changeset 2432:874f758eade5

[project @ 1996-10-26 16:37:36 by jwe]
author jwe
date Sat, 26 Oct 1996 16:37:37 +0000
parents 8426659cd60e
children 3952436ca2c2
files src/ChangeLog src/defun.h src/file-io.cc src/fn-cache.h
diffstat 4 files changed, 16 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+Sat Oct 26 10:40:05 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* defun.h (DEFVAR_INT): Set eternal flag with (svc_fcn != 0)
+	instead of (sv_fcn ? 1 : 0)
+
 Fri Oct 25 01:10:51 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* ov-ch-mat.h (octave_char_matrix::any): Return 0.0 instead of false.
--- a/src/defun.h
+++ b/src/defun.h
@@ -78,7 +78,7 @@
   do \
     { \
       builtin_variable sname (name, octave_value (defn), inst_as_fcn, \
-			      protect, (sv_fcn ? 1 : 0), sv_fcn, doc); \
+			      protect, (sv_fcn != 0), sv_fcn, doc); \
       install_builtin_variable (sname); \
     } \
   while (0)
--- a/src/file-io.cc
+++ b/src/file-io.cc
@@ -343,9 +343,7 @@
   if (nargin == 1)
     {
       if (args(0).is_string () && args(0).string_value () == "all")
-	{
-	  return octave_stream_list::open_file_numbers ();
-	}
+	retval(0) = octave_stream_list::open_file_numbers ();
       else
 	{
 	  string_vector tmp = octave_stream_list::get_info (args(0));
@@ -356,9 +354,9 @@
 	      retval(1) = tmp(1);
 	      retval(0) = tmp(0);
 	    }
+	}
 
-	  return retval;
-	}
+      return retval;
     }
 
   if (nargin > 0 && nargin < 4)
--- a/src/fn-cache.h
+++ b/src/fn-cache.h
@@ -39,7 +39,11 @@
 {
 public:
 
-  file_name_cache_elt (const string& dir_name = string ())
+  file_name_cache_elt (void)
+    : timestamp (0), fcn_file_names (), fcn_file_names_no_suffix ()
+      { update (string ()); }
+
+  file_name_cache_elt (const string& dir_name)
     : timestamp (0), fcn_file_names (), fcn_file_names_no_suffix ()
       { update (dir_name); }
 
@@ -85,13 +89,13 @@
 
   octave_fcn_file_name_cache (void)
     : cache (file_name_cache_elt ())
-      { update (); }
+      { update (string ()); }
 
 public:
 
   ~octave_fcn_file_name_cache (void) { }
 
-  bool update (const string& path = string ());
+  bool update (const string& path);
 
   static string_vector list (bool no_suffix = false)
     { return list (string (), no_suffix); }