summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog10
-rw-r--r--object.c12
-rw-r--r--test/ruby/test_module.rb38
-rw-r--r--test/ruby/test_object.rb19
4 files changed, 69 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 9dbe9db019..440e566d68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
diff --git a/object.c b/object.c
index e2da8d5092..7c149b02b1 100644
--- a/object.c
+++ b/object.c
@@ -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);
}
diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb
index c899948128..8c33511101 100644
--- a/test/ruby/test_module.rb
+++ b/test/ruby/test_module.rb
@@ -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
diff --git a/test/ruby/test_object.rb b/test/ruby/test_object.rb
index b1df99d76e..1da7f250c2 100644
--- a/test/ruby/test_object.rb
+++ b/test/ruby/test_object.rb
@@ -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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-22 10:12:01 +0000