diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-02-28 06:30:03 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-02-28 06:30:03 +0000 |
commit | b27393d6caae763ab27b259ca9588aad75758305 (patch) | |
tree | 46173b79431b547408febc234f716be0f68afed5 /eval.c | |
parent | 4fd84b6f2ecfdc5eb818e30db52795b4e5f7f5e2 (diff) |
* string.c (rb_str_delete_bang): delete! should take at least 1
argument.
* ruby.c (load_file): add rb_gc() after loading to avoid
extraordinary memory growth.
* dir.c (rb_glob_helper): "./foo" should match "foo", not "./foo".
* eval.c (ev_const_get): retrieve Object's constant if no current
class is available (e.g. defining singleton class for Fixnums).
* eval.c (ev_const_defined): check Object's constant if no current
class is available (e.g. defining singleton class for Fixnums).
* time.c (time_timeval): negative time interval shoule not be
allowed.
* eval.c (proc_call): ignore block to `call' always, despite of
being orphan or not.
* eval.c (rb_yield_0): should check based on rb_block_given_p()
and rb_f_block_given_p().
* configure.in (frame-address): --enable-frame-address to allow
__builtin_frame_address() to be used.
* eval.c (stack_length): use __builtin_frame_address() based on
the macro USE_BUILTIN_FRAME_ADDRESS.
* gc.c (rb_gc): ditto.
* gc.c (Init_stack): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1223 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval.c')
-rw-r--r-- | eval.c | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -1431,8 +1431,8 @@ ev_const_defined(cref, id) while (cbase && cbase->nd_clss != rb_cObject) { struct RClass *klass = RCLASS(cbase->nd_clss); - if (klass->iv_tbl && - st_lookup(klass->iv_tbl, id, 0)) { + if (NIL_P(klass)) return rb_const_defined(rb_cObject, id); + if (klass->iv_tbl && st_lookup(klass->iv_tbl, id, 0)) { return Qtrue; } cbase = cbase->nd_next; @@ -1451,6 +1451,7 @@ ev_const_get(cref, id) while (cbase && cbase->nd_clss != rb_cObject) { struct RClass *klass = RCLASS(cbase->nd_clss); + if (NIL_P(klass)) return rb_const_get(rb_cObject, id); if (klass->iv_tbl && st_lookup(klass->iv_tbl, id, &result)) { return result; } @@ -2932,7 +2933,7 @@ rb_eval(self, n) int noex; if (NIL_P(ruby_class)) { - rb_raise(rb_eTypeError, "no class to add method"); + rb_raise(rb_eTypeError, "no class/module to add method"); } if (ruby_class == rb_cObject && node->nd_mid == init) { rb_warn("redefining Object#initialize may cause infinite loop"); @@ -3516,7 +3517,7 @@ rb_yield_0(val, self, klass, acheck) int state; static unsigned serial = 1; - if (!ruby_frame->iter || !ruby_block) { + if (!(rb_block_given_p() || rb_f_block_given_p()) || !ruby_block) { rb_raise(rb_eLocalJumpError, "yield called out of block"); } @@ -4132,7 +4133,7 @@ stack_length(p) alloca(0); # define STACK_END (&stack_end) #else -# if defined(__GNUC__) && defined(__i386__) +# if defined(__GNUC__) && defined(USE_BUILTIN_FRAME_ADDRESS) VALUE *stack_end = __builtin_frame_address(0); # else VALUE *stack_end = alloca(1); |