1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert r53431 "temporally revert r53411 to debug"

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53434 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2016-01-04 07:59:55 +00:00
parent 014d60ce98
commit 812c5798e2
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
parse.y
View File

@ -4042,7 +4042,7 @@ regexp : tREGEXP_BEG regexp_contents tREGEXP_END
} }
if (ripper_is_node_yylval(opt)) { if (ripper_is_node_yylval(opt)) {
$3 = RNODE(opt)->nd_rval; $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))) { if (src && NIL_P(rb_parser_reg_compile(parser, src, options, &err))) {
compile_error(PARSER_ARG "%"PRIsVALUE, err); compile_error(PARSER_ARG "%"PRIsVALUE, err);

12
test/ripper/test_ripper.rb
View File

@ -60,4 +60,16 @@ class TestRipper::Ripper < Test::Unit::TestCase
assert_predicate @ripper, :yydebug assert_predicate @ripper, :yydebug
end 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 end if ripper_test