rua 0.4.7-mswin32 → 0.4.8-mswin32

data/README.txt

@@ -23,6 +23,7 @@ http://rubyforge.org/frs/?group_id=4845
     require 'rua'
     
     class MyClass
+      CONST_FOO = 100
       def val=(v); @val = v; end
       def val; @val; end
       def [](k); "#{k}->#{@val}"; end
@@ -68,6 +69,7 @@ http://rubyforge.org/frs/?group_id=4845
       print(my_obj['foo'])
       my_obj['bar'] = 'zoo'
       print(my_obj.val())
+      print(MyClass.CONST_FOO)
     
       f = function()
         print('f() called.')

data/ext/rua.c

@@ -17,7 +17,13 @@ __declspec(dllexport) void Init_rua(void);
 #include "iconv.h"
 
 #include "ruby.h"
+
+#ifndef RUBY_VM
 #include "rubysig.h"
+#else
+#define TRAP_BEG
+#define TRAP_END
+#endif
 
 #include "rua.h"
 
@@ -37,7 +43,11 @@ __declspec(dllexport) void Init_rua(void);
 #define RARRAY_LEN(s) (RARRAY(s)->len)
 #endif
 
-#define VERSION   "0.4.7"
+#ifndef RUBY_VM
+#define rb_errinfo() ruby_errinfo
+#endif
+
+#define VERSION   "0.4.8"
 #define REF_RBOBJ "self"
 
 #define ICONV_JIS   "ISO-2022-JP"
@@ -104,6 +114,7 @@ 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;
+static VALUE m_constants_unbound, m_const_get_unbound;
 
 void Init_rua() {
   Rua = rb_define_class("Rua", rb_cObject);
@@ -142,6 +153,11 @@ void Init_rua() {
   rb_define_class_variable(Rua, "@@m_method_unbound", m_method_unbound);
   rb_define_class_variable(Rua, "@@m_methods_unbound", m_methods_unbound);
 
+  m_constants_unbound = rb_funcall(rb_cModule, rb_intern("instance_method"), 1, ID2SYM(rb_intern("constants")));
+  m_const_get_unbound = rb_funcall(rb_cModule, rb_intern("instance_method"), 1, ID2SYM(rb_intern("const_get")));
+  rb_define_class_variable(Rua, "@@m_constants_unbound", m_constants_unbound);
+  rb_define_class_variable(Rua, "@@m_const_get_unbound", m_const_get_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);
@@ -1157,7 +1173,7 @@ static void rua_newtable_from_obj(lua_State *L, VALUE obj, struct rua_state *R)
     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(RSTRING_PTR(name))) {
+    if (R->secure && rua_name_is_insecure_method(StringValuePtr(name))) {
       continue;
     }
 
@@ -1166,6 +1182,23 @@ static void rua_newtable_from_obj(lua_State *L, VALUE obj, struct rua_state *R)
     lua_rawset(L, tblidx);
   }
 
+  if (rb_obj_is_kind_of(obj, rb_cModule)) {
+    VALUE cnsts, cname, cnst;
+    VALUE m_const_get_bound, m_constants_bound;
+    m_const_get_bound = rb_funcall(m_const_get_unbound, rb_intern("bind"), 1, obj);
+    m_constants_bound = rb_funcall(m_constants_unbound, rb_intern("bind"), 1, obj);
+    cnsts = rb_check_convert_type(m_constants_bound, T_ARRAY, "Array", "call");
+
+    for (i = 0; i < RARRAY_LEN(cnsts); i++) {
+      cname = rb_ary_entry(cnsts, i);
+      cnst = rb_funcall(m_const_get_bound, rb_intern("call"), 1, cname);
+      rb_hash_aset(R->refs, cnst, Qtrue);
+      rua_pushrbval(L, cname, R);
+      rua_pushrbval(L, cnst, 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);
@@ -1261,12 +1294,12 @@ static int rua_proc_call(lua_State *L) {
   if (status != 0) {
     if (R->wrap_error) {
       if (lua_getstack(L, 1, &ar) && lua_getinfo(L, "nSlu", &ar)) {
-        error = rua_toruaerror(ruby_errinfo, rua_toruadebug(&ar));
+        error = rua_toruaerror(rb_errinfo(), rua_toruadebug(&ar));
       } else {
-        error = rua_toruaerror(ruby_errinfo, Qnil);
+        error = rua_toruaerror(rb_errinfo(), Qnil);
       }
     } else {
-      error = ruby_errinfo;
+      error = rb_errinfo();
     }
 
     if (rua_obj_is_executable(R->error_handler)) {
@@ -1276,7 +1309,7 @@ static int rua_proc_call(lua_State *L) {
       retval = rb_protect(_rua_proc_call, errargs, &status);
 
       if (status != 0) {
-        rb_warn("%s\n", rua_to_sptr(ruby_errinfo));
+        rb_warn("%s\n", rua_to_sptr(rb_errinfo()));
       }
     } else {
       retval = Qnil;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rua
 version: !ruby/object:Gem::Version 
-  version: 0.4.7
+  version: 0.4.8
 platform: mswin32
 authors: 
 - winebarrel
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-30 00:00:00 +09:00
+date: 2009-06-26 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -49,7 +49,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rua
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Rua is a library for using Lua under Ruby.