aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--test/ruby/test_regexp.rb10
2 files changed, 16 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index ea952ff13b..79ac4bd749 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Oct 13 01:37:48 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * test/ruby/test_regexp.rb
+ (TestRegexp#test_raw_hyphen_and_type_char_after_range): added new
+ test. ref [ruby-core:47115] [Backport #6853]
+
Fri Oct 12 21:55:08 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
* include/ruby/win32.h (rb_w32_pow): set floating point precision
diff --git a/test/ruby/test_regexp.rb b/test/ruby/test_regexp.rb
index 7e31e99aa7..7238e55fe1 100644
--- a/test/ruby/test_regexp.rb
+++ b/test/ruby/test_regexp.rb
@@ -911,4 +911,14 @@ class TestRegexp < Test::Unit::TestCase
assert_match(/invalid hex escape/, error.message)
assert_equal(1, error.message.scan(/.*invalid .*escape.*/i).size, bug3539)
end
+
+ def test_raw_hyphen_and_type_char_after_range
+ bug6853 = '[ruby-core:47115]'
+ begin
+ verbose, $VERBOSE = $VERBOSE, nil
+ assert_match(/[0-1-\s]/, ' ', bug6853)
+ ensure
+ $VERBOSE = verbose
+ end
+ end
end