change in internal structure of Ruby 1.9 Range object.

masa · masa · commit 7aaf0d9693be · 2008-01-28T03:54:45.000Z
git-svn-id: svn+ssh://ion/home/svn/ruby/narray05/trunk@74 09a2cad2-7366-4d26-ab3d-61f00787735e
diff --git a/ChangeLog b/ChangeLog
@@ -1,8 +1,19 @@
+2008-01-28  Masahiro TANAKA  <masa16.tanaka at gmail.com>
+
+	* na_array.c (na_range_to_sequence, na_do_mdai): 
+	* na_index.c (na_index_range): 
+	  change in internal structure of Ruby 1.9 Range object.
+	  Thanks to Hargobind Khalsa.
+
+	* ver 0.5.9p4
+
 2007-12-27  Masahiro TANAKA  <masa16.tanaka at gmail.com>
 
 	* narray_local.h, narray.c, na_array.c: 
 	  use RSTRING_PTR, RSTRING_LEN for Ruby 1.9.0.
 
+	* ver 0.5.9p3
+
 2007-12-11  Masahiro TANAKA  <masah16.tanaka at gmail.com>
 
 	* mkop.rb:
diff --git a/na_array.c b/na_array.c
@@ -122,8 +122,8 @@ static void
 {
   int end,len;
 
-  *beg = NUM2INT(rb_ivar_get(obj, na_id_beg));
-  end = NUM2INT(rb_ivar_get(obj, na_id_end));
+  *beg = NUM2INT(rb_funcall(obj, na_id_beg, 0));
+  end = NUM2INT(rb_funcall(obj, na_id_end, 0));
   len = end - *beg;
 
   /* direction */
@@ -179,8 +179,8 @@ static int
     if ( rb_obj_is_kind_of(v, rb_cRange) ) {
       na_range_to_sequence(v,&length,&start,&dir);
       len += length-1;
-      mdai->type[ na_object_type(rb_ivar_get(v, na_id_beg)) ] = 1;
-      mdai->type[ na_object_type(rb_ivar_get(v, na_id_end)) ] = 1;
+      mdai->type[ na_object_type(rb_funcall(v, na_id_beg, 0)) ] = 1;
+      mdai->type[ na_object_type(rb_funcall(v, na_id_end, 0)) ] = 1;
     }
     else {
 
diff --git a/na_index.c b/na_index.c
@@ -23,15 +23,15 @@ static int
   sl->idx  = NULL;
 
   /* Beginning */
-  vbeg = rb_ivar_get(obj, na_id_beg);
+  vbeg = rb_funcall(obj, na_id_beg, 0);
   if (vbeg==Qnil) /* First is nil */
     beg = 0;
   else
     beg = NUM2INT(vbeg);
   if (beg<0) beg += size;
 
   /* End */
-  vend = rb_ivar_get(obj, na_id_end);
+  vend = rb_funcall(obj, na_id_end, 0);
   if (vend==Qnil) { /* Last is nil */
     sl->beg  = beg;
     sl->step = 1;
diff --git a/narray.h b/narray.h
@@ -19,8 +19,8 @@
 # include <sys/types.h>
 #endif
 
-#define NARRAY_VERSION "0.5.9p3"
-#define NARRAY_VERSION_CODE 593
+#define NARRAY_VERSION "0.5.9p4"
+#define NARRAY_VERSION_CODE 594
 
 /*
   Data types used in NArray :
