rua 0.3.5-mswin32 → 0.3.7-mswin32

data/README.txt

@@ -24,7 +24,10 @@ http://storehouse.sakura.ne.jp/rua/
 
     require 'rua'
     
-    class MyClass; end
+    class MyClass
+      def val=(v); @val = v; end
+      def val; @val; end
+    end
     
     rua = Rua.new(:all)
     #rua.external_charset = Rua::SJIS
@@ -60,6 +63,8 @@ http://storehouse.sakura.ne.jp/rua/
       err()
       print(Time.new().to_s())
       my_obj = MyClass.new()
+      my_obj.val = 'my_obj.val'
+      print(my_obj.val())
     
       f = function()
         print('f() called.')

data/ext/rua.c

@@ -9,6 +9,7 @@ __declspec(dllexport) void Init_rua(void);
 #include <string.h>
 #include <malloc.h>
 #include <errno.h>
+#include <stdarg.h>
 
 #include "ruby.h"
 
@@ -20,7 +21,7 @@ __declspec(dllexport) void Init_rua(void);
 
 #include "rua.h"
 
-#define VERSION   "0.3.5"
+#define VERSION   "0.3.7"
 #define REF_RBOBJ "self"
 
 #define ICONV_JIS   "ISO-2022-JP"
@@ -978,7 +979,7 @@ static void rua_pushrbval(lua_State *L, VALUE rbval, struct rua_state *R) {
       lua_pushlightuserdata(L, (void *) rbval);
       lua_pushlightuserdata(L, R);
       lua_pushcclosure(L, rua_proc_call, 2);
-      rua_set_finalizer(L, -1, rbval, R);
+      rua_setmeta2(L, -1, "__gc", rua_finalize_rbobj, 2, rbval, R);
     } else {
       rua_newtable_from_obj(L, rbval, R);
     }
