mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* test/ruby/test_basicinstructions.rb: updated for new class
behavior. [ruby-dev:32192] * encoding.c (enc_name): Encoding should not rely on ENCODING in the FL_USERS flags. * encoding.c (rb_enc_from_encoding): do not call rb_enc_associate for encoding itself. * encoding.c (enc_register_at): ditto. * marshal.c (r_ivar): do not set real instance variable for encoding data associated. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13848 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
a46c532ab8
commit
4ab384be2d
4 changed files with 30 additions and 14 deletions
|
@ -483,16 +483,16 @@ class TestBasicInstructions < Test::Unit::TestCase
|
|||
assert_equal 'B/singleton', CVarB.cvB
|
||||
assert_equal 'B/singleton', CVarB.cvB2
|
||||
assert_equal 'B/singleton', CVarB.new.cvB
|
||||
assert_equal 'CVarA@@cv', CVarA.cv
|
||||
assert_equal 'CVarA@@cv', CVarA.cv2
|
||||
assert_equal 'CVarA@@cv', CVarA.new.cv
|
||||
assert_equal 'B/singleton', CVarA.cv
|
||||
assert_equal 'B/singleton', CVarA.cv2
|
||||
assert_equal 'B/singleton', CVarA.new.cv
|
||||
CVarB.new.cvB = 'B/instance'
|
||||
assert_equal 'B/instance', CVarB.cvB
|
||||
assert_equal 'B/instance', CVarB.cvB2
|
||||
assert_equal 'B/instance', CVarB.new.cvB
|
||||
assert_equal 'CVarA@@cv', CVarA.cv
|
||||
assert_equal 'CVarA@@cv', CVarA.cv2
|
||||
assert_equal 'CVarA@@cv', CVarA.new.cv
|
||||
assert_equal 'B/instance', CVarA.cv
|
||||
assert_equal 'B/instance', CVarA.cv2
|
||||
assert_equal 'B/instance', CVarA.new.cv
|
||||
|
||||
CVarA.cv = 'CVarA@@cv'
|
||||
CVarB.cvB = 'CVarB@@cv'
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue