# HG changeset patch
# User jwe
# Date 753183040 0
# Node ID cd2e49fb4f6b5cbccbc6776522558d0e808a83ac
# Parent  e83d64b26659b2cf42875bfda7af0c6bb72e69e6
[project @ 1993-11-13 09:16:01 by jwe]

diff -r e83d64b26659 -r cd2e49fb4f6b src/det.cc
--- a/src/det.cc	Sat Nov 13 09:11:10 1993 +0000
+++ b/src/det.cc	Sat Nov 13 09:30:40 1993 +0000
@@ -75,8 +75,8 @@
 	    double rcond = 0.0;
 	    DET det = m.determinant (info, rcond);
 	    if (info == -1)
-	      error ("det: matrix singular to machine precision, rcond = %g",
-		     rcond);
+	      warning ("det: matrix singular to machine precision, rcond = %g",
+		       rcond);
 	    else
 	      {
 		double d = det.value ();
@@ -96,8 +96,8 @@
 	    double rcond = 0.0;
 	    ComplexDET det = m.determinant (info, rcond);
 	    if (info == -1)
-	      error ("det: matrix singular to machine precision, rcond = %g",
-		     rcond);
+	      warning ("det: matrix singular to machine precision, rcond = %g",
+		       rcond);
 	    else
 	      {
 		Complex c = det.value ();
diff -r e83d64b26659 -r cd2e49fb4f6b src/g-builtins.cc
--- a/src/g-builtins.cc	Sat Nov 13 09:11:10 1993 +0000
+++ b/src/g-builtins.cc	Sat Nov 13 09:30:40 1993 +0000
@@ -1212,7 +1212,7 @@
 
       if (!directory)
 	{
-	  message ("pwd", "can't find working directory!");
+	  warning ("pwd: can't find working directory!");
 	  delete buffer;
 	}
     }
diff -r e83d64b26659 -r cd2e49fb4f6b src/input.cc
--- a/src/input.cc	Sat Nov 13 09:11:10 1993 +0000
+++ b/src/input.cc	Sat Nov 13 09:30:40 1993 +0000
@@ -267,7 +267,7 @@
     instream = fopen (name, "r");
 
   if (instream == (FILE *) NULL && warn)
-    message (name, "no such file or directory");
+    warning ("%s: no such file or directory", name);
 
   if (reading_m_file || reading_script_file)
     mf_instream = instream;
diff -r e83d64b26659 -r cd2e49fb4f6b src/inv.cc
--- a/src/inv.cc	Sat Nov 13 09:11:10 1993 +0000
+++ b/src/inv.cc	Sat Nov 13 09:30:40 1993 +0000
@@ -76,9 +76,8 @@
 	    double rcond = 0.0;
 	    Matrix minv = m.inverse (info, rcond);
 	    if (info == -1)
-	      message ("inverse",
-		       "matrix singular to machine precision, rcond = %g",
-		       rcond);
+	      warning ("inverse: matrix singular to machine precision,\
+ rcond = %g", rcond);
 	    else
 	      retval = tree_constant (minv);
 	  }
@@ -101,9 +100,8 @@
 	    double rcond = 0.0;
 	    ComplexMatrix minv = m.inverse (info, rcond);
 	    if (info == -1)
-	      message ("inverse",
-		       "matrix singular to machine precision, rcond = %g",
-		       rcond);
+	      warning ("inverse: matrix singular to machine precision,\
+ rcond = %g", rcond);
 	    else
 	      retval = tree_constant (minv);
 	  }
diff -r e83d64b26659 -r cd2e49fb4f6b src/oct-hist.cc
--- a/src/oct-hist.cc	Sat Nov 13 09:11:10 1993 +0000
+++ b/src/oct-hist.cc	Sat Nov 13 09:30:40 1993 +0000
@@ -249,9 +249,9 @@
       if (sscanf (*argv, "%d", &limit) != 1)
         {
 	  if (*argv[0] == '-')
-	    message ("history", "unrecognized option `%s'", *argv);
+	    error ("history: unrecognized option `%s'", *argv);
 	  else
-	    message ("history", "bad non-numeric arg `%s'", *argv);
+	    error ("history: bad non-numeric arg `%s'", *argv);
 	  return;
         }
     }
diff -r e83d64b26659 -r cd2e49fb4f6b src/pr-output.cc
--- a/src/pr-output.cc	Sat Nov 13 09:11:10 1993 +0000
+++ b/src/pr-output.cc	Sat Nov 13 09:30:40 1993 +0000
@@ -1177,8 +1177,7 @@
 		    }
 		  else
 		    {
-		      message ("format",
-			       "unrecognized option `short %s'", *argv);
+		      error ("format: unrecognized option `short %s'", *argv);
 		      return;
 		    }
 		}
@@ -1205,8 +1204,7 @@
 		    }
 		  else
 		    {
-		      message ("format",
-			       "unrecognized option `long %s'", *argv);
+		      error ("format: unrecognized option `long %s'", *argv);
 		      return;
 		    }
 		}
@@ -1216,7 +1214,7 @@
 	      set_output_prec_and_fw (15, 24);
 	    }
 	  else if (strcmp (*argv, "hex") == 0)
