summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--parse.y2
-rw-r--r--test/ruby/test_syntax.rb9
3 files changed, 16 insertions, 1 deletions
@@ -1,3 +1,9 @@
Fri Jan 15 09:25:07 2016 SHIBATA Hiroshi <[email protected]>
* common.mk: test-sample was changed to test-basic.
@@ -3912,7 +3912,6 @@ strings : string
else {
node = evstr2dstr(node);
}
- heredoc_indent = 0;
$$ = node;
/*%
$$ = $1;
@@ -3935,6 +3934,7 @@ string : tCHAR
string1 : tSTRING_BEG string_contents tSTRING_END
{
heredoc_dedent($2);
/*%%%*/
$$ = $2;
/*%
@@ -580,6 +580,15 @@ e"
assert_dedented_heredoc(expect, result)
end
def test_lineno_after_heredoc
bug7559 = '[ruby-dev:46737]'
expected, _, actual = __LINE__, <<eom, __LINE__