kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

error.c: SyntaxError#initialize

Browse source 
* error.c (syntax_error_initialize): move the default message,
  "compile error", from parse.y.  the default parameter should
  belong to the class definition.
* parse.y (yycompile0): use the default parameter.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54654 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-04-20 06:52:30 +00:00
parent e06aaf699d
commit 86b1179a03
3 changed files with 29 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Wed Apr 20 15:52:28 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* error.c (syntax_error_initialize): move the default message,
"compile error", from parse.y. the default parameter should
belong to the class definition.
* parse.y (yycompile0): use the default parameter.
Wed Apr 20 10:25:53 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Apr 20 10:25:53 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* compile.c (append_compile_error): use rb_syntax_error_append. * compile.c (append_compile_error): use rb_syntax_error_append.

20
error.c
View file

@ -1361,6 +1361,25 @@ rb_invalid_str(const char *str, const char *type)
rb_raise(rb_eArgError, "invalid value for %s: %+"PRIsVALUE, type, s); rb_raise(rb_eArgError, "invalid value for %s: %+"PRIsVALUE, type, s);
} }
/*
* call-seq:
* SyntaxError.new([msg]) -> syntax_error
*
* Construct a SyntaxError exception.
*/
static VALUE
syntax_error_initialize(int argc, VALUE *argv, VALUE self)
{
VALUE mesg;
if (argc == 0) {
mesg = rb_fstring_cstr("compile error");
argc = 1;
argv = &mesg;
}
return rb_call_super(argc, argv);
}
/* /*
* Document-module: Errno * Document-module: Errno
* *
@ -1960,6 +1979,7 @@ Init_Exception(void)
rb_eScriptError = rb_define_class("ScriptError", rb_eException); rb_eScriptError = rb_define_class("ScriptError", rb_eException);
rb_eSyntaxError = rb_define_class("SyntaxError", rb_eScriptError); rb_eSyntaxError = rb_define_class("SyntaxError", rb_eScriptError);
rb_define_method(rb_eSyntaxError, "initialize", syntax_error_initialize, -1);
rb_eLoadError = rb_define_class("LoadError", rb_eScriptError); rb_eLoadError = rb_define_class("LoadError", rb_eScriptError);
/* the path failed to load */ /* the path failed to load */

3
parse.y
View file

@ -5551,8 +5551,7 @@ yycompile0(VALUE arg)
if (parser->error_p) { if (parser->error_p) {
VALUE mesg = parser->error_buffer; VALUE mesg = parser->error_buffer;
if (!mesg) { if (!mesg) {
mesg = rb_fstring_cstr("compile error"); mesg = rb_class_new_instance(0, 0, rb_eSyntaxError);
mesg = rb_exc_new_str(rb_eSyntaxError, mesg);
} }
rb_set_errinfo(mesg); rb_set_errinfo(mesg);
return 0; return 0;