Mercurial > octave-nkf

diff src/variables.cc @ 6351:9b525feab43b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2007-02-23 19:54:18 by jwe]
author jwe
date Fri, 23 Feb 2007 19:54:19 +0000
parents f3c5b02c66bf
children 59a4304b7cc5
line wrap: on
line diff
--- a/src/variables.cc	Fri Feb 23 14:29:19 2007 +0000
+++ b/src/variables.cc	Fri Feb 23 19:54:19 2007 +0000
@@ -1149,12 +1149,13 @@
   if (! parent.empty ())
     sr = fbi_sym_tab->lookup (parent + ":" + nm);
 
-  if (! sr || ! sr->is_function () && curr_parent_function)
-    sr = fbi_sym_tab->lookup (curr_parent_function->name () + ":" + nm);
-
   if (! sr || ! sr->is_function ())
     {
-      sr = fbi_sym_tab->lookup (nm, true);
+      if (curr_parent_function)
+	sr = fbi_sym_tab->lookup (curr_parent_function->name () + ":" + nm);
+
+      if (! sr || ! sr->is_function ())
+	sr = fbi_sym_tab->lookup (nm, true);
 
       if (sr && ! sr->is_function ())
 	load_fcn_from_file (sr, false);