rua 0.4.5-mswin32 → 0.4.6-mswin32

data/ext/rua.c

@@ -36,7 +36,7 @@ __declspec(dllexport) void Init_rua(void);
 #define RARRAY_LEN(s) (RARRAY(s)->len)
 #endif
 
-#define VERSION   "0.4.5"
+#define VERSION   "0.4.6"
 #define REF_RBOBJ "self"
 
 #define ICONV_JIS   "ISO-2022-JP"
@@ -292,7 +292,7 @@ static VALUE rua_openlibs(int argc, VALUE *argv, VALUE self) {
 static VALUE rua_eval(VALUE self, VALUE str) {
   struct rua *p;
   VALUE errinfo;
-  const char *errmsg;
+  const char *errmsg = NULL;
   int pretop, result = -1;
 
   Check_Type(str, T_STRING);
@@ -303,7 +303,24 @@ static VALUE rua_eval(VALUE self, VALUE str) {
   }
 
   pretop = lua_gettop(p->L);
-  luaL_loadstring(p->L, RSTRING_PTR(str));
+
+  if (luaL_loadstring(p->L, RSTRING_PTR(str)) != 0) {
+    int curtop = lua_gettop(p->L);
+
+    if (!lua_isnil(p->L, -1)) {
+      errmsg = lua_tostring(p->L, -1);
+    }
+
+    if (errmsg == NULL) {
+      errmsg = "(error object is not a string)";
+    }
+
+    if (curtop - pretop > 0) {
+      lua_pop(p->L, curtop - pretop);
+    }
+
+    rb_raise(RuaError, "%s", errmsg);
+  }
 
   TRAP_BEG;
   result = lua_pcall(p->L, 0, LUA_MULTRET, 0);

metadata

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