=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/lex.c,v retrieving revision 1.16 retrieving revision 1.46 diff -u -p -r1.16 -r1.46 --- OpenXM_contrib2/asir2000/parse/lex.c 2001/06/15 07:56:06 1.16 +++ OpenXM_contrib2/asir2000/parse/lex.c 2010/08/03 04:34:44 1.46 @@ -45,7 +45,7 @@ * 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.15 2001/06/04 02:49:48 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/lex.c,v 1.45 2010/04/16 07:13:42 noro Exp $ */ #include #include "ca.h" @@ -59,23 +59,23 @@ #else #include "y.tab.h" #endif +#if FEP +#include +#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[]; +extern Obj VOIDobj; -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) @@ -117,7 +117,7 @@ while ( 1 ) {\ break;\ } -yylex() +int yylex() { #define yylvalp (&yylval) register int c,c1; @@ -130,6 +130,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; @@ -142,7 +148,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 @@ -151,7 +157,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 @@ -184,8 +190,28 @@ yylex() c = Getc(); if ( c == '\\' ) { c1 = Getc(); - if ( c1 == 'n' ) + if ( c1 == 'n' ) { c1 = '\n'; + }else if ( c1 == 'r' ) { + c1 = '\r'; + }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; @@ -250,14 +276,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 == '-') ) { @@ -266,8 +289,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; @@ -289,18 +323,35 @@ yylex() } yylvalp->p = (pointer)r; return ( FORMULA ); - } else if ( isalpha(c) ) { - i = 0; - tbuf[i++] = c; + } else if ( isalpha(c) || 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; } REALLOC_TBUF tbuf[i] = 0; Ungetc(c); - if ( isupper(tbuf[0]) ) { + if ( isupper(tbuf[0]) || (tbuf[0] == '_' && isupper(tbuf[1])) ) { cptr = (char *)MALLOC(strlen(tbuf)+1); strcpy(cptr,tbuf); yylvalp->p = (pointer)cptr; return UCASE; @@ -369,7 +420,12 @@ yylex() Ungetc(c); REALLOC_TBUF tbuf[i] = 0; if ( !strcmp(tbuf,"@p") ) return GFPNGEN; - else if ( !strcmp(tbuf,"@i") ) { + else if ( !strcmp(tbuf,"@s") ) + return GFSNGEN; + else if ( !strcmp(tbuf,"@void") ) { + yylvalp->p = VOIDobj; + return FORMULA; + } else if ( !strcmp(tbuf,"@i") ) { extern pointer IU; yylvalp->p = IU; @@ -389,6 +445,15 @@ yylex() } else if ( !strcmp(tbuf,"@equiv") ) { yylvalp->i = (int)L_EQUIV; return FOP_EQUIV; + } else if ( !strcmp(tbuf,"@grlex") ) { + yylvalp->p = Symbol_grlex; + return FORMULA; + } else if ( !strcmp(tbuf,"@glex") ) { + yylvalp->p = Symbol_glex; + return FORMULA; + } else if ( !strcmp(tbuf,"@lex") ) { + yylvalp->p = Symbol_lex; + return FORMULA; } else { cptr = (char *)MALLOC(strlen(tbuf)+1); strcpy(cptr,tbuf); yylvalp->p = (pointer)cptr; @@ -404,16 +469,18 @@ yylex() void purge_stdin() { -#if defined(__FreeBSD__) +#if defined(__FreeBSD__) || defined(__DARWIN__) 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__) +#elif (defined(__MACH__) && defined(__ppc__)) || defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__INTERIX) stdin->_r = 0; stdin->_p = stdin->_bf._base; #else --->FIXIT @@ -428,7 +495,7 @@ static int skipspace() { case ' ': case '\t': case '\r': c = Getc(); break; case '\n': - c = afternl(); break; + c = afternl(); break; case '/': if ( (c1 = Getc()) == '*' ) c = aftercomment(); @@ -443,7 +510,7 @@ static int skipspace() { int afternl() { int c,ac,i,quote; - char *ptr; + char *ptr,*buf0; char *av[BUFSIZ]; static int ilevel = 0; char buf[BUFSIZ]; @@ -452,12 +519,15 @@ int afternl() { asir_infile->ln++; while ( (c = Getc()) == '#' ) { Gets(buf); - for ( quote = 0, ptr = buf; *ptr; ptr++ ) +#define LINE "line" + if ( !strncmp(buf,LINE,strlen(LINE)) ) buf0 = buf+strlen(LINE); + else buf0 = buf; + for ( quote = 0, ptr = buf0; *ptr; ptr++ ) if ( *ptr == '"' ) quote = quote ? 0 : 1; else if ( quote && (*ptr == ' ') ) *ptr = '_'; - stoarg(buf,&ac,av); + stoarg(buf0,&ac,av); if ( ac == 3 ) if ( (i = atoi(av[2])) == 1 ) ilevel++; @@ -473,6 +543,7 @@ int aftercomment() { int c,c1; for ( c = Getc(); ; ) { + if ( c == '\n' ) asir_infile->ln++; c1 = Getc(); if ( (c == '*') && (c1 == '/') ) return Getc(); @@ -481,8 +552,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' ); @@ -490,11 +560,20 @@ char *s; } extern int ox_do_copy; +extern int I_am_server; +extern JMP_BUF main_env; +extern int at_root; +extern LIST LastStackTrace; +extern char *CUR_FUNC; -void yyerror(s) -char *s; +void yyerror(char *s) { - if ( main_parser ) + STRING fname,name,kwd; + USINT u; + NODE t; + LIST l,l2; + + if ( main_parser ) { if ( ox_do_copy ) { /* push errors to DebugStack */ } else { @@ -503,24 +582,43 @@ char *s; else fprintf(stderr,"\"%s\", near line %d: %s\n",asir_infile->name,asir_infile->ln,s); } - else + if ( I_am_server ) { + if ( NEXT(asir_infile) ) { + /* error in a file; record the position */ + MKSTR(fname,asir_infile->name); + if ( CPVS == GPVS ) + MKSTR(name,""); + else + MKSTR(name,CUR_FUNC); + MKUSINT(u,asir_infile->ln); + t = mknode(3,fname,name,u); MKLIST(l,t); + /* line number at the toplevel */ + MKSTR(fname,"toplevel"); MKUSINT(u,at_root); + t = mknode(2,fname,u); MKLIST(l2,t); + t = mknode(2,l2,l); + } else { + MKSTR(fname,"toplevel"); MKUSINT(u,asir_infile->ln); + t = mknode(2,fname,u); MKLIST(l,t); + t = mknode(1,l); + } + MKLIST(l,t); + MKSTR(kwd,"asir_where"); t = mknode(2,kwd,l); + MKLIST(LastStackTrace,t); + set_lasterror(s); + LONGJMP(main_env,1); + } + } else fprintf(stderr,"exprparse : %s\n",s); } int echoback; -extern int read_exec_file, do_fep, do_file; +extern int 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; @@ -548,9 +646,7 @@ FILE *fp; if ( asir_infile->encoded ) c = decrypt_char((unsigned char)c); return c; - } else if ( read_exec_file ) - return EOF; - else { + } else { c = *parse_strp++; if ( !c ) return EOF; @@ -559,9 +655,7 @@ FILE *fp; } } -void Eungetc(c,fp) -int c; -FILE *fp; +void Eungetc(int c,FILE *fp) { if ( fp ) { if ( asir_infile->encoded ) @@ -590,11 +684,12 @@ static int Getc() { else c = Getc(); break; - } else if ( read_exec_file || do_file ) - asir_terminate(2); - else { + } else if ( asir_infile->fp || do_file ) { if ( asir_infile->fp ) clearerr(asir_infile->fp); + asir_terminate(2); + } else { + error("end-of-line detected during parsing"); } else break; @@ -606,7 +701,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 ) @@ -615,8 +710,7 @@ static void Ungetc(c) { *--parse_strp = c; } -static void Gets(s) -char *s; +static void Gets(char *s) { int c; @@ -652,8 +746,7 @@ void readline_ungetc() readline_nc++; readline_index--; } -char *readline_console(prompt) -char *prompt; +char *readline_console(char *prompt) { char *line; int exp_result; @@ -666,7 +759,7 @@ char *prompt; exp_result = history_expand(line,&expansion); if ( !exp_result ) { free(expansion); - for ( ; isspace(*line); line++ ); + for ( ; isspace((unsigned char)*line); line++ ); add_history(line); break; } else if ( exp_result > 0 ) {