Re: small __uiobject_draw_axes__ bug fix

[John W. Eaton]

On 22-Feb-2007, John W. Eaton wrote:

| On 22-Feb-2007, Daniel J Sebald wrote:
| 
| | Oh this is strange.  There is more to this.  (And this seems to have just 
started happening within the last day.)
| | 
| | I updated CVS and cleared out all the local scripts that you updated.  
Things are fine; can keep rerunning the same plot command.
| | 
| | However, as soon as I make a local copy:
| | 
| | cp -a /usr/local/share/octave/2.9.9+/m/plot/__uiobject_draw_axes__.m .
| | 
| | into a directory that is part of the Octave search path (no alterations to 
file), then I get the error messages.
| 
| OK, I think this is related to some recent changes I made in the way
| Octave checks to see whether functions that are loaded in memory are
| out of date compared to the corresponding .m files.  I'll take a look
| at it.

I checked in the following patch.  Can you see if it solves the
problem for you?

Thanks,

jwe

src/ChangeLog:

2007-02-22  John W. Eaton  <address@hidden>

        * variables.cc (symbol_out_of_date): If checking nested function,
        look for file using parent function name.  Delete unused
        variable NAMES.


Index: src/variables.cc
===================================================================
RCS file: /cvs/octave/src/variables.cc,v
retrieving revision 1.298
diff -u -u -r1.298 variables.cc
--- src/variables.cc    17 Feb 2007 14:49:34 -0000      1.298
+++ src/variables.cc    22 Feb 2007 23:57:05 -0000
@@ -1010,13 +1010,12 @@
                {
                  time_t tp = fcn->time_parsed ();
 
-                 std::string nm = fcn->name ();
+                 std::string nm = fcn->is_nested_function ()
+                   ? fcn->parent_fcn_name () : fcn->name ();
 
                  // FIXME -- the following code is repeated
                  // in load_fcn_from_file in parse.y.
 
-                 string_vector names (2);
-
                  int nm_len = nm.length ();
 
                  std::string file;