===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/lex.c,v
retrieving revision 1.34
retrieving revision 1.44
diff -u -p -r1.34 -r1.44
--- OpenXM_contrib2/asir2000/parse/lex.c	2004/12/17 03:09:08	1.34
+++ OpenXM_contrib2/asir2000/parse/lex.c	2007/08/06 08:15:26	1.44
@@ -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.33 2004/04/30 08:25:38 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/lex.c,v 1.43 2007/02/18 05:36:28 ohara Exp $ 
 */
 #include <ctype.h>
 #include "ca.h"
@@ -59,6 +59,9 @@
 #else
 #include "y.tab.h"
 #endif
+#if FEP
+#include <readline/readline.h>
+#endif
 
 static int Getc();
 static void Ungetc(int c);
@@ -67,6 +70,7 @@ static int skipspace();
 
 extern INFILE asir_infile;
 extern struct oTKWD kwd[];
+extern Obj VOIDobj;
 
 extern int main_parser;
 extern char *parse_strp;
@@ -319,7 +323,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 != ':' ) {
@@ -347,7 +351,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;
@@ -418,7 +422,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;
@@ -462,7 +469,7 @@ int yylex()
 
 void purge_stdin()
 {
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__DARWIN__)
 	fpurge(stdin);
 #elif defined(linux)
 	stdin->_IO_read_end = stdin->_IO_read_base;
@@ -533,6 +540,7 @@ int aftercomment() {
 	int c,c1;
 
 	for ( c = Getc(); ; ) {
+		if ( c == '\n' ) asir_infile->ln++;
 		c1 = Getc();
 		if ( (c == '*') && (c1 == '/') )
 			return Getc();
@@ -551,9 +559,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 +580,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 +610,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 +643,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 +681,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 )
@@ -720,7 +755,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 ) {