1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* eval.c (rb_call0): update ruby_class as well as ruby_cref.

Browse Source 
(ruby-bugs-ja PR#540)

* eval.c (rb_yield_0): remove ruby_frame->cbase and unify to
  ruby_cref.  [ruby-talk:78141]

* eval.c: initialize /* OK */ variables by Qnil to stop warnings.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4346 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2003-08-06 21:50:06 +00:00
parent 1e51675654
commit b51416e21f
10 changed files with 163 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
ChangeLog
View File

@ -1,3 +1,13 @@
Thu Aug 7 06:46:06 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_call0): update ruby_class as well as ruby_cref.
(ruby-bugs-ja PR#540)
Thu Aug 7 04:52:50 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_yield_0): remove ruby_frame->cbase and unify to
ruby_cref. [ruby-talk:78141]
Thu Aug 7 04:19:15 2003 Akinori MUSHA <knu@iDaemons.org> Thu Aug 7 04:19:15 2003 Akinori MUSHA <knu@iDaemons.org>
* gc.c: FreeBSD/ia64's mcontext_t is a bit different from that of * gc.c: FreeBSD/ia64's mcontext_t is a bit different from that of
@ -39,10 +49,45 @@ Wed Aug 6 17:28:10 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/digest/sha1/extconf.rb: have_library already appends library * ext/digest/sha1/extconf.rb: have_library already appends library
name. name.
Wed Aug 6 17:23:57 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c: initialize /* OK */ variables by Qnil to stop warnings.
Wed Aug 6 04:58:32 2003 NAKAMURA Usaku <usa@ruby-lang.org> Wed Aug 6 04:58:32 2003 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/Setup*: add io/wait and openssl. * ext/Setup*: add io/wait and openssl.
Wed Aug 6 01:13:38 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_f_autoload): use ruby_cbase instead of ruby_class.
* eval.c (rb_f_autoload_p): ditto.
* class.c (rb_mod_init_copy): no longer implements independent
clone and dup methods. override "initialize_copy" instead.
[ruby-core:01352]
* object.c (rb_class_s_alloc): define Class allocation function.
this makes Classes to follow clone framework that uses
initialize_copy.
* object.c (rb_class_initialize): separate instantiation and
initialization.
* object.c (rb_obj_alloc): prohibit instantiation from
uninitialized class.
* object.c (rb_class_superclass): check uninitialized class.
* array.c (rb_ary_fill): wrong index processing with block. this
fix was done by Koji Arai <JCA02266@nifty.ne.jp> [ruby-list:38029]
* marshal.c (w_object): should preserve generic ivar for nil,
true, false, symbols, and fixnums.
* marshal.c (w_uclass): base_klass check should be done after
rb_class_real().
Wed Aug 6 01:18:50 2003 Minero Aoki <aamine@loveruby.net> Wed Aug 6 01:18:50 2003 Minero Aoki <aamine@loveruby.net>
* lib/net/http.rb: update document. * lib/net/http.rb: update document.
@ -51,6 +96,11 @@ Wed Aug 6 01:18:50 2003 Minero Aoki <aamine@loveruby.net>
* lib/net/protocol.rb: ditto. * lib/net/protocol.rb: ditto.
Wed Aug 6 00:48:37 2003 Koji Arai <jca02266@nifty.ne.jp>
* marshal.c (w_object): should recommend marshal_dump rather than
_dump_data.
Tue Aug 5 17:58:57 2003 WATANABE Hirofumi <eban@ruby-lang.org> Tue Aug 5 17:58:57 2003 WATANABE Hirofumi <eban@ruby-lang.org>
* lib/fileutils.rb (install): should preserve timestamp only. * lib/fileutils.rb (install): should preserve timestamp only.

5
array.c
View File

@ -1570,9 +1570,8 @@ rb_ary_fill(argc, argv, ary)
VALUE v; VALUE v;
long i; long i;
for (i=0; i<RARRAY(ary)->len; i++) { for (i=beg; i<RARRAY(ary)->len; i++) {
beg++; v = rb_yield(LONG2NUM(i));
v = rb_yield(LONG2NUM(beg++));
if (i>=RARRAY(ary)->len) break; if (i>=RARRAY(ary)->len) break;
RARRAY(ary)->ptr[i] = v; RARRAY(ary)->ptr[i] = v;
} }

35
class.c
View File

