From 0869399cbf26c16c3226f338661da87882418ff8 Mon Sep 17 00:00:00 2001 From: matz Date: Sat, 23 Jun 2001 15:14:28 +0000 Subject: * eval.c (svalue_to_avalue): new conversion scheme between single value and array values. * eval.c (avalue_to_svalue): ditto. * eval.c (rb_eval): REXPAND now uses avalue_to_svalue(), return and yield too. * eval.c (rb_yield_0): use avalue_to_svalue(). * eval.c (proc_invoke): Proc#call gives avaules, whereas Proc#yield gives mvalues. * eval.c (bmcall): convert given value (svalue) to avalue. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1544 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- node.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'node.h') diff --git a/node.h b/node.h index ea75763c08..d39a5a9a93 100644 --- a/node.h +++ b/node.h @@ -90,8 +90,7 @@ enum node_type { NODE_ARGSPUSH, NODE_RESTARGS, NODE_RESTARY, - NODE_SVALUE, - NODE_MVALUE, + NODE_REXPAND, NODE_BLOCK_ARG, NODE_BLOCK_PASS, NODE_DEFN, @@ -308,8 +307,7 @@ typedef struct RNode { #define NEW_ARGSPUSH(a,b) rb_node_newnode(NODE_ARGSPUSH,a,b,0) #define NEW_RESTARGS(a) rb_node_newnode(NODE_RESTARGS,a,0,0) #define NEW_RESTARY(a) rb_node_newnode(NODE_RESTARY,a,0,0) -#define NEW_SVALUE(a) rb_node_newnode(NODE_SVALUE,a,0,0) -#define NEW_MVALUE(a) rb_node_newnode(NODE_MVALUE,a,0,0) +#define NEW_REXPAND(a) rb_node_newnode(NODE_REXPAND,a,0,0) #define NEW_BLOCK_ARG(v) rb_node_newnode(NODE_BLOCK_ARG,v,0,local_cnt(v)) #define NEW_BLOCK_PASS(b) rb_node_newnode(NODE_BLOCK_PASS,0,b,0) #define NEW_ALIAS(n,o) rb_node_newnode(NODE_ALIAS,o,n,0) -- cgit v1.2.3