ruby-dcl 1.7.1 → 1.8.2

data/ext/numru/math1_vrblib.c

@@ -1,10 +1,9 @@
 /*
- * $Id: p_header,v 1.3 2015/03/18 03:27:42 horinout Exp $
+ * $Id$
  */
 
 #include <stdio.h>
 #include "ruby.h"
-#include "libtinyf2c.h"
 #include "narray.h"
 #include "cdcl.h"
 
@@ -15,6 +14,10 @@
 
 #define DFLT_SIZE 32
 
+#ifndef NARRAY_BIGMEM
+typedef int    na_shape_t;
+#endif
+
 extern char    *dcl_obj2ccharary(VALUE, int, int);
 extern integer *dcl_obj2cintegerary(VALUE);
 extern real    *dcl_obj2crealary(VALUE);
@@ -22,10 +25,10 @@ extern complex *dcl_obj2ccomplexary(VALUE);
 extern logical *dcl_obj2clogicalary(VALUE);
 
 extern VALUE dcl_ccharary2obj(char *, int, int);
-extern VALUE dcl_cintegerary2obj(integer *, int, int, int *);
-extern VALUE dcl_crealary2obj(real *, int, int, int *);
-extern VALUE dcl_ccomplexary2obj(complex *, int, char *);
-extern VALUE dcl_clogicalary2obj(logical *, int, int, int *);
+extern VALUE dcl_cintegerary2obj(integer *, na_shape_t, int, na_shape_t *);
+extern VALUE dcl_crealary2obj(real *, na_shape_t, int, na_shape_t *);
+/* extern VALUE dcl_ccomplexary2obj(complex *, int, char *); */
+extern VALUE dcl_clogicalary2obj(logical *, na_shape_t, int, na_shape_t *);
 
 extern void dcl_freeccharary(char *);
 extern void dcl_freecintegerary(integer *);
@@ -116,7 +119,7 @@ dcl_vrfnb(obj, rx, ry, n, jx, jy, jz, rfnb)
 
     o_rz= ALLOCA_N(real, i_jz*(i_n-1)+1);
 
