* variable.c (rb_cvar_set): remove warn argument.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11611 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
aeec0f8445
commit
fe8d1cfdfd
@ -8,6 +8,10 @@ Fri Feb 2 18:27:54 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
|
|||||||
* eval.c: remove duplicated global variables rb_cProc and
|
* eval.c: remove duplicated global variables rb_cProc and
|
||||||
rb_cBinding. [ruby-dev:30242]
|
rb_cBinding. [ruby-dev:30242]
|
||||||
|
|
||||||
|
Thu Feb 1 20:31:41 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||||
|
|
||||||
|
* variable.c (rb_cvar_set): remove warn argument.
|
||||||
|
|
||||||
Wed Jan 31 14:52:09 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
|
Wed Jan 31 14:52:09 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||||
|
|
||||||
* test/ruby/test_iterator.rb (TestIterator::test_block_given_within_iterator):
|
* test/ruby/test_iterator.rb (TestIterator::test_block_given_within_iterator):
|
||||||
|
3
intern.h
3
intern.h
@ -577,8 +577,7 @@ VALUE rb_const_get_from(VALUE, ID);
|
|||||||
void rb_const_set(VALUE, ID, VALUE);
|
void rb_const_set(VALUE, ID, VALUE);
|
||||||
VALUE rb_mod_const_missing(VALUE,VALUE);
|
VALUE rb_mod_const_missing(VALUE,VALUE);
|
||||||
VALUE rb_cvar_defined(VALUE, ID);
|
VALUE rb_cvar_defined(VALUE, ID);
|
||||||
#define RB_CVAR_SET_4ARGS 1
|
void rb_cvar_set(VALUE, ID, VALUE);
|
||||||
void rb_cvar_set(VALUE, ID, VALUE, int);
|
|
||||||
VALUE rb_cvar_get(VALUE, ID);
|
VALUE rb_cvar_get(VALUE, ID);
|
||||||
void rb_cv_set(VALUE, const char*, VALUE);
|
void rb_cv_set(VALUE, const char*, VALUE);
|
||||||
VALUE rb_cv_get(VALUE, const char*);
|
VALUE rb_cv_get(VALUE, const char*);
|
||||||
|
2
object.c
2
object.c
@ -1793,7 +1793,7 @@ rb_mod_cvar_set(VALUE obj, VALUE iv, VALUE val)
|
|||||||
if (!rb_is_class_id(id)) {
|
if (!rb_is_class_id(id)) {
|
||||||
rb_name_error(id, "`%s' is not allowed as a class variable name", rb_id2name(id));
|
rb_name_error(id, "`%s' is not allowed as a class variable name", rb_id2name(id));
|
||||||
}
|
}
|
||||||
rb_cvar_set(obj, id, val, Qfalse);
|
rb_cvar_set(obj, id, val);
|
||||||
return val;
|
return val;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1565,7 +1565,7 @@ rb_define_global_const(const char *name, VALUE val)
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
rb_cvar_set(VALUE klass, ID id, VALUE val, int warn)
|
rb_cvar_set(VALUE klass, ID id, VALUE val)
|
||||||
{
|
{
|
||||||
mod_av_set(klass, id, val, Qfalse);
|
mod_av_set(klass, id, val, Qfalse);
|
||||||
}
|
}
|
||||||
@ -1600,7 +1600,7 @@ rb_cv_set(VALUE klass, const char *name, VALUE val)
|
|||||||
if (!rb_is_class_id(id)) {
|
if (!rb_is_class_id(id)) {
|
||||||
rb_name_error(id, "wrong class variable name %s", name);
|
rb_name_error(id, "wrong class variable name %s", name);
|
||||||
}
|
}
|
||||||
rb_cvar_set(klass, id, val, Qfalse);
|
rb_cvar_set(klass, id, val);
|
||||||
}
|
}
|
||||||
|
|
||||||
VALUE
|
VALUE
|
||||||
@ -1621,7 +1621,7 @@ rb_define_class_variable(VALUE klass, const char *name, VALUE val)
|
|||||||
if (!rb_is_class_id(id)) {
|
if (!rb_is_class_id(id)) {
|
||||||
rb_name_error(id, "wrong class variable name %s", name);
|
rb_name_error(id, "wrong class variable name %s", name);
|
||||||
}
|
}
|
||||||
rb_cvar_set(klass, id, val, Qtrue);
|
rb_cvar_set(klass, id, val);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
|
Loading…
x
Reference in New Issue
Block a user