Mercurial > octave-nkf

changeset 4845:a9cfb8b37759

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2004-04-02 20:12:24 by jwe]
author jwe
date Fri, 02 Apr 2004 20:12:24 +0000
parents 9f7ef92b50b0
children 7a3eb3cc292b
files doc/interpreter/matrix.txi liboctave/ChangeLog liboctave/mx-inlines.cc src/ChangeLog src/data.cc src/load-save.cc
diffstat 6 files changed, 33 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/doc/interpreter/matrix.txi	Fri Apr 02 17:26:54 2004 +0000
+++ b/doc/interpreter/matrix.txi	Fri Apr 02 20:12:24 2004 +0000
@@ -75,6 +75,16 @@
 
 @DOCSTRING(rot90)
 
+@DOCSTRING(cat)
+
+@DOCSTRING(horzcat)
+
+@DOCSTRING(vertcat)
+
+@DOCSTRING(permute)
+
+@DOCSTRING(ipermute)
+
 @DOCSTRING(reshape)
 
 @DOCSTRING(shift)
--- a/liboctave/ChangeLog	Fri Apr 02 17:26:54 2004 +0000
+++ b/liboctave/ChangeLog	Fri Apr 02 20:12:24 2004 +0000
@@ -1,3 +1,7 @@
+2004-04-02  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* mx-inlines.cc (MX_ND_CUMULATIVE_OP): Fix off-by-one error.
+
 2004-04-02  David Bateman  <dbateman@free.fr>
 
 	* lo-specfun.cc (besselj, bessely, besseli, besselk, besselh1, 
--- a/liboctave/mx-inlines.cc	Fri Apr 02 17:26:54 2004 +0000
+++ b/liboctave/mx-inlines.cc	Fri Apr 02 20:12:24 2004 +0000
@@ -503,10 +503,9 @@
   int empty = true; \
  \
   /* If dim is larger then number of dims, return array as is */ \
-  if (dim > dv.length ()) \
+  if (dim >= dv.length ()) \
     { \
       retval = RET_TYPE (*this); \
- \
       return retval; \
     } \
  \
@@ -523,7 +522,6 @@
   if (empty) \
     { \
       retval.resize (dv); \
- \
       return retval; \
     } \
  \
@@ -559,7 +557,6 @@
   if (squeezed) \
     {  \
       retval.resize (dv); \
- \
       return retval; \
     } \
  \
--- a/src/ChangeLog	Fri Apr 02 17:26:54 2004 +0000
+++ b/src/ChangeLog	Fri Apr 02 20:12:24 2004 +0000
@@ -1,3 +1,9 @@
+2004-04-02  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* load-save.cc (get_file_format): Error if file does not exist.
+	(Fload): Also complain here if specific file type is specified and
+	file does not exist.
+
 2004-04-02  Quentin Spencer  <qspencer@ieee.org>
 
 	* parse.y: Use persistent instead of static in warnings messages.
--- a/src/data.cc	Fri Apr 02 17:26:54 2004 +0000
+++ b/src/data.cc	Fri Apr 02 20:12:24 2004 +0000
@@ -1010,8 +1010,6 @@
 \n\
      1 1 0 0\n\
      1 1 0 0\n\
-     1 1 0 0\n\
-     1 1 0 0\n\
 @end group\n\
 @end example\n\
 \n\
@@ -1798,11 +1796,10 @@
 @ifinfo\n\
   @code{sqrt (-1)}.\n\
 @end ifinfo\n\
-The @code{I} and @code{J} forms are true constants, and cannot be\n\
-modified.  The @code{i} and @code{j} forms are like ordinary variables,\n\
-and may be used for other purposes.  However, unlike other variables,\n\
-they once again assume their special predefined values if they are\n\
-cleared @xref{Status of Variables}.\n\
+These built-in variables behave like functions so you can use the names\n\
+for other purposes.  If you use them as variables and assign values to\n\
+them and then clear them, they once again assume their special predefined\n\
+values @xref{Status of Variables}.\n\
 @end defvr"
 
 #define INFINITY_DOC_STRING "-*- texinfo -*-\n\
--- a/src/load-save.cc	Fri Apr 02 17:26:54 2004 +0000
+++ b/src/load-save.cc	Fri Apr 02 20:12:24 2004 +0000
@@ -311,7 +311,10 @@
   if (file_exist)
     file_exist.close ();
   else
-    return LS_UNKNOWN;
+    {
+      error ("load: nonexistent file `%s'", fname.c_str ());
+      return LS_UNKNOWN;
+    }
 
 #ifdef HAVE_HDF5
   // check this before we open the file
@@ -749,6 +752,8 @@
 		error ("load: couldn't open input file `%s'",
 		       orig_fname.c_str ());
 	    }
+	  else
+	    error ("load: nonexistent file `%s'", orig_fname.c_str ());
 	}
       else
 #endif /* HAVE_HDF5 */
@@ -798,6 +803,8 @@
 	    error ("load: couldn't open input file `%s'",
 		   orig_fname.c_str ());
 	}
+      else
+	error ("load: nonexistent file: `%s'", orig_fname.c_str ());
     }
 
   return retval;