diff options
Diffstat (limited to 'variable.c')
| -rw-r--r-- | variable.c | 1569 |
1 files changed, 855 insertions, 714 deletions
diff --git a/variable.c b/variable.c index a51dd9ea58..71ef831b4e 100644 --- a/variable.c +++ b/variable.c @@ -2,34 +2,37 @@ variable.c - - $Author: matz $ - $Date: 2006/07/20 07:04:17 $ + $Author$ created at: Tue Apr 19 23:55:15 JST 1994 - Copyright (C) 1993-2003 Yukihiro Matsumoto + Copyright (C) 1993-2007 Yukihiro Matsumoto Copyright (C) 2000 Network Applied Communication Laboratory, Inc. Copyright (C) 2000 Information-technology Promotion Agency, Japan **********************************************************************/ -#include "ruby.h" -#include "env.h" +#include "ruby/ruby.h" +#include "ruby/st.h" +#include "ruby/util.h" +#include "ruby/encoding.h" #include "node.h" -#include "st.h" -#include "util.h" + +void rb_vm_change_state(void); +void rb_vm_inc_const_missing_count(void); st_table *rb_global_tbl; st_table *rb_class_tbl; -static ID autoload, classpath, tmp_classpath; +static ID autoload, classpath, tmp_classpath, classid; void -Init_var_tables() +Init_var_tables(void) { rb_global_tbl = st_init_numtable(); rb_class_tbl = st_init_numtable(); - autoload = rb_intern("__autoload__"); - classpath = rb_intern("__classpath__"); - tmp_classpath = rb_intern("__tmp_classpath__"); + CONST_ID(autoload, "__autoload__"); + CONST_ID(classpath, "__classpath__"); + CONST_ID(tmp_classpath, "__tmp_classpath__"); + CONST_ID(classid, "__classid__"); } struct fc_result { @@ -41,37 +44,34 @@ struct fc_result { }; static VALUE -fc_path(fc, name) - struct fc_result *fc; - ID name; +fc_path(struct fc_result *fc, ID name) { VALUE path, tmp; - path = rb_str_new2(rb_id2name(name)); + path = rb_str_dup(rb_id2str(name)); while (fc) { + st_data_t n; if (fc->track == rb_cObject) break; - if (ROBJECT(fc->track)->iv_tbl && - st_lookup(ROBJECT(fc->track)->iv_tbl, classpath, &tmp)) { - tmp = rb_str_dup(tmp); + if (RCLASS_IV_TBL(fc->track) && + st_lookup(RCLASS_IV_TBL(fc->track), (st_data_t)classpath, &n)) { + tmp = rb_str_dup((VALUE)n); rb_str_cat2(tmp, "::"); rb_str_append(tmp, path); - - return tmp; + path = tmp; + break; } - tmp = rb_str_new2(rb_id2name(fc->name)); + tmp = rb_str_dup(rb_id2str(fc->name)); rb_str_cat2(tmp, "::"); rb_str_append(tmp, path); path = tmp; fc = fc->prev; } + OBJ_FREEZE(path); return path; } static int -fc_i(key, value, res) - ID key; - VALUE value; - struct fc_result *res; +fc_i(ID key, VALUE value, struct fc_result *res) { if (!rb_is_const_id(key)) return ST_CONTINUE; @@ -82,7 +82,7 @@ fc_i(key, value, res) switch (TYPE(value)) { case T_MODULE: case T_CLASS: - if (!RCLASS(value)->iv_tbl) return ST_CONTINUE; + if (!RCLASS_IV_TBL(value)) return ST_CONTINUE; else { struct fc_result arg; struct fc_result *list; @@ -98,7 +98,7 @@ fc_i(key, value, res) arg.klass = res->klass; arg.track = value; arg.prev = res; - st_foreach_safe(RCLASS(value)->iv_tbl, fc_i, (st_data_t)&arg); + st_foreach(RCLASS_IV_TBL(value), fc_i, (st_data_t)&arg); if (arg.path) { res->path = arg.path; return ST_STOP; @@ -113,8 +113,7 @@ fc_i(key, value, res) } static VALUE -find_class_path(klass) - VALUE klass; +find_class_path(VALUE klass) { struct fc_result arg; @@ -123,40 +122,44 @@ find_class_path(klass) arg.klass = klass; arg.track = rb_cObject; arg.prev = 0; - if (RCLASS(rb_cObject)->iv_tbl) { - st_foreach_safe(RCLASS(rb_cObject)->iv_tbl, fc_i, (st_data_t)&arg); + if (RCLASS_IV_TBL(rb_cObject)) { + st_foreach_safe(RCLASS_IV_TBL(rb_cObject), fc_i, (st_data_t)&arg); } if (arg.path == 0) { - st_foreach(rb_class_tbl, fc_i, (st_data_t)&arg); + st_foreach_safe(rb_class_tbl, fc_i, (st_data_t)&arg); } if (arg.path) { - if (!ROBJECT(klass)->iv_tbl) { - ROBJECT(klass)->iv_tbl = st_init_numtable(); + st_data_t tmp = tmp_classpath; + if (!RCLASS_IV_TBL(klass)) { + RCLASS_IV_TBL(klass) = st_init_numtable(); } - st_insert(ROBJECT(klass)->iv_tbl, classpath, arg.path); - st_delete(RCLASS(klass)->iv_tbl, &tmp_classpath, 0); + st_insert(RCLASS_IV_TBL(klass), (st_data_t)classpath, arg.path); + st_delete(RCLASS_IV_TBL(klass), &tmp, 0); return arg.path; } return Qnil; } static VALUE -classname(klass) - VALUE klass; +classname(VALUE klass) { VALUE path = Qnil; + st_data_t n; if (!klass) klass = rb_cObject; - if (ROBJECT(klass)->iv_tbl) { - if (!st_lookup(ROBJECT(klass)->iv_tbl, classpath, &path)) { - ID classid = rb_intern("__classid__"); - - if (!st_lookup(ROBJECT(klass)->iv_tbl, classid, &path)) { + if (RCLASS_IV_TBL(klass)) { + if (!st_lookup(RCLASS_IV_TBL(klass), (st_data_t)classpath, &n)) { + if (!st_lookup(RCLASS_IV_TBL(klass), (st_data_t)classid, &n)) { return find_class_path(klass); } - path = rb_str_new2(rb_id2name(SYM2ID(path))); - st_insert(ROBJECT(klass)->iv_tbl, classpath, path); - st_delete(RCLASS(klass)->iv_tbl, (st_data_t*)&classid, 0); + path = rb_str_dup(rb_id2str(SYM2ID((VALUE)n))); + OBJ_FREEZE(path); + st_insert(RCLASS_IV_TBL(klass), (st_data_t)classpath, (st_data_t)path); + n = classid; + st_delete(RCLASS_IV_TBL(klass), &n, 0); + } + else { + path = (VALUE)n; } if (TYPE(path) != T_STRING) { rb_bug("class path is not set properly"); @@ -168,35 +171,33 @@ classname(klass) /* * call-seq: - * mod.name => string - * - * Returns the name of the module <i>mod</i>. + * mod.name -> string + * + * Returns the name of the module <i>mod</i>. Returns nil for anonymous modules. */ VALUE -rb_mod_name(mod) - VALUE mod; +rb_mod_name(VALUE mod) { VALUE path = classname(mod); if (!NIL_P(path)) return rb_str_dup(path); - return rb_str_new(0,0); + return path; } VALUE -rb_class_path(klass) - VALUE klass; +rb_class_path(VALUE klass) { VALUE path = classname(klass); + st_data_t n = (st_data_t)path; if (!NIL_P(path)) return path; - if (RCLASS(klass)->iv_tbl && st_lookup(RCLASS(klass)->iv_tbl, - tmp_classpath, &path)) { - return path; + if (RCLASS_IV_TBL(klass) && st_lookup(RCLASS_IV_TBL(klass), + (st_data_t)tmp_classpath, &n)) { + return (VALUE)n; } else { - char *s = "Class"; - size_t len; + const char *s = "Class"; if (TYPE(klass) == T_MODULE) { if (rb_obj_class(klass) == rb_cModule) { @@ -206,10 +207,8 @@ rb_class_path(klass) s = rb_class2name(RBASIC(klass)->klass); } } - len = 2 + strlen(s) + 3 + 2 * SIZEOF_LONG + 1; - path = rb_str_new(0, len); - snprintf(RSTRING(path)->ptr, len+1, "#<%s:0x%lx>", s, klass); - RSTRING(path)->len = strlen(RSTRING(path)->ptr); + path = rb_sprintf("#<%s:%p>", s, (void*)klass); + OBJ_FREEZE(path); rb_ivar_set(klass, tmp_classpath, path); return path; @@ -217,9 +216,24 @@ rb_class_path(klass) } void -rb_set_class_path(klass, under, name) - VALUE klass, under; - const char *name; +rb_set_class_path_string(VALUE klass, VALUE under, VALUE name) +{ + VALUE str; + + if (under == rb_cObject) { + str = rb_str_new_frozen(name); + } + else { + str = rb_str_dup(rb_class_path(under)); + rb_str_cat2(str, "::"); + rb_str_append(str, name); + OBJ_FREEZE(str); + } + rb_ivar_set(klass, classpath, str); +} + +void +rb_set_class_path(VALUE klass, VALUE under, const char *name) { VALUE str; @@ -231,27 +245,28 @@ rb_set_class_path(klass, under, name) rb_str_cat2(str, "::"); rb_str_cat2(str, name); } + OBJ_FREEZE(str); rb_ivar_set(klass, classpath, str); } VALUE -rb_path2class(path) - const char *path; +rb_path_to_class(VALUE pathname) { - const char *pbeg, *p; + rb_encoding *enc = rb_enc_get(pathname); + const char *pbeg, *p, *path = RSTRING_PTR(pathname); ID id; VALUE c = rb_cObject; + if (!rb_enc_asciicompat(enc)) { + rb_raise(rb_eArgError, "invalid class path encoding (non ASCII)"); + } + pbeg = p = path; if (path[0] == '#') { rb_raise(rb_eArgError, "can't retrieve anonymous class %s", path); } - pbeg = p = path; while (*p) { - VALUE str; - while (*p && *p != ':') p++; - str = rb_str_new(pbeg, p-pbeg); - id = rb_intern(RSTRING(str)->ptr); + id = rb_intern3(pbeg, p-pbeg, enc); if (p[0] == ':') { if (p[1] != ':') goto undefined_class; p += 2; @@ -259,7 +274,7 @@ rb_path2class(path) } if (!rb_const_defined(c, id)) { undefined_class: - rb_raise(rb_eArgError, "undefined class/module %.*s", p-path, path); + rb_raise(rb_eArgError, "undefined class/module %.*s", (int)(p-path), path); } c = rb_const_get_at(c, id); switch (TYPE(c)) { @@ -267,45 +282,54 @@ rb_path2class(path) case T_CLASS: break; default: - rb_raise(rb_eTypeError, "%s does not refer class/module", path); + rb_raise(rb_eTypeError, "%s does not refer to class/module", path); } } return c; } +VALUE +rb_path2class(const char *path) +{ + return rb_path_to_class(rb_str_new_cstr(path)); +} + void -rb_name_class(klass, id) - VALUE klass; - ID id; +rb_name_class(VALUE klass, ID id) { - rb_iv_set(klass, "__classid__", ID2SYM(id)); + rb_ivar_set(klass, classid, ID2SYM(id)); } VALUE -rb_class_name(klass) - VALUE klass; +rb_class_name(VALUE klass) { return rb_class_path(rb_class_real(klass)); } -char * -rb_class2name(klass) - VALUE klass; +const char * +rb_class2name(VALUE klass) { - return RSTRING(rb_class_name(klass))->ptr; + VALUE name = rb_class_name(klass); + return RSTRING_PTR(name); } -char * -rb_obj_classname(obj) - VALUE obj; +const char * +rb_obj_classname(VALUE obj) { return rb_class2name(CLASS_OF(obj)); } +#define global_variable rb_global_variable +#define global_entry rb_global_entry + +#define gvar_getter_t rb_gvar_getter_t +#define gvar_setter_t rb_gvar_setter_t +#define gvar_marker_t rb_gvar_marker_t + struct trace_var { int removed; - void (*func)(); + void (*func)(VALUE arg, VALUE val); VALUE data; struct trace_var *next; }; @@ -313,37 +337,34 @@ struct trace_var { struct global_variable { int counter; void *data; - VALUE (*getter)(); - void (*setter)(); - void (*marker)(); + gvar_getter_t *getter; + gvar_setter_t *setter; + gvar_marker_t *marker; int block_trace; struct trace_var *trace; }; -struct global_entry { - struct global_variable *var; - ID id; -}; +#define undef_getter rb_gvar_undef_getter +#define undef_setter rb_gvar_undef_setter +#define undef_marker rb_gvar_undef_marker -static VALUE undef_getter(); -static void undef_setter(); -static void undef_marker(); +#define val_getter rb_gvar_val_getter +#define val_setter rb_gvar_val_setter +#define val_marker rb_gvar_val_marker -static VALUE val_getter(); -static void val_setter(); -static void val_marker(); +#define var_getter rb_gvar_var_getter +#define var_setter rb_gvar_var_setter +#define var_marker rb_gvar_var_marker -static VALUE var_getter(); -static void var_setter(); -static void var_marker(); +#define readonly_setter rb_gvar_readonly_setter struct global_entry* -rb_global_entry(id) - ID id; +rb_global_entry(ID id) { struct global_entry *entry; + st_data_t data; - if (!st_lookup(rb_global_tbl, id, (st_data_t *)&entry)) { + if (!st_lookup(rb_global_tbl, (st_data_t)id, &data)) { struct global_variable *var; entry = ALLOC(struct global_entry); var = ALLOC(struct global_variable); @@ -359,24 +380,22 @@ rb_global_entry(id) var->trace = 0; st_add_direct(rb_global_tbl, id, (st_data_t)entry); } + else { + entry = (struct global_entry *)data; + } return entry; } -static VALUE -undef_getter(id) - ID id; +VALUE +undef_getter(ID id, void *data, struct global_variable *var) { rb_warning("global variable `%s' not initialized", rb_id2name(id)); return Qnil; } -static void -undef_setter(val, id, data, var) - VALUE val; - ID id; - void *data; - struct global_variable *var; +void +undef_setter(VALUE val, ID id, void *data, struct global_variable *var) { var->getter = val_getter; var->setter = val_setter; @@ -385,74 +404,58 @@ undef_setter(val, id, data, var) var->data = (void*)val; } -static void -undef_marker() +void +undef_marker(VALUE *var) { } -static VALUE -val_getter(id, val) - ID id; - VALUE val; +VALUE +val_getter(ID id, void *data, struct global_variable *var) { - return val; + return (VALUE)data; } -static void -val_setter(val, id, data, var) - VALUE val; - ID id; - void *data; - struct global_variable *var; +void +val_setter(VALUE val, ID id, void *data, struct global_variable *var) { var->data = (void*)val; } -static void -val_marker(data) - VALUE data; +void +val_marker(VALUE *var) { + VALUE data = (VALUE)var; if (data) rb_gc_mark_maybe(data); } -static VALUE -var_getter(id, var) - ID id; - VALUE *var; +VALUE +var_getter(ID id, void *data, struct global_variable *gvar) { + VALUE *var = data; if (!var) return Qnil; return *var; } -static void -var_setter(val, id, var) - VALUE val; - ID id; - VALUE *var; +void +var_setter(VALUE val, ID id, void *data, struct global_variable *gvar) { - *var = val; + *(VALUE *)data = val; } -static void -var_marker(var) - VALUE *var; +void +var_marker(VALUE *var) { if (var) rb_gc_mark_maybe(*var); } -static void -readonly_setter(val, id, var) - VALUE val; - ID id; - void *var; +void +readonly_setter(VALUE val, ID id, void *data, struct global_variable *gvar) { rb_name_error(id, "%s is a read-only variable", rb_id2name(id)); } static int -mark_global_entry(key, entry) - ID key; - struct global_entry *entry; +mark_global_entry(ID key, struct global_entry *entry) { struct trace_var *trace; struct global_variable *var = entry->var; @@ -467,67 +470,64 @@ mark_global_entry(key, entry) } void -rb_gc_mark_global_tbl() +rb_gc_mark_global_tbl(void) { - if (rb_global_tbl) { - st_foreach(rb_global_tbl, mark_global_entry, 0); - } + if (rb_global_tbl) + st_foreach_safe(rb_global_tbl, mark_global_entry, 0); } static ID -global_id(name) - const char *name; +global_id(const char *name) { ID id; if (name[0] == '$') id = rb_intern(name); else { - char *buf = ALLOCA_N(char, strlen(name)+2); + size_t len = strlen(name); + char *buf = ALLOCA_N(char, len+1); buf[0] = '$'; - strcpy(buf+1, name); - id = rb_intern(buf); + memcpy(buf+1, name, len); + id = rb_intern2(buf, len+1); } return id; } void -rb_define_hooked_variable(name, var, getter, setter) - const char *name; - VALUE *var; - VALUE (*getter)(); - void (*setter)(); +rb_define_hooked_variable( + const char *name, + VALUE *var, + VALUE (*getter)(ANYARGS), + void (*setter)(ANYARGS)) { - struct global_variable *gvar; + volatile VALUE tmp = var ? *var : Qnil; ID id = global_id(name); + struct global_variable *gvar = rb_global_entry(id)->var; - gvar = rb_global_entry(id)->var; gvar->data = (void*)var; - gvar->getter = getter?getter:var_getter; - gvar->setter = setter?setter:var_setter; + gvar->getter = getter?(gvar_getter_t *)getter:var_getter; + gvar->setter = setter?(gvar_setter_t *)setter:var_setter; gvar->marker = var_marker; + + RB_GC_GUARD(tmp); } void -rb_define_variable(name, var) - const char *name; - VALUE *var; +rb_define_variable(const char *name, VALUE *var) { rb_define_hooked_variable(name, var, 0, 0); } void -rb_define_readonly_variable(name, var) - const char *name; - VALUE *var; +rb_define_readonly_variable(const char *name, VALUE *var) { rb_define_hooked_variable(name, var, 0, readonly_setter); } void -rb_define_virtual_variable(name, getter, setter) - const char *name; - VALUE (*getter)(); - void (*setter)(); +rb_define_virtual_variable( + const char *name, + VALUE (*getter)(ANYARGS), + void (*setter)(ANYARGS)) { if (!getter) getter = val_getter; if (!setter) setter = readonly_setter; @@ -535,17 +535,16 @@ rb_define_virtual_variable(name, getter, setter) } static void -rb_trace_eval(cmd, val) - VALUE cmd, val; +rb_trace_eval(VALUE cmd, VALUE val) { rb_eval_cmd(cmd, rb_ary_new3(1, val), 0); } /* * call-seq: - * trace_var(symbol, cmd ) => nil - * trace_var(symbol) {|val| block } => nil - * + * trace_var(symbol, cmd ) -> nil + * trace_var(symbol) {|val| block } -> nil + * * Controls tracing of assignments to global variables. The parameter * +symbol_ identifies the variable (as either a string name or a * symbol identifier). _cmd_ (which may be a string or a @@ -553,21 +552,19 @@ rb_trace_eval(cmd, val) * is assigned. The block or +Proc+ object receives the * variable's new value as a parameter. Also see * <code>Kernel::untrace_var</code>. - * + * * trace_var :$_, proc {|v| puts "$_ is now '#{v}'" } * $_ = "hello" * $_ = ' there' - * + * * <em>produces:</em> - * + * * $_ is now 'hello' * $_ is now ' there' */ VALUE -rb_f_trace_var(argc, argv) - int argc; - VALUE *argv; +rb_f_trace_var(int argc, VALUE *argv) { VALUE var, cmd; struct global_entry *entry; @@ -595,8 +592,7 @@ rb_f_trace_var(argc, argv) } static void -remove_trace(var) - struct global_variable *var; +remove_trace(struct global_variable *var) { struct trace_var *trace = var->trace; struct trace_var t; @@ -608,7 +604,7 @@ remove_trace(var) next = trace->next; if (next->removed) { trace->next = next->next; - free(next); + xfree(next); } else { trace = next; @@ -619,8 +615,8 @@ remove_trace(var) /* * call-seq: - * untrace_var(symbol [, cmd] ) => array or nil - * + * untrace_var(symbol [, cmd] ) -> array or nil + * * Removes tracing for the specified command on the given global * variable and returns +nil+. If no command is specified, * removes all tracing for that variable and returns an array @@ -628,22 +624,22 @@ remove_trace(var) */ VALUE -rb_f_untrace_var(argc, argv) - int argc; - VALUE *argv; +rb_f_untrace_var(int argc, VALUE *argv) { VALUE var, cmd; ID id; struct global_entry *entry; struct trace_var *trace; + st_data_t data; + rb_secure(4); rb_scan_args(argc, argv, "11", &var, &cmd); id = rb_to_id(var); - if (!st_lookup(rb_global_tbl, id, (st_data_t *)&entry)) { + if (!st_lookup(rb_global_tbl, (st_data_t)id, &data)) { rb_name_error(id, "undefined global variable %s", rb_id2name(id)); } - trace = entry->var->trace; + trace = (entry = (struct global_entry *)data)->var->trace; if (NIL_P(cmd)) { VALUE ary = rb_ary_new(); @@ -671,8 +667,7 @@ rb_f_untrace_var(argc, argv) } VALUE -rb_gvar_get(entry) - struct global_entry *entry; +rb_gvar_get(struct global_entry *entry) { struct global_variable *var = entry->var; return (*var->getter)(entry->id, var->data, var); @@ -684,8 +679,7 @@ struct trace_data { }; static VALUE -trace_ev(data) - struct trace_data *data; +trace_ev(struct trace_data *data) { struct trace_var *trace = data->trace; @@ -697,8 +691,7 @@ trace_ev(data) } static VALUE -trace_en(var) - struct global_variable *var; +trace_en(struct global_variable *var) { var->block_trace = 0; remove_trace(var); @@ -706,9 +699,7 @@ trace_en(var) } VALUE -rb_gvar_set(entry, val) - struct global_entry *entry; - VALUE val; +rb_gvar_set(struct global_entry *entry, VALUE val) { struct trace_data trace; struct global_variable *var = entry->var; @@ -727,9 +718,7 @@ rb_gvar_set(entry, val) } VALUE -rb_gv_set(name, val) - const char *name; - VALUE val; +rb_gv_set(const char *name, VALUE val) { struct global_entry *entry; @@ -738,8 +727,7 @@ rb_gv_set(name, val) } VALUE -rb_gv_get(name) - const char *name; +rb_gv_get(const char *name) { struct global_entry *entry; @@ -748,66 +736,60 @@ rb_gv_get(name) } VALUE -rb_gvar_defined(entry) - struct global_entry *entry; +rb_gvar_defined(struct global_entry *entry) { if (entry->var->getter == undef_getter) return Qfalse; return Qtrue; } static int -gvar_i(key, entry, ary) - ID key; - struct global_entry *entry; - VALUE ary; +gvar_i(ID key, struct global_entry *entry, VALUE ary) { - rb_ary_push(ary, rb_str_new2(rb_id2name(key))); + rb_ary_push(ary, ID2SYM(key)); return ST_CONTINUE; } /* * call-seq: - * global_variables => array - * + * global_variables -> array + * * Returns an array of the names of global variables. - * - * global_variables.grep /std/ #=> ["$stderr", "$stdout", "$stdin"] + * + * global_variables.grep /std/ #=> [:$stdin, :$stdout, :$stderr] */ VALUE -rb_f_global_variables() +rb_f_global_variables(void) { VALUE ary = rb_ary_new(); - char buf[4]; - char *s = "&`'+123456789"; - - st_foreach(rb_global_tbl, gvar_i, ary); - if (!NIL_P(rb_backref_get())) { - while (*s) { - sprintf(buf, "$%c", *s++); - rb_ary_push(ary, rb_str_new2(buf)); - } + char buf[2]; + int i; + + st_foreach_safe(rb_global_tbl, gvar_i, ary); + buf[0] = '$'; + for (i = 1; i <= 9; ++i) { + buf[1] = (char)(i + '0'); + rb_ary_push(ary, ID2SYM(rb_intern2(buf, 2))); } return ary; } void -rb_alias_variable(name1, name2) - ID name1; - ID name2; +rb_alias_variable(ID name1, ID name2) { struct global_entry *entry1, *entry2; + st_data_t data1; if (rb_safe_level() >= 4) rb_raise(rb_eSecurityError, "Insecure: can't alias global variable"); entry2 = rb_global_entry(name2); - if (!st_lookup(rb_global_tbl, name1, (st_data_t *)&entry1)) { + if (!st_lookup(rb_global_tbl, (st_data_t)name1, &data1)) { entry1 = ALLOC(struct global_entry); entry1->id = name1; st_add_direct(rb_global_tbl, name1, (st_data_t)entry1); } - else if (entry1->var != entry2->var) { + else if ((entry1 = (struct global_entry *)data1)->var != entry2->var) { struct global_variable *var = entry1->var; if (var->block_trace) { rb_raise(rb_eRuntimeError, "can't alias in tracer"); @@ -817,10 +799,10 @@ rb_alias_variable(name1, name2) struct trace_var *trace = var->trace; while (trace) { struct trace_var *next = trace->next; - free(trace); + xfree(trace); trace = next; } - free(var); + xfree(var); } } else { @@ -834,32 +816,27 @@ static int special_generic_ivar = 0; static st_table *generic_iv_tbl; st_table* -rb_generic_ivar_table(obj) - VALUE obj; +rb_generic_ivar_table(VALUE obj) { - st_table *tbl; + st_data_t tbl; if (!FL_TEST(obj, FL_EXIVAR)) return 0; if (!generic_iv_tbl) return 0; - if (!st_lookup(generic_iv_tbl, obj, (st_data_t *)&tbl)) return 0; - return tbl; + if (!st_lookup(generic_iv_tbl, (st_data_t)obj, &tbl)) return 0; + return (st_table *)tbl; } static VALUE -generic_ivar_get(obj, id, warn) - VALUE obj; - ID id; - int warn; +generic_ivar_get(VALUE obj, ID id, int warn) { - st_table *tbl; - VALUE val; + st_data_t tbl, val; if (generic_iv_tbl) { - if (st_lookup(generic_iv_tbl, obj, (st_data_t *)&tbl)) { - if (st_lookup(tbl, id, &val)) { - return val; + if (st_lookup(generic_iv_tbl, (st_data_t)obj, &tbl)) { + if (st_lookup((st_table *)tbl, (st_data_t)id, &val)) { + return (VALUE)val; + } } - } } if (warn) { rb_warning("instance variable %s not initialized", rb_id2name(id)); @@ -868,99 +845,90 @@ generic_ivar_get(obj, id, warn) } static void -generic_ivar_set(obj, id, val) - VALUE obj; - ID id; - VALUE val; +generic_ivar_set(VALUE obj, ID id, VALUE val) { st_table *tbl; + st_data_t data; if (rb_special_const_p(obj)) { + if (rb_obj_frozen_p(obj)) rb_error_frozen("object"); special_generic_ivar = 1; } if (!generic_iv_tbl) { generic_iv_tbl = st_init_numtable(); } - - if (!st_lookup(generic_iv_tbl, obj, (st_data_t *)&tbl)) { + if (!st_lookup(generic_iv_tbl, (st_data_t)obj, &data)) { FL_SET(obj, FL_EXIVAR); tbl = st_init_numtable(); - st_add_direct(generic_iv_tbl, obj, (st_data_t)tbl); - st_add_direct(tbl, id, val); + st_add_direct(generic_iv_tbl, (st_data_t)obj, (st_data_t)tbl); + st_add_direct(tbl, (st_data_t)id, (st_data_t)val); return; } - st_insert(tbl, id, val); + st_insert((st_table *)data, (st_data_t)id, (st_data_t)val); } static VALUE -generic_ivar_defined(obj, id) - VALUE obj; - ID id; +generic_ivar_defined(VALUE obj, ID id) { st_table *tbl; - VALUE val; + st_data_t data; if (!generic_iv_tbl) return Qfalse; - if (!st_lookup(generic_iv_tbl, obj, (st_data_t *)&tbl)) return Qfalse; - if (st_lookup(tbl, id, &val)) { + if (!st_lookup(generic_iv_tbl, (st_data_t)obj, &data)) return Qfalse; + tbl = (st_table *)data; + if (st_lookup(tbl, (st_data_t)id, &data)) { return Qtrue; } return Qfalse; } static int -generic_ivar_remove(obj, id, valp) - VALUE obj; - ID id; - VALUE *valp; +generic_ivar_remove(VALUE obj, ID id, st_data_t *valp) { st_table *tbl; + st_data_t data; int status; if (!generic_iv_tbl) return 0; - if (!st_lookup(generic_iv_tbl, obj, (st_data_t *)&tbl)) return 0; + if (!st_lookup(generic_iv_tbl, (st_data_t)obj, &data)) return 0; + tbl = (st_table *)data; status = st_delete(tbl, &id, valp); if (tbl->num_entries == 0) { - st_delete(generic_iv_tbl, &obj, (st_data_t *)&tbl); - st_free_table(tbl); + st_delete(generic_iv_tbl, &obj, &data); + st_free_table((st_table *)data); } return status; } void -rb_mark_generic_ivar(obj) - VALUE obj; +rb_mark_generic_ivar(VALUE obj) { - st_table *tbl; + st_data_t tbl; if (!generic_iv_tbl) return; - if (st_lookup(generic_iv_tbl, obj, (st_data_t *)&tbl)) { - rb_mark_tbl(tbl); + if (st_lookup(generic_iv_tbl, (st_data_t)obj, &tbl)) { + rb_mark_tbl((st_table *)tbl); } } static int -givar_mark_i(key, value) - ID key; - VALUE value; +givar_mark_i(ID key, VALUE value) { rb_gc_mark(value); return ST_CONTINUE; } static int -givar_i(obj, tbl) - VALUE obj; - st_table *tbl; +givar_i(VALUE obj, st_table *tbl) { if (rb_special_const_p(obj)) { - st_foreach(tbl, givar_mark_i, 0); + st_foreach_safe(tbl, givar_mark_i, 0); } return ST_CONTINUE; } void -rb_mark_generic_ivar_tbl() +rb_mark_generic_ivar_tbl(void) { if (!generic_iv_tbl) return; if (special_generic_ivar == 0) return; @@ -968,48 +936,78 @@ rb_mark_generic_ivar_tbl() } void -rb_free_generic_ivar(obj) - VALUE obj; +rb_free_generic_ivar(VALUE obj) { - st_table *tbl; + st_data_t key = (st_data_t)obj, tbl; - if (st_delete(generic_iv_tbl, &obj, (st_data_t *)&tbl)) - st_free_table(tbl); + if (!generic_iv_tbl) return; + if (st_delete(generic_iv_tbl, &key, &tbl)) + st_free_table((st_table *)tbl); +} + +size_t +rb_generic_ivar_memsize(VALUE obj) +{ + st_data_t tbl; + if (st_lookup(generic_iv_tbl, (st_data_t)obj, &tbl)) + return st_memsize((st_table *)tbl); + return 0; } void -rb_copy_generic_ivar(clone, obj) - VALUE clone, obj; +rb_copy_generic_ivar(VALUE clone, VALUE obj) { - st_table *tbl; + st_data_t data; if (!generic_iv_tbl) return; - if (st_lookup(generic_iv_tbl, obj, (st_data_t *)&tbl)) { - st_table *old; - - if (st_lookup(generic_iv_tbl, clone, (st_data_t *)&old)) { - st_free_table(old); - st_insert(generic_iv_tbl, clone, (st_data_t)st_copy(tbl)); + if (!FL_TEST(obj, FL_EXIVAR)) { + clear: + if (FL_TEST(clone, FL_EXIVAR)) { + rb_free_generic_ivar(clone); + FL_UNSET(clone, FL_EXIVAR); + } + return; + } + if (st_lookup(generic_iv_tbl, (st_data_t)obj, &data)) { + st_table *tbl = (st_table *)data; + + if (tbl->num_entries == 0) + goto clear; + + if (st_lookup(generic_iv_tbl, (st_data_t)clone, &data)) { + st_free_table((st_table *)data); + st_insert(generic_iv_tbl, (st_data_t)clone, (st_data_t)st_copy(tbl)); } else { - st_add_direct(generic_iv_tbl, clone, (st_data_t)st_copy(tbl)); + st_add_direct(generic_iv_tbl, (st_data_t)clone, (st_data_t)st_copy(tbl)); + FL_SET(clone, FL_EXIVAR); } } } static VALUE -ivar_get(obj, id, warn) - VALUE obj; - ID id; - int warn; +ivar_get(VALUE obj, ID id, int warn) { - VALUE val; + VALUE val, *ptr; + struct st_table *iv_index_tbl; + long len; + st_data_t index; switch (TYPE(obj)) { case T_OBJECT: + len = ROBJECT_NUMIV(obj); + ptr = ROBJECT_IVPTR(obj); + iv_index_tbl = ROBJECT_IV_INDEX_TBL(obj); + if (!iv_index_tbl) break; + if (!st_lookup(iv_index_tbl, (st_data_t)id, &index)) break; + if (len <= (long)index) break; + val = ptr[index]; + if (val != Qundef) + return val; + break; case T_CLASS: case T_MODULE: - if (ROBJECT(obj)->iv_tbl && st_lookup(ROBJECT(obj)->iv_tbl, id, &val)) + if (RCLASS_IV_TBL(obj) && st_lookup(RCLASS_IV_TBL(obj), (st_data_t)id, &val)) return val; break; default: @@ -1024,37 +1022,84 @@ ivar_get(obj, id, warn) } VALUE -rb_ivar_get(obj, id) - VALUE obj; - ID id; +rb_ivar_get(VALUE obj, ID id) { - return ivar_get(obj, id, Qtrue); + return ivar_get(obj, id, TRUE); } VALUE -rb_attr_get(obj, id) - VALUE obj; - ID id; +rb_attr_get(VALUE obj, ID id) { - return ivar_get(obj, id, Qfalse); + return ivar_get(obj, id, FALSE); } VALUE -rb_ivar_set(obj, id, val) - VALUE obj; - ID id; - VALUE val; +rb_ivar_set(VALUE obj, ID id, VALUE val) { - if (!OBJ_TAINTED(obj) && rb_safe_level() >= 4) + struct st_table *iv_index_tbl; + st_data_t index; + long i, len; + int ivar_extended; + + if (!OBJ_UNTRUSTED(obj) && rb_safe_level() >= 4) rb_raise(rb_eSecurityError, "Insecure: can't modify instance variable"); if (OBJ_FROZEN(obj)) rb_error_frozen("object"); switch (TYPE(obj)) { case T_OBJECT: + iv_index_tbl = ROBJECT_IV_INDEX_TBL(obj); + if (!iv_index_tbl) { + VALUE klass = rb_obj_class(obj); + iv_index_tbl = RCLASS_IV_INDEX_TBL(klass); + if (!iv_index_tbl) { + iv_index_tbl = RCLASS_IV_INDEX_TBL(klass) = st_init_numtable(); + } + } + ivar_extended = 0; + if (!st_lookup(iv_index_tbl, (st_data_t)id, &index)) { + index = iv_index_tbl->num_entries; + st_add_direct(iv_index_tbl, (st_data_t)id, index); + ivar_extended = 1; + } + len = ROBJECT_NUMIV(obj); + if (len <= (long)index) { + VALUE *ptr = ROBJECT_IVPTR(obj); + if (index < ROBJECT_EMBED_LEN_MAX) { + RBASIC(obj)->flags |= ROBJECT_EMBED; + ptr = ROBJECT(obj)->as.ary; + for (i = 0; i < ROBJECT_EMBED_LEN_MAX; i++) { + ptr[i] = Qundef; + } + } + else { + VALUE *newptr; + long newsize = (index+1) + (index+1)/4; /* (index+1)*1.25 */ + if (!ivar_extended && + iv_index_tbl->num_entries < (st_index_t)newsize) { + newsize = iv_index_tbl->num_entries; + } + if (RBASIC(obj)->flags & ROBJECT_EMBED) { + newptr = ALLOC_N(VALUE, newsize); + MEMCPY(newptr, ptr, VALUE, len); + RBASIC(obj)->flags &= ~ROBJECT_EMBED; + ROBJECT(obj)->as.heap.ivptr = newptr; + } + else { + REALLOC_N(ROBJECT(obj)->as.heap.ivptr, VALUE, newsize); + newptr = ROBJECT(obj)->as.heap.ivptr; + } + for (; len < newsize; len++) + newptr[len] = Qundef; + ROBJECT(obj)->as.heap.numiv = newsize; + ROBJECT(obj)->as.heap.iv_index_tbl = iv_index_tbl; + } + } + ROBJECT_IVPTR(obj)[index] = val; + break; case T_CLASS: case T_MODULE: - if (!ROBJECT(obj)->iv_tbl) ROBJECT(obj)->iv_tbl = st_init_numtable(); - st_insert(ROBJECT(obj)->iv_tbl, id, val); - break; + if (!RCLASS_IV_TBL(obj)) RCLASS_IV_TBL(obj) = st_init_numtable(); + st_insert(RCLASS_IV_TBL(obj), (st_data_t)id, val); + break; default: generic_ivar_set(obj, id, val); break; @@ -1063,15 +1108,24 @@ rb_ivar_set(obj, id, val) } VALUE -rb_ivar_defined(obj, id) - VALUE obj; - ID id; +rb_ivar_defined(VALUE obj, ID id) { + VALUE val; + struct st_table *iv_index_tbl; + st_data_t index; switch (TYPE(obj)) { case T_OBJECT: + iv_index_tbl = ROBJECT_IV_INDEX_TBL(obj); + if (!iv_index_tbl) break; + if (!st_lookup(iv_index_tbl, (st_data_t)id, &index)) break; + if (ROBJECT_NUMIV(obj) <= (long)index) break; + val = ROBJECT_IVPTR(obj)[index]; + if (val != Qundef) + return Qtrue; + break; case T_CLASS: case T_MODULE: - if (ROBJECT(obj)->iv_tbl && st_lookup(ROBJECT(obj)->iv_tbl, id, 0)) + if (RCLASS_IV_TBL(obj) && st_lookup(RCLASS_IV_TBL(obj), (st_data_t)id, 0)) return Qtrue; break; default: @@ -1082,71 +1136,149 @@ rb_ivar_defined(obj, id) return Qfalse; } +struct obj_ivar_tag { + VALUE obj; + int (*func)(ID key, VALUE val, st_data_t arg); + st_data_t arg; +}; + static int -ivar_i(key, entry, ary) - ID key; - struct global_entry *entry; - VALUE ary; +obj_ivar_i(st_data_t key, st_data_t index, st_data_t arg) +{ + struct obj_ivar_tag *data = (struct obj_ivar_tag *)arg; + if ((long)index < ROBJECT_NUMIV(data->obj)) { + VALUE val = ROBJECT_IVPTR(data->obj)[(long)index]; + if (val != Qundef) { + return (data->func)((ID)key, val, data->arg); + } + } + return ST_CONTINUE; +} + +static void +obj_ivar_each(VALUE obj, int (*func)(ANYARGS), st_data_t arg) +{ + st_table *tbl; + struct obj_ivar_tag data; + + tbl = ROBJECT_IV_INDEX_TBL(obj); + if (!tbl) + return; + + data.obj = obj; + data.func = (int (*)(ID key, VALUE val, st_data_t arg))func; + data.arg = arg; + + st_foreach_safe(tbl, obj_ivar_i, (st_data_t)&data); +} + +void +rb_ivar_foreach(VALUE obj, int (*func)(ANYARGS), st_data_t arg) +{ + switch (TYPE(obj)) { + case T_OBJECT: + obj_ivar_each(obj, func, arg); + break; + case T_CLASS: + case T_MODULE: + if (RCLASS_IV_TBL(obj)) { + st_foreach_safe(RCLASS_IV_TBL(obj), func, arg); + } + break; + default: + if (!generic_iv_tbl) break; + if (FL_TEST(obj, FL_EXIVAR) || rb_special_const_p(obj)) { + st_data_t tbl; + + if (st_lookup(generic_iv_tbl, (st_data_t)obj, &tbl)) { + st_foreach_safe((st_table *)tbl, func, arg); + } + } + break; + } +} + +st_index_t +rb_ivar_count(VALUE obj) +{ + st_table *tbl; + switch (TYPE(obj)) { + case T_OBJECT: + if ((tbl = ROBJECT_IV_INDEX_TBL(obj)) != 0) { + st_index_t i, num = tbl->num_entries, count = 0; + const VALUE *const ivptr = ROBJECT_IVPTR(obj); + for (i = count = 0; i < num; ++i) { + if (ivptr[i] != Qundef) { + count++; + } + } + return count; + } + break; + case T_CLASS: + case T_MODULE: + if ((tbl = RCLASS_IV_TBL(obj)) != 0) { + return tbl->num_entries; + } + break; + default: + if (!generic_iv_tbl) break; + if (FL_TEST(obj, FL_EXIVAR) || rb_special_const_p(obj)) { + st_data_t data; + + if (st_lookup(generic_iv_tbl, (st_data_t)obj, &data) && + (tbl = (st_table *)data) != 0) { + return tbl->num_entries; + } + } + break; + } + return 0; +} + +static int +ivar_i(ID key, VALUE val, VALUE ary) { if (rb_is_instance_id(key)) { - rb_ary_push(ary, rb_str_new2(rb_id2name(key))); + rb_ary_push(ary, ID2SYM(key)); } return ST_CONTINUE; } /* * call-seq: - * obj.instance_variables => array - * + * obj.instance_variables -> array + * * Returns an array of instance variable names for the receiver. Note * that simply defining an accessor does not create the corresponding * instance variable. - * + * * class Fred * attr_accessor :a1 * def initialize * @iv = 3 * end * end - * Fred.new.instance_variables #=> ["@iv"] + * Fred.new.instance_variables #=> [:@iv] */ VALUE -rb_obj_instance_variables(obj) - VALUE obj; +rb_obj_instance_variables(VALUE obj) { VALUE ary; ary = rb_ary_new(); - switch (TYPE(obj)) { - case T_OBJECT: - case T_CLASS: - case T_MODULE: - if (ROBJECT(obj)->iv_tbl) { - st_foreach_safe(ROBJECT(obj)->iv_tbl, ivar_i, ary); - } - break; - default: - if (!generic_iv_tbl) break; - if (FL_TEST(obj, FL_EXIVAR) || rb_special_const_p(obj)) { - st_table *tbl; - - if (st_lookup(generic_iv_tbl, obj, (st_data_t *)&tbl)) { - st_foreach_safe(tbl, ivar_i, ary); - } - } - break; - } + rb_ivar_foreach(obj, ivar_i, ary); return ary; } /* * call-seq: - * obj.remove_instance_variable(symbol) => obj - * + * obj.remove_instance_variable(symbol) -> obj + * * Removes the named instance variable from <i>obj</i>, returning that * variable's value. - * + * * class Dummy * attr_reader :var * def initialize @@ -1163,13 +1295,15 @@ rb_obj_instance_variables(obj) */ VALUE -rb_obj_remove_instance_variable(obj, name) - VALUE obj, name; +rb_obj_remove_instance_variable(VALUE obj, VALUE name) { VALUE val = Qnil; - ID id = rb_to_id(name); + const ID id = rb_to_id(name); + st_data_t n, v; + struct st_table *iv_index_tbl; + st_data_t index; - if (!OBJ_TAINTED(obj) && rb_safe_level() >= 4) + if (!OBJ_UNTRUSTED(obj) && rb_safe_level() >= 4) rb_raise(rb_eSecurityError, "Insecure: can't modify instance variable"); if (OBJ_FROZEN(obj)) rb_error_frozen("object"); if (!rb_is_instance_id(id)) { @@ -1178,16 +1312,28 @@ rb_obj_remove_instance_variable(obj, name) switch (TYPE(obj)) { case T_OBJECT: + iv_index_tbl = ROBJECT_IV_INDEX_TBL(obj); + if (!iv_index_tbl) break; + if (!st_lookup(iv_index_tbl, (st_data_t)id, &index)) break; + if (ROBJECT_NUMIV(obj) <= (long)index) break; + val = ROBJECT_IVPTR(obj)[index]; + if (val != Qundef) { + ROBJECT_IVPTR(obj)[index] = Qundef; + return val; + } + break; case T_CLASS: case T_MODULE: - if (ROBJECT(obj)->iv_tbl && st_delete(ROBJECT(obj)->iv_tbl, (st_data_t*)&id, &val)) { - return val; + n = id; + if (RCLASS_IV_TBL(obj) && st_delete(RCLASS_IV_TBL(obj), &n, &v)) { + return (VALUE)v; } break; default: if (FL_TEST(obj, FL_EXIVAR) || rb_special_const_p(obj)) { - if (generic_ivar_remove(obj, id, &val)) { - return val; + v = val; + if (generic_ivar_remove(obj, (st_data_t)id, &v)) { + return (VALUE)v; } } break; @@ -1196,11 +1342,9 @@ rb_obj_remove_instance_variable(obj, name) return Qnil; /* not reached */ } -NORETURN(static void uninitialized_constant _((VALUE, ID))); +NORETURN(static void uninitialized_constant(VALUE, ID)); static void -uninitialized_constant(klass, id) - VALUE klass; - ID id; +uninitialized_constant(VALUE klass, ID id) { if (klass && klass != rb_cObject) rb_name_error(id, "uninitialized constant %s::%s", @@ -1212,9 +1356,7 @@ uninitialized_constant(klass, id) } static VALUE -const_missing(klass, id) - VALUE klass; - ID id; +const_missing(VALUE klass, ID id) { return rb_funcall(klass, rb_intern("const_missing"), 1, ID2SYM(id)); } @@ -1222,7 +1364,7 @@ const_missing(klass, id) /* * call-seq: - * mod.const_missing(sym) => obj + * mod.const_missing(sym) -> obj * * Invoked when a reference is made to an undefined constant in * <i>mod</i>. It is passed a symbol for the undefined constant, and @@ -1233,7 +1375,7 @@ const_missing(klass, id) * assumed to be in file <code>fred.rb</code>). If found, it returns the * value of the loaded class. It therefore implements a perverse * kind of autoload facility. - * + * * def Object.const_missing(name) * @looked_for ||= {} * str_name = name.to_s @@ -1245,170 +1387,200 @@ const_missing(klass, id) * return klass if klass * raise "Class not found: #{name}" * end - * + * */ VALUE -rb_mod_const_missing(klass, name) - VALUE klass, name; +rb_mod_const_missing(VALUE klass, VALUE name) { - ruby_frame = ruby_frame->prev; /* pop frame for "const_missing" */ + rb_frame_pop(); /* pop frame for "const_missing" */ uninitialized_constant(klass, rb_to_id(name)); return Qnil; /* not reached */ } -static struct st_table * -check_autoload_table(av) - VALUE av; +static void +autoload_mark(void *ptr) { - Check_Type(av, T_DATA); - if (RDATA(av)->dmark != (RUBY_DATA_FUNC)rb_mark_tbl || - RDATA(av)->dfree != (RUBY_DATA_FUNC)st_free_table) { - rb_raise(rb_eTypeError, "wrong autoload table: %s", RSTRING(rb_inspect(av))->ptr); - } - return (struct st_table *)DATA_PTR(av); + rb_mark_tbl((st_table *)ptr); +} + +static void +autoload_free(void *ptr) +{ + st_free_table((st_table *)ptr); +} + +static size_t +autoload_memsize(const void *ptr) +{ + const st_table *tbl = ptr; + return st_memsize(tbl); } +static const rb_data_type_t autoload_data_type = { + "autoload", + autoload_mark, autoload_free, autoload_memsize, +}; + +#define check_autoload_table(av) \ + (struct st_table *)rb_check_typeddata(av, &autoload_data_type) + void -rb_autoload(mod, id, file) - VALUE mod; - ID id; - const char *file; +rb_autoload(VALUE mod, ID id, const char *file) { - VALUE av, fn; + st_data_t av; + VALUE fn; struct st_table *tbl; if (!rb_is_const_id(id)) { - rb_raise(rb_eNameError, "autoload must be constant name", rb_id2name(id)); + rb_raise(rb_eNameError, "autoload must be constant name: %s", rb_id2name(id)); } if (!file || !*file) { rb_raise(rb_eArgError, "empty file name"); } - if ((tbl = RCLASS(mod)->iv_tbl) && st_lookup(tbl, id, &av) && av != Qundef) + if ((tbl = RCLASS_IV_TBL(mod)) && st_lookup(tbl, (st_data_t)id, &av) && (VALUE)av != Qundef) return; rb_const_set(mod, id, Qundef); - tbl = RCLASS(mod)->iv_tbl; - if (st_lookup(tbl, autoload, &av)) { - tbl = check_autoload_table(av); + tbl = RCLASS_IV_TBL(mod); + if (st_lookup(tbl, (st_data_t)autoload, &av)) { + tbl = check_autoload_table((VALUE)av); } else { - av = Data_Wrap_Struct(0 , rb_mark_tbl, st_free_table, 0); - st_add_direct(tbl, autoload, av); + av = (st_data_t)TypedData_Wrap_Struct(0, &autoload_data_type, 0); + st_add_direct(tbl, (st_data_t)autoload, av); DATA_PTR(av) = tbl = st_init_numtable(); } fn = rb_str_new2(file); FL_UNSET(fn, FL_TAINT); OBJ_FREEZE(fn); - st_insert(tbl, id, (st_data_t)rb_node_newnode(NODE_MEMO, fn, ruby_safe_level, 0)); + st_insert(tbl, (st_data_t)id, (st_data_t)rb_node_newnode(NODE_MEMO, fn, rb_safe_level(), 0)); } static NODE* -autoload_delete(mod, id) - VALUE mod; - ID id; +autoload_delete(VALUE mod, ID id) { - VALUE val; - st_data_t load = 0; + st_data_t val, load = 0, n = id; - st_delete(RCLASS(mod)->iv_tbl, (st_data_t*)&id, 0); - if (st_lookup(RCLASS(mod)->iv_tbl, autoload, &val)) { - struct st_table *tbl = check_autoload_table(val); + st_delete(RCLASS_IV_TBL(mod), &n, 0); + if (st_lookup(RCLASS_IV_TBL(mod), (st_data_t)autoload, &val)) { + struct st_table *tbl = check_autoload_table((VALUE)val); - st_delete(tbl, (st_data_t*)&id, &load); + st_delete(tbl, &n, &load); if (tbl->num_entries == 0) { - DATA_PTR(val) = 0; - st_free_table(tbl); - id = autoload; - if (st_delete(RCLASS(mod)->iv_tbl, (st_data_t*)&id, &val)) { - rb_gc_force_recycle(val); - } + n = autoload; + st_delete(RCLASS_IV_TBL(mod), &n, &val); } } return (NODE *)load; } -VALUE -rb_autoload_load(klass, id) - VALUE klass; - ID id; +static VALUE +autoload_provided(VALUE arg) { - VALUE file; - NODE *load = autoload_delete(klass, id); - - if (!load || !(file = load->nd_lit) || rb_provided(RSTRING(file)->ptr)) { - return Qfalse; - } - return rb_require_safe(file, load->nd_nth); + const char **p = (const char **)arg; + return rb_feature_provided(*p, p); } static VALUE -autoload_file(mod, id) - VALUE mod; - ID id; +reset_safe(VALUE safe) { - VALUE val, file; + rb_set_safe_level_force((int)safe); + return safe; +} + +static NODE * +autoload_node(VALUE mod, ID id, const char **loadingpath) +{ + VALUE file; struct st_table *tbl; - st_data_t load; + st_data_t val; + NODE *load; + const char *loading; + int safe; - if (!st_lookup(RCLASS(mod)->iv_tbl, autoload, &val) || - !(tbl = check_autoload_table(val)) || !st_lookup(tbl, id, &load)) { - return Qnil; + if (!st_lookup(RCLASS_IV_TBL(mod), autoload, &val) || + !(tbl = check_autoload_table((VALUE)val)) || !st_lookup(tbl, (st_data_t)id, &val)) { + return 0; } - file = ((NODE *)load)->nd_lit; + load = (NODE *)val; + file = load->nd_lit; Check_Type(file, T_STRING); - if (!RSTRING(file)->ptr || !*RSTRING(file)->ptr) { + if (!RSTRING_PTR(file) || !*RSTRING_PTR(file)) { rb_raise(rb_eArgError, "empty file name"); } - if (!rb_provided(RSTRING(file)->ptr)) { - return file; + loading = RSTRING_PTR(file); + safe = rb_safe_level(); + rb_set_safe_level_force(0); + if (!rb_ensure(autoload_provided, (VALUE)&loading, reset_safe, (VALUE)safe)) { + return load; + } + if (loadingpath && loading) { + *loadingpath = loading; + return load; } + return 0; +} - /* already loaded but not defined */ - st_delete(tbl, (st_data_t*)&id, 0); - if (!tbl->num_entries) { - DATA_PTR(val) = 0; - st_free_table(tbl); - id = autoload; - if (st_delete(RCLASS(mod)->iv_tbl, (st_data_t*)&id, &val)) { - rb_gc_force_recycle(val); - } +static int +autoload_node_id(VALUE mod, ID id) +{ + struct st_table *tbl = RCLASS_IV_TBL(mod); + st_data_t val; + + if (!tbl || !st_lookup(tbl, (st_data_t)id, &val) || (VALUE)val != Qundef) { + return 0; } - return Qnil; + return 1; } VALUE -rb_autoload_p(mod, id) - VALUE mod; - ID id; +rb_autoload_load(VALUE mod, ID id) { - struct st_table *tbl = RCLASS(mod)->iv_tbl; - VALUE val; + VALUE file; + NODE *load; + const char *loading = 0, *src; - if (!tbl || !st_lookup(tbl, id, &val) || val != Qundef) { - return Qnil; - } - return autoload_file(mod, id); + if (!autoload_node_id(mod, id)) return Qfalse; + load = autoload_node(mod, id, &loading); + if (!load) return Qfalse; + src = rb_sourcefile(); + if (src && loading && strcmp(src, loading) == 0) return Qfalse; + file = load->nd_lit; + return rb_require_safe(file, (int)load->nd_nth); +} + +VALUE +rb_autoload_p(VALUE mod, ID id) +{ + VALUE file; + NODE *load; + const char *loading = 0; + + if (!autoload_node_id(mod, id)) return Qnil; + load = autoload_node(mod, id, &loading); + if (!load) return Qnil; + return load && (file = load->nd_lit) ? file : Qnil; } static VALUE -rb_const_get_0(klass, id, exclude, recurse) - VALUE klass; - ID id; - int exclude, recurse; +rb_const_get_0(VALUE klass, ID id, int exclude, int recurse) { VALUE value, tmp; int mod_retry = 0; tmp = klass; retry: - while (tmp) { - while (RCLASS(tmp)->iv_tbl && st_lookup(RCLASS(tmp)->iv_tbl,id,&value)) { + while (RTEST(tmp)) { + VALUE am = 0; + while (RCLASS_IV_TBL(tmp) && st_lookup(RCLASS_IV_TBL(tmp), (st_data_t)id, &value)) { if (value == Qundef) { - if (!RTEST(rb_autoload_load(tmp, id))) break; + if (am == tmp) break; + am = tmp; + rb_autoload_load(tmp, id); continue; } if (exclude && tmp == rb_cObject && klass != rb_cObject) { @@ -1417,8 +1589,8 @@ rb_const_get_0(klass, id, exclude, recurse) } return value; } - if (!recurse && klass != rb_cObject) break; - tmp = RCLASS(tmp)->super; + if (!recurse) break; + tmp = RCLASS_SUPER(tmp); } if (!exclude && !mod_retry && BUILTIN_TYPE(klass) == T_MODULE) { mod_retry = 1; @@ -1426,110 +1598,109 @@ rb_const_get_0(klass, id, exclude, recurse) goto retry; } - return const_missing(klass, id); + value = const_missing(klass, id); + rb_vm_inc_const_missing_count(); + return value; } VALUE -rb_const_get_from(klass, id) - VALUE klass; - ID id; +rb_const_get_from(VALUE klass, ID id) { - return rb_const_get_0(klass, id, Qtrue, Qtrue); + return rb_const_get_0(klass, id, TRUE, TRUE); } VALUE -rb_const_get(klass, id) - VALUE klass; - ID id; +rb_const_get(VALUE klass, ID id) { - return rb_const_get_0(klass, id, Qfalse, Qtrue); + return rb_const_get_0(klass, id, FALSE, TRUE); } VALUE -rb_const_get_at(klass, id) - VALUE klass; - ID id; +rb_const_get_at(VALUE klass, ID id) { - return rb_const_get_0(klass, id, Qtrue, Qfalse); + return rb_const_get_0(klass, id, TRUE, FALSE); } /* * call-seq: - * remove_const(sym) => obj - * + * remove_const(sym) -> obj + * * Removes the definition of the given constant, returning that * constant's value. Predefined classes and singleton objects (such as * <i>true</i>) cannot be removed. */ VALUE -rb_mod_remove_const(mod, name) - VALUE mod, name; +rb_mod_remove_const(VALUE mod, VALUE name) { - ID id = rb_to_id(name); - VALUE val; + const ID id = rb_to_id(name); if (!rb_is_const_id(id)) { rb_name_error(id, "`%s' is not allowed as a constant name", rb_id2name(id)); } - if (!OBJ_TAINTED(mod) && rb_safe_level() >= 4) + return rb_const_remove(mod, id); +} + +VALUE +rb_const_remove(VALUE mod, ID id) +{ + VALUE val; + st_data_t v, n = id; + + if (!OBJ_UNTRUSTED(mod) && rb_safe_level() >= 4) rb_raise(rb_eSecurityError, "Insecure: can't remove constant"); if (OBJ_FROZEN(mod)) rb_error_frozen("class/module"); - if (RCLASS(mod)->iv_tbl && st_delete(ROBJECT(mod)->iv_tbl, (st_data_t*)&id, &val)) { - if (val == Qundef) { - autoload_delete(mod, id); - val = Qnil; + if (!RCLASS_IV_TBL(mod) || !st_delete(RCLASS_IV_TBL(mod), &n, &v)) { + if (rb_const_defined_at(mod, id)) { + rb_name_error(id, "cannot remove %s::%s", + rb_class2name(mod), rb_id2name(id)); } - return val; + rb_name_error(id, "constant %s::%s not defined", + rb_class2name(mod), rb_id2name(id)); } - if (rb_const_defined_at(mod, id)) { - rb_name_error(id, "cannot remove %s::%s", - rb_class2name(mod), rb_id2name(id)); + + rb_vm_change_state(); + + val = (VALUE)v; + if (val == Qundef) { + autoload_delete(mod, id); + val = Qnil; } - rb_name_error(id, "constant %s::%s not defined", - rb_class2name(mod), rb_id2name(id)); - return Qnil; /* not reached */ + return val; } static int -sv_i(key, value, tbl) - ID key; - VALUE value; - st_table *tbl; +sv_i(ID key, VALUE value, st_table *tbl) { if (rb_is_const_id(key)) { - if (!st_lookup(tbl, key, 0)) { - st_insert(tbl, key, key); + if (!st_lookup(tbl, (st_data_t)key, 0)) { + st_insert(tbl, (st_data_t)key, (st_data_t)key); } } return ST_CONTINUE; } void* -rb_mod_const_at(mod, data) - VALUE mod; - void *data; +rb_mod_const_at(VALUE mod, void *data) { st_table *tbl = data; if (!tbl) { tbl = st_init_numtable(); } - if (RCLASS(mod)->iv_tbl) { - st_foreach_safe(RCLASS(mod)->iv_tbl, sv_i, (st_data_t)tbl); + if (RCLASS_IV_TBL(mod)) { + st_foreach_safe(RCLASS_IV_TBL(mod), sv_i, (st_data_t)tbl); } return tbl; } void* -rb_mod_const_of(mod, data) - VALUE mod; - void *data; +rb_mod_const_of(VALUE mod, void *data) { VALUE tmp = mod; for (;;) { data = rb_mod_const_at(tmp, data); - tmp = RCLASS(tmp)->super; + tmp = RCLASS_SUPER(tmp); if (!tmp) break; if (tmp == rb_cObject && mod != rb_cObject) break; } @@ -1537,24 +1708,21 @@ rb_mod_const_of(mod, data) } static int -list_i(key, value, ary) - ID key, value; - VALUE ary; +list_i(ID key, ID value, VALUE ary) { - rb_ary_push(ary, rb_str_new2(rb_id2name(key))); + rb_ary_push(ary, ID2SYM(key)); return ST_CONTINUE; } VALUE -rb_const_list(data) - void *data; +rb_const_list(void *data) { st_table *tbl = data; VALUE ary; if (!tbl) return rb_ary_new2(0); ary = rb_ary_new2(tbl->num_entries); - st_foreach(tbl, list_i, ary); + st_foreach_safe(tbl, list_i, ary); st_free_table(tbl); return ary; @@ -1562,82 +1730,90 @@ rb_const_list(data) /* * call-seq: - * mod.constants => array - * + * mod.constants(inherit=true) -> array + * * Returns an array of the names of the constants accessible in * <i>mod</i>. This includes the names of constants in any included - * modules (example at start of section). + * modules (example at start of section), unless the <i>all</i> + * parameter is set to <code>false</code>. + * + * IO.constants.include?(:SYNC) #=> true + * IO.constants(false).include?(:SYNC) #=> false + * + * Also see <code>Module::const_defined?</code>. */ VALUE -rb_mod_constants(mod) - VALUE mod; +rb_mod_constants(int argc, VALUE *argv, VALUE mod) { - return rb_const_list(rb_mod_const_of(mod, 0)); + VALUE inherit; + st_table *tbl; + + if (argc == 0) { + inherit = Qtrue; + } + else { + rb_scan_args(argc, argv, "01", &inherit); + } + if (RTEST(inherit)) { + tbl = rb_mod_const_of(mod, 0); + } + else { + tbl = rb_mod_const_at(mod, 0); + } + return rb_const_list(tbl); } static int -rb_const_defined_0(klass, id, exclude, recurse) - VALUE klass; - ID id; - int exclude, recurse; +rb_const_defined_0(VALUE klass, ID id, int exclude, int recurse) { - VALUE value, tmp; + st_data_t value; + VALUE tmp; int mod_retry = 0; tmp = klass; retry: while (tmp) { - if (RCLASS(tmp)->iv_tbl && st_lookup(RCLASS(tmp)->iv_tbl, id, &value)) { - if (value == Qundef && NIL_P(autoload_file(klass, id))) - return Qfalse; - return Qtrue; + if (RCLASS_IV_TBL(tmp) && st_lookup(RCLASS_IV_TBL(tmp), (st_data_t)id, &value)) { + if ((VALUE)value == Qundef && !autoload_node((VALUE)klass, id, 0)) + return (int)Qfalse; + return (int)Qtrue; } - if (!recurse && klass != rb_cObject) break; - tmp = RCLASS(tmp)->super; + if (!recurse) break; + tmp = RCLASS_SUPER(tmp); } if (!exclude && !mod_retry && BUILTIN_TYPE(klass) == T_MODULE) { mod_retry = 1; tmp = rb_cObject; goto retry; } - return Qfalse; + return (int)Qfalse; } int -rb_const_defined_from(klass, id) - VALUE klass; - ID id; +rb_const_defined_from(VALUE klass, ID id) { - return rb_const_defined_0(klass, id, Qtrue, Qtrue); + return rb_const_defined_0(klass, id, TRUE, TRUE); } int -rb_const_defined(klass, id) - VALUE klass; - ID id; +rb_const_defined(VALUE klass, ID id) { - return rb_const_defined_0(klass, id, Qfalse, Qtrue); + return rb_const_defined_0(klass, id, FALSE, TRUE); } int -rb_const_defined_at(klass, id) - VALUE klass; - ID id; +rb_const_defined_at(VALUE klass, ID id) { - return rb_const_defined_0(klass, id, Qtrue, Qfalse); + return rb_const_defined_0(klass, id, TRUE, FALSE); } static void -mod_av_set(klass, id, val, isconst) - VALUE klass; - ID id; - VALUE val; - int isconst; +mod_av_set(VALUE klass, ID id, VALUE val, int isconst) { - char *dest = isconst ? "constant" : "class variable"; + const char *dest = isconst ? "constant" : "class variable"; - if (!OBJ_TAINTED(klass) && rb_safe_level() >= 4) + if (!OBJ_UNTRUSTED(klass) && rb_safe_level() >= 4) rb_raise(rb_eSecurityError, "Insecure: can't set %s", dest); if (OBJ_FROZEN(klass)) { if (BUILTIN_TYPE(klass) == T_MODULE) { @@ -1647,46 +1823,43 @@ mod_av_set(klass, id, val, isconst) rb_error_frozen("class"); } } - if (!RCLASS(klass)->iv_tbl) { - RCLASS(klass)->iv_tbl = st_init_numtable(); + if (!RCLASS_IV_TBL(klass)) { + RCLASS_IV_TBL(klass) = st_init_numtable(); } else if (isconst) { - VALUE value = Qfalse; + st_data_t value; - if (st_lookup(RCLASS(klass)->iv_tbl, id, &value)) { - if (value == Qundef) + if (st_lookup(RCLASS_IV_TBL(klass), (st_data_t)id, &value)) { + if ((VALUE)value == Qundef) autoload_delete(klass, id); else rb_warn("already initialized %s %s", dest, rb_id2name(id)); } } - st_insert(RCLASS(klass)->iv_tbl, id, val); + if (isconst){ + rb_vm_change_state(); + } + st_insert(RCLASS_IV_TBL(klass), (st_data_t)id, (st_data_t)val); } void -rb_const_set(klass, id, val) - VALUE klass; - ID id; - VALUE val; +rb_const_set(VALUE klass, ID id, VALUE val) { if (NIL_P(klass)) { rb_raise(rb_eTypeError, "no class/module to define constant %s", rb_id2name(id)); } - mod_av_set(klass, id, val, Qtrue); + mod_av_set(klass, id, val, TRUE); } void -rb_define_const(klass, name, val) - VALUE klass; - const char *name; - VALUE val; +rb_define_const(VALUE klass, const char *name, VALUE val) { ID id = rb_intern(name); if (!rb_is_const_id(id)) { - rb_warn("rb_define_const: invalide name `%s' for constant", name); + rb_warn("rb_define_const: invalid name `%s' for constant", name); } if (klass == rb_cObject) { rb_secure(4); @@ -1695,133 +1868,119 @@ rb_define_const(klass, name, val) } void -rb_define_global_const(name, val) - const char *name; - VALUE val; +rb_define_global_const(const char *name, VALUE val) { rb_define_const(rb_cObject, name, val); } static VALUE -original_module(c) - VALUE c; +original_module(VALUE c) { if (TYPE(c) == T_ICLASS) return RBASIC(c)->klass; return c; } -static void -cvar_override_check(id, a) - ID id; - VALUE a; -{ - VALUE base = original_module(a); - - a = RCLASS(a)->super; - while (a) { - if (RCLASS(a)->iv_tbl) { - if (st_lookup(RCLASS(a)->iv_tbl,id,0)) { - rb_warning("class variable %s of %s is overridden by %s", - rb_id2name(id), rb_class2name(original_module(a)), - rb_class2name(base)); - } - } - a = RCLASS(a)->super; - } -} +#define CVAR_LOOKUP(v,r) do {\ + if (RCLASS_IV_TBL(klass) && st_lookup(RCLASS_IV_TBL(klass),(st_data_t)id,(v))) {\ + r;\ + }\ + if (FL_TEST(klass, FL_SINGLETON) ) {\ + VALUE obj = rb_iv_get(klass, "__attached__");\ + switch (TYPE(obj)) {\ + case T_MODULE:\ + case T_CLASS:\ + klass = obj;\ + break;\ + default:\ + klass = RCLASS_SUPER(klass);\ + break;\ + }\ + }\ + else {\ + klass = RCLASS_SUPER(klass);\ + }\ + while (klass) {\ + if (RCLASS_IV_TBL(klass) && st_lookup(RCLASS_IV_TBL(klass),(st_data_t)id,(v))) {\ + r;\ + }\ + klass = RCLASS_SUPER(klass);\ + }\ +} while(0) void -rb_cvar_set(klass, id, val, warn) - VALUE klass; - ID id; - VALUE val; - int warn; +rb_cvar_set(VALUE klass, ID id, VALUE val) { - VALUE tmp; + VALUE tmp, front = 0, target = 0; tmp = klass; - while (tmp) { - if (RCLASS(tmp)->iv_tbl && st_lookup(RCLASS(tmp)->iv_tbl,id,0)) { - if (OBJ_FROZEN(tmp)) rb_error_frozen("class/module"); - if (!OBJ_TAINTED(tmp) && rb_safe_level() >= 4) - rb_raise(rb_eSecurityError, "Insecure: can't modify class variable"); - if (warn && RTEST(ruby_verbose) && klass != tmp) { - rb_warning("already initialized class variable %s", rb_id2name(id)); - } - st_insert(RCLASS(tmp)->iv_tbl,id,val); + CVAR_LOOKUP(0, {if (!front) front = klass; target = klass;}); + if (target) { + if (front && target != front) { + st_data_t did = id; + if (RTEST(ruby_verbose)) { - cvar_override_check(id, tmp); + rb_warning("class variable %s of %s is overtaken by %s", + rb_id2name(id), rb_class2name(original_module(front)), + rb_class2name(original_module(target))); + } + if (BUILTIN_TYPE(front) == T_CLASS) { + st_delete(RCLASS_IV_TBL(front),&did,0); } - return; } - tmp = RCLASS(tmp)->super; } - - mod_av_set(klass, id, val, Qfalse); + else { + target = tmp; + } + mod_av_set(target, id, val, FALSE); } VALUE -rb_cvar_get(klass, id) - VALUE klass; - ID id; +rb_cvar_get(VALUE klass, ID id) { - VALUE value; - VALUE tmp; + VALUE value, tmp, front = 0, target = 0; tmp = klass; - while (tmp) { - if (RCLASS(tmp)->iv_tbl) { - if (st_lookup(RCLASS(tmp)->iv_tbl,id,&value)) { - if (RTEST(ruby_verbose)) { - cvar_override_check(id, tmp); - } - return value; - } + CVAR_LOOKUP(&value, {if (!front) front = klass; target = klass;}); + if (!target) { + rb_name_error(id,"uninitialized class variable %s in %s", + rb_id2name(id), rb_class2name(tmp)); + } + if (front && target != front) { + st_data_t did = id; + + if (RTEST(ruby_verbose)) { + rb_warning("class variable %s of %s is overtaken by %s", + rb_id2name(id), rb_class2name(original_module(front)), + rb_class2name(original_module(target))); + } + if (BUILTIN_TYPE(front) == T_CLASS) { + st_delete(RCLASS_IV_TBL(front),&did,0); } - tmp = RCLASS(tmp)->super; } - - rb_name_error(id,"uninitialized class variable %s in %s", - rb_id2name(id), rb_class2name(klass)); - return Qnil; /* not reached */ + return value; } VALUE -rb_cvar_defined(klass, id) - VALUE klass; - ID id; +rb_cvar_defined(VALUE klass, ID id) { - VALUE tmp; - - tmp = klass; - while (tmp) { - if (RCLASS(tmp)->iv_tbl && st_lookup(RCLASS(tmp)->iv_tbl,id,0)) { - return Qtrue; - } - tmp = RCLASS(tmp)->super; - } - + if (!klass) return Qfalse; + CVAR_LOOKUP(0,return Qtrue); return Qfalse; } void -rb_cv_set(klass, name, val) - VALUE klass; - const char *name; - VALUE val; +rb_cv_set(VALUE klass, const char *name, VALUE val) { ID id = rb_intern(name); if (!rb_is_class_id(id)) { rb_name_error(id, "wrong class variable name %s", name); } - rb_cvar_set(klass, id, val, Qfalse); + rb_cvar_set(klass, id, val); } VALUE -rb_cv_get(klass, name) - VALUE klass; - const char *name; +rb_cv_get(VALUE klass, const char *name) { ID id = rb_intern(name); if (!rb_is_class_id(id)) { @@ -1831,27 +1990,21 @@ rb_cv_get(klass, name) } void -rb_define_class_variable(klass, name, val) - VALUE klass; - const char *name; - VALUE val; +rb_define_class_variable(VALUE klass, const char *name, VALUE val) { ID id = rb_intern(name); if (!rb_is_class_id(id)) { 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 -cv_i(key, value, ary) - ID key; - VALUE value; - VALUE ary; +cv_i(ID key, VALUE value, VALUE ary) { if (rb_is_class_id(key)) { - VALUE kval = rb_str_new2(rb_id2name(key)); + VALUE kval = ID2SYM(key); if (!rb_ary_includes(ary, kval)) { rb_ary_push(ary, kval); } @@ -1861,73 +2014,66 @@ cv_i(key, value, ary) /* * call-seq: - * mod.class_variables => array - * - * Returns an array of the names of class variables in <i>mod</i> and - * the ancestors of <i>mod</i>. - * + * mod.class_variables -> array + * + * Returns an array of the names of class variables in <i>mod</i>. + * * class One * @@var1 = 1 * end * class Two < One * @@var2 = 2 * end - * One.class_variables #=> ["@@var1"] - * Two.class_variables #=> ["@@var2", "@@var1"] + * One.class_variables #=> [:@@var1] + * Two.class_variables #=> [:@@var2] */ VALUE -rb_mod_class_variables(obj) - VALUE obj; +rb_mod_class_variables(VALUE obj) { VALUE ary = rb_ary_new(); - for (;;) { - if (RCLASS(obj)->iv_tbl) { - st_foreach_safe(RCLASS(obj)->iv_tbl, cv_i, ary); - } - obj = RCLASS(obj)->super; - if (!obj) break; + if (RCLASS_IV_TBL(obj)) { + st_foreach_safe(RCLASS_IV_TBL(obj), cv_i, ary); } return ary; } /* * call-seq: - * remove_class_variable(sym) => obj - * + * remove_class_variable(sym) -> obj + * * Removes the definition of the <i>sym</i>, returning that * constant's value. - * + * * class Dummy * @@var = 99 * puts @@var * remove_class_variable(:@@var) - * puts(defined? @@var) + * p(defined? @@var) * end - * + * * <em>produces:</em> - * + * * 99 * nil */ VALUE -rb_mod_remove_cvar(mod, name) - VALUE mod, name; +rb_mod_remove_cvar(VALUE mod, VALUE name) { - ID id = rb_to_id(name); - VALUE val; + const ID id = rb_to_id(name); + st_data_t val, n = id; if (!rb_is_class_id(id)) { rb_name_error(id, "wrong class variable name %s", rb_id2name(id)); } - if (!OBJ_TAINTED(mod) && rb_safe_level() >= 4) + if (!OBJ_UNTRUSTED(mod) && rb_safe_level() >= 4) rb_raise(rb_eSecurityError, "Insecure: can't remove class variable"); if (OBJ_FROZEN(mod)) rb_error_frozen("class/module"); - if (RCLASS(mod)->iv_tbl && st_delete(ROBJECT(mod)->iv_tbl, (st_data_t*)&id, &val)) { - return val; + if (RCLASS_IV_TBL(mod) && st_delete(RCLASS_IV_TBL(mod), &n, &val)) { + return (VALUE)val; } if (rb_cvar_defined(mod, id)) { rb_name_error(id, "cannot remove %s for %s", @@ -1939,9 +2085,7 @@ rb_mod_remove_cvar(mod, name) } VALUE -rb_iv_get(obj, name) - VALUE obj; - const char *name; +rb_iv_get(VALUE obj, const char *name) { ID id = rb_intern(name); @@ -1949,10 +2093,7 @@ rb_iv_get(obj, name) } VALUE -rb_iv_set(obj, name, val) - VALUE obj; - const char *name; - VALUE val; +rb_iv_set(VALUE obj, const char *name, VALUE val) { ID id = rb_intern(name); |