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

changed the spec of CPtr#[]/[]= to suit String#[]/[]=.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8123 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ttate 2005-03-08 11:31:20 +00:00
parent 215cd35df9
commit 6080121d55
2 changed files with 37 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
ext/dl/cptr.c
View file

@ -346,35 +346,38 @@ VALUE
rb_dlptr_aref(int argc, VALUE argv[], VALUE self) rb_dlptr_aref(int argc, VALUE argv[], VALUE self)
{ {
VALUE arg0, arg1; VALUE arg0, arg1;
VALUE retval = Qnil;
size_t offset, len; size_t offset, len;
switch( rb_scan_args(argc, argv, "11", &arg0, &arg1) ){ switch( rb_scan_args(argc, argv, "11", &arg0, &arg1) ){
case 1: case 1:
offset = NUM2ULONG(arg0); offset = NUM2ULONG(arg0);
len = 1; retval = INT2NUM(*((char*)RPTR_DATA(self)->ptr + offset));
break; break;
case 2: case 2:
offset = NUM2ULONG(arg0); offset = NUM2ULONG(arg0);
len = NUM2ULONG(arg1); len = NUM2ULONG(arg1);
retval = rb_tainted_str_new((char *)RPTR_DATA(self)->ptr + offset, len);
break; break;
defualt: defualt:
rb_bug("rb_dlptr_aset()"); rb_bug("rb_dlptr_aref()");
} }
return rb_tainted_str_new((char *)RPTR_DATA(self)->ptr + offset, len); return retval;
} }
VALUE VALUE
rb_dlptr_aset(int argc, VALUE argv[], VALUE self) rb_dlptr_aset(int argc, VALUE argv[], VALUE self)
{ {
VALUE arg0, arg1, arg2; VALUE arg0, arg1, arg2;
VALUE retval = Qnil;
size_t offset, len; size_t offset, len;
void *mem; void *mem;
switch( rb_scan_args(argc, argv, "21", &arg0, &arg1, &arg2) ){ switch( rb_scan_args(argc, argv, "21", &arg0, &arg1, &arg2) ){
case 2: case 2:
offset = NUM2ULONG(arg0); offset = NUM2ULONG(arg0);
len = 1; ((char*)RPTR_DATA(self)->ptr)[offset] = NUM2UINT(arg1);
mem = NUM2PTR(arg1); retval = arg1;
break; break;
case 3: case 3:
offset = NUM2ULONG(arg0); offset = NUM2ULONG(arg0);
@ -388,12 +391,13 @@ rb_dlptr_aset(int argc, VALUE argv[], VALUE self)
else{ else{
mem = NUM2PTR(arg2); mem = NUM2PTR(arg2);
} }
memcpy((char *)RPTR_DATA(self)->ptr + offset, mem, len);
retval = arg2;
break; break;
defualt: defualt:
rb_bug("rb_dlptr_aset()"); rb_bug("rb_dlptr_aset()");
} }
memcpy((char *)RPTR_DATA(self)->ptr + offset, mem, len); return retval;
return Qnil;
} }
VALUE VALUE
@ -424,6 +428,10 @@ rb_dlptr_s_to_ptr(VALUE self, VALUE val)
#endif #endif
return rb_dlptr_new(fp, sizeof(FILE), NULL); return rb_dlptr_new(fp, sizeof(FILE), NULL);
} }
else if( rb_obj_is_kind_of(val, rb_cString) == Qtrue ){
char *ptr = StringValuePtr(val);
return rb_dlptr_new(ptr, RSTRING(val)->len, NULL);
}
else if( rb_respond_to(val, id_to_ptr) ){ else if( rb_respond_to(val, id_to_ptr) ){
VALUE vptr = rb_funcall(val, id_to_ptr, 0); VALUE vptr = rb_funcall(val, id_to_ptr, 0);
if( rb_obj_is_kind_of(vptr, rb_cDLCPtr) ){ if( rb_obj_is_kind_of(vptr, rb_cDLCPtr) ){

22
ext/dl/test/test_dl2.rb
View file

@ -85,5 +85,27 @@ class TestDL < TestBase
ary2 = dlunwrap(addr) ary2 = dlunwrap(addr)
assert_equal(ary, ary2) assert_equal(ary, ary2)
end end
def test_cptr()
check = Proc.new{|str,ptr|
assert_equal(str.size(), ptr.size())
assert_equal(str, ptr.to_s())
assert_equal(str[0,2], ptr.to_s(2))
assert_equal(str[0,2], ptr[0,2])
assert_equal(str[1,2], ptr[1,2])
assert_equal(str[1,0], ptr[1,0])
assert_equal(str[0], ptr[0])
assert_equal(str[1], ptr[1])
}
str = 'abc'
ptr = CPtr[str]
check.call(str, ptr)
str[0] = ?c
ptr[0] = ?c
check.call(str, ptr)
str[0,2] = "aa"
ptr[0,2] = "aa"
check.call(str, ptr)
end
end end
end # module DL end # module DL