=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/lex.c,v retrieving revision 1.33 retrieving revision 1.48 diff -u -p -r1.33 -r1.48 --- OpenXM_contrib2/asir2000/parse/lex.c 2004/04/30 08:25:38 1.33 +++ OpenXM_contrib2/asir2000/parse/lex.c 2015/08/06 10:01:53 1.48 @@ -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.32 2004/03/26 08:25:37 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/lex.c,v 1.47 2015/08/04 06:20:45 noro Exp $ */ #include #include "ca.h" @@ -54,11 +54,14 @@ #include "parse.h" #include #include -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) #include "ytab.h" #else #include "y.tab.h" #endif +#if FEP +#include +#endif static int Getc(); static void Ungetc(int c); @@ -67,6 +70,7 @@ static int skipspace(); extern INFILE asir_infile; extern struct oTKWD kwd[]; +extern Obj VOIDobj; extern int main_parser; extern char *parse_strp; @@ -297,16 +301,11 @@ int yylex() } if ( floatingpoint ) { Ungetc(c); REALLOC_NBUF nbuf[i] = 0; -#if defined(PARI) if ( !bigfloat ) { dbl = (double)atof(nbuf+DLENGTH); MKReal(dbl,real); r = (Obj)real; } else strtobf(nbuf,(BF *)&r); -#else - dbl = (double)atof(nbuf+DLENGTH); - MKReal(dbl,real); r = (Obj)real; -#endif } else { Ungetc(c); i -= DLENGTH; d = (i%DLENGTH?i/DLENGTH+1:i/DLENGTH); @@ -319,7 +318,7 @@ int yylex() } yylvalp->p = (pointer)r; return ( FORMULA ); - } else if ( isalpha(c) || c == ':' ) { + } else if ( isalpha(c) || c == ':' || c == '_' ) { if ( c == ':' ) { c1 = Getc(); if ( c1 != ':' ) { @@ -347,7 +346,7 @@ int yylex() 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; @@ -418,7 +417,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; @@ -462,7 +464,7 @@ int 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; @@ -471,7 +473,7 @@ void purge_stdin() void w_purge_stdin(); w_purge_stdin(); -#elif defined(sparc) || defined(__alpha) || defined(__SVR4) || defined(mips) || defined(VISUAL) || defined(_IBMR2) +#elif defined(sparc) || defined(__alpha) || defined(__SVR4) || defined(mips) || defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) || defined(_IBMR2) stdin->_ptr = stdin->_base; stdin->_cnt = 0; #elif (defined(__MACH__) && defined(__ppc__)) || defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__INTERIX) stdin->_r = 0; stdin->_p = stdin->_bf._base; @@ -480,8 +482,6 @@ void purge_stdin() #endif } -extern int asir_texmacs; - static int skipspace() { int c,c1; @@ -505,7 +505,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]; @@ -514,12 +514,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++; @@ -535,6 +538,7 @@ int aftercomment() { int c,c1; for ( c = Getc(); ; ) { + if ( c == '\n' ) asir_infile->ln++; c1 = Getc(); if ( (c == '*') && (c1 == '/') ) return Getc(); @@ -553,9 +557,17 @@ int myatoi(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(char *s) { + STRING fname,name,kwd; + USINT u; + NODE t; + LIST l,l2; + if ( main_parser ) { if ( ox_do_copy ) { /* push errors to DebugStack */ @@ -566,6 +578,27 @@ void yyerror(char *s) fprintf(stderr,"\"%s\", near line %d: %s\n",asir_infile->name,asir_infile->ln,s); } 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); } @@ -575,7 +608,7 @@ void yyerror(char *s) int echoback; -extern int read_exec_file, do_fep, do_file; +extern int do_fep, do_file; unsigned char encrypt_char(unsigned char); unsigned char decrypt_char(unsigned char); @@ -591,7 +624,7 @@ int Egetc(FILE *fp) else #endif c = getc(fp); -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) if ( recv_intr ) { #include if ( recv_intr == 1 ) { @@ -608,9 +641,7 @@ int Egetc(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; @@ -648,11 +679,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; @@ -722,7 +754,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 ) {