kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

parse.y: unterminated content token

Browse source 
* parse.y (parser_parse_string): defer the end token to next
  reading, to yield tSTRING_CONTENT with the unterminated content.
  [Bug #13363]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58138 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-03-26 07:13:43 +00:00
parent 07e4aa67e1
commit cb64ef240b
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
parse.y
View file

@ -6207,15 +6207,14 @@ parser_parse_string(struct parser_params *parser, NODE *quote)
pushback(c); pushback(c);
if (tokadd_string(func, term, paren, &quote->nd_nest, if (tokadd_string(func, term, paren, &quote->nd_nest,
&enc) == -1) { &enc) == -1) {
if (func & STR_FUNC_REGEXP) { if (parser->eofp) {
if (parser->eofp) if (func & STR_FUNC_REGEXP) {
compile_error(PARSER_ARG "unterminated regexp meets end of file"); compile_error(PARSER_ARG "unterminated regexp meets end of file");
return tREGEXP_END; }
} else {
else {
if (parser->eofp)
compile_error(PARSER_ARG "unterminated string meets end of file"); compile_error(PARSER_ARG "unterminated string meets end of file");
return tSTRING_END; }
quote->u2.id = STR_TERM_END;
} }
} }

3
test/ripper/test_scanner_events.rb
View file

@ -109,6 +109,9 @@ class TestRipper::ScannerEvents < Test::Unit::TestCase
[[3, 0], :on_heredoc_end, "EOS"] [[3, 0], :on_heredoc_end, "EOS"]
], ],
Ripper.lex("<<~EOS\n heredoc\nEOS") Ripper.lex("<<~EOS\n heredoc\nEOS")
assert_equal [[[1, 0], :on_tstring_beg, "'"],
[[1, 1], :on_tstring_content, "foo"]],
Ripper.lex("'foo")
end end
def test_location def test_location