numo-narray 0.9.0.4 → 0.9.0.5

data/ext/numo/narray/gen/tmpl_bit/allocate.c

@@ -1,5 +1,5 @@
 static VALUE
-<%=c_func%>(VALUE self)
+<%=c_func(0)%>(VALUE self)
 {
     narray_t *na;
     char *ptr;
@@ -14,10 +14,6 @@ static VALUE
             NA_DATA_PTR(na) = ptr;
         }
         break;
-    //case NARRAY_FILEMAP_T:
-    // to be implemented
-    //    ptr = ((narray_filemap_t*)na)->ptr;
-    //    break;
     case NARRAY_VIEW_T:
         rb_funcall(NA_VIEW_DATA(na), rb_intern("allocate"), 0);
         break;

data/ext/numo/narray/gen/tmpl_bit/aref.c

@@ -37,7 +37,7 @@
        [15, 16, 99, 18, 19]]
  */
 static VALUE
-<%=c_func%>(int argc, VALUE *argv, VALUE self)
+<%=c_func(-1)%>(int argc, VALUE *argv, VALUE self)
 {
     int nd;
     size_t pos;

data/ext/numo/narray/gen/tmpl_bit/aset.c

@@ -38,7 +38,7 @@
 
 */
 static VALUE
-<%=c_func%>(int argc, VALUE *argv, VALUE self)
+<%=c_func(-1)%>(int argc, VALUE *argv, VALUE self)
 {
     int nd;
     size_t pos;
@@ -55,8 +55,8 @@ static VALUE
             a = na_aref_main(argc, argv, self, 0, nd);
             <%=c_func.sub(/_aset/,"_store")%>(a, argv[argc]);
         } else {
+            x = <%=type_name%>_extract_data(argv[argc]);
             ptr = na_get_pointer_for_read_write(self);
-            x = m_num_to_data(argv[argc]);
             STORE_BIT(ptr,pos,x);
         }
 

data/ext/numo/narray/gen/tmpl_bit/binary.c

@@ -17,7 +17,7 @@ static void
         for (; n--;) {
             LOAD_BIT_STEP(a1, p1, s1, idx1, x);
             LOAD_BIT_STEP(a2, p2, s2, idx2, y);
-            x = m_<%=method%>(x,y);
+            x = m_<%=name%>(x,y);
             STORE_BIT_STEP(a3, p3, s3, idx3, x);
         }
     } else {
@@ -40,7 +40,7 @@ static void
             else       y = *a2<<-o2;
             if (p2+len>NB)  y |= *(a2+1)<<r2;
             a2++;
-            x = m_<%=method%>(x,y);
+            x = m_<%=name%>(x,y);
             *a3 = (x & (SLB(len)<<p3)) | (*a3 & ~(SLB(len)<<p3));
             a3++;
             n -= len;
@@ -49,7 +49,7 @@ static void
             for (; n>=NB; n-=NB) {
                 x = *(a1++);
                 y = *(a2++);
-                x = m_<%=method%>(x,y);
+                x = m_<%=name%>(x,y);
                 *(a3++) = x;
             }
         } else {
@@ -62,7 +62,7 @@ static void
                 if (o2<0)  y |= *(a2-1)>>l2;
                 if (o2>0)  y |= *(a2+1)<<r2;
                 a2++;
-                x = m_<%=method%>(x,y);
+                x = m_<%=name%>(x,y);
                 *(a3++) = x;
             }
         }
@@ -71,20 +71,20 @@ static void
             if (o1<0)  x |= *(a1-1)>>l1;
             y = *a2>>o2;
             if (o2<0)  y |= *(a2-1)>>l2;
-            x = m_<%=method%>(x,y);
+            x = m_<%=name%>(x,y);
             *a3 = (x & SLB(n)) | (*a3 & BALL<<n);
         }
     }
 }
 
 /*
-  Binary <%=method%>.
+  Binary <%=name%>.
   @overload <%=op_map%> other
   @param [Numo::NArray,Numeric] other
-  @return [Numo::NArray] <%=method%> of self and other.
+  @return [Numo::NArray] <%=name%> of self and other.
 */
 static VALUE
