-An Octave module can either load its symbols into the global namespace, so that they can be accessed directly without having to type the module name. -Alternatively, an Octave module can be accessed through a local variable, without being loaded globally. -
- --To load an Octave module globally, simply type its name: +To load an Octave module, simply type its name:
@@ -200,43 +195,6 @@ octave:5> cvar.Foo ans = 4
-To access an Octave module through a local variable, without loading it globally, simply assign the module name (e.g. "example") to the desired local variable: -
- --octave:1> example = example; -octave:2> example.gcd(6,9) -ans = 3 -octave:3> example.cvar.Foo -ans = 3 -
-The variable may have the same name as the module, or a shorter one: -
- --octave:1> ex = example; -octave:2> ex.gcd(6,9) -ans = 3 -octave:3> ex.cvar.Foo -ans = 3 -
-It is also possible to rename the global variables namespaces with an assignment, as in: -
- --octave:1> example; -octave:2> cvar.gcd(10,4) -ans = 2 -octave:3> some_vars = cvar; -octave:4> some_vars.Foo -ans = 3 -
Modules can also be loaded from within functions, even before being loaded in the base context.
If the module is also used in the base context, however, it must first be loaded again:
diff --git a/Examples/octave/module_load/runme.m b/Examples/octave/module_load/runme.m
index 16b437ee8..0fda218cd 100644
--- a/Examples/octave/module_load/runme.m
+++ b/Examples/octave/module_load/runme.m
@@ -1,17 +1,7 @@
# file: runme_args.m
-# test module loading with arguments
-clear all
-
-# access module, no global load
-example = example;
-assert(example.cvar.ivar == example.ifunc());
-clear all
-example = example;
-assert(example.cvar.ivar == example.ifunc());
-clear all
-
-# load module globally
+# load module
+clear all;
example;
assert(cvar.ivar == ifunc);
assert(exist("example","var"));
@@ -21,27 +11,8 @@ assert(cvar.ivar == ifunc);
assert(exist("example","var"));
clear all
-# access module in a function, no global load
-function testme
- example = example;
- assert(example.cvar.ivar == example.ifunc());
-endfunction
-testme
-testme
-example = example;
-assert(example.cvar.ivar == example.ifunc());
-clear all
-function testme
- example = example;
- assert(example.cvar.ivar == example.ifunc());
-endfunction
-testme
-testme
-example = example;
-assert(example.cvar.ivar == example.ifunc());
-clear all
-
# load module in a function globally before base context
+clear all;
function testme
example;
assert(cvar.ivar == ifunc);
@@ -66,6 +37,7 @@ assert(exist("example","var"));
clear all
# load module in a function globally after base context
+clear all;
example;
assert(cvar.ivar == ifunc);
assert(exist("example","var"));
@@ -95,17 +67,8 @@ if api_version < 37
exit
endif
-# access module with no cvar, no global load
-example2 = example2;
-assert(example2.ivar == example2.ifunc());
-assert(!isglobal("cvar"))
-clear all
-example2 = example2;
-assert(example2.ivar == example2.ifunc());
-assert(!isglobal("cvar"))
-clear all
-
-# load module with no cvar globally
+# load module with no cvar
+clear all;
example2;
assert(example2.ivar == ifunc);
assert(exist("example2","var"));
diff --git a/Lib/octave/octruntime.swg b/Lib/octave/octruntime.swg
index 16ad3f7c9..66b6e265a 100644
--- a/Lib/octave/octruntime.swg
+++ b/Lib/octave/octruntime.swg
@@ -20,13 +20,74 @@
%insert(initbeforefunc) %{
-static void SWIG_init_user(octave_swig_type* module_ns);
+static bool SWIG_init_user(octave_swig_type* module_ns);
-SWIGINTERN void SWIG_Octave_InstallFunction(octave_function *octloadfcn, std::string name) {
- octave_value_list args;
- args.append(name);
- args.append(octloadfcn->fcn_file_name());
- feval("autoload", args, 0);
+SWIGINTERN bool SWIG_Octave_LoadModule(std::string name) {
+ bool retn;
+ {
+#if OCTAVE_API_VERSION_NUMBER < 38
+ unwind_protect::begin_frame("SWIG_Octave_LoadModule");
+ unwind_protect_int(error_state);
+ unwind_protect_int(warning_state);
+ unwind_protect_bool(discard_error_messages);
+ unwind_protect_bool(discard_warning_messages);
+#else
+ unwind_protect frame;
+ frame.protect_var(error_state);
+ frame.protect_var(warning_state);
+ frame.protect_var(discard_error_messages);
+ frame.protect_var(discard_warning_messages);
+#endif
+ error_state = 0;
+ warning_state = 0;
+ discard_error_messages = true;
+ discard_warning_messages = true;
+ feval(name, octave_value_list(), 0);
+ retn = (error_state == 0);
+#if OCTAVE_API_VERSION_NUMBER < 38
+ unwind_protect::run_frame("SWIG_Octave_LoadModule");
+#endif
+ }
+ if (!retn) {
+ error(SWIG_name_d ": could not load module `%s'", name.c_str());
+ }
+ return retn;
+}
+
+SWIGINTERN bool SWIG_Octave_InstallFunction(octave_function *octloadfcn, std::string name) {
+ bool retn;
+ {
+#if OCTAVE_API_VERSION_NUMBER < 38
+ unwind_protect::begin_frame("SWIG_Octave_InstallFunction");
+ unwind_protect_int(error_state);
+ unwind_protect_int(warning_state);
+ unwind_protect_bool(discard_error_messages);
+ unwind_protect_bool(discard_warning_messages);
+#else
+ unwind_protect frame;
+ frame.protect_var(error_state);
+ frame.protect_var(warning_state);
+ frame.protect_var(discard_error_messages);
+ frame.protect_var(discard_warning_messages);
+#endif
+ error_state = 0;
+ warning_state = 0;
+ discard_error_messages = true;
+ discard_warning_messages = true;
+ octave_value_list args;
+ args.append(name);
+ args.append(octloadfcn->fcn_file_name());
+ error_state = 0;
+ feval("autoload", args, 0);
+ retn = (error_state == 0);
+#if OCTAVE_API_VERSION_NUMBER < 38
+ unwind_protect::run_frame("SWIG_Octave_InstallFunction");
+#endif
+ }
+ if (!retn) {
+ error(SWIG_name_d ": could not load function `%s'", name.c_str());
+ }
+ return retn;
}
static const char *const subclass_usage = "-*- texinfo -*- \n\
@@ -44,7 +105,7 @@ DEFUN_DLD( subclass, args, nargout, subclass_usage ) {
octave_swig_ref *osr = static_cast < octave_swig_ref *>(args(j).internal_rep());
octave_swig_type *ost = osr->get_ptr();
if (!ost->is_owned()) {
- error("cannot subclass object not constructed on octave side");
+ error("subclass: cannot subclass object not constructed on octave side");
return octave_value_list();
}
top->merge(*ost);
@@ -52,13 +113,13 @@ DEFUN_DLD( subclass, args, nargout, subclass_usage ) {
top->assign(args(j).fcn_handle_value()->fcn_name(), args(j));
} else if (args(j).is_string()) {
if (j + 1 >= args.length()) {
- error("member assignments must be of string,value form");
+ error("subclass: member assignments must be of string,value form");
return octave_value_list();
}
top->assign(args(j).string_value(), args(j + 1));
++j;
} else {
- error("invalid arguments to subclass()");
+ error("subclass: invalid arguments to subclass()");
return octave_value_list();
}
}
@@ -72,12 +133,12 @@ Return the underlying C/C++ type name of a SWIG-wrapped object.\n\
DEFUN_DLD( swig_type, args, nargout, swig_type_usage ) {
if (args.length() != 1) {
- error("swig_type() must be called with only a single object");
+ error("swig_type: must be called with only a single object");
return octave_value_list();
}
octave_swig_type *ost = Swig::swig_value_deref(args(0));
if (!ost) {
- error("object is not a swig_ref");
+ error("swig_type: object is not a swig_ref");
return octave_value_list();
}
return octave_value(ost->swig_type_name());
@@ -91,7 +152,7 @@ otherwise return `