diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | parse.y | 2 | ||||
| -rw-r--r-- | test/ripper/test_ripper.rb | 11 |
3 files changed, 1 insertions, 17 deletions
@@ -1,8 +1,3 @@ -Sat Jan 2 11:11:01 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * parse.y (set_yylval_num): should be used as nd_state, set to u3. - [ruby-core:72638] [Bug #11932] - Sat Jan 2 02:27:22 2016 Marc-Andre Lafortune <ruby-core@marc-andre.ca> * lib/ostruct.rb: Fix case of frozen object with initializer. @@ -5251,7 +5251,7 @@ ripper_yylval_id(ID x) return ripper_new_yylval(x, ID2SYM(x), 0); } # define set_yylval_str(x) (yylval.val = (x)) -# define set_yylval_num(x) (yylval.val = ripper_new_yylval(0, 0, (x))) +# define set_yylval_num(x) (yylval.val = ripper_new_yylval((x), 0, 0)) # define set_yylval_id(x) (void)(x) # define set_yylval_name(x) (void)(yylval.val = ripper_yylval_id(x)) # define set_yylval_literal(x) (void)(x) diff --git a/test/ripper/test_ripper.rb b/test/ripper/test_ripper.rb index 7631b91042..e0b65a04d8 100644 --- a/test/ripper/test_ripper.rb +++ b/test/ripper/test_ripper.rb @@ -61,15 +61,4 @@ class TestRipper::Ripper < Test::Unit::TestCase assert_predicate @ripper, :yydebug end - def test_regexp_with_option - bug11932 = '[ruby-core:72638] [Bug #11932]' - src = '/[\xC0-\xF0]/u'.force_encoding(Encoding::UTF_8) - ripper = Ripper.new(src) - ripper.parse - assert_predicate(ripper, :error?) - src = '/[\xC0-\xF0]/n'.force_encoding(Encoding::UTF_8) - ripper = Ripper.new(src) - ripper.parse - assert_not_predicate(ripper, :error?, bug11932) - end end if ripper_test |