Mercurial > octave

changeset 25193:6f1fde568e46 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make .oct and .mex files in +package dirs work again (bug #51960) * oct-parse.in.yy (load_fcn_from_file): Stash package name in oct and mex function objects.
author John W. Eaton <jwe@octave.org>
date Tue, 10 Apr 2018 09:54:07 -0400
parents 8cc3213f788f
children e3034c1956a3 2f0c0c0652d5
files libinterp/parse-tree/oct-parse.in.yy
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/parse-tree/oct-parse.in.yy	Mon Apr 09 21:52:43 2018 -0700
+++ b/libinterp/parse-tree/oct-parse.in.yy	Tue Apr 10 09:54:07 2018 -0400
@@ -4753,6 +4753,8 @@
         octave_function *tmpfcn
           = dyn_loader.load_oct (nm, file, relative_lookup);
 
+        tmpfcn->stash_package_name (package_name);
+
         retval = octave_value (tmpfcn);
       }
     else if (len > 4 && file.substr (len-4, len-1) == ".mex")
@@ -4781,6 +4783,7 @@
         if (tmpfcn)
           {
             tmpfcn->document (doc_string);
+            tmpfcn->stash_package_name (package_name);
 
             retval = octave_value (tmpfcn);
           }