Mercurial > octave
diff libinterp/octave-value/ov-base.cc @ 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.
| 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-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 ();