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 #5628 from dearblue/super-kwargs

Browse Source 
Fixing keyword arguments with `super`
This commit is contained in:
Yukihiro "Matz" Matsumoto
2022-01-06 10:05:05 +09:00
committed by GitHub
parent b1fc0dd5a4 55b2e45a26
commit 696589cf27
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-compiler/core/codegen.c
+2 -2
View File
@@ -2854,8 +2854,8 @@ codegen(codegen_scope *s, node *tree, int val)
if (s2 && (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;
else st += nk*2;
n |= nk<<4;
}
/* block arguments */
if (tree->cdr->cdr) {
src/vm.c
+10
View File
@@ -1729,6 +1729,16 @@ RETRY_TRY_BLOCK:
}
mrb_assert(bidx < irep->nregs);
uint8_t nk = (b >> 4) & 0x0f;
if (nk > 0 && nk < CALL_MAXARGS) { /* pack keyword arguments */
uint8_t n = b & 0x0f;
mrb_int kidx = a+(n==15?1:n)+1;
mrb_value kdict = hash_new_from_values(mrb, nk, regs+kidx);
regs[kidx] = kdict;
nk = 15;
b = n | (nk<<4);
}
if (mid == 0 || !target_class) {
mrb_value exc = mrb_exc_new_lit(mrb, E_NOMETHOD_ERROR, "super called outside of method");
mrb_exc_set(mrb, exc);