rua 0.4.3-mswin32 → 0.4.4-mswin32

data/ext/rua.c

@@ -1,7 +1,5 @@
 /* */
 #ifdef _WIN32
-#pragma warning(disable:4311)
-#pragma warning(disable:4312)
 __declspec(dllexport) void Init_rua(void);
 #endif
 
@@ -21,7 +19,23 @@ __declspec(dllexport) void Init_rua(void);
 
 #include "rua.h"
 
-#define VERSION   "0.4.3"
+#ifndef RSTRING_PTR
+#define RSTRING_PTR(s) (RSTRING(s)->ptr)
+#endif
+
+#ifndef RSTRING_LEN
+#define RSTRING_LEN(s) (RSTRING(s)->len)
+#endif
+
+#ifndef RARRAY_PTR
+#define RARRAY_PTR(s) (RARRAY(s)->ptr)
+#endif
+
+#ifndef RARRAY_LEN
+#define RARRAY_LEN(s) (RARRAY(s)->len)
+#endif
+
+#define VERSION   "0.4.4"
 #define REF_RBOBJ "self"
 
 #define ICONV_JIS   "ISO-2022-JP"
@@ -284,11 +298,11 @@ static VALUE rua_eval(VALUE self, VALUE str) {
   Data_Get_Struct(self, struct rua, p);
 
   if (!NIL_P(p->R->external_charset)) {
-    str = rua_iconv(ICONV_UTF8, StringValuePtr(p->R->external_charset), str);
+    str = rua_iconv(ICONV_UTF8, RSTRING_PTR(p->R->external_charset), str);
   }
 
   pretop = lua_gettop(p->L);
-  luaL_loadstring(p->L, StringValuePtr(str));
+  luaL_loadstring(p->L, RSTRING_PTR(str));
 
   if (lua_pcall(p->L, 0, LUA_MULTRET, 0) != 0) {
     if (lua_islightuserdata(p->L, -1)) {
@@ -858,7 +872,7 @@ static VALUE rua_torbval(lua_State *L, int idx, struct rua_state *R) {
     rbval = rb_str_new2(lua_tostring(L, idx));
 
     if (!NIL_P(R->external_charset)) {
-      rbval = rua_iconv(StringValuePtr(R->external_charset), ICONV_UTF8, rbval);
+      rbval = rua_iconv(RSTRING_PTR(R->external_charset), ICONV_UTF8, rbval);
     }
 
     break;
@@ -949,10 +963,10 @@ static void rua_pushrbval(lua_State *L, VALUE rbval, struct rua_state *R) {
 
   case T_STRING:
     if (!NIL_P(R->external_charset)) {
-      rbval = rua_iconv(ICONV_UTF8, StringValuePtr(R->external_charset), rbval);
+      rbval = rua_iconv(ICONV_UTF8, RSTRING_PTR(R->external_charset), rbval);
     }
 
-    lua_pushstring(L, StringValuePtr(rbval));
+    lua_pushstring(L, RSTRING_PTR(rbval));
     break;
 
   case T_TRUE:
@@ -1001,7 +1015,7 @@ static void rua_newtable_from_ary(lua_State *L, VALUE ary, struct rua_state *R)
   lua_newtable(L);
   tblidx = lua_gettop(L);
 
-  for (i = 0; i < RARRAY(ary)->len; i++) {
+  for (i = 0; i < RARRAY_LEN(ary); i++) {
     entry = rb_ary_entry(ary, i);
     lua_pushnumber(L, i + 1);
     rua_pushrbval(L, entry, R);
@@ -1017,7 +1031,7 @@ static void rua_newtable_from_hash(lua_State *L, VALUE hash, struct rua_state *R
   tblidx = lua_gettop(L);
   keys = rb_check_convert_type(hash, T_ARRAY, "Array", "keys");
 
-  for (i = 0; i < RARRAY(keys)->len; i++) {
+  for (i = 0; i < RARRAY_LEN(keys); i++) {
     key = rb_ary_entry(keys, i);
     val = rb_hash_aref(hash, key);
     rua_pushrbval(L, key, R);
@@ -1046,12 +1060,12 @@ static void rua_newtable_from_obj(lua_State *L, VALUE obj, struct rua_state *R)
   lua_rawset(L, tblidx);
   rb_hash_aset(R->refs, obj, Qtrue);
 
-  for (i = 0; i < RARRAY(methods)->len; i++) {
+  for (i = 0; i < RARRAY_LEN(methods); i++) {
     name = rb_ary_entry(methods, i);
     method = rb_funcall(m_method_bound, rb_intern("call"), 1, name);
     rb_hash_aset(R->refs, method, Qtrue);
 
-    if (R->secure && rua_name_is_insecure_method(StringValuePtr(name))) {
+    if (R->secure && rua_name_is_insecure_method(RSTRING_PTR(name))) {
       continue;
     }
 
@@ -1190,7 +1204,7 @@ static VALUE _rua_proc_call(VALUE args) {
   VALUE proc;
 
   proc = rb_ary_pop(args);
-  return rb_funcall2(proc, rb_intern("call"), RARRAY(args)->len, RARRAY(args)->ptr);
+  return rb_funcall2(proc, rb_intern("call"), RARRAY_LEN(args), RARRAY_PTR(args));
 }
 
 
@@ -1278,7 +1292,7 @@ static VALUE rua_to_s(VALUE v) {
 static const char *rua_to_sptr(VALUE v) {
   VALUE str = rua_to_s(v);
 
-  return StringValuePtr(str);
+  return RSTRING_PTR(str);
 }
 
 static VALUE rua_classname(VALUE v) {
@@ -1290,7 +1304,7 @@ static VALUE rua_classname(VALUE v) {
 static const char *rua_classname_ptr(VALUE v) {
   VALUE klassname = rua_classname(v);
 
-  return StringValuePtr(klassname);
+  return RSTRING_PTR(klassname);
 }
 
 static void rua_setmeta(lua_State *L, int idx, const char *key, lua_CFunction f, int n) {
@@ -1369,7 +1383,7 @@ static VALUE rua_iconv(const char *to, const char *from, VALUE in) {
     return Qnil;
   }
 
-  cin = StringValuePtr(in);
+  cin = RSTRING_PTR(in);
   cin_len = strlen(cin);
   cout_len = cin_len * 3 + 1;
   cout = pcout = alloca(sizeof(char) * cout_len);

metadata

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