From 813fcf768e6acbccd4d8afe941e6c35836ffbc2c Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 12 Feb 2008 16:26:47 +0000 Subject: * parse.y (arg_concat_gen, arg_append_gen): optimize for array concat. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15449 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- parse.y | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) (limited to 'parse.y') diff --git a/parse.y b/parse.y index c4470512f0..50eaa5f7c7 100644 --- a/parse.y +++ b/parse.y @@ -7794,9 +7794,19 @@ static NODE * arg_concat_gen(struct parser_params *parser, NODE *node1, NODE *node2) { if (!node2) return node1; - if (nd_type(node1) == NODE_BLOCK_PASS) { + switch (nd_type(node1)) { + case NODE_BLOCK_PASS: node1->nd_iter = arg_concat(node1->nd_iter, node2); return node1; + case NODE_ARGSPUSH: + if (nd_type(node2) != NODE_ARRAY) break; + node1->nd_body = list_concat(NEW_LIST(node1->nd_body), node2); + nd_set_type(node1, NODE_ARGSCAT); + return node1; + case NODE_ARGSCAT: + if (nd_type(node2) != NODE_ARRAY) break; + node1->nd_body = list_concat(node1->nd_body, node2); + return node1; } return NEW_ARGSCAT(node1, node2); } @@ -7811,9 +7821,15 @@ arg_append_gen(struct parser_params *parser, NODE *node1, NODE *node2) case NODE_BLOCK_PASS: node1->nd_head = arg_append(node1->nd_head, node2); return node1; - default: - return NEW_ARGSPUSH(node1, node2); + case NODE_ARGSPUSH: + node1->nd_body = list_append(NEW_LIST(node1->nd_body), node2); + nd_set_type(node1, NODE_ARGSCAT); + return node1; + case NODE_ARGSCAT: + node1->nd_body = list_append(node1->nd_body, node2); + return node1; } + return NEW_ARGSPUSH(node1, node2); } static NODE * -- cgit v1.2.3