ruby-dcl 1.7.1 → 1.8.2

data/ext/numru/misc1_fmtlib.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 *);
@@ -84,7 +87,7 @@ dcl_chval(obj, cfmt, val)
     o_cval= ALLOCA_N(char, (DFLT_SIZE+1));
     memset(o_cval, '\0', DFLT_SIZE+1);
 
-    chval_(i_cfmt, &i_val, o_cval, (ftnlen)strlen(i_cfmt), (ftnlen)DFLT_SIZE);
+    chval__(i_cfmt, &i_val, o_cval, (ftnlen)strlen(i_cfmt), (ftnlen)DFLT_SIZE);
 
     cval = rb_str_new2(o_cval);
 

data/ext/numru/misc1_misclib.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_cns(obj, ins)
     o_rtn_val= ALLOCA_N(char, (2));
     memset(o_rtn_val, '\0', 2);
 
-    cns_(o_rtn_val, (ftnlen)1, &i_ins);
+    cns__(o_rtn_val, (ftnlen)1, &i_ins);
 
     rtn_val = rb_str_new2(o_rtn_val);
 
@@ -102,7 +105,7 @@ dcl_cdblk(obj, chr)
     strcpy(io_chr, StringValuePtr(chr));
 
 
-    cdblk_(io_chr, (ftnlen)strlen(io_chr));
+    cdblk__(io_chr, (ftnlen)strlen(io_chr));
 
     chr = rb_str_new2(io_chr);
 

data/ext/numru/misc1_randlib.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_rngu0(obj, iseed)
     io_iseed = NUM2INT(iseed);
 
 
-    o_rtn_val = rngu0_(&io_iseed);
+    o_rtn_val = rngu0__(&io_iseed);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 
@@ -105,7 +108,7 @@ dcl_rngu1(obj, iseed)
     io_iseed = NUM2INT(iseed);
 
 
-    o_rtn_val = rngu1_(&io_iseed);
+    o_rtn_val = rngu1__(&io_iseed);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 
@@ -129,7 +132,7 @@ dcl_rngu2(obj, iseed)
     io_iseed = NUM2INT(iseed);
 
 
-    o_rtn_val = rngu2_(&io_iseed);
+    o_rtn_val = rngu2__(&io_iseed);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 
@@ -155,7 +158,7 @@ dcl_rngu3(obj, iseed)
     io_iseed = NUM2INT(iseed);
 
 
-    o_rtn_val = rngu3_(&io_iseed);
+    o_rtn_val = rngu3__(&io_iseed);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 

data/ext/numru/misc1_timelib.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_time12(obj, itime)
     i_itime = NUM2INT(itime);
 
 
-    time12_(&i_itime, &o_itt);
+    time12__(&i_itime, &o_itt);
 
     itt = INT2NUM(o_itt);
 
@@ -105,7 +108,7 @@ dcl_time13(obj, itime)
     i_itime = NUM2INT(itime);
 
 
-    time13_(&i_itime, &o_ih, &o_im, &o_is);
+    time13__(&i_itime, &o_ih, &o_im, &o_is);
 
     ih = INT2NUM(o_ih);
     im = INT2NUM(o_im);
@@ -131,7 +134,7 @@ dcl_time21(obj, itt)
     i_itt = NUM2INT(itt);
 
 
-    time21_(&o_itime, &i_itt);
+    time21__(&o_itime, &i_itt);
 
     itime = INT2NUM(o_itime);
 
@@ -159,7 +162,7 @@ dcl_time23(obj, itt)
     i_itt = NUM2INT(itt);
 
 
-    time23_(&o_ih, &o_im, &o_is, &i_itt);
+    time23__(&o_ih, &o_im, &o_is, &i_itt);
 
     ih = INT2NUM(o_ih);
     im = INT2NUM(o_im);
@@ -195,7 +198,7 @@ dcl_time31(obj, ih, im, is)
     i_is = NUM2INT(is);
 
 
-    time31_(&o_itime, &i_ih, &i_im, &i_is);
+    time31__(&o_itime, &i_ih, &i_im, &i_is);
 
     itime = INT2NUM(o_itime);
 
@@ -229,7 +232,7 @@ dcl_time32(obj, ih, im, is)
     i_is = NUM2INT(is);
 
 
-    time32_(&i_ih, &i_im, &i_is, &o_itt);
+    time32__(&i_ih, &i_im, &i_is, &o_itt);
 
     itt = INT2NUM(o_itt);
 
@@ -257,7 +260,7 @@ dcl_timec1(obj, cform, itime)
     i_itime = NUM2INT(itime);
 
 
-    timec1_(io_cform, &i_itime, (ftnlen)strlen(io_cform));
+    timec1__(io_cform, &i_itime, (ftnlen)strlen(io_cform));
 
     cform = rb_str_new2(io_cform);
 
@@ -285,7 +288,7 @@ dcl_timec2(obj, cform, itt)
     i_itt = NUM2INT(itt);
 
 
-    timec2_(io_cform, &i_itt, (ftnlen)strlen(io_cform));
+    timec2__(io_cform, &i_itt, (ftnlen)strlen(io_cform));
 
     cform = rb_str_new2(io_cform);
 
@@ -323,7 +326,7 @@ dcl_timec3(obj, cform, ih, im, is)
     i_is = NUM2INT(is);
 
 
-    timec3_(io_cform, &i_ih, &i_im, &i_is, (ftnlen)strlen(io_cform));
+    timec3__(io_cform, &i_ih, &i_im, &i_is, (ftnlen)strlen(io_cform));
 
     cform = rb_str_new2(io_cform);
 
@@ -339,7 +342,7 @@ dcl_timeq1(obj)
     integer o_itime;
     VALUE itime;
 
-    timeq1_(&o_itime);
+    timeq1__(&o_itime);
 
     itime = INT2NUM(o_itime);
 
@@ -355,7 +358,7 @@ dcl_timeq2(obj)
     integer o_itt;
     VALUE itt;
 
-    timeq2_(&o_itt);
+    timeq2__(&o_itt);
 
     itt = INT2NUM(o_itt);