=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/lex.c,v retrieving revision 1.18 retrieving revision 1.37 diff -u -p -r1.18 -r1.37 --- OpenXM_contrib2/asir2000/parse/lex.c 2001/10/09 01:36:24 1.18 +++ 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.17 2001/09/03 07:01:10 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/lex.c,v 1.36 2005/10/26 07:33:03 noro Exp $ */ #include #include "ca.h" @@ -67,6 +67,7 @@ static int skipspace(); extern INFILE asir_infile; extern struct oTKWD kwd[]; +extern Obj VOIDobj; extern int main_parser; extern char *parse_strp; @@ -126,6 +127,12 @@ int 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; @@ -138,7 +145,7 @@ int 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 @@ -147,7 +154,7 @@ int 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 @@ -180,8 +187,28 @@ int 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; @@ -246,14 +273,11 @@ int 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 == '-') ) { @@ -262,8 +286,19 @@ int 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; @@ -285,18 +320,35 @@ int 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; @@ -367,7 +419,10 @@ int yylex() return GFPNGEN; else if ( !strcmp(tbuf,"@s") ) return GFSNGEN; - else if ( !strcmp(tbuf,"@i") ) { + else if ( !strcmp(tbuf,"@void") ) { + yylvalp->p = VOIDobj; + return FORMULA; + } else if ( !strcmp(tbuf,"@i") ) { extern pointer IU; yylvalp->p = IU; @@ -387,6 +442,15 @@ int 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; @@ -413,7 +477,7 @@ void 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 +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(); @@ -489,10 +553,12 @@ int myatoi(char *s) } extern int ox_do_copy; +extern int I_am_server; +extern JMP_BUF main_env; void yyerror(char *s) { - if ( main_parser ) + if ( main_parser ) { if ( ox_do_copy ) { /* push errors to DebugStack */ } else { @@ -501,7 +567,11 @@ void yyerror(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); } @@ -654,7 +724,7 @@ char *readline_console(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 ) {