===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/lex.c,v
retrieving revision 1.41
retrieving revision 1.52
diff -u -p -r1.41 -r1.52
--- OpenXM_contrib2/asir2000/parse/lex.c	2006/03/05 08:21:59	1.41
+++ OpenXM_contrib2/asir2000/parse/lex.c	2017/03/28 03:26:33	1.52
@@ -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.40 2006/03/05 08:02:12 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/lex.c,v 1.51 2016/08/24 08:21:03 ohara Exp $ 
 */
 #include <ctype.h>
 #include "ca.h"
@@ -54,11 +54,14 @@
 #include "parse.h"
 #include <sys/types.h>
 #include <sys/stat.h>
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 #include "ytab.h"
 #else
 #include "y.tab.h"
 #endif
+#if FEP
+#include <readline/readline.h>
+#endif
 
 static int Getc();
 static void Ungetc(int c);
@@ -71,7 +74,6 @@ extern Obj VOIDobj;
 
 extern int main_parser;
 extern char *parse_strp;
-extern int recv_intr;
 
 #define NBUFSIZ (BUFSIZ*10)
 #define TBUFSIZ (BUFSIZ)
@@ -185,6 +187,7 @@ int yylex()
 			i = 0;
 			do {
 				c = Getc();
+                if ( c == '\n' ) asir_infile->ln++;
 				if ( c == '\\' ) {
 					c1 = Getc();
 					if ( c1 == 'n' ) {
@@ -298,16 +301,11 @@ int yylex()
 		}
 		if ( floatingpoint ) {
 			Ungetc(c); REALLOC_NBUF nbuf[i] = 0;
-#if defined(PARI)
 			if ( !bigfloat ) {
 				dbl = (double)atof(nbuf+DLENGTH);
 				MKReal(dbl,real); r = (Obj)real;
 			} else
 				strtobf(nbuf,(BF *)&r);
-#else
-			dbl = (double)atof(nbuf+DLENGTH);
-			MKReal(dbl,real); r = (Obj)real;
-#endif
 		} else {
 			Ungetc(c);
 			i -= DLENGTH; d = (i%DLENGTH?i/DLENGTH+1:i/DLENGTH);
@@ -466,7 +464,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;
@@ -475,7 +473,7 @@ void purge_stdin()
 	void w_purge_stdin();
 
 	w_purge_stdin();
-#elif defined(sparc) || defined(__alpha) || defined(__SVR4) || defined(mips) || defined(VISUAL) || defined(_IBMR2)
+#elif defined(sparc) || defined(__alpha) || defined(__SVR4) || defined(mips) || defined(VISUAL) || defined(__MINGW32__) || defined(_IBMR2)
 	stdin->_ptr = stdin->_base; stdin->_cnt = 0;
 #elif (defined(__MACH__) && defined(__ppc__)) || defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__INTERIX)
 	stdin->_r = 0; stdin->_p = stdin->_bf._base;
@@ -507,7 +505,7 @@ static int skipspace() {
 
 int afternl() {
 	int c,ac,i,quote;
-	char *ptr;
+	char *ptr,*buf0;
 	char *av[BUFSIZ];
 	static int ilevel = 0;
 	char buf[BUFSIZ];
@@ -516,12 +514,15 @@ int afternl() {
 		asir_infile->ln++;
 	while ( (c = Getc()) == '#' ) {
 		Gets(buf);
-		for ( quote = 0, ptr = buf; *ptr; ptr++ )
+#define LINE "line"
+		if ( !strncmp(buf,LINE,strlen(LINE)) ) buf0 = buf+strlen(LINE);
+		else buf0 = buf;
+		for ( quote = 0, ptr = buf0; *ptr; ptr++ )
 			if ( *ptr == '"' )
 				quote = quote ? 0 : 1;
 			else if ( quote && (*ptr == ' ') )
 				*ptr = '_';
-		stoarg(buf,&ac,av);
+		stoarg(buf0,&ac,av);
 		if ( ac == 3 )
 			if ( (i = atoi(av[2])) == 1 )
 				ilevel++;
@@ -563,7 +564,7 @@ extern char *CUR_FUNC;
 void yyerror(char *s)
 {
 	STRING fname,name,kwd;
-	Q q;
+	USINT u;
 	NODE t;
 	LIST l,l2;
 
@@ -584,15 +585,15 @@ void yyerror(char *s)
 					MKSTR(name,"");
 				else
 					MKSTR(name,CUR_FUNC);
-				STOQ(asir_infile->ln,q);
-				t = mknode(3,fname,name,q); MKLIST(l,t);
+				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);
@@ -623,17 +624,8 @@ int Egetc(FILE *fp)
 		else
 #endif
 			c = getc(fp);
-#if defined(VISUAL)
-		if ( recv_intr ) {
-#include <signal.h>
-			if ( recv_intr == 1 ) {
-				recv_intr = 0;
-				int_handler(SIGINT);
-			} else {
-				recv_intr = 0;
-				ox_usr1_handler(0);
-			}
-		}
+#if defined(VISUAL) || defined(__MINGW32__)
+		check_intr();
 #endif
 		if ( c == EOF )
 			return c;
@@ -678,11 +670,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;