ext/numo/narray/gen/tmpl_bit/binary.c in numo-narray-0.9.0.4 vs ext/numo/narray/gen/tmpl_bit/binary.c in numo-narray-0.9.0.5
- old
+ new
@@ -15,11 +15,11 @@
INIT_PTR_BIT_IDX(lp, 2, a3, p3, s3, idx3);
if (s1!=1 || s2!=1 || s3!=1 || idx1 || idx2 || idx3) {
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 {
o1 = p1 % NB;
o1 -= p3;
@@ -38,20 +38,20 @@
a1++;
if (o2>=0) y = *a2>>o2;
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;
}
if (o1==0 && o2==0) {
for (; n>=NB; n-=NB) {
x = *(a1++);
y = *(a2++);
- x = m_<%=method%>(x,y);
+ x = m_<%=name%>(x,y);
*(a3++) = x;
}
} else {
for (; n>=NB; n-=NB) {
x = *a1>>o1;
@@ -60,32 +60,32 @@
a1++;
y = *a2>>o2;
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;
}
}
if (n>0) {
x = *a1>>o1;
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}};
ndfunc_t ndf = { <%=c_iter%>, FULL_LOOP, 2, 1, ain, aout };