@ -60,39 +60,37 @@ clone_method(mid, body, tbl)
} }
VALUE VALUE
rb_mod_clone(module) rb_mod_init_copy(clone, orig)
VALUE module; VALUE clone, orig;
{ {
NEWOBJ(clone, struct RClass); rb_obj_init_copy(clone, orig);
CLONESETUP(clone, module); RCLASS(clone)->super = RCLASS(orig)->super;
if (RCLASS(orig)->iv_tbl) {
RCLASS(clone)->super = RCLASS(module)->super;
if (RCLASS(module)->iv_tbl) {
ID id; ID id;
RCLASS(clone)->iv_tbl = st_copy(RCLASS(module)->iv_tbl); RCLASS(clone)->iv_tbl = st_copy(RCLASS(orig)->iv_tbl);
id = rb_intern("__classpath__"); id = rb_intern("__classpath__");
st_delete(RCLASS(clone)->iv_tbl, (st_data_t*)&id, 0); st_delete(RCLASS(clone)->iv_tbl, (st_data_t*)&id, 0);
id = rb_intern("__classid__"); id = rb_intern("__classid__");
st_delete(RCLASS(clone)->iv_tbl, (st_data_t*)&id, 0); st_delete(RCLASS(clone)->iv_tbl, (st_data_t*)&id, 0);
} }
if (RCLASS(module)->m_tbl) { if (RCLASS(orig)->m_tbl) {
RCLASS(clone)->m_tbl = st_init_numtable(); RCLASS(clone)->m_tbl = st_init_numtable();
st_foreach(RCLASS(module)->m_tbl, clone_method, st_foreach(RCLASS(orig)->m_tbl, clone_method,
(st_data_t)RCLASS(clone)->m_tbl); (st_data_t)RCLASS(clone)->m_tbl);
} }
return (VALUE)clone; return clone;
} }
VALUE VALUE
rb_mod_dup(mod) rb_class_init_copy(clone, orig)
VALUE mod; VALUE clone, orig;
{ {
VALUE dup = rb_mod_clone(mod); if (RCLASS(clone)->super != 0) {
rb_raise(rb_eTypeError, "already initialized class");
RBASIC(dup)->flags = RBASIC(mod)->flags & (T_MASK|FL_TAINT|FL_SINGLETON); }
return dup; return rb_mod_init_copy(clone, orig);
} }
VALUE VALUE
@ -434,8 +432,7 @@ VALUE
rb_mod_ancestors(mod) rb_mod_ancestors(mod)
VALUE mod; VALUE mod;
{ {
VALUE ary = rb_ary_new(); VALUE p, ary = rb_ary_new();
VALUE p;
for (p = mod; p; p = RCLASS(p)->super) { for (p = mod; p; p = RCLASS(p)->super) {
if (FL_TEST(p, FL_SINGLETON)) if (FL_TEST(p, FL_SINGLETON))

1
env.h
View File

@ -20,7 +20,6 @@ extern struct FRAME {
ID last_func; ID last_func;
ID orig_func; ID orig_func;
VALUE last_class; VALUE last_class;
VALUE cbase;
struct FRAME *prev; struct FRAME *prev;
struct FRAME *tmp; struct FRAME *tmp;
struct RNode *node; struct RNode *node;

75
eval.c
View File

@ -217,6 +217,7 @@ rb_clear_cache()
static void static void
rb_clear_cache_for_undef(klass, id) rb_clear_cache_for_undef(klass, id)
VALUE klass;
ID id; ID id;
{ {
struct cache_entry *ent, *end; struct cache_entry *ent, *end;
@ -591,7 +592,6 @@ static struct SCOPE *top_scope;
_frame.tmp = 0; \ _frame.tmp = 0; \
_frame.node = ruby_current_node; \ _frame.node = ruby_current_node; \
_frame.iter = ruby_iter->iter; \ _frame.iter = ruby_iter->iter; \
_frame.cbase = ruby_frame->cbase; \
_frame.argc = 0; \ _frame.argc = 0; \
_frame.argv = 0; \ _frame.argv = 0; \
_frame.flags = FRAME_ALLOCA; \ _frame.flags = FRAME_ALLOCA; \
@ -616,6 +616,7 @@ struct BLOCK {
struct SCOPE *scope; struct SCOPE *scope;
struct BLOCKTAG *tag; struct BLOCKTAG *tag;
VALUE klass; VALUE klass;
NODE *cref;
int iter; int iter;
int vmode; int vmode;
int flags; int flags;
@ -652,6 +653,7 @@ new_blktag()
_block.self = self; \ _block.self = self; \
_block.frame = *ruby_frame; \ _block.frame = *ruby_frame; \
_block.klass = ruby_class; \ _block.klass = ruby_class; \
_block.cref = ruby_cref; \
_block.frame.node = ruby_current_node;\ _block.frame.node = ruby_current_node;\
_block.scope = ruby_scope; \ _block.scope = ruby_scope; \
_block.prev = ruby_block; \ _block.prev = ruby_block; \
@ -1185,7 +1187,6 @@ ruby_init()
ruby_frame->self = ruby_top_self; ruby_frame->self = ruby_top_self;
top_cref = rb_node_newnode(NODE_CREF,rb_cObject,0,0); top_cref = rb_node_newnode(NODE_CREF,rb_cObject,0,0);
ruby_cref = top_cref; ruby_cref = top_cref;
ruby_frame->cbase = (VALUE)ruby_cref;
rb_define_global_const("TOPLEVEL_BINDING", rb_f_binding(ruby_top_self)); rb_define_global_const("TOPLEVEL_BINDING", rb_f_binding(ruby_top_self));
#ifdef __MACOS__ #ifdef __MACOS__
_macruby_init(); _macruby_init();
@ -1446,7 +1447,7 @@ rb_eval_string_protect(str, state)
const char *str; const char *str;
int *state; int *state;
{ {
VALUE result; /* OK */ VALUE result = Qnil; /* OK */
int status; int status;
PUSH_TAG(PROT_NONE); PUSH_TAG(PROT_NONE);
@ -1483,7 +1484,7 @@ rb_eval_string_wrap(str, state)
ruby_frame->orig_func = 0; ruby_frame->orig_func = 0;
ruby_frame->last_class = 0; ruby_frame->last_class = 0;
ruby_frame->self = self; ruby_frame->self = self;
ruby_frame->cbase = (VALUE)rb_node_newnode(NODE_CREF,ruby_wrapper,0,0); PUSH_CREF(ruby_wrapper);
PUSH_SCOPE(); PUSH_SCOPE();
val = rb_eval_string_protect(str, &status); val = rb_eval_string_protect(str, &status);
@ -1582,7 +1583,7 @@ rb_eval_cmd(cmd, arg, tcheck)
int tcheck; int tcheck;
{ {
int state; int state;
VALUE val; /* OK */ VALUE val = Qnil; /* OK */
struct SCOPE *saved_scope; struct SCOPE *saved_scope;
volatile int safe = ruby_safe_level; volatile int safe = ruby_safe_level;
@ -1600,8 +1601,7 @@ rb_eval_cmd(cmd, arg, tcheck)
ruby_frame->orig_func = 0; ruby_frame->orig_func = 0;
ruby_frame->last_class = 0; ruby_frame->last_class = 0;
ruby_frame->self = ruby_top_self; ruby_frame->self = ruby_top_self;
ruby_frame->cbase = (VALUE)rb_node_newnode(NODE_CREF,0,0,0); PUSH_CREF(ruby_wrapper ? ruby_wrapper : rb_cObject);
RNODE(ruby_frame->cbase)->nd_clss = ruby_wrapper ? ruby_wrapper : rb_cObject;
if (tcheck && OBJ_TAINTED(cmd)) { if (tcheck && OBJ_TAINTED(cmd)) {
ruby_safe_level = 4; ruby_safe_level = 4;
@ -1627,7 +1627,7 @@ superclass(self, node)
VALUE self; VALUE self;
NODE *node; NODE *node;
{ {
VALUE val; /* OK */ VALUE val = Qnil; /* OK */
int state; int state;
PUSH_TAG(PROT_NONE); PUSH_TAG(PROT_NONE);
@ -1659,7 +1659,7 @@ superclass(self, node)
return val; return val;
} }
#define ruby_cbase (RNODE(ruby_frame->cbase)->nd_clss) #define ruby_cbase (ruby_cref->nd_clss)
static VALUE static VALUE
ev_const_defined(cref, id, self) ev_const_defined(cref, id, self)
@ -1713,7 +1713,7 @@ ev_const_get(cref, id, self)
static VALUE static VALUE
cvar_cbase() cvar_cbase()
{ {
NODE *cref = RNODE(ruby_frame->cbase); NODE *cref = ruby_cref;
while (cref && cref->nd_next && FL_TEST(cref->nd_clss, FL_SINGLETON)) { while (cref && cref->nd_next && FL_TEST(cref->nd_clss, FL_SINGLETON)) {
cref = cref->nd_next; cref = cref->nd_next;
@ -1727,7 +1727,7 @@ cvar_cbase()
static VALUE static VALUE
rb_mod_nesting() rb_mod_nesting()
{ {
NODE *cbase = RNODE(ruby_frame->cbase); NODE *cbase = ruby_cref;
VALUE ary = rb_ary_new(); VALUE ary = rb_ary_new();
while (cbase && cbase->nd_next) { while (cbase && cbase->nd_next) {
@ -1743,7 +1743,7 @@ rb_mod_nesting()
static VALUE static VALUE
rb_mod_s_constants() rb_mod_s_constants()
{ {
NODE *cbase = RNODE(ruby_frame->cbase); NODE *cbase = ruby_cref;
void *data = 0; void *data = 0;
while (cbase) { while (cbase) {
@ -1789,7 +1789,7 @@ rb_undef(klass, id)
VALUE origin; VALUE origin;
NODE *body; NODE *body;
if (ruby_class == rb_cObject && klass == ruby_class) { if (ruby_cbase == rb_cObject && klass == rb_cObject) {
rb_secure(4); rb_secure(4);
} }
if (ruby_safe_level >= 4 && !OBJ_TAINTED(klass)) { if (ruby_safe_level >= 4 && !OBJ_TAINTED(klass)) {
@ -2123,7 +2123,7 @@ is_defined(self, node, buf)
break; break;
case NODE_CONST: case NODE_CONST:
if (ev_const_defined(RNODE(ruby_frame->cbase), node->nd_vid, self)) { if (ev_const_defined(ruby_cref, node->nd_vid, self)) {
return "constant"; return "constant";
} }
break; break;
@ -3057,7 +3057,6 @@ rb_eval(self, n)
if (node->nd_rval) { if (node->nd_rval) {
saved_cref = ruby_cref; saved_cref = ruby_cref;
ruby_cref = (NODE*)node->nd_rval; ruby_cref = (NODE*)node->nd_rval;
ruby_frame->cbase = node->nd_rval;
} }
if (node->nd_tbl) { if (node->nd_tbl) {
VALUE *vars = ALLOCA_N(VALUE, node->nd_tbl[0]+1); VALUE *vars = ALLOCA_N(VALUE, node->nd_tbl[0]+1);
@ -3229,7 +3228,7 @@ rb_eval(self, n)
break; break;
case NODE_CONST: case NODE_CONST:
result = ev_const_get(RNODE(ruby_frame->cbase), node->nd_vid, self); result = ev_const_get(ruby_cref, node->nd_vid, self);
break; break;
case NODE_CVAR: case NODE_CVAR:
@ -3658,7 +3657,7 @@ module_setup(module, n)
NODE * volatile node = n->nd_body; NODE * volatile node = n->nd_body;
int state; int state;
struct FRAME frame; struct FRAME frame;
VALUE result; /* OK */ VALUE result = Qnil; /* OK */
TMP_PROTECT; TMP_PROTECT;
frame = *ruby_frame; frame = *ruby_frame;
@ -3683,7 +3682,6 @@ module_setup(module, n)
} }
PUSH_CREF(module); PUSH_CREF(module);
ruby_frame->cbase = (VALUE)ruby_cref;
PUSH_TAG(PROT_NONE); PUSH_TAG(PROT_NONE);
if ((state = EXEC_TAG()) == 0) { if ((state = EXEC_TAG()) == 0) {
if (trace_func) { if (trace_func) {
@ -4055,7 +4053,7 @@ rb_yield_0(val, self, klass, flags, avalue)
frame.prev = ruby_frame; frame.prev = ruby_frame;
ruby_frame = &(frame); ruby_frame = &(frame);
old_cref = (VALUE)ruby_cref; old_cref = (VALUE)ruby_cref;
ruby_cref = (NODE*)ruby_frame->cbase; ruby_cref = block->cref;
old_wrapper = ruby_wrapper; old_wrapper = ruby_wrapper;
ruby_wrapper = block->wrapper; ruby_wrapper = block->wrapper;
old_scope = ruby_scope; old_scope = ruby_scope;
@ -4071,8 +4069,14 @@ rb_yield_0(val, self, klass, flags, avalue)
/* FOR does not introduce new scope */ /* FOR does not introduce new scope */
ruby_dyna_vars = block->dyna_vars; ruby_dyna_vars = block->dyna_vars;
} }
ruby_class = klass ? klass : block->klass; if (klass) {
if (!klass) self = block->self; ruby_class = klass;
PUSH_CREF(klass);
}
else {
ruby_class = block->klass;
self = block->self;
}
node = block->body; node = block->body;
if (block->var) { if (block->var) {
@ -4552,7 +4556,7 @@ rb_protect(proc, data, state)
VALUE data; VALUE data;
int *state; int *state;
{ {
VALUE result; /* OK */ VALUE result = Qnil; /* OK */
int status; int status;
PUSH_TAG(PROT_NONE); PUSH_TAG(PROT_NONE);
@ -4599,7 +4603,7 @@ rb_with_disable_interrupt(proc, data)
VALUE (*proc)(); VALUE (*proc)();
VALUE data; VALUE data;
{ {
VALUE result; /* OK */ VALUE result = Qnil; /* OK */
int status; int status;
DEFER_INTS; DEFER_INTS;
@ -4941,7 +4945,7 @@ rb_call0(klass, recv, id, oid, argc, argv, body, nosuper)
if (body->nd_rval) { if (body->nd_rval) {
saved_cref = ruby_cref; saved_cref = ruby_cref;
ruby_cref = (NODE*)body->nd_rval; ruby_cref = (NODE*)body->nd_rval;
ruby_frame->cbase = body->nd_rval; ruby_class = ruby_cbase;
} }
if (body->nd_tbl) { if (body->nd_tbl) {
local_vars = TMP_ALLOC(body->nd_tbl[0]+1); local_vars = TMP_ALLOC(body->nd_tbl[0]+1);
@ -5401,7 +5405,7 @@ eval(self, src, scope, file, line)
old_vmode = scope_vmode; old_vmode = scope_vmode;
scope_vmode = data->vmode; scope_vmode = data->vmode;
old_cref = (VALUE)ruby_cref; old_cref = (VALUE)ruby_cref;
ruby_cref = (NODE*)ruby_frame->cbase; ruby_cref = data->cref;
old_wrapper = ruby_wrapper; old_wrapper = ruby_wrapper;
ruby_wrapper = data->wrapper; ruby_wrapper = data->wrapper;
if ((file == 0 || (line == 1 && strcmp(file, "(eval)") == 0)) && data->body) { if ((file == 0 || (line == 1 && strcmp(file, "(eval)") == 0)) && data->body) {
@ -5557,7 +5561,7 @@ exec_under(func, under, cbase, args)
VALUE under, cbase; VALUE under, cbase;
void *args; void *args;
{ {
VALUE val; /* OK */ VALUE val = Qnil; /* OK */
int state; int state;
int mode; int mode;
@ -5570,9 +5574,6 @@ exec_under(func, under, cbase, args)
ruby_frame->argc = _frame.prev->argc; ruby_frame->argc = _frame.prev->argc;
ruby_frame->argv = _frame.prev->argv; ruby_frame->argv = _frame.prev->argv;
if (cbase) { if (cbase) {
if (ruby_cbase != cbase) {
ruby_frame->cbase = (VALUE)rb_node_newnode(NODE_CREF,under,0,ruby_frame->cbase);
}
PUSH_CREF(cbase); PUSH_CREF(cbase);
} }
@ -5753,7 +5754,7 @@ rb_load(fname, wrap)
ruby_frame->last_func = 0; ruby_frame->last_func = 0;
ruby_frame->last_class = 0; ruby_frame->last_class = 0;
ruby_frame->self = self; ruby_frame->self = self;
ruby_frame->cbase = (VALUE)rb_node_newnode(NODE_CREF,ruby_class,0,0); PUSH_CREF(ruby_class);
PUSH_SCOPE(); PUSH_SCOPE();
/* default visibility is private at loading toplevel */ /* default visibility is private at loading toplevel */
SCOPE_SET(SCOPE_PRIVATE); SCOPE_SET(SCOPE_PRIVATE);
@ -6626,7 +6627,7 @@ rb_f_autoload(obj, sym, file)
VALUE sym; VALUE sym;
VALUE file; VALUE file;
{ {
return rb_mod_autoload(ruby_class, sym, file); return rb_mod_autoload(ruby_cbase, sym, file);
} }
static VALUE static VALUE
@ -6634,8 +6635,8 @@ rb_f_autoload_p(obj, sym)
VALUE obj; VALUE obj;
VALUE sym; VALUE sym;
{ {
/* use ruby_class as same as rb_f_autoload. */ /* use ruby_cbase as same as rb_f_autoload. */
return rb_mod_autoload_p(ruby_class, sym); return rb_mod_autoload_p(ruby_cbase, sym);
} }
void void
@ -6692,7 +6693,7 @@ blk_mark(data)
rb_gc_mark((VALUE)data->body); rb_gc_mark((VALUE)data->body);
rb_gc_mark((VALUE)data->self); rb_gc_mark((VALUE)data->self);
rb_gc_mark((VALUE)data->dyna_vars); rb_gc_mark((VALUE)data->dyna_vars);
rb_gc_mark((VALUE)data->klass); rb_gc_mark((VALUE)data->cref);
rb_gc_mark((VALUE)data->tag); rb_gc_mark((VALUE)data->tag);
rb_gc_mark(data->wrapper); rb_gc_mark(data->wrapper);
rb_gc_mark(data->block_obj); rb_gc_mark(data->block_obj);
@ -7424,7 +7425,7 @@ method_call(argc, argv, method)
VALUE *argv; VALUE *argv;
VALUE method; VALUE method;
{ {
VALUE result; /* OK */ VALUE result = Qnil; /* OK */
struct METHOD *data; struct METHOD *data;
int state; int state;
volatile int safe = ruby_safe_level; volatile int safe = ruby_safe_level;
@ -7968,7 +7969,7 @@ rb_trap_eval(cmd, sig)
int sig; int sig;
{ {
int state; int state;
VALUE val; /* OK */ VALUE val = Qnil; /* OK */
volatile struct thread_status_t save; volatile struct thread_status_t save;
THREAD_COPY_STATUS(curr_thread, &save); THREAD_COPY_STATUS(curr_thread, &save);
@ -10070,7 +10071,7 @@ rb_f_catch(dmy, tag)
{ {
int state; int state;
ID t; ID t;
VALUE val; /* OK */ VALUE val = Qnil; /* OK */
t = rb_to_id(tag); t = rb_to_id(tag);
PUSH_TAG(t); PUSH_TAG(t);

2
gc.c
View File

@ -1157,7 +1157,6 @@ rb_gc_mark_frame(frame)
struct FRAME *frame; struct FRAME *frame;
{ {
mark_locations_array(frame->argv, frame->argc); mark_locations_array(frame->argv, frame->argc);
rb_gc_mark(frame->cbase);
rb_gc_mark((VALUE)frame->node); rb_gc_mark((VALUE)frame->node);
} }
@ -1229,7 +1228,6 @@ rb_gc()
} }
} }
} }
rb_gc_mark((VALUE)ruby_class);
rb_gc_mark((VALUE)ruby_scope); rb_gc_mark((VALUE)ruby_scope);
rb_gc_mark((VALUE)ruby_dyna_vars); rb_gc_mark((VALUE)ruby_dyna_vars);
if (finalizer_table) { if (finalizer_table) {

4
intern.h
View File

@ -97,8 +97,8 @@ VALUE rb_big_rand _((VALUE, double*));
/* class.c */ /* class.c */
VALUE rb_class_boot _((VALUE)); VALUE rb_class_boot _((VALUE));
VALUE rb_class_new _((VALUE)); VALUE rb_class_new _((VALUE));
VALUE rb_mod_clone _((VALUE)); VALUE rb_mod_init_copy _((VALUE, VALUE));
VALUE rb_mod_dup _((VALUE)); VALUE rb_class_init_copy _((VALUE, VALUE));
VALUE rb_singleton_class_clone _((VALUE)); VALUE rb_singleton_class_clone _((VALUE));
void rb_singleton_class_attached _((VALUE,VALUE)); void rb_singleton_class_attached _((VALUE,VALUE));
VALUE rb_make_metaclass _((VALUE, VALUE)); VALUE rb_make_metaclass _((VALUE, VALUE));

43
marshal.c
View File

@ -84,7 +84,7 @@ static ID s_getc, s_read, s_write, s_binmode;
struct dump_arg { struct dump_arg {
VALUE obj; VALUE obj;
VALUE str, dest; VALUE str, dest;
st_table *symbol; st_table *symbols;
st_table *data; st_table *data;
int taint; int taint;
}; };
@ -310,14 +310,14 @@ w_symbol(id, arg)
char *sym = rb_id2name(id); char *sym = rb_id2name(id);
long num; long num;
if (st_lookup(arg->symbol, id, &num)) { if (st_lookup(arg->symbols, id, &num)) {
w_byte(TYPE_SYMLINK, arg); w_byte(TYPE_SYMLINK, arg);
w_long(num, arg); w_long(num, arg);
} }
else { else {
w_byte(TYPE_SYMBOL, arg); w_byte(TYPE_SYMBOL, arg);
w_bytes(sym, strlen(sym), arg); w_bytes(sym, strlen(sym), arg);
st_add_direct(arg->symbol, id, arg->symbol->num_entries); st_add_direct(arg->symbols, id, arg->symbols->num_entries);
} }
} }
@ -400,9 +400,10 @@ w_uclass(obj, base_klass, arg)
VALUE klass = CLASS_OF(obj); VALUE klass = CLASS_OF(obj);
w_extended(klass, arg); w_extended(klass, arg);
klass = rb_class_real(klass);
if (klass != base_klass) { if (klass != base_klass) {
w_byte(TYPE_UCLASS, arg); w_byte(TYPE_UCLASS, arg);
w_unique(rb_obj_classname(obj), arg); w_unique(rb_class2name(klass), arg);
} }
} }
@ -432,6 +433,10 @@ w_object(obj, arg, limit)
if (limit == 0) { if (limit == 0) {
rb_raise(rb_eArgError, "exceed depth limit"); rb_raise(rb_eArgError, "exceed depth limit");
} }
if (ivtbl = rb_generic_ivar_table(obj)) {
w_byte(TYPE_IVAR, arg);
}
if (obj == Qnil) { if (obj == Qnil) {
w_byte(TYPE_NIL, arg); w_byte(TYPE_NIL, arg);
} }
@ -452,13 +457,11 @@ w_object(obj, arg, limit)
} }
else { else {
w_object(rb_int2big(FIX2LONG(obj)), arg, limit); w_object(rb_int2big(FIX2LONG(obj)), arg, limit);
return;
} }
#endif #endif
} }
else if (SYMBOL_P(obj)) { else if (SYMBOL_P(obj)) {
w_symbol(SYM2ID(obj), arg); w_symbol(SYM2ID(obj), arg);
return;
} }
else { else {
long num; long num;
@ -475,10 +478,6 @@ w_object(obj, arg, limit)
if (OBJ_TAINTED(obj)) arg->taint = Qtrue; if (OBJ_TAINTED(obj)) arg->taint = Qtrue;
if (ivtbl = rb_generic_ivar_table(obj)) {
w_byte(TYPE_IVAR, arg);
}
st_add_direct(arg->data, obj, arg->data->num_entries); st_add_direct(arg->data, obj, arg->data->num_entries);
if (rb_respond_to(obj, s_mdump)) { if (rb_respond_to(obj, s_mdump)) {
VALUE v; VALUE v;
@ -641,7 +640,7 @@ w_object(obj, arg, limit)
w_class(TYPE_DATA, obj, arg); w_class(TYPE_DATA, obj, arg);
if (!rb_respond_to(obj, s_dump_data)) { if (!rb_respond_to(obj, s_dump_data)) {
rb_raise(rb_eTypeError, rb_raise(rb_eTypeError,
"class %s needs to have instance method `_dump_data'", "class %s needs to have instance method `marshal_dump'",
rb_obj_classname(obj)); rb_obj_classname(obj));
} }
v = rb_funcall(obj, s_dump_data, 0); v = rb_funcall(obj, s_dump_data, 0);
@ -676,7 +675,7 @@ static VALUE
dump_ensure(arg) dump_ensure(arg)
struct dump_arg *arg; struct dump_arg *arg;
{ {
st_free_table(arg->symbol); st_free_table(arg->symbols);
st_free_table(arg->data); st_free_table(arg->data);
if (arg->taint) { if (arg->taint) {
OBJ_TAINT(arg->str); OBJ_TAINT(arg->str);
@ -723,11 +722,11 @@ marshal_dump(argc, argv)
arg.str = port; arg.str = port;
} }
arg.symbol = st_init_numtable(); arg.symbols = st_init_numtable();
arg.data = st_init_numtable(); arg.data = st_init_numtable();
arg.taint = Qfalse; arg.taint = Qfalse;
c_arg.obj = obj; c_arg.obj = obj;
c_arg.arg = &arg; c_arg.arg = &arg;
c_arg.limit = limit; c_arg.limit = limit;
w_byte(MARSHAL_MAJOR, &arg); w_byte(MARSHAL_MAJOR, &arg);
@ -740,7 +739,7 @@ marshal_dump(argc, argv)
struct load_arg { struct load_arg {
char *ptr, *end; char *ptr, *end;
st_table *symbol; st_table *symbols;
VALUE data; VALUE data;
VALUE proc; VALUE proc;
int taint; int taint;
@ -855,7 +854,7 @@ r_symlink(arg)
ID id; ID id;
long num = r_long(arg); long num = r_long(arg);
if (st_lookup(arg->symbol, num, &id)) { if (st_lookup(arg->symbols, num, &id)) {
return id; return id;
} }
rb_raise(rb_eArgError, "bad symbol"); rb_raise(rb_eArgError, "bad symbol");
@ -868,7 +867,7 @@ r_symreal(arg)
ID id; ID id;
id = rb_intern(RSTRING(r_bytes(arg))->ptr); id = rb_intern(RSTRING(r_bytes(arg))->ptr);
st_insert(arg->symbol, arg->symbol->num_entries, id); st_insert(arg->symbols, arg->symbols->num_entries, id);
return id; return id;
} }
@ -1295,7 +1294,7 @@ static VALUE
load_ensure(arg) load_ensure(arg)
struct load_arg *arg; struct load_arg *arg;
{ {
st_free_table(arg->symbol); st_free_table(arg->symbols);
return 0; return 0;
} }
@ -1341,7 +1340,7 @@ marshal_load(argc, argv)
MARSHAL_MAJOR, MARSHAL_MINOR, major, minor); MARSHAL_MAJOR, MARSHAL_MINOR, major, minor);
} }
arg.symbol = st_init_numtable(); arg.symbols = st_init_numtable();
arg.data = rb_hash_new(); arg.data = rb_hash_new();
if (NIL_P(proc)) arg.proc = 0; if (NIL_P(proc)) arg.proc = 0;
else arg.proc = proc; else arg.proc = proc;

59
object.c
View File

@ -675,6 +675,25 @@ rb_mod_cmp(mod, arg)
return INT2FIX(1); return INT2FIX(1);
} }
static VALUE rb_module_s_alloc _((VALUE));
static VALUE
rb_module_s_alloc(klass)
VALUE klass;
{
VALUE mod = rb_module_new();
RBASIC(mod)->klass = klass;
return mod;
}
static VALUE
rb_class_s_alloc(argc, argv)
int argc;
VALUE *argv;
{
return rb_class_boot(0);
}
static VALUE static VALUE
rb_mod_initialize(module) rb_mod_initialize(module)
VALUE module; VALUE module;
@ -691,33 +710,17 @@ rb_class_initialize(argc, argv, klass)
VALUE *argv; VALUE *argv;
VALUE klass; VALUE klass;
{ {
return rb_mod_initialize(klass); VALUE super;
}
static VALUE rb_module_s_alloc _((VALUE));
static VALUE
rb_module_s_alloc(klass)
VALUE klass;
{
VALUE mod = rb_module_new();
RBASIC(mod)->klass = klass;
return mod;
}
static VALUE
rb_class_s_new(argc, argv)
int argc;
VALUE *argv;
{
VALUE super, klass;
if (RCLASS(klass)->super != 0) {
rb_raise(rb_eTypeError, "already initialized class");
}
if (rb_scan_args(argc, argv, "01", &super) == 0) { if (rb_scan_args(argc, argv, "01", &super) == 0) {
super = rb_cObject; super = rb_cObject;
} }
klass = rb_class_new(super); RCLASS(klass)->super = super;
rb_make_metaclass(klass, RBASIC(super)->klass); rb_make_metaclass(klass, RBASIC(super)->klass);
rb_obj_call_init(klass, argc, argv); rb_mod_initialize(klass);
rb_class_inherited(super, klass); rb_class_inherited(super, klass);
return klass; return klass;
@ -729,6 +732,9 @@ rb_obj_alloc(klass)
{ {
VALUE obj; VALUE obj;
if (RCLASS(klass)->super == 0) {
rb_raise(rb_eTypeError, "can't instantiate uninitialized class");
}
if (FL_TEST(klass, FL_SINGLETON)) { if (FL_TEST(klass, FL_SINGLETON)) {
rb_raise(rb_eTypeError, "can't create instance of virtual class"); rb_raise(rb_eTypeError, "can't create instance of virtual class");
} }
@ -769,6 +775,9 @@ rb_class_superclass(klass)
{ {
VALUE super = RCLASS(klass)->super; VALUE super = RCLASS(klass)->super;
if (!super) {
rb_raise(rb_eTypeError, "uninitialized class");
}
while (TYPE(super) == T_ICLASS) { while (TYPE(super) == T_ICLASS) {
super = RCLASS(super)->super; super = RCLASS(super)->super;
} }
@ -1491,8 +1500,7 @@ Init_Object()
rb_define_method(rb_cModule, "<=", rb_mod_le, 1); rb_define_method(rb_cModule, "<=", rb_mod_le, 1);
rb_define_method(rb_cModule, ">", rb_mod_gt, 1); rb_define_method(rb_cModule, ">", rb_mod_gt, 1);
rb_define_method(rb_cModule, ">=", rb_mod_ge, 1); rb_define_method(rb_cModule, ">=", rb_mod_ge, 1);
rb_define_method(rb_cModule, "clone", rb_mod_clone, 0); rb_define_method(rb_cModule, "initialize_copy", rb_mod_init_copy, 1);
rb_define_method(rb_cModule, "dup", rb_mod_dup, 0);
rb_define_method(rb_cModule, "to_s", rb_mod_to_s, 0); rb_define_method(rb_cModule, "to_s", rb_mod_to_s, 0);
rb_define_method(rb_cModule, "included_modules", rb_mod_included_modules, 0); rb_define_method(rb_cModule, "included_modules", rb_mod_included_modules, 0);
rb_define_method(rb_cModule, "include?", rb_mod_include_p, 1); rb_define_method(rb_cModule, "include?", rb_mod_include_p, 1);
@ -1524,8 +1532,7 @@ Init_Object()
rb_define_method(rb_cClass, "new", rb_class_new_instance, -1); rb_define_method(rb_cClass, "new", rb_class_new_instance, -1);
rb_define_method(rb_cClass, "initialize", rb_class_initialize, -1); rb_define_method(rb_cClass, "initialize", rb_class_initialize, -1);
rb_define_method(rb_cClass, "superclass", rb_class_superclass, 0); rb_define_method(rb_cClass, "superclass", rb_class_superclass, 0);
rb_undef_alloc_func(rb_cClass); rb_define_alloc_func(rb_cClass, rb_class_s_alloc);
rb_define_singleton_method(rb_cClass, "new", rb_class_s_new, -1);
rb_undef_method(rb_cClass, "extend_object"); rb_undef_method(rb_cClass, "extend_object");
rb_undef_method(rb_cClass, "append_features"); rb_undef_method(rb_cClass, "append_features");

2
parse.y
View File

@ -327,7 +327,7 @@ static void top_local_setup();
program : { program : {
lex_state = EXPR_BEG; lex_state = EXPR_BEG;
top_local_init(); top_local_init();
if ((VALUE)ruby_class == rb_cObject) class_nest = 0; if (ruby_class == rb_cObject) class_nest = 0;
else class_nest = 1; else class_nest = 1;
} }
compstmt compstmt