===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/lex.c,v
retrieving revision 1.43
retrieving revision 1.49
diff -u -p -r1.43 -r1.49
--- OpenXM_contrib2/asir2000/parse/lex.c	2007/02/18 05:36:28	1.43
+++ OpenXM_contrib2/asir2000/parse/lex.c	2015/08/08 14:19:42	1.49
@@ -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.42 2006/09/29 08:58:22 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/lex.c,v 1.48 2015/08/06 10:01:53 fujimoto 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__) || defined(__MINGW64__)
 #include "ytab.h"
 #else
 #include "y.tab.h"
 #endif
+#if FEP
+#include <readline/readline.h>
+#endif
 
 static int Getc();
 static void Ungetc(int c);
@@ -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);
@@ -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(__MINGW64__) || 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++;
@@ -603,6 +604,9 @@ void yyerror(char *s)
 		}
 	} else
 		fprintf(stderr,"exprparse : %s\n",s);
+#if defined(__MINGW32__) || defined(__MINGW64__)
+	fflush(stderr);
+#endif
 }
 
 int echoback;
@@ -623,7 +627,7 @@ int Egetc(FILE *fp)
 		else
 #endif
 			c = getc(fp);
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__)
 		if ( recv_intr ) {
 #include <signal.h>
 			if ( recv_intr == 1 ) {
@@ -678,11 +682,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;