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

* eval.c (rb_yield_0): give warning for multiple values for a

Browse source 
block parameter.

* eval.c (rb_yield_values): a function to yield multiple values.

* array.c (sort_1): use rb_yield_values.

* enum.c (min_ii, max_ii): ditto.

* hash.c (rb_hash_update_block_i, delete_if_i, select_i,
  each_pair_i, env_each, env_reject_bang, env_select,
  env_update_i): ditto.

* struct.c (rb_struct_each_pair): ditto.

* eval.c (top_include): should include module in the current self,
  not ruby_top_self. [ruby-dev:20198]

* eval.c (top_include): stop inclusion to ruby_wrapper; give
  warning.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3833 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2003-05-20 06:29:23 +00:00
parent 3b68b107e9
commit 82cf98939f
8 changed files with 83 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
ChangeLog
View file

@ -16,6 +16,29 @@ Tue May 20 10:51:26 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
* error.c (name_err_initialize, nometh_err_initialize,
syserr_initialize): initialize attributes.
Tue May 20 10:26:56 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_yield_0): give warning for multiple values for a
block parameter.
* eval.c (rb_yield_values): a function to yield multiple values.
* array.c (sort_1): use rb_yield_values.
* enum.c (min_ii, max_ii): ditto.
* hash.c (rb_hash_update_block_i, delete_if_i, select_i,
each_pair_i, env_each, env_reject_bang, env_select,
env_update_i): ditto.
* struct.c (rb_struct_each_pair): ditto.
* eval.c (top_include): should include module in the current self,
not ruby_top_self. [ruby-dev:20198]
* eval.c (top_include): stop inclusion to ruby_wrapper; give
warning.
Mon May 19 18:54:30 2003 why the lucky stiff <ruby-cvs@whytheluckystiff.net>
* ext/syck/token.c, ext/syck/implicit.c: expanded character set to

2
array.c
View file

@ -1085,7 +1085,7 @@ static int
sort_1(a, b)
VALUE *a, *b;
{
VALUE retval = rb_yield(rb_assoc_new(*a, *b));
VALUE retval = rb_yield_values(2, *a, *b);
return rb_cmpint(retval, *a, *b);
}

4
enum.c
View file

