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.

--- a/libinterp/parse-tree/pt-check.cc	Mon Jan 18 19:23:56 2016 -0800
+++ b/libinterp/parse-tree/pt-check.cc	Mon Jan 18 21:06:26 2016 -0800
@@ -41,7 +41,7 @@
       if (elt)
         {
           if (do_lvalue_check && ! elt->lvalue_ok ())
-            gripe ("invalid lvalue in multiple assignment", elt->line ());
+            errmsg ("invalid lvalue in multiple assignment", elt->line ());
         }
     }
 }
@@ -146,7 +146,7 @@
   if (lhs)
     {
       if (! lhs->lvalue_ok ())
-        gripe ("invalid lvalue in for command", cmd.line ());
+        errmsg ("invalid lvalue in for command", cmd.line ());
     }
 
   tree_expression *expr = cmd.control_expr ();
@@ -175,7 +175,7 @@
       int len = lhs->length ();
 
       if (len == 0 || len > 2)
-        gripe ("invalid number of output arguments in for command",
+        errmsg ("invalid number of output arguments in for command",
                cmd.line ());
 
       do_lvalue_check = true;
@@ -420,7 +420,7 @@
   if (lhs)
     {
       if (! lhs->lvalue_ok ())
-        gripe ("invalid lvalue in assignment", expr.line ());
+        errmsg ("invalid lvalue in assignment", expr.line ());
     }
 
   tree_expression *rhs = expr.right_hand_side ();
@@ -509,7 +509,7 @@
   if (expr_id)
     {
       if (! expr_id->lvalue_ok ())
-        gripe ("invalid lvalue used for identifier in try-catch command",
+        errmsg ("invalid lvalue used for identifier in try-catch command",
                cmd.line ());
     }
 
@@ -565,7 +565,7 @@
 }
 
 void
-tree_checker::gripe (const std::string& msg, int line)
+tree_checker::errmsg (const std::string& msg, int line)
 {
   if (file_name.empty ())
     error ("%s", msg.c_str ());