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 #5530 from dearblue/mrb_get_args-I

Browse Source 
Check the class with `I` specifier of `mrb_get_args()`
This commit is contained in:
Yukihiro "Matz" Matsumoto
2021-08-13 18:11:26 +09:00
committed by GitHub
parent 9e74aad43c 01da5e1392
commit 32c30c35b2
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/mruby.h
+1 -1
View File
@@ -901,7 +901,7 @@ MRB_API struct RClass* mrb_define_module_under_id(mrb_state *mrb, struct RClass
* | `b` | boolean | {mrb_bool} | |
* | `n` | {String}/{Symbol} | {mrb_sym} | |
* | `d` | data | void *, {mrb_data_type} const | 2nd argument will be used to check data type so it won't be modified; when `!` follows, the value may be `nil` |
* | `I` | inline struct | void * | |
* | `I` | inline struct | void *, struct RClass | |
* | `&` | block | {mrb_value} | &! raises exception if no block given. |
* | `*` | rest arguments | const {mrb_value} *, {mrb_int} | Receive the rest of arguments as an array; `*!` avoid copy of the stack. |
* | <code>\|</code> | optional | | After this spec following specs would be optional. |
mrbgems/mruby-inline-struct/test/inline.c
+2 -1
View File
@@ -57,7 +57,8 @@ static mrb_value
istruct_test_test_receive_direct(mrb_state *mrb, mrb_value self)
{
char *ptr;
mrb_get_args(mrb, "I", &ptr);
struct RClass *klass = mrb_class_get(mrb, "InlineStructTest");
mrb_get_args(mrb, "I", &ptr, klass);
return mrb_bool_value(ptr[0] == 's');
}
src/class.c
+6 -1
View File
@@ -896,7 +896,7 @@ void mrb_hash_check_kdict(mrb_state *mrb, mrb_value self);
b: boolean [mrb_bool]
n: String/Symbol [mrb_sym]
d: data [void*,mrb_data_type const] 2nd argument will be used to check data type so it won't be modified; when ! follows, the value may be nil
I: inline struct [void*]
I: inline struct [void*,struct RClass]
&: block [mrb_value] &! raises exception if no block given
*: rest argument [const mrb_value*,mrb_int] The rest of the arguments as an array; *! avoid copy of the stack
|: optional Following arguments are optional
@@ -1141,11 +1141,16 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
case 'I':
{
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 (!mrb_istruct_p(ss))
{
mrb_raisef(mrb, E_TYPE_ERROR, "%v is not inline struct", ss);