1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* object.c (rb_mod_cvar_get): new method Module#class_variable_get.

* object.c (rb_mod_cvar_set): ditto (Module#class_variable_set).

* eval.c (rb_thread_atfork): 1.9 warns no more for thread
  termination.  [ruby-dev:23212]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6005 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2004-03-23 19:14:16 +00:00
parent 38c173aa60
commit 4f0ef242cc
4 changed files with 72 additions and 2 deletions

View file

@ -1,3 +1,14 @@
Wed Mar 24 04:12:44 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* object.c (rb_mod_cvar_get): new method Module#class_variable_get.
* object.c (rb_mod_cvar_set): ditto (Module#class_variable_set).
Tue Mar 23 17:45:22 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_thread_atfork): 1.9 warns no more for thread
termination. [ruby-dev:23212]
Tue Mar 23 14:46:10 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* Makefile.in, */Makefile.sub, common.mk (clean-local, distclean-local):

1
eval.c
View file

@ -12013,7 +12013,6 @@ rb_thread_atfork()
if (rb_thread_alone()) return;
FOREACH_THREAD(th) {
if (th != curr_thread) {
rb_warn("fork terminates thread at %s:%d", th->node->nd_file, nd_line(th->node));
rb_thread_die(th);
}
}

View file

@ -77,6 +77,7 @@ class Tempfile < SimpleDelegator
def _close # :nodoc:
@tmpfile.close if @tmpfile
@data[1] = @tmpfile = nil
@data = @tmpname = nil
end
protected :_close

View file

@ -1951,6 +1951,63 @@ rb_obj_ivar_set(obj, iv, 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
convert_type(val, tname, method, raise)
VALUE val;
@ -2578,6 +2635,8 @@ Init_Object()
rb_mod_class_variables, 0); /* in variable.c */
rb_define_private_method(rb_cModule, "remove_class_variable",
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, "new", rb_class_new_instance, -1);