mirror of
https://github.com/mruby/mruby
synced 2026-06-08 16:11:16 +00:00
dccd66f9ef
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.
456 lines
12 KiB
C
456 lines
12 KiB
C
/*
|
|
** proc.c - Proc class
|
|
**
|
|
** See Copyright Notice in mruby.h
|
|
*/
|
|
|
|
#include <mruby.h>
|
|
#include <mruby/class.h>
|
|
#include <mruby/proc.h>
|
|
#include <mruby/opcode.h>
|
|
#include <mruby/data.h>
|
|
#include <mruby/presym.h>
|
|
#include <mruby/array.h>
|
|
#include <mruby/hash.h>
|
|
|
|
static const mrb_code call_iseq[] = {
|
|
OP_CALL,
|
|
};
|
|
|
|
static const mrb_irep call_irep = {
|
|
0, /* nlocals */
|
|
2, /* nregs */
|
|
0, /* clen */
|
|
MRB_ISEQ_NO_FREE | MRB_IREP_NO_FREE, /* flags */
|
|
call_iseq, /* iseq */
|
|
NULL, /* pool */
|
|
NULL, /* syms */
|
|
NULL, /* reps */
|
|
NULL, /* lv */
|
|
NULL, /* debug_info */
|
|
1, /* ilen */
|
|
0, /* plen */
|
|
0, /* slen */
|
|
1, /* rlen */
|
|
0, /* refcnt */
|
|
};
|
|
|
|
static const struct RProc call_proc = {
|
|
NULL, NULL, MRB_TT_PROC, MRB_GC_RED, MRB_FL_OBJ_IS_FROZEN | MRB_PROC_SCOPE | MRB_PROC_STRICT,
|
|
{ &call_irep }, NULL, { NULL }
|
|
};
|
|
|
|
struct RProc*
|
|
mrb_proc_new(mrb_state *mrb, const mrb_irep *irep)
|
|
{
|
|
struct RProc *p;
|
|
mrb_callinfo *ci = mrb->c->ci;
|
|
|
|
p = MRB_OBJ_ALLOC(mrb, MRB_TT_PROC, mrb->proc_class);
|
|
if (ci) {
|
|
struct RClass *tc = NULL;
|
|
|
|
if (ci->proc) {
|
|
if (ci->proc->color != MRB_GC_RED) {
|
|
tc = MRB_PROC_TARGET_CLASS(ci->proc);
|
|
}
|
|
else {
|
|
tc = mrb_vm_ci_target_class(ci);
|
|
if (tc && tc->tt == MRB_TT_ICLASS) {
|
|
tc = tc->c;
|
|
}
|
|
}
|
|
}
|
|
if (tc == NULL) {
|
|
tc = mrb_vm_ci_target_class(ci);
|
|
}
|
|
p->upper = ci->proc;
|
|
p->e.target_class = tc;
|
|
}
|
|
p->body.irep = irep;
|
|
if (irep) {
|
|
mrb_irep_incref(mrb, (mrb_irep*)irep);
|
|
}
|
|
|
|
return p;
|
|
}
|
|
|
|
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 = 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 += (n == 15) ? 1 : n;
|
|
bidx += (nk == 15) ? 1 : (2*nk);
|
|
MRB_ENV_SET_BIDX(e, bidx);
|
|
e->mid = ci->mid;
|
|
e->stack = stack;
|
|
e->cxt = c;
|
|
|
|
return e;
|
|
}
|
|
|
|
static void
|
|
closure_setup(mrb_state *mrb, struct RProc *p)
|
|
{
|
|
mrb_callinfo *ci = mrb->c->ci;
|
|
const struct RProc *up = p->upper;
|
|
struct REnv *e = NULL;
|
|
|
|
if (ci && (e = mrb_vm_ci_env(ci)) != NULL) {
|
|
/* do nothing, because e is assigned already */
|
|
}
|
|
else if (up) {
|
|
struct RClass *tc = ci->u.target_class;
|
|
|
|
e = mrb_env_new(mrb, mrb->c, ci, up->body.irep->nlocals, ci->stack, tc);
|
|
ci->u.env = e;
|
|
if (MRB_PROC_ENV_P(up) && MRB_PROC_ENV(up)->cxt == NULL) {
|
|
e->mid = MRB_PROC_ENV(up)->mid;
|
|
}
|
|
}
|
|
if (e) {
|
|
p->e.env = e;
|
|
p->flags |= MRB_PROC_ENVSET;
|
|
mrb_field_write_barrier(mrb, (struct RBasic*)p, (struct RBasic*)e);
|
|
}
|
|
}
|
|
|
|
struct RProc*
|
|
mrb_closure_new(mrb_state *mrb, const mrb_irep *irep)
|
|
{
|
|
struct RProc *p = mrb_proc_new(mrb, irep);
|
|
|
|
closure_setup(mrb, p);
|
|
return p;
|
|
}
|
|
|
|
MRB_API struct RProc*
|
|
mrb_proc_new_cfunc(mrb_state *mrb, mrb_func_t func)
|
|
{
|
|
struct RProc *p;
|
|
|
|
p = MRB_OBJ_ALLOC(mrb, MRB_TT_PROC, mrb->proc_class);
|
|
p->body.func = func;
|
|
p->flags |= MRB_PROC_CFUNC_FL;
|
|
p->upper = 0;
|
|
p->e.target_class = 0;
|
|
|
|
return p;
|
|
}
|
|
|
|
MRB_API struct RProc*
|
|
mrb_proc_new_cfunc_with_env(mrb_state *mrb, mrb_func_t func, mrb_int argc, const mrb_value *argv)
|
|
{
|
|
struct RProc *p = mrb_proc_new_cfunc(mrb, func);
|
|
struct REnv *e;
|
|
int i;
|
|
|
|
p->e.env = e = mrb_env_new(mrb, mrb->c, mrb->c->ci, 0, NULL, NULL);
|
|
p->flags |= MRB_PROC_ENVSET;
|
|
mrb_field_write_barrier(mrb, (struct RBasic*)p, (struct RBasic*)e);
|
|
MRB_ENV_CLOSE(e);
|
|
|
|
e->stack = (mrb_value*)mrb_malloc(mrb, sizeof(mrb_value) * argc);
|
|
MRB_ENV_SET_LEN(e, argc);
|
|
|
|
if (argv) {
|
|
for (i = 0; i < argc; ++i) {
|
|
e->stack[i] = argv[i];
|
|
}
|
|
}
|
|
else {
|
|
for (i = 0; i < argc; ++i) {
|
|
SET_NIL_VALUE(e->stack[i]);
|
|
}
|
|
}
|
|
return p;
|
|
}
|
|
|
|
MRB_API struct RProc*
|
|
mrb_closure_new_cfunc(mrb_state *mrb, mrb_func_t func, int nlocals)
|
|
{
|
|
return mrb_proc_new_cfunc_with_env(mrb, func, nlocals, NULL);
|
|
}
|
|
|
|
MRB_API mrb_value
|
|
mrb_proc_cfunc_env_get(mrb_state *mrb, mrb_int idx)
|
|
{
|
|
const struct RProc *p = mrb->c->ci->proc;
|
|
struct REnv *e;
|
|
|
|
if (!p || !MRB_PROC_CFUNC_P(p)) {
|
|
mrb_raise(mrb, E_TYPE_ERROR, "Can't get cfunc env from non-cfunc proc");
|
|
}
|
|
e = MRB_PROC_ENV(p);
|
|
if (!e) {
|
|
mrb_raise(mrb, E_TYPE_ERROR, "Can't get cfunc env from cfunc Proc without REnv");
|
|
}
|
|
if (idx < 0 || MRB_ENV_LEN(e) <= idx) {
|
|
mrb_raisef(mrb, E_INDEX_ERROR, "Env index out of range: %i (expected: 0 <= index < %i)",
|
|
idx, MRB_ENV_LEN(e));
|
|
}
|
|
|
|
return e->stack[idx];
|
|
}
|
|
|
|
void
|
|
mrb_proc_copy(struct RProc *a, struct RProc *b)
|
|
{
|
|
if (a->body.irep) {
|
|
/* already initialized proc */
|
|
return;
|
|
}
|
|
a->flags = b->flags;
|
|
a->body = b->body;
|
|
if (!MRB_PROC_CFUNC_P(a) && a->body.irep) {
|
|
mrb_irep_incref(NULL, (mrb_irep*)a->body.irep);
|
|
}
|
|
a->upper = b->upper;
|
|
a->e.env = b->e.env;
|
|
/* a->e.target_class = a->e.target_class; */
|
|
}
|
|
|
|
static mrb_value
|
|
mrb_proc_s_new(mrb_state *mrb, mrb_value proc_class)
|
|
{
|
|
mrb_value blk;
|
|
mrb_value proc;
|
|
struct RProc *p;
|
|
|
|
/* Calling Proc.new without a block is not implemented yet */
|
|
mrb_get_args(mrb, "&!", &blk);
|
|
p = MRB_OBJ_ALLOC(mrb, MRB_TT_PROC, mrb_class_ptr(proc_class));
|
|
mrb_proc_copy(p, mrb_proc_ptr(blk));
|
|
proc = mrb_obj_value(p);
|
|
mrb_funcall_with_block(mrb, proc, MRB_SYM(initialize), 0, NULL, proc);
|
|
if (!MRB_PROC_STRICT_P(p) &&
|
|
mrb->c->ci > mrb->c->cibase && MRB_PROC_ENV(p) == mrb->c->ci[-1].u.env) {
|
|
p->flags |= MRB_PROC_ORPHAN;
|
|
}
|
|
return proc;
|
|
}
|
|
|
|
static mrb_value
|
|
mrb_proc_init_copy(mrb_state *mrb, mrb_value self)
|
|
{
|
|
mrb_value proc = mrb_get_arg1(mrb);
|
|
|
|
if (!mrb_proc_p(proc)) {
|
|
mrb_raise(mrb, E_ARGUMENT_ERROR, "not a proc");
|
|
}
|
|
mrb_proc_copy(mrb_proc_ptr(self), mrb_proc_ptr(proc));
|
|
return self;
|
|
}
|
|
|
|
/* 15.2.17.4.2 */
|
|
static mrb_value
|
|
proc_arity(mrb_state *mrb, mrb_value self)
|
|
{
|
|
return mrb_int_value(mrb, mrb_proc_arity(mrb_proc_ptr(self)));
|
|
}
|
|
|
|
/* 15.3.1.2.6 */
|
|
/* 15.3.1.3.27 */
|
|
/*
|
|
* call-seq:
|
|
* lambda { |...| block } -> a_proc
|
|
*
|
|
* Equivalent to <code>Proc.new</code>, except the resulting Proc objects
|
|
* check the number of parameters passed when called.
|
|
*/
|
|
static mrb_value
|
|
proc_lambda(mrb_state *mrb, mrb_value self)
|
|
{
|
|
mrb_value blk;
|
|
struct RProc *p;
|
|
|
|
mrb_get_args(mrb, "&", &blk);
|
|
if (mrb_nil_p(blk)) {
|
|
mrb_raise(mrb, E_ARGUMENT_ERROR, "tried to create Proc object without a block");
|
|
}
|
|
if (!mrb_proc_p(blk)) {
|
|
mrb_raise(mrb, E_ARGUMENT_ERROR, "not a proc");
|
|
}
|
|
p = mrb_proc_ptr(blk);
|
|
if (!MRB_PROC_STRICT_P(p)) {
|
|
struct RProc *p2 = MRB_OBJ_ALLOC(mrb, MRB_TT_PROC, p->c);
|
|
mrb_proc_copy(p2, p);
|
|
p2->flags |= MRB_PROC_STRICT;
|
|
return mrb_obj_value(p2);
|
|
}
|
|
return blk;
|
|
}
|
|
|
|
mrb_int
|
|
mrb_proc_arity(const struct RProc *p)
|
|
{
|
|
const mrb_irep *irep;
|
|
const mrb_code *pc;
|
|
mrb_aspec aspec;
|
|
int ma, op, ra, pa, arity;
|
|
|
|
if (MRB_PROC_CFUNC_P(p)) {
|
|
/* TODO cfunc aspec not implemented yet */
|
|
return -1;
|
|
}
|
|
|
|
irep = p->body.irep;
|
|
if (!irep) {
|
|
return 0;
|
|
}
|
|
|
|
pc = irep->iseq;
|
|
/* arity is depend on OP_ENTER */
|
|
if (*pc != OP_ENTER) {
|
|
return 0;
|
|
}
|
|
|
|
aspec = PEEK_W(pc+1);
|
|
ma = MRB_ASPEC_REQ(aspec);
|
|
op = MRB_ASPEC_OPT(aspec);
|
|
ra = MRB_ASPEC_REST(aspec);
|
|
pa = MRB_ASPEC_POST(aspec);
|
|
arity = ra || (MRB_PROC_STRICT_P(p) && op) ? -(ma + pa + 1) : ma + pa;
|
|
|
|
return arity;
|
|
}
|
|
|
|
mrb_value
|
|
mrb_proc_local_variables(mrb_state *mrb, const struct RProc *proc)
|
|
{
|
|
const mrb_irep *irep;
|
|
mrb_value vars;
|
|
size_t i;
|
|
|
|
if (proc == NULL || MRB_PROC_CFUNC_P(proc)) {
|
|
return mrb_ary_new(mrb);
|
|
}
|
|
vars = mrb_hash_new(mrb);
|
|
while (proc) {
|
|
if (MRB_PROC_CFUNC_P(proc)) break;
|
|
irep = proc->body.irep;
|
|
if (irep->lv) {
|
|
for (i = 0; i + 1 < irep->nlocals; ++i) {
|
|
if (irep->lv[i]) {
|
|
mrb_sym sym = irep->lv[i];
|
|
const char *name = mrb_sym_name(mrb, sym);
|
|
switch (name[0]) {
|
|
case '*': case '&':
|
|
break;
|
|
default:
|
|
mrb_hash_set(mrb, vars, mrb_symbol_value(sym), mrb_true_value());
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (MRB_PROC_SCOPE_P(proc)) break;
|
|
proc = proc->upper;
|
|
}
|
|
|
|
return mrb_hash_keys(mrb, vars);
|
|
}
|
|
|
|
const struct RProc *
|
|
mrb_proc_get_caller(mrb_state *mrb, struct REnv **envp)
|
|
{
|
|
struct mrb_context *c = mrb->c;
|
|
mrb_callinfo *ci = (c->ci > c->cibase) ? c->ci - 1 : c->cibase;
|
|
const struct RProc *proc = ci->proc;
|
|
|
|
if (!proc || MRB_PROC_CFUNC_P(proc)) {
|
|
if (envp) *envp = NULL;
|
|
}
|
|
else {
|
|
struct RClass *tc = MRB_PROC_TARGET_CLASS(proc);
|
|
struct REnv *e = mrb_vm_ci_env(ci);
|
|
|
|
if (e == NULL) {
|
|
int nstacks = proc->body.irep->nlocals;
|
|
e = mrb_env_new(mrb, c, ci, nstacks, ci->stack, tc);
|
|
ci->u.env = e;
|
|
}
|
|
else if (tc) {
|
|
e->c = tc;
|
|
mrb_field_write_barrier(mrb, (struct RBasic*)e, (struct RBasic*)tc);
|
|
}
|
|
if (envp) *envp = e;
|
|
}
|
|
|
|
return proc;
|
|
}
|
|
|
|
#define IREP_LVAR_MERGE_DEFAULT 50
|
|
#define IREP_LVAR_MERGE_MINIMUM 8
|
|
#define IREP_LVAR_MERGE_MAXIMUM 240
|
|
|
|
#ifdef MRB_IREP_LVAR_MERGE_LIMIT
|
|
# define IREP_LVAR_MERGE_LIMIT \
|
|
((MRB_IREP_LVAR_MERGE_LIMIT) < IREP_LVAR_MERGE_MINIMUM ? IREP_LVAR_MERGE_MINIMUM : \
|
|
(MRB_IREP_LVAR_MERGE_LIMIT) > IREP_LVAR_MERGE_MAXIMUM ? IREP_LVAR_MERGE_MAXIMUM : \
|
|
(MRB_IREP_LVAR_MERGE_LIMIT))
|
|
#else
|
|
# define IREP_LVAR_MERGE_LIMIT IREP_LVAR_MERGE_DEFAULT
|
|
#endif
|
|
|
|
void
|
|
mrb_proc_merge_lvar(mrb_state *mrb, mrb_irep *irep, struct REnv *env, int num, const mrb_sym *lv, const mrb_value *stack)
|
|
{
|
|
mrb_assert(!(irep->flags & MRB_IREP_NO_FREE));
|
|
|
|
if ((irep->nlocals + num) > IREP_LVAR_MERGE_LIMIT) {
|
|
mrb_raise(mrb, E_RUNTIME_ERROR, "too many local variables for binding (mruby limitation)");
|
|
}
|
|
|
|
if (!lv) {
|
|
mrb_raise(mrb, E_RUNTIME_ERROR, "unavailable local variable names");
|
|
}
|
|
|
|
irep->lv = (mrb_sym*)mrb_realloc(mrb, (mrb_sym*)irep->lv, sizeof(mrb_sym) * (irep->nlocals + num));
|
|
env->stack = (mrb_value*)mrb_realloc(mrb, env->stack, sizeof(mrb_value) * (irep->nlocals + 1 /* self */ + num));
|
|
|
|
mrb_sym *destlv = (mrb_sym*)irep->lv + irep->nlocals - 1 /* self */;
|
|
mrb_value *destst = env->stack + irep->nlocals;
|
|
memmove(destlv, lv, sizeof(mrb_sym) * num);
|
|
if (stack) {
|
|
memmove(destst, stack, sizeof(mrb_value) * num);
|
|
for (int i = 0; i < num; i++) {
|
|
if (!mrb_immediate_p(stack[i])) {
|
|
mrb_field_write_barrier(mrb, (struct RBasic*)env, (struct RBasic*)mrb_obj_ptr(stack[i]));
|
|
}
|
|
}
|
|
}
|
|
else {
|
|
for (int i = num; i > 0; i--, destst++) {
|
|
*destst = mrb_nil_value();
|
|
}
|
|
}
|
|
irep->nlocals += num;
|
|
irep->nregs = irep->nlocals;
|
|
MRB_ENV_SET_LEN(env, irep->nlocals);
|
|
}
|
|
|
|
void
|
|
mrb_init_proc(mrb_state *mrb)
|
|
{
|
|
mrb_method_t m;
|
|
|
|
mrb_define_class_method(mrb, mrb->proc_class, "new", mrb_proc_s_new, MRB_ARGS_NONE()|MRB_ARGS_BLOCK());
|
|
mrb_define_method(mrb, mrb->proc_class, "initialize_copy", mrb_proc_init_copy, MRB_ARGS_REQ(1));
|
|
mrb_define_method(mrb, mrb->proc_class, "arity", proc_arity, MRB_ARGS_NONE());
|
|
|
|
MRB_METHOD_FROM_PROC(m, &call_proc);
|
|
mrb_define_method_raw(mrb, mrb->proc_class, MRB_SYM(call), m);
|
|
mrb_define_method_raw(mrb, mrb->proc_class, MRB_OPSYM(aref), m);
|
|
|
|
mrb_define_class_method(mrb, mrb->kernel_module, "lambda", proc_lambda, MRB_ARGS_NONE()|MRB_ARGS_BLOCK()); /* 15.3.1.2.6 */
|
|
mrb_define_method(mrb, mrb->kernel_module, "lambda", proc_lambda, MRB_ARGS_NONE()|MRB_ARGS_BLOCK()); /* 15.3.1.3.27 */
|
|
}
|