===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/lex.c,v
retrieving revision 1.36
retrieving revision 1.42
diff -u -p -r1.36 -r1.42
--- OpenXM_contrib2/asir2000/parse/lex.c	2005/10/26 07:33:03	1.36
+++ OpenXM_contrib2/asir2000/parse/lex.c	2006/09/29 08:58:22	1.42
@@ -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.35 2005/10/19 04:51:15 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/lex.c,v 1.41 2006/03/05 08:21:59 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;
@@ -418,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;
@@ -533,6 +537,7 @@ int aftercomment() {
 	int c,c1;
 
 	for ( c = Getc(); ; ) {
+		if ( c == '\n' ) asir_infile->ln++;
 		c1 = Getc();
 		if ( (c == '*') && (c1 == '/') )
 			return Getc();
@@ -551,9 +556,17 @@ 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;
+extern char *CUR_FUNC;
 
 void yyerror(char *s)
 {
+	STRING fname,name,kwd;
+	USINT u;
+	NODE t;
+	LIST l,l2;
+
 	if ( main_parser ) {
 		if ( ox_do_copy ) {
 			/* push errors to DebugStack */
@@ -564,6 +577,27 @@ void yyerror(char *s)
 				fprintf(stderr,"\"%s\", near line %d: %s\n",asir_infile->name,asir_infile->ln,s);
 		}
 		if ( I_am_server ) {
+			if ( NEXT(asir_infile) ) {
+				/* error in a file; record the position */
+				MKSTR(fname,asir_infile->name);
+				if ( CPVS == GPVS )
+					MKSTR(name,"");
+				else
+					MKSTR(name,CUR_FUNC);
+				MKUSINT(u,asir_infile->ln);
+				t = mknode(3,fname,name,u); MKLIST(l,t);
+				/* line number at the toplevel */
+				MKSTR(fname,"toplevel"); MKUSINT(u,at_root);
+				t = mknode(2,fname,u); MKLIST(l2,t);
+				t = mknode(2,l2,l); 
+			} else {
+				MKSTR(fname,"toplevel"); MKUSINT(u,asir_infile->ln);
+				t = mknode(2,fname,u); MKLIST(l,t);
+				t = mknode(1,l);
+			}
+			MKLIST(l,t);
+			MKSTR(kwd,"asir_where"); t = mknode(2,kwd,l);
+			MKLIST(LastStackTrace,t);
 			set_lasterror(s);
 			LONGJMP(main_env,1);
 		}
@@ -573,7 +607,7 @@ void yyerror(char *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);
@@ -606,9 +640,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;
@@ -646,7 +678,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 )