jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Lib/octave: fix getting/setting global variables for Octave >= 4.4

Browse source
This commit is contained in:
Karl Wette 2018-05-12 02:36:13 +10:00
commit 6586616e23
1 changed files with 17 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Lib/octave/octrun.swg
View file

@ -1504,14 +1504,30 @@ SWIGRUNTIMEINLINE void SWIG_Octave_SetConstant(octave_swig_type *module_ns, cons
} }
SWIGRUNTIMEINLINE octave_value SWIG_Octave_GetGlobalValue(std::string name) { SWIGRUNTIMEINLINE octave_value SWIG_Octave_GetGlobalValue(std::string name) {
#if SWIG_OCTAVE_PREREQ(4,4,0)
octave::symbol_table& symtab = octave::interpreter::the_interpreter()->get_symbol_table();
return symtab.global_varval(name);
#else
return get_global_value(name, true); return get_global_value(name, true);
#endif
} }
SWIGRUNTIME void SWIG_Octave_SetGlobalValue(std::string name, const octave_value& value) { SWIGRUNTIME void SWIG_Octave_SetGlobalValue(std::string name, const octave_value& value) {
#if SWIG_OCTAVE_PREREQ(4,4,0)
octave::symbol_table& symtab = octave::interpreter::the_interpreter()->get_symbol_table();
symtab.global_assign(name, value);
#else
set_global_value(name, value); set_global_value(name, value);
#endif
} }
SWIGRUNTIME void SWIG_Octave_LinkGlobalValue(std::string name) { SWIGRUNTIME void SWIG_Octave_LinkGlobalValue(std::string name) {
#if SWIG_OCTAVE_PREREQ(4,4,0)
octave::symbol_table& symtab = octave::interpreter::the_interpreter()->get_symbol_table();
octave::symbol_scope symscope = octave::interpreter::the_interpreter()->get_current_scope();
symscope.assign(name, symtab.global_varval(name));
symscope.mark_global(name);
#else
#if !SWIG_OCTAVE_PREREQ(3,2,0) #if !SWIG_OCTAVE_PREREQ(3,2,0)
link_to_global_variable(curr_sym_tab->lookup(name, true)); link_to_global_variable(curr_sym_tab->lookup(name, true));
#else #else
@ -1520,6 +1536,7 @@ SWIGRUNTIME void SWIG_Octave_LinkGlobalValue(std::string name) {
#endif #endif
symbol_table::mark_global(name); symbol_table::mark_global(name);
#endif #endif
#endif
} }
SWIGRUNTIME swig_module_info *SWIG_Octave_GetModule(void *clientdata) { SWIGRUNTIME swig_module_info *SWIG_Octave_GetModule(void *clientdata) {