mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* eval.c (svalue_to_mvalue): new function to convert from svalue
to mvalue. [experimental] * eval.c (mvalue_to_svalue): new function to convert from mvalue to svalue. * eval.c (rb_eval): use mvalue_to_svalue(). * eval.c (rb_yield_0): use mvalue_to_svalue(). * eval.c (proc_invoke): proper mvalue handling. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1529 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz
parent
a74a6b0d91
commit
058888bd38
3 changed files with 89 additions and 97 deletions
14
ChangeLog
14
ChangeLog
|
|
@ -1,3 +1,17 @@
|
|||
Tue Jun 19 16:29:50 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||
|
||||
* eval.c (svalue_to_mvalue): new function to convert from svalue
|
||||
to mvalue. [experimental]
|
||||
|
||||
* eval.c (mvalue_to_svalue): new function to convert from mvalue
|
||||
to svalue.
|
||||
|
||||
* eval.c (rb_eval): use mvalue_to_svalue().
|
||||
|
||||
* eval.c (rb_yield_0): use mvalue_to_svalue().
|
||||
|
||||
* eval.c (proc_invoke): proper mvalue handling.
|
||||
|
||||
Mon Jun 18 17:38:50 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||
|
||||
* eval.c (rb_f_require): searches ".rb" and ".so" at the same
|
||||
|
|
|
|||
144
eval.c
144
eval.c
|
|
@ -2000,6 +2000,35 @@ call_trace_func(event, file, line, self, id, klass)
|
|||
if (state) JUMP_TAG(state);
|
||||
}
|
||||
|
||||
static VALUE
|
||||
svalue_to_mvalue(v)
|
||||
VALUE v;
|
||||
{
|
||||
if (NIL_P(v)) return rb_ary_new2(0);
|
||||
if (TYPE(v) != T_ARRAY) {
|
||||
v = rb_ary_to_ary(v);
|
||||
}
|
||||
return v;
|
||||
}
|
||||
|
||||
static VALUE
|
||||
mvalue_to_svalue(v)
|
||||
VALUE v;
|
||||
{
|
||||
if (TYPE(v) != T_ARRAY) {
|
||||
v = rb_ary_to_ary(v);
|
||||
}
|
||||
if (RARRAY(v)->len == 0) {
|
||||
return Qnil;
|
||||
}
|
||||
if (RARRAY(v)->len == 1 &&
|
||||
!NIL_P(RARRAY(v)->ptr[0]) &&
|
||||
TYPE(RARRAY(v)->ptr[0]) != T_ARRAY) {
|
||||
return RARRAY(v)->ptr[0];
|
||||
}
|
||||
return v;
|
||||
}
|
||||
|
||||
static void return_check _((void));
|
||||
#define return_value(v) prot_tag->retval = (v)
|
||||
|
||||
|
|
@ -2345,23 +2374,11 @@ rb_eval(self, n)
|
|||
|
||||
case NODE_RESTARGS:
|
||||
case NODE_RESTARY:
|
||||
result = rb_eval(self, node->nd_head);
|
||||
if (TYPE(result) != T_ARRAY) {
|
||||
result = rb_ary_to_ary(result);
|
||||
}
|
||||
result = svalue_to_mvalue(rb_eval(self, node->nd_head));
|
||||
break;
|
||||
|
||||
case NODE_REXPAND:
|
||||
result = rb_eval(self, node->nd_head);
|
||||
if (TYPE(result) != T_ARRAY) {
|
||||
result = rb_ary_to_ary(result);
|
||||
}
|
||||
if (RARRAY(result)->len == 0) {
|
||||
result = Qnil;
|
||||
}
|
||||
else if (RARRAY(result)->len == 1) {
|
||||
result = RARRAY(result)->ptr[0];
|
||||
}
|
||||
result = mvalue_to_svalue(rb_eval(self, node->nd_head));
|
||||
break;
|
||||
|
||||
case NODE_YIELD:
|
||||
|
|
@ -2520,7 +2537,7 @@ rb_eval(self, n)
|
|||
|
||||
case NODE_ARGSCAT:
|
||||
result = rb_ary_concat(rb_eval(self, node->nd_head),
|
||||
rb_ary_to_ary(rb_eval(self, node->nd_body)));
|
||||
svalue_to_mvalue(rb_eval(self, node->nd_body)));
|
||||
break;
|
||||
|
||||
case NODE_ARGSPUSH:
|
||||
|
|
@ -3546,10 +3563,6 @@ rb_f_block_given_p()
|
|||
return Qfalse;
|
||||
}
|
||||
|
||||
#define PC_NONE 0x0
|
||||
#define PC_ACHECK 0x1
|
||||
#define PC_PCALL 0x2
|
||||
|
||||
static VALUE
|
||||
rb_yield_0(val, self, klass, pcall)
|
||||
VALUE val, self, klass; /* OK */
|
||||
|
|
@ -3595,40 +3608,40 @@ rb_yield_0(val, self, klass, pcall)
|
|||
PUSH_TAG(PROT_NONE);
|
||||
if ((state = EXEC_TAG()) == 0) {
|
||||
if (block->var == (NODE*)1) {
|
||||
if ((pcall&PC_ACHECK) && val != Qundef &&
|
||||
TYPE(val) == T_ARRAY && RARRAY(val)->len != 0) {
|
||||
if (pcall && RARRAY(val)->len != 0) {
|
||||
rb_raise(rb_eArgError, "wrong # of arguments (%d for 0)",
|
||||
RARRAY(val)->len);
|
||||
}
|
||||
}
|
||||
else if (block->var == (NODE*)2) {
|
||||
if (val != Qundef && TYPE(val) == T_ARRAY && RARRAY(val)->len != 0) {
|
||||
if (TYPE(val) == T_ARRAY && RARRAY(val)->len != 0) {
|
||||
rb_raise(rb_eArgError, "wrong # of arguments (%d for 0)",
|
||||
RARRAY(val)->len);
|
||||
}
|
||||
}
|
||||
else {
|
||||
if (nd_type(block->var) == NODE_MASGN)
|
||||
massign(self, block->var, val, (pcall&PC_ACHECK));
|
||||
massign(self, block->var, val, pcall);
|
||||
else {
|
||||
/* argument adjust for proc_call etc. */
|
||||
if (pcall && val != Qundef &&
|
||||
TYPE(val) == T_ARRAY && RARRAY(val)->len == 1) {
|
||||
if (pcall) {
|
||||
if (RARRAY(val)->len == 1) {
|
||||
val = RARRAY(val)->ptr[0];
|
||||
}
|
||||
assign(self, block->var, val, (pcall&PC_ACHECK));
|
||||
else {
|
||||
val = mvalue_to_svalue(val);
|
||||
}
|
||||
}
|
||||
assign(self, block->var, val, pcall);
|
||||
}
|
||||
}
|
||||
}
|
||||
POP_TAG();
|
||||
if (state) goto pop_state;
|
||||
}
|
||||
else {
|
||||
else if (pcall) {
|
||||
/* argument adjust for proc_call etc. */
|
||||
if (pcall && val != Qundef &&
|
||||
TYPE(val) == T_ARRAY && RARRAY(val)->len == 1) {
|
||||
val = RARRAY(val)->ptr[0];
|
||||
}
|
||||
val = mvalue_to_svalue(val);
|
||||
}
|
||||
|
||||
PUSH_ITER(block->iter);
|
||||
|
|
@ -3639,7 +3652,6 @@ rb_yield_0(val, self, klass, pcall)
|
|||
result = Qnil;
|
||||
}
|
||||
else if (nd_type(node) == NODE_CFUNC || nd_type(node) == NODE_IFUNC) {
|
||||
if (val == Qundef) val = rb_ary_new2(0);
|
||||
result = (*node->nd_cfnc)(val, node->nd_tval, self);
|
||||
}
|
||||
else {
|
||||
|
|
@ -3723,56 +3735,43 @@ rb_f_loop()
|
|||
}
|
||||
|
||||
static VALUE
|
||||
massign(self, node, val, check)
|
||||
massign(self, node, val, pcall)
|
||||
VALUE self;
|
||||
NODE *node;
|
||||
VALUE val;
|
||||
int check;
|
||||
int pcall;
|
||||
{
|
||||
NODE *list;
|
||||
int i = 0, len;
|
||||
|
||||
if (val == Qundef || val == Qnil) {
|
||||
val = rb_ary_new2(0);
|
||||
}
|
||||
else if (TYPE(val) != T_ARRAY) {
|
||||
if (rb_respond_to(val, to_ary)) {
|
||||
VALUE ary = rb_funcall(val, to_ary, 0);
|
||||
if (TYPE(ary) != T_ARRAY) {
|
||||
rb_raise(rb_eTypeError, "%s#to_ary should return Array",
|
||||
rb_class2name(CLASS_OF(val)));
|
||||
}
|
||||
val = ary;
|
||||
}
|
||||
else {
|
||||
val = rb_ary_new3(1, val);
|
||||
}
|
||||
if (!pcall) {
|
||||
val = svalue_to_mvalue(val);
|
||||
}
|
||||
len = RARRAY(val)->len;
|
||||
list = node->nd_head;
|
||||
for (i=0; list && i<len; i++) {
|
||||
assign(self, list->nd_head, RARRAY(val)->ptr[i], check);
|
||||
assign(self, list->nd_head, RARRAY(val)->ptr[i], pcall);
|
||||
list = list->nd_next;
|
||||
}
|
||||
if (check && list) goto arg_error;
|
||||
if (pcall && list) goto arg_error;
|
||||
if (node->nd_args) {
|
||||
if (node->nd_args == (NODE*)-1) {
|
||||
/* no check for mere `*' */
|
||||
}
|
||||
else if (!list && i<len) {
|
||||
assign(self, node->nd_args, rb_ary_new4(len-i, RARRAY(val)->ptr+i), check);
|
||||
assign(self, node->nd_args, rb_ary_new4(len-i, RARRAY(val)->ptr+i), pcall);
|
||||
}
|
||||
else {
|
||||
assign(self, node->nd_args, rb_ary_new2(0), check);
|
||||
assign(self, node->nd_args, rb_ary_new2(0), pcall);
|
||||
}
|
||||
}
|
||||
else if (check && i < len) {
|
||||
else if (pcall && i < len) {
|
||||
goto arg_error;
|
||||
}
|
||||
|
||||
while (list) {
|
||||
i++;
|
||||
assign(self, list->nd_head, Qnil, check);
|
||||
assign(self, list->nd_head, Qnil, pcall);
|
||||
list = list->nd_next;
|
||||
}
|
||||
return val;
|
||||
|
|
@ -3786,11 +3785,11 @@ massign(self, node, val, check)
|
|||
}
|
||||
|
||||
static void
|
||||
assign(self, lhs, val, check)
|
||||
assign(self, lhs, val, pcall)
|
||||
VALUE self;
|
||||
NODE *lhs;
|
||||
VALUE val;
|
||||
int check;
|
||||
int pcall;
|
||||
{
|
||||
if (val == Qundef) val = Qnil;
|
||||
switch (nd_type(lhs)) {
|
||||
|
|
@ -3832,7 +3831,7 @@ assign(self, lhs, val, check)
|
|||
break;
|
||||
|
||||
case NODE_MASGN:
|
||||
massign(self, lhs, val, check);
|
||||
massign(self, lhs, val, pcall);
|
||||
break;
|
||||
|
||||
case NODE_CALL:
|
||||
|
|
@ -5842,7 +5841,7 @@ call_end_proc(data)
|
|||
ruby_frame->self = ruby_frame->prev->self;
|
||||
ruby_frame->last_func = 0;
|
||||
ruby_frame->last_class = 0;
|
||||
proc_call(data, Qundef);
|
||||
proc_call(data, rb_ary_new2(0));
|
||||
POP_FRAME();
|
||||
POP_ITER();
|
||||
}
|
||||
|
|
@ -6317,19 +6316,6 @@ blk_orphan(data)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static VALUE
|
||||
callargs(args)
|
||||
VALUE args;
|
||||
{
|
||||
switch (RARRAY(args)->len) {
|
||||
case 0:
|
||||
return Qundef;
|
||||
break;
|
||||
default:
|
||||
return args;
|
||||
}
|
||||
}
|
||||
|
||||
static VALUE
|
||||
proc_invoke(proc, args, pcall)
|
||||
VALUE proc, args; /* OK */
|
||||
|
|
@ -6343,13 +6329,6 @@ proc_invoke(proc, args, pcall)
|
|||
volatile int orphan;
|
||||
volatile int safe = ruby_safe_level;
|
||||
|
||||
if (pcall) {
|
||||
pcall = PC_ACHECK|PC_PCALL;
|
||||
}
|
||||
else {
|
||||
pcall = PC_PCALL;
|
||||
}
|
||||
|
||||
if (rb_block_given_p() && ruby_frame->last_func) {
|
||||
rb_warning("block for %s#%s is useless",
|
||||
rb_class2name(CLASS_OF(proc)),
|
||||
|
|
@ -6368,10 +6347,9 @@ proc_invoke(proc, args, pcall)
|
|||
PUSH_ITER(ITER_CUR);
|
||||
ruby_frame->iter = ITER_CUR;
|
||||
|
||||
if (args != Qundef && TYPE(args) == T_ARRAY) {
|
||||
args = callargs(args);
|
||||
if (!pcall) {
|
||||
args = mvalue_to_svalue(args);
|
||||
}
|
||||
|
||||
PUSH_TAG(PROT_NONE);
|
||||
state = EXEC_TAG();
|
||||
if (state == 0) {
|
||||
|
|
@ -8337,7 +8315,7 @@ rb_thread_yield(arg, th)
|
|||
rb_thread_t th;
|
||||
{
|
||||
scope_dup(ruby_block->scope);
|
||||
return rb_yield_0(callargs(arg), 0, 0, Qtrue);
|
||||
return rb_yield_0(mvalue_to_svalue(arg), 0, 0, Qtrue);
|
||||
}
|
||||
|
||||
static VALUE
|
||||
|
|
|
|||
|
|
@ -56,8 +56,8 @@ a = *nil; test_ok(a == nil)
|
|||
a = *1; test_ok(a == 1)
|
||||
a = *[]; test_ok(a == nil)
|
||||
a = *[1]; test_ok(a == 1)
|
||||
a = *[nil]; test_ok(a == nil)
|
||||
a = *[[]]; test_ok(a == [])
|
||||
a = *[nil]; test_ok(a == [nil])
|
||||
a = *[[]]; test_ok(a == [[]])
|
||||
a = *[*[]]; test_ok(a == nil)
|
||||
a = *[*[1]]; test_ok(a == 1)
|
||||
a = *[*[1,2]]; test_ok(a == [1,2])
|
||||
|
|
@ -76,8 +76,8 @@ a = *[*[1,2]]; test_ok(a == [1,2])
|
|||
*a = *1; test_ok(a == [1])
|
||||
*a = *[]; test_ok(a == [])
|
||||
*a = *[1]; test_ok(a == [1])
|
||||
*a = *[nil]; test_ok(a == [])
|
||||
*a = *[[]]; test_ok(a == [])
|
||||
*a = *[nil]; test_ok(a == [nil])
|
||||
*a = *[[]]; test_ok(a == [[]])
|
||||
*a = *[*[]]; test_ok(a == [])
|
||||
*a = *[*[1]]; test_ok(a == [1])
|
||||
*a = *[*[1,2]]; test_ok(a == [1,2])
|
||||
|
|
@ -97,7 +97,7 @@ a,b,*c = *1; test_ok([a,b,c] == [1, nil, []])
|
|||
a,b,*c = *[]; test_ok([a,b,c] == [nil, nil, []])
|
||||
a,b,*c = *[1]; test_ok([a,b,c] == [1, nil, []])
|
||||
a,b,*c = *[nil]; test_ok([a,b,c] == [nil, nil, []])
|
||||
a,b,*c = *[[]]; test_ok([a,b,c] == [nil, nil, []])
|
||||
a,b,*c = *[[]]; test_ok([a,b,c] == [[], nil, []])
|
||||
a,b,*c = *[*[]]; test_ok([a,b,c] == [nil, nil, []])
|
||||
a,b,*c = *[*[1]]; test_ok([a,b,c] == [1, nil, []])
|
||||
a,b,*c = *[*[1,2]]; test_ok([a,b,c] == [1, 2, []])
|
||||
|
|
@ -116,8 +116,8 @@ def f; yield *nil; end; f {|a| test_ok(a == nil)}
|
|||
def f; yield *1; end; f {|a| test_ok(a == 1)}
|
||||
def f; yield *[]; end; f {|a| test_ok(a == nil)}
|
||||
def f; yield *[1]; end; f {|a| test_ok(a == 1)}
|
||||
def f; yield *[nil]; end; f {|a| test_ok(a == nil)}
|
||||
def f; yield *[[]]; end; f {|a| test_ok(a == [])}
|
||||
def f; yield *[nil]; end; f {|a| test_ok(a == [nil])}
|
||||
def f; yield *[[]]; end; f {|a| test_ok(a == [[]])}
|
||||
def f; yield *[*[]]; end; f {|a| test_ok(a == nil)}
|
||||
def f; yield *[*[1]]; end; f {|a| test_ok(a == 1)}
|
||||
def f; yield *[*[1,2]]; end; f {|a| test_ok(a == [1,2])}
|
||||
|
|
@ -136,8 +136,8 @@ def f; yield *nil; end; f {|*a| test_ok(a == [])}
|
|||
def f; yield *1; end; f {|*a| test_ok(a == [1])}
|
||||
def f; yield *[]; end; f {|*a| test_ok(a == [])}
|
||||
def f; yield *[1]; end; f {|*a| test_ok(a == [1])}
|
||||
def f; yield *[nil]; end; f {|*a| test_ok(a == [])}
|
||||
def f; yield *[[]]; end; f {|*a| test_ok(a == [])}
|
||||
def f; yield *[nil]; end; f {|*a| test_ok(a == [nil])}
|
||||
def f; yield *[[]]; end; f {|*a| test_ok(a == [[]])}
|
||||
def f; yield *[*[]]; end; f {|*a| test_ok(a == [])}
|
||||
def f; yield *[*[1]]; end; f {|*a| test_ok(a == [1])}
|
||||
def f; yield *[*[1,2]]; end; f {|*a| test_ok(a == [1,2])}
|
||||
|
|
@ -157,7 +157,7 @@ def f; yield *1; end; f {|a,b,*c| test_ok([a,b,c] == [1, nil, []])}
|
|||
def f; yield *[]; end; f {|a,b,*c| test_ok([a,b,c] == [nil, nil, []])}
|
||||
def f; yield *[1]; end; f {|a,b,*c| test_ok([a,b,c] == [1, nil, []])}
|
||||
def f; yield *[nil]; end; f {|a,b,*c| test_ok([a,b,c] == [nil, nil, []])}
|
||||
def f; yield *[[]]; end; f {|a,b,*c| test_ok([a,b,c] == [nil, nil, []])}
|
||||
def f; yield *[[]]; end; f {|a,b,*c| test_ok([a,b,c] == [[], nil, []])}
|
||||
def f; yield *[*[]]; end; f {|a,b,*c| test_ok([a,b,c] == [nil, nil, []])}
|
||||
def f; yield *[*[1]]; end; f {|a,b,*c| test_ok([a,b,c] == [1, nil, []])}
|
||||
def f; yield *[*[1,2]]; end; f {|a,b,*c| test_ok([a,b,c] == [1, 2, []])}
|
||||
|
|
@ -644,7 +644,7 @@ test_ok($x == 0)
|
|||
IterTest.new([1]).each1 { |x| $x = x }
|
||||
test_ok($x == 1)
|
||||
IterTest.new([2]).each2 { |x| $x = x }
|
||||
test_ok($x == [2])
|
||||
test_ok($x == [2]); p $x
|
||||
IterTest.new([3]).each3 { |x| $x = x }
|
||||
test_ok($x == 3)
|
||||
IterTest.new([4]).each4 { |x| $x = x }
|
||||
|
|
@ -663,11 +663,11 @@ test_ok($x == [0])
|
|||
IterTest.new([[1]]).each1 { |x| $x = x }
|
||||
test_ok($x == 1)
|
||||
IterTest.new([[2]]).each2 { |x| $x = x }
|
||||
test_ok($x == [2])
|
||||
test_ok($x == [2]); p $x
|
||||
IterTest.new([[3]]).each3 { |x| $x = x }
|
||||
test_ok($x == 3)
|
||||
IterTest.new([[4]]).each4 { |x| $x = x }
|
||||
test_ok($x == [4])
|
||||
test_ok($x == [4]); p $x
|
||||
IterTest.new([[5]]).each5 { |x| $x = x }
|
||||
test_ok($x == 5)
|
||||
IterTest.new([[6]]).each6 { |x| $x = x }
|
||||
|
|
|
|||
Loading…
Reference in a new issue