rua 0.2.1-mswin32 → 0.2.2-mswin32

data/README.txt

@@ -10,6 +10,10 @@ Rua is a library for using Lua under Ruby.
 
 http://rubyforge.org/projects/rua
 
+== Install
+
+gem install rua
+
 == Download
 
 http://rubyforge.org/frs/?group_id=4845
@@ -19,15 +23,12 @@ http://rubyforge.org/frs/?group_id=4845
     require 'rua'
     
     class MyClass; end
-
-    error_handler = lambda do |e|
-      p e
-    end
     
-    rua = Rua.new(error_handler)
-    rua.openlibs(:all)
+    rua = Rua.new(:all)
     #rua.openlibs(:base, :package, :string)
-    #rua.secure = false
+    rua.error_handler = lambda do |e|
+      p e
+    end
     
     rua.str = 'xxx'
     rua.num = 100

data/ext/rua.c

@@ -1,3 +1,4 @@
+/* */
 #ifdef _WIN32
 #pragma warning(disable:4311)
 #pragma warning(disable:4312)
@@ -15,7 +16,7 @@ __declspec(dllexport) void Init_rua(void);
 
 #include "rua.h"
 
-#define VERSION "0.2.1"
+#define VERSION "0.2.2"
 #define REF_RBOBJ "self"
 
 static const char *insecure_methods[] = {
@@ -92,6 +93,8 @@ void Init_rua() {
   rb_define_method(Rua, "[]=", rua_set, 2);
   rb_define_method(Rua, "secure", rua_get_secure, 0);
   rb_define_method(Rua, "secure=", rua_set_secure, 1);
+  rb_define_method(Rua, "error_handler", rua_get_error_handler, 0);
+  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);
@@ -118,6 +121,7 @@ void Init_rua() {
 
 static VALUE rua_alloc(VALUE klass) {
   struct rua *p = ALLOC(struct rua);
+  p->R = ALLOC(struct rua_state);
 
   return Data_Wrap_Struct(klass, 0, rua_free, p);
 }
@@ -127,6 +131,10 @@ static void rua_free(struct rua *p) {
     lua_close(p->L);
   }
 
+  if (p->R) {
+    free(p->R);
+  }
+
   free(p);
 }
 
@@ -135,20 +143,16 @@ static void rua_free(struct rua *p) {
  */
 static VALUE rua_initialize(int argc, VALUE *argv, VALUE self) {
   struct rua *p;
-  VALUE error_handler;
 
   Data_Get_Struct(self, struct rua, p);
-  p->L = NULL;
+  p->L = lua_open();
+  p->R->secure = 1;
+  p->R->error_handler = Qnil;
 
-  if (rb_scan_args(argc, argv, "01", &error_handler) < 1) {
-    error_handler = Qnil;
-  } else if (!rua_obj_is_executable(error_handler)) {
-    rb_raise(rb_eTypeError, "wrong argument type %s (expected Proc or Method)", rua_classname_ptr(error_handler));
+  if (argc > 0) {
+    rua_openlibs(argc, argv, self);
   }
 
-  p->L = lua_open();
-  p->R.secure = 1;
-  p->R.error_handler = error_handler;
   return Qnil;
 }
 
@@ -249,7 +253,7 @@ static VALUE rua_set(VALUE self, VALUE key, VALUE val) {
 
   Data_Get_Struct(self, struct rua, p);
 
-  if (p->R.secure && (rb_equal(rb_cModule, val) || rb_equal(rb_cClass, val))) {
+  if (p->R->secure && (rb_equal(rb_cModule, val) || rb_equal(rb_cClass, val))) {
     rb_raise(RuaError, "set insecure value %s", rua_to_sptr(val));
   }
 
@@ -265,7 +269,7 @@ static VALUE rua_get_secure(VALUE self) {
   struct rua *p;
 
   Data_Get_Struct(self, struct rua, p);
-  return p->R.secure ? Qtrue : Qfalse;
+  return p->R->secure ? Qtrue : Qfalse;
 }
 
 /*
@@ -277,8 +281,8 @@ static VALUE rua_set_secure(VALUE self, VALUE secure) {
   Data_Get_Struct(self, struct rua, p);
 
   switch (TYPE(secure)) {
-  case T_TRUE:  p->R.secure = 1; break;
-  case T_FALSE: p->R.secure = 0; break;
+  case T_TRUE:  p->R->secure = 1; break;
+  case T_FALSE: p->R->secure = 0; break;
   default:
     rb_raise(rb_eTypeError, "wrong argument type %s (expected TrueClass or FalseClass)", rua_classname_ptr(secure));
     break;
@@ -287,6 +291,32 @@ static VALUE rua_set_secure(VALUE self, VALUE secure) {
   return Qnil;
 }
 
+
+/*
+ * get error handler flag.
+ */
+static VALUE rua_get_error_handler(VALUE self) {
+  struct rua *p;
+
+  Data_Get_Struct(self, struct rua, p);
+  return p->R->error_handler;
+}
+
+/*
+ * set error handler flag.
+ */
+static VALUE rua_set_error_handler(VALUE self, VALUE error_handler) {
+  struct rua *p;
+
+  if (!NIL_P(error_handler) && !rua_obj_is_executable(error_handler)) {
+    rb_raise(rb_eTypeError, "wrong argument type %s (expected Proc or Method)", rua_classname_ptr(error_handler));
+  }
+
+  Data_Get_Struct(self, struct rua, p);
+  p->R->error_handler = error_handler;
+  return Qnil;
+}
+
 /*
  * dispatch Rua#[], Rua#[]=.
  */
@@ -412,7 +442,7 @@ static VALUE rua_thread_resume(int argc, VALUE *argv, VALUE self) {
 
 // ------------------------------------------------------------------
 
-static VALUE rua_tomultiretval(lua_State *L, int pretop, struct rua_state R) {
+static VALUE rua_tomultiretval(lua_State *L, int pretop, struct rua_state *R) {
   VALUE retval;
   int nresults, i;
 
@@ -436,7 +466,7 @@ static VALUE rua_tomultiretval(lua_State *L, int pretop, struct rua_state R) {
   }
 }
 
-static VALUE rua_torbval(lua_State *L, int idx, struct rua_state R) {
+static VALUE rua_torbval(lua_State *L, int idx, struct rua_state *R) {
   VALUE rbval = Qnil;
 
   switch (lua_type(L, idx)) {
@@ -502,7 +532,7 @@ static VALUE rua_torbobj(lua_State *L, int idx) {
   return rbobj;
 }
 
-static VALUE rua_tohash(lua_State *L, int idx, struct rua_state R) {
+static VALUE rua_tohash(lua_State *L, int idx, struct rua_state *R) {
   VALUE hash, key, val;
   int tblidx;
 
@@ -522,7 +552,7 @@ static VALUE rua_tohash(lua_State *L, int idx, struct rua_state R) {
   return hash;
 }
 
-static void rua_pushrbval(lua_State *L, VALUE rbval, struct rua_state R) {
+static void rua_pushrbval(lua_State *L, VALUE rbval, struct rua_state *R) {
   struct rua_ref *p;
 
   switch (TYPE(rbval)) {
@@ -557,7 +587,7 @@ static void rua_pushrbval(lua_State *L, VALUE rbval, struct rua_state R) {
     break;
 
   default:
-    if (R.secure && (rb_equal(rb_cModule, rbval) || rb_equal(rb_cClass, rbval))) {
+    if (R->secure && (rb_equal(rb_cModule, rbval) || rb_equal(rb_cClass, rbval))) {
       fprintf(stderr, "warning: convert insecure value %s", rua_to_sptr(rbval));
       lua_pushnil(L);
     } else if (rb_obj_is_kind_of(rbval, RuaFunc)) {
@@ -568,9 +598,8 @@ static void rua_pushrbval(lua_State *L, VALUE rbval, struct rua_state R) {
       lua_rawgeti(L, LUA_REGISTRYINDEX, p->ref);
     } else if (rua_obj_is_executable(rbval)) {
       lua_pushlightuserdata(L, (void *) rbval);
-      lua_pushlightuserdata(L, (void *) R.error_handler);
-      lua_pushlightuserdata(L, (void *) R.secure);
-      lua_pushcclosure(L, rua_proc_call, 3);
+      lua_pushlightuserdata(L, R);
+      lua_pushcclosure(L, rua_proc_call, 2);
     } else {
       rua_newtable_from_obj(L, rbval, R);
     }
@@ -579,7 +608,7 @@ static void rua_pushrbval(lua_State *L, VALUE rbval, struct rua_state R) {
   }
 }
 
-static void rua_newtable_from_ary(lua_State *L, VALUE ary, struct rua_state R) {
+static void rua_newtable_from_ary(lua_State *L, VALUE ary, struct rua_state *R) {
   VALUE entry;
   int i, tblidx;
 
@@ -594,7 +623,7 @@ static void rua_newtable_from_ary(lua_State *L, VALUE ary, struct rua_state R) {
   }
 }
 
-static void rua_newtable_from_hash(lua_State *L, VALUE hash, struct rua_state R) {
+static void rua_newtable_from_hash(lua_State *L, VALUE hash, struct rua_state *R) {
   VALUE keys, key, val;
   int i, tblidx;
 
@@ -611,7 +640,7 @@ 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) {
+static void rua_newtable_from_obj(lua_State *L, VALUE obj, struct rua_state *R) {
   VALUE methods, name, method;
   int i, tblidx;
 
@@ -627,7 +656,7 @@ static void rua_newtable_from_obj(lua_State *L, VALUE obj, struct rua_state R) {
     name = rb_ary_entry(methods, i);
     method = rb_funcall(obj, rb_intern("method"), 1, name);
 
-    if (R.secure && rua_name_is_insecure_method(StringValuePtr(name))) {
+    if (R->secure && rua_name_is_insecure_method(StringValuePtr(name))) {
       continue;
     }
 
@@ -638,13 +667,12 @@ static void rua_newtable_from_obj(lua_State *L, VALUE obj, struct rua_state R) {
 }
 
 static int rua_proc_call(lua_State *L) {
-  struct rua_state R;
+  struct rua_state *R;
   VALUE proc, args, retval, errargs;
   int i, n, status;
 
   proc = (VALUE) lua_touserdata(L, lua_upvalueindex(1));
-  R.error_handler = (VALUE) lua_touserdata(L, lua_upvalueindex(2));
-  R.secure = (int) lua_touserdata(L, lua_upvalueindex(3));
+  R = (struct rua_state *) lua_touserdata(L, lua_upvalueindex(2));
   args = rb_ary_new();
   n = lua_gettop(L);
 
@@ -656,10 +684,10 @@ static int rua_proc_call(lua_State *L) {
   retval = rb_protect(_rua_proc_call, args, &status);
 
   if (status != 0) {
-    if (rua_obj_is_executable(R.error_handler)) {
+    if (rua_obj_is_executable(R->error_handler)) {
       errargs = rb_ary_new();
       rb_ary_push(errargs, ruby_errinfo);
-      rb_ary_push(errargs, R.error_handler);
+      rb_ary_push(errargs, R->error_handler);
       retval = rb_protect(_rua_proc_call, errargs, &status);
 
       if (status != 0) {
@@ -680,7 +708,7 @@ static VALUE _rua_proc_call(VALUE args) {
   return rb_apply(proc, rb_intern("call"), args);
 }
 
-static VALUE rua_toruaobj(VALUE klass, lua_State *L, int idx, struct rua_state R) {
+static VALUE rua_toruaobj(VALUE klass, lua_State *L, int idx, struct rua_state *R) {
   struct rua_ref *p;
   VALUE ruaobj;
 

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
+rubygems_version: 0.9.4
 specification_version: 1
 name: rua
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
-date: 2007-11-18 00:00:00 +09:00
+  version: 0.2.2
+date: 2007-11-19 00:00:00 +09:00
 summary: Rua is a library for using Lua under Ruby.
 require_paths: 
 - lib/i386-mswin32
@@ -32,16 +32,14 @@ files:
 - README.txt
 - lib/i386-mswin32/rua.so
 - ext/rua.c
-- ext/rua.h
 test_files: []
 
 rdoc_options: 
 - --title
-- Rua - RDoc Documentation
+- Rua - library for using Lua under Ruby.
 extra_rdoc_files: 
 - README.txt
 - ext/rua.c
-- ext/rua.h
 executables: []
 
 extensions: []

data/ext/rua.h

@@ -1,61 +0,0 @@
-#ifndef __RUA_H__
-#define __RUA_H__
-
-struct rua_state {
-  VALUE error_handler;
-  int secure;
-};
-
-struct rua {
-  lua_State *L;
-  struct rua_state R;
-};
-
-struct rua_ref {
-  lua_State *L;
-  struct rua_state R;
-  int ref;
-};
-
-void Init_rua();
-static VALUE rua_alloc(VALUE klass);
-static void rua_free(struct rua *p);
-static VALUE rua_initialize(int argc, VALUE *argv, VALUE self);
-static VALUE rua_openlibs(int argc, VALUE *argv, VALUE self);
-static VALUE rua_eval(VALUE self, VALUE str);
-static VALUE rua_get(VALUE self, VALUE key);
-static VALUE rua_set(VALUE self, VALUE key, VALUE val);
-static VALUE rua_get_secure(VALUE self);
-static VALUE rua_set_secure(VALUE self, VALUE secure);
-static VALUE rua_method_missing(int argc, VALUE *argv, VALUE self);
-
-static VALUE rua_func_alloc(VALUE klass);
-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 VALUE rua_thread_initialize(VALUE self);
-static VALUE rua_thread_resume(int argc, VALUE *argv, VALUE self);
-
-static VALUE rua_tomultiretval(lua_State *L, int pretop, struct rua_state R);
-static VALUE rua_torbval(lua_State *L, int idx, struct rua_state R);
-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, struct rua_state R);
-static void rua_pushrbval(lua_State *L, VALUE rbval, struct rua_state R);
-static void rua_newtable_from_ary(lua_State *L, VALUE ary, struct rua_state R);
-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);
-static int rua_proc_call(lua_State *L);
-static VALUE _rua_proc_call(VALUE args);
-static VALUE rua_toruaobj(VALUE klass, lua_State *L, int idx, struct rua_state R);
-static VALUE rua_obj_is_executable(VALUE obj);
-static int rua_name_is_insecure_method(const char *name);
-static VALUE rua_to_s(VALUE v);
-static const char *rua_to_sptr(VALUE v);
-static VALUE rua_classname(VALUE v);
-static const char *rua_classname_ptr(VALUE v);
-
-#endif