summaryrefslogtreecommitdiff
path: root/parse.y
diff options
context:
space:
mode:
authormame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-08-20 14:42:16 +0000
committermame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-08-20 14:42:16 +0000
commit4c5d7d53b210017ac71ccb958155ba2dc241e220 (patch)
tree70f177aee18e5c8b554699c75c0dfb10f56154a9 /parse.y
parent681754c29d4ae02983c61b467f764b036df8f656 (diff)
* parse.y (reduce_nodes_gen): preserve NODE_FL_NEWLINE flag during
node reducing. [ruby-core:24463] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24595 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
-rw-r--r--parse.y4
1 files changed, 4 insertions, 0 deletions
diff --git a/parse.y b/parse.y
index 5a3e1aabd7..9ebdaeb4b9 100644
--- a/parse.y
+++ b/parse.y
@@ -8406,6 +8406,7 @@ reduce_nodes_gen(struct parser_params *parser, NODE **body)
(reduce_nodes(&node->n1), body = &node->n2, 1))
while (node) {
+ int newline = node->flags & NODE_FL_NEWLINE;
switch (nd_type(node)) {
end:
case NODE_NIL:
@@ -8413,9 +8414,11 @@ reduce_nodes_gen(struct parser_params *parser, NODE **body)
return;
case NODE_RETURN:
*body = node = node->nd_stts;
+ if (newline && node) node->flags |= NODE_FL_NEWLINE;
continue;
case NODE_BEGIN:
*body = node = node->nd_body;
+ if (newline && node) node->flags |= NODE_FL_NEWLINE;
continue;
case NODE_BLOCK:
body = &node->nd_end->nd_head;
@@ -8439,6 +8442,7 @@ reduce_nodes_gen(struct parser_params *parser, NODE **body)
return;
}
node = *body;
+ if (newline && node) node->flags |= NODE_FL_NEWLINE;
}
#undef subnodes