-<%=c_func%>(VALUE self, VALUE other)
+<%=c_func(1)%>(VALUE self, VALUE other)
 {
     ndfunc_arg_in_t ain[2] = {{cT,0},{cT,0}};
     ndfunc_arg_out_t aout[1] = {{cT,0}};

data/ext/numo/narray/gen/tmpl_bit/bit_count.c

@@ -22,7 +22,7 @@ static void
             for (; i--;) {
                 LOAD_BIT(a1, p1+*idx1, x);
                 idx1++;
-                if (m_<%=method%>(x)) {
+                if (m_<%=name%>(x)) {
                     y++;
                 }
             }
@@ -30,7 +30,7 @@ static void
             for (; i--;) {
                 LOAD_BIT(a1, p1, x);
                 p1 += s1;
-                if (m_<%=method%>(x)) {
+                if (m_<%=name%>(x)) {
                     y++;
                 }
             }
@@ -41,7 +41,7 @@ static void
             for (; i--;) {
                 LOAD_BIT(a1, p1+*idx1, x);
                 idx1++;
-                if (m_<%=method%>(x)) {
+                if (m_<%=name%>(x)) {
                     GET_DATA(p2, int_t, y);
                     y++;
                     SET_DATA(p2, int_t, y);
@@ -52,7 +52,7 @@ static void
             for (; i--;) {
                 LOAD_BIT(a1, p1, x);
                 p1+=s1;
-                if (m_<%=method%>(x)) {
+                if (m_<%=name%>(x)) {
                     GET_DATA(p2, int_t, y);
                     y++;
                     SET_DATA(p2, int_t, y);
@@ -66,19 +66,19 @@ static void
 /*
   Returns the number of bits.
   If argument is supplied, return Int-array counted along the axes.
-  @overload <%=op_map%>([axis,..])
-  @param [Integer] axis  axes to be counted.
+  @overload <%=op_map%>(axis:nil)
+  @param [Integer,Array,Range] axis  axes to be counted.
   @return [Numo::Int64]
 */
 static VALUE
-<%=c_func%>(int argc, VALUE *argv, VALUE self)
+<%=c_func(-1)%>(int argc, VALUE *argv, VALUE self)
 {
     VALUE v, reduce;
     ndfunc_arg_in_t ain[3] = {{cT,0},{sym_reduce,0},{sym_init,0}};
     ndfunc_arg_out_t aout[1] = {{numo_cInt64,0}};
     ndfunc_t ndf = { <%=c_iter%>, FULL_LOOP_NIP, 3, 1, ain, aout };
 
-    reduce = na_reduce_dimension(argc, argv, 1, &self);
+    reduce = na_reduce_dimension(argc, argv, 1, &self, 0);
     v = na_ndloop(&ndf, 3, self, reduce, INT2FIX(0));
     return rb_funcall(v,rb_intern("extract"),0);
 }

data/ext/numo/narray/gen/tmpl_bit/bit_reduce.c

@@ -91,31 +91,31 @@ static void
 }
 
 /*
-<% case method
+<% case name
    when /^any/ %>
   Return true if any of bits is one (true).
 <% when /^all/ %>
   Return true if all of bits are one (true).
 <% end %>
   If argument is supplied, return Bit-array reduced along the axes.
-  @overload <%=op_map%>([axis,..])
-  @param [Integer] axis  axes to be reduced.
+  @overload <%=op_map%>(axis:nil)
+  @param [Integer,Array,Range] axis  axes to be reduced.
   @return [Numo::Bit] .
 */
 static VALUE
-<%=c_func%>(int argc, VALUE *argv, VALUE self)
+<%=c_func(-1)%>(int argc, VALUE *argv, VALUE self)
 {
     VALUE v, reduce;
     ndfunc_arg_in_t ain[3] = {{cT,0},{sym_reduce,0},{sym_init,0}};
     ndfunc_arg_out_t aout[1] = {{numo_cBit,0}};
     ndfunc_t ndf = {<%=c_iter%>, FULL_LOOP_NIP, 3,1, ain,aout};
 
-    reduce = na_reduce_dimension(argc, argv, 1, &self);
+    reduce = na_reduce_dimension(argc, argv, 1, &self, 0);
     v = na_ndloop(&ndf, 3, self, reduce, INT2FIX(<%=init_bit%>));
     if (argc > 0) {
         return v;
     }
-    v = numo_bit_extract(v);
+    v = <%=find_tmpl("extract").c_func%>(v);
     switch (v) {
     case INT2FIX(0):
         return Qfalse;

data/ext/numo/narray/gen/tmpl_bit/each.c

@@ -28,13 +28,13 @@ void
 /*
   Calls the given block once for each element in self,
   passing that element as a parameter.
-  @overload <%=method%>
+  @overload <%=name%>
   @return [Numo::NArray] self
   For a block {|x| ... }
   @yield [x]  x is element of NArray.
 */
 static VALUE
-<%=c_func%>(VALUE self)
+<%=c_func(0)%>(VALUE self)
 {
     ndfunc_arg_in_t ain[1] = {{Qnil,0}};
     ndfunc_t ndf = {<%=c_iter%>, FULL_LOOP_NIP, 1,0, ain,0};

data/ext/numo/narray/gen/tmpl_bit/each_with_index.c

@@ -50,13 +50,13 @@ void
 /*
   Invokes the given block once for each element of self,
   passing that element and indices along each axis as parameters.
-  @overload <%=method%>
+  @overload <%=name%>
   @return [Numo::NArray] self
   For a block {|x,i,j,...| ... }
   @yield [x,i,j,...]  x is an element, i,j,... are multidimensional indices.
 */
 static VALUE
-<%=c_func%>(VALUE self)
+<%=c_func(0)%>(VALUE self)
 {
     ndfunc_arg_in_t ain[1] = {{Qnil,0}};
     ndfunc_t ndf = {<%=c_iter%>, FULL_LOOP_NIP, 1,0, ain,0};

data/ext/numo/narray/gen/tmpl_bit/extract.c

@@ -7,7 +7,7 @@
 */
 
 static VALUE
-numo_bit_extract(VALUE self)
+<%=c_func(0)%>(VALUE self)
 {
     BIT_DIGIT *ptr, val;
     size_t pos;

data/ext/numo/narray/gen/tmpl_bit/fill.c

@@ -50,12 +50,12 @@ static void
 
 /*
   Fill elements with other.
-  @overload <%=method%> other
+  @overload <%=name%> other
   @param [Numeric] other
   @return [Numo::<%=class_name%>] self.
 */
 static VALUE
-<%=c_func%>(VALUE self, VALUE val)
+<%=c_func(1)%>(VALUE self, VALUE val)
 {
     ndfunc_arg_in_t ain[2] = {{OVERWRITE,0},{sym_option}};
     ndfunc_t ndf = {<%=c_iter%>, FULL_LOOP, 2,0, ain,0};

data/ext/numo/narray/gen/tmpl_bit/format.c

@@ -1,5 +1,5 @@
 static VALUE
-format_<%=tp%>(VALUE fmt, dtype x)
+format_<%=type_name%>(VALUE fmt, dtype x)
 {
     if (NIL_P(fmt)) {
         char s[4];
@@ -29,13 +29,13 @@ static void
     if (idx1) {
         for (; i--;) {
             LOAD_BIT(a1, p1+*idx1, x); idx1++;
-            y = format_<%=tp%>(fmt, x);
+            y = format_<%=type_name%>(fmt, x);
             SET_DATA_STRIDE(p2, s2, VALUE, y);
         }
     } else {
         for (; i--;) {
             LOAD_BIT(a1, p1, x); p1+=s1;
-            y = format_<%=tp%>(fmt, x);
+            y = format_<%=type_name%>(fmt, x);
             SET_DATA_STRIDE(p2, s2, VALUE, y);
         }
     }
@@ -43,12 +43,12 @@ static void
 
 /*
   Format elements into strings.
-  @overload <%=method%> format
+  @overload <%=name%> format
   @param [String] format
   @return [Numo::RObject] array of formated strings.
 */
 static VALUE
-<%=c_func%>(int argc, VALUE *argv, VALUE self)
+<%=c_func(-1)%>(int argc, VALUE *argv, VALUE self)
 {
     VALUE fmt=Qnil;
 

data/ext/numo/narray/gen/tmpl_bit/format_to_a.c

@@ -31,12 +31,12 @@ static void
 
 /*
   Format elements into strings.
-  @overload <%=method%> format
+  @overload <%=name%> format
   @param [String] format
   @return [Array] array of formated strings.
 */
 static VALUE
-<%=c_func%>(int argc, VALUE *argv, VALUE self)
+<%=c_func(-1)%>(int argc, VALUE *argv, VALUE self)
 {
     volatile VALUE fmt=Qnil;
     ndfunc_arg_in_t ain[3] = {{Qnil,0},{sym_loop_opt},{sym_option}};

data/ext/numo/narray/gen/tmpl_bit/inspect.c

@@ -3,7 +3,7 @@ static VALUE
 {
     dtype x;
     LOAD_BIT(ptr,pos,x);
-    return format_<%=tp%>(fmt, x);
+    return format_<%=type_name%>(fmt, x);
 }
 
 /*
@@ -12,7 +12,7 @@ static VALUE
   @return [String]
 */
 VALUE
-<%=c_func%>(VALUE ary)
+<%=c_func(0)%>(VALUE ary)
 {
     return na_ndloop_inspect(ary, <%=c_iter%>, Qnil);
 }

data/ext/numo/narray/gen/tmpl_bit/mask.c

@@ -1,5 +1,5 @@
 static void
-iter_bit_pointer(na_loop_t *const lp)
+<%=c_iter%>(na_loop_t *const lp)
 {
     size_t  i;
     BIT_DIGIT *a;
@@ -82,7 +82,7 @@ iter_bit_pointer(na_loop_t *const lp)
   @return [Numo::NArray]  view of masked array.
 */
 static VALUE
- numo_bit_mask(VALUE mask, VALUE val)
+<%=c_func(1)%>(VALUE mask, VALUE val)
 {
     volatile VALUE idx_1, view;
     narray_data_t *nidx;
@@ -93,10 +93,10 @@ static VALUE
     size_t n_1;
     where_opt_t g;
     ndfunc_arg_in_t ain[2] = {{cT,0},{Qnil,0}};
-    ndfunc_t ndf = {iter_bit_pointer, FULL_LOOP, 2, 0, ain, 0};
+    ndfunc_t ndf = {<%=c_iter%>, FULL_LOOP, 2, 0, ain, 0};
 
-    n_1 = NUM2SIZET(numo_bit_count_true(0, NULL, mask));
-    idx_1 = rb_narray_new(cIndex, 1, &n_1);
+    n_1 = NUM2SIZET(<%=find_tmpl("count_true").c_func%>(0, NULL, mask));
+    idx_1 = nary_new(cIndex, 1, &n_1);
     g.count = 0;
     g.elmsz = SIZEOF_VOIDP;
     g.idx1 = na_get_pointer_for_write(idx_1);

data/ext/numo/narray/gen/tmpl_bit/none_p.c

@@ -1,14 +1,14 @@
-VALUE
-numo_bit_none_p(int argc, VALUE *argv, VALUE self)
+static VALUE
+<%=c_func(-1)%>(int argc, VALUE *argv, VALUE self)
 {
     VALUE v;
 
-    v = numo_bit_any_p(argc,argv,self);
+    v = <%=find_tmpl("any?").c_func%>(argc,argv,self);
 
     if (v==Qtrue) {
         return Qfalse;
     } else if (v==Qfalse) {
         return Qtrue;
     }
-    return numo_bit_not(v);
+    return <%=find_tmpl("not").c_func%>(v);
 }

data/ext/numo/narray/gen/tmpl_bit/store_array.c

@@ -20,7 +20,7 @@ static void
 
     if (lp->args[1].ptr) {
         if (v1 == Qtrue) {
-            iter_<%=tp%>_store_<%=tp%>(lp);
+            iter_<%=type_name%>_store_<%=type_name%>(lp);
             i = lp->args[1].shape[0];
             if (idx1) {
                 idx1 += i;
@@ -94,7 +94,7 @@ static void
 }
 
 static VALUE
-<%=c_func%>(VALUE self, VALUE rary)
+<%=c_func(:nodef)%>(VALUE self, VALUE rary)
 {
     ndfunc_arg_in_t ain[2] = {{OVERWRITE,0}, {rb_cArray,0}};
     ndfunc_t ndf = {<%=c_iter%>, FULL_LOOP, 2, 0, ain, 0};

data/ext/numo/narray/gen/tmpl_bit/store_bit.c

@@ -56,7 +56,7 @@ static void
 }
 
 static VALUE
-<%=c_func%>(VALUE self, VALUE obj)
+<%=c_func(:nodef)%>(VALUE self, VALUE obj)
 {
     ndfunc_arg_in_t ain[2] = {{OVERWRITE,0},{Qnil,0}};
     ndfunc_t ndf = {<%=c_iter%>, FULL_LOOP, 2,0, ain,0};

data/ext/numo/narray/gen/tmpl_bit/store_from.c

@@ -46,7 +46,7 @@ static void
 
 
 static VALUE
-<%=c_func%>(VALUE self, VALUE obj)
+<%=c_func(:nodef)%>(VALUE self, VALUE obj)
 {
     ndfunc_arg_in_t ain[2] = {{OVERWRITE,0},{Qnil,0}};
     ndfunc_t ndf = {<%=c_iter%>, FULL_LOOP, 2,0, ain,0};

data/ext/numo/narray/gen/tmpl_bit/to_a.c

@@ -30,11 +30,11 @@ void
 
 /*
   Convert self to Array.
-  @overload <%=method%>
+  @overload <%=name%>
   @return [Array]
 */
 static VALUE
-<%=c_func%>(VALUE self)
+<%=c_func(0)%>(VALUE self)
 {
     ndfunc_arg_in_t ain[3] = {{Qnil,0},{sym_loop_opt},{sym_option}};
     ndfunc_arg_out_t aout[1] = {{rb_cArray,0}}; // dummy?

data/ext/numo/narray/gen/tmpl_bit/unary.c

@@ -16,7 +16,7 @@ static void
     if (s1!=1 || s3!=1 || idx1 || idx3) {
         for (; n--;) {
             LOAD_BIT_STEP(a1, p1, s1, idx1, x);
-            y = m_<%=method%>(x);
+            y = m_<%=name%>(x);
             STORE_BIT_STEP(a3, p3, s3, idx3, y);
         }
     } else {
@@ -31,7 +31,7 @@ static void
             else       x = *a1<<-o1;
             if (p1+len>NB)  x |= *(a1+1)<<r1;
             a1++;
-            y = m_<%=method%>(x);
+            y = m_<%=name%>(x);
             *a3 = (y & (SLB(len)<<p3)) | (*a3 & ~(SLB(len)<<p3));
             a3++;
             n -= len;
@@ -39,7 +39,7 @@ static void
         if (o1==0) {
             for (; n>=NB; n-=NB) {
                 x = *(a1++);
-                y = m_<%=method%>(x);
+                y = m_<%=name%>(x);
                 *(a3++) = y;
             }
         } else {
@@ -48,26 +48,26 @@ static void
                 if (o1<0)  x |= *(a1-1)>>l1;
                 if (o1>0)  x |= *(a1+1)<<r1;
                 a1++;
-                y = m_<%=method%>(x);
+                y = m_<%=name%>(x);
                 *(a3++) = y;
             }
         }
         if (n>0) {
             x = *a1>>o1;
             if (o1<0)  x |= *(a1-1)>>l1;
-            y = m_<%=method%>(x);
+            y = m_<%=name%>(x);
             *a3 = (y & SLB(n)) | (*a3 & BALL<<n);
         }
     }
 }
 
 /*
-  Unary <%=method%>.
-  @overload <%=method%>
-  @return [Numo::<%=class_name%>] <%=method%> of self.
+  Unary <%=name%>.
+  @overload <%=name%>
+  @return [Numo::<%=class_name%>] <%=name%> of self.
 */
 static VALUE
-<%=c_func%>(VALUE self)
+<%=c_func(0)%>(VALUE self)
 {
     ndfunc_arg_in_t ain[1] = {{cT,0}};
     ndfunc_arg_out_t aout[1] = {{cT,0}};