octave-nkf: src/variables.cc comparison

[project @ 2004-09-16 19:04:20 by jwe]

comparison

equal deleted inserted replaced

-:a0e7231a58eb
+:efa1ba94dab5
 	    {
 	      if (tmp->time_checked () < Vlast_prompt_time)
 		{
 		  time_t tp = tmp->time_parsed ();
-		  std::string fname;
+		  std::string nm = tmp->name ();
-		  if (tmp->is_dld_function ())
+		  string_vector names (2);
-		    fname = ff;
+		  names[0] = nm + ".oct";
+		  names[1] = nm + ".m";
+		  std::string file = octave_env::make_absolute
+		    (Vload_path_dir_path.find_first_of (names),
+		     octave_env::getcwd ());
+		  if (file != ff)
+		    retval = true;
 		  else
-		    fname = fcn_file_in_path (ff);
+		    {
+		      tmp->mark_fcn_file_up_to_date (octave_time ());
-		  tmp->mark_fcn_file_up_to_date (octave_time ());
+		      file_stat fs (ff);
-		  file_stat fs (fname);
+		      if (fs && fs.is_newer (tp))
-		  if (fs && fs.is_newer (tp))
+			retval = true;
-		    retval = true;
+		    }
 		}
 	    }
 	}
 }

Mercurial > octave-nkf