Mercurial > octave

changeset 20650:a6a452346c42

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use error and error_with_id directly in libinterp code * gcd.cc, ls-mat5.cc, oct-map.cc, oct-stream.cc, sub2ind.cc, pt-assign.cc, pt-idx.cc: Call error_with_id directly instead of using current_liboctave_error_with_id_handler. Likewise for error and current_liboctave_error_handler.
author John W. Eaton <jwe@octave.org>
date Wed, 21 Oct 2015 13:58:08 -0400
parents 22296da09307
children c1d94e5cd5ea
files libinterp/corefcn/gcd.cc libinterp/corefcn/ls-mat5.cc libinterp/corefcn/oct-map.cc libinterp/corefcn/oct-stream.cc libinterp/corefcn/sub2ind.cc libinterp/parse-tree/pt-assign.cc libinterp/parse-tree/pt-idx.cc
diffstat 7 files changed, 16 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/gcd.cc	Wed Oct 21 13:56:05 2015 -0400
+++ b/libinterp/corefcn/gcd.cc	Wed Oct 21 13:58:08 2015 -0400
@@ -40,8 +40,7 @@
 simple_gcd (double a, double b)
 {
   if (! xisinteger (a) || ! xisinteger (b))
-    (*current_liboctave_error_handler)
-      ("gcd: all values must be integers");
+    error ("gcd: all values must be integers");
 
   double aa = fabs (a);
   double bb = fabs (b);
@@ -78,8 +77,7 @@
 {
   if (! xisinteger (a.real ()) || ! xisinteger (a.imag ())
       || ! xisinteger (b.real ()) || ! xisinteger (b.imag ()))
-    (*current_liboctave_error_handler)
-      ("gcd: all complex parts must be integers");
+    error ("gcd: all complex parts must be integers");
 
   std::complex<FP> aa = a;
   std::complex<FP> bb = b;
@@ -119,8 +117,7 @@
 extended_gcd (double a, double b, double& x, double& y)
 {
   if (! xisinteger (a) || ! xisinteger (b))
-    (*current_liboctave_error_handler)
-      ("gcd: all values must be integers");
+    error ("gcd: all values must be integers");
 
   double aa = fabs (a);
   double bb = fabs (b);
@@ -159,8 +156,7 @@
 {
   if (! xisinteger (a.real ()) || ! xisinteger (a.imag ())
       || ! xisinteger (b.real ()) || ! xisinteger (b.imag ()))
-    (*current_liboctave_error_handler)
-      ("gcd: all complex parts must be integers");
+    error ("gcd: all complex parts must be integers");
 
   std::complex<FP> aa = a;
   std::complex<FP> bb = b;
--- a/libinterp/corefcn/ls-mat5.cc	Wed Oct 21 13:56:05 2015 -0400
+++ b/libinterp/corefcn/ls-mat5.cc	Wed Oct 21 13:58:08 2015 -0400
@@ -1769,8 +1769,7 @@
         break;
 
       default:
-        (*current_liboctave_error_handler)
-          ("unrecognized data format requested");
+        error ("unrecognized data format requested");
         break;
       }
   }
@@ -1855,8 +1854,7 @@
         break;
 
       default:
-        (*current_liboctave_error_handler)
-          ("unrecognized data format requested");
+        error ("unrecognized data format requested");
         break;
       }
   }
--- a/libinterp/corefcn/oct-map.cc	Wed Oct 21 13:56:05 2015 -0400
+++ b/libinterp/corefcn/oct-map.cc	Wed Oct 21 13:58:08 2015 -0400
@@ -649,9 +649,7 @@
 
       if (error_state)
         {
-          // Use liboctave exception to be consistent.
-          (*current_liboctave_error_handler)
-            ("cat: field names mismatch in concatenating structs");
+          error ("cat: field names mismatch in concatenating structs");
           break;
         }
     }
@@ -667,8 +665,7 @@
   if (dim == -1 || dim == -2)
     dim = -dim - 1;
   else if (dim < 0)
-    (*current_liboctave_error_handler)
-      ("cat: invalid dimension");
+    error ("cat: invalid dimension");
 
   if (n == 1)
     retval = map_list[0];
@@ -732,8 +729,7 @@
   if (dim == -1 || dim == -2)
     dim = -dim - 1;
   else if (dim < 0)
-    (*current_liboctave_error_handler)
-      ("cat: invalid dimension");
+    error ("cat: invalid dimension");
 
   if (n == 1)
     retval = map_list[0];
--- a/libinterp/corefcn/oct-stream.cc	Wed Oct 21 13:56:05 2015 -0400
+++ b/libinterp/corefcn/oct-stream.cc	Wed Oct 21 13:58:08 2015 -0400
@@ -3342,8 +3342,7 @@
 
     default:
       retval = false;
-      (*current_liboctave_error_handler)
-        ("read: invalid type specification");
+      error ("read: invalid type specification");
       break;
     }
 
@@ -3713,8 +3712,7 @@
 
     default:
       retval = false;
-      (*current_liboctave_error_handler)
-        ("write: invalid type specification");
+      error ("write: invalid type specification");
       break;
     }
 
--- a/libinterp/corefcn/sub2ind.cc	Wed Oct 21 13:56:05 2015 -0400
+++ b/libinterp/corefcn/sub2ind.cc	Wed Oct 21 13:58:08 2015 -0400
@@ -107,9 +107,8 @@
               catch (index_exception& e)
                 {
                   e.set_pos_if_unset (nargin-1, j+1);
-                  e.set_var ("");     // no particular variable
-                  (*current_liboctave_error_with_id_handler)
-                    (e.id(), e.err());
+                  e.set_var ();
+                  error_with_id (e.id (), e.err ());
                 }
             }
           else
--- a/libinterp/parse-tree/pt-assign.cc	Wed Oct 21 13:56:05 2015 -0400
+++ b/libinterp/parse-tree/pt-assign.cc	Wed Oct 21 13:58:08 2015 -0400
@@ -133,9 +133,9 @@
                 }
             }
           catch (index_exception& e)
-            {       // problems with range, invalid index type etc.
+            {
               e.set_var (lhs->name ());
-              (*current_liboctave_error_with_id_handler) (e.id(), e.err());
+              error_with_id (e.id (), e.err ());
             }
         }
     }
--- a/libinterp/parse-tree/pt-idx.cc	Wed Oct 21 13:56:05 2015 -0400
+++ b/libinterp/parse-tree/pt-idx.cc	Wed Oct 21 13:58:08 2015 -0400
@@ -280,7 +280,7 @@
       && dynamic_cast<const tree_identifier *> (expr)->is_variable ())
     e.set_var (expr->name ());
 
-  (*current_liboctave_error_with_id_handler) (e.id (), e.err ());
+  error_with_id (e.id (), e.err ());
 }
 
 octave_value_list