kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* parse.y (reduce_nodes): remove tail returns. [ruby-talk:90934]

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5616 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2004-02-03 02:23:20 +00:00
parent 05172c4211
commit 3f19bbb094
2 changed files with 80 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Tue Feb 3 11:23:17 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (reduce_nodes): remove tail returns. [ruby-talk:90934]
Tue Feb 3 08:04:57 2004 Tanaka Akira <akr@m17n.org> Tue Feb 3 08:04:57 2004 Tanaka Akira <akr@m17n.org>
* lib/pp.rb (Struct#pretty_print_cycle): follow 1.8 style. * lib/pp.rb (Struct#pretty_print_cycle): follow 1.8 style.

92
parse.y
View file

@ -119,6 +119,7 @@ static void void_stmts();
static NODE *remove_begin(); static NODE *remove_begin();
#define value_expr(node) value_expr0((node) = remove_begin(node)) #define value_expr(node) value_expr0((node) = remove_begin(node))
#define void_expr(node) void_expr0((node) = remove_begin(node)) #define void_expr(node) void_expr0((node) = remove_begin(node))
static void reduce_nodes();
static NODE *block_append(); static NODE *block_append();
static NODE *list_append(); static NODE *list_append();
@ -364,7 +365,12 @@ bodystmt : compstmt
$$ = block_append($$, $3); $$ = block_append($$, $3);
} }
if ($4) { if ($4) {
$$ = NEW_ENSURE($$, $4); if ($$) {
$$ = NEW_ENSURE($$, $4);
}
else {
$$ = block_append($4, NEW_NIL());
}
} }
fixpos($$, $1); fixpos($$, $1);
} }
@ -1649,7 +1655,9 @@ primary : literal
bodystmt bodystmt
kEND kEND
{ {
$$ = NEW_DEFN($2, $4, $5, NOEX_PRIVATE); NODE *body = remove_begin($5);
reduce_nodes(&body);
$$ = NEW_DEFN($2, $4, body, NOEX_PRIVATE);
fixpos($$, $4); fixpos($$, $4);
local_pop(); local_pop();
in_def--; in_def--;
@ -1665,7 +1673,9 @@ primary : literal
bodystmt bodystmt
kEND kEND
{ {
$$ = NEW_DEFS($2, $5, $7, $8); NODE *body = remove_begin($8);
reduce_nodes(&body);
$$ = NEW_DEFS($2, $5, $7, body);
fixpos($$, $2); fixpos($$, $2);
local_pop(); local_pop();
in_single--; in_single--;
@ -4497,7 +4507,7 @@ static NODE*
block_append(head, tail) block_append(head, tail)
NODE *head, *tail; NODE *head, *tail;
{ {
NODE *end, *h = head; NODE *end, *h = head, *nd;
if (tail == 0) return head; if (tail == 0) return head;
@ -4518,20 +4528,20 @@ block_append(head, tail)
break; break;
} }
if (RTEST(ruby_verbose)) { nd = end->nd_head;
NODE *nd = end->nd_head; switch (nd_type(nd)) {
switch (nd_type(nd)) { case NODE_RETURN:
case NODE_RETURN: case NODE_BREAK:
case NODE_BREAK: case NODE_NEXT:
case NODE_NEXT: case NODE_REDO:
case NODE_REDO: case NODE_RETRY:
case NODE_RETRY: if (RTEST(ruby_verbose)) {
parser_warning(nd, "statement not reached"); parser_warning(nd, "statement not reached");
break;
default:
break;
} }
break;
default:
break;
} }
if (nd_type(tail) != NODE_BLOCK) { if (nd_type(tail) != NODE_BLOCK) {
@ -5104,6 +5114,56 @@ remove_begin(node)
return node; return node;
} }
static void
reduce_nodes(body)
NODE **body;
{
NODE *node = *body;
#define subnodes(n1, n2) \
((!node->n1) ? (node->n2 ? (body = &node->n2, 1) : 0) : \
(!node->n2) ? (body = &node->n1, 1) : \
(reduce_nodes(&node->n1), body = &node->n2, 1))
while (node) {
switch (nd_type(node)) {
end:
case NODE_NIL:
*body = 0;
return;
case NODE_RETURN:
*body = node = node->nd_stts;
continue;
case NODE_BEGIN:
*body = node = node->nd_body;
continue;
case NODE_BLOCK:
body = &node->nd_end->nd_head;
break;
case NODE_IF:
if (subnodes(nd_body, nd_else)) break;
return;
case NODE_CASE:
body = &node->nd_body;
break;
case NODE_WHEN:
if (!subnodes(nd_body, nd_next)) goto end;
break;
case NODE_ENSURE:
if (!subnodes(nd_head, nd_resq)) goto end;
break;
case NODE_RESCUE:
if (!subnodes(nd_head, nd_resq)) goto end;
break;
default:
return;
}
node = *body;
}
#undef subnodes
}
static int static int
assign_in_cond(node) assign_in_cond(node)
NODE *node; NODE *node;