summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-01-04 07:59:55 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-01-04 07:59:55 +0000
commit812c5798e22fad779849561d14a8956434234114 (patch)
treec0d2f2571fd3ad8f180e1318d15d343e3f21855b
parent014d60ce98a6bd3d9ae6774df9c39ce156562905 (diff)
Revert r53431 "temporally revert r53411 to debug"
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53434 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--parse.y2
-rw-r--r--test/ripper/test_ripper.rb12
2 files changed, 13 insertions, 1 deletions
diff --git a/parse.y b/parse.y
index cfbef9c764..aa37439498 100644
--- a/parse.y
+++ b/parse.y
@@ -4042,7 +4042,7 @@ regexp : tREGEXP_BEG regexp_contents tREGEXP_END
}
if (ripper_is_node_yylval(opt)) {
$3 = RNODE(opt)->nd_rval;
- options = (int)RNODE(opt)->nd_state;
+ options = (int)RNODE(opt)->nd_tag;
}
if (src && NIL_P(rb_parser_reg_compile(parser, src, options, &err))) {
compile_error(PARSER_ARG "%"PRIsVALUE, err);
diff --git a/test/ripper/test_ripper.rb b/test/ripper/test_ripper.rb
index c6af72d475..7631b91042 100644
--- a/test/ripper/test_ripper.rb
+++ b/test/ripper/test_ripper.rb
@@ -60,4 +60,16 @@ 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