diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | eval.c | 25 | ||||
| -rw-r--r-- | lib/yaml.rb | 2 |
3 files changed, 26 insertions, 12 deletions
@@ -1,3 +1,14 @@ +Mon Dec 26 08:50:36 2005 Yukihiro Matsumoto <matz@ruby-lang.org> + + * eval.c (ev_const_get): fixed a bug in constant reference during + instance_eval. [yarv-dev:707] + + * eval.c (ev_const_defined): ditto. + + * lib/yaml.rb (YAML::add_domain_type): typo fixed. a patch from + Joel VanderWerf <vjoel at path.berkeley.edu>. + [ruby-talk:165285] [ruby-core:6995] + Sat Dec 24 18:58:14 2005 Yukihiro Matsumoto <matz@ruby-lang.org> * stable version 1.8.4 released. @@ -1810,12 +1810,13 @@ ev_const_defined(cref, id, self) while (cbase && cbase->nd_next) { struct RClass *klass = RCLASS(cbase->nd_clss); - if (NIL_P(klass)) return rb_const_defined(CLASS_OF(self), id); - if (klass->iv_tbl && st_lookup(klass->iv_tbl, id, &result)) { - if (result == Qundef && NIL_P(rb_autoload_p((VALUE)klass, id))) { - return Qfalse; + if (!NIL_P(klass)) { + if (klass->iv_tbl && st_lookup(klass->iv_tbl, id, &result)) { + if (result == Qundef && NIL_P(rb_autoload_p((VALUE)klass, id))) { + return Qfalse; + } + return Qtrue; } - return Qtrue; } cbase = cbase->nd_next; } @@ -1834,13 +1835,15 @@ ev_const_get(cref, id, self) while (cbase && cbase->nd_next) { VALUE klass = cbase->nd_clss; - if (NIL_P(klass)) return rb_const_get(CLASS_OF(self), id); - while (RCLASS(klass)->iv_tbl && st_lookup(RCLASS(klass)->iv_tbl, id, &result)) { - if (result == Qundef) { - if (!RTEST(rb_autoload_load(klass, id))) break; - continue; + if (!NIL_P(klass)) { + while (RCLASS(klass)->iv_tbl && + st_lookup(RCLASS(klass)->iv_tbl, id, &result)) { + if (result == Qundef) { + if (!RTEST(rb_autoload_load(klass, id))) break; + continue; + } + return result; } - return result; } cbase = cbase->nd_next; } diff --git a/lib/yaml.rb b/lib/yaml.rb index 3130ad115d..fe8335c8f0 100644 --- a/lib/yaml.rb +++ b/lib/yaml.rb @@ -310,7 +310,7 @@ module YAML # # Add a transfer method for a builtin type # - def YAML.add_ruby_type( type, &transfer_proc ) + def YAML.add_ruby_type( type_tag, &transfer_proc ) resolver.add_type( "tag:ruby.yaml.org,2002:#{ type_tag }", transfer_proc ) end |