===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/lex.c,v
retrieving revision 1.27
retrieving revision 1.37
diff -u -p -r1.27 -r1.37
--- OpenXM_contrib2/asir2000/parse/lex.c	2003/11/27 02:34:11	1.27
+++ OpenXM_contrib2/asir2000/parse/lex.c	2005/12/10 14:14:16	1.37
@@ -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.36 2005/10/26 07:33:03 noro Exp $ 
 */
 #include <ctype.h>
 #include "ca.h"
@@ -67,6 +67,7 @@ static int skipspace();
 
 extern INFILE asir_infile;
 extern struct oTKWD kwd[];
+extern Obj VOIDobj;
 
 extern int main_parser;
 extern char *parse_strp;
@@ -188,6 +189,8 @@ int yylex()
 					c1 = Getc();
 					if ( c1 == 'n' ) {
 						c1 = '\n';
+					}else if ( c1 == 'r' ) {
+						c1 = '\r';
                     }else if ( c1 == 't' ) {
                         c1 = '\t';
                     }else if ( isdigit(c1) ){
@@ -317,7 +320,7 @@ int yylex()
 		}
 		yylvalp->p = (pointer)r;
 		return ( FORMULA );
-	} else if ( isalpha(c) || c == ':' ) {
+	} else if ( isalpha(c) || c == ':' || c == '_' ) {
 		if ( c == ':' ) {
 			c1 = Getc();
 			if ( c1 != ':' ) {
@@ -345,7 +348,7 @@ int yylex()
 				break;
 		}
 		REALLOC_TBUF tbuf[i] = 0; Ungetc(c); 
-		if ( isupper(tbuf[0]) ) {
+		if ( isupper(tbuf[0]) || (tbuf[0] == '_' && isupper(tbuf[1])) ) {
 			cptr = (char *)MALLOC(strlen(tbuf)+1); strcpy(cptr,tbuf);
 			yylvalp->p = (pointer)cptr;
 			return UCASE;
@@ -416,7 +419,10 @@ int yylex()
 				return GFPNGEN;
 			else if ( !strcmp(tbuf,"@s") )
 				return GFSNGEN;
-			else if ( !strcmp(tbuf,"@i") ) {
+			else if ( !strcmp(tbuf,"@void") ) {
+				yylvalp->p = VOIDobj;
+				return FORMULA;
+			} else if ( !strcmp(tbuf,"@i") ) {
 				extern pointer IU;
 
 				yylvalp->p = IU;
@@ -436,6 +442,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 +477,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
@@ -477,7 +492,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 +553,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 +567,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);
 }
 
@@ -703,7 +724,7 @@ char *readline_console(char *prompt)
                         exp_result = history_expand(line,&expansion);
                         if ( !exp_result ) {
                                 free(expansion);
-                                for ( ; isspace(*line); line++ );
+                                for ( ; isspace((unsigned char)*line); line++ );
                                 add_history(line);
                                 break;
                         } else if ( exp_result > 0 ) {