@@ -1021,15 +1022,17 @@ static void rua_newtable_from_hash(lua_State *L, VALUE hash, struct rua_state *R
 
 static void rua_newtable_from_obj(lua_State *L, VALUE obj, struct rua_state *R) {
   VALUE methods, name, method;
-  int i, tblidx;
+  int i, tblidx, prxidx;
 
+  lua_newtable(L);
+  prxidx = lua_gettop(L);
   lua_newtable(L);
   tblidx = lua_gettop(L);
   methods = rb_check_convert_type(obj, T_ARRAY, "Array", "methods");
 
   lua_pushstring(L, REF_RBOBJ);
   lua_pushlightuserdata(L, (void *) obj);
-  rua_set_finalizer(L, -1, obj, R);
+  rua_setmeta2(L, -1, "__gc", rua_finalize_rbobj, 2, obj, R);
   lua_rawset(L, tblidx);
   rb_hash_aset(R->refs, obj, Qtrue);
 
@@ -1046,6 +1049,47 @@ static void rua_newtable_from_obj(lua_State *L, VALUE obj, struct rua_state *R)
     rua_pushrbval(L, method, R);
     lua_rawset(L, tblidx);
   }
+
+  lua_pushvalue(L, -1);
+  rua_setmeta(L, prxidx, "__index", rua_getobject_event, 1);
+  rua_setmeta(L, prxidx, "__newindex", rua_setobject_event, 1);
+}
+
+static int rua_getobject_event(lua_State *L) {
+  int tblidx;
+
+  tblidx = lua_upvalueindex(1);
+  lua_rawget(L, tblidx);
+  return 1;
+}
+
+static int rua_setobject_event(lua_State *L) {
+  const char *key;
+  size_t keylen;
+  char *setter;
+  int tblidx;
+
+  tblidx = lua_upvalueindex(1);
+
+  key = lua_tostring(L, -2);
+  keylen = strlen(key);
+  setter = alloca(keylen + 2);
+  memcpy(setter, key, keylen);
+  setter[keylen] = '=';
+  setter[keylen + 1] = '\0';
+
+  lua_pushstring(L, setter);
+  lua_rawget(L, tblidx);
+
+  if (lua_isfunction(L, -1)) {
+    lua_pushvalue(L, -2);
+    lua_call(L, 1, 0);
+  } else {
+    lua_pop(L, 1);
+    lua_rawset(L, tblidx);
+  }
+
+  return 0;
 }
 
 static int rua_proc_call(lua_State *L) {
@@ -1213,10 +1257,10 @@ static const char *rua_classname_ptr(VALUE v) {
   return StringValuePtr(klassname);
 }
 
-static void rua_set_finalizer(lua_State *L, int idx, VALUE rbobj, struct rua_state *R) {
-  int pretop, objidx, tblidx;
+static void rua_setmeta(lua_State *L, int idx, const char *key, lua_CFunction f, int n) {
+  int basetop, objidx, tblidx, i;
 
-  pretop = lua_gettop(L);
+  basetop = lua_gettop(L) - n;
   lua_pushvalue(L, idx);
   objidx = lua_gettop(L);
 
@@ -1227,14 +1271,37 @@ static void rua_set_finalizer(lua_State *L, int idx, VALUE rbobj, struct rua_sta
   }
 
   tblidx = lua_gettop(L);
-  lua_pushstring(L, "__gc");
+  lua_pushstring(L, key);
 
-  lua_pushlightuserdata(L, (void *) rbobj);
-  lua_pushlightuserdata(L, R);
-  lua_pushcclosure(L, rua_finalize_rbobj, 2);
+  for (i = 1; i <= n; i++) {
+    lua_pushvalue(L, basetop + i);
+  }
+
+  if (n > 0) {
+    lua_pushcclosure(L, f, n);
+  } else {
+    lua_pushcfunction(L, f);
+  }
 
   lua_rawset(L, tblidx);
-  lua_pop(L, lua_gettop(L) - pretop);
+  lua_pop(L, lua_gettop(L) - basetop);
+}
+
+static void rua_setmeta2(lua_State *L, int idx, const char *key, lua_CFunction f, int n, ...) {
+  va_list argp;
+  int i;
+
+  va_start(argp, n);
+
+  for (i = 0; i < n; i++) {
+    lua_pushlightuserdata(L, va_arg(argp, void*));
+  }
+
+  if (idx < 0) {
+    idx -= n;
+  }
+
+  rua_setmeta(L, idx, key, f, n);
 }
 
 static int rua_finalize_rbobj(lua_State *L) {

metadata

@@ -1,50 +1,57 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
-specification_version: 1
 name: rua
 version: !ruby/object:Gem::Version 
-  version: 0.3.5
-date: 2007-12-10 00:00:00 +09:00
-summary: Rua is a library for using Lua under Ruby.
-require_paths: 
-- lib/i386-mswin32
-email: sgwr_dts@yahoo.co.jp
-homepage: http://rua.rubyforge.org
-rubyforge_project: 
-description: 
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.3.7
 platform: mswin32
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - winebarrel
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2007-12-26 00:00:00 +09:00
+default_executable: 
+dependencies: []
+
+description: 
+email: sgwr_dts@yahoo.co.jp
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README.txt
+- ext/rua.c
 files: 
 - README.txt
 - lib/i386-mswin32/rua.so
 - ext/rua.c
-test_files: []
-
+has_rdoc: true
+homepage: http://rua.rubyforge.org
+post_install_message: 
 rdoc_options: 
 - --title
 - Rua - library for using Lua under Ruby.
-extra_rdoc_files: 
-- README.txt
-- ext/rua.c
-executables: []
-
-extensions: []
-
+require_paths: 
+- lib/i386-mswin32
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
+rubyforge_project: 
+rubygems_version: 0.9.5
+signing_key: 
+specification_version: 2
+summary: Rua is a library for using Lua under Ruby.
+test_files: []