===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/lex.c,v
retrieving revision 1.27
retrieving revision 1.31
diff -u -p -r1.27 -r1.31
--- OpenXM_contrib2/asir2000/parse/lex.c	2003/11/27 02:34:11	1.27
+++ 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.26 2003/08/21 08:05:02 saito 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"
@@ -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;
@@ -462,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__) || defined(__FreeBSD__)
+#elif (defined(__MACH__) && defined(__ppc__)) || defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__INTERIX)
 	stdin->_r = 0; stdin->_p = stdin->_bf._base;
 #else
 --->FIXIT
@@ -538,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 {
@@ -550,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);
 }