=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/lex.c,v retrieving revision 1.2 retrieving revision 1.27 diff -u -p -r1.2 -r1.27 --- OpenXM_contrib2/asir2000/parse/lex.c 2000/02/07 03:14:40 1.2 +++ OpenXM_contrib2/asir2000/parse/lex.c 2003/11/27 02:34:11 1.27 @@ -1,30 +1,77 @@ -/* $OpenXM: OpenXM_contrib2/asir2000/parse/lex.c,v 1.1.1.1 1999/12/03 07:39:12 noro Exp $ */ +/* + * Copyright (c) 1994-2000 FUJITSU LABORATORIES LIMITED + * All rights reserved. + * + * FUJITSU LABORATORIES LIMITED ("FLL") hereby grants you a limited, + * non-exclusive and royalty-free license to use, copy, modify and + * redistribute, solely for non-commercial and non-profit purposes, the + * computer program, "Risa/Asir" ("SOFTWARE"), subject to the terms and + * conditions of this Agreement. For the avoidance of doubt, you acquire + * only a limited right to use the SOFTWARE hereunder, and FLL or any + * third party developer retains all rights, including but not limited to + * copyrights, in and to the SOFTWARE. + * + * (1) FLL does not grant you a license in any way for commercial + * purposes. You may use the SOFTWARE only for non-commercial and + * non-profit purposes only, such as academic, research and internal + * business use. + * (2) The SOFTWARE is protected by the Copyright Law of Japan and + * international copyright treaties. If you make copies of the SOFTWARE, + * with or without modification, as permitted hereunder, you shall affix + * to all such copies of the SOFTWARE the above copyright notice. + * (3) An explicit reference to this SOFTWARE and its copyright owner + * shall be made on your publication or presentation in any form of the + * results obtained by use of the SOFTWARE. + * (4) In the event that you modify the SOFTWARE, you shall notify FLL by + * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification + * for such modification or the source code of the modified part of the + * SOFTWARE. + * + * THE SOFTWARE IS PROVIDED AS IS WITHOUT ANY WARRANTY OF ANY KIND. FLL + * MAKES ABSOLUTELY NO WARRANTIES, EXPRESSED, IMPLIED OR STATUTORY, AND + * EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT OF THIRD PARTIES' + * RIGHTS. NO FLL DEALER, AGENT, EMPLOYEES IS AUTHORIZED TO MAKE ANY + * MODIFICATIONS, EXTENSIONS, OR ADDITIONS TO THIS WARRANTY. + * UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT, + * OR OTHERWISE, SHALL FLL BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL + * DAMAGES OF ANY CHARACTER, INCLUDING, WITHOUT LIMITATION, DAMAGES + * ARISING OUT OF OR RELATING TO THE SOFTWARE OR THIS AGREEMENT, DAMAGES + * FOR LOSS OF GOODWILL, WORK STOPPAGE, OR LOSS OF DATA, OR FOR ANY + * DAMAGES, EVEN IF FLL SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF + * SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. EVEN IF A PART + * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY + * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, + * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. + * + * $OpenXM: OpenXM_contrib2/asir2000/parse/lex.c,v 1.26 2003/08/21 08:05:02 saito Exp $ +*/ #include #include "ca.h" #include "al.h" #include "base.h" #include "parse.h" -#if !defined(THINK_C) #include #include -#endif +#if defined(VISUAL) +#include "ytab.h" +#else #include "y.tab.h" +#endif -extern IN asir_infile; +static int Getc(); +static void Ungetc(int c); +static void Gets(char *s); +static int skipspace(); + +extern INFILE asir_infile; extern struct oTKWD kwd[]; -int afternl(); -int myatoi(); -int aftercomment(); - extern int main_parser; extern char *parse_strp; +extern int recv_intr; -static int skipspace(); -static int Getc(); -static void Ungetc(); -static void Gets(); - #define NBUFSIZ (BUFSIZ*10) #define TBUFSIZ (BUFSIZ) @@ -66,7 +113,7 @@ while ( 1 ) {\ break;\ } -yylex() +int yylex() { #define yylvalp (&yylval) register int c,c1; @@ -79,6 +126,12 @@ yylex() N n,n1; Q q; Obj r; + int floatingpoint = 0; + double dbl; + Real real; + double atof(); + extern int bigfloat; + /* initialize buffer pointers */ nbuf = nbuf0; tbuf = tbuf0; @@ -91,7 +144,7 @@ yylex() while ( ( c = Getc() ) == '0' ); if ( c == '.' ) { Ungetc(c); c = '0'; - } else if ( c == 'x' ) { + } else if ( c == 'x' || c == 'X' ) { for ( i = 0; i < 8; i++ ) nbuf[i] = '0'; READ_ALNUM_NBUF @@ -100,7 +153,7 @@ yylex() NTOQ(n1,1,q); r = (Obj)q; yylvalp->p = (pointer)r; return ( FORMULA ); - } else if ( c == 'b' ) { + } else if ( c == 'b' || c == 'B' ) { for ( i = 0; i < 32; i++ ) nbuf[i] = '0'; READ_ALNUM_NBUF @@ -133,8 +186,26 @@ yylex() c = Getc(); if ( c == '\\' ) { c1 = Getc(); - if ( c1 == 'n' ) + if ( c1 == 'n' ) { c1 = '\n'; + }else if ( c1 == 't' ) { + c1 = '\t'; + }else if ( isdigit(c1) ){ + d = c1 - '0'; + c1 = Getc(); + if ( isdigit(c1) ) { + d = 8*d + (c1 - '0'); + c1 = Getc(); + if ( isdigit(c1) ) { + d = 8*d + (c1 - '0'); + }else { + Ungetc(c1); + } + }else { + Ungetc(c1); + } + c1 = d; + } REALLOC_NBUF nbuf[i++] = c1; } else { REALLOC_NBUF nbuf[i++] = c; @@ -199,14 +270,11 @@ yylex() REALLOC_NBUF nbuf[i++] = c; READ_DIGIT_NBUF if ( c == '.' ) { - double dbl; - Real real; - double atof(); - extern int bigfloat; + floatingpoint = 1; REALLOC_NBUF nbuf[i++] = c; READ_DIGIT_NBUF - if ( c == 'e' ) { + if ( c == 'e' || c == 'E' ) { REALLOC_NBUF nbuf[i++] = c; c = Getc(); if ( (c == '+') || (c == '-') ) { @@ -215,8 +283,19 @@ yylex() Ungetc(c); READ_DIGIT_NBUF } + } else if ( c == 'e' || c == 'E' ) { + floatingpoint = 1; + REALLOC_NBUF nbuf[i++] = c; + c = Getc(); + if ( (c == '+') || (c == '-') ) { + REALLOC_NBUF nbuf[i++] = c; + } else + Ungetc(c); + READ_DIGIT_NBUF + } + if ( floatingpoint ) { Ungetc(c); REALLOC_NBUF nbuf[i] = 0; -#if PARI +#if defined(PARI) if ( !bigfloat ) { dbl = (double)atof(nbuf+DLENGTH); MKReal(dbl,real); r = (Obj)real; @@ -238,12 +317,29 @@ yylex() } yylvalp->p = (pointer)r; return ( FORMULA ); - } else if ( isalpha(c) ) { - i = 0; - tbuf[i++] = c; + } else if ( isalpha(c) || c == ':' ) { + if ( c == ':' ) { + c1 = Getc(); + if ( c1 != ':' ) { + Ungetc(c1); + return c; + } + c1 = Getc(); + if ( !isalpha(c1) ) { + Ungetc(c1); + return COLONCOLON; + } + i = 0; + tbuf[i++] = ':'; + tbuf[i++] = ':'; + tbuf[i++] = c1; + } else { + i = 0; + tbuf[i++] = c; + } while ( 1 ) { c = Getc(); - if ( isalpha(c)||isdigit(c)||(c=='_') ) { + if ( isalpha(c)||isdigit(c)||(c=='_')||(c=='.') ) { REALLOC_TBUF tbuf[i++] = c; } else break; @@ -318,6 +414,8 @@ yylex() Ungetc(c); REALLOC_TBUF tbuf[i] = 0; if ( !strcmp(tbuf,"@p") ) return GFPNGEN; + else if ( !strcmp(tbuf,"@s") ) + return GFSNGEN; else if ( !strcmp(tbuf,"@i") ) { extern pointer IU; @@ -351,12 +449,32 @@ yylex() return ( c ); } +void purge_stdin() +{ +#if defined(__FreeBSD__) + fpurge(stdin); +#elif defined(linux) + stdin->_IO_read_end = stdin->_IO_read_base; + stdin->_IO_read_ptr = stdin->_IO_read_base; +#elif defined(VISUAL_LIB) + void w_purge_stdin(); + + w_purge_stdin(); +#elif defined(sparc) || defined(__alpha) || defined(__SVR4) || defined(mips) || defined(VISUAL) || defined(_IBMR2) + stdin->_ptr = stdin->_base; stdin->_cnt = 0; +#elif (defined(__MACH__) && defined(__ppc__)) || defined(__CYGWIN__) || defined(__FreeBSD__) + stdin->_r = 0; stdin->_p = stdin->_bf._base; +#else +--->FIXIT +#endif +} + static int skipspace() { int c,c1; for ( c = Getc(); ; ) switch ( c ) { - case ' ': case '\t': + case ' ': case '\t': case '\r': c = Getc(); break; case '\n': c = afternl(); break; @@ -412,8 +530,7 @@ int aftercomment() { } } -int myatoi(s) -char *s; +int myatoi(char *s) { int i,r; for ( i = 0, r = 0; i < DLENGTH; i++ ) r = r * 10 + ( s[i] - '0' ); @@ -422,8 +539,7 @@ char *s; extern int ox_do_copy; -void yyerror(s) -char *s; +void yyerror(char *s) { if ( main_parser ) if ( ox_do_copy ) { @@ -442,27 +558,40 @@ int echoback; extern int read_exec_file, do_fep, do_file; -int readline_getc(); -void readline_ungetc(); -int Egetc(); -void Eungetc(); - unsigned char encrypt_char(unsigned char); unsigned char decrypt_char(unsigned char); -int Egetc(fp) -FILE *fp; +int Egetc(FILE *fp) { int c; if ( fp ) { - c = getc(fp); +#if FEP + if ( do_fep && isatty(fileno(fp)) ) + c = readline_getc(); + else +#endif + c = getc(fp); +#if defined(VISUAL) + if ( recv_intr ) { +#include + if ( recv_intr == 1 ) { + recv_intr = 0; + int_handler(SIGINT); + } else { + recv_intr = 0; + ox_usr1_handler(0); + } + } +#endif if ( c == EOF ) return c; if ( asir_infile->encoded ) c = decrypt_char((unsigned char)c); return c; - } else { + } else if ( read_exec_file ) + return EOF; + else { c = *parse_strp++; if ( !c ) return EOF; @@ -471,14 +600,17 @@ FILE *fp; } } -void Eungetc(c,fp) -int c; -FILE *fp; +void Eungetc(int c,FILE *fp) { if ( fp ) { if ( asir_infile->encoded ) c = (int)encrypt_char((unsigned char)c); - ungetc(c,fp); +#if FEP + if ( do_fep && isatty(fileno(fp)) ) + readline_ungetc(); + else +#endif + ungetc(c,fp); } else *--parse_strp = c; } @@ -491,7 +623,11 @@ static int Getc() { if ((c = Egetc(asir_infile->fp)) == EOF) if ( NEXT(asir_infile) ) { closecurrentinput(); - c = Getc(); + /* if the input is the top level, generate error */ + if ( !NEXT(asir_infile) ) + error("end-of-file detected during parsing"); + else + c = Getc(); break; } else if ( read_exec_file || do_file ) asir_terminate(2); @@ -509,7 +645,7 @@ static int Getc() { return ( c ); } -static void Ungetc(c) { +static void Ungetc(int c) { if ( main_parser ) { Eungetc(c,asir_infile->fp); if ( echoback ) @@ -518,8 +654,7 @@ static void Ungetc(c) { *--parse_strp = c; } -static void Gets(s) -char *s; +static void Gets(char *s) { int c; @@ -527,3 +662,57 @@ char *s; *s++ = c; *s = 0; } + +#if FEP + +static char *readline_line; +static int readline_nc,readline_index; +char *readline_console(); + +int readline_getc() +{ + char buf[BUFSIZ]; + + if ( !readline_nc ) { + if ( readline_line ) + free(readline_line); + sprompt(buf); + readline_line = readline_console(buf); + readline_nc = strlen(readline_line); + readline_index = 0; + } + readline_nc--; + return readline_line[readline_index++]; +} + +void readline_ungetc() +{ + readline_nc++; readline_index--; +} + +char *readline_console(char *prompt) +{ + char *line; + int exp_result; + char *expansion; + + while ( 1 ) { + line = (char *)readline(prompt); + if ( line && *line ) { + using_history(); + exp_result = history_expand(line,&expansion); + if ( !exp_result ) { + free(expansion); + for ( ; isspace(*line); line++ ); + add_history(line); + break; + } else if ( exp_result > 0 ) { + free(line); + line = expansion; + break; + } + } + } + return line; +} +#endif