summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-01-04 07:23:25 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-01-04 07:23:25 +0000
commit853cd40224af5087b6e96359c60105690bc191d7 (patch)
tree2a25bbdb9d650c49f7ffb0ba27c0eaa61ccefd19
parent04a913f26d62328cc1d1f653666940426f7db3df (diff)
temporally revert r53411 to debug
http://rubyci.s3.amazonaws.com/unstable11s/ruby-trunk/log/20151225T162507Z.diff.html.gz git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--parse.y2
-rw-r--r--test/ripper/test_ripper.rb12
2 files changed, 1 insertions, 13 deletions
diff --git a/parse.y b/parse.y
index aa37439..cfbef9c 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_tag;
+ options = (int)RNODE(opt)->nd_state;
}
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 7631b91..c6af72d 100644
--- a/test/ripper/test_ripper.rb
+++ b/test/ripper/test_ripper.rb
@@ -60,16 +60,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