Mercurial > octave

diff libinterp/octave-value/ov.cc @ 21102:dfcb9d74b253

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename local gripe_XXX functions to err_XXX or warn_XXX. * graphics.cc (err_set_invalid): Add OCTAVE_NORETURN attribute. * graphisc.cc: Rename gripe_set_invalid to err_set_invalid. * jit-typeinfo.cc (err_bad_result): Rename from gripe_bad_result. * load-save.cc (err_file_open): Rename from gripe_file_open. * ls-mat5.cc (warn_dim_too_large): Rename from gripe_dim_too_large. * oct-stream.cc (err_invalid_file_id): Rename from gripe_invalid_file_id. * txt-eng-ft.cc (warn_missing_glyph, warn_glyph_render): Rename from gripe_missing_glyph, gripe_glyph_render. * xpow.cc: Add FIXME about strange gripe_failed_diagonalization function. * ov-base-int.cc, ov-bool-mat.cc, ov-bool-sparse.cc, ov-bool.cc, ov-cell.cc, ov-class.cc, ov-complex.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-fcn-handle.cc, ov-fcn-inline.cc, ov-float.cc, ov-flt-complex.cc, ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-range.cc, ov-re-mat.cc, ov-re-sparse.cc, ov-scalar.cc, ov-str-mat.cc, ov-struct.cc (warn_load, warn_save): ov-base.cc (warn_load, warn_save, err_indexed_assignment, err_assign_conversion_failed, err_no_conversion): Rename from gripe_XXX version. * ov-base.h (warn_load, warn_save): Rename from gripe_load, gripe_save. * ov-classdef.cc (err_method_access, err_property_access): Rename from gripe_method_access, gripe_property_access. * ov-classdef.h (err_invalid_object): Rename from gripe_invalid_object. * ov-oncleanup.h (gripe_internal): Delete function. Place single calling instance directly in code. * ov.cc (err_binary_op, err_binary_op_conv, err_unary_op, err_unary_op_conv, err_unary_op_conversion_failed): Add OCTAVE_NORETURN attribute. Rename from gripe_XXX. * ov.cc (err_cat_op, err_cat_op_conv, ): Rename from gripe_XXX. * lex.h (warn_single_quote_string, warn_language_extension, maybe_warn_language_extension_comment, warn_language_extension_continuation, warn_language_extension_operator): Rename from gripe_XXX. * lex.ll (warn_single_quote_string, warn_language_extension, maybe_warn_language_extension_comment, warn_language_extension_continuation, warn_language_extension_operator): Rename from gripe_XXX. * pt-check.cc (errmsg): Rename from gripe. * pt-check.h (errmsg): Add OCTAVE_NORETURN attribute. Rename from gripe. * PermMatrix.cc (err_invalid_permutation): Add OCTAVE_NORETURN attribute. Rename from gripe_invalid_permutation. * idx-vector.cc (err_invalid_range): Add OCTAVE_NORETURN attribute. Rename from gripe_invalid_range. liboctave/numeric/lo-specfun.cc (err_betainc_nonconformant): Add OCTAVE_NORETURN attribute. Rename from gripe_betainc_nonconformant. * oct-group.cc (err_invalid): New static function. * oct-group.h (gripe_invalid): Delete private function. * oct-passwd.cc (err_invalid): New static function. * oct-passwd.h (gripe_invalid): Delete private function. * data-conv.cc (err_unrecognized_float_fmt): Add OCTAVE_NORETURN attribute. Rename from gripe_unrecognized_float_fmt. * lo-cutils.c (warn_missing_wait_macro): Rename from gripe_missing_wait_macro. * unwind-prot.cc (err_unhandled_exception): Rename from gripe_exception. * unwind-prot.h (err_unhandled_exception): Rename from gripe_exception.
author Rik <rik@octave.org>
date Mon, 18 Jan 2016 21:06:26 -0800
parents e39e05d90788
children 3ac9f47fb04b
line wrap: on
line diff
--- a/libinterp/octave-value/ov.cc	Mon Jan 18 19:23:56 2016 -0800
+++ b/libinterp/octave-value/ov.cc	Mon Jan 18 21:06:26 2016 -0800
@@ -2043,16 +2043,16 @@
   return rep->write (os, block_size, output_type, skip, flt_fmt);
 }
 
-static void
-gripe_binary_op (const std::string& on, const std::string& tn1,
-                 const std::string& tn2)
+OCTAVE_NORETURN static void
+err_binary_op (const std::string& on, const std::string& tn1,
+               const std::string& tn2)
 {
   error ("binary operator '%s' not implemented for '%s' by '%s' operations",
          on.c_str (), tn1.c_str (), tn2.c_str ());
 }
 
-static void
-gripe_binary_op_conv (const std::string& on)
+OCTAVE_NORETURN static void
+err_binary_op_conv (const std::string& on)
 {
   error ("type conversion failed for binary operator '%s'", on.c_str ());
 }
@@ -2079,8 +2079,8 @@
           retval = f (v1, v2);
         }
       else
-        gripe_binary_op (octave_value::binary_op_as_string (op),
-                         v1.class_name (), v2.class_name ());
+        err_binary_op (octave_value::binary_op_as_string (op),
+                       v1.class_name (), v2.class_name ());
     }
   else
     {
@@ -2123,7 +2123,7 @@
                   t1 = tv1.type_id ();
                 }
               else
-                gripe_binary_op_conv (octave_value::binary_op_as_string (op));
+                err_binary_op_conv (octave_value::binary_op_as_string (op));
             }
           else
             tv1 = v1;
