rua 0.4.4 → 0.4.5

data/ext/rua.c

@@ -9,14 +9,15 @@ __declspec(dllexport) void Init_rua(void);
 #include <errno.h>
 #include <stdarg.h>
 
-#include "ruby.h"
-
 #include "lua.h"
 #include "lualib.h"
 #include "lauxlib.h"
 
 #include "iconv.h"
 
+#include "ruby.h"
+#include "rubysig.h"
+
 #include "rua.h"
 
 #ifndef RSTRING_PTR
@@ -35,7 +36,7 @@ __declspec(dllexport) void Init_rua(void);
 #define RARRAY_LEN(s) (RARRAY(s)->len)
 #endif
 
-#define VERSION   "0.4.4"
+#define VERSION   "0.4.5"
 #define REF_RBOBJ "self"
 
 #define ICONV_JIS   "ISO-2022-JP"
@@ -292,7 +293,7 @@ static VALUE rua_eval(VALUE self, VALUE str) {
   struct rua *p;
   VALUE errinfo;
   const char *errmsg;
-  int pretop;
+  int pretop, result = -1;
 
   Check_Type(str, T_STRING);
   Data_Get_Struct(self, struct rua, p);
@@ -304,7 +305,11 @@ static VALUE rua_eval(VALUE self, VALUE str) {
   pretop = lua_gettop(p->L);
   luaL_loadstring(p->L, RSTRING_PTR(str));
 
-  if (lua_pcall(p->L, 0, LUA_MULTRET, 0) != 0) {
+  TRAP_BEG;
+  result = lua_pcall(p->L, 0, LUA_MULTRET, 0);
+  TRAP_END;
+
+  if (result != 0) {
     if (lua_islightuserdata(p->L, -1)) {
       errinfo = (VALUE) lua_touserdata(p->L, -1);
       lua_pop(p->L, 1);
@@ -557,7 +562,7 @@ static VALUE rua_func_initialize(VALUE self) {
  */
 static VALUE rua_func_call(int argc, VALUE *argv, VALUE self) {
   struct rua_ref *p;
-  int pretop, i;
+  int pretop, i, result = -1;
   VALUE errinfo;
   const char *errmsg;
 
@@ -569,7 +574,11 @@ static VALUE rua_func_call(int argc, VALUE *argv, VALUE self) {
     rua_pushrbval(p->L, argv[i], p->R);
   }
 
-  if (lua_pcall(p->L, argc, LUA_MULTRET, 0) != 0) {
+  TRAP_BEG;
+  result = lua_pcall(p->L, argc, LUA_MULTRET, 0);
+  TRAP_END;
+
+  if (result != 0) {
     if (lua_islightuserdata(p->L, -1)) {
       errinfo = (VALUE) lua_touserdata(p->L, -1);
       lua_pop(p->L, 1);
@@ -622,7 +631,7 @@ static VALUE rua_thread_initialize(VALUE self) {
 static VALUE rua_thread_resume(int argc, VALUE *argv, VALUE self) {
   struct rua_ref *p;
   VALUE retval, errinfo;
-  int pretop, i;
+  int pretop, i, result = -1;
   const char *errmsg;
 
   Data_Get_Struct(self, struct rua_ref, p);
@@ -636,7 +645,11 @@ static VALUE rua_thread_resume(int argc, VALUE *argv, VALUE self) {
     rua_pushrbval(p->L, argv[i], p->R);
   }
 
-  if (lua_pcall(p->L, argc + 1, LUA_MULTRET, 0) != 0) {
+  TRAP_BEG;
+  result = lua_pcall(p->L, argc + 1, LUA_MULTRET, 0);
+  TRAP_END;
+
+  if (result != 0) {
     if (lua_islightuserdata(p->L, -1)) {
       errinfo = (VALUE) lua_touserdata(p->L, -1);
       lua_pop(p->L, 2);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rua
 version: !ruby/object:Gem::Version 
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors: 
 - winebarrel
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-09 00:00:00 +09:00
+date: 2008-09-15 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -50,7 +50,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rua
-rubygems_version: 1.1.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Rua is a library for using Lua under Ruby.