diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | test/ruby/test_regexp.rb | 10 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 19 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Sat Oct 13 01:39:46 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 18:19:35 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> * file.c (rb_get_path_check): path name must not contain NUL bytes. diff --git a/test/ruby/test_regexp.rb b/test/ruby/test_regexp.rb index 3c1662efba..b3c44f3d66 100644 --- a/test/ruby/test_regexp.rb +++ b/test/ruby/test_regexp.rb @@ -867,4 +867,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 @@ -1,10 +1,10 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 286 +#define RUBY_PATCHLEVEL 287 -#define RUBY_RELEASE_DATE "2012-10-12" +#define RUBY_RELEASE_DATE "2012-10-13" #define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_MONTH 10 -#define RUBY_RELEASE_DAY 12 +#define RUBY_RELEASE_DAY 13 #include "ruby/version.h" |