rua 0.1.4 → 0.1.5

data/README.txt

@@ -10,6 +10,8 @@ Rua is a library for using Lua under Ruby.
 
     require 'rua'
     
+    class MyClass; end
+
     error_handler = lambda do |e|
       p e
     end
@@ -28,6 +30,8 @@ Rua is a library for using Lua under Ruby.
       raise 'err called.'
     end
     rua.Time = Time
+    rua.MyClass = MyClass
+    
     puts rua.eval(<<-EOS)
       print('hello Rua!')
       print(str)
@@ -35,6 +39,7 @@ Rua is a library for using Lua under Ruby.
       proc()
       err()
       print(Time.new().to_s())
+      my_obj = MyClass.new()
     
       f = function()
         print('f() called.')
@@ -44,6 +49,7 @@ Rua is a library for using Lua under Ruby.
     EOS
     
     rua.f.call
+    p rua.my_obj
     p rua.eval('return 1, 2, 3')
     
     co = rua.eval(<<-EOS)

data/ext/rua.c

@@ -15,6 +15,9 @@ __declspec(dllexport) void Init_rua(void);
 
 #include "rua.h"
 
+#define REF_RBOBJ "__self"
+#define VERSION "0.1.5"
+
 static const char *insecure_methods[] = {
   "__id__",
   "__send__",
@@ -81,7 +84,7 @@ void Init_rua() {
   RuaError = rb_define_class("RuaError", rb_eStandardError);
 
   rb_define_alloc_func(Rua, rua_alloc);
-  rb_define_const(Rua, "VERSION", rb_str_new2("0.1.4"));
+  rb_define_const(Rua, "VERSION", rb_str_new2(VERSION));
   rb_define_private_method(Rua, "initialize", rua_initialize, -1);
   rb_define_method(Rua, "openlibs", rua_openlibs, -1);
   rb_define_method(Rua, "eval", rua_eval, 1);
@@ -375,7 +378,7 @@ static VALUE rua_thread_resume(int argc, VALUE *argv, VALUE self) {
   lua_getglobal(p->L, "coroutine");
   pretop = lua_gettop(p->L);
   lua_pushstring(p->L, "resume");
-  lua_gettable(p->L, pretop);
+  lua_rawget(p->L, pretop);
   lua_rawgeti(p->L, LUA_REGISTRYINDEX, p->ref);
 
   for (i = 0; i < argc; i ++) {
@@ -428,7 +431,12 @@ static VALUE rua_torbval(lua_State *L, int idx, VALUE error_handler, int secure)
     break;
 
   case LUA_TTABLE:
-    rbval = rua_tohash(L, idx, error_handler, secure);
+    if (rua_is_rbobj(L, idx)) {
+      rbval = rua_torbobj(L, idx);
+    } else {
+      rbval = rua_tohash(L, idx, error_handler, secure);
+    }
+
     break;
 
   case LUA_TFUNCTION:
@@ -447,6 +455,31 @@ static VALUE rua_torbval(lua_State *L, int idx, VALUE error_handler, int secure)
   return rbval;
 }
 
+static int rua_is_rbobj(lua_State *L, int idx) {
+  int tblidx, is_rbobj;
+
+  lua_pushvalue(L, idx);
+  tblidx = lua_gettop(L);
+  lua_pushstring(L, REF_RBOBJ);
+  lua_rawget(L, tblidx);
+  is_rbobj = lua_islightuserdata(L, -1);
+  lua_pop(L, 2);
+  return is_rbobj;
+}
+
+static VALUE rua_torbobj(lua_State *L, int idx) {
+  VALUE rbobj;
+  int tblidx;
+
+  lua_pushvalue(L, idx);
+  tblidx = lua_gettop(L);
+  lua_pushstring(L, REF_RBOBJ);
+  lua_rawget(L, tblidx);
+  rbobj = (VALUE) lua_topointer(L, -1);
+  lua_pop(L, 2);
+  return rbobj;
+}
+
 static VALUE rua_tohash(lua_State *L, int idx, VALUE error_handler, int secure) {
   VALUE hash, key, val;
   int tblidx;
@@ -565,6 +598,10 @@ static void rua_newtable_from_obj(lua_State *L, VALUE obj, VALUE error_handler,
   tblidx = lua_gettop(L);
   methods = rb_check_convert_type(obj, T_ARRAY, "Array", "methods");
 
+  lua_pushstring(L, REF_RBOBJ);
+  lua_pushlightuserdata(L, (void *) obj);
+  lua_settable(L, tblidx);
+
   for (i = 0; i < RARRAY(methods)->len; i++) {
     name = rb_ary_entry(methods, i);
     method = rb_funcall(obj, rb_intern("method"), 1, name);

data/ext/rua.h

@@ -42,6 +42,8 @@ static VALUE rua_thread_initialize(VALUE self);
 static VALUE rua_thread_resume(int argc, VALUE *argv, VALUE self);
 
 static VALUE rua_torbval(lua_State *L, int idx, VALUE error_handler, int secure);
+static int rua_is_rbobj(lua_State *L, int idx);
+static VALUE rua_torbobj(lua_State *L, int idx);
 static VALUE rua_tohash(lua_State *L, int idx, VALUE error_handler, int secure);
 static void rua_pushrbval(lua_State *L, VALUE rbval, VALUE error_handler, int secure);
 static void rua_newtable_from_ary(lua_State *L, VALUE ary, VALUE error_handler, int secure);

metadata

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