summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/limitations.md21
-rw-r--r--doc/mruby3.md4
-rw-r--r--doc/opcode.md3
-rw-r--r--include/mruby.h5
-rw-r--r--include/mruby/boxing_nan.h95
-rw-r--r--include/mruby/ops.h7
-rw-r--r--mrbgems/mruby-binding/src/binding.c47
-rw-r--r--mrbgems/mruby-compiler/core/codegen.c243
-rw-r--r--mrbgems/mruby-compiler/core/parse.y155
-rw-r--r--mrbgems/mruby-compiler/core/y.tab.c2137
-rw-r--r--mrbgems/mruby-enumerator/mrblib/enumerator.rb10
-rw-r--r--mrbgems/mruby-eval/src/eval.c3
-rw-r--r--mrbgems/mruby-fiber/src/fiber.c2
-rw-r--r--mrbgems/mruby-io/mrblib/io.rb33
-rw-r--r--mrbgems/mruby-io/src/io.c2
-rw-r--r--mrbgems/mruby-method/src/method.c31
-rw-r--r--mrbgems/mruby-range-ext/mrblib/range.rb8
-rw-r--r--mrbgems/mruby-struct/test/struct.rb2
-rw-r--r--src/class.c109
-rw-r--r--src/codedump.c42
-rw-r--r--src/gc.c26
-rw-r--r--src/hash.c9
-rw-r--r--src/kernel.c11
-rw-r--r--src/proc.c9
-rw-r--r--src/vm.c567
-rw-r--r--test/t/syntax.rb39
26 files changed, 1839 insertions, 1781 deletions
diff --git a/doc/limitations.md b/doc/limitations.md
index 265e4a2d4..b0caecc8f 100644
--- a/doc/limitations.md
+++ b/doc/limitations.md
@@ -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.
diff --git a/doc/mruby3.md b/doc/mruby3.md
index a64e3c73e..e5478c426 100644
--- a/doc/mruby3.md
+++ b/doc/mruby3.md
@@ -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
diff --git a/doc/opcode.md b/doc/opcode.md
index 953e9aeae..113e390e8 100644
--- a/doc/opcode.md
+++ b/doc/opcode.md
@@ -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)` |
diff --git a/include/mruby.h b/include/mruby.h
index d82cff581..f80971543 100644
--- a/include/mruby.h
+++ b/include/mruby.h
@@ -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 */
diff --git a/include/mruby/boxing_nan.h b/include/mruby/boxing_nan.h
index 90866ab55..cbf7953ed 100644
--- a/include/mruby/boxing_nan.h
+++ b/include/mruby/boxing_nan.h
@@ -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)
diff --git a/include/mruby/ops.h b/include/mruby/ops.h
index 7b5ea40ca..af7051833 100644
--- a/include/mruby/ops.h
+++ b/include/mruby/ops.h
@@ -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) */
diff --git a/mrbgems/mruby-binding/src/binding.c b/mrbgems/mruby-binding/src/binding.c
index 67692e2b9..eb44f0e90 100644
--- a/mrbgems/mruby-binding/src/binding.c
+++ b/mrbgems/mruby-binding/src/binding.c
@@ -16,24 +16,6 @@ typedef mrb_bool mrb_parser_foreach_top_variable_func(mrb_state *mrb, mrb_sym sy
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)
{
if (!p) {
@@ -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);
}
diff --git a/mrbgems/mruby-compiler/core/codegen.c b/mrbgems/mruby-compiler/core/codegen.c
index d647b4a55..1374fff07 100644
--- a/mrbgems/mruby-compiler/core/codegen.c
+++ b/mrbgems/mruby-compiler/core/codegen.c
@@ -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);
@@ -1977,6 +2042,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)
{
int nt;
@@ -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;
diff --git a/mrbgems/mruby-compiler/core/parse.y b/mrbgems/mruby-compiler/core/parse.y
index 60cfeadae..42fc94687 100644
--- a/mrbgems/mruby-compiler/core/parse.y
+++ b/mrbgems/mruby-compiler/core/parse.y
@@ -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:
diff --git a/mrbgems/mruby-compiler/core/y.tab.c b/mrbgems/mruby-compiler/core/y.tab.c
index 4fa1b4678..76bf85c01 100644
--- a/mrbgems/mruby-compiler/core/y.tab.c
+++ b/mrbgems/mruby-compiler/core/y.tab.c
@@ -569,6 +569,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)
@@ -580,7 +587,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) */
@@ -589,7 +596,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);
}
@@ -1023,13 +1035,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) */
@@ -1252,17 +1265,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;
}
}
@@ -1289,19 +1302,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;
@@ -1323,7 +1333,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;
}
@@ -1465,7 +1475,7 @@ heredoc_end(parser_state *p)
/* xxx ----------------------------- */
-#line 1469 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 1479 "mrbgems/mruby-compiler/core/y.tab.c"
# ifndef YY_CAST
# ifdef __cplusplus
@@ -1637,7 +1647,7 @@ extern int yydebug;
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
union YYSTYPE
{
-#line 1411 "mrbgems/mruby-compiler/core/parse.y"
+#line 1421 "mrbgems/mruby-compiler/core/parse.y"
node *nd;
mrb_sym id;
@@ -1645,7 +1655,7 @@ union YYSTYPE
stack_type stack;
const struct vtable *vars;
-#line 1649 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 1659 "mrbgems/mruby-compiler/core/y.tab.c"
};
typedef union YYSTYPE YYSTYPE;
@@ -2031,67 +2041,67 @@ static const yytype_uint8 yytranslate[] =
/* YYRLINE[YYN] -- Source line where rule number YYN was defined. */
static const yytype_int16 yyrline[] =
{
- 0, 1582, 1582, 1582, 1593, 1599, 1603, 1608, 1612, 1618,
- 1620, 1619, 1633, 1660, 1666, 1670, 1675, 1679, 1685, 1685,
- 1689, 1693, 1697, 1701, 1705, 1709, 1713, 1718, 1719, 1723,
- 1727, 1731, 1735, 1742, 1745, 1749, 1753, 1757, 1761, 1765,
- 1770, 1774, 1783, 1793, 1802, 1812, 1819, 1820, 1824, 1828,
- 1829, 1833, 1837, 1841, 1845, 1849, 1859, 1858, 1873, 1882,
- 1883, 1886, 1887, 1894, 1893, 1908, 1912, 1917, 1921, 1926,
- 1930, 1935, 1939, 1943, 1947, 1951, 1957, 1961, 1967, 1968,
- 1974, 1978, 1982, 1986, 1990, 1994, 1998, 2002, 2006, 2010,
- 2016, 2017, 2023, 2027, 2033, 2037, 2043, 2047, 2051, 2055,
- 2059, 2063, 2069, 2075, 2082, 2086, 2090, 2094, 2098, 2102,
- 2108, 2114, 2119, 2125, 2129, 2132, 2136, 2140, 2147, 2148,
- 2149, 2150, 2155, 2162, 2163, 2166, 2170, 2170, 2176, 2177,
- 2178, 2179, 2180, 2181, 2182, 2183, 2184, 2185, 2186, 2187,
+ 0, 1592, 1592, 1592, 1603, 1609, 1613, 1618, 1622, 1628,
+ 1630, 1629, 1643, 1670, 1676, 1680, 1685, 1689, 1695, 1695,
+ 1699, 1703, 1707, 1711, 1715, 1719, 1723, 1728, 1729, 1733,
+ 1737, 1741, 1745, 1752, 1755, 1759, 1763, 1767, 1771, 1775,
+ 1780, 1784, 1793, 1803, 1812, 1822, 1829, 1830, 1834, 1838,
+ 1839, 1843, 1847, 1851, 1855, 1859, 1869, 1868, 1883, 1892,
+ 1893, 1896, 1897, 1904, 1903, 1918, 1922, 1927, 1931, 1936,
+ 1940, 1945, 1949, 1953, 1957, 1961, 1967, 1971, 1977, 1978,
+ 1984, 1988, 1992, 1996, 2000, 2004, 2008, 2012, 2016, 2020,
+ 2026, 2027, 2033, 2037, 2043, 2047, 2053, 2057, 2061, 2065,
+ 2069, 2073, 2079, 2085, 2092, 2096, 2100, 2104, 2108, 2112,
+ 2118, 2124, 2129, 2135, 2139, 2142, 2146, 2150, 2157, 2158,
+ 2159, 2160, 2165, 2172, 2173, 2176, 2180, 2180, 2186, 2187,
2188, 2189, 2190, 2191, 2192, 2193, 2194, 2195, 2196, 2197,
- 2198, 2199, 2200, 2201, 2202, 2203, 2204, 2205, 2208, 2208,
- 2208, 2209, 2209, 2210, 2210, 2210, 2211, 2211, 2211, 2211,
- 2212, 2212, 2212, 2213, 2213, 2213, 2214, 2214, 2214, 2214,
- 2215, 2215, 2215, 2215, 2216, 2216, 2216, 2216, 2217, 2217,
- 2217, 2217, 2218, 2218, 2218, 2218, 2219, 2219, 2222, 2226,
- 2230, 2234, 2238, 2242, 2246, 2251, 2256, 2261, 2265, 2269,
- 2273, 2277, 2281, 2285, 2289, 2293, 2297, 2301, 2305, 2309,
- 2313, 2317, 2321, 2325, 2329, 2333, 2337, 2341, 2345, 2349,
- 2353, 2357, 2361, 2365, 2369, 2373, 2377, 2381, 2385, 2389,
- 2393, 2397, 2401, 2405, 2409, 2418, 2428, 2437, 2447, 2453,
- 2454, 2459, 2463, 2470, 2474, 2482, 2486, 2502, 2528, 2529,
- 2532, 2533, 2534, 2539, 2544, 2551, 2557, 2562, 2567, 2572,
- 2579, 2579, 2590, 2596, 2600, 2606, 2609, 2615, 2621, 2626,
- 2633, 2638, 2643, 2650, 2651, 2652, 2653, 2654, 2655, 2656,
- 2657, 2661, 2666, 2665, 2677, 2681, 2676, 2686, 2686, 2690,
- 2694, 2698, 2702, 2707, 2712, 2716, 2720, 2724, 2728, 2732,
- 2733, 2739, 2745, 2738, 2757, 2765, 2773, 2773, 2773, 2780,
- 2780, 2780, 2787, 2793, 2798, 2800, 2797, 2809, 2807, 2825,
- 2830, 2823, 2847, 2845, 2861, 2871, 2882, 2886, 2890, 2894,
- 2900, 2907, 2908, 2909, 2912, 2913, 2916, 2917, 2925, 2926,
- 2932, 2936, 2939, 2943, 2947, 2951, 2956, 2960, 2964, 2968,
- 2974, 2973, 2983, 2987, 2991, 2995, 3001, 3006, 3011, 3015,
- 3019, 3023, 3027, 3031, 3035, 3039, 3043, 3047, 3051, 3055,
- 3059, 3063, 3067, 3073, 3078, 3085, 3085, 3089, 3094, 3101,
- 3105, 3111, 3112, 3115, 3120, 3123, 3127, 3133, 3137, 3144,
- 3143, 3158, 3168, 3172, 3177, 3184, 3188, 3192, 3196, 3200,
- 3204, 3208, 3212, 3216, 3223, 3222, 3237, 3236, 3252, 3260,
- 3269, 3272, 3279, 3282, 3286, 3287, 3290, 3294, 3297, 3301,
- 3304, 3305, 3306, 3307, 3310, 3311, 3317, 3318, 3319, 3323,
- 3336, 3337, 3343, 3348, 3347, 3358, 3362, 3368, 3372, 3385,
- 3389, 3395, 3398, 3399, 3402, 3408, 3414, 3415, 3418, 3425,
- 3424, 3438, 3442, 3456, 3461, 3475, 3481, 3482, 3483, 3484,
- 3485, 3489, 3495, 3499, 3509, 3510, 3511, 3515, 3521, 3525,
- 3529, 3533, 3537, 3543, 3547, 3553, 3557, 3561, 3565, 3569,
- 3573, 3581, 3588, 3594, 3595, 3599, 3603, 3602, 3619, 3620,
- 3623, 3629, 3647, 3667, 3668, 3674, 3680, 3686, 3693, 3698,
- 3705, 3709, 3715, 3719, 3725, 3726, 3729, 3733, 3739, 3743,
- 3747, 3751, 3757, 3762, 3767, 3771, 3775, 3779, 3783, 3787,
- 3791, 3795, 3799, 3803, 3807, 3811, 3815, 3819, 3824, 3830,
- 3835, 3840, 3845, 3850, 3857, 3861, 3868, 3873, 3872, 3884,
- 3888, 3894, 3902, 3910, 3918, 3922, 3928, 3932, 3938, 3939,
- 3942, 3947, 3954, 3955, 3958, 3964, 3968, 3974, 3979, 3979,
- 4004, 4005, 4011, 4016, 4022, 4028, 4033, 4037, 4047, 4054,
- 4055, 4056, 4059, 4060, 4061, 4062, 4065, 4066, 4067, 4070,
- 4071, 4074, 4078, 4084, 4085, 4091, 4092, 4095, 4096, 4099,
- 4102, 4103, 4104, 4107, 4108, 4111, 4116, 4119, 4120, 4124
+ 2198, 2199, 2200, 2201, 2202, 2203, 2204, 2205, 2206, 2207,
+ 2208, 2209, 2210, 2211, 2212, 2213, 2214, 2215, 2218, 2218,
+ 2218, 2219, 2219, 2220, 2220, 2220, 2221, 2221, 2221, 2221,
+ 2222, 2222, 2222, 2223, 2223, 2223, 2224, 2224, 2224, 2224,
+ 2225, 2225, 2225, 2225, 2226, 2226, 2226, 2226, 2227, 2227,
+ 2227, 2227, 2228, 2228, 2228, 2228, 2229, 2229, 2232, 2236,
+ 2240, 2244, 2248, 2252, 2256, 2261, 2266, 2271, 2275, 2279,
+ 2283, 2287, 2291, 2295, 2299, 2303, 2307, 2311, 2315, 2319,
+ 2323, 2327, 2331, 2335, 2339, 2343, 2347, 2351, 2355, 2359,
+ 2363, 2367, 2371, 2375, 2379, 2383, 2387, 2391, 2395, 2399,
+ 2403, 2407, 2411, 2415, 2419, 2428, 2438, 2447, 2457, 2463,
+ 2464, 2469, 2473, 2480, 2484, 2492, 2496, 2505, 2522, 2523,
+ 2526, 2527, 2528, 2533, 2538, 2545, 2551, 2556, 2561, 2566,
+ 2573, 2573, 2584, 2590, 2594, 2600, 2603, 2609, 2615, 2620,
+ 2627, 2632, 2637, 2644, 2645, 2646, 2647, 2648, 2649, 2650,
+ 2651, 2655, 2660, 2659, 2671, 2675, 2670, 2680, 2680, 2684,
+ 2688, 2692, 2696, 2701, 2706, 2710, 2714, 2718, 2722, 2726,
+ 2727, 2733, 2739, 2732, 2751, 2759, 2767, 2767, 2767, 2774,
+ 2774, 2774, 2781, 2787, 2792, 2794, 2791, 2803, 2801, 2819,
+ 2824, 2817, 2841, 2839, 2855, 2865, 2876, 2880, 2884, 2888,
+ 2894, 2901, 2902, 2903, 2906, 2907, 2910, 2911, 2919, 2920,
+ 2926, 2930, 2933, 2937, 2941, 2945, 2950, 2954, 2958, 2962,
+ 2968, 2967, 2977, 2981, 2985, 2989, 2995, 3000, 3005, 3009,
+ 3013, 3017, 3021, 3025, 3029, 3033, 3037, 3041, 3045, 3049,
+ 3053, 3057, 3061, 3067, 3072, 3079, 3079, 3083, 3088, 3095,
+ 3099, 3105, 3106, 3109, 3114, 3117, 3121, 3127, 3131, 3138,
+ 3137, 3152, 3162, 3166, 3171, 3178, 3182, 3186, 3190, 3194,
+ 3198, 3202, 3206, 3210, 3217, 3216, 3231, 3230, 3246, 3254,
+ 3263, 3266, 3273, 3276, 3280, 3281, 3284, 3288, 3291, 3295,
+ 3298, 3299, 3300, 3301, 3304, 3305, 3311, 3312, 3313, 3317,
+ 3330, 3331, 3337, 3342, 3341, 3352, 3356, 3362, 3366, 3379,
+ 3383, 3389, 3392, 3393, 3396, 3402, 3408, 3409, 3412, 3419,
+ 3418, 3432, 3436, 3450, 3455, 3469, 3475, 3476, 3477, 3478,
+ 3479, 3483, 3489, 3493, 3503, 3504, 3505, 3509, 3515, 3519,
+ 3523, 3527, 3531, 3537, 3541, 3547, 3551, 3555, 3559, 3563,
+ 3567, 3575, 3582, 3588, 3589, 3593, 3597, 3596, 3613, 3614,
+ 3617, 3623, 3632, 3643, 3644, 3650, 3656, 3662, 3669, 3674,
+ 3681, 3685, 3691, 3695, 3701, 3702, 3705, 3709, 3715, 3719,
+ 3723, 3727, 3733, 3738, 3743, 3747, 3751, 3755, 3759, 3763,
+ 3767, 3771, 3775, 3779, 3783, 3787, 3791, 3795, 3800, 3806,
+ 3811, 3816, 3821, 3826, 3833, 3837, 3844, 3849, 3848, 3860,
+ 3864, 3870, 3878, 3886, 3894, 3898, 3904, 3908, 3914, 3915,
+ 3918, 3923, 3930, 3931, 3934, 3940, 3944, 3950, 3955, 3955,
+ 3980, 3981, 3987, 3992, 3998, 4004, 4009, 4013, 4023, 4030,
+ 4031, 4032, 4035, 4036, 4037, 4038, 4041, 4042, 4043, 4046,
+ 4047, 4050, 4054, 4060, 4061, 4067, 4068, 4071, 4072, 4075,
+ 4078, 4079, 4080, 4083, 4084, 4087, 4092, 4095, 4096, 4100
};
#endif
@@ -6014,86 +6024,86 @@ yyreduce:
switch (yyn)
{
case 2:
-#line 1582 "mrbgems/mruby-compiler/core/parse.y"
+#line 1592 "mrbgems/mruby-compiler/core/parse.y"
{
p->lstate = EXPR_BEG;
if (!p->locals) p->locals = cons(0,0);
}
-#line 6023 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6033 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 3:
-#line 1587 "mrbgems/mruby-compiler/core/parse.y"
+#line 1597 "mrbgems/mruby-compiler/core/parse.y"
{
p->tree = new_scope(p, (yyvsp[0].nd));
NODE_LINENO(p->tree, (yyvsp[0].nd));
}
-#line 6032 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6042 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 4:
-#line 1594 "mrbgems/mruby-compiler/core/parse.y"
+#line 1604 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = (yyvsp[-1].nd);
}
-#line 6040 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6050 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 5:
-#line 1600 "mrbgems/mruby-compiler/core/parse.y"
+#line 1610 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_begin(p, 0);
}
-#line 6048 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6058 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 6:
-#line 1604 "mrbgems/mruby-compiler/core/parse.y"
+#line 1614 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_begin(p, (yyvsp[0].nd));
NODE_LINENO((yyval.nd), (yyvsp[0].nd));
}
-#line 6057 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6067 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 7:
-#line 1609 "mrbgems/mruby-compiler/core/parse.y"
+#line 1619 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = push((yyvsp[-2].nd), newline_node((yyvsp[0].nd)));
}
-#line 6065 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6075 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 8:
-#line 1613 "mrbgems/mruby-compiler/core/parse.y"
+#line 1623 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_begin(p, 0);
}
-#line 6073 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6083 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 10:
-#line 1620 "mrbgems/mruby-compiler/core/parse.y"
+#line 1630 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = local_switch(p);
nvars_block(p);
}
-#line 6082 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6092 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 11:
-#line 1625 "mrbgems/mruby-compiler/core/parse.y"
+#line 1635 "mrbgems/mruby-compiler/core/parse.y"
{
yyerror(p, "BEGIN not supported");
local_resume(p, (yyvsp[-3].nd));
nvars_unnest(p);
(yyval.nd) = 0;
}
-#line 6093 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6103 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 12:
-#line 1637 "mrbgems/mruby-compiler/core/parse.y"
+#line 1647 "mrbgems/mruby-compiler/core/parse.y"
{
if ((yyvsp[-2].nd)) {
(yyval.nd) = new_rescue(p, (yyvsp[-3].nd), (yyvsp[-2].nd), (yyvsp[-1].nd));
@@ -6115,223 +6125,223 @@ yyreduce:
}
}
}
-#line 6119 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6129 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 13:
-#line 1661 "mrbgems/mruby-compiler/core/parse.y"
+#line 1671 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = (yyvsp[-1].nd);
}
-#line 6127 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6137 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 14:
-#line 1667 "mrbgems/mruby-compiler/core/parse.y"
+#line 1677 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_begin(p, 0);
}
-#line 6135 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6145 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 15:
-#line 1671 "mrbgems/mruby-compiler/core/parse.y"
+#line 1681 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_begin(p, (yyvsp[0].nd));
NODE_LINENO((yyval.nd), (yyvsp[0].nd));
}
-#line 6144 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6154 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 16:
-#line 1676 "mrbgems/mruby-compiler/core/parse.y"
+#line 1686 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = push((yyvsp[-2].nd), newline_node((yyvsp[0].nd)));
}
-#line 6152 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6162 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 17:
-#line 1680 "mrbgems/mruby-compiler/core/parse.y"
+#line 1690 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_begin(p, (yyvsp[0].nd));
}
-#line 6160 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6170 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 18:
-#line 1685 "mrbgems/mruby-compiler/core/parse.y"
+#line 1695 "mrbgems/mruby-compiler/core/parse.y"
{p->lstate = EXPR_FNAME;}
-#line 6166 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6176 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 19:
-#line 1686 "mrbgems/mruby-compiler/core/parse.y"
+#line 1696 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_alias(p, (yyvsp[-2].id), (yyvsp[0].id));
}
-#line 6174 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6184 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 20:
-#line 1690 "mrbgems/mruby-compiler/core/parse.y"
+#line 1700 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = (yyvsp[0].nd);
}
-#line 6182 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6192 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 21:
-#line 1694 "mrbgems/mruby-compiler/core/parse.y"
+#line 1704 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_if(p, cond((yyvsp[0].nd)), (yyvsp[-2].nd), 0);
}
-#line 6190 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6200 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 22:
-#line 1698 "mrbgems/mruby-compiler/core/parse.y"
+#line 1708 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_unless(p, cond((yyvsp[0].nd)), (yyvsp[-2].nd), 0);
}
-#line 6198 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6208 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 23:
-#line 1702 "mrbgems/mruby-compiler/core/parse.y"
+#line 1712 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_while(p, cond((yyvsp[0].nd)), (yyvsp[-2].nd));
}
-#line 6206 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6216 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 24:
-#line 1706 "mrbgems/mruby-compiler/core/parse.y"
+#line 1716 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_until(p, cond((yyvsp[0].nd)), (yyvsp[-2].nd));
}
-#line 6214 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6224 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 25:
-#line 1710 "mrbgems/mruby-compiler/core/parse.y"
+#line 1720 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_mod_rescue(p, (yyvsp[-2].nd), (yyvsp[0].nd));
}
-#line 6222 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6232 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 26:
-#line 1714 "mrbgems/mruby-compiler/core/parse.y"
+#line 1724 "mrbgems/mruby-compiler/core/parse.y"
{
yyerror(p, "END not supported");
(yyval.nd) = new_postexe(p, (yyvsp[-1].nd));
}
-#line 6231 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6241 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 28:
-#line 1720 "mrbgems/mruby-compiler/core/parse.y"
+#line 1730 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_masgn(p, (yyvsp[-2].nd), (yyvsp[0].nd));
}
-#line 6239 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6249 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 29:
-#line 1724 "mrbgems/mruby-compiler/core/parse.y"
+#line 1734 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_asgn(p, (yyvsp[-2].nd), new_array(p, (yyvsp[0].nd)));
}
-#line 6247 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6257 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 30:
-#line 1728 "mrbgems/mruby-compiler/core/parse.y"
+#line 1738 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_masgn(p, (yyvsp[-2].nd), (yyvsp[0].nd));
}
-#line 6255 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6265 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 31:
-#line 1732 "mrbgems/mruby-compiler/core/parse.y"
+#line 1742 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_masgn(p, (yyvsp[-2].nd), new_array(p, (yyvsp[0].nd)));
}
-#line 6263 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6273 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 32:
-#line 1736 "mrbgems/mruby-compiler/core/parse.y"
+#line 1746 "mrbgems/mruby-compiler/core/parse.y"
{
node *lhs = new_lvar(p, (yyvsp[0].id));
void_expr_error(p, (yyvsp[-2].nd));
assignable(p, lhs);
(yyval.nd) = new_asgn(p, lhs, (yyvsp[-2].nd));
}
-#line 6274 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6284 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 34:
-#line 1746 "mrbgems/mruby-compiler/core/parse.y"
+#line 1756 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_asgn(p, (yyvsp[-2].nd), (yyvsp[0].nd));
}
-#line 6282 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6292 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 35:
-#line 1750 "mrbgems/mruby-compiler/core/parse.y"
+#line 1760 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_op_asgn(p, (yyvsp[-2].nd), (yyvsp[-1].id), (yyvsp[0].nd));
}
-#line 6290 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6300 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 36:
-#line 1754 "mrbgems/mruby-compiler/core/parse.y"
+#line 1764 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_op_asgn(p, new_call(p, (yyvsp[-5].nd), intern_op(aref), (yyvsp[-3].nd), '.'), (yyvsp[-1].id), (yyvsp[0].nd));
}
-#line 6298 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6308 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 37:
-#line 1758 "mrbgems/mruby-compiler/core/parse.y"
+#line 1768 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_op_asgn(p, new_call(p, (yyvsp[-4].nd), (yyvsp[-2].id), 0, (yyvsp[-3].num)), (yyvsp[-1].id), (yyvsp[0].nd));
}
-#line 6306 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6316 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 38:
-#line 1762 "mrbgems/mruby-compiler/core/parse.y"
+#line 1772 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_op_asgn(p, new_call(p, (yyvsp[-4].nd), (yyvsp[-2].id), 0, (yyvsp[-3].num)), (yyvsp[-1].id), (yyvsp[0].nd));
}
-#line 6314 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6324 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 39:
-#line 1766 "mrbgems/mruby-compiler/core/parse.y"
+#line 1776 "mrbgems/mruby-compiler/core/parse.y"
{
yyerror(p, "constant re-assignment");
(yyval.nd) = 0;
}
-#line 6323 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6333 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 40:
-#line 1771 "mrbgems/mruby-compiler/core/parse.y"
+#line 1781 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_op_asgn(p, new_call(p, (yyvsp[-4].nd), (yyvsp[-2].id), 0, tCOLON2), (yyvsp[-1].id), (yyvsp[0].nd));
}
-#line 6331 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6341 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 41:
-#line 1775 "mrbgems/mruby-compiler/core/parse.y"
+#line 1785 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = (yyvsp[-3].nd);
endless_method_name(p, (yyvsp[-3].nd));
@@ -6340,11 +6350,11 @@ yyreduce:
nvars_unnest(p);
p->in_def--;
}
-#line 6344 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6354 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 42:
-#line 1784 "mrbgems/mruby-compiler/core/parse.y"
+#line 1794 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = (yyvsp[-5].nd);
endless_method_name(p, (yyvsp[-5].nd));
@@ -6354,11 +6364,11 @@ yyreduce:
nvars_unnest(p);
p->in_def--;
}
-#line 6358 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6368 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 43:
-#line 1794 "mrbgems/mruby-compiler/core/parse.y"
+#line 1804 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = (yyvsp[-3].nd);
void_expr_error(p, (yyvsp[0].nd));
@@ -6367,11 +6377,11 @@ yyreduce:
p->in_def--;
p->in_single--;
}
-#line 6371 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6381 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 44:
-#line 1803 "mrbgems/mruby-compiler/core/parse.y"
+#line 1813 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = (yyvsp[-5].nd);
void_expr_error(p, (yyvsp[-2].nd));
@@ -6381,79 +6391,79 @@ yyreduce:
p->in_def--;
p->in_single--;
}
-#line 6385 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6395 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 45:
-#line 1813 "mrbgems/mruby-compiler/core/parse.y"
+#line 1823 "mrbgems/mruby-compiler/core/parse.y"
{
backref_error(p, (yyvsp[-2].nd));
(yyval.nd) = new_begin(p, 0);
}
-#line 6394 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6404 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 47:
-#line 1821 "mrbgems/mruby-compiler/core/parse.y"
+#line 1831 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_mod_rescue(p, (yyvsp[-2].nd), (yyvsp[0].nd));
}
-#line 6402 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6412 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 50:
-#line 1830 "mrbgems/mruby-compiler/core/parse.y"
+#line 1840 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_and(p, (yyvsp[-2].nd), (yyvsp[0].nd));
}
-#line 6410 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6420 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 51:
-#line 1834 "mrbgems/mruby-compiler/core/parse.y"
+#line 1844 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_or(p, (yyvsp[-2].nd), (yyvsp[0].nd));
}
-#line 6418 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6428 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 52:
-#line 1838 "mrbgems/mruby-compiler/core/parse.y"
+#line 1848 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = call_uni_op(p, cond((yyvsp[0].nd)), "!");
}
-#line 6426 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6436 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 53:
-#line 1842 "mrbgems/mruby-compiler/core/parse.y"
+#line 1852 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = call_uni_op(p, cond((yyvsp[0].nd)), "!");
}
-#line 6434 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6444 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 55:
-#line 1850 "mrbgems/mruby-compiler/core/parse.y"
+#line 1860 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_def(p, (yyvsp[0].id), nint(p->cmdarg_stack), local_switch(p));
p->cmdarg_stack = 0;
p->in_def++;
nvars_block(p);
}
-#line 6445 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6455 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 56:
-#line 1859 "mrbgems/mruby-compiler/core/parse.y"
+#line 1869 "mrbgems/mruby-compiler/core/parse.y"
{
p->lstate = EXPR_FNAME;
}
-#line 6453 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6463 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 57:
-#line 1863 "mrbgems/mruby-compiler/core/parse.y"
+#line 1873 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_sdef(p, (yyvsp[-3].nd), (yyvsp[0].id), nint(p->cmdarg_stack), local_switch(p));
p->cmdarg_stack = 0;
@@ -6462,1054 +6472,1054 @@ yyreduce:
nvars_block(p);
p->lstate = EXPR_ENDFN; /* force for args */
}
-#line 6466 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6476 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 58:
-#line 1874 "mrbgems/mruby-compiler/core/parse.y"
+#line 1884 "mrbgems/mruby-compiler/core/parse.y"
{
if (!(yyvsp[0].nd)) (yyval.nd) = new_nil(p);
else {
(yyval.nd) = (yyvsp[0].nd);
}
}
-#line 6477 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6487 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 62:
-#line 1888 "mrbgems/mruby-compiler/core/parse.y"
+#line 1898 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_call(p, (yyvsp[-3].nd), (yyvsp[-1].id), (yyvsp[0].nd), (yyvsp[-2].num));
}
-#line 6485 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6495 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 63:
-#line 1894 "mrbgems/mruby-compiler/core/parse.y"
+#line 1904 "mrbgems/mruby-compiler/core/parse.y"
{
local_nest(p);
nvars_nest(p);
}
-#line 6494 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6504 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 64:
-#line 1901 "mrbgems/mruby-compiler/core/parse.y"
+#line 1911 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_block(p, (yyvsp[-2].nd), (yyvsp[-1].nd));
local_unnest(p);
nvars_unnest(p);
}
-#line 6504 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6514 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 65:
-#line 1909 "mrbgems/mruby-compiler/core/parse.y"
+#line 1919 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_fcall(p, (yyvsp[-1].id), (yyvsp[0].nd));
}
-#line 6512 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6522 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 66:
-#line 1913 "mrbgems/mruby-compiler/core/parse.y"
+#line 1923 "mrbgems/mruby-compiler/core/parse.y"
{
args_with_block(p, (yyvsp[-1].nd), (yyvsp[0].nd));
(yyval.nd) = new_fcall(p, (yyvsp[-2].id), (yyvsp[-1].nd));
}
-#line 6521 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6531 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 67:
-#line 1918 "mrbgems/mruby-compiler/core/parse.y"
+#line 1928 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_call(p, (yyvsp[-3].nd), (yyvsp[-1].id), (yyvsp[0].nd), (yyvsp[-2].num));
}
-#line 6529 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6539 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 68:
-#line 1922 "mrbgems/mruby-compiler/core/parse.y"
+#line 1932 "mrbgems/mruby-compiler/core/parse.y"
{
args_with_block(p, (yyvsp[-1].nd), (yyvsp[0].nd));
(yyval.nd) = new_call(p, (yyvsp[-4].nd), (yyvsp[-2].id), (yyvsp[-1].nd), (yyvsp[-3].num));
}
-#line 6538 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6548 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 69:
-#line 1927 "mrbgems/mruby-compiler/core/parse.y"
+#line 1937 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_call(p, (yyvsp[-3].nd), (yyvsp[-1].id), (yyvsp[0].nd), tCOLON2);
}
-#line 6546 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6556 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 70:
-#line 1931 "mrbgems/mruby-compiler/core/parse.y"
+#line 1941 "mrbgems/mruby-compiler/core/parse.y"
{
args_with_block(p, (yyvsp[-1].nd), (yyvsp[0].nd));
(yyval.nd) = new_call(p, (yyvsp[-4].nd), (yyvsp[-2].id), (yyvsp[-1].nd), tCOLON2);
}
-#line 6555 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6565 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 71:
-#line 1936 "mrbgems/mruby-compiler/core/parse.y"
+#line 1946 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_super(p, (yyvsp[0].nd));
}
-#line 6563 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6573 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 72:
-#line 1940 "mrbgems/mruby-compiler/core/parse.y"
+#line 1950 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_yield(p, (yyvsp[0].nd));
}
-#line 6571 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6581 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 73:
-#line 1944 "mrbgems/mruby-compiler/core/parse.y"
+#line 1954 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_return(p, ret_args(p, (yyvsp[0].nd)));
}
-#line 6579 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6589 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 74:
-#line 1948 "mrbgems/mruby-compiler/core/parse.y"
+#line 1958 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_break(p, ret_args(p, (yyvsp[0].nd)));
}
-#line 6587 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6597 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 75:
-#line 1952 "mrbgems/mruby-compiler/core/parse.y"
+#line 1962 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_next(p, ret_args(p, (yyvsp[0].nd)));
}
-#line 6595 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6605 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 76:
-#line 1958 "mrbgems/mruby-compiler/core/parse.y"
+#line 1968 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = (yyvsp[0].nd);
}
-#line 6603 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6613 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 77:
-#line 1962 "mrbgems/mruby-compiler/core/parse.y"
+#line 1972 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = (yyvsp[-1].nd);
}
-#line 6611 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6621 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 79:
-#line 1969 "mrbgems/mruby-compiler/core/parse.y"
+#line 1979 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = (yyvsp[-1].nd);
}
-#line 6619 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6629 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 80:
-#line 1975 "mrbgems/mruby-compiler/core/parse.y"
+#line 1985 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = list1((yyvsp[0].nd));
}
-#line 6627 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6637 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 81:
-#line 1979 "mrbgems/mruby-compiler/core/parse.y"
+#line 1989 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = list1(push((yyvsp[-1].nd),(yyvsp[0].nd)));
}
-#line 6635 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6645 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 82:
-#line 1983 "mrbgems/mruby-compiler/core/parse.y"
+#line 1993 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = list2((yyvsp[-2].nd), (yyvsp[0].nd));
}
-#line 6643 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6653 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 83:
-#line 1987 "mrbgems/mruby-compiler/core/parse.y"
+#line 1997 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = list3((yyvsp[-4].nd), (yyvsp[-2].nd), (yyvsp[0].nd));
}
-#line 6651 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6661 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 84:
-#line 1991 "mrbgems/mruby-compiler/core/parse.y"
+#line 2001 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = list2((yyvsp[-1].nd), new_nil(p));
}
-#line 6659 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6669 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 85:
-#line 1995 "mrbgems/mruby-compiler/core/parse.y"
+#line 2005 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = list3((yyvsp[-3].nd), new_nil(p), (yyvsp[0].nd));
}
-#line 6667 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6677 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 86:
-#line 1999 "mrbgems/mruby-compiler/core/parse.y"
+#line 2009 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = list2(0, (yyvsp[0].nd));
}
-#line 6675 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6685 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 87:
-#line 2003 "mrbgems/mruby-compiler/core/parse.y"
+#line 2013 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = list3(0, (yyvsp[-2].nd), (yyvsp[0].nd));
}
-#line 6683 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6693 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 88:
-#line 2007 "mrbgems/mruby-compiler/core/parse.y"
+#line 2017 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = list2(0, new_nil(p));
}
-#line 6691 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6701 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 89:
-#line 2011 "mrbgems/mruby-compiler/core/parse.y"
+#line 2021 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = list3(0, new_nil(p), (yyvsp[0].nd));
}
-#line 6699 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6709 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 91:
-#line 2018 "mrbgems/mruby-compiler/core/parse.y"
+#line 2028 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_masgn(p, (yyvsp[-1].nd), NULL);
}
-#line 6707 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6717 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 92:
-#line 2024 "mrbgems/mruby-compiler/core/parse.y"
+#line 2034 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = list1((yyvsp[-1].nd));
}
-#line 6715 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6725 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 93:
-#line 2028 "mrbgems/mruby-compiler/core/parse.y"
+#line 2038 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = push((yyvsp[-2].nd), (yyvsp[-1].nd));
}
-#line 6723 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6733 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 94:
-#line 2034 "mrbgems/mruby-compiler/core/parse.y"
+#line 2044 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = list1((yyvsp[0].nd));
}
-#line 6731 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6741 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 95:
-#line 2038 "mrbgems/mruby-compiler/core/parse.y"
+#line 2048 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = push((yyvsp[-1].nd), (yyvsp[0].nd));
}
-#line 6739 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6749 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 96:
-#line 2044 "mrbgems/mruby-compiler/core/parse.y"
+#line 2054 "mrbgems/mruby-compiler/core/parse.y"
{
assignable(p, (yyvsp[0].nd));
}
-#line 6747 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6757 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 97:
-#line 2048 "mrbgems/mruby-compiler/core/parse.y"
+#line 2058 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_call(p, (yyvsp[-3].nd), intern_op(aref), (yyvsp[-1].nd), '.');
}
-#line 6755 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6765 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 98:
-#line 2052 "mrbgems/mruby-compiler/core/parse.y"
+#line 2062 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_call(p, (yyvsp[-2].nd), (yyvsp[0].id), 0, (yyvsp[-1].num));
}
-#line 6763 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6773 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 99:
-#line 2056 "mrbgems/mruby-compiler/core/parse.y"
+#line 2066 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_call(p, (yyvsp[-2].nd), (yyvsp[0].id), 0, tCOLON2);
}
-#line 6771 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6781 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 100:
-#line 2060 "mrbgems/mruby-compiler/core/parse.y"
+#line 2070 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_call(p, (yyvsp[-2].nd), (yyvsp[0].id), 0, (yyvsp[-1].num));
}
-#line 6779 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6789 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 101:
-#line 2064 "mrbgems/mruby-compiler/core/parse.y"
+#line 2074 "mrbgems/mruby-compiler/core/parse.y"
{
if (p->in_def || p->in_single)
yyerror(p, "dynamic constant assignment");
(yyval.nd) = new_colon2(p, (yyvsp[-2].nd), (yyvsp[0].id));
}
-#line 6789 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6799 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 102:
-#line 2070 "mrbgems/mruby-compiler/core/parse.y"
+#line 2080 "mrbgems/mruby-compiler/core/parse.y"
{
if (p->in_def || p->in_single)
yyerror(p, "dynamic constant assignment");
(yyval.nd) = new_colon3(p, (yyvsp[0].id));
}
-#line 6799 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6809 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 103:
-#line 2076 "mrbgems/mruby-compiler/core/parse.y"
+#line 2086 "mrbgems/mruby-compiler/core/parse.y"
{
backref_error(p, (yyvsp[0].nd));
(yyval.nd) = 0;
}
-#line 6808 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6818 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 104:
-#line 2083 "mrbgems/mruby-compiler/core/parse.y"
+#line 2093 "mrbgems/mruby-compiler/core/parse.y"
{
assignable(p, (yyvsp[0].nd));
}
-#line 6816 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6826 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 105:
-#line 2087 "mrbgems/mruby-compiler/core/parse.y"
+#line 2097 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_call(p, (yyvsp[-3].nd), intern_op(aref), (yyvsp[-1].nd), '.');
}
-#line 6824 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6834 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 106:
-#line 2091 "mrbgems/mruby-compiler/core/parse.y"
+#line 2101 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_call(p, (yyvsp[-2].nd), (yyvsp[0].id), 0, (yyvsp[-1].num));
}
-#line 6832 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6842 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 107:
-#line 2095 "mrbgems/mruby-compiler/core/parse.y"
+#line 2105 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_call(p, (yyvsp[-2].nd), (yyvsp[0].id), 0, tCOLON2);
}
-#line 6840 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6850 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 108:
-#line 2099 "mrbgems/mruby-compiler/core/parse.y"
+#line 2109 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_call(p, (yyvsp[-2].nd), (yyvsp[0].id), 0, (yyvsp[-1].num));
}
-#line 6848 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6858 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 109:
-#line 2103 "mrbgems/mruby-compiler/core/parse.y"
+#line 2113 "mrbgems/mruby-compiler/core/parse.y"
{
if (p->in_def || p->in_single)
yyerror(p, "dynamic constant assignment");
(yyval.nd) = new_colon2(p, (yyvsp[-2].nd), (yyvsp[0].id));
}
-#line 6858 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6868 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 110:
-#line 2109 "mrbgems/mruby-compiler/core/parse.y"
+#line 2119 "mrbgems/mruby-compiler/core/parse.y"
{
if (p->in_def || p->in_single)
yyerror(p, "dynamic constant assignment");
(yyval.nd) = new_colon3(p, (yyvsp[0].id));
}
-#line 6868 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6878 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 111:
-#line 2115 "mrbgems/mruby-compiler/core/parse.y"
+#line 2125 "mrbgems/mruby-compiler/core/parse.y"
{
backref_error(p, (yyvsp[0].nd));
(yyval.nd) = 0;
}
-#line 6877 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6887 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 112:
-#line 2120 "mrbgems/mruby-compiler/core/parse.y"
+#line 2130 "mrbgems/mruby-compiler/core/parse.y"
{
yyerror(p, "can't assign to numbered parameter");
}
-#line 6885 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6895 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 113:
-#line 2126 "mrbgems/mruby-compiler/core/parse.y"
+#line 2136 "mrbgems/mruby-compiler/core/parse.y"
{
yyerror(p, "class/module name must be CONSTANT");
}
-#line 6893 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6903 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 115:
-#line 2133 "mrbgems/mruby-compiler/core/parse.y"
+#line 2143 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = cons(nint(1), nsym((yyvsp[0].id)));
}
-#line 6901 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6911 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 116:
-#line 2137 "mrbgems/mruby-compiler/core/parse.y"
+#line 2147 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = cons(nint(0), nsym((yyvsp[0].id)));
}
-#line 6909 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6919 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 117:
-#line 2141 "mrbgems/mruby-compiler/core/parse.y"
+#line 2151 "mrbgems/mruby-compiler/core/parse.y"
{
void_expr_error(p, (yyvsp[-2].nd));
(yyval.nd) = cons((yyvsp[-2].nd), nsym((yyvsp[0].id)));
}
-#line 6918 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6928 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 121:
-#line 2151 "mrbgems/mruby-compiler/core/parse.y"
+#line 2161 "mrbgems/mruby-compiler/core/parse.y"
{
p->lstate = EXPR_ENDFN;
(yyval.id) = (yyvsp[0].id);
}
-#line 6927 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6937 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 122:
-#line 2156 "mrbgems/mruby-compiler/core/parse.y"
+#line 2166 "mrbgems/mruby-compiler/core/parse.y"
{
p->lstate = EXPR_ENDFN;
(yyval.id) = (yyvsp[0].id);
}
-#line 6936 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6946 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 125:
-#line 2167 "mrbgems/mruby-compiler/core/parse.y"
+#line 2177 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_undef(p, (yyvsp[0].id));
}
-#line 6944 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6954 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 126:
-#line 2170 "mrbgems/mruby-compiler/core/parse.y"
+#line 2180 "mrbgems/mruby-compiler/core/parse.y"
{p->lstate = EXPR_FNAME;}
-#line 6950 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6960 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 127:
-#line 2171 "mrbgems/mruby-compiler/core/parse.y"
+#line 2181 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = push((yyvsp[-3].nd), nsym((yyvsp[0].id)));
}
-#line 6958 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6968 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 128:
-#line 2176 "mrbgems/mruby-compiler/core/parse.y"
+#line 2186 "mrbgems/mruby-compiler/core/parse.y"
{ (yyval.id) = intern_op(or); }
-#line 6964 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6974 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 129:
-#line 2177 "mrbgems/mruby-compiler/core/parse.y"
+#line 2187 "mrbgems/mruby-compiler/core/parse.y"
{ (yyval.id) = intern_op(xor); }
-#line 6970 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6980 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 130:
-#line 2178 "mrbgems/mruby-compiler/core/parse.y"
+#line 2188 "mrbgems/mruby-compiler/core/parse.y"
{ (yyval.id) = intern_op(and); }
-#line 6976 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6986 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 131:
-#line 2179 "mrbgems/mruby-compiler/core/parse.y"
+#line 2189 "mrbgems/mruby-compiler/core/parse.y"
{ (yyval.id) = intern_op(cmp); }
-#line 6982 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6992 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 132:
-#line 2180 "mrbgems/mruby-compiler/core/parse.y"
+#line 2190 "mrbgems/mruby-compiler/core/parse.y"
{ (yyval.id) = intern_op(eq); }
-#line 6988 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 6998 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 133:
-#line 2181 "mrbgems/mruby-compiler/core/parse.y"
+#line 2191 "mrbgems/mruby-compiler/core/parse.y"
{ (yyval.id) = intern_op(eqq); }
-#line 6994 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7004 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 134:
-#line 2182 "mrbgems/mruby-compiler/core/parse.y"
+#line 2192 "mrbgems/mruby-compiler/core/parse.y"
{ (yyval.id) = intern_op(match); }
-#line 7000 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7010 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 135:
-#line 2183 "mrbgems/mruby-compiler/core/parse.y"
+#line 2193 "mrbgems/mruby-compiler/core/parse.y"
{ (yyval.id) = intern_op(nmatch); }
-#line 7006 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7016 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 136:
-#line 2184 "mrbgems/mruby-compiler/core/parse.y"
+#line 2194 "mrbgems/mruby-compiler/core/parse.y"
{ (yyval.id) = intern_op(gt); }
-#line 7012 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7022 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 137:
-#line 2185 "mrbgems/mruby-compiler/core/parse.y"
+#line 2195 "mrbgems/mruby-compiler/core/parse.y"
{ (yyval.id) = intern_op(ge); }
-#line 7018 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7028 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 138:
-#line 2186 "mrbgems/mruby-compiler/core/parse.y"
+#line 2196 "mrbgems/mruby-compiler/core/parse.y"
{ (yyval.id) = intern_op(lt); }
-#line 7024 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7034 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 139:
-#line 2187 "mrbgems/mruby-compiler/core/parse.y"
+#line 2197 "mrbgems/mruby-compiler/core/parse.y"
{ (yyval.id) = intern_op(le); }
-#line 7030 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7040 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 140:
-#line 2188 "mrbgems/mruby-compiler/core/parse.y"
+#line 2198 "mrbgems/mruby-compiler/core/parse.y"
{ (yyval.id) = intern_op(neq); }
-#line 7036 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7046 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 141:
-#line 2189 "mrbgems/mruby-compiler/core/parse.y"
+#line 2199 "mrbgems/mruby-compiler/core/parse.y"
{ (yyval.id) = intern_op(lshift); }
-#line 7042 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7052 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 142:
-#line 2190 "mrbgems/mruby-compiler/core/parse.y"
+#line 2200 "mrbgems/mruby-compiler/core/parse.y"
{ (yyval.id) = intern_op(rshift); }
-#line 7048 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7058 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 143:
-#line 2191 "mrbgems/mruby-compiler/core/parse.y"
+#line 2201 "mrbgems/mruby-compiler/core/parse.y"
{ (yyval.id) = intern_op(add); }
-#line 7054 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7064 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 144:
-#line 2192 "mrbgems/mruby-compiler/core/parse.y"
+#line 2202 "mrbgems/mruby-compiler/core/parse.y"
{ (yyval.id) = intern_op(sub); }
-#line 7060 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7070 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 145:
-#line 2193 "mrbgems/mruby-compiler/core/parse.y"
+#line 2203 "mrbgems/mruby-compiler/core/parse.y"
{ (yyval.id) = intern_op(mul); }
-#line 7066 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7076 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 146:
-#line 2194 "mrbgems/mruby-compiler/core/parse.y"
+#line 2204 "mrbgems/mruby-compiler/core/parse.y"
{ (yyval.id) = intern_op(mul); }
-#line 7072 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7082 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 147:
-#line 2195 "mrbgems/mruby-compiler/core/parse.y"
+#line 2205 "mrbgems/mruby-compiler/core/parse.y"
{ (yyval.id) = intern_op(div); }
-#line 7078 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7088 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 148:
-#line 2196 "mrbgems/mruby-compiler/core/parse.y"
+#line 2206 "mrbgems/mruby-compiler/core/parse.y"
{ (yyval.id) = intern_op(mod); }
-#line 7084 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7094 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 149:
-#line 2197 "mrbgems/mruby-compiler/core/parse.y"
+#line 2207 "mrbgems/mruby-compiler/core/parse.y"
{ (yyval.id) = intern_op(pow); }
-#line 7090 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7100 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 150:
-#line 2198 "mrbgems/mruby-compiler/core/parse.y"
+#line 2208 "mrbgems/mruby-compiler/core/parse.y"
{ (yyval.id) = intern_op(pow); }
-#line 7096 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7106 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 151:
-#line 2199 "mrbgems/mruby-compiler/core/parse.y"
+#line 2209 "mrbgems/mruby-compiler/core/parse.y"
{ (yyval.id) = intern_op(not); }
-#line 7102 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7112 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 152:
-#line 2200 "mrbgems/mruby-compiler/core/parse.y"
+#line 2210 "mrbgems/mruby-compiler/core/parse.y"
{ (yyval.id) = intern_op(neg); }
-#line 7108 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7118 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 153:
-#line 2201 "mrbgems/mruby-compiler/core/parse.y"
+#line 2211 "mrbgems/mruby-compiler/core/parse.y"
{ (yyval.id) = intern_op(plus); }
-#line 7114 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7124 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 154:
-#line 2202 "mrbgems/mruby-compiler/core/parse.y"
+#line 2212 "mrbgems/mruby-compiler/core/parse.y"
{ (yyval.id) = intern_op(minus); }
-#line 7120 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7130 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 155:
-#line 2203 "mrbgems/mruby-compiler/core/parse.y"
+#line 2213 "mrbgems/mruby-compiler/core/parse.y"
{ (yyval.id) = intern_op(aref); }
-#line 7126 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7136 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 156:
-#line 2204 "mrbgems/mruby-compiler/core/parse.y"
+#line 2214 "mrbgems/mruby-compiler/core/parse.y"
{ (yyval.id) = intern_op(aset); }
-#line 7132 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7142 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 157:
-#line 2205 "mrbgems/mruby-compiler/core/parse.y"
+#line 2215 "mrbgems/mruby-compiler/core/parse.y"
{ (yyval.id) = intern_op(tick); }
-#line 7138 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7148 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 198:
-#line 2223 "mrbgems/mruby-compiler/core/parse.y"
+#line 2233 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_asgn(p, (yyvsp[-2].nd), (yyvsp[0].nd));
}
-#line 7146 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7156 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 199:
-#line 2227 "mrbgems/mruby-compiler/core/parse.y"
+#line 2237 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_op_asgn(p, (yyvsp[-2].nd), (yyvsp[-1].id), (yyvsp[0].nd));
}
-#line 7154 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7164 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 200:
-#line 2231 "mrbgems/mruby-compiler/core/parse.y"
+#line 2241 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_op_asgn(p, new_call(p, (yyvsp[-5].nd), intern_op(aref), (yyvsp[-3].nd), '.'), (yyvsp[-1].id), (yyvsp[0].nd));
}
-#line 7162 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7172 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 201:
-#line 2235 "mrbgems/mruby-compiler/core/parse.y"
+#line 2245 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_op_asgn(p, new_call(p, (yyvsp[-4].nd), (yyvsp[-2].id), 0, (yyvsp[-3].num)), (yyvsp[-1].id), (yyvsp[0].nd));
}
-#line 7170 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7180 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 202:
-#line 2239 "mrbgems/mruby-compiler/core/parse.y"
+#line 2249 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_op_asgn(p, new_call(p, (yyvsp[-4].nd), (yyvsp[-2].id), 0, (yyvsp[-3].num)), (yyvsp[-1].id), (yyvsp[0].nd));
}
-#line 7178 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7188 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 203:
-#line 2243 "mrbgems/mruby-compiler/core/parse.y"
+#line 2253 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_op_asgn(p, new_call(p, (yyvsp[-4].nd), (yyvsp[-2].id), 0, tCOLON2), (yyvsp[-1].id), (yyvsp[0].nd));
}
-#line 7186 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7196 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 204:
-#line 2247 "mrbgems/mruby-compiler/core/parse.y"
+#line 2257 "mrbgems/mruby-compiler/core/parse.y"
{
yyerror(p, "constant re-assignment");
(yyval.nd) = new_begin(p, 0);
}
-#line 7195 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7205 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 205:
-#line 2252 "mrbgems/mruby-compiler/core/parse.y"
+#line 2262 "mrbgems/mruby-compiler/core/parse.y"
{
yyerror(p, "constant re-assignment");
(yyval.nd) = new_begin(p, 0);
}
-#line 7204 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7214 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 206:
-#line 2257 "mrbgems/mruby-compiler/core/parse.y"
+#line 2267 "mrbgems/mruby-compiler/core/parse.y"
{
backref_error(p, (yyvsp[-2].nd));
(yyval.nd) = new_begin(p, 0);
}
-#line 7213 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7223 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 207:
-#line 2262 "mrbgems/mruby-compiler/core/parse.y"
+#line 2272 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_dot2(p, (yyvsp[-2].nd), (yyvsp[0].nd));
}
-#line 7221 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7231 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 208:
-#line 2266 "mrbgems/mruby-compiler/core/parse.y"
+#line 2276 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_dot2(p, (yyvsp[-1].nd), new_nil(p));
}
-#line 7229 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7239 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 209:
-#line 2270 "mrbgems/mruby-compiler/core/parse.y"
+#line 2280 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_dot2(p, new_nil(p), (yyvsp[0].nd));
}
-#line 7237 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7247 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 210:
-#line 2274 "mrbgems/mruby-compiler/core/parse.y"
+#line 2284 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_dot3(p, (yyvsp[-2].nd), (yyvsp[0].nd));
}
-#line 7245 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7255 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 211:
-#line 2278 "mrbgems/mruby-compiler/core/parse.y"
+#line 2288 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_dot3(p, (yyvsp[-1].nd), new_nil(p));
}
-#line 7253 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7263 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 212:
-#line 2282 "mrbgems/mruby-compiler/core/parse.y"
+#line 2292 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_dot3(p, new_nil(p), (yyvsp[0].nd));
}
-#line 7261 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7271 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 213:
-#line 2286 "mrbgems/mruby-compiler/core/parse.y"
+#line 2296 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "+", (yyvsp[0].nd));
}
-#line 7269 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7279 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 214:
-#line 2290 "mrbgems/mruby-compiler/core/parse.y"
+#line 2300 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "-", (yyvsp[0].nd));
}
-#line 7277 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7287 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 215:
-#line 2294 "mrbgems/mruby-compiler/core/parse.y"
+#line 2304 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "*", (yyvsp[0].nd));
}
-#line 7285 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7295 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 216:
-#line 2298 "mrbgems/mruby-compiler/core/parse.y"
+#line 2308 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "/", (yyvsp[0].nd));
}
-#line 7293 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7303 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 217:
-#line 2302 "mrbgems/mruby-compiler/core/parse.y"
+#line 2312 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "%", (yyvsp[0].nd));
}
-#line 7301 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7311 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 218:
-#line 2306 "mrbgems/mruby-compiler/core/parse.y"
+#line 2316 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "**", (yyvsp[0].nd));
}
-#line 7309 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7319 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 219:
-#line 2310 "mrbgems/mruby-compiler/core/parse.y"
+#line 2320 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_negate(p, call_bin_op(p, (yyvsp[-2].nd), "**", (yyvsp[0].nd)));
}
-#line 7317 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7327 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 220:
-#line 2314 "mrbgems/mruby-compiler/core/parse.y"
+#line 2324 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_negate(p, call_bin_op(p, (yyvsp[-2].nd), "**", (yyvsp[0].nd)));
}
-#line 7325 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7335 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 221:
-#line 2318 "mrbgems/mruby-compiler/core/parse.y"
+#line 2328 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = call_uni_op(p, (yyvsp[0].nd), "+@");
}
-#line 7333 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7343 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 222:
-#line 2322 "mrbgems/mruby-compiler/core/parse.y"
+#line 2332 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_negate(p, (yyvsp[0].nd));
}
-#line 7341 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7351 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 223:
-#line 2326 "mrbgems/mruby-compiler/core/parse.y"
+#line 2336 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "|", (yyvsp[0].nd));
}
-#line 7349 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7359 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 224:
-#line 2330 "mrbgems/mruby-compiler/core/parse.y"
+#line 2340 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "^", (yyvsp[0].nd));
}
-#line 7357 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7367 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 225:
-#line 2334 "mrbgems/mruby-compiler/core/parse.y"
+#line 2344 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "&", (yyvsp[0].nd));
}
-#line 7365 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7375 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 226:
-#line 2338 "mrbgems/mruby-compiler/core/parse.y"
+#line 2348 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "<=>", (yyvsp[0].nd));
}
-#line 7373 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7383 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 227:
-#line 2342 "mrbgems/mruby-compiler/core/parse.y"
+#line 2352 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), ">", (yyvsp[0].nd));
}
-#line 7381 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7391 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 228:
-#line 2346 "mrbgems/mruby-compiler/core/parse.y"
+#line 2356 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), ">=", (yyvsp[0].nd));
}
-#line 7389 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7399 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 229:
-#line 2350 "mrbgems/mruby-compiler/core/parse.y"
+#line 2360 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "<", (yyvsp[0].nd));
}
-#line 7397 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7407 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 230:
-#line 2354 "mrbgems/mruby-compiler/core/parse.y"
+#line 2364 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "<=", (yyvsp[0].nd));
}
-#line 7405 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7415 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 231:
-#line 2358 "mrbgems/mruby-compiler/core/parse.y"
+#line 2368 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "==", (yyvsp[0].nd));
}
-#line 7413 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7423 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 232:
-#line 2362 "mrbgems/mruby-compiler/core/parse.y"
+#line 2372 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "===", (yyvsp[0].nd));
}
-#line 7421 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7431 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 233:
-#line 2366 "mrbgems/mruby-compiler/core/parse.y"
+#line 2376 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "!=", (yyvsp[0].nd));
}
-#line 7429 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7439 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 234:
-#line 2370 "mrbgems/mruby-compiler/core/parse.y"
+#line 2380 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "=~", (yyvsp[0].nd));
}
-#line 7437 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7447 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 235:
-#line 2374 "mrbgems/mruby-compiler/core/parse.y"
+#line 2384 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "!~", (yyvsp[0].nd));
}
-#line 7445 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7455 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 236:
-#line 2378 "mrbgems/mruby-compiler/core/parse.y"
+#line 2388 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = call_uni_op(p, cond((yyvsp[0].nd)), "!");
}
-#line 7453 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7463 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 237:
-#line 2382 "mrbgems/mruby-compiler/core/parse.y"
+#line 2392 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = call_uni_op(p, cond((yyvsp[0].nd)), "~");
}
-#line 7461 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7471 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 238:
-#line 2386 "mrbgems/mruby-compiler/core/parse.y"
+#line 2396 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "<<", (yyvsp[0].nd));
}
-#line 7469 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7479 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 239:
-#line 2390 "mrbgems/mruby-compiler/core/parse.y"
+#line 2400 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), ">>", (yyvsp[0].nd));
}
-#line 7477 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7487 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 240:
-#line 2394 "mrbgems/mruby-compiler/core/parse.y"
+#line 2404 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_and(p, (yyvsp[-2].nd), (yyvsp[0].nd));
}
-#line 7485 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7495 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 241:
-#line 2398 "mrbgems/mruby-compiler/core/parse.y"
+#line 2408 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_or(p, (yyvsp[-2].nd), (yyvsp[0].nd));
}
-#line 7493 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7503 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 242:
-#line 2402 "mrbgems/mruby-compiler/core/parse.y"
+#line 2412 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_if(p, cond((yyvsp[-5].nd)), (yyvsp[-3].nd), (yyvsp[0].nd));
}
-#line 7501 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7511 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 243:
-#line 2406 "mrbgems/mruby-compiler/core/parse.y"
+#line 2416 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_if(p, cond((yyvsp[-5].nd)), (yyvsp[-3].nd), (yyvsp[0].nd));
}
-#line 7509 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7519 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 244:
-#line 2410 "mrbgems/mruby-compiler/core/parse.y"
+#line 2420 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = (yyvsp[-3].nd);
endless_method_name(p, (yyvsp[-3].nd));
@@ -7518,11 +7528,11 @@ yyreduce:
nvars_unnest(p);
p->in_def--;
}
-#line 7522 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7532 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 245:
-#line 2419 "mrbgems/mruby-compiler/core/parse.y"
+#line 2429 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = (yyvsp[-5].nd);
endless_method_name(p, (yyvsp[-5].nd));
@@ -7532,11 +7542,11 @@ yyreduce:
nvars_unnest(p);
p->in_def--;
}
-#line 7536 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7546 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 246:
-#line 2429 "mrbgems/mruby-compiler/core/parse.y"
+#line 2439 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = (yyvsp[-3].nd);
void_expr_error(p, (yyvsp[0].nd));
@@ -7545,11 +7555,11 @@ yyreduce:
p->in_def--;
p->in_single--;
}
-#line 7549 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7559 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 247:
-#line 2438 "mrbgems/mruby-compiler/core/parse.y"
+#line 2448 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = (yyvsp[-5].nd);
void_expr_error(p, (yyvsp[-2].nd));
@@ -7559,481 +7569,465 @@ yyreduce:
p->in_def--;
p->in_single--;
}
-#line 7563 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7573 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 248:
-#line 2448 "mrbgems/mruby-compiler/core/parse.y"
+#line 2458 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = (yyvsp[0].nd);
}
-#line 7571 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7581 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 250:
-#line 2455 "mrbgems/mruby-compiler/core/parse.y"
+#line 2465 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = (yyvsp[-1].nd);
NODE_LINENO((yyval.nd), (yyvsp[-1].nd));
}
-#line 7580 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7590 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 251:
-#line 2460 "mrbgems/mruby-compiler/core/parse.y"
+#line 2470 "mrbgems/mruby-compiler/core/parse.y"
{
- (yyval.nd) = push((yyvsp[-3].nd), new_kw_hash(p, (yyvsp[-1].nd)));
+ (yyval.nd) = push((yyvsp[-3].nd), new_hash(p, (yyvsp[-1].nd)));
}
-#line 7588 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7598 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 252:
-#line 2464 "mrbgems/mruby-compiler/core/parse.y"
+#line 2474 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = cons(new_kw_hash(p, (yyvsp[-1].nd)), 0);
NODE_LINENO((yyval.nd), (yyvsp[-1].nd));
}
-#line 7597 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7607 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 253:
-#line 2471 "mrbgems/mruby-compiler/core/parse.y"
+#line 2481 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = (yyvsp[0].nd);
}
-#line 7605 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7615 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 254:
-#line 2475 "mrbgems/mruby-compiler/core/parse.y"
+#line 2485 "mrbgems/mruby-compiler/core/parse.y"
{
void_expr_error(p, (yyvsp[-2].nd));
void_expr_error(p, (yyvsp[0].nd));
(yyval.nd) = new_mod_rescue(p, (yyvsp[-2].nd), (yyvsp[0].nd));
}
-#line 7615 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7625 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 255:
-#line 2483 "mrbgems/mruby-compiler/core/parse.y"
+#line 2493 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = (yyvsp[-1].nd);
}
-#line 7623 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7633 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 256:
-#line 2487 "mrbgems/mruby-compiler/core/parse.y"
+#line 2497 "mrbgems/mruby-compiler/core/parse.y"
{
-#if 1
- mrb_sym r = intern_op(mul);
- mrb_sym b = intern_op(and);
- (yyval.nd) = cons(push((yyvsp[-3].nd), 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);
- (yyval.nd) = cons(list2(push((yyvsp[-3].nd), 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
+ (yyval.nd) = new_callargs(p, push((yyvsp[-3].nd), 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)));
}
-#line 7643 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7646 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 257:
-#line 2503 "mrbgems/mruby-compiler/core/parse.y"
+#line 2506 "mrbgems/mruby-compiler/core/parse.y"
{
-#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)) {
- (yyval.nd) = 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)) {
- (yyval.nd) = 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)));
+ (yyval.nd) = 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 ...");
(yyval.nd) = 0;
}
}
-#line 7671 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7665 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 262:
-#line 2535 "mrbgems/mruby-compiler/core/parse.y"
+#line 2529 "mrbgems/mruby-compiler/core/parse.y"
{
- (yyval.nd) = cons((yyvsp[-1].nd),0);
+ (yyval.nd) = new_callargs(p,(yyvsp[-1].nd),0,0);
NODE_LINENO((yyval.nd), (yyvsp[-1].nd));
}
-#line 7680 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7674 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 263:
-#line 2540 "mrbgems/mruby-compiler/core/parse.y"
+#line 2534 "mrbgems/mruby-compiler/core/parse.y"
{
- (yyval.nd) = cons(push((yyvsp[-3].nd), new_kw_hash(p, (yyvsp[-1].nd))), 0);
+ (yyval.nd) = new_callargs(p,(yyvsp[-3].nd),new_kw_hash(p,(yyvsp[-1].nd)),0);
NODE_LINENO((yyval.nd), (yyvsp[-3].nd));
}
-#line 7689 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7683 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 264:
-#line 2545 "mrbgems/mruby-compiler/core/parse.y"
+#line 2539 "mrbgems/mruby-compiler/core/parse.y"
{
- (yyval.nd) = cons(list1(new_kw_hash(p, (yyvsp[-1].nd))), 0);
+ (yyval.nd) = new_callargs(p,0,new_kw_hash(p,(yyvsp[-1].nd)),0);
NODE_LINENO((yyval.nd), (yyvsp[-1].nd));
}
-#line 7698 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7692 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 265:
-#line 2552 "mrbgems/mruby-compiler/core/parse.y"
+#line 2546 "mrbgems/mruby-compiler/core/parse.y"
{
void_expr_error(p, (yyvsp[0].nd));
- (yyval.nd) = cons(list1((yyvsp[0].nd)), 0);
+ (yyval.nd) = new_callargs(p, list1((yyvsp[0].nd)), 0, 0);
NODE_LINENO((yyval.nd), (yyvsp[0].nd));
}
-#line 7708 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7702 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 266:
-#line 2558 "mrbgems/mruby-compiler/core/parse.y"
+#line 2552 "mrbgems/mruby-compiler/core/parse.y"
{
- (yyval.nd) = cons((yyvsp[-1].nd), (yyvsp[0].nd));
+ (yyval.nd) = new_callargs(p, (yyvsp[-1].nd), 0, (yyvsp[0].nd));
NODE_LINENO((yyval.nd), (yyvsp[-1].nd));
}
-#line 7717 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7711 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 267:
-#line 2563 "mrbgems/mruby-compiler/core/parse.y"
+#line 2557 "mrbgems/mruby-compiler/core/parse.y"
{
- (yyval.nd) = cons(list1(new_kw_hash(p, (yyvsp[-1].nd))), (yyvsp[0].nd));
+ (yyval.nd) = new_callargs(p, 0, new_kw_hash(p, (yyvsp[-1].nd)), (yyvsp[0].nd));
NODE_LINENO((yyval.nd), (yyvsp[-1].nd));
}
-#line 7726 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7720 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 268:
-#line 2568 "mrbgems/mruby-compiler/core/parse.y"
+#line 2562 "mrbgems/mruby-compiler/core/parse.y"
{
- (yyval.nd) = cons(push((yyvsp[-3].nd), new_kw_hash(p, (yyvsp[-1].nd))), (yyvsp[0].nd));
+ (yyval.nd) = new_callargs(p, (yyvsp[-3].nd), new_kw_hash(p, (yyvsp[-1].nd)), (yyvsp[0].nd));
NODE_LINENO((yyval.nd), (yyvsp[-3].nd));
}
-#line 7735 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7729 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 269:
-#line 2573 "mrbgems/mruby-compiler/core/parse.y"
+#line 2567 "mrbgems/mruby-compiler/core/parse.y"
{
- (yyval.nd) = cons(0, (yyvsp[0].nd));
+ (yyval.nd) = new_callargs(p, 0, 0, (yyvsp[0].nd));
NODE_LINENO((yyval.nd), (yyvsp[0].nd));
}
-#line 7744 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7738 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 270:
-#line 2579 "mrbgems/mruby-compiler/core/parse.y"
+#line 2573 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.stack) = p->cmdarg_stack;
CMDARG_PUSH(1);
}
-#line 7753 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7747 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 271:
-#line 2584 "mrbgems/mruby-compiler/core/parse.y"
+#line 2578 "mrbgems/mruby-compiler/core/parse.y"
{
p->cmdarg_stack = (yyvsp[-1].stack);
(yyval.nd) = (yyvsp[0].nd);
}
-#line 7762 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7756 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 272:
-#line 2591 "mrbgems/mruby-compiler/core/parse.y"
+#line 2585 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_block_arg(p, (yyvsp[0].nd));
}
-#line 7770 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7764 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 273:
-#line 2597 "mrbgems/mruby-compiler/core/parse.y"
+#line 2591 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = (yyvsp[0].nd);
}
-#line 7778 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7772 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 274:
-#line 2601 "mrbgems/mruby-compiler/core/parse.y"
+#line 2595 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = 0;
}
-#line 7786 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7780 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 276:
-#line 2610 "mrbgems/mruby-compiler/core/parse.y"
+#line 2604 "mrbgems/mruby-compiler/core/parse.y"
{
void_expr_error(p, (yyvsp[0].nd));
- (yyval.nd) = cons((yyvsp[0].nd), 0);
+ (yyval.nd) = list1((yyvsp[0].nd));
NODE_LINENO((yyval.nd), (yyvsp[0].nd));
}
-#line 7796 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7790 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 277:
-#line 2616 "mrbgems/mruby-compiler/core/parse.y"
+#line 2610 "mrbgems/mruby-compiler/core/parse.y"
{
void_expr_error(p, (yyvsp[0].nd));
- (yyval.nd) = cons(new_splat(p, (yyvsp[0].nd)), 0);
+ (yyval.nd) = list1(new_splat(p, (yyvsp[0].nd)));
NODE_LINENO((yyval.nd), (yyvsp[0].nd));
}
-#line 7806 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7800 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 278:
-#line 2622 "mrbgems/mruby-compiler/core/parse.y"
+#line 2616 "mrbgems/mruby-compiler/core/parse.y"
{
void_expr_error(p, (yyvsp[0].nd));
(yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd));
}
-#line 7815 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7809 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 279:
-#line 2627 "mrbgems/mruby-compiler/core/parse.y"
+#line 2621 "mrbgems/mruby-compiler/core/parse.y"
{
void_expr_error(p, (yyvsp[0].nd));
(yyval.nd) = push((yyvsp[-3].nd), new_splat(p, (yyvsp[0].nd)));
}
-#line 7824 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7818 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 280:
-#line 2634 "mrbgems/mruby-compiler/core/parse.y"
+#line 2628 "mrbgems/mruby-compiler/core/parse.y"
{
void_expr_error(p, (yyvsp[0].nd));
(yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd));
}
-#line 7833 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7827 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 281:
-#line 2639 "mrbgems/mruby-compiler/core/parse.y"
+#line 2633 "mrbgems/mruby-compiler/core/parse.y"
{
void_expr_error(p, (yyvsp[0].nd));
(yyval.nd) = push((yyvsp[-3].nd), new_splat(p, (yyvsp[0].nd)));
}
-#line 7842 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7836 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 282:
-#line 2644 "mrbgems/mruby-compiler/core/parse.y"
+#line 2638 "mrbgems/mruby-compiler/core/parse.y"
{
void_expr_error(p, (yyvsp[0].nd));
(yyval.nd) = list1(new_splat(p, (yyvsp[0].nd)));
}
-#line 7851 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7845 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 290:
-#line 2658 "mrbgems/mruby-compiler/core/parse.y"
+#line 2652 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_nvar(p, (yyvsp[0].num));
}
-#line 7859 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7853 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 291:
-#line 2662 "mrbgems/mruby-compiler/core/parse.y"
+#line 2656 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_fcall(p, (yyvsp[0].id), 0);
}
-#line 7867 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7861 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 292:
-#line 2666 "mrbgems/mruby-compiler/core/parse.y"
+#line 2660 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.stack) = p->cmdarg_stack;
p->cmdarg_stack = 0;
}
-#line 7876 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7870 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 293:
-#line 2672 "mrbgems/mruby-compiler/core/parse.y"
+#line 2666 "mrbgems/mruby-compiler/core/parse.y"
{
p->cmdarg_stack = (yyvsp[-2].stack);
(yyval.nd) = (yyvsp[-1].nd);
}
-#line 7885 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7879 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 294:
-#line 2677 "mrbgems/mruby-compiler/core/parse.y"
+#line 2671 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.stack) = p->cmdarg_stack;
p->cmdarg_stack = 0;
}
-#line 7894 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7888 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 295:
-#line 2681 "mrbgems/mruby-compiler/core/parse.y"
+#line 2675 "mrbgems/mruby-compiler/core/parse.y"
{p->lstate = EXPR_ENDARG;}
-#line 7900 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7894 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 296:
-#line 2682 "mrbgems/mruby-compiler/core/parse.y"
+#line 2676 "mrbgems/mruby-compiler/core/parse.y"
{
p->cmdarg_stack = (yyvsp[-3].stack);
(yyval.nd) = (yyvsp[-2].nd);
}
-#line 7909 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7903 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 297:
-#line 2686 "mrbgems/mruby-compiler/core/parse.y"
+#line 2680 "mrbgems/mruby-compiler/core/parse.y"
{p->lstate = EXPR_ENDARG;}
-#line 7915 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7909 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 298:
-#line 2687 "mrbgems/mruby-compiler/core/parse.y"
+#line 2681 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_nil(p);
}
-#line 7923 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7917 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 299:
-#line 2691 "mrbgems/mruby-compiler/core/parse.y"
+#line 2685 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = (yyvsp[-1].nd);
}
-#line 7931 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7925 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 300:
-#line 2695 "mrbgems/mruby-compiler/core/parse.y"
+#line 2689 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_colon2(p, (yyvsp[-2].nd), (yyvsp[0].id));
}
-#line 7939 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7933 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 301:
-#line 2699 "mrbgems/mruby-compiler/core/parse.y"
+#line 2693 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_colon3(p, (yyvsp[0].id));
}
-#line 7947 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7941 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 302:
-#line 2703 "mrbgems/mruby-compiler/core/parse.y"
+#line 2697 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_array(p, (yyvsp[-1].nd));
NODE_LINENO((yyval.nd), (yyvsp[-1].nd));
}
-#line 7956 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7950 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 303:
-#line 2708 "mrbgems/mruby-compiler/core/parse.y"
+#line 2702 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_hash(p, (yyvsp[-1].nd));
NODE_LINENO((yyval.nd), (yyvsp[-1].nd));
}
-#line 7965 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7959 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 304:
-#line 2713 "mrbgems/mruby-compiler/core/parse.y"
+#line 2707 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_return(p, 0);
}
-#line 7973 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7967 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 305:
-#line 2717 "mrbgems/mruby-compiler/core/parse.y"
+#line 2711 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_yield(p, (yyvsp[0].nd));
}
-#line 7981 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7975 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 306:
-#line 2721 "mrbgems/mruby-compiler/core/parse.y"
+#line 2715 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = call_uni_op(p, cond((yyvsp[-1].nd)), "!");
}
-#line 7989 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7983 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 307:
-#line 2725 "mrbgems/mruby-compiler/core/parse.y"
+#line 2719 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = call_uni_op(p, new_nil(p), "!");
}
-#line 7997 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7991 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 308:
-#line 2729 "mrbgems/mruby-compiler/core/parse.y"
+#line 2723 "mrbgems/mruby-compiler/core/parse.y"
{
- (yyval.nd) = new_fcall(p, (yyvsp[-1].id), cons(0, (yyvsp[0].nd)));
+ (yyval.nd) = new_fcall(p, (yyvsp[-1].id), new_callargs(p, 0, 0, (yyvsp[0].nd)));
}
-#line 8005 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 7999 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 310:
-#line 2734 "mrbgems/mruby-compiler/core/parse.y"
+#line 2728 "mrbgems/mruby-compiler/core/parse.y"
{
call_with_block(p, (yyvsp[-1].nd), (yyvsp[0].nd));
(yyval.nd) = (yyvsp[-1].nd);
}
-#line 8014 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8008 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 311:
-#line 2739 "mrbgems/mruby-compiler/core/parse.y"
+#line 2733 "mrbgems/mruby-compiler/core/parse.y"
{
local_nest(p);
(yyval.num) = p->lpar_beg;
p->lpar_beg = ++p->paren_nest;
}
-#line 8024 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8018 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 312:
-#line 2745 "mrbgems/mruby-compiler/core/parse.y"
+#line 2739 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.stack) = p->cmdarg_stack;
p->cmdarg_stack = 0;
}
-#line 8033 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8027 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 313:
-#line 2750 "mrbgems/mruby-compiler/core/parse.y"
+#line 2744 "mrbgems/mruby-compiler/core/parse.y"
{
p->lpar_beg = (yyvsp[-3].num);
(yyval.nd) = new_lambda(p, (yyvsp[-2].nd), (yyvsp[0].nd));
@@ -8041,149 +8035,149 @@ yyreduce:
p->cmdarg_stack = (yyvsp[-1].stack);
CMDARG_LEXPOP();
}
-#line 8045 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8039 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 314:
-#line 2761 "mrbgems/mruby-compiler/core/parse.y"
+#line 2755 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_if(p, cond((yyvsp[-4].nd)), (yyvsp[-2].nd), (yyvsp[-1].nd));
SET_LINENO((yyval.nd), (yyvsp[-5].num));
}
-#line 8054 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8048 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 315:
-#line 2769 "mrbgems/mruby-compiler/core/parse.y"
+#line 2763 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_unless(p, cond((yyvsp[-4].nd)), (yyvsp[-2].nd), (yyvsp[-1].nd));
SET_LINENO((yyval.nd), (yyvsp[-5].num));
}
-#line 8063 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8057 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 316:
-#line 2773 "mrbgems/mruby-compiler/core/parse.y"
+#line 2767 "mrbgems/mruby-compiler/core/parse.y"
{COND_PUSH(1);}
-#line 8069 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8063 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 317:
-#line 2773 "mrbgems/mruby-compiler/core/parse.y"
+#line 2767 "mrbgems/mruby-compiler/core/parse.y"
{COND_POP();}
-#line 8075 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8069 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 318:
-#line 2776 "mrbgems/mruby-compiler/core/parse.y"
+#line 2770 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_while(p, cond((yyvsp[-4].nd)), (yyvsp[-1].nd));
SET_LINENO((yyval.nd), (yyvsp[-6].num));
}
-#line 8084 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8078 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 319:
-#line 2780 "mrbgems/mruby-compiler/core/parse.y"
+#line 2774 "mrbgems/mruby-compiler/core/parse.y"
{COND_PUSH(1);}
-#line 8090 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8084 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 320:
-#line 2780 "mrbgems/mruby-compiler/core/parse.y"
+#line 2774 "mrbgems/mruby-compiler/core/parse.y"
{COND_POP();}
-#line 8096 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8090 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 321:
-#line 2783 "mrbgems/mruby-compiler/core/parse.y"
+#line 2777 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_until(p, cond((yyvsp[-4].nd)), (yyvsp[-1].nd));
SET_LINENO((yyval.nd), (yyvsp[-6].num));
}
-#line 8105 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8099 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 322:
-#line 2790 "mrbgems/mruby-compiler/core/parse.y"
+#line 2784 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_case(p, (yyvsp[-3].nd), (yyvsp[-1].nd));
}
-#line 8113 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8107 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 323:
-#line 2794 "mrbgems/mruby-compiler/core/parse.y"
+#line 2788 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_case(p, 0, (yyvsp[-1].nd));
}
-#line 8121 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8115 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 324:
-#line 2798 "mrbgems/mruby-compiler/core/parse.y"
+#line 2792 "mrbgems/mruby-compiler/core/parse.y"
{COND_PUSH(1);}
-#line 8127 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8121 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 325:
-#line 2800 "mrbgems/mruby-compiler/core/parse.y"
+#line 2794 "mrbgems/mruby-compiler/core/parse.y"
{COND_POP();}
-#line 8133 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8127 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 326:
-#line 2803 "mrbgems/mruby-compiler/core/parse.y"
+#line 2797 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_for(p, (yyvsp[-7].nd), (yyvsp[-4].nd), (yyvsp[-1].nd));
SET_LINENO((yyval.nd), (yyvsp[-8].num));
}
-#line 8142 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8136 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 327:
-#line 2809 "mrbgems/mruby-compiler/core/parse.y"
+#line 2803 "mrbgems/mruby-compiler/core/parse.y"
{
if (p->in_def || p->in_single)
yyerror(p, "class definition in method body");
(yyval.nd) = local_switch(p);
nvars_block(p);
}
-#line 8153 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8147 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 328:
-#line 2817 "mrbgems/mruby-compiler/core/parse.y"
+#line 2811 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_class(p, (yyvsp[-4].nd), (yyvsp[-3].nd), (yyvsp[-1].nd));
SET_LINENO((yyval.nd), (yyvsp[-5].num));
local_resume(p, (yyvsp[-2].nd));
nvars_unnest(p);
}
-#line 8164 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8158 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 329:
-#line 2825 "mrbgems/mruby-compiler/core/parse.y"
+#line 2819 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.num) = p->in_def;
p->in_def = 0;
}
-#line 8173 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8167 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 330:
-#line 2830 "mrbgems/mruby-compiler/core/parse.y"
+#line 2824 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = cons(local_switch(p), nint(p->in_single));
nvars_block(p);
p->in_single = 0;
}
-#line 8183 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8177 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 331:
-#line 2837 "mrbgems/mruby-compiler/core/parse.y"
+#line 2831 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_sclass(p, (yyvsp[-5].nd), (yyvsp[-1].nd));
SET_LINENO((yyval.nd), (yyvsp[-7].num));
@@ -8192,44 +8186,44 @@ yyreduce:
p->in_def = (yyvsp[-4].num);
p->in_single = intn((yyvsp[-2].nd)->cdr);
}
-#line 8196 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8190 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 332:
-#line 2847 "mrbgems/mruby-compiler/core/parse.y"
+#line 2841 "mrbgems/mruby-compiler/core/parse.y"
{
if (p->in_def || p->in_single)
yyerror(p, "module definition in method body");
(yyval.nd) = local_switch(p);
nvars_block(p);
}
-#line 8207 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8201 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 333:
-#line 2855 "mrbgems/mruby-compiler/core/parse.y"
+#line 2849 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_module(p, (yyvsp[-3].nd), (yyvsp[-1].nd));
SET_LINENO((yyval.nd), (yyvsp[-4].num));
local_resume(p, (yyvsp[-2].nd));
nvars_unnest(p);
}
-#line 8218 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8212 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 334:
-#line 2865 "mrbgems/mruby-compiler/core/parse.y"
+#line 2859 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = (yyvsp[-3].nd);
defn_setup(p, (yyval.nd), (yyvsp[-2].nd), (yyvsp[-1].nd));
nvars_unnest(p);
p->in_def--;
}
-#line 8229 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8223 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 335:
-#line 2875 "mrbgems/mruby-compiler/core/parse.y"
+#line 2869 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = (yyvsp[-3].nd);
defs_setup(p, (yyval.nd), (yyvsp[-2].nd), (yyvsp[-1].nd));
@@ -8237,451 +8231,451 @@ yyreduce:
p->in_def--;
p->in_single--;
}
-#line 8241 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8235 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 336:
-#line 2883 "mrbgems/mruby-compiler/core/parse.y"
+#line 2877 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_break(p, 0);
}
-#line 8249 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8243 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 337:
-#line 2887 "mrbgems/mruby-compiler/core/parse.y"
+#line 2881 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_next(p, 0);
}
-#line 8257 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8251 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 338:
-#line 2891 "mrbgems/mruby-compiler/core/parse.y"
+#line 2885 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_redo(p);
}
-#line 8265 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8259 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 339:
-#line 2895 "mrbgems/mruby-compiler/core/parse.y"
+#line 2889 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_retry(p);
}
-#line 8273 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8267 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 340:
-#line 2901 "mrbgems/mruby-compiler/core/parse.y"
+#line 2895 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = (yyvsp[0].nd);
if (!(yyval.nd)) (yyval.nd) = new_nil(p);
}
-#line 8282 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8276 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 347:
-#line 2920 "mrbgems/mruby-compiler/core/parse.y"
+#line 2914 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_if(p, cond((yyvsp[-3].nd)), (yyvsp[-1].nd), (yyvsp[0].nd));
}
-#line 8290 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8284 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 349:
-#line 2927 "mrbgems/mruby-compiler/core/parse.y"
+#line 2921 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = (yyvsp[0].nd);
}
-#line 8298 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8292 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 350:
-#line 2933 "mrbgems/mruby-compiler/core/parse.y"
+#line 2927 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = list1(list1((yyvsp[0].nd)));
}
-#line 8306 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8300 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 352:
-#line 2940 "mrbgems/mruby-compiler/core/parse.y"
+#line 2934 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = list3((yyvsp[0].nd),0,0);
}
-#line 8314 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8308 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 353:
-#line 2944 "mrbgems/mruby-compiler/core/parse.y"
+#line 2938 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = list3((yyvsp[-3].nd), new_arg(p, (yyvsp[0].id)), 0);
}
-#line 8322 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8316 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 354:
-#line 2948 "mrbgems/mruby-compiler/core/parse.y"
+#line 2942 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = list3((yyvsp[-5].nd), new_arg(p, (yyvsp[-2].id)), (yyvsp[0].nd));
}
-#line 8330 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8324 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 355:
-#line 2952 "mrbgems/mruby-compiler/core/parse.y"
+#line 2946 "mrbgems/mruby-compiler/core/parse.y"
{
local_add_f(p, 0);
(yyval.nd) = list3((yyvsp[-2].nd), nint(-1), 0);
}
-#line 8339 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8333 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 356:
-#line 2957 "mrbgems/mruby-compiler/core/parse.y"
+#line 2951 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = list3((yyvsp[-4].nd), nint(-1), (yyvsp[0].nd));
}
-#line 8347 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8341 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 357:
-#line 2961 "mrbgems/mruby-compiler/core/parse.y"
+#line 2955 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = list3(0, new_arg(p, (yyvsp[0].id)), 0);
}
-#line 8355 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8349 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 358:
-#line 2965 "mrbgems/mruby-compiler/core/parse.y"
+#line 2959 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = list3(0, new_arg(p, (yyvsp[-2].id)), (yyvsp[0].nd));
}
-#line 8363 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8357 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 359:
-#line 2969 "mrbgems/mruby-compiler/core/parse.y"
+#line 2963 "mrbgems/mruby-compiler/core/parse.y"
{
local_add_f(p, 0);
(yyval.nd) = list3(0, nint(-1), 0);
}
-#line 8372 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8366 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 360:
-#line 2974 "mrbgems/mruby-compiler/core/parse.y"
+#line 2968 "mrbgems/mruby-compiler/core/parse.y"
{
local_add_f(p, 0);
}
-#line 8380 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8374 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 361:
-#line 2978 "mrbgems/mruby-compiler/core/parse.y"
+#line 2972 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = list3(0, nint(-1), (yyvsp[0].nd));
}
-#line 8388 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8382 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 362:
-#line 2984 "mrbgems/mruby-compiler/core/parse.y"
+#line 2978 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_args_tail(p, (yyvsp[-3].nd), (yyvsp[-1].nd), (yyvsp[0].id));
}
-#line 8396 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8390 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 363:
-#line 2988 "mrbgems/mruby-compiler/core/parse.y"
+#line 2982 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_args_tail(p, (yyvsp[-1].nd), 0, (yyvsp[0].id));
}
-#line 8404 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8398 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 364:
-#line 2992 "mrbgems/mruby-compiler/core/parse.y"
+#line 2986 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_args_tail(p, 0, (yyvsp[-1].nd), (yyvsp[0].id));
}
-#line 8412 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8406 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 365:
-#line 2996 "mrbgems/mruby-compiler/core/parse.y"
+#line 2990 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_args_tail(p, 0, 0, (yyvsp[0].id));
}
-#line 8420 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8414 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 366:
-#line 3002 "mrbgems/mruby-compiler/core/parse.y"
+#line 2996 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = (yyvsp[0].nd);
}
-#line 8428 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8422 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 367:
-#line 3006 "mrbgems/mruby-compiler/core/parse.y"
+#line 3000 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_args_tail(p, 0, 0, 0);
}
-#line 8436 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8430 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 368:
-#line 3012 "mrbgems/mruby-compiler/core/parse.y"
+#line 3006 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_args(p, (yyvsp[-5].nd), (yyvsp[-3].nd), (yyvsp[-1].id), 0, (yyvsp[0].nd));
}
-#line 8444 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8438 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 369:
-#line 3016 "mrbgems/mruby-compiler/core/parse.y"
+#line 3010 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_args(p, (yyvsp[-7].nd), (yyvsp[-5].nd), (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd));
}
-#line 8452 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8446 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 370:
-#line 3020 "mrbgems/mruby-compiler/core/parse.y"
+#line 3014 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_args(p, (yyvsp[-3].nd), (yyvsp[-1].nd), 0, 0, (yyvsp[0].nd));
}
-#line 8460 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8454 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 371:
-#line 3024 "mrbgems/mruby-compiler/core/parse.y"
+#line 3018 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_args(p, (yyvsp[-5].nd), (yyvsp[-3].nd), 0, (yyvsp[-1].nd), (yyvsp[0].nd));
}
-#line 8468 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8462 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 372:
-#line 3028 "mrbgems/mruby-compiler/core/parse.y"
+#line 3022 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_args(p, (yyvsp[-3].nd), 0, (yyvsp[-1].id), 0, (yyvsp[0].nd));
}
-#line 8476 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8470 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 373:
-#line 3032 "mrbgems/mruby-compiler/core/parse.y"
+#line 3026 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_args(p, (yyvsp[-2].nd), 0, 0, 0, (yyvsp[0].nd));
}
-#line 8484 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8478 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 374:
-#line 3036 "mrbgems/mruby-compiler/core/parse.y"
+#line 3030 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_args(p, (yyvsp[-5].nd), 0, (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd));
}
-#line 8492 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8486 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 375:
-#line 3040 "mrbgems/mruby-compiler/core/parse.y"
+#line 3034 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_args(p, (yyvsp[-1].nd), 0, 0, 0, (yyvsp[0].nd));
}
-#line 8500 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8494 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 376:
-#line 3044 "mrbgems/mruby-compiler/core/parse.y"
+#line 3038 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_args(p, 0, (yyvsp[-3].nd), (yyvsp[-1].id), 0, (yyvsp[0].nd));
}
-#line 8508 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8502 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 377:
-#line 3048 "mrbgems/mruby-compiler/core/parse.y"
+#line 3042 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_args(p, 0, (yyvsp[-5].nd), (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd));
}
-#line 8516 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8510 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 378:
-#line 3052 "mrbgems/mruby-compiler/core/parse.y"
+#line 3046 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_args(p, 0, (yyvsp[-1].nd), 0, 0, (yyvsp[0].nd));
}
-#line 8524 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8518 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 379:
-#line 3056 "mrbgems/mruby-compiler/core/parse.y"
+#line 3050 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_args(p, 0, (yyvsp[-3].nd), 0, (yyvsp[-1].nd), (yyvsp[0].nd));
}
-#line 8532 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8526 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 380:
-#line 3060 "mrbgems/mruby-compiler/core/parse.y"
+#line 3054 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_args(p, 0, 0, (yyvsp[-1].id), 0, (yyvsp[0].nd));
}
-#line 8540 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8534 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 381:
-#line 3064 "mrbgems/mruby-compiler/core/parse.y"
+#line 3058 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_args(p, 0, 0, (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd));
}
-#line 8548 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8542 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 382:
-#line 3068 "mrbgems/mruby-compiler/core/parse.y"
+#line 3062 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_args(p, 0, 0, 0, 0, (yyvsp[0].nd));
}
-#line 8556 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8550 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 383:
-#line 3074 "mrbgems/mruby-compiler/core/parse.y"
+#line 3068 "mrbgems/mruby-compiler/core/parse.y"
{
local_add_blk(p, 0);
(yyval.nd) = 0;
}
-#line 8565 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8559 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 384:
-#line 3079 "mrbgems/mruby-compiler/core/parse.y"
+#line 3073 "mrbgems/mruby-compiler/core/parse.y"
{
p->cmd_start = TRUE;
(yyval.nd) = (yyvsp[0].nd);
}
-#line 8574 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8568 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 385:
-#line 3085 "mrbgems/mruby-compiler/core/parse.y"
+#line 3079 "mrbgems/mruby-compiler/core/parse.y"
{local_add_blk(p, 0);}
-#line 8580 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8574 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 386:
-#line 3086 "mrbgems/mruby-compiler/core/parse.y"
+#line 3080 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = 0;
}
-#line 8588 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8582 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 387:
-#line 3090 "mrbgems/mruby-compiler/core/parse.y"
+#line 3084 "mrbgems/mruby-compiler/core/parse.y"
{
local_add_blk(p, 0);
(yyval.nd) = 0;
}
-#line 8597 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8591 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 388:
-#line 3095 "mrbgems/mruby-compiler/core/parse.y"
+#line 3089 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = (yyvsp[-2].nd);
}
-#line 8605 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8599 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 389:
-#line 3102 "mrbgems/mruby-compiler/core/parse.y"
+#line 3096 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = 0;
}
-#line 8613 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8607 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 390:
-#line 3106 "mrbgems/mruby-compiler/core/parse.y"
+#line 3100 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = 0;
}
-#line 8621 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8615 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 393:
-#line 3116 "mrbgems/mruby-compiler/core/parse.y"
+#line 3110 "mrbgems/mruby-compiler/core/parse.y"
{
local_add_f(p, (yyvsp[0].id));
new_bv(p, (yyvsp[0].id));
}
-#line 8630 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8624 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 395:
-#line 3124 "mrbgems/mruby-compiler/core/parse.y"
+#line 3118 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = (yyvsp[-2].nd);
}
-#line 8638 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8632 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 396:
-#line 3128 "mrbgems/mruby-compiler/core/parse.y"
+#line 3122 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = (yyvsp[0].nd);
}
-#line 8646 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8640 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 397:
-#line 3134 "mrbgems/mruby-compiler/core/parse.y"
+#line 3128 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = (yyvsp[-1].nd);
}
-#line 8654 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8648 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 398:
-#line 3138 "mrbgems/mruby-compiler/core/parse.y"
+#line 3132 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = (yyvsp[-1].nd);
}
-#line 8662 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8656 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 399:
-#line 3144 "mrbgems/mruby-compiler/core/parse.y"
+#line 3138 "mrbgems/mruby-compiler/core/parse.y"
{
local_nest(p);
nvars_nest(p);
}
-#line 8671 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8665 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 400:
-#line 3151 "mrbgems/mruby-compiler/core/parse.y"
+#line 3145 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_block(p,(yyvsp[-2].nd),(yyvsp[-1].nd));
local_unnest(p);
nvars_unnest(p);
}
-#line 8681 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8675 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 401:
-#line 3159 "mrbgems/mruby-compiler/core/parse.y"
+#line 3153 "mrbgems/mruby-compiler/core/parse.y"
{
if (typen((yyvsp[-1].nd)->car) == NODE_YIELD) {
yyerror(p, "block given to yield");
@@ -8691,159 +8685,159 @@ yyreduce:
}
(yyval.nd) = (yyvsp[-1].nd);
}
-#line 8695 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8689 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 402:
-#line 3169 "mrbgems/mruby-compiler/core/parse.y"
+#line 3163 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_call(p, (yyvsp[-3].nd), (yyvsp[-1].id), (yyvsp[0].nd), (yyvsp[-2].num));
}
-#line 8703 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8697 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 403:
-#line 3173 "mrbgems/mruby-compiler/core/parse.y"
+#line 3167 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_call(p, (yyvsp[-4].nd), (yyvsp[-2].id), (yyvsp[-1].nd), (yyvsp[-3].num));
call_with_block(p, (yyval.nd), (yyvsp[0].nd));
}
-#line 8712 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8706 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 404:
-#line 3178 "mrbgems/mruby-compiler/core/parse.y"
+#line 3172 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_call(p, (yyvsp[-4].nd), (yyvsp[-2].id), (yyvsp[-1].nd), (yyvsp[-3].num));
call_with_block(p, (yyval.nd), (yyvsp[0].nd));
}
-#line 8721 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8715 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 405:
-#line 3185 "mrbgems/mruby-compiler/core/parse.y"
+#line 3179 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_fcall(p, (yyvsp[-1].id), (yyvsp[0].nd));
}
-#line 8729 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8723 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 406:
-#line 3189 "mrbgems/mruby-compiler/core/parse.y"
+#line 3183 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_call(p, (yyvsp[-3].nd), (yyvsp[-1].id), (yyvsp[0].nd), (yyvsp[-2].num));
}
-#line 8737 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8731 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 407:
-#line 3193 "mrbgems/mruby-compiler/core/parse.y"
+#line 3187 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_call(p, (yyvsp[-3].nd), (yyvsp[-1].id), (yyvsp[0].nd), tCOLON2);
}
-#line 8745 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8739 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 408:
-#line 3197 "mrbgems/mruby-compiler/core/parse.y"
+#line 3191 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_call(p, (yyvsp[-2].nd), (yyvsp[0].id), 0, tCOLON2);
}
-#line 8753 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8747 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 409:
-#line 3201 "mrbgems/mruby-compiler/core/parse.y"
+#line 3195 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_call(p, (yyvsp[-2].nd), MRB_SYM_2(p->mrb, call), (yyvsp[0].nd), (yyvsp[-1].num));
}
-#line 8761 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8755 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 410:
-#line 3205 "mrbgems/mruby-compiler/core/parse.y"
+#line 3199 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_call(p, (yyvsp[-2].nd), MRB_SYM_2(p->mrb, call), (yyvsp[0].nd), tCOLON2);
}
-#line 8769 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8763 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 411:
-#line 3209 "mrbgems/mruby-compiler/core/parse.y"
+#line 3203 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_super(p, (yyvsp[0].nd));
}
-#line 8777 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8771 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 412:
-#line 3213 "mrbgems/mruby-compiler/core/parse.y"
+#line 3207 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_zsuper(p);
}
-#line 8785 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8779 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 413:
-#line 3217 "mrbgems/mruby-compiler/core/parse.y"
+#line 3211 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_call(p, (yyvsp[-3].nd), intern_op(aref), (yyvsp[-1].nd), '.');
}
-#line 8793 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8787 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 414:
-#line 3223 "mrbgems/mruby-compiler/core/parse.y"
+#line 3217 "mrbgems/mruby-compiler/core/parse.y"
{
local_nest(p);
nvars_nest(p);
(yyval.num) = p->lineno;
}
-#line 8803 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8797 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 415:
-#line 3230 "mrbgems/mruby-compiler/core/parse.y"
+#line 3224 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_block(p,(yyvsp[-2].nd),(yyvsp[-1].nd));
SET_LINENO((yyval.nd), (yyvsp[-3].num));
local_unnest(p);
nvars_unnest(p);
}
-#line 8814 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8808 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 416:
-#line 3237 "mrbgems/mruby-compiler/core/parse.y"
+#line 3231 "mrbgems/mruby-compiler/core/parse.y"
{
local_nest(p);
nvars_nest(p);
(yyval.num) = p->lineno;
}
-#line 8824 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8818 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 417:
-#line 3244 "mrbgems/mruby-compiler/core/parse.y"
+#line 3238 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_block(p,(yyvsp[-2].nd),(yyvsp[-1].nd));
SET_LINENO((yyval.nd), (yyvsp[-3].num));
local_unnest(p);
nvars_unnest(p);
}
-#line 8835 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8829 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 418:
-#line 3255 "mrbgems/mruby-compiler/core/parse.y"
+#line 3249 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = cons(cons((yyvsp[-3].nd), (yyvsp[-1].nd)), (yyvsp[0].nd));
}
-#line 8843 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8837 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 419:
-#line 3261 "mrbgems/mruby-compiler/core/parse.y"
+#line 3255 "mrbgems/mruby-compiler/core/parse.y"
{
if ((yyvsp[0].nd)) {
(yyval.nd) = cons(cons(0, (yyvsp[0].nd)), 0);
@@ -8852,60 +8846,60 @@ yyreduce:
(yyval.nd) = 0;
}
}
-#line 8856 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8850 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 421:
-#line 3275 "mrbgems/mruby-compiler/core/parse.y"
+#line 3269 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = list1(list3((yyvsp[-4].nd), (yyvsp[-3].nd), (yyvsp[-1].nd)));
if ((yyvsp[0].nd)) (yyval.nd) = append((yyval.nd), (yyvsp[0].nd));
}
-#line 8865 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8859 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 423:
-#line 3283 "mrbgems/mruby-compiler/core/parse.y"
+#line 3277 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = list1((yyvsp[0].nd));
}
-#line 8873 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8867 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 426:
-#line 3291 "mrbgems/mruby-compiler/core/parse.y"
+#line 3285 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = (yyvsp[0].nd);
}
-#line 8881 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8875 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 428:
-#line 3298 "mrbgems/mruby-compiler/core/parse.y"
+#line 3292 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = (yyvsp[0].nd);
}
-#line 8889 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8883 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 435:
-#line 3312 "mrbgems/mruby-compiler/core/parse.y"
+#line 3306 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = concat_string(p, (yyvsp[-1].nd), (yyvsp[0].nd));
}
-#line 8897 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8891 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 438:
-#line 3320 "mrbgems/mruby-compiler/core/parse.y"
+#line 3314 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = (yyvsp[0].nd);
}
-#line 8905 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8899 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 439:
-#line 3324 "mrbgems/mruby-compiler/core/parse.y"
+#line 3318 "mrbgems/mruby-compiler/core/parse.y"
{
node *n = (yyvsp[-1].nd);
if (intn((yyvsp[0].nd)->cdr->cdr) > 0) {
@@ -8916,69 +8910,69 @@ yyreduce:
}
(yyval.nd) = new_dstr(p, n);
}
-#line 8920 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8914 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 441:
-#line 3338 "mrbgems/mruby-compiler/core/parse.y"
+#line 3332 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = append((yyvsp[-1].nd), (yyvsp[0].nd));
}
-#line 8928 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8922 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 442:
-#line 3344 "mrbgems/mruby-compiler/core/parse.y"
+#line 3338 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = list1((yyvsp[0].nd));
}
-#line 8936 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8930 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 443:
-#line 3348 "mrbgems/mruby-compiler/core/parse.y"
+#line 3342 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = p->lex_strterm;
p->lex_strterm = NULL;
}
-#line 8945 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8939 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 444:
-#line 3354 "mrbgems/mruby-compiler/core/parse.y"
+#line 3348 "mrbgems/mruby-compiler/core/parse.y"
{
p->lex_strterm = (yyvsp[-2].nd);
(yyval.nd) = list2((yyvsp[-3].nd), (yyvsp[-1].nd));
}
-#line 8954 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8948 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 445:
-#line 3359 "mrbgems/mruby-compiler/core/parse.y"
+#line 3353 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = list1(new_literal_delim(p));
}
-#line 8962 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8956 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 446:
-#line 3363 "mrbgems/mruby-compiler/core/parse.y"
+#line 3357 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = list1(new_literal_delim(p));
}
-#line 8970 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8964 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 447:
-#line 3369 "mrbgems/mruby-compiler/core/parse.y"
+#line 3363 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = (yyvsp[0].nd);
}
-#line 8978 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8972 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 448:
-#line 3373 "mrbgems/mruby-compiler/core/parse.y"
+#line 3367 "mrbgems/mruby-compiler/core/parse.y"
{
node *n = (yyvsp[-1].nd);
if (intn((yyvsp[0].nd)->cdr->cdr) > 0) {
@@ -8989,82 +8983,82 @@ yyreduce:
}
(yyval.nd) = new_dxstr(p, n);
}
-#line 8993 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8987 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 449:
-#line 3386 "mrbgems/mruby-compiler/core/parse.y"
+#line 3380 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = (yyvsp[0].nd);
}
-#line 9001 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 8995 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 450:
-#line 3390 "mrbgems/mruby-compiler/core/parse.y"
+#line 3384 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_dregx(p, (yyvsp[-1].nd), (yyvsp[0].nd));
}
-#line 9009 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9003 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 454:
-#line 3403 "mrbgems/mruby-compiler/core/parse.y"
+#line 3397 "mrbgems/mruby-compiler/core/parse.y"
{
parser_heredoc_info * inf = parsing_heredoc_inf(p);
inf->doc = push(inf->doc, new_str(p, "", 0));
heredoc_end(p);
}
-#line 9019 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9013 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 455:
-#line 3409 "mrbgems/mruby-compiler/core/parse.y"
+#line 3403 "mrbgems/mruby-compiler/core/parse.y"
{
heredoc_end(p);
}
-#line 9027 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9021 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 458:
-#line 3419 "mrbgems/mruby-compiler/core/parse.y"
+#line 3413 "mrbgems/mruby-compiler/core/parse.y"
{
parser_heredoc_info * inf = parsing_heredoc_inf(p);
inf->doc = push(inf->doc, (yyvsp[0].nd));
heredoc_treat_nextline(p);
}
-#line 9037 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9031 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 459:
-#line 3425 "mrbgems/mruby-compiler/core/parse.y"
+#line 3419 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = p->lex_strterm;
p->lex_strterm = NULL;
}
-#line 9046 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9040 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 460:
-#line 3431 "mrbgems/mruby-compiler/core/parse.y"
+#line 3425 "mrbgems/mruby-compiler/core/parse.y"
{
parser_heredoc_info * inf = parsing_heredoc_inf(p);
p->lex_strterm = (yyvsp[-2].nd);
inf->doc = push(push(inf->doc, (yyvsp[-3].nd)), (yyvsp[-1].nd));
}
-#line 9056 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9050 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 461:
-#line 3439 "mrbgems/mruby-compiler/core/parse.y"
+#line 3433 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_words(p, list1((yyvsp[0].nd)));
}
-#line 9064 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9058 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 462:
-#line 3443 "mrbgems/mruby-compiler/core/parse.y"
+#line 3437 "mrbgems/mruby-compiler/core/parse.y"
{
node *n = (yyvsp[-1].nd);
if (intn((yyvsp[0].nd)->cdr->cdr) > 0) {
@@ -9075,20 +9069,20 @@ yyreduce:
}
(yyval.nd) = new_words(p, n);
}
-#line 9079 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9073 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 463:
-#line 3457 "mrbgems/mruby-compiler/core/parse.y"
+#line 3451 "mrbgems/mruby-compiler/core/parse.y"
{
p->lstate = EXPR_ENDARG;
(yyval.nd) = new_sym(p, (yyvsp[0].id));
}
-#line 9088 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9082 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 464:
-#line 3462 "mrbgems/mruby-compiler/core/parse.y"
+#line 3456 "mrbgems/mruby-compiler/core/parse.y"
{
node *n = (yyvsp[-1].nd);
p->lstate = EXPR_ENDARG;
@@ -9100,43 +9094,43 @@ yyreduce:
}
(yyval.nd) = new_dsym(p, new_dstr(p, n));
}
-#line 9104 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9098 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 465:
-#line 3476 "mrbgems/mruby-compiler/core/parse.y"
+#line 3470 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.id) = (yyvsp[0].id);
}
-#line 9112 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9106 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 470:
-#line 3486 "mrbgems/mruby-compiler/core/parse.y"
+#line 3480 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.id) = new_strsym(p, (yyvsp[0].nd));
}
-#line 9120 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9114 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 471:
-#line 3490 "mrbgems/mruby-compiler/core/parse.y"
+#line 3484 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.id) = new_strsym(p, (yyvsp[0].nd));
}
-#line 9128 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9122 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 472:
-#line 3496 "mrbgems/mruby-compiler/core/parse.y"
+#line 3490 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_symbols(p, list1((yyvsp[0].nd)));
}
-#line 9136 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9130 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 473:
-#line 3500 "mrbgems/mruby-compiler/core/parse.y"
+#line 3494 "mrbgems/mruby-compiler/core/parse.y"
{
node *n = (yyvsp[-1].nd);
if (intn((yyvsp[0].nd)->cdr->cdr) > 0) {
@@ -9144,123 +9138,123 @@ yyreduce:
}
(yyval.nd) = new_symbols(p, n);
}
-#line 9148 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9142 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 476:
-#line 3512 "mrbgems/mruby-compiler/core/parse.y"
+#line 3506 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_negate(p, (yyvsp[0].nd));
}
-#line 9156 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9150 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 477:
-#line 3516 "mrbgems/mruby-compiler/core/parse.y"
+#line 3510 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_negate(p, (yyvsp[0].nd));
}
-#line 9164 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9158 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 478:
-#line 3522 "mrbgems/mruby-compiler/core/parse.y"
+#line 3516 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_lvar(p, (yyvsp[0].id));
}
-#line 9172 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9166 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 479:
-#line 3526 "mrbgems/mruby-compiler/core/parse.y"
+#line 3520 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_ivar(p, (yyvsp[0].id));
}
-#line 9180 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9174 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 480:
-#line 3530 "mrbgems/mruby-compiler/core/parse.y"
+#line 3524 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_gvar(p, (yyvsp[0].id));
}
-#line 9188 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9182 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 481:
-#line 3534 "mrbgems/mruby-compiler/core/parse.y"
+#line 3528 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_cvar(p, (yyvsp[0].id));
}
-#line 9196 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9190 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 482:
-#line 3538 "mrbgems/mruby-compiler/core/parse.y"
+#line 3532 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_const(p, (yyvsp[0].id));
}
-#line 9204 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9198 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 483:
-#line 3544 "mrbgems/mruby-compiler/core/parse.y"
+#line 3538 "mrbgems/mruby-compiler/core/parse.y"
{
assignable(p, (yyvsp[0].nd));
}
-#line 9212 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9206 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 484:
-#line 3548 "mrbgems/mruby-compiler/core/parse.y"
+#line 3542 "mrbgems/mruby-compiler/core/parse.y"
{
yyerror(p, "can't assign to numbered parameter");
}
-#line 9220 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9214 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 485:
-#line 3554 "mrbgems/mruby-compiler/core/parse.y"
+#line 3548 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = var_reference(p, (yyvsp[0].nd));
}
-#line 9228 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9222 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 486:
-#line 3558 "mrbgems/mruby-compiler/core/parse.y"
+#line 3552 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_nil(p);
}
-#line 9236 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9230 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 487:
-#line 3562 "mrbgems/mruby-compiler/core/parse.y"
+#line 3556 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_self(p);
}
-#line 9244 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9238 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 488:
-#line 3566 "mrbgems/mruby-compiler/core/parse.y"
+#line 3560 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_true(p);
}
-#line 9252 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9246 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 489:
-#line 3570 "mrbgems/mruby-compiler/core/parse.y"
+#line 3564 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_false(p);
}
-#line 9260 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9254 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 490:
-#line 3574 "mrbgems/mruby-compiler/core/parse.y"
+#line 3568 "mrbgems/mruby-compiler/core/parse.y"
{
const char *fn = mrb_sym_name_len(p->mrb, p->filename_sym, NULL);
if (!fn) {
@@ -9268,602 +9262,584 @@ yyreduce:
}
(yyval.nd) = new_str(p, fn, strlen(fn));
}
-#line 9272 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9266 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 491:
-#line 3582 "mrbgems/mruby-compiler/core/parse.y"
+#line 3576 "mrbgems/mruby-compiler/core/parse.y"
{
char buf[16];
dump_int(p->lineno, buf);
(yyval.nd) = new_int(p, buf, 10, 0);
}
-#line 9283 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9277 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 492:
-#line 3589 "mrbgems/mruby-compiler/core/parse.y"
+#line 3583 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_fcall(p, MRB_SYM_2(p->mrb, __ENCODING__), 0);
}
-#line 9291 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9285 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 495:
-#line 3599 "mrbgems/mruby-compiler/core/parse.y"
+#line 3593 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = 0;
}
-#line 9299 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9293 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 496:
-#line 3603 "mrbgems/mruby-compiler/core/parse.y"
+#line 3597 "mrbgems/mruby-compiler/core/parse.y"
{
p->lstate = EXPR_BEG;
p->cmd_start = TRUE;
}
-#line 9308 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9302 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 497:
-#line 3608 "mrbgems/mruby-compiler/core/parse.y"
+#line 3602 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = (yyvsp[-1].nd);
}
-#line 9316 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9310 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 500:
-#line 3624 "mrbgems/mruby-compiler/core/parse.y"
+#line 3618 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = (yyvsp[-1].nd);
p->lstate = EXPR_BEG;
p->cmd_start = TRUE;
}
-#line 9326 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9320 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 501:
-#line 3630 "mrbgems/mruby-compiler/core/parse.y"
+#line 3624 "mrbgems/mruby-compiler/core/parse.y"
{
-#if 1
- /* til real keyword args implemented */
- mrb_sym r = intern_op(mul);
- mrb_sym b = intern_op(and);
- local_add_f(p, r);
- (yyval.nd) = new_args(p, (yyvsp[-3].nd), 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);
(yyval.nd) = new_args(p, (yyvsp[-3].nd), 0, r, 0,
new_args_tail(p, 0, new_kw_rest_args(p, nsym(k)), b));
-#endif
}
-#line 9348 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9333 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 502:
-#line 3648 "mrbgems/mruby-compiler/core/parse.y"
+#line 3633 "mrbgems/mruby-compiler/core/parse.y"
{
-#if 1
- /* til real keyword args implemented */
- mrb_sym r = intern_op(mul);
- mrb_sym b = intern_op(and);
- local_add_f(p, r);
- (yyval.nd) = 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);
(yyval.nd) = new_args(p, 0, 0, r, 0,
new_args_tail(p, 0, new_kw_rest_args(p, nsym(k)), b));
-#endif
}
-#line 9370 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9346 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 504:
-#line 3669 "mrbgems/mruby-compiler/core/parse.y"
+#line 3645 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = (yyvsp[-1].nd);
}
-#line 9378 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9354 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 505:
-#line 3675 "mrbgems/mruby-compiler/core/parse.y"
+#line 3651 "mrbgems/mruby-compiler/core/parse.y"
{
local_nest(p);
}
-#line 9386 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9362 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 506:
-#line 3681 "mrbgems/mruby-compiler/core/parse.y"
+#line 3657 "mrbgems/mruby-compiler/core/parse.y"
{
void_expr_error(p, (yyvsp[0].nd));
(yyval.nd) = new_kw_arg(p, (yyvsp[-1].id), cons((yyvsp[0].nd), locals_node(p)));
local_unnest(p);
}
-#line 9396 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9372 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 507:
-#line 3687 "mrbgems/mruby-compiler/core/parse.y"
+#line 3663 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_kw_arg(p, (yyvsp[0].id), 0);
local_unnest(p);
}
-#line 9405 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9381 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 508:
-#line 3694 "mrbgems/mruby-compiler/core/parse.y"
+#line 3670 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_kw_arg(p, (yyvsp[-1].id), cons((yyvsp[0].nd), locals_node(p)));
local_unnest(p);
}
-#line 9414 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9390 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 509:
-#line 3699 "mrbgems/mruby-compiler/core/parse.y"
+#line 3675 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_kw_arg(p, (yyvsp[0].id), 0);
local_unnest(p);
}
-#line 9423 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9399 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 510:
-#line 3706 "mrbgems/mruby-compiler/core/parse.y"
+#line 3682 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = list1((yyvsp[0].nd));
}
-#line 9431 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9407 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 511:
-#line 3710 "mrbgems/mruby-compiler/core/parse.y"
+#line 3686 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd));
}
-#line 9439 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9415 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 512:
-#line 3716 "mrbgems/mruby-compiler/core/parse.y"
+#line 3692 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = list1((yyvsp[0].nd));
}
-#line 9447 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9423 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 513:
-#line 3720 "mrbgems/mruby-compiler/core/parse.y"
+#line 3696 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd));
}
-#line 9455 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9431 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 516:
-#line 3730 "mrbgems/mruby-compiler/core/parse.y"
+#line 3706 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_kw_rest_args(p, nsym((yyvsp[0].id)));
}
-#line 9463 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9439 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 517:
-#line 3734 "mrbgems/mruby-compiler/core/parse.y"
+#line 3710 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_kw_rest_args(p, 0);
}
-#line 9471 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9447 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 518:
-#line 3740 "mrbgems/mruby-compiler/core/parse.y"
+#line 3716 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_args_tail(p, (yyvsp[-3].nd), (yyvsp[-1].nd), (yyvsp[0].id));
}
-#line 9479 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9455 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 519:
-#line 3744 "mrbgems/mruby-compiler/core/parse.y"
+#line 3720 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_args_tail(p, (yyvsp[-1].nd), 0, (yyvsp[0].id));
}
-#line 9487 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9463 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 520:
-#line 3748 "mrbgems/mruby-compiler/core/parse.y"
+#line 3724 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_args_tail(p, 0, (yyvsp[-1].nd), (yyvsp[0].id));
}
-#line 9495 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9471 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 521:
-#line 3752 "mrbgems/mruby-compiler/core/parse.y"
+#line 3728 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_args_tail(p, 0, 0, (yyvsp[0].id));
}
-#line 9503 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9479 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 522:
-#line 3758 "mrbgems/mruby-compiler/core/parse.y"
+#line 3734 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = (yyvsp[0].nd);
}
-#line 9511 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9487 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 523:
-#line 3762 "mrbgems/mruby-compiler/core/parse.y"
+#line 3738 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_args_tail(p, 0, 0, 0);
}
-#line 9519 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9495 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 524:
-#line 3768 "mrbgems/mruby-compiler/core/parse.y"
+#line 3744 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_args(p, (yyvsp[-5].nd), (yyvsp[-3].nd), (yyvsp[-1].id), 0, (yyvsp[0].nd));
}
-#line 9527 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9503 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 525:
-#line 3772 "mrbgems/mruby-compiler/core/parse.y"
+#line 3748 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_args(p, (yyvsp[-7].nd), (yyvsp[-5].nd), (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd));
}
-#line 9535 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9511 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 526:
-#line 3776 "mrbgems/mruby-compiler/core/parse.y"
+#line 3752 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_args(p, (yyvsp[-3].nd), (yyvsp[-1].nd), 0, 0, (yyvsp[0].nd));
}
-#line 9543 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9519 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 527:
-#line 3780 "mrbgems/mruby-compiler/core/parse.y"
+#line 3756 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_args(p, (yyvsp[-5].nd), (yyvsp[-3].nd), 0, (yyvsp[-1].nd), (yyvsp[0].nd));
}
-#line 9551 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9527 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 528:
-#line 3784 "mrbgems/mruby-compiler/core/parse.y"
+#line 3760 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_args(p, (yyvsp[-3].nd), 0, (yyvsp[-1].id), 0, (yyvsp[0].nd));
}
-#line 9559 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9535 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 529:
-#line 3788 "mrbgems/mruby-compiler/core/parse.y"
+#line 3764 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_args(p, (yyvsp[-5].nd), 0, (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd));
}
-#line 9567 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9543 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 530:
-#line 3792 "mrbgems/mruby-compiler/core/parse.y"
+#line 3768 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_args(p, (yyvsp[-1].nd), 0, 0, 0, (yyvsp[0].nd));
}
-#line 9575 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9551 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 531:
-#line 3796 "mrbgems/mruby-compiler/core/parse.y"
+#line 3772 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_args(p, 0, (yyvsp[-3].nd), (yyvsp[-1].id), 0, (yyvsp[0].nd));
}
-#line 9583 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9559 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 532:
-#line 3800 "mrbgems/mruby-compiler/core/parse.y"
+#line 3776 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_args(p, 0, (yyvsp[-5].nd), (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd));
}
-#line 9591 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9567 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 533:
-#line 3804 "mrbgems/mruby-compiler/core/parse.y"
+#line 3780 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_args(p, 0, (yyvsp[-1].nd), 0, 0, (yyvsp[0].nd));
}
-#line 9599 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9575 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 534:
-#line 3808 "mrbgems/mruby-compiler/core/parse.y"
+#line 3784 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_args(p, 0, (yyvsp[-3].nd), 0, (yyvsp[-1].nd), (yyvsp[0].nd));
}
-#line 9607 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9583 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 535:
-#line 3812 "mrbgems/mruby-compiler/core/parse.y"
+#line 3788 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_args(p, 0, 0, (yyvsp[-1].id), 0, (yyvsp[0].nd));
}
-#line 9615 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9591 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 536:
-#line 3816 "mrbgems/mruby-compiler/core/parse.y"
+#line 3792 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_args(p, 0, 0, (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd));
}
-#line 9623 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9599 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 537:
-#line 3820 "mrbgems/mruby-compiler/core/parse.y"
+#line 3796 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_args(p, 0, 0, 0, 0, (yyvsp[0].nd));
}
-#line 9631 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9607 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 538:
-#line 3824 "mrbgems/mruby-compiler/core/parse.y"
+#line 3800 "mrbgems/mruby-compiler/core/parse.y"
{
local_add_f(p, intern_op(and));
(yyval.nd) = new_args(p, 0, 0, 0, 0, 0);
}
-#line 9640 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9616 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 539:
-#line 3831 "mrbgems/mruby-compiler/core/parse.y"
+#line 3807 "mrbgems/mruby-compiler/core/parse.y"
{
yyerror(p, "formal argument cannot be a constant");
(yyval.nd) = 0;
}
-#line 9649 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9625 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 540:
-#line 3836 "mrbgems/mruby-compiler/core/parse.y"
+#line 3812 "mrbgems/mruby-compiler/core/parse.y"
{
yyerror(p, "formal argument cannot be an instance variable");
(yyval.nd) = 0;
}
-#line 9658 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9634 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 541:
-#line 3841 "mrbgems/mruby-compiler/core/parse.y"
+#line 3817 "mrbgems/mruby-compiler/core/parse.y"
{
yyerror(p, "formal argument cannot be a global variable");
(yyval.nd) = 0;
}
-#line 9667 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9643 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 542:
-#line 3846 "mrbgems/mruby-compiler/core/parse.y"
+#line 3822 "mrbgems/mruby-compiler/core/parse.y"
{
yyerror(p, "formal argument cannot be a class variable");
(yyval.nd) = 0;
}
-#line 9676 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9652 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 543:
-#line 3851 "mrbgems/mruby-compiler/core/parse.y"
+#line 3827 "mrbgems/mruby-compiler/core/parse.y"
{
yyerror(p, "formal argument cannot be a numbered parameter");
(yyval.nd) = 0;
}
-#line 9685 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9661 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 544:
-#line 3858 "mrbgems/mruby-compiler/core/parse.y"
+#line 3834 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.id) = 0;
}
-#line 9693 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9669 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 545:
-#line 3862 "mrbgems/mruby-compiler/core/parse.y"
+#line 3838 "mrbgems/mruby-compiler/core/parse.y"
{
local_add_f(p, (yyvsp[0].id));
(yyval.id) = (yyvsp[0].id);
}
-#line 9702 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9678 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 546:
-#line 3869 "mrbgems/mruby-compiler/core/parse.y"
+#line 3845 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_arg(p, (yyvsp[0].id));
}
-#line 9710 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9686 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 547:
-#line 3873 "mrbgems/mruby-compiler/core/parse.y"
+#line 3849 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = local_switch(p);
}
-#line 9718 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9694 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 548:
-#line 3877 "mrbgems/mruby-compiler/core/parse.y"
+#line 3853 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = new_masgn_param(p, (yyvsp[-1].nd), p->locals->car);
local_resume(p, (yyvsp[-2].nd));
local_add_f(p, 0);
}
-#line 9728 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9704 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 549:
-#line 3885 "mrbgems/mruby-compiler/core/parse.y"
+#line 3861 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = list1((yyvsp[0].nd));
}
-#line 9736 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9712 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 550:
-#line 3889 "mrbgems/mruby-compiler/core/parse.y"
+#line 3865 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd));
}
-#line 9744 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9720 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 551:
-#line 3895 "mrbgems/mruby-compiler/core/parse.y"
+#line 3871 "mrbgems/mruby-compiler/core/parse.y"
{
local_add_f(p, (yyvsp[-1].id));
local_nest(p);
(yyval.id) = (yyvsp[-1].id);
}
-#line 9754 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9730 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 552:
-#line 3903 "mrbgems/mruby-compiler/core/parse.y"
+#line 3879 "mrbgems/mruby-compiler/core/parse.y"
{
void_expr_error(p, (yyvsp[0].nd));
(yyval.nd) = cons(nsym((yyvsp[-1].id)), cons((yyvsp[0].nd), locals_node(p)));
local_unnest(p);
}
-#line 9764 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9740 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 553:
-#line 3911 "mrbgems/mruby-compiler/core/parse.y"
+#line 3887 "mrbgems/mruby-compiler/core/parse.y"
{
void_expr_error(p, (yyvsp[0].nd));
(yyval.nd) = cons(nsym((yyvsp[-1].id)), cons((yyvsp[0].nd), locals_node(p)));
local_unnest(p);
}
-#line 9774 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9750 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 554:
-#line 3919 "mrbgems/mruby-compiler/core/parse.y"
+#line 3895 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = list1((yyvsp[0].nd));
}
-#line 9782 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9758 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 555:
-#line 3923 "mrbgems/mruby-compiler/core/parse.y"
+#line 3899 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd));
}
-#line 9790 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9766 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 556:
-#line 3929 "mrbgems/mruby-compiler/core/parse.y"
+#line 3905 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = list1((yyvsp[0].nd));
}
-#line 9798 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9774 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 557:
-#line 3933 "mrbgems/mruby-compiler/core/parse.y"
+#line 3909 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd));
}
-#line 9806 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9782 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 560:
-#line 3943 "mrbgems/mruby-compiler/core/parse.y"
+#line 3919 "mrbgems/mruby-compiler/core/parse.y"
{
local_add_f(p, (yyvsp[0].id));
(yyval.id) = (yyvsp[0].id);
}
-#line 9815 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9791 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 561:
-#line 3948 "mrbgems/mruby-compiler/core/parse.y"
+#line 3924 "mrbgems/mruby-compiler/core/parse.y"
{
local_add_f(p, intern_op(mul));
(yyval.id) = -1;
}
-#line 9824 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9800 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 564:
-#line 3959 "mrbgems/mruby-compiler/core/parse.y"
+#line 3935 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.id) = (yyvsp[0].id);
}
-#line 9832 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9808 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 565:
-#line 3965 "mrbgems/mruby-compiler/core/parse.y"
+#line 3941 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.id) = (yyvsp[0].id);
}
-#line 9840 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9816 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 566:
-#line 3969 "mrbgems/mruby-compiler/core/parse.y"
+#line 3945 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.id) = 0;
}
-#line 9848 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9824 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 567:
-#line 3975 "mrbgems/mruby-compiler/core/parse.y"
+#line 3951 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = (yyvsp[0].nd);
if (!(yyval.nd)) (yyval.nd) = new_nil(p);
}
-#line 9857 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9833 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 568:
-#line 3979 "mrbgems/mruby-compiler/core/parse.y"
+#line 3955 "mrbgems/mruby-compiler/core/parse.y"
{p->lstate = EXPR_BEG;}
-#line 9863 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9839 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 569:
-#line 3980 "mrbgems/mruby-compiler/core/parse.y"
+#line 3956 "mrbgems/mruby-compiler/core/parse.y"
{
if ((yyvsp[-1].nd) == 0) {
yyerror(p, "can't define singleton method for ().");
@@ -9886,63 +9862,63 @@ yyreduce:
}
(yyval.nd) = (yyvsp[-1].nd);
}
-#line 9890 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9866 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 571:
-#line 4006 "mrbgems/mruby-compiler/core/parse.y"
+#line 3982 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = (yyvsp[-1].nd);
}
-#line 9898 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9874 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 572:
-#line 4012 "mrbgems/mruby-compiler/core/parse.y"
+#line 3988 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = list1((yyvsp[0].nd));
NODE_LINENO((yyval.nd), (yyvsp[0].nd));
}
-#line 9907 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9883 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 573:
-#line 4017 "mrbgems/mruby-compiler/core/parse.y"
+#line 3993 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd));
}
-#line 9915 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9891 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 574:
-#line 4023 "mrbgems/mruby-compiler/core/parse.y"
+#line 3999 "mrbgems/mruby-compiler/core/parse.y"
{
void_expr_error(p, (yyvsp[-2].nd));
void_expr_error(p, (yyvsp[0].nd));
(yyval.nd) = cons((yyvsp[-2].nd), (yyvsp[0].nd));
}
-#line 9925 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9901 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 575:
-#line 4029 "mrbgems/mruby-compiler/core/parse.y"
+#line 4005 "mrbgems/mruby-compiler/core/parse.y"
{
void_expr_error(p, (yyvsp[0].nd));
(yyval.nd) = cons(new_sym(p, (yyvsp[-2].id)), (yyvsp[0].nd));
}
-#line 9934 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9910 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 576:
-#line 4034 "mrbgems/mruby-compiler/core/parse.y"
+#line 4010 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = cons(new_sym(p, (yyvsp[-1].id)), label_reference(p, (yyvsp[-1].id)));
}
-#line 9942 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9918 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 577:
-#line 4038 "mrbgems/mruby-compiler/core/parse.y"
+#line 4014 "mrbgems/mruby-compiler/core/parse.y"
{
void_expr_error(p, (yyvsp[0].nd));
if (typen((yyvsp[-2].nd)->car) == NODE_DSTR) {
@@ -9952,67 +9928,67 @@ yyreduce:
(yyval.nd) = cons(new_sym(p, new_strsym(p, (yyvsp[-2].nd))), (yyvsp[0].nd));
}
}
-#line 9956 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9932 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 578:
-#line 4048 "mrbgems/mruby-compiler/core/parse.y"
+#line 4024 "mrbgems/mruby-compiler/core/parse.y"
{
void_expr_error(p, (yyvsp[0].nd));
(yyval.nd) = cons(new_kw_rest_args(p, 0), (yyvsp[0].nd));
}
-#line 9965 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9941 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 591:
-#line 4075 "mrbgems/mruby-compiler/core/parse.y"
+#line 4051 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.num) = '.';
}
-#line 9973 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9949 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 592:
-#line 4079 "mrbgems/mruby-compiler/core/parse.y"
+#line 4055 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.num) = 0;
}
-#line 9981 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9957 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 594:
-#line 4086 "mrbgems/mruby-compiler/core/parse.y"
+#line 4062 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.num) = tCOLON2;
}
-#line 9989 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9965 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 603:
-#line 4107 "mrbgems/mruby-compiler/core/parse.y"
+#line 4083 "mrbgems/mruby-compiler/core/parse.y"
{yyerrok;}
-#line 9995 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9971 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 605:
-#line 4112 "mrbgems/mruby-compiler/core/parse.y"
+#line 4088 "mrbgems/mruby-compiler/core/parse.y"
{
p->lineno += (yyvsp[0].num);
p->column = 0;
}
-#line 10004 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9980 "mrbgems/mruby-compiler/core/y.tab.c"
break;
case 609:
-#line 4124 "mrbgems/mruby-compiler/core/parse.y"
+#line 4100 "mrbgems/mruby-compiler/core/parse.y"
{
(yyval.nd) = 0;
}
-#line 10012 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9988 "mrbgems/mruby-compiler/core/y.tab.c"
break;
-#line 10016 "mrbgems/mruby-compiler/core/y.tab.c"
+#line 9992 "mrbgems/mruby-compiler/core/y.tab.c"
default: break;
}
@@ -10244,7 +10220,7 @@ yyreturn:
#endif
return yyresult;
}
-#line 4128 "mrbgems/mruby-compiler/core/parse.y"
+#line 4104 "mrbgems/mruby-compiler/core/parse.y"
#define pylval (*((YYSTYPE*)(p->ylval)))
@@ -13146,8 +13122,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) {
@@ -13424,9 +13405,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;
@@ -13567,7 +13555,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:
@@ -13893,7 +13891,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:
diff --git a/mrbgems/mruby-enumerator/mrblib/enumerator.rb b/mrbgems/mruby-enumerator/mrblib/enumerator.rb
index 5856eb653..58efceb17 100644
--- a/mrbgems/mruby-enumerator/mrblib/enumerator.rb
+++ b/mrbgems/mruby-enumerator/mrblib/enumerator.rb
@@ -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
diff --git a/mrbgems/mruby-eval/src/eval.c b/mrbgems/mruby-eval/src/eval.c
index c21284bdd..13dd3ea4c 100644
--- a/mrbgems/mruby-eval/src/eval.c
+++ b/mrbgems/mruby-eval/src/eval.c
@@ -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);
diff --git a/mrbgems/mruby-fiber/src/fiber.c b/mrbgems/mruby-fiber/src/fiber.c
index 141dcc2ed..0d85bedad 100644
--- a/mrbgems/mruby-fiber/src/fiber.c
+++ b/mrbgems/mruby-fiber/src/fiber.c
@@ -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 {
diff --git a/mrbgems/mruby-io/mrblib/io.rb b/mrbgems/mruby-io/mrblib/io.rb
index 006578222..9192d7bf2 100644
--- a/mrbgems/mruby-io/mrblib/io.rb
+++ b/mrbgems/mruby-io/mrblib/io.rb
@@ -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
diff --git a/mrbgems/mruby-io/src/io.c b/mrbgems/mruby-io/src/io.c
index 3229d339a..8261cf998 100644
--- a/mrbgems/mruby-io/src/io.c
+++ b/mrbgems/mruby-io/src/io.c
@@ -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);
diff --git a/mrbgems/mruby-method/src/method.c b/mrbgems/mruby-method/src/method.c
index 02131050d..763bc5f7d 100644
--- a/mrbgems/mruby-method/src/method.c
+++ b/mrbgems/mruby-method/src/method.c
@@ -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);
diff --git a/mrbgems/mruby-range-ext/mrblib/range.rb b/mrbgems/mruby-range-ext/mrblib/range.rb
index 7fe502c9d..8b670afee 100644
--- a/mrbgems/mruby-range-ext/mrblib/range.rb
+++ b/mrbgems/mruby-range-ext/mrblib/range.rb
@@ -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
diff --git a/mrbgems/mruby-struct/test/struct.rb b/mrbgems/mruby-struct/test/struct.rb
index 93930730b..db0fa56d8 100644
--- a/mrbgems/mruby-struct/test/struct.rb
+++ b/mrbgems/mruby-struct/test/struct.rb
@@ -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
diff --git a/src/class.c b/src/class.c
index fdf63794b..1403ed48e 100644
--- a/src/class.c
+++ b/src/class.c
@@ -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))
diff --git a/src/codedump.c b/src/codedump.c
index 64f6314cf..6a9fcfb6a 100644
--- a/src/codedump.c
+++ b/src/codedump.c
@@ -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,
diff --git a/src/gc.c b/src/gc.c
index 2a7d7f6e1..8e8941cd7 100644
--- a/src/gc.c
+++ b/src/gc.c
@@ -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;
diff --git a/src/hash.c b/src/hash.c
index 918722a2b..a12e45bd7 100644
--- a/src/hash.c
+++ b/src/hash.c
@@ -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)
{
diff --git a/src/kernel.c b/src/kernel.c
index f8ef1bfe1..ae9709f3c 100644
--- a/src/kernel.c
+++ b/src/kernel.c
@@ -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))
diff --git a/src/proc.c b/src/proc.c
index d48145f13..c79a53399 100644
--- a/src/proc.c
+++ b/src/proc.c
@@ -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;
diff --git a/src/vm.c b/src/vm.c
index 7c69b9c3b..1c59d4406 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -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);
+ }
- 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;
+ 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];
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;
- }
- if (m2) {
- if (argc-m2 > m1) {
- value_move(&regs[m1+o+r+1], &argv[m1+o+rnum], m2);
- }
+ rnum = argc-m1-o-m2;
+ rest = mrb_ary_new_from_values(mrb, rnum, argv+m1+o);
+ regs[m1+o+1] = rest;
}
- 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
diff --git a/test/t/syntax.rb b/test/t/syntax.rb
index 515c8f361..a89432b68 100644
--- a/test/t/syntax.rb
+++ b/test/t/syntax.rb
@@ -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
generated by cgit v1.2.3 (git 2.39.1) at 2026-04-15 01:38:36 +0000