===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/lex.c,v
retrieving revision 1.42
retrieving revision 1.46
diff -u -p -r1.42 -r1.46
--- OpenXM_contrib2/asir2000/parse/lex.c	2006/09/29 08:58:22	1.42
+++ OpenXM_contrib2/asir2000/parse/lex.c	2010/08/03 04:34:44	1.46
@@ -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.41 2006/03/05 08:21:59 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/lex.c,v 1.45 2010/04/16 07:13:42 noro 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;
@@ -507,7 +510,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 +519,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++;
@@ -678,11 +684,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;