From be86d8b45fa5d83f1d1caba9c4c0893c6281f720 Mon Sep 17 00:00:00 2001 From: Tomasz Dąbrowski Date: Tue, 10 Oct 2017 18:40:38 +0200 Subject: correctly handle *splat arguments in mrb_get_argc, also add mrb_vm_get_argc and mrb_get_argv Fixes #3825 --- include/mruby.h | 12 +++++++++++- src/class.c | 41 ++++++++++++++++++++++++++++++----------- 2 files changed, 41 insertions(+), 12 deletions(-) diff --git a/include/mruby.h b/include/mruby.h index 316707909..54ba0ead4 100644 --- a/include/mruby.h +++ b/include/mruby.h @@ -858,12 +858,22 @@ mrb_get_mid(mrb_state *mrb) /* get method symbol */ return mrb->c->ci->mid; } +/* returns -1 for *splat arguments */ static inline mrb_int -mrb_get_argc(mrb_state *mrb) /* get argc */ +mrb_vm_get_argc(mrb_state *mrb) /* get argc */ { return mrb->c->ci->argc; } +/** + * Retrieve number of arguments from mrb_state. + * + * Correctly handles *splat arguments. + */ +MRB_API mrb_int mrb_get_argc(mrb_state *mrb); + +MRB_API mrb_value* mrb_get_argv(mrb_state *mrb); + /* `strlen` for character string literals (use with caution or `strlen` instead) Adjacent string literals are concatenated in C/C++ in translation phase 6. If `lit` is not one, the compiler will report a syntax error: diff --git a/src/class.c b/src/class.c index f220106cd..506f540af 100644 --- a/src/class.c +++ b/src/class.c @@ -532,6 +532,34 @@ to_sym(mrb_state *mrb, mrb_value ss) } } +MRB_API mrb_int +mrb_get_argc(mrb_state *mrb) +{ + mrb_int argc = mrb_vm_get_argc(mrb); + if (argc < 0) { + struct RArray *a = mrb_ary_ptr(mrb->c->stack[1]); + + argc = ARY_LEN(a); + } + return argc; +} + +MRB_API mrb_value* +mrb_get_argv(mrb_state *mrb) +{ + mrb_int argc = mrb_vm_get_argc(mrb); + mrb_value *array_argv; + if (argc < 0) { + struct RArray *a = mrb_ary_ptr(mrb->c->stack[1]); + + array_argv = ARY_PTR(a); + } + else { + array_argv = NULL; + } + return array_argv; +} + /* retrieve arguments from mrb_state. @@ -569,23 +597,14 @@ mrb_get_args(mrb_state *mrb, const char *format, ...) char c; mrb_int i = 0; va_list ap; - mrb_int argc = mrb->c->ci->argc; + mrb_int argc = mrb_get_argc(mrb); mrb_int arg_i = 0; - mrb_value *array_argv; + mrb_value *array_argv = mrb_get_argv(mrb); mrb_bool opt = FALSE; mrb_bool opt_skip = TRUE; mrb_bool given = TRUE; va_start(ap, format); - if (argc < 0) { - struct RArray *a = mrb_ary_ptr(mrb->c->stack[1]); - - argc = ARY_LEN(a); - array_argv = ARY_PTR(a); - } - else { - array_argv = NULL; - } #define ARGV \ (array_argv ? array_argv : (mrb->c->stack + 1)) -- cgit v1.2.3 From b890528a183caf2f4161983a147508f65af8c700 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Tue, 17 Oct 2017 15:22:45 +0900 Subject: Remove `mrb_vm_get_argc`; ref #3826 --- include/mruby.h | 7 ------- src/class.c | 5 +++-- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/include/mruby.h b/include/mruby.h index 54ba0ead4..5c5a631e2 100644 --- a/include/mruby.h +++ b/include/mruby.h @@ -858,13 +858,6 @@ mrb_get_mid(mrb_state *mrb) /* get method symbol */ return mrb->c->ci->mid; } -/* returns -1 for *splat arguments */ -static inline mrb_int -mrb_vm_get_argc(mrb_state *mrb) /* get argc */ -{ - return mrb->c->ci->argc; -} - /** * Retrieve number of arguments from mrb_state. * diff --git a/src/class.c b/src/class.c index 506f540af..df645792c 100644 --- a/src/class.c +++ b/src/class.c @@ -535,7 +535,8 @@ to_sym(mrb_state *mrb, mrb_value ss) MRB_API mrb_int mrb_get_argc(mrb_state *mrb) { - mrb_int argc = mrb_vm_get_argc(mrb); + mrb_int argc = mrb->c->ci->argc; + if (argc < 0) { struct RArray *a = mrb_ary_ptr(mrb->c->stack[1]); @@ -547,7 +548,7 @@ mrb_get_argc(mrb_state *mrb) MRB_API mrb_value* mrb_get_argv(mrb_state *mrb) { - mrb_int argc = mrb_vm_get_argc(mrb); + mrb_int argc = mrb->c->ci->argc; mrb_value *array_argv; if (argc < 0) { struct RArray *a = mrb_ary_ptr(mrb->c->stack[1]); -- cgit v1.2.3 From 3c20c96f840d40950f4da61bd93f773a83767aef Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Tue, 17 Oct 2017 15:23:32 +0900 Subject: Use a new function: `mrb_get_argc()`; ref #3826 --- mrbgems/mruby-array-ext/src/array.c | 8 +++++--- mrbgems/mruby-string-ext/src/string.c | 7 ++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/mrbgems/mruby-array-ext/src/array.c b/mrbgems/mruby-array-ext/src/array.c index e99599b09..169f968f9 100644 --- a/mrbgems/mruby-array-ext/src/array.c +++ b/mrbgems/mruby-array-ext/src/array.c @@ -176,14 +176,16 @@ mrb_ary_slice_bang(mrb_state *mrb, mrb_value self) { struct RArray *a = mrb_ary_ptr(self); mrb_int i, j, k, len, alen = ARY_LEN(a); - mrb_value index; mrb_value val; mrb_value *ptr; mrb_value ary; mrb_ary_modify(mrb, a); - if (mrb_get_args(mrb, "o|i", &index, &len) == 1) { + if (mrb_get_argc(mrb) == 1) { + mrb_value index; + + mrb_get_args(mrb, "o|i", &index, &len); switch (mrb_type(index)) { case MRB_TT_RANGE: if (mrb_range_beg_len(mrb, index, &i, &len, alen, TRUE) == 1) { @@ -201,7 +203,7 @@ mrb_ary_slice_bang(mrb_state *mrb, mrb_value self) } } - i = mrb_fixnum(index); + mrb_get_args(mrb, "ii", &i, &len); delete_pos_len: if (i < 0) i += alen; if (i < 0 || alen < i) return mrb_nil_value(); diff --git a/mrbgems/mruby-string-ext/src/string.c b/mrbgems/mruby-string-ext/src/string.c index 612fc5335..5195a7ba0 100644 --- a/mrbgems/mruby-string-ext/src/string.c +++ b/mrbgems/mruby-string-ext/src/string.c @@ -44,12 +44,13 @@ mrb_str_byteslice(mrb_state *mrb, mrb_value str) { mrb_value a1; mrb_int len; - mrb_int argc; - argc = mrb_get_args(mrb, "o|i", &a1, &len); - if (argc == 2) { + if (mrb_get_argc(mrb) == 2) { + mrb_int pos; + mrb_get_args(mrb, "ii", &pos, &len); return mrb_str_substr(mrb, str, mrb_fixnum(a1), len); } + mrb_get_args(mrb, "o|i", &a1, &len); switch (mrb_type(a1)) { case MRB_TT_RANGE: { -- cgit v1.2.3