Skip to content

Commit

Permalink
mruby-test: move declarations in driver.c and vformat.c
Browse files Browse the repository at this point in the history
  • Loading branch information
@matz
matz committed May 1, 2024
1 parent 2c8cde2 commit c5314a2
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 57 deletions.
19 changes: 7 additions & 12 deletions mrbgems/mruby-test/driver.c
View file
Expand Up @@ -52,10 +52,9 @@ t_print(mrb_state *mrb, mrb_value self)
{
const mrb_value *argv;
mrb_int argc;
mrb_int i;

mrb_get_args(mrb, "*!", &argv, &argc);
for (i = 0; i < argc; i++) {
for (mrb_int i = 0; i < argc; i++) {
mrb_value s = mrb_obj_as_string(mrb, argv[i]);
fwrite(RSTRING_PTR(s), RSTRING_LEN(s), 1, stdout);
}
Expand Down Expand Up @@ -212,13 +211,11 @@ m_str_match_p(mrb_state *mrb, mrb_value self)
void
mrb_init_test_driver(mrb_state *mrb, mrb_bool verbose)
{
struct RClass *krn, *mrbtest;

krn = mrb->kernel_module;
struct RClass *krn = mrb->kernel_module;
mrb_define_method(mrb, krn, "t_print", t_print, MRB_ARGS_ANY());
mrb_define_method(mrb, krn, "_str_match?", m_str_match_p, MRB_ARGS_REQ(2));

mrbtest = mrb_define_module(mrb, "Mrbtest");
struct RClass *mrbtest = mrb_define_module(mrb, "Mrbtest");

#ifndef MRB_NO_FLOAT
#ifdef MRB_USE_FLOAT32
Expand All @@ -242,16 +239,14 @@ mrb_init_test_driver(mrb_state *mrb, mrb_bool verbose)
void
mrb_t_pass_result(mrb_state *mrb_dst, mrb_state *mrb_src)
{
mrb_value res_src;

if (mrb_src->exc) {
mrb_print_error(mrb_src);
exit(EXIT_FAILURE);
}

#define TEST_COUNT_PASS(name) \
do { \
res_src = mrb_gv_get(mrb_src, mrb_intern_lit(mrb_src, "$" #name)); \
mrb_value res_src = mrb_gv_get(mrb_src, mrb_intern_lit(mrb_src, "$" #name)); \
if (mrb_integer_p(res_src)) { \
mrb_value res_dst = mrb_gv_get(mrb_dst, mrb_intern_lit(mrb_dst, "$" #name)); \
mrb_gv_set(mrb_dst, mrb_intern_lit(mrb_dst, "$" #name), mrb_int_value(mrb_dst, mrb_integer(res_dst) + mrb_integer(res_src))); \
Expand All @@ -266,7 +261,7 @@ mrb_t_pass_result(mrb_state *mrb_dst, mrb_state *mrb_src)

#undef TEST_COUNT_PASS

res_src = mrb_gv_get(mrb_src, mrb_intern_lit(mrb_src, "$asserts"));
mrb_value res_src = mrb_gv_get(mrb_src, mrb_intern_lit(mrb_src, "$asserts"));

if (mrb_array_p(res_src)) {
mrb_int i;
Expand All @@ -283,7 +278,6 @@ int
main(int argc, char **argv)
{
mrb_state *mrb;
int ret;
mrb_bool verbose = FALSE;

print_hint();
Expand All @@ -303,7 +297,8 @@ main(int argc, char **argv)
mrb_init_test_driver(mrb, verbose);
mrb_load_irep(mrb, mrbtest_assert_irep);
mrbgemtest_init(mrb);
ret = eval_test(mrb);

int ret = eval_test(mrb);
mrb_close(mrb);

return ret;
Expand Down
62 changes: 17 additions & 45 deletions mrbgems/mruby-test/vformat.c
View file
Expand Up @@ -9,11 +9,8 @@ static mrb_value
vf_s_format_0(mrb_state *mrb, mrb_value klass)
{
mrb_value fmt_str;
const char *fmt;

mrb_get_args(mrb, "S", &fmt_str);
fmt = RSTRING_CSTR(mrb, fmt_str);

const char *fmt = RSTRING_CSTR(mrb, fmt_str);
return mrb_format(mrb, fmt);
}

Expand All @@ -22,12 +19,10 @@ static mrb_value
vf_s_format_c(mrb_state *mrb, mrb_value klass)
{
mrb_value fmt_str, arg_str;
const char *fmt;
char c;

mrb_get_args(mrb, "SS", &fmt_str, &arg_str);
fmt = RSTRING_CSTR(mrb, fmt_str);
c = RSTRING_CSTR(mrb, arg_str)[0];
const char *fmt = RSTRING_CSTR(mrb, fmt_str);
char c = RSTRING_CSTR(mrb, arg_str)[0];

return mrb_format(mrb, fmt, c);
}
Expand All @@ -37,14 +32,11 @@ static mrb_value
vf_s_format_d(mrb_state *mrb, mrb_value klass)
{
mrb_value fmt_str;
const char *fmt;
mrb_int i;
int d;

mrb_get_args(mrb, "Si", &fmt_str, &i);
fmt = RSTRING_CSTR(mrb, fmt_str);
d = (int)i;

const char *fmt = RSTRING_CSTR(mrb, fmt_str);
int d = (int)i;
return mrb_format(mrb, fmt, d);
}

Expand All @@ -54,12 +46,10 @@ static mrb_value
vf_s_format_f(mrb_state *mrb, mrb_value klass)
{
mrb_value fmt_str;
const char *fmt;
mrb_float f;

mrb_get_args(mrb, "Sf", &fmt_str, &f);
fmt = RSTRING_CSTR(mrb, fmt_str);

const char *fmt = RSTRING_CSTR(mrb, fmt_str);
return mrb_format(mrb, fmt, f);
}
#endif
Expand All @@ -69,12 +59,10 @@ static mrb_value
vf_s_format_i(mrb_state *mrb, mrb_value klass)
{
mrb_value fmt_str;
const char *fmt;
mrb_int i;

mrb_get_args(mrb, "Si", &fmt_str, &i);
fmt = RSTRING_CSTR(mrb, fmt_str);

const char *fmt = RSTRING_CSTR(mrb, fmt_str);
return mrb_format(mrb, fmt, i);
}

Expand All @@ -83,15 +71,12 @@ static mrb_value
vf_s_format_l(mrb_state *mrb, mrb_value klass)
{
mrb_value fmt_str, arg_str;
const char *fmt;
const char *s;
mrb_int i;
size_t len;

mrb_get_args(mrb, "SSi", &fmt_str, &arg_str, &i);
fmt = RSTRING_CSTR(mrb, fmt_str);
s = RSTRING_PTR(arg_str);
len = (size_t)i;
const char *fmt = RSTRING_CSTR(mrb, fmt_str);
const char *s = RSTRING_PTR(arg_str);
size_t len = (size_t)i;
if (len > (size_t)RSTRING_LEN(arg_str)) len = (size_t)RSTRING_LEN(arg_str);

return mrb_format(mrb, fmt, s, len);
Expand All @@ -102,12 +87,10 @@ static mrb_value
vf_s_format_n(mrb_state *mrb, mrb_value klass)
{
mrb_value fmt_str;
const char *fmt;
mrb_sym sym;

mrb_get_args(mrb, "Sn", &fmt_str, &sym);
fmt = RSTRING_CSTR(mrb, fmt_str);

const char *fmt = RSTRING_CSTR(mrb, fmt_str);
return mrb_format(mrb, fmt, sym);
}

Expand All @@ -116,13 +99,9 @@ static mrb_value
vf_s_format_s(mrb_state *mrb, mrb_value klass)
{
mrb_value fmt_str, arg_str;
const char *fmt;
const char *s;

mrb_get_args(mrb, "SS", &fmt_str, &arg_str);
fmt = RSTRING_CSTR(mrb, fmt_str);
s = RSTRING_CSTR(mrb, arg_str);

const char *fmt = RSTRING_CSTR(mrb, fmt_str);
const char *s = RSTRING_CSTR(mrb, arg_str);
return mrb_format(mrb, fmt, s);
}

Expand All @@ -131,13 +110,10 @@ static mrb_value
vf_s_format_C(mrb_state *mrb, mrb_value klass)
{
mrb_value fmt_str, arg_cls;
const char *fmt;
struct RClass *c;

mrb_get_args(mrb, "SC", &fmt_str, &arg_cls);
fmt = RSTRING_CSTR(mrb, fmt_str);
c = mrb_class_ptr(arg_cls);

const char *fmt = RSTRING_CSTR(mrb, fmt_str);
struct RClass *c = mrb_class_ptr(arg_cls);
return mrb_format(mrb, fmt, c);
}

Expand All @@ -146,20 +122,16 @@ static mrb_value
vf_s_format_v(mrb_state *mrb, mrb_value klass)
{
mrb_value fmt_str, arg_v;
const char *fmt;

mrb_get_args(mrb, "So", &fmt_str, &arg_v);
fmt = RSTRING_CSTR(mrb, fmt_str);

const char *fmt = RSTRING_CSTR(mrb, fmt_str);
return mrb_format(mrb, fmt, arg_v);
}

void
mrb_init_test_vformat(mrb_state *mrb)
{
struct RClass *vf;

vf = mrb_define_module(mrb, "TestVFormat");
struct RClass *vf = mrb_define_module(mrb, "TestVFormat");
mrb_define_class_method(mrb, vf, "z", vf_s_format_0, MRB_ARGS_REQ(1));

#define VF_DEFINE_FORMAT_METHOD(t) VF_DEFINE_FORMAT_METHOD_n(t,2)
Expand Down

0 comments on commit c5314a2

Please sign in to comment.