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

ops.h: update OP_ARYDUP instruction and rename to OP_ARYSPLAT.

Browse Source 
Transforms the value of a splat inside a return statement (similar
to an array). For example, `return *nil` should return `nil.to_a`,
while `return *1` should return `[1]`
This commit is contained in:
fn ⌃ ⌥
2022-10-28 06:53:21 -07:00
parent 6ee4f845c6
commit 273fcbc347
5 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/internal/opcode.md
+1 -1
View File
@@ -95,7 +95,7 @@ sign) of operands.
| `OP_ARRAY2` | `BBB` | `R(a) = ary_new(R(b),R(b+1)..R(b+c))` |
| `OP_ARYCAT` | `B` | `ary_cat(R(a),R(a+1))` |
| `OP_ARYPUSH` | `BB` | `ary_push(R(a),R(a+1)..R(a+b))` |
| `OP_ARYDUP` | `B` | `R(a) = ary_dup(R(a))` |
| `OP_ARYSPLAT` | `B` | `R(a) = ary_splat(R(a))` |
| `OP_AREF` | `BBB` | `R(a) = R(b)[c]` |
| `OP_ASET` | `BBB` | `R(b)[c] = R(a)` |
| `OP_APOST` | `BBB` | `*R(a),R(a+1)..R(a+c) = R(a)[b..]` |
include/mruby/ops.h
+1 -1
View File
@@ -87,7 +87,7 @@ OPCODE(ARRAY, BB) /* R[a] = ary_new(R[a],R[a+1]..R[a+b]) */
OPCODE(ARRAY2, BBB) /* R[a] = ary_new(R[b],R[b+1]..R[b+c]) */
OPCODE(ARYCAT, B) /* ary_cat(R[a],R[a+1]) */
OPCODE(ARYPUSH, BB) /* ary_push(R[a],R[a+1]..R[a+b]) */
OPCODE(ARYDUP, B) /* R[a] = ary_dup(R[a]) */
OPCODE(ARYSPLAT, B) /* R[a] = ary_splat(R[a]) */
OPCODE(AREF, BBB) /* R[a] = R[b][c] */
OPCODE(ASET, BBB) /* R[b][c] = R[a] */
OPCODE(APOST, BBB) /* *R[a],R[a+1]..R[a+c] = R[a][b..] */
mrbgems/mruby-compiler/core/codegen.c
+1 -1
View File
@@ -2202,7 +2202,7 @@ gen_retval(codegen_scope *s, node *tree)
if (nint(tree->car) == NODE_SPLAT) {
codegen(s, tree, VAL);
pop();
genop_1(s, OP_ARYDUP, cursp());
genop_1(s, OP_ARYSPLAT, cursp());
}
else {
codegen(s, tree, VAL);
src/codedump.c
+2 -2
View File
@@ -476,8 +476,8 @@ codedump(mrb_state *mrb, const mrb_irep *irep)
printf("ARYPUSH\tR%d\t%d\t", a, b);
print_lv_a(mrb, irep, a);
break;
CASE(OP_ARYDUP, B):
printf("ARYDUP\tR%d\t", a);
CASE(OP_ARYSPLAT, B):
printf("ARYSPLAT\tR%d\t", a);
print_lv_a(mrb, irep, a);
break;
CASE(OP_AREF, BBB):
src/vm.c
+3 -8
View File
@@ -2748,15 +2748,10 @@ RETRY_TRY_BLOCK:
NEXT;
}
CASE(OP_ARYDUP, B) {
mrb_value ary = regs[a];
if (mrb_array_p(ary)) {
ary = mrb_ary_new_from_values(mrb, RARRAY_LEN(ary), RARRAY_PTR(ary));
}
else {
ary = mrb_ary_new_from_values(mrb, 1, &ary);
}
CASE(OP_ARYSPLAT, B) {
mrb_value ary = mrb_ary_splat(mrb, regs[a]);
regs[a] = ary;
mrb_gc_arena_restore(mrb, ai);
NEXT;
}