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

Support Ruby3.0 keyword arguments.

Browse Source 
The Difference

Since Ruby1.9, the keyword arguments were emulated by Ruby using the hash
object at the bottom of the arguments. But we have gradually moved toward
keyword arguments separated from normal (positinal) arguments.

At the same time, we value compatibility, so that Ruby3.0 keyword
arguments are somewhat compromise. Basically, keyword arguments are
separated from positional arguments, except when the method does not
take any formal keyword arguments, given keyword arguments (packed
in the hash object) are considered as the last argument.

And we also allow non symbol keys in the keyword arguments. In that
case, those keys are just passed in the `**` hash (or raise
`ArgumentError` for unknown keys).

The Instruction Changes

We have changed `OP_SEND` instruction. `OP_SEND` instruction used to
take 3 operands, the register, the symbol, the number of (positional)
arguments. The meaning of the third operand has been changed. It is now
considered as `n|(nk<<4)`, where `n` is the number of positional
arguments, and `nk` is the number of keyword arguments, both occupies
4 bits in the operand.

The number `15` in both `n` and `nk` means variable sized arguments are
packed in the object. Positional arguments will be packed in the array,
and keyword arguments will be packed in the hash object. That means
arguments more than 14 values are always packed in the object.

Arguments information for other instructions (`OP_SENDB` and `OP_SUPER`)
are also changed. It works as the third operand of `OP_SEND`. the
difference between `OP_SEND` and `OP_SENDB` is just trivial. It assigns
`nil` to the block hidden arguments (right after arguments).

The instruction `OP_SENDV` and `OP_SENDVB` are removed. Those
instructions are replaced by `OP_SEND` and `OP_SENDB` respectively with
the `15` (variable sized) argument information.

Calling Convention

When calling a method, the stack elements shall be in the order of the
receiver of the method, positional arguments, keyword arguments and the
block argument. If the number of positional or keyword arugument (`n` or
`nk`) is zero, corresponding arguments will be empty. So when `n=0` and
`nk=0` the stack layout (from bottom to top) will be:

+-----------------------+
| recv | block (or nil) |
+-----------------------+

The last elements `block` should be explicitly filled before `OP_SEND`
or assigned to `nil` by `OP_SENDB` internally. In other words, the
following have exactly same behavior:

OP_SENDB clears `block` implicitly:

```
OP_SENDB reg sym 0
```

OP_SEND clears `block` implicitly:

```
OP_LOADNIL  R2
OP_SEND     R2 sym 0
```

When calling a method with only positional arguments (n=0..14) without
keyword arguments, the stack layout will be like following:

+--------------------------------------------+
| recv | arg1 | ... | arg_n | block (or nil) |
+--------------------------------------------+

When calling a method with arguments packed in the array (n=15) which
means argument splat (*) is used in the actual arguments, or more than
14 arguments are passed the stack layout will be like following:

+-------------------------------+
| recv | array | block (or nil) |
+-------------------------------+

The number of the actual arguments is determined by the length of the
argument array.

When keyword arguments are given (nk>0), keyword arguments are passed
between positional arguments and the block argument. For example, when
we pass one positional argument `1` and one keyword argument `a: 2`,
the stack layout will be like:

+------------------------------------+
| recv | 1 | :a | 2 | block (or nil) |
+------------------------------------+

Note that keyword arguments consume `2*nk` elements in the stack when
`nk=0..14` (unpacked).

When calling a method with keyword arguments packed in the hash object
(nk=15) which means keyword argument splat (**) is used or more than
14 keyword arguments in the actual arguments, the stack layout will
be like:

+------------------------------+
| recv | hash | block (or nil) |
+------------------------------+

Note for mruby/c

When mruby/c authors try to support new keyword arguments, they need
to handle the new meaning of the argument information operand. If they
choose not to support keyword arguments in mruby/c, it just raise
error when `nk` (taken by `(c>>4)&0xf`) is not zero. And combine
`OP_SENDV` behavior with `OP_SEND` when `n` is `15`.

