diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | parse.y | 10 |
2 files changed, 12 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Fri Feb 15 09:44:11 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * parse.y (reg_compile_gen): reg_fragment_setenc might not raise an + exception before rb_reg_compile. + Fri Feb 15 07:37:40 2008 Eric Hodel <drbrain@segment7.net> * lib/rdoc/ri/paths.rb: Preserve compatibility with 1.8. @@ -8655,10 +8655,14 @@ reg_compile_gen(struct parser_params* parser, VALUE str, int options) re = rb_reg_compile(str, options & RE_OPTION_MASK); if (NIL_P(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)); + VALUE m = rb_attr_get(rb_errinfo(), mesg); rb_set_errinfo(err); + if (!NIL_P(err)) { + rb_str_append(rb_str_cat(rb_attr_get(err, mesg), "\n", 1), m); + } + else { + compile_error(PARSER_ARG "%s", RSTRING_PTR(m)); + } return Qnil; } return re; |