1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* object.c (rb_obj_ivar_set/get/defined): fix to check :@_v/C id.

Browse Source 
* test/testunit/test_testcase.rb: fix to use instance_variable_get()
  to access @_result.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11763 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2007-02-16 12:36:49 +00:00
parent b13c74bf82
commit 353cd25170
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Fri Feb 16 21:34:33 2007 Koichi Sasada <ko1@atdot.net>
* object.c (rb_obj_ivar_set/get/defined): fix to check :@_v/C id.
* test/testunit/test_testcase.rb: fix to use instance_variable_get()
to access @_result.
Fri Feb 16 20:59:10 2007 Koichi Sasada <ko1@atdot.net> Fri Feb 16 20:59:10 2007 Koichi Sasada <ko1@atdot.net>
* intern.h: add a prototype of rb_sym_to_s(). * intern.h: add a prototype of rb_sym_to_s().

8
object.c
View File

@ -1673,13 +1673,13 @@ rb_obj_public_methods(int argc, VALUE *argv, VALUE obj)
* fred.instance_variable_get(:@a) #=> "cat" * fred.instance_variable_get(:@a) #=> "cat"
* fred.instance_variable_get("@b") #=> 99 * fred.instance_variable_get("@b") #=> 99
*/ */
#include "debug.h"
static VALUE static VALUE
rb_obj_ivar_get(VALUE obj, VALUE iv) rb_obj_ivar_get(VALUE obj, VALUE iv)
{ {
ID id = rb_to_id(iv); ID id = rb_to_id(iv);
if (!rb_is_instance_id(id)) { if (!rb_is_instance_id(id) && !rb_is_instance2_id(id)) {
rb_name_error(id, "`%s' is not allowed as an instance variable name", rb_id2name(id)); rb_name_error(id, "`%s' is not allowed as an instance variable name", rb_id2name(id));
} }
return rb_ivar_get(obj, id); return rb_ivar_get(obj, id);
@ -1710,7 +1710,7 @@ rb_obj_ivar_set(VALUE obj, VALUE iv, VALUE val)
{ {
ID id = rb_to_id(iv); ID id = rb_to_id(iv);
if (!rb_is_instance_id(id)) { if (!rb_is_instance_id(id) && !rb_is_instance2_id(id)) {
rb_name_error(id, "`%s' is not allowed as an instance variable name", rb_id2name(id)); rb_name_error(id, "`%s' is not allowed as an instance variable name", rb_id2name(id));
} }
return rb_ivar_set(obj, id, val); return rb_ivar_set(obj, id, val);
@ -1739,7 +1739,7 @@ rb_obj_ivar_defined(VALUE obj, VALUE iv)
{ {
ID id = rb_to_id(iv); ID id = rb_to_id(iv);
if (!rb_is_instance_id(id)) { if (!rb_is_instance_id(id) && !rb_is_instance2_id(id)) {
rb_name_error(id, "`%s' is not allowed as an instance variable name", rb_id2name(id)); rb_name_error(id, "`%s' is not allowed as an instance variable name", rb_id2name(id));
} }
return rb_ivar_defined(obj, id); return rb_ivar_defined(obj, id);

2
test/testunit/test_testcase.rb
View File

@ -265,7 +265,7 @@ module Test
end end
def check(message, passed) def check(message, passed)
@_result.add_assertion instance_variable_get(:@_result/TestCase).add_assertion
if ! passed if ! passed
raise AssertionFailedError.new(message) raise AssertionFailedError.new(message)
end end