Ancurio
/
mkxp-freebird
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #57 from cremno/mri-use-rb_type_p-instead-of-rb_type 

MRI: use RB_TYPE_P() instead of rb_type()
This commit is contained in:
Jonas Kulla 2014-08-30 03:56:37 +02:00
parent f7d7b16eaf 70c40fe530
commit 2ba9f6589b
5 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
binding-mri/binding-mri.cpp
View File

@ -236,7 +236,7 @@ RB_METHOD(_kernelCaller)
VALUE trace = rb_funcall2(rb_mKernel, rb_intern("_mkxp_kernel_caller_alias"), 0, 0); VALUE trace = rb_funcall2(rb_mKernel, rb_intern("_mkxp_kernel_caller_alias"), 0, 0);
if (rb_type(trace) != RUBY_T_ARRAY) if (!RB_TYPE_P(trace, RUBY_T_ARRAY))
return trace; return trace;
long len = RARRAY_LEN(trace); long len = RARRAY_LEN(trace);
@ -320,7 +320,7 @@ static void runRMXPScripts()
VALUE scriptArray = kernelLoadDataInt(scriptPack.c_str()); VALUE scriptArray = kernelLoadDataInt(scriptPack.c_str());
if (rb_type(scriptArray) != RUBY_T_ARRAY) if (!RB_TYPE_P(scriptArray, RUBY_T_ARRAY))
{ {
showMsg("Failed to read script data"); showMsg("Failed to read script data");
return; return;
@ -337,7 +337,7 @@ static void runRMXPScripts()
{ {
VALUE script = rb_ary_entry(scriptArray, i); VALUE script = rb_ary_entry(scriptArray, i);
if (rb_type(script) != RUBY_T_ARRAY) if (!RB_TYPE_P(script, RUBY_T_ARRAY))
continue; continue;
VALUE scriptName = rb_ary_entry(script, 1); VALUE scriptName = rb_ary_entry(script, 1);

6
binding-mri/binding-util.cpp
View File

@ -148,7 +148,7 @@ rb_get_args(int argc, VALUE *argv, const char *format, ...)
VALUE *str = va_arg(ap, VALUE*); VALUE *str = va_arg(ap, VALUE*);
VALUE tmp = *arg; VALUE tmp = *arg;
if (!(rb_type(tmp) == RUBY_T_STRING)) if (!RB_TYPE_P(tmp, RUBY_T_STRING))
rb_raise(rb_eTypeError, "Argument %d: Expected string", argI); rb_raise(rb_eTypeError, "Argument %d: Expected string", argI);
*str = tmp; *str = tmp;
@ -167,7 +167,7 @@ rb_get_args(int argc, VALUE *argv, const char *format, ...)
VALUE tmp = *arg; VALUE tmp = *arg;
if (!(rb_type(tmp) == RUBY_T_STRING)) if (!RB_TYPE_P(tmp, RUBY_T_STRING))
rb_raise(rb_eTypeError, "Argument %d: Expected string", argI); rb_raise(rb_eTypeError, "Argument %d: Expected string", argI);
*s = RSTRING_PTR(tmp); *s = RSTRING_PTR(tmp);
@ -186,7 +186,7 @@ rb_get_args(int argc, VALUE *argv, const char *format, ...)
VALUE tmp = *arg++; VALUE tmp = *arg++;
if (!(rb_type(tmp) == RUBY_T_STRING)) if (!RB_TYPE_P(tmp, RUBY_T_STRING))
rb_raise(rb_eTypeError, "Argument %d: Expected string", argI); rb_raise(rb_eTypeError, "Argument %d: Expected string", argI);
*s = RSTRING_PTR(tmp); *s = RSTRING_PTR(tmp);

6
binding-mri/bitmap-binding.cpp
View File

@ -258,7 +258,7 @@ RB_METHOD(bitmapDrawText)
VALUE strObj; VALUE strObj;
rb_get_args(argc, argv, "oo|i", &rectObj, &strObj, &align RB_ARG_END); rb_get_args(argc, argv, "oo|i", &rectObj, &strObj, &align RB_ARG_END);
if (rb_type(strObj) != RUBY_T_STRING) if (!RB_TYPE_P(strObj, RUBY_T_STRING))
strObj = rb_funcallv(strObj, rb_intern("to_s"), 0, 0); strObj = rb_funcallv(strObj, rb_intern("to_s"), 0, 0);
str = RSTRING_PTR(strObj); str = RSTRING_PTR(strObj);
@ -281,7 +281,7 @@ RB_METHOD(bitmapDrawText)
VALUE strObj; VALUE strObj;
rb_get_args(argc, argv, "iiiio|i", &x, &y, &width, &height, &strObj, &align RB_ARG_END); rb_get_args(argc, argv, "iiiio|i", &x, &y, &width, &height, &strObj, &align RB_ARG_END);
if (rb_type(strObj) != RUBY_T_STRING) if (!RB_TYPE_P(strObj, RUBY_T_STRING))
strObj = rb_funcallv(strObj, rb_intern("to_s"), 0, 0); strObj = rb_funcallv(strObj, rb_intern("to_s"), 0, 0);
str = RSTRING_PTR(strObj); str = RSTRING_PTR(strObj);
@ -308,7 +308,7 @@ RB_METHOD(bitmapTextSize)
VALUE strObj; VALUE strObj;
rb_get_args(argc, argv, "o", &strObj RB_ARG_END); rb_get_args(argc, argv, "o", &strObj RB_ARG_END);
if (rb_type(strObj) != RUBY_T_STRING) if (!RB_TYPE_P(strObj, RUBY_T_STRING))
strObj = rb_funcallv(strObj, rb_intern("to_s"), 0, 0); strObj = rb_funcallv(strObj, rb_intern("to_s"), 0, 0);
str = RSTRING_PTR(strObj); str = RSTRING_PTR(strObj);

2
binding-mri/filesystem-binding.cpp
View File

@ -159,7 +159,7 @@ RB_METHOD(kernelSaveData)
static VALUE stringForceUTF8(VALUE arg) static VALUE stringForceUTF8(VALUE arg)
{ {
if (rb_type(arg) == RUBY_T_STRING && ENCODING_IS_ASCII8BIT(arg)) if (RB_TYPE_P(arg, RUBY_T_STRING) && ENCODING_IS_ASCII8BIT(arg))
rb_enc_associate_index(arg, rb_utf8_encindex()); rb_enc_associate_index(arg, rb_utf8_encindex());
return arg; return arg;

9
binding-mri/font-binding.cpp
View File

@ -38,7 +38,7 @@ RB_METHOD(fontDoesExist)
rb_get_args(argc, argv, "o", &nameObj RB_ARG_END); rb_get_args(argc, argv, "o", &nameObj RB_ARG_END);
if (rb_type(nameObj) == RUBY_T_STRING) if (RB_TYPE_P(nameObj, RUBY_T_STRING))
name = rb_string_value_cstr(&nameObj); name = rb_string_value_cstr(&nameObj);
return rb_bool_new(Font::doesExist(name)); return rb_bool_new(Font::doesExist(name));
@ -116,24 +116,23 @@ fontSetNameHelper(VALUE self, int argc, VALUE *argv,
rb_check_argc(argc, 1); rb_check_argc(argc, 1);
VALUE arg = argv[0]; VALUE arg = argv[0];
int type = rb_type(arg);
// Fixme: in RGSS3, specifying "" (and only that) as font name results in // Fixme: in RGSS3, specifying "" (and only that) as font name results in
// no text being drawn (everything else is substituted with Arial I think) // no text being drawn (everything else is substituted with Arial I think)
strncpy(outBuf, "", outLen); strncpy(outBuf, "", outLen);
if (type == RUBY_T_STRING) if (RB_TYPE_P(arg, RUBY_T_STRING))
{ {
strncpy(outBuf, RSTRING_PTR(arg), outLen); strncpy(outBuf, RSTRING_PTR(arg), outLen);
} }
else if (type == RUBY_T_ARRAY) else if (RB_TYPE_P(arg, RUBY_T_ARRAY))
{ {
for (long i = 0; i < RARRAY_LEN(arg); ++i) for (long i = 0; i < RARRAY_LEN(arg); ++i)
{ {
VALUE str = rb_ary_entry(arg, i); VALUE str = rb_ary_entry(arg, i);
/* Non-string objects are tolerated (ignored) */ /* Non-string objects are tolerated (ignored) */
if (rb_type(str) != RUBY_T_STRING) if (!RB_TYPE_P(str, RUBY_T_STRING))
continue; continue;
const char *family = RSTRING_PTR(str); const char *family = RSTRING_PTR(str);