octave: src/data.cc comparison

[project @ 2004-02-04 04:32:48 by jwe]

comparison

equal deleted inserted replaced

-:176fcf62c464
+:b484cdca27be
 static octave_value
 make_diag (const octave_value& a, const octave_value& b)
 {
 octave_value retval;
-int k = b.nint_value ();
+int k = b.int_value ();
 if (error_state)
 {
 error ("diag: invalid second argument");
 return retval;
 	  retval(0) = m;
 	}
 }
 else if (nargin == 2 && nargout < 2)
 {
-int nd = args(1).nint_value ();
+int nd = args(1).int_value (true);
 if (error_state)
 	error ("size: expecting scalar as second argument");
 else
 	{
 {
 	dims.resize (nargin);
 	for (int i = 0; i < nargin; i++)
 	  {
-	    dims(i) = args(i).is_empty () ? 0 : args(i).nint_value ();
+	    dims(i) = args(i).is_empty () ? 0 : args(i).int_value ();
 	    if (error_state)
 	      {
-		error ("%s: expecting scalar arguments", fcn);
+		error ("%s: expecting scalar integer arguments", fcn);
 		break;
 	      }
 	  }
 }
 break;
 print_usage ("linspace");
 return retval;
 }
 if (nargin == 3)
-npoints = args(2).nint_value ();
+npoints = args(2).int_value ();
 if (! error_state)
 {
 octave_value arg_1 = args(0);
 octave_value arg_2 = args(1);
 	      if (! error_state)
 		retval = rv;
 	    }
 	}
 }
+else
+error ("linspace: expecting third argument to be an integer");
 return retval;
 }
 DEFUN (reshape, args, ,

Mercurial > octave