ruby-dcl 1.7.1 → 1.8.2

data/ext/numru/grph2_grpack.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 *);
@@ -75,7 +78,7 @@ dcl_gropn(obj, iws)
     i_iws = NUM2INT(iws);
 
 
-    gropn_(&i_iws);
+    gropn__(&i_iws);
 
     return Qnil;
 
@@ -85,7 +88,7 @@ static VALUE
 dcl_grfrm(obj)
     VALUE obj;
 {
-    grfrm_();
+    grfrm__();
 
     return Qnil;
 
@@ -95,7 +98,7 @@ static VALUE
 dcl_grfig(obj)
     VALUE obj;
 {
-    grfig_();
+    grfig__();
 
     return Qnil;
 
@@ -105,7 +108,7 @@ static VALUE
 dcl_grcls(obj)
     VALUE obj;
 {
-    grcls_();
+    grcls__();
 
     return Qnil;
 
@@ -115,7 +118,7 @@ static VALUE
 dcl_grinit(obj)
     VALUE obj;
 {
-    grinit_();
+    grinit__();
 
     return Qnil;
 
@@ -149,7 +152,7 @@ dcl_grsvpt(obj, vxmin, vxmax, vymin, vymax)
     i_vymax = (real)NUM2DBL(vymax);
 
 
-    grsvpt_(&i_vxmin, &i_vxmax, &i_vymin, &i_vymax);
+    grsvpt__(&i_vxmin, &i_vxmax, &i_vymin, &i_vymax);
 
     return Qnil;
 
@@ -183,7 +186,7 @@ dcl_grswnd(obj, uxmin, uxmax, uymin, uymax)
     i_uymax = (real)NUM2DBL(uymax);
 
 
-    grswnd_(&i_uxmin, &i_uxmax, &i_uymin, &i_uymax);
+    grswnd__(&i_uxmin, &i_uxmax, &i_uymin, &i_uymax);
 
     return Qnil;
 
@@ -212,7 +215,7 @@ dcl_grssim(obj, simfac, vxoff, vyoff)
     i_vyoff = (real)NUM2DBL(vyoff);
 
 
-    grssim_(&i_simfac, &i_vxoff, &i_vyoff);
+    grssim__(&i_simfac, &i_vxoff, &i_vyoff);
 
     return Qnil;
 
@@ -241,7 +244,7 @@ dcl_grsmpl(obj, plx, ply, plrot)
     i_plrot = (real)NUM2DBL(plrot);
 
 
-    grsmpl_(&i_plx, &i_ply, &i_plrot);
+    grsmpl__(&i_plx, &i_ply, &i_plrot);
 
     return Qnil;
 
@@ -275,7 +278,7 @@ dcl_grstxy(obj, txmin, txmax, tymin, tymax)
     i_tymax = (real)NUM2DBL(tymax);
 
 
-    grstxy_(&i_txmin, &i_txmax, &i_tymin, &i_tymax);
+    grstxy__(&i_txmin, &i_txmax, &i_tymin, &i_tymax);
 
     return Qnil;
 
@@ -294,7 +297,7 @@ dcl_grstrn(obj, itr)
     i_itr = NUM2INT(itr);
 
 
-    grstrn_(&i_itr);
+    grstrn__(&i_itr);
 
     return Qnil;
 
@@ -304,7 +307,7 @@ static VALUE
 dcl_grstrf(obj)
     VALUE obj;
 {
-    grstrf_();
+    grstrf__();
 
     return Qnil;
 
@@ -340,7 +343,7 @@ dcl_grscwd(obj, cxmin, cxmax, cymin, cymax)
     i_cymax = (real)NUM2DBL(cymax);
 
 
-    grscwd_(&i_cxmin, &i_cxmax, &i_cymin, &i_cymax);
+    grscwd__(&i_cxmin, &i_cxmax, &i_cymin, &i_cymax);
 
     return Qnil;
 

data/ext/numru/grph2_ucpack.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 *);
@@ -69,7 +72,7 @@ dcl_ucpqnp(obj)
     integer o_ncp;
     VALUE ncp;
 
-    ucpqnp_(&o_ncp);
+    ucpqnp__(&o_ncp);
 
     ncp = INT2NUM(o_ncp);
 
@@ -93,7 +96,7 @@ dcl_ucpqid(obj, cp)
     i_cp = StringValuePtr(cp);
 
 
-    ucpqid_(i_cp, &o_idx, (ftnlen)strlen(i_cp));
+    ucpqid__(i_cp, &o_idx, (ftnlen)strlen(i_cp));
 
     idx = INT2NUM(o_idx);
 
@@ -119,7 +122,7 @@ dcl_ucpqcp(obj, idx)
     o_cp= ALLOCA_N(char, (DFLT_SIZE+1));
     memset(o_cp, '\0', DFLT_SIZE+1);
 
-    ucpqcp_(&i_idx, o_cp, (ftnlen)DFLT_SIZE);
+    ucpqcp__(&i_idx, o_cp, (ftnlen)DFLT_SIZE);
 
     cp = rb_str_new2(o_cp);
 
@@ -145,7 +148,7 @@ dcl_ucpqcl(obj, idx)
     o_cp= ALLOCA_N(char, (DFLT_SIZE+1));
     memset(o_cp, '\0', DFLT_SIZE+1);
 
-    ucpqcl_(&i_idx, o_cp, (ftnlen)DFLT_SIZE);
+    ucpqcl__(&i_idx, o_cp, (ftnlen)DFLT_SIZE);
 
     cp = rb_str_new2(o_cp);
 
@@ -169,7 +172,7 @@ dcl_ucpqit(obj, idx)
     i_idx = NUM2INT(idx);
 
 
-    ucpqit_(&i_idx, &o_itp);
+    ucpqit__(&i_idx, &o_itp);
 
     itp = INT2NUM(o_itp);
 
@@ -193,7 +196,7 @@ dcl_ucpqvl(obj, idx)
     i_idx = NUM2INT(idx);
 
 
-    ucpqvl_(&i_idx, &o_ipara);
+    ucpqvl__(&i_idx, &o_ipara);
 
     ipara = INT2NUM(o_ipara);
 
@@ -220,7 +223,7 @@ dcl_ucpsvl(obj, idx, ipara)
     i_ipara = NUM2INT(ipara);
 
 
-    ucpsvl_(&i_idx, &i_ipara);
+    ucpsvl__(&i_idx, &i_ipara);
 
     return Qnil;
 
@@ -241,7 +244,7 @@ dcl_ucpqin(obj, cp)
     i_cp = StringValuePtr(cp);
 
 
-    ucpqin_(i_cp, &o_in, (ftnlen)strlen(i_cp));
+    ucpqin__(i_cp, &o_in, (ftnlen)strlen(i_cp));
 
     in = INT2NUM(o_in);
 
@@ -273,7 +276,7 @@ dcl_ucxacl(obj, cside, jd0, nd)
     i_nd = NUM2INT(nd);
 
 
-    ucxacl_(i_cside, &i_jd0, &i_nd, (ftnlen)strlen(i_cside));
+    ucxacl__(i_cside, &i_jd0, &i_nd, (ftnlen)strlen(i_cside));
 
     return Qnil;
 
@@ -302,7 +305,7 @@ dcl_ucxady(obj, cside, jd0, nd)
     i_nd = NUM2INT(nd);
 
 
-    ucxady_(i_cside, &i_jd0, &i_nd, (ftnlen)strlen(i_cside));
+    ucxady__(i_cside, &i_jd0, &i_nd, (ftnlen)strlen(i_cside));
 
     return Qnil;
 
@@ -331,7 +334,7 @@ dcl_ucxamn(obj, cside, jd0, nd)
     i_nd = NUM2INT(nd);
 
 
-    ucxamn_(i_cside, &i_jd0, &i_nd, (ftnlen)strlen(i_cside));
+    ucxamn__(i_cside, &i_jd0, &i_nd, (ftnlen)strlen(i_cside));
 
     return Qnil;
 
@@ -360,7 +363,7 @@ dcl_ucxayr(obj, cside, jd0, nd)
     i_nd = NUM2INT(nd);
 
 
-    ucxayr_(i_cside, &i_jd0, &i_nd, (ftnlen)strlen(i_cside));
+    ucxayr__(i_cside, &i_jd0, &i_nd, (ftnlen)strlen(i_cside));
 
     return Qnil;
 
@@ -389,7 +392,7 @@ dcl_ucyacl(obj, cside, jd0, nd)
     i_nd = NUM2INT(nd);
 
 
-    ucyacl_(i_cside, &i_jd0, &i_nd, (ftnlen)strlen(i_cside));
+    ucyacl__(i_cside, &i_jd0, &i_nd, (ftnlen)strlen(i_cside));
 
     return Qnil;
 
@@ -418,7 +421,7 @@ dcl_ucyady(obj, cside, jd0, nd)
     i_nd = NUM2INT(nd);
 
 
-    ucyady_(i_cside, &i_jd0, &i_nd, (ftnlen)strlen(i_cside));
+    ucyady__(i_cside, &i_jd0, &i_nd, (ftnlen)strlen(i_cside));
 
     return Qnil;
 
@@ -447,7 +450,7 @@ dcl_ucyamn(obj, cside, jd0, nd)
     i_nd = NUM2INT(nd);
 
 
-    ucyamn_(i_cside, &i_jd0, &i_nd, (ftnlen)strlen(i_cside));
+    ucyamn__(i_cside, &i_jd0, &i_nd, (ftnlen)strlen(i_cside));
 
     return Qnil;
 
@@ -476,7 +479,7 @@ dcl_ucyayr(obj, cside, jd0, nd)
     i_nd = NUM2INT(nd);
 
 
-    ucyayr_(i_cside, &i_jd0, &i_nd, (ftnlen)strlen(i_cside));
+    ucyayr__(i_cside, &i_jd0, &i_nd, (ftnlen)strlen(i_cside));
 
     return Qnil;
 
@@ -497,7 +500,7 @@ dcl_uciget(obj, cp)
     i_cp = StringValuePtr(cp);
 
 
-    uciget_(i_cp, &o_ipara, (ftnlen)strlen(i_cp));
+    uciget__(i_cp, &o_ipara, (ftnlen)strlen(i_cp));
 
     ipara = INT2NUM(o_ipara);
 
@@ -524,7 +527,7 @@ dcl_uciset(obj, cp, ipara)
     i_ipara = NUM2INT(ipara);
 
 
-    uciset_(i_cp, &i_ipara, (ftnlen)strlen(i_cp));
+    uciset__(i_cp, &i_ipara, (ftnlen)strlen(i_cp));
 
     return Qnil;
 
@@ -548,7 +551,7 @@ dcl_ucistx(obj, cp, ipara)
     i_ipara = NUM2INT(ipara);
 
 
-    ucistx_(i_cp, &i_ipara, (ftnlen)strlen(i_cp));
+    ucistx__(i_cp, &i_ipara, (ftnlen)strlen(i_cp));
 
     return Qnil;
 
@@ -561,7 +564,7 @@ dcl_uciqnp(obj)
     integer o_ncp;
     VALUE ncp;
 
-    uciqnp_(&o_ncp);
+    uciqnp__(&o_ncp);
 
     ncp = INT2NUM(o_ncp);
 
@@ -585,7 +588,7 @@ dcl_uciqid(obj, cp)
     i_cp = StringValuePtr(cp);
 
 
-    uciqid_(i_cp, &o_idx, (ftnlen)strlen(i_cp));
+    uciqid__(i_cp, &o_idx, (ftnlen)strlen(i_cp));
 
     idx = INT2NUM(o_idx);
 
@@ -611,7 +614,7 @@ dcl_uciqcp(obj, idx)
     o_cp= ALLOCA_N(char, (DFLT_SIZE+1));
     memset(o_cp, '\0', DFLT_SIZE+1);
 
-    uciqcp_(&i_idx, o_cp, (ftnlen)DFLT_SIZE);
+    uciqcp__(&i_idx, o_cp, (ftnlen)DFLT_SIZE);
 
     cp = rb_str_new2(o_cp);
 
@@ -637,7 +640,7 @@ dcl_uciqcl(obj, idx)
     o_cp= ALLOCA_N(char, (DFLT_SIZE+1));
     memset(o_cp, '\0', DFLT_SIZE+1);
 
-    uciqcl_(&i_idx, o_cp, (ftnlen)DFLT_SIZE);
+    uciqcl__(&i_idx, o_cp, (ftnlen)DFLT_SIZE);
 
     cp = rb_str_new2(o_cp);
 
@@ -661,7 +664,7 @@ dcl_uciqvl(obj, idx)
     i_idx = NUM2INT(idx);
 
 
-    uciqvl_(&i_idx, &o_ipara);
+    uciqvl__(&i_idx, &o_ipara);
 
     ipara = INT2NUM(o_ipara);
 
@@ -688,7 +691,7 @@ dcl_ucisvl(obj, idx, ipara)
     i_ipara = NUM2INT(ipara);
 
 
-    ucisvl_(&i_idx, &i_ipara);
+    ucisvl__(&i_idx, &i_ipara);
 
     return Qnil;
 
@@ -709,7 +712,7 @@ dcl_uciqin(obj, cp)
     i_cp = StringValuePtr(cp);
 
 
-    uciqin_(i_cp, &o_in, (ftnlen)strlen(i_cp));
+    uciqin__(i_cp, &o_in, (ftnlen)strlen(i_cp));
 
     in = INT2NUM(o_in);
 
@@ -733,7 +736,7 @@ dcl_uclget(obj, cp)
     i_cp = StringValuePtr(cp);
 
 
-    uclget_(i_cp, &o_lpara, (ftnlen)strlen(i_cp));
+    uclget__(i_cp, &o_lpara, (ftnlen)strlen(i_cp));
 
     lpara = (o_lpara == FALSE_) ? Qfalse : Qtrue;
 
@@ -757,7 +760,7 @@ dcl_uclset(obj, cp, lpara)
     i_lpara = ((lpara == Qnil)||(lpara == Qfalse)) ? FALSE_ : TRUE_;
 
 
-    uclset_(i_cp, &i_lpara, (ftnlen)strlen(i_cp));
+    uclset__(i_cp, &i_lpara, (ftnlen)strlen(i_cp));
 
     return Qnil;
 
@@ -778,7 +781,7 @@ dcl_uclstx(obj, cp, lpara)
     i_lpara = ((lpara == Qnil)||(lpara == Qfalse)) ? FALSE_ : TRUE_;
 
 
-    uclstx_(i_cp, &i_lpara, (ftnlen)strlen(i_cp));
+    uclstx__(i_cp, &i_lpara, (ftnlen)strlen(i_cp));
 
     return Qnil;
 
@@ -791,7 +794,7 @@ dcl_uclqnp(obj)
     integer o_ncp;
     VALUE ncp;
 
-    uclqnp_(&o_ncp);
+    uclqnp__(&o_ncp);
 
     ncp = INT2NUM(o_ncp);
 
@@ -815,7 +818,7 @@ dcl_uclqid(obj, cp)
     i_cp = StringValuePtr(cp);
 
 
-    uclqid_(i_cp, &o_idx, (ftnlen)strlen(i_cp));
+    uclqid__(i_cp, &o_idx, (ftnlen)strlen(i_cp));
 
     idx = INT2NUM(o_idx);
 
@@ -841,7 +844,7 @@ dcl_uclqcp(obj, idx)
     o_cp= ALLOCA_N(char, (DFLT_SIZE+1));
     memset(o_cp, '\0', DFLT_SIZE+1);
 
-    uclqcp_(&i_idx, o_cp, (ftnlen)DFLT_SIZE);
+    uclqcp__(&i_idx, o_cp, (ftnlen)DFLT_SIZE);
 
     cp = rb_str_new2(o_cp);
 
@@ -867,7 +870,7 @@ dcl_uclqcl(obj, idx)
     o_cp= ALLOCA_N(char, (DFLT_SIZE+1));
     memset(o_cp, '\0', DFLT_SIZE+1);
 
-    uclqcl_(&i_idx, o_cp, (ftnlen)DFLT_SIZE);
+    uclqcl__(&i_idx, o_cp, (ftnlen)DFLT_SIZE);
 
     cp = rb_str_new2(o_cp);
 
@@ -891,7 +894,7 @@ dcl_uclqvl(obj, idx)
     i_idx = NUM2INT(idx);
 
 
-    uclqvl_(&i_idx, &o_lpara);
+    uclqvl__(&i_idx, &o_lpara);
 
     lpara = (o_lpara == FALSE_) ? Qfalse : Qtrue;
 
@@ -915,7 +918,7 @@ dcl_uclsvl(obj, idx, lpara)
     i_lpara = ((lpara == Qnil)||(lpara == Qfalse)) ? FALSE_ : TRUE_;
 
 
-    uclsvl_(&i_idx, &i_lpara);
+    uclsvl__(&i_idx, &i_lpara);
 
     return Qnil;
 
@@ -936,7 +939,7 @@ dcl_uclqin(obj, cp)
     i_cp = StringValuePtr(cp);
 
 
-    uclqin_(i_cp, &o_in, (ftnlen)strlen(i_cp));
+    uclqin__(i_cp, &o_in, (ftnlen)strlen(i_cp));
 
     in = INT2NUM(o_in);
 
@@ -960,7 +963,7 @@ dcl_ucrget(obj, cp)
     i_cp = StringValuePtr(cp);
 
 
-    ucrget_(i_cp, &o_rpara, (ftnlen)strlen(i_cp));
+    ucrget__(i_cp, &o_rpara, (ftnlen)strlen(i_cp));
 
     rpara = rb_float_new((double)o_rpara);
 
@@ -987,7 +990,7 @@ dcl_ucrset(obj, cp, rpara)
     i_rpara = (real)NUM2DBL(rpara);
 
 
-    ucrset_(i_cp, &i_rpara, (ftnlen)strlen(i_cp));
+    ucrset__(i_cp, &i_rpara, (ftnlen)strlen(i_cp));
 
     return Qnil;
 
@@ -1011,7 +1014,7 @@ dcl_ucrstx(obj, cp, rpara)
     i_rpara = (real)NUM2DBL(rpara);
 
 
-    ucrstx_(i_cp, &i_rpara, (ftnlen)strlen(i_cp));
+    ucrstx__(i_cp, &i_rpara, (ftnlen)strlen(i_cp));
 
     return Qnil;
 
@@ -1024,7 +1027,7 @@ dcl_ucrqnp(obj)
     integer o_ncp;
     VALUE ncp;
 
-    ucrqnp_(&o_ncp);
+    ucrqnp__(&o_ncp);
 
     ncp = INT2NUM(o_ncp);
 
@@ -1048,7 +1051,7 @@ dcl_ucrqid(obj, cp)
     i_cp = StringValuePtr(cp);
 
 
-    ucrqid_(i_cp, &o_idx, (ftnlen)strlen(i_cp));
+    ucrqid__(i_cp, &o_idx, (ftnlen)strlen(i_cp));
 
     idx = INT2NUM(o_idx);
 
@@ -1074,7 +1077,7 @@ dcl_ucrqcp(obj, idx)
     o_cp= ALLOCA_N(char, (DFLT_SIZE+1));
     memset(o_cp, '\0', DFLT_SIZE+1);
 
-    ucrqcp_(&i_idx, o_cp, (ftnlen)DFLT_SIZE);
+    ucrqcp__(&i_idx, o_cp, (ftnlen)DFLT_SIZE);
 
     cp = rb_str_new2(o_cp);
 
@@ -1100,7 +1103,7 @@ dcl_ucrqcl(obj, idx)
     o_cp= ALLOCA_N(char, (DFLT_SIZE+1));
     memset(o_cp, '\0', DFLT_SIZE+1);
 
-    ucrqcl_(&i_idx, o_cp, (ftnlen)DFLT_SIZE);
+    ucrqcl__(&i_idx, o_cp, (ftnlen)DFLT_SIZE);
 
     cp = rb_str_new2(o_cp);
 
@@ -1124,7 +1127,7 @@ dcl_ucrqvl(obj, idx)
     i_idx = NUM2INT(idx);
 
 
-    ucrqvl_(&i_idx, &o_rpara);
+    ucrqvl__(&i_idx, &o_rpara);
 
     rpara = rb_float_new((double)o_rpara);
 
@@ -1151,7 +1154,7 @@ dcl_ucrsvl(obj, idx, rpara)
     i_rpara = (real)NUM2DBL(rpara);
 
 
-    ucrsvl_(&i_idx, &i_rpara);
+    ucrsvl__(&i_idx, &i_rpara);
 
     return Qnil;
 
@@ -1172,7 +1175,7 @@ dcl_ucrqin(obj, cp)
     i_cp = StringValuePtr(cp);
 
 
-    ucrqin_(i_cp, &o_in, (ftnlen)strlen(i_cp));
+    ucrqin__(i_cp, &o_in, (ftnlen)strlen(i_cp));
 
     in = INT2NUM(o_in);