=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/lex.c,v retrieving revision 1.25 retrieving revision 1.29 diff -u -p -r1.25 -r1.29 --- OpenXM_contrib2/asir2000/parse/lex.c 2003/05/30 00:47:24 1.25 +++ OpenXM_contrib2/asir2000/parse/lex.c 2004/02/04 07:42:07 1.29 @@ -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.24 2003/05/14 06:20:12 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/lex.c,v 1.28 2004/01/25 11:54:10 ohara Exp $ */ #include #include "ca.h" @@ -186,8 +186,26 @@ int yylex() c = Getc(); if ( c == '\\' ) { c1 = Getc(); - if ( c1 == 'n' ) + if ( c1 == 'n' ) { c1 = '\n'; + }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; @@ -418,6 +436,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; @@ -444,7 +471,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__)) || defined(__CYGWIN__) +#elif (defined(__MACH__) && defined(__ppc__)) || defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__INTERIX) stdin->_r = 0; stdin->_p = stdin->_bf._base; #else --->FIXIT