Mercurial > hg > octave-nkf

diff src/lex.ll @ 14074:f90c3facfac3 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
don't reset parser when exiting (bug #35120) * src/lex.ll (reset_parser): Don't call yyrestart if quitting_gracefully is true. * src/toplev.cc (octave_main): Set quitting_gracefully to true before calling clean_up_and_exit.
author John W. Eaton <jwe@octave.org>
date Mon, 19 Dec 2011 23:14:41 -0500
parents 2c664266e9d0
children 72c96de7a403
line wrap: on
line diff
--- a/src/lex.ll
+++ b/src/lex.ll
@@ -1141,9 +1141,11 @@
 
   // Only ask for input from stdin if we are expecting interactive
   // input.
-  if ((interactive || forced_interactive)
+
+  if (! quitting_gracefully
+      && (interactive || forced_interactive)
       && ! (reading_fcn_file
-        || reading_classdef_file
+            || reading_classdef_file
             || reading_script_file
             || get_input_from_eval_string
             || input_from_startup_file))