rua 0.3.7-mswin32 → 0.3.9-mswin32

data/README.txt

@@ -27,6 +27,8 @@ http://storehouse.sakura.ne.jp/rua/
     class MyClass
       def val=(v); @val = v; end
       def val; @val; end
+      def [](k); "#{k}->#{@val}"; end
+      def []=(k, v); @val = "#{k}:#{v}"; end
     end
     
     rua = Rua.new(:all)
@@ -65,6 +67,9 @@ http://storehouse.sakura.ne.jp/rua/
       my_obj = MyClass.new()
       my_obj.val = 'my_obj.val'
       print(my_obj.val())
+      print(my_obj['foo'])
+      my_obj['bar'] = 'zoo'
+      print(my_obj.val())
     
       f = function()
         print('f() called.')

data/ext/rua.c

@@ -21,7 +21,7 @@ __declspec(dllexport) void Init_rua(void);
 
 #include "rua.h"
 
-#define VERSION   "0.3.7"
+#define VERSION   "0.3.9"
 #define REF_RBOBJ "self"
 
 #define ICONV_JIS   "ISO-2022-JP"
@@ -87,6 +87,7 @@ static const char *insecure_methods[] = {
 static const int insecure_method_num = sizeof(insecure_methods) / sizeof(char*);
 static VALUE Rua, RuaFunc, RuaThread, RuaError, RuaDebug;
 static VALUE s_all, s_base, s_package, s_string, s_table, s_math, s_io, s_debug;
+static VALUE m_method_unbound, m_methods_unbound;
 
 void Init_rua() {
   Rua = rb_define_class("Rua", rb_cObject);
@@ -118,6 +119,11 @@ void Init_rua() {
   rb_define_method(Rua, "error_handler=", rua_set_error_handler, 1);
   rb_define_method(Rua, "method_missing", rua_method_missing, -1);
 
+  m_method_unbound = rb_funcall(rb_cObject, rb_intern("instance_method"), 1, ID2SYM(rb_intern("method")));
+  m_methods_unbound = rb_funcall(rb_cObject, rb_intern("instance_method"), 1, ID2SYM(rb_intern("methods")));
+  rb_define_class_variable(Rua, "@@m_method_unbound", m_method_unbound);
+  rb_define_class_variable(Rua, "@@m_methods_unbound", m_methods_unbound);
+
   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);
@@ -1022,13 +1028,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;
+  VALUE m_method_bound, m_methods_bound;
   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");
+
+  m_method_bound = rb_funcall(m_method_unbound, rb_intern("bind"), 1, obj);
+  m_methods_bound = rb_funcall(m_methods_unbound, rb_intern("bind"), 1, obj);
+  methods = rb_check_convert_type(m_methods_bound, T_ARRAY, "Array", "call");
 
   lua_pushstring(L, REF_RBOBJ);
   lua_pushlightuserdata(L, (void *) obj);
@@ -1038,7 +1048,7 @@ static void rua_newtable_from_obj(lua_State *L, VALUE obj, struct rua_state *R)
 
   for (i = 0; i < RARRAY(methods)->len; i++) {
     name = rb_ary_entry(methods, i);
-    method = rb_funcall(obj, rb_intern("method"), 1, name);
+    method = rb_funcall(m_method_bound, rb_intern("call"), 1, name);
     rb_hash_aset(R->refs, method, Qtrue);
 
     if (R->secure && rua_name_is_insecure_method(StringValuePtr(name))) {
@@ -1059,7 +1069,23 @@ static int rua_getobject_event(lua_State *L) {
   int tblidx;
 
   tblidx = lua_upvalueindex(1);
+  lua_pushvalue(L, -1);
   lua_rawget(L, tblidx);
+
+  if (lua_isnil(L, -1)) {
+    lua_pop(L, 1);
+    lua_pushstring(L, "[]");
+    lua_rawget(L, tblidx);
+
+    if (lua_isfunction(L, -1)) {
+      lua_pushvalue(L, -2);
+      lua_call(L, 1, 1);
+    } else {
+      lua_pop(L, 1);
+      lua_pushnil(L);
+    }
+  }
+
   return 1;
 }
 
@@ -1086,7 +1112,17 @@ static int rua_setobject_event(lua_State *L) {
     lua_call(L, 1, 0);
   } else {
     lua_pop(L, 1);
-    lua_rawset(L, tblidx);
+    lua_pushstring(L, "[]=");
+    lua_rawget(L, tblidx);
+
+    if (lua_isfunction(L, -1)) {
+      lua_pushvalue(L, -3);
+      lua_pushvalue(L, -3);
+      lua_call(L, 2, 0);
+    } else {
+      lua_pop(L, 1);
+      lua_rawset(L, tblidx);
+    }
   }
 
   return 0;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rua
 version: !ruby/object:Gem::Version 
-  version: 0.3.7
+  version: 0.3.9
 platform: mswin32
 authors: 
 - winebarrel
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2007-12-26 00:00:00 +09:00
+date: 2007-12-28 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -49,7 +49,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 0.9.5
+rubygems_version: 1.0.1
 signing_key: 
 specification_version: 2
 summary: Rua is a library for using Lua under Ruby.