Mercurial > octave

changeset 214:1468a5e6a466

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 1993-11-13 04:04:32 by jwe]
author jwe
date Sat, 13 Nov 1993 04:07:07 +0000
parents 83f77b41ff2f
children cf3f13026ff6
files src/g-builtins.cc src/npsol.cc src/pt-const.cc src/t-builtins.cc src/tc-assign.cc
diffstat 5 files changed, 59 insertions(+), 52 deletions(-) [+]
line wrap: on
line diff
--- a/src/g-builtins.cc	Sat Nov 13 03:59:19 1993 +0000
+++ b/src/g-builtins.cc	Sat Nov 13 04:07:07 1993 +0000
@@ -1675,8 +1675,10 @@
 	      retval[0] = curr_function->va_arg ();
 	    }
 	  else
-	    error ("va_arg only valid within function taking\
- variable number of arguments");
+	    {
+	      error ("va_arg only valid within function taking variable");
+	      error ("number of arguments");
+	    }
 	}
       else
 	error ("va_arg only valid within function body");
@@ -1698,8 +1700,10 @@
 	  if (curr_function->takes_varargs ())
 	    curr_function->va_start ();
 	  else
-	    error ("va_start only valid within function taking\
- variable number of arguments");
+	    {
+	      error ("va_start only valid within function taking variable");
+	      error ("number of arguments");
+	    }
 	}
       else
 	error ("va_start only valid within function body");
--- a/src/npsol.cc	Sat Nov 13 03:59:19 1993 +0000
+++ b/src/npsol.cc	Sat Nov 13 04:07:07 1993 +0000
@@ -270,8 +270,8 @@
       int ub_len = ub.capacity ();
       if (lb_len != ub_len || lb_len != x.capacity ())
 	{
-	  error ("npsol: lower and upper bounds and decision variable\n\
-       vector must all have the same number of elements");
+	  error ("npsol: lower and upper bounds and decision variable vector");
+	  error ("must all have the same number of elements");
 	  return retval;
 	}
 
--- a/src/pt-const.cc	Sat Nov 13 03:59:19 1993 +0000
+++ b/src/pt-const.cc	Sat Nov 13 04:07:07 1993 +0000
@@ -757,8 +757,8 @@
       {
 	if (! force_str_conv && ! user_pref.implicit_str_to_num_ok)
 	  {
-	    error ("failed to convert `%s' to a numeric type -- default\
- conversion turned off", string);
+	    error ("failed to convert `%s' to a numeric type --", string);
+	    error ("default conversion turned off");
 // Abort!
 	    jump_to_top_level ();
 	  }
--- a/src/t-builtins.cc	Sat Nov 13 03:59:19 1993 +0000
+++ b/src/t-builtins.cc	Sat Nov 13 04:07:07 1993 +0000
@@ -639,8 +639,8 @@
       && ((gsr != (symbol_record *) NULL && gsr->is_variable ())
 	  || lsr != (symbol_record *) NULL))
     {
-      warning ("load: variable name `%s' exists.  Use `load -force'\
- to overwrite", nm);
+      warning ("load: variable name `%s' exists.", nm);
+      warning ("Use `load -force' to overwrite");
       return -1;
     }
 
@@ -656,8 +656,8 @@
 	{
 	  if (lsr != (symbol_record *) NULL)
 	    {
-	      warning ("load: replacing local symbol `%s' with global\
- value from file", nm);
+	      warning ("load: replacing local symbol `%s' with", nm);
+	      warning ("global value from file");
 	      curr_sym_tab->clear (nm);
 	    }
 	  sr = global_sym_tab->lookup (nm, 1, 0);
@@ -741,8 +741,10 @@
       if (extract_keyword (stream, "name", nm) == 0 || nm == (char *) NULL)
 	{
 	  if (count == 0)
-	    error ("load: no name keywords found in file.\
-  Are you sure this is an octave data file?");
+	    {
+	      error ("load: no name keywords found in file `%s'", *argv);
+	      error ("Are you sure this is an octave data file?");
+	    }
 	  break;
 	}
 
--- a/src/tc-assign.cc	Sat Nov 13 03:59:19 1993 +0000
+++ b/src/tc-assign.cc	Sat Nov 13 04:07:07 1993 +0000
@@ -293,8 +293,8 @@
 
 	if (ii.capacity () != rhs_nr * rhs_nc)
 	  {
-	    error ("A(matrix) = X: X and matrix must have the same\
- number of elements"); 
+	    error ("A(matrix) = X: X and matrix must have the same number");
+	    error ("of elements"); 
 	    return;
 	  }
 	fortran_style_matrix_assignment (rhs, ii);
@@ -813,8 +813,8 @@
 
 	if (! indexed_assign_conforms (1, jv.capacity (), rhs_nr, rhs_nc))
 	  {
-	    error ("A(int,matrix) = X: X must be a row vector with the\
- same number of elements as matrix"); 
+	    error ("A(int,matrix) = X: X must be a row vector with the same");
+	    error ("number of elements as matrix"); 
 	    return;
 	  }
 	maybe_resize (i, jv.max ());
@@ -832,8 +832,8 @@
 	Range rj = tmp_j.range_value ();
 	if (! indexed_assign_conforms (1, rj.nelem (), rhs_nr, rhs_nc))
 	  {
-	    error ("A(int,range) = X: X must be a row vector with the\
- same number of elements as range"); 
+	    error ("A(int,range) = X: X must be a row vector with the same");
+	    error ("number of elements as range"); 
 	    return;
 	  }
 
@@ -894,8 +894,8 @@
 	  }
 	else
 	  {
-	    error ("A(int,:) = X: X must be a row vector with the\
- same number of columns as A"); 
+	    error ("A(int,:) = X: X must be a row vector with the same");
+	    error ("number of columns as A"); 
 	    return;
 	  }
 
