Mercurial > octave-nkf

changeset 4664:19bcdc6a9bb8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2003-11-25 06:22:02 by jwe]
author jwe
date Tue, 25 Nov 2003 06:25:00 +0000
parents bf7272f8ba8c
children dece11da64ed
files liboctave/CmplxQR.cc src/ChangeLog src/DLD-FUNCTIONS/rand.cc src/ov-complex.cc src/ov-cs-list.cc src/ov-cs-list.h
diffstat 6 files changed, 24 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/CmplxQR.cc	Tue Nov 25 06:07:28 2003 +0000
+++ b/liboctave/CmplxQR.cc	Tue Nov 25 06:25:00 2003 +0000
@@ -127,7 +127,7 @@
 	  Complex *pwork2 = work.fortran_vec ();
 
 	  F77_XFCN (zungqr, ZUNGQR, (m, n2, min_mn, tmp_data, m, ptau,
-				     pwork, lwork, info));
+				     pwork2, lwork, info));
 
 	  if (f77_exception_encountered)
 	    (*current_liboctave_error_handler)
--- a/src/ChangeLog	Tue Nov 25 06:07:28 2003 +0000
+++ b/src/ChangeLog	Tue Nov 25 06:25:00 2003 +0000
@@ -1,12 +1,18 @@
-2003-11-25  John W. Eaton  <jwe@bevo.che.wisc.edu>
-
 2003-11-24  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* version.h (OCTAVE_VERSION): Now 2.1.52.
 	(OCTAVE_API_VERSION): Now api-v3.
 
+	* DLD-FUNCTIONS/rand.cc (do_rand): Pass function name from arg
+	list in calls to error.
+
+	* ov-cs-list.cc, ov-cs-list.h (octave_cs_list::octave_cs_list):
+	Explicitly initialize base class in constructors.
+
 	* ov.h (octave_value::all_strings): Pass second arg to rep function.
 
+	* ov.h (octave_value::string_value): Pass arg to rep function.
+
 	* DLD-FUNCTIONS/dasrt.cc (dasrt_user_f): Delete unused arg names.
 	* ls-hdf5.h (hdf5_streambase::hdf5_streambase): Likewise.
 	* ls-hdf5.cc (read_hdf5_data): Likewise.
@@ -17,6 +23,7 @@
 	* ov-base-mat.h (octave_base_matrix::subsref): Likewise.
 	* ov-mapper.h (octave_mapper::subsref): Likewise.
 	* ov-builtin.h (octave_builtin::subsref): Likewise.
+	* ov-complex.cc (octave_complex::complex_array_value): Likewise.
 	* ov-cell.h (octave_cell::subsref): Likewise.
 	* ov-base-scalar.h (octave_base_scalar::subsref): Likewise.
 	* ov-struct.h (octave_struct::subsref): Likewise.
--- a/src/DLD-FUNCTIONS/rand.cc	Tue Nov 25 06:07:28 2003 +0000
+++ b/src/DLD-FUNCTIONS/rand.cc	Tue Nov 25 06:25:00 2003 +0000
@@ -85,7 +85,7 @@
 		octave_rand::normal_distribution ();
 	      }
 	    else
-	      error ("rand: unrecognized string argument");
+	      error ("%s: unrecognized string argument", fcn);
 	  }
 	else if (tmp.is_scalar_type ())
 	  {
@@ -93,7 +93,7 @@
 
 	    if (xisnan (dval))
 	      {
-		error ("rand: NaN is invalid a matrix dimension");
+		error ("%s: NaN is invalid a matrix dimension", fcn);
 	      }
 	    else
 	      {
@@ -121,7 +121,7 @@
 		int lim = NINT (r.limit ());
 
 		if (base < 0 || lim < 0)
-		  error ("rand: all dimensions must be nonnegative");
+		  error ("%s: all dimensions must be nonnegative", fcn);
 		else
 		  {
 		    for (int i = 0; i < n; i++)
@@ -134,7 +134,8 @@
 		  }
 	      }
 	    else
-	      error ("rand: expecting all elements of range to be integers");
+	      error ("%s: expecting all elements of range to be integers",
+		     fcn);
 	  }
 	else if (tmp.is_matrix_type ())
 	  {
@@ -152,7 +153,7 @@
 
 		    if (elt < 0)
 		      {
-			error ("rand: all dimensions must be nonnegative");
+			error ("%s: all dimensions must be nonnegative", fcn);
 			goto done;
 		      }
 
@@ -162,7 +163,7 @@
 		goto gen_matrix;
 	      }
 	    else
-	      error ("rand: expecting integer vector");
+	      error ("%s: expecting integer vector", fcn);
 	  }
 	else
 	  {
@@ -186,7 +187,7 @@
 		  octave_rand::seed (d);
 	      }
 	    else
-	      error ("rand: unrecognized string argument");
+	      error ("%s: unrecognized string argument", fcn);
 	  }
 	else
 	  {
@@ -198,7 +199,7 @@
 
 		if (error_state)
 		  {
-		    error ("rand: expecting integer arguments");
+		    error ("%s: expecting integer arguments", fcn);
 		    goto done;
 		  }
 	      }
--- a/src/ov-complex.cc	Tue Nov 25 06:07:28 2003 +0000
+++ b/src/ov-complex.cc	Tue Nov 25 06:25:00 2003 +0000
@@ -141,7 +141,7 @@
 }
 
 ComplexNDArray
-octave_complex::complex_array_value (bool force_conversion) const
+octave_complex::complex_array_value (bool /* force_conversion */) const
 {
   return ComplexNDArray (dim_vector (1, 1), scalar);
 }
--- a/src/ov-cs-list.cc	Tue Nov 25 06:07:28 2003 +0000
+++ b/src/ov-cs-list.cc	Tue Nov 25 06:25:00 2003 +0000
@@ -43,6 +43,7 @@
 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_cs_list, "cs-list", "cs-list");
 
 octave_cs_list::octave_cs_list (const Cell& c)
+  : octave_base_value (), lst ()
 {
   int n = c.length ();
 
--- a/src/ov-cs-list.h	Tue Nov 25 06:07:28 2003 +0000
+++ b/src/ov-cs-list.h	Tue Nov 25 06:25:00 2003 +0000
@@ -52,15 +52,15 @@
 public:
 
   octave_cs_list (void)
-    : lst () { }
+    : octave_base_value (), lst () { }
 
   octave_cs_list (const octave_value_list& l)
-    : lst (l) { }
+    : octave_base_value (), lst (l) { }
 
   octave_cs_list (const Cell& c);
 
   octave_cs_list (const octave_cs_list& l)
-    : lst (l) { }
+    : octave_base_value (), lst (l) { }
 
   ~octave_cs_list (void) { }