rua 0.2.4 → 0.2.5

data/ext/rua.c

@@ -16,7 +16,7 @@ __declspec(dllexport) void Init_rua(void);
 
 #include "rua.h"
 
-#define VERSION "0.2.4"
+#define VERSION "0.2.5"
 #define REF_RBOBJ "self"
 
 static const char *insecure_methods[] = {
@@ -97,13 +97,13 @@ void Init_rua() {
   rb_define_method(Rua, "error_handler=", rua_set_error_handler, 1);
   rb_define_method(Rua, "method_missing", rua_method_missing, -1);
 
-  rb_define_alloc_func(RuaFunc, rua_func_alloc);
+  rb_define_alloc_func(RuaFunc, rua_ref_alloc);
   rb_define_private_method(RuaFunc, "initialize", rua_func_initialize, 0);
   rb_define_method(RuaFunc, "call", rua_func_call, -1);
   //rb_define_method(RuaFunc, "[]", rua_func_get, 1);
   //rb_define_method(RuaFunc, "[]=", rua_func_set, 2);
 
-  rb_define_alloc_func(RuaThread, rua_thread_alloc);
+  rb_define_alloc_func(RuaThread, rua_ref_alloc);
   rb_define_private_method(RuaThread, "initialize", rua_thread_initialize, 0);
   rb_define_method(RuaThread, "resume", rua_thread_resume, -1);
 
@@ -352,17 +352,29 @@ static VALUE rua_method_missing(int argc, VALUE *argv, VALUE self) {
 
 // ------------------------------------------------------------------
 
-static VALUE rua_func_alloc(VALUE klass) {
+static VALUE rua_ref_alloc(VALUE klass) {
   struct rua_ref *p = ALLOC(struct rua_ref);
 
-  return Data_Wrap_Struct(klass, rua_func_mark, -1, p);
+  return Data_Wrap_Struct(klass, rua_ref_mark, rua_ref_free, p);
 }
 
-static void rua_func_mark(struct rua_ref *p) {
+static void rua_ref_mark(struct rua_ref *p) {
   rb_gc_mark(p->R->rua);
   rb_gc_mark(p->R->error_handler);
 }
 
+static void rua_ref_free(struct rua_ref *p) {
+  luaL_unref(p->L, LUA_REGISTRYINDEX, p->ref);
+
+  if (p->R) {
+    free(p->R);
+  }
+
+  free(p);
+}
+
+// ------------------------------------------------------------------
+
 /*
  * new RuaFunc instance.
  */
@@ -409,17 +421,6 @@ static VALUE rua_func_call(int argc, VALUE *argv, VALUE self) {
 
 // ------------------------------------------------------------------
 
-static VALUE rua_thread_alloc(VALUE klass) {
-  struct rua_ref *p = ALLOC(struct rua_ref);
-
-  return Data_Wrap_Struct(klass, rua_thread_mark, -1, p);
-}
-
-static void rua_thread_mark(struct rua_ref *p) {
-  rb_gc_mark(p->R->rua);
-  rb_gc_mark(p->R->error_handler);
-}
-
 /*
  * new RuaThread instance.
  */
@@ -606,7 +607,7 @@ static void rua_pushrbval(lua_State *L, VALUE rbval, struct rua_state *R) {
 
   default:
     if (R->secure && (rb_equal(rb_cModule, rbval) || rb_equal(rb_cClass, rbval))) {
-      fprintf(stderr, "warning: convert insecure value %s", rua_to_sptr(rbval));
+      rb_warn("warning: convert insecure value %s", rua_to_sptr(rbval));
       lua_pushnil(L);
     } else if (rb_obj_is_kind_of(rbval, RuaFunc)) {
       Data_Get_Struct(rbval, struct rua_ref, p);
@@ -698,7 +699,7 @@ static int rua_proc_call(lua_State *L) {
     rb_ary_push(args, rua_torbval(L, i + 1, R));
   }
 
-  last = (i > 0) ? rb_ary_entry(args, -1) : Qnil;
+  last = rb_ary_entry(args, -1);
   rb_ary_push(args, proc);
 
   if (rb_obj_is_kind_of(last, RuaFunc)) {
@@ -715,7 +716,7 @@ static int rua_proc_call(lua_State *L) {
       retval = rb_protect(_rua_proc_call, errargs, &status);
 
       if (status != 0) {
-        fprintf(stderr, "warning: %s\n", rua_to_sptr(ruby_errinfo));
+        rb_warn("%s\n", rua_to_sptr(ruby_errinfo));
       }
     } else {
       retval = Qnil;

data/ext/rua.h

@@ -33,15 +33,15 @@ static VALUE rua_get_error_handler(VALUE self);
 static VALUE rua_set_error_handler(VALUE self, VALUE error_handler);
 static VALUE rua_method_missing(int argc, VALUE *argv, VALUE self);
 
-static VALUE rua_func_alloc(VALUE klass);
-static void rua_func_mark(struct rua_ref *p);
+static VALUE rua_ref_alloc(VALUE klass);
+static void rua_ref_mark(struct rua_ref *p);
+static void rua_ref_free(struct rua_ref *p);
+
 static VALUE rua_func_initialize(VALUE self);
 static VALUE rua_func_call(int argc, VALUE *argv, VALUE self);
 //static VALUE rua_func_get(VALUE self, VALUE key);
 //static VALUE rua_func_set(VALUE self, VALUE key, VALUE val);
 
-static VALUE rua_thread_alloc(VALUE klass);
-static void rua_thread_mark(struct rua_ref *p);
 static VALUE rua_thread_initialize(VALUE self);
 static VALUE rua_thread_resume(int argc, VALUE *argv, VALUE self);
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: rua
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
-date: 2007-11-22 00:00:00 +09:00
+  version: 0.2.5
+date: 2007-11-23 00:00:00 +09:00
 summary: Rua is a library for using Lua under Ruby.
 require_paths: 
 - lib