=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/lex.c,v retrieving revision 1.24 retrieving revision 1.26 diff -u -p -r1.24 -r1.26 --- OpenXM_contrib2/asir2000/parse/lex.c 2003/05/14 06:20:12 1.24 +++ OpenXM_contrib2/asir2000/parse/lex.c 2003/08/21 08:05:02 1.26 @@ -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.23 2003/03/07 03:12:31 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/lex.c,v 1.25 2003/05/30 00:47:24 noro Exp $ */ #include #include "ca.h" @@ -299,9 +299,26 @@ int yylex() } yylvalp->p = (pointer)r; return ( FORMULA ); - } else if ( isalpha(c) ) { - i = 0; - tbuf[i++] = c; + } else if ( isalpha(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=='_')||(c=='.') ) { @@ -427,7 +444,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__) stdin->_r = 0; stdin->_p = stdin->_bf._base; #else --->FIXIT