# HG changeset patch # User John W. Eaton # Date 1523368447 14400 # Node ID 6f1fde568e46360f76d99566856a97ff8326374b # Parent 8cc3213f788f2a93e9689cddf4c00ba85649a95d 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. diff -r 8cc3213f788f -r 6f1fde568e46 libinterp/parse-tree/oct-parse.in.yy --- 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); }