Mercurial > octave
diff src/octave.cc @ 14074:f90c3facfac3 stable
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 | 834f904a3dcb |
children | 72c96de7a403 |
line wrap: on
line diff
--- a/src/octave.cc Mon Dec 19 22:01:10 2011 -0500 +++ b/src/octave.cc Mon Dec 19 23:14:41 2011 -0500 @@ -901,7 +901,11 @@ execute_command_line_file (argv[last_arg_idx]); if (! persist) - clean_up_and_exit (error_state ? 1 : 0); + { + quitting_gracefully = true; + + clean_up_and_exit (error_state ? 1 : 0); + } } // Avoid counting commands executed from startup files. @@ -940,6 +944,8 @@ if (retval == 1 && ! error_state) retval = 0; + quitting_gracefully = true; + clean_up_and_exit (retval); return 0;