===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/lex.c,v
retrieving revision 1.28
retrieving revision 1.40
diff -u -p -r1.28 -r1.40
--- OpenXM_contrib2/asir2000/parse/lex.c	2004/01/25 11:54:10	1.28
+++ OpenXM_contrib2/asir2000/parse/lex.c	2006/03/05 08:02:12	1.40
@@ -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.39 2006/03/05 07:11:52 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;
@@ -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();
@@ -522,6 +537,7 @@ int aftercomment() {
 	int c,c1;
 
 	for ( c = Getc(); ; ) {
+		if ( c == '\n' ) asir_infile->ln++;
 		c1 = Getc();
 		if ( (c == '*') && (c1 == '/') )
 			return Getc();
@@ -538,10 +554,19 @@ int myatoi(char *s)
 }
 
 extern int ox_do_copy;
+extern int I_am_server;
+extern JMP_BUF main_env;
+extern int at_root;
+extern LIST LastStackTrace;
 
 void yyerror(char *s)
 {
-	if ( main_parser )
+	STRING fname;
+	Q q;
+	NODE t;
+	LIST l,l2;
+
+	if ( main_parser ) {
 		if ( ox_do_copy ) {
 			/* push errors to DebugStack */
 		} else {
@@ -550,13 +575,31 @@ 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 ) {
+			if ( NEXT(asir_infile) ) {
+				/* error in a file; record the position */
+				MKSTR(fname,asir_infile->name); STOQ(asir_infile->ln,q);
+				t = mknode(2,fname,q); MKLIST(l,t);
+				/* line number at the toplevel */
+				MKSTR(fname,"toplevel"); STOQ(at_root,q);
+				t = mknode(2,fname,q); MKLIST(l2,t);
+				t = mknode(2,l2,l); 
+			} else {
+				MKSTR(fname,"toplevel"); STOQ(asir_infile->ln,q);
+				t = mknode(2,fname,q); MKLIST(l,t);
+				t = mknode(1,l);
+			}
+			MKLIST(LastStackTrace,t);
+			set_lasterror(s);
+			LONGJMP(main_env,1);
+		}
+	} else
 		fprintf(stderr,"exprparse : %s\n",s);
 }
 
 int echoback;
 
-extern int read_exec_file, do_fep, do_file;
+extern int do_fep, do_file;
 
 unsigned char encrypt_char(unsigned char);
 unsigned char decrypt_char(unsigned char);
@@ -589,9 +632,7 @@ int Egetc(FILE *fp)
 		if ( asir_infile->encoded )
 			c = decrypt_char((unsigned char)c);
 		return c;
-	} else if ( read_exec_file )
-		return EOF;
-	else {
+	} else {
 		c = *parse_strp++;
 		if ( !c )
 			return EOF;
@@ -629,7 +670,7 @@ static int Getc() {
 					else
 						c = Getc();
 					break;
-				} else if ( read_exec_file || do_file )
+				} else if ( asir_infile->fp || do_file )
 					asir_terminate(2);
 				else {
 					if ( asir_infile->fp )
@@ -703,7 +744,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 ) {