Skip to content

Commit 1e9cb74

Browse files
shuujiishuujii
committed
Change second argument to %l of mrb_vformat() to size_t from mrb_int
- `size_t` is more commonly used. - `len` argument of `mrb_str_new()` is `size_t`. NOTE: The test for `%l` is temporarily disabled because adding a new type to `mrbgems/mruby-test/vformat.c` causes an error (memory error?) on Visual Studio 2017 in AppVeyor.
1 parent f6c41c1 commit 1e9cb74

4 files changed

Lines changed: 14 additions & 6 deletions

File tree

‎mrbgems/mruby-test/vformat.c‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ typedef mrb_int mrb_float;
1414
int d; \
1515
mrb_float f; \
1616
mrb_int i; \
17+
/* size_t l; */\
1718
mrb_sym n; \
1819
char *s; \
1920
struct RClass *C
@@ -35,6 +36,7 @@ typedef enum {
3536
ARG_d,
3637
ARG_f,
3738
ARG_i,
39+
/* ARG_l,*/
3840
ARG_n,
3941
ARG_s,
4042
ARG_C,
@@ -80,6 +82,7 @@ native_initialize(mrb_state *mrb, mrb_value self)
8082
case ARG_d: data.d = (int)mrb_fixnum(obj); break;
8183
case ARG_f: data.f = mrb_float(obj); break;
8284
case ARG_i: data.i = mrb_fixnum(obj); break;
85+
/* case ARG_l: data.l = (size_t)mrb_fixnum(obj); break;*/
8386
case ARG_n: data.n = mrb_symbol(obj); break;
8487
case ARG_s: data.s = (char*)mrb_malloc(mrb, RSTRING_LEN(obj) + 1);
8588
memcpy(data.s, RSTRING_PTR(obj), RSTRING_LEN(obj));
@@ -97,6 +100,7 @@ NATIVE_DEFINE_TYPE_FUNC(c)
97100
NATIVE_DEFINE_TYPE_FUNC(d)
98101
NATIVE_DEFINE_TYPE_FUNC(f)
99102
NATIVE_DEFINE_TYPE_FUNC(i)
103+
/*NATIVE_DEFINE_TYPE_FUNC(l)*/
100104
NATIVE_DEFINE_TYPE_FUNC(n)
101105
NATIVE_DEFINE_TYPE_FUNC(s)
102106
NATIVE_DEFINE_TYPE_FUNC(C)
@@ -133,6 +137,7 @@ arg_from_obj(mrb_state *mrb, mrb_value obj, struct RClass *native_class,
133137
VF_FORMAT2_COND_EXPR(fmt, vf_args, vf_args+1, d) : \
134138
VF_FORMAT2_COND_EXPR(fmt, vf_args, vf_args+1, f) : \
135139
VF_FORMAT2_COND_EXPR(fmt, vf_args, vf_args+1, i) : \
140+
/* VF_FORMAT2_COND_EXPR(fmt, vf_args, vf_args+1, l) : */\
136141
VF_FORMAT2_COND_EXPR(fmt, vf_args, vf_args+1, n) : \
137142
VF_FORMAT2_COND_EXPR(fmt, vf_args, vf_args+1, s) : \
138143
VF_FORMAT2_COND_EXPR(fmt, vf_args, vf_args+1, C) : \
@@ -146,6 +151,7 @@ arg_from_obj(mrb_state *mrb, mrb_value obj, struct RClass *native_class,
146151
VF_FORMAT_TYPED_COND_EXPR(fmt, n_arg, type_a, v1, d) : \
147152
VF_FORMAT_TYPED_COND_EXPR(fmt, n_arg, type_a, v1, f) : \
148153
VF_FORMAT_TYPED_COND_EXPR(fmt, n_arg, type_a, v1, i) : \
154+
/* VF_FORMAT_TYPED_COND_EXPR(fmt, n_arg, type_a, v1, l) : */\
149155
VF_FORMAT_TYPED_COND_EXPR(fmt, n_arg, type_a, v1, n) : \
150156
VF_FORMAT_TYPED_COND_EXPR(fmt, n_arg, type_a, v1, s) : \
151157
VF_FORMAT_TYPED_COND_EXPR(fmt, n_arg, type_a, v1, C) : \
@@ -186,6 +192,7 @@ mrb_init_test_vformat(mrb_state *mrb)
186192
NATIVE_DEFINE_TYPE_METHOD(d);
187193
NATIVE_DEFINE_TYPE_METHOD(f);
188194
NATIVE_DEFINE_TYPE_METHOD(i);
195+
/* NATIVE_DEFINE_TYPE_METHOD(l);*/
189196
NATIVE_DEFINE_TYPE_METHOD(n);
190197
NATIVE_DEFINE_TYPE_METHOD(s);
191198
NATIVE_DEFINE_TYPE_METHOD(C);

‎src/error.c‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ mrb_raise(mrb_state *mrb, struct RClass *c, const char *msg)
285285
* d | int |
286286
* f | mrb_float |
287287
* i | mrb_int |
288-
* l | char*, mrb_int | Arguments are string and length.
288+
* l | char*, size_t | Arguments are string and length.
289289
* n | mrb_sym |
290290
* s | char* | Argument is NUL terminated string.
291291
* t | mrb_value | Convert to type (class) of object.
@@ -303,8 +303,9 @@ mrb_vformat(mrb_state *mrb, const char *format, va_list ap)
303303
{
304304
const char *chars, *p = format, *b = format, *e;
305305
char ch;
306+
size_t len;
307+
mrb_int i;
306308
struct RClass *cls;
307-
mrb_int len, i;
308309
mrb_bool inspect = FALSE;
309310
mrb_value result = mrb_str_new_capa(mrb, 128), obj, str;
310311
int ai = mrb_gc_arena_save(mrb);
@@ -335,7 +336,7 @@ mrb_vformat(mrb_state *mrb, const char *format, va_list ap)
335336
#endif
336337
case 'l':
337338
chars = va_arg(ap, char*);
338-
len = va_arg(ap, mrb_int);
339+
len = va_arg(ap, size_t);
339340
L_cat:
340341
if (inspect) {
341342
obj = mrb_str_new(mrb, chars, len);

‎tasks/toolchains/visualcpp.rake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ MRuby::Toolchain.new(:visualcpp) do |conf, _params|
22
conf.cc do |cc|
33
cc.command = ENV['CC'] || 'cl.exe'
44
# C4013: implicit function declaration
5-
cc.flags = [ENV['CFLAGS'] || %w(/c /nologo /W3 /we4013 /Zi /MD /O2 /D_CRT_SECURE_NO_WARNINGS)]
5+
cc.flags = [ENV['CFLAGS'] || %w(/c /nologo /W3 /we4013 /Zi /Zm2000 /MD /O2 /D_CRT_SECURE_NO_WARNINGS)]
66
cc.defines = %w(MRB_STACK_EXTEND_DOUBLING)
77
cc.option_include_path = '/I%s'
88
cc.option_define = '/D%s'

‎test/t/vformat.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class << v
4141
assert_format '`t`: Fixnum', ['`t`: %t', 0]
4242
assert_format '`t`: Hash', ['`t`: %t', k: "value"]
4343
assert_format_pattern '#<Class:#<Class:#<Hash:0x*>>>', ['%t', sclass({})]
44-
assert_format 'string and length', ['string %l length', n.s('andante'), n.i(3)]
44+
# assert_format 'string and length', ['string %l length', n.s('andante'), n.l(3)]
4545
assert_format '`n`: sym', ['`n`: %n', n.n(:sym)]
4646
assert_format '%C文字列%', ['%s', n.s('%C文字列%')]
4747
assert_format '`C`: Kernel module', ['`C`: %C module', n.C(Kernel)]
@@ -65,7 +65,7 @@ class << v
6565
assert_format 'percent: %', ['percent: %%']
6666
assert_format '"I": inspect char', ['%!c: inspect char', n.c(?I)]
6767
assert_format '709: inspect mrb_int', ['%!d: inspect mrb_int', n.i(709)]
68-
assert_format '"a\x00b\xff"', ['%!l', n.s("a\000b\xFFc\000d"), n.i(4)]
68+
# assert_format '"a\x00b\xff"', ['%!l', n.s("a\000b\xFFc\000d"), n.l(4)]
6969
assert_format ':"&.": inspect symbol', ['%!n: inspect symbol', n.n(:'&.')]
7070
assert_format 'inspect "String"', ['inspect %!v', 'String']
7171
assert_format 'inspect Array: [1, :x, {}]', ['inspect Array: %!v', [1,:x,{}]]

0 commit comments

Comments
 (0)