=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/lex.c,v retrieving revision 1.7 retrieving revision 1.20 diff -u -p -r1.7 -r1.20 --- OpenXM_contrib2/asir2000/parse/lex.c 2000/12/01 04:34:01 1.7 +++ OpenXM_contrib2/asir2000/parse/lex.c 2002/09/09 12:23:51 1.20 @@ -45,34 +45,33 @@ * 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.6 2000/11/13 01:48:13 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/lex.c,v 1.19 2001/12/21 08:23:15 noro 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) @@ -114,7 +113,7 @@ while ( 1 ) {\ break;\ } -yylex() +int yylex() { #define yylvalp (&yylval) register int c,c1; @@ -127,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; @@ -247,10 +252,7 @@ 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 @@ -263,6 +265,17 @@ yylex() Ungetc(c); READ_DIGIT_NBUF } + } else if ( 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 ( !bigfloat ) { @@ -366,6 +379,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; @@ -406,10 +421,14 @@ void purge_stdin() #elif defined(linux) stdin->_IO_read_end = stdin->_IO_read_base; stdin->_IO_read_ptr = stdin->_IO_read_base; -#elif defined(sparc) || defined(__alpha) || defined(__SVR4) || defined(mips) - stdin->_ptr = stdin->_base; stdin->_cnt = 0; -#elif defined(VISUAL) +#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__) + stdin->_r = 0; stdin->_p = stdin->_bf._base; #else --->FIXIT #endif @@ -420,7 +439,7 @@ static int skipspace() { for ( c = Getc(); ; ) switch ( c ) { - case ' ': case '\t': + case ' ': case '\t': case '\r': c = Getc(); break; case '\n': c = afternl(); break; @@ -476,8 +495,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' ); @@ -486,8 +504,7 @@ char *s; extern int ox_do_copy; -void yyerror(s) -char *s; +void yyerror(char *s) { if ( main_parser ) if ( ox_do_copy ) { @@ -506,21 +523,32 @@ 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 ) @@ -537,14 +565,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; } @@ -557,7 +588,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); @@ -575,7 +610,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 ) @@ -584,8 +619,7 @@ static void Ungetc(c) { *--parse_strp = c; } -static void Gets(s) -char *s; +static void Gets(char *s) { int c; @@ -593,3 +627,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