RubyGems - ruby-dcl - Versions diffs - 1.7.1 → 1.8.0 - Mend

@@ -1,6 +1,6 @@
 /*
  * dcl_cary2obj.c
- *   $Id: dcl_cary2obj.c,v 1.1.1.1 2011/02/23 07:21:26 horinout Exp $
+ *   $Id$
  */
 #include <math.h>
@@ -8,13 +8,18 @@
 #include "libtinyf2c.h"
 #include "narray.h"  /* kuro: depend on numarray.so */
+#ifndef NARRAY_BIGMEM
+typedef int    na_shape_t;
+#endif
 /*  functions  */
 VALUE dcl_ccharary2obj(char *, int, int);
-VALUE dcl_cintegerary2obj(integer *, int, int, int *);
-VALUE dcl_crealary2obj(real *, int, int, int *);
-VALUE dcl_ccomplexary2obj(complex *, int, char *);
-VALUE dcl_clogicalary2obj(logical *, int, int, int *);
+VALUE dcl_cintegerary2obj(integer *, na_shape_t, int, na_shape_t *);
+VALUE dcl_crealary2obj(real *, na_shape_t, int, na_shape_t *);
+/* not implemented
+VALUE dcl_ccomplexary2obj(complex *, na_shape_t, int, na_shape_t *);
+*/
+VALUE dcl_clogicalary2obj(logical *, na_shape_t, int, na_shape_t *);
 static VALUE ccharary2ary(char *, int, int);
 static VALUE cintegerary2ary(integer *, int);
@@ -25,9 +30,9 @@ static VALUE ccomplexary2ary(complex *, int);
 */
 /* kuro: depend on numarray.so */
-static VALUE crealary2na(real *, int, int, int *);
-static VALUE clogicalary2na(logical *, int, int, int *);
-static VALUE cintegerary2na(integer *, int, int, int *);
+static VALUE crealary2na(real *, na_shape_t, int, na_shape_t *);
+static VALUE clogicalary2na(logical *, na_shape_t, int, na_shape_t *);
+static VALUE cintegerary2na(integer *, na_shape_t, int, na_shape_t *);
 /* not implemented
 static VALUE ccomplexary2na(complex *, int, char *);
 */
@@ -57,9 +62,9 @@ dcl_ccharary2obj(cary, size, len)
 VALUE
 dcl_cintegerary2obj(cary, size, rank, shape)
     integer *cary;
-    int size;
+    na_shape_t size;
     int rank;
