=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/lex.c,v retrieving revision 1.15 retrieving revision 1.37 diff -u -p -r1.15 -r1.37 --- OpenXM_contrib2/asir2000/parse/lex.c 2001/06/04 02:49:48 1.15 +++ OpenXM_contrib2/asir2000/parse/lex.c 2005/12/10 14:14:16 1.37 @@ -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.14 2001/03/08 07:49:13 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/lex.c,v 1.36 2005/10/26 07:33:03 noro Exp $ */ #include #include "ca.h" @@ -60,22 +60,19 @@ #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[]; +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 +114,7 @@ while ( 1 ) {\ break;\ } -yylex() +int yylex() { #define yylvalp (&yylval) register int c,c1; @@ -130,6 +127,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 +145,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 +154,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 +187,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 +273,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 +286,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 +320,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 +417,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 +442,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; @@ -410,10 +472,12 @@ void purge_stdin() 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) +#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 +492,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(); @@ -481,8 +545,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 +553,12 @@ char *s; } extern int ox_do_copy; +extern int I_am_server; +extern JMP_BUF main_env; -void yyerror(s) -char *s; +void yyerror(char *s) { - if ( main_parser ) + if ( main_parser ) { if ( ox_do_copy ) { /* push errors to DebugStack */ } else { @@ -503,7 +567,11 @@ char *s; else fprintf(stderr,"\"%s\", near line %d: %s\n",asir_infile->name,asir_infile->ln,s); } - else + if ( I_am_server ) { + set_lasterror(s); + LONGJMP(main_env,1); + } + } else fprintf(stderr,"exprparse : %s\n",s); } @@ -511,16 +579,10 @@ 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; @@ -559,9 +621,7 @@ FILE *fp; } } -void Eungetc(c,fp) -int c; -FILE *fp; +void Eungetc(int c,FILE *fp) { if ( fp ) { if ( asir_infile->encoded ) @@ -606,7 +666,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 +675,7 @@ static void Ungetc(c) { *--parse_strp = c; } -static void Gets(s) -char *s; +static void Gets(char *s) { int c; @@ -652,8 +711,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 +724,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 ) {