ruby-dcl 1.7.1 → 1.8.2

data/ext/numru/math2_shtlib.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 *);
@@ -66,7 +69,7 @@ static VALUE
 dcl_shtlib(obj)
     VALUE obj;
 {
-    shtlib_();
+    shtlib__();
 
     return Qnil;
 
@@ -98,7 +101,7 @@ dcl_shtint(obj, mm, jm, im)
 
     o_work= ALLOCA_N(real, (i_jm+1)*(4*i_jm+5*i_mm+14)+(i_mm+1)*(i_mm+1)+i_mm+2+6*i_im+15);
 
-    shtint_(&i_mm, &i_jm, &i_im, o_work);
+    shtint__(&i_mm, &i_jm, &i_im, o_work);
 
     {int array_shape[1] = {(i_jm+1)*(4*i_jm+5*i_mm+14)+(i_mm+1)*(i_mm+1)+i_mm+2+6*i_im+15};
      work = dcl_crealary2obj(o_work, (i_jm+1)*(4*i_jm+5*i_mm+14)+(i_mm+1)*(i_mm+1)+i_mm+2+6*i_im+15, 1, array_shape);
@@ -139,7 +142,7 @@ dcl_shtlap(obj, mm, ind, a)
 
     o_b= ALLOCA_N(real, (i_mm+1)*(i_mm+1));
 
-    shtlap_(&i_mm, &i_ind, i_a, o_b);
+    shtlap__(&i_mm, &i_ind, i_a, o_b);
 
     {int array_shape[1] = {(i_mm+1)*(i_mm+1)};
      b = dcl_crealary2obj(o_b, (i_mm+1)*(i_mm+1), 1, array_shape);
@@ -178,7 +181,7 @@ dcl_shtnml(obj, mm, n, m)
     i_m = NUM2INT(m);
 
 
-    shtnml_(&i_mm, &i_n, &i_m, &o_lr, &o_li);
+    shtnml__(&i_mm, &i_n, &i_m, &o_lr, &o_li);
 
     lr = INT2NUM(o_lr);
     li = INT2NUM(o_li);
@@ -223,7 +226,7 @@ dcl_shtfun(obj, mm, jm, m, work)
 
     o_fun= ALLOCA_N(real, ((2*i_jm+1)*(i_mm-i_m+1)));
 
-    shtfun_(&i_mm, &i_jm, &i_m, o_fun, i_work);
+    shtfun__(&i_mm, &i_jm, &i_m, o_fun, i_work);
 
     {int array_shape[2] = {(2*i_jm+1), (i_mm-i_m+1)};
      fun = dcl_crealary2obj(o_fun, ((2*i_jm+1)*(i_mm-i_m+1)), 2, array_shape);
@@ -284,7 +287,7 @@ dcl_shtlfw(obj, mm, jm, m, isw, wm, work)
 
     o_sm= ALLOCA_N(real, (i_mm-i_m+1));
 
-    shtlfw_(&i_mm, &i_jm, &i_m, &i_isw, i_wm, o_sm, i_work);
+    shtlfw__(&i_mm, &i_jm, &i_m, &i_isw, i_wm, o_sm, i_work);
 
     {int array_shape[1] = {i_mm-i_m+1};
      sm = dcl_crealary2obj(o_sm, (i_mm-i_m+1), 1, array_shape);
@@ -346,7 +349,7 @@ dcl_shtlbw(obj, mm, jm, m, isw, sm, work)
 
     o_wm= ALLOCA_N(real, (2*i_jm+1));
 
-    shtlbw_(&i_mm, &i_jm, &i_m, &i_isw, i_sm, o_wm, i_work);
+    shtlbw__(&i_mm, &i_jm, &i_m, &i_isw, i_sm, o_wm, i_work);
 
     {int array_shape[1] = {2*i_jm+1};
      wm = dcl_crealary2obj(o_wm, (2*i_jm+1), 1, array_shape);
@@ -403,7 +406,7 @@ dcl_shts2w(obj, mm, jm, isw, s, work)
 
     o_w= ALLOCA_N(real, ((2*i_jm+1)*(2*i_mm+1)));
 
-    shts2w_(&i_mm, &i_jm, &i_isw, i_s, o_w, i_work);
+    shts2w__(&i_mm, &i_jm, &i_isw, i_s, o_w, i_work);
 
     {int array_shape[2] = {(2*i_jm+1), (2*i_mm+1)};
      w = dcl_crealary2obj(o_w, ((2*i_jm+1)*(2*i_mm+1)), 2, array_shape);
@@ -470,7 +473,7 @@ dcl_shtswa(obj, mm, jm, isw, m1, m2, s, work)
 
     o_w= ALLOCA_N(real, ((2*i_jm+1)*(2*i_mm+1)));
 
-    shtswa_(&i_mm, &i_jm, &i_isw, &i_m1, &i_m2, i_s, o_w, i_work);
+    shtswa__(&i_mm, &i_jm, &i_isw, &i_m1, &i_m2, i_s, o_w, i_work);
 
     {int array_shape[2] = {(2*i_jm+1), (2*i_mm+1)};
      w = dcl_crealary2obj(o_w, ((2*i_jm+1)*(2*i_mm+1)), 2, array_shape);
@@ -527,7 +530,7 @@ dcl_shtswz(obj, mm, jm, isw, s, work)
 
     o_wz= ALLOCA_N(real, (2*i_jm+1));
 
-    shtswz_(&i_mm, &i_jm, &i_isw, i_s, o_wz, i_work);
+    shtswz__(&i_mm, &i_jm, &i_isw, i_s, o_wz, i_work);
 
     {int array_shape[1] = {2*i_jm+1};
      wz = dcl_crealary2obj(o_wz, (2*i_jm+1), 1, array_shape);
@@ -592,7 +595,7 @@ dcl_shtswm(obj, mm, jm, m, isw, s, work)
     o_wr= ALLOCA_N(real, (2*i_jm+1));
     o_wi= ALLOCA_N(real, (2*i_jm+1));
 
-    shtswm_(&i_mm, &i_jm, &i_m, &i_isw, i_s, o_wr, o_wi, i_work);
+    shtswm__(&i_mm, &i_jm, &i_m, &i_isw, i_s, o_wr, o_wi, i_work);
 
     {int array_shape[1] = {2*i_jm+1};
      wr = dcl_crealary2obj(o_wr, (2*i_jm+1), 1, array_shape);
@@ -667,7 +670,7 @@ dcl_shtswj(obj, mm, jm, isw, j, m1, m2, s, work)
 
     o_wj= ALLOCA_N(real, (2*i_mm+1));
 
-    shtswj_(&i_mm, &i_jm, &i_isw, &i_j, &i_m1, &i_m2, i_s, o_wj, i_work);
+    shtswj__(&i_mm, &i_jm, &i_isw, &i_j, &i_m1, &i_m2, i_s, o_wj, i_work);
 
     {int array_shape[1] = {2*i_mm+1};
      wj = dcl_crealary2obj(o_wj, (2*i_mm+1), 1, array_shape);
@@ -724,7 +727,7 @@ dcl_shtw2s(obj, mm, jm, isw, s, work)
 
     o_w= ALLOCA_N(real, ((i_mm+1)*(i_mm+1)));
 
-    shtw2s_(&i_mm, &i_jm, &i_isw, i_s, o_w, i_work);
+    shtw2s__(&i_mm, &i_jm, &i_isw, i_s, o_w, i_work);
 
     {int array_shape[2] = {(i_mm+1), (i_mm+1)};
      w = dcl_crealary2obj(o_w, ((i_mm+1)*(i_mm+1)), 2, array_shape);
@@ -781,7 +784,7 @@ dcl_shtw2g(obj, mm, jm, im, w, work)
 
     o_g= ALLOCA_N(real, ((2*i_im+1)*(2*i_jm+1)));
 
-    shtw2g_(&i_mm, &i_jm, &i_im, i_w, o_g, i_work);
+    shtw2g__(&i_mm, &i_jm, &i_im, i_w, o_g, i_work);
 
     {int array_shape[2] = {(2*i_im+1), (2*i_jm+1)};
      g = dcl_crealary2obj(o_g, ((2*i_im+1)*(2*i_jm+1)), 2, array_shape);
@@ -848,7 +851,7 @@ dcl_shtwga(obj, mm, jm, im, m1, m2, w, work)
 
     o_g= ALLOCA_N(real, ((2*i_im+1)*(2*i_jm+1)));
 
-    shtwga_(&i_mm, &i_jm, &i_im, &i_m1, &i_m2, i_w, o_g, i_work);
+    shtwga__(&i_mm, &i_jm, &i_im, &i_m1, &i_m2, i_w, o_g, i_work);
 
     {int array_shape[2] = {(2*i_im+1), (2*i_jm+1)};
      g = dcl_crealary2obj(o_g, ((2*i_im+1)*(2*i_jm+1)), 2, array_shape);
@@ -919,7 +922,7 @@ dcl_shtwgm(obj, mm, jm, im, m, wr, wi, work)
 
     o_g= ALLOCA_N(real, ((2*i_im+1)*(2*i_jm+1)));
 
-    shtwgm_(&i_mm, &i_jm, &i_im, &i_m, i_wr, i_wi, o_g, i_work);
+    shtwgm__(&i_mm, &i_jm, &i_im, &i_m, i_wr, i_wi, o_g, i_work);
 
     {int array_shape[2] = {(2*i_im+1), (2*i_jm+1)};
      g = dcl_crealary2obj(o_g, ((2*i_im+1)*(2*i_jm+1)), 2, array_shape);
@@ -963,7 +966,7 @@ dcl_shtwgz(obj, jm, im, wz)
 
     o_g= ALLOCA_N(real, ((2*i_im+1)*(2*i_jm+1)));
 
-    shtwgz_(&i_jm, &i_im, i_wz, o_g);
+    shtwgz__(&i_jm, &i_im, i_wz, o_g);
 
     {int array_shape[2] = {(2*i_im+1), (2*i_jm+1)};
      g = dcl_crealary2obj(o_g, ((2*i_im+1)*(2*i_jm+1)), 2, array_shape);
@@ -1024,7 +1027,7 @@ dcl_shtwgj(obj, mm, im, m1, m2, wj, work)
 
     o_gj= ALLOCA_N(real, (2*i_im+1));
 
-    shtwgj_(&i_mm, &i_im, &i_m1, &i_m2, i_wj, o_gj, i_work);
+    shtwgj__(&i_mm, &i_im, &i_m1, &i_m2, i_wj, o_gj, i_work);
 
     {int array_shape[1] = {2*i_im+1};
      gj = dcl_crealary2obj(o_gj, (2*i_im+1), 1, array_shape);
@@ -1081,7 +1084,7 @@ dcl_shtg2w(obj, mm, jm, im, g, work)
 
     o_w= ALLOCA_N(real, ((2*i_jm+1)*(2*i_mm+1)));
 
-    shtg2w_(&i_mm, &i_jm, &i_im, i_g, o_w, i_work);
+    shtg2w__(&i_mm, &i_jm, &i_im, i_g, o_w, i_work);
 
     {int array_shape[2] = {(2*i_jm+1), (2*i_mm+1)};
      w = dcl_crealary2obj(o_w, ((2*i_jm+1)*(2*i_mm+1)), 2, array_shape);
@@ -1146,7 +1149,7 @@ dcl_shts2g(obj, mm, jm, im, isw, s, work)
     o_w= ALLOCA_N(real, ((2*i_jm+1)*(2*i_mm+1)));
     o_g= ALLOCA_N(real, ((2*i_im+1)*(2*i_jm+1)));
 
-    shts2g_(&i_mm, &i_jm, &i_im, &i_isw, i_s, o_w, o_g, i_work);
+    shts2g__(&i_mm, &i_jm, &i_im, &i_isw, i_s, o_w, o_g, i_work);
 
     {int array_shape[2] = {(2*i_jm+1), (2*i_mm+1)};
      w = dcl_crealary2obj(o_w, ((2*i_jm+1)*(2*i_mm+1)), 2, array_shape);
@@ -1224,7 +1227,7 @@ dcl_shtsga(obj, mm, jm, im, isw, m1, m2, s, work)
     o_w= ALLOCA_N(real, ((2*i_jm+1)*(2*i_mm+1)));
     o_g= ALLOCA_N(real, ((2*i_im+1)*(2*i_jm+1)));
 
-    shtsga_(&i_mm, &i_jm, &i_im, &i_isw, &i_m1, &i_m2, i_s, o_w, o_g, i_work);
+    shtsga__(&i_mm, &i_jm, &i_im, &i_isw, &i_m1, &i_m2, i_s, o_w, o_g, i_work);
 
     {int array_shape[2] = {(2*i_jm+1), (2*i_mm+1)};
      w = dcl_crealary2obj(o_w, ((2*i_jm+1)*(2*i_mm+1)), 2, array_shape);
@@ -1292,7 +1295,7 @@ dcl_shtsgz(obj, mm, jm, im, isw, s, work)
     o_wz= ALLOCA_N(real, (2*i_jm+1));
     o_g= ALLOCA_N(real, ((2*i_im+1)*(2*i_jm+1)));
 
-    shtsgz_(&i_mm, &i_jm, &i_im, &i_isw, i_s, o_wz, o_g, i_work);
+    shtsgz__(&i_mm, &i_jm, &i_im, &i_isw, i_s, o_wz, o_g, i_work);
 
     {int array_shape[1] = {2*i_jm+1};
      wz = dcl_crealary2obj(o_wz, (2*i_jm+1), 1, array_shape);
@@ -1368,7 +1371,7 @@ dcl_shtsgm(obj, mm, jm, im, m, isw, s, work)
     o_wi= ALLOCA_N(real, (2*i_jm+1));
     o_g= ALLOCA_N(real, ((2*i_im+1)*(2*i_jm+1)));
 
-    shtsgm_(&i_mm, &i_jm, &i_im, &i_m, &i_isw, i_s, o_wr, o_wi, o_g, i_work);
+    shtsgm__(&i_mm, &i_jm, &i_im, &i_m, &i_isw, i_s, o_wr, o_wi, o_g, i_work);
 
     {int array_shape[1] = {2*i_jm+1};
      wr = dcl_crealary2obj(o_wr, (2*i_jm+1), 1, array_shape);
@@ -1454,7 +1457,7 @@ dcl_shtsgj(obj, mm, jm, im, isw, j, m1, m2, s, work)
     o_wj= ALLOCA_N(real, (2*i_mm+1));
     o_gj= ALLOCA_N(real, (2*i_im+1));
 
-    shtsgj_(&i_mm, &i_jm, &i_im, &i_isw, &i_j, &i_m1, &i_m2, i_s, o_wj, o_gj, i_work);
+    shtsgj__(&i_mm, &i_jm, &i_im, &i_isw, &i_j, &i_m1, &i_m2, i_s, o_wj, o_gj, i_work);
 
     {int array_shape[1] = {2*i_mm+1};
      wj = dcl_crealary2obj(o_wj, (2*i_mm+1), 1, array_shape);
@@ -1522,7 +1525,7 @@ dcl_shtg2s(obj, mm, jm, im, isw, g, work)
     o_w= ALLOCA_N(real, ((2*i_jm+1)*(2*i_mm+1)));
     o_s= ALLOCA_N(real, (i_mm+1)*(i_mm+1));
 
-    shtg2s_(&i_mm, &i_jm, &i_im, &i_isw, i_g, o_w, o_s, i_work);
+    shtg2s__(&i_mm, &i_jm, &i_im, &i_isw, i_g, o_w, o_s, i_work);
 
     {int array_shape[2] = {(2*i_jm+1), (2*i_mm+1)};
      w = dcl_crealary2obj(o_w, ((2*i_jm+1)*(2*i_mm+1)), 2, array_shape);

data/ext/numru/math2_vstlib.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 *);
@@ -81,7 +84,7 @@ dcl_vs1int(obj, ix)
     o_wz= ALLOCA_N(real, (i_ix*2));
     o_nw= ALLOCA_N(integer, (i_ix));
 
-    vs1int_(o_wz, o_nw, &i_ix);
+    vs1int__(o_wz, o_nw, &i_ix);
 
     {int array_shape[2] = {i_ix, 2};
      wz = dcl_crealary2obj(o_wz, (i_ix*2), 2, array_shape);
@@ -135,7 +138,7 @@ dcl_vs1din(obj, wz, nw, ix, x)
     i_x = dcl_obj2crealary(x);
 
 
-    vs1din_(io_wz, io_nw, &i_ix, i_x);
+    vs1din__(io_wz, io_nw, &i_ix, i_x);
 
     {int array_shape[2] = {i_ix, 2};
      wz = dcl_crealary2obj(io_wz, (i_ix*2), 2, array_shape);
@@ -183,7 +186,7 @@ dcl_vs1out(obj, wz, nw, ix)
     i_nw = dcl_obj2cintegerary(nw);
 
 
-    vs1out_(io_wz, i_nw, &i_ix);
+    vs1out__(io_wz, i_nw, &i_ix);
 
     {int array_shape[2] = {i_ix, 2};
      wz = dcl_crealary2obj(io_wz, (i_ix*2), 2, array_shape);
@@ -220,7 +223,7 @@ dcl_vs2int(obj, ix, iy)
     o_wz= ALLOCA_N(real, (i_ix*i_iy*5));
     o_nw= ALLOCA_N(integer, (i_ix*i_iy));
 
-    vs2int_(o_wz, o_nw, &i_ix, &i_iy);
+    vs2int__(o_wz, o_nw, &i_ix, &i_iy);
 
     {int array_shape[3] = {i_ix, i_iy, 5};
      wz = dcl_crealary2obj(o_wz, (i_ix*i_iy*5), 3, array_shape);
@@ -288,7 +291,7 @@ dcl_vs2din(obj, wz, nw, ix, iy, x, y)
     i_y = dcl_obj2crealary(y);
 
 
-    vs2din_(io_wz, io_nw, &i_ix, &i_iy, i_x, i_y);
+    vs2din__(io_wz, io_nw, &i_ix, &i_iy, i_x, i_y);
 
     {int array_shape[3] = {i_ix, i_iy, 5};
      wz = dcl_crealary2obj(io_wz, (i_ix*i_iy*5), 3, array_shape);
@@ -342,7 +345,7 @@ dcl_vs2out(obj, wz, nw, ix, iy)
     i_nw = dcl_obj2cintegerary(nw);
 
 
-    vs2out_(io_wz, i_nw, &i_ix, &i_iy);
+    vs2out__(io_wz, i_nw, &i_ix, &i_iy);
 
     {int array_shape[3] = {i_ix, i_iy, 5};
      wz = dcl_crealary2obj(io_wz, (i_ix*i_iy*5), 3, array_shape);

data/ext/numru/misc1_chnlib.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 *);
@@ -86,7 +89,7 @@ dcl_chngc(obj, ch, ca, cb)
     i_cb = StringValuePtr(cb);
 
 
-    chngc_(io_ch, i_ca, i_cb, (ftnlen)strlen(io_ch), (ftnlen)strlen(i_ca), (ftnlen)strlen(i_cb));
+    chngc__(io_ch, i_ca, i_cb, (ftnlen)strlen(io_ch), (ftnlen)strlen(i_ca), (ftnlen)strlen(i_cb));
 
     ch = rb_str_new2(io_ch);
 
@@ -124,7 +127,7 @@ dcl_chngi(obj, ch, ca, ii, cfmt)
     i_cfmt = StringValuePtr(cfmt);
 
 
-    chngi_(io_ch, i_ca, &i_ii, i_cfmt, (ftnlen)strlen(io_ch), (ftnlen)strlen(i_ca), (ftnlen)strlen(i_cfmt));
+    chngi__(io_ch, i_ca, &i_ii, i_cfmt, (ftnlen)strlen(io_ch), (ftnlen)strlen(i_ca), (ftnlen)strlen(i_cfmt));
 
     ch = rb_str_new2(io_ch);
 
@@ -162,7 +165,7 @@ dcl_chngr(obj, ch, ca, rr, cfmt)
     i_cfmt = StringValuePtr(cfmt);
 
 
-    chngr_(io_ch, i_ca, &i_rr, i_cfmt, (ftnlen)strlen(io_ch), (ftnlen)strlen(i_ca), (ftnlen)strlen(i_cfmt));
+    chngr__(io_ch, i_ca, &i_rr, i_cfmt, (ftnlen)strlen(io_ch), (ftnlen)strlen(i_ca), (ftnlen)strlen(i_cfmt));
 
     ch = rb_str_new2(io_ch);
 

data/ext/numru/misc1_datelib.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 *);
@@ -79,7 +82,7 @@ dcl_date12(obj, idate)
     i_idate = NUM2INT(idate);
 
 
-    date12_(&i_idate, &o_iy, &o_itd);
+    date12__(&i_idate, &o_iy, &o_itd);
 
     iy = INT2NUM(o_iy);
     itd = INT2NUM(o_itd);
@@ -108,7 +111,7 @@ dcl_date13(obj, idate)
     i_idate = NUM2INT(idate);
 
 
-    date13_(&i_idate, &o_iy, &o_im, &o_id);
+    date13__(&i_idate, &o_iy, &o_im, &o_id);
 
     iy = INT2NUM(o_iy);
     im = INT2NUM(o_im);
@@ -139,7 +142,7 @@ dcl_date21(obj, iy, itd)
     i_itd = NUM2INT(itd);
 
 
-    date21_(&o_idate, &i_iy, &i_itd);
+    date21__(&o_idate, &i_iy, &i_itd);
 
     idate = INT2NUM(o_idate);
 
@@ -170,7 +173,7 @@ dcl_date23(obj, iy, itd)
     i_itd = NUM2INT(itd);
 
 
-    date23_(&io_iy, &o_im, &o_id, &i_itd);
+    date23__(&io_iy, &o_im, &o_id, &i_itd);
 
     iy = INT2NUM(io_iy);
     im = INT2NUM(o_im);
@@ -206,7 +209,7 @@ dcl_date31(obj, iy, im, id)
     i_id = NUM2INT(id);
 
 
-    date31_(&o_idate, &i_iy, &i_im, &i_id);
+    date31__(&o_idate, &i_iy, &i_im, &i_id);
 
     idate = INT2NUM(o_idate);
 
@@ -240,7 +243,7 @@ dcl_date32(obj, iy, im, id)
     i_id = NUM2INT(id);
 
 
-    date32_(&io_iy, &i_im, &i_id, &o_itd);
+    date32__(&io_iy, &i_im, &i_id, &o_itd);
 
     iy = INT2NUM(io_iy);
     itd = INT2NUM(o_itd);
@@ -270,7 +273,7 @@ dcl_datef1(obj, n, idate)
     i_idate = NUM2INT(idate);
 
 
-    datef1_(&i_n, &i_idate, &o_ndate);
+    datef1__(&i_n, &i_idate, &o_ndate);
 
     ndate = INT2NUM(o_ndate);
 
@@ -306,7 +309,7 @@ dcl_datef2(obj, n, iy, itd)
     i_itd = NUM2INT(itd);
 
 
-    datef2_(&i_n, &i_iy, &i_itd, &o_ny, &o_ntd);
+    datef2__(&i_n, &i_iy, &i_itd, &o_ny, &o_ntd);
 
     ny = INT2NUM(o_ny);
     ntd = INT2NUM(o_ntd);
@@ -350,7 +353,7 @@ dcl_datef3(obj, n, iy, im, id)
     i_id = NUM2INT(id);
 
 
-    datef3_(&i_n, &i_iy, &i_im, &i_id, &o_ny, &o_nm, &o_nd);
+    datef3__(&i_n, &i_iy, &i_im, &i_id, &o_ny, &o_nm, &o_nd);
 
     ny = INT2NUM(o_ny);
     nm = INT2NUM(o_nm);
@@ -381,7 +384,7 @@ dcl_dateg1(obj, idate, ndate)
     i_ndate = NUM2INT(ndate);
 
 
-    dateg1_(&o_n, &i_idate, &i_ndate);
+    dateg1__(&o_n, &i_idate, &i_ndate);
 
     n = INT2NUM(o_n);
 
@@ -420,7 +423,7 @@ dcl_dateg2(obj, iy, itd, ny, ntd)
     i_ntd = NUM2INT(ntd);
 
 
-    dateg2_(&o_n, &i_iy, &i_itd, &i_ny, &i_ntd);
+    dateg2__(&o_n, &i_iy, &i_itd, &i_ny, &i_ntd);
 
     n = INT2NUM(o_n);
 
@@ -469,7 +472,7 @@ dcl_dateg3(obj, iy, im, id, ny, nm, nd)
     i_nd = NUM2INT(nd);
 
 
-    dateg3_(&o_n, &i_iy, &i_im, &i_id, &i_ny, &i_nm, &i_nd);
+    dateg3__(&o_n, &i_iy, &i_im, &i_id, &i_ny, &i_nm, &i_nd);
 
     n = INT2NUM(o_n);
 
@@ -498,7 +501,7 @@ dcl_ndate1(obj, idate, ndate)
     i_ndate = NUM2INT(ndate);
 
 
-    o_rtn_val = ndate1_(&i_idate, &i_ndate);
+    o_rtn_val = ndate1__(&i_idate, &i_ndate);
 
     rtn_val = INT2NUM(o_rtn_val);
 
@@ -537,7 +540,7 @@ dcl_ndate2(obj, iy, itd, ny, ntd)
     i_ntd = NUM2INT(ntd);
 
 
-    o_rtn_val = ndate2_(&i_iy, &i_itd, &i_ny, &i_ntd);
+    o_rtn_val = ndate2__(&i_iy, &i_itd, &i_ny, &i_ntd);
 
     rtn_val = INT2NUM(o_rtn_val);
 
@@ -586,7 +589,7 @@ dcl_ndate3(obj, iy, im, id, ny, nm, nd)
     i_nd = NUM2INT(nd);
 
 
-    o_rtn_val = ndate3_(&i_iy, &i_im, &i_id, &i_ny, &i_nm, &i_nd);
+    o_rtn_val = ndate3__(&i_iy, &i_im, &i_id, &i_ny, &i_nm, &i_nd);
 
     rtn_val = INT2NUM(o_rtn_val);
 
@@ -614,7 +617,7 @@ dcl_datec1(obj, cform, idate)
     i_idate = NUM2INT(idate);
 
 
-    datec1_(io_cform, &i_idate, (ftnlen)strlen(io_cform));
+    datec1__(io_cform, &i_idate, (ftnlen)strlen(io_cform));
 
     cform = rb_str_new2(io_cform);
 
@@ -647,7 +650,7 @@ dcl_datec2(obj, cform, iy, itd)
     i_itd = NUM2INT(itd);
 
 
-    datec2_(io_cform, &i_iy, &i_itd, (ftnlen)strlen(io_cform));
+    datec2__(io_cform, &i_iy, &i_itd, (ftnlen)strlen(io_cform));
 
     cform = rb_str_new2(io_cform);
 
@@ -685,7 +688,7 @@ dcl_datec3(obj, cform, iy, im, id)
     i_id = NUM2INT(id);
 
 
-    datec3_(io_cform, &i_iy, &i_im, &i_id, (ftnlen)strlen(io_cform));
+    datec3__(io_cform, &i_iy, &i_im, &i_id, (ftnlen)strlen(io_cform));
 
     cform = rb_str_new2(io_cform);
 
@@ -701,7 +704,7 @@ dcl_dateq1(obj)
     integer o_idate;
     VALUE idate;
 
-    dateq1_(&o_idate);
+    dateq1__(&o_idate);
 
     idate = INT2NUM(o_idate);
 
@@ -730,7 +733,7 @@ dcl_ndmon(obj, iy, im)
     i_im = NUM2INT(im);
 
 
-    o_rtn_val = ndmon_(&i_iy, &i_im);
+    o_rtn_val = ndmon__(&i_iy, &i_im);
 
     rtn_val = INT2NUM(o_rtn_val);
 
@@ -748,7 +751,7 @@ dcl_dateq2(obj)
     VALUE iy;
     VALUE itd;
 
-    dateq2_(&o_iy, &o_itd);
+    dateq2__(&o_iy, &o_itd);
 
     iy = INT2NUM(o_iy);
     itd = INT2NUM(o_itd);
@@ -775,7 +778,7 @@ dcl_cmon(obj, im)
     o_rtn_val= ALLOCA_N(char, (DFLT_SIZE+1));
     memset(o_rtn_val, '\0', DFLT_SIZE+1);
 
-    cmon_(o_rtn_val, (ftnlen)DFLT_SIZE, &i_im);
+    cmon__(o_rtn_val, (ftnlen)DFLT_SIZE, &i_im);
 
     rtn_val = rb_str_new2(o_rtn_val);
 
@@ -801,7 +804,7 @@ dcl_cweek(obj, iw)
     o_rtn_val= ALLOCA_N(char, (DFLT_SIZE+1));
     memset(o_rtn_val, '\0', DFLT_SIZE+1);
 
-    cweek_(o_rtn_val, (ftnlen)DFLT_SIZE, &i_iw);
+    cweek__(o_rtn_val, (ftnlen)DFLT_SIZE, &i_iw);
 
     rtn_val = rb_str_new2(o_rtn_val);
 
@@ -825,7 +828,7 @@ dcl_iweek1(obj, idate)
     i_idate = NUM2INT(idate);
 
 
-    o_rtn_val = iweek1_(&i_idate);
+    o_rtn_val = iweek1__(&i_idate);
 
     rtn_val = INT2NUM(o_rtn_val);
 
@@ -854,7 +857,7 @@ dcl_iweek2(obj, iy, itd)
     i_itd = NUM2INT(itd);
 
 
-    o_rtn_val = iweek2_(&i_iy, &i_itd);
+    o_rtn_val = iweek2__(&i_iy, &i_itd);
 
     rtn_val = INT2NUM(o_rtn_val);
 
@@ -888,7 +891,7 @@ dcl_iweek3(obj, iy, im, id)
     i_id = NUM2INT(id);
 
 
-    o_rtn_val = iweek3_(&i_iy, &i_im, &i_id);
+    o_rtn_val = iweek3__(&i_iy, &i_im, &i_id);
 
     rtn_val = INT2NUM(o_rtn_val);
 
@@ -912,7 +915,7 @@ dcl_ndyear(obj, iy)
     i_iy = NUM2INT(iy);
 
 
-    o_rtn_val = ndyear_(&i_iy);
+    o_rtn_val = ndyear__(&i_iy);
 
     rtn_val = INT2NUM(o_rtn_val);