===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/lex.c,v
retrieving revision 1.28
retrieving revision 1.32
diff -u -p -r1.28 -r1.32
--- OpenXM_contrib2/asir2000/parse/lex.c	2004/01/25 11:54:10	1.28
+++ OpenXM_contrib2/asir2000/parse/lex.c	2004/03/26 08:25:37	1.32
@@ -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.27 2003/11/27 02:34:11 ohara Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/lex.c,v 1.31 2004/03/04 07:11:01 noro Exp $ 
 */
 #include <ctype.h>
 #include "ca.h"
@@ -436,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;
@@ -469,6 +478,8 @@ void purge_stdin()
 #endif
 }
 
+extern int asir_texmacs;
+
 static int skipspace() {
 	int c,c1;
 
@@ -477,7 +488,7 @@ static int skipspace() {
 			case ' ': case '\t': case '\r':
 				c = Getc(); break;
 			case '\n':
-				c = afternl();	break;
+				c = afternl(); break;
 			case '/':
 				if ( (c1 = Getc()) == '*' )
 					c = aftercomment();
@@ -538,10 +549,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 {
@@ -550,7 +563,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);
 }