changeset 6346:f3c5b02c66bf

[project @ 2007-02-23 00:01:04 by jwe]
author jwe
date Fri, 23 Feb 2007 00:01:05 +0000
parents 9e058e5fa8a7
children e40a46a100b6
files src/ChangeLog src/variables.cc
diffstat 2 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Thu Feb 22 22:22:54 2007 +0000
+++ b/src/ChangeLog	Fri Feb 23 00:01:05 2007 +0000
@@ -1,5 +1,9 @@
 2007-02-22  John W. Eaton  <jwe@octave.org>
 
+	* variables.cc (symbol_out_of_date): If checking nested function,
+	look for file using parent function name.  Delete unused
+	variable NAMES.
+
 	* src/oct-stream.cc (octave_stream::do_gets): If no limit or not
 	at limit, read ahead one character at end of line for compatibility.
 	(octave_stream::gets, octave_stream::getl): Set max_len to -1 if
--- a/src/variables.cc	Thu Feb 22 22:22:54 2007 +0000
+++ b/src/variables.cc	Fri Feb 23 00:01:05 2007 +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;