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

Merge pull request #5535 from dearblue/get-args-frozen

Browse Source 
Checks the frozen object with `mrb_get_args()`
This commit is contained in:
Yukihiro "Matz" Matsumoto
2021-08-24 16:33:15 +09:00
committed by GitHub
parent 6f46f88873 66aa184a82
commit b8b86d1976
2 changed files with 105 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/mruby.h
+7
View File
@@ -912,6 +912,13 @@ MRB_API struct RClass* mrb_define_module_under_id(mrb_state *mrb, struct RClass
* | `:` | keyword args | {mrb_kwargs} const | Get keyword arguments. @see mrb_kwargs |
*
* @see mrb_get_args
*
* Immediately after format specifiers it can add format modifiers:
*
* | char | Notes |
* |:----:|-----------------------------------------------------------------------------------------|
* | `!` | Switch to the alternate mode; The behaviour changes depending on the format specifier |
* | `+` | Request a not frozen object; However, except nil value |
*/
typedef const char *mrb_args_format;
src/class.c
+98 -85
View File
@@ -902,6 +902,13 @@ void mrb_hash_check_kdict(mrb_state *mrb, mrb_value self);
|: optional Following arguments are optional
?: optional given [mrb_bool] true if preceding argument (optional) is given
':': keyword args [mrb_kwargs const] Get keyword arguments
format modifiers:
string note
----------------------------------------------------------------------------------------------
!: Switch to the alternate mode; The behaviour changes depending on the specifier
+: Request a not frozen object; However, except nil value
*/
MRB_API mrb_int
mrb_get_args(mrb_state *mrb, const char *format, ...)
@@ -915,7 +922,7 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
mrb_bool argv_on_stack = argc >= 0;
mrb_bool opt = FALSE;
mrb_bool opt_skip = TRUE;
mrb_bool given = TRUE;
const mrb_value *pickarg = NULL; /* arguments currently being processed */
mrb_value kdict;
mrb_bool reqkarg = FALSE;
int argc_min = 0, argc_max = 0;
@@ -940,6 +947,7 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
if (!reqkarg) reqkarg = strchr(fmt, ':') ? TRUE : FALSE;
goto check_exit;
case '!':
case '+':
break;
case ':':
reqkarg = TRUE;
@@ -967,15 +975,45 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
i = 0;
while ((c = *format++)) {
mrb_value *argv = ARGV;
mrb_bool altmode;
mrb_bool altmode = FALSE;
mrb_bool needmodify = FALSE;
for (; *format; format++) {
switch (*format) {
case '!':
if (altmode) goto modifier_exit; /* not accept for multiple '!' */
altmode = TRUE;
break;
case '+':
if (needmodify) goto modifier_exit; /* not accept for multiple '+' */
needmodify = TRUE;
break;
default:
goto modifier_exit;
}
}
modifier_exit:
switch (c) {
case '|': case '*': case '&': case '?': case ':':
if (needmodify) {
bad_needmodify:
mrb_raisef(mrb, E_ARGUMENT_ERROR, "wrong `%c+` modified specifer`", c);
}
break;
default:
if (argc <= i) {
if (i < argc) {
pickarg = &argv[i++];
if (needmodify && !mrb_nil_p(*pickarg)) {
if (mrb_immediate_p(*pickarg)) {
mrb_raisef(mrb, E_FROZEN_ERROR, "can't modify frozen %t", *pickarg);
}
mrb_check_frozen(mrb, mrb_obj_ptr(*pickarg));
}
}
else {
if (opt) {
given = FALSE;
pickarg = NULL;
}
else {
mrb_argnum_error(mrb, argc, argc_min, argc_max);
@@ -984,22 +1022,14 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
break;
}
if (*format == '!') {
format ++;
altmode = TRUE;
}
else {
altmode = FALSE;
}
switch (c) {
case 'o':
{
mrb_value *p;
p = va_arg(ap, mrb_value*);
if (i < argc) {
*p = argv[i++];
if (pickarg) {
*p = *pickarg;
}
}
break;
@@ -1008,14 +1038,11 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
mrb_value *p;
p = va_arg(ap, mrb_value*);
if (i < argc) {
mrb_value ss;
ss = argv[i++];
if (!class_ptr_p(ss)) {
mrb_raisef(mrb, E_TYPE_ERROR, "%v is not class/module", ss);
if (pickarg) {
if (!class_ptr_p(*pickarg)) {
mrb_raisef(mrb, E_TYPE_ERROR, "%v is not class/module", *pickarg);
}
*p = ss;
*p = *pickarg;
}
}
break;
@@ -1024,14 +1051,11 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
struct RClass **p;
p = va_arg(ap, struct RClass**);
if (i < argc) {
mrb_value ss;
ss = argv[i++];
if (!class_ptr_p(ss)) {
mrb_raisef(mrb, E_TYPE_ERROR, "%v is not class/module", ss);
if (pickarg) {
if (!class_ptr_p(*pickarg)) {
mrb_raisef(mrb, E_TYPE_ERROR, "%v is not class/module", *pickarg);
}
*p = mrb_class_ptr(ss);
*p = mrb_class_ptr(*pickarg);
}
}
break;
@@ -1040,11 +1064,11 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
mrb_value *p;
p = va_arg(ap, mrb_value*);
if (i < argc) {
*p = argv[i++];
if (!(altmode && mrb_nil_p(*p))) {
mrb_to_str(mrb, *p);
if (pickarg) {
if (!(altmode && mrb_nil_p(*pickarg))) {
mrb_to_str(mrb, *pickarg);
}
*p = *pickarg;
}
}
break;
@@ -1053,11 +1077,11 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
mrb_value *p;
p = va_arg(ap, mrb_value*);
if (i < argc) {
*p = argv[i++];
if (!(altmode && mrb_nil_p(*p))) {
*p = to_ary(mrb, *p);
if (pickarg) {
if (!(altmode && mrb_nil_p(*pickarg))) {
to_ary(mrb, *pickarg);
}
*p = *pickarg;
}
}
break;
@@ -1066,72 +1090,69 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
mrb_value *p;
p = va_arg(ap, mrb_value*);
if (i < argc) {
*p = argv[i++];
if (!(altmode && mrb_nil_p(*p))) {
*p = to_hash(mrb, *p);
if (pickarg) {
if (!(altmode && mrb_nil_p(*pickarg))) {
to_hash(mrb, *pickarg);
}
*p = *pickarg;
}
}
break;
case 's':
{
mrb_value ss;
const char **ps = 0;
mrb_int *pl = 0;
ps = va_arg(ap, const char**);
pl = va_arg(ap, mrb_int*);
if (i < argc) {
ss = argv[i++];
if (altmode && mrb_nil_p(ss)) {
if (needmodify) goto bad_needmodify;
if (pickarg) {
if (altmode && mrb_nil_p(*pickarg)) {
*ps = NULL;
*pl = 0;
}
else {
mrb_to_str(mrb, ss);
*ps = RSTRING_PTR(ss);
*pl = RSTRING_LEN(ss);
mrb_to_str(mrb, *pickarg);
*ps = RSTRING_PTR(*pickarg);
*pl = RSTRING_LEN(*pickarg);
}
}
}
break;
case 'z':
{
mrb_value ss;
const char **ps;
ps = va_arg(ap, const char**);
if (i < argc) {
ss = argv[i++];
if (altmode && mrb_nil_p(ss)) {
if (needmodify) goto bad_needmodify;
if (pickarg) {
if (altmode && mrb_nil_p(*pickarg)) {
*ps = NULL;
}
else {
mrb_to_str(mrb, ss);
*ps = RSTRING_CSTR(mrb, ss);
mrb_to_str(mrb, *pickarg);
*ps = RSTRING_CSTR(mrb, *pickarg);
}
}
}
break;
case 'a':
{
mrb_value aa;
struct RArray *a;
const mrb_value **pb;
mrb_int *pl;
pb = va_arg(ap, const mrb_value**);
pl = va_arg(ap, mrb_int*);
if (i < argc) {
aa = argv[i++];
if (altmode && mrb_nil_p(aa)) {
if (needmodify) goto bad_needmodify;
if (pickarg) {
if (altmode && mrb_nil_p(*pickarg)) {
*pb = 0;
*pl = 0;
}
else {
aa = to_ary(mrb, aa);
a = mrb_ary_ptr(aa);
to_ary(mrb, *pickarg);
a = mrb_ary_ptr(*pickarg);
*pb = ARY_PTR(a);
*pl = ARY_LEN(a);
}
@@ -1142,20 +1163,17 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
{
void* *p;
struct RClass *klass;
mrb_value ss;
p = va_arg(ap, void**);
klass = va_arg(ap, struct RClass*);
if (i < argc) {
ss = argv[i++];
if (!mrb_obj_is_kind_of(mrb, ss, klass)) {
mrb_raisef(mrb, E_TYPE_ERROR, "%v is not a %C", ss, klass);
if (pickarg) {
if (!mrb_obj_is_kind_of(mrb, *pickarg, klass)) {
mrb_raisef(mrb, E_TYPE_ERROR, "%v is not a %C", *pickarg, klass);
}
if (!mrb_istruct_p(ss))
{
mrb_raisef(mrb, E_TYPE_ERROR, "%v is not inline struct", ss);
if (!mrb_istruct_p(*pickarg)) {
mrb_raisef(mrb, E_TYPE_ERROR, "%v is not inline struct", *pickarg);
}
*p = mrb_istruct_ptr(ss);
*p = mrb_istruct_ptr(*pickarg);
}
}
break;
@@ -1165,8 +1183,8 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
mrb_float *p;
p = va_arg(ap, mrb_float*);
if (i < argc) {
*p = mrb_as_float(mrb, argv[i]); i++;
if (pickarg) {
*p = mrb_as_float(mrb, *pickarg);
}
}
break;
@@ -1176,8 +1194,8 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
mrb_int *p;
p = va_arg(ap, mrb_int*);
if (i < argc) {
*p = mrb_as_int(mrb, argv[i]); i++;
if (pickarg) {
*p = mrb_as_int(mrb, *pickarg);
}
}
break;
@@ -1185,9 +1203,8 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
{
mrb_bool *boolp = va_arg(ap, mrb_bool*);
if (i < argc) {
mrb_value b = argv[i++];
*boolp = mrb_test(b);
if (pickarg) {
*boolp = mrb_test(*pickarg);
}
}
break;
@@ -1196,11 +1213,8 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
mrb_sym *symp;
symp = va_arg(ap, mrb_sym*);
if (i < argc) {
mrb_value ss;
ss = argv[i++];
*symp = to_sym(mrb, ss);
if (pickarg) {
*symp = to_sym(mrb, *pickarg);
}
}
break;
@@ -1211,13 +1225,12 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
datap = va_arg(ap, void**);
type = va_arg(ap, struct mrb_data_type const*);
if (i < argc) {
mrb_value dd = argv[i++];
if (altmode && mrb_nil_p(dd)) {
if (pickarg) {
if (altmode && mrb_nil_p(*pickarg)) {
*datap = 0;
}
else {
*datap = mrb_data_get_ptr(mrb, dd, type);
*datap = mrb_data_get_ptr(mrb, *pickarg, type);
}
}
}
@@ -1249,7 +1262,7 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
mrb_bool *p;
p = va_arg(ap, mrb_bool*);
*p = given;
*p = pickarg ? TRUE : FALSE;
}
break;