Mercurial > octave
changeset 21102:dfcb9d74b253
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.
line wrap: on
line diff
--- a/libinterp/corefcn/graphics.cc Mon Jan 18 19:23:56 2016 -0800 +++ b/libinterp/corefcn/graphics.cc Mon Jan 18 21:06:26 2016 -0800 @@ -63,8 +63,9 @@ // forward declarations static octave_value xget (const graphics_handle& h, const caseless_str& name); -static void -gripe_set_invalid (const std::string& pname) +OCTAVE_NORETURN static +void +err_set_invalid (const std::string& pname) { error ("set: invalid value for %s property", pname.c_str ()); } @@ -3394,7 +3395,7 @@ callbackobject = val; } else - gripe_set_invalid ("callbackobject"); + err_set_invalid ("callbackobject"); } void @@ -3410,7 +3411,7 @@ gh_manager::push_figure (val); } else - gripe_set_invalid ("currentfigure"); + err_set_invalid ("currentfigure"); } void @@ -3565,7 +3566,7 @@ if (xisnan (hax.value ()) || is_handle (hax)) currentaxes = hax; else - gripe_set_invalid ("currentaxes"); + err_set_invalid ("currentaxes"); } void
--- a/libinterp/corefcn/jit-typeinfo.cc Mon Jan 18 19:23:56 2016 -0800 +++ b/libinterp/corefcn/jit-typeinfo.cc Mon Jan 18 21:06:26 2016 -0800 @@ -441,7 +441,7 @@ OCTAVE_NORETURN static void -gripe_bad_result (void) +err_bad_result (void) { error ("incorrect type information given to the JIT compiler"); } @@ -461,7 +461,7 @@ if (result_type) { if (ovl.length () < 1) - gripe_bad_result (); + err_bad_result (); octave_value result = ovl.xelem(0); octave_base_value *ret = result.internal_rep (); @@ -471,7 +471,7 @@ if (! (ovl.length () == 0 || (ovl.length () == 1 && ovl.xelem (0).is_undefined ()))) - gripe_bad_result (); + err_bad_result (); return 0; }
--- a/libinterp/corefcn/load-save.cc Mon Jan 18 19:23:56 2016 -0800 +++ b/libinterp/corefcn/load-save.cc Mon Jan 18 21:06:26 2016 -0800 @@ -128,7 +128,7 @@ OCTAVE_NORETURN static void -gripe_file_open (const std::string& fcn, const std::string& file) +err_file_open (const std::string& fcn, const std::string& file) { if (fcn == "load") error ("%s: unable to open input file '%s'", fcn.c_str (), file.c_str ()); @@ -321,7 +321,7 @@ file.close (); } else if (! quiet) - gripe_file_open ("load", orig_fname); + err_file_open ("load", orig_fname); } #ifdef HAVE_ZLIB else @@ -333,7 +333,7 @@ gzfile.close (); } else if (! quiet) - gripe_file_open ("load", orig_fname); + err_file_open ("load", orig_fname); } #endif @@ -774,7 +774,7 @@ hdf5_file.close (); } else - gripe_file_open ("load", orig_fname); + err_file_open ("load", orig_fname); } else #endif @@ -821,7 +821,7 @@ file.close (); } else - gripe_file_open ("load", orig_fname); + err_file_open ("load", orig_fname); } else #endif @@ -1674,7 +1674,7 @@ hdf5_file.close (); } else - gripe_file_open ("save", fname); + err_file_open ("save", fname); } else #endif @@ -1696,7 +1696,7 @@ file.close (); } else - gripe_file_open ("save", fname); + err_file_open ("save", fname); } else #endif @@ -1713,7 +1713,7 @@ file.close (); } else - gripe_file_open ("save", fname); + err_file_open ("save", fname); } } }
--- a/libinterp/corefcn/ls-mat5.cc Mon Jan 18 19:23:56 2016 -0800 +++ b/libinterp/corefcn/ls-mat5.cc Mon Jan 18 21:06:26 2016 -0800 @@ -2224,7 +2224,7 @@ } static void -gripe_dim_too_large (const std::string& name) +warn_dim_too_large (const std::string& name) { warning ("save: skipping %s: dimension too large for MAT format", name.c_str ()); @@ -2254,7 +2254,7 @@ { if (dv(i) > max_dim_val) { - gripe_dim_too_large (name); + warn_dim_too_large (name); goto skip_to_next; } } @@ -2279,7 +2279,7 @@ if (nnz > max_dim_val || nc + 1 > max_dim_val) { - gripe_dim_too_large (name); + warn_dim_too_large (name); goto skip_to_next; } @@ -2287,7 +2287,7 @@ } else if (dv.numel () > max_dim_val) { - gripe_dim_too_large (name); + warn_dim_too_large (name); goto skip_to_next; }
--- a/libinterp/corefcn/oct-stream.cc Mon Jan 18 19:23:56 2016 -0800 +++ b/libinterp/corefcn/oct-stream.cc Mon Jan 18 21:06:26 2016 -0800 @@ -4157,7 +4157,7 @@ OCTAVE_NORETURN static void -gripe_invalid_file_id (int fid, const std::string& who) +err_invalid_file_id (int fid, const std::string& who) { if (who.empty ()) ::error ("invalid stream number = %d", fid); @@ -4171,7 +4171,7 @@ octave_stream retval; if (fid < 0) - gripe_invalid_file_id (fid, who); + err_invalid_file_id (fid, who); if (lookup_cache != list.end () && lookup_cache->first == fid) retval = lookup_cache->second; @@ -4180,7 +4180,7 @@ ostrl_map::const_iterator iter = list.find (fid); if (iter == list.end ()) - gripe_invalid_file_id (fid, who); + err_invalid_file_id (fid, who); retval = iter->second; lookup_cache = iter; @@ -4203,12 +4203,12 @@ { // Can't remove stdin (std::cin), stdout (std::cout), or stderr (std::cerr). if (fid < 3) - gripe_invalid_file_id (fid, who); + err_invalid_file_id (fid, who); ostrl_map::iterator iter = list.find (fid); if (iter == list.end ()) - gripe_invalid_file_id (fid, who); + err_invalid_file_id (fid, who); octave_stream os = iter->second; list.erase (iter); @@ -4216,7 +4216,7 @@ // FIXME: is this check redundant? if (! os.is_valid ()) - gripe_invalid_file_id (fid, who); + err_invalid_file_id (fid, who); os.close ();
--- a/libinterp/corefcn/txt-eng-ft.cc Mon Jan 18 19:23:56 2016 -0800 +++ b/libinterp/corefcn/txt-eng-ft.cc Mon Jan 18 21:06:26 2016 -0800 @@ -46,19 +46,17 @@ // combination. static void -gripe_missing_glyph (FT_ULong c) +warn_missing_glyph (FT_ULong c) { warning_with_id ("Octave:missing-glyph", - "ft_render: skipping missing glyph for character '%x'", - c); + "ft_render: skipping missing glyph for character '%x'", c); } static void -gripe_glyph_render (FT_ULong c) +warn_glyph_render (FT_ULong c) { warning_with_id ("Octave:glyph-render", - "ft_render: unable to render glyph for character '%x'", - c); + "ft_render: unable to render glyph for character '%x'", c); } #ifdef _MSC_VER @@ -508,7 +506,7 @@ || FT_Load_Glyph (face, glyph_index, FT_LOAD_DEFAULT))) { glyph_index = 0; - gripe_missing_glyph (code); + warn_missing_glyph (code); } else { @@ -522,7 +520,7 @@ || FT_Load_Glyph (face, glyph_index, FT_LOAD_DEFAULT)) { glyph_index = 0; - gripe_missing_glyph (' '); + warn_missing_glyph (' '); } else push_new_line (); @@ -530,7 +528,7 @@ else if (FT_Render_Glyph (face->glyph, FT_RENDER_MODE_NORMAL)) { glyph_index = 0; - gripe_glyph_render (code); + warn_glyph_render (code); } else { @@ -587,7 +585,7 @@ || FT_Load_Glyph (face, glyph_index, FT_LOAD_DEFAULT)) { glyph_index = 0; - gripe_missing_glyph (' '); + warn_missing_glyph (' '); } else push_new_line ();
--- a/libinterp/corefcn/xpow.cc Mon Jan 18 19:23:56 2016 -0800 +++ b/libinterp/corefcn/xpow.cc Mon Jan 18 21:06:26 2016 -0800 @@ -54,6 +54,7 @@ #include "bsxfun.h" +// FIXME: Why does this routine call itself? static void gripe_failed_diagonalization (void) {
--- a/libinterp/octave-value/ov-base-int.cc Mon Jan 18 19:23:56 2016 -0800 +++ b/libinterp/octave-value/ov-base-int.cc Mon Jan 18 21:06:26 2016 -0800 @@ -370,7 +370,7 @@ H5Sclose (space_hid); #else - this->gripe_save ("hdf5"); + this->warn_save ("hdf5"); #endif return retval; @@ -439,7 +439,7 @@ H5Dclose (data_hid); #else - this->gripe_load ("hdf5"); + this->warn_load ("hdf5"); #endif return retval; @@ -577,7 +577,7 @@ H5Sclose (space_hid); #else - this->gripe_save ("hdf5"); + this->warn_save ("hdf5"); #endif return retval; @@ -620,7 +620,7 @@ return true; #else - this->gripe_load ("hdf5"); + this->warn_load ("hdf5"); return false; #endif }
--- a/libinterp/octave-value/ov-base.cc Mon Jan 18 19:23:56 2016 -0800 +++ b/libinterp/octave-value/ov-base.cc Mon Jan 18 21:06:26 2016 -0800 @@ -1246,7 +1246,7 @@ } void -octave_base_value::gripe_load (const char *type) const +octave_base_value::warn_load (const char *type) const { warning_with_id ("Octave:load-save-unavailable", @@ -1255,7 +1255,7 @@ } void -octave_base_value::gripe_save (const char *type) const +octave_base_value::warn_save (const char *type) const { warning_with_id ("Octave:load-save-unavailable", @@ -1299,7 +1299,7 @@ OCTAVE_NORETURN static void -gripe_indexed_assignment (const std::string& tn1, const std::string& tn2) +err_indexed_assignment (const std::string& tn1, const std::string& tn2) { error ("assignment of '%s' to indexed '%s' not implemented", tn2.c_str (), tn1.c_str ()); @@ -1307,7 +1307,7 @@ OCTAVE_NORETURN static void -gripe_assign_conversion_failed (const std::string& tn1, const std::string& tn2) +err_assign_conversion_failed (const std::string& tn1, const std::string& tn2) { error ("type conversion for assignment of '%s' to indexed '%s' failed", tn2.c_str (), tn1.c_str ()); @@ -1315,8 +1315,8 @@ OCTAVE_NORETURN static void -gripe_no_conversion (const std::string& on, const std::string& tn1, - const std::string& tn2) +err_no_conversion (const std::string& on, const std::string& tn1, + const std::string& tn2) { error ("operator %s: no conversion for assignment of '%s' to indexed '%s'", on.c_str (), tn2.c_str (), tn1.c_str ()); @@ -1376,11 +1376,11 @@ done = true; } else - gripe_assign_conversion_failed (type_name (), - rhs.type_name ()); + err_assign_conversion_failed (type_name (), + rhs.type_name ()); } else - gripe_indexed_assignment (type_name (), rhs.type_name ()); + err_indexed_assignment (type_name (), rhs.type_name ()); } if (! done) @@ -1415,8 +1415,8 @@ if (tmp) tmp_rhs = octave_value (tmp); else - gripe_assign_conversion_failed (type_name (), - rhs.type_name ()); + err_assign_conversion_failed (type_name (), + rhs.type_name ()); } else tmp_rhs = rhs; @@ -1431,8 +1431,8 @@ if (tmp) tmp_lhs = octave_value (tmp); else - gripe_assign_conversion_failed (type_name (), - rhs.type_name ()); + err_assign_conversion_failed (type_name (), + rhs.type_name ()); } if (cf_this || cf_rhs) @@ -1442,14 +1442,13 @@ done = true; } else - gripe_no_conversion (octave_value::assign_op_as_string - (octave_value::op_asn_eq), - type_name (), rhs.type_name ()); + err_no_conversion (octave_value::assign_op_as_string + (octave_value::op_asn_eq), + type_name (), rhs.type_name ()); } } - // The assignment may have converted to a type that is wider than - // necessary. + // The assignment may have converted to a type that is wider than necessary. retval.maybe_mutate ();
--- a/libinterp/octave-value/ov-base.h Mon Jan 18 19:23:56 2016 -0800 +++ b/libinterp/octave-value/ov-base.h Mon Jan 18 21:06:26 2016 -0800 @@ -825,8 +825,8 @@ static const char *get_umap_name (unary_mapper_t); - void gripe_load (const char *type) const; - void gripe_save (const char *type) const; + void warn_load (const char *type) const; + void warn_save (const char *type) const; private:
--- a/libinterp/octave-value/ov-bool-mat.cc Mon Jan 18 19:23:56 2016 -0800 +++ b/libinterp/octave-value/ov-bool-mat.cc Mon Jan 18 21:06:26 2016 -0800 @@ -432,7 +432,7 @@ H5Sclose (space_hid); #else - gripe_save ("hdf5"); + warn_save ("hdf5"); #endif return retval; @@ -503,7 +503,7 @@ H5Dclose (data_hid); #else - gripe_load ("hdf5"); + warn_load ("hdf5"); #endif return retval;
--- a/libinterp/octave-value/ov-bool-sparse.cc Mon Jan 18 19:23:56 2016 -0800 +++ b/libinterp/octave-value/ov-bool-sparse.cc Mon Jan 18 21:06:26 2016 -0800 @@ -546,7 +546,7 @@ H5Gclose (group_hid); #else - gripe_save ("hdf5"); + warn_save ("hdf5"); #endif return retval; @@ -785,7 +785,7 @@ H5Gclose (group_hid); #else - gripe_load ("hdf5"); + warn_load ("hdf5"); #endif return retval;
--- a/libinterp/octave-value/ov-bool.cc Mon Jan 18 19:23:56 2016 -0800 +++ b/libinterp/octave-value/ov-bool.cc Mon Jan 18 21:06:26 2016 -0800 @@ -190,7 +190,7 @@ H5Sclose (space_hid); #else - gripe_save ("hdf5"); + warn_save ("hdf5"); #endif return retval; @@ -229,7 +229,7 @@ H5Dclose (data_hid); #else - gripe_load ("hdf5"); + warn_load ("hdf5"); #endif return true;
--- a/libinterp/octave-value/ov-cell.cc Mon Jan 18 19:23:56 2016 -0800 +++ b/libinterp/octave-value/ov-cell.cc Mon Jan 18 21:06:26 2016 -0800 @@ -1057,7 +1057,7 @@ return true; #else - gripe_save ("hdf5"); + warn_save ("hdf5"); return false; #endif } @@ -1167,7 +1167,7 @@ } #else - gripe_load ("hdf5"); + warn_load ("hdf5"); #endif return retval;
--- a/libinterp/octave-value/ov-class.cc Mon Jan 18 19:23:56 2016 -0800 +++ b/libinterp/octave-value/ov-class.cc Mon Jan 18 21:06:26 2016 -0800 @@ -1477,7 +1477,7 @@ return true; #else - gripe_save ("hdf5"); + warn_save ("hdf5"); return false; #endif } @@ -1612,7 +1612,7 @@ H5Gclose (group_hid); #else - gripe_load ("hdf5"); + warn_load ("hdf5"); #endif return retval;
--- a/libinterp/octave-value/ov-classdef.cc Mon Jan 18 19:23:56 2016 -0800 +++ b/libinterp/octave-value/ov-classdef.cc Mon Jan 18 21:06:26 2016 -0800 @@ -50,7 +50,7 @@ OCTAVE_NORETURN static void -gripe_method_access (const std::string& from, const cdef_method& meth) +err_method_access (const std::string& from, const cdef_method& meth) { octave_value acc = meth.get ("Access"); std::string acc_s; @@ -66,7 +66,7 @@ OCTAVE_NORETURN static void -gripe_property_access (const std::string& from, const cdef_property& prop, +err_property_access (const std::string& from, const cdef_property& prop, bool is_set = false) { octave_value acc = prop.get (is_set ? "SetAccess" : "GetAccess"); @@ -2911,7 +2911,7 @@ octave_value retval; if (do_check_access && ! check_get_access ()) - gripe_property_access (who, wrap (), false); + err_property_access (who, wrap (), false); if (! obj.is_constructed ()) { @@ -2947,7 +2947,7 @@ const std::string& who) { if (do_check_access && ! check_get_access ()) - gripe_property_access (who, wrap (), false); + err_property_access (who, wrap (), false); return get ("DefaultValue"); } @@ -2966,7 +2966,7 @@ const std::string& who) { if (do_check_access && ! check_set_access ()) - gripe_property_access (who, wrap (), true); + err_property_access (who, wrap (), true); if (! obj.is_constructed ()) { @@ -3083,7 +3083,7 @@ octave_value_list retval; if (do_check_access && ! check_access ()) - gripe_method_access (who, wrap ()); + err_method_access (who, wrap ()); if (get ("Abstract").bool_value ()) error ("%s: cannot execute abstract method", @@ -3106,7 +3106,7 @@ octave_value_list retval; if (do_check_access && ! check_access ()) - gripe_method_access (who, wrap ()); + err_method_access (who, wrap ()); if (get ("Abstract").bool_value ()) error ("%s: cannot execute abstract method",
--- a/libinterp/octave-value/ov-classdef.h Mon Jan 18 19:23:56 2016 -0800 +++ b/libinterp/octave-value/ov-classdef.h Mon Jan 18 21:06:26 2016 -0800 @@ -57,26 +57,26 @@ virtual cdef_class get_class (void) const; virtual void set_class (const cdef_class&) - { gripe_invalid_object ("set_class"); } + { err_invalid_object ("set_class"); } virtual cdef_object_rep* clone (void) const { - gripe_invalid_object ("clone"); + err_invalid_object ("clone"); } virtual cdef_object_rep* empty_clone (void) const { - gripe_invalid_object ("empty_clone"); + err_invalid_object ("empty_clone"); } virtual cdef_object_rep* copy (void) const { - gripe_invalid_object ("copy"); + err_invalid_object ("copy"); } virtual cdef_object_rep* make_array (void) const { - gripe_invalid_object ("make_array"); + err_invalid_object ("make_array"); } virtual bool is_array (void) const { return false; } @@ -89,29 +89,29 @@ virtual Array<cdef_object> array_value (void) const { - gripe_invalid_object ("array_value"); + err_invalid_object ("array_value"); } virtual void put (const std::string&, const octave_value&) - { gripe_invalid_object ("put"); } + { err_invalid_object ("put"); } virtual octave_value get (const std::string&) const { - gripe_invalid_object ("get"); + err_invalid_object ("get"); } virtual octave_value_list subsref (const std::string&, const std::list<octave_value_list>&, int, size_t&, const cdef_class&, bool) { - gripe_invalid_object ("subsref"); + err_invalid_object ("subsref"); } virtual octave_value subsasgn (const std::string&, const std::list<octave_value_list>&, const octave_value&) { - gripe_invalid_object ("subsasgn"); + err_invalid_object ("subsasgn"); } virtual string_vector map_keys (void) const; @@ -122,32 +122,32 @@ virtual void mark_for_construction (const cdef_class&) { - gripe_invalid_object ("mark_for_construction"); + err_invalid_object ("mark_for_construction"); } virtual bool is_constructed_for (const cdef_class&) const { - gripe_invalid_object ("is_constructed_for"); + err_invalid_object ("is_constructed_for"); } virtual bool is_partially_constructed_for (const cdef_class&) const { - gripe_invalid_object ("is_partially_constructed_for"); + err_invalid_object ("is_partially_constructed_for"); } virtual void mark_as_constructed (void) { - gripe_invalid_object ("mark_as_constructed"); + err_invalid_object ("mark_as_constructed"); } virtual void mark_as_constructed (const cdef_class&) { - gripe_invalid_object ("mark_as_constructed"); + err_invalid_object ("mark_as_constructed"); } virtual bool is_constructed (void) const { - gripe_invalid_object ("is_constructed"); + err_invalid_object ("is_constructed"); } virtual octave_idx_type static_count (void) const { return 0; } @@ -175,7 +175,7 @@ // No assignment cdef_object_rep& operator = (const cdef_object_rep& ); - OCTAVE_NORETURN void gripe_invalid_object (const char *who) const + OCTAVE_NORETURN void err_invalid_object (const char *who) const { error ("%s: invalid object", who); } }; @@ -1163,7 +1163,7 @@ inline cdef_class cdef_object_rep::get_class (void) const { - gripe_invalid_object ("get_class"); + err_invalid_object ("get_class"); } inline std::string
--- a/libinterp/octave-value/ov-complex.cc Mon Jan 18 19:23:56 2016 -0800 +++ b/libinterp/octave-value/ov-complex.cc Mon Jan 18 21:06:26 2016 -0800 @@ -392,7 +392,7 @@ H5Sclose (space_hid); #else - gripe_save ("hdf5"); + warn_save ("hdf5"); #endif return retval; @@ -446,7 +446,7 @@ H5Dclose (data_hid); #else - gripe_load ("hdf5"); + warn_load ("hdf5"); #endif return retval;
--- a/libinterp/octave-value/ov-cx-mat.cc Mon Jan 18 19:23:56 2016 -0800 +++ b/libinterp/octave-value/ov-cx-mat.cc Mon Jan 18 21:06:26 2016 -0800 @@ -626,7 +626,7 @@ return retval; #else - gripe_save ("hdf5"); + warn_save ("hdf5"); return false; #endif } @@ -706,7 +706,7 @@ H5Dclose (data_hid); #else - gripe_load ("hdf5"); + warn_load ("hdf5"); #endif return retval;
--- a/libinterp/octave-value/ov-cx-sparse.cc Mon Jan 18 19:23:56 2016 -0800 +++ b/libinterp/octave-value/ov-cx-sparse.cc Mon Jan 18 21:06:26 2016 -0800 @@ -615,7 +615,7 @@ H5Gclose (group_hid); #else - gripe_save ("hdf5"); + warn_save ("hdf5"); #endif return retval; @@ -863,7 +863,7 @@ H5Gclose (group_hid); #else - gripe_load ("hdf5"); + warn_load ("hdf5"); #endif return retval;
--- a/libinterp/octave-value/ov-fcn-handle.cc Mon Jan 18 19:23:56 2016 -0800 +++ b/libinterp/octave-value/ov-fcn-handle.cc Mon Jan 18 21:06:26 2016 -0800 @@ -911,7 +911,7 @@ return retval; #else - gripe_save ("hdf5"); + warn_save ("hdf5"); return false; #endif } @@ -1268,7 +1268,7 @@ return success; #else - gripe_load ("hdf5"); + warn_load ("hdf5"); return false; #endif }
--- a/libinterp/octave-value/ov-fcn-inline.cc Mon Jan 18 19:23:56 2016 -0800 +++ b/libinterp/octave-value/ov-fcn-inline.cc Mon Jan 18 21:06:26 2016 -0800 @@ -413,7 +413,7 @@ H5Gclose (group_hid); #else - gripe_save ("hdf5"); + warn_save ("hdf5"); #endif return retval; @@ -605,7 +605,7 @@ return true; #else - gripe_load ("hdf5"); + warn_load ("hdf5"); return false; #endif }
--- a/libinterp/octave-value/ov-float.cc Mon Jan 18 19:23:56 2016 -0800 +++ b/libinterp/octave-value/ov-float.cc Mon Jan 18 21:06:26 2016 -0800 @@ -217,7 +217,7 @@ H5Sclose (space_hid); #else - gripe_save ("hdf5"); + warn_save ("hdf5"); #endif return retval; @@ -258,7 +258,7 @@ return true; #else - gripe_load ("hdf5"); + warn_load ("hdf5"); return false; #endif }
--- a/libinterp/octave-value/ov-flt-complex.cc Mon Jan 18 19:23:56 2016 -0800 +++ b/libinterp/octave-value/ov-flt-complex.cc Mon Jan 18 21:06:26 2016 -0800 @@ -336,7 +336,7 @@ H5Sclose (space_hid); #else - gripe_save ("hdf5"); + warn_save ("hdf5"); #endif return retval; @@ -390,7 +390,7 @@ H5Dclose (data_hid); #else - gripe_load ("hdf5"); + warn_load ("hdf5"); #endif return retval;
--- a/libinterp/octave-value/ov-flt-cx-mat.cc Mon Jan 18 19:23:56 2016 -0800 +++ b/libinterp/octave-value/ov-flt-cx-mat.cc Mon Jan 18 21:06:26 2016 -0800 @@ -576,7 +576,7 @@ H5Sclose (space_hid); #else - gripe_save ("hdf5"); + warn_save ("hdf5"); #endif return retval; @@ -657,7 +657,7 @@ H5Dclose (data_hid); #else - gripe_load ("hdf5"); + warn_load ("hdf5"); #endif return retval;
--- a/libinterp/octave-value/ov-flt-re-mat.cc Mon Jan 18 19:23:56 2016 -0800 +++ b/libinterp/octave-value/ov-flt-re-mat.cc Mon Jan 18 21:06:26 2016 -0800 @@ -582,7 +582,7 @@ H5Sclose (space_hid); #else - gripe_save ("hdf5"); + warn_save ("hdf5"); #endif return retval; @@ -650,7 +650,7 @@ H5Dclose (data_hid); #else - gripe_load ("hdf5"); + warn_load ("hdf5"); #endif return retval;
--- a/libinterp/octave-value/ov-oncleanup.h Mon Jan 18 19:23:56 2016 -0800 +++ b/libinterp/octave-value/ov-oncleanup.h Mon Jan 18 21:06:26 2016 -0800 @@ -26,11 +26,6 @@ #include "ov-struct.h" #include "ov.h" -static void -gripe_internal (void) -{ - error ("onCleanup: internal error: cloning nonempty object"); -} class octave_oncleanup : public octave_base_value { @@ -42,7 +37,7 @@ octave_base_value *clone (void) const { if (fcn.is_defined ()) - gripe_internal (); + error ("onCleanup: internal error: cloning nonempty object"); return empty_clone (); }
--- a/libinterp/octave-value/ov-range.cc Mon Jan 18 19:23:56 2016 -0800 +++ b/libinterp/octave-value/ov-range.cc Mon Jan 18 21:06:26 2016 -0800 @@ -607,7 +607,7 @@ H5Sclose (space_hid); #else - gripe_save ("hdf5"); + warn_save ("hdf5"); #endif return retval; @@ -671,7 +671,7 @@ H5Dclose (data_hid); #else - gripe_load ("hdf5"); + warn_load ("hdf5"); #endif return retval;
--- a/libinterp/octave-value/ov-re-mat.cc Mon Jan 18 19:23:56 2016 -0800 +++ b/libinterp/octave-value/ov-re-mat.cc Mon Jan 18 21:06:26 2016 -0800 @@ -705,7 +705,7 @@ H5Sclose (space_hid); #else - gripe_save ("hdf5"); + warn_save ("hdf5"); #endif return retval; @@ -773,7 +773,7 @@ H5Dclose (data_hid); #else - gripe_load ("hdf5"); + warn_load ("hdf5"); #endif return retval;
--- a/libinterp/octave-value/ov-re-sparse.cc Mon Jan 18 19:23:56 2016 -0800 +++ b/libinterp/octave-value/ov-re-sparse.cc Mon Jan 18 21:06:26 2016 -0800 @@ -623,7 +623,7 @@ H5Gclose (group_hid); #else - gripe_save ("hdf5"); + warn_save ("hdf5"); #endif return retval; @@ -856,7 +856,7 @@ H5Gclose (group_hid); #else - gripe_load ("hdf5"); + warn_load ("hdf5"); #endif return retval;
--- a/libinterp/octave-value/ov-scalar.cc Mon Jan 18 19:23:56 2016 -0800 +++ b/libinterp/octave-value/ov-scalar.cc Mon Jan 18 21:06:26 2016 -0800 @@ -234,7 +234,7 @@ H5Sclose (space_hid); #else - gripe_save ("hdf5"); + warn_save ("hdf5"); #endif return retval; @@ -275,7 +275,7 @@ return true; #else - gripe_load ("hdf5"); + warn_load ("hdf5"); return false; #endif }
--- a/libinterp/octave-value/ov-str-mat.cc Mon Jan 18 19:23:56 2016 -0800 +++ b/libinterp/octave-value/ov-str-mat.cc Mon Jan 18 21:06:26 2016 -0800 @@ -585,7 +585,7 @@ H5Sclose (space_hid); #else - gripe_save ("hdf5"); + warn_save ("hdf5"); #endif return retval; @@ -760,7 +760,7 @@ } #else - gripe_load ("hdf5"); + warn_load ("hdf5"); #endif return retval;
--- a/libinterp/octave-value/ov-struct.cc Mon Jan 18 19:23:56 2016 -0800 +++ b/libinterp/octave-value/ov-struct.cc Mon Jan 18 21:06:26 2016 -0800 @@ -913,7 +913,7 @@ return true; #else - gripe_save ("hdf5"); + warn_save ("hdf5"); return false; #endif } @@ -961,7 +961,7 @@ } #else - gripe_load ("hdf5"); + warn_load ("hdf5"); #endif return retval; @@ -1513,7 +1513,7 @@ return true; #else - gripe_save ("hdf5"); + warn_save ("hdf5"); return false; #endif } @@ -1559,7 +1559,7 @@ } #else - gripe_load ("hdf5"); + warn_load ("hdf5"); #endif return retval;
--- 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
--- a/libinterp/parse-tree/lex.h Mon Jan 18 19:23:56 2016 -0800 +++ b/libinterp/parse-tree/lex.h Mon Jan 18 21:06:26 2016 -0800 @@ -606,15 +606,15 @@ void maybe_warn_separator_insert (char sep); - void gripe_single_quote_string (void); + void warn_single_quote_string (void); - void gripe_language_extension (const std::string& msg); + void warn_language_extension (const std::string& msg); - void maybe_gripe_language_extension_comment (char c); + void maybe_warn_language_extension_comment (char c); - void gripe_language_extension_continuation (void); + void warn_language_extension_continuation (void); - void gripe_language_extension_operator (const std::string& op); + void warn_language_extension_operator (const std::string& op); void push_token (token *);
--- a/libinterp/parse-tree/lex.ll Mon Jan 18 19:23:56 2016 -0800 +++ b/libinterp/parse-tree/lex.ll Mon Jan 18 21:06:26 2016 -0800 @@ -523,7 +523,7 @@ curr_lexer->current_input_column = 1; if (curr_lexer->nesting_level.is_paren ()) - curr_lexer->gripe_language_extension ("bare newline inside parentheses"); + curr_lexer->warn_language_extension ("bare newline inside parentheses"); else { int tok = curr_lexer->previous_token_value (); @@ -1356,7 +1356,7 @@ curr_lexer->current_input_column = 1; curr_lexer->at_beginning_of_statement = false; - curr_lexer->gripe_language_extension + curr_lexer->warn_language_extension ("bare newline inside parentheses"); } else if (curr_lexer->nesting_level.none () @@ -2827,7 +2827,7 @@ int offset = 1; if (yytxt[0] == '\\') - gripe_language_extension_continuation (); + warn_language_extension_continuation (); else offset = 3; @@ -3138,7 +3138,7 @@ } void -octave_base_lexer::gripe_single_quote_string (void) +octave_base_lexer::warn_single_quote_string (void) { std::string nm = fcn_file_full_name; @@ -3153,7 +3153,7 @@ } void -octave_base_lexer::gripe_language_extension (const std::string& msg) +octave_base_lexer::warn_language_extension (const std::string& msg) { std::string nm = fcn_file_full_name; @@ -3168,26 +3168,26 @@ } void -octave_base_lexer::maybe_gripe_language_extension_comment (char c) +octave_base_lexer::maybe_warn_language_extension_comment (char c) { if (c == '#') - gripe_language_extension ("# used as comment character"); + warn_language_extension ("# used as comment character"); } void -octave_base_lexer::gripe_language_extension_continuation (void) +octave_base_lexer::warn_language_extension_continuation (void) { - gripe_language_extension ("\\ used as line continuation marker"); + warn_language_extension ("\\ used as line continuation marker"); } void -octave_base_lexer::gripe_language_extension_operator (const std::string& op) +octave_base_lexer::warn_language_extension_operator (const std::string& op) { std::string t = op; int n = t.length (); if (t[n-1] == '\n') t.resize (n-1); - gripe_language_extension (t + " used as operator"); + warn_language_extension (t + " used as operator"); } void @@ -3493,7 +3493,7 @@ octave_base_lexer::handle_op_internal (int tok, bool bos, bool compat) { if (! compat) - gripe_language_extension_operator (flex_yytext ()); + warn_language_extension_operator (flex_yytext ()); push_token (new token (tok, input_line_number, current_input_column));
--- 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 ());
--- a/libinterp/parse-tree/pt-check.h Mon Jan 18 19:23:56 2016 -0800 +++ b/libinterp/parse-tree/pt-check.h Mon Jan 18 21:06:26 2016 -0800 @@ -131,7 +131,7 @@ void do_decl_command (tree_decl_command&); - void gripe (const std::string& msg, int line); + OCTAVE_NORETURN void errmsg (const std::string& msg, int line); // No copying!
--- a/liboctave/array/PermMatrix.cc Mon Jan 18 19:23:56 2016 -0800 +++ b/liboctave/array/PermMatrix.cc Mon Jan 18 21:06:26 2016 -0800 @@ -29,8 +29,9 @@ #include "Array-util.h" #include "oct-locbuf.h" -static void -gripe_invalid_permutation (void) +OCTAVE_NORETURN static +void +err_invalid_permutation (void) { (*current_liboctave_error_handler) ("PermMatrix: invalid permutation vector"); @@ -43,7 +44,7 @@ { if (! idx_vector (p).is_permutation (p.numel ())) { - gripe_invalid_permutation (); + err_invalid_permutation (); Array<octave_idx_type>::operator = (Array<octave_idx_type> ()); } } @@ -70,13 +71,11 @@ octave_idx_type len = idx.length (n); if (! idx.is_permutation (len)) - gripe_invalid_permutation (); - else - { - Array<octave_idx_type> idxa (dim_vector (len, 1)); - for (octave_idx_type i = 0; i < len; i++) idxa(i) = idx(i); - Array<octave_idx_type>::operator = (idxa); - } + err_invalid_permutation (); + + Array<octave_idx_type> idxa (dim_vector (len, 1)); + for (octave_idx_type i = 0; i < len; i++) idxa(i) = idx(i); + Array<octave_idx_type>::operator = (idxa); if (! colp) *this = this->transpose ();
--- a/liboctave/array/idx-vector.cc Mon Jan 18 19:23:56 2016 -0800 +++ b/liboctave/array/idx-vector.cc Mon Jan 18 21:06:26 2016 -0800 @@ -40,11 +40,11 @@ #include "lo-error.h" #include "lo-mappers.h" -static void -gripe_invalid_range (void) +OCTAVE_NORETURN static +void +err_invalid_range (void) { - (*current_liboctave_error_handler) - ("invalid range used as index"); + (*current_liboctave_error_handler) ("invalid range used as index"); } static void @@ -110,7 +110,7 @@ { if (len < 0) { - gripe_invalid_range (); + err_invalid_range (); err = true; } else if (start < 0) @@ -129,11 +129,9 @@ : start (0), len (r.numel ()), step (1) { if (len < 0) - { - gripe_invalid_range (); - err = true; - } - else if (len > 0) + err_invalid_range (); + + if (len > 0) { if (r.all_elements_are_ints ()) { @@ -233,12 +231,8 @@ convert_index (octave_idx_type i, bool& conv_error, octave_idx_type& ext) { - if (i <= 0) - { - if (! conv_error) // only gripe once, for things like A(-10000:0) - err_invalid_index (i-1); - conv_error = true; - } + if (i <= 0 && ! conv_error) + err_invalid_index (i-1); if (ext < i) ext = i;
--- a/liboctave/numeric/lo-specfun.cc Mon Jan 18 19:23:56 2016 -0800 +++ b/liboctave/numeric/lo-specfun.cc Mon Jan 18 21:06:26 2016 -0800 @@ -2260,8 +2260,8 @@ return retval; } -static void -gripe_betainc_nonconformant (const dim_vector& d1, const dim_vector& d2, +OCTAVE_NORETURN static void +err_betainc_nonconformant (const dim_vector& d1, const dim_vector& d2, const dim_vector& d3) { std::string d1_str = d1.str (); @@ -2273,8 +2273,8 @@ d1_str.c_str (), d2_str.c_str (), d3_str.c_str ()); } -static void -gripe_betaincinv_nonconformant (const dim_vector& d1, const dim_vector& d2, +OCTAVE_NORETURN static void +err_betaincinv_nonconformant (const dim_vector& d1, const dim_vector& d2, const dim_vector& d3) { std::string d1_str = d1.str (); @@ -2344,7 +2344,7 @@ *pretval++ = betainc (x, a(i), b(i)); } else - gripe_betainc_nonconformant (dim_vector (0, 0), dv, b.dims ()); + err_betainc_nonconformant (dim_vector (0, 0), dv, b.dims ()); return retval; } @@ -2383,7 +2383,7 @@ *pretval++ = betainc (x(i), a, b(i)); } else - gripe_betainc_nonconformant (dv, dim_vector (0, 0), b.dims ()); + err_betainc_nonconformant (dv, dim_vector (0, 0), b.dims ()); return retval; } @@ -2406,7 +2406,7 @@ *pretval++ = betainc (x(i), a(i), b); } else - gripe_betainc_nonconformant (dv, a.dims (), dim_vector (0, 0)); + err_betainc_nonconformant (dv, a.dims (), dim_vector (0, 0)); return retval; } @@ -2429,7 +2429,7 @@ *pretval++ = betainc (x(i), a(i), b(i)); } else - gripe_betainc_nonconformant (dv, a.dims (), b.dims ()); + err_betainc_nonconformant (dv, a.dims (), b.dims ()); return retval; } @@ -2492,7 +2492,7 @@ *pretval++ = betainc (x, a(i), b(i)); } else - gripe_betainc_nonconformant (dim_vector (0, 0), dv, b.dims ()); + err_betainc_nonconformant (dim_vector (0, 0), dv, b.dims ()); return retval; } @@ -2531,7 +2531,7 @@ *pretval++ = betainc (x(i), a, b(i)); } else - gripe_betainc_nonconformant (dv, dim_vector (0, 0), b.dims ()); + err_betainc_nonconformant (dv, dim_vector (0, 0), b.dims ()); return retval; } @@ -2554,7 +2554,7 @@ *pretval++ = betainc (x(i), a(i), b); } else - gripe_betainc_nonconformant (dv, a.dims (), dim_vector (0, 0)); + err_betainc_nonconformant (dv, a.dims (), dim_vector (0, 0)); return retval; } @@ -2577,7 +2577,7 @@ *pretval++ = betainc (x(i), a(i), b(i)); } else - gripe_betainc_nonconformant (dv, a.dims (), b.dims ()); + err_betainc_nonconformant (dv, a.dims (), b.dims ()); return retval; } @@ -3551,7 +3551,7 @@ *pretval++ = betaincinv (x, a(i), b(i)); } else - gripe_betaincinv_nonconformant (dim_vector (0, 0), dv, b.dims ()); + err_betaincinv_nonconformant (dim_vector (0, 0), dv, b.dims ()); return retval; } @@ -3590,7 +3590,7 @@ *pretval++ = betaincinv (x(i), a, b(i)); } else - gripe_betaincinv_nonconformant (dv, dim_vector (0, 0), b.dims ()); + err_betaincinv_nonconformant (dv, dim_vector (0, 0), b.dims ()); return retval; } @@ -3613,7 +3613,7 @@ *pretval++ = betaincinv (x(i), a(i), b); } else - gripe_betaincinv_nonconformant (dv, a.dims (), dim_vector (0, 0)); + err_betaincinv_nonconformant (dv, a.dims (), dim_vector (0, 0)); return retval; } @@ -3637,7 +3637,7 @@ *pretval++ = betaincinv (x(i), a(i), b(i)); } else - gripe_betaincinv_nonconformant (dv, a.dims (), b.dims ()); + err_betaincinv_nonconformant (dv, a.dims (), b.dims ()); return retval; }
--- a/liboctave/system/oct-group.cc Mon Jan 18 19:23:56 2016 -0800 +++ b/liboctave/system/oct-group.cc Mon Jan 18 21:06:26 2016 -0800 @@ -37,11 +37,18 @@ #define NOT_SUPPORTED(nm) \ nm ": not supported on this system" +OCTAVE_NORETURN static +void +err_invalid (void) +{ + (*current_liboctave_error_handler) ("invalid group object"); +} + std::string octave_group::name (void) const { if (! ok ()) - gripe_invalid (); + err_invalid (); return gr_name; } @@ -50,7 +57,7 @@ octave_group::passwd (void) const { if (! ok ()) - gripe_invalid (); + err_invalid (); return gr_passwd; } @@ -59,7 +66,7 @@ octave_group::gid (void) const { if (! ok ()) - gripe_invalid (); + err_invalid (); return gr_gid; } @@ -68,7 +75,7 @@ octave_group::mem (void) const { if (! ok ()) - gripe_invalid (); + err_invalid (); return gr_mem; } @@ -214,8 +221,3 @@ #endif } -void -octave_group::gripe_invalid (void) const -{ - (*current_liboctave_error_handler) ("invalid group object"); -}
--- a/liboctave/system/oct-group.h Mon Jan 18 19:23:56 2016 -0800 +++ b/liboctave/system/oct-group.h Mon Jan 18 21:06:26 2016 -0800 @@ -105,8 +105,6 @@ // This is how we will create an octave_group object from a pointer // to a struct group. octave_group (void *p, std::string& msg); - - void gripe_invalid (void) const; }; #endif
--- a/liboctave/system/oct-passwd.cc Mon Jan 18 19:23:56 2016 -0800 +++ b/liboctave/system/oct-passwd.cc Mon Jan 18 21:06:26 2016 -0800 @@ -36,11 +36,18 @@ #define NOT_SUPPORTED(nm) \ nm ": not supported on this system" +OCTAVE_NORETURN static +void +err_invalid (void) +{ + (*current_liboctave_error_handler) ("invalid password object"); +} + std::string octave_passwd::name (void) const { if (! ok ()) - gripe_invalid (); + err_invalid (); return pw_name; } @@ -49,7 +56,7 @@ octave_passwd::passwd (void) const { if (! ok ()) - gripe_invalid (); + err_invalid (); return pw_passwd; } @@ -58,7 +65,7 @@ octave_passwd::uid (void) const { if (! ok ()) - gripe_invalid (); + err_invalid (); return pw_uid; } @@ -67,7 +74,7 @@ octave_passwd::gid (void) const { if (! ok ()) - gripe_invalid (); + err_invalid (); return pw_gid; } @@ -76,7 +83,7 @@ octave_passwd::gecos (void) const { if (! ok ()) - gripe_invalid (); + err_invalid (); return pw_gecos; } @@ -85,7 +92,7 @@ octave_passwd::dir (void) const { if (! ok ()) - gripe_invalid (); + err_invalid (); return pw_dir; } @@ -94,7 +101,7 @@ octave_passwd::shell (void) const { if (! ok ()) - gripe_invalid (); + err_invalid (); return pw_shell; } @@ -222,8 +229,3 @@ #endif } -void -octave_passwd::gripe_invalid (void) const -{ - (*current_liboctave_error_handler) ("invalid password object"); -}
--- a/liboctave/system/oct-passwd.h Mon Jan 18 19:23:56 2016 -0800 +++ b/liboctave/system/oct-passwd.h Mon Jan 18 21:06:26 2016 -0800 @@ -125,8 +125,6 @@ // This is how we will create an octave_passwd object from a pointer // to a struct passwd. octave_passwd (void *p, std::string& msg); - - void gripe_invalid (void) const; }; #endif
--- a/liboctave/util/data-conv.cc Mon Jan 18 19:23:56 2016 -0800 +++ b/liboctave/util/data-conv.cc Mon Jan 18 21:06:26 2016 -0800 @@ -617,8 +617,9 @@ // Loading variables from files. -static void -gripe_unrecognized_float_fmt (void) +OCTAVE_NORETURN static +void +err_unrecognized_float_fmt (void) { (*current_liboctave_error_handler) ("unrecognized floating point format requested"); @@ -675,7 +676,7 @@ break; default: - gripe_unrecognized_float_fmt (); + err_unrecognized_float_fmt (); break; } break; @@ -691,7 +692,7 @@ break; default: - gripe_unrecognized_float_fmt (); + err_unrecognized_float_fmt (); break; } break; @@ -722,7 +723,7 @@ break; default: - gripe_unrecognized_float_fmt (); + err_unrecognized_float_fmt (); break; } break; @@ -738,7 +739,7 @@ break; default: - gripe_unrecognized_float_fmt (); + err_unrecognized_float_fmt (); break; } break;
--- a/liboctave/util/lo-cutils.c Mon Jan 18 19:23:56 2016 -0800 +++ b/liboctave/util/lo-cutils.c Mon Jan 18 21:06:26 2016 -0800 @@ -80,7 +80,7 @@ } static inline void -gripe_missing_wait_macro (const char *id, int status) +warn_missing_wait_macro (const char *id, int status) { (*current_liboctave_warning_handler) ("%s always returns false in this version of Octave; status = %d", @@ -95,7 +95,7 @@ #if defined (WIFEXITED) retval = WIFEXITED (status); #else - gripe_missing_wait_macro ("WIFEXITED", status); + warn_missing_wait_macro ("WIFEXITED", status); #endif return retval; @@ -109,7 +109,7 @@ #if defined (WEXITSTATUS) retval = WEXITSTATUS (status); #else - gripe_missing_wait_macro ("WEXITSTATUS", status); + warn_missing_wait_macro ("WEXITSTATUS", status); #endif return retval; @@ -123,7 +123,7 @@ #if defined (WIFSIGNALED) retval = WIFSIGNALED (status); #else - gripe_missing_wait_macro ("WIFSIGNALED", status); + warn_missing_wait_macro ("WIFSIGNALED", status); #endif return retval; @@ -137,7 +137,7 @@ #if defined (WTERMSIG) retval = WTERMSIG (status); #else - gripe_missing_wait_macro ("WTERMSIG", status); + warn_missing_wait_macro ("WTERMSIG", status); #endif return retval; @@ -151,7 +151,7 @@ #if defined (WCOREDUMP) retval = WCOREDUMP (status); #else - gripe_missing_wait_macro ("WCOREDUMP", status); + warn_missing_wait_macro ("WCOREDUMP", status); #endif return retval; @@ -165,7 +165,7 @@ #if defined (WIFSTOPPED) retval = WIFSTOPPED (status); #else - gripe_missing_wait_macro ("WIFSTOPPED", status); + warn_missing_wait_macro ("WIFSTOPPED", status); #endif return retval; @@ -179,7 +179,7 @@ #if defined (WSTOPSIG) retval = WSTOPSIG (status); #else - gripe_missing_wait_macro ("WSTOPSIG", status); + warn_missing_wait_macro ("WSTOPSIG", status); #endif return retval; @@ -193,7 +193,7 @@ #if defined (WIFCONTINUED) retval = WIFCONTINUED (status); #else - gripe_missing_wait_macro ("WIFCONTINUED", status); + warn_missing_wait_macro ("WIFCONTINUED", status); #endif return retval;
--- a/liboctave/util/unwind-prot.cc Mon Jan 18 19:23:56 2016 -0800 +++ b/liboctave/util/unwind-prot.cc Mon Jan 18 21:06:26 2016 -0800 @@ -29,9 +29,10 @@ #include "unwind-prot.h" void -unwind_protect_safe::gripe_exception (void) +unwind_protect_safe::err_unhandled_exception (void) { // FIXME: can this throw an exception? + // Yes, it can now (1/18/16). Maybe this needs to be re-done? (*current_liboctave_error_handler) ("internal: unhandled exception in unwind_protect handler");
--- a/liboctave/util/unwind-prot.h Mon Jan 18 19:23:56 2016 -0800 +++ b/liboctave/util/unwind-prot.h Mon Jan 18 21:06:26 2016 -0800 @@ -112,7 +112,7 @@ { private: - static void gripe_exception (void); + static void err_unhandled_exception (void); public: @@ -126,9 +126,9 @@ { run_first (); } - catch (...) // Yes, the black hole. Remember we're in a dtor. + catch (...) // Yes, the black hole. Remember we're in a destructor. { - gripe_exception (); + err_unhandled_exception (); } } }