-    int *shape;
+    na_shape_t *shape;
 {
     VALUE obj;
@@ -75,9 +80,9 @@ dcl_cintegerary2obj(cary, size, rank, shape)
 VALUE
 dcl_crealary2obj(cary, size, rank, shape)
     real *cary;
-    int size;
+    na_shape_t size;
     int rank;
-    int *shape;
+    na_shape_t *shape;
 {
     VALUE obj;
@@ -112,9 +117,9 @@ dcl_ccomplexary2obj(cary, size, type)
 VALUE
 dcl_clogicalary2obj(cary, size, rank, shape)
     logical *cary;
-    int size;
+    na_shape_t size;
     int rank;
-    int *shape;
+    na_shape_t *shape;
 {
     VALUE obj;
@@ -271,13 +276,13 @@ clogicalary2ary(cary, size)
 static VALUE
 crealary2na(cary, size, rank, shape)
     real *cary;
-    int size;
+    na_shape_t size;
     int rank;
-    int *shape;
+    na_shape_t *shape;
 {
     VALUE obj;
     struct NARRAY *na;
-    int i;
+    na_shape_t i;
     float *ptr;
     if (cary == NULL)
@@ -299,13 +304,13 @@ crealary2na(cary, size, rank, shape)
 static VALUE
 cintegerary2na(cary, size, rank, shape)
     integer *cary;
-    int size;
+    na_shape_t size;
     int rank;
-    int *shape;
+    na_shape_t *shape;
 {
     VALUE obj;
     struct NARRAY *na;
-    int i;
+    na_shape_t i;
     int32_t *ptr;
     if (cary == NULL)
@@ -327,13 +332,13 @@ cintegerary2na(cary, size, rank, shape)
 static VALUE
 clogicalary2na(cary, size, rank, shape)
     logical *cary;
-    int size;
+    na_shape_t size;
     int rank;
-    int *shape;
+    na_shape_t *shape;
 {
     VALUE obj;
     struct NARRAY *na;
-    int i;
+    na_shape_t i;
     u_int8_t *ptr;
     if (cary == NULL)

data/ext/numru/dcl_obj2cary.c CHANGED

@@ -1,6 +1,6 @@
 /*
  * dcl_obj2cary.c
- *   $Id: dcl_obj2cary.c,v 1.1.1.1 2011/02/23 07:21:26 horinout Exp $
+ *   $Id$
  */
 #include <math.h>
@@ -8,6 +8,10 @@
 #include "libtinyf2c.h"
 #include "narray.h"
+#ifndef NARRAY_BIGMEM
+typedef int    na_shape_t;
+#endif
 /* for compatibility with ruby 1.6 */
 #ifndef RFLOAT_VALUE
 #define RFLOAT_VALUE(x) ((real)(RFLOAT(x)->value))
@@ -427,7 +431,7 @@ na2crealary(src)
     VALUE src;
 {
     VALUE chk;
-    int len, i;
+    na_shape_t len, i;
     real *rtn;
     float *ptr;
     struct NARRAY *na;
@@ -455,7 +459,7 @@ na2cintegerary(src)
     VALUE src;
 {
     VALUE chk;
-    int len, i;
+    na_shape_t len, i;
     integer *rtn;
     int32_t *ptr;
     struct NARRAY *na;
@@ -485,7 +489,7 @@ na2clogicalary(src)
 {
     VALUE chk;
     struct NARRAY *na;
-    int len, i;
+    na_shape_t len, i;
     logical *rtn;
     unsigned char *ptr;

data/ext/numru/dcl_rubydcloriginal.c CHANGED

@@ -6,9 +6,19 @@
 #include "ruby.h"
 #include "libtinyf2c.h"
 #include "narray.h"
+#include "cdcl.h"
+/* for compatibility with ruby 1.6 */
+#ifndef StringValuePtr
+#define StringValuePtr(s) STR2CSTR(s)
+#endif
 #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);
@@ -16,10 +26,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 *);

data/ext/numru/extconf.rb CHANGED

@@ -2,24 +2,19 @@ require "rubygems" unless defined?(Gem)
 require "mkmf"
 require "rbconfig"
-begin
-  require "fileutils"
-rescue LoadError
-  require "ftools"
-  module FileUtils
-    def copy(src, dst); File.copy(src, dst); end
-    module_function :copy
-  end
-end
+so = RbConfig::CONFIG["DLEXT"]
+#if Gem.respond_to?(:find_files) and Gem.find_files("numru/narray/narray.h").length > 0
+#  narray_include = File.expand_path(File.dirname(Gem.find_files("numru/narray/narray.h")[0]))
+#  narray_lib = File.expand_path(File.dirname(Gem.find_files("numru/narray/narray." + so)[0]))
+#elsif Gem.respond_to?(:find_files) and Gem.find_files("narray.h").length > 0
-if Gem.respond_to?(:find_files)
-  require "rbconfig"
-  so = RbConfig::CONFIG["DLEXT"]
+if Gem.respond_to?(:find_files) and Gem.find_files("narray.h").length > 0
   narray_include = File.expand_path(File.dirname(Gem.find_files("narray.h")[0]))
   narray_lib = File.expand_path(File.dirname(Gem.find_files("narray." + so)[0]))
 else
   gem_home=(`gem environment GEM_HOME`).chomp
-  narray_dir = Dir.glob("#{gem_home}/gems/narray-*").sort[-1]
+  narray_dir = Dir.glob("#{gem_home}/gems/narray-*/ext/narray").sort[-1]
   if narray_dir
     narray_include = narray_lib = narray_dir
   else
@@ -69,44 +64,7 @@ if(xsystem("which cdclconfig"))
   fin.close
 else
-  print "**Warning** cdclconfig is not found. Assume C version of DCL 5.2\n"
-  dcllibname = "cdcl52"
-  f2clibname = "f2c4dcl"
-  xlibname = "X11"
-  dcllibdir = "-L/usr/local/lib"
-  f2clibdir = "-L/usr/local/lib"
-  xlibdir = "-L/usr/local/X11R6/lib"
-  f2cincdir = "-I/usr/local/include"
-  $CFLAGS += f2cincdir
-  if(dcllibdir != f2clibdir)
-    libdir = " "+dcllibdir
-  else
-    libdir = " "+dcllibdir+" "+f2clibdir
-  end
-  $LOCAL_LIBS += " "+libdir+" "+xlibdir
-  $LOCAL_LIBS += " -l"+dcllibname+" -l"+f2clibname+" -l"+xlibname+" -lsocket -lnsl"
-  FileUtils.copy(initcfile_default, initcfile)
-end
-if /cygwin|mingw/ =~ RUBY_PLATFORM
-   have_library("narray") || raise("ERROR: narray import library is not found")
+  raise "cdclconfig is not found."
 end
 create_makefile("numru/dcl_raw")
-######  Modify Makefile: #######
-File.rename("Makefile","Makefile.orig")
-oldmkfl = File.open("Makefile.orig")
-newmkfl = File.open("Makefile","w")
-oldmkfl.each_line{ |line|
-   case(line)
-   when /^distclean:/
-      newmkfl.puts(line)
-      newmkfl.puts("\t\t@$(RM) Makefile.orig")
-      newmkfl.puts("\t\t@$(RM) init.c")
-   else
-      newmkfl.puts(line)
-   end
-}
-newmkfl.close