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

multiline heredoc identifier

Browse source 
* parse.y (parser_heredoc_identifier): reject multiline here
  document identifier, which never matches single line.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57089 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-12-16 01:27:47 +00:00
parent 75755ef159
commit d25faa4ed2
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
parse.y
View file

@ -6434,13 +6434,20 @@ parser_heredoc_identifier(struct parser_params *parser)
while ((c = nextc()) != -1 && c != term) {
if (tokadd_mbchar(c) == -1) return 0;
if (c == '\n') newline = 1;
else if (newline) newline = 2;
}
if (c == -1) {
compile_error(PARSER_ARG "unterminated here document identifier");
return 0;
}
if (newline) {
rb_warn0("here document identifier contains newline");
switch (newline) {
case 1:
rb_warn0("here document identifier ends with a newline");
if (--tokidx > 0 && tokenbuf[tokidx] == '\r') --tokidx;
break;
case 2:
compile_error(PARSER_ARG "here document identifier across newlines, never match");
return -1;
}
break;

2
test/ruby/test_syntax.rb
View file

@ -746,7 +746,7 @@ eom
end
def test_heredoc_newline
assert_warn(/contains newline/) do
assert_warn(/ends with a newline/) do
eval("<<\"EOS\n\"\nEOS\n")
end
end