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

Check for ability to skip optional argument parsing.

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2017-08-25 09:00:58 +09:00
parent 60104ce41d
commit 1b545a6b63
1 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/class.c
+24
View File
@@ -562,6 +562,7 @@ to_sym(mrb_state *mrb, mrb_value ss)
MRB_API mrb_int
mrb_get_args(mrb_state *mrb, const char *format, ...)
{
const char *fmt = format;
char c;
int i = 0;
va_list ap;
@@ -569,6 +570,7 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
int arg_i = 0;
mrb_value *array_argv;
mrb_bool opt = FALSE;
mrb_bool opt_skip = TRUE;
mrb_bool given = TRUE;
va_start(ap, format);
@@ -585,6 +587,27 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
#define ARGV \
(array_argv ? array_argv : (mrb->c->stack + 1))
while ((c = *fmt++)) {
switch (c) {
case '|':
opt = TRUE;
break;
case '*':
opt_skip = FALSE;
goto check_exit;
case '!':
break;
case '&': case '?':
if (opt) opt_skip = FALSE;
break;
default:
break;
}
}
check_exit:
opt = FALSE;
i = 0;
while ((c = *format++)) {
switch (c) {
case '|': case '*': case '&': case '?':
@@ -884,6 +907,7 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
}
break;
case '|':
if (opt_skip && i == argc) return argc;
opt = TRUE;
break;
case '?':