From ac02635ba56e7008419b73741db6ffaa8bea24c9 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Wed, 27 Aug 2025 07:58:08 +0900 Subject: [PATCH] mruby-compiler: add infrastructure for variable-sized ast nodes This commit introduces the core infrastructure for variable-sized AST nodes, designed to improve memory efficiency. The previous fixed-size nodes are replaced by nodes that can store data inline, such as strings and integers, reducing pointer indirection and memory overhead. Key changes include: - A generic variable-sized node header (`mrb_ast_var_header`). - A size-class-based memory allocation system for these nodes. - Implementation of variable-sized nodes for core types: symbols, strings, integers, and variables (lvar, gvar, ivar, cvar). - Integration into the parser and code generator, controlled by a feature flag. - Centralized and improved type-casting macros for AST nodes. Co-authored-by: Claude --- include/mruby/compile.h | 6 + mrbgems/mruby-compiler/core/codegen.c | 242 +- mrbgems/mruby-compiler/core/node.h | 93 + mrbgems/mruby-compiler/core/parse.y | 501 ++-- mrbgems/mruby-compiler/core/y.tab.c | 3493 +++++++++++++------------ 5 files changed, 2449 insertions(+), 1886 deletions(-) diff --git a/include/mruby/compile.h b/include/mruby/compile.h index 70206202e..3246f5af3 100644 --- a/include/mruby/compile.h +++ b/include/mruby/compile.h @@ -33,6 +33,7 @@ typedef struct mrb_ccontext { mrb_bool keep_lv:1; mrb_bool no_optimize:1; mrb_bool no_ext_ops:1; + mrb_bool use_variable_nodes:1; /* Enable variable-sized AST nodes */ const struct RProc *upper; size_t parser_nerr; @@ -133,6 +134,11 @@ struct mrb_parser_state { uint16_t filename_table_length; uint16_t current_filename_index; + /* Variable-sized node management */ + struct mrb_ast_node *var_free_lists[5]; /* Free lists by size class (SIZE_CLASS_COUNT) */ + size_t var_alloc_counts[5]; /* Allocation tracking by size class */ + size_t var_total_allocated; /* Total variable node memory */ + mrb_bool var_nodes_enabled:1; /* Feature flag for gradual rollout */ mrb_ast_node *nvars; }; diff --git a/mrbgems/mruby-compiler/core/codegen.c b/mrbgems/mruby-compiler/core/codegen.c index cbbe729c0..e18298c12 100644 --- a/mrbgems/mruby-compiler/core/codegen.c +++ b/mrbgems/mruby-compiler/core/codegen.c @@ -2198,14 +2198,15 @@ node_len(node *tree) } /* Casts a void* (typically from an AST node part) to an int. */ -#define nint(x) ((int)(intptr_t)(x)) +#define node_to_sym(x) ((mrb_sym)(intptr_t)(x)) +#define node_to_int(x) ((int)(intptr_t)(x)) /* Casts a void* (typically from an AST node part) to a char. */ -#define nchar(x) ((char)(intptr_t)(x)) +#define node_to_char(x) ((char)(intptr_t)(x)) /* Casts a void* (typically from an AST node part) to an mrb_sym. */ -#define nsym(x) ((mrb_sym)(intptr_t)(x)) + /* Extracts the symbol (name) of a local variable from its AST node representation. */ -#define lv_name(lv) nsym((lv)->car) +#define lv_name(lv) node_to_sym((lv)->car) /* * Searches for a local variable `id` within the current scope's local variable list (`s->lv`). @@ -2450,7 +2451,7 @@ lambda_body(codegen_scope *s, node *tree, int blk) i = 0; while (opt) { /* Iterate through optional arguments. */ int idx; - mrb_sym id = nsym(opt->car->car); /* Symbol of the optional argument. */ + mrb_sym id = node_to_sym(opt->car->car); /* Symbol of the optional argument. */ dispatch(s, pos+i*3+1); /* Patch the jump to this argument's default value code. */ codegen(s, opt->car->cdr, VAL); /* Generate code for the default value expression. */ @@ -2477,15 +2478,15 @@ lambda_body(codegen_scope *s, node *tree, int blk) if (tail->cdr->cdr->car) { /* Check if a keyword rest argument exists. */ kwrest = 1; } - mrb_assert(nint(tail->car) == NODE_ARGS_TAIL); + mrb_assert(node_to_int(tail->car) == NODE_ARGS_TAIL); mrb_assert(node_len(tail) == 4); while (kwds) { int jmpif_key_p, jmp_def_set = -1; node *kwd = kwds->car, *def_arg = kwd->cdr->cdr->car; - mrb_sym kwd_sym = nsym(kwd->cdr->car); + mrb_sym kwd_sym = node_to_sym(kwd->cdr->car); - mrb_assert(nint(kwd->car) == NODE_KW_ARG); + mrb_assert(node_to_int(kwd->car) == NODE_KW_ARG); if (def_arg) { int idx; @@ -2516,7 +2517,7 @@ lambda_body(codegen_scope *s, node *tree, int blk) } /* Block argument processing */ if (ba) { /* If a block argument (e.g., &blk) is present. */ - mrb_sym bparam = nsym(tail->cdr->cdr->cdr->car); /* Symbol of the block parameter. */ + mrb_sym bparam = node_to_sym(tail->cdr->cdr->cdr->car); /* Symbol of the block parameter. */ pos = ma+oa+ra+pa+(ka||kd); /* Calculate register offset for the block parameter. */ if (bparam) { /* If it's a named block parameter. */ int idx = lv_idx(s, bparam); @@ -2530,7 +2531,7 @@ lambda_body(codegen_scope *s, node *tree, int blk) node *n = margs; pos = 1; /* Start from register 1 (after self). */ while (n) { - if (nint(n->car->car) == NODE_MASGN) { /* If the argument is a mass assignment (e.g., |(a,b)| ). */ + if (node_to_int(n->car->car) == NODE_MASGN) { /* If the argument is a mass assignment (e.g., |(a,b)| ). */ gen_massignment(s, n->car->cdr->car, pos, NOVAL); } pos++; @@ -2541,7 +2542,7 @@ lambda_body(codegen_scope *s, node *tree, int blk) node *n = pargs; pos = ma+oa+ra+1; /* Calculate starting register for post-mandatory args. */ while (n) { - if (nint(n->car->car) == NODE_MASGN) { /* If argument is a mass assignment. */ + if (node_to_int(n->car->car) == NODE_MASGN) { /* If argument is a mass assignment. */ gen_massignment(s, n->car->cdr->car, pos, NOVAL); } pos++; @@ -2614,7 +2615,7 @@ static mrb_bool nosplat(node *t) { while (t) { - if (nint(t->car->car) == NODE_SPLAT) return FALSE; + if (node_to_int(t->car->car) == NODE_SPLAT) return FALSE; t = t->cdr; } return TRUE; @@ -2668,7 +2669,7 @@ gen_values(codegen_scope *s, node *t, int val, int limit) } while (t) { - int is_splat = nint(t->car->car) == NODE_SPLAT; + int is_splat = node_to_int(t->car->car) == NODE_SPLAT; if (is_splat || cursp() >= slimit) { /* flush stack */ pop_n(n); @@ -2727,7 +2728,7 @@ gen_hash(codegen_scope *s, node *tree, int val, int limit) mrb_bool first = TRUE; while (tree) { - if (nint(tree->car->car->car) == NODE_KW_REST_ARGS) { + if (node_to_int(tree->car->car->car) == NODE_KW_REST_ARGS) { if (val && first) { genop_2(s, OP_HASH, cursp(), 0); push(); @@ -2794,7 +2795,7 @@ gen_hash(codegen_scope *s, node *tree, int val, int limit) static void gen_call(codegen_scope *s, node *tree, int val, int safe) { - mrb_sym sym = nsym(tree->cdr->car); + mrb_sym sym = node_to_sym(tree->cdr->car); int skip = 0, n = 0, nk = 0, noop = no_optimize(s), noself = 0, blk = 0, sp_save = cursp(); enum mrb_insn opt_op = OP_NOP; @@ -2811,7 +2812,7 @@ gen_call(codegen_scope *s, node *tree, int val, int safe) else if (sym == MRB_OPSYM_2(s->mrb, aref)) opt_op = OP_GETIDX; else if (sym == MRB_OPSYM_2(s->mrb, aset)) opt_op = OP_SETIDX; } - if (!tree->car || (opt_op == OP_NOP && nint(tree->car->car) == NODE_SELF)) { + if (!tree->car || (opt_op == OP_NOP && node_to_int(tree->car->car) == NODE_SELF)) { noself = 1; push(); } @@ -2900,7 +2901,7 @@ static void gen_assignment(codegen_scope *s, node *tree, node *rhs, int sp, int val) { int idx; - int type = nint(tree->car); + int type = node_to_int(tree->car); switch (type) { case NODE_GVAR: @@ -2938,11 +2939,11 @@ gen_assignment(codegen_scope *s, node *tree, node *rhs, int sp, int val) tree = tree->cdr; switch (type) { case NODE_GVAR: - gen_setxv(s, OP_SETGV, sp, nsym(tree), val); + gen_setxv(s, OP_SETGV, sp, node_to_sym(tree), val); break; case NODE_ARG: case NODE_LVAR: - idx = lv_idx(s, nsym(tree)); + idx = lv_idx(s, node_to_sym(tree)); if (idx > 0) { if (idx != sp) { gen_move(s, idx, sp, val); @@ -2950,17 +2951,17 @@ gen_assignment(codegen_scope *s, node *tree, node *rhs, int sp, int val) break; } else { /* upvar */ - gen_setupvar(s, sp, nsym(tree)); + gen_setupvar(s, sp, node_to_sym(tree)); } break; case NODE_IVAR: - gen_setxv(s, OP_SETIV, sp, nsym(tree), val); + gen_setxv(s, OP_SETIV, sp, node_to_sym(tree), val); break; case NODE_CVAR: - gen_setxv(s, OP_SETCV, sp, nsym(tree), val); + gen_setxv(s, OP_SETCV, sp, node_to_sym(tree), val); break; case NODE_CONST: - gen_setxv(s, OP_SETCONST, sp, nsym(tree), val); + gen_setxv(s, OP_SETCONST, sp, node_to_sym(tree), val); break; case NODE_COLON2: case NODE_COLON3: @@ -2971,12 +2972,12 @@ gen_assignment(codegen_scope *s, node *tree, node *rhs, int sp, int val) push(); if (type == NODE_COLON2) { codegen(s, tree->car, VAL); - idx = new_sym(s, nsym(tree->cdr)); + idx = new_sym(s, node_to_sym(tree->cdr)); } else { /* NODE_COLON3 */ genop_1(s, OP_OCLASS, cursp()); push(); - idx = new_sym(s, nsym(tree)); + idx = new_sym(s, node_to_sym(tree)); } if (rhs) { codegen(s, rhs, VAL); pop(); @@ -2990,7 +2991,7 @@ gen_assignment(codegen_scope *s, node *tree, node *rhs, int sp, int val) case NODE_SCALL: { int noself = 0, safe = (type == NODE_SCALL), skip = 0, top, call, n = 0; - mrb_sym mid = nsym(tree->cdr->car); + mrb_sym mid = node_to_sym(tree->cdr->car); top = cursp(); if (val || sp == cursp()) { @@ -3168,9 +3169,9 @@ gen_literal_array(codegen_scope *s, node *tree, mrb_bool sym, int val) int i = 0, j = 0, gen = 0; while (tree) { - switch (nint(tree->car->car)) { + switch (node_to_int(tree->car->car)) { case NODE_STR: - if ((tree->cdr == NULL) && (nint(tree->car->cdr->cdr) == 0)) + if ((tree->cdr == NULL) && (node_to_int(tree->car->cdr->cdr) == 0)) break; /* fall through */ case NODE_STMTS: @@ -3226,7 +3227,7 @@ gen_literal_array(codegen_scope *s, node *tree, mrb_bool sym, int val) } else { while (tree) { - switch (nint(tree->car->car)) { + switch (node_to_int(tree->car->car)) { case NODE_STMTS: case NODE_BEGIN: case NODE_BLOCK: codegen(s, tree->car, NOVAL); } @@ -3292,7 +3293,7 @@ readint(codegen_scope *s, const char *p, int base, mrb_bool neg, mrb_bool *overf static void gen_retval(codegen_scope *s, node *tree) { - if (nint(tree->car) == NODE_SPLAT) { + if (node_to_int(tree->car) == NODE_SPLAT) { codegen(s, tree, VAL); pop(); genop_1(s, OP_ARYSPLAT, cursp()); @@ -3306,7 +3307,7 @@ gen_retval(codegen_scope *s, node *tree) static mrb_bool true_always(node *tree) { - switch (nint(tree->car)) { + switch (node_to_int(tree->car)) { case NODE_TRUE: case NODE_INT: case NODE_STR: @@ -3320,7 +3321,7 @@ true_always(node *tree) static mrb_bool false_always(node *tree) { - switch (nint(tree->car)) { + switch (node_to_int(tree->car)) { case NODE_FALSE: case NODE_NIL: return TRUE; @@ -3349,14 +3350,14 @@ gen_blkmove(codegen_scope *s, uint16_t ainfo, int lv) static void codegen_op_asgn(codegen_scope *s, node *tree, int val) { - mrb_sym sym = nsym(tree->cdr->car); + mrb_sym sym = node_to_sym(tree->cdr->car); mrb_int len; const char *name = mrb_sym_name_len(s->mrb, sym, &len); int idx, callargs = -1, vsp = -1; if ((len == 2 && name[0] == '|' && name[1] == '|') && - (nint(tree->car->car) == NODE_CONST || - nint(tree->car->car) == NODE_CVAR)) { + (node_to_int(tree->car->car) == NODE_CONST || + node_to_int(tree->car->car) == NODE_CVAR)) { int catch_entry, begin, end; int noexc, exc; struct loopinfo *lp; @@ -3376,7 +3377,7 @@ codegen_op_asgn(codegen_scope *s, node *tree, int val) dispatch(s, noexc); loop_pop(s, NOVAL); } - else if (nint(tree->car->car) == NODE_CALL) { + else if (node_to_int(tree->car->car) == NODE_CALL) { node *n = tree->car->cdr; int base, i, nargs = 0; callargs = 0; @@ -3386,7 +3387,7 @@ codegen_op_asgn(codegen_scope *s, node *tree, int val) push(); } codegen(s, n->car, VAL); /* receiver */ - idx = new_sym(s, nsym(n->cdr->car)); + idx = new_sym(s, node_to_sym(n->cdr->car)); base = cursp()-1; if (n->cdr->cdr->car) { nargs = gen_values(s, n->cdr->cdr->car->car, VAL, 13); @@ -3431,7 +3432,7 @@ codegen_op_asgn(codegen_scope *s, node *tree, int val) if (val && vsp >= 0) { gen_move(s, vsp, cursp(), 1); } - if (nint(tree->car->car) == NODE_CALL) { + if (node_to_int(tree->car->car) == NODE_CALL) { if (callargs == CALL_MAXARGS) { pop(); genop_2(s, OP_ARYPUSH, cursp(), 1); @@ -3441,7 +3442,7 @@ codegen_op_asgn(codegen_scope *s, node *tree, int val) callargs++; } pop(); - idx = new_sym(s, attrsym(s, nsym(tree->car->cdr->cdr->car))); + idx = new_sym(s, attrsym(s, node_to_sym(tree->car->cdr->cdr->car))); genop_3(s, OP_SEND, cursp(), idx, callargs); } else { @@ -3498,7 +3499,7 @@ codegen_op_asgn(codegen_scope *s, node *tree, int val) callargs++; } pop(); - idx = new_sym(s, attrsym(s,nsym(tree->car->cdr->cdr->car))); + idx = new_sym(s, attrsym(s,node_to_sym(tree->car->cdr->cdr->car))); genop_3(s, OP_SEND, cursp(), idx, callargs); } } @@ -3510,7 +3511,7 @@ codegen_masgn(codegen_scope *s, node *tree, int val) node *t = tree->cdr, *p; int rhs = cursp(); - if (!val && nint(t->car) == NODE_ARRAY && t->cdr && nosplat(t->cdr)) { + if (!val && node_to_int(t->car) == NODE_ARRAY && t->cdr && nosplat(t->cdr)) { /* fixed rhs */ t = t->cdr; while (t) { @@ -3642,7 +3643,7 @@ codegen_rescue(codegen_scope *s, node *tree, int val) dispatch(s, pos1); pos2 = JMPLINK_START; do { - if (n4 && n4->car && nint(n4->car->car) == NODE_SPLAT) { + if (n4 && n4->car && node_to_int(n4->car->car) == NODE_SPLAT) { codegen(s, n4->car, VAL); gen_move(s, cursp(), exc, 0); push_n(2); pop_n(2); /* space for one arg and a block */ @@ -3704,7 +3705,7 @@ static void codegen_ensure(codegen_scope *s, node *tree, int val) { if (!tree->cdr || !tree->cdr->cdr || - (nint(tree->cdr->cdr->car) == NODE_STMTS && + (node_to_int(tree->cdr->cdr->car) == NODE_STMTS && tree->cdr->cdr->cdr)) { int catch_entry, begin, end, target; int idx; @@ -3767,9 +3768,9 @@ codegen_if(codegen_scope *s, node *tree, int val) codegen(s, elsepart, val); return; } - if (nint(tree->car->car) == NODE_CALL) { + if (node_to_int(tree->car->car) == NODE_CALL) { node *n = tree->car->cdr; - mrb_sym mid = nsym(n->cdr->car); + mrb_sym mid = node_to_sym(n->cdr->car); mrb_sym sym_nil_p = MRB_SYM_Q_2(s->mrb, nil); if (mid == sym_nil_p && n->cdr->cdr->car == NULL) { nil_p = TRUE; @@ -3883,16 +3884,16 @@ codegen_false(codegen_scope *s, node *tree, int val) } static void -codegen_lvar(codegen_scope *s, node *tree, int val) +codegen_lvar(codegen_scope *s, mrb_sym sym, int val) { if (!val) return; - int idx = lv_idx(s, nsym(tree)); + int idx = lv_idx(s, sym); if (idx > 0) { gen_move(s, cursp(), idx, val); } else { - gen_getupvar(s, cursp(), nsym(tree)); + gen_getupvar(s, cursp(), sym); } push(); } @@ -3901,56 +3902,56 @@ static void codegen_nvar(codegen_scope *s, node *tree, int val) { if (!val) return; - int idx = nint(tree); + int idx = node_to_int(tree); gen_move(s, cursp(), idx, val); push(); } static void -codegen_gvar(codegen_scope *s, node *tree, int val) +codegen_gvar(codegen_scope *s, mrb_sym sym, int val) { if (!val) return; - int sym = new_sym(s, nsym(tree)); + int i = new_sym(s, sym); - genop_2(s, OP_GETGV, cursp(), sym); + genop_2(s, OP_GETGV, cursp(), i); push(); } static void -codegen_ivar(codegen_scope *s, node *tree, int val) +codegen_ivar(codegen_scope *s, mrb_sym sym, int val) { if (!val) return; - int sym = new_sym(s, nsym(tree)); + int i = new_sym(s, sym); - genop_2(s, OP_GETIV, cursp(), sym); + genop_2(s, OP_GETIV, cursp(), i); push(); } static void -codegen_cvar(codegen_scope *s, node *tree, int val) +codegen_cvar(codegen_scope *s, mrb_sym sym, int val) { if (!val) return; - int sym = new_sym(s, nsym(tree)); + int i = new_sym(s, sym); - genop_2(s, OP_GETCV, cursp(), sym); + genop_2(s, OP_GETCV, cursp(), i); push(); } static void -codegen_const(codegen_scope *s, node *tree, int val) +codegen_const(codegen_scope *s, mrb_sym sym, int val) { - int sym = new_sym(s, nsym(tree)); + int i = new_sym(s, sym); - genop_2(s, OP_GETCONST, cursp(), sym); + genop_2(s, OP_GETCONST, cursp(), i); if (val) push(); } static void -codegen_sym(codegen_scope *s, node *tree, int val) +codegen_sym(codegen_scope *s, mrb_sym sym, int val) { - int sym = new_sym(s, nsym(tree)); - gen_load_op2(s, OP_LOADSYM, sym, val); + int i = new_sym(s, sym); + gen_load_op2(s, OP_LOADSYM, i, val); } static void @@ -4053,7 +4054,7 @@ codegen_case(codegen_scope *s, node *tree, int val) if (head) { gen_move(s, cursp(), head, 0); push(); push(); pop(); pop(); pop(); - if (nint(n->car->car) == NODE_SPLAT) { + if (node_to_int(n->car->car) == NODE_SPLAT) { genop_3(s, OP_SEND, cursp(), new_sym(s, MRB_SYM_2(s->mrb, __case_eqq)), 1); } else { @@ -4174,7 +4175,7 @@ codegen_while_until(codegen_scope *s, node *tree, int val, int nt) static void codegen_negate(codegen_scope *s, node *tree, int val) { - int nt = nint(tree->car); + int nt = node_to_int(tree->car); switch (nt) { #ifndef MRB_NO_FLOAT case NODE_FLOAT: @@ -4192,7 +4193,7 @@ codegen_negate(codegen_scope *s, node *tree, int val) case NODE_INT: if (val) { char *p = (char*)tree->cdr->car; - int base = nint(tree->cdr->cdr->car); + int base = node_to_int(tree->cdr->cdr->car); mrb_int i; mrb_bool overflow; @@ -4238,7 +4239,7 @@ codegen_int(codegen_scope *s, node *tree, int val) { if (!val) return; char *p = (char*)tree->car; - int base = nint(tree->cdr->car); + int base = node_to_int(tree->cdr->car); mrb_int i; mrb_bool overflow; @@ -4257,7 +4258,7 @@ static void codegen_xstr(codegen_scope *s, node *tree, int val) { char *p = (char*)tree->car; - mrb_int len = nint(tree->cdr); + mrb_int len = node_to_int(tree->cdr); int off = new_lit_str(s, p, len); int sym; @@ -4286,7 +4287,7 @@ codegen_dxstr(codegen_scope *s, node *tree, int val) codegen(s, tree->car, VAL); n = tree->cdr; while (n) { - if (nint(n->car->car) == NODE_XSTR) { + if (node_to_int(n->car->car) == NODE_XSTR) { n->car->car = (struct mrb_ast_node*)(intptr_t)NODE_STR; mrb_assert(!n->cdr); /* must be the end */ } @@ -4333,7 +4334,7 @@ codegen_heredoc_dstr(codegen_scope *s, node *tree, int val) node *n = tree; while (n) { - if (nint(n->car->car) != NODE_STR) { + if (node_to_int(n->car->car) != NODE_STR) { codegen(s, n->car, NOVAL); } n = n->cdr; @@ -4346,7 +4347,7 @@ codegen_str(codegen_scope *s, node *tree, int val) { if (val) { char *p = (char*)tree->car; - mrb_int len = nint(tree->cdr); + mrb_int len = node_to_int(tree->cdr); int off = new_lit_str(s, p, len); genop_2(s, OP_STRING, cursp(), off); @@ -4410,7 +4411,7 @@ codegen_dregx(codegen_scope *s, node *tree, int val) node *n = tree->car; while (n) { - if (nint(n->car->car) != NODE_STR) { + if (node_to_int(n->car->car) != NODE_STR) { codegen(s, n->car, NOVAL); } n = n->cdr; @@ -4468,7 +4469,7 @@ codegen_asgn(codegen_scope *s, node *tree, int val) static void codegen_def(codegen_scope *s, node *tree, int val) { - int sym = new_sym(s, nsym(tree->car)); + int sym = new_sym(s, node_to_sym(tree->car)); int idx = lambda_body(s, tree->cdr, 0); genop_1(s, OP_TCLASS, cursp()); @@ -4484,7 +4485,7 @@ static void codegen_sdef(codegen_scope *s, node *tree, int val) { node *recv = tree->car; - int sym = new_sym(s, nsym(tree->cdr->car)); + int sym = new_sym(s, node_to_sym(tree->cdr->car)); int idx = lambda_body(s, tree->cdr->cdr, 0); codegen(s, recv, VAL); @@ -4528,10 +4529,10 @@ codegen_class(codegen_scope *s, node *tree, int val) push(); } pop(); pop(); - idx = new_sym(s, nsym(tree->car->cdr)); + idx = new_sym(s, node_to_sym(tree->car->cdr)); genop_2(s, OP_CLASS, cursp(), idx); body = tree->cdr->cdr->car; - if (nint(body->cdr->car) == NODE_STMTS && body->cdr->cdr == NULL) { + if (node_to_int(body->cdr->car) == NODE_STMTS && body->cdr->cdr == NULL) { genop_1(s, OP_LOADNIL, cursp()); } else { @@ -4560,9 +4561,9 @@ codegen_module(codegen_scope *s, node *tree, int val) codegen(s, tree->car->car, VAL); } pop(); - idx = new_sym(s, nsym(tree->car->cdr)); + idx = new_sym(s, node_to_sym(tree->car->cdr)); genop_2(s, OP_MODULE, cursp(), idx); - if (nint(tree->cdr->car->cdr->car) == NODE_STMTS && + if (node_to_int(tree->cdr->car->cdr->car) == NODE_STMTS && tree->cdr->car->cdr->cdr == NULL) { genop_1(s, OP_LOADNIL, cursp()); } @@ -4583,7 +4584,7 @@ codegen_sclass(codegen_scope *s, node *tree, int val) codegen(s, tree->car, VAL); pop(); genop_1(s, OP_SCLASS, cursp()); - if (nint(tree->cdr->car->cdr->car) == NODE_STMTS && + if (node_to_int(tree->cdr->car->cdr->car) == NODE_STMTS && tree->cdr->car->cdr->cdr == NULL) { genop_1(s, OP_LOADNIL, cursp()); } @@ -4599,8 +4600,8 @@ codegen_sclass(codegen_scope *s, node *tree, int val) static void codegen_alias(codegen_scope *s, node *tree, int val) { - int a = new_sym(s, nsym(tree->car)); - int b = new_sym(s, nsym(tree->cdr)); + int a = new_sym(s, node_to_sym(tree->car)); + int b = new_sym(s, node_to_sym(tree->cdr)); genop_2(s, OP_ALIAS, a, b); gen_load_nil(s, val); @@ -4612,7 +4613,7 @@ codegen_undef(codegen_scope *s, node *tree, int val) node *t = tree; while (t) { - int symbol = new_sym(s, nsym(t->car)); + int symbol = new_sym(s, node_to_sym(t->car)); genop_1(s, OP_UNDEF, symbol); t = t->cdr; } @@ -4673,7 +4674,7 @@ codegen_next(codegen_scope *s, node *tree, int val) static void codegen_colon2(codegen_scope *s, node *tree, int val) { - int sym = new_sym(s, nsym(tree->cdr)); + int sym = new_sym(s, node_to_sym(tree->cdr)); codegen(s, tree->car, VAL); pop(); @@ -4684,7 +4685,7 @@ codegen_colon2(codegen_scope *s, node *tree, int val) static void codegen_colon3(codegen_scope *s, node *tree, int val) { - int sym = new_sym(s, nsym(tree)); + int sym = new_sym(s, node_to_sym(tree)); genop_1(s, OP_OCLASS, cursp()); genop_2(s, OP_GETMCNST, cursp(), sym); @@ -4729,7 +4730,7 @@ codegen_retry(codegen_scope *s, node *tree, int val) static void codegen_back_ref(codegen_scope *s, node *tree, int val) { - char buf[] = {'$', nchar(tree)}; + char buf[] = {'$', node_to_char(tree)}; int sym = new_sym(s, mrb_intern(s->mrb, buf, sizeof(buf))); gen_load_op2(s, OP_GETGV, sym, val); } @@ -4741,7 +4742,7 @@ codegen_nth_ref(codegen_scope *s, node *tree, int val) mrb_value str; int sym; - str = mrb_format(mrb, "$%d", nint(tree)); + str = mrb_format(mrb, "$%d", node_to_int(tree)); sym = new_sym(s, mrb_intern_str(mrb, str)); gen_load_op2(s, OP_GETGV, sym, val); } @@ -4918,6 +4919,53 @@ codegen_yield(codegen_scope *s, node *tree, int val) } +/* Handle variable-sized node types */ +static mrb_bool +codegen_variable_node(codegen_scope *s, node *varnode, int val) +{ + enum node_type nt = VAR_NODE_TYPE(varnode); + + switch (nt) { + case NODE_INT: + if (val) { + gen_int(s, cursp(), INT_NODE_VALUE(varnode)); + push(); + } + return TRUE; + + case NODE_STR: + if (val) { + int off = new_lit_str(s, STR_NODE_PTR(varnode), STR_NODE_LEN(varnode)); + genop_2(s, OP_STRING, cursp(), off); + push(); + } + return TRUE; + + case NODE_SYM: + codegen_sym(s, SYM_NODE_VALUE(varnode), val); + return TRUE; + + case NODE_LVAR: + codegen_lvar(s, VAR_NODE_SYMBOL(varnode), val); + return TRUE; + + case NODE_GVAR: + codegen_gvar(s, VAR_NODE_SYMBOL(varnode), val); + return TRUE; + + case NODE_IVAR: + codegen_ivar(s, VAR_NODE_SYMBOL(varnode), val); + return TRUE; + + case NODE_CVAR: + codegen_cvar(s, VAR_NODE_SYMBOL(varnode), val); + return TRUE; + + default: + return FALSE; /* Not handled, fall through to main codegen */ + } +} + static void codegen(codegen_scope *s, node *tree, int val) { @@ -4934,6 +4982,9 @@ codegen(codegen_scope *s, node *tree, int val) } head = (struct mrb_ast_head_node*)tree; + nt = node_to_int(tree->car); + + s->rlev++; if (s->rlev > MRB_CODEGEN_LEVEL_MAX) { codegen_error(s, "too complex expression"); @@ -4951,7 +5002,6 @@ codegen(codegen_scope *s, node *tree, int val) s->filename_sym = mrb_parser_get_filename(s->parser, head->filename_index); } - nt = nint(tree->car); s->lineno = head->lineno; tree = tree->cdr; switch (nt) { @@ -5092,7 +5142,7 @@ codegen(codegen_scope *s, node *tree, int val) break; case NODE_LVAR: - codegen_lvar(s, tree, val); + codegen_lvar(s, node_to_sym(tree), val); break; case NODE_NVAR: @@ -5100,19 +5150,19 @@ codegen(codegen_scope *s, node *tree, int val) break; case NODE_GVAR: - codegen_gvar(s, tree, val); + codegen_gvar(s, node_to_sym(tree), val); break; case NODE_IVAR: - codegen_ivar(s, tree, val); + codegen_ivar(s, node_to_sym(tree), val); break; case NODE_CVAR: - codegen_cvar(s, tree, val); + codegen_cvar(s, node_to_sym(tree), val); break; case NODE_CONST: - codegen_const(s, tree, val); + codegen_const(s, node_to_sym(tree), val); break; case NODE_BACK_REF: @@ -5182,7 +5232,7 @@ codegen(codegen_scope *s, node *tree, int val) break; case NODE_SYM: - codegen_sym(s, tree, val); + codegen_sym(s, node_to_sym(tree), val); break; case NODE_DSYM: @@ -5237,6 +5287,10 @@ codegen(codegen_scope *s, node *tree, int val) codegen_postexe(s, tree, val); break; + case NODE_VARIABLE: + codegen_variable_node(s, tree, val); + break; + default: break; } diff --git a/mrbgems/mruby-compiler/core/node.h b/mrbgems/mruby-compiler/core/node.h index 8deb3137c..be1f86c74 100644 --- a/mrbgems/mruby-compiler/core/node.h +++ b/mrbgems/mruby-compiler/core/node.h @@ -100,6 +100,7 @@ enum node_type { NODE_LITERAL_DELIM, NODE_WORDS, NODE_SYMBOLS, + NODE_VARIABLE, NODE_LAST }; @@ -153,4 +154,96 @@ struct mrb_ast_head_node { uint16_t lineno, filename_index; }; +/* Variable-sized AST nodes - Phase 1 Infrastructure */ + +/* Variable node header - common to all variable-sized nodes */ +struct mrb_ast_var_header { + uint16_t lineno; /* Line number information */ + uint16_t filename_index; /* File index information */ + uint8_t node_type; /* NODE_INT, NODE_STR, NODE_SYM, etc. */ + uint8_t size_class; /* Size class for allocation/deallocation */ + uint16_t flags; /* Type-specific flags and metadata */ + /* Total: 8 bytes header for all variable nodes */ +}; + +/* Size class enumeration */ +enum mrb_ast_size_class { + SIZE_CLASS_TINY = 0, /* 8-16 bytes - symbols, small values */ + SIZE_CLASS_SMALL = 1, /* 16-32 bytes - most nodes */ + SIZE_CLASS_MEDIUM = 2, /* 32-64 bytes - complex expressions */ + SIZE_CLASS_LARGE = 3, /* 64-128 bytes - large arrays/calls */ + SIZE_CLASS_XLARGE = 4, /* 128+ bytes - very large constructs */ + SIZE_CLASS_COUNT = 5 +}; + +/* Size class limits for allocation decisions */ +#define SIZE_CLASS_LIMITS { 16, 32, 64, 128, 256 } + +/* Node type flags */ +#define VAR_NODE_FLAG_INLINE_DATA 0x0001 /* Data stored inline */ +#define VAR_NODE_FLAG_HEAP_ALLOCATED 0x0002 /* Large data on heap */ +#define VAR_NODE_FLAG_CACHED 0x0004 /* Node is cached/reusable */ + +/* Phase 1 Variable Node Structures */ + +/* Variable-sized symbol node */ +struct mrb_ast_sym_node { + struct mrb_ast_var_header header; /* 8 bytes */ + mrb_sym symbol; /* Direct symbol reference */ + /* Total: 12-16 bytes vs previous 20+ bytes + indirection */ +}; + +/* Variable-sized string node with inline storage */ +struct mrb_ast_str_node { + struct mrb_ast_var_header header; /* 8 bytes */ + size_t len; /* String length */ + char data[]; /* Flexible array - inline string storage */ + /* Total: Variable (16 + string_length) vs previous 20+ bytes + separate allocation */ +}; + +/* Variable-sized integer node */ +struct mrb_ast_int_node { + struct mrb_ast_var_header header; /* 8 bytes */ + int32_t value; /* Direct 32-bit integer storage */ +}; + +/* Variable-sized node for variables (lvar, ivar, etc.) */ +struct mrb_ast_var_node { + struct mrb_ast_var_header header; + mrb_sym symbol; +}; + +/* String storage strategy thresholds */ +#define STR_INLINE_THRESHOLD 48 /* Inline strings <= 48 bytes */ +#define STR_SMALL_THRESHOLD 128 /* Small strings <= 128 bytes */ + +#define VAR_NODE_TYPE(n) ((enum node_type)(((struct mrb_ast_var_header*)(n))->node_type)) +#define VAR_NODE_CLASS(n) (((struct mrb_ast_var_header*)(n))->size_class) + +/* Type-safe casting macros */ +#define var_header(n) ((struct mrb_ast_var_header*)(n)) + +/* Common type casting macros used by parser and codegen */ +#define node_to_sym(x) ((mrb_sym)(intptr_t)(x)) +#define sym_to_node(x) ((node*)(intptr_t)(x)) +#define int_to_node(x) ((node*)(intptr_t)(x)) +#define head(x) ((struct mrb_ast_head_node*)(x)) +#define node_to_int(x) ((int)(intptr_t)(x)) +#define node_to_type(x) ((enum node_type)(intptr_t)(x)) +#define node_to_char(x) ((char)(intptr_t)(x)) + +/* Phase 1 node casting macros */ +#define sym_node(n) ((struct mrb_ast_sym_node*)(n)) +#define str_node(n) ((struct mrb_ast_str_node*)(n)) +#define int_node(n) ((struct mrb_ast_int_node*)(n)) +#define var_node(n) ((struct mrb_ast_var_node*)(n)) + +/* Phase 1 value access macros */ +#define SYM_NODE_VALUE(n) (sym_node(n)->symbol) +#define STR_NODE_PTR(n) (str_node(n)->data) +#define STR_NODE_LEN(n) (str_node(n)->len) +#define STR_NODE_INLINE_P(n) (var_header(n)->flags & VAR_NODE_FLAG_INLINE_DATA) +#define INT_NODE_VALUE(n) (int_node(n)->value) +#define VAR_NODE_SYMBOL(n) (var_node(n)->symbol) + #endif /* MRUBY_COMPILER_NODE_H */ diff --git a/mrbgems/mruby-compiler/core/parse.y b/mrbgems/mruby-compiler/core/parse.y index b08479a35..34aeda007 100644 --- a/mrbgems/mruby-compiler/core/parse.y +++ b/mrbgems/mruby-compiler/core/parse.y @@ -62,14 +62,7 @@ typedef unsigned int stack_type; #define CMDARG_LEXPOP() BITSTACK_LEXPOP(p->cmdarg_stack) #define CMDARG_P() BITSTACK_SET_P(p->cmdarg_stack) -#define SET_LINENO(c,n) (headn(c)->lineno = (n)) - -#define sym(x) ((mrb_sym)(intptr_t)(x)) -#define nsym(x) ((node*)(intptr_t)(x)) -#define nint(x) ((node*)(intptr_t)(x)) -#define headn(x) ((struct mrb_ast_head_node*)(x)) -#define intn(x) ((int)(intptr_t)(x)) -#define typen(x) ((enum node_type)(intptr_t)(x)) +#define SET_LINENO(c,n) (head(c)->lineno = (n)) #define NUM_SUFFIX_R (1<<0) #define NUM_SUFFIX_I (1<<1) @@ -161,6 +154,76 @@ cons_head_gen(parser_state *p, node *car, node *cdr) #define cons(a,b) cons_gen(p,(a),(b)) /* Structure nodes - no location */ #define cons_head(a,b) cons_head_gen(p,(a),(b)) /* Head nodes - with location */ +/* Variable-sized node infrastructure - Phase 1 */ + +/* Calculate size class for given byte size */ +static inline enum mrb_ast_size_class +size_to_class(size_t size) +{ + static const size_t limits[] = SIZE_CLASS_LIMITS; + for (int i = 0; i < SIZE_CLASS_COUNT; i++) { + if (size <= limits[i]) return (enum mrb_ast_size_class)i; + } + return SIZE_CLASS_XLARGE; +} + +/* Get maximum size for a size class */ +static inline size_t +size_class_limit(enum mrb_ast_size_class class) +{ + static const size_t limits[] = SIZE_CLASS_LIMITS; + return (class < SIZE_CLASS_COUNT) ? limits[class] : 512; +} + +/* Allocate variable-sized node with size class management */ +static void* +parser_alloc_var(parser_state *p, size_t size, enum mrb_ast_size_class class) +{ + /* Try to reuse from appropriate size class free list */ + if (p->var_free_lists[class] && size <= size_class_limit(class)) { + struct mrb_ast_node *ptr = p->var_free_lists[class]; + p->var_free_lists[class] = ptr->cdr; + p->var_alloc_counts[class]++; + return ptr; + } + + /* Allocate new memory */ + void *ptr = parser_palloc(p, size); + p->var_total_allocated += size; + p->var_alloc_counts[class]++; + return ptr; +} + +/* Free variable-sized node to appropriate size class list */ +/* +static void +parser_free_var(parser_state *p, void *ptr, enum mrb_ast_size_class class) +{ + if (!ptr) return; + + struct mrb_ast_node *node = (struct mrb_ast_node*)ptr; + node->cdr = p->var_free_lists[class]; + p->var_free_lists[class] = node; +} +*/ + +/* Initialize variable node header */ +static void +init_var_header(struct mrb_ast_var_header *header, parser_state *p, + enum node_type type, enum mrb_ast_size_class class) +{ + header->lineno = p->lineno; + header->filename_index = p->current_filename_index; + header->node_type = (uint8_t)type; + header->size_class = (uint8_t)class; + header->flags = 0; + + /* Handle file boundary edge case */ + if (p->lineno == 0 && p->current_filename_index > 0) { + header->filename_index--; + } +} + static node* list1_gen(parser_state *p, node *a) { @@ -299,7 +362,7 @@ local_var_p(parser_state *p, mrb_sym sym) while (l) { node *n = l->car; while (n) { - if (sym(n->car) == sym) return TRUE; + if (node_to_sym(n->car) == sym) return TRUE; n = n->cdr; } l = l->cdr; @@ -328,7 +391,7 @@ local_add_f(parser_state *p, mrb_sym sym) if (p->locals) { node *n = p->locals->car; while (n) { - if (sym(n->car) == sym) { + if (node_to_sym(n->car) == sym) { mrb_int len; const char* name = mrb_sym_name_len(p->mrb, sym, &len); if (len > 0 && name[0] != '_') { @@ -338,7 +401,7 @@ local_add_f(parser_state *p, mrb_sym sym) } n = n->cdr; } - p->locals->car = push(p->locals->car, nsym(sym)); + p->locals->car = push(p->locals->car, sym_to_node(sym)); } } @@ -369,13 +432,13 @@ locals_node(parser_state *p) static void nvars_nest(parser_state *p) { - p->nvars = cons(nint(0), p->nvars); + p->nvars = cons(int_to_node(0), p->nvars); } static void nvars_block(parser_state *p) { - p->nvars = cons(nint(-2), p->nvars); + p->nvars = cons(int_to_node(-2), p->nvars); } static void @@ -397,7 +460,7 @@ new_stmts(parser_state *p, node *body) { if (body) { /* If body is already a NODE_STMTS, just return it directly */ - if (typen(body->car) == NODE_STMTS) { + if (node_to_type(body->car) == NODE_STMTS) { return body; } return list2((node*)NODE_STMTS, body); @@ -459,7 +522,7 @@ new_false(parser_state *p) static node* new_alias(parser_state *p, mrb_sym a, mrb_sym b) { - return cons_head((node*)NODE_ALIAS, cons(nsym(a), nsym(b))); + return cons_head((node*)NODE_ALIAS, cons(sym_to_node(a), sym_to_node(b))); } /* (:if cond then else) */ @@ -551,7 +614,7 @@ new_self(parser_state *p) static node* new_call(parser_state *p, node *a, mrb_sym b, node *c, int pass) { - node *n = list4(nint(pass?NODE_CALL:NODE_SCALL), a, nsym(b), c); + node *n = list4(int_to_node(pass?NODE_CALL:NODE_SCALL), a, sym_to_node(b), c); void_expr_error(p, a); return n; } @@ -560,7 +623,7 @@ new_call(parser_state *p, node *a, mrb_sym b, node *c, int pass) static node* new_fcall(parser_state *p, mrb_sym b, node *c) { - node *n = list4((node*)NODE_FCALL, 0, nsym(b), c); + node *n = list4((node*)NODE_FCALL, 0, sym_to_node(b), c); return n; } @@ -650,14 +713,14 @@ static node* new_colon2(parser_state *p, node *b, mrb_sym c) { void_expr_error(p, b); - return cons_head((node*)NODE_COLON2, cons(b, nsym(c))); + return cons_head((node*)NODE_COLON2, cons(b, sym_to_node(c))); } /* (:colon3 . c) */ static node* new_colon3(parser_state *p, mrb_sym c) { - return cons_head((node*)NODE_COLON3, nsym(c)); + return cons_head((node*)NODE_COLON3, sym_to_node(c)); } /* (:and a b) */ @@ -706,10 +769,52 @@ new_kw_hash(parser_state *p, node *a) } /* (:sym . a) */ +/* Original symbol node creation (legacy) */ +static node* +new_sym_original(parser_state *p, mrb_sym sym) +{ + return cons_head((node*)NODE_SYM, sym_to_node(sym)); +} + +/* Create variable-sized symbol node */ +static node* +new_sym_var(parser_state *p, mrb_sym sym) +{ + size_t size = sizeof(struct mrb_ast_sym_node); + enum mrb_ast_size_class class = size_to_class(size); + + struct mrb_ast_sym_node *n = (struct mrb_ast_sym_node*) + parser_alloc_var(p, size, class); + + init_var_header(&n->header, p, NODE_SYM, class); + n->symbol = sym; + + return cons_head((node*)NODE_VARIABLE, (node*)n); +} + +/* Symbol node creation - supports both variable and legacy modes */ static node* new_sym(parser_state *p, mrb_sym sym) { - return cons_head((node*)NODE_SYM, nsym(sym)); + if (p->var_nodes_enabled) { + return new_sym_var(p, sym); + } + return new_sym_original(p, sym); +} + +static node* +new_var_var(parser_state *p, mrb_sym sym, enum node_type type) +{ + size_t size = sizeof(struct mrb_ast_var_node); + enum mrb_ast_size_class class = size_to_class(size); + + struct mrb_ast_var_node *n = (struct mrb_ast_var_node*) + parser_alloc_var(p, size, class); + + init_var_header(&n->header, p, type, class); + n->symbol = sym; + + return cons_head((node*)NODE_VARIABLE, (node*)n); } static mrb_sym @@ -725,28 +830,40 @@ new_strsym(parser_state *p, node* str) static node* new_lvar(parser_state *p, mrb_sym sym) { - return cons_head((node*)NODE_LVAR, nsym(sym)); + if (p->var_nodes_enabled) { + return new_var_var(p, sym, NODE_LVAR); + } + return cons_head((node*)NODE_LVAR, sym_to_node(sym)); } /* (:gvar . a) */ static node* new_gvar(parser_state *p, mrb_sym sym) { - return cons_head((node*)NODE_GVAR, nsym(sym)); + if (p->var_nodes_enabled) { + return new_var_var(p, sym, NODE_GVAR); + } + return cons_head((node*)NODE_GVAR, sym_to_node(sym)); } /* (:ivar . a) */ static node* new_ivar(parser_state *p, mrb_sym sym) { - return cons_head((node*)NODE_IVAR, nsym(sym)); + if (p->var_nodes_enabled) { + return new_var_var(p, sym, NODE_IVAR); + } + return cons_head((node*)NODE_IVAR, sym_to_node(sym)); } /* (:cvar . a) */ static node* new_cvar(parser_state *p, mrb_sym sym) { - return cons_head((node*)NODE_CVAR, nsym(sym)); + if (p->var_nodes_enabled) { + return new_var_var(p, sym, NODE_CVAR); + } + return cons_head((node*)NODE_CVAR, sym_to_node(sym)); } /* (:nvar . a) */ @@ -756,37 +873,37 @@ new_nvar(parser_state *p, int num) int nvar; node *nvars = p->nvars->cdr; while (nvars) { - nvar = intn(nvars->car); + nvar = node_to_int(nvars->car); if (nvar == -2) break; /* top of the scope */ if (nvar > 0) { yyerror(NULL, p, "numbered parameter used in outer block"); break; } - nvars->car = nint(-1); + nvars->car = int_to_node(-1); nvars = nvars->cdr; } - nvar = intn(p->nvars->car); + nvar = node_to_int(p->nvars->car); if (nvar == -1) { yyerror(NULL, p, "numbered parameter used in inner block"); } else { - p->nvars->car = nint(nvar > num ? nvar : num); + p->nvars->car = int_to_node(nvar > num ? nvar : num); } - return cons_head((node*)NODE_NVAR, nint(num)); + return cons_head((node*)NODE_NVAR, int_to_node(num)); } /* (:const . a) */ static node* new_const(parser_state *p, mrb_sym sym) { - return cons_head((node*)NODE_CONST, nsym(sym)); + return cons_head((node*)NODE_CONST, sym_to_node(sym)); } /* (:undef a...) */ static node* new_undef(parser_state *p, mrb_sym sym) { - return list2((node*)NODE_UNDEF, nsym(sym)); + return list2((node*)NODE_UNDEF, sym_to_node(sym)); } /* (:class class super body) */ @@ -816,7 +933,7 @@ new_module(parser_state *p, node *m, node *b) static node* new_def(parser_state *p, mrb_sym m, node *a, node *b) { - return list5((node*)NODE_DEF, nsym(m), 0, a, b); + return list5((node*)NODE_DEF, sym_to_node(m), 0, a, b); } static void @@ -825,7 +942,7 @@ defn_setup(parser_state *p, node *d, node *a, node *b) node *n = d->cdr->cdr; n->car = locals_node(p); - p->cmdarg_stack = intn(n->cdr->car); + p->cmdarg_stack = node_to_int(n->cdr->car); n->cdr->car = a; local_resume(p, n->cdr->cdr->car); n->cdr->cdr->car = b; @@ -836,7 +953,7 @@ static node* new_sdef(parser_state *p, node *o, mrb_sym m, node *a, node *b) { void_expr_error(p, o); - return list6((node*)NODE_SDEF, o, nsym(m), 0, a, b); + return list6((node*)NODE_SDEF, o, sym_to_node(m), 0, a, b); } static void @@ -845,7 +962,7 @@ defs_setup(parser_state *p, node *d, node *a, node *b) node *n = d->cdr->cdr->cdr; n->car = locals_node(p); - p->cmdarg_stack = intn(n->cdr->car); + p->cmdarg_stack = node_to_int(n->cdr->car); n->cdr->car = a; local_resume(p, n->cdr->cdr->car); n->cdr->cdr->car = b; @@ -855,19 +972,19 @@ defs_setup(parser_state *p, node *d, node *a, node *b) static node* new_arg(parser_state *p, mrb_sym sym) { - return cons_head((node*)NODE_ARG, nsym(sym)); + return cons_head((node*)NODE_ARG, sym_to_node(sym)); } static void local_add_margs(parser_state *p, node *n) { while (n) { - if (typen(n->car->car) == NODE_MASGN) { + if (node_to_type(n->car->car) == NODE_MASGN) { node *t = n->car->cdr->cdr; n->car->cdr->cdr = NULL; while (t) { - local_add_f(p, sym(t->car)); + local_add_f(p, node_to_sym(t->car)); t = t->cdr; } local_add_margs(p, n->car->cdr->car->car); @@ -881,7 +998,7 @@ static void local_add_lv(parser_state *p, node *lv) { while (lv) { - local_add_f(p, sym(lv->car)); + local_add_f(p, node_to_sym(lv->car)); lv = lv->cdr; } } @@ -900,7 +1017,7 @@ new_args(parser_state *p, node *m, node *opt, mrb_sym rest, node *m2, node *tail local_add_margs(p, m); local_add_margs(p, m2); n = cons(m2, tail); - n = cons(nsym(rest), n); + n = cons(sym_to_node(rest), n); n = cons(opt, n); while (opt) { /* opt: (sym . (opt . lv)) -> (sym . opt) */ @@ -918,7 +1035,7 @@ new_args_tail(parser_state *p, node *kws, node *kwrest, mrb_sym blk) node *k; if (kws || kwrest) { - local_add_kw(p, (kwrest && kwrest->cdr)? sym(kwrest->cdr) : 0); + local_add_kw(p, (kwrest && kwrest->cdr)? node_to_sym(kwrest->cdr) : 0); } local_add_blk(p); @@ -928,18 +1045,18 @@ new_args_tail(parser_state *p, node *kws, node *kwrest, mrb_sym blk) /* order is for Proc#parameters */ for (k = kws; k; k = k->cdr) { if (!k->car->cdr->cdr->car) { /* allocate required keywords */ - local_add_f(p, sym(k->car->cdr->car)); + local_add_f(p, node_to_sym(k->car->cdr->car)); } } for (k = kws; k; k = k->cdr) { if (k->car->cdr->cdr->car) { /* allocate keywords with default */ local_add_lv(p, k->car->cdr->cdr->car->cdr); k->car->cdr->cdr->car = k->car->cdr->cdr->car->car; - local_add_f(p, sym(k->car->cdr->car)); + local_add_f(p, node_to_sym(k->car->cdr->car)); } } - return list4((node*)NODE_ARGS_TAIL, kws, kwrest, nsym(blk)); + return list4((node*)NODE_ARGS_TAIL, kws, kwrest, sym_to_node(blk)); } /* (:kw_arg kw_sym def_arg) */ @@ -947,14 +1064,14 @@ static node* new_kw_arg(parser_state *p, mrb_sym kw, node *def_arg) { mrb_assert(kw); - return list3((node*)NODE_KW_ARG, nsym(kw), def_arg); + return list3((node*)NODE_KW_ARG, sym_to_node(kw), def_arg); } /* (:kw_rest_args . a) */ static node* new_kw_rest_args(parser_state *p, mrb_sym sym) { - return cons_head((node*)NODE_KW_REST_ARGS, nsym(sym)); + return cons_head((node*)NODE_KW_REST_ARGS, sym_to_node(sym)); } static node* @@ -978,7 +1095,7 @@ new_block_arg(parser_state *p, node *a) static node* setup_numparams(parser_state *p, node *a) { - int nvars = intn(p->nvars->car); + int nvars = node_to_int(p->nvars->car); if (nvars > 0) { int i; mrb_sym sym; @@ -997,7 +1114,7 @@ setup_numparams(parser_state *p, node *a) buf[2] = '\0'; sym = intern_cstr(buf); args = cons(new_arg(p, sym), args); - p->locals->car = cons(nsym(sym), p->locals->car); + p->locals->car = cons(sym_to_node(sym), p->locals->car); } a = new_args(p, args, 0, 0, 0, 0); } @@ -1049,14 +1166,14 @@ static node* new_op_asgn(parser_state *p, node *a, mrb_sym op, node *b) { void_expr_error(p, b); - return list4((node*)NODE_OP_ASGN, a, nsym(op), b); + return list4((node*)NODE_OP_ASGN, a, sym_to_node(op), b); } static node* new_imaginary(parser_state *p, node *imaginary) { return new_fcall(p, MRB_SYM_2(p->mrb, Complex), - new_callargs(p, list2(list3((node*)NODE_INT, (node*)strdup("0"), nint(10)), imaginary), 0, 0)); + new_callargs(p, list2(list3((node*)NODE_INT, (node*)strdup("0"), int_to_node(10)), imaginary), 0, 0)); } static node* @@ -1066,10 +1183,49 @@ new_rational(parser_state *p, node *rational) } /* (:int . i) */ +static node* +new_int_original(parser_state *p, const char *s, int base) +{ + return list3((node*)NODE_INT, (node*)strdup(s), int_to_node(base)); +} + +static node* +new_int_var(parser_state *p, int32_t value) +{ + size_t size = sizeof(struct mrb_ast_int_node); + enum mrb_ast_size_class class = size_to_class(size); + + struct mrb_ast_int_node *n = (struct mrb_ast_int_node*) + parser_alloc_var(p, size, class); + + init_var_header(&n->header, p, NODE_INT, class); + n->value = value; + + return cons_head((node*)NODE_VARIABLE, (node*)n); +} + static node* new_int(parser_state *p, const char *s, int base, int suffix) { - node* result = list3((node*)NODE_INT, (node*)strdup(s), nint(base)); + node* result; + + if (p->var_nodes_enabled && suffix == 0) { + char *e; + long long val; +#ifdef MRB_INT64 + val = strtoll(s, &e, base); +#else + val = strtol(s, &e, base); +#endif + if (*e == 0) { /* conversion successful */ + if (val >= INT32_MIN && val <= INT32_MAX) { + return new_int_var(p, (int32_t)val); + } + } + /* fallback to original for large numbers or parse errors */ + } + + result = new_int_original(p, s, base); if (suffix & NUM_SUFFIX_R) { result = new_rational(p, result); } @@ -1096,10 +1252,50 @@ new_float(parser_state *p, const char *s, int suffix) #endif /* (:str . (s . len)) */ +/* Original string node creation (legacy) */ +static node* +new_str_original(parser_state *p, const char *s, size_t len) +{ + return cons_head((node*)NODE_STR, cons((node*)strndup(s, len), int_to_node(len))); +} + +/* Create variable-sized string node with inline storage */ +static node* +new_str_var(parser_state *p, const char *s, size_t len) +{ + /* Calculate total size needed */ + size_t base_size = sizeof(struct mrb_ast_str_node); + size_t total_size = base_size + len + 1; /* +1 for null terminator */ + enum mrb_ast_size_class class = size_to_class(total_size); + + /* For very large strings, use legacy mode for now (Phase 1 simplification) */ + if (len > STR_INLINE_THRESHOLD) { + /* TODO: Implement heap storage for large strings in Phase 2 */ + return new_str_original(p, s, len); + } + + struct mrb_ast_str_node *n = (struct mrb_ast_str_node*) + parser_alloc_var(p, total_size, class); + + init_var_header(&n->header, p, NODE_STR, class); + n->header.flags |= VAR_NODE_FLAG_INLINE_DATA; + n->len = len; + + /* Copy string data inline */ + memcpy(n->data, s, len); + n->data[len] = '\0'; + + return cons_head((node*)NODE_VARIABLE, (node*)n); +} + +/* String node creation - supports both variable and legacy modes */ static node* new_str(parser_state *p, const char *s, size_t len) { - return cons_head((node*)NODE_STR, cons((node*)strndup(s, len), nint(len))); + if (p->var_nodes_enabled) { + return new_str_var(p, s, len); + } + return new_str_original(p, s, len); } /* (:dstr . a) */ @@ -1112,7 +1308,7 @@ new_dstr(parser_state *p, node *a) static int string_node_p(node *n) { - return (int)(typen(n->car) == NODE_STR); + return (int)(node_to_type(n->car) == NODE_STR); } static node* @@ -1193,7 +1389,7 @@ concat_string(parser_state *p, node *a, node *b) static node* new_xstr(parser_state *p, const char *s, int len) { - return cons_head((node*)NODE_XSTR, cons((node*)strndup(s, len), nint(len))); + return cons_head((node*)NODE_XSTR, cons((node*)strndup(s, len), int_to_node(len))); } /* (:xstr . a) */ @@ -1228,14 +1424,14 @@ new_dregx(parser_state *p, node *a, node *b) static node* new_back_ref(parser_state *p, int n) { - return cons_head((node*)NODE_BACK_REF, nint(n)); + return cons_head((node*)NODE_BACK_REF, int_to_node(n)); } /* (:nthref . n) */ static node* new_nth_ref(parser_state *p, int n) { - return cons_head((node*)NODE_NTH_REF, nint(n)); + return cons_head((node*)NODE_NTH_REF, int_to_node(n)); } /* (:heredoc . a) */ @@ -1302,7 +1498,7 @@ args_with_block(parser_state *p, node *a, node *b) static void endless_method_name(parser_state *p, node *defn) { - mrb_sym sym = sym(defn->cdr->car); + mrb_sym sym = node_to_sym(defn->cdr->car); mrb_int len; const char *name = mrb_sym_name_len(p->mrb, sym, &len); @@ -1319,7 +1515,7 @@ call_with_block(parser_state *p, node *a, node *b) { node *n; - switch (typen(a->car)) { + switch (node_to_type(a->car)) { case NODE_SUPER: case NODE_ZSUPER: if (!a->cdr) a->cdr = new_callargs(p, 0, 0, b); @@ -1371,9 +1567,9 @@ ret_args(parser_state *p, node *n) static void assignable(parser_state *p, node *lhs) { - switch (intn(lhs->car)) { + switch (node_to_int(lhs->car)) { case NODE_LVAR: - local_add(p, sym(lhs->cdr)); + local_add(p, node_to_sym(lhs->cdr)); break; case NODE_CONST: if (p->in_def) @@ -1385,9 +1581,9 @@ assignable(parser_state *p, node *lhs) static node* var_reference(parser_state *p, node *lhs) { - if (intn(lhs->car) == NODE_LVAR) { - if (!local_var_p(p, sym(lhs->cdr))) { - node *n = new_fcall(p, sym(lhs->cdr), 0); + if (node_to_int(lhs->car) == NODE_LVAR) { + if (!local_var_p(p, node_to_sym(lhs->cdr))) { + node *n = new_fcall(p, node_to_sym(lhs->cdr), 0); cons_free(lhs); return n; } @@ -1500,7 +1696,7 @@ prohibit_literals(parser_state *p, node *n) yyerror(NULL, p, "can't define singleton method for ()."); } else { - switch (typen(n->car)) { + switch (node_to_type(n->car)) { case NODE_INT: case NODE_STR: case NODE_DSTR: @@ -1815,7 +2011,7 @@ stmt : keyword_alias fsym {p->lstate = EXPR_FNAME;} fsym } | stmt modifier_while expr_value { - if ($1 && typen($1->car) == NODE_BEGIN) { + if ($1 && node_to_type($1->car) == NODE_BEGIN) { $$ = new_while_mod(p, cond($3), $1); } else { @@ -1824,7 +2020,7 @@ stmt : keyword_alias fsym {p->lstate = EXPR_FNAME;} fsym } | stmt modifier_until expr_value { - if ($1 && typen($1->car) == NODE_BEGIN) { + if ($1 && node_to_type($1->car) == NODE_BEGIN) { $$ = new_until_mod(p, cond($3), $1); } else { @@ -1970,7 +2166,7 @@ expr : command_call defn_head : keyword_def fname { - $$ = new_def(p, $2, nint(p->cmdarg_stack), local_switch(p)); + $$ = new_def(p, $2, int_to_node(p->cmdarg_stack), local_switch(p)); p->cmdarg_stack = 0; p->in_def++; nvars_block(p); @@ -1983,7 +2179,7 @@ defs_head : keyword_def singleton dot_or_colon } fname { - $$ = new_sdef(p, $2, $5, nint(p->cmdarg_stack), local_switch(p)); + $$ = new_sdef(p, $2, $5, int_to_node(p->cmdarg_stack), local_switch(p)); p->cmdarg_stack = 0; p->in_def++; p->in_single++; @@ -2253,16 +2449,16 @@ cname : tIDENTIFIER cpath : tCOLON3 cname { - $$ = cons(nint(1), nsym($2)); + $$ = cons(int_to_node(1), sym_to_node($2)); } | cname { - $$ = cons(nint(0), nsym($1)); + $$ = cons(int_to_node(0), sym_to_node($1)); } | primary_value tCOLON2 cname { void_expr_error(p, $1); - $$ = cons($1, nsym($3)); + $$ = cons($1, sym_to_node($3)); } ; @@ -2291,7 +2487,7 @@ undef_list : fsym } | undef_list ',' {p->lstate = EXPR_FNAME;} fsym { - $$ = push($1, nsym($4)); + $$ = push($1, sym_to_node($4)); } ; @@ -2923,7 +3119,7 @@ primary : literal } term { - $$ = cons(local_switch(p), nint(p->in_single)); + $$ = cons(local_switch(p), int_to_node(p->in_single)); nvars_block(p); p->in_single = 0; } @@ -2935,7 +3131,7 @@ primary : literal local_resume(p, $6->car); nvars_unnest(p); p->in_def = $4; - p->in_single = intn($6->cdr); + p->in_single = node_to_int($6->cdr); } | keyword_module cpath @@ -3046,11 +3242,11 @@ f_margs : f_arg | f_arg ',' tSTAR { local_add_f(p, intern_op(mul)); - $$ = list3($1, nint(-1), 0); + $$ = list3($1, int_to_node(-1), 0); } | f_arg ',' tSTAR ',' f_arg { - $$ = list3($1, nint(-1), $5); + $$ = list3($1, int_to_node(-1), $5); } | tSTAR f_norm_arg { @@ -3063,7 +3259,7 @@ f_margs : f_arg | tSTAR { local_add_f(p, intern_op(mul)); - $$ = list3(0, nint(-1), 0); + $$ = list3(0, int_to_node(-1), 0); } | tSTAR ',' { @@ -3071,7 +3267,7 @@ f_margs : f_arg } f_arg { - $$ = list3(0, nint(-1), $4); + $$ = list3(0, int_to_node(-1), $4); } ; @@ -3254,7 +3450,7 @@ do_block : keyword_do_block block_call : command do_block { - if (typen($1->car) == NODE_YIELD) { + if (node_to_type($1->car) == NODE_YIELD) { yyerror(&@1, p, "block given to yield"); } else { @@ -3420,7 +3616,7 @@ string_fragment : tCHAR | tSTRING_BEG string_rep tSTRING { node *n = $2; - if (intn($3->cdr->cdr) > 0) { + if (node_to_int($3->cdr->cdr) > 0) { n = push(n, $3); } else { @@ -3468,7 +3664,7 @@ xstring : tXSTRING_BEG tXSTRING | tXSTRING_BEG string_rep tXSTRING { node *n = $2; - if (intn($3->cdr->cdr) > 0) { + if (node_to_int($3->cdr->cdr) > 0) { n = push(n, $3); } else { @@ -3537,7 +3733,7 @@ words : tWORDS_BEG tSTRING | tWORDS_BEG string_rep tSTRING { node *n = $2; - if (intn($3->cdr->cdr) > 0) { + if (node_to_int($3->cdr->cdr) > 0) { n = push(n, $3); } else { @@ -3556,7 +3752,7 @@ symbol : basic_symbol { node *n = $3; p->lstate = EXPR_ENDARG; - if (intn($4->cdr->cdr) > 0) { + if (node_to_int($4->cdr->cdr) > 0) { n = push(n, $4); } else { @@ -3599,7 +3795,7 @@ symbols : tSYMBOLS_BEG tSTRING | tSYMBOLS_BEG string_rep tSTRING { node *n = $2; - if (intn($3->cdr->cdr) > 0) { + if (node_to_int($3->cdr->cdr) > 0) { n = push(n, $3); } $$ = new_symbols(p, n); @@ -3991,7 +4187,7 @@ f_opt_asgn : tIDENTIFIER '=' f_opt : f_opt_asgn arg { void_expr_error(p, $2); - $$ = cons(nsym($1), cons($2, locals_node(p))); + $$ = cons(sym_to_node($1), cons($2, locals_node(p))); local_unnest(p); } ; @@ -3999,7 +4195,7 @@ f_opt : f_opt_asgn arg f_block_opt : f_opt_asgn primary_value { void_expr_error(p, $2); - $$ = cons(nsym($1), cons($2, locals_node(p))); + $$ = cons(sym_to_node($1), cons($2, locals_node(p))); local_unnest(p); } ; @@ -4122,7 +4318,7 @@ assoc : arg tASSOC arg | string_fragment tLABEL_TAG arg { void_expr_error(p, $3); - if (typen($1->car) == NODE_DSTR) { + if (node_to_type($1->car) == NODE_DSTR) { $$ = cons(new_dsym(p, $1), $3); } else { @@ -4301,13 +4497,13 @@ backref_error(parser_state *p, node *n) { int c; - c = intn(n->car); + c = node_to_int(n->car); if (c == NODE_NTH_REF) { - yyerror_c(p, "can't set variable $", (char)intn(n->cdr)+'0'); + yyerror_c(p, "can't set variable $", (char)node_to_int(n->cdr)+'0'); } else if (c == NODE_BACK_REF) { - yyerror_c(p, "can't set variable $", (char)intn(n->cdr)); + yyerror_c(p, "can't set variable $", (char)node_to_int(n->cdr)); } else { yyerror(NULL, p, "Internal error in backref_error()"); @@ -4320,7 +4516,7 @@ void_expr_error(parser_state *p, node *n) int c; if (n == NULL) return; - c = intn(n->car); + c = node_to_int(n->car); switch (c) { case NODE_BREAK: case NODE_RETURN: @@ -4381,7 +4577,7 @@ nextc(parser_state *p) if (p->pb) { node *tmp; - c = intn(p->pb->car); + c = node_to_int(p->pb->car); tmp = p->pb; p->pb = p->pb->cdr; cons_free(tmp); @@ -4417,7 +4613,7 @@ pushback(parser_state *p, int c) if (c >= 0) { p->column--; } - p->pb = cons(nint(c), p->pb); + p->pb = cons(int_to_node(c), p->pb); } static void @@ -4442,7 +4638,7 @@ peekc_n(parser_state *p, int n) c0 = nextc(p); if (c0 == -1) return c0; /* do not skip partial EOF */ if (c0 >= 0) --p->column; - list = push(list, nint(c0)); + list = push(list, int_to_node(c0)); } while(n--); if (p->pb) { p->pb = append(list, p->pb); @@ -4972,7 +5168,7 @@ parse_string(parser_state *p) node *nd = new_str(p, tok(p), toklen(p)); pylval.nd = nd; if (unindent && head) { - nspaces = push(nspaces, nint(spaces)); + nspaces = push(nspaces, int_to_node(spaces)); heredoc_push_indented(p, hinfo, nd->cdr, escaped, nspaces, empty && line_head); } return tHD_STRING_MID; @@ -5007,8 +5203,8 @@ parse_string(parser_state *p) p->lineno++; p->column = 0; if (unindent) { - nspaces = push(nspaces, nint(spaces)); - escaped = push(escaped, nint(pos)); + nspaces = push(nspaces, int_to_node(spaces)); + escaped = push(escaped, int_to_node(pos)); pos--; empty = TRUE; spaces = 0; @@ -5066,7 +5262,7 @@ parse_string(parser_state *p) pylval.nd = nd; if (hinfo) { if (unindent && head) { - nspaces = push(nspaces, nint(spaces)); + nspaces = push(nspaces, int_to_node(spaces)); heredoc_push_indented(p, hinfo, nd->cdr, escaped, nspaces, FALSE); } hinfo->line_head = FALSE; @@ -5189,7 +5385,7 @@ number_literal_suffix(parser_state *p) int mask = NUM_SUFFIX_R|NUM_SUFFIX_I; while ((c = nextc(p)) != -1) { - list = push(list, nint(c)); + list = push(list, int_to_node(c)); if ((mask & NUM_SUFFIX_I) && c == 'i') { result |= (mask & NUM_SUFFIX_I); @@ -6505,7 +6701,7 @@ parser_yylex(parser_state *p) int nvar; if (n > 0) { - nvar = intn(p->nvars->car); + nvar = node_to_int(p->nvars->car); if (nvar != -2) { /* numbered parameters never appear on toplevel */ pylval.num = n; p->lstate = EXPR_END; @@ -6646,6 +6842,7 @@ parser_init_cxt(parser_state *p, mrb_ccontext *cxt) p->no_optimize = cxt->no_optimize; p->no_ext_ops = cxt->no_ext_ops; p->upper = cxt->upper; + p->var_nodes_enabled = cxt->use_variable_nodes; if (cxt->partial_hook) { p->cxt = cxt; } @@ -6659,7 +6856,7 @@ parser_update_cxt(parser_state *p, mrb_ccontext *cxt) if (!cxt) return; if (!p->tree) return; - if (intn(p->tree->car) != NODE_SCOPE) return; + if (node_to_int(p->tree->car) != NODE_SCOPE) return; n0 = n = p->tree->cdr->car; while (n) { i++; @@ -6668,7 +6865,7 @@ parser_update_cxt(parser_state *p, mrb_ccontext *cxt) cxt->syms = (mrb_sym*)mrbc_realloc(cxt->syms, i*sizeof(mrb_sym)); cxt->slen = i; for (i=0, n=n0; n; i++,n=n->cdr) { - cxt->syms[i] = sym(n->car); + cxt->syms[i] = node_to_sym(n->car); } } @@ -6752,6 +6949,14 @@ mrb_parser_new(mrb_state *mrb) p->filename_table = NULL; p->filename_table_length = 0; + /* Initialize variable-sized node infrastructure */ + for (int i = 0; i < SIZE_CLASS_COUNT; i++) { + p->var_free_lists[i] = NULL; + p->var_alloc_counts[i] = 0; + } + p->var_total_allocated = 0; + p->var_nodes_enabled = FALSE; /* Start disabled for compatibility */ + return p; } @@ -7091,7 +7296,7 @@ dump_args(mrb_state *mrb, node *n, int offset) while (n2) { dump_prefix(n2, offset+2); - printf("%s=\n", mrb_sym_name(mrb, sym(n2->car->car))); + printf("%s=\n", mrb_sym_name(mrb, node_to_sym(n2->car->car))); mrb_parser_dump(mrb, n2->car->cdr, offset+3); n2 = n2->cdr; } @@ -7099,7 +7304,7 @@ dump_args(mrb_state *mrb, node *n, int offset) } n = n->cdr; if (n->car) { - mrb_sym rest = sym(n->car); + mrb_sym rest = node_to_sym(n->car); dump_prefix(n, offset+1); if (rest == MRB_OPSYM(mul)) @@ -7116,7 +7321,7 @@ dump_args(mrb_state *mrb, node *n, int offset) n = n->cdr; if (n) { - mrb_assert(intn(n->car) == NODE_ARGS_TAIL); + mrb_assert(node_to_int(n->car) == NODE_ARGS_TAIL); mrb_parser_dump(mrb, n, offset); } } @@ -7154,7 +7359,7 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) if (!tree) return; again: dump_prefix(tree, offset); - nodetype = intn(tree->car); + nodetype = node_to_int(tree->car); tree = tree->cdr; switch (nodetype) { case NODE_STMTS: @@ -7371,7 +7576,7 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) while (n2) { if (n2->car) { if (!first_lval) printf(", "); - printf("%s", mrb_sym_name(mrb, sym(n2->car))); + printf("%s", mrb_sym_name(mrb, node_to_sym(n2->car))); first_lval = FALSE; } n2 = n2->cdr; @@ -7399,8 +7604,8 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) mrb_parser_dump(mrb, tree->car, offset+1); dump_prefix(tree, offset+1); printf("method='%s' (%d)\n", - mrb_sym_dump(mrb, sym(tree->cdr->car)), - intn(tree->cdr->car)); + mrb_sym_dump(mrb, node_to_sym(tree->cdr->car)), + node_to_int(tree->cdr->car)); tree = tree->cdr->cdr->car; if (tree) { dump_prefix(tree, offset+1); @@ -7437,11 +7642,11 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) printf("NODE_COLON2:\n"); mrb_parser_dump(mrb, tree->car, offset+1); dump_prefix(tree, offset+1); - printf("::%s\n", mrb_sym_name(mrb, sym(tree->cdr))); + printf("::%s\n", mrb_sym_name(mrb, node_to_sym(tree->cdr))); break; case NODE_COLON3: - printf("NODE_COLON3: ::%s\n", mrb_sym_name(mrb, sym(tree))); + printf("NODE_COLON3: ::%s\n", mrb_sym_name(mrb, node_to_sym(tree))); break; case NODE_ARRAY: @@ -7507,7 +7712,7 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) if (n2->car) { dump_prefix(n2, offset+2); printf("rest:\n"); - if (n2->car == nint(-1)) { + if (n2->car == int_to_node(-1)) { dump_prefix(n2, offset+2); printf("(empty)\n"); } @@ -7535,7 +7740,7 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) mrb_parser_dump(mrb, tree->car, offset+2); tree = tree->cdr; dump_prefix(tree, offset+1); - printf("op='%s' (%d)\n", mrb_sym_name(mrb, sym(tree->car)), intn(tree->car)); + printf("op='%s' (%d)\n", mrb_sym_name(mrb, node_to_sym(tree->car)), node_to_int(tree->car)); tree = tree->cdr; mrb_parser_dump(mrb, tree->car, offset+1); break; @@ -7597,27 +7802,27 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) break; case NODE_LVAR: - printf("NODE_LVAR %s\n", mrb_sym_name(mrb, sym(tree))); + printf("NODE_LVAR %s\n", mrb_sym_name(mrb, node_to_sym(tree))); break; case NODE_GVAR: - printf("NODE_GVAR %s\n", mrb_sym_name(mrb, sym(tree))); + printf("NODE_GVAR %s\n", mrb_sym_name(mrb, node_to_sym(tree))); break; case NODE_IVAR: - printf("NODE_IVAR %s\n", mrb_sym_name(mrb, sym(tree))); + printf("NODE_IVAR %s\n", mrb_sym_name(mrb, node_to_sym(tree))); break; case NODE_CVAR: - printf("NODE_CVAR %s\n", mrb_sym_name(mrb, sym(tree))); + printf("NODE_CVAR %s\n", mrb_sym_name(mrb, node_to_sym(tree))); break; case NODE_NVAR: - printf("NODE_NVAR %d\n", intn(tree)); + printf("NODE_NVAR %d\n", node_to_int(tree)); break; case NODE_CONST: - printf("NODE_CONST %s\n", mrb_sym_name(mrb, sym(tree))); + printf("NODE_CONST %s\n", mrb_sym_name(mrb, node_to_sym(tree))); break; case NODE_MATCH: @@ -7631,15 +7836,15 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) break; case NODE_BACK_REF: - printf("NODE_BACK_REF: $%c\n", intn(tree)); + printf("NODE_BACK_REF: $%c\n", node_to_int(tree)); break; case NODE_NTH_REF: - printf("NODE_NTH_REF: $%d\n", intn(tree)); + printf("NODE_NTH_REF: $%d\n", node_to_int(tree)); break; case NODE_ARG: - printf("NODE_ARG %s\n", mrb_sym_name(mrb, sym(tree))); + printf("NODE_ARG %s\n", mrb_sym_name(mrb, node_to_sym(tree))); break; case NODE_BLOCK_ARG: @@ -7648,7 +7853,7 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) break; case NODE_INT: - printf("NODE_INT %s base %d\n", (char*)tree->car, intn(tree->cdr->car)); + printf("NODE_INT %s base %d\n", (char*)tree->car, node_to_int(tree->cdr->car)); break; case NODE_FLOAT: @@ -7661,7 +7866,7 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) break; case NODE_STR: - printf("NODE_STR %s len %d\n", str_dump(mrb, (char*)tree->car, intn(tree->cdr)), intn(tree->cdr)); + printf("NODE_STR %s len %d\n", str_dump(mrb, (char*)tree->car, node_to_int(tree->cdr)), node_to_int(tree->cdr)); break; case NODE_DSTR: @@ -7670,7 +7875,7 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) break; case NODE_XSTR: - printf("NODE_XSTR %s len %d\n", str_dump(mrb, (char*)tree->car, intn(tree->cdr)), intn(tree->cdr)); + printf("NODE_XSTR %s len %d\n", str_dump(mrb, (char*)tree->car, node_to_int(tree->cdr)), node_to_int(tree->cdr)); break; case NODE_DXSTR: @@ -7706,8 +7911,8 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) break; case NODE_SYM: - printf("NODE_SYM :%s (%d)\n", mrb_sym_dump(mrb, sym(tree)), - intn(tree)); + printf("NODE_SYM :%s (%d)\n", mrb_sym_dump(mrb, node_to_sym(tree)), + node_to_int(tree)); break; case NODE_DSYM: @@ -7747,8 +7952,8 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) case NODE_ALIAS: printf("NODE_ALIAS %s %s:\n", - mrb_sym_dump(mrb, sym(tree->car)), - mrb_sym_dump(mrb, sym(tree->cdr))); + mrb_sym_dump(mrb, node_to_sym(tree->car)), + mrb_sym_dump(mrb, node_to_sym(tree->cdr))); break; case NODE_UNDEF: @@ -7756,7 +7961,7 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) { node *t = tree; while (t) { - printf(" %s", mrb_sym_dump(mrb, sym(t->car))); + printf(" %s", mrb_sym_dump(mrb, node_to_sym(t->car))); t = t->cdr; } } @@ -7765,18 +7970,18 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) case NODE_CLASS: printf("NODE_CLASS:\n"); - if (tree->car->car == nint(0)) { + if (tree->car->car == int_to_node(0)) { dump_prefix(tree, offset+1); - printf(":%s\n", mrb_sym_name(mrb, sym(tree->car->cdr))); + printf(":%s\n", mrb_sym_name(mrb, node_to_sym(tree->car->cdr))); } - else if (tree->car->car == nint(1)) { + else if (tree->car->car == int_to_node(1)) { dump_prefix(tree, offset+1); - printf("::%s\n", mrb_sym_name(mrb, sym(tree->car->cdr))); + printf("::%s\n", mrb_sym_name(mrb, node_to_sym(tree->car->cdr))); } else { mrb_parser_dump(mrb, tree->car->car, offset+1); dump_prefix(tree, offset+1); - printf("::%s\n", mrb_sym_name(mrb, sym(tree->car->cdr))); + printf("::%s\n", mrb_sym_name(mrb, node_to_sym(tree->car->cdr))); } if (tree->cdr->car) { dump_prefix(tree, offset+1); @@ -7790,18 +7995,18 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) case NODE_MODULE: printf("NODE_MODULE:\n"); - if (tree->car->car == nint(0)) { + if (tree->car->car == int_to_node(0)) { dump_prefix(tree, offset+1); - printf(":%s\n", mrb_sym_name(mrb, sym(tree->car->cdr))); + printf(":%s\n", mrb_sym_name(mrb, node_to_sym(tree->car->cdr))); } - else if (tree->car->car == nint(1)) { + else if (tree->car->car == int_to_node(1)) { dump_prefix(tree, offset+1); - printf("::%s\n", mrb_sym_name(mrb, sym(tree->car->cdr))); + printf("::%s\n", mrb_sym_name(mrb, node_to_sym(tree->car->cdr))); } else { mrb_parser_dump(mrb, tree->car->car, offset+1); dump_prefix(tree, offset+1); - printf("::%s\n", mrb_sym_name(mrb, sym(tree->car->cdr))); + printf("::%s\n", mrb_sym_name(mrb, node_to_sym(tree->car->cdr))); } dump_prefix(tree, offset+1); printf("body:\n"); @@ -7819,7 +8024,7 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) case NODE_DEF: printf("NODE_DEF:\n"); dump_prefix(tree, offset+1); - printf("%s\n", mrb_sym_dump(mrb, sym(tree->car))); + printf("%s\n", mrb_sym_dump(mrb, node_to_sym(tree->car))); tree = tree->cdr; { node *n2 = tree->car; @@ -7832,7 +8037,7 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) while (n2) { if (n2->car) { if (!first_lval) printf(", "); - printf("%s", mrb_sym_name(mrb, sym(n2->car))); + printf("%s", mrb_sym_name(mrb, node_to_sym(n2->car))); first_lval = FALSE; } n2 = n2->cdr; @@ -7852,7 +8057,7 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) mrb_parser_dump(mrb, tree->car, offset+1); tree = tree->cdr; dump_prefix(tree, offset+1); - printf(":%s\n", mrb_sym_dump(mrb, sym(tree->car))); + printf(":%s\n", mrb_sym_dump(mrb, node_to_sym(tree->car))); tree = tree->cdr->cdr; if (tree->car) { dump_args(mrb, tree->car, offset+1); @@ -7883,24 +8088,24 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) } tree = tree->cdr; if (tree->car) { - mrb_assert(intn(tree->car->car) == NODE_KW_REST_ARGS); + mrb_assert(node_to_int(tree->car->car) == NODE_KW_REST_ARGS); mrb_parser_dump(mrb, tree->car, offset+1); } tree = tree->cdr; if (tree->car) { dump_prefix(tree, offset+1); - printf("block='%s'\n", mrb_sym_name(mrb, sym(tree->car))); + printf("block='%s'\n", mrb_sym_name(mrb, node_to_sym(tree->car))); } break; case NODE_KW_ARG: - printf("NODE_KW_ARG %s:\n", mrb_sym_name(mrb, sym(tree->car))); + printf("NODE_KW_ARG %s:\n", mrb_sym_name(mrb, node_to_sym(tree->car))); mrb_parser_dump(mrb, tree->cdr->car, offset + 1); break; case NODE_KW_REST_ARGS: if (tree) - printf("NODE_KW_REST_ARGS %s\n", mrb_sym_name(mrb, sym(tree))); + printf("NODE_KW_REST_ARGS %s\n", mrb_sym_name(mrb, node_to_sym(tree))); else printf("NODE_KW_REST_ARGS\n"); break; @@ -7922,7 +8127,7 @@ mrb_parser_foreach_top_variable(mrb_state *mrb, struct mrb_parser_state *p, mrb_ if ((intptr_t)n->car == NODE_SCOPE) { n = n->cdr->car; for (; n; n = n->cdr) { - mrb_sym sym = sym(n->car); + mrb_sym sym = node_to_sym(n->car); if (sym && !func(mrb, sym, user)) break; } } diff --git a/mrbgems/mruby-compiler/core/y.tab.c b/mrbgems/mruby-compiler/core/y.tab.c index 1c21f7022..3f2294587 100644 --- a/mrbgems/mruby-compiler/core/y.tab.c +++ b/mrbgems/mruby-compiler/core/y.tab.c @@ -124,14 +124,7 @@ typedef unsigned int stack_type; #define CMDARG_LEXPOP() BITSTACK_LEXPOP(p->cmdarg_stack) #define CMDARG_P() BITSTACK_SET_P(p->cmdarg_stack) -#define SET_LINENO(c,n) (headn(c)->lineno = (n)) - -#define sym(x) ((mrb_sym)(intptr_t)(x)) -#define nsym(x) ((node*)(intptr_t)(x)) -#define nint(x) ((node*)(intptr_t)(x)) -#define headn(x) ((struct mrb_ast_head_node*)(x)) -#define intn(x) ((int)(intptr_t)(x)) -#define typen(x) ((enum node_type)(intptr_t)(x)) +#define SET_LINENO(c,n) (head(c)->lineno = (n)) #define NUM_SUFFIX_R (1<<0) #define NUM_SUFFIX_I (1<<1) @@ -223,6 +216,76 @@ cons_head_gen(parser_state *p, node *car, node *cdr) #define cons(a,b) cons_gen(p,(a),(b)) /* Structure nodes - no location */ #define cons_head(a,b) cons_head_gen(p,(a),(b)) /* Head nodes - with location */ +/* Variable-sized node infrastructure - Phase 1 */ + +/* Calculate size class for given byte size */ +static inline enum mrb_ast_size_class +size_to_class(size_t size) +{ + static const size_t limits[] = SIZE_CLASS_LIMITS; + for (int i = 0; i < SIZE_CLASS_COUNT; i++) { + if (size <= limits[i]) return (enum mrb_ast_size_class)i; + } + return SIZE_CLASS_XLARGE; +} + +/* Get maximum size for a size class */ +static inline size_t +size_class_limit(enum mrb_ast_size_class class) +{ + static const size_t limits[] = SIZE_CLASS_LIMITS; + return (class < SIZE_CLASS_COUNT) ? limits[class] : 512; +} + +/* Allocate variable-sized node with size class management */ +static void* +parser_alloc_var(parser_state *p, size_t size, enum mrb_ast_size_class class) +{ + /* Try to reuse from appropriate size class free list */ + if (p->var_free_lists[class] && size <= size_class_limit(class)) { + struct mrb_ast_node *ptr = p->var_free_lists[class]; + p->var_free_lists[class] = ptr->cdr; + p->var_alloc_counts[class]++; + return ptr; + } + + /* Allocate new memory */ + void *ptr = parser_palloc(p, size); + p->var_total_allocated += size; + p->var_alloc_counts[class]++; + return ptr; +} + +/* Free variable-sized node to appropriate size class list */ +/* +static void +parser_free_var(parser_state *p, void *ptr, enum mrb_ast_size_class class) +{ + if (!ptr) return; + + struct mrb_ast_node *node = (struct mrb_ast_node*)ptr; + node->cdr = p->var_free_lists[class]; + p->var_free_lists[class] = node; +} +*/ + +/* Initialize variable node header */ +static void +init_var_header(struct mrb_ast_var_header *header, parser_state *p, + enum node_type type, enum mrb_ast_size_class class) +{ + header->lineno = p->lineno; + header->filename_index = p->current_filename_index; + header->node_type = (uint8_t)type; + header->size_class = (uint8_t)class; + header->flags = 0; + + /* Handle file boundary edge case */ + if (p->lineno == 0 && p->current_filename_index > 0) { + header->filename_index--; + } +} + static node* list1_gen(parser_state *p, node *a) { @@ -361,7 +424,7 @@ local_var_p(parser_state *p, mrb_sym sym) while (l) { node *n = l->car; while (n) { - if (sym(n->car) == sym) return TRUE; + if (node_to_sym(n->car) == sym) return TRUE; n = n->cdr; } l = l->cdr; @@ -390,7 +453,7 @@ local_add_f(parser_state *p, mrb_sym sym) if (p->locals) { node *n = p->locals->car; while (n) { - if (sym(n->car) == sym) { + if (node_to_sym(n->car) == sym) { mrb_int len; const char* name = mrb_sym_name_len(p->mrb, sym, &len); if (len > 0 && name[0] != '_') { @@ -400,7 +463,7 @@ local_add_f(parser_state *p, mrb_sym sym) } n = n->cdr; } - p->locals->car = push(p->locals->car, nsym(sym)); + p->locals->car = push(p->locals->car, sym_to_node(sym)); } } @@ -431,13 +494,13 @@ locals_node(parser_state *p) static void nvars_nest(parser_state *p) { - p->nvars = cons(nint(0), p->nvars); + p->nvars = cons(int_to_node(0), p->nvars); } static void nvars_block(parser_state *p) { - p->nvars = cons(nint(-2), p->nvars); + p->nvars = cons(int_to_node(-2), p->nvars); } static void @@ -459,7 +522,7 @@ new_stmts(parser_state *p, node *body) { if (body) { /* If body is already a NODE_STMTS, just return it directly */ - if (typen(body->car) == NODE_STMTS) { + if (node_to_type(body->car) == NODE_STMTS) { return body; } return list2((node*)NODE_STMTS, body); @@ -521,7 +584,7 @@ new_false(parser_state *p) static node* new_alias(parser_state *p, mrb_sym a, mrb_sym b) { - return cons_head((node*)NODE_ALIAS, cons(nsym(a), nsym(b))); + return cons_head((node*)NODE_ALIAS, cons(sym_to_node(a), sym_to_node(b))); } /* (:if cond then else) */ @@ -613,7 +676,7 @@ new_self(parser_state *p) static node* new_call(parser_state *p, node *a, mrb_sym b, node *c, int pass) { - node *n = list4(nint(pass?NODE_CALL:NODE_SCALL), a, nsym(b), c); + node *n = list4(int_to_node(pass?NODE_CALL:NODE_SCALL), a, sym_to_node(b), c); void_expr_error(p, a); return n; } @@ -622,7 +685,7 @@ new_call(parser_state *p, node *a, mrb_sym b, node *c, int pass) static node* new_fcall(parser_state *p, mrb_sym b, node *c) { - node *n = list4((node*)NODE_FCALL, 0, nsym(b), c); + node *n = list4((node*)NODE_FCALL, 0, sym_to_node(b), c); return n; } @@ -712,14 +775,14 @@ static node* new_colon2(parser_state *p, node *b, mrb_sym c) { void_expr_error(p, b); - return cons_head((node*)NODE_COLON2, cons(b, nsym(c))); + return cons_head((node*)NODE_COLON2, cons(b, sym_to_node(c))); } /* (:colon3 . c) */ static node* new_colon3(parser_state *p, mrb_sym c) { - return cons_head((node*)NODE_COLON3, nsym(c)); + return cons_head((node*)NODE_COLON3, sym_to_node(c)); } /* (:and a b) */ @@ -768,10 +831,52 @@ new_kw_hash(parser_state *p, node *a) } /* (:sym . a) */ +/* Original symbol node creation (legacy) */ +static node* +new_sym_original(parser_state *p, mrb_sym sym) +{ + return cons_head((node*)NODE_SYM, sym_to_node(sym)); +} + +/* Create variable-sized symbol node */ +static node* +new_sym_var(parser_state *p, mrb_sym sym) +{ + size_t size = sizeof(struct mrb_ast_sym_node); + enum mrb_ast_size_class class = size_to_class(size); + + struct mrb_ast_sym_node *n = (struct mrb_ast_sym_node*) + parser_alloc_var(p, size, class); + + init_var_header(&n->header, p, NODE_SYM, class); + n->symbol = sym; + + return cons_head((node*)NODE_VARIABLE, (node*)n); +} + +/* Symbol node creation - supports both variable and legacy modes */ static node* new_sym(parser_state *p, mrb_sym sym) { - return cons_head((node*)NODE_SYM, nsym(sym)); + if (p->var_nodes_enabled) { + return new_sym_var(p, sym); + } + return new_sym_original(p, sym); +} + +static node* +new_var_var(parser_state *p, mrb_sym sym, enum node_type type) +{ + size_t size = sizeof(struct mrb_ast_var_node); + enum mrb_ast_size_class class = size_to_class(size); + + struct mrb_ast_var_node *n = (struct mrb_ast_var_node*) + parser_alloc_var(p, size, class); + + init_var_header(&n->header, p, type, class); + n->symbol = sym; + + return cons_head((node*)NODE_VARIABLE, (node*)n); } static mrb_sym @@ -787,28 +892,40 @@ new_strsym(parser_state *p, node* str) static node* new_lvar(parser_state *p, mrb_sym sym) { - return cons_head((node*)NODE_LVAR, nsym(sym)); + if (p->var_nodes_enabled) { + return new_var_var(p, sym, NODE_LVAR); + } + return cons_head((node*)NODE_LVAR, sym_to_node(sym)); } /* (:gvar . a) */ static node* new_gvar(parser_state *p, mrb_sym sym) { - return cons_head((node*)NODE_GVAR, nsym(sym)); + if (p->var_nodes_enabled) { + return new_var_var(p, sym, NODE_GVAR); + } + return cons_head((node*)NODE_GVAR, sym_to_node(sym)); } /* (:ivar . a) */ static node* new_ivar(parser_state *p, mrb_sym sym) { - return cons_head((node*)NODE_IVAR, nsym(sym)); + if (p->var_nodes_enabled) { + return new_var_var(p, sym, NODE_IVAR); + } + return cons_head((node*)NODE_IVAR, sym_to_node(sym)); } /* (:cvar . a) */ static node* new_cvar(parser_state *p, mrb_sym sym) { - return cons_head((node*)NODE_CVAR, nsym(sym)); + if (p->var_nodes_enabled) { + return new_var_var(p, sym, NODE_CVAR); + } + return cons_head((node*)NODE_CVAR, sym_to_node(sym)); } /* (:nvar . a) */ @@ -818,37 +935,37 @@ new_nvar(parser_state *p, int num) int nvar; node *nvars = p->nvars->cdr; while (nvars) { - nvar = intn(nvars->car); + nvar = node_to_int(nvars->car); if (nvar == -2) break; /* top of the scope */ if (nvar > 0) { yyerror(NULL, p, "numbered parameter used in outer block"); break; } - nvars->car = nint(-1); + nvars->car = int_to_node(-1); nvars = nvars->cdr; } - nvar = intn(p->nvars->car); + nvar = node_to_int(p->nvars->car); if (nvar == -1) { yyerror(NULL, p, "numbered parameter used in inner block"); } else { - p->nvars->car = nint(nvar > num ? nvar : num); + p->nvars->car = int_to_node(nvar > num ? nvar : num); } - return cons_head((node*)NODE_NVAR, nint(num)); + return cons_head((node*)NODE_NVAR, int_to_node(num)); } /* (:const . a) */ static node* new_const(parser_state *p, mrb_sym sym) { - return cons_head((node*)NODE_CONST, nsym(sym)); + return cons_head((node*)NODE_CONST, sym_to_node(sym)); } /* (:undef a...) */ static node* new_undef(parser_state *p, mrb_sym sym) { - return list2((node*)NODE_UNDEF, nsym(sym)); + return list2((node*)NODE_UNDEF, sym_to_node(sym)); } /* (:class class super body) */ @@ -878,7 +995,7 @@ new_module(parser_state *p, node *m, node *b) static node* new_def(parser_state *p, mrb_sym m, node *a, node *b) { - return list5((node*)NODE_DEF, nsym(m), 0, a, b); + return list5((node*)NODE_DEF, sym_to_node(m), 0, a, b); } static void @@ -887,7 +1004,7 @@ defn_setup(parser_state *p, node *d, node *a, node *b) node *n = d->cdr->cdr; n->car = locals_node(p); - p->cmdarg_stack = intn(n->cdr->car); + p->cmdarg_stack = node_to_int(n->cdr->car); n->cdr->car = a; local_resume(p, n->cdr->cdr->car); n->cdr->cdr->car = b; @@ -898,7 +1015,7 @@ static node* new_sdef(parser_state *p, node *o, mrb_sym m, node *a, node *b) { void_expr_error(p, o); - return list6((node*)NODE_SDEF, o, nsym(m), 0, a, b); + return list6((node*)NODE_SDEF, o, sym_to_node(m), 0, a, b); } static void @@ -907,7 +1024,7 @@ defs_setup(parser_state *p, node *d, node *a, node *b) node *n = d->cdr->cdr->cdr; n->car = locals_node(p); - p->cmdarg_stack = intn(n->cdr->car); + p->cmdarg_stack = node_to_int(n->cdr->car); n->cdr->car = a; local_resume(p, n->cdr->cdr->car); n->cdr->cdr->car = b; @@ -917,19 +1034,19 @@ defs_setup(parser_state *p, node *d, node *a, node *b) static node* new_arg(parser_state *p, mrb_sym sym) { - return cons_head((node*)NODE_ARG, nsym(sym)); + return cons_head((node*)NODE_ARG, sym_to_node(sym)); } static void local_add_margs(parser_state *p, node *n) { while (n) { - if (typen(n->car->car) == NODE_MASGN) { + if (node_to_type(n->car->car) == NODE_MASGN) { node *t = n->car->cdr->cdr; n->car->cdr->cdr = NULL; while (t) { - local_add_f(p, sym(t->car)); + local_add_f(p, node_to_sym(t->car)); t = t->cdr; } local_add_margs(p, n->car->cdr->car->car); @@ -943,7 +1060,7 @@ static void local_add_lv(parser_state *p, node *lv) { while (lv) { - local_add_f(p, sym(lv->car)); + local_add_f(p, node_to_sym(lv->car)); lv = lv->cdr; } } @@ -962,7 +1079,7 @@ new_args(parser_state *p, node *m, node *opt, mrb_sym rest, node *m2, node *tail local_add_margs(p, m); local_add_margs(p, m2); n = cons(m2, tail); - n = cons(nsym(rest), n); + n = cons(sym_to_node(rest), n); n = cons(opt, n); while (opt) { /* opt: (sym . (opt . lv)) -> (sym . opt) */ @@ -980,7 +1097,7 @@ new_args_tail(parser_state *p, node *kws, node *kwrest, mrb_sym blk) node *k; if (kws || kwrest) { - local_add_kw(p, (kwrest && kwrest->cdr)? sym(kwrest->cdr) : 0); + local_add_kw(p, (kwrest && kwrest->cdr)? node_to_sym(kwrest->cdr) : 0); } local_add_blk(p); @@ -990,18 +1107,18 @@ new_args_tail(parser_state *p, node *kws, node *kwrest, mrb_sym blk) /* order is for Proc#parameters */ for (k = kws; k; k = k->cdr) { if (!k->car->cdr->cdr->car) { /* allocate required keywords */ - local_add_f(p, sym(k->car->cdr->car)); + local_add_f(p, node_to_sym(k->car->cdr->car)); } } for (k = kws; k; k = k->cdr) { if (k->car->cdr->cdr->car) { /* allocate keywords with default */ local_add_lv(p, k->car->cdr->cdr->car->cdr); k->car->cdr->cdr->car = k->car->cdr->cdr->car->car; - local_add_f(p, sym(k->car->cdr->car)); + local_add_f(p, node_to_sym(k->car->cdr->car)); } } - return list4((node*)NODE_ARGS_TAIL, kws, kwrest, nsym(blk)); + return list4((node*)NODE_ARGS_TAIL, kws, kwrest, sym_to_node(blk)); } /* (:kw_arg kw_sym def_arg) */ @@ -1009,14 +1126,14 @@ static node* new_kw_arg(parser_state *p, mrb_sym kw, node *def_arg) { mrb_assert(kw); - return list3((node*)NODE_KW_ARG, nsym(kw), def_arg); + return list3((node*)NODE_KW_ARG, sym_to_node(kw), def_arg); } /* (:kw_rest_args . a) */ static node* new_kw_rest_args(parser_state *p, mrb_sym sym) { - return cons_head((node*)NODE_KW_REST_ARGS, nsym(sym)); + return cons_head((node*)NODE_KW_REST_ARGS, sym_to_node(sym)); } static node* @@ -1040,7 +1157,7 @@ new_block_arg(parser_state *p, node *a) static node* setup_numparams(parser_state *p, node *a) { - int nvars = intn(p->nvars->car); + int nvars = node_to_int(p->nvars->car); if (nvars > 0) { int i; mrb_sym sym; @@ -1059,7 +1176,7 @@ setup_numparams(parser_state *p, node *a) buf[2] = '\0'; sym = intern_cstr(buf); args = cons(new_arg(p, sym), args); - p->locals->car = cons(nsym(sym), p->locals->car); + p->locals->car = cons(sym_to_node(sym), p->locals->car); } a = new_args(p, args, 0, 0, 0, 0); } @@ -1111,14 +1228,14 @@ static node* new_op_asgn(parser_state *p, node *a, mrb_sym op, node *b) { void_expr_error(p, b); - return list4((node*)NODE_OP_ASGN, a, nsym(op), b); + return list4((node*)NODE_OP_ASGN, a, sym_to_node(op), b); } static node* new_imaginary(parser_state *p, node *imaginary) { return new_fcall(p, MRB_SYM_2(p->mrb, Complex), - new_callargs(p, list2(list3((node*)NODE_INT, (node*)strdup("0"), nint(10)), imaginary), 0, 0)); + new_callargs(p, list2(list3((node*)NODE_INT, (node*)strdup("0"), int_to_node(10)), imaginary), 0, 0)); } static node* @@ -1128,10 +1245,49 @@ new_rational(parser_state *p, node *rational) } /* (:int . i) */ +static node* +new_int_original(parser_state *p, const char *s, int base) +{ + return list3((node*)NODE_INT, (node*)strdup(s), int_to_node(base)); +} + +static node* +new_int_var(parser_state *p, int32_t value) +{ + size_t size = sizeof(struct mrb_ast_int_node); + enum mrb_ast_size_class class = size_to_class(size); + + struct mrb_ast_int_node *n = (struct mrb_ast_int_node*) + parser_alloc_var(p, size, class); + + init_var_header(&n->header, p, NODE_INT, class); + n->value = value; + + return cons_head((node*)NODE_VARIABLE, (node*)n); +} + static node* new_int(parser_state *p, const char *s, int base, int suffix) { - node* result = list3((node*)NODE_INT, (node*)strdup(s), nint(base)); + node* result; + + if (p->var_nodes_enabled && suffix == 0) { + char *e; + long long val; +#ifdef MRB_INT64 + val = strtoll(s, &e, base); +#else + val = strtol(s, &e, base); +#endif + if (*e == 0) { /* conversion successful */ + if (val >= INT32_MIN && val <= INT32_MAX) { + return new_int_var(p, (int32_t)val); + } + } + /* fallback to original for large numbers or parse errors */ + } + + result = new_int_original(p, s, base); if (suffix & NUM_SUFFIX_R) { result = new_rational(p, result); } @@ -1158,10 +1314,50 @@ new_float(parser_state *p, const char *s, int suffix) #endif /* (:str . (s . len)) */ +/* Original string node creation (legacy) */ +static node* +new_str_original(parser_state *p, const char *s, size_t len) +{ + return cons_head((node*)NODE_STR, cons((node*)strndup(s, len), int_to_node(len))); +} + +/* Create variable-sized string node with inline storage */ +static node* +new_str_var(parser_state *p, const char *s, size_t len) +{ + /* Calculate total size needed */ + size_t base_size = sizeof(struct mrb_ast_str_node); + size_t total_size = base_size + len + 1; /* +1 for null terminator */ + enum mrb_ast_size_class class = size_to_class(total_size); + + /* For very large strings, use legacy mode for now (Phase 1 simplification) */ + if (len > STR_INLINE_THRESHOLD) { + /* TODO: Implement heap storage for large strings in Phase 2 */ + return new_str_original(p, s, len); + } + + struct mrb_ast_str_node *n = (struct mrb_ast_str_node*) + parser_alloc_var(p, total_size, class); + + init_var_header(&n->header, p, NODE_STR, class); + n->header.flags |= VAR_NODE_FLAG_INLINE_DATA; + n->len = len; + + /* Copy string data inline */ + memcpy(n->data, s, len); + n->data[len] = '\0'; + + return cons_head((node*)NODE_VARIABLE, (node*)n); +} + +/* String node creation - supports both variable and legacy modes */ static node* new_str(parser_state *p, const char *s, size_t len) { - return cons_head((node*)NODE_STR, cons((node*)strndup(s, len), nint(len))); + if (p->var_nodes_enabled) { + return new_str_var(p, s, len); + } + return new_str_original(p, s, len); } /* (:dstr . a) */ @@ -1174,7 +1370,7 @@ new_dstr(parser_state *p, node *a) static int string_node_p(node *n) { - return (int)(typen(n->car) == NODE_STR); + return (int)(node_to_type(n->car) == NODE_STR); } static node* @@ -1255,7 +1451,7 @@ concat_string(parser_state *p, node *a, node *b) static node* new_xstr(parser_state *p, const char *s, int len) { - return cons_head((node*)NODE_XSTR, cons((node*)strndup(s, len), nint(len))); + return cons_head((node*)NODE_XSTR, cons((node*)strndup(s, len), int_to_node(len))); } /* (:xstr . a) */ @@ -1290,14 +1486,14 @@ new_dregx(parser_state *p, node *a, node *b) static node* new_back_ref(parser_state *p, int n) { - return cons_head((node*)NODE_BACK_REF, nint(n)); + return cons_head((node*)NODE_BACK_REF, int_to_node(n)); } /* (:nthref . n) */ static node* new_nth_ref(parser_state *p, int n) { - return cons_head((node*)NODE_NTH_REF, nint(n)); + return cons_head((node*)NODE_NTH_REF, int_to_node(n)); } /* (:heredoc . a) */ @@ -1364,7 +1560,7 @@ args_with_block(parser_state *p, node *a, node *b) static void endless_method_name(parser_state *p, node *defn) { - mrb_sym sym = sym(defn->cdr->car); + mrb_sym sym = node_to_sym(defn->cdr->car); mrb_int len; const char *name = mrb_sym_name_len(p->mrb, sym, &len); @@ -1381,7 +1577,7 @@ call_with_block(parser_state *p, node *a, node *b) { node *n; - switch (typen(a->car)) { + switch (node_to_type(a->car)) { case NODE_SUPER: case NODE_ZSUPER: if (!a->cdr) a->cdr = new_callargs(p, 0, 0, b); @@ -1433,9 +1629,9 @@ ret_args(parser_state *p, node *n) static void assignable(parser_state *p, node *lhs) { - switch (intn(lhs->car)) { + switch (node_to_int(lhs->car)) { case NODE_LVAR: - local_add(p, sym(lhs->cdr)); + local_add(p, node_to_sym(lhs->cdr)); break; case NODE_CONST: if (p->in_def) @@ -1447,9 +1643,9 @@ assignable(parser_state *p, node *lhs) static node* var_reference(parser_state *p, node *lhs) { - if (intn(lhs->car) == NODE_LVAR) { - if (!local_var_p(p, sym(lhs->cdr))) { - node *n = new_fcall(p, sym(lhs->cdr), 0); + if (node_to_int(lhs->car) == NODE_LVAR) { + if (!local_var_p(p, node_to_sym(lhs->cdr))) { + node *n = new_fcall(p, node_to_sym(lhs->cdr), 0); cons_free(lhs); return n; } @@ -1562,7 +1758,7 @@ prohibit_literals(parser_state *p, node *n) yyerror(NULL, p, "can't define singleton method for ()."); } else { - switch (typen(n->car)) { + switch (node_to_type(n->car)) { case NODE_INT: case NODE_STR: case NODE_DSTR: @@ -1583,7 +1779,7 @@ prohibit_literals(parser_state *p, node *n) /* xxx ----------------------------- */ -#line 1587 "mrbgems/mruby-compiler/core/y.tab.c" +#line 1783 "mrbgems/mruby-compiler/core/y.tab.c" # ifndef YY_CAST # ifdef __cplusplus @@ -1754,7 +1950,7 @@ extern int yydebug; #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED union YYSTYPE { -#line 1530 "mrbgems/mruby-compiler/core/parse.y" +#line 1726 "mrbgems/mruby-compiler/core/parse.y" node *nd; mrb_sym id; @@ -1762,7 +1958,7 @@ union YYSTYPE stack_type stack; const struct vtable *vars; -#line 1766 "mrbgems/mruby-compiler/core/y.tab.c" +#line 1962 "mrbgems/mruby-compiler/core/y.tab.c" }; typedef union YYSTYPE YYSTYPE; @@ -2521,69 +2717,69 @@ static const yytype_uint8 yytranslate[] = /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_int16 yyrline[] = { - 0, 1701, 1701, 1701, 1711, 1717, 1721, 1725, 1729, 1735, - 1737, 1736, 1750, 1776, 1782, 1786, 1790, 1794, 1800, 1800, - 1804, 1808, 1812, 1816, 1825, 1834, 1838, 1843, 1844, 1848, - 1852, 1856, 1860, 1866, 1869, 1873, 1877, 1881, 1885, 1889, - 1894, 1898, 1907, 1916, 1925, 1934, 1941, 1942, 1946, 1950, - 1951, 1955, 1959, 1963, 1967, 1971, 1981, 1980, 1995, 2004, - 2005, 2008, 2009, 2016, 2015, 2030, 2034, 2039, 2043, 2048, - 2052, 2057, 2061, 2065, 2069, 2073, 2079, 2083, 2089, 2090, - 2096, 2100, 2104, 2108, 2112, 2116, 2120, 2124, 2128, 2132, - 2138, 2139, 2145, 2149, 2155, 2159, 2165, 2169, 2173, 2177, - 2181, 2185, 2191, 2197, 2204, 2208, 2212, 2216, 2220, 2224, - 2230, 2236, 2241, 2247, 2251, 2254, 2258, 2262, 2269, 2270, - 2271, 2272, 2277, 2284, 2285, 2288, 2292, 2292, 2298, 2299, - 2300, 2301, 2302, 2303, 2304, 2305, 2306, 2307, 2308, 2309, - 2310, 2311, 2312, 2313, 2314, 2315, 2316, 2317, 2318, 2319, - 2320, 2321, 2322, 2323, 2324, 2325, 2326, 2327, 2330, 2330, - 2330, 2331, 2331, 2332, 2332, 2332, 2333, 2333, 2333, 2333, - 2334, 2334, 2334, 2335, 2335, 2335, 2336, 2336, 2336, 2336, - 2337, 2337, 2337, 2337, 2338, 2338, 2338, 2338, 2339, 2339, - 2339, 2339, 2340, 2340, 2340, 2340, 2341, 2341, 2344, 2348, - 2352, 2356, 2360, 2364, 2368, 2373, 2378, 2383, 2387, 2391, - 2395, 2399, 2403, 2407, 2411, 2415, 2419, 2423, 2427, 2431, - 2435, 2439, 2443, 2447, 2451, 2455, 2459, 2463, 2467, 2471, - 2475, 2479, 2483, 2487, 2491, 2495, 2499, 2503, 2507, 2511, - 2515, 2519, 2523, 2527, 2531, 2540, 2549, 2558, 2567, 2573, - 2574, 2578, 2582, 2588, 2592, 2599, 2603, 2612, 2629, 2630, - 2633, 2634, 2635, 2639, 2643, 2649, 2654, 2658, 2662, 2666, - 2672, 2672, 2683, 2687, 2693, 2697, 2703, 2706, 2711, 2715, - 2719, 2724, 2728, 2734, 2739, 2743, 2749, 2750, 2751, 2752, - 2753, 2754, 2755, 2756, 2761, 2760, 2772, 2776, 2771, 2781, - 2781, 2785, 2789, 2793, 2797, 2801, 2805, 2809, 2813, 2817, - 2821, 2825, 2826, 2832, 2839, 2831, 2852, 2860, 2868, 2868, - 2868, 2875, 2875, 2875, 2882, 2888, 2893, 2895, 2892, 2904, - 2902, 2920, 2925, 2918, 2942, 2940, 2956, 2966, 2977, 2981, - 2985, 2989, 2995, 3002, 3003, 3004, 3007, 3008, 3011, 3012, - 3020, 3021, 3027, 3031, 3034, 3038, 3042, 3046, 3051, 3055, - 3059, 3063, 3069, 3068, 3078, 3082, 3086, 3090, 3096, 3101, - 3106, 3110, 3114, 3118, 3122, 3126, 3130, 3134, 3138, 3142, - 3146, 3150, 3154, 3158, 3162, 3168, 3173, 3180, 3180, 3184, - 3189, 3196, 3200, 3206, 3207, 3210, 3215, 3218, 3222, 3228, - 3232, 3239, 3238, 3255, 3265, 3269, 3274, 3281, 3285, 3289, - 3293, 3297, 3301, 3305, 3309, 3313, 3320, 3319, 3334, 3333, - 3349, 3357, 3366, 3369, 3376, 3379, 3383, 3384, 3387, 3391, - 3394, 3398, 3401, 3402, 3403, 3404, 3407, 3408, 3414, 3415, - 3416, 3420, 3433, 3434, 3440, 3445, 3444, 3454, 3458, 3464, - 3468, 3481, 3485, 3491, 3494, 3495, 3498, 3504, 3510, 3511, - 3514, 3521, 3520, 3533, 3537, 3551, 3555, 3567, 3574, 3581, - 3582, 3583, 3584, 3585, 3589, 3595, 3599, 3609, 3610, 3611, - 3615, 3621, 3625, 3629, 3633, 3637, 3643, 3647, 3653, 3657, - 3661, 3665, 3669, 3673, 3677, 3685, 3692, 3698, 3699, 3703, - 3707, 3706, 3723, 3724, 3727, 3733, 3737, 3743, 3744, 3748, - 3752, 3758, 3762, 3768, 3774, 3781, 3787, 3794, 3798, 3804, - 3808, 3814, 3815, 3818, 3822, 3828, 3832, 3836, 3840, 3846, - 3851, 3856, 3860, 3864, 3868, 3872, 3876, 3880, 3884, 3888, - 3892, 3896, 3900, 3904, 3908, 3913, 3919, 3924, 3929, 3934, - 3939, 3946, 3950, 3957, 3962, 3961, 3973, 3977, 3983, 3991, - 3999, 4007, 4011, 4017, 4021, 4027, 4028, 4031, 4036, 4043, - 4044, 4047, 4051, 4057, 4061, 4067, 4073, 4073, 4080, 4081, - 4087, 4091, 4097, 4103, 4108, 4112, 4117, 4122, 4132, 4137, - 4143, 4144, 4145, 4148, 4149, 4150, 4151, 4154, 4155, 4156, - 4159, 4160, 4163, 4167, 4173, 4174, 4180, 4181, 4184, 4185, - 4188, 4191, 4192, 4193, 4196, 4197, 4200, 4205, 4208, 4209, - 4213 + 0, 1897, 1897, 1897, 1907, 1913, 1917, 1921, 1925, 1931, + 1933, 1932, 1946, 1972, 1978, 1982, 1986, 1990, 1996, 1996, + 2000, 2004, 2008, 2012, 2021, 2030, 2034, 2039, 2040, 2044, + 2048, 2052, 2056, 2062, 2065, 2069, 2073, 2077, 2081, 2085, + 2090, 2094, 2103, 2112, 2121, 2130, 2137, 2138, 2142, 2146, + 2147, 2151, 2155, 2159, 2163, 2167, 2177, 2176, 2191, 2200, + 2201, 2204, 2205, 2212, 2211, 2226, 2230, 2235, 2239, 2244, + 2248, 2253, 2257, 2261, 2265, 2269, 2275, 2279, 2285, 2286, + 2292, 2296, 2300, 2304, 2308, 2312, 2316, 2320, 2324, 2328, + 2334, 2335, 2341, 2345, 2351, 2355, 2361, 2365, 2369, 2373, + 2377, 2381, 2387, 2393, 2400, 2404, 2408, 2412, 2416, 2420, + 2426, 2432, 2437, 2443, 2447, 2450, 2454, 2458, 2465, 2466, + 2467, 2468, 2473, 2480, 2481, 2484, 2488, 2488, 2494, 2495, + 2496, 2497, 2498, 2499, 2500, 2501, 2502, 2503, 2504, 2505, + 2506, 2507, 2508, 2509, 2510, 2511, 2512, 2513, 2514, 2515, + 2516, 2517, 2518, 2519, 2520, 2521, 2522, 2523, 2526, 2526, + 2526, 2527, 2527, 2528, 2528, 2528, 2529, 2529, 2529, 2529, + 2530, 2530, 2530, 2531, 2531, 2531, 2532, 2532, 2532, 2532, + 2533, 2533, 2533, 2533, 2534, 2534, 2534, 2534, 2535, 2535, + 2535, 2535, 2536, 2536, 2536, 2536, 2537, 2537, 2540, 2544, + 2548, 2552, 2556, 2560, 2564, 2569, 2574, 2579, 2583, 2587, + 2591, 2595, 2599, 2603, 2607, 2611, 2615, 2619, 2623, 2627, + 2631, 2635, 2639, 2643, 2647, 2651, 2655, 2659, 2663, 2667, + 2671, 2675, 2679, 2683, 2687, 2691, 2695, 2699, 2703, 2707, + 2711, 2715, 2719, 2723, 2727, 2736, 2745, 2754, 2763, 2769, + 2770, 2774, 2778, 2784, 2788, 2795, 2799, 2808, 2825, 2826, + 2829, 2830, 2831, 2835, 2839, 2845, 2850, 2854, 2858, 2862, + 2868, 2868, 2879, 2883, 2889, 2893, 2899, 2902, 2907, 2911, + 2915, 2920, 2924, 2930, 2935, 2939, 2945, 2946, 2947, 2948, + 2949, 2950, 2951, 2952, 2957, 2956, 2968, 2972, 2967, 2977, + 2977, 2981, 2985, 2989, 2993, 2997, 3001, 3005, 3009, 3013, + 3017, 3021, 3022, 3028, 3035, 3027, 3048, 3056, 3064, 3064, + 3064, 3071, 3071, 3071, 3078, 3084, 3089, 3091, 3088, 3100, + 3098, 3116, 3121, 3114, 3138, 3136, 3152, 3162, 3173, 3177, + 3181, 3185, 3191, 3198, 3199, 3200, 3203, 3204, 3207, 3208, + 3216, 3217, 3223, 3227, 3230, 3234, 3238, 3242, 3247, 3251, + 3255, 3259, 3265, 3264, 3274, 3278, 3282, 3286, 3292, 3297, + 3302, 3306, 3310, 3314, 3318, 3322, 3326, 3330, 3334, 3338, + 3342, 3346, 3350, 3354, 3358, 3364, 3369, 3376, 3376, 3380, + 3385, 3392, 3396, 3402, 3403, 3406, 3411, 3414, 3418, 3424, + 3428, 3435, 3434, 3451, 3461, 3465, 3470, 3477, 3481, 3485, + 3489, 3493, 3497, 3501, 3505, 3509, 3516, 3515, 3530, 3529, + 3545, 3553, 3562, 3565, 3572, 3575, 3579, 3580, 3583, 3587, + 3590, 3594, 3597, 3598, 3599, 3600, 3603, 3604, 3610, 3611, + 3612, 3616, 3629, 3630, 3636, 3641, 3640, 3650, 3654, 3660, + 3664, 3677, 3681, 3687, 3690, 3691, 3694, 3700, 3706, 3707, + 3710, 3717, 3716, 3729, 3733, 3747, 3751, 3763, 3770, 3777, + 3778, 3779, 3780, 3781, 3785, 3791, 3795, 3805, 3806, 3807, + 3811, 3817, 3821, 3825, 3829, 3833, 3839, 3843, 3849, 3853, + 3857, 3861, 3865, 3869, 3873, 3881, 3888, 3894, 3895, 3899, + 3903, 3902, 3919, 3920, 3923, 3929, 3933, 3939, 3940, 3944, + 3948, 3954, 3958, 3964, 3970, 3977, 3983, 3990, 3994, 4000, + 4004, 4010, 4011, 4014, 4018, 4024, 4028, 4032, 4036, 4042, + 4047, 4052, 4056, 4060, 4064, 4068, 4072, 4076, 4080, 4084, + 4088, 4092, 4096, 4100, 4104, 4109, 4115, 4120, 4125, 4130, + 4135, 4142, 4146, 4153, 4158, 4157, 4169, 4173, 4179, 4187, + 4195, 4203, 4207, 4213, 4217, 4223, 4224, 4227, 4232, 4239, + 4240, 4243, 4247, 4253, 4257, 4263, 4269, 4269, 4276, 4277, + 4283, 4287, 4293, 4299, 4304, 4308, 4313, 4318, 4328, 4333, + 4339, 4340, 4341, 4344, 4345, 4346, 4347, 4350, 4351, 4352, + 4355, 4356, 4359, 4363, 4369, 4370, 4376, 4377, 4380, 4381, + 4384, 4387, 4388, 4389, 4392, 4393, 4396, 4401, 4404, 4405, + 4409 }; #endif @@ -6560,7 +6756,7 @@ YYLTYPE yylloc = yyloc_default; -#line 6564 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6760 "mrbgems/mruby-compiler/core/y.tab.c" yylsp[0] = yylloc; goto yysetstate; @@ -6773,84 +6969,84 @@ yyreduce: switch (yyn) { case 2: /* $@1: %empty */ -#line 1701 "mrbgems/mruby-compiler/core/parse.y" +#line 1897 "mrbgems/mruby-compiler/core/parse.y" { p->lstate = EXPR_BEG; if (!p->locals) p->locals = cons(0,0); } -#line 6782 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6978 "mrbgems/mruby-compiler/core/y.tab.c" break; case 3: /* program: $@1 top_compstmt */ -#line 1706 "mrbgems/mruby-compiler/core/parse.y" +#line 1902 "mrbgems/mruby-compiler/core/parse.y" { p->tree = new_scope(p, (yyvsp[0].nd)); } -#line 6790 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6986 "mrbgems/mruby-compiler/core/y.tab.c" break; case 4: /* top_compstmt: top_stmts opt_terms */ -#line 1712 "mrbgems/mruby-compiler/core/parse.y" +#line 1908 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-1].nd); } -#line 6798 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6994 "mrbgems/mruby-compiler/core/y.tab.c" break; case 5: /* top_stmts: none */ -#line 1718 "mrbgems/mruby-compiler/core/parse.y" +#line 1914 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_stmts(p, 0); } -#line 6806 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7002 "mrbgems/mruby-compiler/core/y.tab.c" break; case 6: /* top_stmts: top_stmt */ -#line 1722 "mrbgems/mruby-compiler/core/parse.y" +#line 1918 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_stmts(p, (yyvsp[0].nd)); } -#line 6814 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7010 "mrbgems/mruby-compiler/core/y.tab.c" break; case 7: /* top_stmts: top_stmts terms top_stmt */ -#line 1726 "mrbgems/mruby-compiler/core/parse.y" +#line 1922 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = push((yyvsp[-2].nd), newline_node((yyvsp[0].nd))); } -#line 6822 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7018 "mrbgems/mruby-compiler/core/y.tab.c" break; case 8: /* top_stmts: error top_stmt */ -#line 1730 "mrbgems/mruby-compiler/core/parse.y" +#line 1926 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_stmts(p, 0); } -#line 6830 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7026 "mrbgems/mruby-compiler/core/y.tab.c" break; case 10: /* @2: %empty */ -#line 1737 "mrbgems/mruby-compiler/core/parse.y" +#line 1933 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = local_switch(p); nvars_block(p); } -#line 6839 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7035 "mrbgems/mruby-compiler/core/y.tab.c" break; case 11: /* top_stmt: "'BEGIN'" @2 '{' top_compstmt '}' */ -#line 1742 "mrbgems/mruby-compiler/core/parse.y" +#line 1938 "mrbgems/mruby-compiler/core/parse.y" { yyerror(&(yylsp[-4]), p, "BEGIN not supported"); local_resume(p, (yyvsp[-3].nd)); nvars_unnest(p); (yyval.nd) = 0; } -#line 6850 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7046 "mrbgems/mruby-compiler/core/y.tab.c" break; case 12: /* bodystmt: compstmt opt_rescue opt_else opt_ensure */ -#line 1754 "mrbgems/mruby-compiler/core/parse.y" +#line 1950 "mrbgems/mruby-compiler/core/parse.y" { if ((yyvsp[-2].nd)) { (yyval.nd) = new_rescue(p, (yyvsp[-3].nd), (yyvsp[-2].nd), (yyvsp[-1].nd)); @@ -6871,231 +7067,231 @@ yyreduce: } } } -#line 6875 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7071 "mrbgems/mruby-compiler/core/y.tab.c" break; case 13: /* compstmt: stmts opt_terms */ -#line 1777 "mrbgems/mruby-compiler/core/parse.y" +#line 1973 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-1].nd); } -#line 6883 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7079 "mrbgems/mruby-compiler/core/y.tab.c" break; case 14: /* stmts: none */ -#line 1783 "mrbgems/mruby-compiler/core/parse.y" +#line 1979 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_stmts(p, 0); } -#line 6891 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7087 "mrbgems/mruby-compiler/core/y.tab.c" break; case 15: /* stmts: stmt */ -#line 1787 "mrbgems/mruby-compiler/core/parse.y" +#line 1983 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_stmts(p, (yyvsp[0].nd)); } -#line 6899 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7095 "mrbgems/mruby-compiler/core/y.tab.c" break; case 16: /* stmts: stmts terms stmt */ -#line 1791 "mrbgems/mruby-compiler/core/parse.y" +#line 1987 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = push((yyvsp[-2].nd), newline_node((yyvsp[0].nd))); } -#line 6907 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7103 "mrbgems/mruby-compiler/core/y.tab.c" break; case 17: /* stmts: error stmt */ -#line 1795 "mrbgems/mruby-compiler/core/parse.y" +#line 1991 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_stmts(p, (yyvsp[0].nd)); } -#line 6915 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7111 "mrbgems/mruby-compiler/core/y.tab.c" break; case 18: /* $@3: %empty */ -#line 1800 "mrbgems/mruby-compiler/core/parse.y" +#line 1996 "mrbgems/mruby-compiler/core/parse.y" {p->lstate = EXPR_FNAME;} -#line 6921 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7117 "mrbgems/mruby-compiler/core/y.tab.c" break; case 19: /* stmt: "'alias'" fsym $@3 fsym */ -#line 1801 "mrbgems/mruby-compiler/core/parse.y" +#line 1997 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_alias(p, (yyvsp[-2].id), (yyvsp[0].id)); } -#line 6929 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7125 "mrbgems/mruby-compiler/core/y.tab.c" break; case 20: /* stmt: "'undef'" undef_list */ -#line 1805 "mrbgems/mruby-compiler/core/parse.y" +#line 2001 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[0].nd); } -#line 6937 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7133 "mrbgems/mruby-compiler/core/y.tab.c" break; case 21: /* stmt: stmt "'if' modifier" expr_value */ -#line 1809 "mrbgems/mruby-compiler/core/parse.y" +#line 2005 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_if(p, cond((yyvsp[0].nd)), (yyvsp[-2].nd), 0); } -#line 6945 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7141 "mrbgems/mruby-compiler/core/y.tab.c" break; case 22: /* stmt: stmt "'unless' modifier" expr_value */ -#line 1813 "mrbgems/mruby-compiler/core/parse.y" +#line 2009 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_unless(p, cond((yyvsp[0].nd)), (yyvsp[-2].nd), 0); } -#line 6953 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7149 "mrbgems/mruby-compiler/core/y.tab.c" break; case 23: /* stmt: stmt "'while' modifier" expr_value */ -#line 1817 "mrbgems/mruby-compiler/core/parse.y" +#line 2013 "mrbgems/mruby-compiler/core/parse.y" { - if ((yyvsp[-2].nd) && typen((yyvsp[-2].nd)->car) == NODE_BEGIN) { + if ((yyvsp[-2].nd) && node_to_type((yyvsp[-2].nd)->car) == NODE_BEGIN) { (yyval.nd) = new_while_mod(p, cond((yyvsp[0].nd)), (yyvsp[-2].nd)); } else { (yyval.nd) = new_while(p, cond((yyvsp[0].nd)), (yyvsp[-2].nd)); } } -#line 6966 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7162 "mrbgems/mruby-compiler/core/y.tab.c" break; case 24: /* stmt: stmt "'until' modifier" expr_value */ -#line 1826 "mrbgems/mruby-compiler/core/parse.y" +#line 2022 "mrbgems/mruby-compiler/core/parse.y" { - if ((yyvsp[-2].nd) && typen((yyvsp[-2].nd)->car) == NODE_BEGIN) { + if ((yyvsp[-2].nd) && node_to_type((yyvsp[-2].nd)->car) == NODE_BEGIN) { (yyval.nd) = new_until_mod(p, cond((yyvsp[0].nd)), (yyvsp[-2].nd)); } else { (yyval.nd) = new_until(p, cond((yyvsp[0].nd)), (yyvsp[-2].nd)); } } -#line 6979 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7175 "mrbgems/mruby-compiler/core/y.tab.c" break; case 25: /* stmt: stmt "'rescue' modifier" stmt */ -#line 1835 "mrbgems/mruby-compiler/core/parse.y" +#line 2031 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_mod_rescue(p, (yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 6987 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7183 "mrbgems/mruby-compiler/core/y.tab.c" break; case 26: /* stmt: "'END'" '{' compstmt '}' */ -#line 1839 "mrbgems/mruby-compiler/core/parse.y" +#line 2035 "mrbgems/mruby-compiler/core/parse.y" { yyerror(&(yylsp[-3]), p, "END not supported"); (yyval.nd) = new_postexe(p, (yyvsp[-1].nd)); } -#line 6996 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7192 "mrbgems/mruby-compiler/core/y.tab.c" break; case 28: /* stmt: mlhs '=' command_call */ -#line 1845 "mrbgems/mruby-compiler/core/parse.y" +#line 2041 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_masgn(p, (yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 7004 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7200 "mrbgems/mruby-compiler/core/y.tab.c" break; case 29: /* stmt: lhs '=' mrhs */ -#line 1849 "mrbgems/mruby-compiler/core/parse.y" +#line 2045 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_asgn(p, (yyvsp[-2].nd), new_array(p, (yyvsp[0].nd))); } -#line 7012 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7208 "mrbgems/mruby-compiler/core/y.tab.c" break; case 30: /* stmt: mlhs '=' arg */ -#line 1853 "mrbgems/mruby-compiler/core/parse.y" +#line 2049 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_masgn(p, (yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 7020 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7216 "mrbgems/mruby-compiler/core/y.tab.c" break; case 31: /* stmt: mlhs '=' mrhs */ -#line 1857 "mrbgems/mruby-compiler/core/parse.y" +#line 2053 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_masgn(p, (yyvsp[-2].nd), new_array(p, (yyvsp[0].nd))); } -#line 7028 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7224 "mrbgems/mruby-compiler/core/y.tab.c" break; case 32: /* stmt: arg "=>" "local variable or method" */ -#line 1861 "mrbgems/mruby-compiler/core/parse.y" +#line 2057 "mrbgems/mruby-compiler/core/parse.y" { node *lhs = new_lvar(p, (yyvsp[0].id)); assignable(p, lhs); (yyval.nd) = new_asgn(p, lhs, (yyvsp[-2].nd)); } -#line 7038 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7234 "mrbgems/mruby-compiler/core/y.tab.c" break; case 34: /* command_asgn: lhs '=' command_rhs */ -#line 1870 "mrbgems/mruby-compiler/core/parse.y" +#line 2066 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_asgn(p, (yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 7046 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7242 "mrbgems/mruby-compiler/core/y.tab.c" break; case 35: /* command_asgn: var_lhs tOP_ASGN command_rhs */ -#line 1874 "mrbgems/mruby-compiler/core/parse.y" +#line 2070 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_op_asgn(p, (yyvsp[-2].nd), (yyvsp[-1].id), (yyvsp[0].nd)); } -#line 7054 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7250 "mrbgems/mruby-compiler/core/y.tab.c" break; case 36: /* command_asgn: primary_value '[' opt_call_args ']' tOP_ASGN command_rhs */ -#line 1878 "mrbgems/mruby-compiler/core/parse.y" +#line 2074 "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 7062 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7258 "mrbgems/mruby-compiler/core/y.tab.c" break; case 37: /* command_asgn: primary_value call_op "local variable or method" tOP_ASGN command_rhs */ -#line 1882 "mrbgems/mruby-compiler/core/parse.y" +#line 2078 "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 7070 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7266 "mrbgems/mruby-compiler/core/y.tab.c" break; case 38: /* command_asgn: primary_value call_op "constant" tOP_ASGN command_rhs */ -#line 1886 "mrbgems/mruby-compiler/core/parse.y" +#line 2082 "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 7078 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7274 "mrbgems/mruby-compiler/core/y.tab.c" break; case 39: /* command_asgn: primary_value "::" "constant" tOP_ASGN command_call */ -#line 1890 "mrbgems/mruby-compiler/core/parse.y" +#line 2086 "mrbgems/mruby-compiler/core/parse.y" { yyerror(&(yylsp[-4]), p, "constant re-assignment"); (yyval.nd) = 0; } -#line 7087 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7283 "mrbgems/mruby-compiler/core/y.tab.c" break; case 40: /* command_asgn: primary_value "::" "local variable or method" tOP_ASGN command_rhs */ -#line 1895 "mrbgems/mruby-compiler/core/parse.y" +#line 2091 "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 7095 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7291 "mrbgems/mruby-compiler/core/y.tab.c" break; case 41: /* command_asgn: defn_head f_opt_arglist_paren '=' command */ -#line 1899 "mrbgems/mruby-compiler/core/parse.y" +#line 2095 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-3].nd); endless_method_name(p, (yyvsp[-3].nd)); @@ -7104,11 +7300,11 @@ yyreduce: nvars_unnest(p); p->in_def--; } -#line 7108 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7304 "mrbgems/mruby-compiler/core/y.tab.c" break; case 42: /* command_asgn: defn_head f_opt_arglist_paren '=' command "'rescue' modifier" arg */ -#line 1908 "mrbgems/mruby-compiler/core/parse.y" +#line 2104 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-5].nd); endless_method_name(p, (yyvsp[-5].nd)); @@ -7117,11 +7313,11 @@ yyreduce: nvars_unnest(p); p->in_def--; } -#line 7121 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7317 "mrbgems/mruby-compiler/core/y.tab.c" break; case 43: /* command_asgn: defs_head f_opt_arglist_paren '=' command */ -#line 1917 "mrbgems/mruby-compiler/core/parse.y" +#line 2113 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-3].nd); void_expr_error(p, (yyvsp[0].nd)); @@ -7130,11 +7326,11 @@ yyreduce: p->in_def--; p->in_single--; } -#line 7134 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7330 "mrbgems/mruby-compiler/core/y.tab.c" break; case 44: /* command_asgn: defs_head f_opt_arglist_paren '=' command "'rescue' modifier" arg */ -#line 1926 "mrbgems/mruby-compiler/core/parse.y" +#line 2122 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-5].nd); void_expr_error(p, (yyvsp[-2].nd)); @@ -7143,1135 +7339,1135 @@ yyreduce: p->in_def--; p->in_single--; } -#line 7147 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7343 "mrbgems/mruby-compiler/core/y.tab.c" break; case 45: /* command_asgn: backref tOP_ASGN command_rhs */ -#line 1935 "mrbgems/mruby-compiler/core/parse.y" +#line 2131 "mrbgems/mruby-compiler/core/parse.y" { backref_error(p, (yyvsp[-2].nd)); (yyval.nd) = new_stmts(p, 0); } -#line 7156 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7352 "mrbgems/mruby-compiler/core/y.tab.c" break; case 47: /* command_rhs: command_call "'rescue' modifier" stmt */ -#line 1943 "mrbgems/mruby-compiler/core/parse.y" +#line 2139 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_mod_rescue(p, (yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 7164 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7360 "mrbgems/mruby-compiler/core/y.tab.c" break; case 50: /* expr: expr "'and'" expr */ -#line 1952 "mrbgems/mruby-compiler/core/parse.y" +#line 2148 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_and(p, (yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 7172 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7368 "mrbgems/mruby-compiler/core/y.tab.c" break; case 51: /* expr: expr "'or'" expr */ -#line 1956 "mrbgems/mruby-compiler/core/parse.y" +#line 2152 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_or(p, (yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 7180 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7376 "mrbgems/mruby-compiler/core/y.tab.c" break; case 52: /* expr: "'not'" opt_nl expr */ -#line 1960 "mrbgems/mruby-compiler/core/parse.y" +#line 2156 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_uni_op(p, cond((yyvsp[0].nd)), "!"); } -#line 7188 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7384 "mrbgems/mruby-compiler/core/y.tab.c" break; case 53: /* expr: '!' command_call */ -#line 1964 "mrbgems/mruby-compiler/core/parse.y" +#line 2160 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_uni_op(p, cond((yyvsp[0].nd)), "!"); } -#line 7196 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7392 "mrbgems/mruby-compiler/core/y.tab.c" break; case 55: /* defn_head: "'def'" fname */ -#line 1972 "mrbgems/mruby-compiler/core/parse.y" +#line 2168 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_def(p, (yyvsp[0].id), nint(p->cmdarg_stack), local_switch(p)); + (yyval.nd) = new_def(p, (yyvsp[0].id), int_to_node(p->cmdarg_stack), local_switch(p)); p->cmdarg_stack = 0; p->in_def++; nvars_block(p); } -#line 7207 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7403 "mrbgems/mruby-compiler/core/y.tab.c" break; case 56: /* $@4: %empty */ -#line 1981 "mrbgems/mruby-compiler/core/parse.y" +#line 2177 "mrbgems/mruby-compiler/core/parse.y" { p->lstate = EXPR_FNAME; } -#line 7215 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7411 "mrbgems/mruby-compiler/core/y.tab.c" break; case 57: /* defs_head: "'def'" singleton dot_or_colon $@4 fname */ -#line 1985 "mrbgems/mruby-compiler/core/parse.y" +#line 2181 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_sdef(p, (yyvsp[-3].nd), (yyvsp[0].id), nint(p->cmdarg_stack), local_switch(p)); + (yyval.nd) = new_sdef(p, (yyvsp[-3].nd), (yyvsp[0].id), int_to_node(p->cmdarg_stack), local_switch(p)); p->cmdarg_stack = 0; p->in_def++; p->in_single++; nvars_block(p); p->lstate = EXPR_ENDFN; /* force for args */ } -#line 7228 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7424 "mrbgems/mruby-compiler/core/y.tab.c" break; case 58: /* expr_value: expr */ -#line 1996 "mrbgems/mruby-compiler/core/parse.y" +#line 2192 "mrbgems/mruby-compiler/core/parse.y" { if (!(yyvsp[0].nd)) (yyval.nd) = new_nil(p); else { (yyval.nd) = (yyvsp[0].nd); } } -#line 7239 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7435 "mrbgems/mruby-compiler/core/y.tab.c" break; case 62: /* block_command: block_call call_op2 operation2 command_args */ -#line 2010 "mrbgems/mruby-compiler/core/parse.y" +#line 2206 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_call(p, (yyvsp[-3].nd), (yyvsp[-1].id), (yyvsp[0].nd), (yyvsp[-2].num)); } -#line 7247 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7443 "mrbgems/mruby-compiler/core/y.tab.c" break; case 63: /* $@5: %empty */ -#line 2016 "mrbgems/mruby-compiler/core/parse.y" +#line 2212 "mrbgems/mruby-compiler/core/parse.y" { local_nest(p); nvars_nest(p); } -#line 7256 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7452 "mrbgems/mruby-compiler/core/y.tab.c" break; case 64: /* cmd_brace_block: "{" $@5 opt_block_param compstmt '}' */ -#line 2023 "mrbgems/mruby-compiler/core/parse.y" +#line 2219 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_block(p, (yyvsp[-2].nd), (yyvsp[-1].nd)); local_unnest(p); nvars_unnest(p); } -#line 7266 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7462 "mrbgems/mruby-compiler/core/y.tab.c" break; case 65: /* command: operation command_args */ -#line 2031 "mrbgems/mruby-compiler/core/parse.y" +#line 2227 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_fcall(p, (yyvsp[-1].id), (yyvsp[0].nd)); } -#line 7274 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7470 "mrbgems/mruby-compiler/core/y.tab.c" break; case 66: /* command: operation command_args cmd_brace_block */ -#line 2035 "mrbgems/mruby-compiler/core/parse.y" +#line 2231 "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 7283 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7479 "mrbgems/mruby-compiler/core/y.tab.c" break; case 67: /* command: primary_value call_op operation2 command_args */ -#line 2040 "mrbgems/mruby-compiler/core/parse.y" +#line 2236 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_call(p, (yyvsp[-3].nd), (yyvsp[-1].id), (yyvsp[0].nd), (yyvsp[-2].num)); } -#line 7291 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7487 "mrbgems/mruby-compiler/core/y.tab.c" break; case 68: /* command: primary_value call_op operation2 command_args cmd_brace_block */ -#line 2044 "mrbgems/mruby-compiler/core/parse.y" +#line 2240 "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 7300 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7496 "mrbgems/mruby-compiler/core/y.tab.c" break; case 69: /* command: primary_value "::" operation2 command_args */ -#line 2049 "mrbgems/mruby-compiler/core/parse.y" +#line 2245 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_call(p, (yyvsp[-3].nd), (yyvsp[-1].id), (yyvsp[0].nd), tCOLON2); } -#line 7308 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7504 "mrbgems/mruby-compiler/core/y.tab.c" break; case 70: /* command: primary_value "::" operation2 command_args cmd_brace_block */ -#line 2053 "mrbgems/mruby-compiler/core/parse.y" +#line 2249 "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 7317 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7513 "mrbgems/mruby-compiler/core/y.tab.c" break; case 71: /* command: "'super'" command_args */ -#line 2058 "mrbgems/mruby-compiler/core/parse.y" +#line 2254 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_super(p, (yyvsp[0].nd)); } -#line 7325 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7521 "mrbgems/mruby-compiler/core/y.tab.c" break; case 72: /* command: "'yield'" command_args */ -#line 2062 "mrbgems/mruby-compiler/core/parse.y" +#line 2258 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_yield(p, (yyvsp[0].nd)); } -#line 7333 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7529 "mrbgems/mruby-compiler/core/y.tab.c" break; case 73: /* command: "'return'" call_args */ -#line 2066 "mrbgems/mruby-compiler/core/parse.y" +#line 2262 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_return(p, ret_args(p, (yyvsp[0].nd))); } -#line 7341 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7537 "mrbgems/mruby-compiler/core/y.tab.c" break; case 74: /* command: "'break'" call_args */ -#line 2070 "mrbgems/mruby-compiler/core/parse.y" +#line 2266 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_break(p, ret_args(p, (yyvsp[0].nd))); } -#line 7349 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7545 "mrbgems/mruby-compiler/core/y.tab.c" break; case 75: /* command: "'next'" call_args */ -#line 2074 "mrbgems/mruby-compiler/core/parse.y" +#line 2270 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_next(p, ret_args(p, (yyvsp[0].nd))); } -#line 7357 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7553 "mrbgems/mruby-compiler/core/y.tab.c" break; case 76: /* mlhs: mlhs_basic */ -#line 2080 "mrbgems/mruby-compiler/core/parse.y" +#line 2276 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[0].nd); } -#line 7365 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 77: /* mlhs: tLPAREN mlhs_inner rparen */ -#line 2084 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = (yyvsp[-1].nd); - } -#line 7373 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 79: /* mlhs_inner: tLPAREN mlhs_inner rparen */ -#line 2091 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = (yyvsp[-1].nd); - } -#line 7381 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 80: /* mlhs_basic: mlhs_list */ -#line 2097 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = list1((yyvsp[0].nd)); - } -#line 7389 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 81: /* mlhs_basic: mlhs_list mlhs_item */ -#line 2101 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = list1(push((yyvsp[-1].nd),(yyvsp[0].nd))); - } -#line 7397 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 82: /* mlhs_basic: mlhs_list "*" mlhs_node */ -#line 2105 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = list2((yyvsp[-2].nd), (yyvsp[0].nd)); - } -#line 7405 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 83: /* mlhs_basic: mlhs_list "*" mlhs_node ',' mlhs_post */ -#line 2109 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = list3((yyvsp[-4].nd), (yyvsp[-2].nd), (yyvsp[0].nd)); - } -#line 7413 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 84: /* mlhs_basic: mlhs_list "*" */ -#line 2113 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = list2((yyvsp[-1].nd), new_nil(p)); - } -#line 7421 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 85: /* mlhs_basic: mlhs_list "*" ',' mlhs_post */ -#line 2117 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = list3((yyvsp[-3].nd), new_nil(p), (yyvsp[0].nd)); - } -#line 7429 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 86: /* mlhs_basic: "*" mlhs_node */ -#line 2121 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = list2(0, (yyvsp[0].nd)); - } -#line 7437 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 87: /* mlhs_basic: "*" mlhs_node ',' mlhs_post */ -#line 2125 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = list3(0, (yyvsp[-2].nd), (yyvsp[0].nd)); - } -#line 7445 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 88: /* mlhs_basic: "*" */ -#line 2129 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = list2(0, new_nil(p)); - } -#line 7453 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 89: /* mlhs_basic: "*" ',' mlhs_post */ -#line 2133 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = list3(0, new_nil(p), (yyvsp[0].nd)); - } -#line 7461 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 91: /* mlhs_item: tLPAREN mlhs_inner rparen */ -#line 2140 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_masgn(p, (yyvsp[-1].nd), NULL); - } -#line 7469 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 92: /* mlhs_list: mlhs_item ',' */ -#line 2146 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = list1((yyvsp[-1].nd)); - } -#line 7477 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 93: /* mlhs_list: mlhs_list mlhs_item ',' */ -#line 2150 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[-1].nd)); - } -#line 7485 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 94: /* mlhs_post: mlhs_item */ -#line 2156 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = list1((yyvsp[0].nd)); - } -#line 7493 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 95: /* mlhs_post: mlhs_list mlhs_item */ -#line 2160 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = push((yyvsp[-1].nd), (yyvsp[0].nd)); - } -#line 7501 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 96: /* mlhs_node: variable */ -#line 2166 "mrbgems/mruby-compiler/core/parse.y" - { - assignable(p, (yyvsp[0].nd)); - } -#line 7509 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 97: /* mlhs_node: primary_value '[' opt_call_args ']' */ -#line 2170 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_call(p, (yyvsp[-3].nd), intern_op(aref), (yyvsp[-1].nd), '.'); - } -#line 7517 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 98: /* mlhs_node: primary_value call_op "local variable or method" */ -#line 2174 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_call(p, (yyvsp[-2].nd), (yyvsp[0].id), 0, (yyvsp[-1].num)); - } -#line 7525 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 99: /* mlhs_node: primary_value "::" "local variable or method" */ -#line 2178 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_call(p, (yyvsp[-2].nd), (yyvsp[0].id), 0, tCOLON2); - } -#line 7533 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 100: /* mlhs_node: primary_value call_op "constant" */ -#line 2182 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_call(p, (yyvsp[-2].nd), (yyvsp[0].id), 0, (yyvsp[-1].num)); - } -#line 7541 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 101: /* mlhs_node: primary_value "::" "constant" */ -#line 2186 "mrbgems/mruby-compiler/core/parse.y" - { - if (p->in_def || p->in_single) - yyerror(&(yylsp[-2]), p, "dynamic constant assignment"); - (yyval.nd) = new_colon2(p, (yyvsp[-2].nd), (yyvsp[0].id)); - } -#line 7551 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 102: /* mlhs_node: tCOLON3 "constant" */ -#line 2192 "mrbgems/mruby-compiler/core/parse.y" - { - if (p->in_def || p->in_single) - yyerror(&(yylsp[-1]), p, "dynamic constant assignment"); - (yyval.nd) = new_colon3(p, (yyvsp[0].id)); - } #line 7561 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 103: /* mlhs_node: backref */ -#line 2198 "mrbgems/mruby-compiler/core/parse.y" + case 77: /* mlhs: tLPAREN mlhs_inner rparen */ +#line 2280 "mrbgems/mruby-compiler/core/parse.y" { - backref_error(p, (yyvsp[0].nd)); - (yyval.nd) = 0; + (yyval.nd) = (yyvsp[-1].nd); } -#line 7570 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7569 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 104: /* lhs: variable */ -#line 2205 "mrbgems/mruby-compiler/core/parse.y" + case 79: /* mlhs_inner: tLPAREN mlhs_inner rparen */ +#line 2287 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = (yyvsp[-1].nd); + } +#line 7577 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 80: /* mlhs_basic: mlhs_list */ +#line 2293 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = list1((yyvsp[0].nd)); + } +#line 7585 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 81: /* mlhs_basic: mlhs_list mlhs_item */ +#line 2297 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = list1(push((yyvsp[-1].nd),(yyvsp[0].nd))); + } +#line 7593 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 82: /* mlhs_basic: mlhs_list "*" mlhs_node */ +#line 2301 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = list2((yyvsp[-2].nd), (yyvsp[0].nd)); + } +#line 7601 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 83: /* mlhs_basic: mlhs_list "*" mlhs_node ',' mlhs_post */ +#line 2305 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = list3((yyvsp[-4].nd), (yyvsp[-2].nd), (yyvsp[0].nd)); + } +#line 7609 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 84: /* mlhs_basic: mlhs_list "*" */ +#line 2309 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = list2((yyvsp[-1].nd), new_nil(p)); + } +#line 7617 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 85: /* mlhs_basic: mlhs_list "*" ',' mlhs_post */ +#line 2313 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = list3((yyvsp[-3].nd), new_nil(p), (yyvsp[0].nd)); + } +#line 7625 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 86: /* mlhs_basic: "*" mlhs_node */ +#line 2317 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = list2(0, (yyvsp[0].nd)); + } +#line 7633 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 87: /* mlhs_basic: "*" mlhs_node ',' mlhs_post */ +#line 2321 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = list3(0, (yyvsp[-2].nd), (yyvsp[0].nd)); + } +#line 7641 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 88: /* mlhs_basic: "*" */ +#line 2325 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = list2(0, new_nil(p)); + } +#line 7649 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 89: /* mlhs_basic: "*" ',' mlhs_post */ +#line 2329 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = list3(0, new_nil(p), (yyvsp[0].nd)); + } +#line 7657 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 91: /* mlhs_item: tLPAREN mlhs_inner rparen */ +#line 2336 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_masgn(p, (yyvsp[-1].nd), NULL); + } +#line 7665 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 92: /* mlhs_list: mlhs_item ',' */ +#line 2342 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = list1((yyvsp[-1].nd)); + } +#line 7673 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 93: /* mlhs_list: mlhs_list mlhs_item ',' */ +#line 2346 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[-1].nd)); + } +#line 7681 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 94: /* mlhs_post: mlhs_item */ +#line 2352 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = list1((yyvsp[0].nd)); + } +#line 7689 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 95: /* mlhs_post: mlhs_list mlhs_item */ +#line 2356 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = push((yyvsp[-1].nd), (yyvsp[0].nd)); + } +#line 7697 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 96: /* mlhs_node: variable */ +#line 2362 "mrbgems/mruby-compiler/core/parse.y" { assignable(p, (yyvsp[0].nd)); } -#line 7578 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7705 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 105: /* lhs: primary_value '[' opt_call_args ']' */ -#line 2209 "mrbgems/mruby-compiler/core/parse.y" + case 97: /* mlhs_node: primary_value '[' opt_call_args ']' */ +#line 2366 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_call(p, (yyvsp[-3].nd), intern_op(aref), (yyvsp[-1].nd), '.'); } -#line 7586 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7713 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 106: /* lhs: primary_value call_op "local variable or method" */ -#line 2213 "mrbgems/mruby-compiler/core/parse.y" + case 98: /* mlhs_node: primary_value call_op "local variable or method" */ +#line 2370 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_call(p, (yyvsp[-2].nd), (yyvsp[0].id), 0, (yyvsp[-1].num)); } -#line 7594 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7721 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 107: /* lhs: primary_value "::" "local variable or method" */ -#line 2217 "mrbgems/mruby-compiler/core/parse.y" + case 99: /* mlhs_node: primary_value "::" "local variable or method" */ +#line 2374 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_call(p, (yyvsp[-2].nd), (yyvsp[0].id), 0, tCOLON2); } -#line 7602 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7729 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 108: /* lhs: primary_value call_op "constant" */ -#line 2221 "mrbgems/mruby-compiler/core/parse.y" + case 100: /* mlhs_node: primary_value call_op "constant" */ +#line 2378 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_call(p, (yyvsp[-2].nd), (yyvsp[0].id), 0, (yyvsp[-1].num)); } -#line 7610 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7737 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 109: /* lhs: primary_value "::" "constant" */ -#line 2225 "mrbgems/mruby-compiler/core/parse.y" + case 101: /* mlhs_node: primary_value "::" "constant" */ +#line 2382 "mrbgems/mruby-compiler/core/parse.y" { if (p->in_def || p->in_single) yyerror(&(yylsp[-2]), p, "dynamic constant assignment"); (yyval.nd) = new_colon2(p, (yyvsp[-2].nd), (yyvsp[0].id)); } -#line 7620 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7747 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 110: /* lhs: tCOLON3 "constant" */ -#line 2231 "mrbgems/mruby-compiler/core/parse.y" + case 102: /* mlhs_node: tCOLON3 "constant" */ +#line 2388 "mrbgems/mruby-compiler/core/parse.y" { if (p->in_def || p->in_single) yyerror(&(yylsp[-1]), p, "dynamic constant assignment"); (yyval.nd) = new_colon3(p, (yyvsp[0].id)); } -#line 7630 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7757 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 111: /* lhs: backref */ -#line 2237 "mrbgems/mruby-compiler/core/parse.y" + case 103: /* mlhs_node: backref */ +#line 2394 "mrbgems/mruby-compiler/core/parse.y" { backref_error(p, (yyvsp[0].nd)); (yyval.nd) = 0; } -#line 7639 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7766 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 112: /* lhs: "numbered parameter" */ -#line 2242 "mrbgems/mruby-compiler/core/parse.y" + case 104: /* lhs: variable */ +#line 2401 "mrbgems/mruby-compiler/core/parse.y" { - yyerror(&(yylsp[0]), p, "can't assign to numbered parameter"); + assignable(p, (yyvsp[0].nd)); } -#line 7647 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 113: /* cname: "local variable or method" */ -#line 2248 "mrbgems/mruby-compiler/core/parse.y" - { - yyerror(&(yylsp[0]), p, "class/module name must be CONSTANT"); - } -#line 7655 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 115: /* cpath: tCOLON3 cname */ -#line 2255 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = cons(nint(1), nsym((yyvsp[0].id))); - } -#line 7663 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 116: /* cpath: cname */ -#line 2259 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = cons(nint(0), nsym((yyvsp[0].id))); - } -#line 7671 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 117: /* cpath: primary_value "::" cname */ -#line 2263 "mrbgems/mruby-compiler/core/parse.y" - { - void_expr_error(p, (yyvsp[-2].nd)); - (yyval.nd) = cons((yyvsp[-2].nd), nsym((yyvsp[0].id))); - } -#line 7680 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 121: /* fname: op */ -#line 2273 "mrbgems/mruby-compiler/core/parse.y" - { - p->lstate = EXPR_ENDFN; - (yyval.id) = (yyvsp[0].id); - } -#line 7689 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 122: /* fname: reswords */ -#line 2278 "mrbgems/mruby-compiler/core/parse.y" - { - p->lstate = EXPR_ENDFN; - (yyval.id) = (yyvsp[0].id); - } -#line 7698 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 125: /* undef_list: fsym */ -#line 2289 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_undef(p, (yyvsp[0].id)); - } -#line 7706 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 126: /* $@6: %empty */ -#line 2292 "mrbgems/mruby-compiler/core/parse.y" - {p->lstate = EXPR_FNAME;} -#line 7712 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 127: /* undef_list: undef_list ',' $@6 fsym */ -#line 2293 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = push((yyvsp[-3].nd), nsym((yyvsp[0].id))); - } -#line 7720 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 128: /* op: '|' */ -#line 2298 "mrbgems/mruby-compiler/core/parse.y" - { (yyval.id) = intern_op(or); } -#line 7726 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 129: /* op: '^' */ -#line 2299 "mrbgems/mruby-compiler/core/parse.y" - { (yyval.id) = intern_op(xor); } -#line 7732 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 130: /* op: '&' */ -#line 2300 "mrbgems/mruby-compiler/core/parse.y" - { (yyval.id) = intern_op(and); } -#line 7738 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 131: /* op: "<=>" */ -#line 2301 "mrbgems/mruby-compiler/core/parse.y" - { (yyval.id) = intern_op(cmp); } -#line 7744 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 132: /* op: "==" */ -#line 2302 "mrbgems/mruby-compiler/core/parse.y" - { (yyval.id) = intern_op(eq); } -#line 7750 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 133: /* op: "===" */ -#line 2303 "mrbgems/mruby-compiler/core/parse.y" - { (yyval.id) = intern_op(eqq); } -#line 7756 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 134: /* op: "=~" */ -#line 2304 "mrbgems/mruby-compiler/core/parse.y" - { (yyval.id) = intern_op(match); } -#line 7762 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 135: /* op: "!~" */ -#line 2305 "mrbgems/mruby-compiler/core/parse.y" - { (yyval.id) = intern_op(nmatch); } -#line 7768 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 136: /* op: '>' */ -#line 2306 "mrbgems/mruby-compiler/core/parse.y" - { (yyval.id) = intern_op(gt); } #line 7774 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 137: /* op: ">=" */ -#line 2307 "mrbgems/mruby-compiler/core/parse.y" - { (yyval.id) = intern_op(ge); } -#line 7780 "mrbgems/mruby-compiler/core/y.tab.c" + case 105: /* lhs: primary_value '[' opt_call_args ']' */ +#line 2405 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_call(p, (yyvsp[-3].nd), intern_op(aref), (yyvsp[-1].nd), '.'); + } +#line 7782 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 138: /* op: '<' */ -#line 2308 "mrbgems/mruby-compiler/core/parse.y" - { (yyval.id) = intern_op(lt); } -#line 7786 "mrbgems/mruby-compiler/core/y.tab.c" + case 106: /* lhs: primary_value call_op "local variable or method" */ +#line 2409 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_call(p, (yyvsp[-2].nd), (yyvsp[0].id), 0, (yyvsp[-1].num)); + } +#line 7790 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 139: /* op: "<=" */ -#line 2309 "mrbgems/mruby-compiler/core/parse.y" - { (yyval.id) = intern_op(le); } -#line 7792 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 140: /* op: "!=" */ -#line 2310 "mrbgems/mruby-compiler/core/parse.y" - { (yyval.id) = intern_op(neq); } + case 107: /* lhs: primary_value "::" "local variable or method" */ +#line 2413 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_call(p, (yyvsp[-2].nd), (yyvsp[0].id), 0, tCOLON2); + } #line 7798 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 141: /* op: "<<" */ -#line 2311 "mrbgems/mruby-compiler/core/parse.y" - { (yyval.id) = intern_op(lshift); } -#line 7804 "mrbgems/mruby-compiler/core/y.tab.c" + case 108: /* lhs: primary_value call_op "constant" */ +#line 2417 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_call(p, (yyvsp[-2].nd), (yyvsp[0].id), 0, (yyvsp[-1].num)); + } +#line 7806 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 142: /* op: ">>" */ -#line 2312 "mrbgems/mruby-compiler/core/parse.y" - { (yyval.id) = intern_op(rshift); } -#line 7810 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 143: /* op: '+' */ -#line 2313 "mrbgems/mruby-compiler/core/parse.y" - { (yyval.id) = intern_op(add); } + case 109: /* lhs: primary_value "::" "constant" */ +#line 2421 "mrbgems/mruby-compiler/core/parse.y" + { + if (p->in_def || p->in_single) + yyerror(&(yylsp[-2]), p, "dynamic constant assignment"); + (yyval.nd) = new_colon2(p, (yyvsp[-2].nd), (yyvsp[0].id)); + } #line 7816 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 144: /* op: '-' */ -#line 2314 "mrbgems/mruby-compiler/core/parse.y" - { (yyval.id) = intern_op(sub); } -#line 7822 "mrbgems/mruby-compiler/core/y.tab.c" + case 110: /* lhs: tCOLON3 "constant" */ +#line 2427 "mrbgems/mruby-compiler/core/parse.y" + { + if (p->in_def || p->in_single) + yyerror(&(yylsp[-1]), p, "dynamic constant assignment"); + (yyval.nd) = new_colon3(p, (yyvsp[0].id)); + } +#line 7826 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 145: /* op: '*' */ -#line 2315 "mrbgems/mruby-compiler/core/parse.y" - { (yyval.id) = intern_op(mul); } -#line 7828 "mrbgems/mruby-compiler/core/y.tab.c" + case 111: /* lhs: backref */ +#line 2433 "mrbgems/mruby-compiler/core/parse.y" + { + backref_error(p, (yyvsp[0].nd)); + (yyval.nd) = 0; + } +#line 7835 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 146: /* op: "*" */ -#line 2316 "mrbgems/mruby-compiler/core/parse.y" - { (yyval.id) = intern_op(mul); } -#line 7834 "mrbgems/mruby-compiler/core/y.tab.c" + case 112: /* lhs: "numbered parameter" */ +#line 2438 "mrbgems/mruby-compiler/core/parse.y" + { + yyerror(&(yylsp[0]), p, "can't assign to numbered parameter"); + } +#line 7843 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 147: /* op: '/' */ -#line 2317 "mrbgems/mruby-compiler/core/parse.y" - { (yyval.id) = intern_op(div); } -#line 7840 "mrbgems/mruby-compiler/core/y.tab.c" + case 113: /* cname: "local variable or method" */ +#line 2444 "mrbgems/mruby-compiler/core/parse.y" + { + yyerror(&(yylsp[0]), p, "class/module name must be CONSTANT"); + } +#line 7851 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 148: /* op: '%' */ -#line 2318 "mrbgems/mruby-compiler/core/parse.y" - { (yyval.id) = intern_op(mod); } -#line 7846 "mrbgems/mruby-compiler/core/y.tab.c" + case 115: /* cpath: tCOLON3 cname */ +#line 2451 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = cons(int_to_node(1), sym_to_node((yyvsp[0].id))); + } +#line 7859 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 149: /* op: tPOW */ -#line 2319 "mrbgems/mruby-compiler/core/parse.y" - { (yyval.id) = intern_op(pow); } -#line 7852 "mrbgems/mruby-compiler/core/y.tab.c" + case 116: /* cpath: cname */ +#line 2455 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = cons(int_to_node(0), sym_to_node((yyvsp[0].id))); + } +#line 7867 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 150: /* op: "**" */ -#line 2320 "mrbgems/mruby-compiler/core/parse.y" - { (yyval.id) = intern_op(pow); } -#line 7858 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 151: /* op: '!' */ -#line 2321 "mrbgems/mruby-compiler/core/parse.y" - { (yyval.id) = intern_op(not); } -#line 7864 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 152: /* op: '~' */ -#line 2322 "mrbgems/mruby-compiler/core/parse.y" - { (yyval.id) = intern_op(neg); } -#line 7870 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 153: /* op: "unary plus" */ -#line 2323 "mrbgems/mruby-compiler/core/parse.y" - { (yyval.id) = intern_op(plus); } + case 117: /* cpath: primary_value "::" cname */ +#line 2459 "mrbgems/mruby-compiler/core/parse.y" + { + void_expr_error(p, (yyvsp[-2].nd)); + (yyval.nd) = cons((yyvsp[-2].nd), sym_to_node((yyvsp[0].id))); + } #line 7876 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 154: /* op: "unary minus" */ -#line 2324 "mrbgems/mruby-compiler/core/parse.y" - { (yyval.id) = intern_op(minus); } -#line 7882 "mrbgems/mruby-compiler/core/y.tab.c" + case 121: /* fname: op */ +#line 2469 "mrbgems/mruby-compiler/core/parse.y" + { + p->lstate = EXPR_ENDFN; + (yyval.id) = (yyvsp[0].id); + } +#line 7885 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 155: /* op: tAREF */ -#line 2325 "mrbgems/mruby-compiler/core/parse.y" - { (yyval.id) = intern_op(aref); } -#line 7888 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 156: /* op: tASET */ -#line 2326 "mrbgems/mruby-compiler/core/parse.y" - { (yyval.id) = intern_op(aset); } + case 122: /* fname: reswords */ +#line 2474 "mrbgems/mruby-compiler/core/parse.y" + { + p->lstate = EXPR_ENDFN; + (yyval.id) = (yyvsp[0].id); + } #line 7894 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 157: /* op: '`' */ -#line 2327 "mrbgems/mruby-compiler/core/parse.y" - { (yyval.id) = intern_op(tick); } -#line 7900 "mrbgems/mruby-compiler/core/y.tab.c" + case 125: /* undef_list: fsym */ +#line 2485 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_undef(p, (yyvsp[0].id)); + } +#line 7902 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 198: /* arg: lhs '=' arg_rhs */ -#line 2345 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_asgn(p, (yyvsp[-2].nd), (yyvsp[0].nd)); - } + case 126: /* $@6: %empty */ +#line 2488 "mrbgems/mruby-compiler/core/parse.y" + {p->lstate = EXPR_FNAME;} #line 7908 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 199: /* arg: var_lhs tOP_ASGN arg_rhs */ -#line 2349 "mrbgems/mruby-compiler/core/parse.y" + case 127: /* undef_list: undef_list ',' $@6 fsym */ +#line 2489 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_op_asgn(p, (yyvsp[-2].nd), (yyvsp[-1].id), (yyvsp[0].nd)); + (yyval.nd) = push((yyvsp[-3].nd), sym_to_node((yyvsp[0].id))); } #line 7916 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 200: /* arg: primary_value '[' opt_call_args ']' tOP_ASGN arg_rhs */ -#line 2353 "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 7924 "mrbgems/mruby-compiler/core/y.tab.c" + case 128: /* op: '|' */ +#line 2494 "mrbgems/mruby-compiler/core/parse.y" + { (yyval.id) = intern_op(or); } +#line 7922 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 201: /* arg: primary_value call_op "local variable or method" tOP_ASGN arg_rhs */ -#line 2357 "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 7932 "mrbgems/mruby-compiler/core/y.tab.c" + case 129: /* op: '^' */ +#line 2495 "mrbgems/mruby-compiler/core/parse.y" + { (yyval.id) = intern_op(xor); } +#line 7928 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 202: /* arg: primary_value call_op "constant" tOP_ASGN arg_rhs */ -#line 2361 "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)); - } + case 130: /* op: '&' */ +#line 2496 "mrbgems/mruby-compiler/core/parse.y" + { (yyval.id) = intern_op(and); } +#line 7934 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 131: /* op: "<=>" */ +#line 2497 "mrbgems/mruby-compiler/core/parse.y" + { (yyval.id) = intern_op(cmp); } #line 7940 "mrbgems/mruby-compiler/core/y.tab.c" break; + case 132: /* op: "==" */ +#line 2498 "mrbgems/mruby-compiler/core/parse.y" + { (yyval.id) = intern_op(eq); } +#line 7946 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 133: /* op: "===" */ +#line 2499 "mrbgems/mruby-compiler/core/parse.y" + { (yyval.id) = intern_op(eqq); } +#line 7952 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 134: /* op: "=~" */ +#line 2500 "mrbgems/mruby-compiler/core/parse.y" + { (yyval.id) = intern_op(match); } +#line 7958 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 135: /* op: "!~" */ +#line 2501 "mrbgems/mruby-compiler/core/parse.y" + { (yyval.id) = intern_op(nmatch); } +#line 7964 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 136: /* op: '>' */ +#line 2502 "mrbgems/mruby-compiler/core/parse.y" + { (yyval.id) = intern_op(gt); } +#line 7970 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 137: /* op: ">=" */ +#line 2503 "mrbgems/mruby-compiler/core/parse.y" + { (yyval.id) = intern_op(ge); } +#line 7976 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 138: /* op: '<' */ +#line 2504 "mrbgems/mruby-compiler/core/parse.y" + { (yyval.id) = intern_op(lt); } +#line 7982 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 139: /* op: "<=" */ +#line 2505 "mrbgems/mruby-compiler/core/parse.y" + { (yyval.id) = intern_op(le); } +#line 7988 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 140: /* op: "!=" */ +#line 2506 "mrbgems/mruby-compiler/core/parse.y" + { (yyval.id) = intern_op(neq); } +#line 7994 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 141: /* op: "<<" */ +#line 2507 "mrbgems/mruby-compiler/core/parse.y" + { (yyval.id) = intern_op(lshift); } +#line 8000 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 142: /* op: ">>" */ +#line 2508 "mrbgems/mruby-compiler/core/parse.y" + { (yyval.id) = intern_op(rshift); } +#line 8006 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 143: /* op: '+' */ +#line 2509 "mrbgems/mruby-compiler/core/parse.y" + { (yyval.id) = intern_op(add); } +#line 8012 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 144: /* op: '-' */ +#line 2510 "mrbgems/mruby-compiler/core/parse.y" + { (yyval.id) = intern_op(sub); } +#line 8018 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 145: /* op: '*' */ +#line 2511 "mrbgems/mruby-compiler/core/parse.y" + { (yyval.id) = intern_op(mul); } +#line 8024 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 146: /* op: "*" */ +#line 2512 "mrbgems/mruby-compiler/core/parse.y" + { (yyval.id) = intern_op(mul); } +#line 8030 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 147: /* op: '/' */ +#line 2513 "mrbgems/mruby-compiler/core/parse.y" + { (yyval.id) = intern_op(div); } +#line 8036 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 148: /* op: '%' */ +#line 2514 "mrbgems/mruby-compiler/core/parse.y" + { (yyval.id) = intern_op(mod); } +#line 8042 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 149: /* op: tPOW */ +#line 2515 "mrbgems/mruby-compiler/core/parse.y" + { (yyval.id) = intern_op(pow); } +#line 8048 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 150: /* op: "**" */ +#line 2516 "mrbgems/mruby-compiler/core/parse.y" + { (yyval.id) = intern_op(pow); } +#line 8054 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 151: /* op: '!' */ +#line 2517 "mrbgems/mruby-compiler/core/parse.y" + { (yyval.id) = intern_op(not); } +#line 8060 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 152: /* op: '~' */ +#line 2518 "mrbgems/mruby-compiler/core/parse.y" + { (yyval.id) = intern_op(neg); } +#line 8066 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 153: /* op: "unary plus" */ +#line 2519 "mrbgems/mruby-compiler/core/parse.y" + { (yyval.id) = intern_op(plus); } +#line 8072 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 154: /* op: "unary minus" */ +#line 2520 "mrbgems/mruby-compiler/core/parse.y" + { (yyval.id) = intern_op(minus); } +#line 8078 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 155: /* op: tAREF */ +#line 2521 "mrbgems/mruby-compiler/core/parse.y" + { (yyval.id) = intern_op(aref); } +#line 8084 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 156: /* op: tASET */ +#line 2522 "mrbgems/mruby-compiler/core/parse.y" + { (yyval.id) = intern_op(aset); } +#line 8090 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 157: /* op: '`' */ +#line 2523 "mrbgems/mruby-compiler/core/parse.y" + { (yyval.id) = intern_op(tick); } +#line 8096 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 198: /* arg: lhs '=' arg_rhs */ +#line 2541 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_asgn(p, (yyvsp[-2].nd), (yyvsp[0].nd)); + } +#line 8104 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 199: /* arg: var_lhs tOP_ASGN arg_rhs */ +#line 2545 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_op_asgn(p, (yyvsp[-2].nd), (yyvsp[-1].id), (yyvsp[0].nd)); + } +#line 8112 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 200: /* arg: primary_value '[' opt_call_args ']' tOP_ASGN arg_rhs */ +#line 2549 "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 8120 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 201: /* arg: primary_value call_op "local variable or method" tOP_ASGN arg_rhs */ +#line 2553 "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 8128 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 202: /* arg: primary_value call_op "constant" tOP_ASGN arg_rhs */ +#line 2557 "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 8136 "mrbgems/mruby-compiler/core/y.tab.c" + break; + case 203: /* arg: primary_value "::" "local variable or method" tOP_ASGN arg_rhs */ -#line 2365 "mrbgems/mruby-compiler/core/parse.y" +#line 2561 "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 7948 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8144 "mrbgems/mruby-compiler/core/y.tab.c" break; case 204: /* arg: primary_value "::" "constant" tOP_ASGN arg_rhs */ -#line 2369 "mrbgems/mruby-compiler/core/parse.y" +#line 2565 "mrbgems/mruby-compiler/core/parse.y" { yyerror(&(yylsp[-4]), p, "constant re-assignment"); (yyval.nd) = new_stmts(p, 0); } -#line 7957 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8153 "mrbgems/mruby-compiler/core/y.tab.c" break; case 205: /* arg: tCOLON3 "constant" tOP_ASGN arg_rhs */ -#line 2374 "mrbgems/mruby-compiler/core/parse.y" +#line 2570 "mrbgems/mruby-compiler/core/parse.y" { yyerror(&(yylsp[-3]), p, "constant re-assignment"); (yyval.nd) = new_stmts(p, 0); } -#line 7966 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8162 "mrbgems/mruby-compiler/core/y.tab.c" break; case 206: /* arg: backref tOP_ASGN arg_rhs */ -#line 2379 "mrbgems/mruby-compiler/core/parse.y" +#line 2575 "mrbgems/mruby-compiler/core/parse.y" { backref_error(p, (yyvsp[-2].nd)); (yyval.nd) = new_stmts(p, 0); } -#line 7975 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8171 "mrbgems/mruby-compiler/core/y.tab.c" break; case 207: /* arg: arg ".." arg */ -#line 2384 "mrbgems/mruby-compiler/core/parse.y" +#line 2580 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_dot2(p, (yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 7983 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8179 "mrbgems/mruby-compiler/core/y.tab.c" break; case 208: /* arg: arg ".." */ -#line 2388 "mrbgems/mruby-compiler/core/parse.y" +#line 2584 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_dot2(p, (yyvsp[-1].nd), new_nil(p)); } -#line 7991 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8187 "mrbgems/mruby-compiler/core/y.tab.c" break; case 209: /* arg: tBDOT2 arg */ -#line 2392 "mrbgems/mruby-compiler/core/parse.y" +#line 2588 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_dot2(p, new_nil(p), (yyvsp[0].nd)); } -#line 7999 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8195 "mrbgems/mruby-compiler/core/y.tab.c" break; case 210: /* arg: arg "..." arg */ -#line 2396 "mrbgems/mruby-compiler/core/parse.y" +#line 2592 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_dot3(p, (yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 8007 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8203 "mrbgems/mruby-compiler/core/y.tab.c" break; case 211: /* arg: arg "..." */ -#line 2400 "mrbgems/mruby-compiler/core/parse.y" +#line 2596 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_dot3(p, (yyvsp[-1].nd), new_nil(p)); } -#line 8015 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8211 "mrbgems/mruby-compiler/core/y.tab.c" break; case 212: /* arg: tBDOT3 arg */ -#line 2404 "mrbgems/mruby-compiler/core/parse.y" +#line 2600 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_dot3(p, new_nil(p), (yyvsp[0].nd)); } -#line 8023 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8219 "mrbgems/mruby-compiler/core/y.tab.c" break; case 213: /* arg: arg '+' arg */ -#line 2408 "mrbgems/mruby-compiler/core/parse.y" +#line 2604 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "+", (yyvsp[0].nd)); } -#line 8031 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8227 "mrbgems/mruby-compiler/core/y.tab.c" break; case 214: /* arg: arg '-' arg */ -#line 2412 "mrbgems/mruby-compiler/core/parse.y" +#line 2608 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "-", (yyvsp[0].nd)); } -#line 8039 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8235 "mrbgems/mruby-compiler/core/y.tab.c" break; case 215: /* arg: arg '*' arg */ -#line 2416 "mrbgems/mruby-compiler/core/parse.y" +#line 2612 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "*", (yyvsp[0].nd)); } -#line 8047 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8243 "mrbgems/mruby-compiler/core/y.tab.c" break; case 216: /* arg: arg '/' arg */ -#line 2420 "mrbgems/mruby-compiler/core/parse.y" +#line 2616 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "/", (yyvsp[0].nd)); } -#line 8055 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8251 "mrbgems/mruby-compiler/core/y.tab.c" break; case 217: /* arg: arg '%' arg */ -#line 2424 "mrbgems/mruby-compiler/core/parse.y" +#line 2620 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "%", (yyvsp[0].nd)); } -#line 8063 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8259 "mrbgems/mruby-compiler/core/y.tab.c" break; case 218: /* arg: arg tPOW arg */ -#line 2428 "mrbgems/mruby-compiler/core/parse.y" +#line 2624 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "**", (yyvsp[0].nd)); } -#line 8071 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8267 "mrbgems/mruby-compiler/core/y.tab.c" break; case 219: /* arg: tUMINUS_NUM "integer literal" tPOW arg */ -#line 2432 "mrbgems/mruby-compiler/core/parse.y" +#line 2628 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_negate(p, call_bin_op(p, (yyvsp[-2].nd), "**", (yyvsp[0].nd))); } -#line 8079 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8275 "mrbgems/mruby-compiler/core/y.tab.c" break; case 220: /* arg: tUMINUS_NUM "float literal" tPOW arg */ -#line 2436 "mrbgems/mruby-compiler/core/parse.y" +#line 2632 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_negate(p, call_bin_op(p, (yyvsp[-2].nd), "**", (yyvsp[0].nd))); } -#line 8087 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8283 "mrbgems/mruby-compiler/core/y.tab.c" break; case 221: /* arg: "unary plus" arg */ -#line 2440 "mrbgems/mruby-compiler/core/parse.y" +#line 2636 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_uni_op(p, (yyvsp[0].nd), "+@"); } -#line 8095 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8291 "mrbgems/mruby-compiler/core/y.tab.c" break; case 222: /* arg: "unary minus" arg */ -#line 2444 "mrbgems/mruby-compiler/core/parse.y" +#line 2640 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_negate(p, (yyvsp[0].nd)); } -#line 8103 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8299 "mrbgems/mruby-compiler/core/y.tab.c" break; case 223: /* arg: arg '|' arg */ -#line 2448 "mrbgems/mruby-compiler/core/parse.y" +#line 2644 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "|", (yyvsp[0].nd)); } -#line 8111 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8307 "mrbgems/mruby-compiler/core/y.tab.c" break; case 224: /* arg: arg '^' arg */ -#line 2452 "mrbgems/mruby-compiler/core/parse.y" +#line 2648 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "^", (yyvsp[0].nd)); } -#line 8119 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8315 "mrbgems/mruby-compiler/core/y.tab.c" break; case 225: /* arg: arg '&' arg */ -#line 2456 "mrbgems/mruby-compiler/core/parse.y" +#line 2652 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "&", (yyvsp[0].nd)); } -#line 8127 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8323 "mrbgems/mruby-compiler/core/y.tab.c" break; case 226: /* arg: arg "<=>" arg */ -#line 2460 "mrbgems/mruby-compiler/core/parse.y" +#line 2656 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "<=>", (yyvsp[0].nd)); } -#line 8135 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8331 "mrbgems/mruby-compiler/core/y.tab.c" break; case 227: /* arg: arg '>' arg */ -#line 2464 "mrbgems/mruby-compiler/core/parse.y" +#line 2660 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), ">", (yyvsp[0].nd)); } -#line 8143 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8339 "mrbgems/mruby-compiler/core/y.tab.c" break; case 228: /* arg: arg ">=" arg */ -#line 2468 "mrbgems/mruby-compiler/core/parse.y" +#line 2664 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), ">=", (yyvsp[0].nd)); } -#line 8151 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8347 "mrbgems/mruby-compiler/core/y.tab.c" break; case 229: /* arg: arg '<' arg */ -#line 2472 "mrbgems/mruby-compiler/core/parse.y" +#line 2668 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "<", (yyvsp[0].nd)); } -#line 8159 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8355 "mrbgems/mruby-compiler/core/y.tab.c" break; case 230: /* arg: arg "<=" arg */ -#line 2476 "mrbgems/mruby-compiler/core/parse.y" +#line 2672 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "<=", (yyvsp[0].nd)); } -#line 8167 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8363 "mrbgems/mruby-compiler/core/y.tab.c" break; case 231: /* arg: arg "==" arg */ -#line 2480 "mrbgems/mruby-compiler/core/parse.y" +#line 2676 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "==", (yyvsp[0].nd)); } -#line 8175 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8371 "mrbgems/mruby-compiler/core/y.tab.c" break; case 232: /* arg: arg "===" arg */ -#line 2484 "mrbgems/mruby-compiler/core/parse.y" +#line 2680 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "===", (yyvsp[0].nd)); } -#line 8183 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8379 "mrbgems/mruby-compiler/core/y.tab.c" break; case 233: /* arg: arg "!=" arg */ -#line 2488 "mrbgems/mruby-compiler/core/parse.y" +#line 2684 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "!=", (yyvsp[0].nd)); } -#line 8191 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8387 "mrbgems/mruby-compiler/core/y.tab.c" break; case 234: /* arg: arg "=~" arg */ -#line 2492 "mrbgems/mruby-compiler/core/parse.y" +#line 2688 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "=~", (yyvsp[0].nd)); } -#line 8199 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8395 "mrbgems/mruby-compiler/core/y.tab.c" break; case 235: /* arg: arg "!~" arg */ -#line 2496 "mrbgems/mruby-compiler/core/parse.y" +#line 2692 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "!~", (yyvsp[0].nd)); } -#line 8207 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8403 "mrbgems/mruby-compiler/core/y.tab.c" break; case 236: /* arg: '!' arg */ -#line 2500 "mrbgems/mruby-compiler/core/parse.y" +#line 2696 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_uni_op(p, cond((yyvsp[0].nd)), "!"); } -#line 8215 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8411 "mrbgems/mruby-compiler/core/y.tab.c" break; case 237: /* arg: '~' arg */ -#line 2504 "mrbgems/mruby-compiler/core/parse.y" +#line 2700 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_uni_op(p, cond((yyvsp[0].nd)), "~"); } -#line 8223 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8419 "mrbgems/mruby-compiler/core/y.tab.c" break; case 238: /* arg: arg "<<" arg */ -#line 2508 "mrbgems/mruby-compiler/core/parse.y" +#line 2704 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "<<", (yyvsp[0].nd)); } -#line 8231 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8427 "mrbgems/mruby-compiler/core/y.tab.c" break; case 239: /* arg: arg ">>" arg */ -#line 2512 "mrbgems/mruby-compiler/core/parse.y" +#line 2708 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), ">>", (yyvsp[0].nd)); } -#line 8239 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8435 "mrbgems/mruby-compiler/core/y.tab.c" break; case 240: /* arg: arg "&&" arg */ -#line 2516 "mrbgems/mruby-compiler/core/parse.y" +#line 2712 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_and(p, (yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 8247 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8443 "mrbgems/mruby-compiler/core/y.tab.c" break; case 241: /* arg: arg "||" arg */ -#line 2520 "mrbgems/mruby-compiler/core/parse.y" +#line 2716 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_or(p, (yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 8255 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8451 "mrbgems/mruby-compiler/core/y.tab.c" break; case 242: /* arg: arg '?' arg opt_nl ':' arg */ -#line 2524 "mrbgems/mruby-compiler/core/parse.y" +#line 2720 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_if(p, cond((yyvsp[-5].nd)), (yyvsp[-3].nd), (yyvsp[0].nd)); } -#line 8263 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8459 "mrbgems/mruby-compiler/core/y.tab.c" break; case 243: /* arg: arg '?' arg opt_nl "label" arg */ -#line 2528 "mrbgems/mruby-compiler/core/parse.y" +#line 2724 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_if(p, cond((yyvsp[-5].nd)), (yyvsp[-3].nd), (yyvsp[0].nd)); } -#line 8271 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8467 "mrbgems/mruby-compiler/core/y.tab.c" break; case 244: /* arg: defn_head f_opt_arglist_paren '=' arg */ -#line 2532 "mrbgems/mruby-compiler/core/parse.y" +#line 2728 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-3].nd); endless_method_name(p, (yyvsp[-3].nd)); @@ -8280,11 +8476,11 @@ yyreduce: nvars_unnest(p); p->in_def--; } -#line 8284 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8480 "mrbgems/mruby-compiler/core/y.tab.c" break; case 245: /* arg: defn_head f_opt_arglist_paren '=' arg "'rescue' modifier" arg */ -#line 2541 "mrbgems/mruby-compiler/core/parse.y" +#line 2737 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-5].nd); endless_method_name(p, (yyvsp[-5].nd)); @@ -8293,11 +8489,11 @@ yyreduce: nvars_unnest(p); p->in_def--; } -#line 8297 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8493 "mrbgems/mruby-compiler/core/y.tab.c" break; case 246: /* arg: defs_head f_opt_arglist_paren '=' arg */ -#line 2550 "mrbgems/mruby-compiler/core/parse.y" +#line 2746 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-3].nd); void_expr_error(p, (yyvsp[0].nd)); @@ -8306,11 +8502,11 @@ yyreduce: p->in_def--; p->in_single--; } -#line 8310 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8506 "mrbgems/mruby-compiler/core/y.tab.c" break; case 247: /* arg: defs_head f_opt_arglist_paren '=' arg "'rescue' modifier" arg */ -#line 2559 "mrbgems/mruby-compiler/core/parse.y" +#line 2755 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-5].nd); void_expr_error(p, (yyvsp[-2].nd)); @@ -8319,68 +8515,68 @@ yyreduce: p->in_def--; p->in_single--; } -#line 8323 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8519 "mrbgems/mruby-compiler/core/y.tab.c" break; case 248: /* arg: primary */ -#line 2568 "mrbgems/mruby-compiler/core/parse.y" +#line 2764 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[0].nd); } -#line 8331 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8527 "mrbgems/mruby-compiler/core/y.tab.c" break; case 250: /* aref_args: args trailer */ -#line 2575 "mrbgems/mruby-compiler/core/parse.y" +#line 2771 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-1].nd); } -#line 8339 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8535 "mrbgems/mruby-compiler/core/y.tab.c" break; case 251: /* aref_args: args comma assocs trailer */ -#line 2579 "mrbgems/mruby-compiler/core/parse.y" +#line 2775 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = push((yyvsp[-3].nd), new_hash(p, (yyvsp[-1].nd))); } -#line 8347 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8543 "mrbgems/mruby-compiler/core/y.tab.c" break; case 252: /* aref_args: assocs trailer */ -#line 2583 "mrbgems/mruby-compiler/core/parse.y" +#line 2779 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = cons(new_kw_hash(p, (yyvsp[-1].nd)), 0); } -#line 8355 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8551 "mrbgems/mruby-compiler/core/y.tab.c" break; case 253: /* arg_rhs: arg */ -#line 2589 "mrbgems/mruby-compiler/core/parse.y" +#line 2785 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[0].nd); } -#line 8363 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8559 "mrbgems/mruby-compiler/core/y.tab.c" break; case 254: /* arg_rhs: arg "'rescue' modifier" arg */ -#line 2593 "mrbgems/mruby-compiler/core/parse.y" +#line 2789 "mrbgems/mruby-compiler/core/parse.y" { void_expr_error(p, (yyvsp[-2].nd)); (yyval.nd) = new_mod_rescue(p, (yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 8372 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8568 "mrbgems/mruby-compiler/core/y.tab.c" break; case 255: /* paren_args: '(' opt_call_args ')' */ -#line 2600 "mrbgems/mruby-compiler/core/parse.y" +#line 2796 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-1].nd); } -#line 8380 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8576 "mrbgems/mruby-compiler/core/y.tab.c" break; case 256: /* paren_args: '(' args comma tBDOT3 rparen */ -#line 2604 "mrbgems/mruby-compiler/core/parse.y" +#line 2800 "mrbgems/mruby-compiler/core/parse.y" { mrb_sym r = intern_op(mul); mrb_sym k = intern_op(pow); @@ -8389,11 +8585,11 @@ yyreduce: 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 8393 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8589 "mrbgems/mruby-compiler/core/y.tab.c" break; case 257: /* paren_args: '(' tBDOT3 rparen */ -#line 2613 "mrbgems/mruby-compiler/core/parse.y" +#line 2809 "mrbgems/mruby-compiler/core/parse.y" { mrb_sym r = intern_op(mul); mrb_sym k = intern_op(pow); @@ -8408,374 +8604,374 @@ yyreduce: (yyval.nd) = 0; } } -#line 8412 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8608 "mrbgems/mruby-compiler/core/y.tab.c" break; case 262: /* opt_call_args: args comma */ -#line 2636 "mrbgems/mruby-compiler/core/parse.y" +#line 2832 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_callargs(p,(yyvsp[-1].nd),0,0); } -#line 8420 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8616 "mrbgems/mruby-compiler/core/y.tab.c" break; case 263: /* opt_call_args: args comma assocs comma */ -#line 2640 "mrbgems/mruby-compiler/core/parse.y" +#line 2836 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_callargs(p,(yyvsp[-3].nd),new_kw_hash(p,(yyvsp[-1].nd)),0); } -#line 8428 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8624 "mrbgems/mruby-compiler/core/y.tab.c" break; case 264: /* opt_call_args: assocs comma */ -#line 2644 "mrbgems/mruby-compiler/core/parse.y" +#line 2840 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_callargs(p,0,new_kw_hash(p,(yyvsp[-1].nd)),0); } -#line 8436 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8632 "mrbgems/mruby-compiler/core/y.tab.c" break; case 265: /* call_args: command */ -#line 2650 "mrbgems/mruby-compiler/core/parse.y" +#line 2846 "mrbgems/mruby-compiler/core/parse.y" { void_expr_error(p, (yyvsp[0].nd)); (yyval.nd) = new_callargs(p, list1((yyvsp[0].nd)), 0, 0); } -#line 8445 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8641 "mrbgems/mruby-compiler/core/y.tab.c" break; case 266: /* call_args: args opt_block_arg */ -#line 2655 "mrbgems/mruby-compiler/core/parse.y" +#line 2851 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_callargs(p, (yyvsp[-1].nd), 0, (yyvsp[0].nd)); } -#line 8453 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8649 "mrbgems/mruby-compiler/core/y.tab.c" break; case 267: /* call_args: assocs opt_block_arg */ -#line 2659 "mrbgems/mruby-compiler/core/parse.y" +#line 2855 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_callargs(p, 0, new_kw_hash(p, (yyvsp[-1].nd)), (yyvsp[0].nd)); } -#line 8461 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8657 "mrbgems/mruby-compiler/core/y.tab.c" break; case 268: /* call_args: args comma assocs opt_block_arg */ -#line 2663 "mrbgems/mruby-compiler/core/parse.y" +#line 2859 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_callargs(p, (yyvsp[-3].nd), new_kw_hash(p, (yyvsp[-1].nd)), (yyvsp[0].nd)); } -#line 8469 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8665 "mrbgems/mruby-compiler/core/y.tab.c" break; case 269: /* call_args: block_arg */ -#line 2667 "mrbgems/mruby-compiler/core/parse.y" +#line 2863 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_callargs(p, 0, 0, (yyvsp[0].nd)); } -#line 8477 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8673 "mrbgems/mruby-compiler/core/y.tab.c" break; case 270: /* @7: %empty */ -#line 2672 "mrbgems/mruby-compiler/core/parse.y" +#line 2868 "mrbgems/mruby-compiler/core/parse.y" { (yyval.stack) = p->cmdarg_stack; CMDARG_PUSH(1); } -#line 8486 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8682 "mrbgems/mruby-compiler/core/y.tab.c" break; case 271: /* command_args: @7 call_args */ -#line 2677 "mrbgems/mruby-compiler/core/parse.y" +#line 2873 "mrbgems/mruby-compiler/core/parse.y" { p->cmdarg_stack = (yyvsp[-1].stack); (yyval.nd) = (yyvsp[0].nd); } -#line 8495 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8691 "mrbgems/mruby-compiler/core/y.tab.c" break; case 272: /* block_arg: "&" arg */ -#line 2684 "mrbgems/mruby-compiler/core/parse.y" +#line 2880 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_block_arg(p, (yyvsp[0].nd)); } -#line 8503 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8699 "mrbgems/mruby-compiler/core/y.tab.c" break; case 273: /* block_arg: "&" */ -#line 2688 "mrbgems/mruby-compiler/core/parse.y" +#line 2884 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_block_arg(p, 0); } -#line 8511 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8707 "mrbgems/mruby-compiler/core/y.tab.c" break; case 274: /* opt_block_arg: comma block_arg */ -#line 2694 "mrbgems/mruby-compiler/core/parse.y" +#line 2890 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[0].nd); } -#line 8519 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8715 "mrbgems/mruby-compiler/core/y.tab.c" break; case 275: /* opt_block_arg: none */ -#line 2698 "mrbgems/mruby-compiler/core/parse.y" +#line 2894 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = 0; } -#line 8527 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8723 "mrbgems/mruby-compiler/core/y.tab.c" break; case 277: /* args: arg */ -#line 2707 "mrbgems/mruby-compiler/core/parse.y" +#line 2903 "mrbgems/mruby-compiler/core/parse.y" { void_expr_error(p, (yyvsp[0].nd)); (yyval.nd) = list1((yyvsp[0].nd)); } -#line 8536 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8732 "mrbgems/mruby-compiler/core/y.tab.c" break; case 278: /* args: "*" */ -#line 2712 "mrbgems/mruby-compiler/core/parse.y" +#line 2908 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list1(new_splat(p, new_lvar(p, intern_op(mul)))); } -#line 8544 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8740 "mrbgems/mruby-compiler/core/y.tab.c" break; case 279: /* args: "*" arg */ -#line 2716 "mrbgems/mruby-compiler/core/parse.y" +#line 2912 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list1(new_splat(p, (yyvsp[0].nd))); } -#line 8552 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8748 "mrbgems/mruby-compiler/core/y.tab.c" break; case 280: /* args: args comma arg */ -#line 2720 "mrbgems/mruby-compiler/core/parse.y" +#line 2916 "mrbgems/mruby-compiler/core/parse.y" { void_expr_error(p, (yyvsp[0].nd)); (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 8561 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8757 "mrbgems/mruby-compiler/core/y.tab.c" break; case 281: /* args: args comma "*" */ -#line 2725 "mrbgems/mruby-compiler/core/parse.y" +#line 2921 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = push((yyvsp[-2].nd), new_splat(p, new_lvar(p, intern_op(mul)))); } -#line 8569 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8765 "mrbgems/mruby-compiler/core/y.tab.c" break; case 282: /* args: args comma "*" arg */ -#line 2729 "mrbgems/mruby-compiler/core/parse.y" +#line 2925 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = push((yyvsp[-3].nd), new_splat(p, (yyvsp[0].nd))); } -#line 8577 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8773 "mrbgems/mruby-compiler/core/y.tab.c" break; case 283: /* mrhs: args comma arg */ -#line 2735 "mrbgems/mruby-compiler/core/parse.y" +#line 2931 "mrbgems/mruby-compiler/core/parse.y" { void_expr_error(p, (yyvsp[0].nd)); (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 8586 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8782 "mrbgems/mruby-compiler/core/y.tab.c" break; case 284: /* mrhs: args comma "*" arg */ -#line 2740 "mrbgems/mruby-compiler/core/parse.y" +#line 2936 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = push((yyvsp[-3].nd), new_splat(p, (yyvsp[0].nd))); } -#line 8594 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8790 "mrbgems/mruby-compiler/core/y.tab.c" break; case 285: /* mrhs: "*" arg */ -#line 2744 "mrbgems/mruby-compiler/core/parse.y" +#line 2940 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list1(new_splat(p, (yyvsp[0].nd))); } -#line 8602 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8798 "mrbgems/mruby-compiler/core/y.tab.c" break; case 293: /* primary: "method" */ -#line 2757 "mrbgems/mruby-compiler/core/parse.y" +#line 2953 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_fcall(p, (yyvsp[0].id), 0); } -#line 8610 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8806 "mrbgems/mruby-compiler/core/y.tab.c" break; case 294: /* @8: %empty */ -#line 2761 "mrbgems/mruby-compiler/core/parse.y" +#line 2957 "mrbgems/mruby-compiler/core/parse.y" { (yyval.stack) = p->cmdarg_stack; p->cmdarg_stack = 0; } -#line 8619 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8815 "mrbgems/mruby-compiler/core/y.tab.c" break; case 295: /* primary: "'begin'" @8 bodystmt "'end'" */ -#line 2767 "mrbgems/mruby-compiler/core/parse.y" +#line 2963 "mrbgems/mruby-compiler/core/parse.y" { p->cmdarg_stack = (yyvsp[-2].stack); (yyval.nd) = new_begin(p, (yyvsp[-1].nd)); } -#line 8628 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8824 "mrbgems/mruby-compiler/core/y.tab.c" break; case 296: /* @9: %empty */ -#line 2772 "mrbgems/mruby-compiler/core/parse.y" +#line 2968 "mrbgems/mruby-compiler/core/parse.y" { (yyval.stack) = p->cmdarg_stack; p->cmdarg_stack = 0; } -#line 8637 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8833 "mrbgems/mruby-compiler/core/y.tab.c" break; case 297: /* $@10: %empty */ -#line 2776 "mrbgems/mruby-compiler/core/parse.y" +#line 2972 "mrbgems/mruby-compiler/core/parse.y" {p->lstate = EXPR_ENDARG;} -#line 8643 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8839 "mrbgems/mruby-compiler/core/y.tab.c" break; case 298: /* primary: "(" @9 stmt $@10 rparen */ -#line 2777 "mrbgems/mruby-compiler/core/parse.y" +#line 2973 "mrbgems/mruby-compiler/core/parse.y" { p->cmdarg_stack = (yyvsp[-3].stack); (yyval.nd) = (yyvsp[-2].nd); } -#line 8652 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8848 "mrbgems/mruby-compiler/core/y.tab.c" break; case 299: /* $@11: %empty */ -#line 2781 "mrbgems/mruby-compiler/core/parse.y" +#line 2977 "mrbgems/mruby-compiler/core/parse.y" {p->lstate = EXPR_ENDARG;} -#line 8658 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8854 "mrbgems/mruby-compiler/core/y.tab.c" break; case 300: /* primary: "(" $@11 rparen */ -#line 2782 "mrbgems/mruby-compiler/core/parse.y" +#line 2978 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_nil(p); } -#line 8666 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8862 "mrbgems/mruby-compiler/core/y.tab.c" break; case 301: /* primary: tLPAREN compstmt ')' */ -#line 2786 "mrbgems/mruby-compiler/core/parse.y" +#line 2982 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-1].nd); } -#line 8674 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8870 "mrbgems/mruby-compiler/core/y.tab.c" break; case 302: /* primary: primary_value "::" "constant" */ -#line 2790 "mrbgems/mruby-compiler/core/parse.y" +#line 2986 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_colon2(p, (yyvsp[-2].nd), (yyvsp[0].id)); } -#line 8682 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8878 "mrbgems/mruby-compiler/core/y.tab.c" break; case 303: /* primary: tCOLON3 "constant" */ -#line 2794 "mrbgems/mruby-compiler/core/parse.y" +#line 2990 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_colon3(p, (yyvsp[0].id)); } -#line 8690 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8886 "mrbgems/mruby-compiler/core/y.tab.c" break; case 304: /* primary: "[" aref_args ']' */ -#line 2798 "mrbgems/mruby-compiler/core/parse.y" +#line 2994 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_array(p, (yyvsp[-1].nd)); } -#line 8698 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8894 "mrbgems/mruby-compiler/core/y.tab.c" break; case 305: /* primary: tLBRACE assoc_list '}' */ -#line 2802 "mrbgems/mruby-compiler/core/parse.y" +#line 2998 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_hash(p, (yyvsp[-1].nd)); } -#line 8706 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8902 "mrbgems/mruby-compiler/core/y.tab.c" break; case 306: /* primary: "'return'" */ -#line 2806 "mrbgems/mruby-compiler/core/parse.y" +#line 3002 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_return(p, 0); } -#line 8714 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8910 "mrbgems/mruby-compiler/core/y.tab.c" break; case 307: /* primary: "'yield'" opt_paren_args */ -#line 2810 "mrbgems/mruby-compiler/core/parse.y" +#line 3006 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_yield(p, (yyvsp[0].nd)); } -#line 8722 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8918 "mrbgems/mruby-compiler/core/y.tab.c" break; case 308: /* primary: "'not'" '(' expr rparen */ -#line 2814 "mrbgems/mruby-compiler/core/parse.y" +#line 3010 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_uni_op(p, cond((yyvsp[-1].nd)), "!"); } -#line 8730 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8926 "mrbgems/mruby-compiler/core/y.tab.c" break; case 309: /* primary: "'not'" '(' rparen */ -#line 2818 "mrbgems/mruby-compiler/core/parse.y" +#line 3014 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_uni_op(p, new_nil(p), "!"); } -#line 8738 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8934 "mrbgems/mruby-compiler/core/y.tab.c" break; case 310: /* primary: operation brace_block */ -#line 2822 "mrbgems/mruby-compiler/core/parse.y" +#line 3018 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_fcall(p, (yyvsp[-1].id), new_callargs(p, 0, 0, (yyvsp[0].nd))); } -#line 8746 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8942 "mrbgems/mruby-compiler/core/y.tab.c" break; case 312: /* primary: method_call brace_block */ -#line 2827 "mrbgems/mruby-compiler/core/parse.y" +#line 3023 "mrbgems/mruby-compiler/core/parse.y" { call_with_block(p, (yyvsp[-1].nd), (yyvsp[0].nd)); (yyval.nd) = (yyvsp[-1].nd); } -#line 8755 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8951 "mrbgems/mruby-compiler/core/y.tab.c" break; case 313: /* @12: %empty */ -#line 2832 "mrbgems/mruby-compiler/core/parse.y" +#line 3028 "mrbgems/mruby-compiler/core/parse.y" { local_nest(p); nvars_nest(p); (yyval.num) = p->lpar_beg; p->lpar_beg = ++p->paren_nest; } -#line 8766 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8962 "mrbgems/mruby-compiler/core/y.tab.c" break; case 314: /* @13: %empty */ -#line 2839 "mrbgems/mruby-compiler/core/parse.y" +#line 3035 "mrbgems/mruby-compiler/core/parse.y" { (yyval.stack) = p->cmdarg_stack; p->cmdarg_stack = 0; } -#line 8775 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8971 "mrbgems/mruby-compiler/core/y.tab.c" break; case 315: /* primary: "->" @12 f_larglist @13 lambda_body */ -#line 2844 "mrbgems/mruby-compiler/core/parse.y" +#line 3040 "mrbgems/mruby-compiler/core/parse.y" { p->lpar_beg = (yyvsp[-3].num); (yyval.nd) = new_lambda(p, (yyvsp[-2].nd), (yyvsp[0].nd)); @@ -8784,195 +8980,195 @@ yyreduce: p->cmdarg_stack = (yyvsp[-1].stack); CMDARG_LEXPOP(); } -#line 8788 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8984 "mrbgems/mruby-compiler/core/y.tab.c" break; case 316: /* primary: "'if'" expr_value then compstmt if_tail "'end'" */ -#line 2856 "mrbgems/mruby-compiler/core/parse.y" +#line 3052 "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 8797 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8993 "mrbgems/mruby-compiler/core/y.tab.c" break; case 317: /* primary: "'unless'" expr_value then compstmt opt_else "'end'" */ -#line 2864 "mrbgems/mruby-compiler/core/parse.y" +#line 3060 "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 8806 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9002 "mrbgems/mruby-compiler/core/y.tab.c" break; case 318: /* $@14: %empty */ -#line 2868 "mrbgems/mruby-compiler/core/parse.y" +#line 3064 "mrbgems/mruby-compiler/core/parse.y" {COND_PUSH(1);} -#line 8812 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9008 "mrbgems/mruby-compiler/core/y.tab.c" break; case 319: /* $@15: %empty */ -#line 2868 "mrbgems/mruby-compiler/core/parse.y" +#line 3064 "mrbgems/mruby-compiler/core/parse.y" {COND_POP();} -#line 8818 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9014 "mrbgems/mruby-compiler/core/y.tab.c" break; case 320: /* primary: "'while'" $@14 expr_value do $@15 compstmt "'end'" */ -#line 2871 "mrbgems/mruby-compiler/core/parse.y" +#line 3067 "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 8827 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9023 "mrbgems/mruby-compiler/core/y.tab.c" break; case 321: /* $@16: %empty */ -#line 2875 "mrbgems/mruby-compiler/core/parse.y" +#line 3071 "mrbgems/mruby-compiler/core/parse.y" {COND_PUSH(1);} -#line 8833 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9029 "mrbgems/mruby-compiler/core/y.tab.c" break; case 322: /* $@17: %empty */ -#line 2875 "mrbgems/mruby-compiler/core/parse.y" +#line 3071 "mrbgems/mruby-compiler/core/parse.y" {COND_POP();} -#line 8839 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9035 "mrbgems/mruby-compiler/core/y.tab.c" break; case 323: /* primary: "'until'" $@16 expr_value do $@17 compstmt "'end'" */ -#line 2878 "mrbgems/mruby-compiler/core/parse.y" +#line 3074 "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 8848 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9044 "mrbgems/mruby-compiler/core/y.tab.c" break; case 324: /* primary: "'case'" expr_value opt_terms case_body "'end'" */ -#line 2885 "mrbgems/mruby-compiler/core/parse.y" +#line 3081 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_case(p, (yyvsp[-3].nd), (yyvsp[-1].nd)); } -#line 8856 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9052 "mrbgems/mruby-compiler/core/y.tab.c" break; case 325: /* primary: "'case'" opt_terms case_body "'end'" */ -#line 2889 "mrbgems/mruby-compiler/core/parse.y" +#line 3085 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_case(p, 0, (yyvsp[-1].nd)); } -#line 8864 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9060 "mrbgems/mruby-compiler/core/y.tab.c" break; case 326: /* $@18: %empty */ -#line 2893 "mrbgems/mruby-compiler/core/parse.y" +#line 3089 "mrbgems/mruby-compiler/core/parse.y" {COND_PUSH(1);} -#line 8870 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9066 "mrbgems/mruby-compiler/core/y.tab.c" break; case 327: /* $@19: %empty */ -#line 2895 "mrbgems/mruby-compiler/core/parse.y" +#line 3091 "mrbgems/mruby-compiler/core/parse.y" {COND_POP();} -#line 8876 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9072 "mrbgems/mruby-compiler/core/y.tab.c" break; case 328: /* primary: "'for'" for_var "'in'" $@18 expr_value do $@19 compstmt "'end'" */ -#line 2898 "mrbgems/mruby-compiler/core/parse.y" +#line 3094 "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 8885 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9081 "mrbgems/mruby-compiler/core/y.tab.c" break; case 329: /* @20: %empty */ -#line 2904 "mrbgems/mruby-compiler/core/parse.y" +#line 3100 "mrbgems/mruby-compiler/core/parse.y" { if (p->in_def || p->in_single) yyerror(&(yylsp[-2]), p, "class definition in method body"); (yyval.nd) = local_switch(p); nvars_block(p); } -#line 8896 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9092 "mrbgems/mruby-compiler/core/y.tab.c" break; case 330: /* primary: "'class'" cpath superclass @20 bodystmt "'end'" */ -#line 2912 "mrbgems/mruby-compiler/core/parse.y" +#line 3108 "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 8907 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9103 "mrbgems/mruby-compiler/core/y.tab.c" break; case 331: /* @21: %empty */ -#line 2920 "mrbgems/mruby-compiler/core/parse.y" +#line 3116 "mrbgems/mruby-compiler/core/parse.y" { (yyval.num) = p->in_def; p->in_def = 0; } -#line 8916 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9112 "mrbgems/mruby-compiler/core/y.tab.c" break; case 332: /* @22: %empty */ -#line 2925 "mrbgems/mruby-compiler/core/parse.y" +#line 3121 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = cons(local_switch(p), nint(p->in_single)); + (yyval.nd) = cons(local_switch(p), int_to_node(p->in_single)); nvars_block(p); p->in_single = 0; } -#line 8926 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9122 "mrbgems/mruby-compiler/core/y.tab.c" break; case 333: /* primary: "'class'" "<<" expr @21 term @22 bodystmt "'end'" */ -#line 2932 "mrbgems/mruby-compiler/core/parse.y" +#line 3128 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_sclass(p, (yyvsp[-5].nd), (yyvsp[-1].nd)); SET_LINENO((yyval.nd), (yyvsp[-7].num)); local_resume(p, (yyvsp[-2].nd)->car); nvars_unnest(p); p->in_def = (yyvsp[-4].num); - p->in_single = intn((yyvsp[-2].nd)->cdr); + p->in_single = node_to_int((yyvsp[-2].nd)->cdr); } -#line 8939 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9135 "mrbgems/mruby-compiler/core/y.tab.c" break; case 334: /* @23: %empty */ -#line 2942 "mrbgems/mruby-compiler/core/parse.y" +#line 3138 "mrbgems/mruby-compiler/core/parse.y" { if (p->in_def || p->in_single) yyerror(&(yylsp[-1]), p, "module definition in method body"); (yyval.nd) = local_switch(p); nvars_block(p); } -#line 8950 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9146 "mrbgems/mruby-compiler/core/y.tab.c" break; case 335: /* primary: "'module'" cpath @23 bodystmt "'end'" */ -#line 2950 "mrbgems/mruby-compiler/core/parse.y" +#line 3146 "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 8961 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9157 "mrbgems/mruby-compiler/core/y.tab.c" break; case 336: /* primary: defn_head f_arglist bodystmt "'end'" */ -#line 2960 "mrbgems/mruby-compiler/core/parse.y" +#line 3156 "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 8972 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9168 "mrbgems/mruby-compiler/core/y.tab.c" break; case 337: /* primary: defs_head f_arglist bodystmt "'end'" */ -#line 2970 "mrbgems/mruby-compiler/core/parse.y" +#line 3166 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-3].nd); defs_setup(p, (yyval.nd), (yyvsp[-2].nd), (yyvsp[-1].nd)); @@ -8980,455 +9176,455 @@ yyreduce: p->in_def--; p->in_single--; } -#line 8984 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9180 "mrbgems/mruby-compiler/core/y.tab.c" break; case 338: /* primary: "'break'" */ -#line 2978 "mrbgems/mruby-compiler/core/parse.y" +#line 3174 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_break(p, 0); } -#line 8992 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9188 "mrbgems/mruby-compiler/core/y.tab.c" break; case 339: /* primary: "'next'" */ -#line 2982 "mrbgems/mruby-compiler/core/parse.y" +#line 3178 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_next(p, 0); } -#line 9000 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9196 "mrbgems/mruby-compiler/core/y.tab.c" break; case 340: /* primary: "'redo'" */ -#line 2986 "mrbgems/mruby-compiler/core/parse.y" +#line 3182 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_redo(p); } -#line 9008 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9204 "mrbgems/mruby-compiler/core/y.tab.c" break; case 341: /* primary: "'retry'" */ -#line 2990 "mrbgems/mruby-compiler/core/parse.y" +#line 3186 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_retry(p); } -#line 9016 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9212 "mrbgems/mruby-compiler/core/y.tab.c" break; case 342: /* primary_value: primary */ -#line 2996 "mrbgems/mruby-compiler/core/parse.y" +#line 3192 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[0].nd); if (!(yyval.nd)) (yyval.nd) = new_nil(p); } -#line 9025 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9221 "mrbgems/mruby-compiler/core/y.tab.c" break; case 349: /* if_tail: "'elsif'" expr_value then compstmt if_tail */ -#line 3015 "mrbgems/mruby-compiler/core/parse.y" +#line 3211 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_if(p, cond((yyvsp[-3].nd)), (yyvsp[-1].nd), (yyvsp[0].nd)); } -#line 9033 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9229 "mrbgems/mruby-compiler/core/y.tab.c" break; case 351: /* opt_else: "'else'" compstmt */ -#line 3022 "mrbgems/mruby-compiler/core/parse.y" +#line 3218 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[0].nd); } -#line 9041 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9237 "mrbgems/mruby-compiler/core/y.tab.c" break; case 352: /* for_var: lhs */ -#line 3028 "mrbgems/mruby-compiler/core/parse.y" +#line 3224 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list1(list1((yyvsp[0].nd))); } -#line 9049 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9245 "mrbgems/mruby-compiler/core/y.tab.c" break; case 354: /* f_margs: f_arg */ -#line 3035 "mrbgems/mruby-compiler/core/parse.y" +#line 3231 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list3((yyvsp[0].nd),0,0); } -#line 9057 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9253 "mrbgems/mruby-compiler/core/y.tab.c" break; case 355: /* f_margs: f_arg ',' "*" f_norm_arg */ -#line 3039 "mrbgems/mruby-compiler/core/parse.y" +#line 3235 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list3((yyvsp[-3].nd), new_arg(p, (yyvsp[0].id)), 0); } -#line 9065 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9261 "mrbgems/mruby-compiler/core/y.tab.c" break; case 356: /* f_margs: f_arg ',' "*" f_norm_arg ',' f_arg */ -#line 3043 "mrbgems/mruby-compiler/core/parse.y" +#line 3239 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list3((yyvsp[-5].nd), new_arg(p, (yyvsp[-2].id)), (yyvsp[0].nd)); } -#line 9073 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9269 "mrbgems/mruby-compiler/core/y.tab.c" break; case 357: /* f_margs: f_arg ',' "*" */ -#line 3047 "mrbgems/mruby-compiler/core/parse.y" +#line 3243 "mrbgems/mruby-compiler/core/parse.y" { local_add_f(p, intern_op(mul)); - (yyval.nd) = list3((yyvsp[-2].nd), nint(-1), 0); + (yyval.nd) = list3((yyvsp[-2].nd), int_to_node(-1), 0); } -#line 9082 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9278 "mrbgems/mruby-compiler/core/y.tab.c" break; case 358: /* f_margs: f_arg ',' "*" ',' f_arg */ -#line 3052 "mrbgems/mruby-compiler/core/parse.y" +#line 3248 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = list3((yyvsp[-4].nd), nint(-1), (yyvsp[0].nd)); + (yyval.nd) = list3((yyvsp[-4].nd), int_to_node(-1), (yyvsp[0].nd)); } -#line 9090 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9286 "mrbgems/mruby-compiler/core/y.tab.c" break; case 359: /* f_margs: "*" f_norm_arg */ -#line 3056 "mrbgems/mruby-compiler/core/parse.y" +#line 3252 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list3(0, new_arg(p, (yyvsp[0].id)), 0); } -#line 9098 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9294 "mrbgems/mruby-compiler/core/y.tab.c" break; case 360: /* f_margs: "*" f_norm_arg ',' f_arg */ -#line 3060 "mrbgems/mruby-compiler/core/parse.y" +#line 3256 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list3(0, new_arg(p, (yyvsp[-2].id)), (yyvsp[0].nd)); } -#line 9106 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9302 "mrbgems/mruby-compiler/core/y.tab.c" break; case 361: /* f_margs: "*" */ -#line 3064 "mrbgems/mruby-compiler/core/parse.y" +#line 3260 "mrbgems/mruby-compiler/core/parse.y" { local_add_f(p, intern_op(mul)); - (yyval.nd) = list3(0, nint(-1), 0); + (yyval.nd) = list3(0, int_to_node(-1), 0); } -#line 9115 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9311 "mrbgems/mruby-compiler/core/y.tab.c" break; case 362: /* $@24: %empty */ -#line 3069 "mrbgems/mruby-compiler/core/parse.y" +#line 3265 "mrbgems/mruby-compiler/core/parse.y" { local_add_f(p, intern_op(mul)); } -#line 9123 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9319 "mrbgems/mruby-compiler/core/y.tab.c" break; case 363: /* f_margs: "*" ',' $@24 f_arg */ -#line 3073 "mrbgems/mruby-compiler/core/parse.y" +#line 3269 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = list3(0, nint(-1), (yyvsp[0].nd)); + (yyval.nd) = list3(0, int_to_node(-1), (yyvsp[0].nd)); } -#line 9131 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9327 "mrbgems/mruby-compiler/core/y.tab.c" break; case 364: /* block_args_tail: f_block_kwarg ',' f_kwrest opt_f_block_arg */ -#line 3079 "mrbgems/mruby-compiler/core/parse.y" +#line 3275 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args_tail(p, (yyvsp[-3].nd), (yyvsp[-1].nd), (yyvsp[0].id)); } -#line 9139 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9335 "mrbgems/mruby-compiler/core/y.tab.c" break; case 365: /* block_args_tail: f_block_kwarg opt_f_block_arg */ -#line 3083 "mrbgems/mruby-compiler/core/parse.y" +#line 3279 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args_tail(p, (yyvsp[-1].nd), 0, (yyvsp[0].id)); } -#line 9147 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9343 "mrbgems/mruby-compiler/core/y.tab.c" break; case 366: /* block_args_tail: f_kwrest opt_f_block_arg */ -#line 3087 "mrbgems/mruby-compiler/core/parse.y" +#line 3283 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args_tail(p, 0, (yyvsp[-1].nd), (yyvsp[0].id)); } -#line 9155 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9351 "mrbgems/mruby-compiler/core/y.tab.c" break; case 367: /* block_args_tail: f_block_arg */ -#line 3091 "mrbgems/mruby-compiler/core/parse.y" +#line 3287 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args_tail(p, 0, 0, (yyvsp[0].id)); } -#line 9163 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9359 "mrbgems/mruby-compiler/core/y.tab.c" break; case 368: /* opt_block_args_tail: ',' block_args_tail */ -#line 3097 "mrbgems/mruby-compiler/core/parse.y" +#line 3293 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[0].nd); } -#line 9171 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9367 "mrbgems/mruby-compiler/core/y.tab.c" break; case 369: /* opt_block_args_tail: %empty */ -#line 3101 "mrbgems/mruby-compiler/core/parse.y" +#line 3297 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args_tail(p, 0, 0, 0); } -#line 9179 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9375 "mrbgems/mruby-compiler/core/y.tab.c" break; case 370: /* block_param: f_arg ',' f_block_optarg ',' f_rest_arg opt_block_args_tail */ -#line 3107 "mrbgems/mruby-compiler/core/parse.y" +#line 3303 "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 9187 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9383 "mrbgems/mruby-compiler/core/y.tab.c" break; case 371: /* block_param: f_arg ',' f_block_optarg ',' f_rest_arg ',' f_arg opt_block_args_tail */ -#line 3111 "mrbgems/mruby-compiler/core/parse.y" +#line 3307 "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 9195 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9391 "mrbgems/mruby-compiler/core/y.tab.c" break; case 372: /* block_param: f_arg ',' f_block_optarg opt_block_args_tail */ -#line 3115 "mrbgems/mruby-compiler/core/parse.y" +#line 3311 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args(p, (yyvsp[-3].nd), (yyvsp[-1].nd), 0, 0, (yyvsp[0].nd)); } -#line 9203 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9399 "mrbgems/mruby-compiler/core/y.tab.c" break; case 373: /* block_param: f_arg ',' f_block_optarg ',' f_arg opt_block_args_tail */ -#line 3119 "mrbgems/mruby-compiler/core/parse.y" +#line 3315 "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 9211 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9407 "mrbgems/mruby-compiler/core/y.tab.c" break; case 374: /* block_param: f_arg ',' f_rest_arg opt_block_args_tail */ -#line 3123 "mrbgems/mruby-compiler/core/parse.y" +#line 3319 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args(p, (yyvsp[-3].nd), 0, (yyvsp[-1].id), 0, (yyvsp[0].nd)); } -#line 9219 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9415 "mrbgems/mruby-compiler/core/y.tab.c" break; case 375: /* block_param: f_arg ',' opt_block_args_tail */ -#line 3127 "mrbgems/mruby-compiler/core/parse.y" +#line 3323 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args(p, (yyvsp[-2].nd), 0, 0, 0, (yyvsp[0].nd)); } -#line 9227 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9423 "mrbgems/mruby-compiler/core/y.tab.c" break; case 376: /* block_param: f_arg ',' f_rest_arg ',' f_arg opt_block_args_tail */ -#line 3131 "mrbgems/mruby-compiler/core/parse.y" +#line 3327 "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 9235 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9431 "mrbgems/mruby-compiler/core/y.tab.c" break; case 377: /* block_param: f_arg opt_block_args_tail */ -#line 3135 "mrbgems/mruby-compiler/core/parse.y" +#line 3331 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args(p, (yyvsp[-1].nd), 0, 0, 0, (yyvsp[0].nd)); } -#line 9243 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9439 "mrbgems/mruby-compiler/core/y.tab.c" break; case 378: /* block_param: f_block_optarg ',' f_rest_arg opt_block_args_tail */ -#line 3139 "mrbgems/mruby-compiler/core/parse.y" +#line 3335 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args(p, 0, (yyvsp[-3].nd), (yyvsp[-1].id), 0, (yyvsp[0].nd)); } -#line 9251 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9447 "mrbgems/mruby-compiler/core/y.tab.c" break; case 379: /* block_param: f_block_optarg ',' f_rest_arg ',' f_arg opt_block_args_tail */ -#line 3143 "mrbgems/mruby-compiler/core/parse.y" +#line 3339 "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 9259 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9455 "mrbgems/mruby-compiler/core/y.tab.c" break; case 380: /* block_param: f_block_optarg opt_block_args_tail */ -#line 3147 "mrbgems/mruby-compiler/core/parse.y" +#line 3343 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args(p, 0, (yyvsp[-1].nd), 0, 0, (yyvsp[0].nd)); } -#line 9267 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9463 "mrbgems/mruby-compiler/core/y.tab.c" break; case 381: /* block_param: f_block_optarg ',' f_arg opt_block_args_tail */ -#line 3151 "mrbgems/mruby-compiler/core/parse.y" +#line 3347 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args(p, 0, (yyvsp[-3].nd), 0, (yyvsp[-1].nd), (yyvsp[0].nd)); } -#line 9275 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9471 "mrbgems/mruby-compiler/core/y.tab.c" break; case 382: /* block_param: f_rest_arg opt_block_args_tail */ -#line 3155 "mrbgems/mruby-compiler/core/parse.y" +#line 3351 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args(p, 0, 0, (yyvsp[-1].id), 0, (yyvsp[0].nd)); } -#line 9283 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9479 "mrbgems/mruby-compiler/core/y.tab.c" break; case 383: /* block_param: f_rest_arg ',' f_arg opt_block_args_tail */ -#line 3159 "mrbgems/mruby-compiler/core/parse.y" +#line 3355 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args(p, 0, 0, (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd)); } -#line 9291 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9487 "mrbgems/mruby-compiler/core/y.tab.c" break; case 384: /* block_param: block_args_tail */ -#line 3163 "mrbgems/mruby-compiler/core/parse.y" +#line 3359 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args(p, 0, 0, 0, 0, (yyvsp[0].nd)); } -#line 9299 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9495 "mrbgems/mruby-compiler/core/y.tab.c" break; case 385: /* opt_block_param: none */ -#line 3169 "mrbgems/mruby-compiler/core/parse.y" +#line 3365 "mrbgems/mruby-compiler/core/parse.y" { local_add_blk(p); (yyval.nd) = 0; } -#line 9308 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9504 "mrbgems/mruby-compiler/core/y.tab.c" break; case 386: /* opt_block_param: block_param_def */ -#line 3174 "mrbgems/mruby-compiler/core/parse.y" +#line 3370 "mrbgems/mruby-compiler/core/parse.y" { p->cmd_start = TRUE; (yyval.nd) = (yyvsp[0].nd); } -#line 9317 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9513 "mrbgems/mruby-compiler/core/y.tab.c" break; case 387: /* $@25: %empty */ -#line 3180 "mrbgems/mruby-compiler/core/parse.y" +#line 3376 "mrbgems/mruby-compiler/core/parse.y" {local_add_blk(p);} -#line 9323 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9519 "mrbgems/mruby-compiler/core/y.tab.c" break; case 388: /* block_param_def: '|' $@25 opt_bv_decl '|' */ -#line 3181 "mrbgems/mruby-compiler/core/parse.y" +#line 3377 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = 0; } -#line 9331 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9527 "mrbgems/mruby-compiler/core/y.tab.c" break; case 389: /* block_param_def: "||" */ -#line 3185 "mrbgems/mruby-compiler/core/parse.y" +#line 3381 "mrbgems/mruby-compiler/core/parse.y" { local_add_blk(p); (yyval.nd) = 0; } -#line 9340 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9536 "mrbgems/mruby-compiler/core/y.tab.c" break; case 390: /* block_param_def: '|' block_param opt_bv_decl '|' */ -#line 3190 "mrbgems/mruby-compiler/core/parse.y" +#line 3386 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-2].nd); } -#line 9348 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9544 "mrbgems/mruby-compiler/core/y.tab.c" break; case 391: /* opt_bv_decl: opt_nl */ -#line 3197 "mrbgems/mruby-compiler/core/parse.y" +#line 3393 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = 0; } -#line 9356 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9552 "mrbgems/mruby-compiler/core/y.tab.c" break; case 392: /* opt_bv_decl: opt_nl ';' bv_decls opt_nl */ -#line 3201 "mrbgems/mruby-compiler/core/parse.y" +#line 3397 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = 0; } -#line 9364 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9560 "mrbgems/mruby-compiler/core/y.tab.c" break; case 395: /* bvar: "local variable or method" */ -#line 3211 "mrbgems/mruby-compiler/core/parse.y" +#line 3407 "mrbgems/mruby-compiler/core/parse.y" { local_add_f(p, (yyvsp[0].id)); new_bv(p, (yyvsp[0].id)); } -#line 9373 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9569 "mrbgems/mruby-compiler/core/y.tab.c" break; case 397: /* f_larglist: '(' f_args opt_bv_decl ')' */ -#line 3219 "mrbgems/mruby-compiler/core/parse.y" +#line 3415 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-2].nd); } -#line 9381 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9577 "mrbgems/mruby-compiler/core/y.tab.c" break; case 398: /* f_larglist: f_args */ -#line 3223 "mrbgems/mruby-compiler/core/parse.y" +#line 3419 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[0].nd); } -#line 9389 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9585 "mrbgems/mruby-compiler/core/y.tab.c" break; case 399: /* lambda_body: tLAMBEG compstmt '}' */ -#line 3229 "mrbgems/mruby-compiler/core/parse.y" +#line 3425 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-1].nd); } -#line 9397 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9593 "mrbgems/mruby-compiler/core/y.tab.c" break; case 400: /* lambda_body: "'do' for lambda" bodystmt "'end'" */ -#line 3233 "mrbgems/mruby-compiler/core/parse.y" +#line 3429 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-1].nd); } -#line 9405 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9601 "mrbgems/mruby-compiler/core/y.tab.c" break; case 401: /* @26: %empty */ -#line 3239 "mrbgems/mruby-compiler/core/parse.y" +#line 3435 "mrbgems/mruby-compiler/core/parse.y" { local_nest(p); nvars_nest(p); (yyval.num) = p->lineno; } -#line 9415 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9611 "mrbgems/mruby-compiler/core/y.tab.c" break; case 402: /* do_block: "'do' for block" @26 opt_block_param bodystmt "'end'" */ -#line 3247 "mrbgems/mruby-compiler/core/parse.y" +#line 3443 "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 9426 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9622 "mrbgems/mruby-compiler/core/y.tab.c" break; case 403: /* block_call: command do_block */ -#line 3256 "mrbgems/mruby-compiler/core/parse.y" +#line 3452 "mrbgems/mruby-compiler/core/parse.y" { - if (typen((yyvsp[-1].nd)->car) == NODE_YIELD) { + if (node_to_type((yyvsp[-1].nd)->car) == NODE_YIELD) { yyerror(&(yylsp[-1]), p, "block given to yield"); } else { @@ -9436,159 +9632,159 @@ yyreduce: } (yyval.nd) = (yyvsp[-1].nd); } -#line 9440 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9636 "mrbgems/mruby-compiler/core/y.tab.c" break; case 404: /* block_call: block_call call_op2 operation2 opt_paren_args */ -#line 3266 "mrbgems/mruby-compiler/core/parse.y" +#line 3462 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_call(p, (yyvsp[-3].nd), (yyvsp[-1].id), (yyvsp[0].nd), (yyvsp[-2].num)); } -#line 9448 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9644 "mrbgems/mruby-compiler/core/y.tab.c" break; case 405: /* block_call: block_call call_op2 operation2 opt_paren_args brace_block */ -#line 3270 "mrbgems/mruby-compiler/core/parse.y" +#line 3466 "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 9457 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9653 "mrbgems/mruby-compiler/core/y.tab.c" break; case 406: /* block_call: block_call call_op2 operation2 command_args do_block */ -#line 3275 "mrbgems/mruby-compiler/core/parse.y" +#line 3471 "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 9466 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9662 "mrbgems/mruby-compiler/core/y.tab.c" break; case 407: /* method_call: operation paren_args */ -#line 3282 "mrbgems/mruby-compiler/core/parse.y" +#line 3478 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_fcall(p, (yyvsp[-1].id), (yyvsp[0].nd)); } -#line 9474 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9670 "mrbgems/mruby-compiler/core/y.tab.c" break; case 408: /* method_call: primary_value call_op operation2 opt_paren_args */ -#line 3286 "mrbgems/mruby-compiler/core/parse.y" +#line 3482 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_call(p, (yyvsp[-3].nd), (yyvsp[-1].id), (yyvsp[0].nd), (yyvsp[-2].num)); } -#line 9482 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9678 "mrbgems/mruby-compiler/core/y.tab.c" break; case 409: /* method_call: primary_value "::" operation2 paren_args */ -#line 3290 "mrbgems/mruby-compiler/core/parse.y" +#line 3486 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_call(p, (yyvsp[-3].nd), (yyvsp[-1].id), (yyvsp[0].nd), tCOLON2); } -#line 9490 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9686 "mrbgems/mruby-compiler/core/y.tab.c" break; case 410: /* method_call: primary_value "::" operation3 */ -#line 3294 "mrbgems/mruby-compiler/core/parse.y" +#line 3490 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_call(p, (yyvsp[-2].nd), (yyvsp[0].id), 0, tCOLON2); } -#line 9498 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9694 "mrbgems/mruby-compiler/core/y.tab.c" break; case 411: /* method_call: primary_value call_op paren_args */ -#line 3298 "mrbgems/mruby-compiler/core/parse.y" +#line 3494 "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 9506 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9702 "mrbgems/mruby-compiler/core/y.tab.c" break; case 412: /* method_call: primary_value "::" paren_args */ -#line 3302 "mrbgems/mruby-compiler/core/parse.y" +#line 3498 "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 9514 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9710 "mrbgems/mruby-compiler/core/y.tab.c" break; case 413: /* method_call: "'super'" paren_args */ -#line 3306 "mrbgems/mruby-compiler/core/parse.y" +#line 3502 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_super(p, (yyvsp[0].nd)); } -#line 9522 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9718 "mrbgems/mruby-compiler/core/y.tab.c" break; case 414: /* method_call: "'super'" */ -#line 3310 "mrbgems/mruby-compiler/core/parse.y" +#line 3506 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_zsuper(p); } -#line 9530 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9726 "mrbgems/mruby-compiler/core/y.tab.c" break; case 415: /* method_call: primary_value '[' opt_call_args ']' */ -#line 3314 "mrbgems/mruby-compiler/core/parse.y" +#line 3510 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_call(p, (yyvsp[-3].nd), intern_op(aref), (yyvsp[-1].nd), '.'); } -#line 9538 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9734 "mrbgems/mruby-compiler/core/y.tab.c" break; case 416: /* @27: %empty */ -#line 3320 "mrbgems/mruby-compiler/core/parse.y" +#line 3516 "mrbgems/mruby-compiler/core/parse.y" { local_nest(p); nvars_nest(p); (yyval.num) = p->lineno; } -#line 9548 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9744 "mrbgems/mruby-compiler/core/y.tab.c" break; case 417: /* brace_block: '{' @27 opt_block_param compstmt '}' */ -#line 3327 "mrbgems/mruby-compiler/core/parse.y" +#line 3523 "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 9559 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9755 "mrbgems/mruby-compiler/core/y.tab.c" break; case 418: /* @28: %empty */ -#line 3334 "mrbgems/mruby-compiler/core/parse.y" +#line 3530 "mrbgems/mruby-compiler/core/parse.y" { local_nest(p); nvars_nest(p); (yyval.num) = p->lineno; } -#line 9569 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9765 "mrbgems/mruby-compiler/core/y.tab.c" break; case 419: /* brace_block: "'do'" @28 opt_block_param bodystmt "'end'" */ -#line 3341 "mrbgems/mruby-compiler/core/parse.y" +#line 3537 "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 9580 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9776 "mrbgems/mruby-compiler/core/y.tab.c" break; case 420: /* case_body: "'when'" args then compstmt cases */ -#line 3352 "mrbgems/mruby-compiler/core/parse.y" +#line 3548 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = cons(cons((yyvsp[-3].nd), (yyvsp[-1].nd)), (yyvsp[0].nd)); } -#line 9588 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9784 "mrbgems/mruby-compiler/core/y.tab.c" break; case 421: /* cases: opt_else */ -#line 3358 "mrbgems/mruby-compiler/core/parse.y" +#line 3554 "mrbgems/mruby-compiler/core/parse.y" { if ((yyvsp[0].nd)) { (yyval.nd) = cons(cons(0, (yyvsp[0].nd)), 0); @@ -9597,63 +9793,63 @@ yyreduce: (yyval.nd) = 0; } } -#line 9601 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9797 "mrbgems/mruby-compiler/core/y.tab.c" break; case 423: /* opt_rescue: "'rescue'" exc_list exc_var then compstmt opt_rescue */ -#line 3372 "mrbgems/mruby-compiler/core/parse.y" +#line 3568 "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 9610 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9806 "mrbgems/mruby-compiler/core/y.tab.c" break; case 425: /* exc_list: arg */ -#line 3380 "mrbgems/mruby-compiler/core/parse.y" +#line 3576 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list1((yyvsp[0].nd)); } -#line 9618 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9814 "mrbgems/mruby-compiler/core/y.tab.c" break; case 428: /* exc_var: "=>" lhs */ -#line 3388 "mrbgems/mruby-compiler/core/parse.y" +#line 3584 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[0].nd); } -#line 9626 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9822 "mrbgems/mruby-compiler/core/y.tab.c" break; case 430: /* opt_ensure: "'ensure'" compstmt */ -#line 3395 "mrbgems/mruby-compiler/core/parse.y" +#line 3591 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[0].nd); } -#line 9634 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9830 "mrbgems/mruby-compiler/core/y.tab.c" break; case 437: /* string: string string_fragment */ -#line 3409 "mrbgems/mruby-compiler/core/parse.y" +#line 3605 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = concat_string(p, (yyvsp[-1].nd), (yyvsp[0].nd)); } -#line 9642 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9838 "mrbgems/mruby-compiler/core/y.tab.c" break; case 440: /* string_fragment: "string literal" tSTRING */ -#line 3417 "mrbgems/mruby-compiler/core/parse.y" +#line 3613 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[0].nd); } -#line 9650 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9846 "mrbgems/mruby-compiler/core/y.tab.c" break; case 441: /* string_fragment: "string literal" string_rep tSTRING */ -#line 3421 "mrbgems/mruby-compiler/core/parse.y" +#line 3617 "mrbgems/mruby-compiler/core/parse.y" { node *n = (yyvsp[-1].nd); - if (intn((yyvsp[0].nd)->cdr->cdr) > 0) { + if (node_to_int((yyvsp[0].nd)->cdr->cdr) > 0) { n = push(n, (yyvsp[0].nd)); } else { @@ -9661,71 +9857,71 @@ yyreduce: } (yyval.nd) = new_dstr(p, n); } -#line 9665 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9861 "mrbgems/mruby-compiler/core/y.tab.c" break; case 443: /* string_rep: string_rep string_interp */ -#line 3435 "mrbgems/mruby-compiler/core/parse.y" +#line 3631 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = append((yyvsp[-1].nd), (yyvsp[0].nd)); } -#line 9673 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9869 "mrbgems/mruby-compiler/core/y.tab.c" break; case 444: /* string_interp: tSTRING_MID */ -#line 3441 "mrbgems/mruby-compiler/core/parse.y" +#line 3637 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list1((yyvsp[0].nd)); } -#line 9681 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9877 "mrbgems/mruby-compiler/core/y.tab.c" break; case 445: /* @29: %empty */ -#line 3445 "mrbgems/mruby-compiler/core/parse.y" +#line 3641 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = push_strterm(p); } -#line 9689 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9885 "mrbgems/mruby-compiler/core/y.tab.c" break; case 446: /* string_interp: tSTRING_PART @29 compstmt '}' */ -#line 3450 "mrbgems/mruby-compiler/core/parse.y" +#line 3646 "mrbgems/mruby-compiler/core/parse.y" { pop_strterm(p,(yyvsp[-2].nd)); (yyval.nd) = list2((yyvsp[-3].nd), (yyvsp[-1].nd)); } -#line 9698 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9894 "mrbgems/mruby-compiler/core/y.tab.c" break; case 447: /* string_interp: tLITERAL_DELIM */ -#line 3455 "mrbgems/mruby-compiler/core/parse.y" +#line 3651 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list1(new_literal_delim(p)); } -#line 9706 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9902 "mrbgems/mruby-compiler/core/y.tab.c" break; case 448: /* string_interp: tHD_LITERAL_DELIM heredoc_bodies */ -#line 3459 "mrbgems/mruby-compiler/core/parse.y" +#line 3655 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list1(new_literal_delim(p)); } -#line 9714 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9910 "mrbgems/mruby-compiler/core/y.tab.c" break; case 449: /* xstring: tXSTRING_BEG tXSTRING */ -#line 3465 "mrbgems/mruby-compiler/core/parse.y" +#line 3661 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[0].nd); } -#line 9722 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9918 "mrbgems/mruby-compiler/core/y.tab.c" break; case 450: /* xstring: tXSTRING_BEG string_rep tXSTRING */ -#line 3469 "mrbgems/mruby-compiler/core/parse.y" +#line 3665 "mrbgems/mruby-compiler/core/parse.y" { node *n = (yyvsp[-1].nd); - if (intn((yyvsp[0].nd)->cdr->cdr) > 0) { + if (node_to_int((yyvsp[0].nd)->cdr->cdr) > 0) { n = push(n, (yyvsp[0].nd)); } else { @@ -9733,84 +9929,84 @@ yyreduce: } (yyval.nd) = new_dxstr(p, n); } -#line 9737 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9933 "mrbgems/mruby-compiler/core/y.tab.c" break; case 451: /* regexp: tREGEXP_BEG tREGEXP */ -#line 3482 "mrbgems/mruby-compiler/core/parse.y" +#line 3678 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[0].nd); } -#line 9745 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9941 "mrbgems/mruby-compiler/core/y.tab.c" break; case 452: /* regexp: tREGEXP_BEG string_rep tREGEXP */ -#line 3486 "mrbgems/mruby-compiler/core/parse.y" +#line 3682 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_dregx(p, (yyvsp[-1].nd), (yyvsp[0].nd)); } -#line 9753 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9949 "mrbgems/mruby-compiler/core/y.tab.c" break; case 456: /* heredoc_body: tHEREDOC_END */ -#line 3499 "mrbgems/mruby-compiler/core/parse.y" +#line 3695 "mrbgems/mruby-compiler/core/parse.y" { parser_heredoc_info *info = parsing_heredoc_info(p); info->doc = push(info->doc, new_str(p, "", 0)); heredoc_end(p); } -#line 9763 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9959 "mrbgems/mruby-compiler/core/y.tab.c" break; case 457: /* heredoc_body: heredoc_string_rep tHEREDOC_END */ -#line 3505 "mrbgems/mruby-compiler/core/parse.y" +#line 3701 "mrbgems/mruby-compiler/core/parse.y" { heredoc_end(p); } -#line 9771 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9967 "mrbgems/mruby-compiler/core/y.tab.c" break; case 460: /* heredoc_string_interp: tHD_STRING_MID */ -#line 3515 "mrbgems/mruby-compiler/core/parse.y" +#line 3711 "mrbgems/mruby-compiler/core/parse.y" { parser_heredoc_info *info = parsing_heredoc_info(p); info->doc = push(info->doc, (yyvsp[0].nd)); heredoc_treat_nextline(p); } -#line 9781 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9977 "mrbgems/mruby-compiler/core/y.tab.c" break; case 461: /* @30: %empty */ -#line 3521 "mrbgems/mruby-compiler/core/parse.y" +#line 3717 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = push_strterm(p); } -#line 9789 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9985 "mrbgems/mruby-compiler/core/y.tab.c" break; case 462: /* heredoc_string_interp: tHD_STRING_PART @30 compstmt '}' */ -#line 3526 "mrbgems/mruby-compiler/core/parse.y" +#line 3722 "mrbgems/mruby-compiler/core/parse.y" { pop_strterm(p, (yyvsp[-2].nd)); parser_heredoc_info *info = parsing_heredoc_info(p); info->doc = push(push(info->doc, (yyvsp[-3].nd)), (yyvsp[-1].nd)); } -#line 9799 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9995 "mrbgems/mruby-compiler/core/y.tab.c" break; case 463: /* words: tWORDS_BEG tSTRING */ -#line 3534 "mrbgems/mruby-compiler/core/parse.y" +#line 3730 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_words(p, list1((yyvsp[0].nd))); } -#line 9807 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10003 "mrbgems/mruby-compiler/core/y.tab.c" break; case 464: /* words: tWORDS_BEG string_rep tSTRING */ -#line 3538 "mrbgems/mruby-compiler/core/parse.y" +#line 3734 "mrbgems/mruby-compiler/core/parse.y" { node *n = (yyvsp[-1].nd); - if (intn((yyvsp[0].nd)->cdr->cdr) > 0) { + if (node_to_int((yyvsp[0].nd)->cdr->cdr) > 0) { n = push(n, (yyvsp[0].nd)); } else { @@ -9818,23 +10014,23 @@ yyreduce: } (yyval.nd) = new_words(p, n); } -#line 9822 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10018 "mrbgems/mruby-compiler/core/y.tab.c" break; case 465: /* symbol: basic_symbol */ -#line 3552 "mrbgems/mruby-compiler/core/parse.y" +#line 3748 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_sym(p, (yyvsp[0].id)); } -#line 9830 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10026 "mrbgems/mruby-compiler/core/y.tab.c" break; case 466: /* symbol: "symbol" "string literal" string_rep tSTRING */ -#line 3556 "mrbgems/mruby-compiler/core/parse.y" +#line 3752 "mrbgems/mruby-compiler/core/parse.y" { node *n = (yyvsp[-1].nd); p->lstate = EXPR_ENDARG; - if (intn((yyvsp[0].nd)->cdr->cdr) > 0) { + if (node_to_int((yyvsp[0].nd)->cdr->cdr) > 0) { n = push(n, (yyvsp[0].nd)); } else { @@ -9842,185 +10038,185 @@ yyreduce: } (yyval.nd) = new_dsym(p, new_dstr(p, n)); } -#line 9846 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10042 "mrbgems/mruby-compiler/core/y.tab.c" break; case 467: /* symbol: "symbol" "numbered parameter" */ -#line 3568 "mrbgems/mruby-compiler/core/parse.y" +#line 3764 "mrbgems/mruby-compiler/core/parse.y" { mrb_sym sym = intern_numparam((yyvsp[0].num)); (yyval.nd) = new_sym(p, sym); } -#line 9855 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10051 "mrbgems/mruby-compiler/core/y.tab.c" break; case 468: /* basic_symbol: "symbol" sym */ -#line 3575 "mrbgems/mruby-compiler/core/parse.y" +#line 3771 "mrbgems/mruby-compiler/core/parse.y" { p->lstate = EXPR_END; (yyval.id) = (yyvsp[0].id); } -#line 9864 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10060 "mrbgems/mruby-compiler/core/y.tab.c" break; case 473: /* sym: tSTRING */ -#line 3586 "mrbgems/mruby-compiler/core/parse.y" +#line 3782 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = new_strsym(p, (yyvsp[0].nd)); } -#line 9872 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10068 "mrbgems/mruby-compiler/core/y.tab.c" break; case 474: /* sym: "string literal" tSTRING */ -#line 3590 "mrbgems/mruby-compiler/core/parse.y" +#line 3786 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = new_strsym(p, (yyvsp[0].nd)); } -#line 9880 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10076 "mrbgems/mruby-compiler/core/y.tab.c" break; case 475: /* symbols: tSYMBOLS_BEG tSTRING */ -#line 3596 "mrbgems/mruby-compiler/core/parse.y" +#line 3792 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_symbols(p, list1((yyvsp[0].nd))); } -#line 9888 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10084 "mrbgems/mruby-compiler/core/y.tab.c" break; case 476: /* symbols: tSYMBOLS_BEG string_rep tSTRING */ -#line 3600 "mrbgems/mruby-compiler/core/parse.y" +#line 3796 "mrbgems/mruby-compiler/core/parse.y" { node *n = (yyvsp[-1].nd); - if (intn((yyvsp[0].nd)->cdr->cdr) > 0) { + if (node_to_int((yyvsp[0].nd)->cdr->cdr) > 0) { n = push(n, (yyvsp[0].nd)); } (yyval.nd) = new_symbols(p, n); } -#line 9900 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10096 "mrbgems/mruby-compiler/core/y.tab.c" break; case 479: /* numeric: tUMINUS_NUM "integer literal" */ -#line 3612 "mrbgems/mruby-compiler/core/parse.y" +#line 3808 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_negate(p, (yyvsp[0].nd)); } -#line 9908 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10104 "mrbgems/mruby-compiler/core/y.tab.c" break; case 480: /* numeric: tUMINUS_NUM "float literal" */ -#line 3616 "mrbgems/mruby-compiler/core/parse.y" +#line 3812 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_negate(p, (yyvsp[0].nd)); } -#line 9916 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10112 "mrbgems/mruby-compiler/core/y.tab.c" break; case 481: /* variable: "local variable or method" */ -#line 3622 "mrbgems/mruby-compiler/core/parse.y" +#line 3818 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_lvar(p, (yyvsp[0].id)); } -#line 9924 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10120 "mrbgems/mruby-compiler/core/y.tab.c" break; case 482: /* variable: "instance variable" */ -#line 3626 "mrbgems/mruby-compiler/core/parse.y" +#line 3822 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_ivar(p, (yyvsp[0].id)); } -#line 9932 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10128 "mrbgems/mruby-compiler/core/y.tab.c" break; case 483: /* variable: "global variable" */ -#line 3630 "mrbgems/mruby-compiler/core/parse.y" +#line 3826 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_gvar(p, (yyvsp[0].id)); } -#line 9940 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10136 "mrbgems/mruby-compiler/core/y.tab.c" break; case 484: /* variable: "class variable" */ -#line 3634 "mrbgems/mruby-compiler/core/parse.y" +#line 3830 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_cvar(p, (yyvsp[0].id)); } -#line 9948 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10144 "mrbgems/mruby-compiler/core/y.tab.c" break; case 485: /* variable: "constant" */ -#line 3638 "mrbgems/mruby-compiler/core/parse.y" +#line 3834 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_const(p, (yyvsp[0].id)); } -#line 9956 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10152 "mrbgems/mruby-compiler/core/y.tab.c" break; case 486: /* var_lhs: variable */ -#line 3644 "mrbgems/mruby-compiler/core/parse.y" +#line 3840 "mrbgems/mruby-compiler/core/parse.y" { assignable(p, (yyvsp[0].nd)); } -#line 9964 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10160 "mrbgems/mruby-compiler/core/y.tab.c" break; case 487: /* var_lhs: "numbered parameter" */ -#line 3648 "mrbgems/mruby-compiler/core/parse.y" +#line 3844 "mrbgems/mruby-compiler/core/parse.y" { yyerror(&(yylsp[0]), p, "can't assign to numbered parameter"); } -#line 9972 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10168 "mrbgems/mruby-compiler/core/y.tab.c" break; case 488: /* var_ref: variable */ -#line 3654 "mrbgems/mruby-compiler/core/parse.y" +#line 3850 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = var_reference(p, (yyvsp[0].nd)); } -#line 9980 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10176 "mrbgems/mruby-compiler/core/y.tab.c" break; case 489: /* var_ref: "numbered parameter" */ -#line 3658 "mrbgems/mruby-compiler/core/parse.y" +#line 3854 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_nvar(p, (yyvsp[0].num)); } -#line 9988 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10184 "mrbgems/mruby-compiler/core/y.tab.c" break; case 490: /* var_ref: "'nil'" */ -#line 3662 "mrbgems/mruby-compiler/core/parse.y" +#line 3858 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_nil(p); } -#line 9996 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10192 "mrbgems/mruby-compiler/core/y.tab.c" break; case 491: /* var_ref: "'self'" */ -#line 3666 "mrbgems/mruby-compiler/core/parse.y" +#line 3862 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_self(p); } -#line 10004 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10200 "mrbgems/mruby-compiler/core/y.tab.c" break; case 492: /* var_ref: "'true'" */ -#line 3670 "mrbgems/mruby-compiler/core/parse.y" +#line 3866 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_true(p); } -#line 10012 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10208 "mrbgems/mruby-compiler/core/y.tab.c" break; case 493: /* var_ref: "'false'" */ -#line 3674 "mrbgems/mruby-compiler/core/parse.y" +#line 3870 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_false(p); } -#line 10020 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10216 "mrbgems/mruby-compiler/core/y.tab.c" break; case 494: /* var_ref: "'__FILE__'" */ -#line 3678 "mrbgems/mruby-compiler/core/parse.y" +#line 3874 "mrbgems/mruby-compiler/core/parse.y" { const char *fn = mrb_sym_name_len(p->mrb, p->filename_sym, NULL); if (!fn) { @@ -10028,764 +10224,764 @@ yyreduce: } (yyval.nd) = new_str(p, fn, strlen(fn)); } -#line 10032 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10228 "mrbgems/mruby-compiler/core/y.tab.c" break; case 495: /* var_ref: "'__LINE__'" */ -#line 3686 "mrbgems/mruby-compiler/core/parse.y" +#line 3882 "mrbgems/mruby-compiler/core/parse.y" { char buf[16]; dump_int(p->lineno, buf); (yyval.nd) = new_int(p, buf, 10, 0); } -#line 10043 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10239 "mrbgems/mruby-compiler/core/y.tab.c" break; case 496: /* var_ref: "'__ENCODING__'" */ -#line 3693 "mrbgems/mruby-compiler/core/parse.y" +#line 3889 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_fcall(p, MRB_SYM_2(p->mrb, __ENCODING__), 0); } -#line 10051 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10247 "mrbgems/mruby-compiler/core/y.tab.c" break; case 499: /* superclass: %empty */ -#line 3703 "mrbgems/mruby-compiler/core/parse.y" +#line 3899 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = 0; } -#line 10059 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10255 "mrbgems/mruby-compiler/core/y.tab.c" break; case 500: /* $@31: %empty */ -#line 3707 "mrbgems/mruby-compiler/core/parse.y" +#line 3903 "mrbgems/mruby-compiler/core/parse.y" { p->lstate = EXPR_BEG; p->cmd_start = TRUE; } -#line 10068 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10264 "mrbgems/mruby-compiler/core/y.tab.c" break; case 501: /* superclass: '<' $@31 expr_value term */ -#line 3712 "mrbgems/mruby-compiler/core/parse.y" +#line 3908 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-1].nd); } -#line 10076 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10272 "mrbgems/mruby-compiler/core/y.tab.c" break; case 504: /* f_arglist_paren: '(' f_args rparen */ -#line 3728 "mrbgems/mruby-compiler/core/parse.y" +#line 3924 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-1].nd); p->lstate = EXPR_BEG; p->cmd_start = TRUE; } -#line 10086 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10282 "mrbgems/mruby-compiler/core/y.tab.c" break; case 505: /* f_arglist_paren: '(' f_arg ',' tBDOT3 rparen */ -#line 3734 "mrbgems/mruby-compiler/core/parse.y" +#line 3930 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args_dots(p, (yyvsp[-3].nd)); } -#line 10094 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10290 "mrbgems/mruby-compiler/core/y.tab.c" break; case 506: /* f_arglist_paren: '(' tBDOT3 rparen */ -#line 3738 "mrbgems/mruby-compiler/core/parse.y" +#line 3934 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args_dots(p, 0); } -#line 10102 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10298 "mrbgems/mruby-compiler/core/y.tab.c" break; case 508: /* f_arglist: f_args term */ -#line 3745 "mrbgems/mruby-compiler/core/parse.y" +#line 3941 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-1].nd); } -#line 10110 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10306 "mrbgems/mruby-compiler/core/y.tab.c" break; case 509: /* f_arglist: f_arg ',' tBDOT3 term */ -#line 3749 "mrbgems/mruby-compiler/core/parse.y" +#line 3945 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args_dots(p, (yyvsp[-3].nd)); } -#line 10118 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10314 "mrbgems/mruby-compiler/core/y.tab.c" break; case 510: /* f_arglist: "..." term */ -#line 3753 "mrbgems/mruby-compiler/core/parse.y" +#line 3949 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args_dots(p, 0); } -#line 10126 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10322 "mrbgems/mruby-compiler/core/y.tab.c" break; case 511: /* f_label: "local variable or method" "label" */ -#line 3759 "mrbgems/mruby-compiler/core/parse.y" +#line 3955 "mrbgems/mruby-compiler/core/parse.y" { local_nest(p); } -#line 10134 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10330 "mrbgems/mruby-compiler/core/y.tab.c" break; case 512: /* f_label: "numbered parameter" "label" */ -#line 3763 "mrbgems/mruby-compiler/core/parse.y" +#line 3959 "mrbgems/mruby-compiler/core/parse.y" { local_nest(p); } -#line 10142 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10338 "mrbgems/mruby-compiler/core/y.tab.c" break; case 513: /* f_kw: f_label arg */ -#line 3769 "mrbgems/mruby-compiler/core/parse.y" +#line 3965 "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 10152 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 514: /* f_kw: f_label */ -#line 3775 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_kw_arg(p, (yyvsp[0].id), 0); - local_unnest(p); - } -#line 10161 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 515: /* f_block_kw: f_label primary_value */ -#line 3782 "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 10171 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 516: /* f_block_kw: f_label */ -#line 3788 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_kw_arg(p, (yyvsp[0].id), 0); - local_unnest(p); - } -#line 10180 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 517: /* f_block_kwarg: f_block_kw */ -#line 3795 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = list1((yyvsp[0].nd)); - } -#line 10188 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 518: /* f_block_kwarg: f_block_kwarg ',' f_block_kw */ -#line 3799 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); - } -#line 10196 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 519: /* f_kwarg: f_kw */ -#line 3805 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = list1((yyvsp[0].nd)); - } -#line 10204 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 520: /* f_kwarg: f_kwarg ',' f_kw */ -#line 3809 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); - } -#line 10212 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 523: /* f_kwrest: kwrest_mark "local variable or method" */ -#line 3819 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_kw_rest_args(p, (yyvsp[0].id)); - } -#line 10220 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 524: /* f_kwrest: kwrest_mark */ -#line 3823 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_kw_rest_args(p, 0); - } -#line 10228 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 525: /* args_tail: f_kwarg ',' f_kwrest opt_f_block_arg */ -#line 3829 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_args_tail(p, (yyvsp[-3].nd), (yyvsp[-1].nd), (yyvsp[0].id)); - } -#line 10236 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 526: /* args_tail: f_kwarg opt_f_block_arg */ -#line 3833 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_args_tail(p, (yyvsp[-1].nd), 0, (yyvsp[0].id)); - } -#line 10244 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 527: /* args_tail: f_kwrest opt_f_block_arg */ -#line 3837 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_args_tail(p, 0, (yyvsp[-1].nd), (yyvsp[0].id)); - } -#line 10252 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 528: /* args_tail: f_block_arg */ -#line 3841 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_args_tail(p, 0, 0, (yyvsp[0].id)); - } -#line 10260 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 529: /* opt_args_tail: ',' args_tail */ -#line 3847 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = (yyvsp[0].nd); - } -#line 10268 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 530: /* opt_args_tail: %empty */ -#line 3851 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_args_tail(p, 0, 0, 0); - } -#line 10276 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 531: /* f_args: f_arg ',' f_optarg ',' f_rest_arg opt_args_tail */ -#line 3857 "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 10284 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 532: /* f_args: f_arg ',' f_optarg ',' f_rest_arg ',' f_arg opt_args_tail */ -#line 3861 "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 10292 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 533: /* f_args: f_arg ',' f_optarg opt_args_tail */ -#line 3865 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_args(p, (yyvsp[-3].nd), (yyvsp[-1].nd), 0, 0, (yyvsp[0].nd)); - } -#line 10300 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 534: /* f_args: f_arg ',' f_optarg ',' f_arg opt_args_tail */ -#line 3869 "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 10308 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 535: /* f_args: f_arg ',' f_rest_arg opt_args_tail */ -#line 3873 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_args(p, (yyvsp[-3].nd), 0, (yyvsp[-1].id), 0, (yyvsp[0].nd)); - } -#line 10316 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 536: /* f_args: f_arg ',' f_rest_arg ',' f_arg opt_args_tail */ -#line 3877 "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 10324 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 537: /* f_args: f_arg opt_args_tail */ -#line 3881 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_args(p, (yyvsp[-1].nd), 0, 0, 0, (yyvsp[0].nd)); - } -#line 10332 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 538: /* f_args: f_optarg ',' f_rest_arg opt_args_tail */ -#line 3885 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_args(p, 0, (yyvsp[-3].nd), (yyvsp[-1].id), 0, (yyvsp[0].nd)); - } -#line 10340 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 539: /* f_args: f_optarg ',' f_rest_arg ',' f_arg opt_args_tail */ -#line 3889 "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 10348 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 540: /* f_args: f_optarg opt_args_tail */ -#line 3893 "mrbgems/mruby-compiler/core/parse.y" + case 514: /* f_kw: f_label */ +#line 3971 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, 0, (yyvsp[-1].nd), 0, 0, (yyvsp[0].nd)); + (yyval.nd) = new_kw_arg(p, (yyvsp[0].id), 0); + local_unnest(p); } -#line 10356 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10357 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 541: /* f_args: f_optarg ',' f_arg opt_args_tail */ -#line 3897 "mrbgems/mruby-compiler/core/parse.y" + case 515: /* f_block_kw: f_label primary_value */ +#line 3978 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, 0, (yyvsp[-3].nd), 0, (yyvsp[-1].nd), (yyvsp[0].nd)); + 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 10364 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10367 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 542: /* f_args: f_rest_arg opt_args_tail */ -#line 3901 "mrbgems/mruby-compiler/core/parse.y" + case 516: /* f_block_kw: f_label */ +#line 3984 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, 0, 0, (yyvsp[-1].id), 0, (yyvsp[0].nd)); + (yyval.nd) = new_kw_arg(p, (yyvsp[0].id), 0); + local_unnest(p); } -#line 10372 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10376 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 543: /* f_args: f_rest_arg ',' f_arg opt_args_tail */ -#line 3905 "mrbgems/mruby-compiler/core/parse.y" + case 517: /* f_block_kwarg: f_block_kw */ +#line 3991 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, 0, 0, (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd)); + (yyval.nd) = list1((yyvsp[0].nd)); } -#line 10380 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10384 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 544: /* f_args: args_tail */ -#line 3909 "mrbgems/mruby-compiler/core/parse.y" + case 518: /* f_block_kwarg: f_block_kwarg ',' f_block_kw */ +#line 3995 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, 0, 0, 0, 0, (yyvsp[0].nd)); + (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 10388 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10392 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 545: /* f_args: %empty */ -#line 3913 "mrbgems/mruby-compiler/core/parse.y" + case 519: /* f_kwarg: f_kw */ +#line 4001 "mrbgems/mruby-compiler/core/parse.y" { - local_add_f(p, 0); - (yyval.nd) = new_args(p, 0, 0, 0, 0, 0); + (yyval.nd) = list1((yyvsp[0].nd)); } -#line 10397 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10400 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 546: /* f_bad_arg: "constant" */ -#line 3920 "mrbgems/mruby-compiler/core/parse.y" + case 520: /* f_kwarg: f_kwarg ',' f_kw */ +#line 4005 "mrbgems/mruby-compiler/core/parse.y" { - yyerror(&(yylsp[0]), p, "formal argument cannot be a constant"); - (yyval.nd) = 0; + (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 10406 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10408 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 547: /* f_bad_arg: "instance variable" */ -#line 3925 "mrbgems/mruby-compiler/core/parse.y" + case 523: /* f_kwrest: kwrest_mark "local variable or method" */ +#line 4015 "mrbgems/mruby-compiler/core/parse.y" { - yyerror(&(yylsp[0]), p, "formal argument cannot be an instance variable"); - (yyval.nd) = 0; + (yyval.nd) = new_kw_rest_args(p, (yyvsp[0].id)); } -#line 10415 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10416 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 548: /* f_bad_arg: "global variable" */ -#line 3930 "mrbgems/mruby-compiler/core/parse.y" + case 524: /* f_kwrest: kwrest_mark */ +#line 4019 "mrbgems/mruby-compiler/core/parse.y" { - yyerror(&(yylsp[0]), p, "formal argument cannot be a global variable"); - (yyval.nd) = 0; + (yyval.nd) = new_kw_rest_args(p, 0); } #line 10424 "mrbgems/mruby-compiler/core/y.tab.c" break; + case 525: /* args_tail: f_kwarg ',' f_kwrest opt_f_block_arg */ +#line 4025 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_args_tail(p, (yyvsp[-3].nd), (yyvsp[-1].nd), (yyvsp[0].id)); + } +#line 10432 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 526: /* args_tail: f_kwarg opt_f_block_arg */ +#line 4029 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_args_tail(p, (yyvsp[-1].nd), 0, (yyvsp[0].id)); + } +#line 10440 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 527: /* args_tail: f_kwrest opt_f_block_arg */ +#line 4033 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_args_tail(p, 0, (yyvsp[-1].nd), (yyvsp[0].id)); + } +#line 10448 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 528: /* args_tail: f_block_arg */ +#line 4037 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_args_tail(p, 0, 0, (yyvsp[0].id)); + } +#line 10456 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 529: /* opt_args_tail: ',' args_tail */ +#line 4043 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = (yyvsp[0].nd); + } +#line 10464 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 530: /* opt_args_tail: %empty */ +#line 4047 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_args_tail(p, 0, 0, 0); + } +#line 10472 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 531: /* f_args: f_arg ',' f_optarg ',' f_rest_arg opt_args_tail */ +#line 4053 "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 10480 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 532: /* f_args: f_arg ',' f_optarg ',' f_rest_arg ',' f_arg opt_args_tail */ +#line 4057 "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 10488 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 533: /* f_args: f_arg ',' f_optarg opt_args_tail */ +#line 4061 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_args(p, (yyvsp[-3].nd), (yyvsp[-1].nd), 0, 0, (yyvsp[0].nd)); + } +#line 10496 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 534: /* f_args: f_arg ',' f_optarg ',' f_arg opt_args_tail */ +#line 4065 "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 10504 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 535: /* f_args: f_arg ',' f_rest_arg opt_args_tail */ +#line 4069 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_args(p, (yyvsp[-3].nd), 0, (yyvsp[-1].id), 0, (yyvsp[0].nd)); + } +#line 10512 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 536: /* f_args: f_arg ',' f_rest_arg ',' f_arg opt_args_tail */ +#line 4073 "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 10520 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 537: /* f_args: f_arg opt_args_tail */ +#line 4077 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_args(p, (yyvsp[-1].nd), 0, 0, 0, (yyvsp[0].nd)); + } +#line 10528 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 538: /* f_args: f_optarg ',' f_rest_arg opt_args_tail */ +#line 4081 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_args(p, 0, (yyvsp[-3].nd), (yyvsp[-1].id), 0, (yyvsp[0].nd)); + } +#line 10536 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 539: /* f_args: f_optarg ',' f_rest_arg ',' f_arg opt_args_tail */ +#line 4085 "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 10544 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 540: /* f_args: f_optarg opt_args_tail */ +#line 4089 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_args(p, 0, (yyvsp[-1].nd), 0, 0, (yyvsp[0].nd)); + } +#line 10552 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 541: /* f_args: f_optarg ',' f_arg opt_args_tail */ +#line 4093 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_args(p, 0, (yyvsp[-3].nd), 0, (yyvsp[-1].nd), (yyvsp[0].nd)); + } +#line 10560 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 542: /* f_args: f_rest_arg opt_args_tail */ +#line 4097 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_args(p, 0, 0, (yyvsp[-1].id), 0, (yyvsp[0].nd)); + } +#line 10568 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 543: /* f_args: f_rest_arg ',' f_arg opt_args_tail */ +#line 4101 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_args(p, 0, 0, (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd)); + } +#line 10576 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 544: /* f_args: args_tail */ +#line 4105 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_args(p, 0, 0, 0, 0, (yyvsp[0].nd)); + } +#line 10584 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 545: /* f_args: %empty */ +#line 4109 "mrbgems/mruby-compiler/core/parse.y" + { + local_add_f(p, 0); + (yyval.nd) = new_args(p, 0, 0, 0, 0, 0); + } +#line 10593 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 546: /* f_bad_arg: "constant" */ +#line 4116 "mrbgems/mruby-compiler/core/parse.y" + { + yyerror(&(yylsp[0]), p, "formal argument cannot be a constant"); + (yyval.nd) = 0; + } +#line 10602 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 547: /* f_bad_arg: "instance variable" */ +#line 4121 "mrbgems/mruby-compiler/core/parse.y" + { + yyerror(&(yylsp[0]), p, "formal argument cannot be an instance variable"); + (yyval.nd) = 0; + } +#line 10611 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 548: /* f_bad_arg: "global variable" */ +#line 4126 "mrbgems/mruby-compiler/core/parse.y" + { + yyerror(&(yylsp[0]), p, "formal argument cannot be a global variable"); + (yyval.nd) = 0; + } +#line 10620 "mrbgems/mruby-compiler/core/y.tab.c" + break; + case 549: /* f_bad_arg: "class variable" */ -#line 3935 "mrbgems/mruby-compiler/core/parse.y" +#line 4131 "mrbgems/mruby-compiler/core/parse.y" { yyerror(&(yylsp[0]), p, "formal argument cannot be a class variable"); (yyval.nd) = 0; } -#line 10433 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10629 "mrbgems/mruby-compiler/core/y.tab.c" break; case 550: /* f_bad_arg: "numbered parameter" */ -#line 3940 "mrbgems/mruby-compiler/core/parse.y" +#line 4136 "mrbgems/mruby-compiler/core/parse.y" { yyerror(&(yylsp[0]), p, "formal argument cannot be a numbered parameter"); (yyval.nd) = 0; } -#line 10442 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10638 "mrbgems/mruby-compiler/core/y.tab.c" break; case 551: /* f_norm_arg: f_bad_arg */ -#line 3947 "mrbgems/mruby-compiler/core/parse.y" +#line 4143 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = 0; } -#line 10450 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10646 "mrbgems/mruby-compiler/core/y.tab.c" break; case 552: /* f_norm_arg: "local variable or method" */ -#line 3951 "mrbgems/mruby-compiler/core/parse.y" +#line 4147 "mrbgems/mruby-compiler/core/parse.y" { local_add_f(p, (yyvsp[0].id)); (yyval.id) = (yyvsp[0].id); } -#line 10459 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10655 "mrbgems/mruby-compiler/core/y.tab.c" break; case 553: /* f_arg_item: f_norm_arg */ -#line 3958 "mrbgems/mruby-compiler/core/parse.y" +#line 4154 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_arg(p, (yyvsp[0].id)); } -#line 10467 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10663 "mrbgems/mruby-compiler/core/y.tab.c" break; case 554: /* @32: %empty */ -#line 3962 "mrbgems/mruby-compiler/core/parse.y" +#line 4158 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = local_switch(p); } -#line 10475 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10671 "mrbgems/mruby-compiler/core/y.tab.c" break; case 555: /* f_arg_item: tLPAREN @32 f_margs rparen */ -#line 3966 "mrbgems/mruby-compiler/core/parse.y" +#line 4162 "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 10485 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10681 "mrbgems/mruby-compiler/core/y.tab.c" break; case 556: /* f_arg: f_arg_item */ -#line 3974 "mrbgems/mruby-compiler/core/parse.y" +#line 4170 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list1((yyvsp[0].nd)); } -#line 10493 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10689 "mrbgems/mruby-compiler/core/y.tab.c" break; case 557: /* f_arg: f_arg ',' f_arg_item */ -#line 3978 "mrbgems/mruby-compiler/core/parse.y" +#line 4174 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 10501 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10697 "mrbgems/mruby-compiler/core/y.tab.c" break; case 558: /* f_opt_asgn: "local variable or method" '=' */ -#line 3984 "mrbgems/mruby-compiler/core/parse.y" +#line 4180 "mrbgems/mruby-compiler/core/parse.y" { local_add_f(p, (yyvsp[-1].id)); local_nest(p); (yyval.id) = (yyvsp[-1].id); } -#line 10511 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10707 "mrbgems/mruby-compiler/core/y.tab.c" break; case 559: /* f_opt: f_opt_asgn arg */ -#line 3992 "mrbgems/mruby-compiler/core/parse.y" +#line 4188 "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))); + (yyval.nd) = cons(sym_to_node((yyvsp[-1].id)), cons((yyvsp[0].nd), locals_node(p))); local_unnest(p); } -#line 10521 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10717 "mrbgems/mruby-compiler/core/y.tab.c" break; case 560: /* f_block_opt: f_opt_asgn primary_value */ -#line 4000 "mrbgems/mruby-compiler/core/parse.y" +#line 4196 "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))); + (yyval.nd) = cons(sym_to_node((yyvsp[-1].id)), cons((yyvsp[0].nd), locals_node(p))); local_unnest(p); } -#line 10531 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10727 "mrbgems/mruby-compiler/core/y.tab.c" break; case 561: /* f_block_optarg: f_block_opt */ -#line 4008 "mrbgems/mruby-compiler/core/parse.y" +#line 4204 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list1((yyvsp[0].nd)); } -#line 10539 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10735 "mrbgems/mruby-compiler/core/y.tab.c" break; case 562: /* f_block_optarg: f_block_optarg ',' f_block_opt */ -#line 4012 "mrbgems/mruby-compiler/core/parse.y" +#line 4208 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 10547 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10743 "mrbgems/mruby-compiler/core/y.tab.c" break; case 563: /* f_optarg: f_opt */ -#line 4018 "mrbgems/mruby-compiler/core/parse.y" +#line 4214 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list1((yyvsp[0].nd)); } -#line 10555 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10751 "mrbgems/mruby-compiler/core/y.tab.c" break; case 564: /* f_optarg: f_optarg ',' f_opt */ -#line 4022 "mrbgems/mruby-compiler/core/parse.y" +#line 4218 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 10563 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10759 "mrbgems/mruby-compiler/core/y.tab.c" break; case 567: /* f_rest_arg: restarg_mark "local variable or method" */ -#line 4032 "mrbgems/mruby-compiler/core/parse.y" +#line 4228 "mrbgems/mruby-compiler/core/parse.y" { local_add_f(p, (yyvsp[0].id)); (yyval.id) = (yyvsp[0].id); } -#line 10572 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10768 "mrbgems/mruby-compiler/core/y.tab.c" break; case 568: /* f_rest_arg: restarg_mark */ -#line 4037 "mrbgems/mruby-compiler/core/parse.y" +#line 4233 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_op(mul); local_add_f(p, (yyval.id)); } -#line 10581 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10777 "mrbgems/mruby-compiler/core/y.tab.c" break; case 571: /* f_block_arg: blkarg_mark "local variable or method" */ -#line 4048 "mrbgems/mruby-compiler/core/parse.y" +#line 4244 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = (yyvsp[0].id); } -#line 10589 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10785 "mrbgems/mruby-compiler/core/y.tab.c" break; case 572: /* f_block_arg: blkarg_mark */ -#line 4052 "mrbgems/mruby-compiler/core/parse.y" +#line 4248 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_op(and); } -#line 10597 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10793 "mrbgems/mruby-compiler/core/y.tab.c" break; case 573: /* opt_f_block_arg: ',' f_block_arg */ -#line 4058 "mrbgems/mruby-compiler/core/parse.y" +#line 4254 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = (yyvsp[0].id); } -#line 10605 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10801 "mrbgems/mruby-compiler/core/y.tab.c" break; case 574: /* opt_f_block_arg: none */ -#line 4062 "mrbgems/mruby-compiler/core/parse.y" +#line 4258 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = 0; } -#line 10613 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10809 "mrbgems/mruby-compiler/core/y.tab.c" break; case 575: /* singleton: var_ref */ -#line 4068 "mrbgems/mruby-compiler/core/parse.y" +#line 4264 "mrbgems/mruby-compiler/core/parse.y" { prohibit_literals(p, (yyvsp[0].nd)); (yyval.nd) = (yyvsp[0].nd); if (!(yyval.nd)) (yyval.nd) = new_nil(p); } -#line 10623 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10819 "mrbgems/mruby-compiler/core/y.tab.c" break; case 576: /* $@33: %empty */ -#line 4073 "mrbgems/mruby-compiler/core/parse.y" +#line 4269 "mrbgems/mruby-compiler/core/parse.y" {p->lstate = EXPR_BEG;} -#line 10629 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10825 "mrbgems/mruby-compiler/core/y.tab.c" break; case 577: /* singleton: '(' $@33 expr rparen */ -#line 4074 "mrbgems/mruby-compiler/core/parse.y" +#line 4270 "mrbgems/mruby-compiler/core/parse.y" { prohibit_literals(p, (yyvsp[-1].nd)); (yyval.nd) = (yyvsp[-1].nd); } -#line 10638 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10834 "mrbgems/mruby-compiler/core/y.tab.c" break; case 579: /* assoc_list: assocs trailer */ -#line 4082 "mrbgems/mruby-compiler/core/parse.y" +#line 4278 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-1].nd); } -#line 10646 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10842 "mrbgems/mruby-compiler/core/y.tab.c" break; case 580: /* assocs: assoc */ -#line 4088 "mrbgems/mruby-compiler/core/parse.y" +#line 4284 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list1((yyvsp[0].nd)); } -#line 10654 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10850 "mrbgems/mruby-compiler/core/y.tab.c" break; case 581: /* assocs: assocs comma assoc */ -#line 4092 "mrbgems/mruby-compiler/core/parse.y" +#line 4288 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 10662 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10858 "mrbgems/mruby-compiler/core/y.tab.c" break; case 582: /* assoc: arg "=>" arg */ -#line 4098 "mrbgems/mruby-compiler/core/parse.y" +#line 4294 "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 10672 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10868 "mrbgems/mruby-compiler/core/y.tab.c" break; case 583: /* assoc: "local variable or method" "label" arg */ -#line 4104 "mrbgems/mruby-compiler/core/parse.y" +#line 4300 "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 10681 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10877 "mrbgems/mruby-compiler/core/y.tab.c" break; case 584: /* assoc: "local variable or method" "label" */ -#line 4109 "mrbgems/mruby-compiler/core/parse.y" +#line 4305 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = cons(new_sym(p, (yyvsp[-1].id)), label_reference(p, (yyvsp[-1].id))); } -#line 10689 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10885 "mrbgems/mruby-compiler/core/y.tab.c" break; case 585: /* assoc: "numbered parameter" "label" */ -#line 4113 "mrbgems/mruby-compiler/core/parse.y" +#line 4309 "mrbgems/mruby-compiler/core/parse.y" { mrb_sym sym = intern_numparam((yyvsp[-1].num)); (yyval.nd) = cons(new_sym(p, sym), label_reference(p, sym)); } -#line 10698 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10894 "mrbgems/mruby-compiler/core/y.tab.c" break; case 586: /* assoc: "numbered parameter" "label" arg */ -#line 4118 "mrbgems/mruby-compiler/core/parse.y" +#line 4314 "mrbgems/mruby-compiler/core/parse.y" { void_expr_error(p, (yyvsp[0].nd)); (yyval.nd) = cons(new_sym(p, intern_numparam((yyvsp[-2].num))), (yyvsp[0].nd)); } -#line 10707 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10903 "mrbgems/mruby-compiler/core/y.tab.c" break; case 587: /* assoc: string_fragment "label" arg */ -#line 4123 "mrbgems/mruby-compiler/core/parse.y" +#line 4319 "mrbgems/mruby-compiler/core/parse.y" { void_expr_error(p, (yyvsp[0].nd)); - if (typen((yyvsp[-2].nd)->car) == NODE_DSTR) { + if (node_to_type((yyvsp[-2].nd)->car) == NODE_DSTR) { (yyval.nd) = cons(new_dsym(p, (yyvsp[-2].nd)), (yyvsp[0].nd)); } else { (yyval.nd) = cons(new_sym(p, new_strsym(p, (yyvsp[-2].nd))), (yyvsp[0].nd)); } } -#line 10721 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10917 "mrbgems/mruby-compiler/core/y.tab.c" break; case 588: /* assoc: "**" arg */ -#line 4133 "mrbgems/mruby-compiler/core/parse.y" +#line 4329 "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 10730 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10926 "mrbgems/mruby-compiler/core/y.tab.c" break; case 589: /* assoc: "**" */ -#line 4138 "mrbgems/mruby-compiler/core/parse.y" +#line 4334 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = cons(new_kw_rest_args(p, 0), new_lvar(p, intern_op(pow))); } -#line 10738 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10934 "mrbgems/mruby-compiler/core/y.tab.c" break; case 602: /* call_op: '.' */ -#line 4164 "mrbgems/mruby-compiler/core/parse.y" +#line 4360 "mrbgems/mruby-compiler/core/parse.y" { (yyval.num) = '.'; } -#line 10746 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10942 "mrbgems/mruby-compiler/core/y.tab.c" break; case 603: /* call_op: "&." */ -#line 4168 "mrbgems/mruby-compiler/core/parse.y" +#line 4364 "mrbgems/mruby-compiler/core/parse.y" { (yyval.num) = 0; } -#line 10754 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10950 "mrbgems/mruby-compiler/core/y.tab.c" break; case 605: /* call_op2: "::" */ -#line 4175 "mrbgems/mruby-compiler/core/parse.y" +#line 4371 "mrbgems/mruby-compiler/core/parse.y" { (yyval.num) = tCOLON2; } -#line 10762 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10958 "mrbgems/mruby-compiler/core/y.tab.c" break; case 614: /* term: ';' */ -#line 4196 "mrbgems/mruby-compiler/core/parse.y" +#line 4392 "mrbgems/mruby-compiler/core/parse.y" {yyerrok;} -#line 10768 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10964 "mrbgems/mruby-compiler/core/y.tab.c" break; case 616: /* nl: '\n' */ -#line 4201 "mrbgems/mruby-compiler/core/parse.y" +#line 4397 "mrbgems/mruby-compiler/core/parse.y" { p->lineno += (yyvsp[0].num); p->column = 0; } -#line 10777 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10973 "mrbgems/mruby-compiler/core/y.tab.c" break; case 620: /* none: %empty */ -#line 4213 "mrbgems/mruby-compiler/core/parse.y" +#line 4409 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = 0; } -#line 10785 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10981 "mrbgems/mruby-compiler/core/y.tab.c" break; -#line 10789 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10985 "mrbgems/mruby-compiler/core/y.tab.c" default: break; } @@ -11018,7 +11214,7 @@ yyreturnlab: return yyresult; } -#line 4217 "mrbgems/mruby-compiler/core/parse.y" +#line 4413 "mrbgems/mruby-compiler/core/parse.y" #define pylval (*((YYSTYPE*)(p->ylval))) @@ -11106,13 +11302,13 @@ backref_error(parser_state *p, node *n) { int c; - c = intn(n->car); + c = node_to_int(n->car); if (c == NODE_NTH_REF) { - yyerror_c(p, "can't set variable $", (char)intn(n->cdr)+'0'); + yyerror_c(p, "can't set variable $", (char)node_to_int(n->cdr)+'0'); } else if (c == NODE_BACK_REF) { - yyerror_c(p, "can't set variable $", (char)intn(n->cdr)); + yyerror_c(p, "can't set variable $", (char)node_to_int(n->cdr)); } else { yyerror(NULL, p, "Internal error in backref_error()"); @@ -11125,7 +11321,7 @@ void_expr_error(parser_state *p, node *n) int c; if (n == NULL) return; - c = intn(n->car); + c = node_to_int(n->car); switch (c) { case NODE_BREAK: case NODE_RETURN: @@ -11186,7 +11382,7 @@ nextc(parser_state *p) if (p->pb) { node *tmp; - c = intn(p->pb->car); + c = node_to_int(p->pb->car); tmp = p->pb; p->pb = p->pb->cdr; cons_free(tmp); @@ -11222,7 +11418,7 @@ pushback(parser_state *p, int c) if (c >= 0) { p->column--; } - p->pb = cons(nint(c), p->pb); + p->pb = cons(int_to_node(c), p->pb); } static void @@ -11247,7 +11443,7 @@ peekc_n(parser_state *p, int n) c0 = nextc(p); if (c0 == -1) return c0; /* do not skip partial EOF */ if (c0 >= 0) --p->column; - list = push(list, nint(c0)); + list = push(list, int_to_node(c0)); } while(n--); if (p->pb) { p->pb = append(list, p->pb); @@ -11777,7 +11973,7 @@ parse_string(parser_state *p) node *nd = new_str(p, tok(p), toklen(p)); pylval.nd = nd; if (unindent && head) { - nspaces = push(nspaces, nint(spaces)); + nspaces = push(nspaces, int_to_node(spaces)); heredoc_push_indented(p, hinfo, nd->cdr, escaped, nspaces, empty && line_head); } return tHD_STRING_MID; @@ -11812,8 +12008,8 @@ parse_string(parser_state *p) p->lineno++; p->column = 0; if (unindent) { - nspaces = push(nspaces, nint(spaces)); - escaped = push(escaped, nint(pos)); + nspaces = push(nspaces, int_to_node(spaces)); + escaped = push(escaped, int_to_node(pos)); pos--; empty = TRUE; spaces = 0; @@ -11871,7 +12067,7 @@ parse_string(parser_state *p) pylval.nd = nd; if (hinfo) { if (unindent && head) { - nspaces = push(nspaces, nint(spaces)); + nspaces = push(nspaces, int_to_node(spaces)); heredoc_push_indented(p, hinfo, nd->cdr, escaped, nspaces, FALSE); } hinfo->line_head = FALSE; @@ -11994,7 +12190,7 @@ number_literal_suffix(parser_state *p) int mask = NUM_SUFFIX_R|NUM_SUFFIX_I; while ((c = nextc(p)) != -1) { - list = push(list, nint(c)); + list = push(list, int_to_node(c)); if ((mask & NUM_SUFFIX_I) && c == 'i') { result |= (mask & NUM_SUFFIX_I); @@ -13310,7 +13506,7 @@ parser_yylex(parser_state *p) int nvar; if (n > 0) { - nvar = intn(p->nvars->car); + nvar = node_to_int(p->nvars->car); if (nvar != -2) { /* numbered parameters never appear on toplevel */ pylval.num = n; p->lstate = EXPR_END; @@ -13451,6 +13647,7 @@ parser_init_cxt(parser_state *p, mrb_ccontext *cxt) p->no_optimize = cxt->no_optimize; p->no_ext_ops = cxt->no_ext_ops; p->upper = cxt->upper; + p->var_nodes_enabled = cxt->use_variable_nodes; if (cxt->partial_hook) { p->cxt = cxt; } @@ -13464,7 +13661,7 @@ parser_update_cxt(parser_state *p, mrb_ccontext *cxt) if (!cxt) return; if (!p->tree) return; - if (intn(p->tree->car) != NODE_SCOPE) return; + if (node_to_int(p->tree->car) != NODE_SCOPE) return; n0 = n = p->tree->cdr->car; while (n) { i++; @@ -13473,7 +13670,7 @@ parser_update_cxt(parser_state *p, mrb_ccontext *cxt) cxt->syms = (mrb_sym*)mrbc_realloc(cxt->syms, i*sizeof(mrb_sym)); cxt->slen = i; for (i=0, n=n0; n; i++,n=n->cdr) { - cxt->syms[i] = sym(n->car); + cxt->syms[i] = node_to_sym(n->car); } } @@ -13557,6 +13754,14 @@ mrb_parser_new(mrb_state *mrb) p->filename_table = NULL; p->filename_table_length = 0; + /* Initialize variable-sized node infrastructure */ + for (int i = 0; i < SIZE_CLASS_COUNT; i++) { + p->var_free_lists[i] = NULL; + p->var_alloc_counts[i] = 0; + } + p->var_total_allocated = 0; + p->var_nodes_enabled = FALSE; /* Start disabled for compatibility */ + return p; } @@ -13896,7 +14101,7 @@ dump_args(mrb_state *mrb, node *n, int offset) while (n2) { dump_prefix(n2, offset+2); - printf("%s=\n", mrb_sym_name(mrb, sym(n2->car->car))); + printf("%s=\n", mrb_sym_name(mrb, node_to_sym(n2->car->car))); mrb_parser_dump(mrb, n2->car->cdr, offset+3); n2 = n2->cdr; } @@ -13904,7 +14109,7 @@ dump_args(mrb_state *mrb, node *n, int offset) } n = n->cdr; if (n->car) { - mrb_sym rest = sym(n->car); + mrb_sym rest = node_to_sym(n->car); dump_prefix(n, offset+1); if (rest == MRB_OPSYM(mul)) @@ -13921,7 +14126,7 @@ dump_args(mrb_state *mrb, node *n, int offset) n = n->cdr; if (n) { - mrb_assert(intn(n->car) == NODE_ARGS_TAIL); + mrb_assert(node_to_int(n->car) == NODE_ARGS_TAIL); mrb_parser_dump(mrb, n, offset); } } @@ -13959,7 +14164,7 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) if (!tree) return; again: dump_prefix(tree, offset); - nodetype = intn(tree->car); + nodetype = node_to_int(tree->car); tree = tree->cdr; switch (nodetype) { case NODE_STMTS: @@ -14176,7 +14381,7 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) while (n2) { if (n2->car) { if (!first_lval) printf(", "); - printf("%s", mrb_sym_name(mrb, sym(n2->car))); + printf("%s", mrb_sym_name(mrb, node_to_sym(n2->car))); first_lval = FALSE; } n2 = n2->cdr; @@ -14204,8 +14409,8 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) mrb_parser_dump(mrb, tree->car, offset+1); dump_prefix(tree, offset+1); printf("method='%s' (%d)\n", - mrb_sym_dump(mrb, sym(tree->cdr->car)), - intn(tree->cdr->car)); + mrb_sym_dump(mrb, node_to_sym(tree->cdr->car)), + node_to_int(tree->cdr->car)); tree = tree->cdr->cdr->car; if (tree) { dump_prefix(tree, offset+1); @@ -14242,11 +14447,11 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) printf("NODE_COLON2:\n"); mrb_parser_dump(mrb, tree->car, offset+1); dump_prefix(tree, offset+1); - printf("::%s\n", mrb_sym_name(mrb, sym(tree->cdr))); + printf("::%s\n", mrb_sym_name(mrb, node_to_sym(tree->cdr))); break; case NODE_COLON3: - printf("NODE_COLON3: ::%s\n", mrb_sym_name(mrb, sym(tree))); + printf("NODE_COLON3: ::%s\n", mrb_sym_name(mrb, node_to_sym(tree))); break; case NODE_ARRAY: @@ -14312,7 +14517,7 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) if (n2->car) { dump_prefix(n2, offset+2); printf("rest:\n"); - if (n2->car == nint(-1)) { + if (n2->car == int_to_node(-1)) { dump_prefix(n2, offset+2); printf("(empty)\n"); } @@ -14340,7 +14545,7 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) mrb_parser_dump(mrb, tree->car, offset+2); tree = tree->cdr; dump_prefix(tree, offset+1); - printf("op='%s' (%d)\n", mrb_sym_name(mrb, sym(tree->car)), intn(tree->car)); + printf("op='%s' (%d)\n", mrb_sym_name(mrb, node_to_sym(tree->car)), node_to_int(tree->car)); tree = tree->cdr; mrb_parser_dump(mrb, tree->car, offset+1); break; @@ -14402,27 +14607,27 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) break; case NODE_LVAR: - printf("NODE_LVAR %s\n", mrb_sym_name(mrb, sym(tree))); + printf("NODE_LVAR %s\n", mrb_sym_name(mrb, node_to_sym(tree))); break; case NODE_GVAR: - printf("NODE_GVAR %s\n", mrb_sym_name(mrb, sym(tree))); + printf("NODE_GVAR %s\n", mrb_sym_name(mrb, node_to_sym(tree))); break; case NODE_IVAR: - printf("NODE_IVAR %s\n", mrb_sym_name(mrb, sym(tree))); + printf("NODE_IVAR %s\n", mrb_sym_name(mrb, node_to_sym(tree))); break; case NODE_CVAR: - printf("NODE_CVAR %s\n", mrb_sym_name(mrb, sym(tree))); + printf("NODE_CVAR %s\n", mrb_sym_name(mrb, node_to_sym(tree))); break; case NODE_NVAR: - printf("NODE_NVAR %d\n", intn(tree)); + printf("NODE_NVAR %d\n", node_to_int(tree)); break; case NODE_CONST: - printf("NODE_CONST %s\n", mrb_sym_name(mrb, sym(tree))); + printf("NODE_CONST %s\n", mrb_sym_name(mrb, node_to_sym(tree))); break; case NODE_MATCH: @@ -14436,15 +14641,15 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) break; case NODE_BACK_REF: - printf("NODE_BACK_REF: $%c\n", intn(tree)); + printf("NODE_BACK_REF: $%c\n", node_to_int(tree)); break; case NODE_NTH_REF: - printf("NODE_NTH_REF: $%d\n", intn(tree)); + printf("NODE_NTH_REF: $%d\n", node_to_int(tree)); break; case NODE_ARG: - printf("NODE_ARG %s\n", mrb_sym_name(mrb, sym(tree))); + printf("NODE_ARG %s\n", mrb_sym_name(mrb, node_to_sym(tree))); break; case NODE_BLOCK_ARG: @@ -14453,7 +14658,7 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) break; case NODE_INT: - printf("NODE_INT %s base %d\n", (char*)tree->car, intn(tree->cdr->car)); + printf("NODE_INT %s base %d\n", (char*)tree->car, node_to_int(tree->cdr->car)); break; case NODE_FLOAT: @@ -14466,7 +14671,7 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) break; case NODE_STR: - printf("NODE_STR %s len %d\n", str_dump(mrb, (char*)tree->car, intn(tree->cdr)), intn(tree->cdr)); + printf("NODE_STR %s len %d\n", str_dump(mrb, (char*)tree->car, node_to_int(tree->cdr)), node_to_int(tree->cdr)); break; case NODE_DSTR: @@ -14475,7 +14680,7 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) break; case NODE_XSTR: - printf("NODE_XSTR %s len %d\n", str_dump(mrb, (char*)tree->car, intn(tree->cdr)), intn(tree->cdr)); + printf("NODE_XSTR %s len %d\n", str_dump(mrb, (char*)tree->car, node_to_int(tree->cdr)), node_to_int(tree->cdr)); break; case NODE_DXSTR: @@ -14511,8 +14716,8 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) break; case NODE_SYM: - printf("NODE_SYM :%s (%d)\n", mrb_sym_dump(mrb, sym(tree)), - intn(tree)); + printf("NODE_SYM :%s (%d)\n", mrb_sym_dump(mrb, node_to_sym(tree)), + node_to_int(tree)); break; case NODE_DSYM: @@ -14552,8 +14757,8 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) case NODE_ALIAS: printf("NODE_ALIAS %s %s:\n", - mrb_sym_dump(mrb, sym(tree->car)), - mrb_sym_dump(mrb, sym(tree->cdr))); + mrb_sym_dump(mrb, node_to_sym(tree->car)), + mrb_sym_dump(mrb, node_to_sym(tree->cdr))); break; case NODE_UNDEF: @@ -14561,7 +14766,7 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) { node *t = tree; while (t) { - printf(" %s", mrb_sym_dump(mrb, sym(t->car))); + printf(" %s", mrb_sym_dump(mrb, node_to_sym(t->car))); t = t->cdr; } } @@ -14570,18 +14775,18 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) case NODE_CLASS: printf("NODE_CLASS:\n"); - if (tree->car->car == nint(0)) { + if (tree->car->car == int_to_node(0)) { dump_prefix(tree, offset+1); - printf(":%s\n", mrb_sym_name(mrb, sym(tree->car->cdr))); + printf(":%s\n", mrb_sym_name(mrb, node_to_sym(tree->car->cdr))); } - else if (tree->car->car == nint(1)) { + else if (tree->car->car == int_to_node(1)) { dump_prefix(tree, offset+1); - printf("::%s\n", mrb_sym_name(mrb, sym(tree->car->cdr))); + printf("::%s\n", mrb_sym_name(mrb, node_to_sym(tree->car->cdr))); } else { mrb_parser_dump(mrb, tree->car->car, offset+1); dump_prefix(tree, offset+1); - printf("::%s\n", mrb_sym_name(mrb, sym(tree->car->cdr))); + printf("::%s\n", mrb_sym_name(mrb, node_to_sym(tree->car->cdr))); } if (tree->cdr->car) { dump_prefix(tree, offset+1); @@ -14595,18 +14800,18 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) case NODE_MODULE: printf("NODE_MODULE:\n"); - if (tree->car->car == nint(0)) { + if (tree->car->car == int_to_node(0)) { dump_prefix(tree, offset+1); - printf(":%s\n", mrb_sym_name(mrb, sym(tree->car->cdr))); + printf(":%s\n", mrb_sym_name(mrb, node_to_sym(tree->car->cdr))); } - else if (tree->car->car == nint(1)) { + else if (tree->car->car == int_to_node(1)) { dump_prefix(tree, offset+1); - printf("::%s\n", mrb_sym_name(mrb, sym(tree->car->cdr))); + printf("::%s\n", mrb_sym_name(mrb, node_to_sym(tree->car->cdr))); } else { mrb_parser_dump(mrb, tree->car->car, offset+1); dump_prefix(tree, offset+1); - printf("::%s\n", mrb_sym_name(mrb, sym(tree->car->cdr))); + printf("::%s\n", mrb_sym_name(mrb, node_to_sym(tree->car->cdr))); } dump_prefix(tree, offset+1); printf("body:\n"); @@ -14624,7 +14829,7 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) case NODE_DEF: printf("NODE_DEF:\n"); dump_prefix(tree, offset+1); - printf("%s\n", mrb_sym_dump(mrb, sym(tree->car))); + printf("%s\n", mrb_sym_dump(mrb, node_to_sym(tree->car))); tree = tree->cdr; { node *n2 = tree->car; @@ -14637,7 +14842,7 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) while (n2) { if (n2->car) { if (!first_lval) printf(", "); - printf("%s", mrb_sym_name(mrb, sym(n2->car))); + printf("%s", mrb_sym_name(mrb, node_to_sym(n2->car))); first_lval = FALSE; } n2 = n2->cdr; @@ -14657,7 +14862,7 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) mrb_parser_dump(mrb, tree->car, offset+1); tree = tree->cdr; dump_prefix(tree, offset+1); - printf(":%s\n", mrb_sym_dump(mrb, sym(tree->car))); + printf(":%s\n", mrb_sym_dump(mrb, node_to_sym(tree->car))); tree = tree->cdr->cdr; if (tree->car) { dump_args(mrb, tree->car, offset+1); @@ -14688,24 +14893,24 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) } tree = tree->cdr; if (tree->car) { - mrb_assert(intn(tree->car->car) == NODE_KW_REST_ARGS); + mrb_assert(node_to_int(tree->car->car) == NODE_KW_REST_ARGS); mrb_parser_dump(mrb, tree->car, offset+1); } tree = tree->cdr; if (tree->car) { dump_prefix(tree, offset+1); - printf("block='%s'\n", mrb_sym_name(mrb, sym(tree->car))); + printf("block='%s'\n", mrb_sym_name(mrb, node_to_sym(tree->car))); } break; case NODE_KW_ARG: - printf("NODE_KW_ARG %s:\n", mrb_sym_name(mrb, sym(tree->car))); + printf("NODE_KW_ARG %s:\n", mrb_sym_name(mrb, node_to_sym(tree->car))); mrb_parser_dump(mrb, tree->cdr->car, offset + 1); break; case NODE_KW_REST_ARGS: if (tree) - printf("NODE_KW_REST_ARGS %s\n", mrb_sym_name(mrb, sym(tree))); + printf("NODE_KW_REST_ARGS %s\n", mrb_sym_name(mrb, node_to_sym(tree))); else printf("NODE_KW_REST_ARGS\n"); break; @@ -14727,7 +14932,7 @@ mrb_parser_foreach_top_variable(mrb_state *mrb, struct mrb_parser_state *p, mrb_ if ((intptr_t)n->car == NODE_SCOPE) { n = n->cdr->car; for (; n; n = n->cdr) { - mrb_sym sym = sym(n->car); + mrb_sym sym = node_to_sym(n->car); if (sym && !func(mrb, sym, user)) break; } }