diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-19 18:47:56 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-19 18:47:56 +0000 |
commit | d457fdad2dbcba31eee20f491deae3120db11dec (patch) | |
tree | b22a65c2882e7408c924bc41f90d7c2c614c2460 /vm_insnhelper.c | |
parent | e07663ec1fa3f03031fd6e074446857490767983 (diff) |
* eval.c, vm_insnhelper.c: fix cref in instance_eval
and cvar_base search protocol.
* bootstraptest/test_knownbug.rb, test_eval.rb: move soleved test
and add new tests.
* test/ruby/test_eval.rb: fix tests for spec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16486 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_insnhelper.c')
-rw-r--r-- | vm_insnhelper.c | 72 |
1 files changed, 38 insertions, 34 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c index eb7c218f6d..5b306eb182 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -21,9 +21,10 @@ #endif static inline rb_control_frame_t * -vm_push_frame(rb_thread_t *th, rb_iseq_t *iseq, VALUE type, - VALUE self, VALUE specval, VALUE *pc, - VALUE *sp, VALUE *lfp, int local_size) +vm_push_frame(rb_thread_t * const th, const rb_iseq_t * const iseq, + const VALUE type, const VALUE self, const VALUE specval, + const VALUE * const pc, VALUE *sp, VALUE *lfp, + int const local_size) { VALUE *dfp; rb_control_frame_t *cfp; @@ -48,14 +49,14 @@ vm_push_frame(rb_thread_t *th, rb_iseq_t *iseq, VALUE type, /* setup vm control frame stack */ cfp = th->cfp = th->cfp - 1; - cfp->pc = pc; + cfp->pc = (VALUE *)pc; cfp->sp = sp + 1; cfp->bp = sp + 1; - cfp->iseq = iseq; + cfp->iseq = (rb_iseq_t *) iseq; cfp->flag = type; cfp->self = self; cfp->lfp = lfp; - cfp->dfp = dfp; + cfp->dfp = (VALUE *)dfp; cfp->proc = 0; #define COLLECT_PROFILE 0 @@ -72,7 +73,7 @@ vm_push_frame(rb_thread_t *th, rb_iseq_t *iseq, VALUE type, } static inline void -vm_pop_frame(rb_thread_t *th) +vm_pop_frame(rb_thread_t * const th) { #if COLLECT_PROFILE rb_control_frame_t *cfp = th->cfp; @@ -990,37 +991,32 @@ vm_get_ev_const(rb_thread_t *th, rb_iseq_t *iseq, klass = cref->nd_clss; cref = cref->nd_next; - if (klass == 0) { - continue; - } - if (NIL_P(klass)) { - if (is_defined) { - /* TODO: check */ - return 1; - } - else { - klass = CLASS_OF(th->cfp->self); - return rb_const_get(klass, id); - } - } - search_continue: - if (RCLASS_IV_TBL(klass) && - st_lookup(RCLASS_IV_TBL(klass), id, &val)) { - if (val == Qundef) { - rb_autoload_load(klass, id); - goto search_continue; - } - else { - if (is_defined) { - return 1; + if (!NIL_P(klass)) { + search_continue: + if (RCLASS_IV_TBL(klass) && + st_lookup(RCLASS_IV_TBL(klass), id, &val)) { + if (val == Qundef) { + rb_autoload_load(klass, id); + goto search_continue; } else { - return val; + if (is_defined) { + return 1; + } + else { + return val; + } } } } } + + /* search self */ klass = root_cref->nd_clss; + if (NIL_P(klass)) { + klass = CLASS_OF(th->cfp->self); + } + if (is_defined) { return rb_const_defined(klass, id); } @@ -1042,14 +1038,18 @@ vm_get_ev_const(rb_thread_t *th, rb_iseq_t *iseq, static inline VALUE vm_get_cvar_base(NODE *cref) { - VALUE klass = Qnil; + VALUE klass; + + while (cref && cref->nd_next && (NIL_P(cref->nd_clss) || FL_TEST(cref->nd_clss, FL_SINGLETON))) { + cref = cref->nd_next; - if (cref) { - klass = cref->nd_clss; if (!cref->nd_next) { rb_warn("class variable access from toplevel"); } } + + klass = cref->nd_clss; + if (NIL_P(klass)) { rb_raise(rb_eTypeError, "no class variables available"); } @@ -1064,6 +1064,10 @@ vm_define_method(rb_thread_t *th, VALUE obj, VALUE klass = cref->nd_clss; int noex = cref->nd_visi; + if (NIL_P(klass)) { + rb_raise(rb_eTypeError, "no class/module to add method"); + } + if (is_singleton) { if (FIXNUM_P(obj) || SYMBOL_P(obj)) { rb_raise(rb_eTypeError, |