From 10c2251addd40b2f6525213eb0e03ad101b3ebf2 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 2 Jan 2016 02:11:09 +0000 Subject: [PATCH] parse.y: yylval.num should be u3 * parse.y (set_yylval_num): should be used as nd_state, set to u3. [ruby-core:72638] [Bug #11932] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53409 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ parse.y | 2 +- test/ripper/test_ripper.rb | 11 +++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ede80f2a78..51b7699511 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Jan 2 11:11:01 2016 Nobuyoshi Nakada + + * 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 * lib/ostruct.rb: Fix case of frozen object with initializer. diff --git a/parse.y b/parse.y index cfbef9c764..2bdf7a3b86 100644 --- a/parse.y +++ b/parse.y @@ -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((x), 0, 0)) +# define set_yylval_num(x) (yylval.val = ripper_new_yylval(0, 0, (x))) # 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 e0b65a04d8..7631b91042 100644 --- a/test/ripper/test_ripper.rb +++ b/test/ripper/test_ripper.rb @@ -61,4 +61,15 @@ 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