From 4c5d7d53b210017ac71ccb958155ba2dc241e220 Mon Sep 17 00:00:00 2001 From: mame Date: Thu, 20 Aug 2009 14:42:16 +0000 Subject: [PATCH] * 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 --- ChangeLog | 5 +++++ parse.y | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/ChangeLog b/ChangeLog index 721393c0b6..0c64cc9157 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Aug 20 23:39:51 2009 Yusuke Endoh + + * parse.y (reduce_nodes_gen): preserve NODE_FL_NEWLINE flag during + node reducing. [ruby-core:24463] + Thu Aug 20 14:39:47 2009 NARUSE, Yui * ext/readline/readline.c (readline_get): add rl_prep_terminal(1). 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