rsruby 0.4.4 → 0.4.5

data/ext/Converters.c

@@ -108,11 +108,11 @@ SEXP ruby_to_R(VALUE obj)
 }
 
 /* Make a R list or vector from a Ruby array */
-static SEXP array_to_R(VALUE obj)
+SEXP array_to_R(VALUE obj)
 {
   VALUE it;
   SEXP robj, rit;
-  int i, len, state;
+  int i, state;
 
   /* This matrix defines what mode a vector should take given what
      it already contains and a new item
@@ -187,19 +187,12 @@ exception:
 }
 
 /* Make a R named list or vector from a Ruby Hash */
-static SEXP
+SEXP
 hash_to_R(VALUE obj)
 {
-  int len;
   VALUE keys, values;
   SEXP robj, names;
 
-  //TODO - Baffling. Not sure what's wrong with these functions?
-  //rb_hash_keys(proc_table);
-  //rb_hash_values(proc_table);
-  //rb_hash_size(proc_table);
-  //compiles, but complains they are undefined symbols when run...
-
   if (FIX2INT(rb_funcall(obj,rb_intern("size"),0)) == 0)
     return R_NilValue;
 
@@ -224,7 +217,7 @@ hash_to_R(VALUE obj)
   return NULL;
 }
 
-static int
+int
 type_to_int(VALUE obj)
 {
   if (obj == Qtrue || obj == Qfalse)
@@ -253,8 +246,6 @@ VALUE to_ruby_with_mode(SEXP robj, int mode)
   VALUE obj;
   int i;
 
-  int old_mode = mode;
-
   switch (mode)
     {
     case PROC_CONVERSION:
@@ -428,7 +419,7 @@ from_proc_table(SEXP robj, VALUE *fun)
 {
   VALUE proc_table, procs, proc, funs, res, obj, mode;
   VALUE args[2];
-  int i, l, error, exception;
+  int i, l, error;
 
   proc_table = rb_cvar_get(rb_const_get(rb_cObject, 
 					rb_intern("RSRuby")),
@@ -436,11 +427,6 @@ from_proc_table(SEXP robj, VALUE *fun)
 
   proc  = Qnil;
 
-  //TODO - Baffling. Not sure what's wrong with these functions?
-  //procs = rb_hash_keys(proc_table);
-  //funs  = rb_hash_values(proc_table);
-  //l     = FIX2INT(rb_hash_size(proc_table));
-
   procs = rb_funcall(proc_table,rb_intern("keys"),0);
   funs  = rb_funcall(proc_table,rb_intern("values"),0);
   l     = FIX2INT(rb_funcall(proc_table,rb_intern("size"),0));
@@ -609,7 +595,7 @@ to_ruby_class(SEXP robj, VALUE *obj)
 }
 
 /* Convert a R named vector or list to a Ruby Hash */
-static VALUE to_ruby_hash(VALUE obj, SEXP names)
+VALUE to_ruby_hash(VALUE obj, SEXP names)
 {
   int len, i;
   VALUE it, hash;
@@ -630,7 +616,7 @@ static VALUE to_ruby_hash(VALUE obj, SEXP names)
 
 /* We need to transpose the list because R makes array by the
  * fastest index */
-static VALUE ltranspose(VALUE list, int *dims, int *strides,
+VALUE ltranspose(VALUE list, int *dims, int *strides,
 			int pos, int shift, int len)
 {
   VALUE nl, it;
@@ -660,7 +646,7 @@ static VALUE ltranspose(VALUE list, int *dims, int *strides,
       
 /* Convert a R Array to a Ruby Array (in the form of
  * array of arrays of ...) */
-static VALUE to_ruby_array(VALUE obj, int *dims, int l)
+VALUE to_ruby_array(VALUE obj, int *dims, int l)
 {
   VALUE list;
   int i, c, *strides;

data/ext/Converters.h

@@ -37,9 +37,9 @@
 //Converters for Ruby to R
 SEXP ruby_to_R(VALUE val);
 
-static SEXP array_to_R(VALUE obj);
-static SEXP hash_to_R(VALUE obj);
-static int type_to_int(VALUE obj);
+SEXP array_to_R(VALUE obj);
+SEXP hash_to_R(VALUE obj);
+int type_to_int(VALUE obj);
 
 //Converters for R to Ruby
 VALUE to_ruby_with_mode(SEXP robj, int mode);
@@ -54,10 +54,10 @@ VALUE from_class_table(SEXP robj);
 VALUE call_proc(VALUE data);
 VALUE reset_mode(VALUE mode);
 
-static VALUE to_ruby_hash(VALUE obj, SEXP names);
-static VALUE to_ruby_array(VALUE obj, int *dims, int l);
+VALUE to_ruby_hash(VALUE obj, SEXP names);
+VALUE to_ruby_array(VALUE obj, int *dims, int l);
 
-static VALUE ltranspose(VALUE list, int *dims, int *strides,
+VALUE ltranspose(VALUE list, int *dims, int *strides,
 			int pos, int shift, int len);
 
 //Macros for quick checks

data/ext/rsruby.c

@@ -35,7 +35,7 @@
 /* This is inspired in $R_SRC/src/main/memory.c */
 static SEXP R_References;
 
-static SEXP
+SEXP
 RecursiveRelease(SEXP obj, SEXP list)
 {
   if (!isNull(list)) {
@@ -48,7 +48,7 @@ RecursiveRelease(SEXP obj, SEXP list)
 }
 
 /* TODO: This needs implementing as a Ruby destructor for each RObj */
-static void
+void
 Robj_dealloc(VALUE self)
 {
   /* Remove the object from the list of protected objects */
@@ -73,7 +73,7 @@ VALUE get_fun(VALUE self, VALUE name){
   int conversion=TOP_MODE;
   SEXP robj;
   VALUE  rubyobj;
-  VALUE  params[2];
+  //VALUE  params[2];
   char* cstr_name;
 
   str = StringValue(name);
@@ -144,10 +144,9 @@ VALUE rr_init(VALUE self){
  */
 void init_R(int argc, char **argv){
 
-  int   defaultArgc = 2;
   char *defaultArgv[] = {"rsruby","-q","--vanilla"};
 
-  Rf_initEmbeddedR(defaultArgc, defaultArgv);
+  Rf_initEmbeddedR(sizeof(defaultArgv) / sizeof(defaultArgv[0]), defaultArgv);
 }
 
 /* Ruby code */

data/ext/rsruby.h

@@ -61,14 +61,15 @@ extern void CleanEd(void);
 extern int R_CollectWarnings; 
 # define PrintWarnings Rf_PrintWarnings
 extern void PrintWarnings(void);
+extern void Rf_initEmbeddedR(int argc, char **argv);
 
 void Init_rsruby();
 
 void init_R(int argc, char *argv[0]);
 void r_finalize(void);
 
-static SEXP RecursiveRelease(SEXP obj, SEXP list);
-static void Robj_dealloc(VALUE self);
+SEXP RecursiveRelease(SEXP obj, SEXP list);
+void Robj_dealloc(VALUE self);
 
 VALUE shutdown(VALUE self);
 VALUE get_fun(VALUE self, VALUE name);
@@ -76,5 +77,6 @@ VALUE rr_init(VALUE self);
 
 VALUE RObj_lcall(VALUE self, VALUE args);
 VALUE RObj_to_ruby(VALUE self, VALUE args);
+int make_argl(VALUE args, SEXP *e);
 
 #endif

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: rsruby
 version: !ruby/object:Gem::Version 
-  version: 0.4.4
-date: 2007-02-22 00:00:00 +09:00
+  version: 0.4.5
+date: 2007-08-10 00:00:00 +09:00
 summary: RSRuby is a bridge library for Ruby giving Ruby developers access to the full R statistical programming environment. RSRuby embeds a full R interpreter inside the running Ruby script, allowing R methods to be called and data passed between the Ruby script and the R interpreter. Most data conversion is handled automatically, but user-definable conversion routines can also be written to handle any R or Ruby class.
 require_paths: 
 - lib
@@ -69,10 +69,20 @@ files:
 - test/test_all.rb
 test_files: 
 - test/test_all.rb
-rdoc_options: []
-
-extra_rdoc_files: []
-
+rdoc_options: 
+- --exclude
+- test/*
+- --main
+- README.txt
+- --inline-source
+extra_rdoc_files: 
+- README.txt
+- History.txt
+- License.txt
+- examples/arrayfields.rb
+- examples/bioc.rb
+- examples/dataframe.rb
+- examples/erobj.rb
 executables: []
 
 extensions: