diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-05-04 12:29:19 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-05-04 12:29:19 +0900 |
| commit | 0fe62ddcd3c2285515e2f4cd1fa27e8383e60711 (patch) | |
| tree | 2a874a95234ab2e0d6d8a23b97110b3bb3ed87b1 /src | |
| parent | b87bfe73569756dea0a32260411d679618d67d11 (diff) | |
| parent | cf80e7fe2150682f348049cca7bae85fed624596 (diff) | |
| download | mruby-0fe62ddcd3c2285515e2f4cd1fa27e8383e60711.tar.gz mruby-0fe62ddcd3c2285515e2f4cd1fa27e8383e60711.zip | |
Merge pull request #2183 from yui-knk/fix-error-comment
Fix comment of exc_inspect (and adjust spaces)
Diffstat (limited to 'src')
| -rw-r--r-- | src/error.c | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/src/error.c b/src/error.c index 8f13dcf77..6f7641cf1 100644 --- a/src/error.c +++ b/src/error.c @@ -115,7 +115,10 @@ exc_message(mrb_state *mrb, mrb_value exc) * call-seq: * exception.inspect -> string * - * Return this exception's class name an message + * Returns this exception's file name, line number, + * message and class name. + * If file name or line number is not set, + * returns message and class name. */ static mrb_value @@ -444,18 +447,18 @@ mrb_init_exception(mrb_state *mrb) { struct RClass *e; - mrb->eException_class = e = mrb_define_class(mrb, "Exception", mrb->object_class); /* 15.2.22 */ - mrb_define_class_method(mrb, e, "exception", mrb_instance_new, MRB_ARGS_ANY()); - mrb_define_method(mrb, e, "exception", exc_exception, MRB_ARGS_ANY()); - mrb_define_method(mrb, e, "initialize", exc_initialize, MRB_ARGS_ANY()); - mrb_define_method(mrb, e, "==", exc_equal, MRB_ARGS_REQ(1)); - mrb_define_method(mrb, e, "to_s", exc_to_s, MRB_ARGS_NONE()); - mrb_define_method(mrb, e, "message", exc_message, MRB_ARGS_NONE()); - mrb_define_method(mrb, e, "inspect", exc_inspect, MRB_ARGS_NONE()); - mrb_define_method(mrb, e, "backtrace", mrb_exc_backtrace, MRB_ARGS_NONE()); - - mrb->eStandardError_class = mrb_define_class(mrb, "StandardError", mrb->eException_class); /* 15.2.23 */ + mrb->eException_class = e = mrb_define_class(mrb, "Exception", mrb->object_class); /* 15.2.22 */ + mrb_define_class_method(mrb, e, "exception", mrb_instance_new, MRB_ARGS_ANY()); + mrb_define_method(mrb, e, "exception", exc_exception, MRB_ARGS_ANY()); + mrb_define_method(mrb, e, "initialize", exc_initialize, MRB_ARGS_ANY()); + mrb_define_method(mrb, e, "==", exc_equal, MRB_ARGS_REQ(1)); + mrb_define_method(mrb, e, "to_s", exc_to_s, MRB_ARGS_NONE()); + mrb_define_method(mrb, e, "message", exc_message, MRB_ARGS_NONE()); + mrb_define_method(mrb, e, "inspect", exc_inspect, MRB_ARGS_NONE()); + mrb_define_method(mrb, e, "backtrace", mrb_exc_backtrace, MRB_ARGS_NONE()); + + mrb->eStandardError_class = mrb_define_class(mrb, "StandardError", mrb->eException_class); /* 15.2.23 */ mrb_define_class(mrb, "RuntimeError", mrb->eStandardError_class); /* 15.2.28 */ - e = mrb_define_class(mrb, "ScriptError", mrb->eException_class); /* 15.2.37 */ - mrb_define_class(mrb, "SyntaxError", e); /* 15.2.38 */ + e = mrb_define_class(mrb, "ScriptError", mrb->eException_class); /* 15.2.37 */ + mrb_define_class(mrb, "SyntaxError", e); /* 15.2.38 */ } |