diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | re.c | 4 | ||||
| -rw-r--r-- | test/ruby/test_regexp.rb | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Tue Aug 19 00:56:01 2008 Tanaka Akira <akr@fsij.org> + + * re.c (rb_reg_inspect): don't raise for uninitialized Regexp. + Tue Aug 19 00:34:24 2008 Tanaka Akira <akr@fsij.org> * io.c (rb_io_check_readable): side effect for STDIN removed. @@ -435,7 +435,9 @@ rb_reg_source(VALUE re) static VALUE rb_reg_inspect(VALUE re) { - rb_reg_check(re); + if (!RREGEXP(re)->ptr || !RREGEXP_SRC(re) || !RREGEXP_SRC_PTR(re)) { + return rb_any_to_s(re); + } return rb_reg_desc(RREGEXP_SRC_PTR(re), RREGEXP_SRC_LEN(re), re); } diff --git a/test/ruby/test_regexp.rb b/test/ruby/test_regexp.rb index bce362e34f..ad222c5483 100644 --- a/test/ruby/test_regexp.rb +++ b/test/ruby/test_regexp.rb @@ -686,7 +686,7 @@ class TestRegexp < Test::Unit::TestCase assert_nil(~Regexp.allocate) assert_raise(TypeError) { Regexp.allocate.match("") } assert_raise(TypeError) { Regexp.allocate.to_s } - assert_raise(TypeError) { Regexp.allocate.inspect } + assert_match(/^#<Regexp:.*>$/, Regexp.allocate.inspect) assert_raise(TypeError) { Regexp.allocate.source } assert_raise(TypeError) { Regexp.allocate.casefold? } assert_raise(TypeError) { Regexp.allocate.options } |