archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 62872,62873: [Backport #14621]

Browse source 
parse.y: unindent continued line

	* parse.y (tokadd_string): stop at continued line in dedented here
	  documents, to dedent for each lines before removing escaped
	  newlines.  [ruby-core:86236] [Bug #14621]

	parse.y: terminator at continued line

	* parse.y (here_document): a continuing line is not the
	  terminator.  [ruby-core:86283] [Bug #14621]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@67147 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2019-02-28 14:52:06 +00:00
parent 1cc19523c2
commit a6da4f8ac7
3 changed files with 40 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

21
parse.y
View file

@ -6187,7 +6187,14 @@ parser_tokadd_string(struct parser_params *parser,
switch (c) { switch (c) {
case '\n': case '\n':
if (func & STR_FUNC_QWORDS) break; if (func & STR_FUNC_QWORDS) break;
if (func & STR_FUNC_EXPAND) continue; if (func & STR_FUNC_EXPAND) {
if (!(func & STR_FUNC_INDENT) || (heredoc_indent < 0))
continue;
if (c == term) {
c = '\\';
goto terminate;
}
}
tokadd('\\'); tokadd('\\');
break; break;
@ -6265,6 +6272,7 @@ parser_tokadd_string(struct parser_params *parser,
} }
tokadd(c); tokadd(c);
} }
terminate:
*encp = enc; *encp = enc;
return c; return c;
} }
@ -6718,6 +6726,7 @@ parser_here_document(struct parser_params *parser, NODE *here)
long len; long len;
VALUE str = 0; VALUE str = 0;
rb_encoding *enc = current_enc; rb_encoding *enc = current_enc;
int bol;
eos = RSTRING_PTR(here->nd_lit); eos = RSTRING_PTR(here->nd_lit);
len = RSTRING_LEN(here->nd_lit) - 1; len = RSTRING_LEN(here->nd_lit) - 1;
@ -6754,7 +6763,14 @@ parser_here_document(struct parser_params *parser, NODE *here)
heredoc_restore(lex_strterm); heredoc_restore(lex_strterm);
return 0; return 0;
} }
if (was_bol() && whole_match_p(eos, len, indent)) { bol = was_bol();
/* `heredoc_line_indent == -1` means
* - "after an interpolation in the same line", or
* - "in a continuing line"
*/
if (bol &&
(heredoc_line_indent != -1 || (heredoc_line_indent = 0)) &&
whole_match_p( eos, len, indent)) {
dispatch_heredoc_end(); dispatch_heredoc_end();
heredoc_restore(lex_strterm); heredoc_restore(lex_strterm);
return tSTRING_END; return tSTRING_END;
@ -6825,6 +6841,7 @@ parser_here_document(struct parser_params *parser, NODE *here)
goto restore; goto restore;
} }
if (c != '\n') { if (c != '\n') {
if (c == '\\') heredoc_line_indent = -1;
flush: flush:
set_yylval_str(STR_NEW3(tok(), toklen(), enc, func)); set_yylval_str(STR_NEW3(tok(), toklen(), enc, func));
flush_string_content(enc); flush_string_content(enc);

18
test/ruby/test_syntax.rb
View file

@ -667,6 +667,24 @@ e"
assert_dedented_heredoc(expected, result) assert_dedented_heredoc(expected, result)
end end
def test_dedented_heredoc_continued_line
result = " 1\\\n" " 2\n"
expected = "1\\\n" "2\n"
assert_dedented_heredoc(expected, result)
assert_syntax_error("#{<<~"begin;"}\n#{<<~'end;'}", /can't find string "TEXT"/)
begin;
<<-TEXT
\
TEXT
end;
assert_syntax_error("#{<<~"begin;"}\n#{<<~'end;'}", /can't find string "TEXT"/)
begin;
<<~TEXT
\
TEXT
end;
end
def test_lineno_after_heredoc def test_lineno_after_heredoc
bug7559 = '[ruby-dev:46737]' bug7559 = '[ruby-dev:46737]'
expected, _, actual = __LINE__, <<eom, __LINE__ expected, _, actual = __LINE__, <<eom, __LINE__

6
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.4.6" #define RUBY_VERSION "2.4.6"
#define RUBY_RELEASE_DATE "2019-02-01" #define RUBY_RELEASE_DATE "2019-02-28"
#define RUBY_PATCHLEVEL 347 #define RUBY_PATCHLEVEL 348
#define RUBY_RELEASE_YEAR 2019 #define RUBY_RELEASE_YEAR 2019
#define RUBY_RELEASE_MONTH 2 #define RUBY_RELEASE_MONTH 2
#define RUBY_RELEASE_DAY 1 #define RUBY_RELEASE_DAY 28
#include "ruby/version.h" #include "ruby/version.h"