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

* object.c (rb_mod_cvar_get): Module#class_variable_get(): back

Browse source 
ported from CVS HEAD.  [ruby-talk:144741]

* object.c (rb_mod_cvar_set): Module#class_variable_set().
  [ruby-talk:144741]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8582 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2005-06-07 08:41:55 +00:00
parent 0abd06b244
commit 5dcba62289
2 changed files with 67 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Tue Jun 7 17:39:54 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* object.c (rb_mod_cvar_get): Module#class_variable_get(): back
ported from CVS HEAD. [ruby-talk:144741]
* object.c (rb_mod_cvar_set): Module#class_variable_set().
[ruby-talk:144741]
Tue Jun 7 16:32:53 2005 Yukihiro Matsumoto <matz@ruby-lang.org> Tue Jun 7 16:32:53 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* sprintf.c (rb_f_sprintf): raise exception on debug mode (-d), * sprintf.c (rb_f_sprintf): raise exception on debug mode (-d),

59
object.c
View file

@ -2038,6 +2038,63 @@ rb_obj_ivar_set(obj, iv, val)
return rb_ivar_set(obj, id, val); return rb_ivar_set(obj, id, val);
} }
/*
* call-seq:
* mod.class_variable_get(symbol) => obj
*
* Returns the value of the given class variable (or throws a
* <code>NameError</code> exception). The <code>@@</code> part of the
* variable name should be included for regular class variables
*
* class Fred
* @@foo = 99
* end
* Fred.class_variable_get(:@foo) #=> 99
*/
static VALUE
rb_mod_cvar_get(obj, iv)
VALUE obj, iv;
{
ID id = rb_to_id(iv);
if (!rb_is_class_id(id)) {
rb_name_error(id, "`%s' is not allowed as an class variable name", rb_id2name(id));
}
return rb_cvar_get(obj, id);
}
/*
* call-seq:
* obj.class_variable_set(symbol, obj) => obj
*
* Sets the class variable names by <i>symbol</i> to
* <i>object</i>.
*
* class Fred
* @@foo = 99
* def foo
* @@foo
* end
* end
* Fred.class_variable_set(:@foo, 101) #=> 101
* Fred.new.foo #=> 101
*/
static VALUE
rb_mod_cvar_set(obj, iv, val)
VALUE obj, iv, val;
{
ID id = rb_to_id(iv);
if (!rb_is_class_id(id)) {
rb_name_error(id, "`%s' is not allowed as an class variable name", rb_id2name(id));
}
rb_cvar_set(obj, id, val, Qfalse);
return val;
}
static VALUE static VALUE
convert_type(val, tname, method, raise) convert_type(val, tname, method, raise)
VALUE val; VALUE val;
@ -2668,6 +2725,8 @@ Init_Object()
rb_mod_class_variables, 0); /* in variable.c */ rb_mod_class_variables, 0); /* in variable.c */
rb_define_private_method(rb_cModule, "remove_class_variable", rb_define_private_method(rb_cModule, "remove_class_variable",
rb_mod_remove_cvar, 1); /* in variable.c */ rb_mod_remove_cvar, 1); /* in variable.c */
rb_define_private_method(rb_cModule, "class_variable_get", rb_mod_cvar_get, 1);
rb_define_private_method(rb_cModule, "class_variable_set", rb_mod_cvar_set, 2);
rb_define_method(rb_cClass, "allocate", rb_obj_alloc, 0); rb_define_method(rb_cClass, "allocate", rb_obj_alloc, 0);
rb_define_method(rb_cClass, "new", rb_class_new_instance, -1); rb_define_method(rb_cClass, "new", rb_class_new_instance, -1);