-	    message ("format", "format state `hex' not implemented");
+	    error ("format: format state `hex' not implemented yet");
 	  else if (strcmp (*argv, "+") == 0)
 	    {
 	      init_format_state ();
@@ -1238,11 +1236,11 @@
 	      free_format = 1;
 	    }
 	  else if (strcmp (*argv, "compact") == 0)
-	    message ("format", "format state `compact' not implemented");
+	    error ("format: format state `compact' not implemented yet");
 	  else if (strcmp (*argv, "loose") == 0)
-	    message ("format", "format state `loose' not implemented");
+	    error ("format: format state `loose' not implemented yet");
 	  else
-	    message ("format", "unrecognized format state `%s'", *argv);
+	    error ("format: unrecognized format state `%s'", *argv);
 	}
       else
 	usage ("format [format_state]");
diff -r e83d64b26659 -r cd2e49fb4f6b src/pt-const.cc
--- a/src/pt-const.cc	Sat Nov 13 09:11:10 1993 +0000
+++ b/src/pt-const.cc	Sat Nov 13 09:30:40 1993 +0000
@@ -2263,7 +2263,7 @@
 	    }
 	}
       else
-	message ("diag", "invalid second argument");
+	error ("diag: invalid second argument");
 
       break;
     case complex_scalar_constant:
@@ -2302,7 +2302,7 @@
 	    }
 	}
       else
-	message ("diag", "invalid second argument");
+	error ("diag: invalid second argument");
 
       break;
     case string_constant:
diff -r e83d64b26659 -r cd2e49fb4f6b src/symtab.cc
--- a/src/symtab.cc	Sat Nov 13 09:11:10 1993 +0000
+++ b/src/symtab.cc	Sat Nov 13 09:30:40 1993 +0000
@@ -893,7 +893,7 @@
       return new_sym;
     }
   else if (warn)
-    message ("lookup", "symbol`%s' not found", nm);
+    warning ("lookup: symbol`%s' not found", nm);
 
   return (symbol_record *) NULL;
 }
diff -r e83d64b26659 -r cd2e49fb4f6b src/sysdep.cc
--- a/src/sysdep.cc	Sat Nov 13 09:11:10 1993 +0000
+++ b/src/sysdep.cc	Sat Nov 13 09:30:40 1993 +0000
@@ -40,8 +40,7 @@
 malloc_handler (int code)
 {
   if (code == 5)
-    message ("malloc_handler",
-	     "hopefully recoverable malloc error: freeing wild pointer");
+    warning ("hopefully recoverable malloc error: freeing wild pointer");
   else
     {
       panic ("probably irrecoverable malloc error: code %d", code);
diff -r e83d64b26659 -r cd2e49fb4f6b src/tc-extras.cc
--- a/src/tc-extras.cc	Sat Nov 13 09:11:10 1993 +0000
+++ b/src/tc-extras.cc	Sat Nov 13 09:30:40 1993 +0000
@@ -773,7 +773,7 @@
 	    }
 	}
       else
-	message ("max", "nonconformant matrices");
+	error ("max: nonconformant matrices");
     }
   else
     panic_impossible ();
@@ -944,7 +944,7 @@
 	    }
 	}
       else
-	message ("min", "nonconformant matrices");
+	error ("min: nonconformant matrices");
     }
   else
     panic_impossible ();
diff -r e83d64b26659 -r cd2e49fb4f6b src/utils.cc
--- a/src/utils.cc	Sat Nov 13 09:11:10 1993 +0000
+++ b/src/utils.cc	Sat Nov 13 09:30:40 1993 +0000
@@ -1189,7 +1189,8 @@
 
 	      if (strcmp (plot_prog, "gnuplot") != 0)
 		{
-		  message ("plot", "trying again with `gnuplot'");
+		  warning ("having trouble finding plotting program.");
+		  warning ("trying again with `gnuplot'");
 		  goto last_chance;
 		}
 	    }
diff -r e83d64b26659 -r cd2e49fb4f6b src/variables.cc
--- a/src/variables.cc	Sat Nov 13 09:11:10 1993 +0000
+++ b/src/variables.cc	Sat Nov 13 09:30:40 1993 +0000
@@ -627,7 +627,7 @@
   if (! arg.is_string_type ())
     {
       if (warn)
-	message (warn_for, "expecting function name as argument");
+	error ("%s: expecting function name as argument", warn_for);
       return ans;
     }
 
@@ -650,8 +650,8 @@
   if (ans == NULL_TREE || ! sr->is_function ())
     {
       if (warn)
-	message (warn_for, "the symbol `%s' is not valid as a function",
-		 fcn_name);
+	error ("%s: the symbol `%s' is not valid as a function",
+	       warn_for, fcn_name);
       ans = NULL_TREE;
     }
 
@@ -670,8 +670,8 @@
   if (nargs != e_nargs)
     {
       if (warn)
-	message (warn_for, "expecting function to take %d argument%c", 
-		 e_nargs, s_plural (e_nargs));
+	error ("%s: expecting function to take %d argument%c", 
+	       warn_for, e_nargs, s_plural (e_nargs));
       return 0;
     }
   return 1;