@ -397,7 +397,7 @@ min_ii(i, memo)
memo->u1.value = i;
}
else {
cmp = rb_yield(rb_assoc_new(i, memo->u1.value));
cmp = rb_yield_values(2, i, memo->u1.value);
if (rb_cmpint(cmp, i, memo->u1.value) < 0) {
memo->u1.value = i;
}
@ -448,7 +448,7 @@ max_ii(i, memo)
memo->u1.value = i;
}
else {
cmp = rb_yield(rb_assoc_new(i, memo->u1.value));
cmp = rb_yield_values(2, i, memo->u1.value);
if (rb_cmpint(cmp, i, memo->u1.value) > 0) {
memo->u1.value = i;
}

49
eval.c
View file

@ -4025,7 +4025,7 @@ rb_yield_0(val, self, klass, pcall, avalue)
if (block->var) {
PUSH_TAG(PROT_NONE);
if ((state = EXEC_TAG()) == 0) {
if (block->var == (NODE*)1) {
if (block->var == (NODE*)1) { /* no parameter || */
if (pcall && RARRAY(val)->len != 0) {
rb_raise(rb_eArgError, "wrong number of arguments (%ld for 0)",
RARRAY(val)->len);
@ -4044,8 +4044,22 @@ rb_yield_0(val, self, klass, pcall, avalue)
massign(self, block->var, val, pcall);
}
else {
if (avalue) val = avalue_splat(val);
if (val == Qundef) val = Qnil;
if (avalue) {
if (RARRAY(val)->len == 0) {
goto zero_arg;
}
if (RARRAY(val)->len == 1) {
val = RARRAY(val)->ptr[0];
}
else {
rb_warn("multiple values for a block parameter (%d for 1)", RARRAY(val)->len);
}
}
else if (val == Qundef) {
zero_arg:
rb_warn("multiple values for a block parameter (0 for 1)");
val = Qnil;
}
assign(self, block->var, val, pcall);
}
}
@ -4136,6 +4150,26 @@ rb_yield(val)
return rb_yield_0(val, 0, 0, 0, 0);
}
VALUE
#ifdef HAVE_STDARG_PROTOTYPES
rb_yield_values(int n, ...)
#else
rb_yield_values(int n, va_alist)
int n;
va_dcl
#endif
{
va_list args;
VALUE ary = rb_ary_new2(n);
va_init_list(args, n);
while (n--) {
rb_ary_push(ary, va_arg(args, VALUE));
}
va_end(args);
return rb_yield_0(ary, 0, 0, 0, Qtrue);
}
static VALUE
rb_f_loop()
{
@ -5623,7 +5657,7 @@ rb_load(fname, wrap)
/* load in anonymous module as toplevel */
ruby_class = ruby_wrapper = rb_module_new();
self = rb_obj_clone(ruby_top_self);
rb_extend_object(self, ruby_class);
rb_extend_object(self, ruby_wrapper);
PUSH_CREF(ruby_wrapper);
}
PUSH_ITER(ITER_NOT);
@ -6167,14 +6201,15 @@ rb_obj_extend(argc, argv, obj)
}
static VALUE
top_include(argc, argv)
top_include(argc, argv, self)
int argc;
VALUE *argv;
VALUE self;
{
rb_secure(4);
if (ruby_wrapper) {
rb_obj_extend(argc, argv, ruby_top_self);
return rb_mod_include(argc, argv, ruby_wrapper);
rb_warn("main#include in the wrapped load is effective only for toplevel");
return rb_obj_extend(argc, argv, self);
}
else {
return rb_mod_include(argc, argv, rb_cObject);

29
hash.c
View file

@ -465,7 +465,7 @@ delete_if_i(key, value)
VALUE key, value;
{
if (key == Qundef) return ST_CONTINUE;
if (RTEST(rb_yield(rb_assoc_new(key, value))))
if (RTEST(rb_yield_values(2, key, value)))
return ST_DELETE;
return ST_CONTINUE;
}
@ -500,12 +500,9 @@ static enum st_retval
select_i(key, value, result)
VALUE key, value, result;
{
VALUE assoc;
if (key == Qundef) return ST_CONTINUE;
assoc = rb_assoc_new(key, value);
if (RTEST(rb_yield(assoc)))
rb_ary_push(result, assoc);
if (RTEST(rb_yield_values(2, key, value)))
rb_ary_push(result, rb_assoc_new(key, value));
return ST_CONTINUE;
}
@ -663,7 +660,7 @@ each_pair_i(key, value)
VALUE key, value;
{
if (key == Qundef) return ST_CONTINUE;
rb_yield(rb_assoc_new(key, value));
rb_yield_values(2, key, value);
return ST_CONTINUE;
}
@ -938,7 +935,7 @@ rb_hash_update_block_i(key, value, hash)
{
if (key == Qundef) return ST_CONTINUE;
if (rb_hash_has_key(hash, key)) {
value = rb_yield(rb_ary_new3(3, key, rb_hash_aref(hash, key), value));
value = rb_yield_values(3, key, rb_hash_aref(hash, key), value);
}
rb_hash_aset(hash, key, value);
return ST_CONTINUE;
@ -1334,8 +1331,8 @@ env_each(hash)
while (*env) {
char *s = strchr(*env, '=');
if (s) {
rb_yield(rb_assoc_new(rb_tainted_str_new(*env, s-*env),
rb_tainted_str_new2(s+1)));
rb_yield_values(2, rb_tainted_str_new(*env, s-*env),
rb_tainted_str_new2(s+1));
}
env++;
}
@ -1359,7 +1356,7 @@ env_reject_bang()
while (len--) {
VALUE val = rb_f_getenv(Qnil, *ptr);
if (!NIL_P(val)) {
if (RTEST(rb_yield(rb_assoc_new(*ptr, val)))) {
if (RTEST(rb_yield_values(2, *ptr, val))) {
FL_UNSET(*ptr, FL_TAINT);
env_delete(Qnil, *ptr);
del++;
@ -1413,10 +1410,10 @@ env_select(argc, argv)
while (*env) {
char *s = strchr(*env, '=');
if (s) {
VALUE assoc = rb_assoc_new(rb_tainted_str_new(*env, s-*env),
rb_tainted_str_new2(s+1));
if (RTEST(rb_yield(assoc))) {
rb_ary_push(result, assoc);
VALUE k = rb_tainted_str_new(*env, s-*env);
VALUE v = rb_tainted_str_new2(s+1);
if (RTEST(rb_yield_values(2, k, v))) {
rb_ary_push(result, rb_assoc_new(k, v));
}
}
env++;
@ -1712,7 +1709,7 @@ env_update_i(key, val)
{
if (key != Qundef) {
if (rb_block_given_p()) {
val = rb_yield(rb_ary_new3(3, key, rb_f_getenv(Qnil, key), val));
val = rb_yield_values(3, key, rb_f_getenv(Qnil, key), val);
}
env_aset(Qnil, key, val);
}

1
ruby.h
View file

@ -532,6 +532,7 @@ void rb_warn __((const char*, ...)); /* reports always */
VALUE rb_each _((VALUE));
VALUE rb_yield _((VALUE));
VALUE rb_yield_values __((int n, ...));
int rb_block_given_p _((void));
VALUE rb_iterate _((VALUE(*)(VALUE),VALUE,VALUE(*)(ANYARGS),VALUE));
VALUE rb_rescue _((VALUE(*)(ANYARGS),VALUE,VALUE(*)(ANYARGS),VALUE));

1
sample/test.rb
View file

@ -254,7 +254,6 @@ test_ok(f.call(42) == 42)
test_ok(f.call([42]) == [42])
test_ok(f.call([[42]]) == [[42]])
test_ok(f.call([42,55]) == [42,55])
test_ok(f.call(42,55) == [42,55])
f = lambda{|x,| x}
test_ok(f.call(42) == 42)

2
struct.c
View file

@ -346,7 +346,7 @@ rb_struct_each_pair(s)
rb_bug("non-initialized struct");
}
for (i=0; i<RSTRUCT(s)->len; i++) {
rb_yield(rb_assoc_new(RARRAY(member)->ptr[i], RSTRUCT(s)->ptr[i]));
rb_yield_values(2, RARRAY(member)->ptr[i], RSTRUCT(s)->ptr[i]);
}
return s;
}