===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/lex.c,v
retrieving revision 1.40
retrieving revision 1.45
diff -u -p -r1.40 -r1.45
--- OpenXM_contrib2/asir2000/parse/lex.c	2006/03/05 08:02:12	1.40
+++ OpenXM_contrib2/asir2000/parse/lex.c	2010/04/16 07:13:42	1.45
@@ -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.39 2006/03/05 07:11:52 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/lex.c,v 1.44 2007/08/06 08:15:26 saito 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);
@@ -466,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;
@@ -558,11 +561,12 @@ 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;
-	Q q;
+	STRING fname,name,kwd;
+	USINT u;
 	NODE t;
 	LIST l,l2;
 
@@ -578,17 +582,24 @@ void yyerror(char *s)
 		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);
+				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"); STOQ(at_root,q);
-				t = mknode(2,fname,q); MKLIST(l2,t);
+				MKSTR(fname,"toplevel"); MKUSINT(u,at_root);
+				t = mknode(2,fname,u); 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);
+				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);
@@ -670,11 +681,12 @@ static int Getc() {
 					else
 						c = Getc();
 					break;
-				} else if ( asir_infile->fp || do_file )
-					asir_terminate(2);
-				else {
+				} else if ( asir_infile->fp || do_file ) {
 					if ( asir_infile->fp )
 						clearerr(asir_infile->fp);
+					asir_terminate(2);
+				} else {
+					error("end-of-line detected during parsing");
 				}
 			else
 				break;