If they want to support keyword arguments seriously, contact me at
<matz@ruby.or.jp> or `@yukihiro_matz`. I can help you.
This commit is contained in:
Yukihiro "Matz" Matsumoto
2021-10-11 10:21:35 +09:00
parent c6df4bf9a8
commit dccd66f9ef
26 changed files with 1951 additions and 1893 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/limitations.md
-21
View File
@@ -219,27 +219,6 @@ trace (most recent call last):
-e:1: undefined method 'binding' (NoMethodError)
```
## Keyword arguments
mruby keyword arguments behave slightly different from CRuby 2.5
to make the behavior simpler and less confusing.
#### Ruby [ruby 2.5.1p57 (2018-03-29 revision 63029)]
```
$ ruby -e 'def m(*r,**k) p [r,k] end; m("a"=>1,:b=>2)'
[[{"a"=>1}], {:b=>2}]
```
#### mruby [3.0.0 (2021-03-05)]
```
$ ./bin/mruby -e 'def m(*r,**k) p [r,k] end; m("a"=>1,:b=>2)'
trace (most recent call last):
[0] -e:1
-e:1: keyword argument hash with non symbol keys (ArgumentError)
```
## `nil?` redefinition in conditional expressions
Redefinition of `nil?` is ignored in conditional expressions.
doc/mruby3.md
-4
View File
@@ -124,10 +124,6 @@ Renamed from `OP_RAISE`
* `OP_RAISEIF`
Instruction that is reserved for the future keyword argument support.
* OP_SENDVK
## Removed Instructions
Instructions for old exception handling
doc/opcode.md
-3
View File
@@ -67,11 +67,8 @@ sign) of operands.
| `OP_EXCEPT` | `B` | `R(a) = exc` |
| `OP_RESCUE` | `BB` | `R(b) = R(a).isa?(R(b))` |
| `OP_RAISEIF` | `B` | `raise(R(a)) if R(a)` |
| `OP_SENDV` | `BB` | `R(a) = call(R(a),Syms(b),*R(a+1))` |
| `OP_SENDVB` | `BB` | `R(a) = call(R(a),Syms(b),*R(a+1),&R(a+2))` |
| `OP_SEND` | `BBB` | `R(a) = call(R(a),Syms(b),R(a+1),...,R(a+c))` |
| `OP_SENDB` | `BBB` | `R(a) = call(R(a),Syms(b),R(a+1),...,R(a+c),&R(a+c+1))` |
| `OP_SENDVK` | `BB` | `R(a) = call(R(a),Syms(b),*R(a+1),**(a+2),&R(a+3))` |
| `OP_CALL` | `-` | `R(0) = self.call(frame.argc, frame.argv)` |
| `OP_SUPER` | `BB` | `R(a) = super(R(a+1),... ,R(a+b+1))` |
| `OP_ARGARY` | `BS` | `R(a) = argument array (16=m5:r1:m5:d1:lv4)` |
include/mruby.h
+3 -2
View File
@@ -153,9 +153,10 @@ typedef void* (*mrb_allocf) (struct mrb_state *mrb, void*, size_t, void *ud);
#endif
typedef struct {
mrb_sym mid;
uint8_t n:4; /* (15=*) c=n|nk<<4 */
uint8_t nk:4; /* (15=*) */
uint8_t cci; /* called from C function */
int16_t argc;
mrb_sym mid;
const struct RProc *proc;
mrb_value *stack;
const mrb_code *pc; /* current address on iseq of this proc */
include/mruby/boxing_nan.h
+67 -28
View File
@@ -24,13 +24,22 @@
#define MRB_FIXNUM_MIN INT32_MIN
#define MRB_FIXNUM_MAX INT32_MAX
enum mrb_nanbox_tt_inline {
MRB_NANBOX_TT_POINTER = 1,
MRB_NANBOX_TT_INTEGER,
MRB_NANBOX_TT_SYMBOL,
MRB_NANBOX_TT_MISC,
#ifndef MRB_NO_FLOAT
MRB_NANBOX_TT_FLOAT,
#endif
};
/* value representation by nan-boxing:
* float : FFFFFFFFFFFFFFFF FFFFFFFFFFFFFFFF FFFFFFFFFFFFFFFF FFFFFFFFFFFFFFFF
* object: 111111111111TTTT TTPPPPPPPPPPPPPP PPPPPPPPPPPPPPPP PPPPPPPPPPPPPPPP
* int : 1111111111110001 0000000000000000 IIIIIIIIIIIIIIII IIIIIIIIIIIIIIII
* sym : 1111111111110001 0100000000000000 SSSSSSSSSSSSSSSS SSSSSSSSSSSSSSSS
* In order to get enough bit size to save TT, all pointers are shifted 2 bits
* in the right direction. Also, TTTTTT is the mrb_vtype + 1;
* object: 1111111111110001 PPPPPPPPPPPPPPPP PPPPPPPPPPPPPPPP PPPPPPPPPPPPPPPP
* int : 1111111111110010 0000000000000000 IIIIIIIIIIIIIIII IIIIIIIIIIIIIIII
* sym : 1111111111110011 0100000000000000 SSSSSSSSSSSSSSSS SSSSSSSSSSSSSSSS
* misc : 1111111111110100 0100000000000000 0000000000000000 TTTTTT000000MMMM
*/
typedef struct mrb_value {
uint64_t u;
@@ -41,16 +50,7 @@ union mrb_value_ {
uint64_t u;
#ifdef MRB_64BIT
void *p;
# define NANBOX_IMMEDIATE_VALUE uint32_t i
#else
# define NANBOX_IMMEDIATE_VALUE union { uint32_t i; void *p; }
#endif
struct {
MRB_ENDIAN_LOHI(
uint32_t ttt;
,NANBOX_IMMEDIATE_VALUE;
)
};
mrb_value value;
};
@@ -60,26 +60,59 @@ static inline union mrb_value_
mrb_val_union(mrb_value v)
{
union mrb_value_ x;
x.value = v;
x.u = v.u;
return x;
}
#define mrb_tt(o) ((enum mrb_vtype)((mrb_val_union(o).ttt & 0xfc000)>>14)-1)
#define mrb_type(o) (enum mrb_vtype)((uint32_t)0xfff00000 < mrb_val_union(o).ttt ? mrb_tt(o) : MRB_TT_FLOAT)
#define mrb_float(o) mrb_val_union(o).f
#define mrb_fixnum(o) ((mrb_int)mrb_val_union(o).i)
static inline mrb_float
mrb_float(mrb_value v)
{
union {
mrb_float f;
uint64_t u;
} x;
x.u = v.u;
return x.f;
}
#define mrb_tt_(o) ((enum mrb_nanbox_tt_inline)((o).u >> 48)&0xf)
MRB_INLINE enum mrb_vtype
mrb_type(mrb_value o)
{
switch (mrb_tt_(o)) {
case MRB_NANBOX_TT_POINTER:
return RBASIC(o)->tt;
case MRB_NANBOX_TT_INTEGER:
return MRB_TT_INTEGER;
case MRB_NANBOX_TT_SYMBOL:
return MRB_TT_SYMBOL;
case MRB_NANBOX_TT_MISC:
return (enum mrb_vtype)(o.u >> 10) & 0x3f;
#ifndef MRB_NO_FLOAT
default:
return MRB_TT_FLOAT;
#endif
}
return MRB_TT_UNDEF;
}
#define mrb_symbol(o) ((mrb_sym)((o).u & 0x3fffffff))
#ifdef MRB_INT64
#define mrb_fixnum(o) ((mrb_int)((o).u & 0xffffffffffffL))
#define mrb_integer(o) ((mrb_tt(o)==MRB_NANBOX_TT_POINTER)?(((struct RInteger*)mrb_ptr(o))->i):mrb_fixnum(o)))
#else /* MRB_INT32 */
#define mrb_fixnum(o) ((mrb_int)((o).u & 0xffffffff))
#define mrb_integer(o) mrb_fixnum(o)
#define mrb_symbol(o) ((mrb_sym)mrb_val_union(o).i)
#endif
#ifdef MRB_64BIT
#define mrb_ptr(o) ((void*)((((uintptr_t)0x3fffffffffff)&((uintptr_t)(mrb_val_union(o).p)))<<2))
#define mrb_cptr(o) (((struct RCptr*)mrb_ptr(o))->p)
#define NANBOX_SHIFT_LONG_POINTER(v) (((uintptr_t)(v)>>34)&0x3fff)
#define mrb_ptr(o) ((void*)(((uintptr_t)(o).u) & 0xffffffffffff))
#else
#define mrb_ptr(o) ((void*)mrb_val_union(o).i)
#define mrb_cptr(o) mrb_ptr(o)
#define NANBOX_SHIFT_LONG_POINTER(v) 0
#define mrb_ptr(o) ((void*)(((uintptr_t)(o).u) & 0xffffffff))
#endif
#define mrb_cptr(o) mrb_ptr(o)
#define NANBOX_SET_VALUE(o, tt, attr, v) do { \
union mrb_value_ mrb_value_union_variable; \
@@ -102,8 +135,7 @@ mrb_val_union(mrb_value v)
#define SET_FLOAT_VALUE(mrb,r,v) do { \
union mrb_value_ mrb_value_union_variable; \
if ((v) != (v)) { /* NaN */ \
mrb_value_union_variable.ttt = 0x7ff80000; \
mrb_value_union_variable.i = 0; \
mrb_value_union_variable.u = 0x7ff8000000000000UL; \
} \
else { \
mrb_value_union_variable.f = (v); \
@@ -111,6 +143,13 @@ mrb_val_union(mrb_value v)
r = mrb_value_union_variable.value; \
} while(0)
#define NANBOX_SET_MISC_VALUE(o, tt, attr, v) do { \
union mrb_value_ mrb_value_union_variable; \
mrb_value_union_variable.attr = (v);\
mrb_value_union_variable.ttt = 0xfff00000 | (((tt)+1)<<14);\
o = mrb_value_union_variable.value;\
} while (0)
#define SET_NIL_VALUE(r) NANBOX_SET_VALUE(r, MRB_TT_FALSE, i, 0)
#define SET_FALSE_VALUE(r) NANBOX_SET_VALUE(r, MRB_TT_FALSE, i, 1)
#define SET_TRUE_VALUE(r) NANBOX_SET_VALUE(r, MRB_TT_TRUE, i, 1)
include/mruby/ops.h
+2 -5
View File
@@ -57,11 +57,8 @@ OPCODE(JMPUW, S) /* unwind_and_jump_to(a) */
OPCODE(EXCEPT, B) /* R(a) = exc */
OPCODE(RESCUE, BB) /* R(b) = R(a).isa?(R(b)) */
OPCODE(RAISEIF, B) /* raise(R(a)) if R(a) */
OPCODE(SENDV, BB) /* R(a) = call(R(a),Syms(b),*R(a+1)) */
OPCODE(SENDVB, BB) /* R(a) = call(R(a),Syms(b),*R(a+1),&R(a+2)) */
OPCODE(SEND, BBB) /* R(a) = call(R(a),Syms(b),R(a+1),...,R(a+c)) */
OPCODE(SENDB, BBB) /* R(a) = call(R(a),Syms(b),R(a+1),...,R(a+c),&R(a+c+1)) */
OPCODE(SENDVK, BB) /* R(a) = call(R(a),Syms(b),*R(a+1),**(a+2),&R(a+3)) # todo */
OPCODE(SEND, BBB) /* R(a) = call(R(a),Syms(b),R(a+1)..,R(a+n+1):R(a+n+2)..) (c=n|k<<4) */
OPCODE(SENDB, BBB) /* R(a) = call(R(a),Syms(b),R(a+1)..,R(a+n+1):R(a+n+2)..,&R(a+n+2k+1)) */
OPCODE(CALL, Z) /* R(0) = self.call(frame.argc, frame.argv) */
OPCODE(SUPER, BB) /* R(a) = super(R(a+1),... ,R(a+b+1)) */
OPCODE(ARGARY, BS) /* R(a) = argument array (16=m5:r1:m5:d1:lv4) */
mrbgems/mruby-binding/src/binding.c
+22 -25
View File
@@ -15,24 +15,6 @@ struct REnv *mrb_binding_extract_env(mrb_state *mrb, mrb_value binding);
typedef mrb_bool mrb_parser_foreach_top_variable_func(mrb_state *mrb, mrb_sym sym, void *user);
void mrb_parser_foreach_top_variable(mrb_state *mrb, struct mrb_parser_state *p, mrb_parser_foreach_top_variable_func *func, void *user);
static void
insert_args(mrb_state *mrb, size_t offset, mrb_value obj)
{
mrb_callinfo *ci = mrb->c->ci;
mrb_value *argp = ci->stack + 1 /* recv */;
if (ci->argc < 0) {
mrb_ary_splice(mrb, *argp, offset, 0, obj);
}
else {
argp += offset;
mrb_stack_extend(mrb, ci->argc + offset + 2 /* recv + block */);
memmove(argp + 1 /* obj */, argp, sizeof(mrb_value) * (ci->argc - offset + 1 /* block */));
*argp = obj;
ci->argc++;
}
}
static void
binding_eval_error_check(mrb_state *mrb, struct mrb_parser_state *p, const char *file)
{
@@ -133,6 +115,8 @@ binding_eval_prepare(mrb_state *mrb, mrb_value binding)
mrb_value *argv;
mrb_get_args(mrb, "s|z*!", &d.expr, &d.exprlen, &d.file, &argv, &argc);
/* `eval` should take (string[, file, line]) */
if (argc > 3) mrb_argnum_error(mrb, argc, 1, 3);
mrb_bool error;
mrb_value ret = mrb_protect_error(mrb, binding_eval_prepare_body, &d, &error);
if (d.pstate) mrb_parser_free(d.pstate);
@@ -147,16 +131,29 @@ mrb_binding_eval(mrb_state *mrb, mrb_value binding)
struct RClass *c = mrb->kernel_module;
mrb_method_t m = mrb_method_search_vm(mrb, &c, MRB_SYM(eval));
mrb_callinfo *ci = mrb->c->ci;
int argc = ci->n;
mrb_value *argv = ci->stack + 1;
struct RProc *proc;
if (argc < 15) {
argv[0] = mrb_ary_new_from_values(mrb, argc, argv);
argv[1] = argv[argc]; /* copy block */
ci->n = 15;
}
if (MRB_METHOD_UNDEF_P(m)) {
int argc = mrb->c->ci->argc;
mrb_value *argv = mrb->c->ci->stack + 1;
mrb_value args = (argc < 0) ? argv[0] : mrb_ary_new_from_values(mrb, argc, argv);
mrb_method_missing(mrb, MRB_SYM(eval), binding, args);
mrb_method_missing(mrb, MRB_SYM(eval), binding, argv[0]);
}
insert_args(mrb, 1, binding);
struct RProc *proc = MRB_METHOD_PROC_P(m) ? MRB_METHOD_PROC(m) : mrb_proc_new_cfunc(mrb, MRB_METHOD_FUNC(m));
mrb->c->ci->u.target_class = c;
mrb_ary_splice(mrb, argv[0], 1, 0, binding); /* insert binding as 2nd argument */
if (MRB_METHOD_FUNC_P(m)) {
proc = mrb_proc_new_cfunc(mrb, MRB_METHOD_FUNC(m));
MRB_PROC_SET_TARGET_CLASS(proc, c);
}
else {
proc = MRB_METHOD_PROC(m);
}
ci->u.target_class = c;
return mrb_exec_irep(mrb, binding, proc);
}
mrbgems/mruby-compiler/core/codegen.c
+145 -98
View File
@@ -57,7 +57,7 @@ typedef struct scope {
uint32_t pc;
uint32_t lastpc;
uint32_t lastlabel;
int ainfo:15;
size_t ainfo:15;
mrb_bool mscope:1;
struct loopinfo *loop;
@@ -1507,7 +1507,7 @@ attrsym(codegen_scope *s, mrb_sym a)
return mrb_intern(s->mrb, name2, len+1);
}
#define CALL_MAXARGS 127
#define CALL_MAXARGS 15
#define GEN_LIT_ARY_MAX 64
#define GEN_VAL_STACK_MAX 99
@@ -1575,12 +1575,74 @@ gen_values(codegen_scope *s, node *t, int val, int extra, int limit)
return n;
}
static int
gen_hash(codegen_scope *s, node *tree, int val, int limit)
{
int slimit = GEN_VAL_STACK_MAX;
if (cursp() >= GEN_LIT_ARY_MAX) slimit = INT16_MAX;
int len = 0;
mrb_bool update = FALSE;
while (tree) {
if (nint(tree->car->car->car) == NODE_KW_REST_ARGS) {
if (len > 0) {
pop_n(len*2);
if (!update) {
genop_2(s, OP_HASH, cursp(), len);
}
else {
pop();
genop_2(s, OP_HASHADD, cursp(), len);
}
push();
}
codegen(s, tree->car->cdr, val);
if (len > 0 || update) {
pop(); pop();
genop_1(s, OP_HASHCAT, cursp());
push();
}
update = TRUE;
len = 0;
}
else {
codegen(s, tree->car->car, val);
codegen(s, tree->car->cdr, val);
len++;
}
tree = tree->cdr;
if (val && cursp() >= slimit) {
pop_n(len*2);
if (!update) {
genop_2(s, OP_HASH, cursp(), len);
}
else {
pop();
genop_2(s, OP_HASHADD, cursp(), len);
}
push();
update = TRUE;
len = 0;
}
}
if (update) {
if (len > 0) {
pop_n(len*2+1);
genop_2(s, OP_HASHADD, cursp(), len);
push();
}
return -1; /* variable length */
}
if (update) return -1;
return len;
}
static void
gen_call(codegen_scope *s, node *tree, mrb_sym name, int sp, int val, int safe)
{
mrb_sym sym = name ? name : nsym(tree->cdr->car);
int skip = 0;
int n = 0, noop = 0, sendv = 0, blk = 0;
int n = 0, nk = 0, st = 0, noop = 0, blk = 0;
codegen(s, tree->car, VAL); /* receiver */
if (safe) {
@@ -1590,14 +1652,24 @@ gen_call(codegen_scope *s, node *tree, mrb_sym name, int sp, int val, int safe)
}
tree = tree->cdr->cdr->car;
if (tree) {
n = gen_values(s, tree->car, VAL, sp?1:0, 14);
if (n < 0) {
n = noop = sendv = 1;
push();
if (tree->car) { /* positional arguments */
st = n = gen_values(s, tree->car, VAL, sp?1:0, 14);
if (n < 0) { /* variable length */
st = 1; /* one stack element */
noop = 1; /* not operator */
n = 15;
push();
}
}
if (tree->cdr->car) { /* keyword arguments */
noop = 1;
nk = gen_hash(s, tree->cdr->car->cdr, VAL, 14);
if (nk < 0) {st++; nk = 15;}
else st += 2*nk;
}
}
if (sp) { /* last argument pushed (attr=) */
if (sendv) {
if (sp) { /* last argument pushed (attr=, []=) */
if (n == CALL_MAXARGS) {
gen_move(s, cursp(), sp, 0);
pop();
genop_2(s, OP_ARYPUSH, cursp(), 1);
@@ -1606,17 +1678,17 @@ gen_call(codegen_scope *s, node *tree, mrb_sym name, int sp, int val, int safe)
else {
gen_move(s, cursp(), sp, 0);
push();
n++;
n++; st++;
}
}
if (tree && tree->cdr) {
noop = 1;
codegen(s, tree->cdr, VAL);
if (tree && tree->cdr && tree->cdr->cdr) {
codegen(s, tree->cdr->cdr, VAL);
pop();
noop = 1;
blk = 1;
}
push();pop();
pop_n(n+1);
pop_n(st+1);
if (!noop && sym == MRB_OPSYM_2(s->mrb, add) && n == 1) {
gen_addsub(s, OP_ADD, cursp());
}
@@ -1651,14 +1723,7 @@ gen_call(codegen_scope *s, node *tree, mrb_sym name, int sp, int val, int safe)
/* constant folding succeeded */
}
else {
int idx = new_sym(s, sym);
if (sendv) {
genop_2(s, blk ? OP_SENDVB : OP_SENDV, cursp(), idx);
}
else {
genop_3(s, blk ? OP_SENDB : OP_SEND, cursp(), idx, n);
}
genop_3(s, blk ? OP_SENDB : OP_SEND, cursp(), new_sym(s, sym), n|(nk<<4));
}
if (safe) {
dispatch(s, skip);
@@ -1976,6 +2041,23 @@ false_always(node *tree)
}
}
static void
gen_blkmove(codegen_scope *s, int ainfo, int lv)
{
int m1 = (ainfo>>7)&0x3f;
int r = (ainfo>>6)&0x1;
int m2 = (ainfo>>1)&0x1f;
int kd = (ainfo)&0x1;
int off = m1+r+m2+kd+1;
if (lv == 0) {
gen_move(s, cursp(), off, 0);
}
else {
genop_3(s, OP_GETUPVAR, cursp(), off, lv);
}
push();
}
static void
codegen(codegen_scope *s, node *tree, int val)
{
@@ -2453,64 +2535,10 @@ codegen(codegen_scope *s, node *tree, int val)
case NODE_HASH:
case NODE_KW_HASH:
{
int len = 0;
mrb_bool update = FALSE;
int slimit = GEN_VAL_STACK_MAX;
if (cursp() >= GEN_LIT_ARY_MAX) slimit = INT16_MAX;
while (tree) {
if (nint(tree->car->car->car) == NODE_KW_REST_ARGS) {
if (len > 0) {
pop_n(len*2);
if (!update) {
genop_2(s, OP_HASH, cursp(), len);
}
else {
pop();
genop_2(s, OP_HASHADD, cursp(), len);
}
push();
}
codegen(s, tree->car->cdr, VAL);
if (len > 0 || update) {
pop(); pop();
genop_1(s, OP_HASHCAT, cursp());
push();
}
update = TRUE;
len = 0;
}
else {
codegen(s, tree->car->car, val);
codegen(s, tree->car->cdr, val);
len++;
}
tree = tree->cdr;
if (val && cursp() >= slimit) {
pop_n(len*2);
if (!update) {
genop_2(s, OP_HASH, cursp(), len);
}
else {
pop();
genop_2(s, OP_HASHADD, cursp(), len);
}
push();
update = TRUE;
len = 0;
}
}
if (val) {
pop_n(len*2);
if (!update) {
genop_2(s, OP_HASH, cursp(), len);
}
else {
pop();
if (len > 0) {
genop_2(s, OP_HASHADD, cursp(), len);
}
}
int nk = gen_hash(s, tree, val, GEN_LIT_ARY_MAX);
if (val && nk >= 0) {
pop_n(nk*2);
genop_2(s, OP_HASH, cursp(), nk);
push();
}
}
@@ -2765,9 +2793,9 @@ codegen(codegen_scope *s, node *tree, int val)
{
codegen_scope *s2 = s;
int lv = 0;
int n = 0, noop = 0, sendv = 0;
int n = 0, nk = 0, st = 0;
push(); /* room for receiver */
push();
while (!s2->mscope) {
lv++;
s2 = s2->prev;
@@ -2776,23 +2804,33 @@ codegen(codegen_scope *s, node *tree, int val)
if (tree) {
node *args = tree->car;
if (args) {
n = gen_values(s, args, VAL, 0, 14);
st = n = gen_values(s, args, VAL, 0, 14);
if (n < 0) {
n = noop = sendv = 1;
st = 1; n = 15;
push();
}
}
}
if (tree && tree->cdr) {
codegen(s, tree->cdr, VAL);
pop();
/* keyword arguments */
if ((s2->ainfo & 0x1) && tree->cdr->car) {
nk = gen_hash(s, tree->cdr->car->cdr, VAL, 14);
if (nk < 0) {st++; nk = 15;}
else st += nk;
n |= 15<<4;
}
/* block arguments */
if (tree->cdr->cdr) {
codegen(s, tree->cdr->cdr, VAL);
}
else {
gen_blkmove(s, s2->ainfo, lv);
}
st++;
}
else {
genop_1(s, OP_LOADNIL, cursp());
push(); pop();
gen_blkmove(s, s2->ainfo, lv);
st++;
}
pop_n(n+1);
if (sendv) n = CALL_MAXARGS;
pop_n(st+1);
genop_2(s, OP_SUPER, cursp(), n);
if (val) push();
}
@@ -2802,6 +2840,8 @@ codegen(codegen_scope *s, node *tree, int val)
{
codegen_scope *s2 = s;
int lv = 0, ainfo = 0;
int n = CALL_MAXARGS;
int sp = cursp();
push(); /* room for receiver */
while (!s2->mscope) {
@@ -2813,13 +2853,20 @@ codegen(codegen_scope *s, node *tree, int val)
ainfo = s2->ainfo;
}
genop_2S(s, OP_ARGARY, cursp(), (ainfo<<4)|(lv & 0xf));
push(); push(); pop(); /* ARGARY pushes two values */
if (tree && tree->cdr) {
codegen(s, tree->cdr, VAL);
pop();
push(); push(); push(); /* ARGARY pushes 3 values at most */
pop(); pop(); pop();
/* keyword arguments */
if (ainfo & 0x1) {
n |= CALL_MAXARGS<<4;
push();
}
pop(); pop();
genop_2(s, OP_SUPER, cursp(), CALL_MAXARGS);
/* block argument */
if (tree && tree->cdr && tree->cdr->cdr) {
push();
codegen(s, tree->cdr->cdr, VAL);
}
s->sp = sp;
genop_2(s, OP_SUPER, cursp(), n);
if (val) push();
}
break;
mrbgems/mruby-compiler/core/parse.y
+78 -77
View File
@@ -506,6 +506,13 @@ new_fcall(parser_state *p, mrb_sym b, node *c)
return n;
}
/* (a b . c) */
static node*
new_callargs(parser_state *p, node *a, node *b, node *c)
{
return cons(a, cons(b, c));
}
/* (:super . c) */
static node*
new_super(parser_state *p, node *c)
@@ -517,7 +524,7 @@ new_super(parser_state *p, node *c)
static node*
new_zsuper(parser_state *p)
{
return list1((node*)NODE_ZSUPER);
return cons((node*)NODE_ZSUPER, 0);
}
/* (:yield . c) */
@@ -526,7 +533,12 @@ new_yield(parser_state *p, node *c)
{
if (c) {
if (c->cdr) {
yyerror(p, "both block arg and actual block given");
if (c->cdr->cdr) {
yyerror(p, "both block arg and actual block given");
}
if (c->cdr->car) {
return cons((node*)NODE_YIELD, push(c->car, c->cdr->car));
}
}
return cons((node*)NODE_YIELD, c->car);
}
@@ -960,13 +972,14 @@ new_op_asgn(parser_state *p, node *a, mrb_sym op, node *b)
static node*
new_imaginary(parser_state *p, node *imaginary)
{
return new_call(p, new_const(p, MRB_SYM_2(p->mrb, Kernel)), MRB_SYM_2(p->mrb, Complex), list1(list2(list3((node*)NODE_INT, (node*)strdup("0"), nint(10)), imaginary)), 1);
return new_call(p, new_const(p, MRB_SYM_2(p->mrb, Kernel)), MRB_SYM_2(p->mrb, Complex),
new_callargs(p, list2(list3((node*)NODE_INT, (node*)strdup("0"), nint(10)), imaginary), 0, 0), 1);
}
static node*
new_rational(parser_state *p, node *rational)
{
return new_call(p, new_const(p, MRB_SYM_2(p->mrb, Kernel)), MRB_SYM_2(p->mrb, Rational), list1(list1(rational)), 1);
return new_call(p, new_const(p, MRB_SYM_2(p->mrb, Kernel)), MRB_SYM_2(p->mrb, Rational), new_callargs(p, list1(rational), 0, 0), 1);
}
/* (:int . i) */
@@ -1189,17 +1202,17 @@ call_uni_op(parser_state *p, node *recv, const char *m)
static node*
call_bin_op(parser_state *p, node *recv, const char *m, node *arg1)
{
return new_call(p, recv, intern_cstr(m), list1(list1(arg1)), 1);
return new_call(p, recv, intern_cstr(m), new_callargs(p, list1(arg1), 0, 0), 1);
}
static void
args_with_block(parser_state *p, node *a, node *b)
{
if (b) {
if (a->cdr) {
if (a->cdr && a->cdr->cdr) {
yyerror(p, "both block arg and actual block given");
}
a->cdr = b;
a->cdr->cdr = b;
}
}
@@ -1226,19 +1239,16 @@ call_with_block(parser_state *p, node *a, node *b)
switch (typen(a->car)) {
case NODE_SUPER:
case NODE_ZSUPER:
if (!a->cdr) a->cdr = cons(0, b);
else {
args_with_block(p, a->cdr, b);
}
if (!a->cdr) a->cdr = new_callargs(p, 0, 0, b);
else args_with_block(p, a->cdr, b);
break;
case NODE_CALL:
case NODE_FCALL:
case NODE_SCALL:
n = a->cdr->cdr->cdr;
if (!n->car) n->car = cons(0, b);
else {
args_with_block(p, n->car, b);
}
/* (NODE_CALL recv mid (args kw . blk)) */
n = a->cdr->cdr->cdr; /* (args kw . blk) */
if (!n->car) n->car = new_callargs(p, 0, 0, b);
else args_with_block(p, n->car, b);
break;
default:
break;
@@ -1260,7 +1270,7 @@ cond(node *n)
static node*
ret_args(parser_state *p, node *n)
{
if (n->cdr) {
if (n->cdr->cdr) {
yyerror(p, "block argument should not be given");
return NULL;
}
@@ -2458,7 +2468,7 @@ aref_args : none
}
| args comma assocs trailer
{
$$ = push($1, new_kw_hash(p, $3));
$$ = push($1, new_hash(p, $3));
}
| assocs trailer
{
@@ -2485,39 +2495,23 @@ paren_args : '(' opt_call_args ')'
}
| '(' args comma tBDOT3 rparen
{
#if 1
mrb_sym r = intern_op(mul);
mrb_sym b = intern_op(and);
$$ = cons(push($2, new_splat(p, new_lvar(p, r))),
new_block_arg(p, new_lvar(p, b)));
#else
mrb_sym r = intern_op(mul);
mrb_sym k = intern_op(pow);
mrb_sym b = intern_op(and);
$$ = cons(list2(push($2, new_splat(p, new_lvar(p, r))),
new_kw_hash(p, list1(cons(new_kw_rest_args(p, 0), new_lvar(p, k))))),
new_block_arg(p, new_lvar(p, b)));
#endif
$$ = new_callargs(p, push($2, new_splat(p, new_lvar(p, r))),
new_kw_hash(p, list1(cons(new_kw_rest_args(p, 0), new_lvar(p, k)))),
new_block_arg(p, new_lvar(p, b)));
}
| '(' tBDOT3 rparen
{
#if 1
mrb_sym r = intern_op(mul);
mrb_sym b = intern_op(and);
if (local_var_p(p, r) && local_var_p(p, b)) {
$$ = cons(list1(new_splat(p, new_lvar(p, r))),
new_block_arg(p, new_lvar(p, b)));
}
#else
mrb_sym r = intern_op(mul);
mrb_sym k = intern_op(pow);
mrb_sym b = intern_op(and);
if (local_var_p(p, r) && local_var_p(p, k) && local_var_p(p, b)) {
$$ = cons(list2(new_splat(p, new_lvar(p, r)),
new_kw_hash(p, list1(cons(new_kw_rest_args(p, 0), new_lvar(p, k))))),
new_block_arg(p, new_lvar(p, b)));
$$ = new_callargs(p, list1(new_splat(p, new_lvar(p, r))),
new_kw_hash(p, list1(cons(new_kw_rest_args(p, 0), new_lvar(p, k)))),
new_block_arg(p, new_lvar(p, b)));
}
#endif
else {
yyerror(p, "unexpected argument forwarding ...");
$$ = 0;
@@ -2533,17 +2527,17 @@ opt_call_args : none
| call_args opt_terms
| args comma
{
$$ = cons($1,0);
$$ = new_callargs(p,$1,0,0);
NODE_LINENO($$, $1);
}
| args comma assocs comma
{
$$ = cons(push($1, new_kw_hash(p, $3)), 0);
$$ = new_callargs(p,$1,new_kw_hash(p,$3),0);
NODE_LINENO($$, $1);
}
| assocs comma
{
$$ = cons(list1(new_kw_hash(p, $1)), 0);
$$ = new_callargs(p,0,new_kw_hash(p,$1),0);
NODE_LINENO($$, $1);
}
;
@@ -2551,27 +2545,27 @@ opt_call_args : none
call_args : command
{
void_expr_error(p, $1);
$$ = cons(list1($1), 0);
$$ = new_callargs(p, list1($1), 0, 0);
NODE_LINENO($$, $1);
}
| args opt_block_arg
{
$$ = cons($1, $2);
$$ = new_callargs(p, $1, 0, $2);
NODE_LINENO($$, $1);
}
| assocs opt_block_arg
{
$$ = cons(list1(new_kw_hash(p, $1)), $2);
$$ = new_callargs(p, 0, new_kw_hash(p, $1), $2);
NODE_LINENO($$, $1);
}
| args comma assocs opt_block_arg
{
$$ = cons(push($1, new_kw_hash(p, $3)), $4);
$$ = new_callargs(p, $1, new_kw_hash(p, $3), $4);
NODE_LINENO($$, $1);
}
| block_arg
{
$$ = cons(0, $1);
$$ = new_callargs(p, 0, 0, $1);
NODE_LINENO($$, $1);
}
;
@@ -2609,13 +2603,13 @@ comma : ',' opt_nl
args : arg
{
void_expr_error(p, $1);
$$ = cons($1, 0);
$$ = list1($1);
NODE_LINENO($$, $1);
}
| tSTAR arg
{
void_expr_error(p, $2);
$$ = cons(new_splat(p, $2), 0);
$$ = list1(new_splat(p, $2));
NODE_LINENO($$, $2);
}
| args comma arg
@@ -2727,7 +2721,7 @@ primary : literal
}
| operation brace_block
{
$$ = new_fcall(p, $1, cons(0, $2));
$$ = new_fcall(p, $1, new_callargs(p, 0, 0, $2));
}
| method_call
| method_call brace_block
@@ -3628,39 +3622,21 @@ f_arglist_paren : '(' f_args rparen
}
| '(' f_arg ',' tBDOT3 rparen
{
#if 1
/* til real keyword args implemented */
mrb_sym r = intern_op(mul);
mrb_sym b = intern_op(and);
local_add_f(p, r);
$$ = new_args(p, $2, 0, r, 0,
new_args_tail(p, 0, 0, b));
#else
mrb_sym r = intern_op(mul);
mrb_sym k = intern_op(pow);
mrb_sym b = intern_op(and);
local_add_f(p, r); local_add_f(p, k);
local_add_f(p, r);
$$ = new_args(p, $2, 0, r, 0,
new_args_tail(p, 0, new_kw_rest_args(p, nsym(k)), b));
#endif
}
| '(' tBDOT3 rparen
{
#if 1
/* til real keyword args implemented */
mrb_sym r = intern_op(mul);
mrb_sym b = intern_op(and);
local_add_f(p, r);
$$ = new_args(p, 0, 0, r, 0,
new_args_tail(p, 0, 0, b));
#else
mrb_sym r = intern_op(mul);
mrb_sym k = intern_op(pow);
mrb_sym b = intern_op(and);
local_add_f(p, r); local_add_f(p, k);
local_add_f(p, r);
$$ = new_args(p, 0, 0, r, 0,
new_args_tail(p, 0, new_kw_rest_args(p, nsym(k)), b));
#endif
}
;
@@ -7026,8 +7002,13 @@ dump_args(mrb_state *mrb, node *n, int offset)
}
n = n->cdr;
if (n->car) {
mrb_sym rest = sym(n->car);
dump_prefix(n, offset+1);
printf("rest=*%s\n", mrb_sym_name(mrb, sym(n->car)));
if (rest == MRB_OPSYM(mul))
printf("rest=*\n");
else
printf("rest=*%s\n", mrb_sym_name(mrb, rest));
}
n = n->cdr;
if (n->car) {
@@ -7304,9 +7285,16 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset)
printf("args:\n");
dump_recur(mrb, tree->car, offset+2);
if (tree->cdr) {
dump_prefix(tree, offset+1);
printf("block:\n");
mrb_parser_dump(mrb, tree->cdr, offset+2);
if (tree->cdr->car) {
dump_prefix(tree, offset+1);
printf("kwargs:\n");
mrb_parser_dump(mrb, tree->cdr->car, offset+2);
}
if (tree->cdr->cdr) {
dump_prefix(tree, offset+1);
printf("block:\n");
mrb_parser_dump(mrb, tree->cdr->cdr, offset+2);
}
}
}
break;
@@ -7447,7 +7435,17 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset)
break;
case NODE_ZSUPER:
printf("NODE_ZSUPER\n");
printf("NODE_ZSUPER:\n");
if (tree) {
dump_prefix(tree, offset+1);
printf("args:\n");
dump_recur(mrb, tree->car, offset+2);
if (tree->cdr) {
dump_prefix(tree, offset+1);
printf("block:\n");
mrb_parser_dump(mrb, tree->cdr, offset+2);
}
}
break;
case NODE_RETURN:
@@ -7773,7 +7771,10 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset)
break;
case NODE_KW_REST_ARGS:
printf("NODE_KW_REST_ARGS %s\n", mrb_sym_name(mrb, sym(tree)));
if (tree)
printf("NODE_KW_REST_ARGS %s\n", mrb_sym_name(mrb, sym(tree)));
else
printf("NODE_KW_REST_ARGS\n");
break;
default:
mrbgems/mruby-compiler/core/y.tab.c
+1181 -1180
View File
File diff suppressed because it is too large Load Diff
mrbgems/mruby-enumerator/mrblib/enumerator.rb
+6 -4
View File
@@ -89,7 +89,7 @@ class Enumerator
include Enumerable
##
# @overload initialize(obj, method = :each, *args)
# @overload initialize(obj, method = :each, *args, **kwd)
#
# Creates a new Enumerator object, which can be used as an
# Enumerable.
@@ -114,7 +114,7 @@ class Enumerator
#
# Use of this form is discouraged. Use Kernel#enum_for or Kernel#to_enum
# instead.
def initialize(obj=NONE, meth=:each, *args, &block)
def initialize(obj=NONE, meth=:each, *args, **kwd, &block)
if block
obj = Generator.new(&block)
elsif obj == NONE
@@ -124,6 +124,7 @@ class Enumerator
@obj = obj
@meth = meth
@args = args
@kwd = kwd
@fib = nil
@dst = nil
@lookahead = nil
@@ -131,7 +132,7 @@ class Enumerator
@stop_exc = false
end
attr_accessor :obj, :meth, :args
attr_accessor :obj, :meth, :args, :kwd
attr_reader :fib
def initialize_copy(obj)
@@ -140,6 +141,7 @@ class Enumerator
@obj = obj.obj
@meth = obj.meth
@args = obj.args
@kwd = obj.kwd
@fib = nil
@lookahead = nil
@feedvalue = nil
@@ -286,7 +288,7 @@ class Enumerator
end
def enumerator_block_call(&block)
@obj.__send__ @meth, *@args, &block
@obj.__send__ @meth, *@args, **@kwd, &block
end
private :enumerator_block_call
mrbgems/mruby-eval/src/eval.c
+2 -1
View File
@@ -144,7 +144,8 @@ static mrb_value
exec_irep(mrb_state *mrb, mrb_value self, struct RProc *proc)
{
/* no argument passed from eval() */
mrb->c->ci->argc = 0;
mrb->c->ci->n = 0;
mrb->c->ci->nk = 0;
/* clear block */
mrb->c->ci->stack[1] = mrb_nil_value();
return mrb_exec_irep(mrb, self, proc);
mrbgems/mruby-fiber/src/fiber.c
+1 -1
View File
@@ -217,7 +217,7 @@ fiber_switch(mrb_state *mrb, mrb_value self, mrb_int len, const mrb_value *a, mr
if (vmexec) {
c->ci--; /* pop dummy callinfo */
}
c->cibase->argc = (int)len;
c->cibase->n = len;
value = c->stbase[0] = MRB_PROC_ENV(c->cibase->proc)->stack[0];
}
else {
mrbgems/mruby-io/mrblib/io.rb
+4 -29
View File
@@ -26,11 +26,11 @@ class IO
end
end
def self.popen(command, mode = 'r', opts={}, &block)
def self.popen(command, mode = 'r', **opts, &block)
if !self.respond_to?(:_popen)
raise NotImplementedError, "popen is not supported on this platform"
end
io = self._popen(command, mode, opts)
io = self._popen(command, mode, **opts)
return io unless block
begin
@@ -61,39 +61,14 @@ class IO
end
end
def self.read(path, length=nil, offset=nil, opt=nil)
if not opt.nil? # 4 arguments
offset ||= 0
elsif not offset.nil? # 3 arguments
if offset.is_a? Hash
opt = offset
offset = 0
else
opt = {}
end
elsif not length.nil? # 2 arguments
if length.is_a? Hash
opt = length
offset = 0
length = nil
else
offset = 0
opt = {}
end
else # only 1 argument
opt = {}
offset = 0
length = nil
end
def self.read(path, length=nil, offset=0, mode: "r")
str = ""
fd = -1
io = nil
begin
if path[0] == "|"
io = IO.popen(path[1..-1], (opt[:mode] || "r"))
io = IO.popen(path[1..-1], mode)
else
mode = opt[:mode] || "r"
fd = IO.sysopen(path, mode)
io = IO.open(fd, mode)
end
mrbgems/mruby-io/src/io.c
+1 -1
View File
@@ -363,7 +363,7 @@ mrb_io_s_popen_args(mrb_state *mrb, mrb_value klass,
NULL,
};
mrb_get_args(mrb, "z|o:", cmd, &mode, &kw);
mrb_get_args(mrb, "zo:", cmd, &mode, &kw);
*flags = mrb_io_mode_to_flags(mrb, mode);
*doexec = (strcmp("-", *cmd) != 0);
mrbgems/mruby-method/src/method.c
+17 -14
View File
@@ -12,15 +12,16 @@ mrb_value mrb_exec_irep(mrb_state *mrb, mrb_value self, struct RProc *p);
static mrb_value
args_shift(mrb_state *mrb)
{
mrb_value *argv = mrb->c->ci->stack + 1;
mrb_callinfo *ci = mrb->c->ci;
mrb_value *argv = ci->stack + 1;
if (mrb->c->ci->argc > 0) {
if (ci->n < 15) {
mrb_value obj = argv[0];
memmove(argv, argv + 1, (mrb->c->ci->argc + 1 /* block */ - 1 /* first value */) * sizeof(mrb_value));
mrb->c->ci->argc--;
memmove(argv, argv + 1, (ci->n + 1 /* block */ - 1 /* first value */) * sizeof(mrb_value));
ci->n--;
return obj;
}
else if (mrb->c->ci->argc < 0 && RARRAY_LEN(*argv) > 0) {
else if (ci->n == 15 && RARRAY_LEN(*argv) > 0) {
return mrb_ary_shift(mrb, *argv);
}
else {
@@ -32,13 +33,14 @@ args_shift(mrb_state *mrb)
static void
args_unshift(mrb_state *mrb, mrb_value obj)
{
mrb_value *argv = mrb->c->ci->stack + 1;
mrb_callinfo *ci = mrb->c->ci;
mrb_value *argv = ci->stack + 1;
if (mrb->c->ci->argc >= 0) {
mrb_value block = argv[mrb->c->ci->argc];
argv[0] = mrb_ary_new_from_values(mrb, mrb->c->ci->argc, argv);
if (ci->n < 15) {
mrb_value block = argv[ci->n];
argv[0] = mrb_ary_new_from_values(mrb, ci->n, argv);
argv[1] = block;
mrb->c->ci->argc = -1;
ci->n = 15;
}
mrb_ary_unshift(mrb, *argv, obj);
@@ -48,13 +50,14 @@ static struct RProc*
method_missing_prepare(mrb_state *mrb, mrb_sym *mid, mrb_value recv, struct RClass **tc)
{
const mrb_sym id_method_missing = MRB_SYM(method_missing);
mrb_callinfo *ci = mrb->c->ci;
if (*mid == id_method_missing) {
method_missing: ;
int argc = mrb->c->ci->argc;
mrb_value *argv = mrb->c->ci->stack + 1;
mrb_value args = (argc < 0) ? argv[0] : mrb_ary_new_from_values(mrb, argc, argv);
mrb_method_missing(mrb, *mid, recv, args);
int n = ci->n;
mrb_value *argv = ci->stack + 1;
mrb_value args = (n == 15) ? argv[0] : mrb_ary_new_from_values(mrb, n, argv);
mrb_method_missing(mrb, id_method_missing, recv, args);
}
*tc = mrb_class(mrb, recv);
mrbgems/mruby-range-ext/mrblib/range.rb
+4 -4
View File
@@ -56,7 +56,7 @@ class Range
def max(&block)
val = self.begin
last = self.end
return super if block
return super(&block) if block
raise RangeError, "cannot get the maximum of endless range" if last.nil?
@@ -72,7 +72,7 @@ class Range
end
# delegate to Enumerable
super
super()
end
def min(&block)
@@ -80,7 +80,7 @@ class Range
last = self.end
if block
raise RangeError, "cannot get the minimum of endless range with custom comparison method" if last.nil?
return super
return super(&block)
end
return val if last.nil?
@@ -94,6 +94,6 @@ class Range
end
# delegate to Enumerable
super
super()
end
end
mrbgems/mruby-struct/test/struct.rb
+1 -1
View File
@@ -136,7 +136,7 @@ end
assert('Struct#to_h') do
s = Struct.new(:white, :red, :green).new('ruuko', 'yuzuki', 'hitoe')
assert_equal(:white => 'ruuko', :red => 'yuzuki', :green => 'hitoe') { s.to_h }
assert_equal({:white => 'ruuko', :red => 'yuzuki', :green => 'hitoe'}) { s.to_h }
end
assert('Struct#values_at') do
src/class.c
+67 -42
View File
@@ -812,9 +812,9 @@ ensure_class_type(mrb_state *mrb, mrb_value val)
MRB_API mrb_int
mrb_get_argc(mrb_state *mrb)
{
mrb_int argc = mrb->c->ci->argc;
mrb_int argc = mrb->c->ci->n;
if (argc < 0) {
if (argc == 15) {
struct RArray *a = mrb_ary_ptr(mrb->c->ci->stack[1]);
argc = ARY_LEN(a);
@@ -825,9 +825,9 @@ mrb_get_argc(mrb_state *mrb)
MRB_API const mrb_value*
mrb_get_argv(mrb_state *mrb)
{
mrb_int argc = mrb->c->ci->argc;
mrb_int argc = mrb->c->ci->n;
mrb_value *array_argv = mrb->c->ci->stack + 1;
if (argc < 0) {
if (argc == 15) {
struct RArray *a = mrb_ary_ptr(*array_argv);
array_argv = ARY_PTR(a);
@@ -838,33 +838,37 @@ mrb_get_argv(mrb_state *mrb)
MRB_API mrb_value
mrb_get_arg1(mrb_state *mrb)
{
mrb_int argc = mrb->c->ci->argc;
mrb_value *array_argv = mrb->c->ci->stack + 1;
if (argc < 0) {
mrb_callinfo *ci = mrb->c->ci;
mrb_int argc = ci->n;
mrb_value *array_argv = ci->stack + 1;
if (argc == 15) {
struct RArray *a = mrb_ary_ptr(*array_argv);
argc = ARY_LEN(a);
array_argv = ARY_PTR(a);
}
if (argc == 0 && ci->nk == 15) {
mrb_int n = ci->n;
if (n == 15) n = 1;
return ci->stack[n+1]; /* kwhash next to positional arguments */
}
if (argc != 1) {
mrb_argnum_error(mrb, argc, 1, 1);
}
return array_argv[0];
}
mrb_int mrb_ci_bidx(mrb_callinfo *ci);
MRB_API mrb_bool
mrb_block_given_p(mrb_state *mrb)
{
const mrb_callinfo *ci = mrb->c->ci;
int argc = ci->argc;
int idx = (argc < 0) ? 2 : argc + 1;
mrb_value b = ci->stack[idx];
mrb_callinfo *ci = mrb->c->ci;
mrb_value b = ci->stack[mrb_ci_bidx(ci)];
return !mrb_nil_p(b);
}
void mrb_hash_check_kdict(mrb_state *mrb, mrb_value self);
/*
retrieve arguments from mrb_state.
@@ -911,21 +915,17 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
char c;
int i = 0;
va_list ap;
int argc = mrb->c->ci->argc;
const mrb_value *argv = mrb->c->ci->stack+1;
mrb_bool argv_on_stack = argc >= 0;
mrb_callinfo *ci = mrb->c->ci;
int argc = ci->n;
const mrb_value *argv = ci->stack+1;
mrb_bool argv_on_stack;
mrb_bool opt = FALSE;
mrb_bool opt_skip = TRUE;
const mrb_value *pickarg = NULL; /* arguments currently being processed */
mrb_value kdict;
mrb_value kdict = mrb_nil_value();
mrb_bool reqkarg = FALSE;
int argc_min = 0, argc_max = 0;
if (!argv_on_stack) {
struct RArray *a = mrb_ary_ptr(*argv);
argv = ARY_PTR(a);
argc = ARY_LEN(a);
}
va_start(ap, format);
while ((c = *fmt++)) {
@@ -955,12 +955,41 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
}
check_exit:
if (reqkarg && argc > argc_min && mrb_hash_p(kdict = argv[argc - 1])) {
mrb_hash_check_kdict(mrb, kdict);
argc--;
if (!reqkarg && ci->nk > 0) {
mrb_assert(ci->nk == 15);
kdict = ci->stack[mrb_ci_bidx(ci)-1];
if (mrb_hash_p(kdict) && mrb_hash_size(mrb, kdict) > 0) {
if (argc < 14) {
ci->n++;
argc++; /* include kdict in normal arguments */
}
else {
/* 14+1 == 15 so pack first */
if (argc == 14) {
/* pack arguments and kdict */
ci->stack[1] = mrb_ary_new_from_values(mrb, argc+1, &ci->stack[1]);
argc = ci->n = 15;
}
else {
/* push kdict to packed arguments */
mrb_ary_push(mrb, ci->stack[1], kdict);
}
ci->stack[2] = ci->stack[mrb_ci_bidx(ci)];
}
ci->nk = 0;
}
}
else {
kdict = mrb_nil_value();
if (reqkarg && ci->nk > 0) {
kdict = ci->stack[mrb_ci_bidx(ci)-1];
mrb_assert(ci->nk == 15);
mrb_assert(mrb_hash_p(kdict));
}
argv_on_stack = argc < 15;
if (!argv_on_stack) {
struct RArray *a = mrb_ary_ptr(*argv);
argv = ARY_PTR(a);
argc = ARY_LEN(a);
}
opt = FALSE;
@@ -989,7 +1018,7 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
case '|': case '*': case '&': case '?': case ':':
if (needmodify) {
bad_needmodify:
mrb_raisef(mrb, E_ARGUMENT_ERROR, "wrong `%c+` modified specifer`", c);
mrb_raisef(mrb, E_ARGUMENT_ERROR, "wrong `%c+` modified specifier`", c);
}
break;
default:
@@ -1200,12 +1229,7 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
mrb_value *p, *bp;
p = va_arg(ap, mrb_value*);
if (mrb->c->ci->argc < 0) {
bp = mrb->c->ci->stack + 2;
}
else {
bp = mrb->c->ci->stack + mrb->c->ci->argc + 1;
}
bp = ci->stack + mrb_ci_bidx(ci);
if (altmode && mrb_nil_p(*bp)) {
mrb_raise(mrb, E_ARGUMENT_ERROR, "no block given");
}
@@ -2812,14 +2836,15 @@ inspect_main(mrb_state *mrb, mrb_value mod)
}
static const mrb_code new_iseq[] = {
OP_ENTER, 0x0, 0x10, 0x1, /* OP_ENTER 0:0:1:0:0:0:1 */
OP_LOADSELF, 0x3, /* OP_LOADSELF R3 */
OP_SEND, 0x3, 0x0, 0x0, /* OP_SEND R3 :allocate 0 */
OP_MOVE, 0x0, 0x3, /* OP_MOVE R0 R3 */
OP_MOVE, 0x4, 0x1, /* OP_MOVE R4 R1 */
OP_MOVE, 0x5, 0x2, /* OP_MOVE R5 R2 */
OP_SENDVB, 0x3, 0x1, /* OP_SENDVB R3 :initialize */
OP_RETURN, 0x0 /* OP_RETURN R0 */
OP_ENTER, 0x0, 0x10, 0x3, // OP_ENTER 0:0:1:0:0:1:1
OP_LOADSELF, 4, // OP_LOADSELF R4
OP_SEND, 4, 0, 0, // OP_SEND R4 :allocate n=0
OP_MOVE, 0, 4, // OP_MOVE R0 R4
OP_MOVE, 5, 1, // OP_MOVE R5 R1 (*)
OP_MOVE, 6, 2, // OP_MOVE R6 R2 (**)
OP_MOVE, 7, 3, // OP_MOVE R7 R3
OP_SENDB, 4, 1, 255, // OP_SENDB R4 :initialize n=*|nk=*
OP_RETURN, 0 // OP_RETURN R0
};
MRB_PRESYM_DEFINE_VAR_AND_INITER(new_syms, 2, MRB_SYM(allocate), MRB_SYM(initialize))
src/codedump.c
+30 -12
View File
@@ -57,6 +57,30 @@ print_header(mrb_state *mrb, const mrb_irep *irep, uint32_t i)
printf("%03d ", (int)i);
}
static void
print_args(uint8_t i)
{
uint8_t n = i&0xf;
uint8_t nk = (i>>4)&0xf;
if (n == 15) {
printf("n=*");
}
else {
printf("n=%d", n);
}
if (nk > 0) {
printf("|");
if (nk == 15) {
printf("nk=*");
}
else {
printf("nk=%d", nk);
}
}
printf(" (0x%02x)\n", i);
}
#define CASE(insn,ops) case insn: FETCH_ ## ops (); L_ ## insn
static void
@@ -294,26 +318,20 @@ codedump(mrb_state *mrb, const mrb_irep *irep)
printf("OP_JMPNIL\tR%d\t%03d\t", a, (int)i+(int16_t)b);
print_lv_a(mrb, irep, a);
break;
CASE(OP_SENDV, BB):
printf("OP_SENDV\tR%d\t:%s\n", a, mrb_sym_dump(mrb, irep->syms[b]));
break;
CASE(OP_SENDVB, BB):
printf("OP_SENDVB\tR%d\t:%s\n", a, mrb_sym_dump(mrb, irep->syms[b]));
break;
CASE(OP_SEND, BBB):
printf("OP_SEND\tR%d\t:%s\t%d\n", a, mrb_sym_dump(mrb, irep->syms[b]), c);
printf("OP_SEND\tR%d\t:%s\t", a, mrb_sym_dump(mrb, irep->syms[b]));
print_args(c);
break;
CASE(OP_SENDB, BBB):
printf("OP_SENDB\tR%d\t:%s\t%d\n", a, mrb_sym_dump(mrb, irep->syms[b]), c);
break;
CASE(OP_SENDVK, BB):
printf("OP_SENDVK\tR%d\t:%s\n", a, mrb_sym_dump(mrb, irep->syms[b]));
printf("OP_SENDB\tR%d\t:%s\t", a, mrb_sym_dump(mrb, irep->syms[b]));
print_args(c);
break;
CASE(OP_CALL, Z):
printf("OP_CALL\n");
break;
CASE(OP_SUPER, BB):
printf("OP_SUPER\tR%d\t%d\n", a, b);
printf("OP_SUPER\tR%d\t", a);
print_args(b);
break;
CASE(OP_ARGARY, BS):
printf("OP_ARGARY\tR%d\t%d:%d:%d:%d (%d)\t", a,
src/gc.c
+3 -23
View File
@@ -599,27 +599,7 @@ add_gray_list(mrb_state *mrb, mrb_gc *gc, struct RBasic *obj)
gc->gray_list = obj;
}
static mrb_int
ci_nregs(mrb_callinfo *ci)
{
const struct RProc *p = ci->proc;
mrb_int n = 0;
if (!p) {
if (ci->argc < 0) return 3;
return ci->argc+2;
}
if (!MRB_PROC_CFUNC_P(p) && p->body.irep) {
n = p->body.irep->nregs;
}
if (ci->argc < 0) {
if (n < 3) n = 3; /* self + args + blk */
}
if (ci->argc > n) {
n = ci->argc + 2; /* self + blk */
}
return n;
}
mrb_int mrb_ci_nregs(mrb_callinfo *ci);
static void
mark_context_stack(mrb_state *mrb, struct mrb_context *c)
@@ -631,7 +611,7 @@ mark_context_stack(mrb_state *mrb, struct mrb_context *c)
if (c->stbase == NULL) return;
if (c->ci) {
e = (c->ci->stack ? c->ci->stack - c->stbase : 0);
e += ci_nregs(c->ci);
e += mrb_ci_nregs(c->ci);
}
else {
e = 0;
@@ -1029,7 +1009,7 @@ gc_gray_counts(mrb_state *mrb, mrb_gc *gc, struct RBasic *obj)
i = c->ci->stack - c->stbase;
if (c->ci) {
i += ci_nregs(c->ci);
i += mrb_ci_nregs(c->ci);
}
if (c->stbase + i > c->stend) i = c->stend - c->stbase;
children += i;
src/hash.c
-9
View File
@@ -1189,15 +1189,6 @@ mrb_hash_init_copy(mrb_state *mrb, mrb_value self)
return self;
}
void
mrb_hash_check_kdict(mrb_state *mrb, mrb_value self)
{
h_each(mrb_hash_ptr(self), entry, {
if (mrb_symbol_p(entry->key)) continue;
mrb_raise(mrb, E_ARGUMENT_ERROR, "keyword argument hash with non symbol keys");
});
}
MRB_API mrb_value
mrb_hash_dup(mrb_state *mrb, mrb_value self)
{
src/kernel.c
+4 -7
View File
@@ -186,13 +186,10 @@ mrb_f_block_given_p_m(mrb_state *mrb, mrb_value self)
bp = &e->stack[bidx];
}
else {
bp = ci->stack+1;
if (ci->argc >= 0) {
bp += ci->argc;
}
else {
bp++;
}
uint8_t n = ci->n == 15 ? 1 : ci->n;
uint8_t k = ci->nk == 15 ? 1 : ci->nk*2;
bidx = n + k + 1; /* self + args + kargs => bidx */
bp = &ci->stack[bidx];
}
block_given:
if (mrb_nil_p(*bp))
src/proc.c
+5 -4
View File
@@ -79,14 +79,15 @@ struct REnv*
mrb_env_new(mrb_state *mrb, struct mrb_context *c, mrb_callinfo *ci, int nstacks, mrb_value *stack, struct RClass *tc)
{
struct REnv *e;
mrb_int bidx;
mrb_int bidx = 1;
int n = ci->n;
int nk = ci->nk;
e = MRB_OBJ_ALLOC(mrb, MRB_TT_ENV, NULL);
e->c = tc;
MRB_ENV_SET_LEN(e, nstacks);
bidx = ci->argc;
if (bidx < 0) bidx = 2;
else bidx += 1;
bidx += (n == 15) ? 1 : n;
bidx += (nk == 15) ? 1 : (2*nk);
MRB_ENV_SET_BIDX(e, bidx);
e->mid = ci->mid;
e->stack = stack;
src/vm.c
+298 -269
View File
@@ -80,7 +80,8 @@ mrb_gc_arena_shrink(mrb_state *mrb, int idx)
#define mrb_gc_arena_shrink(mrb,idx) mrb_gc_arena_restore(mrb,idx)
#endif
#define CALL_MAXARGS 127
#define CALL_MAXARGS 15
#define CALL_VARARGS (CALL_MAXARGS<<4 | CALL_MAXARGS)
void mrb_method_missing(mrb_state *mrb, mrb_sym name, mrb_value self, mrb_value args);
@@ -244,7 +245,7 @@ top_proc(mrb_state *mrb, const struct RProc *proc)
static inline mrb_callinfo*
cipush(mrb_state *mrb, mrb_int push_stacks, uint8_t cci,
struct RClass *target_class, const struct RProc *proc, mrb_sym mid, mrb_int argc)
struct RClass *target_class, const struct RProc *proc, mrb_sym mid, uint8_t argc)
{
struct mrb_context *c = mrb->c;
mrb_callinfo *ci = c->ci;
@@ -263,7 +264,8 @@ cipush(mrb_state *mrb, mrb_int push_stacks, uint8_t cci,
ci->mid = mid;
mrb_vm_ci_proc_set(ci, proc);
ci->stack = ci[-1].stack + push_stacks;
ci->argc = (int16_t)argc;
ci->n = argc & 0xf;
ci->nk = (argc>>4) & 0xf;
ci->cci = cci;
ci->u.target_class = target_class;
@@ -392,27 +394,41 @@ mrb_funcall_id(mrb_state *mrb, mrb_value self, mrb_sym mid, mrb_int argc, ...)
}
static mrb_int
ci_nregs(mrb_callinfo *ci)
mrb_ci_kidx(mrb_callinfo *ci)
{
if (ci->nk == 0) return -1;
return (ci->n % 14) + 1;
}
static mrb_int
mrb_bidx(uint16_t c)
{
uint8_t n = c & 0xf;
uint8_t k = (c>>4) & 0xf;
if (n == 15) n = 1;
if (k == 15) n += 1;
else n += k*2;
return n + 1; /* self + args + kargs */
}
mrb_int
mrb_ci_bidx(mrb_callinfo *ci)
{
return mrb_bidx(ci->n|(ci->nk<<4));
}
mrb_int
mrb_ci_nregs(mrb_callinfo *ci)
{
const struct RProc *p;
mrb_int n = 0;
if (!ci) return 3;
if (!ci) return 4;
uint8_t nregs = mrb_ci_bidx(ci) + 1; /* self + args + kargs + blk */
p = ci->proc;
if (!p) {
if (ci->argc < 0) return 3;
return ci->argc+2;
if (p && !MRB_PROC_CFUNC_P(p) && p->body.irep && p->body.irep->nregs > nregs) {
return p->body.irep->nregs;
}
if (!MRB_PROC_CFUNC_P(p) && p->body.irep) {
n = p->body.irep->nregs;
}
if (ci->argc < 0) {
if (n < 3) n = 3; /* self + args + blk */
}
if (ci->argc > n) {
n = ci->argc + 2; /* self + blk */
}
return n;
return nregs;
}
MRB_API mrb_value
@@ -444,43 +460,45 @@ mrb_funcall_with_block(mrb_state *mrb, mrb_value self, mrb_sym mid, mrb_int argc
else {
mrb_method_t m;
struct RClass *c;
mrb_callinfo *ci;
mrb_int n = ci_nregs(mrb->c->ci);
mrb_callinfo *ci = mrb->c->ci;
mrb_int n = mrb_ci_nregs(ci);
ptrdiff_t voff = -1;
if (!mrb->c->stbase) {
stack_init(mrb);
}
if (ci - mrb->c->cibase > MRB_CALL_LEVEL_MAX) {
mrb_exc_raise(mrb, mrb_obj_value(mrb->stack_err));
}
if (mrb->c->stbase <= argv && argv < mrb->c->stend) {
voff = argv - mrb->c->stbase;
}
if (argc < 0) {
mrb_raisef(mrb, E_ARGUMENT_ERROR, "negative argc for funcall (%i)", argc);
}
c = mrb_class(mrb, self);
m = mrb_method_search_vm(mrb, &c, mid);
mrb_stack_extend(mrb, argc + 3);
if (MRB_METHOD_UNDEF_P(m) || argc >= 15) {
mrb_value args = mrb_ary_new_from_values(mrb, argc, argv);
ci->stack[n+1] = args;
argc = 15;
}
if (MRB_METHOD_UNDEF_P(m)) {
mrb_sym missing = MRB_SYM(method_missing);
mrb_value args = mrb_ary_new_from_values(mrb, argc, argv);
mrb_value args = ci->stack[n+1];
m = mrb_method_search_vm(mrb, &c, missing);
if (MRB_METHOD_UNDEF_P(m)) {
mrb_method_missing(mrb, mid, self, args);
}
mrb_ary_unshift(mrb, args, mrb_symbol_value(mid));
mrb_stack_extend(mrb, n+2);
mrb->c->ci->stack[n+1] = args;
argc = -1;
ci->stack[n+1] = args;
argc = 15;
}
ci = cipush(mrb, n, 0, c, NULL, mid, argc);
if (argc < 0) argc = 1;
if (mrb->c->stbase <= argv && argv < mrb->c->stend) {
voff = argv - mrb->c->stbase;
}
if (argc >= CALL_MAXARGS) {
mrb_value args = mrb_ary_new_from_values(mrb, argc, argv);
mrb->c->ci->stack[1] = args;
ci->argc = -1;
argc = 1;
}
mrb_stack_extend(mrb, argc + 2);
if (MRB_METHOD_PROC_P(m)) {
struct RProc *p = MRB_METHOD_PROC(m);
@@ -492,11 +510,15 @@ mrb_funcall_with_block(mrb_state *mrb, mrb_value self, mrb_sym mid, mrb_int argc
if (voff >= 0) {
argv = mrb->c->stbase + voff;
}
mrb->c->ci->stack[0] = self;
if (ci->argc > 0) {
stack_copy(mrb->c->ci->stack+1, argv, argc);
ci->stack[0] = self;
if (argc < 15) {
if (argc > 0)
stack_copy(ci->stack+1, argv, argc);
ci->stack[argc+1] = blk;
}
else {
ci->stack[2] = blk;
}
mrb->c->ci->stack[argc+1] = blk;
if (MRB_METHOD_CFUNC_P(m)) {
ci->cci = CINFO_DIRECT;
@@ -531,8 +553,7 @@ exec_irep(mrb_state *mrb, mrb_value self, struct RProc *p)
return MRB_PROC_CFUNC(p)(mrb, self);
}
nregs = p->body.irep->nregs;
if (ci->argc < 0) keep = 3;
else keep = ci->argc + 2;
keep = mrb_ci_bidx(ci)+1;
if (nregs < keep) {
mrb_stack_extend(mrb, keep);
}
@@ -556,12 +577,12 @@ mrb_exec_irep(mrb_state *mrb, mrb_value self, struct RProc *p)
else {
mrb_value ret;
if (MRB_PROC_CFUNC_P(p)) {
cipush(mrb, 0, CINFO_DIRECT, mrb_vm_ci_target_class(ci), p, ci->mid, ci->argc);
cipush(mrb, 0, CINFO_DIRECT, mrb_vm_ci_target_class(ci), p, ci->mid, ci->n|(ci->nk<<4));
ret = MRB_PROC_CFUNC(p)(mrb, self);
cipop(mrb);
}
else {
int keep = (ci->argc < 0 ? 1 : ci->argc) + 2 /* receiver + block */;
int keep = mrb_ci_bidx(ci) + 1; /* receiver + block */
ret = mrb_top_run(mrb, p, self, keep);
}
if (mrb->exc && mrb->jmp) {
@@ -595,19 +616,31 @@ mrb_f_send(mrb_state *mrb, mrb_value self)
{
mrb_sym name;
mrb_value block, *regs;
const mrb_value *argv;
mrb_int argc, i, len;
mrb_method_t m;
struct RClass *c;
mrb_callinfo *ci;
mrb_callinfo *ci = mrb->c->ci;
int n = ci->n;
mrb_get_args(mrb, "n*&", &name, &argv, &argc, &block);
ci = mrb->c->ci;
if (ci->cci > CINFO_NONE) {
funcall:
funcall:;
const mrb_value *argv;
mrb_int argc;
mrb_get_args(mrb, "n*&", &name, &argv, &argc, &block);
return mrb_funcall_with_block(mrb, self, name, argc, argv, block);
}
regs = mrb->c->ci->stack+1;
if (n == 0) {
mrb_argnum_error(mrb, 0, 1, -1);
}
else if (n == 15) {
name = mrb_obj_to_sym(mrb, RARRAY_PTR(regs[0])[0]);
}
else {
name = mrb_obj_to_sym(mrb, regs[0]);
}
c = mrb_class(mrb, self);
m = mrb_method_search_vm(mrb, &c, name);
if (MRB_METHOD_UNDEF_P(m)) { /* call method_mising */
@@ -616,16 +649,19 @@ mrb_f_send(mrb_state *mrb, mrb_value self)
ci->mid = name;
ci->u.target_class = c;
regs = mrb->c->ci->stack+1;
/* remove first symbol from arguments */
if (ci->argc >= 0) {
for (i=0,len=ci->argc; i<len; i++) {
if (n == 15) { /* variable length arguments */
regs[0] = mrb_ary_subseq(mrb, regs[0], 1, RARRAY_LEN(regs[0]) - 1);
}
else { /* n > 0 */
for (int i=0; i<n; i++) {
regs[i] = regs[i+1];
}
ci->argc--;
}
else { /* variable length arguments */
regs[0] = mrb_ary_subseq(mrb, regs[0], 1, RARRAY_LEN(regs[0]) - 1);
regs[n] = regs[n+1]; /* copy kdict or block */
if (ci->nk > 0) {
regs[n+1] = regs[n+2]; /* copy block */
}
ci->n--;
}
if (MRB_METHOD_CFUNC_P(m)) {
@@ -654,17 +690,18 @@ eval_under(mrb_state *mrb, mrb_value self, mrb_value blk, struct RClass *c)
ci->u.target_class = c;
p = mrb_proc_ptr(blk);
mrb_vm_ci_proc_set(ci, p);
ci->argc = 1;
ci->n = 1;
ci->nk = 0;
ci->mid = ci[-1].mid;
if (MRB_PROC_CFUNC_P(p)) {
mrb_stack_extend(mrb, 3);
mrb_stack_extend(mrb, 4);
mrb->c->ci->stack[0] = self;
mrb->c->ci->stack[1] = self;
mrb->c->ci->stack[2] = mrb_nil_value();
return MRB_PROC_CFUNC(p)(mrb, self);
}
nregs = p->body.irep->nregs;
if (nregs < 3) nregs = 3;
if (nregs < 4) nregs = 4;
mrb_stack_extend(mrb, nregs);
mrb->c->ci->stack[0] = self;
mrb->c->ci->stack[1] = self;
@@ -740,27 +777,28 @@ mrb_yield_with_class(mrb_state *mrb, mrb_value b, mrb_int argc, const mrb_value
mrb_raise(mrb, E_ARGUMENT_ERROR, "no block given");
}
ci = mrb->c->ci;
n = ci_nregs(ci);
n = mrb_ci_nregs(ci);
p = mrb_proc_ptr(b);
ci = cipush(mrb, n, CINFO_SKIP, c, p, mid, 0 /* dummy */);
ci->nk = 0;
if (argc >= CALL_MAXARGS) {
ci->argc = -1;
ci->n = 15;
n = 3;
}
else {
ci->argc = (int)argc;
ci->n = argc;
n = argc + 2;
}
mrb_stack_extend(mrb, n);
mrb->c->ci->stack[0] = self;
if (ci->argc < 0) {
if (ci->n == 15) {
mrb->c->ci->stack[1] = mrb_ary_new_from_values(mrb, argc, argv);
argc = 1;
}
else if (argc > 0) {
stack_copy(mrb->c->ci->stack+1, argv, argc);
}
mrb->c->ci->stack[argc+1] = mrb_nil_value();
mrb->c->ci->stack[argc+1] = mrb_nil_value(); /* clear blk */
if (MRB_PROC_CFUNC_P(p)) {
ci->cci = CINFO_DIRECT;
@@ -805,10 +843,12 @@ mrb_yield_cont(mrb_state *mrb, mrb_value b, mrb_value self, mrb_int argc, const
p = mrb_proc_ptr(b);
ci = mrb->c->ci;
mrb_stack_extend(mrb, 3);
mrb_stack_extend(mrb, 4);
mrb->c->ci->stack[1] = mrb_ary_new_from_values(mrb, argc, argv);
mrb->c->ci->stack[2] = mrb_nil_value();
ci->argc = -1;
mrb->c->ci->stack[3] = mrb_nil_value();
ci->n = 15;
ci->nk = 0;
return exec_irep(mrb, self, p);
}
@@ -890,9 +930,9 @@ argnum_error(mrb_state *mrb, mrb_int num)
{
mrb_value exc;
mrb_value str;
mrb_int argc = mrb->c->ci->argc;
mrb_int argc = mrb->c->ci->n;
if (argc < 0) {
if (argc == 15) {
mrb_value args = mrb->c->ci->stack[1];
if (mrb_array_p(args)) {
argc = RARRAY_LEN(args);
@@ -1051,15 +1091,63 @@ check_target_class(mrb_state *mrb)
return target;
}
mrb_value
get_send_args(mrb_state *mrb, mrb_int argc, mrb_value *regs)
static mrb_value
hash_new_from_values(mrb_state *mrb, mrb_int argc, mrb_value *regs)
{
if (argc < 0) return regs[0];
return mrb_ary_new_from_values(mrb, argc, regs);
mrb_value hash = mrb_hash_new_capa(mrb, argc);
while (argc--) {
mrb_hash_set(mrb, hash, regs[0], regs[1]);
regs += 2;
}
return hash;
}
mrb_value mrb_obj_missing(mrb_state *mrb, mrb_value mod);
void mrb_hash_check_kdict(mrb_state *mrb, mrb_value self);
static mrb_method_t
prepare_missing(mrb_state *mrb, mrb_value recv, mrb_sym mid, struct RClass **clsp, uint32_t a, uint16_t *c, mrb_value blk, int super)
{
mrb_sym missing = MRB_SYM(method_missing);
mrb_callinfo *ci = mrb->c->ci;
uint16_t b = *c;
mrb_int n = b & 0xf;
mrb_int nk = (b>>4) & 0xf;
mrb_value *argv = &ci->stack[a+1];
mrb_value args;
mrb_method_t m;
/* pack positional arguments */
if (n == 15) args = argv[0];
else args = mrb_ary_new_from_values(mrb, n, argv);
if (mrb_func_basic_p(mrb, recv, missing, mrb_obj_missing)) {
method_missing:
if (super) mrb_no_method_error(mrb, mid, args, "no superclass method '%n'", mid);
else mrb_method_missing(mrb, mid, recv, args);
/* not reached */
}
if (mid != missing) {
*clsp = mrb_class(mrb, recv);
}
m = mrb_method_search_vm(mrb, clsp, missing);
if (MRB_METHOD_UNDEF_P(m)) goto method_missing; /* just in case */
mrb_stack_extend(mrb, a+4);
argv = &ci->stack[a+1]; /* maybe reallocated */
argv[0] = args;
if (nk == 0) {
argv[1] = blk;
}
else {
mrb_assert(nk == 15);
argv[1] = argv[n];
argv[2] = blk;
}
*c = 15 | (nk<<4);
mrb_ary_unshift(mrb, args, mrb_symbol_value(mid));
return m;
}
void mrb_method_added(mrb_state *mrb, struct RClass *c, mrb_sym mid);
mrb_value mrb_str_aref(mrb_state *mrb, mrb_value str, mrb_value idx, mrb_value len);
@@ -1451,84 +1539,63 @@ RETRY_TRY_BLOCK:
NEXT;
}
CASE(OP_SENDV, BB) {
c = CALL_MAXARGS;
goto L_SEND;
};
CASE(OP_SENDVB, BB) {
c = CALL_MAXARGS;
goto L_SENDB;
};
CASE(OP_SEND, BBB)
L_SEND:
{
/* push nil after arguments */
int bidx = (c == CALL_MAXARGS) ? a+2 : a+c+1;
SET_NIL_VALUE(regs[bidx]);
goto L_SENDB;
};
goto L_SENDB;
L_SEND_SYM:
{
/* push nil after arguments */
int bidx = (c == CALL_MAXARGS) ? a+2 : a+c+1;
SET_NIL_VALUE(regs[bidx]);
goto L_SENDB_SYM;
};
c = 1;
/* push nil after arguments */
SET_NIL_VALUE(regs[a+2]);
goto L_SENDB_SYM;
CASE(OP_SENDB, BBB)
L_SENDB:
mid = syms[b];
L_SENDB_SYM:
{
mrb_int argc = (c == CALL_MAXARGS) ? -1 : c;
mrb_int bidx = (argc < 0) ? a+2 : a+c+1;
int n = c&0xf;
int nk = (c>>4)&0xf;
mrb_callinfo *ci = mrb->c->ci;
mrb_int bidx = a + ((n == 15) ? 1 : n) + ((nk == 15) ? 1 : 2*nk) + 1;
mrb_method_t m;
struct RClass *cls;
mrb_callinfo *ci = mrb->c->ci;
mrb_value recv, blk;
mrb_value recv;
mrb_assert(bidx < irep->nregs);
if (0 < nk && nk < 15) { /* pack keyword arguments */
mrb_int kidx = a+n+1;
mrb_value kdict = hash_new_from_values(mrb, nk, regs+kidx);
regs[kidx] = kdict;
nk = 15;
c = n | (nk<<4);
}
mrb_assert(bidx < irep->nregs+a);
mrb_value blk = mrb_nil_value();
mrb_int new_bidx = a+((n==15)?1:n)+1+(nk==15);
if (insn == OP_SEND) {
/* clear block argument */
SET_NIL_VALUE(regs[new_bidx]);
}
else {
blk = regs[bidx];
if (!mrb_nil_p(blk) && !mrb_proc_p(blk)) {
blk = mrb_type_convert(mrb, blk, MRB_TT_PROC, MRB_SYM(to_proc));
/* The stack might have been reallocated during mrb_type_convert(),
see #3622 */
}
regs[new_bidx] = blk;
}
recv = regs[a];
blk = regs[bidx];
if (!mrb_nil_p(blk) && !mrb_proc_p(blk)) {
blk = mrb_type_convert(mrb, blk, MRB_TT_PROC, MRB_SYM(to_proc));
/* The stack might have been reallocated during mrb_type_convert(),
see #3622 */
regs[bidx] = blk;
}
cls = mrb_class(mrb, recv);
m = mrb_method_search_vm(mrb, &cls, mid);
if (MRB_METHOD_UNDEF_P(m)) {
mrb_sym missing = MRB_SYM(method_missing);
mrb_value args;
if (mrb_func_basic_p(mrb, recv, missing, mrb_obj_missing)) {
method_missing:
args = get_send_args(mrb, argc, regs+a+1);
mrb_method_missing(mrb, mid, recv, args);
}
if (mid != missing) {
cls = mrb_class(mrb, recv);
}
m = mrb_method_search_vm(mrb, &cls, missing);
if (MRB_METHOD_UNDEF_P(m)) goto method_missing; /* just in case */
if (argc >= 0) {
if (a+2 >= irep->nregs) {
mrb_stack_extend(mrb, a+3);
}
regs[a+1] = mrb_ary_new_from_values(mrb, c, regs+a+1);
regs[a+2] = blk;
argc = -1;
}
mrb_ary_unshift(mrb, regs[a+1], mrb_symbol_value(mid));
mid = missing;
m = prepare_missing(mrb, recv, mid, &cls, a, &c, blk, 0);
mid = MRB_SYM(method_missing);
}
/* push callinfo */
ci = cipush(mrb, a, 0, cls, NULL, mid, argc);
ci = cipush(mrb, a, 0, cls, NULL, mid, c);
if (MRB_METHOD_CFUNC_P(m)) {
if (MRB_METHOD_PROC_P(m)) {
@@ -1538,7 +1605,7 @@ RETRY_TRY_BLOCK:
recv = p->body.func(mrb, recv);
}
else if (MRB_METHOD_NOARG_P(m) &&
(argc > 0 || (argc == -1 && RARRAY_LEN(regs[1]) != 0))) {
!(n == 0 || (n == CALL_MAXARGS && RARRAY_LEN(regs[1]) == 0))) {
argnum_error(mrb, 0);
goto L_RAISE;
}
@@ -1567,7 +1634,7 @@ RETRY_TRY_BLOCK:
syms = irep->syms;
}
}
mrb->c->ci->stack[0] = recv;
ci->stack[0] = recv;
/* pop stackpos */
ci = cipop(mrb);
pc = ci->pc;
@@ -1578,19 +1645,18 @@ RETRY_TRY_BLOCK:
irep = proc->body.irep;
pool = irep->pool;
syms = irep->syms;
mrb_stack_extend(mrb, (argc < 0 && irep->nregs < 3) ? 3 : irep->nregs);
mrb_stack_extend(mrb, (irep->nregs < 4) ? 4 : irep->nregs);
pc = irep->iseq;
}
}
JUMP;
CASE(OP_CALL, Z) {
mrb_callinfo *ci;
mrb_value recv = mrb->c->ci->stack[0];
mrb_callinfo *ci = mrb->c->ci;
mrb_value recv = ci->stack[0];
struct RProc *m = mrb_proc_ptr(recv);
/* replace callinfo */
ci = mrb->c->ci;
ci->u.target_class = MRB_PROC_TARGET_CLASS(m);
mrb_vm_ci_proc_set(ci, m);
if (MRB_PROC_ENV_P(m)) {
@@ -1623,14 +1689,10 @@ RETRY_TRY_BLOCK:
}
pool = irep->pool;
syms = irep->syms;
mrb_stack_extend(mrb, irep->nregs);
if (ci->argc < 0) {
if (irep->nregs > 3) {
stack_clear(regs+3, irep->nregs-3);
}
}
else if (ci->argc+2 < irep->nregs) {
stack_clear(regs+ci->argc+2, irep->nregs-ci->argc-2);
mrb_int nargs = mrb_ci_bidx(ci)+1;
if (nargs < irep->nregs) {
mrb_stack_extend(mrb, irep->nregs);
stack_clear(regs+nargs, irep->nregs-nargs);
}
if (MRB_PROC_ENV_P(m)) {
regs[0] = MRB_PROC_ENV(m)->stack[0];
@@ -1641,11 +1703,10 @@ RETRY_TRY_BLOCK:
}
CASE(OP_SUPER, BB) {
mrb_int argc = (b == CALL_MAXARGS) ? -1 : b;
int bidx = (argc < 0) ? a+2 : a+b+1;
mrb_method_t m;
struct RClass *cls;
mrb_callinfo *ci = mrb->c->ci;
mrb_int bidx = mrb_bidx(b)+a;
mrb_value recv, blk;
const struct RProc *p = ci->proc;
mrb_sym mid = ci->mid;
@@ -1689,36 +1750,15 @@ RETRY_TRY_BLOCK:
cls = target_class->super;
m = mrb_method_search_vm(mrb, &cls, mid);
if (MRB_METHOD_UNDEF_P(m)) {
mrb_sym missing = MRB_SYM(method_missing);
mrb_value args;
if (mrb_func_basic_p(mrb, recv, missing, mrb_obj_missing)) {
super_missing:
args = get_send_args(mrb, argc, regs+a+1);
mrb_no_method_error(mrb, mid, args, "no superclass method '%n'", mid);
}
if (mid != missing) {
cls = mrb_class(mrb, recv);
}
m = mrb_method_search_vm(mrb, &cls, missing);
if (MRB_METHOD_UNDEF_P(m)) goto super_missing; /* just in case */
if (argc >= 0) {
if (a+2 >= irep->nregs) {
mrb_stack_extend(mrb, a+3);
}
regs[a+1] = mrb_ary_new_from_values(mrb, b, regs+a+1);
regs[a+2] = blk;
argc = -1;
}
mrb_ary_unshift(mrb, regs[a+1], mrb_symbol_value(mid));
mid = missing;
m = prepare_missing(mrb, recv, mid, &cls, a, &b, blk, 1);
mid = MRB_SYM(method_missing);
}
/* push callinfo */
ci = cipush(mrb, a, 0, cls, NULL, mid, argc);
ci = cipush(mrb, a, 0, cls, NULL, mid, b);
/* prepare stack */
mrb->c->ci->stack[0] = recv;
ci->stack[0] = recv;
if (MRB_METHOD_CFUNC_P(m)) {
mrb_value v;
@@ -1755,7 +1795,7 @@ RETRY_TRY_BLOCK:
irep = proc->body.irep;
pool = irep->pool;
syms = irep->syms;
mrb_stack_extend(mrb, (argc < 0 && irep->nregs < 3) ? 3 : irep->nregs);
mrb_stack_extend(mrb, (irep->nregs < 4) ? 4 : irep->nregs);
pc = irep->iseq;
JUMP;
}
@@ -1781,12 +1821,12 @@ RETRY_TRY_BLOCK:
else {
struct REnv *e = uvenv(mrb, lv-1);
if (!e) goto L_NOSUPER;
if (MRB_ENV_LEN(e) <= m1+r+m2+kd+1)
if (MRB_ENV_LEN(e) <= m1+r+m2+1)
goto L_NOSUPER;
stack = e->stack + 1;
}
if (r == 0) {
regs[a] = mrb_ary_new_from_values(mrb, m1+m2+kd, stack);
regs[a] = mrb_ary_new_from_values(mrb, m1+m2, stack);
}
else {
mrb_value *pp = NULL;
@@ -1799,7 +1839,7 @@ RETRY_TRY_BLOCK:
pp = ARY_PTR(ary);
len = ARY_LEN(ary);
}
regs[a] = mrb_ary_new_capa(mrb, m1+len+m2+kd);
regs[a] = mrb_ary_new_capa(mrb, m1+len+m2);
rest = mrb_ary_ptr(regs[a]);
if (m1 > 0) {
stack_copy(ARY_PTR(rest), stack, m1);
@@ -1810,12 +1850,15 @@ RETRY_TRY_BLOCK:
if (m2 > 0) {
stack_copy(ARY_PTR(rest)+m1+len, stack+m1+1, m2);
}
if (kd) {
stack_copy(ARY_PTR(rest)+m1+len+m2, stack+m1+m2+1, kd);
}
ARY_SET_LEN(rest, m1+len+m2+kd);
ARY_SET_LEN(rest, m1+len+m2);
}
if (kd) {
regs[a+1] = stack[m1+r+m2];
regs[a+2] = stack[m1+r+m2+1];
}
else {
regs[a+1] = stack[m1+r+m2];
}
regs[a+1] = stack[m1+r+m2];
mrb_gc_arena_restore(mrb, ai);
NEXT;
}
@@ -1829,17 +1872,48 @@ RETRY_TRY_BLOCK:
/* unused
int b = MRB_ASPEC_BLOCK(a);
*/
mrb_int argc = mrb->c->ci->argc;
mrb_int const len = m1 + o + r + m2;
mrb_callinfo *ci = mrb->c->ci;
mrb_int argc = ci->n;
mrb_value *argv = regs+1;
mrb_value * const argv0 = argv;
mrb_int const len = m1 + o + r + m2;
mrb_int const blk_pos = len + kd + 1;
mrb_value *blk = &argv[argc < 0 ? 1 : argc];
mrb_int const kw_pos = len + kd; /* where kwhash should be */
mrb_int const blk_pos = kw_pos + 1; /* where block should be */
mrb_value blk = regs[mrb_ci_bidx(ci)];
mrb_value kdict = mrb_nil_value();
mrb_int kargs = kd;
/* keyword arguments */
if (ci->nk > 0) {
mrb_int kidx = mrb_ci_kidx(ci);
kdict = regs[kidx];
if (!mrb_hash_p(kdict) || mrb_hash_size(mrb, kdict) == 0) {
kdict = mrb_nil_value();
ci->nk = 0;
}
}
if (!kd && !mrb_nil_p(kdict)) {
if (argc < 14) {
ci->n++;
argc++; /* include kdict in normal arguments */
}
else if (argc == 14) {
/* pack arguments and kdict */
regs[1] = mrb_ary_new_from_values(mrb, argc+1, &regs[1]);
argc = ci->n = 15;
}
else {/* argc == 15 */
/* push kdict to packed arguments */
mrb_ary_push(mrb, regs[1], regs[2]);
}
ci->nk = 0;
}
if (kd && MRB_ASPEC_KEY(a) > 0 && mrb_hash_p(kdict)) {
kdict = mrb_hash_dup(mrb, kdict);
}
/* arguments is passed with Array */
if (argc < 0) {
if (argc == 15) {
struct RArray *ary = mrb_ary_ptr(regs[1]);
argv = ARY_PTR(ary);
argc = (int)ARY_LEN(ary);
@@ -1847,8 +1921,8 @@ RETRY_TRY_BLOCK:
}
/* strict argument check */
if (mrb->c->ci->proc && MRB_PROC_STRICT_P(mrb->c->ci->proc)) {
if (argc < m1 + m2 || (r == 0 && argc > len + kd)) {
if (ci->proc && MRB_PROC_STRICT_P(ci->proc)) {
if (argc < m1 + m2 || (r == 0 && argc > len)) {
argnum_error(mrb, m1+m2);
goto L_RAISE;
}
@@ -1860,40 +1934,13 @@ RETRY_TRY_BLOCK:
argv = RARRAY_PTR(argv[0]);
}
if (kd) {
/* check last arguments is hash if method takes keyword arguments */
if (argc == m1+m2) {
kdict = mrb_hash_new(mrb);
kargs = 0;
}
else {
if (argv && argc > 0 && mrb_hash_p(argv[argc-1])) {
kdict = argv[argc-1];
mrb_hash_check_kdict(mrb, kdict);
}
else if (r || argc <= m1+m2+o
|| !(mrb->c->ci->proc && MRB_PROC_STRICT_P(mrb->c->ci->proc))) {
kdict = mrb_hash_new(mrb);
kargs = 0;
}
else {
argnum_error(mrb, m1+m2);
goto L_RAISE;
}
if (MRB_ASPEC_KEY(a) > 0) {
kdict = mrb_hash_dup(mrb, kdict);
}
}
}
/* no rest arguments */
if (argc-kargs < len) {
/* rest arguments */
mrb_value rest = mrb_nil_value();
if (argc < len) {
mrb_int mlen = m2;
if (argc < m1+m2) {
mlen = m1 < argc ? argc - m1 : 0;
}
regs[blk_pos] = *blk; /* move block */
if (kd) regs[len + 1] = kdict;
/* copy mandatory and optional arguments */
if (argv0 != argv && argv) {
@@ -1911,40 +1958,39 @@ RETRY_TRY_BLOCK:
}
/* initialize rest arguments with empty Array */
if (r) {
regs[m1+o+1] = mrb_ary_new_capa(mrb, 0);
rest = mrb_ary_new_capa(mrb, 0);
regs[m1+o+1] = rest;
}
/* skip initializer of passed arguments */
if (o > 0 && argc-kargs > m1+m2)
pc += (argc - kargs - m1 - m2)*3;
if (o > 0 && argc > m1+m2)
pc += (argc - m1 - m2)*3;
}
else {
mrb_int rnum = 0;
if (argv0 != argv) {
regs[blk_pos] = *blk; /* move block */
if (kd) regs[len + 1] = kdict;
value_move(&regs[1], argv, m1+o);
}
if (r) {
mrb_value ary;
rnum = argc-m1-o-m2-kargs;
ary = mrb_ary_new_from_values(mrb, rnum, argv+m1+o);
regs[m1+o+1] = ary;
rnum = argc-m1-o-m2;
rest = mrb_ary_new_from_values(mrb, rnum, argv+m1+o);
regs[m1+o+1] = rest;
}
if (m2) {
if (argc-m2 > m1) {
value_move(&regs[m1+o+r+1], &argv[m1+o+rnum], m2);
}
}
if (argv0 == argv) {
regs[blk_pos] = *blk; /* move block */
if (kd) regs[len + 1] = kdict;
if (m2 > 0 && argc-m2 > m1) {
value_move(&regs[m1+o+r+1], &argv[m1+o+rnum], m2);
}
pc += o*3;
}
/* need to be update blk first to protect blk from GC */
regs[blk_pos] = blk; /* move block */
if (kd) {
if (mrb_nil_p(kdict))
kdict = mrb_hash_new_capa(mrb, 0);
regs[kw_pos] = kdict; /* set kwhash */
}
/* format arguments for generated code */
mrb->c->ci->argc = (int16_t)(len + kd);
mrb->c->ci->n = len;
/* clear local (but non-argument) variables */
if (irep->nlocals-blk_pos-1 > 0) {
@@ -1955,9 +2001,10 @@ RETRY_TRY_BLOCK:
CASE(OP_KARG, BB) {
mrb_value k = mrb_symbol_value(syms[b]);
mrb_value kdict = regs[mrb->c->ci->argc];
mrb_int kidx = mrb_ci_kidx(mrb->c->ci);
mrb_value kdict;
if (!mrb_hash_p(kdict) || !mrb_hash_key_p(mrb, kdict, k)) {
if (kidx < 0 || !mrb_hash_p(kdict=regs[kidx]) || !mrb_hash_key_p(mrb, kdict, k)) {
mrb_value str = mrb_format(mrb, "missing keyword: %v", k);
mrb_exc_set(mrb, mrb_exc_new_str(mrb, E_ARGUMENT_ERROR, str));
goto L_RAISE;
@@ -1969,10 +2016,11 @@ RETRY_TRY_BLOCK:
CASE(OP_KEY_P, BB) {
mrb_value k = mrb_symbol_value(syms[b]);
mrb_value kdict = regs[mrb->c->ci->argc];
mrb_int kidx = mrb_ci_kidx(mrb->c->ci);
mrb_value kdict;
mrb_bool key_p = FALSE;
if (mrb_hash_p(kdict)) {
if (kidx >= 0 && mrb_hash_p(kdict=regs[kidx])) {
key_p = mrb_hash_key_p(mrb, kdict, k);
}
regs[a] = mrb_bool_value(key_p);
@@ -1980,9 +2028,10 @@ RETRY_TRY_BLOCK:
}
CASE(OP_KEYEND, Z) {
mrb_value kdict = regs[mrb->c->ci->argc];
mrb_int kidx = mrb_ci_kidx(mrb->c->ci);
mrb_value kdict;
if (mrb_hash_p(kdict) && !mrb_hash_empty_p(mrb, kdict)) {
if (kidx >= 0 && mrb_hash_p(kdict=regs[kidx]) && !mrb_hash_empty_p(mrb, kdict)) {
mrb_value keys = mrb_hash_keys(mrb, kdict);
mrb_value key1 = RARRAY_PTR(keys)[0];
mrb_value str = mrb_format(mrb, "unknown keyword: %v", key1);
@@ -2008,14 +2057,8 @@ RETRY_TRY_BLOCK:
ci = mrb->c->ci;
if (ci->mid) {
mrb_value blk;
mrb_value blk = regs[mrb_ci_bidx(ci)];
if (ci->argc < 0) {
blk = regs[2];
}
else {
blk = regs[ci->argc+1];
}
if (mrb_proc_p(blk)) {
struct RProc *p = mrb_proc_ptr(blk);
@@ -2310,7 +2353,7 @@ RETRY_TRY_BLOCK:
}
stack = e->stack + 1;
}
if (mrb_nil_p(stack[m1+r+m2])) {
if (mrb_nil_p(stack[m1+r+m2+kd])) {
localjump_error(mrb, LOCALJUMP_ERROR_YIELD);
goto L_RAISE;
}
@@ -2335,7 +2378,6 @@ RETRY_TRY_BLOCK:
OP_MATH_CASE_FLOAT(op_name, float, float); \
OP_MATH_CASE_STRING_##op_name(); \
default: \
c = 1; \
mid = MRB_OPSYM(op_name); \
goto L_SEND_SYM; \
} \
@@ -2417,7 +2459,6 @@ RETRY_TRY_BLOCK:
break;
#endif
default:
c = 1;
mid = MRB_OPSYM(div);
goto L_SEND_SYM;
}
@@ -2436,7 +2477,6 @@ RETRY_TRY_BLOCK:
OP_MATHI_CASE_FLOAT(op_name); \
default: \
SET_INT_VALUE(mrb,regs[a+1], b); \
c = 1; \
mid = MRB_OPSYM(op_name); \
goto L_SEND_SYM; \
} \
@@ -2482,7 +2522,6 @@ RETRY_TRY_BLOCK:
result = OP_CMP_BODY(op,mrb_fixnum,mrb_fixnum);\
break;\
default:\
c = 1;\
mid = MRB_OPSYM(sym);\
goto L_SEND_SYM;\
}\
@@ -2511,7 +2550,6 @@ RETRY_TRY_BLOCK:
result = OP_CMP_BODY(op,mrb_float,mrb_float);\
break;\
default:\
c = 1;\
mid = MRB_OPSYM(sym);\
goto L_SEND_SYM;\
}\
@@ -2910,10 +2948,6 @@ RETRY_TRY_BLOCK:
goto L_RAISE;
}
CASE(OP_SENDVK, BB) { /* not yet implemented */
NEXT;
}
CASE(OP_EXT1, Z) {
insn = READ_B();
switch (insn) {
@@ -2981,12 +3015,7 @@ RETRY_TRY_BLOCK:
static mrb_value
mrb_run(mrb_state *mrb, const struct RProc *proc, mrb_value self)
{
if (mrb->c->ci->argc < 0) {
return mrb_vm_run(mrb, proc, self, 3); /* receiver, args and block) */
}
else {
return mrb_vm_run(mrb, proc, self, mrb->c->ci->argc + 2); /* argc + 2 (receiver and block) */
}
return mrb_vm_run(mrb, proc, self, mrb_ci_bidx(mrb->c->ci) + 1);
}
MRB_API mrb_value
test/t/syntax.rb
+10 -29
View File
@@ -552,8 +552,7 @@ assert 'keyword arguments' do
assert_raise(ArgumentError) { m }
assert_raise(ArgumentError) { m 'a' => 1, a: 1 }
h = { a: 1 }
assert_equal 1, m(h)
assert_equal({ a: 1 }, h)
assert_equal 1, m(**h)
def m(a: 1) a end
assert_equal 1, m
@@ -568,23 +567,23 @@ assert 'keyword arguments' do
def m(a, **) a end
assert_equal 1, m(1)
assert_equal 1, m(1, a: 2, b: 3)
assert_equal({ 'a' => 1, b: 2 }, m('a' => 1, b: 2))
assert_raise(ArgumentError) { m('a' => 1, b: 2) }
def m(a, **k) [a, k] end
assert_equal [1, {}], m(1)
assert_equal [1, {a: 2, b: 3}], m(1, a: 2, b: 3)
assert_equal [{'a' => 1, b: 2}, {}], m('a' => 1, b: 2)
assert_raise(ArgumentError) { m('a' => 1, b: 2) }
def m(a=1, **) a end
assert_equal 1, m
assert_equal 2, m(2, a: 1, b: 0)
assert_raise(ArgumentError) { m('a' => 1, a: 2) }
def m(a=1, **k) [a, k] end
assert_equal [1, {}], m
assert_equal [1, {a: 1}], m(a: 1)
assert_equal [2, {a: 1, b: 2}], m(2, a: 1, b: 2)
assert_equal [{a: 1}, {b: 2}], m({a: 1}, {b: 2})
assert_equal [{a: 1}, {b: 2}], m({a: 1}, b: 2)
assert_raise(ArgumentError) { m({a: 1}, {b: 2}) }
def m(*, a:) a end
assert_equal 1, m(a: 1)
@@ -609,34 +608,27 @@ assert 'keyword arguments' do
def m(*a, **) a end
assert_equal [], m()
assert_equal [1, 2, 3], m(1, 2, 3, a: 4, b: 5)
assert_raise(ArgumentError) { m("a" => 1, a: 1) }
assert_equal [1], m(1, **{a: 2})
def m(*, **k) k end
assert_equal({}, m())
assert_equal({a: 4, b: 5}, m(1, 2, 3, a: 4, b: 5))
assert_raise(ArgumentError) { m("a" => 1, a: 1) }
def m(a = nil, b = nil, **k) [a, k] end
assert_equal [nil, {}], m()
assert_equal([nil, {a: 1}], m(a: 1))
assert_raise(ArgumentError) { m("a" => 1, a: 1) }
assert_equal([{"a" => 1}, {a: 1}], m({ "a" => 1 }, a: 1))
assert_equal([{a: 1}, {}], m({a: 1}, {}))
assert_equal([nil, {}], m({}))
assert_equal([{}, {}], m({}))
def m(*a, **k) [a, k] end
assert_equal([[], {}], m())
assert_equal([[1], {}], m(1))
assert_equal([[], {a: 1, b: 2}], m(a: 1, b: 2))
assert_equal([[1, 2, 3], {a: 2}], m(1, 2, 3, a: 2))
assert_raise(ArgumentError) { m("a" => 1, a: 1) }
assert_raise(ArgumentError) { m("a" => 1) }
assert_equal([[], {a: 1}], m(a: 1))
assert_raise(ArgumentError) { m("a" => 1, a: 1) }
assert_equal([[{"a" => 1}], {a: 1}], m({ "a" => 1 }, a: 1))
assert_equal([[{a: 1}], {}], m({a: 1}, {}))
assert_raise(ArgumentError) { m({a: 1}, {"a" => 1}) }
assert_equal([[{a: 1}, {}], {}], m({a: 1}, {}))
def m(a:, b:) [a, b] end
assert_equal([1, 2], m(a: 1, b: 2))
@@ -645,23 +637,21 @@ assert 'keyword arguments' do
def m(a:, b: 1) [a, b] end
assert_equal([1, 1], m(a: 1))
assert_equal([1, 2], m(a: 1, b: 2))
assert_raise(ArgumentError) { m(b: 1) }
assert_raise(ArgumentError) { m("a" => 1, a: 1, b: 2) }
def m(a:, **) a end
assert_equal(1, m(a: 1))
assert_equal(1, m(a: 1, b: 2))
assert_raise(ArgumentError) { m("a" => 1, a: 1, b: 2) }
def m(a:, **k) [a, k] end
assert_equal([1, {}], m(a: 1))
assert_equal([1, {b: 2, c: 3}], m(a: 1, b: 2, c: 3))
assert_raise(ArgumentError) { m("a" => 1, a: 1, b: 2) }
=begin
def m(a:, &b) [a, b] end
assert_equal([1, nil], m(a: 1))
assert_equal([1, l], m(a: 1, &(l = ->{})))
=end
result = m(a: 1, &(l = ->{}))
assert_equal([1, l], result)
def m(a: 1, b:) [a, b] end
assert_equal([1, 0], m(b: 0))
@@ -699,21 +689,12 @@ assert 'keyword arguments' do
assert_equal([{ a: 1, b: 2}, nil], m(a: 1, b: 2))
assert_equal :blk, m{ :blk }[1].call
def m(hsh = {}) hsh end
assert_equal({ a: 1, b: 2 }, m(a: 1, b: 2))
assert_equal({ a: 1, 'b' => 2 }, m(a: 1, 'b' => 2))
def m(hsh) hsh end
assert_equal({ a: 1, b: 2 }, m(a: 1, b: 2))
assert_equal({ a: 1, 'b' => 2 }, m(a: 1, 'b' => 2))
=begin
def m(a, b=1, *c, (*d, (e)), f: 2, g:, h:, **k, &l)
[a, b, c, d, e, f, g, h, k, l]
end
result = m(9, 8, 7, 6, f: 5, g: 4, h: 3, &(l = ->{}))
assert_equal([9, 8, [7], [], 6, 5, 4, 3, {}, l], result)
def m a, b=1, *c, d, e:, f: 2, g:, **k, &l
[a, b, c, d, e, f, g, k, l]
end