===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/lex.c,v
retrieving revision 1.22
retrieving revision 1.31
diff -u -p -r1.22 -r1.31
--- OpenXM_contrib2/asir2000/parse/lex.c	2003/02/14 22:29:18	1.22
+++ OpenXM_contrib2/asir2000/parse/lex.c	2004/03/04 07:11:01	1.31
@@ -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.21 2002/09/09 23:52:45 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/lex.c,v 1.30 2004/03/01 02:03:28 noro Exp $ 
 */
 #include <ctype.h>
 #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;
@@ -299,12 +317,29 @@ 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=='_') ) {
+			if ( isalpha(c)||isdigit(c)||(c=='_')||(c=='.') ) {
 				REALLOC_TBUF tbuf[i++] = c;
 			} else
 				break;
@@ -401,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;
@@ -427,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
@@ -503,10 +547,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 {
@@ -515,7 +561,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);
 }
 
@@ -531,7 +581,7 @@ int Egetc(FILE *fp)
 	int c;
 
 	if ( fp ) {
-#if defined(FEP)
+#if FEP
 		if ( do_fep && isatty(fileno(fp)) )
 			c = readline_getc();
 		else
@@ -570,7 +620,7 @@ void Eungetc(int c,FILE *fp)
 	if ( fp ) {
 		if ( asir_infile->encoded )
 			c = (int)encrypt_char((unsigned char)c);
-#if defined(FEP)
+#if FEP
 		if ( do_fep && isatty(fileno(fp)) )
 			readline_ungetc();
 		else
@@ -628,7 +678,7 @@ static void Gets(char *s)
 	*s = 0;
 }
 
-#if defined(FEP)
+#if FEP
 
 static char *readline_line;
 static int readline_nc,readline_index;