rua 0.2.3 → 0.2.4

data/README.txt

@@ -32,6 +32,7 @@ http://rubyforge.org/frs/?group_id=4845
     
     rua.str = 'xxx'
     rua.num = 100
+    rua.range = 1..5
     rua.proc = lambda do
       puts 'proc called.'
     end
@@ -45,6 +46,9 @@ http://rubyforge.org/frs/?group_id=4845
       print('hello Rua!')
       print(str)
       print(num)
+      range.each(function(i)
+        print(i)
+      end)
       proc()
       err()
       print(Time.new().to_s())

data/ext/rua.c

@@ -16,7 +16,7 @@ __declspec(dllexport) void Init_rua(void);
 
 #include "rua.h"
 
-#define VERSION "0.2.3"
+#define VERSION "0.2.4"
 #define REF_RBOBJ "self"
 
 static const char *insecure_methods[] = {
@@ -686,7 +686,7 @@ 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;
-  VALUE proc, args, retval, errargs;
+  VALUE proc, args, last, retval, errargs;
   int i, n, status;
 
   proc = (VALUE) lua_touserdata(L, lua_upvalueindex(1));
@@ -698,8 +698,14 @@ static int rua_proc_call(lua_State *L) {
     rb_ary_push(args, rua_torbval(L, i + 1, R));
   }
 
+  last = (i > 0) ? rb_ary_entry(args, -1) : Qnil;
   rb_ary_push(args, proc);
-  retval = rb_protect(_rua_proc_call, args, &status);
+
+  if (rb_obj_is_kind_of(last, RuaFunc)) {
+    retval = rb_protect(_rua_proc_call_with_block, args, &status);
+  } else {
+    retval = rb_protect(_rua_proc_call, args, &status);
+  }
 
   if (status != 0) {
     if (rua_obj_is_executable(R->error_handler)) {
@@ -721,9 +727,28 @@ static int rua_proc_call(lua_State *L) {
 }
 
 static VALUE _rua_proc_call(VALUE args) {
-  VALUE proc = rb_ary_pop(args);
+  VALUE proc;
+
+  proc = rb_ary_pop(args);
+  return rb_funcall2(proc, rb_intern("call"), RARRAY(args)->len, RARRAY(args)->ptr);
+}
+
 
-  return rb_apply(proc, rb_intern("call"), args);
+static VALUE _rua_proc_call_with_block(VALUE args) {
+  VALUE proc, block;
+
+  proc = rb_ary_pop(args);
+  block = rb_ary_pop(args);
+  rb_ary_push(args, proc);
+  return rb_iterate(_rua_proc_call, args, _rua_proc_call_as_block, block);
+}
+
+static VALUE _rua_proc_call_as_block(VALUE block_arg, VALUE block, VALUE self) {
+  if (TYPE(block_arg) == T_ARRAY) {
+    return rb_apply(block, rb_intern("call"), block_arg);
+  } else {
+    return rb_funcall(block, rb_intern("call"), 1, block_arg);
+  }
 }
 
 static VALUE rua_toruaobj(VALUE klass, lua_State *L, int idx, struct rua_state *R) {

data/ext/rua.h

@@ -56,6 +56,8 @@ 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_proc_call_with_block(VALUE args);
+static VALUE _rua_proc_call_as_block(VALUE block_arg, VALUE block, VALUE self);
 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);

metadata

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