1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* parse.y (reg_compile_gen): appends error message from

Browse Source 
rb_reg_compile() to one from reg_fragment_setenc().


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15475 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-02-14 14:56:40 +00:00
parent 5aa388c23c
commit 67d0ce36f5
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Thu Feb 14 23:56:38 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval_error.c (error_print): append a newline to rest lines.
* parse.y (reg_compile_gen): appends error message from
rb_reg_compile() to one from reg_fragment_setenc().
Thu Feb 14 21:00:14 2008 Tanaka Akira <akr@fsij.org>
* io.c (io_reopen): check STDIN, STDOUT and STDERR mode according to

11
parse.y
View File

@ -8546,7 +8546,7 @@ reg_fragment_setenc_gen(struct parser_params* parser, VALUE str, int options)
}
return;
error:
error:
compile_error(PARSER_ARG
"regexp encoding option '%c' differs from source encoding '%s'",
c, rb_enc_name(rb_enc_get(str)));
@ -8648,12 +8648,17 @@ static VALUE
reg_compile_gen(struct parser_params* parser, VALUE str, int options)
{
VALUE re;
VALUE err;
reg_fragment_setenc(str, options);
err = rb_errinfo();
re = rb_reg_compile(str, options & RE_OPTION_MASK);
if (NIL_P(re)) {
RB_GC_GUARD(re) = rb_obj_as_string(rb_errinfo());
compile_error(PARSER_ARG "%s", RSTRING_PTR(re));
ID mesg = rb_intern("mesg");
VALUE m = rb_attr_get(err, mesg);
rb_str_cat(m, "\n", 1);
rb_str_append(m, rb_attr_get(rb_errinfo(), mesg));
rb_set_errinfo(err);
return Qnil;
}
return re;