kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* object.c (rb_obj_ivar_set): call to_str for string only once.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40178 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2013-04-08 03:05:15 +00:00
parent 6cb682a480
commit ae13ab2466
4 changed files with 69 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,13 +1,11 @@
Sun Apr 7 21:27:40 2013 NARUSE, Yui <naruse@ruby-lang.org>
Mon Apr 8 12:05:02 2013 NARUSE, Yui <naruse@ruby-lang.org>
* object.c (rb_mod_const_set): call to_str for string only once.
* object.c (rb_obj_ivar_set): call to_str for string only once.
to_str was called from rb_is_const_name and rb_to_id before.
* object.c (rb_mod_const_set): ditto.
Sun Apr 7 21:16:19 2013 NARUSE, Yui <naruse@ruby-lang.org>
* object.c (rb_mod_cvar_set): call to_str for string only once.
to_str was called from rb_is_class_name and rb_to_id before.
* object.c (rb_mod_cvar_set): ditto.
Sun Apr 7 13:56:16 2013 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>

12
object.c
View file

@ -2189,12 +2189,16 @@ rb_obj_ivar_set(VALUE obj, VALUE iv, VALUE val)
QUOTE_ID(id));
}
}
else if (!rb_is_instance_name(iv)) {
else {
VALUE name = rb_check_string_type(iv);
if (NIL_P(name)) {
rb_raise(rb_eTypeError, "%+"PRIsVALUE" is not a symbol or string", iv);
}
if (!rb_is_instance_name(name)) {
rb_name_error_str(iv, "`%"PRIsVALUE"' is not allowed as an instance variable name",
QUOTE(iv));
}
else {
id = rb_to_id(iv);
}
id = rb_to_id(name);
}
return rb_ivar_set(obj, id, val);
}

38
test/ruby/test_module.rb
View file

@ -262,6 +262,12 @@ class TestModule < Test::Unit::TestCase
def test_const_get
assert_equal(Math::PI, Math.const_get("PI"))
assert_equal(Math::PI, Math.const_get(:PI))
n = Object.new
def n.to_str; @count = defined?(@count) ? @count + 1 : 1; "PI"; end
def n.count; @count; end
assert_equal(Math::PI, Math.const_get(n))
assert_equal(1, n.count)
end
def test_nested_get
@ -302,6 +308,20 @@ class TestModule < Test::Unit::TestCase
assert_equal(99, Other::KOALA)
Other.const_set("WOMBAT", "Hi")
assert_equal("Hi", Other::WOMBAT)
n = Object.new
def n.to_str; @count = defined?(@count) ? @count + 1 : 1; "HOGE"; end
def n.count; @count; end
def n.count=(v); @count=v; end
assert(!Other.const_defined?(:HOGE))
Other.const_set(n, 999)
assert_equal(1, n.count)
n.count = 0
assert_equal(999, Other.const_get(n))
assert_equal(1, n.count)
n.count = 0
assert_equal(true, Other.const_defined?(n))
assert_equal(1, n.count)
end
def test_constants
@ -669,6 +689,12 @@ class TestModule < Test::Unit::TestCase
assert_raise(NameError) { c.class_variable_get(:foo) }
assert_raise(NameError) { c.class_variable_get("bar") }
assert_raise(TypeError) { c.class_variable_get(1) }
n = Object.new
def n.to_str; @count = defined?(@count) ? @count + 1 : 1; "@@foo"; end
def n.count; @count; end
assert_equal(:foo, c.class_variable_get(n))
assert_equal(1, n.count)
end
def test_class_variable_set
@ -679,6 +705,13 @@ class TestModule < Test::Unit::TestCase
assert_raise(NameError) { c.class_variable_set(:foo, 1) }
assert_raise(NameError) { c.class_variable_set("bar", 1) }
assert_raise(TypeError) { c.class_variable_set(1, 1) }
n = Object.new
def n.to_str; @count = defined?(@count) ? @count + 1 : 1; "@@foo"; end
def n.count; @count; end
c.class_variable_set(n, :bar)
assert_equal(:bar, c.class_eval('@@foo'))
assert_equal(1, n.count)
end
def test_class_variable_defined
@ -689,6 +722,11 @@ class TestModule < Test::Unit::TestCase
assert_raise(NameError) { c.class_variable_defined?(:foo) }
assert_raise(NameError) { c.class_variable_defined?("bar") }
assert_raise(TypeError) { c.class_variable_defined?(1) }
n = Object.new
def n.to_str; @count = defined?(@count) ? @count + 1 : 1; "@@foo"; end
def n.count; @count; end
assert_equal(true, c.class_variable_defined?(n))
assert_equal(1, n.count)
end
def test_remove_class_variable

19
test/ruby/test_object.rb
View file

@ -176,6 +176,12 @@ class TestObject < Test::Unit::TestCase
assert_raise(NameError) { o.instance_variable_get(:foo) }
assert_raise(NameError) { o.instance_variable_get("bar") }
assert_raise(TypeError) { o.instance_variable_get(1) }
n = Object.new
def n.to_str; @count = defined?(@count) ? @count + 1 : 1; "@foo"; end
def n.count; @count; end
assert_equal(:foo, o.instance_variable_get(n))
assert_equal(1, n.count)
end
def test_instance_variable_set
@ -185,6 +191,13 @@ class TestObject < Test::Unit::TestCase
assert_raise(NameError) { o.instance_variable_set(:foo, 1) }
assert_raise(NameError) { o.instance_variable_set("bar", 1) }
assert_raise(TypeError) { o.instance_variable_set(1, 1) }
n = Object.new
def n.to_str; @count = defined?(@count) ? @count + 1 : 1; "@foo"; end
def n.count; @count; end
o.instance_variable_set(n, :bar)
assert_equal(:bar, o.instance_eval { @foo })
assert_equal(1, n.count)
end
def test_instance_variable_defined
@ -195,6 +208,12 @@ class TestObject < Test::Unit::TestCase
assert_raise(NameError) { o.instance_variable_defined?(:foo) }
assert_raise(NameError) { o.instance_variable_defined?("bar") }
assert_raise(TypeError) { o.instance_variable_defined?(1) }
n = Object.new
def n.to_str; @count = defined?(@count) ? @count + 1 : 1; "@foo"; end
def n.count; @count; end
assert_equal(true, o.instance_variable_defined?(n))
assert_equal(1, n.count)
end
def test_remove_instance_variable