Load plruby-0.2.9 into trunk.

git-svn-id: file:///home/knu/repos/ts/plruby/trunk@24 1f148aff-833f-de11-9cfd-0015170b777a

Changes

@@ -15,4 +15,7 @@
 
  adapted for 7.3b3
 
-
+--- 0.2.9
+
+ adapted for 1.8.0
+ corrected stupid bug with GC 

extconf.rb

@@ -1,5 +1,13 @@
 #!/usr/bin/ruby
 require 'mkmf'
+
+stat_lib = if CONFIG.key?("LIBRUBYARG_STATIC")
+	      $LDFLAGS += " -L#{CONFIG['libdir']}"
+	      CONFIG["LIBRUBYARG_STATIC"]
+	   else
+	      "-lruby"
+	   end.sub(/^-l/, '')
+
 src_dir = ""
 if srcdir = with_config("pgsql-srcinc-dir")
    $CFLAGS = "-I#{srcdir}"
@@ -31,7 +39,7 @@
 if ! have_library("pq", "PQsetdbLogin")
     raise "libpq is missing"
 end
-$libs = append_library($libs, "ruby")
+$libs = append_library($libs, stat_lib)
 if ! version = with_config("pgsql-version")
    for version_in in [
 	 "#{include_dir}/config.h", 

plruby.c

@@ -188,26 +188,24 @@ static VALUE
 plruby_protect(args)
     VALUE *args;
 {
-    Datum *retval;
-    VALUE res;
+    Datum retval;
 
     if (sigsetjmp(Warn_restart, 1) != 0)
 	return pg_eCatch;
-    res = Data_Make_Struct(rb_cObject, Datum, 0, free, retval);
 #ifdef NEW_STYLE_FUNCTION
     if (CALLED_AS_TRIGGER((FunctionCallInfo)args))
-	*retval = PointerGetDatum(plruby_trigger_handler((FunctionCallInfo)args));
+	retval = PointerGetDatum(plruby_trigger_handler((FunctionCallInfo)args));
     else
-	*retval = plruby_func_handler((FunctionCallInfo)args);
+	retval = plruby_func_handler((FunctionCallInfo)args);
 #else
     if (CurrentTriggerData == NULL)
-	*retval = plruby_func_handler((FmgrInfo *)args[0], 
+	retval = plruby_func_handler((FmgrInfo *)args[0], 
 				     (FmgrValues *)args[1],
 				     (bool *)args[2]);
     else
-	*retval = (Datum) plruby_trigger_handler((FmgrInfo *)args[0]);
+	retval = (Datum) plruby_trigger_handler((FmgrInfo *)args[0]);
 #endif
-    return res;
+    return Data_Wrap_Struct(rb_cObject, 0, 0, (void *)retval);
 }
 
 Datum
@@ -221,7 +219,7 @@ plruby_call_handler(FmgrInfo *proinfo,
 {
     VALUE *args, c;
     sigjmp_buf save_restart;
-    Datum *result;
+    Datum result;
     int state;
 
     if (plruby_firstcall)
@@ -268,8 +266,9 @@ plruby_call_handler(FmgrInfo *proinfo,
 	else
 	    rb_raise(pg_ePLruby, "%.*s", RSTRING(d)->len, RSTRING(d)->ptr);
     }
-    Data_Get_Struct(c, Datum, result);
-    return *result;
+    Check_Type(c, T_DATA);
+    result = (Datum)DATA_PTR(c);
+    return result;
 }
 
 static Datum

test/plp/b.rb

@@ -2,7 +2,7 @@
 require 'rbconfig'
 include Config
 pwd = Dir.pwd
-pwd.sub!("[^/]+/[^/]+$", "")
+pwd.sub!(%r{[^/]+/[^/]+$}, "")
 language, extension = 'C', '_new'
 opaque = 'opaque'
 case ARGV[0].to_i

test/plt/b.rb

@@ -2,7 +2,7 @@
 require 'rbconfig'
 include Config
 pwd = Dir.pwd
-pwd.sub!("[^/]+/[^/]+$", "")
+pwd.sub!(%r{[^/]+/[^/]+$}, "")
 language, extension, procedural = 'C', '_old', 'procedural'
 opaque = 'opaque'
 case ARGV[0].to_i