rua 0.4.6 → 0.4.7

data/ext/rua.c

@@ -8,6 +8,7 @@ __declspec(dllexport) void Init_rua(void);
 #include <malloc.h>
 #include <errno.h>
 #include <stdarg.h>
+#include <math.h>
 
 #include "lua.h"
 #include "lualib.h"
@@ -36,7 +37,7 @@ __declspec(dllexport) void Init_rua(void);
 #define RARRAY_LEN(s) (RARRAY(s)->len)
 #endif
 
-#define VERSION   "0.4.6"
+#define VERSION   "0.4.7"
 #define REF_RBOBJ "self"
 
 #define ICONV_JIS   "ISO-2022-JP"
@@ -119,7 +120,7 @@ void Init_rua() {
   //rb_define_const(Rua, "UTF8", rb_str_new2(ICONV_UTF8));
   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);
+  rb_define_method(Rua, "eval", rua_eval, -1);
   rb_define_method(Rua, "[]", rua_get, 1);
   rb_define_method(Rua, "[]=", rua_set, 2);
   rb_define_method(Rua, "secure", rua_get_secure, 0);
@@ -133,6 +134,8 @@ void Init_rua() {
   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_method(Rua, "accept_block", rua_get_accept_block, 0);
+  rb_define_method(Rua, "accept_block=", rua_set_accept_block, 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")));
@@ -225,6 +228,7 @@ static VALUE rua_initialize(int argc, VALUE *argv, VALUE self) {
   p->R->secure = 1;
   p->R->abort_by_error = 1;
   p->R->wrap_error = 1;
+  p->R->accept_block = 1;
 
   if (argc > 0) {
     rua_openlibs(argc, argv, self);
@@ -289,13 +293,20 @@ static VALUE rua_openlibs(int argc, VALUE *argv, VALUE self) {
 /**
  * evaluates string.
  */
-static VALUE rua_eval(VALUE self, VALUE str) {
+static VALUE rua_eval(int argc, VALUE *argv, VALUE self) {
   struct rua *p;
-  VALUE errinfo;
+  VALUE str, script_name, errinfo;
   const char *errmsg = NULL;
-  int pretop, result = -1;
+  int pretop, loaded = -1, result = -1;
+
+  rb_scan_args(argc, argv, "11", &str, &script_name);
 
   Check_Type(str, T_STRING);
+
+  if (!NIL_P(script_name)) {
+    Check_Type(script_name, T_STRING);
+  }
+
   Data_Get_Struct(self, struct rua, p);
 
   if (!NIL_P(p->R->external_charset)) {
@@ -304,7 +315,13 @@ static VALUE rua_eval(VALUE self, VALUE str) {
 
   pretop = lua_gettop(p->L);
 
-  if (luaL_loadstring(p->L, RSTRING_PTR(str)) != 0) {
+  if (NIL_P(script_name)) {
+    loaded = luaL_loadstring(p->L, RSTRING_PTR(str));
+  } else {
+    loaded = luaL_loadbuffer(p->L, RSTRING_PTR(str), RSTRING_LEN(str), RSTRING_PTR(script_name));
+  }
+
+  if (loaded != 0) {
     int curtop = lua_gettop(p->L);
 
     if (!lua_isnil(p->L, -1)) {
@@ -540,11 +557,40 @@ static VALUE rua_method_missing(int argc, VALUE *argv, VALUE self) {
   }
 }
 
+/**
+ * get accept block flag.
+ */
+static VALUE rua_get_accept_block(VALUE self) {
+  struct rua *p;
+
+  Data_Get_Struct(self, struct rua, p);
+  return p->R->accept_block ? Qtrue : Qfalse;
+}
+
+/**
+ * set accept block flag.
+ */
+static VALUE rua_set_accept_block(VALUE self, VALUE accept_block) {
+  struct rua *p;
+
+  Data_Get_Struct(self, struct rua, p);
+
+  switch (TYPE(accept_block)) {
+  case T_TRUE:  p->R->accept_block = 1; break;
+  case T_FALSE: p->R->accept_block = 0; break;
+  default:
+    rb_raise(rb_eTypeError, "wrong argument type %s (expected TrueClass or FalseClass)", rua_classname_ptr(accept_block));
+    break;
+  }
+
+  return Qnil;
+}
+
 // ------------------------------------------------------------------
 
 static VALUE rua_ref_alloc(VALUE klass) {
   struct rua_ref *p = ALLOC(struct rua_ref);
-
+  p->is_ruby = 0;
   return Data_Wrap_Struct(klass, rua_ref_mark, rua_ref_free, p);
 }
 
@@ -565,6 +611,18 @@ static void rua_ref_free(struct rua_ref *p) {
   xfree(p);
 }
 
+static void rua_ref_set_ruby_flag(VALUE self, int is_ruby) {
+  struct rua_ref *p;
+  Data_Get_Struct(self, struct rua_ref, p);
+  p->is_ruby = is_ruby;
+}
+
+static int rua_ref_get_ruby_flag(VALUE self) {
+  struct rua_ref *p;
+  Data_Get_Struct(self, struct rua_ref, p);
+  return p->is_ruby;
+}
+
 // ------------------------------------------------------------------
 
 /**
@@ -891,7 +949,7 @@ static VALUE rua_torbval(lua_State *L, int idx, struct rua_state *R) {
 
   switch (lua_type(L, idx)) {
   case LUA_TNUMBER:
-    rbval = rb_float_new(lua_tonumber(L, idx));
+    rbval = rua_torbnum(L, idx);
     break;
 
   case LUA_TBOOLEAN:
@@ -917,7 +975,11 @@ static VALUE rua_torbval(lua_State *L, int idx, struct rua_state *R) {
     break;
 
   case LUA_TFUNCTION:
-    rbval = rua_toruaobj(RuaFunc, L, idx, R);
+    {
+      int type_is_cfunction = lua_iscfunction(L, idx);
+      rbval = rua_toruaobj(RuaFunc, L, idx, R);
+      rua_ref_set_ruby_flag(rbval, type_is_cfunction);
+    }
     break;
 
   case LUA_TTHREAD:
@@ -1190,7 +1252,7 @@ static int rua_proc_call(lua_State *L) {
   last = rb_ary_entry(args, -1);
   rb_ary_push(args, proc);
 
-  if (rb_obj_is_kind_of(last, RuaFunc)) {
+  if (R->accept_block && rb_obj_is_kind_of(last, RuaFunc) && !rua_ref_get_ruby_flag(last)) {
     retval = rb_protect(_rua_proc_call_with_block, args, &status);
   } else {
     retval = rb_protect(_rua_proc_call, args, &status);
@@ -1433,3 +1495,14 @@ static VALUE rua_iconv(const char *to, const char *from, VALUE in) {
 
   return out;
 }
+
+static VALUE rua_torbnum(lua_State *L, int idx) {
+  double luanum = lua_tonumber(L, idx);
+  double truncated = floor(luanum);
+
+  if (luanum == truncated) {
+    return INT2NUM(lua_tointeger(L, idx));
+  } else {
+    return rb_float_new(luanum);
+  }
+}

data/ext/rua.h

@@ -9,6 +9,7 @@ struct rua_state {
   int secure;
   int abort_by_error;
   int wrap_error;
+  int accept_block;
 };
 
 struct rua {
@@ -20,6 +21,7 @@ struct rua_ref {
   lua_State *L;
   struct rua_state *R;
   int ref;
+  int is_ruby;
 };
 
 struct rua_debug {
@@ -45,7 +47,7 @@ static void rua_mark(struct rua *p);
 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_eval(int argc, VALUE *argv, VALUE self);
 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);
@@ -59,10 +61,14 @@ static VALUE rua_set_external_charset(VALUE self, VALUE external_charset);
 static VALUE rua_get_error_handler(VALUE self);
 static VALUE rua_set_error_handler(VALUE self, VALUE error_handler);
 static VALUE rua_method_missing(int argc, VALUE *argv, VALUE self);
+static VALUE rua_get_accept_block(VALUE self);
+static VALUE rua_set_accept_block(VALUE self, VALUE accept_block);
 
 static VALUE rua_ref_alloc(VALUE klass);
 static void rua_ref_mark(struct rua_ref *p);
 static void rua_ref_free(struct rua_ref *p);
+static void rua_ref_set_ruby_flag(VALUE self, int is_ruby);
+static int rua_ref_get_ruby_flag(VALUE self);
 
 static VALUE rua_func_initialize(VALUE self);
 static VALUE rua_func_call(int argc, VALUE *argv, VALUE self);
@@ -118,5 +124,6 @@ static void rua_setmeta(lua_State *L, int idx, const char *key, lua_CFunction f,
 static void rua_setmeta2(lua_State *L, int idx, const char *key, lua_CFunction f, int n, ...);
 static int rua_finalize_rbobj(lua_State *L);
 static VALUE rua_iconv(const char *to, const char *from, VALUE in);
+static VALUE rua_torbnum(lua_State *L, int idx);
 
 #endif

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rua
 version: !ruby/object:Gem::Version 
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors: 
 - winebarrel
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-21 00:00:00 +09:00
+date: 2008-09-30 00:00:00 +09:00
 default_executable: 
 dependencies: []