Mercurial > octave

comparison liboctave/system/oct-group.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 93748bcaec17
children f7121e111991
comparison
equal deleted inserted replaced
21101:2e8aea678f2a 21102:dfcb9d74b253
35 #include "str-vec.h" 35 #include "str-vec.h"
36 36
37 #define NOT_SUPPORTED(nm) \ 37 #define NOT_SUPPORTED(nm) \
38 nm ": not supported on this system" 38 nm ": not supported on this system"
39 39
40 OCTAVE_NORETURN static
41 void
42 err_invalid (void)
43 {
44 (*current_liboctave_error_handler) ("invalid group object");
45 }
46
40 std::string 47 std::string
41 octave_group::name (void) const 48 octave_group::name (void) const
42 { 49 {
43 if (! ok ()) 50 if (! ok ())
44 gripe_invalid (); 51 err_invalid ();
45 52
46 return gr_name; 53 return gr_name;
47 } 54 }
48 55
49 std::string 56 std::string
50 octave_group::passwd (void) const 57 octave_group::passwd (void) const
51 { 58 {
52 if (! ok ()) 59 if (! ok ())
53 gripe_invalid (); 60 err_invalid ();
54 61
55 return gr_passwd; 62 return gr_passwd;
56 } 63 }
57 64
58 gid_t 65 gid_t
59 octave_group::gid (void) const 66 octave_group::gid (void) const
60 { 67 {
61 if (! ok ()) 68 if (! ok ())
62 gripe_invalid (); 69 err_invalid ();
63 70
64 return gr_gid; 71 return gr_gid;
65 } 72 }
66 73
67 string_vector 74 string_vector
68 octave_group::mem (void) const 75 octave_group::mem (void) const
69 { 76 {
70 if (! ok ()) 77 if (! ok ())
71 gripe_invalid (); 78 err_invalid ();
72 79
73 return gr_mem; 80 return gr_mem;
74 } 81 }
75 82
76 octave_group 83 octave_group
212 #else 219 #else
213 msg = NOT_SUPPORTED ("group functions"); 220 msg = NOT_SUPPORTED ("group functions");
214 #endif 221 #endif
215 } 222 }
216 223
217 void
218 octave_group::gripe_invalid (void) const
219 {
220 (*current_liboctave_error_handler) ("invalid group object");
221 }