-    vrfnb_(i_rx, i_ry, o_rz, &i_n, &i_jx, &i_jy, &i_jz, &i_rfnb);
+    vrfnb__(i_rx, i_ry, o_rz, &i_n, &i_jx, &i_jy, &i_jz, &i_rfnb);
 
     {int array_shape[1] = {i_jz*(i_n-1)+1};
      rz = dcl_crealary2obj(o_rz, i_jz*(i_n-1)+1, 1, array_shape);
@@ -183,7 +186,7 @@ dcl_vrfnb0(obj, rx, ry, n, jx, jy, jz, rfnb)
 
     o_rz= ALLOCA_N(real, i_jz*(i_n-1)+1);
 
-    vrfnb0_(i_rx, i_ry, o_rz, &i_n, &i_jx, &i_jy, &i_jz, &i_rfnb);
+    vrfnb0__(i_rx, i_ry, o_rz, &i_n, &i_jx, &i_jy, &i_jz, &i_rfnb);
 
     {int array_shape[1] = {i_jz*(i_n-1)+1};
      rz = dcl_crealary2obj(o_rz, i_jz*(i_n-1)+1, 1, array_shape);
@@ -250,7 +253,7 @@ dcl_vrfnb1(obj, rx, ry, n, jx, jy, jz, rfnb)
 
     o_rz= ALLOCA_N(real, i_jz*(i_n-1)+1);
 
-    vrfnb1_(i_rx, i_ry, o_rz, &i_n, &i_jx, &i_jy, &i_jz, &i_rfnb);
+    vrfnb1__(i_rx, i_ry, o_rz, &i_n, &i_jx, &i_jy, &i_jz, &i_rfnb);
 
     {int array_shape[1] = {i_jz*(i_n-1)+1};
      rz = dcl_crealary2obj(o_rz, i_jz*(i_n-1)+1, 1, array_shape);
@@ -312,7 +315,7 @@ dcl_vradd(obj, rx, ry, n, jx, jy, jz)
 
     o_rz= ALLOCA_N(real, i_jz*(i_n-1)+1);
 
-    vradd_(i_rx, i_ry, o_rz, &i_n, &i_jx, &i_jy, &i_jz);
+    vradd__(i_rx, i_ry, o_rz, &i_n, &i_jx, &i_jy, &i_jz);
 
     {int array_shape[1] = {i_jz*(i_n-1)+1};
      rz = dcl_crealary2obj(o_rz, i_jz*(i_n-1)+1, 1, array_shape);
@@ -374,7 +377,7 @@ dcl_vradd0(obj, rx, ry, n, jx, jy, jz)
 
     o_rz= ALLOCA_N(real, i_jz*(i_n-1)+1);
 
-    vradd0_(i_rx, i_ry, o_rz, &i_n, &i_jx, &i_jy, &i_jz);
+    vradd0__(i_rx, i_ry, o_rz, &i_n, &i_jx, &i_jy, &i_jz);
 
     {int array_shape[1] = {i_jz*(i_n-1)+1};
      rz = dcl_crealary2obj(o_rz, i_jz*(i_n-1)+1, 1, array_shape);
@@ -436,7 +439,7 @@ dcl_vradd1(obj, rx, ry, n, jx, jy, jz)
 
     o_rz= ALLOCA_N(real, i_jz*(i_n-1)+1);
 
-    vradd1_(i_rx, i_ry, o_rz, &i_n, &i_jx, &i_jy, &i_jz);
+    vradd1__(i_rx, i_ry, o_rz, &i_n, &i_jx, &i_jy, &i_jz);
 
     {int array_shape[1] = {i_jz*(i_n-1)+1};
      rz = dcl_crealary2obj(o_rz, i_jz*(i_n-1)+1, 1, array_shape);
@@ -498,7 +501,7 @@ dcl_vrsub(obj, rx, ry, n, jx, jy, jz)
 
     o_rz= ALLOCA_N(real, i_jz*(i_n-1)+1);
 
-    vrsub_(i_rx, i_ry, o_rz, &i_n, &i_jx, &i_jy, &i_jz);
+    vrsub__(i_rx, i_ry, o_rz, &i_n, &i_jx, &i_jy, &i_jz);
 
     {int array_shape[1] = {i_jz*(i_n-1)+1};
      rz = dcl_crealary2obj(o_rz, i_jz*(i_n-1)+1, 1, array_shape);
@@ -560,7 +563,7 @@ dcl_vrsub0(obj, rx, ry, n, jx, jy, jz)
 
     o_rz= ALLOCA_N(real, i_jz*(i_n-1)+1);
 
-    vrsub0_(i_rx, i_ry, o_rz, &i_n, &i_jx, &i_jy, &i_jz);
+    vrsub0__(i_rx, i_ry, o_rz, &i_n, &i_jx, &i_jy, &i_jz);
 
     {int array_shape[1] = {i_jz*(i_n-1)+1};
      rz = dcl_crealary2obj(o_rz, i_jz*(i_n-1)+1, 1, array_shape);
@@ -622,7 +625,7 @@ dcl_vrsub1(obj, rx, ry, n, jx, jy, jz)
 
     o_rz= ALLOCA_N(real, i_jz*(i_n-1)+1);
 
-    vrsub1_(i_rx, i_ry, o_rz, &i_n, &i_jx, &i_jy, &i_jz);
+    vrsub1__(i_rx, i_ry, o_rz, &i_n, &i_jx, &i_jy, &i_jz);
 
     {int array_shape[1] = {i_jz*(i_n-1)+1};
      rz = dcl_crealary2obj(o_rz, i_jz*(i_n-1)+1, 1, array_shape);
@@ -684,7 +687,7 @@ dcl_vrmlt(obj, rx, ry, n, jx, jy, jz)
 
     o_rz= ALLOCA_N(real, i_jz*(i_n-1)+1);
 
-    vrmlt_(i_rx, i_ry, o_rz, &i_n, &i_jx, &i_jy, &i_jz);
+    vrmlt__(i_rx, i_ry, o_rz, &i_n, &i_jx, &i_jy, &i_jz);
 
     {int array_shape[1] = {i_jz*(i_n-1)+1};
      rz = dcl_crealary2obj(o_rz, i_jz*(i_n-1)+1, 1, array_shape);
@@ -746,7 +749,7 @@ dcl_vrmlt0(obj, rx, ry, n, jx, jy, jz)
 
     o_rz= ALLOCA_N(real, i_jz*(i_n-1)+1);
 
-    vrmlt0_(i_rx, i_ry, o_rz, &i_n, &i_jx, &i_jy, &i_jz);
+    vrmlt0__(i_rx, i_ry, o_rz, &i_n, &i_jx, &i_jy, &i_jz);
 
     {int array_shape[1] = {i_jz*(i_n-1)+1};
      rz = dcl_crealary2obj(o_rz, i_jz*(i_n-1)+1, 1, array_shape);
@@ -808,7 +811,7 @@ dcl_vrmlt1(obj, rx, ry, n, jx, jy, jz)
 
     o_rz= ALLOCA_N(real, i_jz*(i_n-1)+1);
 
-    vrmlt1_(i_rx, i_ry, o_rz, &i_n, &i_jx, &i_jy, &i_jz);
+    vrmlt1__(i_rx, i_ry, o_rz, &i_n, &i_jx, &i_jy, &i_jz);
 
     {int array_shape[1] = {i_jz*(i_n-1)+1};
      rz = dcl_crealary2obj(o_rz, i_jz*(i_n-1)+1, 1, array_shape);
@@ -870,7 +873,7 @@ dcl_vrdiv(obj, rx, ry, n, jx, jy, jz)
 
     o_rz= ALLOCA_N(real, i_jz*(i_n-1)+1);
 
-    vrdiv_(i_rx, i_ry, o_rz, &i_n, &i_jx, &i_jy, &i_jz);
+    vrdiv__(i_rx, i_ry, o_rz, &i_n, &i_jx, &i_jy, &i_jz);
 
     {int array_shape[1] = {i_jz*(i_n-1)+1};
      rz = dcl_crealary2obj(o_rz, i_jz*(i_n-1)+1, 1, array_shape);
@@ -932,7 +935,7 @@ dcl_vrdiv0(obj, rx, ry, n, jx, jy, jz)
 
     o_rz= ALLOCA_N(real, i_jz*(i_n-1)+1);
 
-    vrdiv0_(i_rx, i_ry, o_rz, &i_n, &i_jx, &i_jy, &i_jz);
+    vrdiv0__(i_rx, i_ry, o_rz, &i_n, &i_jx, &i_jy, &i_jz);
 
     {int array_shape[1] = {i_jz*(i_n-1)+1};
      rz = dcl_crealary2obj(o_rz, i_jz*(i_n-1)+1, 1, array_shape);
@@ -994,7 +997,7 @@ dcl_vrdiv1(obj, rx, ry, n, jx, jy, jz)
 
     o_rz= ALLOCA_N(real, i_jz*(i_n-1)+1);
 
-    vrdiv1_(i_rx, i_ry, o_rz, &i_n, &i_jx, &i_jy, &i_jz);
+    vrdiv1__(i_rx, i_ry, o_rz, &i_n, &i_jx, &i_jy, &i_jz);
 
     {int array_shape[1] = {i_jz*(i_n-1)+1};
      rz = dcl_crealary2obj(o_rz, i_jz*(i_n-1)+1, 1, array_shape);

data/ext/numru/math1_xfclib.c

@@ -1,10 +1,9 @@
 /*
- * $Id: p_header,v 1.3 2015/03/18 03:27:42 horinout Exp $
+ * $Id$
  */
 
 #include <stdio.h>
 #include "ruby.h"
-#include "libtinyf2c.h"
 #include "narray.h"
 #include "cdcl.h"
 
@@ -15,6 +14,10 @@
 
 #define DFLT_SIZE 32
 
+#ifndef NARRAY_BIGMEM
+typedef int    na_shape_t;
+#endif
+
 extern char    *dcl_obj2ccharary(VALUE, int, int);
 extern integer *dcl_obj2cintegerary(VALUE);
 extern real    *dcl_obj2crealary(VALUE);
@@ -22,10 +25,10 @@ extern complex *dcl_obj2ccomplexary(VALUE);
 extern logical *dcl_obj2clogicalary(VALUE);
 
 extern VALUE dcl_ccharary2obj(char *, int, int);
-extern VALUE dcl_cintegerary2obj(integer *, int, int, int *);
-extern VALUE dcl_crealary2obj(real *, int, int, int *);
-extern VALUE dcl_ccomplexary2obj(complex *, int, char *);
-extern VALUE dcl_clogicalary2obj(logical *, int, int, int *);
+extern VALUE dcl_cintegerary2obj(integer *, na_shape_t, int, na_shape_t *);
+extern VALUE dcl_crealary2obj(real *, na_shape_t, int, na_shape_t *);
+/* extern VALUE dcl_ccomplexary2obj(complex *, int, char *); */
+extern VALUE dcl_clogicalary2obj(logical *, na_shape_t, int, na_shape_t *);
 
 extern void dcl_freeccharary(char *);
 extern void dcl_freecintegerary(integer *);
@@ -77,7 +80,7 @@ dcl_ifromc(obj, cx)
     i_cx = StringValuePtr(cx);
 
 
-    o_rtn_val = ifromc_(i_cx, (ftnlen)strlen(i_cx));
+    o_rtn_val = ifromc__(i_cx, (ftnlen)strlen(i_cx));
 
     rtn_val = INT2NUM(o_rtn_val);
 
@@ -101,7 +104,7 @@ dcl_lfromc(obj, cx)
     i_cx = StringValuePtr(cx);
 
 
-    o_rtn_val = lfromc_(i_cx, (ftnlen)strlen(i_cx));
+    o_rtn_val = lfromc__(i_cx, (ftnlen)strlen(i_cx));
 
     rtn_val = (o_rtn_val == FALSE_) ? Qfalse : Qtrue;
 
@@ -125,7 +128,7 @@ dcl_rfromc(obj, cx)
     i_cx = StringValuePtr(cx);
 
 
-    o_rtn_val = rfromc_(i_cx, (ftnlen)strlen(i_cx));
+    o_rtn_val = rfromc__(i_cx, (ftnlen)strlen(i_cx));
 
     rtn_val = rb_float_new((double)o_rtn_val);
 

data/ext/numru/math2_fftlib.c

@@ -1,10 +1,9 @@
 /*
- * $Id: p_header,v 1.3 2015/03/18 03:27:42 horinout Exp $
+ * $Id$
  */
 
 #include <stdio.h>
 #include "ruby.h"
-#include "libtinyf2c.h"
 #include "narray.h"
 #include "cdcl.h"
 
@@ -15,6 +14,10 @@
 
 #define DFLT_SIZE 32
 
+#ifndef NARRAY_BIGMEM
+typedef int    na_shape_t;
+#endif
+
 extern char    *dcl_obj2ccharary(VALUE, int, int);
 extern integer *dcl_obj2cintegerary(VALUE);
 extern real    *dcl_obj2crealary(VALUE);
@@ -22,10 +25,10 @@ extern complex *dcl_obj2ccomplexary(VALUE);
 extern logical *dcl_obj2clogicalary(VALUE);
 
 extern VALUE dcl_ccharary2obj(char *, int, int);
-extern VALUE dcl_cintegerary2obj(integer *, int, int, int *);
-extern VALUE dcl_crealary2obj(real *, int, int, int *);
-extern VALUE dcl_ccomplexary2obj(complex *, int, char *);
-extern VALUE dcl_clogicalary2obj(logical *, int, int, int *);
+extern VALUE dcl_cintegerary2obj(integer *, na_shape_t, int, na_shape_t *);
+extern VALUE dcl_crealary2obj(real *, na_shape_t, int, na_shape_t *);
+/* extern VALUE dcl_ccomplexary2obj(complex *, int, char *); */
+extern VALUE dcl_clogicalary2obj(logical *, na_shape_t, int, na_shape_t *);
 
 extern void dcl_freeccharary(char *);
 extern void dcl_freecintegerary(integer *);
@@ -93,7 +96,7 @@ dcl_cfftb(obj, n, c, wsave)
     i_wsave = dcl_obj2crealary(wsave);
 
 
-    cfftb_(&i_n, io_c, i_wsave);
+    cfftb__(&i_n, io_c, i_wsave);
 
     {int array_shape[1] = {2*i_n};
      c = dcl_crealary2obj(io_c, (2*i_n), 1, array_shape);
@@ -137,7 +140,7 @@ dcl_cfftf(obj, n, c, wsave)
     i_wsave = dcl_obj2crealary(wsave);
 
 
-    cfftf_(&i_n, io_c, i_wsave);
+    cfftf__(&i_n, io_c, i_wsave);
 
     {int array_shape[1] = {2*i_n};
      c = dcl_crealary2obj(io_c, (2*i_n), 1, array_shape);
@@ -166,7 +169,7 @@ dcl_cffti(obj, n)
 
     o_wsave= ALLOCA_N(real, (4*i_n+15));
 
-    cffti_(&i_n, o_wsave);
+    cffti__(&i_n, o_wsave);
 
     {int array_shape[1] = {4*i_n+15};
      wsave = dcl_crealary2obj(o_wsave, (4*i_n+15), 1, array_shape);
@@ -208,7 +211,7 @@ dcl_cosqb(obj, n, x, wsave)
     i_wsave = dcl_obj2crealary(wsave);
 
 
-    cosqb_(&i_n, io_x, i_wsave);
+    cosqb__(&i_n, io_x, i_wsave);
 
     {int array_shape[1] = {i_n};
      x = dcl_crealary2obj(io_x, (i_n), 1, array_shape);
@@ -252,7 +255,7 @@ dcl_cosqf(obj, n, x, wsave)
     i_wsave = dcl_obj2crealary(wsave);
 
 
-    cosqf_(&i_n, io_x, i_wsave);
+    cosqf__(&i_n, io_x, i_wsave);
 
     {int array_shape[1] = {i_n};
      x = dcl_crealary2obj(io_x, (i_n), 1, array_shape);
@@ -281,7 +284,7 @@ dcl_cosqi(obj, n)
 
     o_wsave= ALLOCA_N(real, (3*i_n+15));
 
-    cosqi_(&i_n, o_wsave);
+    cosqi__(&i_n, o_wsave);
 
     {int array_shape[1] = {3*i_n+15};
      wsave = dcl_crealary2obj(o_wsave, (3*i_n+15), 1, array_shape);
@@ -323,7 +326,7 @@ dcl_cost(obj, n, x, wsave)
     i_wsave = dcl_obj2crealary(wsave);
 
 
-    cost_(&i_n, io_x, i_wsave);
+    cost__(&i_n, io_x, i_wsave);
 
     {int array_shape[1] = {i_n};
      x = dcl_crealary2obj(io_x, (i_n), 1, array_shape);
@@ -352,7 +355,7 @@ dcl_costi(obj, n)
 
     o_wsave= ALLOCA_N(real, (3*i_n+15));
 
-    costi_(&i_n, o_wsave);
+    costi__(&i_n, o_wsave);
 
     {int array_shape[1] = {3*i_n+15};
      wsave = dcl_crealary2obj(o_wsave, (3*i_n+15), 1, array_shape);
@@ -411,7 +414,7 @@ dcl_ezfftb(obj, n, azero, a, b, wsave)
 
     o_r= ALLOCA_N(real, (i_n));
 
-    ezfftb_(&i_n, o_r, &i_azero, i_a, i_b, i_wsave);
+    ezfftb__(&i_n, o_r, &i_azero, i_a, i_b, i_wsave);
 
     {int array_shape[1] = {i_n};
      r = dcl_crealary2obj(o_r, (i_n), 1, array_shape);
@@ -464,7 +467,7 @@ dcl_ezfftf(obj, n, r, wsave)
     o_a= ALLOCA_N(real, (i_n/2));
     o_b= ALLOCA_N(real, (i_n/2));
 
-    ezfftf_(&i_n, i_r, &o_azero, o_a, o_b, i_wsave);
+    ezfftf__(&i_n, i_r, &o_azero, o_a, o_b, i_wsave);
 
     azero = rb_float_new((double)o_azero);
     {int array_shape[1] = {i_n/2};
@@ -497,7 +500,7 @@ dcl_ezffti(obj, n)
 
     o_wsave= ALLOCA_N(real, (3*i_n+15));
 
-    ezffti_(&i_n, o_wsave);
+    ezffti__(&i_n, o_wsave);
 
     {int array_shape[1] = {3*i_n+15};
      wsave = dcl_crealary2obj(o_wsave, (3*i_n+15), 1, array_shape);
@@ -539,7 +542,7 @@ dcl_rfftb(obj, n, r, wsave)
     i_wsave = dcl_obj2crealary(wsave);
 
 
-    rfftb_(&i_n, io_r, i_wsave);
+    rfftb__(&i_n, io_r, i_wsave);
 
     {int array_shape[1] = {i_n};
      r = dcl_crealary2obj(io_r, (i_n), 1, array_shape);
@@ -583,7 +586,7 @@ dcl_rfftf(obj, n, r, wsave)
     i_wsave = dcl_obj2crealary(wsave);
 
 
-    rfftf_(&i_n, io_r, i_wsave);
+    rfftf__(&i_n, io_r, i_wsave);
 
     {int array_shape[1] = {i_n};
      r = dcl_crealary2obj(io_r, (i_n), 1, array_shape);
@@ -612,7 +615,7 @@ dcl_rffti(obj, n)
 
     o_wsave= ALLOCA_N(real, (2*i_n+15));
 
-    rffti_(&i_n, o_wsave);
+    rffti__(&i_n, o_wsave);
 
     {int array_shape[1] = {2*i_n+15};
      wsave = dcl_crealary2obj(o_wsave, (2*i_n+15), 1, array_shape);
@@ -654,7 +657,7 @@ dcl_sinqb(obj, n, x, wsave)
     i_wsave = dcl_obj2crealary(wsave);
 
 
-    sinqb_(&i_n, io_x, i_wsave);
+    sinqb__(&i_n, io_x, i_wsave);
 
     {int array_shape[1] = {i_n};
      x = dcl_crealary2obj(io_x, (i_n), 1, array_shape);
@@ -698,7 +701,7 @@ dcl_sinqf(obj, n, x, wsave)
     i_wsave = dcl_obj2crealary(wsave);
 
 
-    sinqf_(&i_n, io_x, i_wsave);
+    sinqf__(&i_n, io_x, i_wsave);
 
     {int array_shape[1] = {i_n};
      x = dcl_crealary2obj(io_x, (i_n), 1, array_shape);
@@ -727,7 +730,7 @@ dcl_sinqi(obj, n)
 
     o_wsave= ALLOCA_N(real, (3*i_n+15));
 
-    sinqi_(&i_n, o_wsave);
+    sinqi__(&i_n, o_wsave);
 
     {int array_shape[1] = {3*i_n+15};
      wsave = dcl_crealary2obj(o_wsave, (3*i_n+15), 1, array_shape);
@@ -769,7 +772,7 @@ dcl_sint(obj, n, x, wsave)
     i_wsave = dcl_obj2crealary(wsave);
 
 
-    sint_(&i_n, io_x, i_wsave);
+    sint__(&i_n, io_x, i_wsave);
 
     {int array_shape[1] = {i_n};
      x = dcl_crealary2obj(io_x, (i_n), 1, array_shape);
@@ -798,7 +801,7 @@ dcl_sinti(obj, n)
 
     o_wsave= ALLOCA_N(real, (2*i_n+i_n/2+15));
 
-    sinti_(&i_n, o_wsave);
+    sinti__(&i_n, o_wsave);
 
     {int array_shape[1] = {2*i_n+i_n/2+15};
      wsave = dcl_crealary2obj(o_wsave, (2*i_n+i_n/2+15), 1, array_shape);

data/ext/numru/math2_intrlib.c

@@ -1,10 +1,9 @@
 /*
- * $Id: p_header,v 1.3 2015/03/18 03:27:42 horinout Exp $
+ * $Id$
  */
 
 #include <stdio.h>
 #include "ruby.h"
-#include "libtinyf2c.h"
 #include "narray.h"
 #include "cdcl.h"
 
@@ -15,6 +14,10 @@
 
 #define DFLT_SIZE 32
 
+#ifndef NARRAY_BIGMEM
+typedef int    na_shape_t;
+#endif
+
 extern char    *dcl_obj2ccharary(VALUE, int, int);
 extern integer *dcl_obj2cintegerary(VALUE);
 extern real    *dcl_obj2crealary(VALUE);
@@ -22,10 +25,10 @@ extern complex *dcl_obj2ccomplexary(VALUE);
 extern logical *dcl_obj2clogicalary(VALUE);
 
 extern VALUE dcl_ccharary2obj(char *, int, int);
-extern VALUE dcl_cintegerary2obj(integer *, int, int, int *);
-extern VALUE dcl_crealary2obj(real *, int, int, int *);
-extern VALUE dcl_ccomplexary2obj(complex *, int, char *);
-extern VALUE dcl_clogicalary2obj(logical *, int, int, int *);
+extern VALUE dcl_cintegerary2obj(integer *, na_shape_t, int, na_shape_t *);
+extern VALUE dcl_crealary2obj(real *, na_shape_t, int, na_shape_t *);
+/* extern VALUE dcl_ccomplexary2obj(complex *, int, char *); */
+extern VALUE dcl_clogicalary2obj(logical *, na_shape_t, int, na_shape_t *);
 
 extern void dcl_freeccharary(char *);
 extern void dcl_freecintegerary(integer *);
@@ -89,7 +92,7 @@ dcl_vrintr(obj, rx, n, jx)
     io_rx = dcl_obj2crealary(rx);
 
 
-    vrintr_(io_rx, &i_n, &i_jx);
+    vrintr__(io_rx, &i_n, &i_jx);
 
     {int array_shape[1] = {i_jx*(i_n-1)+1};
      rx = dcl_crealary2obj(io_rx, i_jx*(i_n-1)+1, 1, array_shape);
@@ -122,7 +125,7 @@ dcl_vcintr(obj, cx, n, jx)
     /* initialization: not implemented for cx (ComplexInputOutputArrayVariable) */
 
 
-    vcintr_(io_cx, &i_n, &i_jx);
+    vcintr__(io_cx, &i_n, &i_jx);
 
     /* getresult: not implemented for cx (ComplexInputOutputArrayVariable) */
 

data/ext/numru/math2_rnmlib.c

@@ -1,10 +1,9 @@
 /*
- * $Id: p_header,v 1.3 2015/03/18 03:27:42 horinout Exp $
+ * $Id$
  */
 
 #include <stdio.h>
 #include "ruby.h"
-#include "libtinyf2c.h"
 #include "narray.h"
 #include "cdcl.h"
 
@@ -15,6 +14,10 @@
 
 #define DFLT_SIZE 32
 
+#ifndef NARRAY_BIGMEM
+typedef int    na_shape_t;
+#endif
+
 extern char    *dcl_obj2ccharary(VALUE, int, int);
 extern integer *dcl_obj2cintegerary(VALUE);
 extern real    *dcl_obj2crealary(VALUE);
@@ -22,10 +25,10 @@ extern complex *dcl_obj2ccomplexary(VALUE);
 extern logical *dcl_obj2clogicalary(VALUE);
 
 extern VALUE dcl_ccharary2obj(char *, int, int);
-extern VALUE dcl_cintegerary2obj(integer *, int, int, int *);
-extern VALUE dcl_crealary2obj(real *, int, int, int *);
-extern VALUE dcl_ccomplexary2obj(complex *, int, char *);
-extern VALUE dcl_clogicalary2obj(logical *, int, int, int *);
+extern VALUE dcl_cintegerary2obj(integer *, na_shape_t, int, na_shape_t *);
+extern VALUE dcl_crealary2obj(real *, na_shape_t, int, na_shape_t *);
+/* extern VALUE dcl_ccomplexary2obj(complex *, int, char *); */
+extern VALUE dcl_clogicalary2obj(logical *, na_shape_t, int, na_shape_t *);
 
 extern void dcl_freeccharary(char *);
 extern void dcl_freecintegerary(integer *);
@@ -102,7 +105,7 @@ dcl_vrrnm(obj, rx, n, jx, jy, nb)
 
     o_ry= ALLOCA_N(real, i_jy*(i_n-1)+1);
 
-    vrrnm_(i_rx, o_ry, &i_n, &i_jx, &i_jy, &i_nb);
+    vrrnm__(i_rx, o_ry, &i_n, &i_jx, &i_jy, &i_nb);
 
     {int array_shape[1] = {i_jy*(i_n-1)+1};
      ry = dcl_crealary2obj(o_ry, i_jy*(i_n-1)+1, 1, array_shape);
@@ -154,7 +157,7 @@ dcl_vrrnm0(obj, rx, n, jx, jy, nb)
 
     o_ry= ALLOCA_N(real, i_jy*(i_n-1)+1);
 
-    vrrnm0_(i_rx, o_ry, &i_n, &i_jx, &i_jy, &i_nb);
+    vrrnm0__(i_rx, o_ry, &i_n, &i_jx, &i_jy, &i_nb);
 
     {int array_shape[1] = {i_jy*(i_n-1)+1};
      ry = dcl_crealary2obj(o_ry, i_jy*(i_n-1)+1, 1, array_shape);
@@ -206,7 +209,7 @@ dcl_vrrnm1(obj, rx, n, jx, jy, nb)
 
     o_ry= ALLOCA_N(real, i_jx*(i_n-1)+1);
 
-    vrrnm1_(i_rx, o_ry, &i_n, &i_jx, &i_jy, &i_nb);
+    vrrnm1__(i_rx, o_ry, &i_n, &i_jx, &i_jy, &i_nb);
 
     {int array_shape[1] = {i_jx*(i_n-1)+1};
      ry = dcl_crealary2obj(o_ry, i_jx*(i_n-1)+1, 1, array_shape);