# HG changeset patch
# User jwe
# Date 1017764538 0
# Node ID c34d631dee186f28c7c73a143e2a5a0109eb75d7
# Parent  c21ae2c5840fb528e58681cc60998b16b8e930a6
[project @ 2002-04-02 16:22:18 by jwe]

diff --git a/src/ChangeLog b/src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2002-04-02  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* parse.y (input): Call YYACCEPT for END_OF_INPUT.
+	(parse_and_execute): Handle change in yyparse return value semantics.
+	* toplev.cc (main_loop): Likewise.
+
 2002-03-25  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* parse.y (parse_fcn_file): Call error if there is no input file.
diff --git a/src/parse.y b/src/parse.y
--- a/src/parse.y
+++ b/src/parse.y
@@ -466,7 +466,7 @@
 		  {
 		    global_command = 0;
 		    promptflag = 1;
-		    YYABORT;
+		    YYACCEPT;
 		  }
 		| simple_list parse_error
 		  { ABORT_PARSE; }
@@ -2774,6 +2774,8 @@
 	  if (quit)
 	    break;
 	}
+      else
+	break;
     }
   while (retval == 0);
 
diff --git a/src/toplev.cc b/src/toplev.cc
--- a/src/toplev.cc
+++ b/src/toplev.cc
@@ -165,6 +165,8 @@
 		command_editor::increment_current_command_number ();
 	    }
 	}
+      else
+	break;
     }
   while (retval == 0);
 
diff --git a/test/octave.test/io/fopen-1.m b/test/octave.test/io/fopen-1.m
--- a/test/octave.test/io/fopen-1.m
+++ b/test/octave.test/io/fopen-1.m
@@ -3,7 +3,7 @@
 status = 1;
 
 for i = 1:6
-  arch = deblank (arch_list (i,:))
+  arch = deblank (arch_list (i,:));
   for j = 1:2
     if (j == 1)
       mode_list = ["w"; "r"; "a"];
@@ -13,7 +13,14 @@
     nm = tmpnam ();
     for k = 1:3
       mode = deblank (mode_list (k,:));
-      if ((id = fopen (nm, mode, arch)) < 0)
+      [id, err] = fopen (nm, mode, arch);
+      if (id < 0)
+      	status = 0; break;
+      endif
+      fclose (id);
+      mode = strcat (mode, "b");
+      [id, err] = fopen (nm, mode, arch);
+      if (id < 0)
       	status = 0; break;
       endif
       fclose (id);