diff options
author | sorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-25 04:13:53 +0000 |
---|---|---|
committer | sorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-25 04:13:53 +0000 |
commit | ceb94d988812e26fa53f55a72ac06305ed959576 (patch) | |
tree | b6815831e7070d4edb90cb5f6c874ecdf241ee9a | |
parent | f30e113b1df5a6ea1b80b665baa7f93e3df052ca (diff) |
* backport r33045 from trunk.
* insns.def (defined): fix to checking class variable.
A patch by Magnus Holm <judofyr@gmail.com>. Thanks!
* test/ruby/test_variable.rb: add a test for above.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | insns.def | 5 | ||||
-rw-r--r-- | test/ruby/test_variable.rb | 5 |
3 files changed, 18 insertions, 1 deletions
@@ -1,3 +1,12 @@ +Wed Aug 24 09:49:10 2011 Koichi Sasada <ko1@atdot.net> + + * backport r33045 from trunk. + + * insns.def (defined): fix to checking class variable. + A patch by Magnus Holm <judofyr@gmail.com>. Thanks! + + * test/ruby/test_variable.rb: add a test for above. + Thu Aug 25 09:43:16 2011 Eric Hodel <drbrain@segment7.net> * backport r33066 from trunk. @@ -773,11 +773,14 @@ defined } break; case DEFINED_CVAR: - klass = vm_get_cbase(GET_ISEQ(), GET_LFP(), GET_DFP()); + { + NODE *cref = vm_get_cref(GET_ISEQ(), GET_LFP(), GET_DFP()); + klass = vm_get_cvar_base(cref); if (rb_cvar_defined(klass, SYM2ID(obj))) { expr_type = "class variable"; } break; + } case DEFINED_CONST: klass = v; if (vm_get_ev_const(th, GET_ISEQ(), klass, SYM2ID(obj), 1)) { diff --git a/test/ruby/test_variable.rb b/test/ruby/test_variable.rb index 53e00301dc..32b3d61573 100644 --- a/test/ruby/test_variable.rb +++ b/test/ruby/test_variable.rb @@ -55,6 +55,11 @@ class TestVariable < Test::Unit::TestCase assert_equal("Cronus", atlas.ruler0) assert_equal("Zeus", atlas.ruler3) assert_equal("Cronus", atlas.ruler4) + assert_nothing_raised do + class << Gods + defined?(@@rule) && @@rule + end + end end def test_local_variables |