@@ -929,8 +929,8 @@
 	  return;
 	if (! indexed_assign_conforms (iv.capacity (), 1, rhs_nr, rhs_nc))
 	  {
-	    error ("A(matrix,int) = X: X must be a column vector with\
- the same number of elements as matrix");  
+	    error ("A(matrix,int) = X: X must be a column vector with the");
+	    error ("same number of elements as matrix");  
 	    return;
 	  }
 	maybe_resize (iv.max (), j);
@@ -952,9 +952,9 @@
 	if (! indexed_assign_conforms (iv.capacity (), jv.capacity (),
 				       rhs_nr, rhs_nc))
 	  {
-	    error ("A(r_matrix,c_matrix) = X: the number of rows in X\
- must match the number of elements in r_matrix and the number of\
- columns in X must match the number of elements in c_matrix");  
+	    error ("A(r_mat,c_mat) = X: the number of rows in X must match");
+	    error ("the number of elements in r_mat and the number of");
+	    error ("columns in X must match the number of elements in c_mat");
 	    return;
 	  }
 	maybe_resize (iv.max (), jv.max ());
@@ -973,9 +973,9 @@
 	if (! indexed_assign_conforms (iv.capacity (), rj.nelem (),
 				       rhs_nr, rhs_nc))
 	  {
-	    error ("A(matrix,range) = X: the number of rows in X must\
- match the number of elements in matrix and the number of columns in X\
- must match the number of elements in range");  
+	    error ("A(matrix,range) = X: the number of rows in X must match");
+	    error ("the number of elements in matrix and the number of");
+	    error ("columns in X must match the number of elements in range");
 	    return;
 	  }
 
@@ -1024,9 +1024,9 @@
 	  }
 	else
 	  {
-	    error ("A(matrix,:) = X: the number of rows in X must\
- match the number of elements in matrix, and the number of columns in\
- X must match the number of columns in A");
+	    error ("A(matrix,:) = X: the number of rows in X must match the");
+	    error ("number of elements in matrix, and the number of columns");
+	    error ("in X must match the number of columns in A");
 	    return;
 	  }
 
@@ -1060,8 +1060,8 @@
 	  return;
 	if (! indexed_assign_conforms (ri.nelem (), 1, rhs_nr, rhs_nc))
 	  {
-	    error ("A(range,int) = X: X must be a column vector with\
- the same number of elements as range");
+	    error ("A(range,int) = X: X must be a column vector with the");
+	    error ("same number of elements as range");
 	    return;
 	  }
 	maybe_resize (tree_to_mat_idx (ri.max ()), j);
@@ -1083,9 +1083,9 @@
 	if (! indexed_assign_conforms (ri.nelem (), jv.capacity (),
 				       rhs_nr, rhs_nc))
 	  {
-	    error ("A(range,matrix) = X: the number of rows in X must\
- match the number of elements in range and the number of columns in X\
- must match the number of elements in matrix");
+	    error ("A(range,matrix) = X: the number of rows in X must match");
+	    error ("the number of elements in range and the number of");
+	    error ("columns in X must match the number of elements in matrix");
 	    return;
 	  }
 	maybe_resize (tree_to_mat_idx (ri.max ()), jv.max ());
@@ -1104,9 +1104,10 @@
 	if (! indexed_assign_conforms (ri.nelem (), rj.nelem (),
 				       rhs_nr, rhs_nc))
 	  {
-	    error ("A(r_range,c_range) = X: the number of rows in X\
- must match the number of elements in r_range and the number of\
- columns in X must match the number of elements in c_range\n");
+	    error ("A(r_range,c_range) = X: the number of rows in X must");
+	    error ("match the number of elements in r_range and the number");
+	    error ("of columns in X must match the number of elements in");
+	    error ("c_range");
 	    return;
 	  }
 
@@ -1159,9 +1160,9 @@
 	  }
 	else
 	  {
-	    error ("A(range,:) = X: the number of rows in X must match\
- the number of elements in range, and the number of columns in X must\
- match the number of columns in A");  
+	    error ("A(range,:) = X: the number of rows in X must match the");
+	    error ("number of elements in range, and the number of columns");
+	    error ("in X must match the number of columns in A");  
 	    return;
 	  }
 
@@ -1228,8 +1229,8 @@
 	  }
 	else
 	  {
-	    error ("A(:,int) = X: X must be a column vector with the\
- same number of rows as A"); 
+	    error ("A(:,int) = X: X must be a column vector with the same");
+	    error ("number of rows as A"); 
 	    return;
 	  }
 
@@ -1267,9 +1268,9 @@
 	  }
 	else
 	  {
-	    error ("A(:,matrix) = X: the number of rows in X must\
- match the number of rows in A, and the number of columns in X must\
- match the number of elements in matrix");   
+	    error ("A(:,matrix) = X: the number of rows in X must match the");
+	    error ("number of rows in A, and the number of columns in X must");
+	    error ("match the number of elements in matrix");   
 	    return;
 	  }
 
@@ -1319,9 +1320,9 @@
 	  }
 	else
 	  {
-	    error ("A(:,range) = X: the number of rows in X must match\
- the number of rows in A, and the number of columns in X must match\
- the number of elements in range");
+	    error ("A(:,range) = X: the number of rows in X must match the");
+	    error ("number of rows in A, and the number of columns in X");
+	    error ("must match the number of elements in range");
 	    return;
 	  }