Mercurial > hg > octave-lyh

comparison 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
comparison
equal deleted inserted replaced
14073:5cbc978a27e8 14074:f90c3facfac3
1139 input_line_number = command_editor::current_command_number (); 1139 input_line_number = command_editor::current_command_number ();
1140 } 1140 }
1141 1141
1142 // Only ask for input from stdin if we are expecting interactive 1142 // Only ask for input from stdin if we are expecting interactive
1143 // input. 1143 // input.
1144 if ((interactive || forced_interactive) 1144
1145 if (! quitting_gracefully
1146 && (interactive || forced_interactive)
1145 && ! (reading_fcn_file 1147 && ! (reading_fcn_file
1146 || reading_classdef_file 1148 || reading_classdef_file
1147 || reading_script_file 1149 || reading_script_file
1148 || get_input_from_eval_string 1150 || get_input_from_eval_string
1149 || input_from_startup_file)) 1151 || input_from_startup_file))
1150 yyrestart (stdin); 1152 yyrestart (stdin);
1151 1153