Mercurial > hg > octave-lyh
diff libinterp/interpfcn/input.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 | 8cb65fd72164 |
| children | 0ce49f9fb171 |
line wrap: on
line diff
--- a/libinterp/interpfcn/input.cc +++ b/libinterp/interpfcn/input.cc @@ -123,7 +123,7 @@ void octave_base_reader::do_input_echo (const std::string& input_string) const { - int do_echo = CURR_LEXER->reading_script_file ? + int do_echo = LEXER->reading_script_file ? (Vecho_executing_commands & ECHO_SCRIPTS) : (Vecho_executing_commands & ECHO_CMD_LINE) && ! forced_interactive; @@ -495,17 +495,17 @@ VPS1 = prompt; if (! (interactive || forced_interactive) - || CURR_LEXER->reading_fcn_file - || CURR_LEXER->reading_classdef_file - || CURR_LEXER->reading_script_file - || CURR_LEXER->input_from_eval_string ()) + || LEXER->reading_fcn_file + || LEXER->reading_classdef_file + || LEXER->reading_script_file + || LEXER->input_from_eval_string ()) { frame.protect_var (forced_interactive); forced_interactive = true; } // octave_parser constructor sets this for us. - frame.protect_var (CURR_LEXER); + frame.protect_var (LEXER); octave_parser curr_parser;