Mercurial > octave
diff libinterp/interpfcn/toplev.cc @ 16288:fe3b9a51e625
rename curr_lexer, curr_parser, CURR_LEXER
* input.cc, toplev.cc, oct-parse.in.yy, parse.h: Drop curr_ prefix
from curr_lexer, curr_parser, and CURR_PARSER variables.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 12 Mar 2013 00:24:54 -0400 |
| parents | 04a7953496a7 |
| children | 6ce905b89cee |
line wrap: on
line diff
--- a/libinterp/interpfcn/toplev.cc Tue Mar 12 00:18:28 2013 -0400 +++ b/libinterp/interpfcn/toplev.cc Tue Mar 12 00:24:54 2013 -0400 @@ -560,9 +560,9 @@ unwind_protect frame; // octave_parser constructor sets this for us. - frame.protect_var (CURR_LEXER); + frame.protect_var (LEXER); - octave_parser curr_parser; + octave_parser parser; int retval = 0; do @@ -573,18 +573,18 @@ reset_error_handler (); - curr_parser.reset (); + parser.reset (); if (symbol_table::at_top_level ()) tree_evaluator::reset_debug_state (); - retval = curr_parser.run (); + retval = parser.run (); if (retval == 0) { - if (curr_parser.stmt_list) + if (parser.stmt_list) { - curr_parser.stmt_list->accept (*current_evaluator); + parser.stmt_list->accept (*current_evaluator); octave_quit (); @@ -620,7 +620,7 @@ command_editor::increment_current_command_number (); } } - else if (curr_parser.curr_lexer.end_of_input) + else if (parser.lexer.end_of_input) break; } }