Mercurial > octave
diff libinterp/parse-tree/lex.ll @ 27443:075602880383
store ref to interpreter in lexical_feedback and symbol_table_context classes
* lex.h (lexical_feedback::m_interpreter): New data member. Store
interpreter reference here instead of in base_lexer class.
(symbol_table_context::m_interpreter): New data member.
* lex.ll: Don't include interpreter-private.h.
(lexical_feedback::symbol_table_context::curr_scope):
Use m_interpreter to access current scope if needed.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 25 Sep 2019 13:44:06 -0400 |
| parents | a2b1ba6c92d5 |
| children | 549273db93e4 |
line wrap: on
line diff
--- a/libinterp/parse-tree/lex.ll Wed Sep 25 13:02:50 2019 -0400 +++ b/libinterp/parse-tree/lex.ll Wed Sep 25 13:44:06 2019 -0400 @@ -109,7 +109,6 @@ #include "error.h" #include "errwarn.h" #include "input.h" -#include "interpreter-private.h" #include "interpreter.h" #include "lex.h" #include "octave.h" @@ -2128,12 +2127,7 @@ lexical_feedback::symbol_table_context::curr_scope (void) const { if (empty ()) - { - symbol_scope scope - = __get_current_scope__ ("lexical_feedback::symbol_table_context::curr_scope"); - - return scope; - } + return m_interpreter.get_current_scope (); else return m_frame_stack.front (); }