@@ -2138,7 +2138,7 @@
                   t2 = tv2.type_id ();
                 }
               else
-                gripe_binary_op_conv (octave_value::binary_op_as_string (op));
+                err_binary_op_conv (octave_value::binary_op_as_string (op));
             }
           else
             tv2 = v2;
@@ -2175,7 +2175,7 @@
                       t1 = tv1.type_id ();
                     }
                   else
-                    gripe_binary_op_conv
+                    err_binary_op_conv
                       (octave_value::binary_op_as_string (op));
                 }
 
@@ -2189,7 +2189,7 @@
                       t2 = tv2.type_id ();
                     }
                   else
-                    gripe_binary_op_conv
+                    err_binary_op_conv
                       (octave_value::binary_op_as_string (op));
                 }
 
@@ -2200,12 +2200,12 @@
                   if (f)
                     retval = f (*tv1.rep, *tv2.rep);
                   else
-                    gripe_binary_op (octave_value::binary_op_as_string (op),
-                                     v1.type_name (), v2.type_name ());
+                    err_binary_op (octave_value::binary_op_as_string (op),
+                                   v1.type_name (), v2.type_name ());
                 }
               else
-                gripe_binary_op (octave_value::binary_op_as_string (op),
-                                 v1.type_name (), v2.type_name ());
+                err_binary_op (octave_value::binary_op_as_string (op),
+                               v1.type_name (), v2.type_name ());
             }
         }
     }
@@ -2315,17 +2315,15 @@
   return retval;
 }
 
-OCTAVE_NORETURN static
-void
-gripe_cat_op (const std::string& tn1, const std::string& tn2)
+OCTAVE_NORETURN static void
+err_cat_op (const std::string& tn1, const std::string& tn2)
 {
   error ("concatenation operator not implemented for '%s' by '%s' operations",
          tn1.c_str (), tn2.c_str ());
 }
 
-OCTAVE_NORETURN static
-void
-gripe_cat_op_conv (void)
+OCTAVE_NORETURN static void
+err_cat_op_conv (void)
 {
   error ("type conversion failed for concatenation operator");
 }
@@ -2373,7 +2371,7 @@
               t1 = tv1.type_id ();
             }
           else
-            gripe_cat_op_conv ();
+            err_cat_op_conv ();
         }
       else
         tv1 = v1;
@@ -2388,7 +2386,7 @@
               t2 = tv2.type_id ();
             }
           else
-            gripe_cat_op_conv ();
+            err_cat_op_conv ();
         }
       else
         tv2 = v2;
@@ -2398,7 +2396,7 @@
           retval = do_cat_op (tv1, tv2, ra_idx);
         }
       else
-        gripe_cat_op (v1.type_name (), v2.type_name ());
+        err_cat_op (v1.type_name (), v2.type_name ());
     }
 
   return retval;
@@ -2512,15 +2510,15 @@
   rep->print_info (os, prefix + " ");
 }
 
-static void
-gripe_unary_op (const std::string& on, const std::string& tn)
+OCTAVE_NORETURN static void
+err_unary_op (const std::string& on, const std::string& tn)
 {
   error ("unary operator '%s' not implemented for '%s' operands",
          on.c_str (), tn.c_str ());
 }
 
-static void
-gripe_unary_op_conv (const std::string& on)
+OCTAVE_NORETURN static void
+err_unary_op_conv (const std::string& on)
 {
   error ("type conversion failed for unary operator '%s'", on.c_str ());
 }
@@ -2541,8 +2539,8 @@
       if (f)
         retval = f (v);
       else
-        gripe_unary_op (octave_value::unary_op_as_string (op),
-                        v.class_name ());
+        err_unary_op (octave_value::unary_op_as_string (op),
+                      v.class_name ());
     }
   else
     {
@@ -2570,20 +2568,20 @@
                   retval = do_unary_op (op, tv);
                 }
               else
-                gripe_unary_op_conv (octave_value::unary_op_as_string (op));
+                err_unary_op_conv (octave_value::unary_op_as_string (op));
             }
           else
-            gripe_unary_op (octave_value::unary_op_as_string (op),
-                            v.type_name ());
+            err_unary_op (octave_value::unary_op_as_string (op),
+                          v.type_name ());
         }
     }
 
   return retval;
 }
 
-static void
-gripe_unary_op_conversion_failed (const std::string& op,
-                                  const std::string& tn)
+OCTAVE_NORETURN static void
+err_unary_op_conversion_failed (const std::string& op,
+                                const std::string& tn)
 {
   error ("operator %s: type conversion for '%s' failed",
          op.c_str (), tn.c_str ());
@@ -2594,7 +2592,7 @@
 {
   if (op == op_incr || op == op_decr)
     {
-      // We want the gripe just here, because in the other branch this should
+      // We want the error just here, because in the other branch this should
       // not happen, and if it did anyway (internal error), the message would
       // be confusing.
       if (is_undefined ())
@@ -2651,17 +2649,17 @@
                           rep = old_rep;
                         }
 
-                      gripe_unary_op (octave_value::unary_op_as_string (op),
-                                      type_name ());
+                      err_unary_op (octave_value::unary_op_as_string (op),
+                                    type_name ());
                     }
                 }
               else
-                gripe_unary_op_conversion_failed
+                err_unary_op_conversion_failed
                   (octave_value::unary_op_as_string (op), type_name ());
             }
           else
-            gripe_unary_op (octave_value::unary_op_as_string (op),
-                            type_name ());
+            err_unary_op (octave_value::unary_op_as_string (op),
+                          type_name ());
         }
     }
   else