Mercurial > octave
diff libinterp/corefcn/symtab.cc @ 24269:f494b87d2a93
rename scope to symbol_scope
* symscope.h, symscope.cc: Rename from scope.h and scope.cc.
(class symbol_scope): Rename from scope. Change all uses.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 16 Nov 2017 19:39:00 -0500 |
| parents | 3b302b2890d7 |
| children | a26a8714db26 |
line wrap: on
line diff
--- a/libinterp/corefcn/symtab.cc Fri Nov 17 16:53:42 2017 +0000 +++ b/libinterp/corefcn/symtab.cc Thu Nov 16 19:39:00 2017 -0500 @@ -46,8 +46,8 @@ #include "pager.h" #include "parse.h" #include "pt-pr-code.h" -#include "scope.h" #include "symrec.h" +#include "symscope.h" #include "symtab.h" #include "unwind-prot.h" #include "utils.h" @@ -443,7 +443,7 @@ else { std::string fcn_scope = name.substr (0, pos); - scope *stored_scope = m_current_scope; + symbol_scope *stored_scope = m_current_scope; m_current_scope = m_top_scope; octave_value parent = find_function (name.substr (0, pos), octave_value_list (), false); @@ -482,7 +482,7 @@ if (pos != std::string::npos) { std::string fcn_scope = full_name.substr (0, pos); - scope *stored_scope = m_current_scope; + symbol_scope *stored_scope = m_current_scope; m_current_scope = m_top_scope; octave_value parent = find_function (full_name.substr (0, pos), octave_value_list (), false); @@ -658,7 +658,7 @@ { octave::symbol_table& symtab = interp.get_symbol_table (); - octave::scope *scope = symtab.current_scope (); + octave::symbol_scope *scope = symtab.current_scope (); std::string nm = scope ? scope->name () : "<unknown>";