Merge pull request #4609 from shuujii/change-the-mrb_vformat-specifier-%d-for-int

Change the `mrb_vformat` specifier `%d` for `int`

1 files changed, 46 insertions, 44 deletions

diff --git a/mrbgems/mruby-test/vformat.c b/mrbgems/mruby-test/vformat.c
index a10e49b08..e6581d6be 100644
--- a/mrbgems/mruby-test/vformat.c
+++ b/mrbgems/mruby-test/vformat.c
@@ -6,14 +6,28 @@
 
 #define NATIVE_TYPES                                                        \
   char c;                                                                   \
+  int d;                                                                    \
   mrb_float f;                                                              \
   mrb_int i;                                                                \
   mrb_sym n;                                                                \
   char *s;                                                                  \
   struct RClass *C
 
+#define NATIVE_DEFINE_TYPE_FUNC(t)                                          \
+  static mrb_value                                                          \
+  native_s_##t(mrb_state *mrb, mrb_value klass)                             \
+  {                                                                         \
+    mrb_value obj, type = mrb_fixnum_value(ARG_##t);                        \
+    mrb_get_args(mrb, "o", &obj);                                           \
+    return mrb_funcall(mrb, klass, "new", 2, type, obj);                    \
+  }
+
+#define NATIVE_DEFINE_TYPE_METHOD(t) \
+  mrb_define_class_method(mrb, n, #t, native_s_##t, MRB_ARGS_REQ(1))
+
 typedef enum {
   ARG_c,
+  ARG_d,
   ARG_f,
   ARG_i,
   ARG_n,
@@ -51,56 +65,37 @@ static mrb_value
 native_initialize(mrb_state *mrb, mrb_value self)
 {
   VFNative data, *datap;
+  mrb_int type;
   mrb_value obj;
 
-  mrb_get_args(mrb, "o", &obj);
-  switch (mrb_type(obj)) {
-    case MRB_TT_FLOAT:
-      data.f = mrb_float(obj);
-      data.type = ARG_f;
-      break;
-    case MRB_TT_FIXNUM:
-      data.i = mrb_fixnum(obj);
-      data.type = ARG_i;
-      break;
-    case MRB_TT_SYMBOL:
-      data.n = mrb_symbol(obj);
-      data.type = ARG_n;
-      break;
-    case MRB_TT_CLASS: case MRB_TT_SCLASS: case MRB_TT_MODULE:
-      data.C = mrb_class_ptr(obj);
-      data.type = ARG_C;
-      break;
-    case MRB_TT_STRING: {
-      mrb_int len = RSTRING_LEN(obj);
-      const char *s = RSTRING_PTR(obj);
-      if (len == 1) {
-        /* one byte string is considered char */
-        data.c = s[0];
-        data.type = ARG_c;
-      }
-      else {
-        data.s = (char*)mrb_malloc(mrb, len + 1);
-        memcpy(data.s, s, len);
-        data.s[len] = '\0';
-        data.type = ARG_s;
-      }
-      break;
-    }
-    default: {
-      mrb_value msg = mrb_str_new_cstr(mrb, "native type for ");
-      mrb_str_cat_cstr(mrb, msg, mrb_class_name(mrb, mrb_class(mrb, obj)));
-      mrb_str_cat_cstr(mrb, msg, " is unknown");
-      mrb_raise(mrb, E_ARGUMENT_ERROR, RSTRING_PTR(msg));
-    }
+  mrb_get_args(mrb, "io", &type, &obj);
+  data.type = (VFArgumentType)type;
+  switch (data.type) {
+    case ARG_c: data.c = RSTRING_PTR(obj)[0]; break;
+    case ARG_d: data.d = (int)mrb_fixnum(obj); break;
+    case ARG_f: data.f = mrb_float(obj); break;
+    case ARG_i: data.i = mrb_fixnum(obj); break;
+    case ARG_n: data.n = mrb_symbol(obj); break;
+    case ARG_s: data.s = (char*)mrb_malloc(mrb, RSTRING_LEN(obj) + 1);
+                memcpy(data.s, RSTRING_PTR(obj), RSTRING_LEN(obj));
+                data.s[RSTRING_LEN(obj)] = '\0'; break;
+    case ARG_C: data.C = mrb_class_ptr(obj); break;
+    default: mrb_raise(mrb, E_ARGUMENT_ERROR, "unknown type");
   }
-
   datap = (VFNative*)mrb_malloc(mrb, sizeof(VFNative));
   *datap = data;
   mrb_data_init(self, datap, &native_data_type);
   return self;
 }
 
+NATIVE_DEFINE_TYPE_FUNC(c)
+NATIVE_DEFINE_TYPE_FUNC(d)
+NATIVE_DEFINE_TYPE_FUNC(f)
+NATIVE_DEFINE_TYPE_FUNC(i)
+NATIVE_DEFINE_TYPE_FUNC(n)
+NATIVE_DEFINE_TYPE_FUNC(s)
+NATIVE_DEFINE_TYPE_FUNC(C)
+
 static VFArgument*
 arg_from_obj(mrb_state *mrb, mrb_value obj, struct RClass *native_class,
              VFArgument *vf_arg)
@@ -130,6 +125,7 @@ arg_from_obj(mrb_state *mrb, mrb_value obj, struct RClass *native_class,
 #define VF_FORMAT2(fmt, args) (                                             \
   VF_ARG(args, 0), VF_ARG(args, 1),                                         \
   VF_FORMAT2_COND_EXPR(fmt, vf_args, vf_args+1, c) :                        \
+  VF_FORMAT2_COND_EXPR(fmt, vf_args, vf_args+1, d) :                        \
   VF_FORMAT2_COND_EXPR(fmt, vf_args, vf_args+1, f) :                        \
   VF_FORMAT2_COND_EXPR(fmt, vf_args, vf_args+1, i) :                        \
   VF_FORMAT2_COND_EXPR(fmt, vf_args, vf_args+1, n) :                        \
@@ -142,6 +138,7 @@ arg_from_obj(mrb_state *mrb, mrb_value obj, struct RClass *native_class,
   a1->type == ARG_##t ? VF_FORMAT_TYPED(fmt, 2, a2, (a1)->t)
 #define VF_FORMAT_TYPED(fmt, n_arg, type_a, v1)                             \
   VF_FORMAT_TYPED_COND_EXPR(fmt, n_arg, type_a, v1, c) :                    \
+  VF_FORMAT_TYPED_COND_EXPR(fmt, n_arg, type_a, v1, d) :                    \
   VF_FORMAT_TYPED_COND_EXPR(fmt, n_arg, type_a, v1, f) :                    \
   VF_FORMAT_TYPED_COND_EXPR(fmt, n_arg, type_a, v1, i) :                    \
   VF_FORMAT_TYPED_COND_EXPR(fmt, n_arg, type_a, v1, n) :                    \
@@ -180,7 +177,12 @@ mrb_init_test_vformat(mrb_state *mrb)
 
   n = mrb_define_class_under(mrb, vf, "Native", mrb->object_class);
   MRB_SET_INSTANCE_TT(n, MRB_TT_DATA);
-  mrb_define_method(mrb, n, "initialize", native_initialize, MRB_ARGS_REQ(1));
-  mrb_singleton_class(mrb, mrb_obj_value(n));
-  mrb_define_alias(mrb, n->c, "[]", "new");
+  NATIVE_DEFINE_TYPE_METHOD(c);
+  NATIVE_DEFINE_TYPE_METHOD(d);
+  NATIVE_DEFINE_TYPE_METHOD(f);
+  NATIVE_DEFINE_TYPE_METHOD(i);
+  NATIVE_DEFINE_TYPE_METHOD(n);
+  NATIVE_DEFINE_TYPE_METHOD(s);
+  NATIVE_DEFINE_TYPE_METHOD(C);
+  mrb_define_method(mrb, n, "initialize", native_initialize, MRB_ARGS_REQ(2));
 }