From d15c0271d6a601c6ff0029142423c06a5b045c60 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Tue, 23 Sep 2025 11:05:30 +0900 Subject: [PATCH] mruby-compiler: remove unused variable node recycling mechanism Remove var_free_lists, var_alloc_counts, and var_total_allocated fields from parser_state struct as they were never used since all nodes go directly to codegen. Replace parser_alloc_var() wrapper with direct parser_palloc() calls throughout the codebase, reducing parser memory footprint by 88 bytes. Co-authored-by: Claude --- include/mruby/compile.h | 3 - mrbgems/mruby-compiler/core/parse.y | 167 +- mrbgems/mruby-compiler/core/y.tab.c | 3315 +++++++++++++-------------- 3 files changed, 1704 insertions(+), 1781 deletions(-) diff --git a/include/mruby/compile.h b/include/mruby/compile.h index 3246f5af3..d447d50cd 100644 --- a/include/mruby/compile.h +++ b/include/mruby/compile.h @@ -135,9 +135,6 @@ struct mrb_parser_state { 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/parse.y b/mrbgems/mruby-compiler/core/parse.y index df1d5677e..8f895b16b 100644 --- a/mrbgems/mruby-compiler/core/parse.y +++ b/mrbgems/mruby-compiler/core/parse.y @@ -185,38 +185,6 @@ size_class_limit(enum mrb_ast_size_class size_class) return (size_class < SIZE_CLASS_COUNT) ? limits[size_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 size_class) -{ - /* Try to reuse from appropriate size class free list */ - if (p->var_free_lists[size_class] && size <= size_class_limit(size_class)) { - struct mrb_ast_node *ptr = p->var_free_lists[size_class]; - p->var_free_lists[size_class] = ptr->cdr; - p->var_alloc_counts[size_class]++; - return ptr; - } - - /* Allocate new memory */ - void *ptr = parser_palloc(p, size); - p->var_total_allocated += size; - p->var_alloc_counts[size_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 size_class) -{ - if (!ptr) return; - - struct mrb_ast_node *node = (struct mrb_ast_node*)ptr; - node->cdr = p->var_free_lists[size_class]; - p->var_free_lists[size_class] = node; -} -*/ - /* Initialize variable node header */ static void init_var_header(struct mrb_ast_var_header *header, parser_state *p, @@ -457,7 +425,7 @@ new_scope(parser_state *p, node *body) { size_t total_size = sizeof(struct mrb_ast_scope_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_scope_node *scope_node = (struct mrb_ast_scope_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_scope_node *scope_node = (struct mrb_ast_scope_node*)parser_palloc(p, total_size); init_var_header(&scope_node->hdr, p, NODE_SCOPE, size_class); scope_node->locals = locals_node(p); scope_node->body = body; @@ -471,7 +439,7 @@ new_stmts(parser_state *p, node *body) size_t total_size = sizeof(struct mrb_ast_stmts_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_stmts_node *n = (struct mrb_ast_stmts_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_stmts_node *n = (struct mrb_ast_stmts_node*)parser_palloc(p, total_size); init_var_header(&n->hdr, p, NODE_STMTS, size_class); n->stmts = body ? list1(body) : 0; /* Wrap single statement in cons-list */ @@ -485,7 +453,7 @@ new_begin(parser_state *p, node *body) { size_t total_size = sizeof(struct mrb_ast_begin_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_begin_node *begin_node = (struct mrb_ast_begin_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_begin_node *begin_node = (struct mrb_ast_begin_node*)parser_palloc(p, total_size); init_var_header(&begin_node->hdr, p, NODE_BEGIN, size_class); begin_node->body = body; return cons_head((node*)NODE_VARIABLE, (node*)begin_node); @@ -500,7 +468,7 @@ new_rescue(parser_state *p, node *body, node *resq, node *els) size_t total_size = sizeof(struct mrb_ast_rescue_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_rescue_node *n = (struct mrb_ast_rescue_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_rescue_node *n = (struct mrb_ast_rescue_node*)parser_palloc(p, total_size); init_var_header(&n->hdr, p, NODE_RESCUE, size_class); n->body = body; @@ -522,7 +490,7 @@ new_ensure(parser_state *p, node *a, node *b) { size_t total_size = sizeof(struct mrb_ast_ensure_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_ensure_node *ensure_node = (struct mrb_ast_ensure_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_ensure_node *ensure_node = (struct mrb_ast_ensure_node*)parser_palloc(p, total_size); init_var_header(&ensure_node->hdr, p, NODE_ENSURE, size_class); ensure_node->body = a; ensure_node->ensure_clause = b; @@ -536,7 +504,7 @@ new_nil(parser_state *p) size_t total_size = sizeof(struct mrb_ast_nil_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_nil_node *n = (struct mrb_ast_nil_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_nil_node *n = (struct mrb_ast_nil_node*)parser_palloc(p, total_size); init_var_header(&n->hdr, p, NODE_NIL, size_class); @@ -550,7 +518,7 @@ new_true(parser_state *p) size_t total_size = sizeof(struct mrb_ast_true_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_true_node *n = (struct mrb_ast_true_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_true_node *n = (struct mrb_ast_true_node*)parser_palloc(p, total_size); init_var_header(&n->hdr, p, NODE_TRUE, size_class); @@ -564,7 +532,7 @@ new_false(parser_state *p) size_t total_size = sizeof(struct mrb_ast_false_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_false_node *n = (struct mrb_ast_false_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_false_node *n = (struct mrb_ast_false_node*)parser_palloc(p, total_size); init_var_header(&n->hdr, p, NODE_FALSE, size_class); @@ -577,7 +545,7 @@ new_alias(parser_state *p, mrb_sym a, mrb_sym b) { size_t total_size = sizeof(struct mrb_ast_alias_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_alias_node *alias_node = (struct mrb_ast_alias_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_alias_node *alias_node = (struct mrb_ast_alias_node*)parser_palloc(p, total_size); init_var_header(&alias_node->hdr, p, NODE_ALIAS, size_class); alias_node->new_name = a; alias_node->old_name = b; @@ -594,7 +562,7 @@ new_if(parser_state *p, node *condition, node *then_body, node *else_body) enum mrb_ast_size_class size_class = size_to_class(total_size); struct mrb_ast_if_node *n; - n = (struct mrb_ast_if_node*)parser_alloc_var(p, total_size, size_class); + n = (struct mrb_ast_if_node*)parser_palloc(p, total_size); init_var_header(&n->header, p, NODE_IF, size_class); n->condition = condition; n->then_body = then_body; @@ -613,7 +581,7 @@ new_while(parser_state *p, node *condition, node *body) enum mrb_ast_size_class size_class = size_to_class(total_size); struct mrb_ast_while_node *n; - n = (struct mrb_ast_while_node*)parser_alloc_var(p, total_size, size_class); + n = (struct mrb_ast_while_node*)parser_palloc(p, total_size); init_var_header(&n->header, p, NODE_WHILE, size_class); n->condition = condition; n->body = body; @@ -631,7 +599,7 @@ new_until(parser_state *p, node *condition, node *body) enum mrb_ast_size_class size_class = size_to_class(total_size); struct mrb_ast_until_node *n; - n = (struct mrb_ast_until_node*)parser_alloc_var(p, total_size, size_class); + n = (struct mrb_ast_until_node*)parser_palloc(p, total_size); init_var_header(&n->header, p, NODE_UNTIL, size_class); n->condition = condition; n->body = body; @@ -668,7 +636,7 @@ new_for(parser_state *p, node *v, node *o, node *b) size_t total_size = sizeof(struct mrb_ast_for_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_for_node *n = (struct mrb_ast_for_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_for_node *n = (struct mrb_ast_for_node*)parser_palloc(p, total_size); init_var_header(&n->header, p, NODE_FOR, size_class); n->var = v; @@ -684,7 +652,7 @@ new_case(parser_state *p, node *a, node *b) { void_expr_error(p, a); - struct mrb_ast_case_node *n = (struct mrb_ast_case_node*)parser_alloc_var(p, sizeof(struct mrb_ast_case_node), SIZE_CLASS_MEDIUM); + struct mrb_ast_case_node *n = (struct mrb_ast_case_node*)parser_palloc(p, sizeof(struct mrb_ast_case_node)); init_var_header(&n->header, p, NODE_CASE, SIZE_CLASS_MEDIUM); n->value = a; @@ -699,7 +667,7 @@ new_postexe(parser_state *p, node *a) { size_t total_size = sizeof(struct mrb_ast_postexe_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_postexe_node *postexe_node = (struct mrb_ast_postexe_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_postexe_node *postexe_node = (struct mrb_ast_postexe_node*)parser_palloc(p, total_size); init_var_header(&postexe_node->hdr, p, NODE_POSTEXE, size_class); postexe_node->body = a; return cons_head((node*)NODE_VARIABLE, (node*)postexe_node); @@ -712,7 +680,7 @@ new_self(parser_state *p) size_t total_size = sizeof(struct mrb_ast_self_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_self_node *n = (struct mrb_ast_self_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_self_node *n = (struct mrb_ast_self_node*)parser_palloc(p, total_size); init_var_header(&n->hdr, p, NODE_SELF, size_class); @@ -738,7 +706,7 @@ new_call(parser_state *p, node *receiver, mrb_sym method, node *args, int pass) size_t total_size = sizeof(struct mrb_ast_call_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_call_node *n = (struct mrb_ast_call_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_call_node *n = (struct mrb_ast_call_node*)parser_palloc(p, total_size); init_var_header(&n->header, p, NODE_CALL, size_class); n->receiver = receiver; @@ -786,7 +754,7 @@ new_super(parser_state *p, node *c) size_t total_size = sizeof(struct mrb_ast_super_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_super_node *n = (struct mrb_ast_super_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_super_node *n = (struct mrb_ast_super_node*)parser_palloc(p, total_size); init_var_header(&n->header, p, NODE_SUPER, size_class); n->args = c; @@ -800,7 +768,7 @@ new_zsuper(parser_state *p) { size_t total_size = sizeof(struct mrb_ast_super_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_super_node *n = (struct mrb_ast_super_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_super_node *n = (struct mrb_ast_super_node*)parser_palloc(p, total_size); init_var_header(&n->header, p, NODE_ZSUPER, size_class); n->args = NULL; /* zsuper initially has no args, but may be added by call_with_block */ return cons_head((node*)NODE_VARIABLE, (node*)n); @@ -821,7 +789,7 @@ new_yield(parser_state *p, node *c) size_t total_size = sizeof(struct mrb_ast_yield_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_yield_node *n = (struct mrb_ast_yield_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_yield_node *n = (struct mrb_ast_yield_node*)parser_palloc(p, total_size); init_var_header(&n->header, p, NODE_YIELD, size_class); n->args = c; @@ -836,7 +804,7 @@ new_return(parser_state *p, node *c) size_t total_size = sizeof(struct mrb_ast_return_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_return_node *n = (struct mrb_ast_return_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_return_node *n = (struct mrb_ast_return_node*)parser_palloc(p, total_size); init_var_header(&n->header, p, NODE_RETURN, size_class); n->args = c; @@ -850,7 +818,7 @@ new_break(parser_state *p, node *c) { size_t total_size = sizeof(struct mrb_ast_break_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_break_node *n = (struct mrb_ast_break_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_break_node *n = (struct mrb_ast_break_node*)parser_palloc(p, total_size); init_var_header(&n->hdr, p, NODE_BREAK, size_class); n->value = c; return cons_head((node*)NODE_VARIABLE, (node*)n); @@ -862,7 +830,7 @@ new_next(parser_state *p, node *c) { size_t total_size = sizeof(struct mrb_ast_next_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_next_node *n = (struct mrb_ast_next_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_next_node *n = (struct mrb_ast_next_node*)parser_palloc(p, total_size); init_var_header(&n->hdr, p, NODE_NEXT, size_class); n->value = c; return cons_head((node*)NODE_VARIABLE, (node*)n); @@ -874,7 +842,7 @@ new_redo(parser_state *p) { size_t total_size = sizeof(struct mrb_ast_redo_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_redo_node *n = (struct mrb_ast_redo_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_redo_node *n = (struct mrb_ast_redo_node*)parser_palloc(p, total_size); init_var_header(&n->hdr, p, NODE_REDO, size_class); return cons_head((node*)NODE_VARIABLE, (node*)n); } @@ -885,7 +853,7 @@ new_retry(parser_state *p) { size_t total_size = sizeof(struct mrb_ast_retry_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_retry_node *n = (struct mrb_ast_retry_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_retry_node *n = (struct mrb_ast_retry_node*)parser_palloc(p, total_size); init_var_header(&n->hdr, p, NODE_RETRY, size_class); return cons_head((node*)NODE_VARIABLE, (node*)n); } @@ -897,7 +865,7 @@ new_dot2(parser_state *p, node *a, node *b) size_t total_size = sizeof(struct mrb_ast_dot2_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_dot2_node *n = (struct mrb_ast_dot2_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_dot2_node *n = (struct mrb_ast_dot2_node*)parser_palloc(p, total_size); init_var_header(&n->hdr, p, NODE_DOT2, size_class); n->left = a; @@ -913,7 +881,7 @@ new_dot3(parser_state *p, node *a, node *b) size_t total_size = sizeof(struct mrb_ast_dot3_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_dot3_node *n = (struct mrb_ast_dot3_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_dot3_node *n = (struct mrb_ast_dot3_node*)parser_palloc(p, total_size); init_var_header(&n->hdr, p, NODE_DOT3, size_class); n->left = a; @@ -930,7 +898,7 @@ new_colon2(parser_state *p, node *b, mrb_sym c) size_t total_size = sizeof(struct mrb_ast_colon2_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_colon2_node *colon2_node = (struct mrb_ast_colon2_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_colon2_node *colon2_node = (struct mrb_ast_colon2_node*)parser_palloc(p, total_size); init_var_header(&colon2_node->hdr, p, NODE_COLON2, size_class); colon2_node->base = b; colon2_node->name = c; @@ -943,7 +911,7 @@ new_colon3(parser_state *p, mrb_sym c) { size_t total_size = sizeof(struct mrb_ast_colon3_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_colon3_node *colon3_node = (struct mrb_ast_colon3_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_colon3_node *colon3_node = (struct mrb_ast_colon3_node*)parser_palloc(p, total_size); init_var_header(&colon3_node->hdr, p, NODE_COLON3, size_class); colon3_node->name = c; return cons_head((node*)NODE_VARIABLE, (node*)colon3_node); @@ -958,7 +926,7 @@ new_and(parser_state *p, node *a, node *b) size_t total_size = sizeof(struct mrb_ast_and_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_and_node *n = (struct mrb_ast_and_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_and_node *n = (struct mrb_ast_and_node*)parser_palloc(p, total_size); init_var_header(&n->header, p, NODE_AND, size_class); n->left = a; @@ -976,7 +944,7 @@ new_or(parser_state *p, node *a, node *b) size_t total_size = sizeof(struct mrb_ast_or_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_or_node *n = (struct mrb_ast_or_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_or_node *n = (struct mrb_ast_or_node*)parser_palloc(p, total_size); init_var_header(&n->header, p, NODE_OR, size_class); n->left = a; @@ -989,7 +957,7 @@ new_or(parser_state *p, node *a, node *b) static node* new_array(parser_state *p, node *a) { - struct mrb_ast_array_node *n = (struct mrb_ast_array_node*)parser_alloc_var(p, sizeof(struct mrb_ast_array_node), SIZE_CLASS_MEDIUM); + struct mrb_ast_array_node *n = (struct mrb_ast_array_node*)parser_palloc(p, sizeof(struct mrb_ast_array_node)); init_var_header(&n->header, p, NODE_ARRAY, SIZE_CLASS_MEDIUM); n->elements = a; @@ -1005,7 +973,7 @@ new_splat(parser_state *p, node *a) size_t total_size = sizeof(struct mrb_ast_splat_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_splat_node *splat_node = (struct mrb_ast_splat_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_splat_node *splat_node = (struct mrb_ast_splat_node*)parser_palloc(p, total_size); init_var_header(&splat_node->hdr, p, NODE_SPLAT, size_class); splat_node->value = a; return cons_head((node*)NODE_VARIABLE, (node*)splat_node); @@ -1015,7 +983,7 @@ new_splat(parser_state *p, node *a) static node* new_hash(parser_state *p, node *a) { - struct mrb_ast_hash_node *n = (struct mrb_ast_hash_node*)parser_alloc_var(p, sizeof(struct mrb_ast_hash_node), SIZE_CLASS_MEDIUM); + struct mrb_ast_hash_node *n = (struct mrb_ast_hash_node*)parser_palloc(p, sizeof(struct mrb_ast_hash_node)); init_var_header(&n->header, p, NODE_HASH, SIZE_CLASS_MEDIUM); n->pairs = a; @@ -1033,7 +1001,7 @@ new_kw_hash(parser_state *p, node *a) size_t total_size = sizeof(struct mrb_ast_kw_hash_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_kw_hash_node *kw_hash_node = (struct mrb_ast_kw_hash_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_kw_hash_node *kw_hash_node = (struct mrb_ast_kw_hash_node*)parser_palloc(p, total_size); init_var_header(&kw_hash_node->hdr, p, NODE_KW_HASH, size_class); kw_hash_node->args = a; return cons_head((node*)NODE_VARIABLE, (node*)kw_hash_node); @@ -1047,7 +1015,7 @@ new_sym(parser_state *p, mrb_sym sym) size_t size = sizeof(struct mrb_ast_sym_node); enum mrb_ast_size_class size_class = size_to_class(size); - struct mrb_ast_sym_node *n = (struct mrb_ast_sym_node*)parser_alloc_var(p, size, size_class); + struct mrb_ast_sym_node *n = (struct mrb_ast_sym_node*)parser_palloc(p, size); init_var_header(&n->header, p, NODE_SYM, size_class); n->symbol = sym; @@ -1061,7 +1029,7 @@ new_xvar(parser_state *p, mrb_sym sym, enum node_type type) size_t size = sizeof(struct mrb_ast_var_node); enum mrb_ast_size_class size_class = size_to_class(size); - struct mrb_ast_var_node *n = (struct mrb_ast_var_node*)parser_alloc_var(p, size, size_class); + struct mrb_ast_var_node *n = (struct mrb_ast_var_node*)parser_palloc(p, size); init_var_header(&n->header, p, type, size_class); n->symbol = sym; @@ -1109,7 +1077,7 @@ new_nvar(parser_state *p, int num) size_t total_size = sizeof(struct mrb_ast_nvar_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_nvar_node *n = (struct mrb_ast_nvar_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_nvar_node *n = (struct mrb_ast_nvar_node*)parser_palloc(p, total_size); init_var_header(&n->hdr, p, NODE_NVAR, size_class); n->num = num; return cons_head((node*)NODE_VARIABLE, (node*)n); @@ -1122,7 +1090,7 @@ new_const(parser_state *p, mrb_sym sym) size_t total_size = sizeof(struct mrb_ast_const_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_const_node *n = (struct mrb_ast_const_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_const_node *n = (struct mrb_ast_const_node*)parser_palloc(p, total_size); init_var_header(&n->hdr, p, NODE_CONST, size_class); n->symbol = sym; @@ -1136,7 +1104,7 @@ new_undef(parser_state *p, node *syms) { size_t total_size = sizeof(struct mrb_ast_undef_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_undef_node *undef_node = (struct mrb_ast_undef_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_undef_node *undef_node = (struct mrb_ast_undef_node*)parser_palloc(p, total_size); init_var_header(&undef_node->hdr, p, NODE_UNDEF, size_class); undef_node->syms = syms; return cons_head((node*)NODE_VARIABLE, (node*)undef_node); @@ -1151,7 +1119,7 @@ new_class(parser_state *p, node *c, node *s, node *b) size_t total_size = sizeof(struct mrb_ast_class_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_class_node *n = (struct mrb_ast_class_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_class_node *n = (struct mrb_ast_class_node*)parser_palloc(p, total_size); init_var_header(&n->header, p, NODE_CLASS, size_class); n->name = c; @@ -1169,7 +1137,7 @@ new_sclass(parser_state *p, node *o, node *b) size_t total_size = sizeof(struct mrb_ast_sclass_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_sclass_node *n = (struct mrb_ast_sclass_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_sclass_node *n = (struct mrb_ast_sclass_node*)parser_palloc(p, total_size); init_var_header(&n->header, p, NODE_SCLASS, size_class); n->obj = o; @@ -1185,7 +1153,7 @@ new_module(parser_state *p, node *m, node *b) size_t total_size = sizeof(struct mrb_ast_module_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_module_node *n = (struct mrb_ast_module_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_module_node *n = (struct mrb_ast_module_node*)parser_palloc(p, total_size); init_var_header(&n->header, p, NODE_MODULE, size_class); n->name = m; @@ -1201,7 +1169,7 @@ new_def(parser_state *p, mrb_sym name) size_t total_size = sizeof(struct mrb_ast_def_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_def_node *n = (struct mrb_ast_def_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_def_node *n = (struct mrb_ast_def_node*)parser_palloc(p, total_size); init_var_header(&n->header, p, NODE_DEF, size_class); n->name = name; @@ -1233,7 +1201,7 @@ new_sdef(parser_state *p, node *o, mrb_sym name) size_t total_size = sizeof(struct mrb_ast_sdef_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_sdef_node *sdef_node = (struct mrb_ast_sdef_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_sdef_node *sdef_node = (struct mrb_ast_sdef_node*)parser_palloc(p, total_size); init_var_header(&sdef_node->header, p, NODE_SDEF, size_class); sdef_node->obj = o; sdef_node->name = name; @@ -1396,7 +1364,7 @@ new_block_arg(parser_state *p, node *a) { size_t total_size = sizeof(struct mrb_ast_block_arg_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_block_arg_node *block_arg_node = (struct mrb_ast_block_arg_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_block_arg_node *block_arg_node = (struct mrb_ast_block_arg_node*)parser_palloc(p, total_size); init_var_header(&block_arg_node->hdr, p, NODE_BLOCK_ARG, size_class); block_arg_node->value = a; return cons_head((node*)NODE_VARIABLE, (node*)block_arg_node); @@ -1443,7 +1411,7 @@ new_block(parser_state *p, node *a, node *b) size_t total_size = sizeof(struct mrb_ast_block_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_block_node *n = (struct mrb_ast_block_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_block_node *n = (struct mrb_ast_block_node*)parser_palloc(p, total_size); init_var_header(&n->hdr, p, NODE_BLOCK, size_class); n->locals = locals_node(p); @@ -1461,7 +1429,7 @@ new_lambda(parser_state *p, node *a, node *b) size_t total_size = sizeof(struct mrb_ast_lambda_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_lambda_node *lambda_node = (struct mrb_ast_lambda_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_lambda_node *lambda_node = (struct mrb_ast_lambda_node*)parser_palloc(p, total_size); init_var_header(&lambda_node->hdr, p, NODE_LAMBDA, size_class); lambda_node->locals = locals_node(p); lambda_node->args = (struct mrb_ast_args *)a; @@ -1478,7 +1446,7 @@ new_asgn(parser_state *p, node *a, node *b) size_t total_size = sizeof(struct mrb_ast_asgn_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_asgn_node *n = (struct mrb_ast_asgn_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_asgn_node *n = (struct mrb_ast_asgn_node*)parser_palloc(p, total_size); init_var_header(&n->header, p, NODE_ASGN, size_class); n->lhs = a; @@ -1496,7 +1464,7 @@ new_masgn(parser_state *p, node *a, node *b) size_t total_size = sizeof(struct mrb_ast_masgn_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_masgn_node *n = (struct mrb_ast_masgn_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_masgn_node *n = (struct mrb_ast_masgn_node*)parser_palloc(p, total_size); init_var_header(&n->header, p, NODE_MASGN, size_class); n->lhs = a; @@ -1512,7 +1480,7 @@ new_masgn_param(parser_state *p, node *a, node *b) size_t total_size = sizeof(struct mrb_ast_masgn_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_masgn_node *n = (struct mrb_ast_masgn_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_masgn_node *n = (struct mrb_ast_masgn_node*)parser_palloc(p, total_size); init_var_header(&n->header, p, NODE_MASGN, size_class); n->lhs = a; @@ -1529,7 +1497,7 @@ new_op_asgn(parser_state *p, node *a, mrb_sym op, node *b) size_t total_size = sizeof(struct mrb_ast_op_asgn_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_op_asgn_node *n = (struct mrb_ast_op_asgn_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_op_asgn_node *n = (struct mrb_ast_op_asgn_node*)parser_palloc(p, total_size); init_var_header(&n->header, p, NODE_OP_ASGN, size_class); n->lhs = a; n->op = op; @@ -1542,7 +1510,7 @@ new_int_n(parser_state *p, int32_t val) { size_t size = sizeof(struct mrb_ast_int_node); enum mrb_ast_size_class size_class = size_to_class(size); - struct mrb_ast_int_node *n = (struct mrb_ast_int_node*)parser_alloc_var(p, size, size_class); + struct mrb_ast_int_node *n = (struct mrb_ast_int_node*)parser_palloc(p, size); init_var_header(&n->header, p, NODE_INT, size_class); n->value = val; @@ -1652,7 +1620,7 @@ new_int(parser_state *p, const char *s, int base, int suffix) /* Big integer - create NODE_BIGINT */ size_t size = sizeof(struct mrb_ast_bigint_node); enum mrb_ast_size_class size_class = size_to_class(size); - struct mrb_ast_bigint_node *n = (struct mrb_ast_bigint_node*)parser_alloc_var(p, size, size_class); + struct mrb_ast_bigint_node *n = (struct mrb_ast_bigint_node*)parser_palloc(p, size); init_var_header(&n->header, p, NODE_BIGINT, size_class); n->string = strdup(s); @@ -1680,7 +1648,7 @@ new_float(parser_state *p, const char *s, int suffix) size_t total_size = sizeof(struct mrb_ast_float_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_float_node *n = (struct mrb_ast_float_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_float_node *n = (struct mrb_ast_float_node*)parser_palloc(p, total_size); init_var_header(&n->hdr, p, NODE_FLOAT, size_class); n->value = strdup(s); @@ -1705,7 +1673,7 @@ new_str(parser_state *p, node *a) size_t total_size = sizeof(struct mrb_ast_str_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_str_node *n = (struct mrb_ast_str_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_str_node *n = (struct mrb_ast_str_node*)parser_palloc(p, total_size); init_var_header(&n->hdr, p, NODE_STR, size_class); n->list = a; @@ -1719,7 +1687,7 @@ new_xstr(parser_state *p, node *a) { size_t total_size = sizeof(struct mrb_ast_xstr_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_xstr_node *n = (struct mrb_ast_xstr_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_xstr_node *n = (struct mrb_ast_xstr_node*)parser_palloc(p, total_size); init_var_header(&n->hdr, p, NODE_XSTR, size_class); n->list = a; return cons_head((node*)NODE_VARIABLE, (node*)n); @@ -1731,7 +1699,7 @@ new_dsym(parser_state *p, node *a) { size_t total_size = sizeof(struct mrb_ast_dsym_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_dsym_node *n = (struct mrb_ast_dsym_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_dsym_node *n = (struct mrb_ast_dsym_node*)parser_palloc(p, total_size); init_var_header(&n->hdr, p, NODE_DSYM, size_class); n->list = a; return cons_head((node*)NODE_VARIABLE, (node*)n); @@ -1743,7 +1711,7 @@ new_dregx(parser_state *p, node *list, const char *flags, const char *encoding) { size_t total_size = sizeof(struct mrb_ast_dregx_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_dregx_node *n = (struct mrb_ast_dregx_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_dregx_node *n = (struct mrb_ast_dregx_node*)parser_palloc(p, total_size); init_var_header(&n->hdr, p, NODE_DREGX, size_class); n->list = list; n->flags = flags; @@ -1757,7 +1725,7 @@ new_back_ref(parser_state *p, int n) { size_t total_size = sizeof(struct mrb_ast_back_ref_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_back_ref_node *backref_node = (struct mrb_ast_back_ref_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_back_ref_node *backref_node = (struct mrb_ast_back_ref_node*)parser_palloc(p, total_size); init_var_header(&backref_node->hdr, p, NODE_BACK_REF, size_class); backref_node->type = n; return cons_head((node*)NODE_VARIABLE, (node*)backref_node); @@ -1769,7 +1737,7 @@ new_nth_ref(parser_state *p, int n) { size_t total_size = sizeof(struct mrb_ast_nth_ref_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_nth_ref_node *nthref_node = (struct mrb_ast_nth_ref_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_nth_ref_node *nthref_node = (struct mrb_ast_nth_ref_node*)parser_palloc(p, total_size); init_var_header(&nthref_node->hdr, p, NODE_NTH_REF, size_class); nthref_node->nth = n; return cons_head((node*)NODE_VARIABLE, (node*)nthref_node); @@ -1781,7 +1749,7 @@ new_heredoc(parser_state *p, struct mrb_parser_heredoc_info **infop) { size_t total_size = sizeof(struct mrb_ast_heredoc_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_heredoc_node *n = (struct mrb_ast_heredoc_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_heredoc_node *n = (struct mrb_ast_heredoc_node*)parser_palloc(p, total_size); init_var_header(&n->hdr, p, NODE_HEREDOC, size_class); /* Initialize embedded heredoc info struct */ @@ -1839,7 +1807,7 @@ new_words(parser_state *p, node *a) { size_t total_size = sizeof(struct mrb_ast_words_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_words_node *words_node = (struct mrb_ast_words_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_words_node *words_node = (struct mrb_ast_words_node*)parser_palloc(p, total_size); init_var_header(&words_node->hdr, p, NODE_WORDS, size_class); words_node->args = a; return cons_head((node*)NODE_VARIABLE, (node*)words_node); @@ -1851,7 +1819,7 @@ new_symbols(parser_state *p, node *a) { size_t total_size = sizeof(struct mrb_ast_symbols_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_symbols_node *symbols_node = (struct mrb_ast_symbols_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_symbols_node *symbols_node = (struct mrb_ast_symbols_node*)parser_palloc(p, total_size); init_var_header(&symbols_node->hdr, p, NODE_SYMBOLS, size_class); symbols_node->args = a; return cons_head((node*)NODE_VARIABLE, (node*)symbols_node); @@ -1989,7 +1957,7 @@ new_negate(parser_state *p, node *n) { size_t total_size = sizeof(struct mrb_ast_negate_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_negate_node *negate_node = (struct mrb_ast_negate_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_negate_node *negate_node = (struct mrb_ast_negate_node*)parser_palloc(p, total_size); init_var_header(&negate_node->hdr, p, NODE_NEGATE, size_class); negate_node->operand = n; return cons_head((node*)NODE_VARIABLE, (node*)negate_node); @@ -7430,11 +7398,6 @@ mrb_parser_new(mrb_state *mrb) 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; return p; diff --git a/mrbgems/mruby-compiler/core/y.tab.c b/mrbgems/mruby-compiler/core/y.tab.c index 4f51a5e1b..63103dc6d 100644 --- a/mrbgems/mruby-compiler/core/y.tab.c +++ b/mrbgems/mruby-compiler/core/y.tab.c @@ -247,38 +247,6 @@ size_class_limit(enum mrb_ast_size_class size_class) return (size_class < SIZE_CLASS_COUNT) ? limits[size_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 size_class) -{ - /* Try to reuse from appropriate size class free list */ - if (p->var_free_lists[size_class] && size <= size_class_limit(size_class)) { - struct mrb_ast_node *ptr = p->var_free_lists[size_class]; - p->var_free_lists[size_class] = ptr->cdr; - p->var_alloc_counts[size_class]++; - return ptr; - } - - /* Allocate new memory */ - void *ptr = parser_palloc(p, size); - p->var_total_allocated += size; - p->var_alloc_counts[size_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 size_class) -{ - if (!ptr) return; - - struct mrb_ast_node *node = (struct mrb_ast_node*)ptr; - node->cdr = p->var_free_lists[size_class]; - p->var_free_lists[size_class] = node; -} -*/ - /* Initialize variable node header */ static void init_var_header(struct mrb_ast_var_header *header, parser_state *p, @@ -519,7 +487,7 @@ new_scope(parser_state *p, node *body) { size_t total_size = sizeof(struct mrb_ast_scope_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_scope_node *scope_node = (struct mrb_ast_scope_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_scope_node *scope_node = (struct mrb_ast_scope_node*)parser_palloc(p, total_size); init_var_header(&scope_node->hdr, p, NODE_SCOPE, size_class); scope_node->locals = locals_node(p); scope_node->body = body; @@ -533,7 +501,7 @@ new_stmts(parser_state *p, node *body) size_t total_size = sizeof(struct mrb_ast_stmts_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_stmts_node *n = (struct mrb_ast_stmts_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_stmts_node *n = (struct mrb_ast_stmts_node*)parser_palloc(p, total_size); init_var_header(&n->hdr, p, NODE_STMTS, size_class); n->stmts = body ? list1(body) : 0; /* Wrap single statement in cons-list */ @@ -547,7 +515,7 @@ new_begin(parser_state *p, node *body) { size_t total_size = sizeof(struct mrb_ast_begin_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_begin_node *begin_node = (struct mrb_ast_begin_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_begin_node *begin_node = (struct mrb_ast_begin_node*)parser_palloc(p, total_size); init_var_header(&begin_node->hdr, p, NODE_BEGIN, size_class); begin_node->body = body; return cons_head((node*)NODE_VARIABLE, (node*)begin_node); @@ -562,7 +530,7 @@ new_rescue(parser_state *p, node *body, node *resq, node *els) size_t total_size = sizeof(struct mrb_ast_rescue_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_rescue_node *n = (struct mrb_ast_rescue_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_rescue_node *n = (struct mrb_ast_rescue_node*)parser_palloc(p, total_size); init_var_header(&n->hdr, p, NODE_RESCUE, size_class); n->body = body; @@ -584,7 +552,7 @@ new_ensure(parser_state *p, node *a, node *b) { size_t total_size = sizeof(struct mrb_ast_ensure_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_ensure_node *ensure_node = (struct mrb_ast_ensure_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_ensure_node *ensure_node = (struct mrb_ast_ensure_node*)parser_palloc(p, total_size); init_var_header(&ensure_node->hdr, p, NODE_ENSURE, size_class); ensure_node->body = a; ensure_node->ensure_clause = b; @@ -598,7 +566,7 @@ new_nil(parser_state *p) size_t total_size = sizeof(struct mrb_ast_nil_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_nil_node *n = (struct mrb_ast_nil_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_nil_node *n = (struct mrb_ast_nil_node*)parser_palloc(p, total_size); init_var_header(&n->hdr, p, NODE_NIL, size_class); @@ -612,7 +580,7 @@ new_true(parser_state *p) size_t total_size = sizeof(struct mrb_ast_true_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_true_node *n = (struct mrb_ast_true_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_true_node *n = (struct mrb_ast_true_node*)parser_palloc(p, total_size); init_var_header(&n->hdr, p, NODE_TRUE, size_class); @@ -626,7 +594,7 @@ new_false(parser_state *p) size_t total_size = sizeof(struct mrb_ast_false_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_false_node *n = (struct mrb_ast_false_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_false_node *n = (struct mrb_ast_false_node*)parser_palloc(p, total_size); init_var_header(&n->hdr, p, NODE_FALSE, size_class); @@ -639,7 +607,7 @@ new_alias(parser_state *p, mrb_sym a, mrb_sym b) { size_t total_size = sizeof(struct mrb_ast_alias_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_alias_node *alias_node = (struct mrb_ast_alias_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_alias_node *alias_node = (struct mrb_ast_alias_node*)parser_palloc(p, total_size); init_var_header(&alias_node->hdr, p, NODE_ALIAS, size_class); alias_node->new_name = a; alias_node->old_name = b; @@ -656,7 +624,7 @@ new_if(parser_state *p, node *condition, node *then_body, node *else_body) enum mrb_ast_size_class size_class = size_to_class(total_size); struct mrb_ast_if_node *n; - n = (struct mrb_ast_if_node*)parser_alloc_var(p, total_size, size_class); + n = (struct mrb_ast_if_node*)parser_palloc(p, total_size); init_var_header(&n->header, p, NODE_IF, size_class); n->condition = condition; n->then_body = then_body; @@ -675,7 +643,7 @@ new_while(parser_state *p, node *condition, node *body) enum mrb_ast_size_class size_class = size_to_class(total_size); struct mrb_ast_while_node *n; - n = (struct mrb_ast_while_node*)parser_alloc_var(p, total_size, size_class); + n = (struct mrb_ast_while_node*)parser_palloc(p, total_size); init_var_header(&n->header, p, NODE_WHILE, size_class); n->condition = condition; n->body = body; @@ -693,7 +661,7 @@ new_until(parser_state *p, node *condition, node *body) enum mrb_ast_size_class size_class = size_to_class(total_size); struct mrb_ast_until_node *n; - n = (struct mrb_ast_until_node*)parser_alloc_var(p, total_size, size_class); + n = (struct mrb_ast_until_node*)parser_palloc(p, total_size); init_var_header(&n->header, p, NODE_UNTIL, size_class); n->condition = condition; n->body = body; @@ -730,7 +698,7 @@ new_for(parser_state *p, node *v, node *o, node *b) size_t total_size = sizeof(struct mrb_ast_for_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_for_node *n = (struct mrb_ast_for_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_for_node *n = (struct mrb_ast_for_node*)parser_palloc(p, total_size); init_var_header(&n->header, p, NODE_FOR, size_class); n->var = v; @@ -746,7 +714,7 @@ new_case(parser_state *p, node *a, node *b) { void_expr_error(p, a); - struct mrb_ast_case_node *n = (struct mrb_ast_case_node*)parser_alloc_var(p, sizeof(struct mrb_ast_case_node), SIZE_CLASS_MEDIUM); + struct mrb_ast_case_node *n = (struct mrb_ast_case_node*)parser_palloc(p, sizeof(struct mrb_ast_case_node)); init_var_header(&n->header, p, NODE_CASE, SIZE_CLASS_MEDIUM); n->value = a; @@ -761,7 +729,7 @@ new_postexe(parser_state *p, node *a) { size_t total_size = sizeof(struct mrb_ast_postexe_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_postexe_node *postexe_node = (struct mrb_ast_postexe_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_postexe_node *postexe_node = (struct mrb_ast_postexe_node*)parser_palloc(p, total_size); init_var_header(&postexe_node->hdr, p, NODE_POSTEXE, size_class); postexe_node->body = a; return cons_head((node*)NODE_VARIABLE, (node*)postexe_node); @@ -774,7 +742,7 @@ new_self(parser_state *p) size_t total_size = sizeof(struct mrb_ast_self_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_self_node *n = (struct mrb_ast_self_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_self_node *n = (struct mrb_ast_self_node*)parser_palloc(p, total_size); init_var_header(&n->hdr, p, NODE_SELF, size_class); @@ -800,7 +768,7 @@ new_call(parser_state *p, node *receiver, mrb_sym method, node *args, int pass) size_t total_size = sizeof(struct mrb_ast_call_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_call_node *n = (struct mrb_ast_call_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_call_node *n = (struct mrb_ast_call_node*)parser_palloc(p, total_size); init_var_header(&n->header, p, NODE_CALL, size_class); n->receiver = receiver; @@ -848,7 +816,7 @@ new_super(parser_state *p, node *c) size_t total_size = sizeof(struct mrb_ast_super_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_super_node *n = (struct mrb_ast_super_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_super_node *n = (struct mrb_ast_super_node*)parser_palloc(p, total_size); init_var_header(&n->header, p, NODE_SUPER, size_class); n->args = c; @@ -862,7 +830,7 @@ new_zsuper(parser_state *p) { size_t total_size = sizeof(struct mrb_ast_super_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_super_node *n = (struct mrb_ast_super_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_super_node *n = (struct mrb_ast_super_node*)parser_palloc(p, total_size); init_var_header(&n->header, p, NODE_ZSUPER, size_class); n->args = NULL; /* zsuper initially has no args, but may be added by call_with_block */ return cons_head((node*)NODE_VARIABLE, (node*)n); @@ -883,7 +851,7 @@ new_yield(parser_state *p, node *c) size_t total_size = sizeof(struct mrb_ast_yield_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_yield_node *n = (struct mrb_ast_yield_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_yield_node *n = (struct mrb_ast_yield_node*)parser_palloc(p, total_size); init_var_header(&n->header, p, NODE_YIELD, size_class); n->args = c; @@ -898,7 +866,7 @@ new_return(parser_state *p, node *c) size_t total_size = sizeof(struct mrb_ast_return_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_return_node *n = (struct mrb_ast_return_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_return_node *n = (struct mrb_ast_return_node*)parser_palloc(p, total_size); init_var_header(&n->header, p, NODE_RETURN, size_class); n->args = c; @@ -912,7 +880,7 @@ new_break(parser_state *p, node *c) { size_t total_size = sizeof(struct mrb_ast_break_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_break_node *n = (struct mrb_ast_break_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_break_node *n = (struct mrb_ast_break_node*)parser_palloc(p, total_size); init_var_header(&n->hdr, p, NODE_BREAK, size_class); n->value = c; return cons_head((node*)NODE_VARIABLE, (node*)n); @@ -924,7 +892,7 @@ new_next(parser_state *p, node *c) { size_t total_size = sizeof(struct mrb_ast_next_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_next_node *n = (struct mrb_ast_next_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_next_node *n = (struct mrb_ast_next_node*)parser_palloc(p, total_size); init_var_header(&n->hdr, p, NODE_NEXT, size_class); n->value = c; return cons_head((node*)NODE_VARIABLE, (node*)n); @@ -936,7 +904,7 @@ new_redo(parser_state *p) { size_t total_size = sizeof(struct mrb_ast_redo_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_redo_node *n = (struct mrb_ast_redo_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_redo_node *n = (struct mrb_ast_redo_node*)parser_palloc(p, total_size); init_var_header(&n->hdr, p, NODE_REDO, size_class); return cons_head((node*)NODE_VARIABLE, (node*)n); } @@ -947,7 +915,7 @@ new_retry(parser_state *p) { size_t total_size = sizeof(struct mrb_ast_retry_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_retry_node *n = (struct mrb_ast_retry_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_retry_node *n = (struct mrb_ast_retry_node*)parser_palloc(p, total_size); init_var_header(&n->hdr, p, NODE_RETRY, size_class); return cons_head((node*)NODE_VARIABLE, (node*)n); } @@ -959,7 +927,7 @@ new_dot2(parser_state *p, node *a, node *b) size_t total_size = sizeof(struct mrb_ast_dot2_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_dot2_node *n = (struct mrb_ast_dot2_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_dot2_node *n = (struct mrb_ast_dot2_node*)parser_palloc(p, total_size); init_var_header(&n->hdr, p, NODE_DOT2, size_class); n->left = a; @@ -975,7 +943,7 @@ new_dot3(parser_state *p, node *a, node *b) size_t total_size = sizeof(struct mrb_ast_dot3_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_dot3_node *n = (struct mrb_ast_dot3_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_dot3_node *n = (struct mrb_ast_dot3_node*)parser_palloc(p, total_size); init_var_header(&n->hdr, p, NODE_DOT3, size_class); n->left = a; @@ -992,7 +960,7 @@ new_colon2(parser_state *p, node *b, mrb_sym c) size_t total_size = sizeof(struct mrb_ast_colon2_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_colon2_node *colon2_node = (struct mrb_ast_colon2_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_colon2_node *colon2_node = (struct mrb_ast_colon2_node*)parser_palloc(p, total_size); init_var_header(&colon2_node->hdr, p, NODE_COLON2, size_class); colon2_node->base = b; colon2_node->name = c; @@ -1005,7 +973,7 @@ new_colon3(parser_state *p, mrb_sym c) { size_t total_size = sizeof(struct mrb_ast_colon3_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_colon3_node *colon3_node = (struct mrb_ast_colon3_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_colon3_node *colon3_node = (struct mrb_ast_colon3_node*)parser_palloc(p, total_size); init_var_header(&colon3_node->hdr, p, NODE_COLON3, size_class); colon3_node->name = c; return cons_head((node*)NODE_VARIABLE, (node*)colon3_node); @@ -1020,7 +988,7 @@ new_and(parser_state *p, node *a, node *b) size_t total_size = sizeof(struct mrb_ast_and_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_and_node *n = (struct mrb_ast_and_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_and_node *n = (struct mrb_ast_and_node*)parser_palloc(p, total_size); init_var_header(&n->header, p, NODE_AND, size_class); n->left = a; @@ -1038,7 +1006,7 @@ new_or(parser_state *p, node *a, node *b) size_t total_size = sizeof(struct mrb_ast_or_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_or_node *n = (struct mrb_ast_or_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_or_node *n = (struct mrb_ast_or_node*)parser_palloc(p, total_size); init_var_header(&n->header, p, NODE_OR, size_class); n->left = a; @@ -1051,7 +1019,7 @@ new_or(parser_state *p, node *a, node *b) static node* new_array(parser_state *p, node *a) { - struct mrb_ast_array_node *n = (struct mrb_ast_array_node*)parser_alloc_var(p, sizeof(struct mrb_ast_array_node), SIZE_CLASS_MEDIUM); + struct mrb_ast_array_node *n = (struct mrb_ast_array_node*)parser_palloc(p, sizeof(struct mrb_ast_array_node)); init_var_header(&n->header, p, NODE_ARRAY, SIZE_CLASS_MEDIUM); n->elements = a; @@ -1067,7 +1035,7 @@ new_splat(parser_state *p, node *a) size_t total_size = sizeof(struct mrb_ast_splat_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_splat_node *splat_node = (struct mrb_ast_splat_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_splat_node *splat_node = (struct mrb_ast_splat_node*)parser_palloc(p, total_size); init_var_header(&splat_node->hdr, p, NODE_SPLAT, size_class); splat_node->value = a; return cons_head((node*)NODE_VARIABLE, (node*)splat_node); @@ -1077,7 +1045,7 @@ new_splat(parser_state *p, node *a) static node* new_hash(parser_state *p, node *a) { - struct mrb_ast_hash_node *n = (struct mrb_ast_hash_node*)parser_alloc_var(p, sizeof(struct mrb_ast_hash_node), SIZE_CLASS_MEDIUM); + struct mrb_ast_hash_node *n = (struct mrb_ast_hash_node*)parser_palloc(p, sizeof(struct mrb_ast_hash_node)); init_var_header(&n->header, p, NODE_HASH, SIZE_CLASS_MEDIUM); n->pairs = a; @@ -1095,7 +1063,7 @@ new_kw_hash(parser_state *p, node *a) size_t total_size = sizeof(struct mrb_ast_kw_hash_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_kw_hash_node *kw_hash_node = (struct mrb_ast_kw_hash_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_kw_hash_node *kw_hash_node = (struct mrb_ast_kw_hash_node*)parser_palloc(p, total_size); init_var_header(&kw_hash_node->hdr, p, NODE_KW_HASH, size_class); kw_hash_node->args = a; return cons_head((node*)NODE_VARIABLE, (node*)kw_hash_node); @@ -1109,7 +1077,7 @@ new_sym(parser_state *p, mrb_sym sym) size_t size = sizeof(struct mrb_ast_sym_node); enum mrb_ast_size_class size_class = size_to_class(size); - struct mrb_ast_sym_node *n = (struct mrb_ast_sym_node*)parser_alloc_var(p, size, size_class); + struct mrb_ast_sym_node *n = (struct mrb_ast_sym_node*)parser_palloc(p, size); init_var_header(&n->header, p, NODE_SYM, size_class); n->symbol = sym; @@ -1123,7 +1091,7 @@ new_xvar(parser_state *p, mrb_sym sym, enum node_type type) size_t size = sizeof(struct mrb_ast_var_node); enum mrb_ast_size_class size_class = size_to_class(size); - struct mrb_ast_var_node *n = (struct mrb_ast_var_node*)parser_alloc_var(p, size, size_class); + struct mrb_ast_var_node *n = (struct mrb_ast_var_node*)parser_palloc(p, size); init_var_header(&n->header, p, type, size_class); n->symbol = sym; @@ -1171,7 +1139,7 @@ new_nvar(parser_state *p, int num) size_t total_size = sizeof(struct mrb_ast_nvar_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_nvar_node *n = (struct mrb_ast_nvar_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_nvar_node *n = (struct mrb_ast_nvar_node*)parser_palloc(p, total_size); init_var_header(&n->hdr, p, NODE_NVAR, size_class); n->num = num; return cons_head((node*)NODE_VARIABLE, (node*)n); @@ -1184,7 +1152,7 @@ new_const(parser_state *p, mrb_sym sym) size_t total_size = sizeof(struct mrb_ast_const_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_const_node *n = (struct mrb_ast_const_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_const_node *n = (struct mrb_ast_const_node*)parser_palloc(p, total_size); init_var_header(&n->hdr, p, NODE_CONST, size_class); n->symbol = sym; @@ -1198,7 +1166,7 @@ new_undef(parser_state *p, node *syms) { size_t total_size = sizeof(struct mrb_ast_undef_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_undef_node *undef_node = (struct mrb_ast_undef_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_undef_node *undef_node = (struct mrb_ast_undef_node*)parser_palloc(p, total_size); init_var_header(&undef_node->hdr, p, NODE_UNDEF, size_class); undef_node->syms = syms; return cons_head((node*)NODE_VARIABLE, (node*)undef_node); @@ -1213,7 +1181,7 @@ new_class(parser_state *p, node *c, node *s, node *b) size_t total_size = sizeof(struct mrb_ast_class_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_class_node *n = (struct mrb_ast_class_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_class_node *n = (struct mrb_ast_class_node*)parser_palloc(p, total_size); init_var_header(&n->header, p, NODE_CLASS, size_class); n->name = c; @@ -1231,7 +1199,7 @@ new_sclass(parser_state *p, node *o, node *b) size_t total_size = sizeof(struct mrb_ast_sclass_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_sclass_node *n = (struct mrb_ast_sclass_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_sclass_node *n = (struct mrb_ast_sclass_node*)parser_palloc(p, total_size); init_var_header(&n->header, p, NODE_SCLASS, size_class); n->obj = o; @@ -1247,7 +1215,7 @@ new_module(parser_state *p, node *m, node *b) size_t total_size = sizeof(struct mrb_ast_module_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_module_node *n = (struct mrb_ast_module_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_module_node *n = (struct mrb_ast_module_node*)parser_palloc(p, total_size); init_var_header(&n->header, p, NODE_MODULE, size_class); n->name = m; @@ -1263,7 +1231,7 @@ new_def(parser_state *p, mrb_sym name) size_t total_size = sizeof(struct mrb_ast_def_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_def_node *n = (struct mrb_ast_def_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_def_node *n = (struct mrb_ast_def_node*)parser_palloc(p, total_size); init_var_header(&n->header, p, NODE_DEF, size_class); n->name = name; @@ -1295,7 +1263,7 @@ new_sdef(parser_state *p, node *o, mrb_sym name) size_t total_size = sizeof(struct mrb_ast_sdef_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_sdef_node *sdef_node = (struct mrb_ast_sdef_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_sdef_node *sdef_node = (struct mrb_ast_sdef_node*)parser_palloc(p, total_size); init_var_header(&sdef_node->header, p, NODE_SDEF, size_class); sdef_node->obj = o; sdef_node->name = name; @@ -1458,7 +1426,7 @@ new_block_arg(parser_state *p, node *a) { size_t total_size = sizeof(struct mrb_ast_block_arg_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_block_arg_node *block_arg_node = (struct mrb_ast_block_arg_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_block_arg_node *block_arg_node = (struct mrb_ast_block_arg_node*)parser_palloc(p, total_size); init_var_header(&block_arg_node->hdr, p, NODE_BLOCK_ARG, size_class); block_arg_node->value = a; return cons_head((node*)NODE_VARIABLE, (node*)block_arg_node); @@ -1505,7 +1473,7 @@ new_block(parser_state *p, node *a, node *b) size_t total_size = sizeof(struct mrb_ast_block_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_block_node *n = (struct mrb_ast_block_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_block_node *n = (struct mrb_ast_block_node*)parser_palloc(p, total_size); init_var_header(&n->hdr, p, NODE_BLOCK, size_class); n->locals = locals_node(p); @@ -1523,7 +1491,7 @@ new_lambda(parser_state *p, node *a, node *b) size_t total_size = sizeof(struct mrb_ast_lambda_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_lambda_node *lambda_node = (struct mrb_ast_lambda_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_lambda_node *lambda_node = (struct mrb_ast_lambda_node*)parser_palloc(p, total_size); init_var_header(&lambda_node->hdr, p, NODE_LAMBDA, size_class); lambda_node->locals = locals_node(p); lambda_node->args = (struct mrb_ast_args *)a; @@ -1540,7 +1508,7 @@ new_asgn(parser_state *p, node *a, node *b) size_t total_size = sizeof(struct mrb_ast_asgn_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_asgn_node *n = (struct mrb_ast_asgn_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_asgn_node *n = (struct mrb_ast_asgn_node*)parser_palloc(p, total_size); init_var_header(&n->header, p, NODE_ASGN, size_class); n->lhs = a; @@ -1558,7 +1526,7 @@ new_masgn(parser_state *p, node *a, node *b) size_t total_size = sizeof(struct mrb_ast_masgn_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_masgn_node *n = (struct mrb_ast_masgn_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_masgn_node *n = (struct mrb_ast_masgn_node*)parser_palloc(p, total_size); init_var_header(&n->header, p, NODE_MASGN, size_class); n->lhs = a; @@ -1574,7 +1542,7 @@ new_masgn_param(parser_state *p, node *a, node *b) size_t total_size = sizeof(struct mrb_ast_masgn_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_masgn_node *n = (struct mrb_ast_masgn_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_masgn_node *n = (struct mrb_ast_masgn_node*)parser_palloc(p, total_size); init_var_header(&n->header, p, NODE_MASGN, size_class); n->lhs = a; @@ -1591,7 +1559,7 @@ new_op_asgn(parser_state *p, node *a, mrb_sym op, node *b) size_t total_size = sizeof(struct mrb_ast_op_asgn_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_op_asgn_node *n = (struct mrb_ast_op_asgn_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_op_asgn_node *n = (struct mrb_ast_op_asgn_node*)parser_palloc(p, total_size); init_var_header(&n->header, p, NODE_OP_ASGN, size_class); n->lhs = a; n->op = op; @@ -1604,7 +1572,7 @@ new_int_n(parser_state *p, int32_t val) { size_t size = sizeof(struct mrb_ast_int_node); enum mrb_ast_size_class size_class = size_to_class(size); - struct mrb_ast_int_node *n = (struct mrb_ast_int_node*)parser_alloc_var(p, size, size_class); + struct mrb_ast_int_node *n = (struct mrb_ast_int_node*)parser_palloc(p, size); init_var_header(&n->header, p, NODE_INT, size_class); n->value = val; @@ -1714,7 +1682,7 @@ new_int(parser_state *p, const char *s, int base, int suffix) /* Big integer - create NODE_BIGINT */ size_t size = sizeof(struct mrb_ast_bigint_node); enum mrb_ast_size_class size_class = size_to_class(size); - struct mrb_ast_bigint_node *n = (struct mrb_ast_bigint_node*)parser_alloc_var(p, size, size_class); + struct mrb_ast_bigint_node *n = (struct mrb_ast_bigint_node*)parser_palloc(p, size); init_var_header(&n->header, p, NODE_BIGINT, size_class); n->string = strdup(s); @@ -1742,7 +1710,7 @@ new_float(parser_state *p, const char *s, int suffix) size_t total_size = sizeof(struct mrb_ast_float_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_float_node *n = (struct mrb_ast_float_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_float_node *n = (struct mrb_ast_float_node*)parser_palloc(p, total_size); init_var_header(&n->hdr, p, NODE_FLOAT, size_class); n->value = strdup(s); @@ -1767,7 +1735,7 @@ new_str(parser_state *p, node *a) size_t total_size = sizeof(struct mrb_ast_str_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_str_node *n = (struct mrb_ast_str_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_str_node *n = (struct mrb_ast_str_node*)parser_palloc(p, total_size); init_var_header(&n->hdr, p, NODE_STR, size_class); n->list = a; @@ -1781,7 +1749,7 @@ new_xstr(parser_state *p, node *a) { size_t total_size = sizeof(struct mrb_ast_xstr_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_xstr_node *n = (struct mrb_ast_xstr_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_xstr_node *n = (struct mrb_ast_xstr_node*)parser_palloc(p, total_size); init_var_header(&n->hdr, p, NODE_XSTR, size_class); n->list = a; return cons_head((node*)NODE_VARIABLE, (node*)n); @@ -1793,7 +1761,7 @@ new_dsym(parser_state *p, node *a) { size_t total_size = sizeof(struct mrb_ast_dsym_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_dsym_node *n = (struct mrb_ast_dsym_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_dsym_node *n = (struct mrb_ast_dsym_node*)parser_palloc(p, total_size); init_var_header(&n->hdr, p, NODE_DSYM, size_class); n->list = a; return cons_head((node*)NODE_VARIABLE, (node*)n); @@ -1805,7 +1773,7 @@ new_dregx(parser_state *p, node *list, const char *flags, const char *encoding) { size_t total_size = sizeof(struct mrb_ast_dregx_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_dregx_node *n = (struct mrb_ast_dregx_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_dregx_node *n = (struct mrb_ast_dregx_node*)parser_palloc(p, total_size); init_var_header(&n->hdr, p, NODE_DREGX, size_class); n->list = list; n->flags = flags; @@ -1819,7 +1787,7 @@ new_back_ref(parser_state *p, int n) { size_t total_size = sizeof(struct mrb_ast_back_ref_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_back_ref_node *backref_node = (struct mrb_ast_back_ref_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_back_ref_node *backref_node = (struct mrb_ast_back_ref_node*)parser_palloc(p, total_size); init_var_header(&backref_node->hdr, p, NODE_BACK_REF, size_class); backref_node->type = n; return cons_head((node*)NODE_VARIABLE, (node*)backref_node); @@ -1831,7 +1799,7 @@ new_nth_ref(parser_state *p, int n) { size_t total_size = sizeof(struct mrb_ast_nth_ref_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_nth_ref_node *nthref_node = (struct mrb_ast_nth_ref_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_nth_ref_node *nthref_node = (struct mrb_ast_nth_ref_node*)parser_palloc(p, total_size); init_var_header(&nthref_node->hdr, p, NODE_NTH_REF, size_class); nthref_node->nth = n; return cons_head((node*)NODE_VARIABLE, (node*)nthref_node); @@ -1843,7 +1811,7 @@ new_heredoc(parser_state *p, struct mrb_parser_heredoc_info **infop) { size_t total_size = sizeof(struct mrb_ast_heredoc_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_heredoc_node *n = (struct mrb_ast_heredoc_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_heredoc_node *n = (struct mrb_ast_heredoc_node*)parser_palloc(p, total_size); init_var_header(&n->hdr, p, NODE_HEREDOC, size_class); /* Initialize embedded heredoc info struct */ @@ -1901,7 +1869,7 @@ new_words(parser_state *p, node *a) { size_t total_size = sizeof(struct mrb_ast_words_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_words_node *words_node = (struct mrb_ast_words_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_words_node *words_node = (struct mrb_ast_words_node*)parser_palloc(p, total_size); init_var_header(&words_node->hdr, p, NODE_WORDS, size_class); words_node->args = a; return cons_head((node*)NODE_VARIABLE, (node*)words_node); @@ -1913,7 +1881,7 @@ new_symbols(parser_state *p, node *a) { size_t total_size = sizeof(struct mrb_ast_symbols_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_symbols_node *symbols_node = (struct mrb_ast_symbols_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_symbols_node *symbols_node = (struct mrb_ast_symbols_node*)parser_palloc(p, total_size); init_var_header(&symbols_node->hdr, p, NODE_SYMBOLS, size_class); symbols_node->args = a; return cons_head((node*)NODE_VARIABLE, (node*)symbols_node); @@ -2051,7 +2019,7 @@ new_negate(parser_state *p, node *n) { size_t total_size = sizeof(struct mrb_ast_negate_node); enum mrb_ast_size_class size_class = size_to_class(total_size); - struct mrb_ast_negate_node *negate_node = (struct mrb_ast_negate_node*)parser_alloc_var(p, total_size, size_class); + struct mrb_ast_negate_node *negate_node = (struct mrb_ast_negate_node*)parser_palloc(p, total_size); init_var_header(&negate_node->hdr, p, NODE_NEGATE, size_class); negate_node->operand = n; return cons_head((node*)NODE_VARIABLE, (node*)negate_node); @@ -2243,7 +2211,7 @@ prohibit_literals(parser_state *p, node *n) /* xxx ----------------------------- */ -#line 2247 "mrbgems/mruby-compiler/core/y.tab.c" +#line 2215 "mrbgems/mruby-compiler/core/y.tab.c" # ifndef YY_CAST # ifdef __cplusplus @@ -2414,7 +2382,7 @@ extern int yydebug; #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED union YYSTYPE { -#line 2190 "mrbgems/mruby-compiler/core/parse.y" +#line 2158 "mrbgems/mruby-compiler/core/parse.y" node *nd; mrb_sym id; @@ -2422,7 +2390,7 @@ union YYSTYPE stack_type stack; const struct vtable *vars; -#line 2426 "mrbgems/mruby-compiler/core/y.tab.c" +#line 2394 "mrbgems/mruby-compiler/core/y.tab.c" }; typedef union YYSTYPE YYSTYPE; @@ -3181,69 +3149,69 @@ static const yytype_uint8 yytranslate[] = /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_int16 yyrline[] = { - 0, 2361, 2361, 2361, 2371, 2377, 2381, 2385, 2389, 2395, - 2397, 2396, 2410, 2436, 2442, 2446, 2450, 2456, 2462, 2462, - 2466, 2470, 2474, 2478, 2487, 2496, 2500, 2505, 2506, 2510, - 2514, 2518, 2522, 2528, 2531, 2535, 2539, 2543, 2547, 2551, - 2556, 2560, 2569, 2578, 2587, 2596, 2603, 2604, 2608, 2611, - 2612, 2616, 2620, 2624, 2628, 2631, 2641, 2640, 2655, 2664, - 2665, 2668, 2669, 2676, 2675, 2690, 2694, 2699, 2703, 2708, - 2712, 2717, 2721, 2725, 2729, 2733, 2739, 2743, 2749, 2750, - 2756, 2760, 2764, 2768, 2772, 2776, 2780, 2784, 2788, 2792, - 2798, 2799, 2805, 2809, 2815, 2819, 2825, 2829, 2833, 2837, - 2841, 2845, 2851, 2857, 2864, 2868, 2872, 2876, 2880, 2884, - 2890, 2896, 2901, 2907, 2911, 2914, 2918, 2922, 2929, 2930, - 2931, 2932, 2937, 2944, 2945, 2948, 2952, 2952, 2958, 2959, - 2960, 2961, 2962, 2963, 2964, 2965, 2966, 2967, 2968, 2969, - 2970, 2971, 2972, 2973, 2974, 2975, 2976, 2977, 2978, 2979, - 2980, 2981, 2982, 2983, 2984, 2985, 2986, 2987, 2990, 2990, - 2990, 2991, 2991, 2992, 2992, 2992, 2993, 2993, 2993, 2993, - 2994, 2994, 2994, 2995, 2995, 2995, 2996, 2996, 2996, 2996, - 2997, 2997, 2997, 2997, 2998, 2998, 2998, 2998, 2999, 2999, - 2999, 2999, 3000, 3000, 3000, 3000, 3001, 3001, 3004, 3008, - 3012, 3016, 3020, 3024, 3028, 3033, 3038, 3043, 3047, 3051, - 3055, 3059, 3063, 3067, 3071, 3075, 3079, 3083, 3087, 3091, - 3095, 3099, 3103, 3107, 3111, 3115, 3119, 3123, 3127, 3131, - 3135, 3139, 3143, 3147, 3151, 3155, 3159, 3163, 3167, 3171, - 3175, 3179, 3183, 3187, 3191, 3200, 3209, 3218, 3227, 3233, - 3234, 3238, 3242, 3248, 3252, 3259, 3263, 3272, 3289, 3290, - 3293, 3294, 3295, 3299, 3303, 3309, 3314, 3318, 3322, 3326, - 3332, 3332, 3343, 3347, 3353, 3357, 3363, 3366, 3371, 3375, - 3379, 3384, 3388, 3394, 3399, 3403, 3409, 3410, 3414, 3418, - 3419, 3420, 3421, 3422, 3427, 3426, 3438, 3442, 3437, 3447, - 3447, 3451, 3455, 3459, 3463, 3467, 3471, 3475, 3479, 3483, - 3487, 3491, 3492, 3498, 3505, 3497, 3518, 3526, 3534, 3534, - 3534, 3541, 3541, 3541, 3548, 3554, 3559, 3561, 3558, 3570, - 3568, 3586, 3591, 3584, 3608, 3606, 3622, 3632, 3643, 3647, - 3651, 3655, 3661, 3668, 3669, 3670, 3673, 3674, 3677, 3678, - 3686, 3687, 3693, 3697, 3700, 3704, 3708, 3712, 3717, 3721, - 3725, 3729, 3735, 3734, 3744, 3748, 3752, 3756, 3762, 3767, - 3772, 3776, 3780, 3784, 3788, 3792, 3796, 3800, 3804, 3808, - 3812, 3816, 3820, 3824, 3828, 3834, 3839, 3846, 3846, 3850, - 3855, 3861, 3865, 3871, 3872, 3875, 3880, 3883, 3887, 3893, - 3897, 3904, 3903, 3920, 3925, 3929, 3934, 3941, 3945, 3949, - 3953, 3957, 3961, 3965, 3969, 3973, 3980, 3979, 3994, 3993, - 4009, 4017, 4026, 4029, 4036, 4039, 4043, 4044, 4047, 4051, - 4054, 4058, 4061, 4062, 4063, 4064, 4067, 4068, 4074, 4079, - 4084, 4089, 4095, 4096, 4102, 4108, 4107, 4119, 4123, 4129, - 4133, 4139, 4148, 4159, 4162, 4163, 4166, 4172, 4178, 4179, - 4182, 4189, 4188, 4203, 4207, 4215, 4219, 4231, 4238, 4245, - 4246, 4247, 4248, 4249, 4253, 4259, 4263, 4271, 4272, 4273, - 4277, 4283, 4287, 4291, 4295, 4299, 4305, 4309, 4315, 4319, - 4323, 4327, 4331, 4335, 4339, 4347, 4354, 4360, 4361, 4365, - 4369, 4368, 4385, 4386, 4389, 4395, 4399, 4405, 4406, 4410, - 4414, 4420, 4424, 4430, 4436, 4443, 4449, 4456, 4460, 4466, - 4470, 4476, 4477, 4480, 4484, 4490, 4494, 4498, 4502, 4508, - 4513, 4518, 4522, 4526, 4530, 4534, 4538, 4542, 4546, 4550, - 4554, 4558, 4562, 4566, 4570, 4575, 4581, 4586, 4591, 4596, - 4601, 4608, 4612, 4619, 4624, 4623, 4635, 4639, 4645, 4653, - 4661, 4669, 4673, 4679, 4683, 4689, 4690, 4693, 4698, 4705, - 4706, 4709, 4713, 4719, 4723, 4729, 4735, 4735, 4742, 4743, - 4749, 4753, 4759, 4765, 4770, 4774, 4779, 4784, 4800, 4805, - 4811, 4812, 4813, 4816, 4817, 4818, 4819, 4822, 4823, 4824, - 4827, 4828, 4831, 4835, 4841, 4842, 4848, 4849, 4852, 4853, - 4856, 4859, 4860, 4861, 4864, 4865, 4868, 4873, 4876, 4877, - 4881 + 0, 2329, 2329, 2329, 2339, 2345, 2349, 2353, 2357, 2363, + 2365, 2364, 2378, 2404, 2410, 2414, 2418, 2424, 2430, 2430, + 2434, 2438, 2442, 2446, 2455, 2464, 2468, 2473, 2474, 2478, + 2482, 2486, 2490, 2496, 2499, 2503, 2507, 2511, 2515, 2519, + 2524, 2528, 2537, 2546, 2555, 2564, 2571, 2572, 2576, 2579, + 2580, 2584, 2588, 2592, 2596, 2599, 2609, 2608, 2623, 2632, + 2633, 2636, 2637, 2644, 2643, 2658, 2662, 2667, 2671, 2676, + 2680, 2685, 2689, 2693, 2697, 2701, 2707, 2711, 2717, 2718, + 2724, 2728, 2732, 2736, 2740, 2744, 2748, 2752, 2756, 2760, + 2766, 2767, 2773, 2777, 2783, 2787, 2793, 2797, 2801, 2805, + 2809, 2813, 2819, 2825, 2832, 2836, 2840, 2844, 2848, 2852, + 2858, 2864, 2869, 2875, 2879, 2882, 2886, 2890, 2897, 2898, + 2899, 2900, 2905, 2912, 2913, 2916, 2920, 2920, 2926, 2927, + 2928, 2929, 2930, 2931, 2932, 2933, 2934, 2935, 2936, 2937, + 2938, 2939, 2940, 2941, 2942, 2943, 2944, 2945, 2946, 2947, + 2948, 2949, 2950, 2951, 2952, 2953, 2954, 2955, 2958, 2958, + 2958, 2959, 2959, 2960, 2960, 2960, 2961, 2961, 2961, 2961, + 2962, 2962, 2962, 2963, 2963, 2963, 2964, 2964, 2964, 2964, + 2965, 2965, 2965, 2965, 2966, 2966, 2966, 2966, 2967, 2967, + 2967, 2967, 2968, 2968, 2968, 2968, 2969, 2969, 2972, 2976, + 2980, 2984, 2988, 2992, 2996, 3001, 3006, 3011, 3015, 3019, + 3023, 3027, 3031, 3035, 3039, 3043, 3047, 3051, 3055, 3059, + 3063, 3067, 3071, 3075, 3079, 3083, 3087, 3091, 3095, 3099, + 3103, 3107, 3111, 3115, 3119, 3123, 3127, 3131, 3135, 3139, + 3143, 3147, 3151, 3155, 3159, 3168, 3177, 3186, 3195, 3201, + 3202, 3206, 3210, 3216, 3220, 3227, 3231, 3240, 3257, 3258, + 3261, 3262, 3263, 3267, 3271, 3277, 3282, 3286, 3290, 3294, + 3300, 3300, 3311, 3315, 3321, 3325, 3331, 3334, 3339, 3343, + 3347, 3352, 3356, 3362, 3367, 3371, 3377, 3378, 3382, 3386, + 3387, 3388, 3389, 3390, 3395, 3394, 3406, 3410, 3405, 3415, + 3415, 3419, 3423, 3427, 3431, 3435, 3439, 3443, 3447, 3451, + 3455, 3459, 3460, 3466, 3473, 3465, 3486, 3494, 3502, 3502, + 3502, 3509, 3509, 3509, 3516, 3522, 3527, 3529, 3526, 3538, + 3536, 3554, 3559, 3552, 3576, 3574, 3590, 3600, 3611, 3615, + 3619, 3623, 3629, 3636, 3637, 3638, 3641, 3642, 3645, 3646, + 3654, 3655, 3661, 3665, 3668, 3672, 3676, 3680, 3685, 3689, + 3693, 3697, 3703, 3702, 3712, 3716, 3720, 3724, 3730, 3735, + 3740, 3744, 3748, 3752, 3756, 3760, 3764, 3768, 3772, 3776, + 3780, 3784, 3788, 3792, 3796, 3802, 3807, 3814, 3814, 3818, + 3823, 3829, 3833, 3839, 3840, 3843, 3848, 3851, 3855, 3861, + 3865, 3872, 3871, 3888, 3893, 3897, 3902, 3909, 3913, 3917, + 3921, 3925, 3929, 3933, 3937, 3941, 3948, 3947, 3962, 3961, + 3977, 3985, 3994, 3997, 4004, 4007, 4011, 4012, 4015, 4019, + 4022, 4026, 4029, 4030, 4031, 4032, 4035, 4036, 4042, 4047, + 4052, 4057, 4063, 4064, 4070, 4076, 4075, 4087, 4091, 4097, + 4101, 4107, 4116, 4127, 4130, 4131, 4134, 4140, 4146, 4147, + 4150, 4157, 4156, 4171, 4175, 4183, 4187, 4199, 4206, 4213, + 4214, 4215, 4216, 4217, 4221, 4227, 4231, 4239, 4240, 4241, + 4245, 4251, 4255, 4259, 4263, 4267, 4273, 4277, 4283, 4287, + 4291, 4295, 4299, 4303, 4307, 4315, 4322, 4328, 4329, 4333, + 4337, 4336, 4353, 4354, 4357, 4363, 4367, 4373, 4374, 4378, + 4382, 4388, 4392, 4398, 4404, 4411, 4417, 4424, 4428, 4434, + 4438, 4444, 4445, 4448, 4452, 4458, 4462, 4466, 4470, 4476, + 4481, 4486, 4490, 4494, 4498, 4502, 4506, 4510, 4514, 4518, + 4522, 4526, 4530, 4534, 4538, 4543, 4549, 4554, 4559, 4564, + 4569, 4576, 4580, 4587, 4592, 4591, 4603, 4607, 4613, 4621, + 4629, 4637, 4641, 4647, 4651, 4657, 4658, 4661, 4666, 4673, + 4674, 4677, 4681, 4687, 4691, 4697, 4703, 4703, 4710, 4711, + 4717, 4721, 4727, 4733, 4738, 4742, 4747, 4752, 4768, 4773, + 4779, 4780, 4781, 4784, 4785, 4786, 4787, 4790, 4791, 4792, + 4795, 4796, 4799, 4803, 4809, 4810, 4816, 4817, 4820, 4821, + 4824, 4827, 4828, 4829, 4832, 4833, 4836, 4841, 4844, 4845, + 4849 }; #endif @@ -7220,7 +7188,7 @@ YYLTYPE yylloc = yyloc_default; -#line 7224 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7192 "mrbgems/mruby-compiler/core/y.tab.c" yylsp[0] = yylloc; goto yysetstate; @@ -7433,84 +7401,84 @@ yyreduce: switch (yyn) { case 2: /* $@1: %empty */ -#line 2361 "mrbgems/mruby-compiler/core/parse.y" +#line 2329 "mrbgems/mruby-compiler/core/parse.y" { p->lstate = EXPR_BEG; if (!p->locals) p->locals = cons(0,0); } -#line 7442 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7410 "mrbgems/mruby-compiler/core/y.tab.c" break; case 3: /* program: $@1 top_compstmt */ -#line 2366 "mrbgems/mruby-compiler/core/parse.y" +#line 2334 "mrbgems/mruby-compiler/core/parse.y" { p->tree = new_scope(p, (yyvsp[0].nd)); } +#line 7418 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 4: /* top_compstmt: top_stmts opt_terms */ +#line 2340 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = (yyvsp[-1].nd); + } +#line 7426 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 5: /* top_stmts: none */ +#line 2346 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_stmts(p, 0); + } +#line 7434 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 6: /* top_stmts: top_stmt */ +#line 2350 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_stmts(p, (yyvsp[0].nd)); + } +#line 7442 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 7: /* top_stmts: top_stmts terms top_stmt */ +#line 2354 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = push((yyvsp[-2].nd), newline_node((yyvsp[0].nd))); + } #line 7450 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 4: /* top_compstmt: top_stmts opt_terms */ -#line 2372 "mrbgems/mruby-compiler/core/parse.y" + case 8: /* top_stmts: error top_stmt */ +#line 2358 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = (yyvsp[-1].nd); + (yyval.nd) = new_stmts(p, 0); } #line 7458 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 5: /* top_stmts: none */ -#line 2378 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_stmts(p, 0); - } -#line 7466 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 6: /* top_stmts: top_stmt */ -#line 2382 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_stmts(p, (yyvsp[0].nd)); - } -#line 7474 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 7: /* top_stmts: top_stmts terms top_stmt */ -#line 2386 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = push((yyvsp[-2].nd), newline_node((yyvsp[0].nd))); - } -#line 7482 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 8: /* top_stmts: error top_stmt */ -#line 2390 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_stmts(p, 0); - } -#line 7490 "mrbgems/mruby-compiler/core/y.tab.c" - break; - case 10: /* @2: %empty */ -#line 2397 "mrbgems/mruby-compiler/core/parse.y" +#line 2365 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = local_switch(p); nvars_block(p); } -#line 7499 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7467 "mrbgems/mruby-compiler/core/y.tab.c" break; case 11: /* top_stmt: "'BEGIN'" @2 '{' top_compstmt '}' */ -#line 2402 "mrbgems/mruby-compiler/core/parse.y" +#line 2370 "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 7510 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7478 "mrbgems/mruby-compiler/core/y.tab.c" break; case 12: /* bodystmt: compstmt opt_rescue opt_else opt_ensure */ -#line 2414 "mrbgems/mruby-compiler/core/parse.y" +#line 2382 "mrbgems/mruby-compiler/core/parse.y" { if ((yyvsp[-2].nd)) { (yyval.nd) = new_rescue(p, (yyvsp[-3].nd), (yyvsp[-2].nd), (yyvsp[-1].nd)); @@ -7531,91 +7499,91 @@ yyreduce: } } } -#line 7535 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7503 "mrbgems/mruby-compiler/core/y.tab.c" break; case 13: /* compstmt: stmts opt_terms */ -#line 2437 "mrbgems/mruby-compiler/core/parse.y" +#line 2405 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-1].nd); } -#line 7543 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7511 "mrbgems/mruby-compiler/core/y.tab.c" break; case 14: /* stmts: none */ -#line 2443 "mrbgems/mruby-compiler/core/parse.y" +#line 2411 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_stmts(p, 0); } -#line 7551 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7519 "mrbgems/mruby-compiler/core/y.tab.c" break; case 15: /* stmts: stmt */ -#line 2447 "mrbgems/mruby-compiler/core/parse.y" +#line 2415 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_stmts(p, (yyvsp[0].nd)); } -#line 7559 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7527 "mrbgems/mruby-compiler/core/y.tab.c" break; case 16: /* stmts: stmts terms stmt */ -#line 2451 "mrbgems/mruby-compiler/core/parse.y" +#line 2419 "mrbgems/mruby-compiler/core/parse.y" { /* Update the cons-list inside the existing variable-sized node */ STMTS_NODE_STMTS((yyvsp[-2].nd)->cdr) = push(STMTS_NODE_STMTS((yyvsp[-2].nd)->cdr), newline_node((yyvsp[0].nd))); (yyval.nd) = (yyvsp[-2].nd); } -#line 7569 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7537 "mrbgems/mruby-compiler/core/y.tab.c" break; case 17: /* stmts: error stmt */ -#line 2457 "mrbgems/mruby-compiler/core/parse.y" +#line 2425 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_stmts(p, (yyvsp[0].nd)); } -#line 7577 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7545 "mrbgems/mruby-compiler/core/y.tab.c" break; case 18: /* $@3: %empty */ -#line 2462 "mrbgems/mruby-compiler/core/parse.y" +#line 2430 "mrbgems/mruby-compiler/core/parse.y" {p->lstate = EXPR_FNAME;} -#line 7583 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7551 "mrbgems/mruby-compiler/core/y.tab.c" break; case 19: /* stmt: "'alias'" fsym $@3 fsym */ -#line 2463 "mrbgems/mruby-compiler/core/parse.y" +#line 2431 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_alias(p, (yyvsp[-2].id), (yyvsp[0].id)); } -#line 7591 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7559 "mrbgems/mruby-compiler/core/y.tab.c" break; case 20: /* stmt: "'undef'" undef_list */ -#line 2467 "mrbgems/mruby-compiler/core/parse.y" +#line 2435 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_undef(p, (yyvsp[0].nd)); } -#line 7599 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7567 "mrbgems/mruby-compiler/core/y.tab.c" break; case 21: /* stmt: stmt "'if' modifier" expr_value */ -#line 2471 "mrbgems/mruby-compiler/core/parse.y" +#line 2439 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_if(p, cond((yyvsp[0].nd)), (yyvsp[-2].nd), 0); } -#line 7607 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7575 "mrbgems/mruby-compiler/core/y.tab.c" break; case 22: /* stmt: stmt "'unless' modifier" expr_value */ -#line 2475 "mrbgems/mruby-compiler/core/parse.y" +#line 2443 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_if(p, cond((yyvsp[0].nd)), 0, (yyvsp[-2].nd)); } -#line 7615 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7583 "mrbgems/mruby-compiler/core/y.tab.c" break; case 23: /* stmt: stmt "'while' modifier" expr_value */ -#line 2479 "mrbgems/mruby-compiler/core/parse.y" +#line 2447 "mrbgems/mruby-compiler/core/parse.y" { if ((yyvsp[-2].nd) && node_type_p((yyvsp[-2].nd), NODE_BEGIN)) { (yyval.nd) = new_while_mod(p, cond((yyvsp[0].nd)), (yyvsp[-2].nd)); @@ -7624,11 +7592,11 @@ yyreduce: (yyval.nd) = new_while(p, cond((yyvsp[0].nd)), (yyvsp[-2].nd)); } } -#line 7628 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7596 "mrbgems/mruby-compiler/core/y.tab.c" break; case 24: /* stmt: stmt "'until' modifier" expr_value */ -#line 2488 "mrbgems/mruby-compiler/core/parse.y" +#line 2456 "mrbgems/mruby-compiler/core/parse.y" { if ((yyvsp[-2].nd) && node_type_p((yyvsp[-2].nd), NODE_BEGIN)) { (yyval.nd) = new_until_mod(p, cond((yyvsp[0].nd)), (yyvsp[-2].nd)); @@ -7637,127 +7605,127 @@ yyreduce: (yyval.nd) = new_until(p, cond((yyvsp[0].nd)), (yyvsp[-2].nd)); } } -#line 7641 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7609 "mrbgems/mruby-compiler/core/y.tab.c" break; case 25: /* stmt: stmt "'rescue' modifier" stmt */ -#line 2497 "mrbgems/mruby-compiler/core/parse.y" +#line 2465 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_mod_rescue(p, (yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 7649 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7617 "mrbgems/mruby-compiler/core/y.tab.c" break; case 26: /* stmt: "'END'" '{' compstmt '}' */ -#line 2501 "mrbgems/mruby-compiler/core/parse.y" +#line 2469 "mrbgems/mruby-compiler/core/parse.y" { yyerror(&(yylsp[-3]), p, "END not supported"); (yyval.nd) = new_postexe(p, (yyvsp[-1].nd)); } -#line 7658 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7626 "mrbgems/mruby-compiler/core/y.tab.c" break; case 28: /* stmt: mlhs '=' command_call */ -#line 2507 "mrbgems/mruby-compiler/core/parse.y" +#line 2475 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_masgn(p, (yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 7666 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7634 "mrbgems/mruby-compiler/core/y.tab.c" break; case 29: /* stmt: lhs '=' mrhs */ -#line 2511 "mrbgems/mruby-compiler/core/parse.y" +#line 2479 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_asgn(p, (yyvsp[-2].nd), new_array(p, (yyvsp[0].nd))); } -#line 7674 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7642 "mrbgems/mruby-compiler/core/y.tab.c" break; case 30: /* stmt: mlhs '=' arg */ -#line 2515 "mrbgems/mruby-compiler/core/parse.y" +#line 2483 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_masgn(p, (yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 7682 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7650 "mrbgems/mruby-compiler/core/y.tab.c" break; case 31: /* stmt: mlhs '=' mrhs */ -#line 2519 "mrbgems/mruby-compiler/core/parse.y" +#line 2487 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_masgn(p, (yyvsp[-2].nd), new_array(p, (yyvsp[0].nd))); } -#line 7690 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7658 "mrbgems/mruby-compiler/core/y.tab.c" break; case 32: /* stmt: arg "=>" "local variable or method" */ -#line 2523 "mrbgems/mruby-compiler/core/parse.y" +#line 2491 "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 7700 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7668 "mrbgems/mruby-compiler/core/y.tab.c" break; case 34: /* command_asgn: lhs '=' command_rhs */ -#line 2532 "mrbgems/mruby-compiler/core/parse.y" +#line 2500 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_asgn(p, (yyvsp[-2].nd), (yyvsp[0].nd)); } +#line 7676 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 35: /* command_asgn: var_lhs tOP_ASGN command_rhs */ +#line 2504 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_op_asgn(p, (yyvsp[-2].nd), (yyvsp[-1].id), (yyvsp[0].nd)); + } +#line 7684 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 36: /* command_asgn: primary_value '[' opt_call_args ']' tOP_ASGN command_rhs */ +#line 2508 "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 7692 "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 2512 "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 7700 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 38: /* command_asgn: primary_value call_op "constant" tOP_ASGN command_rhs */ +#line 2516 "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 7708 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 35: /* command_asgn: var_lhs tOP_ASGN command_rhs */ -#line 2536 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_op_asgn(p, (yyvsp[-2].nd), (yyvsp[-1].id), (yyvsp[0].nd)); - } -#line 7716 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 36: /* command_asgn: primary_value '[' opt_call_args ']' tOP_ASGN command_rhs */ -#line 2540 "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 7724 "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 2544 "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 7732 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 38: /* command_asgn: primary_value call_op "constant" tOP_ASGN command_rhs */ -#line 2548 "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 7740 "mrbgems/mruby-compiler/core/y.tab.c" - break; - case 39: /* command_asgn: primary_value "::" "constant" tOP_ASGN command_call */ -#line 2552 "mrbgems/mruby-compiler/core/parse.y" +#line 2520 "mrbgems/mruby-compiler/core/parse.y" { yyerror(&(yylsp[-4]), p, "constant re-assignment"); (yyval.nd) = 0; } -#line 7749 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7717 "mrbgems/mruby-compiler/core/y.tab.c" break; case 40: /* command_asgn: primary_value "::" "local variable or method" tOP_ASGN command_rhs */ -#line 2557 "mrbgems/mruby-compiler/core/parse.y" +#line 2525 "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 7757 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7725 "mrbgems/mruby-compiler/core/y.tab.c" break; case 41: /* command_asgn: defn_head f_opt_arglist_paren '=' command */ -#line 2561 "mrbgems/mruby-compiler/core/parse.y" +#line 2529 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-3].nd); endless_method_name(p, (yyvsp[-3].nd)); @@ -7766,11 +7734,11 @@ yyreduce: nvars_unnest(p); p->in_def--; } -#line 7770 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7738 "mrbgems/mruby-compiler/core/y.tab.c" break; case 42: /* command_asgn: defn_head f_opt_arglist_paren '=' command "'rescue' modifier" arg */ -#line 2570 "mrbgems/mruby-compiler/core/parse.y" +#line 2538 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-5].nd); endless_method_name(p, (yyvsp[-5].nd)); @@ -7779,11 +7747,11 @@ yyreduce: nvars_unnest(p); p->in_def--; } -#line 7783 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7751 "mrbgems/mruby-compiler/core/y.tab.c" break; case 43: /* command_asgn: defs_head f_opt_arglist_paren '=' command */ -#line 2579 "mrbgems/mruby-compiler/core/parse.y" +#line 2547 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-3].nd); void_expr_error(p, (yyvsp[0].nd)); @@ -7792,11 +7760,11 @@ yyreduce: p->in_def--; p->in_single--; } -#line 7796 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7764 "mrbgems/mruby-compiler/core/y.tab.c" break; case 44: /* command_asgn: defs_head f_opt_arglist_paren '=' command "'rescue' modifier" arg */ -#line 2588 "mrbgems/mruby-compiler/core/parse.y" +#line 2556 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-5].nd); void_expr_error(p, (yyvsp[-2].nd)); @@ -7805,79 +7773,79 @@ yyreduce: p->in_def--; p->in_single--; } -#line 7809 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7777 "mrbgems/mruby-compiler/core/y.tab.c" break; case 45: /* command_asgn: backref tOP_ASGN command_rhs */ -#line 2597 "mrbgems/mruby-compiler/core/parse.y" +#line 2565 "mrbgems/mruby-compiler/core/parse.y" { backref_error(p, (yyvsp[-2].nd)); (yyval.nd) = new_stmts(p, 0); } -#line 7818 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7786 "mrbgems/mruby-compiler/core/y.tab.c" break; case 47: /* command_rhs: command_call "'rescue' modifier" stmt */ -#line 2605 "mrbgems/mruby-compiler/core/parse.y" +#line 2573 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_mod_rescue(p, (yyvsp[-2].nd), (yyvsp[0].nd)); } +#line 7794 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 50: /* expr: expr "'and'" expr */ +#line 2581 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_and(p, (yyvsp[-2].nd), (yyvsp[0].nd)); + } +#line 7802 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 51: /* expr: expr "'or'" expr */ +#line 2585 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_or(p, (yyvsp[-2].nd), (yyvsp[0].nd)); + } +#line 7810 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 52: /* expr: "'not'" opt_nl expr */ +#line 2589 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = call_uni_op(p, cond((yyvsp[0].nd)), "!"); + } +#line 7818 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 53: /* expr: '!' command_call */ +#line 2593 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = call_uni_op(p, cond((yyvsp[0].nd)), "!"); + } #line 7826 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 50: /* expr: expr "'and'" expr */ -#line 2613 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_and(p, (yyvsp[-2].nd), (yyvsp[0].nd)); - } -#line 7834 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 51: /* expr: expr "'or'" expr */ -#line 2617 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_or(p, (yyvsp[-2].nd), (yyvsp[0].nd)); - } -#line 7842 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 52: /* expr: "'not'" opt_nl expr */ -#line 2621 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = call_uni_op(p, cond((yyvsp[0].nd)), "!"); - } -#line 7850 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 53: /* expr: '!' command_call */ -#line 2625 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = call_uni_op(p, cond((yyvsp[0].nd)), "!"); - } -#line 7858 "mrbgems/mruby-compiler/core/y.tab.c" - break; - case 55: /* defn_head: "'def'" fname */ -#line 2632 "mrbgems/mruby-compiler/core/parse.y" +#line 2600 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_def(p, (yyvsp[0].id)); p->cmdarg_stack = 0; p->in_def++; nvars_block(p); } -#line 7869 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7837 "mrbgems/mruby-compiler/core/y.tab.c" break; case 56: /* $@4: %empty */ -#line 2641 "mrbgems/mruby-compiler/core/parse.y" +#line 2609 "mrbgems/mruby-compiler/core/parse.y" { p->lstate = EXPR_FNAME; } -#line 7877 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7845 "mrbgems/mruby-compiler/core/y.tab.c" break; case 57: /* defs_head: "'def'" singleton dot_or_colon $@4 fname */ -#line 2645 "mrbgems/mruby-compiler/core/parse.y" +#line 2613 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_sdef(p, (yyvsp[-3].nd), (yyvsp[0].id)); p->cmdarg_stack = 0; @@ -7886,1054 +7854,1054 @@ yyreduce: nvars_block(p); p->lstate = EXPR_ENDFN; /* force for args */ } -#line 7890 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7858 "mrbgems/mruby-compiler/core/y.tab.c" break; case 58: /* expr_value: expr */ -#line 2656 "mrbgems/mruby-compiler/core/parse.y" +#line 2624 "mrbgems/mruby-compiler/core/parse.y" { if (!(yyvsp[0].nd)) (yyval.nd) = new_nil(p); else { (yyval.nd) = (yyvsp[0].nd); } } -#line 7901 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7869 "mrbgems/mruby-compiler/core/y.tab.c" break; case 62: /* block_command: block_call call_op2 operation2 command_args */ -#line 2670 "mrbgems/mruby-compiler/core/parse.y" +#line 2638 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_call(p, (yyvsp[-3].nd), (yyvsp[-1].id), (yyvsp[0].nd), (yyvsp[-2].num)); } -#line 7909 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7877 "mrbgems/mruby-compiler/core/y.tab.c" break; case 63: /* $@5: %empty */ -#line 2676 "mrbgems/mruby-compiler/core/parse.y" +#line 2644 "mrbgems/mruby-compiler/core/parse.y" { local_nest(p); nvars_nest(p); } -#line 7918 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7886 "mrbgems/mruby-compiler/core/y.tab.c" break; case 64: /* cmd_brace_block: "{" $@5 opt_block_param compstmt '}' */ -#line 2683 "mrbgems/mruby-compiler/core/parse.y" +#line 2651 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_block(p, (yyvsp[-2].nd), (yyvsp[-1].nd)); local_unnest(p); nvars_unnest(p); } -#line 7928 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7896 "mrbgems/mruby-compiler/core/y.tab.c" break; case 65: /* command: operation command_args */ -#line 2691 "mrbgems/mruby-compiler/core/parse.y" +#line 2659 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_fcall(p, (yyvsp[-1].id), (yyvsp[0].nd)); } -#line 7936 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7904 "mrbgems/mruby-compiler/core/y.tab.c" break; case 66: /* command: operation command_args cmd_brace_block */ -#line 2695 "mrbgems/mruby-compiler/core/parse.y" +#line 2663 "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 7945 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7913 "mrbgems/mruby-compiler/core/y.tab.c" break; case 67: /* command: primary_value call_op operation2 command_args */ -#line 2700 "mrbgems/mruby-compiler/core/parse.y" +#line 2668 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_call(p, (yyvsp[-3].nd), (yyvsp[-1].id), (yyvsp[0].nd), (yyvsp[-2].num)); } -#line 7953 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7921 "mrbgems/mruby-compiler/core/y.tab.c" break; case 68: /* command: primary_value call_op operation2 command_args cmd_brace_block */ -#line 2704 "mrbgems/mruby-compiler/core/parse.y" +#line 2672 "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 7962 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7930 "mrbgems/mruby-compiler/core/y.tab.c" break; case 69: /* command: primary_value "::" operation2 command_args */ -#line 2709 "mrbgems/mruby-compiler/core/parse.y" +#line 2677 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_call(p, (yyvsp[-3].nd), (yyvsp[-1].id), (yyvsp[0].nd), tCOLON2); } -#line 7970 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7938 "mrbgems/mruby-compiler/core/y.tab.c" break; case 70: /* command: primary_value "::" operation2 command_args cmd_brace_block */ -#line 2713 "mrbgems/mruby-compiler/core/parse.y" +#line 2681 "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 7979 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7947 "mrbgems/mruby-compiler/core/y.tab.c" break; case 71: /* command: "'super'" command_args */ -#line 2718 "mrbgems/mruby-compiler/core/parse.y" +#line 2686 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_super(p, (yyvsp[0].nd)); } +#line 7955 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 72: /* command: "'yield'" command_args */ +#line 2690 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_yield(p, (yyvsp[0].nd)); + } +#line 7963 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 73: /* command: "'return'" call_args */ +#line 2694 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_return(p, ret_args(p, (yyvsp[0].nd))); + } +#line 7971 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 74: /* command: "'break'" call_args */ +#line 2698 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_break(p, ret_args(p, (yyvsp[0].nd))); + } +#line 7979 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 75: /* command: "'next'" call_args */ +#line 2702 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_next(p, ret_args(p, (yyvsp[0].nd))); + } #line 7987 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 72: /* command: "'yield'" command_args */ -#line 2722 "mrbgems/mruby-compiler/core/parse.y" + case 76: /* mlhs: mlhs_basic */ +#line 2708 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_yield(p, (yyvsp[0].nd)); + (yyval.nd) = (yyvsp[0].nd); } #line 7995 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 73: /* command: "'return'" call_args */ -#line 2726 "mrbgems/mruby-compiler/core/parse.y" + case 77: /* mlhs: tLPAREN mlhs_inner rparen */ +#line 2712 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_return(p, ret_args(p, (yyvsp[0].nd))); + (yyval.nd) = (yyvsp[-1].nd); } #line 8003 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 74: /* command: "'break'" call_args */ -#line 2730 "mrbgems/mruby-compiler/core/parse.y" + case 79: /* mlhs_inner: tLPAREN mlhs_inner rparen */ +#line 2719 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_break(p, ret_args(p, (yyvsp[0].nd))); + (yyval.nd) = (yyvsp[-1].nd); } #line 8011 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 75: /* command: "'next'" call_args */ -#line 2734 "mrbgems/mruby-compiler/core/parse.y" + case 80: /* mlhs_basic: mlhs_list */ +#line 2725 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_next(p, ret_args(p, (yyvsp[0].nd))); + (yyval.nd) = list1((yyvsp[0].nd)); } #line 8019 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 76: /* mlhs: mlhs_basic */ -#line 2740 "mrbgems/mruby-compiler/core/parse.y" + case 81: /* mlhs_basic: mlhs_list mlhs_item */ +#line 2729 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = (yyvsp[0].nd); + (yyval.nd) = list1(push((yyvsp[-1].nd),(yyvsp[0].nd))); } #line 8027 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 77: /* mlhs: tLPAREN mlhs_inner rparen */ -#line 2744 "mrbgems/mruby-compiler/core/parse.y" + case 82: /* mlhs_basic: mlhs_list "*" mlhs_node */ +#line 2733 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = (yyvsp[-1].nd); + (yyval.nd) = list2((yyvsp[-2].nd), (yyvsp[0].nd)); } #line 8035 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 79: /* mlhs_inner: tLPAREN mlhs_inner rparen */ -#line 2751 "mrbgems/mruby-compiler/core/parse.y" + case 83: /* mlhs_basic: mlhs_list "*" mlhs_node ',' mlhs_post */ +#line 2737 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = (yyvsp[-1].nd); + (yyval.nd) = list3((yyvsp[-4].nd), (yyvsp[-2].nd), (yyvsp[0].nd)); } #line 8043 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 80: /* mlhs_basic: mlhs_list */ -#line 2757 "mrbgems/mruby-compiler/core/parse.y" + case 84: /* mlhs_basic: mlhs_list "*" */ +#line 2741 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = list1((yyvsp[0].nd)); + (yyval.nd) = list2((yyvsp[-1].nd), new_nil(p)); } #line 8051 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 81: /* mlhs_basic: mlhs_list mlhs_item */ -#line 2761 "mrbgems/mruby-compiler/core/parse.y" + case 85: /* mlhs_basic: mlhs_list "*" ',' mlhs_post */ +#line 2745 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = list1(push((yyvsp[-1].nd),(yyvsp[0].nd))); + (yyval.nd) = list3((yyvsp[-3].nd), new_nil(p), (yyvsp[0].nd)); } #line 8059 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 82: /* mlhs_basic: mlhs_list "*" mlhs_node */ -#line 2765 "mrbgems/mruby-compiler/core/parse.y" + case 86: /* mlhs_basic: "*" mlhs_node */ +#line 2749 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = list2((yyvsp[-2].nd), (yyvsp[0].nd)); + (yyval.nd) = list2(0, (yyvsp[0].nd)); } #line 8067 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 83: /* mlhs_basic: mlhs_list "*" mlhs_node ',' mlhs_post */ -#line 2769 "mrbgems/mruby-compiler/core/parse.y" + case 87: /* mlhs_basic: "*" mlhs_node ',' mlhs_post */ +#line 2753 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = list3((yyvsp[-4].nd), (yyvsp[-2].nd), (yyvsp[0].nd)); + (yyval.nd) = list3(0, (yyvsp[-2].nd), (yyvsp[0].nd)); } #line 8075 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 84: /* mlhs_basic: mlhs_list "*" */ -#line 2773 "mrbgems/mruby-compiler/core/parse.y" + case 88: /* mlhs_basic: "*" */ +#line 2757 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = list2((yyvsp[-1].nd), new_nil(p)); + (yyval.nd) = list2(0, new_nil(p)); } #line 8083 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 85: /* mlhs_basic: mlhs_list "*" ',' mlhs_post */ -#line 2777 "mrbgems/mruby-compiler/core/parse.y" + case 89: /* mlhs_basic: "*" ',' mlhs_post */ +#line 2761 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = list3((yyvsp[-3].nd), new_nil(p), (yyvsp[0].nd)); + (yyval.nd) = list3(0, new_nil(p), (yyvsp[0].nd)); } #line 8091 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 86: /* mlhs_basic: "*" mlhs_node */ -#line 2781 "mrbgems/mruby-compiler/core/parse.y" + case 91: /* mlhs_item: tLPAREN mlhs_inner rparen */ +#line 2768 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = list2(0, (yyvsp[0].nd)); + (yyval.nd) = new_masgn(p, (yyvsp[-1].nd), NULL); } #line 8099 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 87: /* mlhs_basic: "*" mlhs_node ',' mlhs_post */ -#line 2785 "mrbgems/mruby-compiler/core/parse.y" + case 92: /* mlhs_list: mlhs_item ',' */ +#line 2774 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = list3(0, (yyvsp[-2].nd), (yyvsp[0].nd)); + (yyval.nd) = list1((yyvsp[-1].nd)); } #line 8107 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 88: /* mlhs_basic: "*" */ -#line 2789 "mrbgems/mruby-compiler/core/parse.y" + case 93: /* mlhs_list: mlhs_list mlhs_item ',' */ +#line 2778 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = list2(0, new_nil(p)); + (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[-1].nd)); } #line 8115 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 89: /* mlhs_basic: "*" ',' mlhs_post */ -#line 2793 "mrbgems/mruby-compiler/core/parse.y" + case 94: /* mlhs_post: mlhs_item */ +#line 2784 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = list3(0, new_nil(p), (yyvsp[0].nd)); + (yyval.nd) = list1((yyvsp[0].nd)); } #line 8123 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 91: /* mlhs_item: tLPAREN mlhs_inner rparen */ -#line 2800 "mrbgems/mruby-compiler/core/parse.y" + case 95: /* mlhs_post: mlhs_list mlhs_item */ +#line 2788 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_masgn(p, (yyvsp[-1].nd), NULL); + (yyval.nd) = push((yyvsp[-1].nd), (yyvsp[0].nd)); } #line 8131 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 92: /* mlhs_list: mlhs_item ',' */ -#line 2806 "mrbgems/mruby-compiler/core/parse.y" + case 96: /* mlhs_node: variable */ +#line 2794 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = list1((yyvsp[-1].nd)); + assignable(p, (yyvsp[0].nd)); } #line 8139 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 93: /* mlhs_list: mlhs_list mlhs_item ',' */ -#line 2810 "mrbgems/mruby-compiler/core/parse.y" + case 97: /* mlhs_node: primary_value '[' opt_call_args ']' */ +#line 2798 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[-1].nd)); + (yyval.nd) = new_call(p, (yyvsp[-3].nd), intern_op(aref), (yyvsp[-1].nd), '.'); } #line 8147 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 94: /* mlhs_post: mlhs_item */ -#line 2816 "mrbgems/mruby-compiler/core/parse.y" + case 98: /* mlhs_node: primary_value call_op "local variable or method" */ +#line 2802 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = list1((yyvsp[0].nd)); + (yyval.nd) = new_call(p, (yyvsp[-2].nd), (yyvsp[0].id), 0, (yyvsp[-1].num)); } #line 8155 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 95: /* mlhs_post: mlhs_list mlhs_item */ -#line 2820 "mrbgems/mruby-compiler/core/parse.y" + case 99: /* mlhs_node: primary_value "::" "local variable or method" */ +#line 2806 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = push((yyvsp[-1].nd), (yyvsp[0].nd)); + (yyval.nd) = new_call(p, (yyvsp[-2].nd), (yyvsp[0].id), 0, tCOLON2); } #line 8163 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 96: /* mlhs_node: variable */ -#line 2826 "mrbgems/mruby-compiler/core/parse.y" + case 100: /* mlhs_node: primary_value call_op "constant" */ +#line 2810 "mrbgems/mruby-compiler/core/parse.y" { - assignable(p, (yyvsp[0].nd)); + (yyval.nd) = new_call(p, (yyvsp[-2].nd), (yyvsp[0].id), 0, (yyvsp[-1].num)); } #line 8171 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 97: /* mlhs_node: primary_value '[' opt_call_args ']' */ -#line 2830 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_call(p, (yyvsp[-3].nd), intern_op(aref), (yyvsp[-1].nd), '.'); - } -#line 8179 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 98: /* mlhs_node: primary_value call_op "local variable or method" */ -#line 2834 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_call(p, (yyvsp[-2].nd), (yyvsp[0].id), 0, (yyvsp[-1].num)); - } -#line 8187 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 99: /* mlhs_node: primary_value "::" "local variable or method" */ -#line 2838 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_call(p, (yyvsp[-2].nd), (yyvsp[0].id), 0, tCOLON2); - } -#line 8195 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 100: /* mlhs_node: primary_value call_op "constant" */ -#line 2842 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_call(p, (yyvsp[-2].nd), (yyvsp[0].id), 0, (yyvsp[-1].num)); - } -#line 8203 "mrbgems/mruby-compiler/core/y.tab.c" - break; - case 101: /* mlhs_node: primary_value "::" "constant" */ -#line 2846 "mrbgems/mruby-compiler/core/parse.y" +#line 2814 "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 8213 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8181 "mrbgems/mruby-compiler/core/y.tab.c" break; case 102: /* mlhs_node: tCOLON3 "constant" */ -#line 2852 "mrbgems/mruby-compiler/core/parse.y" +#line 2820 "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 8223 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8191 "mrbgems/mruby-compiler/core/y.tab.c" break; case 103: /* mlhs_node: backref */ -#line 2858 "mrbgems/mruby-compiler/core/parse.y" +#line 2826 "mrbgems/mruby-compiler/core/parse.y" { backref_error(p, (yyvsp[0].nd)); (yyval.nd) = 0; } +#line 8200 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 104: /* lhs: variable */ +#line 2833 "mrbgems/mruby-compiler/core/parse.y" + { + assignable(p, (yyvsp[0].nd)); + } +#line 8208 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 105: /* lhs: primary_value '[' opt_call_args ']' */ +#line 2837 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_call(p, (yyvsp[-3].nd), intern_op(aref), (yyvsp[-1].nd), '.'); + } +#line 8216 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 106: /* lhs: primary_value call_op "local variable or method" */ +#line 2841 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_call(p, (yyvsp[-2].nd), (yyvsp[0].id), 0, (yyvsp[-1].num)); + } +#line 8224 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 107: /* lhs: primary_value "::" "local variable or method" */ +#line 2845 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_call(p, (yyvsp[-2].nd), (yyvsp[0].id), 0, tCOLON2); + } #line 8232 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 104: /* lhs: variable */ -#line 2865 "mrbgems/mruby-compiler/core/parse.y" + case 108: /* lhs: primary_value call_op "constant" */ +#line 2849 "mrbgems/mruby-compiler/core/parse.y" { - assignable(p, (yyvsp[0].nd)); + (yyval.nd) = new_call(p, (yyvsp[-2].nd), (yyvsp[0].id), 0, (yyvsp[-1].num)); } #line 8240 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 105: /* lhs: primary_value '[' opt_call_args ']' */ -#line 2869 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_call(p, (yyvsp[-3].nd), intern_op(aref), (yyvsp[-1].nd), '.'); - } -#line 8248 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 106: /* lhs: primary_value call_op "local variable or method" */ -#line 2873 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_call(p, (yyvsp[-2].nd), (yyvsp[0].id), 0, (yyvsp[-1].num)); - } -#line 8256 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 107: /* lhs: primary_value "::" "local variable or method" */ -#line 2877 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_call(p, (yyvsp[-2].nd), (yyvsp[0].id), 0, tCOLON2); - } -#line 8264 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 108: /* lhs: primary_value call_op "constant" */ -#line 2881 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_call(p, (yyvsp[-2].nd), (yyvsp[0].id), 0, (yyvsp[-1].num)); - } -#line 8272 "mrbgems/mruby-compiler/core/y.tab.c" - break; - case 109: /* lhs: primary_value "::" "constant" */ -#line 2885 "mrbgems/mruby-compiler/core/parse.y" +#line 2853 "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 8282 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8250 "mrbgems/mruby-compiler/core/y.tab.c" break; case 110: /* lhs: tCOLON3 "constant" */ -#line 2891 "mrbgems/mruby-compiler/core/parse.y" +#line 2859 "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 8292 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8260 "mrbgems/mruby-compiler/core/y.tab.c" break; case 111: /* lhs: backref */ -#line 2897 "mrbgems/mruby-compiler/core/parse.y" +#line 2865 "mrbgems/mruby-compiler/core/parse.y" { backref_error(p, (yyvsp[0].nd)); (yyval.nd) = 0; } -#line 8301 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8269 "mrbgems/mruby-compiler/core/y.tab.c" break; case 112: /* lhs: "numbered parameter" */ -#line 2902 "mrbgems/mruby-compiler/core/parse.y" +#line 2870 "mrbgems/mruby-compiler/core/parse.y" { yyerror(&(yylsp[0]), p, "can't assign to numbered parameter"); } -#line 8309 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8277 "mrbgems/mruby-compiler/core/y.tab.c" break; case 113: /* cname: "local variable or method" */ -#line 2908 "mrbgems/mruby-compiler/core/parse.y" +#line 2876 "mrbgems/mruby-compiler/core/parse.y" { yyerror(&(yylsp[0]), p, "class/module name must be CONSTANT"); } -#line 8317 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8285 "mrbgems/mruby-compiler/core/y.tab.c" break; case 115: /* cpath: tCOLON3 cname */ -#line 2915 "mrbgems/mruby-compiler/core/parse.y" +#line 2883 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = cons(int_to_node(1), sym_to_node((yyvsp[0].id))); } -#line 8325 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8293 "mrbgems/mruby-compiler/core/y.tab.c" break; case 116: /* cpath: cname */ -#line 2919 "mrbgems/mruby-compiler/core/parse.y" +#line 2887 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = cons(int_to_node(0), sym_to_node((yyvsp[0].id))); } -#line 8333 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8301 "mrbgems/mruby-compiler/core/y.tab.c" break; case 117: /* cpath: primary_value "::" cname */ -#line 2923 "mrbgems/mruby-compiler/core/parse.y" +#line 2891 "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 8342 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8310 "mrbgems/mruby-compiler/core/y.tab.c" break; case 121: /* fname: op */ -#line 2933 "mrbgems/mruby-compiler/core/parse.y" +#line 2901 "mrbgems/mruby-compiler/core/parse.y" { p->lstate = EXPR_ENDFN; (yyval.id) = (yyvsp[0].id); } -#line 8351 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8319 "mrbgems/mruby-compiler/core/y.tab.c" break; case 122: /* fname: reswords */ -#line 2938 "mrbgems/mruby-compiler/core/parse.y" +#line 2906 "mrbgems/mruby-compiler/core/parse.y" { p->lstate = EXPR_ENDFN; (yyval.id) = (yyvsp[0].id); } -#line 8360 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8328 "mrbgems/mruby-compiler/core/y.tab.c" break; case 125: /* undef_list: fsym */ -#line 2949 "mrbgems/mruby-compiler/core/parse.y" +#line 2917 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = cons(sym_to_node((yyvsp[0].id)), 0); } -#line 8368 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8336 "mrbgems/mruby-compiler/core/y.tab.c" break; case 126: /* $@6: %empty */ -#line 2952 "mrbgems/mruby-compiler/core/parse.y" +#line 2920 "mrbgems/mruby-compiler/core/parse.y" {p->lstate = EXPR_FNAME;} -#line 8374 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8342 "mrbgems/mruby-compiler/core/y.tab.c" break; case 127: /* undef_list: undef_list ',' $@6 fsym */ -#line 2953 "mrbgems/mruby-compiler/core/parse.y" +#line 2921 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = push((yyvsp[-3].nd), sym_to_node((yyvsp[0].id))); } -#line 8382 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8350 "mrbgems/mruby-compiler/core/y.tab.c" break; case 128: /* op: '|' */ -#line 2958 "mrbgems/mruby-compiler/core/parse.y" +#line 2926 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_op(or); } -#line 8388 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8356 "mrbgems/mruby-compiler/core/y.tab.c" break; case 129: /* op: '^' */ -#line 2959 "mrbgems/mruby-compiler/core/parse.y" +#line 2927 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_op(xor); } -#line 8394 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8362 "mrbgems/mruby-compiler/core/y.tab.c" break; case 130: /* op: '&' */ -#line 2960 "mrbgems/mruby-compiler/core/parse.y" +#line 2928 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_op(and); } -#line 8400 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8368 "mrbgems/mruby-compiler/core/y.tab.c" break; case 131: /* op: "<=>" */ -#line 2961 "mrbgems/mruby-compiler/core/parse.y" +#line 2929 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_op(cmp); } -#line 8406 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8374 "mrbgems/mruby-compiler/core/y.tab.c" break; case 132: /* op: "==" */ -#line 2962 "mrbgems/mruby-compiler/core/parse.y" +#line 2930 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_op(eq); } -#line 8412 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8380 "mrbgems/mruby-compiler/core/y.tab.c" break; case 133: /* op: "===" */ -#line 2963 "mrbgems/mruby-compiler/core/parse.y" +#line 2931 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_op(eqq); } -#line 8418 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8386 "mrbgems/mruby-compiler/core/y.tab.c" break; case 134: /* op: "=~" */ -#line 2964 "mrbgems/mruby-compiler/core/parse.y" +#line 2932 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_op(match); } -#line 8424 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8392 "mrbgems/mruby-compiler/core/y.tab.c" break; case 135: /* op: "!~" */ -#line 2965 "mrbgems/mruby-compiler/core/parse.y" +#line 2933 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_op(nmatch); } -#line 8430 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8398 "mrbgems/mruby-compiler/core/y.tab.c" break; case 136: /* op: '>' */ -#line 2966 "mrbgems/mruby-compiler/core/parse.y" +#line 2934 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_op(gt); } -#line 8436 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8404 "mrbgems/mruby-compiler/core/y.tab.c" break; case 137: /* op: ">=" */ -#line 2967 "mrbgems/mruby-compiler/core/parse.y" +#line 2935 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_op(ge); } -#line 8442 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8410 "mrbgems/mruby-compiler/core/y.tab.c" break; case 138: /* op: '<' */ -#line 2968 "mrbgems/mruby-compiler/core/parse.y" +#line 2936 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_op(lt); } -#line 8448 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8416 "mrbgems/mruby-compiler/core/y.tab.c" break; case 139: /* op: "<=" */ -#line 2969 "mrbgems/mruby-compiler/core/parse.y" +#line 2937 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_op(le); } -#line 8454 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8422 "mrbgems/mruby-compiler/core/y.tab.c" break; case 140: /* op: "!=" */ -#line 2970 "mrbgems/mruby-compiler/core/parse.y" +#line 2938 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_op(neq); } -#line 8460 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8428 "mrbgems/mruby-compiler/core/y.tab.c" break; case 141: /* op: "<<" */ -#line 2971 "mrbgems/mruby-compiler/core/parse.y" +#line 2939 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_op(lshift); } -#line 8466 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8434 "mrbgems/mruby-compiler/core/y.tab.c" break; case 142: /* op: ">>" */ -#line 2972 "mrbgems/mruby-compiler/core/parse.y" +#line 2940 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_op(rshift); } -#line 8472 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8440 "mrbgems/mruby-compiler/core/y.tab.c" break; case 143: /* op: '+' */ -#line 2973 "mrbgems/mruby-compiler/core/parse.y" +#line 2941 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_op(add); } -#line 8478 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8446 "mrbgems/mruby-compiler/core/y.tab.c" break; case 144: /* op: '-' */ -#line 2974 "mrbgems/mruby-compiler/core/parse.y" +#line 2942 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_op(sub); } -#line 8484 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8452 "mrbgems/mruby-compiler/core/y.tab.c" break; case 145: /* op: '*' */ -#line 2975 "mrbgems/mruby-compiler/core/parse.y" +#line 2943 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_op(mul); } -#line 8490 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8458 "mrbgems/mruby-compiler/core/y.tab.c" break; case 146: /* op: "*" */ -#line 2976 "mrbgems/mruby-compiler/core/parse.y" +#line 2944 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_op(mul); } -#line 8496 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8464 "mrbgems/mruby-compiler/core/y.tab.c" break; case 147: /* op: '/' */ -#line 2977 "mrbgems/mruby-compiler/core/parse.y" +#line 2945 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_op(div); } -#line 8502 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8470 "mrbgems/mruby-compiler/core/y.tab.c" break; case 148: /* op: '%' */ -#line 2978 "mrbgems/mruby-compiler/core/parse.y" +#line 2946 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_op(mod); } -#line 8508 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8476 "mrbgems/mruby-compiler/core/y.tab.c" break; case 149: /* op: tPOW */ -#line 2979 "mrbgems/mruby-compiler/core/parse.y" +#line 2947 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_op(pow); } -#line 8514 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8482 "mrbgems/mruby-compiler/core/y.tab.c" break; case 150: /* op: "**" */ -#line 2980 "mrbgems/mruby-compiler/core/parse.y" +#line 2948 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_op(pow); } -#line 8520 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8488 "mrbgems/mruby-compiler/core/y.tab.c" break; case 151: /* op: '!' */ -#line 2981 "mrbgems/mruby-compiler/core/parse.y" +#line 2949 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_op(not); } -#line 8526 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8494 "mrbgems/mruby-compiler/core/y.tab.c" break; case 152: /* op: '~' */ -#line 2982 "mrbgems/mruby-compiler/core/parse.y" +#line 2950 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_op(neg); } -#line 8532 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8500 "mrbgems/mruby-compiler/core/y.tab.c" break; case 153: /* op: "unary plus" */ -#line 2983 "mrbgems/mruby-compiler/core/parse.y" +#line 2951 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_op(plus); } -#line 8538 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8506 "mrbgems/mruby-compiler/core/y.tab.c" break; case 154: /* op: "unary minus" */ -#line 2984 "mrbgems/mruby-compiler/core/parse.y" +#line 2952 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_op(minus); } -#line 8544 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8512 "mrbgems/mruby-compiler/core/y.tab.c" break; case 155: /* op: tAREF */ -#line 2985 "mrbgems/mruby-compiler/core/parse.y" +#line 2953 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_op(aref); } -#line 8550 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8518 "mrbgems/mruby-compiler/core/y.tab.c" break; case 156: /* op: tASET */ -#line 2986 "mrbgems/mruby-compiler/core/parse.y" +#line 2954 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_op(aset); } -#line 8556 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8524 "mrbgems/mruby-compiler/core/y.tab.c" break; case 157: /* op: '`' */ -#line 2987 "mrbgems/mruby-compiler/core/parse.y" +#line 2955 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_op(tick); } -#line 8562 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8530 "mrbgems/mruby-compiler/core/y.tab.c" break; case 198: /* arg: lhs '=' arg_rhs */ -#line 3005 "mrbgems/mruby-compiler/core/parse.y" +#line 2973 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_asgn(p, (yyvsp[-2].nd), (yyvsp[0].nd)); } +#line 8538 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 199: /* arg: var_lhs tOP_ASGN arg_rhs */ +#line 2977 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_op_asgn(p, (yyvsp[-2].nd), (yyvsp[-1].id), (yyvsp[0].nd)); + } +#line 8546 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 200: /* arg: primary_value '[' opt_call_args ']' tOP_ASGN arg_rhs */ +#line 2981 "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 8554 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 201: /* arg: primary_value call_op "local variable or method" tOP_ASGN arg_rhs */ +#line 2985 "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 8562 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 202: /* arg: primary_value call_op "constant" tOP_ASGN arg_rhs */ +#line 2989 "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 8570 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 199: /* arg: var_lhs tOP_ASGN arg_rhs */ -#line 3009 "mrbgems/mruby-compiler/core/parse.y" + case 203: /* arg: primary_value "::" "local variable or method" tOP_ASGN arg_rhs */ +#line 2993 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_op_asgn(p, (yyvsp[-2].nd), (yyvsp[-1].id), (yyvsp[0].nd)); + (yyval.nd) = new_op_asgn(p, new_call(p, (yyvsp[-4].nd), (yyvsp[-2].id), 0, tCOLON2), (yyvsp[-1].id), (yyvsp[0].nd)); } #line 8578 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 200: /* arg: primary_value '[' opt_call_args ']' tOP_ASGN arg_rhs */ -#line 3013 "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 8586 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 201: /* arg: primary_value call_op "local variable or method" tOP_ASGN arg_rhs */ -#line 3017 "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 8594 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 202: /* arg: primary_value call_op "constant" tOP_ASGN arg_rhs */ -#line 3021 "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 8602 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 203: /* arg: primary_value "::" "local variable or method" tOP_ASGN arg_rhs */ -#line 3025 "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 8610 "mrbgems/mruby-compiler/core/y.tab.c" - break; - case 204: /* arg: primary_value "::" "constant" tOP_ASGN arg_rhs */ -#line 3029 "mrbgems/mruby-compiler/core/parse.y" +#line 2997 "mrbgems/mruby-compiler/core/parse.y" { yyerror(&(yylsp[-4]), p, "constant re-assignment"); (yyval.nd) = new_stmts(p, 0); } -#line 8619 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8587 "mrbgems/mruby-compiler/core/y.tab.c" break; case 205: /* arg: tCOLON3 "constant" tOP_ASGN arg_rhs */ -#line 3034 "mrbgems/mruby-compiler/core/parse.y" +#line 3002 "mrbgems/mruby-compiler/core/parse.y" { yyerror(&(yylsp[-3]), p, "constant re-assignment"); (yyval.nd) = new_stmts(p, 0); } -#line 8628 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8596 "mrbgems/mruby-compiler/core/y.tab.c" break; case 206: /* arg: backref tOP_ASGN arg_rhs */ -#line 3039 "mrbgems/mruby-compiler/core/parse.y" +#line 3007 "mrbgems/mruby-compiler/core/parse.y" { backref_error(p, (yyvsp[-2].nd)); (yyval.nd) = new_stmts(p, 0); } -#line 8637 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8605 "mrbgems/mruby-compiler/core/y.tab.c" break; case 207: /* arg: arg ".." arg */ -#line 3044 "mrbgems/mruby-compiler/core/parse.y" +#line 3012 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_dot2(p, (yyvsp[-2].nd), (yyvsp[0].nd)); } +#line 8613 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 208: /* arg: arg ".." */ +#line 3016 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_dot2(p, (yyvsp[-1].nd), new_nil(p)); + } +#line 8621 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 209: /* arg: tBDOT2 arg */ +#line 3020 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_dot2(p, new_nil(p), (yyvsp[0].nd)); + } +#line 8629 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 210: /* arg: arg "..." arg */ +#line 3024 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_dot3(p, (yyvsp[-2].nd), (yyvsp[0].nd)); + } +#line 8637 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 211: /* arg: arg "..." */ +#line 3028 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_dot3(p, (yyvsp[-1].nd), new_nil(p)); + } #line 8645 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 208: /* arg: arg ".." */ -#line 3048 "mrbgems/mruby-compiler/core/parse.y" + case 212: /* arg: tBDOT3 arg */ +#line 3032 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_dot2(p, (yyvsp[-1].nd), new_nil(p)); + (yyval.nd) = new_dot3(p, new_nil(p), (yyvsp[0].nd)); } #line 8653 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 209: /* arg: tBDOT2 arg */ -#line 3052 "mrbgems/mruby-compiler/core/parse.y" + case 213: /* arg: arg '+' arg */ +#line 3036 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_dot2(p, new_nil(p), (yyvsp[0].nd)); + (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "+", (yyvsp[0].nd)); } #line 8661 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 210: /* arg: arg "..." arg */ -#line 3056 "mrbgems/mruby-compiler/core/parse.y" + case 214: /* arg: arg '-' arg */ +#line 3040 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_dot3(p, (yyvsp[-2].nd), (yyvsp[0].nd)); + (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "-", (yyvsp[0].nd)); } #line 8669 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 211: /* arg: arg "..." */ -#line 3060 "mrbgems/mruby-compiler/core/parse.y" + case 215: /* arg: arg '*' arg */ +#line 3044 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_dot3(p, (yyvsp[-1].nd), new_nil(p)); + (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "*", (yyvsp[0].nd)); } #line 8677 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 212: /* arg: tBDOT3 arg */ -#line 3064 "mrbgems/mruby-compiler/core/parse.y" + case 216: /* arg: arg '/' arg */ +#line 3048 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_dot3(p, new_nil(p), (yyvsp[0].nd)); + (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "/", (yyvsp[0].nd)); } #line 8685 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 213: /* arg: arg '+' arg */ -#line 3068 "mrbgems/mruby-compiler/core/parse.y" + case 217: /* arg: arg '%' arg */ +#line 3052 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "+", (yyvsp[0].nd)); + (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "%", (yyvsp[0].nd)); } #line 8693 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 214: /* arg: arg '-' arg */ -#line 3072 "mrbgems/mruby-compiler/core/parse.y" + case 218: /* arg: arg tPOW arg */ +#line 3056 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "-", (yyvsp[0].nd)); + (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "**", (yyvsp[0].nd)); } #line 8701 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 215: /* arg: arg '*' arg */ -#line 3076 "mrbgems/mruby-compiler/core/parse.y" + case 219: /* arg: tUMINUS_NUM "integer literal" tPOW arg */ +#line 3060 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "*", (yyvsp[0].nd)); + (yyval.nd) = new_negate(p, call_bin_op(p, (yyvsp[-2].nd), "**", (yyvsp[0].nd))); } #line 8709 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 216: /* arg: arg '/' arg */ -#line 3080 "mrbgems/mruby-compiler/core/parse.y" + case 220: /* arg: tUMINUS_NUM "float literal" tPOW arg */ +#line 3064 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "/", (yyvsp[0].nd)); + (yyval.nd) = new_negate(p, call_bin_op(p, (yyvsp[-2].nd), "**", (yyvsp[0].nd))); } #line 8717 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 217: /* arg: arg '%' arg */ -#line 3084 "mrbgems/mruby-compiler/core/parse.y" + case 221: /* arg: "unary plus" arg */ +#line 3068 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "%", (yyvsp[0].nd)); + (yyval.nd) = call_uni_op(p, (yyvsp[0].nd), "+@"); } #line 8725 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 218: /* arg: arg tPOW arg */ -#line 3088 "mrbgems/mruby-compiler/core/parse.y" + case 222: /* arg: "unary minus" arg */ +#line 3072 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "**", (yyvsp[0].nd)); + (yyval.nd) = new_negate(p, (yyvsp[0].nd)); } #line 8733 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 219: /* arg: tUMINUS_NUM "integer literal" tPOW arg */ -#line 3092 "mrbgems/mruby-compiler/core/parse.y" + case 223: /* arg: arg '|' arg */ +#line 3076 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_negate(p, call_bin_op(p, (yyvsp[-2].nd), "**", (yyvsp[0].nd))); + (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "|", (yyvsp[0].nd)); } #line 8741 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 220: /* arg: tUMINUS_NUM "float literal" tPOW arg */ -#line 3096 "mrbgems/mruby-compiler/core/parse.y" + case 224: /* arg: arg '^' arg */ +#line 3080 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_negate(p, call_bin_op(p, (yyvsp[-2].nd), "**", (yyvsp[0].nd))); + (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "^", (yyvsp[0].nd)); } #line 8749 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 221: /* arg: "unary plus" arg */ -#line 3100 "mrbgems/mruby-compiler/core/parse.y" + case 225: /* arg: arg '&' arg */ +#line 3084 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = call_uni_op(p, (yyvsp[0].nd), "+@"); + (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "&", (yyvsp[0].nd)); } #line 8757 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 222: /* arg: "unary minus" arg */ -#line 3104 "mrbgems/mruby-compiler/core/parse.y" + case 226: /* arg: arg "<=>" arg */ +#line 3088 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_negate(p, (yyvsp[0].nd)); + (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "<=>", (yyvsp[0].nd)); } #line 8765 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 223: /* arg: arg '|' arg */ -#line 3108 "mrbgems/mruby-compiler/core/parse.y" + case 227: /* arg: arg '>' arg */ +#line 3092 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "|", (yyvsp[0].nd)); + (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), ">", (yyvsp[0].nd)); } #line 8773 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 224: /* arg: arg '^' arg */ -#line 3112 "mrbgems/mruby-compiler/core/parse.y" + case 228: /* arg: arg ">=" arg */ +#line 3096 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "^", (yyvsp[0].nd)); + (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), ">=", (yyvsp[0].nd)); } #line 8781 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 225: /* arg: arg '&' arg */ -#line 3116 "mrbgems/mruby-compiler/core/parse.y" + case 229: /* arg: arg '<' arg */ +#line 3100 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "&", (yyvsp[0].nd)); + (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "<", (yyvsp[0].nd)); } #line 8789 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 226: /* arg: arg "<=>" arg */ -#line 3120 "mrbgems/mruby-compiler/core/parse.y" + case 230: /* arg: arg "<=" arg */ +#line 3104 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "<=>", (yyvsp[0].nd)); + (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "<=", (yyvsp[0].nd)); } #line 8797 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 227: /* arg: arg '>' arg */ -#line 3124 "mrbgems/mruby-compiler/core/parse.y" + case 231: /* arg: arg "==" arg */ +#line 3108 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), ">", (yyvsp[0].nd)); + (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "==", (yyvsp[0].nd)); } #line 8805 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 228: /* arg: arg ">=" arg */ -#line 3128 "mrbgems/mruby-compiler/core/parse.y" + case 232: /* arg: arg "===" arg */ +#line 3112 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), ">=", (yyvsp[0].nd)); + (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "===", (yyvsp[0].nd)); } #line 8813 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 229: /* arg: arg '<' arg */ -#line 3132 "mrbgems/mruby-compiler/core/parse.y" + case 233: /* arg: arg "!=" arg */ +#line 3116 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "<", (yyvsp[0].nd)); + (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "!=", (yyvsp[0].nd)); } #line 8821 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 230: /* arg: arg "<=" arg */ -#line 3136 "mrbgems/mruby-compiler/core/parse.y" + case 234: /* arg: arg "=~" arg */ +#line 3120 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "<=", (yyvsp[0].nd)); + (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "=~", (yyvsp[0].nd)); } #line 8829 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 231: /* arg: arg "==" arg */ -#line 3140 "mrbgems/mruby-compiler/core/parse.y" + case 235: /* arg: arg "!~" arg */ +#line 3124 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "==", (yyvsp[0].nd)); + (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "!~", (yyvsp[0].nd)); } #line 8837 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 232: /* arg: arg "===" arg */ -#line 3144 "mrbgems/mruby-compiler/core/parse.y" + case 236: /* arg: '!' arg */ +#line 3128 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "===", (yyvsp[0].nd)); + (yyval.nd) = call_uni_op(p, cond((yyvsp[0].nd)), "!"); } #line 8845 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 233: /* arg: arg "!=" arg */ -#line 3148 "mrbgems/mruby-compiler/core/parse.y" + case 237: /* arg: '~' arg */ +#line 3132 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "!=", (yyvsp[0].nd)); + (yyval.nd) = call_uni_op(p, cond((yyvsp[0].nd)), "~"); } #line 8853 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 234: /* arg: arg "=~" arg */ -#line 3152 "mrbgems/mruby-compiler/core/parse.y" + case 238: /* arg: arg "<<" arg */ +#line 3136 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "=~", (yyvsp[0].nd)); + (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "<<", (yyvsp[0].nd)); } #line 8861 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 235: /* arg: arg "!~" arg */ -#line 3156 "mrbgems/mruby-compiler/core/parse.y" + case 239: /* arg: arg ">>" arg */ +#line 3140 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "!~", (yyvsp[0].nd)); + (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), ">>", (yyvsp[0].nd)); } #line 8869 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 236: /* arg: '!' arg */ -#line 3160 "mrbgems/mruby-compiler/core/parse.y" + case 240: /* arg: arg "&&" arg */ +#line 3144 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = call_uni_op(p, cond((yyvsp[0].nd)), "!"); + (yyval.nd) = new_and(p, (yyvsp[-2].nd), (yyvsp[0].nd)); } #line 8877 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 237: /* arg: '~' arg */ -#line 3164 "mrbgems/mruby-compiler/core/parse.y" + case 241: /* arg: arg "||" arg */ +#line 3148 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = call_uni_op(p, cond((yyvsp[0].nd)), "~"); + (yyval.nd) = new_or(p, (yyvsp[-2].nd), (yyvsp[0].nd)); } #line 8885 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 238: /* arg: arg "<<" arg */ -#line 3168 "mrbgems/mruby-compiler/core/parse.y" + case 242: /* arg: arg '?' arg opt_nl ':' arg */ +#line 3152 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "<<", (yyvsp[0].nd)); + (yyval.nd) = new_if(p, cond((yyvsp[-5].nd)), (yyvsp[-3].nd), (yyvsp[0].nd)); } #line 8893 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 239: /* arg: arg ">>" arg */ -#line 3172 "mrbgems/mruby-compiler/core/parse.y" + case 243: /* arg: arg '?' arg opt_nl "label" arg */ +#line 3156 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), ">>", (yyvsp[0].nd)); + (yyval.nd) = new_if(p, cond((yyvsp[-5].nd)), (yyvsp[-3].nd), (yyvsp[0].nd)); } #line 8901 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 240: /* arg: arg "&&" arg */ -#line 3176 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_and(p, (yyvsp[-2].nd), (yyvsp[0].nd)); - } -#line 8909 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 241: /* arg: arg "||" arg */ -#line 3180 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_or(p, (yyvsp[-2].nd), (yyvsp[0].nd)); - } -#line 8917 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 242: /* arg: arg '?' arg opt_nl ':' arg */ -#line 3184 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_if(p, cond((yyvsp[-5].nd)), (yyvsp[-3].nd), (yyvsp[0].nd)); - } -#line 8925 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 243: /* arg: arg '?' arg opt_nl "label" arg */ -#line 3188 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_if(p, cond((yyvsp[-5].nd)), (yyvsp[-3].nd), (yyvsp[0].nd)); - } -#line 8933 "mrbgems/mruby-compiler/core/y.tab.c" - break; - case 244: /* arg: defn_head f_opt_arglist_paren '=' arg */ -#line 3192 "mrbgems/mruby-compiler/core/parse.y" +#line 3160 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-3].nd); endless_method_name(p, (yyvsp[-3].nd)); @@ -8942,11 +8910,11 @@ yyreduce: nvars_unnest(p); p->in_def--; } -#line 8946 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8914 "mrbgems/mruby-compiler/core/y.tab.c" break; case 245: /* arg: defn_head f_opt_arglist_paren '=' arg "'rescue' modifier" arg */ -#line 3201 "mrbgems/mruby-compiler/core/parse.y" +#line 3169 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-5].nd); endless_method_name(p, (yyvsp[-5].nd)); @@ -8955,11 +8923,11 @@ yyreduce: nvars_unnest(p); p->in_def--; } -#line 8959 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8927 "mrbgems/mruby-compiler/core/y.tab.c" break; case 246: /* arg: defs_head f_opt_arglist_paren '=' arg */ -#line 3210 "mrbgems/mruby-compiler/core/parse.y" +#line 3178 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-3].nd); void_expr_error(p, (yyvsp[0].nd)); @@ -8968,11 +8936,11 @@ yyreduce: p->in_def--; p->in_single--; } -#line 8972 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8940 "mrbgems/mruby-compiler/core/y.tab.c" break; case 247: /* arg: defs_head f_opt_arglist_paren '=' arg "'rescue' modifier" arg */ -#line 3219 "mrbgems/mruby-compiler/core/parse.y" +#line 3187 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-5].nd); void_expr_error(p, (yyvsp[-2].nd)); @@ -8981,68 +8949,68 @@ yyreduce: p->in_def--; p->in_single--; } -#line 8985 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8953 "mrbgems/mruby-compiler/core/y.tab.c" break; case 248: /* arg: primary */ -#line 3228 "mrbgems/mruby-compiler/core/parse.y" +#line 3196 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = (yyvsp[0].nd); + } +#line 8961 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 250: /* aref_args: args trailer */ +#line 3203 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = (yyvsp[-1].nd); + } +#line 8969 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 251: /* aref_args: args comma assocs trailer */ +#line 3207 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = push((yyvsp[-3].nd), new_hash(p, (yyvsp[-1].nd))); + } +#line 8977 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 252: /* aref_args: assocs trailer */ +#line 3211 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = cons(new_kw_hash(p, (yyvsp[-1].nd)), 0); + } +#line 8985 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 253: /* arg_rhs: arg */ +#line 3217 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[0].nd); } #line 8993 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 250: /* aref_args: args trailer */ -#line 3235 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = (yyvsp[-1].nd); - } -#line 9001 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 251: /* aref_args: args comma assocs trailer */ -#line 3239 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = push((yyvsp[-3].nd), new_hash(p, (yyvsp[-1].nd))); - } -#line 9009 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 252: /* aref_args: assocs trailer */ -#line 3243 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = cons(new_kw_hash(p, (yyvsp[-1].nd)), 0); - } -#line 9017 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 253: /* arg_rhs: arg */ -#line 3249 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = (yyvsp[0].nd); - } -#line 9025 "mrbgems/mruby-compiler/core/y.tab.c" - break; - case 254: /* arg_rhs: arg "'rescue' modifier" arg */ -#line 3253 "mrbgems/mruby-compiler/core/parse.y" +#line 3221 "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 9034 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9002 "mrbgems/mruby-compiler/core/y.tab.c" break; case 255: /* paren_args: '(' opt_call_args ')' */ -#line 3260 "mrbgems/mruby-compiler/core/parse.y" +#line 3228 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-1].nd); } -#line 9042 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9010 "mrbgems/mruby-compiler/core/y.tab.c" break; case 256: /* paren_args: '(' args comma tBDOT3 rparen */ -#line 3264 "mrbgems/mruby-compiler/core/parse.y" +#line 3232 "mrbgems/mruby-compiler/core/parse.y" { mrb_sym r = intern_op(mul); mrb_sym k = intern_op(pow); @@ -9051,11 +9019,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 9055 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9023 "mrbgems/mruby-compiler/core/y.tab.c" break; case 257: /* paren_args: '(' tBDOT3 rparen */ -#line 3273 "mrbgems/mruby-compiler/core/parse.y" +#line 3241 "mrbgems/mruby-compiler/core/parse.y" { mrb_sym r = intern_op(mul); mrb_sym k = intern_op(pow); @@ -9070,390 +9038,390 @@ yyreduce: (yyval.nd) = 0; } } -#line 9074 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9042 "mrbgems/mruby-compiler/core/y.tab.c" break; case 262: /* opt_call_args: args comma */ -#line 3296 "mrbgems/mruby-compiler/core/parse.y" +#line 3264 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_callargs(p,(yyvsp[-1].nd),0,0); } -#line 9082 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9050 "mrbgems/mruby-compiler/core/y.tab.c" break; case 263: /* opt_call_args: args comma assocs comma */ -#line 3300 "mrbgems/mruby-compiler/core/parse.y" +#line 3268 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_callargs(p,(yyvsp[-3].nd),new_kw_hash(p,(yyvsp[-1].nd)),0); } -#line 9090 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9058 "mrbgems/mruby-compiler/core/y.tab.c" break; case 264: /* opt_call_args: assocs comma */ -#line 3304 "mrbgems/mruby-compiler/core/parse.y" +#line 3272 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_callargs(p,0,new_kw_hash(p,(yyvsp[-1].nd)),0); } -#line 9098 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9066 "mrbgems/mruby-compiler/core/y.tab.c" break; case 265: /* call_args: command */ -#line 3310 "mrbgems/mruby-compiler/core/parse.y" +#line 3278 "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 9107 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9075 "mrbgems/mruby-compiler/core/y.tab.c" break; case 266: /* call_args: args opt_block_arg */ -#line 3315 "mrbgems/mruby-compiler/core/parse.y" +#line 3283 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_callargs(p, (yyvsp[-1].nd), 0, (yyvsp[0].nd)); } -#line 9115 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9083 "mrbgems/mruby-compiler/core/y.tab.c" break; case 267: /* call_args: assocs opt_block_arg */ -#line 3319 "mrbgems/mruby-compiler/core/parse.y" +#line 3287 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_callargs(p, 0, new_kw_hash(p, (yyvsp[-1].nd)), (yyvsp[0].nd)); } -#line 9123 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9091 "mrbgems/mruby-compiler/core/y.tab.c" break; case 268: /* call_args: args comma assocs opt_block_arg */ -#line 3323 "mrbgems/mruby-compiler/core/parse.y" +#line 3291 "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 9131 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9099 "mrbgems/mruby-compiler/core/y.tab.c" break; case 269: /* call_args: block_arg */ -#line 3327 "mrbgems/mruby-compiler/core/parse.y" +#line 3295 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_callargs(p, 0, 0, (yyvsp[0].nd)); } -#line 9139 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9107 "mrbgems/mruby-compiler/core/y.tab.c" break; case 270: /* @7: %empty */ -#line 3332 "mrbgems/mruby-compiler/core/parse.y" +#line 3300 "mrbgems/mruby-compiler/core/parse.y" { (yyval.stack) = p->cmdarg_stack; CMDARG_PUSH(1); } -#line 9148 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9116 "mrbgems/mruby-compiler/core/y.tab.c" break; case 271: /* command_args: @7 call_args */ -#line 3337 "mrbgems/mruby-compiler/core/parse.y" +#line 3305 "mrbgems/mruby-compiler/core/parse.y" { p->cmdarg_stack = (yyvsp[-1].stack); (yyval.nd) = (yyvsp[0].nd); } -#line 9157 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9125 "mrbgems/mruby-compiler/core/y.tab.c" break; case 272: /* block_arg: "&" arg */ -#line 3344 "mrbgems/mruby-compiler/core/parse.y" +#line 3312 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_block_arg(p, (yyvsp[0].nd)); } -#line 9165 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9133 "mrbgems/mruby-compiler/core/y.tab.c" break; case 273: /* block_arg: "&" */ -#line 3348 "mrbgems/mruby-compiler/core/parse.y" +#line 3316 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_block_arg(p, 0); } -#line 9173 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9141 "mrbgems/mruby-compiler/core/y.tab.c" break; case 274: /* opt_block_arg: comma block_arg */ -#line 3354 "mrbgems/mruby-compiler/core/parse.y" +#line 3322 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[0].nd); } -#line 9181 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9149 "mrbgems/mruby-compiler/core/y.tab.c" break; case 275: /* opt_block_arg: none */ -#line 3358 "mrbgems/mruby-compiler/core/parse.y" +#line 3326 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = 0; } -#line 9189 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9157 "mrbgems/mruby-compiler/core/y.tab.c" break; case 277: /* args: arg */ -#line 3367 "mrbgems/mruby-compiler/core/parse.y" +#line 3335 "mrbgems/mruby-compiler/core/parse.y" { void_expr_error(p, (yyvsp[0].nd)); (yyval.nd) = list1((yyvsp[0].nd)); } -#line 9198 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9166 "mrbgems/mruby-compiler/core/y.tab.c" break; case 278: /* args: "*" */ -#line 3372 "mrbgems/mruby-compiler/core/parse.y" +#line 3340 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list1(new_splat(p, new_lvar(p, intern_op(mul)))); } -#line 9206 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9174 "mrbgems/mruby-compiler/core/y.tab.c" break; case 279: /* args: "*" arg */ -#line 3376 "mrbgems/mruby-compiler/core/parse.y" +#line 3344 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list1(new_splat(p, (yyvsp[0].nd))); } -#line 9214 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9182 "mrbgems/mruby-compiler/core/y.tab.c" break; case 280: /* args: args comma arg */ -#line 3380 "mrbgems/mruby-compiler/core/parse.y" +#line 3348 "mrbgems/mruby-compiler/core/parse.y" { void_expr_error(p, (yyvsp[0].nd)); (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 9223 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9191 "mrbgems/mruby-compiler/core/y.tab.c" break; case 281: /* args: args comma "*" */ -#line 3385 "mrbgems/mruby-compiler/core/parse.y" +#line 3353 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = push((yyvsp[-2].nd), new_splat(p, new_lvar(p, intern_op(mul)))); } -#line 9231 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9199 "mrbgems/mruby-compiler/core/y.tab.c" break; case 282: /* args: args comma "*" arg */ -#line 3389 "mrbgems/mruby-compiler/core/parse.y" +#line 3357 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = push((yyvsp[-3].nd), new_splat(p, (yyvsp[0].nd))); } -#line 9239 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9207 "mrbgems/mruby-compiler/core/y.tab.c" break; case 283: /* mrhs: args comma arg */ -#line 3395 "mrbgems/mruby-compiler/core/parse.y" +#line 3363 "mrbgems/mruby-compiler/core/parse.y" { void_expr_error(p, (yyvsp[0].nd)); (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); } +#line 9216 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 284: /* mrhs: args comma "*" arg */ +#line 3368 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = push((yyvsp[-3].nd), new_splat(p, (yyvsp[0].nd))); + } +#line 9224 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 285: /* mrhs: "*" arg */ +#line 3372 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = list1(new_splat(p, (yyvsp[0].nd))); + } +#line 9232 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 287: /* primary: string */ +#line 3379 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_str(p, (yyvsp[0].nd)); + } +#line 9240 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 288: /* primary: xstring */ +#line 3383 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_xstr(p, (yyvsp[0].nd)); + } #line 9248 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 284: /* mrhs: args comma "*" arg */ -#line 3400 "mrbgems/mruby-compiler/core/parse.y" + case 293: /* primary: "method" */ +#line 3391 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = push((yyvsp[-3].nd), new_splat(p, (yyvsp[0].nd))); + (yyval.nd) = new_fcall(p, (yyvsp[0].id), 0); } #line 9256 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 285: /* mrhs: "*" arg */ -#line 3404 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = list1(new_splat(p, (yyvsp[0].nd))); - } -#line 9264 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 287: /* primary: string */ -#line 3411 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_str(p, (yyvsp[0].nd)); - } -#line 9272 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 288: /* primary: xstring */ -#line 3415 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_xstr(p, (yyvsp[0].nd)); - } -#line 9280 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 293: /* primary: "method" */ -#line 3423 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_fcall(p, (yyvsp[0].id), 0); - } -#line 9288 "mrbgems/mruby-compiler/core/y.tab.c" - break; - case 294: /* @8: %empty */ -#line 3427 "mrbgems/mruby-compiler/core/parse.y" +#line 3395 "mrbgems/mruby-compiler/core/parse.y" { (yyval.stack) = p->cmdarg_stack; p->cmdarg_stack = 0; } -#line 9297 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9265 "mrbgems/mruby-compiler/core/y.tab.c" break; case 295: /* primary: "'begin'" @8 bodystmt "'end'" */ -#line 3433 "mrbgems/mruby-compiler/core/parse.y" +#line 3401 "mrbgems/mruby-compiler/core/parse.y" { p->cmdarg_stack = (yyvsp[-2].stack); (yyval.nd) = new_begin(p, (yyvsp[-1].nd)); } -#line 9306 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9274 "mrbgems/mruby-compiler/core/y.tab.c" break; case 296: /* @9: %empty */ -#line 3438 "mrbgems/mruby-compiler/core/parse.y" +#line 3406 "mrbgems/mruby-compiler/core/parse.y" { (yyval.stack) = p->cmdarg_stack; p->cmdarg_stack = 0; } -#line 9315 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9283 "mrbgems/mruby-compiler/core/y.tab.c" break; case 297: /* $@10: %empty */ -#line 3442 "mrbgems/mruby-compiler/core/parse.y" +#line 3410 "mrbgems/mruby-compiler/core/parse.y" {p->lstate = EXPR_ENDARG;} -#line 9321 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9289 "mrbgems/mruby-compiler/core/y.tab.c" break; case 298: /* primary: "(" @9 stmt $@10 rparen */ -#line 3443 "mrbgems/mruby-compiler/core/parse.y" +#line 3411 "mrbgems/mruby-compiler/core/parse.y" { p->cmdarg_stack = (yyvsp[-3].stack); (yyval.nd) = (yyvsp[-2].nd); } -#line 9330 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9298 "mrbgems/mruby-compiler/core/y.tab.c" break; case 299: /* $@11: %empty */ -#line 3447 "mrbgems/mruby-compiler/core/parse.y" +#line 3415 "mrbgems/mruby-compiler/core/parse.y" {p->lstate = EXPR_ENDARG;} -#line 9336 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9304 "mrbgems/mruby-compiler/core/y.tab.c" break; case 300: /* primary: "(" $@11 rparen */ -#line 3448 "mrbgems/mruby-compiler/core/parse.y" +#line 3416 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_nil(p); } +#line 9312 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 301: /* primary: tLPAREN compstmt ')' */ +#line 3420 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = (yyvsp[-1].nd); + } +#line 9320 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 302: /* primary: primary_value "::" "constant" */ +#line 3424 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_colon2(p, (yyvsp[-2].nd), (yyvsp[0].id)); + } +#line 9328 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 303: /* primary: tCOLON3 "constant" */ +#line 3428 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_colon3(p, (yyvsp[0].id)); + } +#line 9336 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 304: /* primary: "[" aref_args ']' */ +#line 3432 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_array(p, (yyvsp[-1].nd)); + } #line 9344 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 301: /* primary: tLPAREN compstmt ')' */ -#line 3452 "mrbgems/mruby-compiler/core/parse.y" + case 305: /* primary: tLBRACE assoc_list '}' */ +#line 3436 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = (yyvsp[-1].nd); + (yyval.nd) = new_hash(p, (yyvsp[-1].nd)); } #line 9352 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 302: /* primary: primary_value "::" "constant" */ -#line 3456 "mrbgems/mruby-compiler/core/parse.y" + case 306: /* primary: "'return'" */ +#line 3440 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_colon2(p, (yyvsp[-2].nd), (yyvsp[0].id)); + (yyval.nd) = new_return(p, 0); } #line 9360 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 303: /* primary: tCOLON3 "constant" */ -#line 3460 "mrbgems/mruby-compiler/core/parse.y" + case 307: /* primary: "'yield'" opt_paren_args */ +#line 3444 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_colon3(p, (yyvsp[0].id)); + (yyval.nd) = new_yield(p, (yyvsp[0].nd)); } #line 9368 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 304: /* primary: "[" aref_args ']' */ -#line 3464 "mrbgems/mruby-compiler/core/parse.y" + case 308: /* primary: "'not'" '(' expr rparen */ +#line 3448 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_array(p, (yyvsp[-1].nd)); + (yyval.nd) = call_uni_op(p, cond((yyvsp[-1].nd)), "!"); } #line 9376 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 305: /* primary: tLBRACE assoc_list '}' */ -#line 3468 "mrbgems/mruby-compiler/core/parse.y" + case 309: /* primary: "'not'" '(' rparen */ +#line 3452 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_hash(p, (yyvsp[-1].nd)); + (yyval.nd) = call_uni_op(p, new_nil(p), "!"); } #line 9384 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 306: /* primary: "'return'" */ -#line 3472 "mrbgems/mruby-compiler/core/parse.y" + case 310: /* primary: operation brace_block */ +#line 3456 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_return(p, 0); + (yyval.nd) = new_fcall(p, (yyvsp[-1].id), new_callargs(p, 0, 0, (yyvsp[0].nd))); } #line 9392 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 307: /* primary: "'yield'" opt_paren_args */ -#line 3476 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_yield(p, (yyvsp[0].nd)); - } -#line 9400 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 308: /* primary: "'not'" '(' expr rparen */ -#line 3480 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = call_uni_op(p, cond((yyvsp[-1].nd)), "!"); - } -#line 9408 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 309: /* primary: "'not'" '(' rparen */ -#line 3484 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = call_uni_op(p, new_nil(p), "!"); - } -#line 9416 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 310: /* primary: operation brace_block */ -#line 3488 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_fcall(p, (yyvsp[-1].id), new_callargs(p, 0, 0, (yyvsp[0].nd))); - } -#line 9424 "mrbgems/mruby-compiler/core/y.tab.c" - break; - case 312: /* primary: method_call brace_block */ -#line 3493 "mrbgems/mruby-compiler/core/parse.y" +#line 3461 "mrbgems/mruby-compiler/core/parse.y" { call_with_block(p, (yyvsp[-1].nd), (yyvsp[0].nd)); (yyval.nd) = (yyvsp[-1].nd); } -#line 9433 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9401 "mrbgems/mruby-compiler/core/y.tab.c" break; case 313: /* @12: %empty */ -#line 3498 "mrbgems/mruby-compiler/core/parse.y" +#line 3466 "mrbgems/mruby-compiler/core/parse.y" { local_nest(p); nvars_nest(p); (yyval.num) = p->lpar_beg; p->lpar_beg = ++p->paren_nest; } -#line 9444 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9412 "mrbgems/mruby-compiler/core/y.tab.c" break; case 314: /* @13: %empty */ -#line 3505 "mrbgems/mruby-compiler/core/parse.y" +#line 3473 "mrbgems/mruby-compiler/core/parse.y" { (yyval.stack) = p->cmdarg_stack; p->cmdarg_stack = 0; } -#line 9453 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9421 "mrbgems/mruby-compiler/core/y.tab.c" break; case 315: /* primary: "->" @12 f_larglist @13 lambda_body */ -#line 3510 "mrbgems/mruby-compiler/core/parse.y" +#line 3478 "mrbgems/mruby-compiler/core/parse.y" { p->lpar_beg = (yyvsp[-3].num); (yyval.nd) = new_lambda(p, (yyvsp[-2].nd), (yyvsp[0].nd)); @@ -9462,149 +9430,149 @@ yyreduce: p->cmdarg_stack = (yyvsp[-1].stack); CMDARG_LEXPOP(); } -#line 9466 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9434 "mrbgems/mruby-compiler/core/y.tab.c" break; case 316: /* primary: "'if'" expr_value then compstmt if_tail "'end'" */ -#line 3522 "mrbgems/mruby-compiler/core/parse.y" +#line 3490 "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 9475 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9443 "mrbgems/mruby-compiler/core/y.tab.c" break; case 317: /* primary: "'unless'" expr_value then compstmt opt_else "'end'" */ -#line 3530 "mrbgems/mruby-compiler/core/parse.y" +#line 3498 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_if(p, cond((yyvsp[-4].nd)), (yyvsp[-1].nd), (yyvsp[-2].nd)); SET_LINENO((yyval.nd), (yyvsp[-5].num)); } -#line 9484 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9452 "mrbgems/mruby-compiler/core/y.tab.c" break; case 318: /* $@14: %empty */ -#line 3534 "mrbgems/mruby-compiler/core/parse.y" +#line 3502 "mrbgems/mruby-compiler/core/parse.y" {COND_PUSH(1);} -#line 9490 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9458 "mrbgems/mruby-compiler/core/y.tab.c" break; case 319: /* $@15: %empty */ -#line 3534 "mrbgems/mruby-compiler/core/parse.y" +#line 3502 "mrbgems/mruby-compiler/core/parse.y" {COND_POP();} -#line 9496 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9464 "mrbgems/mruby-compiler/core/y.tab.c" break; case 320: /* primary: "'while'" $@14 expr_value do $@15 compstmt "'end'" */ -#line 3537 "mrbgems/mruby-compiler/core/parse.y" +#line 3505 "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 9505 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9473 "mrbgems/mruby-compiler/core/y.tab.c" break; case 321: /* $@16: %empty */ -#line 3541 "mrbgems/mruby-compiler/core/parse.y" +#line 3509 "mrbgems/mruby-compiler/core/parse.y" {COND_PUSH(1);} -#line 9511 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9479 "mrbgems/mruby-compiler/core/y.tab.c" break; case 322: /* $@17: %empty */ -#line 3541 "mrbgems/mruby-compiler/core/parse.y" +#line 3509 "mrbgems/mruby-compiler/core/parse.y" {COND_POP();} -#line 9517 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9485 "mrbgems/mruby-compiler/core/y.tab.c" break; case 323: /* primary: "'until'" $@16 expr_value do $@17 compstmt "'end'" */ -#line 3544 "mrbgems/mruby-compiler/core/parse.y" +#line 3512 "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 9526 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9494 "mrbgems/mruby-compiler/core/y.tab.c" break; case 324: /* primary: "'case'" expr_value opt_terms case_body "'end'" */ -#line 3551 "mrbgems/mruby-compiler/core/parse.y" +#line 3519 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_case(p, (yyvsp[-3].nd), (yyvsp[-1].nd)); } -#line 9534 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9502 "mrbgems/mruby-compiler/core/y.tab.c" break; case 325: /* primary: "'case'" opt_terms case_body "'end'" */ -#line 3555 "mrbgems/mruby-compiler/core/parse.y" +#line 3523 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_case(p, 0, (yyvsp[-1].nd)); } -#line 9542 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9510 "mrbgems/mruby-compiler/core/y.tab.c" break; case 326: /* $@18: %empty */ -#line 3559 "mrbgems/mruby-compiler/core/parse.y" +#line 3527 "mrbgems/mruby-compiler/core/parse.y" {COND_PUSH(1);} -#line 9548 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9516 "mrbgems/mruby-compiler/core/y.tab.c" break; case 327: /* $@19: %empty */ -#line 3561 "mrbgems/mruby-compiler/core/parse.y" +#line 3529 "mrbgems/mruby-compiler/core/parse.y" {COND_POP();} -#line 9554 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9522 "mrbgems/mruby-compiler/core/y.tab.c" break; case 328: /* primary: "'for'" for_var "'in'" $@18 expr_value do $@19 compstmt "'end'" */ -#line 3564 "mrbgems/mruby-compiler/core/parse.y" +#line 3532 "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 9563 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9531 "mrbgems/mruby-compiler/core/y.tab.c" break; case 329: /* @20: %empty */ -#line 3570 "mrbgems/mruby-compiler/core/parse.y" +#line 3538 "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 9574 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9542 "mrbgems/mruby-compiler/core/y.tab.c" break; case 330: /* primary: "'class'" cpath superclass @20 bodystmt "'end'" */ -#line 3578 "mrbgems/mruby-compiler/core/parse.y" +#line 3546 "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 9585 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9553 "mrbgems/mruby-compiler/core/y.tab.c" break; case 331: /* @21: %empty */ -#line 3586 "mrbgems/mruby-compiler/core/parse.y" +#line 3554 "mrbgems/mruby-compiler/core/parse.y" { (yyval.num) = p->in_def; p->in_def = 0; } -#line 9594 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9562 "mrbgems/mruby-compiler/core/y.tab.c" break; case 332: /* @22: %empty */ -#line 3591 "mrbgems/mruby-compiler/core/parse.y" +#line 3559 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = cons(local_switch(p), int_to_node(p->in_single)); nvars_block(p); p->in_single = 0; } -#line 9604 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9572 "mrbgems/mruby-compiler/core/y.tab.c" break; case 333: /* primary: "'class'" "<<" expr @21 term @22 bodystmt "'end'" */ -#line 3598 "mrbgems/mruby-compiler/core/parse.y" +#line 3566 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_sclass(p, (yyvsp[-5].nd), (yyvsp[-1].nd)); SET_LINENO((yyval.nd), (yyvsp[-7].num)); @@ -9613,44 +9581,44 @@ yyreduce: p->in_def = (yyvsp[-4].num); p->in_single = node_to_int((yyvsp[-2].nd)->cdr); } -#line 9617 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9585 "mrbgems/mruby-compiler/core/y.tab.c" break; case 334: /* @23: %empty */ -#line 3608 "mrbgems/mruby-compiler/core/parse.y" +#line 3576 "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 9628 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9596 "mrbgems/mruby-compiler/core/y.tab.c" break; case 335: /* primary: "'module'" cpath @23 bodystmt "'end'" */ -#line 3616 "mrbgems/mruby-compiler/core/parse.y" +#line 3584 "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 9639 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9607 "mrbgems/mruby-compiler/core/y.tab.c" break; case 336: /* primary: defn_head f_arglist bodystmt "'end'" */ -#line 3626 "mrbgems/mruby-compiler/core/parse.y" +#line 3594 "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 9650 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9618 "mrbgems/mruby-compiler/core/y.tab.c" break; case 337: /* primary: defs_head f_arglist bodystmt "'end'" */ -#line 3636 "mrbgems/mruby-compiler/core/parse.y" +#line 3604 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-3].nd); defn_setup(p, (yyval.nd), (yyvsp[-2].nd), (yyvsp[-1].nd)); @@ -9658,326 +9626,358 @@ yyreduce: p->in_def--; p->in_single--; } -#line 9662 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9630 "mrbgems/mruby-compiler/core/y.tab.c" break; case 338: /* primary: "'break'" */ -#line 3644 "mrbgems/mruby-compiler/core/parse.y" +#line 3612 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_break(p, 0); } -#line 9670 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9638 "mrbgems/mruby-compiler/core/y.tab.c" break; case 339: /* primary: "'next'" */ -#line 3648 "mrbgems/mruby-compiler/core/parse.y" +#line 3616 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_next(p, 0); } -#line 9678 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9646 "mrbgems/mruby-compiler/core/y.tab.c" break; case 340: /* primary: "'redo'" */ -#line 3652 "mrbgems/mruby-compiler/core/parse.y" +#line 3620 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_redo(p); } -#line 9686 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9654 "mrbgems/mruby-compiler/core/y.tab.c" break; case 341: /* primary: "'retry'" */ -#line 3656 "mrbgems/mruby-compiler/core/parse.y" +#line 3624 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_retry(p); } -#line 9694 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9662 "mrbgems/mruby-compiler/core/y.tab.c" break; case 342: /* primary_value: primary */ -#line 3662 "mrbgems/mruby-compiler/core/parse.y" +#line 3630 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[0].nd); if (!(yyval.nd)) (yyval.nd) = new_nil(p); } -#line 9703 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9671 "mrbgems/mruby-compiler/core/y.tab.c" break; case 349: /* if_tail: "'elsif'" expr_value then compstmt if_tail */ -#line 3681 "mrbgems/mruby-compiler/core/parse.y" +#line 3649 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_if(p, cond((yyvsp[-3].nd)), (yyvsp[-1].nd), (yyvsp[0].nd)); } +#line 9679 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 351: /* opt_else: "'else'" compstmt */ +#line 3656 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = (yyvsp[0].nd); + } +#line 9687 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 352: /* for_var: lhs */ +#line 3662 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = list1(list1((yyvsp[0].nd))); + } +#line 9695 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 354: /* f_margs: f_arg */ +#line 3669 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = list3((yyvsp[0].nd),0,0); + } +#line 9703 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 355: /* f_margs: f_arg ',' "*" f_norm_arg */ +#line 3673 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = list3((yyvsp[-3].nd), new_lvar(p, (yyvsp[0].id)), 0); + } #line 9711 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 351: /* opt_else: "'else'" compstmt */ -#line 3688 "mrbgems/mruby-compiler/core/parse.y" + case 356: /* f_margs: f_arg ',' "*" f_norm_arg ',' f_arg */ +#line 3677 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = (yyvsp[0].nd); + (yyval.nd) = list3((yyvsp[-5].nd), new_lvar(p, (yyvsp[-2].id)), (yyvsp[0].nd)); } #line 9719 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 352: /* for_var: lhs */ -#line 3694 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = list1(list1((yyvsp[0].nd))); - } -#line 9727 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 354: /* f_margs: f_arg */ -#line 3701 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = list3((yyvsp[0].nd),0,0); - } -#line 9735 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 355: /* f_margs: f_arg ',' "*" f_norm_arg */ -#line 3705 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = list3((yyvsp[-3].nd), new_lvar(p, (yyvsp[0].id)), 0); - } -#line 9743 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 356: /* f_margs: f_arg ',' "*" f_norm_arg ',' f_arg */ -#line 3709 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = list3((yyvsp[-5].nd), new_lvar(p, (yyvsp[-2].id)), (yyvsp[0].nd)); - } -#line 9751 "mrbgems/mruby-compiler/core/y.tab.c" - break; - case 357: /* f_margs: f_arg ',' "*" */ -#line 3713 "mrbgems/mruby-compiler/core/parse.y" +#line 3681 "mrbgems/mruby-compiler/core/parse.y" { local_add_f(p, intern_op(mul)); (yyval.nd) = list3((yyvsp[-2].nd), int_to_node(-1), 0); } -#line 9760 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9728 "mrbgems/mruby-compiler/core/y.tab.c" break; case 358: /* f_margs: f_arg ',' "*" ',' f_arg */ -#line 3718 "mrbgems/mruby-compiler/core/parse.y" +#line 3686 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list3((yyvsp[-4].nd), int_to_node(-1), (yyvsp[0].nd)); } -#line 9768 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9736 "mrbgems/mruby-compiler/core/y.tab.c" break; case 359: /* f_margs: "*" f_norm_arg */ -#line 3722 "mrbgems/mruby-compiler/core/parse.y" +#line 3690 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list3(0, new_lvar(p, (yyvsp[0].id)), 0); } -#line 9776 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9744 "mrbgems/mruby-compiler/core/y.tab.c" break; case 360: /* f_margs: "*" f_norm_arg ',' f_arg */ -#line 3726 "mrbgems/mruby-compiler/core/parse.y" +#line 3694 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list3(0, new_lvar(p, (yyvsp[-2].id)), (yyvsp[0].nd)); } -#line 9784 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9752 "mrbgems/mruby-compiler/core/y.tab.c" break; case 361: /* f_margs: "*" */ -#line 3730 "mrbgems/mruby-compiler/core/parse.y" +#line 3698 "mrbgems/mruby-compiler/core/parse.y" { local_add_f(p, intern_op(mul)); (yyval.nd) = list3(0, int_to_node(-1), 0); } -#line 9793 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9761 "mrbgems/mruby-compiler/core/y.tab.c" break; case 362: /* $@24: %empty */ -#line 3735 "mrbgems/mruby-compiler/core/parse.y" +#line 3703 "mrbgems/mruby-compiler/core/parse.y" { local_add_f(p, intern_op(mul)); } +#line 9769 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 363: /* f_margs: "*" ',' $@24 f_arg */ +#line 3707 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = list3(0, int_to_node(-1), (yyvsp[0].nd)); + } +#line 9777 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 364: /* block_args_tail: f_block_kwarg ',' f_kwrest opt_f_block_arg */ +#line 3713 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_args_tail(p, (yyvsp[-3].nd), (yyvsp[-1].id), (yyvsp[0].id)); + } +#line 9785 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 365: /* block_args_tail: f_block_kwarg opt_f_block_arg */ +#line 3717 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_args_tail(p, (yyvsp[-1].nd), 0, (yyvsp[0].id)); + } +#line 9793 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 366: /* block_args_tail: f_kwrest opt_f_block_arg */ +#line 3721 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_args_tail(p, 0, (yyvsp[-1].id), (yyvsp[0].id)); + } #line 9801 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 363: /* f_margs: "*" ',' $@24 f_arg */ -#line 3739 "mrbgems/mruby-compiler/core/parse.y" + case 367: /* block_args_tail: f_block_arg */ +#line 3725 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = list3(0, int_to_node(-1), (yyvsp[0].nd)); + (yyval.nd) = new_args_tail(p, 0, 0, (yyvsp[0].id)); } #line 9809 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 364: /* block_args_tail: f_block_kwarg ',' f_kwrest opt_f_block_arg */ -#line 3745 "mrbgems/mruby-compiler/core/parse.y" + case 368: /* opt_block_args_tail: ',' block_args_tail */ +#line 3731 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args_tail(p, (yyvsp[-3].nd), (yyvsp[-1].id), (yyvsp[0].id)); + (yyval.nd) = (yyvsp[0].nd); } #line 9817 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 365: /* block_args_tail: f_block_kwarg opt_f_block_arg */ -#line 3749 "mrbgems/mruby-compiler/core/parse.y" + case 369: /* opt_block_args_tail: %empty */ +#line 3735 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args_tail(p, (yyvsp[-1].nd), 0, (yyvsp[0].id)); + (yyval.nd) = new_args_tail(p, 0, 0, 0); } #line 9825 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 366: /* block_args_tail: f_kwrest opt_f_block_arg */ -#line 3753 "mrbgems/mruby-compiler/core/parse.y" + case 370: /* block_param: f_arg ',' f_block_optarg ',' f_rest_arg opt_block_args_tail */ +#line 3741 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args_tail(p, 0, (yyvsp[-1].id), (yyvsp[0].id)); + (yyval.nd) = new_args(p, (yyvsp[-5].nd), (yyvsp[-3].nd), (yyvsp[-1].id), 0, (yyvsp[0].nd)); } #line 9833 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 367: /* block_args_tail: f_block_arg */ -#line 3757 "mrbgems/mruby-compiler/core/parse.y" + case 371: /* block_param: f_arg ',' f_block_optarg ',' f_rest_arg ',' f_arg opt_block_args_tail */ +#line 3745 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args_tail(p, 0, 0, (yyvsp[0].id)); + (yyval.nd) = new_args(p, (yyvsp[-7].nd), (yyvsp[-5].nd), (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd)); } #line 9841 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 368: /* opt_block_args_tail: ',' block_args_tail */ -#line 3763 "mrbgems/mruby-compiler/core/parse.y" + case 372: /* block_param: f_arg ',' f_block_optarg opt_block_args_tail */ +#line 3749 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = (yyvsp[0].nd); + (yyval.nd) = new_args(p, (yyvsp[-3].nd), (yyvsp[-1].nd), 0, 0, (yyvsp[0].nd)); } #line 9849 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 369: /* opt_block_args_tail: %empty */ -#line 3767 "mrbgems/mruby-compiler/core/parse.y" + case 373: /* block_param: f_arg ',' f_block_optarg ',' f_arg opt_block_args_tail */ +#line 3753 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args_tail(p, 0, 0, 0); + (yyval.nd) = new_args(p, (yyvsp[-5].nd), (yyvsp[-3].nd), 0, (yyvsp[-1].nd), (yyvsp[0].nd)); } #line 9857 "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 3773 "mrbgems/mruby-compiler/core/parse.y" + case 374: /* block_param: f_arg ',' f_rest_arg opt_block_args_tail */ +#line 3757 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, (yyvsp[-5].nd), (yyvsp[-3].nd), (yyvsp[-1].id), 0, (yyvsp[0].nd)); + (yyval.nd) = new_args(p, (yyvsp[-3].nd), 0, (yyvsp[-1].id), 0, (yyvsp[0].nd)); } #line 9865 "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 3777 "mrbgems/mruby-compiler/core/parse.y" + case 375: /* block_param: f_arg ',' opt_block_args_tail */ +#line 3761 "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)); + (yyval.nd) = new_args(p, (yyvsp[-2].nd), 0, 0, 0, (yyvsp[0].nd)); } #line 9873 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 372: /* block_param: f_arg ',' f_block_optarg opt_block_args_tail */ -#line 3781 "mrbgems/mruby-compiler/core/parse.y" + case 376: /* block_param: f_arg ',' f_rest_arg ',' f_arg opt_block_args_tail */ +#line 3765 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, (yyvsp[-3].nd), (yyvsp[-1].nd), 0, 0, (yyvsp[0].nd)); + (yyval.nd) = new_args(p, (yyvsp[-5].nd), 0, (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd)); } #line 9881 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 373: /* block_param: f_arg ',' f_block_optarg ',' f_arg opt_block_args_tail */ -#line 3785 "mrbgems/mruby-compiler/core/parse.y" + case 377: /* block_param: f_arg opt_block_args_tail */ +#line 3769 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, (yyvsp[-5].nd), (yyvsp[-3].nd), 0, (yyvsp[-1].nd), (yyvsp[0].nd)); + (yyval.nd) = new_args(p, (yyvsp[-1].nd), 0, 0, 0, (yyvsp[0].nd)); } #line 9889 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 374: /* block_param: f_arg ',' f_rest_arg opt_block_args_tail */ -#line 3789 "mrbgems/mruby-compiler/core/parse.y" + case 378: /* block_param: f_block_optarg ',' f_rest_arg opt_block_args_tail */ +#line 3773 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, (yyvsp[-3].nd), 0, (yyvsp[-1].id), 0, (yyvsp[0].nd)); + (yyval.nd) = new_args(p, 0, (yyvsp[-3].nd), (yyvsp[-1].id), 0, (yyvsp[0].nd)); } #line 9897 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 375: /* block_param: f_arg ',' opt_block_args_tail */ -#line 3793 "mrbgems/mruby-compiler/core/parse.y" + case 379: /* block_param: f_block_optarg ',' f_rest_arg ',' f_arg opt_block_args_tail */ +#line 3777 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, (yyvsp[-2].nd), 0, 0, 0, (yyvsp[0].nd)); + (yyval.nd) = new_args(p, 0, (yyvsp[-5].nd), (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd)); } #line 9905 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 376: /* block_param: f_arg ',' f_rest_arg ',' f_arg opt_block_args_tail */ -#line 3797 "mrbgems/mruby-compiler/core/parse.y" + case 380: /* block_param: f_block_optarg opt_block_args_tail */ +#line 3781 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, (yyvsp[-5].nd), 0, (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd)); + (yyval.nd) = new_args(p, 0, (yyvsp[-1].nd), 0, 0, (yyvsp[0].nd)); } #line 9913 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 377: /* block_param: f_arg opt_block_args_tail */ -#line 3801 "mrbgems/mruby-compiler/core/parse.y" + case 381: /* block_param: f_block_optarg ',' f_arg opt_block_args_tail */ +#line 3785 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, (yyvsp[-1].nd), 0, 0, 0, (yyvsp[0].nd)); + (yyval.nd) = new_args(p, 0, (yyvsp[-3].nd), 0, (yyvsp[-1].nd), (yyvsp[0].nd)); } #line 9921 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 378: /* block_param: f_block_optarg ',' f_rest_arg opt_block_args_tail */ -#line 3805 "mrbgems/mruby-compiler/core/parse.y" + case 382: /* block_param: f_rest_arg opt_block_args_tail */ +#line 3789 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, 0, (yyvsp[-3].nd), (yyvsp[-1].id), 0, (yyvsp[0].nd)); + (yyval.nd) = new_args(p, 0, 0, (yyvsp[-1].id), 0, (yyvsp[0].nd)); } #line 9929 "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 3809 "mrbgems/mruby-compiler/core/parse.y" + case 383: /* block_param: f_rest_arg ',' f_arg opt_block_args_tail */ +#line 3793 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, 0, (yyvsp[-5].nd), (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd)); + (yyval.nd) = new_args(p, 0, 0, (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd)); } #line 9937 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 380: /* block_param: f_block_optarg opt_block_args_tail */ -#line 3813 "mrbgems/mruby-compiler/core/parse.y" + case 384: /* block_param: block_args_tail */ +#line 3797 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, 0, (yyvsp[-1].nd), 0, 0, (yyvsp[0].nd)); + (yyval.nd) = new_args(p, 0, 0, 0, 0, (yyvsp[0].nd)); } #line 9945 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 381: /* block_param: f_block_optarg ',' f_arg opt_block_args_tail */ -#line 3817 "mrbgems/mruby-compiler/core/parse.y" + case 385: /* opt_block_param: none */ +#line 3803 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, 0, (yyvsp[-3].nd), 0, (yyvsp[-1].nd), (yyvsp[0].nd)); + local_add_blk(p); + (yyval.nd) = 0; } -#line 9953 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9954 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 382: /* block_param: f_rest_arg opt_block_args_tail */ -#line 3821 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_args(p, 0, 0, (yyvsp[-1].id), 0, (yyvsp[0].nd)); + case 386: /* opt_block_param: block_param_def */ +#line 3808 "mrbgems/mruby-compiler/core/parse.y" + { + p->cmd_start = TRUE; + (yyval.nd) = (yyvsp[0].nd); } -#line 9961 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9963 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 383: /* block_param: f_rest_arg ',' f_arg opt_block_args_tail */ -#line 3825 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_args(p, 0, 0, (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd)); - } + case 387: /* $@25: %empty */ +#line 3814 "mrbgems/mruby-compiler/core/parse.y" + {local_add_blk(p);} #line 9969 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 384: /* block_param: block_args_tail */ -#line 3829 "mrbgems/mruby-compiler/core/parse.y" + case 388: /* block_param_def: '|' $@25 opt_bv_decl '|' */ +#line 3815 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, 0, 0, 0, 0, (yyvsp[0].nd)); + (yyval.nd) = 0; } #line 9977 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 385: /* opt_block_param: none */ -#line 3835 "mrbgems/mruby-compiler/core/parse.y" + case 389: /* block_param_def: "||" */ +#line 3819 "mrbgems/mruby-compiler/core/parse.y" { local_add_blk(p); (yyval.nd) = 0; @@ -9985,283 +9985,251 @@ yyreduce: #line 9986 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 386: /* opt_block_param: block_param_def */ -#line 3840 "mrbgems/mruby-compiler/core/parse.y" - { - p->cmd_start = TRUE; - (yyval.nd) = (yyvsp[0].nd); - } -#line 9995 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 387: /* $@25: %empty */ -#line 3846 "mrbgems/mruby-compiler/core/parse.y" - {local_add_blk(p);} -#line 10001 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 388: /* block_param_def: '|' $@25 opt_bv_decl '|' */ -#line 3847 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = 0; - } -#line 10009 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 389: /* block_param_def: "||" */ -#line 3851 "mrbgems/mruby-compiler/core/parse.y" - { - local_add_blk(p); - (yyval.nd) = 0; - } -#line 10018 "mrbgems/mruby-compiler/core/y.tab.c" - break; - case 390: /* block_param_def: '|' block_param opt_bv_decl '|' */ -#line 3856 "mrbgems/mruby-compiler/core/parse.y" +#line 3824 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-2].nd); } -#line 10026 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9994 "mrbgems/mruby-compiler/core/y.tab.c" break; case 391: /* opt_bv_decl: opt_nl */ -#line 3862 "mrbgems/mruby-compiler/core/parse.y" +#line 3830 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = 0; } -#line 10034 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10002 "mrbgems/mruby-compiler/core/y.tab.c" break; case 392: /* opt_bv_decl: opt_nl ';' bv_decls opt_nl */ -#line 3866 "mrbgems/mruby-compiler/core/parse.y" +#line 3834 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = 0; } -#line 10042 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10010 "mrbgems/mruby-compiler/core/y.tab.c" break; case 395: /* bvar: "local variable or method" */ -#line 3876 "mrbgems/mruby-compiler/core/parse.y" +#line 3844 "mrbgems/mruby-compiler/core/parse.y" { local_add_f(p, (yyvsp[0].id)); new_bv(p, (yyvsp[0].id)); } -#line 10051 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10019 "mrbgems/mruby-compiler/core/y.tab.c" break; case 397: /* f_larglist: '(' f_args opt_bv_decl ')' */ -#line 3884 "mrbgems/mruby-compiler/core/parse.y" +#line 3852 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-2].nd); } -#line 10059 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10027 "mrbgems/mruby-compiler/core/y.tab.c" break; case 398: /* f_larglist: f_args */ -#line 3888 "mrbgems/mruby-compiler/core/parse.y" +#line 3856 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[0].nd); } -#line 10067 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10035 "mrbgems/mruby-compiler/core/y.tab.c" break; case 399: /* lambda_body: tLAMBEG compstmt '}' */ -#line 3894 "mrbgems/mruby-compiler/core/parse.y" +#line 3862 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-1].nd); } -#line 10075 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10043 "mrbgems/mruby-compiler/core/y.tab.c" break; case 400: /* lambda_body: "'do' for lambda" bodystmt "'end'" */ -#line 3898 "mrbgems/mruby-compiler/core/parse.y" +#line 3866 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-1].nd); } -#line 10083 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10051 "mrbgems/mruby-compiler/core/y.tab.c" break; case 401: /* @26: %empty */ -#line 3904 "mrbgems/mruby-compiler/core/parse.y" +#line 3872 "mrbgems/mruby-compiler/core/parse.y" { local_nest(p); nvars_nest(p); (yyval.num) = p->lineno; } -#line 10093 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10061 "mrbgems/mruby-compiler/core/y.tab.c" break; case 402: /* do_block: "'do' for block" @26 opt_block_param bodystmt "'end'" */ -#line 3912 "mrbgems/mruby-compiler/core/parse.y" +#line 3880 "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 10104 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10072 "mrbgems/mruby-compiler/core/y.tab.c" break; case 403: /* block_call: command do_block */ -#line 3921 "mrbgems/mruby-compiler/core/parse.y" +#line 3889 "mrbgems/mruby-compiler/core/parse.y" { call_with_block(p, (yyvsp[-1].nd), (yyvsp[0].nd)); (yyval.nd) = (yyvsp[-1].nd); } -#line 10113 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10081 "mrbgems/mruby-compiler/core/y.tab.c" break; case 404: /* block_call: block_call call_op2 operation2 opt_paren_args */ -#line 3926 "mrbgems/mruby-compiler/core/parse.y" +#line 3894 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_call(p, (yyvsp[-3].nd), (yyvsp[-1].id), (yyvsp[0].nd), (yyvsp[-2].num)); } -#line 10121 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10089 "mrbgems/mruby-compiler/core/y.tab.c" break; case 405: /* block_call: block_call call_op2 operation2 opt_paren_args brace_block */ -#line 3930 "mrbgems/mruby-compiler/core/parse.y" +#line 3898 "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 10130 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10098 "mrbgems/mruby-compiler/core/y.tab.c" break; case 406: /* block_call: block_call call_op2 operation2 command_args do_block */ -#line 3935 "mrbgems/mruby-compiler/core/parse.y" +#line 3903 "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 10107 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 407: /* method_call: operation paren_args */ +#line 3910 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_fcall(p, (yyvsp[-1].id), (yyvsp[0].nd)); + } +#line 10115 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 408: /* method_call: primary_value call_op operation2 opt_paren_args */ +#line 3914 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_call(p, (yyvsp[-3].nd), (yyvsp[-1].id), (yyvsp[0].nd), (yyvsp[-2].num)); + } +#line 10123 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 409: /* method_call: primary_value "::" operation2 paren_args */ +#line 3918 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_call(p, (yyvsp[-3].nd), (yyvsp[-1].id), (yyvsp[0].nd), tCOLON2); + } +#line 10131 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 410: /* method_call: primary_value "::" operation3 */ +#line 3922 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_call(p, (yyvsp[-2].nd), (yyvsp[0].id), 0, tCOLON2); + } #line 10139 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 407: /* method_call: operation paren_args */ -#line 3942 "mrbgems/mruby-compiler/core/parse.y" + case 411: /* method_call: primary_value call_op paren_args */ +#line 3926 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_fcall(p, (yyvsp[-1].id), (yyvsp[0].nd)); + (yyval.nd) = new_call(p, (yyvsp[-2].nd), MRB_SYM_2(p->mrb, call), (yyvsp[0].nd), (yyvsp[-1].num)); } #line 10147 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 408: /* method_call: primary_value call_op operation2 opt_paren_args */ -#line 3946 "mrbgems/mruby-compiler/core/parse.y" + case 412: /* method_call: primary_value "::" paren_args */ +#line 3930 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_call(p, (yyvsp[-3].nd), (yyvsp[-1].id), (yyvsp[0].nd), (yyvsp[-2].num)); + (yyval.nd) = new_call(p, (yyvsp[-2].nd), MRB_SYM_2(p->mrb, call), (yyvsp[0].nd), tCOLON2); } #line 10155 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 409: /* method_call: primary_value "::" operation2 paren_args */ -#line 3950 "mrbgems/mruby-compiler/core/parse.y" + case 413: /* method_call: "'super'" paren_args */ +#line 3934 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_call(p, (yyvsp[-3].nd), (yyvsp[-1].id), (yyvsp[0].nd), tCOLON2); + (yyval.nd) = new_super(p, (yyvsp[0].nd)); } #line 10163 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 410: /* method_call: primary_value "::" operation3 */ -#line 3954 "mrbgems/mruby-compiler/core/parse.y" + case 414: /* method_call: "'super'" */ +#line 3938 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_call(p, (yyvsp[-2].nd), (yyvsp[0].id), 0, tCOLON2); + (yyval.nd) = new_zsuper(p); } #line 10171 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 411: /* method_call: primary_value call_op paren_args */ -#line 3958 "mrbgems/mruby-compiler/core/parse.y" + case 415: /* method_call: primary_value '[' opt_call_args ']' */ +#line 3942 "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)); + (yyval.nd) = new_call(p, (yyvsp[-3].nd), intern_op(aref), (yyvsp[-1].nd), '.'); } #line 10179 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 412: /* method_call: primary_value "::" paren_args */ -#line 3962 "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 10187 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 413: /* method_call: "'super'" paren_args */ -#line 3966 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_super(p, (yyvsp[0].nd)); - } -#line 10195 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 414: /* method_call: "'super'" */ -#line 3970 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_zsuper(p); - } -#line 10203 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 415: /* method_call: primary_value '[' opt_call_args ']' */ -#line 3974 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_call(p, (yyvsp[-3].nd), intern_op(aref), (yyvsp[-1].nd), '.'); - } -#line 10211 "mrbgems/mruby-compiler/core/y.tab.c" - break; - case 416: /* @27: %empty */ -#line 3980 "mrbgems/mruby-compiler/core/parse.y" +#line 3948 "mrbgems/mruby-compiler/core/parse.y" { local_nest(p); nvars_nest(p); (yyval.num) = p->lineno; } +#line 10189 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 417: /* brace_block: '{' @27 opt_block_param compstmt '}' */ +#line 3955 "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 10200 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 418: /* @28: %empty */ +#line 3962 "mrbgems/mruby-compiler/core/parse.y" + { + local_nest(p); + nvars_nest(p); + (yyval.num) = p->lineno; + } +#line 10210 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 419: /* brace_block: "'do'" @28 opt_block_param bodystmt "'end'" */ +#line 3969 "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 10221 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 417: /* brace_block: '{' @27 opt_block_param compstmt '}' */ -#line 3987 "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 10232 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 418: /* @28: %empty */ -#line 3994 "mrbgems/mruby-compiler/core/parse.y" - { - local_nest(p); - nvars_nest(p); - (yyval.num) = p->lineno; - } -#line 10242 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 419: /* brace_block: "'do'" @28 opt_block_param bodystmt "'end'" */ -#line 4001 "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 10253 "mrbgems/mruby-compiler/core/y.tab.c" - break; - case 420: /* case_body: "'when'" args then compstmt cases */ -#line 4012 "mrbgems/mruby-compiler/core/parse.y" +#line 3980 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = cons(cons((yyvsp[-3].nd), (yyvsp[-1].nd)), (yyvsp[0].nd)); } -#line 10261 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10229 "mrbgems/mruby-compiler/core/y.tab.c" break; case 421: /* cases: opt_else */ -#line 4018 "mrbgems/mruby-compiler/core/parse.y" +#line 3986 "mrbgems/mruby-compiler/core/parse.y" { if ((yyvsp[0].nd)) { (yyval.nd) = cons(cons(0, (yyvsp[0].nd)), 0); @@ -10270,155 +10238,155 @@ yyreduce: (yyval.nd) = 0; } } -#line 10274 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10242 "mrbgems/mruby-compiler/core/y.tab.c" break; case 423: /* opt_rescue: "'rescue'" exc_list exc_var then compstmt opt_rescue */ -#line 4032 "mrbgems/mruby-compiler/core/parse.y" +#line 4000 "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 10283 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10251 "mrbgems/mruby-compiler/core/y.tab.c" break; case 425: /* exc_list: arg */ -#line 4040 "mrbgems/mruby-compiler/core/parse.y" +#line 4008 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list1((yyvsp[0].nd)); } -#line 10291 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10259 "mrbgems/mruby-compiler/core/y.tab.c" break; case 428: /* exc_var: "=>" lhs */ -#line 4048 "mrbgems/mruby-compiler/core/parse.y" +#line 4016 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[0].nd); } -#line 10299 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10267 "mrbgems/mruby-compiler/core/y.tab.c" break; case 430: /* opt_ensure: "'ensure'" compstmt */ -#line 4055 "mrbgems/mruby-compiler/core/parse.y" +#line 4023 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[0].nd); } -#line 10307 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10275 "mrbgems/mruby-compiler/core/y.tab.c" break; case 437: /* string: string string_fragment */ -#line 4069 "mrbgems/mruby-compiler/core/parse.y" +#line 4037 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = append((yyvsp[-1].nd), (yyvsp[0].nd)); } -#line 10315 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10283 "mrbgems/mruby-compiler/core/y.tab.c" break; case 438: /* string_fragment: "character literal" */ -#line 4075 "mrbgems/mruby-compiler/core/parse.y" +#line 4043 "mrbgems/mruby-compiler/core/parse.y" { /* tCHAR is (len . str), wrap as cons list */ (yyval.nd) = list1((yyvsp[0].nd)); } -#line 10324 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10292 "mrbgems/mruby-compiler/core/y.tab.c" break; case 439: /* string_fragment: tSTRING */ -#line 4080 "mrbgems/mruby-compiler/core/parse.y" +#line 4048 "mrbgems/mruby-compiler/core/parse.y" { /* tSTRING is (len . str), wrap as cons list */ (yyval.nd) = list1((yyvsp[0].nd)); } -#line 10333 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10301 "mrbgems/mruby-compiler/core/y.tab.c" break; case 440: /* string_fragment: "string literal" tSTRING */ -#line 4085 "mrbgems/mruby-compiler/core/parse.y" +#line 4053 "mrbgems/mruby-compiler/core/parse.y" { /* $2 is (len . str), wrap as cons list */ (yyval.nd) = list1((yyvsp[0].nd)); } -#line 10342 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10310 "mrbgems/mruby-compiler/core/y.tab.c" break; case 441: /* string_fragment: "string literal" string_rep tSTRING */ -#line 4090 "mrbgems/mruby-compiler/core/parse.y" +#line 4058 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = push((yyvsp[-1].nd), (yyvsp[0].nd)); } -#line 10350 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10318 "mrbgems/mruby-compiler/core/y.tab.c" break; case 443: /* string_rep: string_rep string_interp */ -#line 4097 "mrbgems/mruby-compiler/core/parse.y" +#line 4065 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = append((yyvsp[-1].nd), (yyvsp[0].nd)); } -#line 10358 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10326 "mrbgems/mruby-compiler/core/y.tab.c" break; case 444: /* string_interp: tSTRING_MID */ -#line 4103 "mrbgems/mruby-compiler/core/parse.y" +#line 4071 "mrbgems/mruby-compiler/core/parse.y" { /* $1 is already in (len . str) format */ (yyval.nd) = list1((yyvsp[0].nd)); } -#line 10367 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10335 "mrbgems/mruby-compiler/core/y.tab.c" break; case 445: /* @29: %empty */ -#line 4108 "mrbgems/mruby-compiler/core/parse.y" +#line 4076 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = push_strterm(p); } -#line 10375 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10343 "mrbgems/mruby-compiler/core/y.tab.c" break; case 446: /* string_interp: tSTRING_PART @29 compstmt '}' */ -#line 4113 "mrbgems/mruby-compiler/core/parse.y" +#line 4081 "mrbgems/mruby-compiler/core/parse.y" { pop_strterm(p,(yyvsp[-2].nd)); /* $1 is already in (len . str) format, create (-1 . node) for expression */ node *expr_elem = cons(int_to_node(-1), (yyvsp[-1].nd)); (yyval.nd) = list2((yyvsp[-3].nd), expr_elem); } -#line 10386 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10354 "mrbgems/mruby-compiler/core/y.tab.c" break; case 447: /* string_interp: tLITERAL_DELIM */ -#line 4120 "mrbgems/mruby-compiler/core/parse.y" +#line 4088 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list1(new_literal_delim(p)); } -#line 10394 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10362 "mrbgems/mruby-compiler/core/y.tab.c" break; case 448: /* string_interp: tHD_LITERAL_DELIM heredoc_bodies */ -#line 4124 "mrbgems/mruby-compiler/core/parse.y" +#line 4092 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list1(new_literal_delim(p)); } -#line 10402 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10370 "mrbgems/mruby-compiler/core/y.tab.c" break; case 449: /* xstring: tXSTRING_BEG tXSTRING */ -#line 4130 "mrbgems/mruby-compiler/core/parse.y" +#line 4098 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = cons((yyvsp[0].nd), (node*)NULL); } -#line 10410 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10378 "mrbgems/mruby-compiler/core/y.tab.c" break; case 450: /* xstring: tXSTRING_BEG string_rep tXSTRING */ -#line 4134 "mrbgems/mruby-compiler/core/parse.y" +#line 4102 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = push((yyvsp[-1].nd), (yyvsp[0].nd)); } -#line 10418 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10386 "mrbgems/mruby-compiler/core/y.tab.c" break; case 451: /* regexp: tREGEXP_BEG tREGEXP */ -#line 4140 "mrbgems/mruby-compiler/core/parse.y" +#line 4108 "mrbgems/mruby-compiler/core/parse.y" { node *data = (yyvsp[0].nd); /* ((len . pattern) . (flags . encoding)) */ const char *flags = (const char*)data->cdr->car; @@ -10427,11 +10395,11 @@ yyreduce: node *pattern_list = cons(data->car, (node*)NULL); (yyval.nd) = new_dregx(p, pattern_list, flags, encoding); } -#line 10431 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10399 "mrbgems/mruby-compiler/core/y.tab.c" break; case 452: /* regexp: tREGEXP_BEG string_rep tREGEXP */ -#line 4149 "mrbgems/mruby-compiler/core/parse.y" +#line 4117 "mrbgems/mruby-compiler/core/parse.y" { node *data = (yyvsp[0].nd); /* ((len . pattern) . (flags . encoding)) */ const char *flags = (const char*)data->cdr->car; @@ -10440,47 +10408,47 @@ yyreduce: node *complete_list = push((yyvsp[-1].nd), data->car); (yyval.nd) = new_dregx(p, complete_list, flags, encoding); } -#line 10444 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10412 "mrbgems/mruby-compiler/core/y.tab.c" break; case 456: /* heredoc_body: tHEREDOC_END */ -#line 4167 "mrbgems/mruby-compiler/core/parse.y" +#line 4135 "mrbgems/mruby-compiler/core/parse.y" { parser_heredoc_info *info = parsing_heredoc_info(p); info->doc = push(info->doc, new_str_empty(p)); heredoc_end(p); } -#line 10454 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10422 "mrbgems/mruby-compiler/core/y.tab.c" break; case 457: /* heredoc_body: heredoc_string_rep tHEREDOC_END */ -#line 4173 "mrbgems/mruby-compiler/core/parse.y" +#line 4141 "mrbgems/mruby-compiler/core/parse.y" { heredoc_end(p); } -#line 10462 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10430 "mrbgems/mruby-compiler/core/y.tab.c" break; case 460: /* heredoc_string_interp: tHD_STRING_MID */ -#line 4183 "mrbgems/mruby-compiler/core/parse.y" +#line 4151 "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 10472 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10440 "mrbgems/mruby-compiler/core/y.tab.c" break; case 461: /* @30: %empty */ -#line 4189 "mrbgems/mruby-compiler/core/parse.y" +#line 4157 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = push_strterm(p); } -#line 10480 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10448 "mrbgems/mruby-compiler/core/y.tab.c" break; case 462: /* heredoc_string_interp: tHD_STRING_PART @30 compstmt '}' */ -#line 4194 "mrbgems/mruby-compiler/core/parse.y" +#line 4162 "mrbgems/mruby-compiler/core/parse.y" { pop_strterm(p, (yyvsp[-2].nd)); parser_heredoc_info *info = parsing_heredoc_info(p); @@ -10488,37 +10456,37 @@ yyreduce: node *expr_elem = cons(int_to_node(-1), (yyvsp[-1].nd)); info->doc = push(push(info->doc, (yyvsp[-3].nd)), expr_elem); } -#line 10492 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10460 "mrbgems/mruby-compiler/core/y.tab.c" break; case 463: /* words: tWORDS_BEG tSTRING */ -#line 4204 "mrbgems/mruby-compiler/core/parse.y" +#line 4172 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_words(p, list1((yyvsp[0].nd))); } -#line 10500 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10468 "mrbgems/mruby-compiler/core/y.tab.c" break; case 464: /* words: tWORDS_BEG string_rep tSTRING */ -#line 4208 "mrbgems/mruby-compiler/core/parse.y" +#line 4176 "mrbgems/mruby-compiler/core/parse.y" { node *n = (yyvsp[-1].nd); n = push(n, (yyvsp[0].nd)); (yyval.nd) = new_words(p, n); } -#line 10510 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10478 "mrbgems/mruby-compiler/core/y.tab.c" break; case 465: /* symbol: basic_symbol */ -#line 4216 "mrbgems/mruby-compiler/core/parse.y" +#line 4184 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_sym(p, (yyvsp[0].id)); } -#line 10518 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10486 "mrbgems/mruby-compiler/core/y.tab.c" break; case 466: /* symbol: "symbol" "string literal" string_rep tSTRING */ -#line 4220 "mrbgems/mruby-compiler/core/parse.y" +#line 4188 "mrbgems/mruby-compiler/core/parse.y" { node *n = (yyvsp[-1].nd); p->lstate = EXPR_ENDARG; @@ -10530,183 +10498,183 @@ yyreduce: } (yyval.nd) = new_dsym(p, new_str(p, n)); } -#line 10534 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10502 "mrbgems/mruby-compiler/core/y.tab.c" break; case 467: /* symbol: "symbol" "numbered parameter" */ -#line 4232 "mrbgems/mruby-compiler/core/parse.y" +#line 4200 "mrbgems/mruby-compiler/core/parse.y" { mrb_sym sym = intern_numparam((yyvsp[0].num)); (yyval.nd) = new_sym(p, sym); } -#line 10543 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10511 "mrbgems/mruby-compiler/core/y.tab.c" break; case 468: /* basic_symbol: "symbol" sym */ -#line 4239 "mrbgems/mruby-compiler/core/parse.y" +#line 4207 "mrbgems/mruby-compiler/core/parse.y" { p->lstate = EXPR_END; (yyval.id) = (yyvsp[0].id); } -#line 10552 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10520 "mrbgems/mruby-compiler/core/y.tab.c" break; case 473: /* sym: tSTRING */ -#line 4250 "mrbgems/mruby-compiler/core/parse.y" +#line 4218 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = new_strsym(p, (yyvsp[0].nd)); } -#line 10560 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10528 "mrbgems/mruby-compiler/core/y.tab.c" break; case 474: /* sym: "string literal" tSTRING */ -#line 4254 "mrbgems/mruby-compiler/core/parse.y" +#line 4222 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = new_strsym(p, (yyvsp[0].nd)); } -#line 10568 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10536 "mrbgems/mruby-compiler/core/y.tab.c" break; case 475: /* symbols: tSYMBOLS_BEG tSTRING */ -#line 4260 "mrbgems/mruby-compiler/core/parse.y" +#line 4228 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_symbols(p, list1((yyvsp[0].nd))); } -#line 10576 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10544 "mrbgems/mruby-compiler/core/y.tab.c" break; case 476: /* symbols: tSYMBOLS_BEG string_rep tSTRING */ -#line 4264 "mrbgems/mruby-compiler/core/parse.y" +#line 4232 "mrbgems/mruby-compiler/core/parse.y" { node *n = (yyvsp[-1].nd); n = push(n, (yyvsp[0].nd)); (yyval.nd) = new_symbols(p, n); } -#line 10586 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10554 "mrbgems/mruby-compiler/core/y.tab.c" break; case 479: /* numeric: tUMINUS_NUM "integer literal" */ -#line 4274 "mrbgems/mruby-compiler/core/parse.y" +#line 4242 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_negate(p, (yyvsp[0].nd)); } +#line 10562 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 480: /* numeric: tUMINUS_NUM "float literal" */ +#line 4246 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_negate(p, (yyvsp[0].nd)); + } +#line 10570 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 481: /* variable: "local variable or method" */ +#line 4252 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_lvar(p, (yyvsp[0].id)); + } +#line 10578 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 482: /* variable: "instance variable" */ +#line 4256 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_ivar(p, (yyvsp[0].id)); + } +#line 10586 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 483: /* variable: "global variable" */ +#line 4260 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_gvar(p, (yyvsp[0].id)); + } #line 10594 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 480: /* numeric: tUMINUS_NUM "float literal" */ -#line 4278 "mrbgems/mruby-compiler/core/parse.y" + case 484: /* variable: "class variable" */ +#line 4264 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_negate(p, (yyvsp[0].nd)); + (yyval.nd) = new_cvar(p, (yyvsp[0].id)); } #line 10602 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 481: /* variable: "local variable or method" */ -#line 4284 "mrbgems/mruby-compiler/core/parse.y" + case 485: /* variable: "constant" */ +#line 4268 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_lvar(p, (yyvsp[0].id)); + (yyval.nd) = new_const(p, (yyvsp[0].id)); } #line 10610 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 482: /* variable: "instance variable" */ -#line 4288 "mrbgems/mruby-compiler/core/parse.y" + case 486: /* var_lhs: variable */ +#line 4274 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_ivar(p, (yyvsp[0].id)); + assignable(p, (yyvsp[0].nd)); } #line 10618 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 483: /* variable: "global variable" */ -#line 4292 "mrbgems/mruby-compiler/core/parse.y" + case 487: /* var_lhs: "numbered parameter" */ +#line 4278 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_gvar(p, (yyvsp[0].id)); + yyerror(&(yylsp[0]), p, "can't assign to numbered parameter"); } #line 10626 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 484: /* variable: "class variable" */ -#line 4296 "mrbgems/mruby-compiler/core/parse.y" + case 488: /* var_ref: variable */ +#line 4284 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_cvar(p, (yyvsp[0].id)); + (yyval.nd) = var_reference(p, (yyvsp[0].nd)); } #line 10634 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 485: /* variable: "constant" */ -#line 4300 "mrbgems/mruby-compiler/core/parse.y" + case 489: /* var_ref: "numbered parameter" */ +#line 4288 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_const(p, (yyvsp[0].id)); + (yyval.nd) = new_nvar(p, (yyvsp[0].num)); } #line 10642 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 486: /* var_lhs: variable */ -#line 4306 "mrbgems/mruby-compiler/core/parse.y" + case 490: /* var_ref: "'nil'" */ +#line 4292 "mrbgems/mruby-compiler/core/parse.y" { - assignable(p, (yyvsp[0].nd)); + (yyval.nd) = new_nil(p); } #line 10650 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 487: /* var_lhs: "numbered parameter" */ -#line 4310 "mrbgems/mruby-compiler/core/parse.y" + case 491: /* var_ref: "'self'" */ +#line 4296 "mrbgems/mruby-compiler/core/parse.y" { - yyerror(&(yylsp[0]), p, "can't assign to numbered parameter"); + (yyval.nd) = new_self(p); } #line 10658 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 488: /* var_ref: variable */ -#line 4316 "mrbgems/mruby-compiler/core/parse.y" + case 492: /* var_ref: "'true'" */ +#line 4300 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = var_reference(p, (yyvsp[0].nd)); + (yyval.nd) = new_true(p); } #line 10666 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 489: /* var_ref: "numbered parameter" */ -#line 4320 "mrbgems/mruby-compiler/core/parse.y" + case 493: /* var_ref: "'false'" */ +#line 4304 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_nvar(p, (yyvsp[0].num)); + (yyval.nd) = new_false(p); } #line 10674 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 490: /* var_ref: "'nil'" */ -#line 4324 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_nil(p); - } -#line 10682 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 491: /* var_ref: "'self'" */ -#line 4328 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_self(p); - } -#line 10690 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 492: /* var_ref: "'true'" */ -#line 4332 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_true(p); - } -#line 10698 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 493: /* var_ref: "'false'" */ -#line 4336 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_false(p); - } -#line 10706 "mrbgems/mruby-compiler/core/y.tab.c" - break; - case 494: /* var_ref: "'__FILE__'" */ -#line 4340 "mrbgems/mruby-compiler/core/parse.y" +#line 4308 "mrbgems/mruby-compiler/core/parse.y" { const char *fn = mrb_sym_name_len(p->mrb, p->filename_sym, NULL); if (!fn) { @@ -10714,686 +10682,686 @@ yyreduce: } (yyval.nd) = new_str(p, cons(cons(int_to_node(strlen(fn)), (node*)fn), (node*)NULL)); } -#line 10718 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10686 "mrbgems/mruby-compiler/core/y.tab.c" break; case 495: /* var_ref: "'__LINE__'" */ -#line 4348 "mrbgems/mruby-compiler/core/parse.y" +#line 4316 "mrbgems/mruby-compiler/core/parse.y" { char buf[16]; dump_int(p->lineno, buf); (yyval.nd) = new_int(p, buf, 10, 0); } -#line 10729 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10697 "mrbgems/mruby-compiler/core/y.tab.c" break; case 496: /* var_ref: "'__ENCODING__'" */ -#line 4355 "mrbgems/mruby-compiler/core/parse.y" +#line 4323 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_fcall(p, MRB_SYM_2(p->mrb, __ENCODING__), 0); } -#line 10737 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10705 "mrbgems/mruby-compiler/core/y.tab.c" break; case 499: /* superclass: %empty */ -#line 4365 "mrbgems/mruby-compiler/core/parse.y" +#line 4333 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = 0; } -#line 10745 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10713 "mrbgems/mruby-compiler/core/y.tab.c" break; case 500: /* $@31: %empty */ -#line 4369 "mrbgems/mruby-compiler/core/parse.y" +#line 4337 "mrbgems/mruby-compiler/core/parse.y" { p->lstate = EXPR_BEG; p->cmd_start = TRUE; } -#line 10754 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10722 "mrbgems/mruby-compiler/core/y.tab.c" break; case 501: /* superclass: '<' $@31 expr_value term */ -#line 4374 "mrbgems/mruby-compiler/core/parse.y" +#line 4342 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-1].nd); } -#line 10762 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10730 "mrbgems/mruby-compiler/core/y.tab.c" break; case 504: /* f_arglist_paren: '(' f_args rparen */ -#line 4390 "mrbgems/mruby-compiler/core/parse.y" +#line 4358 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-1].nd); p->lstate = EXPR_BEG; p->cmd_start = TRUE; } +#line 10740 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 505: /* f_arglist_paren: '(' f_arg ',' tBDOT3 rparen */ +#line 4364 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_args_dots(p, (yyvsp[-3].nd)); + } +#line 10748 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 506: /* f_arglist_paren: '(' tBDOT3 rparen */ +#line 4368 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_args_dots(p, 0); + } +#line 10756 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 508: /* f_arglist: f_args term */ +#line 4375 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = (yyvsp[-1].nd); + } +#line 10764 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 509: /* f_arglist: f_arg ',' tBDOT3 term */ +#line 4379 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_args_dots(p, (yyvsp[-3].nd)); + } #line 10772 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 505: /* f_arglist_paren: '(' f_arg ',' tBDOT3 rparen */ -#line 4396 "mrbgems/mruby-compiler/core/parse.y" + case 510: /* f_arglist: "..." term */ +#line 4383 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args_dots(p, (yyvsp[-3].nd)); + (yyval.nd) = new_args_dots(p, 0); } #line 10780 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 506: /* f_arglist_paren: '(' tBDOT3 rparen */ -#line 4400 "mrbgems/mruby-compiler/core/parse.y" + case 511: /* f_label: "local variable or method" "label" */ +#line 4389 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args_dots(p, 0); + local_nest(p); } #line 10788 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 508: /* f_arglist: f_args term */ -#line 4407 "mrbgems/mruby-compiler/core/parse.y" + case 512: /* f_label: "numbered parameter" "label" */ +#line 4393 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = (yyvsp[-1].nd); + local_nest(p); } #line 10796 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 509: /* f_arglist: f_arg ',' tBDOT3 term */ -#line 4411 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_args_dots(p, (yyvsp[-3].nd)); - } -#line 10804 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 510: /* f_arglist: "..." term */ -#line 4415 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_args_dots(p, 0); - } -#line 10812 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 511: /* f_label: "local variable or method" "label" */ -#line 4421 "mrbgems/mruby-compiler/core/parse.y" - { - local_nest(p); - } -#line 10820 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 512: /* f_label: "numbered parameter" "label" */ -#line 4425 "mrbgems/mruby-compiler/core/parse.y" - { - local_nest(p); - } -#line 10828 "mrbgems/mruby-compiler/core/y.tab.c" - break; - case 513: /* f_kw: f_label arg */ -#line 4431 "mrbgems/mruby-compiler/core/parse.y" +#line 4399 "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 10838 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10806 "mrbgems/mruby-compiler/core/y.tab.c" break; case 514: /* f_kw: f_label */ -#line 4437 "mrbgems/mruby-compiler/core/parse.y" +#line 4405 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_kw_arg(p, (yyvsp[0].id), 0); local_unnest(p); } -#line 10847 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10815 "mrbgems/mruby-compiler/core/y.tab.c" break; case 515: /* f_block_kw: f_label primary_value */ -#line 4444 "mrbgems/mruby-compiler/core/parse.y" +#line 4412 "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 10857 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10825 "mrbgems/mruby-compiler/core/y.tab.c" break; case 516: /* f_block_kw: f_label */ -#line 4450 "mrbgems/mruby-compiler/core/parse.y" +#line 4418 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_kw_arg(p, (yyvsp[0].id), 0); local_unnest(p); } +#line 10834 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 517: /* f_block_kwarg: f_block_kw */ +#line 4425 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = list1((yyvsp[0].nd)); + } +#line 10842 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 518: /* f_block_kwarg: f_block_kwarg ',' f_block_kw */ +#line 4429 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); + } +#line 10850 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 519: /* f_kwarg: f_kw */ +#line 4435 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = list1((yyvsp[0].nd)); + } +#line 10858 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 520: /* f_kwarg: f_kwarg ',' f_kw */ +#line 4439 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); + } #line 10866 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 517: /* f_block_kwarg: f_block_kw */ -#line 4457 "mrbgems/mruby-compiler/core/parse.y" + case 523: /* f_kwrest: kwrest_mark "local variable or method" */ +#line 4449 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = list1((yyvsp[0].nd)); + (yyval.id) = (yyvsp[0].id); } #line 10874 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 518: /* f_block_kwarg: f_block_kwarg ',' f_block_kw */ -#line 4461 "mrbgems/mruby-compiler/core/parse.y" + case 524: /* f_kwrest: kwrest_mark */ +#line 4453 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); + (yyval.id) = intern_op(pow); } #line 10882 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 519: /* f_kwarg: f_kw */ -#line 4467 "mrbgems/mruby-compiler/core/parse.y" + case 525: /* args_tail: f_kwarg ',' f_kwrest opt_f_block_arg */ +#line 4459 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = list1((yyvsp[0].nd)); + (yyval.nd) = new_args_tail(p, (yyvsp[-3].nd), (yyvsp[-1].id), (yyvsp[0].id)); } #line 10890 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 520: /* f_kwarg: f_kwarg ',' f_kw */ -#line 4471 "mrbgems/mruby-compiler/core/parse.y" + case 526: /* args_tail: f_kwarg opt_f_block_arg */ +#line 4463 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); + (yyval.nd) = new_args_tail(p, (yyvsp[-1].nd), 0, (yyvsp[0].id)); } #line 10898 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 523: /* f_kwrest: kwrest_mark "local variable or method" */ -#line 4481 "mrbgems/mruby-compiler/core/parse.y" + case 527: /* args_tail: f_kwrest opt_f_block_arg */ +#line 4467 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.id) = (yyvsp[0].id); + (yyval.nd) = new_args_tail(p, 0, (yyvsp[-1].id), (yyvsp[0].id)); } #line 10906 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 524: /* f_kwrest: kwrest_mark */ -#line 4485 "mrbgems/mruby-compiler/core/parse.y" + case 528: /* args_tail: f_block_arg */ +#line 4471 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.id) = intern_op(pow); + (yyval.nd) = new_args_tail(p, 0, 0, (yyvsp[0].id)); } #line 10914 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 525: /* args_tail: f_kwarg ',' f_kwrest opt_f_block_arg */ -#line 4491 "mrbgems/mruby-compiler/core/parse.y" + case 529: /* opt_args_tail: ',' args_tail */ +#line 4477 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args_tail(p, (yyvsp[-3].nd), (yyvsp[-1].id), (yyvsp[0].id)); + (yyval.nd) = (yyvsp[0].nd); } #line 10922 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 526: /* args_tail: f_kwarg opt_f_block_arg */ -#line 4495 "mrbgems/mruby-compiler/core/parse.y" + case 530: /* opt_args_tail: %empty */ +#line 4481 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args_tail(p, (yyvsp[-1].nd), 0, (yyvsp[0].id)); + (yyval.nd) = new_args_tail(p, 0, 0, 0); } #line 10930 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 527: /* args_tail: f_kwrest opt_f_block_arg */ -#line 4499 "mrbgems/mruby-compiler/core/parse.y" + case 531: /* f_args: f_arg ',' f_optarg ',' f_rest_arg opt_args_tail */ +#line 4487 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args_tail(p, 0, (yyvsp[-1].id), (yyvsp[0].id)); + (yyval.nd) = new_args(p, (yyvsp[-5].nd), (yyvsp[-3].nd), (yyvsp[-1].id), 0, (yyvsp[0].nd)); } #line 10938 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 528: /* args_tail: f_block_arg */ -#line 4503 "mrbgems/mruby-compiler/core/parse.y" + case 532: /* f_args: f_arg ',' f_optarg ',' f_rest_arg ',' f_arg opt_args_tail */ +#line 4491 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args_tail(p, 0, 0, (yyvsp[0].id)); + (yyval.nd) = new_args(p, (yyvsp[-7].nd), (yyvsp[-5].nd), (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd)); } #line 10946 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 529: /* opt_args_tail: ',' args_tail */ -#line 4509 "mrbgems/mruby-compiler/core/parse.y" + case 533: /* f_args: f_arg ',' f_optarg opt_args_tail */ +#line 4495 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = (yyvsp[0].nd); + (yyval.nd) = new_args(p, (yyvsp[-3].nd), (yyvsp[-1].nd), 0, 0, (yyvsp[0].nd)); } #line 10954 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 530: /* opt_args_tail: %empty */ -#line 4513 "mrbgems/mruby-compiler/core/parse.y" + case 534: /* f_args: f_arg ',' f_optarg ',' f_arg opt_args_tail */ +#line 4499 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args_tail(p, 0, 0, 0); + (yyval.nd) = new_args(p, (yyvsp[-5].nd), (yyvsp[-3].nd), 0, (yyvsp[-1].nd), (yyvsp[0].nd)); } #line 10962 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 531: /* f_args: f_arg ',' f_optarg ',' f_rest_arg opt_args_tail */ -#line 4519 "mrbgems/mruby-compiler/core/parse.y" + case 535: /* f_args: f_arg ',' f_rest_arg opt_args_tail */ +#line 4503 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, (yyvsp[-5].nd), (yyvsp[-3].nd), (yyvsp[-1].id), 0, (yyvsp[0].nd)); + (yyval.nd) = new_args(p, (yyvsp[-3].nd), 0, (yyvsp[-1].id), 0, (yyvsp[0].nd)); } #line 10970 "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 4523 "mrbgems/mruby-compiler/core/parse.y" + case 536: /* f_args: f_arg ',' f_rest_arg ',' f_arg opt_args_tail */ +#line 4507 "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)); + (yyval.nd) = new_args(p, (yyvsp[-5].nd), 0, (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd)); } #line 10978 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 533: /* f_args: f_arg ',' f_optarg opt_args_tail */ -#line 4527 "mrbgems/mruby-compiler/core/parse.y" + case 537: /* f_args: f_arg opt_args_tail */ +#line 4511 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, (yyvsp[-3].nd), (yyvsp[-1].nd), 0, 0, (yyvsp[0].nd)); + (yyval.nd) = new_args(p, (yyvsp[-1].nd), 0, 0, 0, (yyvsp[0].nd)); } #line 10986 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 534: /* f_args: f_arg ',' f_optarg ',' f_arg opt_args_tail */ -#line 4531 "mrbgems/mruby-compiler/core/parse.y" + case 538: /* f_args: f_optarg ',' f_rest_arg opt_args_tail */ +#line 4515 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, (yyvsp[-5].nd), (yyvsp[-3].nd), 0, (yyvsp[-1].nd), (yyvsp[0].nd)); + (yyval.nd) = new_args(p, 0, (yyvsp[-3].nd), (yyvsp[-1].id), 0, (yyvsp[0].nd)); } #line 10994 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 535: /* f_args: f_arg ',' f_rest_arg opt_args_tail */ -#line 4535 "mrbgems/mruby-compiler/core/parse.y" + case 539: /* f_args: f_optarg ',' f_rest_arg ',' f_arg opt_args_tail */ +#line 4519 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, (yyvsp[-3].nd), 0, (yyvsp[-1].id), 0, (yyvsp[0].nd)); + (yyval.nd) = new_args(p, 0, (yyvsp[-5].nd), (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd)); } #line 11002 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 536: /* f_args: f_arg ',' f_rest_arg ',' f_arg opt_args_tail */ -#line 4539 "mrbgems/mruby-compiler/core/parse.y" + case 540: /* f_args: f_optarg opt_args_tail */ +#line 4523 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, (yyvsp[-5].nd), 0, (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd)); + (yyval.nd) = new_args(p, 0, (yyvsp[-1].nd), 0, 0, (yyvsp[0].nd)); } #line 11010 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 537: /* f_args: f_arg opt_args_tail */ -#line 4543 "mrbgems/mruby-compiler/core/parse.y" + case 541: /* f_args: f_optarg ',' f_arg opt_args_tail */ +#line 4527 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, (yyvsp[-1].nd), 0, 0, 0, (yyvsp[0].nd)); + (yyval.nd) = new_args(p, 0, (yyvsp[-3].nd), 0, (yyvsp[-1].nd), (yyvsp[0].nd)); } #line 11018 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 538: /* f_args: f_optarg ',' f_rest_arg opt_args_tail */ -#line 4547 "mrbgems/mruby-compiler/core/parse.y" + case 542: /* f_args: f_rest_arg opt_args_tail */ +#line 4531 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, 0, (yyvsp[-3].nd), (yyvsp[-1].id), 0, (yyvsp[0].nd)); + (yyval.nd) = new_args(p, 0, 0, (yyvsp[-1].id), 0, (yyvsp[0].nd)); } #line 11026 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 539: /* f_args: f_optarg ',' f_rest_arg ',' f_arg opt_args_tail */ -#line 4551 "mrbgems/mruby-compiler/core/parse.y" + case 543: /* f_args: f_rest_arg ',' f_arg opt_args_tail */ +#line 4535 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, 0, (yyvsp[-5].nd), (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd)); + (yyval.nd) = new_args(p, 0, 0, (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd)); } #line 11034 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 540: /* f_args: f_optarg opt_args_tail */ -#line 4555 "mrbgems/mruby-compiler/core/parse.y" + case 544: /* f_args: args_tail */ +#line 4539 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, 0, (yyvsp[-1].nd), 0, 0, (yyvsp[0].nd)); + (yyval.nd) = new_args(p, 0, 0, 0, 0, (yyvsp[0].nd)); } #line 11042 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 541: /* f_args: f_optarg ',' f_arg opt_args_tail */ -#line 4559 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_args(p, 0, (yyvsp[-3].nd), 0, (yyvsp[-1].nd), (yyvsp[0].nd)); - } -#line 11050 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 542: /* f_args: f_rest_arg opt_args_tail */ -#line 4563 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_args(p, 0, 0, (yyvsp[-1].id), 0, (yyvsp[0].nd)); - } -#line 11058 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 543: /* f_args: f_rest_arg ',' f_arg opt_args_tail */ -#line 4567 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_args(p, 0, 0, (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd)); - } -#line 11066 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 544: /* f_args: args_tail */ -#line 4571 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_args(p, 0, 0, 0, 0, (yyvsp[0].nd)); - } -#line 11074 "mrbgems/mruby-compiler/core/y.tab.c" - break; - case 545: /* f_args: %empty */ -#line 4575 "mrbgems/mruby-compiler/core/parse.y" +#line 4543 "mrbgems/mruby-compiler/core/parse.y" { local_add_f(p, 0); (yyval.nd) = new_args(p, 0, 0, 0, 0, 0); } -#line 11083 "mrbgems/mruby-compiler/core/y.tab.c" +#line 11051 "mrbgems/mruby-compiler/core/y.tab.c" break; case 546: /* f_bad_arg: "constant" */ -#line 4582 "mrbgems/mruby-compiler/core/parse.y" +#line 4550 "mrbgems/mruby-compiler/core/parse.y" { yyerror(&(yylsp[0]), p, "formal argument cannot be a constant"); (yyval.nd) = 0; } -#line 11092 "mrbgems/mruby-compiler/core/y.tab.c" +#line 11060 "mrbgems/mruby-compiler/core/y.tab.c" break; case 547: /* f_bad_arg: "instance variable" */ -#line 4587 "mrbgems/mruby-compiler/core/parse.y" +#line 4555 "mrbgems/mruby-compiler/core/parse.y" { yyerror(&(yylsp[0]), p, "formal argument cannot be an instance variable"); (yyval.nd) = 0; } -#line 11101 "mrbgems/mruby-compiler/core/y.tab.c" +#line 11069 "mrbgems/mruby-compiler/core/y.tab.c" break; case 548: /* f_bad_arg: "global variable" */ -#line 4592 "mrbgems/mruby-compiler/core/parse.y" +#line 4560 "mrbgems/mruby-compiler/core/parse.y" { yyerror(&(yylsp[0]), p, "formal argument cannot be a global variable"); (yyval.nd) = 0; } -#line 11110 "mrbgems/mruby-compiler/core/y.tab.c" +#line 11078 "mrbgems/mruby-compiler/core/y.tab.c" break; case 549: /* f_bad_arg: "class variable" */ -#line 4597 "mrbgems/mruby-compiler/core/parse.y" +#line 4565 "mrbgems/mruby-compiler/core/parse.y" { yyerror(&(yylsp[0]), p, "formal argument cannot be a class variable"); (yyval.nd) = 0; } -#line 11119 "mrbgems/mruby-compiler/core/y.tab.c" +#line 11087 "mrbgems/mruby-compiler/core/y.tab.c" break; case 550: /* f_bad_arg: "numbered parameter" */ -#line 4602 "mrbgems/mruby-compiler/core/parse.y" +#line 4570 "mrbgems/mruby-compiler/core/parse.y" { yyerror(&(yylsp[0]), p, "formal argument cannot be a numbered parameter"); (yyval.nd) = 0; } -#line 11128 "mrbgems/mruby-compiler/core/y.tab.c" +#line 11096 "mrbgems/mruby-compiler/core/y.tab.c" break; case 551: /* f_norm_arg: f_bad_arg */ -#line 4609 "mrbgems/mruby-compiler/core/parse.y" +#line 4577 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = 0; } -#line 11136 "mrbgems/mruby-compiler/core/y.tab.c" +#line 11104 "mrbgems/mruby-compiler/core/y.tab.c" break; case 552: /* f_norm_arg: "local variable or method" */ -#line 4613 "mrbgems/mruby-compiler/core/parse.y" +#line 4581 "mrbgems/mruby-compiler/core/parse.y" { local_add_f(p, (yyvsp[0].id)); (yyval.id) = (yyvsp[0].id); } -#line 11145 "mrbgems/mruby-compiler/core/y.tab.c" +#line 11113 "mrbgems/mruby-compiler/core/y.tab.c" break; case 553: /* f_arg_item: f_norm_arg */ -#line 4620 "mrbgems/mruby-compiler/core/parse.y" +#line 4588 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_lvar(p, (yyvsp[0].id)); } -#line 11153 "mrbgems/mruby-compiler/core/y.tab.c" +#line 11121 "mrbgems/mruby-compiler/core/y.tab.c" break; case 554: /* @32: %empty */ -#line 4624 "mrbgems/mruby-compiler/core/parse.y" +#line 4592 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = local_switch(p); } -#line 11161 "mrbgems/mruby-compiler/core/y.tab.c" +#line 11129 "mrbgems/mruby-compiler/core/y.tab.c" break; case 555: /* f_arg_item: tLPAREN @32 f_margs rparen */ -#line 4628 "mrbgems/mruby-compiler/core/parse.y" +#line 4596 "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 11171 "mrbgems/mruby-compiler/core/y.tab.c" +#line 11139 "mrbgems/mruby-compiler/core/y.tab.c" break; case 556: /* f_arg: f_arg_item */ -#line 4636 "mrbgems/mruby-compiler/core/parse.y" +#line 4604 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list1((yyvsp[0].nd)); } -#line 11179 "mrbgems/mruby-compiler/core/y.tab.c" +#line 11147 "mrbgems/mruby-compiler/core/y.tab.c" break; case 557: /* f_arg: f_arg ',' f_arg_item */ -#line 4640 "mrbgems/mruby-compiler/core/parse.y" +#line 4608 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 11187 "mrbgems/mruby-compiler/core/y.tab.c" +#line 11155 "mrbgems/mruby-compiler/core/y.tab.c" break; case 558: /* f_opt_asgn: "local variable or method" '=' */ -#line 4646 "mrbgems/mruby-compiler/core/parse.y" +#line 4614 "mrbgems/mruby-compiler/core/parse.y" { local_add_f(p, (yyvsp[-1].id)); local_nest(p); (yyval.id) = (yyvsp[-1].id); } -#line 11197 "mrbgems/mruby-compiler/core/y.tab.c" +#line 11165 "mrbgems/mruby-compiler/core/y.tab.c" break; case 559: /* f_opt: f_opt_asgn arg */ -#line 4654 "mrbgems/mruby-compiler/core/parse.y" +#line 4622 "mrbgems/mruby-compiler/core/parse.y" { void_expr_error(p, (yyvsp[0].nd)); (yyval.nd) = cons(sym_to_node((yyvsp[-1].id)), cons((yyvsp[0].nd), locals_node(p))); local_unnest(p); } -#line 11207 "mrbgems/mruby-compiler/core/y.tab.c" +#line 11175 "mrbgems/mruby-compiler/core/y.tab.c" break; case 560: /* f_block_opt: f_opt_asgn primary_value */ -#line 4662 "mrbgems/mruby-compiler/core/parse.y" +#line 4630 "mrbgems/mruby-compiler/core/parse.y" { void_expr_error(p, (yyvsp[0].nd)); (yyval.nd) = cons(sym_to_node((yyvsp[-1].id)), cons((yyvsp[0].nd), locals_node(p))); local_unnest(p); } +#line 11185 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 561: /* f_block_optarg: f_block_opt */ +#line 4638 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = list1((yyvsp[0].nd)); + } +#line 11193 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 562: /* f_block_optarg: f_block_optarg ',' f_block_opt */ +#line 4642 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); + } +#line 11201 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 563: /* f_optarg: f_opt */ +#line 4648 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = list1((yyvsp[0].nd)); + } +#line 11209 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 564: /* f_optarg: f_optarg ',' f_opt */ +#line 4652 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); + } #line 11217 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 561: /* f_block_optarg: f_block_opt */ -#line 4670 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = list1((yyvsp[0].nd)); - } -#line 11225 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 562: /* f_block_optarg: f_block_optarg ',' f_block_opt */ -#line 4674 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); - } -#line 11233 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 563: /* f_optarg: f_opt */ -#line 4680 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = list1((yyvsp[0].nd)); - } -#line 11241 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 564: /* f_optarg: f_optarg ',' f_opt */ -#line 4684 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); - } -#line 11249 "mrbgems/mruby-compiler/core/y.tab.c" - break; - case 567: /* f_rest_arg: restarg_mark "local variable or method" */ -#line 4694 "mrbgems/mruby-compiler/core/parse.y" +#line 4662 "mrbgems/mruby-compiler/core/parse.y" { local_add_f(p, (yyvsp[0].id)); (yyval.id) = (yyvsp[0].id); } -#line 11258 "mrbgems/mruby-compiler/core/y.tab.c" +#line 11226 "mrbgems/mruby-compiler/core/y.tab.c" break; case 568: /* f_rest_arg: restarg_mark */ -#line 4699 "mrbgems/mruby-compiler/core/parse.y" +#line 4667 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_op(mul); local_add_f(p, (yyval.id)); } -#line 11267 "mrbgems/mruby-compiler/core/y.tab.c" +#line 11235 "mrbgems/mruby-compiler/core/y.tab.c" break; case 571: /* f_block_arg: blkarg_mark "local variable or method" */ -#line 4710 "mrbgems/mruby-compiler/core/parse.y" +#line 4678 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = (yyvsp[0].id); } -#line 11275 "mrbgems/mruby-compiler/core/y.tab.c" +#line 11243 "mrbgems/mruby-compiler/core/y.tab.c" break; case 572: /* f_block_arg: blkarg_mark */ -#line 4714 "mrbgems/mruby-compiler/core/parse.y" +#line 4682 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_op(and); } -#line 11283 "mrbgems/mruby-compiler/core/y.tab.c" +#line 11251 "mrbgems/mruby-compiler/core/y.tab.c" break; case 573: /* opt_f_block_arg: ',' f_block_arg */ -#line 4720 "mrbgems/mruby-compiler/core/parse.y" +#line 4688 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = (yyvsp[0].id); } -#line 11291 "mrbgems/mruby-compiler/core/y.tab.c" +#line 11259 "mrbgems/mruby-compiler/core/y.tab.c" break; case 574: /* opt_f_block_arg: none */ -#line 4724 "mrbgems/mruby-compiler/core/parse.y" +#line 4692 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = 0; } -#line 11299 "mrbgems/mruby-compiler/core/y.tab.c" +#line 11267 "mrbgems/mruby-compiler/core/y.tab.c" break; case 575: /* singleton: var_ref */ -#line 4730 "mrbgems/mruby-compiler/core/parse.y" +#line 4698 "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 11309 "mrbgems/mruby-compiler/core/y.tab.c" +#line 11277 "mrbgems/mruby-compiler/core/y.tab.c" break; case 576: /* $@33: %empty */ -#line 4735 "mrbgems/mruby-compiler/core/parse.y" +#line 4703 "mrbgems/mruby-compiler/core/parse.y" {p->lstate = EXPR_BEG;} -#line 11315 "mrbgems/mruby-compiler/core/y.tab.c" +#line 11283 "mrbgems/mruby-compiler/core/y.tab.c" break; case 577: /* singleton: '(' $@33 expr rparen */ -#line 4736 "mrbgems/mruby-compiler/core/parse.y" +#line 4704 "mrbgems/mruby-compiler/core/parse.y" { prohibit_literals(p, (yyvsp[-1].nd)); (yyval.nd) = (yyvsp[-1].nd); } -#line 11324 "mrbgems/mruby-compiler/core/y.tab.c" +#line 11292 "mrbgems/mruby-compiler/core/y.tab.c" break; case 579: /* assoc_list: assocs trailer */ -#line 4744 "mrbgems/mruby-compiler/core/parse.y" +#line 4712 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-1].nd); } -#line 11332 "mrbgems/mruby-compiler/core/y.tab.c" +#line 11300 "mrbgems/mruby-compiler/core/y.tab.c" break; case 580: /* assocs: assoc */ -#line 4750 "mrbgems/mruby-compiler/core/parse.y" +#line 4718 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list1((yyvsp[0].nd)); } -#line 11340 "mrbgems/mruby-compiler/core/y.tab.c" +#line 11308 "mrbgems/mruby-compiler/core/y.tab.c" break; case 581: /* assocs: assocs comma assoc */ -#line 4754 "mrbgems/mruby-compiler/core/parse.y" +#line 4722 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 11348 "mrbgems/mruby-compiler/core/y.tab.c" +#line 11316 "mrbgems/mruby-compiler/core/y.tab.c" break; case 582: /* assoc: arg "=>" arg */ -#line 4760 "mrbgems/mruby-compiler/core/parse.y" +#line 4728 "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 11358 "mrbgems/mruby-compiler/core/y.tab.c" +#line 11326 "mrbgems/mruby-compiler/core/y.tab.c" break; case 583: /* assoc: "local variable or method" "label" arg */ -#line 4766 "mrbgems/mruby-compiler/core/parse.y" +#line 4734 "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 11367 "mrbgems/mruby-compiler/core/y.tab.c" +#line 11335 "mrbgems/mruby-compiler/core/y.tab.c" break; case 584: /* assoc: "local variable or method" "label" */ -#line 4771 "mrbgems/mruby-compiler/core/parse.y" +#line 4739 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = cons(new_sym(p, (yyvsp[-1].id)), label_reference(p, (yyvsp[-1].id))); } -#line 11375 "mrbgems/mruby-compiler/core/y.tab.c" +#line 11343 "mrbgems/mruby-compiler/core/y.tab.c" break; case 585: /* assoc: "numbered parameter" "label" */ -#line 4775 "mrbgems/mruby-compiler/core/parse.y" +#line 4743 "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 11384 "mrbgems/mruby-compiler/core/y.tab.c" +#line 11352 "mrbgems/mruby-compiler/core/y.tab.c" break; case 586: /* assoc: "numbered parameter" "label" arg */ -#line 4780 "mrbgems/mruby-compiler/core/parse.y" +#line 4748 "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 11393 "mrbgems/mruby-compiler/core/y.tab.c" +#line 11361 "mrbgems/mruby-compiler/core/y.tab.c" break; case 587: /* assoc: string_fragment "label" arg */ -#line 4785 "mrbgems/mruby-compiler/core/parse.y" +#line 4753 "mrbgems/mruby-compiler/core/parse.y" { void_expr_error(p, (yyvsp[0].nd)); if ((yyvsp[-2].nd)->cdr) { @@ -11409,75 +11377,75 @@ yyreduce: (yyval.nd) = cons(new_sym(p, new_strsym(p, (yyvsp[-2].nd)->car)), (yyvsp[0].nd)); } } -#line 11413 "mrbgems/mruby-compiler/core/y.tab.c" +#line 11381 "mrbgems/mruby-compiler/core/y.tab.c" break; case 588: /* assoc: "**" arg */ -#line 4801 "mrbgems/mruby-compiler/core/parse.y" +#line 4769 "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 11422 "mrbgems/mruby-compiler/core/y.tab.c" +#line 11390 "mrbgems/mruby-compiler/core/y.tab.c" break; case 589: /* assoc: "**" */ -#line 4806 "mrbgems/mruby-compiler/core/parse.y" +#line 4774 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = cons(new_kw_rest_args(p, 0), new_lvar(p, intern_op(pow))); } -#line 11430 "mrbgems/mruby-compiler/core/y.tab.c" +#line 11398 "mrbgems/mruby-compiler/core/y.tab.c" break; case 602: /* call_op: '.' */ -#line 4832 "mrbgems/mruby-compiler/core/parse.y" +#line 4800 "mrbgems/mruby-compiler/core/parse.y" { (yyval.num) = '.'; } -#line 11438 "mrbgems/mruby-compiler/core/y.tab.c" +#line 11406 "mrbgems/mruby-compiler/core/y.tab.c" break; case 603: /* call_op: "&." */ -#line 4836 "mrbgems/mruby-compiler/core/parse.y" +#line 4804 "mrbgems/mruby-compiler/core/parse.y" { (yyval.num) = 0; } -#line 11446 "mrbgems/mruby-compiler/core/y.tab.c" +#line 11414 "mrbgems/mruby-compiler/core/y.tab.c" break; case 605: /* call_op2: "::" */ -#line 4843 "mrbgems/mruby-compiler/core/parse.y" +#line 4811 "mrbgems/mruby-compiler/core/parse.y" { (yyval.num) = tCOLON2; } -#line 11454 "mrbgems/mruby-compiler/core/y.tab.c" +#line 11422 "mrbgems/mruby-compiler/core/y.tab.c" break; case 614: /* term: ';' */ -#line 4864 "mrbgems/mruby-compiler/core/parse.y" +#line 4832 "mrbgems/mruby-compiler/core/parse.y" {yyerrok;} -#line 11460 "mrbgems/mruby-compiler/core/y.tab.c" +#line 11428 "mrbgems/mruby-compiler/core/y.tab.c" break; case 616: /* nl: '\n' */ -#line 4869 "mrbgems/mruby-compiler/core/parse.y" +#line 4837 "mrbgems/mruby-compiler/core/parse.y" { p->lineno += (yyvsp[0].num); p->column = 0; } -#line 11469 "mrbgems/mruby-compiler/core/y.tab.c" +#line 11437 "mrbgems/mruby-compiler/core/y.tab.c" break; case 620: /* none: %empty */ -#line 4881 "mrbgems/mruby-compiler/core/parse.y" +#line 4849 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = 0; } -#line 11477 "mrbgems/mruby-compiler/core/y.tab.c" +#line 11445 "mrbgems/mruby-compiler/core/y.tab.c" break; -#line 11481 "mrbgems/mruby-compiler/core/y.tab.c" +#line 11449 "mrbgems/mruby-compiler/core/y.tab.c" default: break; } @@ -11710,7 +11678,7 @@ yyreturnlab: return yyresult; } -#line 4885 "mrbgems/mruby-compiler/core/parse.y" +#line 4853 "mrbgems/mruby-compiler/core/parse.y" #define pylval (*((YYSTYPE*)(p->ylval))) @@ -14259,11 +14227,6 @@ mrb_parser_new(mrb_state *mrb) 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; return p;