===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/lex.c,v
retrieving revision 1.42
retrieving revision 1.45
diff -u -p -r1.42 -r1.45
--- OpenXM_contrib2/asir2000/parse/lex.c	2006/09/29 08:58:22	1.42
+++ 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.41 2006/03/05 08:21:59 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;
@@ -678,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;