admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

mruby-struct/struct.c: allow empty Struct when a name is not given

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2023-03-09 14:57:58 +09:00
parent fc4fe48a00
commit c212edec5f
1 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-struct/src/struct.c
+10 -18
View File
@@ -264,22 +264,17 @@ mrb_struct_s_def(mrb_state *mrb, mrb_value klass)
name = mrb_nil_value();
mrb_get_args(mrb, "*&", &argv, &argc, &b);
if (argc == 0) { /* special case to avoid crash */
mrb_argnum_error(mrb, argc, 1, -1);
}
else {
if (argc > 0) {
pargv = argv;
argcnt = argc;
if (argc > 0) {
name = argv[0];
if (mrb_symbol_p(name)) {
/* 1stArgument:symbol -> name=nil rest=argv[0..n] */
name = mrb_nil_value();
}
else {
pargv++;
argcnt--;
}
name = argv[0];
if (mrb_symbol_p(name)) {
/* 1stArgument:symbol -> name=nil rest=argv[0..n] */
name = mrb_nil_value();
}
else {
pargv++;
argcnt--;
}
rest = mrb_ary_new_from_values(mrb, argcnt, pargv);
for (i=0; i<argcnt; i++) {
@@ -290,11 +285,8 @@ mrb_struct_s_def(mrb_state *mrb, mrb_value klass)
if (!mrb_nil_p(b)) {
mrb_yield_with_class(mrb, b, 1, &st, st, mrb_class_ptr(st));
}
return st;
}
/* not reached */
return mrb_nil_value();
return st;
}
static mrb_int