From c5e9af9c9d890578182a21e7b71b50334cd5579e Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Thu, 9 Mar 2023 09:31:46 -0800 Subject: Expand tabs in parse.y I used the same script as https://github.com/ruby/ruby/pull/6094 but for a .y file. --- parse.y | 14822 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 7411 insertions(+), 7411 deletions(-) (limited to 'parse.y') diff --git a/parse.y b/parse.y index a5e9d4fff7..b05f1ba76a 100644 --- a/parse.y +++ b/parse.y @@ -104,15 +104,15 @@ RBIMPL_WARNING_POP() #define YYFPRINTF rb_parser_printf #define YY_LOCATION_PRINT(File, loc) \ rb_parser_printf(p, "%d.%d-%d.%d", \ - (loc).beg_pos.lineno, (loc).beg_pos.column,\ - (loc).end_pos.lineno, (loc).end_pos.column) + (loc).beg_pos.lineno, (loc).beg_pos.column,\ + (loc).end_pos.lineno, (loc).end_pos.column) #define YYLLOC_DEFAULT(Current, Rhs, N) \ do \ if (N) \ - { \ - (Current).beg_pos = YYRHSLOC(Rhs, 1).beg_pos; \ - (Current).end_pos = YYRHSLOC(Rhs, N).end_pos; \ - } \ + { \ + (Current).beg_pos = YYRHSLOC(Rhs, 1).beg_pos; \ + (Current).end_pos = YYRHSLOC(Rhs, N).end_pos; \ + } \ else \ { \ (Current).beg_pos = YYRHSLOC(Rhs, 0).end_pos; \ @@ -137,8 +137,8 @@ RBIMPL_WARNING_POP() rb_parser_set_location(p, &(Current)) #define RUBY_INIT_YYLLOC() \ { \ - {p->ruby_sourceline, (int)(p->lex.ptok - p->lex.pbeg)}, \ - {p->ruby_sourceline, (int)(p->lex.pcur - p->lex.pbeg)}, \ + {p->ruby_sourceline, (int)(p->lex.ptok - p->lex.pbeg)}, \ + {p->ruby_sourceline, (int)(p->lex.pcur - p->lex.pbeg)}, \ } enum lex_state_bits { @@ -229,7 +229,7 @@ struct local_vars { struct local_vars *prev; # ifndef RIPPER struct { - NODE *outer, *inner, *current; + NODE *outer, *inner, *current; } numparam; # endif }; @@ -282,26 +282,26 @@ struct parser_params { YYLTYPE *yylloc; struct { - rb_strterm_t *strterm; - VALUE (*gets)(struct parser_params*,VALUE); - VALUE input; - VALUE lastline; - VALUE nextline; - const char *pbeg; - const char *pcur; - const char *pend; - const char *ptok; - union { - long ptr; - VALUE (*call)(VALUE, int); - } gets_; - enum lex_state_e state; - /* track the nest level of any parens "()[]{}" */ - int paren_nest; - /* keep p->lex.paren_nest at the beginning of lambda "->" to detect tLAMBEG and keyword_do_LAMBDA */ - int lpar_beg; - /* track the nest level of only braces "{}" */ - int brace_nest; + rb_strterm_t *strterm; + VALUE (*gets)(struct parser_params*,VALUE); + VALUE input; + VALUE lastline; + VALUE nextline; + const char *pbeg; + const char *pcur; + const char *pend; + const char *ptok; + union { + long ptr; + VALUE (*call)(VALUE, int); + } gets_; + enum lex_state_e state; + /* track the nest level of any parens "()[]{}" */ + int paren_nest; + /* keep p->lex.paren_nest at the beginning of lambda "->" to detect tLAMBEG and keyword_do_LAMBDA */ + int lpar_beg; + /* track the nest level of only braces "{}" */ + int brace_nest; } lex; stack_type cond_stack; stack_type cmdarg_stack; @@ -328,11 +328,11 @@ struct parser_params { VALUE debug_output; struct { - VALUE token; - int beg_line; - int beg_col; - int end_line; - int end_col; + VALUE token; + int beg_line; + int beg_col; + int end_line; + int end_col; } delayed; ID cur_arg; @@ -681,9 +681,9 @@ static inline VALUE add_mark_object(struct parser_params *p, VALUE obj) { if (!SPECIAL_CONST_P(obj) - && !RB_TYPE_P(obj, T_NODE) /* Ripper jumbles NODE objects and other objects... */ + && !RB_TYPE_P(obj, T_NODE) /* Ripper jumbles NODE objects and other objects... */ ) { - rb_ast_add_mark_object(p->ast, obj); + rb_ast_add_mark_object(p->ast, obj); } return obj; } @@ -712,7 +712,7 @@ set_line_body(NODE *body, int line) switch (nd_type(body)) { case NODE_RESCUE: case NODE_ENSURE: - nd_set_line(body, line); + nd_set_line(body, line); } } @@ -957,20 +957,20 @@ static void numparam_pop(struct parser_params *p, NODE *prev_inner); /* structs for managing terminator of string literal and heredocment */ typedef struct rb_strterm_literal_struct { union { - VALUE dummy; - long nest; + VALUE dummy; + long nest; } u0; union { - VALUE dummy; - long func; /* STR_FUNC_* (e.g., STR_FUNC_ESCAPE and STR_FUNC_EXPAND) */ + VALUE dummy; + long func; /* STR_FUNC_* (e.g., STR_FUNC_ESCAPE and STR_FUNC_EXPAND) */ } u1; union { - VALUE dummy; - long paren; /* '(' of `%q(...)` */ + VALUE dummy; + long paren; /* '(' of `%q(...)` */ } u2; union { - VALUE dummy; - long term; /* ')' of `%q(...)` */ + VALUE dummy; + long term; /* ')' of `%q(...)` */ } u3; } rb_strterm_literal_t; @@ -1003,8 +1003,8 @@ STATIC_ASSERT(rb_strterm_heredoc_t, sizeof(rb_strterm_heredoc_t) <= 4 * SIZEOF_V struct rb_strterm_struct { VALUE flags; union { - rb_strterm_literal_t literal; - rb_strterm_heredoc_t heredoc; + rb_strterm_literal_t literal; + rb_strterm_heredoc_t heredoc; } u; }; @@ -1014,8 +1014,8 @@ rb_strterm_mark(VALUE obj) { rb_strterm_t *strterm = (rb_strterm_t*)obj; if (RBASIC(obj)->flags & STRTERM_HEREDOC) { - rb_strterm_heredoc_t *heredoc = &strterm->u.heredoc; - rb_gc_mark(heredoc->lastline); + rb_strterm_heredoc_t *heredoc = &strterm->u.heredoc; + rb_gc_mark(heredoc->lastline); } } #endif @@ -1101,12 +1101,12 @@ new_array_pattern(struct parser_params *p, VALUE constant, VALUE pre_arg, VALUE VALUE pre_args = t->u1.value, rest_arg = t->u2.value, post_args = t->u3.value; if (!NIL_P(pre_arg)) { - if (!NIL_P(pre_args)) { - rb_ary_unshift(pre_args, pre_arg); - } - else { - pre_args = rb_ary_new_from_args(1, pre_arg); - } + if (!NIL_P(pre_args)) { + rb_ary_unshift(pre_args, pre_arg); + } + else { + pre_args = rb_ary_new_from_args(1, pre_arg); + } } return dispatch4(aryptn, constant, pre_args, rest_arg, post_args); } @@ -1117,10 +1117,10 @@ new_array_pattern_tail(struct parser_params *p, VALUE pre_args, VALUE has_rest, NODE *t; if (has_rest) { - rest_arg = dispatch1(var_field, rest_arg ? rest_arg : Qnil); + rest_arg = dispatch1(var_field, rest_arg ? rest_arg : Qnil); } else { - rest_arg = Qnil; + rest_arg = Qnil; } t = rb_node_newnode(NODE_ARYPTN, pre_args, rest_arg, post_args, &NULL_LOC); @@ -1175,10 +1175,10 @@ new_hash_pattern_tail(struct parser_params *p, VALUE kw_args, VALUE kw_rest_arg, { NODE *t; if (kw_rest_arg) { - kw_rest_arg = dispatch1(var_field, kw_rest_arg); + kw_rest_arg = dispatch1(var_field, kw_rest_arg); } else { - kw_rest_arg = Qnil; + kw_rest_arg = Qnil; } t = rb_node_newnode(NODE_HSHPTN, kw_args, kw_rest_arg, 0, &NULL_LOC); @@ -1210,7 +1210,7 @@ set_defun_body(struct parser_params *p, NODE *n, NODE *args, NODE *body, const Y static NODE * rescued_expr(struct parser_params *p, NODE *arg, NODE *rescue, - const YYLTYPE *arg_loc, const YYLTYPE *mod_loc, const YYLTYPE *res_loc) + const YYLTYPE *arg_loc, const YYLTYPE *mod_loc, const YYLTYPE *res_loc) { YYLTYPE loc = code_loc_gen(mod_loc, res_loc); rescue = NEW_RESBODY(0, remove_begin(rescue), 0, &loc); @@ -1237,19 +1237,19 @@ endless_method_name(struct parser_params *p, NODE *defn, const YYLTYPE *loc) #endif ID mid = defn->nd_mid; if (is_attrset_id(mid)) { - yyerror1(loc, "setter method cannot be defined in an endless method definition"); + yyerror1(loc, "setter method cannot be defined in an endless method definition"); } token_info_drop(p, "def", loc->beg_pos); } #define debug_token_line(p, name, line) do { \ - if (p->debug) { \ - const char *const pcur = p->lex.pcur; \ - const char *const ptok = p->lex.ptok; \ - rb_parser_printf(p, name ":%d (%d: %"PRIdPTRDIFF"|%"PRIdPTRDIFF"|%"PRIdPTRDIFF")\n", \ - line, p->ruby_sourceline, \ - ptok - p->lex.pbeg, pcur - ptok, p->lex.pend - pcur); \ - } \ + if (p->debug) { \ + const char *const pcur = p->lex.pcur; \ + const char *const ptok = p->lex.ptok; \ + rb_parser_printf(p, name ":%d (%d: %"PRIdPTRDIFF"|%"PRIdPTRDIFF"|%"PRIdPTRDIFF")\n", \ + line, p->ruby_sourceline, \ + ptok - p->lex.pbeg, pcur - ptok, p->lex.pend - pcur); \ + } \ } while (0) #ifndef RIPPER @@ -1339,7 +1339,7 @@ static int looking_at_eol_p(struct parser_params *p); %printer { #ifndef RIPPER if ($$) { - rb_parser_printf(p, "%s", ruby_node_name(nd_type($$))); + rb_parser_printf(p, "%s", ruby_node_name(nd_type($$))); } #else #endif @@ -1586,3346 +1586,3346 @@ static int looking_at_eol_p(struct parser_params *p); %% program : { - SET_LEX_STATE(EXPR_BEG); - local_push(p, ifndef_ripper(1)+0); - } - top_compstmt - { - /*%%%*/ - if ($2 && !compile_for_eval) { - NODE *node = $2; - /* last expression should not be void */ - if (nd_type_p(node, NODE_BLOCK)) { - while (node->nd_next) { - node = node->nd_next; - } - node = node->nd_head; - } - node = remove_begin(node); - void_expr(p, node); - } - p->eval_tree = NEW_SCOPE(0, block_append(p, p->eval_tree, $2), &@$); - /*% %*/ - /*% ripper[final]: program!($2) %*/ - local_pop(p); - } - ; + SET_LEX_STATE(EXPR_BEG); + local_push(p, ifndef_ripper(1)+0); + } + top_compstmt + { + /*%%%*/ + if ($2 && !compile_for_eval) { + NODE *node = $2; + /* last expression should not be void */ + if (nd_type_p(node, NODE_BLOCK)) { + while (node->nd_next) { + node = node->nd_next; + } + node = node->nd_head; + } + node = remove_begin(node); + void_expr(p, node); + } + p->eval_tree = NEW_SCOPE(0, block_append(p, p->eval_tree, $2), &@$); + /*% %*/ + /*% ripper[final]: program!($2) %*/ + local_pop(p); + } + ; top_compstmt : top_stmts opt_terms - { - $$ = void_stmts(p, $1); - } - ; + { + $$ = void_stmts(p, $1); + } + ; top_stmts : none { - /*%%%*/ - $$ = NEW_BEGIN(0, &@$); - /*% %*/ - /*% ripper: stmts_add!(stmts_new!, void_stmt!) %*/ - } - | top_stmt - { - /*%%%*/ - $$ = newline_node($1); - /*% %*/ - /*% ripper: stmts_add!(stmts_new!, $1) %*/ - } - | top_stmts terms top_stmt - { - /*%%%*/ - $$ = block_append(p, $1, newline_node($3)); - /*% %*/ - /*% ripper: stmts_add!($1, $3) %*/ - } - ; + /*%%%*/ + $$ = NEW_BEGIN(0, &@$); + /*% %*/ + /*% ripper: stmts_add!(stmts_new!, void_stmt!) %*/ + } + | top_stmt + { + /*%%%*/ + $$ = newline_node($1); + /*% %*/ + /*% ripper: stmts_add!(stmts_new!, $1) %*/ + } + | top_stmts terms top_stmt + { + /*%%%*/ + $$ = block_append(p, $1, newline_node($3)); + /*% %*/ + /*% ripper: stmts_add!($1, $3) %*/ + } + ; top_stmt : stmt - | keyword_BEGIN begin_block - { - $$ = $2; - } - ; + | keyword_BEGIN begin_block + { + $$ = $2; + } + ; begin_block : '{' top_compstmt '}' - { - /*%%%*/ - p->eval_tree_begin = block_append(p, p->eval_tree_begin, - NEW_BEGIN($2, &@$)); - $$ = NEW_BEGIN(0, &@$); - /*% %*/ - /*% ripper: BEGIN!($2) %*/ - } - ; + { + /*%%%*/ + p->eval_tree_begin = block_append(p, p->eval_tree_begin, + NEW_BEGIN($2, &@$)); + $$ = NEW_BEGIN(0, &@$); + /*% %*/ + /*% ripper: BEGIN!($2) %*/ + } + ; bodystmt : compstmt - opt_rescue - k_else {if (!$2) {yyerror1(&@3, "else without rescue is useless");}} - compstmt - opt_ensure - { - /*%%%*/ - $$ = new_bodystmt(p, $1, $2, $5, $6, &@$); - /*% %*/ - /*% ripper: bodystmt!(escape_Qundef($1), escape_Qundef($2), escape_Qundef($5), escape_Qundef($6)) %*/ - } - | compstmt - opt_rescue - opt_ensure - { - /*%%%*/ - $$ = new_bodystmt(p, $1, $2, 0, $3, &@$); - /*% %*/ - /*% ripper: bodystmt!(escape_Qundef($1), escape_Qundef($2), Qnil, escape_Qundef($3)) %*/ - } - ; + opt_rescue + k_else {if (!$2) {yyerror1(&@3, "else without rescue is useless");}} + compstmt + opt_ensure + { + /*%%%*/ + $$ = new_bodystmt(p, $1, $2, $5, $6, &@$); + /*% %*/ + /*% ripper: bodystmt!(escape_Qundef($1), escape_Qundef($2), escape_Qundef($5), escape_Qundef($6)) %*/ + } + | compstmt + opt_rescue + opt_ensure + { + /*%%%*/ + $$ = new_bodystmt(p, $1, $2, 0, $3, &@$); + /*% %*/ + /*% ripper: bodystmt!(escape_Qundef($1), escape_Qundef($2), Qnil, escape_Qundef($3)) %*/ + } + ; compstmt : stmts opt_terms - { - $$ = void_stmts(p, $1); - } - ; + { + $$ = void_stmts(p, $1); + } + ; stmts : none { - /*%%%*/ - $$ = NEW_BEGIN(0, &@$); - /*% %*/ - /*% ripper: stmts_add!(stmts_new!, void_stmt!) %*/ - } - | stmt_or_begin - { - /*%%%*/ - $$ = newline_node($1); - /*% %*/ - /*% ripper: stmts_add!(stmts_new!, $1) %*/ - } - | stmts terms stmt_or_begin - { - /*%%%*/ - $$ = block_append(p, $1, newline_node($3)); - /*% %*/ - /*% ripper: stmts_add!($1, $3) %*/ - } - ; + /*%%%*/ + $$ = NEW_BEGIN(0, &@$); + /*% %*/ + /*% ripper: stmts_add!(stmts_new!, void_stmt!) %*/ + } + | stmt_or_begin + { + /*%%%*/ + $$ = newline_node($1); + /*% %*/ + /*% ripper: stmts_add!(stmts_new!, $1) %*/ + } + | stmts terms stmt_or_begin + { + /*%%%*/ + $$ = block_append(p, $1, newline_node($3)); + /*% %*/ + /*% ripper: stmts_add!($1, $3) %*/ + } + ; stmt_or_begin : stmt { - $$ = $1; - } + $$ = $1; + } | keyword_BEGIN - { - yyerror1(&@1, "BEGIN is permitted only at toplevel"); - } - begin_block - { - $$ = $3; - } - ; + { + yyerror1(&@1, "BEGIN is permitted only at toplevel"); + } + begin_block + { + $$ = $3; + } + ; stmt : keyword_alias fitem {SET_LEX_STATE(EXPR_FNAME|EXPR_FITEM);} fitem - { - /*%%%*/ - $$ = NEW_ALIAS($2, $4, &@$); - /*% %*/ - /*% ripper: alias!($2, $4) %*/ - } - | keyword_alias tGVAR tGVAR - { - /*%%%*/ - $$ = NEW_VALIAS($2, $3, &@$); - /*% %*/ - /*% ripper: var_alias!($2, $3) %*/ - } - | keyword_alias tGVAR tBACK_REF - { - /*%%%*/ - char buf[2]; - buf[0] = '$'; - buf[1] = (char)$3->nd_nth; - $$ = NEW_VALIAS($2, rb_intern2(buf, 2), &@$); - /*% %*/ - /*% ripper: var_alias!($2, $3) %*/ - } - | keyword_alias tGVAR tNTH_REF - { - static const char mesg[] = "can't make alias for the number variables"; - /*%%%*/ - yyerror1(&@3, mesg); - $$ = NEW_BEGIN(0, &@$); - /*% %*/ - /*% ripper[error]: alias_error!(ERR_MESG(), $3) %*/ - } - | keyword_undef undef_list - { - /*%%%*/ - $$ = $2; - /*% %*/ - /*% ripper: undef!($2) %*/ - } - | stmt modifier_if expr_value - { - /*%%%*/ - $$ = new_if(p, $3, remove_begin($1), 0, &@$); - fixpos($$, $3); - /*% %*/ - /*% ripper: if_mod!($3, $1) %*/ - } - | stmt modifier_unless expr_value - { - /*%%%*/ - $$ = new_unless(p, $3, remove_begin($1), 0, &@$); - fixpos($$, $3); - /*% %*/ - /*% ripper: unless_mod!($3, $1) %*/ - } - | stmt modifier_while expr_value - { - /*%%%*/ - if ($1 && nd_type_p($1, NODE_BEGIN)) { - $$ = NEW_WHILE(cond(p, $3, &@3), $1->nd_body, 0, &@$); - } - else { - $$ = NEW_WHILE(cond(p, $3, &@3), $1, 1, &@$); - } - /*% %*/ - /*% ripper: while_mod!($3, $1) %*/ - } - | stmt modifier_until expr_value - { - /*%%%*/ - if ($1 && nd_type_p($1, NODE_BEGIN)) { - $$ = NEW_UNTIL(cond(p, $3, &@3), $1->nd_body, 0, &@$); - } - else { - $$ = NEW_UNTIL(cond(p, $3, &@3), $1, 1, &@$); - } - /*% %*/ - /*% ripper: until_mod!($3, $1) %*/ - } - | stmt modifier_rescue stmt - { - /*%%%*/ - NODE *resq; - YYLTYPE loc = code_loc_gen(&@2, &@3); - resq = NEW_RESBODY(0, remove_begin($3), 0, &loc); - $$ = NEW_RESCUE(remove_begin($1), resq, 0, &@$); - /*% %*/ - /*% ripper: rescue_mod!($1, $3) %*/ - } - | keyword_END '{' compstmt '}' - { - if (p->ctxt.in_def) { - rb_warn0("END in method; use at_exit"); - } - /*%%%*/ - { - NODE *scope = NEW_NODE( - NODE_SCOPE, 0 /* tbl */, $3 /* body */, 0 /* args */, &@$); - $$ = NEW_POSTEXE(scope, &@$); - } - /*% %*/ - /*% ripper: END!($3) %*/ - } - | command_asgn - | mlhs '=' lex_ctxt command_call - { - /*%%%*/ - value_expr($4); - $$ = node_assign(p, $1, $4, $3, &@$); - /*% %*/ - /*% ripper: massign!($1, $4) %*/ - } - | lhs '=' lex_ctxt mrhs - { - /*%%%*/ - $$ = node_assign(p, $1, $4, $3, &@$); - /*% %*/ - /*% ripper: assign!($1, $4) %*/ - } + { + /*%%%*/ + $$ = NEW_ALIAS($2, $4, &@$); + /*% %*/ + /*% ripper: alias!($2, $4) %*/ + } + | keyword_alias tGVAR tGVAR + { + /*%%%*/ + $$ = NEW_VALIAS($2, $3, &@$); + /*% %*/ + /*% ripper: var_alias!($2, $3) %*/ + } + | keyword_alias tGVAR tBACK_REF + { + /*%%%*/ + char buf[2]; + buf[0] = '$'; + buf[1] = (char)$3->nd_nth; + $$ = NEW_VALIAS($2, rb_intern2(buf, 2), &@$); + /*% %*/ + /*% ripper: var_alias!($2, $3) %*/ + } + | keyword_alias tGVAR tNTH_REF + { + static const char mesg[] = "can't make alias for the number variables"; + /*%%%*/ + yyerror1(&@3, mesg); + $$ = NEW_BEGIN(0, &@$); + /*% %*/ + /*% ripper[error]: alias_error!(ERR_MESG(), $3) %*/ + } + | keyword_undef undef_list + { + /*%%%*/ + $$ = $2; + /*% %*/ + /*% ripper: undef!($2) %*/ + } + | stmt modifier_if expr_value + { + /*%%%*/ + $$ = new_if(p, $3, remove_begin($1), 0, &@$); + fixpos($$, $3); + /*% %*/ + /*% ripper: if_mod!($3, $1) %*/ + } + | stmt modifier_unless expr_value + { + /*%%%*/ + $$ = new_unless(p, $3, remove_begin($1), 0, &@$); + fixpos($$, $3); + /*% %*/ + /*% ripper: unless_mod!($3, $1) %*/ + } + | stmt modifier_while expr_value + { + /*%%%*/ + if ($1 && nd_type_p($1, NODE_BEGIN)) { + $$ = NEW_WHILE(cond(p, $3, &@3), $1->nd_body, 0, &@$); + } + else { + $$ = NEW_WHILE(cond(p, $3, &@3), $1, 1, &@$); + } + /*% %*/ + /*% ripper: while_mod!($3, $1) %*/ + } + | stmt modifier_until expr_value + { + /*%%%*/ + if ($1 && nd_type_p($1, NODE_BEGIN)) { + $$ = NEW_UNTIL(cond(p, $3, &@3), $1->nd_body, 0, &@$); + } + else { + $$ = NEW_UNTIL(cond(p, $3, &@3), $1, 1, &@$); + } + /*% %*/ + /*% ripper: until_mod!($3, $1) %*/ + } + | stmt modifier_rescue stmt + { + /*%%%*/ + NODE *resq; + YYLTYPE loc = code_loc_gen(&@2, &@3); + resq = NEW_RESBODY(0, remove_begin($3), 0, &loc); + $$ = NEW_RESCUE(remove_begin($1), resq, 0, &@$); + /*% %*/ + /*% ripper: rescue_mod!($1, $3) %*/ + } + | keyword_END '{' compstmt '}' + { + if (p->ctxt.in_def) { + rb_warn0("END in method; use at_exit"); + } + /*%%%*/ + { + NODE *scope = NEW_NODE( + NODE_SCOPE, 0 /* tbl */, $3 /* body */, 0 /* args */, &@$); + $$ = NEW_POSTEXE(scope, &@$); + } + /*% %*/ + /*% ripper: END!($3) %*/ + } + | command_asgn + | mlhs '=' lex_ctxt command_call + { + /*%%%*/ + value_expr($4); + $$ = node_assign(p, $1, $4, $3, &@$); + /*% %*/ + /*% ripper: massign!($1, $4) %*/ + } + | lhs '=' lex_ctxt mrhs + { + /*%%%*/ + $$ = node_assign(p, $1, $4, $3, &@$); + /*% %*/ + /*% ripper: assign!($1, $4) %*/ + } | mlhs '=' lex_ctxt mrhs_arg modifier_rescue stmt { /*%%%*/ YYLTYPE loc = code_loc_gen(&@5, &@6); - $$ = node_assign(p, $1, NEW_RESCUE($4, NEW_RESBODY(0, remove_begin($6), 0, &loc), 0, &@$), $3, &@$); + $$ = node_assign(p, $1, NEW_RESCUE($4, NEW_RESBODY(0, remove_begin($6), 0, &loc), 0, &@$), $3, &@$); /*% %*/ /*% ripper: massign!($1, rescue_mod!($4, $6)) %*/ } - | mlhs '=' lex_ctxt mrhs_arg - { - /*%%%*/ - $$ = node_assign(p, $1, $4, $3, &@$); - /*% %*/ - /*% ripper: massign!($1, $4) %*/ - } - | expr - | error - { - (void)yynerrs; - /*%%%*/ - $$ = NEW_ERROR(&@$); - /*% %*/ - } - ; + | mlhs '=' lex_ctxt mrhs_arg + { + /*%%%*/ + $$ = node_assign(p, $1, $4, $3, &@$); + /*% %*/ + /*% ripper: massign!($1, $4) %*/ + } + | expr + | error + { + (void)yynerrs; + /*%%%*/ + $$ = NEW_ERROR(&@$); + /*% %*/ + } + ; command_asgn : lhs '=' lex_ctxt command_rhs - { - /*%%%*/ - $$ = node_assign(p, $1, $4, $3, &@$); - /*% %*/ - /*% ripper: assign!($1, $4) %*/ - } - | var_lhs tOP_ASGN lex_ctxt command_rhs - { - /*%%%*/ - $$ = new_op_assign(p, $1, $2, $4, $3, &@$); - /*% %*/ - /*% ripper: opassign!($1, $2, $4) %*/ - } - | primary_value '[' opt_call_args rbracket tOP_ASGN lex_ctxt command_rhs - { - /*%%%*/ - $$ = new_ary_op_assign(p, $1, $3, $5, $7, &@3, &@$); - /*% %*/ - /*% ripper: opassign!(aref_field!($1, escape_Qundef($3)), $5, $7) %*/ - - } - | primary_value call_op tIDENTIFIER tOP_ASGN lex_ctxt command_rhs - { - /*%%%*/ - $$ = new_attr_op_assign(p, $1, $2, $3, $4, $6, &@$); - /*% %*/ - /*% ripper: opassign!(field!($1, $2, $3), $4, $6) %*/ - } - | primary_value call_op tCONSTANT tOP_ASGN lex_ctxt command_rhs - { - /*%%%*/ - $$ = new_attr_op_assign(p, $1, $2, $3, $4, $6, &@$); - /*% %*/ - /*% ripper: opassign!(field!($1, $2, $3), $4, $6) %*/ - } - | primary_value tCOLON2 tCONSTANT tOP_ASGN lex_ctxt command_rhs - { - /*%%%*/ - YYLTYPE loc = code_loc_gen(&@1, &@3); - $$ = new_const_op_assign(p, NEW_COLON2($1, $3, &loc), $4, $6, $5, &@$); - /*% %*/ - /*% ripper: opassign!(const_path_field!($1, $3), $4, $6) %*/ - } - | primary_value tCOLON2 tIDENTIFIER tOP_ASGN lex_ctxt command_rhs - { - /*%%%*/ - $$ = new_attr_op_assign(p, $1, ID2VAL(idCOLON2), $3, $4, $6, &@$); - /*% %*/ - /*% ripper: opassign!(field!($1, ID2VAL(idCOLON2), $3), $4, $6) %*/ - } - | defn_head f_opt_paren_args '=' endless_command - { - endless_method_name(p, $1, &@1); - restore_defun(p, $1->nd_defn); - /*%%%*/ - $$ = set_defun_body(p, $1, $2, $4, &@$); - /*% %*/ - /*% ripper: def!(get_value($1), $2, bodystmt!($4, Qnil, Qnil, Qnil)) %*/ - local_pop(p); - } - | defs_head f_opt_paren_args '=' endless_command - { - endless_method_name(p, $1, &@1); - restore_defun(p, $1->nd_defn); - /*%%%*/ - $$ = set_defun_body(p, $1, $2, $4, &@$); - /*% - $1 = get_value($1); - %*/ - /*% ripper: defs!(AREF($1, 0), AREF($1, 1), AREF($1, 2), $2, bodystmt!($4, Qnil, Qnil, Qnil)) %*/ - local_pop(p); - } - | backref tOP_ASGN lex_ctxt command_rhs - { - /*%%%*/ - rb_backref_error(p, $1); - $$ = NEW_BEGIN(0, &@$); - /*% %*/ - /*% ripper[error]: backref_error(p, RNODE($1), assign!(var_field(p, $1), $4)) %*/ - } - ; + { + /*%%%*/ + $$ = node_assign(p, $1, $4, $3, &@$); + /*% %*/ + /*% ripper: assign!($1, $4) %*/ + } + | var_lhs tOP_ASGN lex_ctxt command_rhs + { + /*%%%*/ + $$ = new_op_assign(p, $1, $2, $4, $3, &@$); + /*% %*/ + /*% ripper: opassign!($1, $2, $4) %*/ + } + | primary_value '[' opt_call_args rbracket tOP_ASGN lex_ctxt command_rhs + { + /*%%%*/ + $$ = new_ary_op_assign(p, $1, $3, $5, $7, &@3, &@$); + /*% %*/ + /*% ripper: opassign!(aref_field!($1, escape_Qundef($3)), $5, $7) %*/ + + } + | primary_value call_op tIDENTIFIER tOP_ASGN lex_ctxt command_rhs + { + /*%%%*/ + $$ = new_attr_op_assign(p, $1, $2, $3, $4, $6, &@$); + /*% %*/ + /*% ripper: opassign!(field!($1, $2, $3), $4, $6) %*/ + } + | primary_value call_op tCONSTANT tOP_ASGN lex_ctxt command_rhs + { + /*%%%*/ + $$ = new_attr_op_assign(p, $1, $2, $3, $4, $6, &@$); + /*% %*/ + /*% ripper: opassign!(field!($1, $2, $3), $4, $6) %*/ + } + | primary_value tCOLON2 tCONSTANT tOP_ASGN lex_ctxt command_rhs + { + /*%%%*/ + YYLTYPE loc = code_loc_gen(&@1, &@3); + $$ = new_const_op_assign(p, NEW_COLON2($1, $3, &loc), $4, $6, $5, &@$); + /*% %*/ + /*% ripper: opassign!(const_path_field!($1, $3), $4, $6) %*/ + } + | primary_value tCOLON2 tIDENTIFIER tOP_ASGN lex_ctxt command_rhs + { + /*%%%*/ + $$ = new_attr_op_assign(p, $1, ID2VAL(idCOLON2), $3, $4, $6, &@$); + /*% %*/ + /*% ripper: opassign!(field!($1, ID2VAL(idCOLON2), $3), $4, $6) %*/ + } + | defn_head f_opt_paren_args '=' endless_command + { + endless_method_name(p, $1, &@1); + restore_defun(p, $1->nd_defn); + /*%%%*/ + $$ = set_defun_body(p, $1, $2, $4, &@$); + /*% %*/ + /*% ripper: def!(get_value($1), $2, bodystmt!($4, Qnil, Qnil, Qnil)) %*/ + local_pop(p); + } + | defs_head f_opt_paren_args '=' endless_command + { + endless_method_name(p, $1, &@1); + restore_defun(p, $1->nd_defn); + /*%%%*/ + $$ = set_defun_body(p, $1, $2, $4, &@$); + /*% + $1 = get_value($1); + %*/ + /*% ripper: defs!(AREF($1, 0), AREF($1, 1), AREF($1, 2), $2, bodystmt!($4, Qnil, Qnil, Qnil)) %*/ + local_pop(p); + } + | backref tOP_ASGN lex_ctxt command_rhs + { + /*%%%*/ + rb_backref_error(p, $1); + $$ = NEW_BEGIN(0, &@$); + /*% %*/ + /*% ripper[error]: backref_error(p, RNODE($1), assign!(var_field(p, $1), $4)) %*/ + } + ; endless_command : command - | endless_command modifier_rescue arg - { - /*%%%*/ - $$ = rescued_expr(p, $1, $3, &@1, &@2, &@3); - /*% %*/ - /*% ripper: rescue_mod!($1, $3) %*/ - } - | keyword_not opt_nl endless_command - { - $$ = call_uni_op(p, method_cond(p, $3, &@3), METHOD_NOT, &@1, &@$); - } - ; + | endless_command modifier_rescue arg + { + /*%%%*/ + $$ = rescued_expr(p, $1, $3, &@1, &@2, &@3); + /*% %*/ + /*% ripper: rescue_mod!($1, $3) %*/ + } + | keyword_not opt_nl endless_command + { + $$ = call_uni_op(p, method_cond(p, $3, &@3), METHOD_NOT, &@1, &@$); + } + ; command_rhs : command_call %prec tOP_ASGN - { - value_expr($1); - $$ = $1; - } - | command_call modifier_rescue stmt - { - /*%%%*/ - YYLTYPE loc = code_loc_gen(&@2, &@3); - value_expr($1); - $$ = NEW_RESCUE($1, NEW_RESBODY(0, remove_begin($3), 0, &loc), 0, &@$); - /*% %*/ - /*% ripper: rescue_mod!($1, $3) %*/ - } - | command_asgn - ; + { + value_expr($1); + $$ = $1; + } + | command_call modifier_rescue stmt + { + /*%%%*/ + YYLTYPE loc = code_loc_gen(&@2, &@3); + value_expr($1); + $$ = NEW_RESCUE($1, NEW_RESBODY(0, remove_begin($3), 0, &loc), 0, &@$); + /*% %*/ + /*% ripper: rescue_mod!($1, $3) %*/ + } + | command_asgn + ; expr : command_call - | expr keyword_and expr - { - $$ = logop(p, idAND, $1, $3, &@2, &@$); - } - | expr keyword_or expr - { - $$ = logop(p, idOR, $1, $3, &@2, &@$); - } - | keyword_not opt_nl expr - { - $$ = call_uni_op(p, method_cond(p, $3, &@3), METHOD_NOT, &@1, &@$); - } - | '!' command_call - { - $$ = call_uni_op(p, method_cond(p, $2, &@2), '!', &@1, &@$); - } - | arg tASSOC - { - value_expr($1); - SET_LEX_STATE(EXPR_BEG|EXPR_LABEL); - p->command_start = FALSE; - $2 = p->ctxt; - p->ctxt.in_kwarg = 1; - $$ = push_pvtbl(p); - } - { - $$ = push_pktbl(p); - } - p_top_expr_body - { - pop_pktbl(p, $4); - pop_pvtbl(p, $3); - p->ctxt.in_kwarg = $2.in_kwarg; - /*%%%*/ - $$ = NEW_CASE3($1, NEW_IN($5, 0, 0, &@5), &@$); - /*% %*/ - /*% ripper: case!($1, in!($5, Qnil, Qnil)) %*/ - } - | arg keyword_in - { - value_expr($1); - SET_LEX_STATE(EXPR_BEG|EXPR_LABEL); - p->command_start = FALSE; - $2 = p->ctxt; - p->ctxt.in_kwarg = 1; - $$ = push_pvtbl(p); - } - { - $$ = push_pktbl(p); - } - p_top_expr_body - { - pop_pktbl(p, $4); - pop_pvtbl(p, $3); - p->ctxt.in_kwarg = $2.in_kwarg; - /*%%%*/ - $$ = NEW_CASE3($1, NEW_IN($5, NEW_TRUE(&@5), NEW_FALSE(&@5), &@5), &@$); - /*% %*/ - /*% ripper: case!($1, in!($5, Qnil, Qnil)) %*/ - } - | arg %prec tLBRACE_ARG - ; + | expr keyword_and expr + { + $$ = logop(p, idAND, $1, $3, &@2, &@$); + } + | expr keyword_or expr + { + $$ = logop(p, idOR, $1, $3, &@2, &@$); + } + | keyword_not opt_nl expr + { + $$ = call_uni_op(p, method_cond(p, $3, &@3), METHOD_NOT, &@1, &@$); + } + | '!' command_call + { + $$ = call_uni_op(p, method_cond(p, $2, &@2), '!', &@1, &@$); + } + | arg tASSOC + { + value_expr($1); + SET_LEX_STATE(EXPR_BEG|EXPR_LABEL); + p->command_start = FALSE; + $2 = p->ctxt; + p->ctxt.in_kwarg = 1; + $$ = push_pvtbl(p); + } + { + $$ = push_pktbl(p); + } + p_top_expr_body + { + pop_pktbl(p, $4); + pop_pvtbl(p, $3); + p->ctxt.in_kwarg = $2.in_kwarg; + /*%%%*/ + $$ = NEW_CASE3($1, NEW_IN($5, 0, 0, &@5), &@$); + /*% %*/ + /*% ripper: case!($1, in!($5, Qnil, Qnil)) %*/ + } + | arg keyword_in + { + value_expr($1); + SET_LEX_STATE(EXPR_BEG|EXPR_LABEL); + p->command_start = FALSE; + $2 = p->ctxt; + p->ctxt.in_kwarg = 1; + $$ = push_pvtbl(p); + } + { + $$ = push_pktbl(p); + } + p_top_expr_body + { + pop_pktbl(p, $4); + pop_pvtbl(p, $3); + p->ctxt.in_kwarg = $2.in_kwarg; + /*%%%*/ + $$ = NEW_CASE3($1, NEW_IN($5, NEW_TRUE(&@5), NEW_FALSE(&@5), &@5), &@$); + /*% %*/ + /*% ripper: case!($1, in!($5, Qnil, Qnil)) %*/ + } + | arg %prec tLBRACE_ARG + ; def_name : fname - { - ID fname = get_id($1); - ID cur_arg = p->cur_arg; - YYSTYPE c = {.ctxt = p->ctxt}; - numparam_name(p, fname); - local_push(p, 0); - p->cur_arg = 0; - p->ctxt.in_def = 1; - $$ = NEW_NODE(NODE_SELF, /*vid*/cur_arg, /*mid*/fname, /*cval*/c.val, &@$); - /*%%%*/ - /*% - $$ = NEW_RIPPER(fname, get_value($1), $$, &NULL_LOC); - %*/ - } - ; + { + ID fname = get_id($1); + ID cur_arg = p->cur_arg; + YYSTYPE c = {.ctxt = p->ctxt}; + numparam_name(p, fname); + local_push(p, 0); + p->cur_arg = 0; + p->ctxt.in_def = 1; + $$ = NEW_NODE(NODE_SELF, /*vid*/cur_arg, /*mid*/fname, /*cval*/c.val, &@$); + /*%%%*/ + /*% + $$ = NEW_RIPPER(fname, get_value($1), $$, &NULL_LOC); + %*/ + } + ; defn_head : k_def def_name - { - $$ = $2; - /*%%%*/ - $$ = NEW_NODE(NODE_DEFN, 0, $$->nd_mid, $$, &@$); - /*% %*/ - } - ; + { + $$ = $2; + /*%%%*/ + $$ = NEW_NODE(NODE_DEFN, 0, $$->nd_mid, $$, &@$); + /*% %*/ + } + ; defs_head : k_def singleton dot_or_colon - { - SET_LEX_STATE(EXPR_FNAME); - p->ctxt.in_argdef = 1; - } - def_name - { - SET_LEX_STATE(EXPR_ENDFN|EXPR_LABEL); /* force for args */ - $$ = $5; - /*%%%*/ - $$ = NEW_NODE(NODE_DEFS, $2, $$->nd_mid, $$, &@$); - /*% - VALUE ary = rb_ary_new_from_args(3, $2, $3, get_value($$)); - add_mark_object(p, ary); - $$->nd_rval = ary; - %*/ - } - ; + { + SET_LEX_STATE(EXPR_FNAME); + p->ctxt.in_argdef = 1; + } + def_name + { + SET_LEX_STATE(EXPR_ENDFN|EXPR_LABEL); /* force for args */ + $$ = $5; + /*%%%*/ + $$ = NEW_NODE(NODE_DEFS, $2, $$->nd_mid, $$, &@$); + /*% + VALUE ary = rb_ary_new_from_args(3, $2, $3, get_value($$)); + add_mark_object(p, ary); + $$->nd_rval = ary; + %*/ + } + ; expr_value : expr - { - value_expr($1); - $$ = $1; - } - | error - { - /*%%%*/ - $$ = NEW_ERROR(&@$); - /*% %*/ - } - ; + { + value_expr($1); + $$ = $1; + } + | error + { + /*%%%*/ + $$ = NEW_ERROR(&@$); + /*% %*/ + } + ; expr_value_do : {COND_PUSH(1);} expr_value do {COND_POP();} - { - $$ = $2; - } - ; + { + $$ = $2; + } + ; command_call : command - | block_command - ; + | block_command + ; block_command : block_call - | block_call call_op2 operation2 command_args - { - /*%%%*/ - $$ = new_qcall(p, $2, $1, $3, $4, &@3, &@$); - /*% %*/ - /*% ripper: method_add_arg!(call!($1, $2, $3), $4) %*/ - } - ; + | block_call call_op2 operation2 command_args + { + /*%%%*/ + $$ = new_qcall(p, $2, $1, $3, $4, &@3, &@$); + /*% %*/ + /*% ripper: method_add_arg!(call!($1, $2, $3), $4) %*/ + } + ; cmd_brace_block : tLBRACE_ARG brace_body '}' - { - $$ = $2; - /*%%%*/ - $$->nd_body->nd_loc = code_loc_gen(&@1, &@3); - nd_set_line($$, @1.end_pos.lineno); - /*% %*/ - } - ; + { + $$ = $2; + /*%%%*/ + $$->nd_body->nd_loc = code_loc_gen(&@1, &@3); + nd_set_line($$, @1.end_pos.lineno); + /*% %*/ + } + ; fcall : operation - { - /*%%%*/ - $$ = NEW_FCALL($1, 0, &@$); - nd_set_line($$, p->tokline); - /*% %*/ - /*% ripper: $1 %*/ - } - ; + { + /*%%%*/ + $$ = NEW_FCALL($1, 0, &@$); + nd_set_line($$, p->tokline); + /*% %*/ + /*% ripper: $1 %*/ + } + ; command : fcall command_args %prec tLOWEST - { - /*%%%*/ - $1->nd_args = $2; - nd_set_last_loc($1, @2.end_pos); - $$ = $1; - /*% %*/ - /*% ripper: command!($1, $2) %*/ - } - | fcall command_args cmd_brace_block - { - /*%%%*/ - block_dup_check(p, $2, $3); - $1->nd_args = $2; - $$ = method_add_block(p, $1, $3, &@$); - fixpos($$, $1); - nd_set_last_loc($1, @2.end_pos); - /*% %*/ - /*% ripper: method_add_block!(command!($1, $2), $3) %*/ - } - | primary_value call_op operation2 command_args %prec tLOWEST - { - /*%%%*/ - $$ = new_command_qcall(p, $2, $1, $3, $4, Qnull, &@3, &@$); - /*% %*/ - /*% ripper: command_call!($1, $2, $3, $4) %*/ - } - | primary_value call_op operation2 command_args cmd_brace_block - { - /*%%%*/ - $$ = new_command_qcall(p, $2, $1, $3, $4, $5, &@3, &@$); - /*% %*/ - /*% ripper: method_add_block!(command_call!($1, $2, $3, $4), $5) %*/ - } - | primary_value tCOLON2 operation2 command_args %prec tLOWEST - { - /*%%%*/ - $$ = new_command_qcall(p, ID2VAL(idCOLON2), $1, $3, $4, Qnull, &@3, &@$); - /*% %*/ - /*% ripper: command_call!($1, ID2VAL(idCOLON2), $3, $4) %*/ - } - | primary_value tCOLON2 operation2 command_args cmd_brace_block - { - /*%%%*/ - $$ = new_command_qcall(p, ID2VAL(idCOLON2), $1, $3, $4, $5, &@3, &@$); - /*% %*/ - /*% ripper: method_add_block!(command_call!($1, ID2VAL(idCOLON2), $3, $4), $5) %*/ - } - | keyword_super command_args - { - /*%%%*/ - $$ = NEW_SUPER($2, &@$); - fixpos($$, $2); - /*% %*/ - /*% ripper: super!($2) %*/ - } - | keyword_yield command_args - { - /*%%%*/ - $$ = new_yield(p, $2, &@$); - fixpos($$, $2); - /*% %*/ - /*% ripper: yield!($2) %*/ - } - | k_return call_args - { - /*%%%*/ - $$ = NEW_RETURN(ret_args(p, $2), &@$); - /*% %*/ - /*% ripper: return!($2) %*/ - } - | keyword_break call_args - { - /*%%%*/ - $$ = NEW_BREAK(ret_args(p, $2), &@$); - /*% %*/ - /*% ripper: break!($2) %*/ - } - | keyword_next call_args - { - /*%%%*/ - $$ = NEW_NEXT(ret_args(p, $2), &@$); - /*% %*/ - /*% ripper: next!($2) %*/ - } - ; - + { + /*%%%*/ + $1->nd_args = $2; + nd_set_last_loc($1, @2.end_pos); + $$ = $1; + /*% %*/ + /*% ripper: command!($1, $2) %*/ + } + | fcall command_args cmd_brace_block + { + /*%%%*/ + block_dup_check(p, $2, $3); + $1->nd_args = $2; + $$ = method_add_block(p, $1, $3, &@$); + fixpos($$, $1); + nd_set_last_loc($1, @2.end_pos); + /*% %*/ + /*% ripper: method_add_block!(command!($1, $2), $3) %*/ + } + | primary_value call_op operation2 command_args %prec tLOWEST + { + /*%%%*/ + $$ = new_command_qcall(p, $2, $1, $3, $4, Qnull, &@3, &@$); + /*% %*/ + /*% ripper: command_call!($1, $2, $3, $4) %*/ + } + | primary_value call_op operation2 command_args cmd_brace_block + { + /*%%%*/ + $$ = new_command_qcall(p, $2, $1, $3, $4, $5, &@3, &@$); + /*% %*/ + /*% ripper: method_add_block!(command_call!($1, $2, $3, $4), $5) %*/ + } + | primary_value tCOLON2 operation2 command_args %prec tLOWEST + { + /*%%%*/ + $$ = new_command_qcall(p, ID2VAL(idCOLON2), $1, $3, $4, Qnull, &@3, &@$); + /*% %*/ + /*% ripper: command_call!($1, ID2VAL(idCOLON2), $3, $4) %*/ + } + | primary_value tCOLON2 operation2 command_args cmd_brace_block + { + /*%%%*/ + $$ = new_command_qcall(p, ID2VAL(idCOLON2), $1, $3, $4, $5, &@3, &@$); + /*% %*/ + /*% ripper: method_add_block!(command_call!($1, ID2VAL(idCOLON2), $3, $4), $5) %*/ + } + | keyword_super command_args + { + /*%%%*/ + $$ = NEW_SUPER($2, &@$); + fixpos($$, $2); + /*% %*/ + /*% ripper: super!($2) %*/ + } + | keyword_yield command_args + { + /*%%%*/ + $$ = new_yield(p, $2, &@$); + fixpos($$, $2); + /*% %*/ + /*% ripper: yield!($2) %*/ + } + | k_return call_args + { + /*%%%*/ + $$ = NEW_RETURN(ret_args(p, $2), &@$); + /*% %*/ + /*% ripper: return!($2) %*/ + } + | keyword_break call_args + { + /*%%%*/ + $$ = NEW_BREAK(ret_args(p, $2), &@$); + /*% %*/ + /*% ripper: break!($2) %*/ + } + | keyword_next call_args + { + /*%%%*/ + $$ = NEW_NEXT(ret_args(p, $2), &@$); + /*% %*/ + /*% ripper: next!($2) %*/ + } + ; + mlhs : mlhs_basic - | tLPAREN mlhs_inner rparen - { - /*%%%*/ - $$ = $2; - /*% %*/ - /*% ripper: mlhs_paren!($2) %*/ - } - ; + | tLPAREN mlhs_inner rparen + { + /*%%%*/ + $$ = $2; + /*% %*/ + /*% ripper: mlhs_paren!($2) %*/ + } + ; mlhs_inner : mlhs_basic - | tLPAREN mlhs_inner rparen - { - /*%%%*/ - $$ = NEW_MASGN(NEW_LIST($2, &@$), 0, &@$); - /*% %*/ - /*% ripper: mlhs_paren!($2) %*/ - } - ; + | tLPAREN mlhs_inner rparen + { + /*%%%*/ + $$ = NEW_MASGN(NEW_LIST($2, &@$), 0, &@$); + /*% %*/ + /*% ripper: mlhs_paren!($2) %*/ + } + ; mlhs_basic : mlhs_head - { - /*%%%*/ - $$ = NEW_MASGN($1, 0, &@$); - /*% %*/ - /*% ripper: $1 %*/ - } - | mlhs_head mlhs_item - { - /*%%%*/ - $$ = NEW_MASGN(list_append(p, $1,$2), 0, &@$); - /*% %*/ - /*% ripper: mlhs_add!($1, $2) %*/ - } - | mlhs_head tSTAR mlhs_node - { - /*%%%*/ - $$ = NEW_MASGN($1, $3, &@$); - /*% %*/ - /*% ripper: mlhs_add_star!($1, $3) %*/ - } - | mlhs_head tSTAR mlhs_node ',' mlhs_post - { - /*%%%*/ - $$ = NEW_MASGN($1, NEW_POSTARG($3,$5,&@$), &@$); - /*% %*/ - /*% ripper: mlhs_add_post!(mlhs_add_star!($1, $3), $5) %*/ - } - | mlhs_head tSTAR - { - /*%%%*/ - $$ = NEW_MASGN($1, NODE_SPECIAL_NO_NAME_REST, &@$); - /*% %*/ - /*% ripper: mlhs_add_star!($1, Qnil) %*/ - } - | mlhs_head tSTAR ',' mlhs_post - { - /*%%%*/ - $$ = NEW_MASGN($1, NEW_POSTARG(NODE_SPECIAL_NO_NAME_REST, $4, &@$), &@$); - /*% %*/ - /*% ripper: mlhs_add_post!(mlhs_add_star!($1, Qnil), $4) %*/ - } - | tSTAR mlhs_node - { - /*%%%*/ - $$ = NEW_MASGN(0, $2, &@$); - /*% %*/ - /*% ripper: mlhs_add_star!(mlhs_new!, $2) %*/ - } - | tSTAR mlhs_node ',' mlhs_post - { - /*%%%*/ - $$ = NEW_MASGN(0, NEW_POSTARG($2,$4,&@$), &@$); - /*% %*/ - /*% ripper: mlhs_add_post!(mlhs_add_star!(mlhs_new!, $2), $4) %*/ - } - | tSTAR - { - /*%%%*/ - $$ = NEW_MASGN(0, NODE_SPECIAL_NO_NAME_REST, &@$); - /*% %*/ - /*% ripper: mlhs_add_star!(mlhs_new!, Qnil) %*/ - } - | tSTAR ',' mlhs_post - { - /*%%%*/ - $$ = NEW_MASGN(0, NEW_POSTARG(NODE_SPECIAL_NO_NAME_REST, $3, &@$), &@$); - /*% %*/ - /*% ripper: mlhs_add_post!(mlhs_add_star!(mlhs_new!, Qnil), $3) %*/ - } - ; + { + /*%%%*/ + $$ = NEW_MASGN($1, 0, &@$); + /*% %*/ + /*% ripper: $1 %*/ + } + | mlhs_head mlhs_item + { + /*%%%*/ + $$ = NEW_MASGN(list_append(p, $1,$2), 0, &@$); + /*% %*/ + /*% ripper: mlhs_add!($1, $2) %*/ + } + | mlhs_head tSTAR mlhs_node + { + /*%%%*/ + $$ = NEW_MASGN($1, $3, &@$); + /*% %*/ + /*% ripper: mlhs_add_star!($1, $3) %*/ + } + | mlhs_head tSTAR mlhs_node ',' mlhs_post + { + /*%%%*/ + $$ = NEW_MASGN($1, NEW_POSTARG($3,$5,&@$), &@$); + /*% %*/ + /*% ripper: mlhs_add_post!(mlhs_add_star!($1, $3), $5) %*/ + } + | mlhs_head tSTAR + { + /*%%%*/ + $$ = NEW_MASGN($1, NODE_SPECIAL_NO_NAME_REST, &@$); + /*% %*/ + /*% ripper: mlhs_add_star!($1, Qnil) %*/ + } + | mlhs_head tSTAR ',' mlhs_post + { + /*%%%*/ + $$ = NEW_MASGN($1, NEW_POSTARG(NODE_SPECIAL_NO_NAME_REST, $4, &@$), &@$); + /*% %*/ + /*% ripper: mlhs_add_post!(mlhs_add_star!($1, Qnil), $4) %*/ + } + | tSTAR mlhs_node + { + /*%%%*/ + $$ = NEW_MASGN(0, $2, &@$); + /*% %*/ + /*% ripper: mlhs_add_star!(mlhs_new!, $2) %*/ + } + | tSTAR mlhs_node ',' mlhs_post + { + /*%%%*/ + $$ = NEW_MASGN(0, NEW_POSTARG($2,$4,&@$), &@$); + /*% %*/ + /*% ripper: mlhs_add_post!(mlhs_add_star!(mlhs_new!, $2), $4) %*/ + } + | tSTAR + { + /*%%%*/ + $$ = NEW_MASGN(0, NODE_SPECIAL_NO_NAME_REST, &@$); + /*% %*/ + /*% ripper: mlhs_add_star!(mlhs_new!, Qnil) %*/ + } + | tSTAR ',' mlhs_post + { + /*%%%*/ + $$ = NEW_MASGN(0, NEW_POSTARG(NODE_SPECIAL_NO_NAME_REST, $3, &@$), &@$); + /*% %*/ + /*% ripper: mlhs_add_post!(mlhs_add_star!(mlhs_new!, Qnil), $3) %*/ + } + ; mlhs_item : mlhs_node - | tLPAREN mlhs_inner rparen - { - /*%%%*/ - $$ = $2; - /*% %*/ - /*% ripper: mlhs_paren!($2) %*/ - } - ; + | tLPAREN mlhs_inner rparen + { + /*%%%*/ + $$ = $2; + /*% %*/ + /*% ripper: mlhs_paren!($2) %*/ + } + ; mlhs_head : mlhs_item ',' - { - /*%%%*/ - $$ = NEW_LIST($1, &@1); - /*% %*/ - /*% ripper: mlhs_add!(mlhs_new!, $1) %*/ - } - | mlhs_head mlhs_item ',' - { - /*%%%*/ - $$ = list_append(p, $1, $2); - /*% %*/ - /*% ripper: mlhs_add!($1, $2) %*/ - } - ; + { + /*%%%*/ + $$ = NEW_LIST($1, &@1); + /*% %*/ + /*% ripper: mlhs_add!(mlhs_new!, $1) %*/ + } + | mlhs_head mlhs_item ',' + { + /*%%%*/ + $$ = list_append(p, $1, $2); + /*% %*/ + /*% ripper: mlhs_add!($1, $2) %*/ + } + ; mlhs_post : mlhs_item - { - /*%%%*/ - $$ = NEW_LIST($1, &@$); - /*% %*/ - /*% ripper: mlhs_add!(mlhs_new!, $1) %*/ - } - | mlhs_post ',' mlhs_item - { - /*%%%*/ - $$ = list_append(p, $1, $3); - /*% %*/ - /*% ripper: mlhs_add!($1, $3) %*/ - } - ; + { + /*%%%*/ + $$ = NEW_LIST($1, &@$); + /*% %*/ + /*% ripper: mlhs_add!(mlhs_new!, $1) %*/ + } + | mlhs_post ',' mlhs_item + { + /*%%%*/ + $$ = list_append(p, $1, $3); + /*% %*/ + /*% ripper: mlhs_add!($1, $3) %*/ + } + ; mlhs_node : user_variable - { - /*%%%*/ - $$ = assignable(p, $1, 0, &@$); - /*% %*/ - /*% ripper: assignable(p, var_field(p, $1)) %*/ - } - | keyword_variable - { - /*%%%*/ - $$ = assignable(p, $1, 0, &@$); - /*% %*/ - /*% ripper: assignable(p, var_field(p, $1)) %*/ - } - | primary_value '[' opt_call_args rbracket - { - /*%%%*/ - $$ = aryset(p, $1, $3, &@$); - /*% %*/ - /*% ripper: aref_field!($1, escape_Qundef($3)) %*/ - } - | primary_value call_op tIDENTIFIER - { - if ($2 == tANDDOT) { - yyerror1(&@2, "&. inside multiple assignment destination"); - } - /*%%%*/ - $$ = attrset(p, $1, $2, $3, &@$); - /*% %*/ - /*% ripper: field!($1, $2, $3) %*/ - } - | primary_value tCOLON2 tIDENTIFIER - { - /*%%%*/ - $$ = attrset(p, $1, idCOLON2, $3, &@$); - /*% %*/ - /*% ripper: const_path_field!($1, $3) %*/ - } - | primary_value call_op tCONSTANT - { - if ($2 == tANDDOT) { - yyerror1(&@2, "&. inside multiple assignment destination"); - } - /*%%%*/ - $$ = attrset(p, $1, $2, $3, &@$); - /*% %*/ - /*% ripper: field!($1, $2, $3) %*/ - } - | primary_value tCOLON2 tCONSTANT - { - /*%%%*/ - $$ = const_decl(p, NEW_COLON2($1, $3, &@$), &@$); - /*% %*/ - /*% ripper: const_decl(p, const_path_field!($1, $3)) %*/ - } - | tCOLON3 tCONSTANT - { - /*%%%*/ - $$ = const_decl(p, NEW_COLON3($2, &@$), &@$); - /*% %*/ - /*% ripper: const_decl(p, top_const_field!($2)) %*/ - } - | backref - { - /*%%%*/ - rb_backref_error(p, $1); - $$ = NEW_BEGIN(0, &@$); - /*% %*/ - /*% ripper[error]: backref_error(p, RNODE($1), var_field(p, $1)) %*/ - } - ; + { + /*%%%*/ + $$ = assignable(p, $1, 0, &@$); + /*% %*/ + /*% ripper: assignable(p, var_field(p, $1)) %*/ + } + | keyword_variable + { + /*%%%*/ + $$ = assignable(p, $1, 0, &@$); + /*% %*/ + /*% ripper: assignable(p, var_field(p, $1)) %*/ + } + | primary_value '[' opt_call_args rbracket + { + /*%%%*/ + $$ = aryset(p, $1, $3, &@$); + /*% %*/ + /*% ripper: aref_field!($1, escape_Qundef($3)) %*/ + } + | primary_value call_op tIDENTIFIER + { + if ($2 == tANDDOT) { + yyerror1(&@2, "&. inside multiple assignment destination"); + } + /*%%%*/ + $$ = attrset(p, $1, $2, $3, &@$); + /*% %*/ + /*% ripper: field!($1, $2, $3) %*/ + } + | primary_value tCOLON2 tIDENTIFIER + { + /*%%%*/ + $$ = attrset(p, $1, idCOLON2, $3, &@$); + /*% %*/ + /*% ripper: const_path_field!($1, $3) %*/ + } + | primary_value call_op tCONSTANT + { + if ($2 == tANDDOT) { + yyerror1(&@2, "&. inside multiple assignment destination"); + } + /*%%%*/ + $$ = attrset(p, $1, $2, $3, &@$); + /*% %*/ + /*% ripper: field!($1, $2, $3) %*/ + } + | primary_value tCOLON2 tCONSTANT + { + /*%%%*/ + $$ = const_decl(p, NEW_COLON2($1, $3, &@$), &@$); + /*% %*/ + /*% ripper: const_decl(p, const_path_field!($1, $3)) %*/ + } + | tCOLON3 tCONSTANT + { + /*%%%*/ + $$ = const_decl(p, NEW_COLON3($2, &@$), &@$); + /*% %*/ + /*% ripper: const_decl(p, top_const_field!($2)) %*/ + } + | backref + { + /*%%%*/ + rb_backref_error(p, $1); + $$ = NEW_BEGIN(0, &@$); + /*% %*/ + /*% ripper[error]: backref_error(p, RNODE($1), var_field(p, $1)) %*/ + } + ; lhs : user_variable - { - /*%%%*/ - $$ = assignable(p, $1, 0, &@$); - /*% %*/ - /*% ripper: assignable(p, var_field(p, $1)) %*/ - } - | keyword_variable - { - /*%%%*/ - $$ = assignable(p, $1, 0, &@$); - /*% %*/ - /*% ripper: assignable(p, var_field(p, $1)) %*/ - } - | primary_value '[' opt_call_args rbracket - { - /*%%%*/ - $$ = aryset(p, $1, $3, &@$); - /*% %*/ - /*% ripper: aref_field!($1, escape_Qundef($3)) %*/ - } - | primary_value call_op tIDENTIFIER - { - /*%%%*/ - $$ = attrset(p, $1, $2, $3, &@$); - /*% %*/ - /*% ripper: field!($1, $2, $3) %*/ - } - | primary_value tCOLON2 tIDENTIFIER - { - /*%%%*/ - $$ = attrset(p, $1, idCOLON2, $3, &@$); - /*% %*/ - /*% ripper: field!($1, ID2VAL(idCOLON2), $3) %*/ - } - | primary_value call_op tCONSTANT - { - /*%%%*/ - $$ = attrset(p, $1, $2, $3, &@$); - /*% %*/ - /*% ripper: field!($1, $2, $3) %*/ - } - | primary_value tCOLON2 tCONSTANT - { - /*%%%*/ - $$ = const_decl(p, NEW_COLON2($1, $3, &@$), &@$); - /*% %*/ - /*% ripper: const_decl(p, const_path_field!($1, $3)) %*/ - } - | tCOLON3 tCONSTANT - { - /*%%%*/ - $$ = const_decl(p, NEW_COLON3($2, &@$), &@$); - /*% %*/ - /*% ripper: const_decl(p, top_const_field!($2)) %*/ - } - | backref - { - /*%%%*/ - rb_backref_error(p, $1); - $$ = NEW_BEGIN(0, &@$); - /*% %*/ - /*% ripper[error]: backref_error(p, RNODE($1), var_field(p, $1)) %*/ - } - ; + { + /*%%%*/ + $$ = assignable(p, $1, 0, &@$); + /*% %*/ + /*% ripper: assignable(p, var_field(p, $1)) %*/ + } + | keyword_variable + { + /*%%%*/ + $$ = assignable(p, $1, 0, &@$); + /*% %*/ + /*% ripper: assignable(p, var_field(p, $1)) %*/ + } + | primary_value '[' opt_call_args rbracket + { + /*%%%*/ + $$ = aryset(p, $1, $3, &@$); + /*% %*/ + /*% ripper: aref_field!($1, escape_Qundef($3)) %*/ + } + | primary_value call_op tIDENTIFIER + { + /*%%%*/ + $$ = attrset(p, $1, $2, $3, &@$); + /*% %*/ + /*% ripper: field!($1, $2, $3) %*/ + } + | primary_value tCOLON2 tIDENTIFIER + { + /*%%%*/ + $$ = attrset(p, $1, idCOLON2, $3, &@$); + /*% %*/ + /*% ripper: field!($1, ID2VAL(idCOLON2), $3) %*/ + } + | primary_value call_op tCONSTANT + { + /*%%%*/ + $$ = attrset(p, $1, $2, $3, &@$); + /*% %*/ + /*% ripper: field!($1, $2, $3) %*/ + } + | primary_value tCOLON2 tCONSTANT + { + /*%%%*/ + $$ = const_decl(p, NEW_COLON2($1, $3, &@$), &@$); + /*% %*/ + /*% ripper: const_decl(p, const_path_field!($1, $3)) %*/ + } + | tCOLON3 tCONSTANT + { + /*%%%*/ + $$ = const_decl(p, NEW_COLON3($2, &@$), &@$); + /*% %*/ + /*% ripper: const_decl(p, top_const_field!($2)) %*/ + } + | backref + { + /*%%%*/ + rb_backref_error(p, $1); + $$ = NEW_BEGIN(0, &@$); + /*% %*/ + /*% ripper[error]: backref_error(p, RNODE($1), var_field(p, $1)) %*/ + } + ; cname : tIDENTIFIER - { - static const char mesg[] = "class/module name must be CONSTANT"; - /*%%%*/ - yyerror1(&@1, mesg); - /*% %*/ - /*% ripper[error]: class_name_error!(ERR_MESG(), $1) %*/ - } - | tCONSTANT - ; + { + static const char mesg[] = "class/module name must be CONSTANT"; + /*%%%*/ + yyerror1(&@1, mesg); + /*% %*/ + /*% ripper[error]: class_name_error!(ERR_MESG(), $1) %*/ + } + | tCONSTANT + ; cpath : tCOLON3 cname - { - /*%%%*/ - $$ = NEW_COLON3($2, &@$); - /*% %*/ - /*% ripper: top_const_ref!($2) %*/ - } - | cname - { - /*%%%*/ - $$ = NEW_COLON2(0, $$, &@$); - /*% %*/ - /*% ripper: const_ref!($1) %*/ - } - | primary_value tCOLON2 cname - { - /*%%%*/ - $$ = NEW_COLON2($1, $3, &@$); - /*% %*/ - /*% ripper: const_path_ref!($1, $3) %*/ - } - ; + { + /*%%%*/ + $$ = NEW_COLON3($2, &@$); + /*% %*/ + /*% ripper: top_const_ref!($2) %*/ + } + | cname + { + /*%%%*/ + $$ = NEW_COLON2(0, $$, &@$); + /*% %*/ + /*% ripper: const_ref!($1) %*/ + } + | primary_value tCOLON2 cname + { + /*%%%*/ + $$ = NEW_COLON2($1, $3, &@$); + /*% %*/ + /*% ripper: const_path_ref!($1, $3) %*/ + } + ; fname : tIDENTIFIER - | tCONSTANT - | tFID - | op - { - SET_LEX_STATE(EXPR_ENDFN); - $$ = $1; - } - | reswords - ; + | tCONSTANT + | tFID + | op + { + SET_LEX_STATE(EXPR_ENDFN); + $$ = $1; + } + | reswords + ; fitem : fname - { - /*%%%*/ - $$ = NEW_LIT(ID2SYM($1), &@$); - /*% %*/ - /*% ripper: symbol_literal!($1) %*/ - } - | symbol - ; + { + /*%%%*/ + $$ = NEW_LIT(ID2SYM($1), &@$); + /*% %*/ + /*% ripper: symbol_literal!($1) %*/ + } + | symbol + ; undef_list : fitem - { - /*%%%*/ - $$ = NEW_UNDEF($1, &@$); - /*% %*/ - /*% ripper: rb_ary_new3(1, get_value($1)) %*/ - } - | undef_list ',' {SET_LEX_STATE(EXPR_FNAME|EXPR_FITEM);} fitem - { - /*%%%*/ - NODE *undef = NEW_UNDEF($4, &@4); - $$ = block_append(p, $1, undef); - /*% %*/ - /*% ripper: rb_ary_push($1, get_value($4)) %*/ - } - ; + { + /*%%%*/ + $$ = NEW_UNDEF($1, &@$); + /*% %*/ + /*% ripper: rb_ary_new3(1, get_value($1)) %*/ + } + | undef_list ',' {SET_LEX_STATE(EXPR_FNAME|EXPR_FITEM);} fitem + { + /*%%%*/ + NODE *undef = NEW_UNDEF($4, &@4); + $$ = block_append(p, $1, undef); + /*% %*/ + /*% ripper: rb_ary_push($1, get_value($4)) %*/ + } + ; op : '|' { ifndef_ripper($$ = '|'); } - | '^' { ifndef_ripper($$ = '^'); } - | '&' { ifndef_ripper($$ = '&'); } - | tCMP { ifndef_ripper($$ = tCMP); } - | tEQ { ifndef_ripper($$ = tEQ); } - | tEQQ { ifndef_ripper($$ = tEQQ); } - | tMATCH { ifndef_ripper($$ = tMATCH); } - | tNMATCH { ifndef_ripper($$ = tNMATCH); } - | '>' { ifndef_ripper($$ = '>'); } - | tGEQ { ifndef_ripper($$ = tGEQ); } - | '<' { ifndef_ripper($$ = '<'); } - | tLEQ { ifndef_ripper($$ = tLEQ); } - | tNEQ { ifndef_ripper($$ = tNEQ); } - | tLSHFT { ifndef_ripper($$ = tLSHFT); } - | tRSHFT { ifndef_ripper($$ = tRSHFT); } - | '+' { ifndef_ripper($$ = '+'); } - | '-' { ifndef_ripper($$ = '-'); } - | '*' { ifndef_ripper($$ = '*'); } - | tSTAR { ifndef_ripper($$ = '*'); } - | '/' { ifndef_ripper($$ = '/'); } - | '%' { ifndef_ripper($$ = '%'); } - | tPOW { ifndef_ripper($$ = tPOW); } - | tDSTAR { ifndef_ripper($$ = tDSTAR); } - | '!' { ifndef_ripper($$ = '!'); } - | '~' { ifndef_ripper($$ = '~'); } - | tUPLUS { ifndef_ripper($$ = tUPLUS); } - | tUMINUS { ifndef_ripper($$ = tUMINUS); } - | tAREF { ifndef_ripper($$ = tAREF); } - | tASET { ifndef_ripper($$ = tASET); } - | '`' { ifndef_ripper($$ = '`'); } - ; + | '^' { ifndef_ripper($$ = '^'); } + | '&' { ifndef_ripper($$ = '&'); } + | tCMP { ifndef_ripper($$ = tCMP); } + | tEQ { ifndef_ripper($$ = tEQ); } + | tEQQ { ifndef_ripper($$ = tEQQ); } + | tMATCH { ifndef_ripper($$ = tMATCH); } + | tNMATCH { ifndef_ripper($$ = tNMATCH); } + | '>' { ifndef_ripper($$ = '>'); } + | tGEQ { ifndef_ripper($$ = tGEQ); } + | '<' { ifndef_ripper($$ = '<'); } + | tLEQ { ifndef_ripper($$ = tLEQ); } + | tNEQ { ifndef_ripper($$ = tNEQ); } + | tLSHFT { ifndef_ripper($$ = tLSHFT); } + | tRSHFT { ifndef_ripper($$ = tRSHFT); } + | '+' { ifndef_ripper($$ = '+'); } + | '-' { ifndef_ripper($$ = '-'); } + | '*' { ifndef_ripper($$ = '*'); } + | tSTAR { ifndef_ripper($$ = '*'); } + | '/' { ifndef_ripper($$ = '/'); } + | '%' { ifndef_ripper($$ = '%'); } + | tPOW { ifndef_ripper($$ = tPOW); } + | tDSTAR { ifndef_ripper($$ = tDSTAR); } + | '!' { ifndef_ripper($$ = '!'); } + | '~' { ifndef_ripper($$ = '~'); } + | tUPLUS { ifndef_ripper($$ = tUPLUS); } + | tUMINUS { ifndef_ripper($$ = tUMINUS); } + | tAREF { ifndef_ripper($$ = tAREF); } + | tASET { ifndef_ripper($$ = tASET); } + | '`' { ifndef_ripper($$ = '`'); } + ; reswords : keyword__LINE__ | keyword__FILE__ | keyword__ENCODING__ - | keyword_BEGIN | keyword_END - | keyword_alias | keyword_and | keyword_begin - | keyword_break | keyword_case | keyword_class | keyword_def - | keyword_defined | keyword_do | keyword_else | keyword_elsif - | keyword_end | keyword_ensure | keyword_false - | keyword_for | keyword_in | keyword_module | keyword_next - | keyword_nil | keyword_not | keyword_or | keyword_redo - | keyword_rescue | keyword_retry | keyword_return | keyword_self - | keyword_super | keyword_then | keyword_true | keyword_undef - | keyword_when | keyword_yield | keyword_if | keyword_unless - | keyword_while | keyword_until - ; + | keyword_BEGIN | keyword_END + | keyword_alias | keyword_and | keyword_begin + | keyword_break | keyword_case | keyword_class | keyword_def + | keyword_defined | keyword_do | keyword_else | keyword_elsif + | keyword_end | keyword_ensure | keyword_false + | keyword_for | keyword_in | keyword_module | keyword_next + | keyword_nil | keyword_not | keyword_or | keyword_redo + | keyword_rescue | keyword_retry | keyword_return | keyword_self + | keyword_super | keyword_then | keyword_true | keyword_undef + | keyword_when | keyword_yield | keyword_if | keyword_unless + | keyword_while | keyword_until + ; arg : lhs '=' lex_ctxt arg_rhs - { - /*%%%*/ - $$ = node_assign(p, $1, $4, $3, &@$); - /*% %*/ - /*% ripper: assign!($1, $4) %*/ - } - | var_lhs tOP_ASGN lex_ctxt arg_rhs - { - /*%%%*/ - $$ = new_op_assign(p, $1, $2, $4, $3, &@$); - /*% %*/ - /*% ripper: opassign!($1, $2, $4) %*/ - } - | primary_value '[' opt_call_args rbracket tOP_ASGN lex_ctxt arg_rhs - { - /*%%%*/ - $$ = new_ary_op_assign(p, $1, $3, $5, $7, &@3, &@$); - /*% %*/ - /*% ripper: opassign!(aref_field!($1, escape_Qundef($3)), $5, $7) %*/ - } - | primary_value call_op tIDENTIFIER tOP_ASGN lex_ctxt arg_rhs - { - /*%%%*/ - $$ = new_attr_op_assign(p, $1, $2, $3, $4, $6, &@$); - /*% %*/ - /*% ripper: opassign!(field!($1, $2, $3), $4, $6) %*/ - } - | primary_value call_op tCONSTANT tOP_ASGN lex_ctxt arg_rhs - { - /*%%%*/ - $$ = new_attr_op_assign(p, $1, $2, $3, $4, $6, &@$); - /*% %*/ - /*% ripper: opassign!(field!($1, $2, $3), $4, $6) %*/ - } - | primary_value tCOLON2 tIDENTIFIER tOP_ASGN lex_ctxt arg_rhs - { - /*%%%*/ - $$ = new_attr_op_assign(p, $1, ID2VAL(idCOLON2), $3, $4, $6, &@$); - /*% %*/ - /*% ripper: opassign!(field!($1, ID2VAL(idCOLON2), $3), $4, $6) %*/ - } - | primary_value tCOLON2 tCONSTANT tOP_ASGN lex_ctxt arg_rhs - { - /*%%%*/ - YYLTYPE loc = code_loc_gen(&@1, &@3); - $$ = new_const_op_assign(p, NEW_COLON2($1, $3, &loc), $4, $6, $5, &@$); - /*% %*/ - /*% ripper: opassign!(const_path_field!($1, $3), $4, $6) %*/ - } - | tCOLON3 tCONSTANT tOP_ASGN lex_ctxt arg_rhs - { - /*%%%*/ - YYLTYPE loc = code_loc_gen(&@1, &@2); - $$ = new_const_op_assign(p, NEW_COLON3($2, &loc), $3, $5, $4, &@$); - /*% %*/ - /*% ripper: opassign!(top_const_field!($2), $3, $5) %*/ - } - | backref tOP_ASGN lex_ctxt arg_rhs - { - /*%%%*/ - rb_backref_error(p, $1); - $$ = NEW_BEGIN(0, &@$); - /*% %*/ - /*% ripper[error]: backref_error(p, RNODE($1), opassign!(var_field(p, $1), $2, $4)) %*/ - } - | arg tDOT2 arg - { - /*%%%*/ - value_expr($1); - value_expr($3); - $$ = NEW_DOT2($1, $3, &@$); - /*% %*/ - /*% ripper: dot2!($1, $3) %*/ - } - | arg tDOT3 arg - { - /*%%%*/ - value_expr($1); - value_expr($3); - $$ = NEW_DOT3($1, $3, &@$); - /*% %*/ - /*% ripper: dot3!($1, $3) %*/ - } - | arg tDOT2 - { - /*%%%*/ - value_expr($1); - $$ = NEW_DOT2($1, new_nil_at(p, &@2.end_pos), &@$); - /*% %*/ - /*% ripper: dot2!($1, Qnil) %*/ - } - | arg tDOT3 - { - /*%%%*/ - value_expr($1); - $$ = NEW_DOT3($1, new_nil_at(p, &@2.end_pos), &@$); - /*% %*/ - /*% ripper: dot3!($1, Qnil) %*/ - } - | tBDOT2 arg - { - /*%%%*/ - value_expr($2); - $$ = NEW_DOT2(new_nil_at(p, &@1.beg_pos), $2, &@$); - /*% %*/ - /*% ripper: dot2!(Qnil, $2) %*/ - } - | tBDOT3 arg - { - /*%%%*/ - value_expr($2); - $$ = NEW_DOT3(new_nil_at(p, &@1.beg_pos), $2, &@$); - /*% %*/ - /*% ripper: dot3!(Qnil, $2) %*/ - } - | arg '+' arg - { - $$ = call_bin_op(p, $1, '+', $3, &@2, &@$); - } - | arg '-' arg - { - $$ = call_bin_op(p, $1, '-', $3, &@2, &@$); - } - | arg '*' arg - { - $$ = call_bin_op(p, $1, '*', $3, &@2, &@$); - } - | arg '/' arg - { - $$ = call_bin_op(p, $1, '/', $3, &@2, &@$); - } - | arg '%' arg - { - $$ = call_bin_op(p, $1, '%', $3, &@2, &@$); - } - | arg tPOW arg - { - $$ = call_bin_op(p, $1, idPow, $3, &@2, &@$); - } - | tUMINUS_NUM simple_numeric tPOW arg - { - $$ = call_uni_op(p, call_bin_op(p, $2, idPow, $4, &@2, &@$), idUMinus, &@1, &@$); - } - | tUPLUS arg - { - $$ = call_uni_op(p, $2, idUPlus, &@1, &@$); - } - | tUMINUS arg - { - $$ = call_uni_op(p, $2, idUMinus, &@1, &@$); - } - | arg '|' arg - { - $$ = call_bin_op(p, $1, '|', $3, &@2, &@$); - } - | arg '^' arg - { - $$ = call_bin_op(p, $1, '^', $3, &@2, &@$); - } - | arg '&' arg - { - $$ = call_bin_op(p, $1, '&', $3, &@2, &@$); - } - | arg tCMP arg - { - $$ = call_bin_op(p, $1, idCmp, $3, &@2, &@$); - } - | rel_expr %prec tCMP - | arg tEQ arg - { - $$ = call_bin_op(p, $1, idEq, $3, &@2, &@$); - } - | arg tEQQ arg - { - $$ = call_bin_op(p, $1, idEqq, $3, &@2, &@$); - } - | arg tNEQ arg - { - $$ = call_bin_op(p, $1, idNeq, $3, &@2, &@$); - } - | arg tMATCH arg - { - $$ = match_op(p, $1, $3, &@2, &@$); - } - | arg tNMATCH arg - { - $$ = call_bin_op(p, $1, idNeqTilde, $3, &@2, &@$); - } - | '!' arg - { - $$ = call_uni_op(p, method_cond(p, $2, &@2), '!', &@1, &@$); - } - | '~' arg - { - $$ = call_uni_op(p, $2, '~', &@1, &@$); - } - | arg tLSHFT arg - { - $$ = call_bin_op(p, $1, idLTLT, $3, &@2, &@$); - } - | arg tRSHFT arg - { - $$ = call_bin_op(p, $1, idGTGT, $3, &@2, &@$); - } - | arg tANDOP arg - { - $$ = logop(p, idANDOP, $1, $3, &@2, &@$); - } - | arg tOROP arg - { - $$ = logop(p, idOROP, $1, $3, &@2, &@$); - } - | keyword_defined opt_nl {p->ctxt.in_defined = 1;} arg - { - p->ctxt.in_defined = 0; - $$ = new_defined(p, $4, &@$); - } - | arg '?' arg opt_nl ':' arg - { - /*%%%*/ - value_expr($1); - $$ = new_if(p, $1, $3, $6, &@$); - fixpos($$, $1); - /*% %*/ - /*% ripper: ifop!($1, $3, $6) %*/ - } - | defn_head f_opt_paren_args '=' endless_arg - { - endless_method_name(p, $1, &@1); - restore_defun(p, $1->nd_defn); - /*%%%*/ - $$ = set_defun_body(p, $1, $2, $4, &@$); - /*% %*/ - /*% ripper: def!(get_value($1), $2, bodystmt!($4, Qnil, Qnil, Qnil)) %*/ - local_pop(p); - } - | defs_head f_opt_paren_args '=' endless_arg - { - endless_method_name(p, $1, &@1); - restore_defun(p, $1->nd_defn); - /*%%%*/ - $$ = set_defun_body(p, $1, $2, $4, &@$); - /*% - $1 = get_value($1); - %*/ - /*% ripper: defs!(AREF($1, 0), AREF($1, 1), AREF($1, 2), $2, bodystmt!($4, Qnil, Qnil, Qnil)) %*/ - local_pop(p); - } - | primary - { - $$ = $1; - } - ; - -endless_arg : arg %prec modifier_rescue - | endless_arg modifier_rescue arg - { - /*%%%*/ - $$ = rescued_expr(p, $1, $3, &@1, &@2, &@3); - /*% %*/ - /*% ripper: rescue_mod!($1, $3) %*/ - } - | keyword_not opt_nl endless_arg - { - $$ = call_uni_op(p, method_cond(p, $3, &@3), METHOD_NOT, &@1, &@$); - } - ; - -relop : '>' {$$ = '>';} - | '<' {$$ = '<';} - | tGEQ {$$ = idGE;} - | tLEQ {$$ = idLE;} - ; - -rel_expr : arg relop arg %prec '>' - { - $$ = call_bin_op(p, $1, $2, $3, &@2, &@$); - } - | rel_expr relop arg %prec '>' - { - rb_warning1("comparison '%s' after comparison", WARN_ID($2)); - $$ = call_bin_op(p, $1, $2, $3, &@2, &@$); - } - ; - -lex_ctxt : none - { - $$ = p->ctxt; - } - ; - -arg_value : arg - { - value_expr($1); - $$ = $1; - } - ; - -aref_args : none - | args trailer - { - $$ = $1; - } - | args ',' assocs trailer - { - /*%%%*/ - $$ = $3 ? arg_append(p, $1, new_hash(p, $3, &@3), &@$) : $1; - /*% %*/ - /*% ripper: args_add!($1, bare_assoc_hash!($3)) %*/ - } - | assocs trailer - { - /*%%%*/ - $$ = $1 ? NEW_LIST(new_hash(p, $1, &@1), &@$) : 0; - /*% %*/ - /*% ripper: args_add!(args_new!, bare_assoc_hash!($1)) %*/ - } - ; - -arg_rhs : arg %prec tOP_ASGN - { - value_expr($1); - $$ = $1; - } - | arg modifier_rescue arg - { - /*%%%*/ - value_expr($1); - $$ = rescued_expr(p, $1, $3, &@1, &@2, &@3); - /*% %*/ - /*% ripper: rescue_mod!($1, $3) %*/ - } - ; - -paren_args : '(' opt_call_args rparen - { - /*%%%*/ - $$ = $2; - /*% %*/ - /*% ripper: arg_paren!(escape_Qundef($2)) %*/ - } - | '(' args ',' args_forward rparen - { - if (!check_forwarding_args(p)) { - $$ = Qnone; - } - else { - /*%%%*/ - $$ = new_args_forward_call(p, $2, &@4, &@$); - /*% %*/ - /*% ripper: arg_paren!(args_add!($2, $4)) %*/ - } - } - | '(' args_forward rparen - { - if (!check_forwarding_args(p)) { - $$ = Qnone; - } - else { - /*%%%*/ - $$ = new_args_forward_call(p, 0, &@2, &@$); - /*% %*/ - /*% ripper: arg_paren!($2) %*/ - } - } - ; - -opt_paren_args : none - | paren_args - ; - -opt_call_args : none - | call_args - | args ',' - { - $$ = $1; - } - | args ',' assocs ',' - { - /*%%%*/ - $$ = $3 ? arg_append(p, $1, new_hash(p, $3, &@3), &@$) : $1; - /*% %*/ - /*% ripper: args_add!($1, bare_assoc_hash!($3)) %*/ - } - | assocs ',' - { - /*%%%*/ - $$ = $1 ? NEW_LIST(new_hash(p, $1, &@1), &@1) : 0; - /*% %*/ - /*% ripper: args_add!(args_new!, bare_assoc_hash!($1)) %*/ - } - ; - -call_args : command - { - /*%%%*/ - value_expr($1); - $$ = NEW_LIST($1, &@$); - /*% %*/ - /*% ripper: args_add!(args_new!, $1) %*/ - } - | args opt_block_arg - { - /*%%%*/ - $$ = arg_blk_pass($1, $2); - /*% %*/ - /*% ripper: args_add_block!($1, $2) %*/ - } - | assocs opt_block_arg - { - /*%%%*/ - $$ = $1 ? NEW_LIST(new_hash(p, $1, &@1), &@1) : 0; - $$ = arg_blk_pass($$, $2); - /*% %*/ - /*% ripper: args_add_block!(args_add!(args_new!, bare_assoc_hash!($1)), $2) %*/ - } - | args ',' assocs opt_block_arg - { - /*%%%*/ - $$ = $3 ? arg_append(p, $1, new_hash(p, $3, &@3), &@$) : $1; - $$ = arg_blk_pass($$, $4); - /*% %*/ - /*% ripper: args_add_block!(args_add!($1, bare_assoc_hash!($3)), $4) %*/ - } - | block_arg - /*% ripper[brace]: args_add_block!(args_new!, $1) %*/ - ; - -command_args : { - /* If call_args starts with a open paren '(' or '[', - * look-ahead reading of the letters calls CMDARG_PUSH(0), - * but the push must be done after CMDARG_PUSH(1). - * So this code makes them consistent by first cancelling - * the premature CMDARG_PUSH(0), doing CMDARG_PUSH(1), - * and finally redoing CMDARG_PUSH(0). - */ - int lookahead = 0; - switch (yychar) { - case '(': case tLPAREN: case tLPAREN_ARG: case '[': case tLBRACK: - lookahead = 1; - } - if (lookahead) CMDARG_POP(); - CMDARG_PUSH(1); - if (lookahead) CMDARG_PUSH(0); - } - call_args - { - /* call_args can be followed by tLBRACE_ARG (that does CMDARG_PUSH(0) in the lexer) - * but the push must be done after CMDARG_POP() in the parser. - * So this code does CMDARG_POP() to pop 0 pushed by tLBRACE_ARG, - * CMDARG_POP() to pop 1 pushed by command_args, - * and CMDARG_PUSH(0) to restore back the flag set by tLBRACE_ARG. - */ - int lookahead = 0; - switch (yychar) { - case tLBRACE_ARG: - lookahead = 1; - } - if (lookahead) CMDARG_POP(); - CMDARG_POP(); - if (lookahead) CMDARG_PUSH(0); - $$ = $2; - } - ; + { + /*%%%*/ + $$ = node_assign(p, $1, $4, $3, &@$); + /*% %*/ + /*% ripper: assign!($1, $4) %*/ + } + | var_lhs tOP_ASGN lex_ctxt arg_rhs + { + /*%%%*/ + $$ = new_op_assign(p, $1, $2, $4, $3, &@$); + /*% %*/ + /*% ripper: opassign!($1, $2, $4) %*/ + } + | primary_value '[' opt_call_args rbracket tOP_ASGN lex_ctxt arg_rhs + { + /*%%%*/ + $$ = new_ary_op_assign(p, $1, $3, $5, $7, &@3, &@$); + /*% %*/ + /*% ripper: opassign!(aref_field!($1, escape_Qundef($3)), $5, $7) %*/ + } + | primary_value call_op tIDENTIFIER tOP_ASGN lex_ctxt arg_rhs + { + /*%%%*/ + $$ = new_attr_op_assign(p, $1, $2, $3, $4, $6, &@$); + /*% %*/ + /*% ripper: opassign!(field!($1, $2, $3), $4, $6) %*/ + } + | primary_value call_op tCONSTANT tOP_ASGN lex_ctxt arg_rhs + { + /*%%%*/ + $$ = new_attr_op_assign(p, $1, $2, $3, $4, $6, &@$); + /*% %*/ + /*% ripper: opassign!(field!($1, $2, $3), $4, $6) %*/ + } + | primary_value tCOLON2 tIDENTIFIER tOP_ASGN lex_ctxt arg_rhs + { + /*%%%*/ + $$ = new_attr_op_assign(p, $1, ID2VAL(idCOLON2), $3, $4, $6, &@$); + /*% %*/ + /*% ripper: opassign!(field!($1, ID2VAL(idCOLON2), $3), $4, $6) %*/ + } + | primary_value tCOLON2 tCONSTANT tOP_ASGN lex_ctxt arg_rhs + { + /*%%%*/ + YYLTYPE loc = code_loc_gen(&@1, &@3); + $$ = new_const_op_assign(p, NEW_COLON2($1, $3, &loc), $4, $6, $5, &@$); + /*% %*/ + /*% ripper: opassign!(const_path_field!($1, $3), $4, $6) %*/ + } + | tCOLON3 tCONSTANT tOP_ASGN lex_ctxt arg_rhs + { + /*%%%*/ + YYLTYPE loc = code_loc_gen(&@1, &@2); + $$ = new_const_op_assign(p, NEW_COLON3($2, &loc), $3, $5, $4, &@$); + /*% %*/ + /*% ripper: opassign!(top_const_field!($2), $3, $5) %*/ + } + | backref tOP_ASGN lex_ctxt arg_rhs + { + /*%%%*/ + rb_backref_error(p, $1); + $$ = NEW_BEGIN(0, &@$); + /*% %*/ + /*% ripper[error]: backref_error(p, RNODE($1), opassign!(var_field(p, $1), $2, $4)) %*/ + } + | arg tDOT2 arg + { + /*%%%*/ + value_expr($1); + value_expr($3); + $$ = NEW_DOT2($1, $3, &@$); + /*% %*/ + /*% ripper: dot2!($1, $3) %*/ + } + | arg tDOT3 arg + { + /*%%%*/ + value_expr($1); + value_expr($3); + $$ = NEW_DOT3($1, $3, &@$); + /*% %*/ + /*% ripper: dot3!($1, $3) %*/ + } + | arg tDOT2 + { + /*%%%*/ + value_expr($1); + $$ = NEW_DOT2($1, new_nil_at(p, &@2.end_pos), &@$); + /*% %*/ + /*% ripper: dot2!($1, Qnil) %*/ + } + | arg tDOT3 + { + /*%%%*/ + value_expr($1); + $$ = NEW_DOT3($1, new_nil_at(p, &@2.end_pos), &@$); + /*% %*/ + /*% ripper: dot3!($1, Qnil) %*/ + } + | tBDOT2 arg + { + /*%%%*/ + value_expr($2); + $$ = NEW_DOT2(new_nil_at(p, &@1.beg_pos), $2, &@$); + /*% %*/ + /*% ripper: dot2!(Qnil, $2) %*/ + } + | tBDOT3 arg + { + /*%%%*/ + value_expr($2); + $$ = NEW_DOT3(new_nil_at(p, &@1.beg_pos), $2, &@$); + /*% %*/ + /*% ripper: dot3!(Qnil, $2) %*/ + } + | arg '+' arg + { + $$ = call_bin_op(p, $1, '+', $3, &@2, &@$); + } + | arg '-' arg + { + $$ = call_bin_op(p, $1, '-', $3, &@2, &@$); + } + | arg '*' arg + { + $$ = call_bin_op(p, $1, '*', $3, &@2, &@$); + } + | arg '/' arg + { + $$ = call_bin_op(p, $1, '/', $3, &@2, &@$); + } + | arg '%' arg + { + $$ = call_bin_op(p, $1, '%', $3, &@2, &@$); + } + | arg tPOW arg + { + $$ = call_bin_op(p, $1, idPow, $3, &@2, &@$); + } + | tUMINUS_NUM simple_numeric tPOW arg + { + $$ = call_uni_op(p, call_bin_op(p, $2, idPow, $4, &@2, &@$), idUMinus, &@1, &@$); + } + | tUPLUS arg + { + $$ = call_uni_op(p, $2, idUPlus, &@1, &@$); + } + | tUMINUS arg + { + $$ = call_uni_op(p, $2, idUMinus, &@1, &@$); + } + | arg '|' arg + { + $$ = call_bin_op(p, $1, '|', $3, &@2, &@$); + } + | arg '^' arg + { + $$ = call_bin_op(p, $1, '^', $3, &@2, &@$); + } + | arg '&' arg + { + $$ = call_bin_op(p, $1, '&', $3, &@2, &@$); + } + | arg tCMP arg + { + $$ = call_bin_op(p, $1, idCmp, $3, &@2, &@$); + } + | rel_expr %prec tCMP + | arg tEQ arg + { + $$ = call_bin_op(p, $1, idEq, $3, &@2, &@$); + } + | arg tEQQ arg + { + $$ = call_bin_op(p, $1, idEqq, $3, &@2, &@$); + } + | arg tNEQ arg + { + $$ = call_bin_op(p, $1, idNeq, $3, &@2, &@$); + } + | arg tMATCH arg + { + $$ = match_op(p, $1, $3, &@2, &@$); + } + | arg tNMATCH arg + { + $$ = call_bin_op(p, $1, idNeqTilde, $3, &@2, &@$); + } + | '!' arg + { + $$ = call_uni_op(p, method_cond(p, $2, &@2), '!', &@1, &@$); + } + | '~' arg + { + $$ = call_uni_op(p, $2, '~', &@1, &@$); + } + | arg tLSHFT arg + { + $$ = call_bin_op(p, $1, idLTLT, $3, &@2, &@$); + } + | arg tRSHFT arg + { + $$ = call_bin_op(p, $1, idGTGT, $3, &@2, &@$); + } + | arg tANDOP arg + { + $$ = logop(p, idANDOP, $1, $3, &@2, &@$); + } + | arg tOROP arg + { + $$ = logop(p, idOROP, $1, $3, &@2, &@$); + } + | keyword_defined opt_nl {p->ctxt.in_defined = 1;} arg + { + p->ctxt.in_defined = 0; + $$ = new_defined(p, $4, &@$); + } + | arg '?' arg opt_nl ':' arg + { + /*%%%*/ + value_expr($1); + $$ = new_if(p, $1, $3, $6, &@$); + fixpos($$, $1); + /*% %*/ + /*% ripper: ifop!($1, $3, $6) %*/ + } + | defn_head f_opt_paren_args '=' endless_arg + { + endless_method_name(p, $1, &@1); + restore_defun(p, $1->nd_defn); + /*%%%*/ + $$ = set_defun_body(p, $1, $2, $4, &@$); + /*% %*/ + /*% ripper: def!(get_value($1), $2, bodystmt!($4, Qnil, Qnil, Qnil)) %*/ + local_pop(p); + } + | defs_head f_opt_paren_args '=' endless_arg + { + endless_method_name(p, $1, &@1); + restore_defun(p, $1->nd_defn); + /*%%%*/ + $$ = set_defun_body(p, $1, $2, $4, &@$); + /*% + $1 = get_value($1); + %*/ + /*% ripper: defs!(AREF($1, 0), AREF($1, 1), AREF($1, 2), $2, bodystmt!($4, Qnil, Qnil, Qnil)) %*/ + local_pop(p); + } + | primary + { + $$ = $1; + } + ; + +endless_arg : arg %prec modifier_rescue + | endless_arg modifier_rescue arg + { + /*%%%*/ + $$ = rescued_expr(p, $1, $3, &@1, &@2, &@3); + /*% %*/ + /*% ripper: rescue_mod!($1, $3) %*/ + } + | keyword_not opt_nl endless_arg + { + $$ = call_uni_op(p, method_cond(p, $3, &@3), METHOD_NOT, &@1, &@$); + } + ; + +relop : '>' {$$ = '>';} + | '<' {$$ = '<';} + | tGEQ {$$ = idGE;} + | tLEQ {$$ = idLE;} + ; + +rel_expr : arg relop arg %prec '>' + { + $$ = call_bin_op(p, $1, $2, $3, &@2, &@$); + } + | rel_expr relop arg %prec '>' + { + rb_warning1("comparison '%s' after comparison", WARN_ID($2)); + $$ = call_bin_op(p, $1, $2, $3, &@2, &@$); + } + ; + +lex_ctxt : none + { + $$ = p->ctxt; + } + ; + +arg_value : arg + { + value_expr($1); + $$ = $1; + } + ; + +aref_args : none + | args trailer + { + $$ = $1; + } + | args ',' assocs trailer + { + /*%%%*/ + $$ = $3 ? arg_append(p, $1, new_hash(p, $3, &@3), &@$) : $1; + /*% %*/ + /*% ripper: args_add!($1, bare_assoc_hash!($3)) %*/ + } + | assocs trailer + { + /*%%%*/ + $$ = $1 ? NEW_LIST(new_hash(p, $1, &@1), &@$) : 0; + /*% %*/ + /*% ripper: args_add!(args_new!, bare_assoc_hash!($1)) %*/ + } + ; + +arg_rhs : arg %prec tOP_ASGN + { + value_expr($1); + $$ = $1; + } + | arg modifier_rescue arg + { + /*%%%*/ + value_expr($1); + $$ = rescued_expr(p, $1, $3, &@1, &@2, &@3); + /*% %*/ + /*% ripper: rescue_mod!($1, $3) %*/ + } + ; + +paren_args : '(' opt_call_args rparen + { + /*%%%*/ + $$ = $2; + /*% %*/ + /*% ripper: arg_paren!(escape_Qundef($2)) %*/ + } + | '(' args ',' args_forward rparen + { + if (!check_forwarding_args(p)) { + $$ = Qnone; + } + else { + /*%%%*/ + $$ = new_args_forward_call(p, $2, &@4, &@$); + /*% %*/ + /*% ripper: arg_paren!(args_add!($2, $4)) %*/ + } + } + | '(' args_forward rparen + { + if (!check_forwarding_args(p)) { + $$ = Qnone; + } + else { + /*%%%*/ + $$ = new_args_forward_call(p, 0, &@2, &@$); + /*% %*/ + /*% ripper: arg_paren!($2) %*/ + } + } + ; + +opt_paren_args : none + | paren_args + ; + +opt_call_args : none + | call_args + | args ',' + { + $$ = $1; + } + | args ',' assocs ',' + { + /*%%%*/ + $$ = $3 ? arg_append(p, $1, new_hash(p, $3, &@3), &@$) : $1; + /*% %*/ + /*% ripper: args_add!($1, bare_assoc_hash!($3)) %*/ + } + | assocs ',' + { + /*%%%*/ + $$ = $1 ? NEW_LIST(new_hash(p, $1, &@1), &@1) : 0; + /*% %*/ + /*% ripper: args_add!(args_new!, bare_assoc_hash!($1)) %*/ + } + ; + +call_args : command + { + /*%%%*/ + value_expr($1); + $$ = NEW_LIST($1, &@$); + /*% %*/ + /*% ripper: args_add!(args_new!, $1) %*/ + } + | args opt_block_arg + { + /*%%%*/ + $$ = arg_blk_pass($1, $2); + /*% %*/ + /*% ripper: args_add_block!($1, $2) %*/ + } + | assocs opt_block_arg + { + /*%%%*/ + $$ = $1 ? NEW_LIST(new_hash(p, $1, &@1), &@1) : 0; + $$ = arg_blk_pass($$, $2); + /*% %*/ + /*% ripper: args_add_block!(args_add!(args_new!, bare_assoc_hash!($1)), $2) %*/ + } + | args ',' assocs opt_block_arg + { + /*%%%*/ + $$ = $3 ? arg_append(p, $1, new_hash(p, $3, &@3), &@$) : $1; + $$ = arg_blk_pass($$, $4); + /*% %*/ + /*% ripper: args_add_block!(args_add!($1, bare_assoc_hash!($3)), $4) %*/ + } + | block_arg + /*% ripper[brace]: args_add_block!(args_new!, $1) %*/ + ; + +command_args : { + /* If call_args starts with a open paren '(' or '[', + * look-ahead reading of the letters calls CMDARG_PUSH(0), + * but the push must be done after CMDARG_PUSH(1). + * So this code makes them consistent by first cancelling + * the premature CMDARG_PUSH(0), doing CMDARG_PUSH(1), + * and finally redoing CMDARG_PUSH(0). + */ + int lookahead = 0; + switch (yychar) { + case '(': case tLPAREN: case tLPAREN_ARG: case '[': case tLBRACK: + lookahead = 1; + } + if (lookahead) CMDARG_POP(); + CMDARG_PUSH(1); + if (lookahead) CMDARG_PUSH(0); + } + call_args + { + /* call_args can be followed by tLBRACE_ARG (that does CMDARG_PUSH(0) in the lexer) + * but the push must be done after CMDARG_POP() in the parser. + * So this code does CMDARG_POP() to pop 0 pushed by tLBRACE_ARG, + * CMDARG_POP() to pop 1 pushed by command_args, + * and CMDARG_PUSH(0) to restore back the flag set by tLBRACE_ARG. + */ + int lookahead = 0; + switch (yychar) { + case tLBRACE_ARG: + lookahead = 1; + } + if (lookahead) CMDARG_POP(); + CMDARG_POP(); + if (lookahead) CMDARG_PUSH(0); + $$ = $2; + } + ; block_arg : tAMPER arg_value - { - /*%%%*/ - $$ = NEW_BLOCK_PASS($2, &@$); - /*% %*/ - /*% ripper: $2 %*/ - } + { + /*%%%*/ + $$ = NEW_BLOCK_PASS($2, &@$); + /*% %*/ + /*% ripper: $2 %*/ + } | tAMPER { - if (!local_id(p, idFWD_BLOCK)) { - compile_error(p, "no anonymous block parameter"); - } + if (!local_id(p, idFWD_BLOCK)) { + compile_error(p, "no anonymous block parameter"); + } + /*%%%*/ + $$ = NEW_BLOCK_PASS(NEW_LVAR(idFWD_BLOCK, &@1), &@$); + /*% %*/ + /*% ripper: Qnil %*/ + } + ; + +opt_block_arg : ',' block_arg + { + $$ = $2; + } + | none + { + $$ = 0; + } + ; + +/* value */ +args : arg_value + { + /*%%%*/ + $$ = NEW_LIST($1, &@$); + /*% %*/ + /*% ripper: args_add!(args_new!, $1) %*/ + } + | tSTAR arg_value + { + /*%%%*/ + $$ = NEW_SPLAT($2, &@$); + /*% %*/ + /*% ripper: args_add_star!(args_new!, $2) %*/ + } + | tSTAR + { + if (!local_id(p, idFWD_REST) || + local_id(p, idFWD_ALL)) { + compile_error(p, "no anonymous rest parameter"); + } + /*%%%*/ + $$ = NEW_SPLAT(NEW_LVAR(idFWD_REST, &@1), &@$); + /*% %*/ + /*% ripper: args_add_star!(args_new!, Qnil) %*/ + } + | args ',' arg_value + { + /*%%%*/ + $$ = last_arg_append(p, $1, $3, &@$); + /*% %*/ + /*% ripper: args_add!($1, $3) %*/ + } + | args ',' tSTAR arg_value + { + /*%%%*/ + $$ = rest_arg_append(p, $1, $4, &@$); + /*% %*/ + /*% ripper: args_add_star!($1, $4) %*/ + } + | args ',' tSTAR + { + if (!local_id(p, idFWD_REST) || + local_id(p, idFWD_ALL)) { + compile_error(p, "no anonymous rest parameter"); + } + /*%%%*/ + $$ = rest_arg_append(p, $1, NEW_LVAR(idFWD_REST, &@3), &@$); + /*% %*/ + /*% ripper: args_add_star!($1, Qnil) %*/ + } + ; + +/* value */ +mrhs_arg : mrhs + | arg_value + ; + +/* value */ +mrhs : args ',' arg_value + { + /*%%%*/ + $$ = last_arg_append(p, $1, $3, &@$); + /*% %*/ + /*% ripper: mrhs_add!(mrhs_new_from_args!($1), $3) %*/ + } + | args ',' tSTAR arg_value + { + /*%%%*/ + $$ = rest_arg_append(p, $1, $4, &@$); + /*% %*/ + /*% ripper: mrhs_add_star!(mrhs_new_from_args!($1), $4) %*/ + } + | tSTAR arg_value + { + /*%%%*/ + $$ = NEW_SPLAT($2, &@$); + /*% %*/ + /*% ripper: mrhs_add_star!(mrhs_new!, $2) %*/ + } + ; + +primary : literal + | strings + | xstring + | regexp + | words + | qwords + | symbols + | qsymbols + | var_ref + | backref + | tFID + { + /*%%%*/ + $$ = NEW_FCALL($1, 0, &@$); + /*% %*/ + /*% ripper: method_add_arg!(fcall!($1), args_new!) %*/ + } + | k_begin + { + CMDARG_PUSH(0); + } + bodystmt + k_end + { + CMDARG_POP(); + /*%%%*/ + set_line_body($3, @1.end_pos.lineno); + $$ = NEW_BEGIN($3, &@$); + nd_set_line($$, @1.end_pos.lineno); + /*% %*/ + /*% ripper: begin!($3) %*/ + } + | tLPAREN_ARG {SET_LEX_STATE(EXPR_ENDARG);} rparen + { + /*%%%*/ + $$ = NEW_BEGIN(0, &@$); + /*% %*/ + /*% ripper: paren!(0) %*/ + } + | tLPAREN_ARG stmt {SET_LEX_STATE(EXPR_ENDARG);} rparen + { + /*%%%*/ + if (nd_type_p($2, NODE_SELF)) $2->nd_state = 0; + $$ = $2; + /*% %*/ + /*% ripper: paren!($2) %*/ + } + | tLPAREN compstmt ')' + { + /*%%%*/ + if (nd_type_p($2, NODE_SELF)) $2->nd_state = 0; + $$ = $2; + /*% %*/ + /*% ripper: paren!($2) %*/ + } + | primary_value tCOLON2 tCONSTANT + { + /*%%%*/ + $$ = NEW_COLON2($1, $3, &@$); + /*% %*/ + /*% ripper: const_path_ref!($1, $3) %*/ + } + | tCOLON3 tCONSTANT + { + /*%%%*/ + $$ = NEW_COLON3($2, &@$); + /*% %*/ + /*% ripper: top_const_ref!($2) %*/ + } + | tLBRACK aref_args ']' + { + /*%%%*/ + $$ = make_list($2, &@$); + /*% %*/ + /*% ripper: array!(escape_Qundef($2)) %*/ + } + | tLBRACE assoc_list '}' + { + /*%%%*/ + $$ = new_hash(p, $2, &@$); + $$->nd_brace = TRUE; + /*% %*/ + /*% ripper: hash!(escape_Qundef($2)) %*/ + } + | k_return + { + /*%%%*/ + $$ = NEW_RETURN(0, &@$); + /*% %*/ + /*% ripper: return0! %*/ + } + | keyword_yield '(' call_args rparen + { + /*%%%*/ + $$ = new_yield(p, $3, &@$); + /*% %*/ + /*% ripper: yield!(paren!($3)) %*/ + } + | keyword_yield '(' rparen + { + /*%%%*/ + $$ = NEW_YIELD(0, &@$); + /*% %*/ + /*% ripper: yield!(paren!(args_new!)) %*/ + } + | keyword_yield + { + /*%%%*/ + $$ = NEW_YIELD(0, &@$); + /*% %*/ + /*% ripper: yield0! %*/ + } + | keyword_defined opt_nl '(' {p->ctxt.in_defined = 1;} expr rparen + { + p->ctxt.in_defined = 0; + $$ = new_defined(p, $5, &@$); + } + | keyword_not '(' expr rparen + { + $$ = call_uni_op(p, method_cond(p, $3, &@3), METHOD_NOT, &@1, &@$); + } + | keyword_not '(' rparen + { + $$ = call_uni_op(p, method_cond(p, new_nil(&@2), &@2), METHOD_NOT, &@1, &@$); + } + | fcall brace_block + { /*%%%*/ - $$ = NEW_BLOCK_PASS(NEW_LVAR(idFWD_BLOCK, &@1), &@$); + $$ = method_add_block(p, $1, $2, &@$); /*% %*/ - /*% ripper: Qnil %*/ + /*% ripper: method_add_block!(method_add_arg!(fcall!($1), args_new!), $2) %*/ } - ; - -opt_block_arg : ',' block_arg - { - $$ = $2; - } - | none - { - $$ = 0; - } - ; - -/* value */ -args : arg_value - { - /*%%%*/ - $$ = NEW_LIST($1, &@$); - /*% %*/ - /*% ripper: args_add!(args_new!, $1) %*/ - } - | tSTAR arg_value - { - /*%%%*/ - $$ = NEW_SPLAT($2, &@$); - /*% %*/ - /*% ripper: args_add_star!(args_new!, $2) %*/ - } - | tSTAR - { - if (!local_id(p, idFWD_REST) || - local_id(p, idFWD_ALL)) { - compile_error(p, "no anonymous rest parameter"); + | method_call + | method_call brace_block + { + /*%%%*/ + block_dup_check(p, $1->nd_args, $2); + $$ = method_add_block(p, $1, $2, &@$); + /*% %*/ + /*% ripper: method_add_block!($1, $2) %*/ + } + | lambda + | k_if expr_value then + compstmt + if_tail + k_end + { + /*%%%*/ + $$ = new_if(p, $2, $4, $5, &@$); + fixpos($$, $2); + /*% %*/ + /*% ripper: if!($2, $4, escape_Qundef($5)) %*/ + } + | k_unless expr_value then + compstmt + opt_else + k_end + { + /*%%%*/ + $$ = new_unless(p, $2, $4, $5, &@$); + fixpos($$, $2); + /*% %*/ + /*% ripper: unless!($2, $4, escape_Qundef($5)) %*/ + } + | k_while expr_value_do + compstmt + k_end + { + /*%%%*/ + $$ = NEW_WHILE(cond(p, $2, &@2), $3, 1, &@$); + fixpos($$, $2); + /*% %*/ + /*% ripper: while!($2, $3) %*/ + } + | k_until expr_value_do + compstmt + k_end + { + /*%%%*/ + $$ = NEW_UNTIL(cond(p, $2, &@2), $3, 1, &@$); + fixpos($$, $2); + /*% %*/ + /*% ripper: until!($2, $3) %*/ + } + | k_case expr_value opt_terms + { + $$ = p->case_labels; + p->case_labels = Qnil; + } + case_body + k_end + { + if (RTEST(p->case_labels)) rb_hash_clear(p->case_labels); + p->case_labels = $4; + /*%%%*/ + $$ = NEW_CASE($2, $5, &@$); + fixpos($$, $2); + /*% %*/ + /*% ripper: case!($2, $5) %*/ + } + | k_case opt_terms + { + $$ = p->case_labels; + p->case_labels = 0; + } + case_body + k_end + { + if (RTEST(p->case_labels)) rb_hash_clear(p->case_labels); + p->case_labels = $3; + /*%%%*/ + $$ = NEW_CASE2($4, &@$); + /*% %*/ + /*% ripper: case!(Qnil, $4) %*/ + } + | k_case expr_value opt_terms + p_case_body + k_end + { + /*%%%*/ + $$ = NEW_CASE3($2, $4, &@$); + /*% %*/ + /*% ripper: case!($2, $4) %*/ + } + | k_for for_var keyword_in expr_value_do + compstmt + k_end + { + /*%%%*/ + /* + * for a, b, c in e + * #=> + * e.each{|*x| a, b, c = x} + * + * for a in e + * #=> + * e.each{|x| a, = x} + */ + ID id = internal_id(p); + NODE *m = NEW_ARGS_AUX(0, 0, &NULL_LOC); + NODE *args, *scope, *internal_var = NEW_DVAR(id, &@2); + rb_ast_id_table_t *tbl = rb_ast_new_local_table(p->ast, 1); + tbl->ids[0] = id; /* internal id */ + + switch (nd_type($2)) { + case NODE_LASGN: + case NODE_DASGN: /* e.each {|internal_var| a = internal_var; ... } */ + $2->nd_value = internal_var; + id = 0; + m->nd_plen = 1; + m->nd_next = $2; + break; + case NODE_MASGN: /* e.each {|*internal_var| a, b, c = (internal_var.length == 1 && Array === (tmp = internal_var[0]) ? tmp : internal_var); ... } */ + m->nd_next = node_assign(p, $2, NEW_FOR_MASGN(internal_var, &@2), NO_LEX_CTXT, &@2); + break; + default: /* e.each {|*internal_var| @a, B, c[1], d.attr = internal_val; ... } */ + m->nd_next = node_assign(p, NEW_MASGN(NEW_LIST($2, &@2), 0, &@2), internal_var, NO_LEX_CTXT, &@2); } - /*%%%*/ - $$ = NEW_SPLAT(NEW_LVAR(idFWD_REST, &@1), &@$); - /*% %*/ - /*% ripper: args_add_star!(args_new!, Qnil) %*/ - } - | args ',' arg_value - { - /*%%%*/ - $$ = last_arg_append(p, $1, $3, &@$); - /*% %*/ - /*% ripper: args_add!($1, $3) %*/ - } - | args ',' tSTAR arg_value - { - /*%%%*/ - $$ = rest_arg_append(p, $1, $4, &@$); - /*% %*/ - /*% ripper: args_add_star!($1, $4) %*/ - } - | args ',' tSTAR - { - if (!local_id(p, idFWD_REST) || - local_id(p, idFWD_ALL)) { - compile_error(p, "no anonymous rest parameter"); + /* {|*internal_id| = internal_id; ... } */ + args = new_args(p, m, 0, id, 0, new_args_tail(p, 0, 0, 0, &@2), &@2); + scope = NEW_NODE(NODE_SCOPE, tbl, $5, args, &@$); + $$ = NEW_FOR($4, scope, &@$); + fixpos($$, $2); + /*% %*/ + /*% ripper: for!($2, $4, $5) %*/ + } + | k_class cpath superclass + { + if (p->ctxt.in_def) { + YYLTYPE loc = code_loc_gen(&@1, &@2); + yyerror1(&loc, "class definition in method body"); } - /*%%%*/ - $$ = rest_arg_append(p, $1, NEW_LVAR(idFWD_REST, &@3), &@$); - /*% %*/ - /*% ripper: args_add_star!($1, Qnil) %*/ - } - ; - -/* value */ -mrhs_arg : mrhs - | arg_value - ; - -/* value */ -mrhs : args ',' arg_value - { - /*%%%*/ - $$ = last_arg_append(p, $1, $3, &@$); - /*% %*/ - /*% ripper: mrhs_add!(mrhs_new_from_args!($1), $3) %*/ - } - | args ',' tSTAR arg_value - { - /*%%%*/ - $$ = rest_arg_append(p, $1, $4, &@$); - /*% %*/ - /*% ripper: mrhs_add_star!(mrhs_new_from_args!($1), $4) %*/ - } - | tSTAR arg_value - { - /*%%%*/ - $$ = NEW_SPLAT($2, &@$); - /*% %*/ - /*% ripper: mrhs_add_star!(mrhs_new!, $2) %*/ - } - ; - -primary : literal - | strings - | xstring - | regexp - | words - | qwords - | symbols - | qsymbols - | var_ref - | backref - | tFID - { - /*%%%*/ - $$ = NEW_FCALL($1, 0, &@$); - /*% %*/ - /*% ripper: method_add_arg!(fcall!($1), args_new!) %*/ - } - | k_begin - { - CMDARG_PUSH(0); - } - bodystmt - k_end - { - CMDARG_POP(); - /*%%%*/ - set_line_body($3, @1.end_pos.lineno); - $$ = NEW_BEGIN($3, &@$); - nd_set_line($$, @1.end_pos.lineno); - /*% %*/ - /*% ripper: begin!($3) %*/ - } - | tLPAREN_ARG {SET_LEX_STATE(EXPR_ENDARG);} rparen - { - /*%%%*/ - $$ = NEW_BEGIN(0, &@$); - /*% %*/ - /*% ripper: paren!(0) %*/ - } - | tLPAREN_ARG stmt {SET_LEX_STATE(EXPR_ENDARG);} rparen - { - /*%%%*/ - if (nd_type_p($2, NODE_SELF)) $2->nd_state = 0; - $$ = $2; - /*% %*/ - /*% ripper: paren!($2) %*/ - } - | tLPAREN compstmt ')' - { - /*%%%*/ - if (nd_type_p($2, NODE_SELF)) $2->nd_state = 0; - $$ = $2; - /*% %*/ - /*% ripper: paren!($2) %*/ - } - | primary_value tCOLON2 tCONSTANT - { - /*%%%*/ - $$ = NEW_COLON2($1, $3, &@$); - /*% %*/ - /*% ripper: const_path_ref!($1, $3) %*/ - } - | tCOLON3 tCONSTANT - { - /*%%%*/ - $$ = NEW_COLON3($2, &@$); - /*% %*/ - /*% ripper: top_const_ref!($2) %*/ - } - | tLBRACK aref_args ']' - { - /*%%%*/ - $$ = make_list($2, &@$); - /*% %*/ - /*% ripper: array!(escape_Qundef($2)) %*/ - } - | tLBRACE assoc_list '}' - { - /*%%%*/ - $$ = new_hash(p, $2, &@$); - $$->nd_brace = TRUE; - /*% %*/ - /*% ripper: hash!(escape_Qundef($2)) %*/ - } - | k_return - { - /*%%%*/ - $$ = NEW_RETURN(0, &@$); - /*% %*/ - /*% ripper: return0! %*/ - } - | keyword_yield '(' call_args rparen - { - /*%%%*/ - $$ = new_yield(p, $3, &@$); - /*% %*/ - /*% ripper: yield!(paren!($3)) %*/ - } - | keyword_yield '(' rparen - { - /*%%%*/ - $$ = NEW_YIELD(0, &@$); - /*% %*/ - /*% ripper: yield!(paren!(args_new!)) %*/ - } - | keyword_yield - { - /*%%%*/ - $$ = NEW_YIELD(0, &@$); - /*% %*/ - /*% ripper: yield0! %*/ - } - | keyword_defined opt_nl '(' {p->ctxt.in_defined = 1;} expr rparen - { - p->ctxt.in_defined = 0; - $$ = new_defined(p, $5, &@$); - } - | keyword_not '(' expr rparen - { - $$ = call_uni_op(p, method_cond(p, $3, &@3), METHOD_NOT, &@1, &@$); - } - | keyword_not '(' rparen - { - $$ = call_uni_op(p, method_cond(p, new_nil(&@2), &@2), METHOD_NOT, &@1, &@$); - } - | fcall brace_block - { - /*%%%*/ - $$ = method_add_block(p, $1, $2, &@$); - /*% %*/ - /*% ripper: method_add_block!(method_add_arg!(fcall!($1), args_new!), $2) %*/ - } - | method_call - | method_call brace_block - { - /*%%%*/ - block_dup_check(p, $1->nd_args, $2); - $$ = method_add_block(p, $1, $2, &@$); - /*% %*/ - /*% ripper: method_add_block!($1, $2) %*/ - } - | lambda - | k_if expr_value then - compstmt - if_tail - k_end - { - /*%%%*/ - $$ = new_if(p, $2, $4, $5, &@$); - fixpos($$, $2); - /*% %*/ - /*% ripper: if!($2, $4, escape_Qundef($5)) %*/ - } - | k_unless expr_value then - compstmt - opt_else - k_end - { - /*%%%*/ - $$ = new_unless(p, $2, $4, $5, &@$); - fixpos($$, $2); - /*% %*/ - /*% ripper: unless!($2, $4, escape_Qundef($5)) %*/ - } - | k_while expr_value_do - compstmt - k_end - { - /*%%%*/ - $$ = NEW_WHILE(cond(p, $2, &@2), $3, 1, &@$); - fixpos($$, $2); - /*% %*/ - /*% ripper: while!($2, $3) %*/ - } - | k_until expr_value_do - compstmt - k_end - { - /*%%%*/ - $$ = NEW_UNTIL(cond(p, $2, &@2), $3, 1, &@$); - fixpos($$, $2); - /*% %*/ - /*% ripper: until!($2, $3) %*/ - } - | k_case expr_value opt_terms - { - $$ = p->case_labels; - p->case_labels = Qnil; - } - case_body - k_end - { - if (RTEST(p->case_labels)) rb_hash_clear(p->case_labels); - p->case_labels = $4; - /*%%%*/ - $$ = NEW_CASE($2, $5, &@$); - fixpos($$, $2); - /*% %*/ - /*% ripper: case!($2, $5) %*/ - } - | k_case opt_terms - { - $$ = p->case_labels; - p->case_labels = 0; - } - case_body - k_end - { - if (RTEST(p->case_labels)) rb_hash_clear(p->case_labels); - p->case_labels = $3; - /*%%%*/ - $$ = NEW_CASE2($4, &@$); - /*% %*/ - /*% ripper: case!(Qnil, $4) %*/ - } - | k_case expr_value opt_terms - p_case_body - k_end - { - /*%%%*/ - $$ = NEW_CASE3($2, $4, &@$); - /*% %*/ - /*% ripper: case!($2, $4) %*/ - } - | k_for for_var keyword_in expr_value_do - compstmt - k_end - { - /*%%%*/ - /* - * for a, b, c in e - * #=> - * e.each{|*x| a, b, c = x} - * - * for a in e - * #=> - * e.each{|x| a, = x} - */ - ID id = internal_id(p); - NODE *m = NEW_ARGS_AUX(0, 0, &NULL_LOC); - NODE *args, *scope, *internal_var = NEW_DVAR(id, &@2); - rb_ast_id_table_t *tbl = rb_ast_new_local_table(p->ast, 1); - tbl->ids[0] = id; /* internal id */ - - switch (nd_type($2)) { - case NODE_LASGN: - case NODE_DASGN: /* e.each {|internal_var| a = internal_var; ... } */ - $2->nd_value = internal_var; - id = 0; - m->nd_plen = 1; - m->nd_next = $2; - break; - case NODE_MASGN: /* e.each {|*internal_var| a, b, c = (internal_var.length == 1 && Array === (tmp = internal_var[0]) ? tmp : internal_var); ... } */ - m->nd_next = node_assign(p, $2, NEW_FOR_MASGN(internal_var, &@2), NO_LEX_CTXT, &@2); - break; - default: /* e.each {|*internal_var| @a, B, c[1], d.attr = internal_val; ... } */ - m->nd_next = node_assign(p, NEW_MASGN(NEW_LIST($2, &@2), 0, &@2), internal_var, NO_LEX_CTXT, &@2); - } - /* {|*internal_id| = internal_id; ... } */ - args = new_args(p, m, 0, id, 0, new_args_tail(p, 0, 0, 0, &@2), &@2); - scope = NEW_NODE(NODE_SCOPE, tbl, $5, args, &@$); - $$ = NEW_FOR($4, scope, &@$); - fixpos($$, $2); - /*% %*/ - /*% ripper: for!($2, $4, $5) %*/ - } - | k_class cpath superclass - { - if (p->ctxt.in_def) { - YYLTYPE loc = code_loc_gen(&@1, &@2); - yyerror1(&loc, "class definition in method body"); - } - p->ctxt.in_class = 1; - local_push(p, 0); - } - bodystmt - k_end - { - /*%%%*/ - $$ = NEW_CLASS($2, $5, $3, &@$); - nd_set_line($$->nd_body, @6.end_pos.lineno); - set_line_body($5, @3.end_pos.lineno); - nd_set_line($$, @3.end_pos.lineno); - /*% %*/ - /*% ripper: class!($2, $3, $5) %*/ - local_pop(p); - p->ctxt.in_class = $1.in_class; - p->ctxt.shareable_constant_value = $1.shareable_constant_value; - } - | k_class tLSHFT expr - { - p->ctxt.in_def = 0; - p->ctxt.in_class = 0; - local_push(p, 0); - } - term - bodystmt - k_end - { - /*%%%*/ - $$ = NEW_SCLASS($3, $6, &@$); - nd_set_line($$->nd_body, @7.end_pos.lineno); - set_line_body($6, nd_line($3)); - fixpos($$, $3); - /*% %*/ - /*% ripper: sclass!($3, $6) %*/ - local_pop(p); - p->ctxt.in_def = $1.in_def; - p->ctxt.in_class = $1.in_class; - p->ctxt.shareable_constant_value = $1.shareable_constant_value; - } - | k_module cpath - { - if (p->ctxt.in_def) { - YYLTYPE loc = code_loc_gen(&@1, &@2); - yyerror1(&loc, "module definition in method body"); - } - p->ctxt.in_class = 1; - local_push(p, 0); - } - bodystmt - k_end - { - /*%%%*/ - $$ = NEW_MODULE($2, $4, &@$); - nd_set_line($$->nd_body, @5.end_pos.lineno); - set_line_body($4, @2.end_pos.lineno); - nd_set_line($$, @2.end_pos.lineno); - /*% %*/ - /*% ripper: module!($2, $4) %*/ - local_pop(p); - p->ctxt.in_class = $1.in_class; - p->ctxt.shareable_constant_value = $1.shareable_constant_value; - } - | defn_head - f_arglist - { - /*%%%*/ - push_end_expect_token_locations(p, &@1.beg_pos); - /*% %*/ - } - bodystmt - k_end - { - restore_defun(p, $1->nd_defn); - /*%%%*/ - $$ = set_defun_body(p, $1, $2, $4, &@$); - /*% %*/ - /*% ripper: def!(get_value($1), $2, $4) %*/ - local_pop(p); - } - | defs_head - f_arglist - { - /*%%%*/ - push_end_expect_token_locations(p, &@1.beg_pos); - /*% %*/ - } - bodystmt - k_end - { - restore_defun(p, $1->nd_defn); - /*%%%*/ - $$ = set_defun_body(p, $1, $2, $4, &@$); - /*% - $1 = get_value($1); - %*/ - /*% ripper: defs!(AREF($1, 0), AREF($1, 1), AREF($1, 2), $2, $4) %*/ - local_pop(p); - } - | keyword_break - { - /*%%%*/ - $$ = NEW_BREAK(0, &@$); - /*% %*/ - /*% ripper: break!(args_new!) %*/ - } - | keyword_next - { - /*%%%*/ - $$ = NEW_NEXT(0, &@$); - /*% %*/ - /*% ripper: next!(args_new!) %*/ - } - | keyword_redo - { - /*%%%*/ - $$ = NEW_REDO(&@$); - /*% %*/ - /*% ripper: redo! %*/ - } - | keyword_retry - { - /*%%%*/ - $$ = NEW_RETRY(&@$); - /*% %*/ - /*% ripper: retry! %*/ - } - ; + p->ctxt.in_class = 1; + local_push(p, 0); + } + bodystmt + k_end + { + /*%%%*/ + $$ = NEW_CLASS($2, $5, $3, &@$); + nd_set_line($$->nd_body, @6.end_pos.lineno); + set_line_body($5, @3.end_pos.lineno); + nd_set_line($$, @3.end_pos.lineno); + /*% %*/ + /*% ripper: class!($2, $3, $5) %*/ + local_pop(p); + p->ctxt.in_class = $1.in_class; + p->ctxt.shareable_constant_value = $1.shareable_constant_value; + } + | k_class tLSHFT expr + { + p->ctxt.in_def = 0; + p->ctxt.in_class = 0; + local_push(p, 0); + } + term + bodystmt + k_end + { + /*%%%*/ + $$ = NEW_SCLASS($3, $6, &@$); + nd_set_line($$->nd_body, @7.end_pos.lineno); + set_line_body($6, nd_line($3)); + fixpos($$, $3); + /*% %*/ + /*% ripper: sclass!($3, $6) %*/ + local_pop(p); + p->ctxt.in_def = $1.in_def; + p->ctxt.in_class = $1.in_class; + p->ctxt.shareable_constant_value = $1.shareable_constant_value; + } + | k_module cpath + { + if (p->ctxt.in_def) { + YYLTYPE loc = code_loc_gen(&@1, &@2); + yyerror1(&loc, "module definition in method body"); + } + p->ctxt.in_class = 1; + local_push(p, 0); + } + bodystmt + k_end + { + /*%%%*/ + $$ = NEW_MODULE($2, $4, &@$); + nd_set_line($$->nd_body, @5.end_pos.lineno); + set_line_body($4, @2.end_pos.lineno); + nd_set_line($$, @2.end_pos.lineno); + /*% %*/ + /*% ripper: module!($2, $4) %*/ + local_pop(p); + p->ctxt.in_class = $1.in_class; + p->ctxt.shareable_constant_value = $1.shareable_constant_value; + } + | defn_head + f_arglist + { + /*%%%*/ + push_end_expect_token_locations(p, &@1.beg_pos); + /*% %*/ + } + bodystmt + k_end + { + restore_defun(p, $1->nd_defn); + /*%%%*/ + $$ = set_defun_body(p, $1, $2, $4, &@$); + /*% %*/ + /*% ripper: def!(get_value($1), $2, $4) %*/ + local_pop(p); + } + | defs_head + f_arglist + { + /*%%%*/ + push_end_expect_token_locations(p, &@1.beg_pos); + /*% %*/ + } + bodystmt + k_end + { + restore_defun(p, $1->nd_defn); + /*%%%*/ + $$ = set_defun_body(p, $1, $2, $4, &@$); + /*% + $1 = get_value($1); + %*/ + /*% ripper: defs!(AREF($1, 0), AREF($1, 1), AREF($1, 2), $2, $4) %*/ + local_pop(p); + } + | keyword_break + { + /*%%%*/ + $$ = NEW_BREAK(0, &@$); + /*% %*/ + /*% ripper: break!(args_new!) %*/ + } + | keyword_next + { + /*%%%*/ + $$ = NEW_NEXT(0, &@$); + /*% %*/ + /*% ripper: next!(args_new!) %*/ + } + | keyword_redo + { + /*%%%*/ + $$ = NEW_REDO(&@$); + /*% %*/ + /*% ripper: redo! %*/ + } + | keyword_retry + { + /*%%%*/ + $$ = NEW_RETRY(&@$); + /*% %*/ + /*% ripper: retry! %*/ + } + ; primary_value : primary - { - value_expr($1); - $$ = $1; - } - ; + { + value_expr($1); + $$ = $1; + } + ; k_begin : keyword_begin - { - token_info_push(p, "begin", &@$); - /*%%%*/ - push_end_expect_token_locations(p, &@1.beg_pos); - /*% %*/ - } - ; + { + token_info_push(p, "begin", &@$); + /*%%%*/ + push_end_expect_token_locations(p, &@1.beg_pos); + /*% %*/ + } + ; k_if : keyword_if - { - WARN_EOL("if"); - token_info_push(p, "if", &@$); - if (p->token_info && p->token_info->nonspc && - p->token_info->next && !strcmp(p->token_info->next->token, "else")) { - const char *tok = p->lex.ptok - rb_strlen_lit("if"); - const char *beg = p->lex.pbeg + p->token_info->next->beg.column; - beg += rb_strlen_lit("else"); - while (beg < tok && ISSPACE(*beg)) beg++; - if (beg == tok) { - p->token_info->nonspc = 0; - } - } - /*%%%*/ - push_end_expect_token_locations(p, &@1.beg_pos); - /*% %*/ - } - ; + { + WARN_EOL("if"); + token_info_push(p, "if", &@$); + if (p->token_info && p->token_info->nonspc && + p->token_info->next && !strcmp(p->token_info->next->token, "else")) { + const char *tok = p->lex.ptok - rb_strlen_lit("if"); + const char *beg = p->lex.pbeg + p->token_info->next->beg.column; + beg += rb_strlen_lit("else"); + while (beg < tok && ISSPACE(*beg)) beg++; + if (beg == tok) { + p->token_info->nonspc = 0; + } + } + /*%%%*/ + push_end_expect_token_locations(p, &@1.beg_pos); + /*% %*/ + } + ; k_unless : keyword_unless - { - token_info_push(p, "unless", &@$); - /*%%%*/ - push_end_expect_token_locations(p, &@1.beg_pos); - /*% %*/ - } - ; + { + token_info_push(p, "unless", &@$); + /*%%%*/ + push_end_expect_token_locations(p, &@1.beg_pos); + /*% %*/ + } + ; k_while : keyword_while - { - token_info_push(p, "while", &@$); - /*%%%*/ - push_end_expect_token_locations(p, &@1.beg_pos); - /*% %*/ - } - ; + { + token_info_push(p, "while", &@$); + /*%%%*/ + push_end_expect_token_locations(p, &@1.beg_pos); + /*% %*/ + } + ; k_until : keyword_until - { - token_info_push(p, "until", &@$); - /*%%%*/ - push_end_expect_token_locations(p, &@1.beg_pos); - /*% %*/ - } - ; + { + token_info_push(p, "until", &@$); + /*%%%*/ + push_end_expect_token_locations(p, &@1.beg_pos); + /*% %*/ + } + ; k_case : keyword_case - { - token_info_push(p, "case", &@$); - /*%%%*/ - push_end_expect_token_locations(p, &@1.beg_pos); - /*% %*/ - } - ; + { + token_info_push(p, "case", &@$); + /*%%%*/ + push_end_expect_token_locations(p, &@1.beg_pos); + /*% %*/ + } + ; k_for : keyword_for - { - token_info_push(p, "for", &@$); - /*%%%*/ - push_end_expect_token_locations(p, &@1.beg_pos); - /*% %*/ - } - ; + { + token_info_push(p, "for", &@$); + /*%%%*/ + push_end_expect_token_locations(p, &@1.beg_pos); + /*% %*/ + } + ; k_class : keyword_class - { - token_info_push(p, "class", &@$); - $$ = p->ctxt; - /*%%%*/ - push_end_expect_token_locations(p, &@1.beg_pos); - /*% %*/ - } - ; + { + token_info_push(p, "class", &@$); + $$ = p->ctxt; + /*%%%*/ + push_end_expect_token_locations(p, &@1.beg_pos); + /*% %*/ + } + ; k_module : keyword_module - { - token_info_push(p, "module", &@$); - $$ = p->ctxt; - /*%%%*/ - push_end_expect_token_locations(p, &@1.beg_pos); - /*% %*/ - } - ; + { + token_info_push(p, "module", &@$); + $$ = p->ctxt; + /*%%%*/ + push_end_expect_token_locations(p, &@1.beg_pos); + /*% %*/ + } + ; k_def : keyword_def - { - token_info_push(p, "def", &@$); - p->ctxt.in_argdef = 1; - } - ; + { + token_info_push(p, "def", &@$); + p->ctxt.in_argdef = 1; + } + ; k_do : keyword_do - { - token_info_push(p, "do", &@$); - /*%%%*/ - push_end_expect_token_locations(p, &@1.beg_pos); - /*% %*/ + { + token_info_push(p, "do", &@$); + /*%%%*/ + push_end_expect_token_locations(p, &@1.beg_pos); + /*% %*/ - } - ; + } + ; k_do_block : keyword_do_block - { - token_info_push(p, "do", &@$); - /*%%%*/ - push_end_expect_token_locations(p, &@1.beg_pos); - /*% %*/ - } - ; + { + token_info_push(p, "do", &@$); + /*%%%*/ + push_end_expect_token_locations(p, &@1.beg_pos); + /*% %*/ + } + ; k_rescue : keyword_rescue - { - token_info_warn(p, "rescue", p->token_info, 1, &@$); - } - ; + { + token_info_warn(p, "rescue", p->token_info, 1, &@$); + } + ; k_ensure : keyword_ensure - { - token_info_warn(p, "ensure", p->token_info, 1, &@$); - } - ; + { + token_info_warn(p, "ensure", p->token_info, 1, &@$); + } + ; k_when : keyword_when - { - token_info_warn(p, "when", p->token_info, 0, &@$); - } - ; + { + token_info_warn(p, "when", p->token_info, 0, &@$); + } + ; k_else : keyword_else - { - token_info *ptinfo_beg = p->token_info; - int same = ptinfo_beg && strcmp(ptinfo_beg->token, "case") != 0; - token_info_warn(p, "else", p->token_info, same, &@$); - if (same) { - token_info e; - e.next = ptinfo_beg->next; - e.token = "else"; - token_info_setup(&e, p->lex.pbeg, &@$); - if (!e.nonspc) *ptinfo_beg = e; - } - } - ; + { + token_info *ptinfo_beg = p->token_info; + int same = ptinfo_beg && strcmp(ptinfo_beg->token, "case") != 0; + token_info_warn(p, "else", p->token_info, same, &@$); + if (same) { + token_info e; + e.next = ptinfo_beg->next; + e.token = "else"; + token_info_setup(&e, p->lex.pbeg, &@$); + if (!e.nonspc) *ptinfo_beg = e; + } + } + ; k_elsif : keyword_elsif - { - WARN_EOL("elsif"); - token_info_warn(p, "elsif", p->token_info, 1, &@$); - } - ; + { + WARN_EOL("elsif"); + token_info_warn(p, "elsif", p->token_info, 1, &@$); + } + ; k_end : keyword_end - { - token_info_pop(p, "end", &@$); - /*%%%*/ - pop_end_expect_token_locations(p); - /*% %*/ - } - | tDUMNY_END - { - compile_error(p, "syntax error, unexpected end-of-input"); - } - ; + { + token_info_pop(p, "end", &@$); + /*%%%*/ + pop_end_expect_token_locations(p); + /*% %*/ + } + | tDUMNY_END + { + compile_error(p, "syntax error, unexpected end-of-input"); + } + ; k_return : keyword_return - { - if (p->ctxt.in_class && !p->ctxt.in_def && !dyna_in_block(p)) - yyerror1(&@1, "Invalid return in class/module body"); - } - ; + { + if (p->ctxt.in_class && !p->ctxt.in_def && !dyna_in_block(p)) + yyerror1(&@1, "Invalid return in class/module body"); + } + ; then : term - | keyword_then - | term keyword_then - ; + | keyword_then + | term keyword_then + ; do : term - | keyword_do_cond - ; + | keyword_do_cond + ; if_tail : opt_else - | k_elsif expr_value then - compstmt - if_tail - { - /*%%%*/ - $$ = new_if(p, $2, $4, $5, &@$); - fixpos($$, $2); - /*% %*/ - /*% ripper: elsif!($2, $4, escape_Qundef($5)) %*/ - } - ; + | k_elsif expr_value then + compstmt + if_tail + { + /*%%%*/ + $$ = new_if(p, $2, $4, $5, &@$); + fixpos($$, $2); + /*% %*/ + /*% ripper: elsif!($2, $4, escape_Qundef($5)) %*/ + } + ; opt_else : none - | k_else compstmt - { - /*%%%*/ - $$ = $2; - /*% %*/ - /*% ripper: else!($2) %*/ - } - ; + | k_else compstmt + { + /*%%%*/ + $$ = $2; + /*% %*/ + /*% ripper: else!($2) %*/ + } + ; for_var : lhs - | mlhs - ; + | mlhs + ; f_marg : f_norm_arg - { - /*%%%*/ - $$ = assignable(p, $1, 0, &@$); - mark_lvar_used(p, $$); - /*% %*/ - /*% ripper: assignable(p, $1) %*/ - } - | tLPAREN f_margs rparen - { - /*%%%*/ - $$ = $2; - /*% %*/ - /*% ripper: mlhs_paren!($2) %*/ - } - ; + { + /*%%%*/ + $$ = assignable(p, $1, 0, &@$); + mark_lvar_used(p, $$); + /*% %*/ + /*% ripper: assignable(p, $1) %*/ + } + | tLPAREN f_margs rparen + { + /*%%%*/ + $$ = $2; + /*% %*/ + /*% ripper: mlhs_paren!($2) %*/ + } + ; f_marg_list : f_marg - { - /*%%%*/ - $$ = NEW_LIST($1, &@$); - /*% %*/ - /*% ripper: mlhs_add!(mlhs_new!, $1) %*/ - } - | f_marg_list ',' f_marg - { - /*%%%*/ - $$ = list_append(p, $1, $3); - /*% %*/ - /*% ripper: mlhs_add!($1, $3) %*/ - } - ; + { + /*%%%*/ + $$ = NEW_LIST($1, &@$); + /*% %*/ + /*% ripper: mlhs_add!(mlhs_new!, $1) %*/ + } + | f_marg_list ',' f_marg + { + /*%%%*/ + $$ = list_append(p, $1, $3); + /*% %*/ + /*% ripper: mlhs_add!($1, $3) %*/ + } + ; f_margs : f_marg_list - { - /*%%%*/ - $$ = NEW_MASGN($1, 0, &@$); - /*% %*/ - /*% ripper: $1 %*/ - } - | f_marg_list ',' f_rest_marg - { - /*%%%*/ - $$ = NEW_MASGN($1, $3, &@$); - /*% %*/ - /*% ripper: mlhs_add_star!($1, $3) %*/ - } - | f_marg_list ',' f_rest_marg ',' f_marg_list - { - /*%%%*/ - $$ = NEW_MASGN($1, NEW_POSTARG($3, $5, &@$), &@$); - /*% %*/ - /*% ripper: mlhs_add_post!(mlhs_add_star!($1, $3), $5) %*/ - } - | f_rest_marg - { - /*%%%*/ - $$ = NEW_MASGN(0, $1, &@$); - /*% %*/ - /*% ripper: mlhs_add_star!(mlhs_new!, $1) %*/ - } - | f_rest_marg ',' f_marg_list - { - /*%%%*/ - $$ = NEW_MASGN(0, NEW_POSTARG($1, $3, &@$), &@$); - /*% %*/ - /*% ripper: mlhs_add_post!(mlhs_add_star!(mlhs_new!, $1), $3) %*/ - } - ; + { + /*%%%*/ + $$ = NEW_MASGN($1, 0, &@$); + /*% %*/ + /*% ripper: $1 %*/ + } + | f_marg_list ',' f_rest_marg + { + /*%%%*/ + $$ = NEW_MASGN($1, $3, &@$); + /*% %*/ + /*% ripper: mlhs_add_star!($1, $3) %*/ + } + | f_marg_list ',' f_rest_marg ',' f_marg_list + { + /*%%%*/ + $$ = NEW_MASGN($1, NEW_POSTARG($3, $5, &@$), &@$); + /*% %*/ + /*% ripper: mlhs_add_post!(mlhs_add_star!($1, $3), $5) %*/ + } + | f_rest_marg + { + /*%%%*/ + $$ = NEW_MASGN(0, $1, &@$); + /*% %*/ + /*% ripper: mlhs_add_star!(mlhs_new!, $1) %*/ + } + | f_rest_marg ',' f_marg_list + { + /*%%%*/ + $$ = NEW_MASGN(0, NEW_POSTARG($1, $3, &@$), &@$); + /*% %*/ + /*% ripper: mlhs_add_post!(mlhs_add_star!(mlhs_new!, $1), $3) %*/ + } + ; f_rest_marg : tSTAR f_norm_arg - { - /*%%%*/ - $$ = assignable(p, $2, 0, &@$); - mark_lvar_used(p, $$); - /*% %*/ - /*% ripper: assignable(p, $2) %*/ - } - | tSTAR - { - /*%%%*/ - $$ = NODE_SPECIAL_NO_NAME_REST; - /*% %*/ - /*% ripper: Qnil %*/ - } - ; + { + /*%%%*/ + $$ = assignable(p, $2, 0, &@$); + mark_lvar_used(p, $$); + /*% %*/ + /*% ripper: assignable(p, $2) %*/ + } + | tSTAR + { + /*%%%*/ + $$ = NODE_SPECIAL_NO_NAME_REST; + /*% %*/ + /*% ripper: Qnil %*/ + } + ; f_any_kwrest : f_kwrest - | f_no_kwarg {$$ = ID2VAL(idNil);} - ; + | f_no_kwarg {$$ = ID2VAL(idNil);} + ; f_eq : {p->ctxt.in_argdef = 0;} '='; block_args_tail : f_block_kwarg ',' f_kwrest opt_f_block_arg - { - $$ = new_args_tail(p, $1, $3, $4, &@3); - } - | f_block_kwarg opt_f_block_arg - { - $$ = new_args_tail(p, $1, Qnone, $2, &@1); - } - | f_any_kwrest opt_f_block_arg - { - $$ = new_args_tail(p, Qnone, $1, $2, &@1); - } - | f_block_arg - { - $$ = new_args_tail(p, Qnone, Qnone, $1, &@1); - } - ; + { + $$ = new_args_tail(p, $1, $3, $4, &@3); + } + | f_block_kwarg opt_f_block_arg + { + $$ = new_args_tail(p, $1, Qnone, $2, &@1); + } + | f_any_kwrest opt_f_block_arg + { + $$ = new_args_tail(p, Qnone, $1, $2, &@1); + } + | f_block_arg + { + $$ = new_args_tail(p, Qnone, Qnone, $1, &@1); + } + ; opt_block_args_tail : ',' block_args_tail - { - $$ = $2; - } - | /* none */ - { - $$ = new_args_tail(p, Qnone, Qnone, Qnone, &@0); - } - ; + { + $$ = $2; + } + | /* none */ + { + $$ = new_args_tail(p, Qnone, Qnone, Qnone, &@0); + } + ; excessed_comma : ',' - { - /* magic number for rest_id in iseq_set_arguments() */ - /*%%%*/ - $$ = NODE_SPECIAL_EXCESSIVE_COMMA; - /*% %*/ - /*% ripper: excessed_comma! %*/ - } - ; + { + /* magic number for rest_id in iseq_set_arguments() */ + /*%%%*/ + $$ = NODE_SPECIAL_EXCESSIVE_COMMA; + /*% %*/ + /*% ripper: excessed_comma! %*/ + } + ; block_param : f_arg ',' f_block_optarg ',' f_rest_arg opt_block_args_tail - { - $$ = new_args(p, $1, $3, $5, Qnone, $6, &@$); - } - | f_arg ',' f_block_optarg ',' f_rest_arg ',' f_arg opt_block_args_tail - { - $$ = new_args(p, $1, $3, $5, $7, $8, &@$); - } - | f_arg ',' f_block_optarg opt_block_args_tail - { - $$ = new_args(p, $1, $3, Qnone, Qnone, $4, &@$); - } - | f_arg ',' f_block_optarg ',' f_arg opt_block_args_tail - { - $$ = new_args(p, $1, $3, Qnone, $5, $6, &@$); - } + { + $$ = new_args(p, $1, $3, $5, Qnone, $6, &@$); + } + | f_arg ',' f_block_optarg ',' f_rest_arg ',' f_arg opt_block_args_tail + { + $$ = new_args(p, $1, $3, $5, $7, $8, &@$); + } + | f_arg ',' f_block_optarg opt_block_args_tail + { + $$ = new_args(p, $1, $3, Qnone, Qnone, $4, &@$); + } + | f_arg ',' f_block_optarg ',' f_arg opt_block_args_tail + { + $$ = new_args(p, $1, $3, Qnone, $5, $6, &@$); + } | f_arg ',' f_rest_arg opt_block_args_tail - { - $$ = new_args(p, $1, Qnone, $3, Qnone, $4, &@$); - } - | f_arg excessed_comma - { - $$ = new_args_tail(p, Qnone, Qnone, Qnone, &@2); - $$ = new_args(p, $1, Qnone, $2, Qnone, $$, &@$); - } - | f_arg ',' f_rest_arg ',' f_arg opt_block_args_tail - { - $$ = new_args(p, $1, Qnone, $3, $5, $6, &@$); - } - | f_arg opt_block_args_tail - { - $$ = new_args(p, $1, Qnone, Qnone, Qnone, $2, &@$); - } - | f_block_optarg ',' f_rest_arg opt_block_args_tail - { - $$ = new_args(p, Qnone, $1, $3, Qnone, $4, &@$); - } - | f_block_optarg ',' f_rest_arg ',' f_arg opt_block_args_tail - { - $$ = new_args(p, Qnone, $1, $3, $5, $6, &@$); - } - | f_block_optarg opt_block_args_tail - { - $$ = new_args(p, Qnone, $1, Qnone, Qnone, $2, &@$); - } - | f_block_optarg ',' f_arg opt_block_args_tail - { - $$ = new_args(p, Qnone, $1, Qnone, $3, $4, &@$); - } - | f_rest_arg opt_block_args_tail - { - $$ = new_args(p, Qnone, Qnone, $1, Qnone, $2, &@$); - } - | f_rest_arg ',' f_arg opt_block_args_tail - { - $$ = new_args(p, Qnone, Qnone, $1, $3, $4, &@$); - } - | block_args_tail - { - $$ = new_args(p, Qnone, Qnone, Qnone, Qnone, $1, &@$); - } - ; + { + $$ = new_args(p, $1, Qnone, $3, Qnone, $4, &@$); + } + | f_arg excessed_comma + { + $$ = new_args_tail(p, Qnone, Qnone, Qnone, &@2); + $$ = new_args(p, $1, Qnone, $2, Qnone, $$, &@$); + } + | f_arg ',' f_rest_arg ',' f_arg opt_block_args_tail + { + $$ = new_args(p, $1, Qnone, $3, $5, $6, &@$); + } + | f_arg opt_block_args_tail + { + $$ = new_args(p, $1, Qnone, Qnone, Qnone, $2, &@$); + } + | f_block_optarg ',' f_rest_arg opt_block_args_tail + { + $$ = new_args(p, Qnone, $1, $3, Qnone, $4, &@$); + } + | f_block_optarg ',' f_rest_arg ',' f_arg opt_block_args_tail + { + $$ = new_args(p, Qnone, $1, $3, $5, $6, &@$); + } + | f_block_optarg opt_block_args_tail + { + $$ = new_args(p, Qnone, $1, Qnone, Qnone, $2, &@$); + } + | f_block_optarg ',' f_arg opt_block_args_tail + { + $$ = new_args(p, Qnone, $1, Qnone, $3, $4, &@$); + } + | f_rest_arg opt_block_args_tail + { + $$ = new_args(p, Qnone, Qnone, $1, Qnone, $2, &@$); + } + | f_rest_arg ',' f_arg opt_block_args_tail + { + $$ = new_args(p, Qnone, Qnone, $1, $3, $4, &@$); + } + | block_args_tail + { + $$ = new_args(p, Qnone, Qnone, Qnone, Qnone, $1, &@$); + } + ; opt_block_param : none - | block_param_def - { - p->command_start = TRUE; - } - ; + | block_param_def + { + p->command_start = TRUE; + } + ; block_param_def : '|' opt_bv_decl '|' - { - p->cur_arg = 0; - p->max_numparam = ORDINAL_PARAM; - p->ctxt.in_argdef = 0; - /*%%%*/ - $$ = 0; - /*% %*/ - /*% ripper: block_var!(params!(Qnil,Qnil,Qnil,Qnil,Qnil,Qnil,Qnil), escape_Qundef($2)) %*/ - } - | '|' block_param opt_bv_decl '|' - { - p->cur_arg = 0; - p->max_numparam = ORDINAL_PARAM; - p->ctxt.in_argdef = 0; - /*%%%*/ - $$ = $2; - /*% %*/ - /*% ripper: block_var!(escape_Qundef($2), escape_Qundef($3)) %*/ - } - ; + { + p->cur_arg = 0; + p->max_numparam = ORDINAL_PARAM; + p->ctxt.in_argdef = 0; + /*%%%*/ + $$ = 0; + /*% %*/ + /*% ripper: block_var!(params!(Qnil,Qnil,Qnil,Qnil,Qnil,Qnil,Qnil), escape_Qundef($2)) %*/ + } + | '|' block_param opt_bv_decl '|' + { + p->cur_arg = 0; + p->max_numparam = ORDINAL_PARAM; + p->ctxt.in_argdef = 0; + /*%%%*/ + $$ = $2; + /*% %*/ + /*% ripper: block_var!(escape_Qundef($2), escape_Qundef($3)) %*/ + } + ; opt_bv_decl : opt_nl - { - $$ = 0; - } - | opt_nl ';' bv_decls opt_nl - { - /*%%%*/ - $$ = 0; - /*% %*/ - /*% ripper: $3 %*/ - } - ; + { + $$ = 0; + } + | opt_nl ';' bv_decls opt_nl + { + /*%%%*/ + $$ = 0; + /*% %*/ + /*% ripper: $3 %*/ + } + ; bv_decls : bvar - /*% ripper[brace]: rb_ary_new3(1, get_value($1)) %*/ - | bv_decls ',' bvar - /*% ripper[brace]: rb_ary_push($1, get_value($3)) %*/ - ; + /*% ripper[brace]: rb_ary_new3(1, get_value($1)) %*/ + | bv_decls ',' bvar + /*% ripper[brace]: rb_ary_push($1, get_value($3)) %*/ + ; bvar : tIDENTIFIER - { - new_bv(p, get_id($1)); - /*% ripper: get_value($1) %*/ - } - | f_bad_arg - { - $$ = 0; - } - ; + { + new_bv(p, get_id($1)); + /*% ripper: get_value($1) %*/ + } + | f_bad_arg + { + $$ = 0; + } + ; lambda : tLAMBDA - { - token_info_push(p, "->", &@1); - $1 = dyna_push(p); - $$ = p->lex.lpar_beg; - p->lex.lpar_beg = p->lex.paren_nest; - } - { - $$ = p->max_numparam; - p->max_numparam = 0; - } - { - $$ = numparam_push(p); - } - f_larglist - { - CMDARG_PUSH(0); - } - lambda_body - { - int max_numparam = p->max_numparam; - p->lex.lpar_beg = $2; - p->max_numparam = $3; - CMDARG_POP(); - $5 = args_with_numbered(p, $5, max_numparam); - /*%%%*/ + { + token_info_push(p, "->", &@1); + $1 = dyna_push(p); + $$ = p->lex.lpar_beg; + p->lex.lpar_beg = p->lex.paren_nest; + } + { + $$ = p->max_numparam; + p->max_numparam = 0; + } + { + $$ = numparam_push(p); + } + f_larglist + { + CMDARG_PUSH(0); + } + lambda_body + { + int max_numparam = p->max_numparam; + p->lex.lpar_beg = $2; + p->max_numparam = $3; + CMDARG_POP(); + $5 = args_with_numbered(p, $5, max_numparam); + /*%%%*/ { YYLTYPE loc = code_loc_gen(&@5, &@7); $$ = NEW_LAMBDA($5, $7, &loc); nd_set_line($$->nd_body, @7.end_pos.lineno); nd_set_line($$, @5.end_pos.lineno); - nd_set_first_loc($$, @1.beg_pos); + nd_set_first_loc($$, @1.beg_pos); } - /*% %*/ - /*% ripper: lambda!($5, $7) %*/ - numparam_pop(p, $4); - dyna_pop(p, $1); - } - ; + /*% %*/ + /*% ripper: lambda!($5, $7) %*/ + numparam_pop(p, $4); + dyna_pop(p, $1); + } + ; f_larglist : '(' f_args opt_bv_decl ')' - { - p->ctxt.in_argdef = 0; - /*%%%*/ - $$ = $2; - p->max_numparam = ORDINAL_PARAM; - /*% %*/ - /*% ripper: paren!($2) %*/ - } - | f_args - { - p->ctxt.in_argdef = 0; - /*%%%*/ - if (!args_info_empty_p($1->nd_ainfo)) - p->max_numparam = ORDINAL_PARAM; - /*% %*/ - $$ = $1; - } - ; + { + p->ctxt.in_argdef = 0; + /*%%%*/ + $$ = $2; + p->max_numparam = ORDINAL_PARAM; + /*% %*/ + /*% ripper: paren!($2) %*/ + } + | f_args + { + p->ctxt.in_argdef = 0; + /*%%%*/ + if (!args_info_empty_p($1->nd_ainfo)) + p->max_numparam = ORDINAL_PARAM; + /*% %*/ + $$ = $1; + } + ; lambda_body : tLAMBEG compstmt '}' - { - token_info_pop(p, "}", &@3); - $$ = $2; - } - | keyword_do_LAMBDA - { - /*%%%*/ - push_end_expect_token_locations(p, &@1.beg_pos); - /*% %*/ - } - bodystmt k_end - { - $$ = $3; - } - ; + { + token_info_pop(p, "}", &@3); + $$ = $2; + } + | keyword_do_LAMBDA + { + /*%%%*/ + push_end_expect_token_locations(p, &@1.beg_pos); + /*% %*/ + } + bodystmt k_end + { + $$ = $3; + } + ; do_block : k_do_block do_body k_end - { - $$ = $2; - /*%%%*/ - $$->nd_body->nd_loc = code_loc_gen(&@1, &@3); - nd_set_line($$, @1.end_pos.lineno); - /*% %*/ - } - ; + { + $$ = $2; + /*%%%*/ + $$->nd_body->nd_loc = code_loc_gen(&@1, &@3); + nd_set_line($$, @1.end_pos.lineno); + /*% %*/ + } + ; block_call : command do_block - { - /*%%%*/ - if (nd_type_p($1, NODE_YIELD)) { - compile_error(p, "block given to yield"); - } - else { - block_dup_check(p, $1->nd_args, $2); - } - $$ = method_add_block(p, $1, $2, &@$); - fixpos($$, $1); - /*% %*/ - /*% ripper: method_add_block!($1, $2) %*/ - } - | block_call call_op2 operation2 opt_paren_args - { - /*%%%*/ - $$ = new_qcall(p, $2, $1, $3, $4, &@3, &@$); - /*% %*/ - /*% ripper: opt_event(:method_add_arg!, call!($1, $2, $3), $4) %*/ - } - | block_call call_op2 operation2 opt_paren_args brace_block - { - /*%%%*/ - $$ = new_command_qcall(p, $2, $1, $3, $4, $5, &@3, &@$); - /*% %*/ - /*% ripper: opt_event(:method_add_block!, command_call!($1, $2, $3, $4), $5) %*/ - } - | block_call call_op2 operation2 command_args do_block - { - /*%%%*/ - $$ = new_command_qcall(p, $2, $1, $3, $4, $5, &@3, &@$); - /*% %*/ - /*% ripper: method_add_block!(command_call!($1, $2, $3, $4), $5) %*/ - } - ; + { + /*%%%*/ + if (nd_type_p($1, NODE_YIELD)) { + compile_error(p, "block given to yield"); + } + else { + block_dup_check(p, $1->nd_args, $2); + } + $$ = method_add_block(p, $1, $2, &@$); + fixpos($$, $1); + /*% %*/ + /*% ripper: method_add_block!($1, $2) %*/ + } + | block_call call_op2 operation2 opt_paren_args + { + /*%%%*/ + $$ = new_qcall(p, $2, $1, $3, $4, &@3, &@$); + /*% %*/ + /*% ripper: opt_event(:method_add_arg!, call!($1, $2, $3), $4) %*/ + } + | block_call call_op2 operation2 opt_paren_args brace_block + { + /*%%%*/ + $$ = new_command_qcall(p, $2, $1, $3, $4, $5, &@3, &@$); + /*% %*/ + /*% ripper: opt_event(:method_add_block!, command_call!($1, $2, $3, $4), $5) %*/ + } + | block_call call_op2 operation2 command_args do_block + { + /*%%%*/ + $$ = new_command_qcall(p, $2, $1, $3, $4, $5, &@3, &@$); + /*% %*/ + /*% ripper: method_add_block!(command_call!($1, $2, $3, $4), $5) %*/ + } + ; method_call : fcall paren_args - { - /*%%%*/ - $$ = $1; - $$->nd_args = $2; - nd_set_last_loc($1, @2.end_pos); - /*% %*/ - /*% ripper: method_add_arg!(fcall!($1), $2) %*/ - } - | primary_value call_op operation2 opt_paren_args - { - /*%%%*/ - $$ = new_qcall(p, $2, $1, $3, $4, &@3, &@$); - nd_set_line($$, @3.end_pos.lineno); - /*% %*/ - /*% ripper: opt_event(:method_add_arg!, call!($1, $2, $3), $4) %*/ - } - | primary_value tCOLON2 operation2 paren_args - { - /*%%%*/ - $$ = new_qcall(p, ID2VAL(idCOLON2), $1, $3, $4, &@3, &@$); - nd_set_line($$, @3.end_pos.lineno); - /*% %*/ - /*% ripper: method_add_arg!(call!($1, ID2VAL(idCOLON2), $3), $4) %*/ - } - | primary_value tCOLON2 operation3 - { - /*%%%*/ - $$ = new_qcall(p, ID2VAL(idCOLON2), $1, $3, Qnull, &@3, &@$); - /*% %*/ - /*% ripper: call!($1, ID2VAL(idCOLON2), $3) %*/ - } - | primary_value call_op paren_args - { - /*%%%*/ - $$ = new_qcall(p, $2, $1, ID2VAL(idCall), $3, &@2, &@$); - nd_set_line($$, @2.end_pos.lineno); - /*% %*/ - /*% ripper: method_add_arg!(call!($1, $2, ID2VAL(idCall)), $3) %*/ - } - | primary_value tCOLON2 paren_args - { - /*%%%*/ - $$ = new_qcall(p, ID2VAL(idCOLON2), $1, ID2VAL(idCall), $3, &@2, &@$); - nd_set_line($$, @2.end_pos.lineno); - /*% %*/ - /*% ripper: method_add_arg!(call!($1, ID2VAL(idCOLON2), ID2VAL(idCall)), $3) %*/ - } - | keyword_super paren_args - { - /*%%%*/ - $$ = NEW_SUPER($2, &@$); - /*% %*/ - /*% ripper: super!($2) %*/ - } - | keyword_super - { - /*%%%*/ - $$ = NEW_ZSUPER(&@$); - /*% %*/ - /*% ripper: zsuper! %*/ - } - | primary_value '[' opt_call_args rbracket - { - /*%%%*/ - if ($1 && nd_type_p($1, NODE_SELF)) - $$ = NEW_FCALL(tAREF, $3, &@$); - else - $$ = NEW_CALL($1, tAREF, $3, &@$); - fixpos($$, $1); - /*% %*/ - /*% ripper: aref!($1, escape_Qundef($3)) %*/ - } - ; + { + /*%%%*/ + $$ = $1; + $$->nd_args = $2; + nd_set_last_loc($1, @2.end_pos); + /*% %*/ + /*% ripper: method_add_arg!(fcall!($1), $2) %*/ + } + | primary_value call_op operation2 opt_paren_args + { + /*%%%*/ + $$ = new_qcall(p, $2, $1, $3, $4, &@3, &@$); + nd_set_line($$, @3.end_pos.lineno); + /*% %*/ + /*% ripper: opt_event(:method_add_arg!, call!($1, $2, $3), $4) %*/ + } + | primary_value tCOLON2 operation2 paren_args + { + /*%%%*/ + $$ = new_qcall(p, ID2VAL(idCOLON2), $1, $3, $4, &@3, &@$); + nd_set_line($$, @3.end_pos.lineno); + /*% %*/ + /*% ripper: method_add_arg!(call!($1, ID2VAL(idCOLON2), $3), $4) %*/ + } + | primary_value tCOLON2 operation3 + { + /*%%%*/ + $$ = new_qcall(p, ID2VAL(idCOLON2), $1, $3, Qnull, &@3, &@$); + /*% %*/ + /*% ripper: call!($1, ID2VAL(idCOLON2), $3) %*/ + } + | primary_value call_op paren_args + { + /*%%%*/ + $$ = new_qcall(p, $2, $1, ID2VAL(idCall), $3, &@2, &@$); + nd_set_line($$, @2.end_pos.lineno); + /*% %*/ + /*% ripper: method_add_arg!(call!($1, $2, ID2VAL(idCall)), $3) %*/ + } + | primary_value tCOLON2 paren_args + { + /*%%%*/ + $$ = new_qcall(p, ID2VAL(idCOLON2), $1, ID2VAL(idCall), $3, &@2, &@$); + nd_set_line($$, @2.end_pos.lineno); + /*% %*/ + /*% ripper: method_add_arg!(call!($1, ID2VAL(idCOLON2), ID2VAL(idCall)), $3) %*/ + } + | keyword_super paren_args + { + /*%%%*/ + $$ = NEW_SUPER($2, &@$); + /*% %*/ + /*% ripper: super!($2) %*/ + } + | keyword_super + { + /*%%%*/ + $$ = NEW_ZSUPER(&@$); + /*% %*/ + /*% ripper: zsuper! %*/ + } + | primary_value '[' opt_call_args rbracket + { + /*%%%*/ + if ($1 && nd_type_p($1, NODE_SELF)) + $$ = NEW_FCALL(tAREF, $3, &@$); + else + $$ = NEW_CALL($1, tAREF, $3, &@$); + fixpos($$, $1); + /*% %*/ + /*% ripper: aref!($1, escape_Qundef($3)) %*/ + } + ; brace_block : '{' brace_body '}' - { - $$ = $2; - /*%%%*/ - $$->nd_body->nd_loc = code_loc_gen(&@1, &@3); - nd_set_line($$, @1.end_pos.lineno); - /*% %*/ - } - | k_do do_body k_end - { - $$ = $2; - /*%%%*/ - $$->nd_body->nd_loc = code_loc_gen(&@1, &@3); - nd_set_line($$, @1.end_pos.lineno); - /*% %*/ - } - ; + { + $$ = $2; + /*%%%*/ + $$->nd_body->nd_loc = code_loc_gen(&@1, &@3); + nd_set_line($$, @1.end_pos.lineno); + /*% %*/ + } + | k_do do_body k_end + { + $$ = $2; + /*%%%*/ + $$->nd_body->nd_loc = code_loc_gen(&@1, &@3); + nd_set_line($$, @1.end_pos.lineno); + /*% %*/ + } + ; brace_body : {$$ = dyna_push(p);} - { - $$ = p->max_numparam; - p->max_numparam = 0; - } - { - $$ = numparam_push(p); - } - opt_block_param compstmt - { - int max_numparam = p->max_numparam; - p->max_numparam = $2; - $4 = args_with_numbered(p, $4, max_numparam); - /*%%%*/ - $$ = NEW_ITER($4, $5, &@$); - /*% %*/ - /*% ripper: brace_block!(escape_Qundef($4), $5) %*/ - numparam_pop(p, $3); - dyna_pop(p, $1); - } - ; + { + $$ = p->max_numparam; + p->max_numparam = 0; + } + { + $$ = numparam_push(p); + } + opt_block_param compstmt + { + int max_numparam = p->max_numparam; + p->max_numparam = $2; + $4 = args_with_numbered(p, $4, max_numparam); + /*%%%*/ + $$ = NEW_ITER($4, $5, &@$); + /*% %*/ + /*% ripper: brace_block!(escape_Qundef($4), $5) %*/ + numparam_pop(p, $3); + dyna_pop(p, $1); + } + ; do_body : {$$ = dyna_push(p);} - { - $$ = p->max_numparam; - p->max_numparam = 0; - } - { - $$ = numparam_push(p); - CMDARG_PUSH(0); - } - opt_block_param bodystmt - { - int max_numparam = p->max_numparam; - p->max_numparam = $2; - $4 = args_with_numbered(p, $4, max_numparam); - /*%%%*/ - $$ = NEW_ITER($4, $5, &@$); - /*% %*/ - /*% ripper: do_block!(escape_Qundef($4), $5) %*/ - CMDARG_POP(); - numparam_pop(p, $3); - dyna_pop(p, $1); - } - ; + { + $$ = p->max_numparam; + p->max_numparam = 0; + } + { + $$ = numparam_push(p); + CMDARG_PUSH(0); + } + opt_block_param bodystmt + { + int max_numparam = p->max_numparam; + p->max_numparam = $2; + $4 = args_with_numbered(p, $4, max_numparam); + /*%%%*/ + $$ = NEW_ITER($4, $5, &@$); + /*% %*/ + /*% ripper: do_block!(escape_Qundef($4), $5) %*/ + CMDARG_POP(); + numparam_pop(p, $3); + dyna_pop(p, $1); + } + ; case_args : arg_value - { - /*%%%*/ - check_literal_when(p, $1, &@1); - $$ = NEW_LIST($1, &@$); - /*% %*/ - /*% ripper: args_add!(args_new!, $1) %*/ - } - | tSTAR arg_value - { - /*%%%*/ - $$ = NEW_SPLAT($2, &@$); - /*% %*/ - /*% ripper: args_add_star!(args_new!, $2) %*/ - } - | case_args ',' arg_value - { - /*%%%*/ - check_literal_when(p, $3, &@3); - $$ = last_arg_append(p, $1, $3, &@$); - /*% %*/ - /*% ripper: args_add!($1, $3) %*/ - } - | case_args ',' tSTAR arg_value - { - /*%%%*/ - $$ = rest_arg_append(p, $1, $4, &@$); - /*% %*/ - /*% ripper: args_add_star!($1, $4) %*/ - } - ; + { + /*%%%*/ + check_literal_when(p, $1, &@1); + $$ = NEW_LIST($1, &@$); + /*% %*/ + /*% ripper: args_add!(args_new!, $1) %*/ + } + | tSTAR arg_value + { + /*%%%*/ + $$ = NEW_SPLAT($2, &@$); + /*% %*/ + /*% ripper: args_add_star!(args_new!, $2) %*/ + } + | case_args ',' arg_value + { + /*%%%*/ + check_literal_when(p, $3, &@3); + $$ = last_arg_append(p, $1, $3, &@$); + /*% %*/ + /*% ripper: args_add!($1, $3) %*/ + } + | case_args ',' tSTAR arg_value + { + /*%%%*/ + $$ = rest_arg_append(p, $1, $4, &@$); + /*% %*/ + /*% ripper: args_add_star!($1, $4) %*/ + } + ; case_body : k_when case_args then - compstmt - cases - { - /*%%%*/ - $$ = NEW_WHEN($2, $4, $5, &@$); - fixpos($$, $2); - /*% %*/ - /*% ripper: when!($2, $4, escape_Qundef($5)) %*/ - } - ; + compstmt + cases + { + /*%%%*/ + $$ = NEW_WHEN($2, $4, $5, &@$); + fixpos($$, $2); + /*% %*/ + /*% ripper: when!($2, $4, escape_Qundef($5)) %*/ + } + ; cases : opt_else - | case_body - ; + | case_body + ; p_case_body : keyword_in - { - SET_LEX_STATE(EXPR_BEG|EXPR_LABEL); - p->command_start = FALSE; - $1 = p->ctxt; - p->ctxt.in_kwarg = 1; - $$ = push_pvtbl(p); - } - { - $$ = push_pktbl(p); - } - p_top_expr then - { - pop_pktbl(p, $3); - pop_pvtbl(p, $2); - p->ctxt.in_kwarg = $1.in_kwarg; - } - compstmt - p_cases - { - /*%%%*/ - $$ = NEW_IN($4, $7, $8, &@$); - /*% %*/ - /*% ripper: in!($4, $7, escape_Qundef($8)) %*/ - } - ; + { + SET_LEX_STATE(EXPR_BEG|EXPR_LABEL); + p->command_start = FALSE; + $1 = p->ctxt; + p->ctxt.in_kwarg = 1; + $$ = push_pvtbl(p); + } + { + $$ = push_pktbl(p); + } + p_top_expr then + { + pop_pktbl(p, $3); + pop_pvtbl(p, $2); + p->ctxt.in_kwarg = $1.in_kwarg; + } + compstmt + p_cases + { + /*%%%*/ + $$ = NEW_IN($4, $7, $8, &@$); + /*% %*/ + /*% ripper: in!($4, $7, escape_Qundef($8)) %*/ + } + ; p_cases : opt_else - | p_case_body - ; + | p_case_body + ; p_top_expr : p_top_expr_body - | p_top_expr_body modifier_if expr_value - { - /*%%%*/ - $$ = new_if(p, $3, $1, 0, &@$); - fixpos($$, $3); - /*% %*/ - /*% ripper: if_mod!($3, $1) %*/ - } - | p_top_expr_body modifier_unless expr_value - { - /*%%%*/ - $$ = new_unless(p, $3, $1, 0, &@$); - fixpos($$, $3); - /*% %*/ - /*% ripper: unless_mod!($3, $1) %*/ - } - ; + | p_top_expr_body modifier_if expr_value + { + /*%%%*/ + $$ = new_if(p, $3, $1, 0, &@$); + fixpos($$, $3); + /*% %*/ + /*% ripper: if_mod!($3, $1) %*/ + } + | p_top_expr_body modifier_unless expr_value + { + /*%%%*/ + $$ = new_unless(p, $3, $1, 0, &@$); + fixpos($$, $3); + /*% %*/ + /*% ripper: unless_mod!($3, $1) %*/ + } + ; p_top_expr_body : p_expr - | p_expr ',' - { - $$ = new_array_pattern_tail(p, Qnone, 1, 0, Qnone, &@$); - $$ = new_array_pattern(p, Qnone, get_value($1), $$, &@$); - } - | p_expr ',' p_args - { - $$ = new_array_pattern(p, Qnone, get_value($1), $3, &@$); - /*%%%*/ - nd_set_first_loc($$, @1.beg_pos); - /*% - %*/ - } - | p_find - { - $$ = new_find_pattern(p, Qnone, $1, &@$); - } - | p_args_tail - { - $$ = new_array_pattern(p, Qnone, Qnone, $1, &@$); - } - | p_kwargs - { - $$ = new_hash_pattern(p, Qnone, $1, &@$); - } - ; + | p_expr ',' + { + $$ = new_array_pattern_tail(p, Qnone, 1, 0, Qnone, &@$); + $$ = new_array_pattern(p, Qnone, get_value($1), $$, &@$); + } + | p_expr ',' p_args + { + $$ = new_array_pattern(p, Qnone, get_value($1), $3, &@$); + /*%%%*/ + nd_set_first_loc($$, @1.beg_pos); + /*% + %*/ + } + | p_find + { + $$ = new_find_pattern(p, Qnone, $1, &@$); + } + | p_args_tail + { + $$ = new_array_pattern(p, Qnone, Qnone, $1, &@$); + } + | p_kwargs + { + $$ = new_hash_pattern(p, Qnone, $1, &@$); + } + ; p_expr : p_as - ; + ; p_as : p_expr tASSOC p_variable - { - /*%%%*/ - NODE *n = NEW_LIST($1, &@$); - n = list_append(p, n, $3); - $$ = new_hash(p, n, &@$); - /*% %*/ - /*% ripper: binary!($1, STATIC_ID2SYM((id_assoc)), $3) %*/ - } - | p_alt - ; + { + /*%%%*/ + NODE *n = NEW_LIST($1, &@$); + n = list_append(p, n, $3); + $$ = new_hash(p, n, &@$); + /*% %*/ + /*% ripper: binary!($1, STATIC_ID2SYM((id_assoc)), $3) %*/ + } + | p_alt + ; p_alt : p_alt '|' p_expr_basic - { - /*%%%*/ - $$ = NEW_NODE(NODE_OR, $1, $3, 0, &@$); - /*% %*/ - /*% ripper: binary!($1, STATIC_ID2SYM(idOr), $3) %*/ - } - | p_expr_basic - ; + { + /*%%%*/ + $$ = NEW_NODE(NODE_OR, $1, $3, 0, &@$); + /*% %*/ + /*% ripper: binary!($1, STATIC_ID2SYM(idOr), $3) %*/ + } + | p_expr_basic + ; p_lparen : '(' {$$ = push_pktbl(p);}; p_lbracket : '[' {$$ = push_pktbl(p);}; p_expr_basic : p_value - | p_variable - | p_const p_lparen p_args rparen - { - pop_pktbl(p, $2); - $$ = new_array_pattern(p, $1, Qnone, $3, &@$); - /*%%%*/ - nd_set_first_loc($$, @1.beg_pos); - /*% - %*/ - } - | p_const p_lparen p_find rparen - { - pop_pktbl(p, $2); - $$ = new_find_pattern(p, $1, $3, &@$); - /*%%%*/ - nd_set_first_loc($$, @1.beg_pos); - /*% - %*/ - } - | p_const p_lparen p_kwargs rparen - { - pop_pktbl(p, $2); - $$ = new_hash_pattern(p, $1, $3, &@$); - /*%%%*/ - nd_set_first_loc($$, @1.beg_pos); - /*% - %*/ - } - | p_const '(' rparen - { - $$ = new_array_pattern_tail(p, Qnone, 0, 0, Qnone, &@$); - $$ = new_array_pattern(p, $1, Qnone, $$, &@$); - } - | p_const p_lbracket p_args rbracket - { - pop_pktbl(p, $2); - $$ = new_array_pattern(p, $1, Qnone, $3, &@$); - /*%%%*/ - nd_set_first_loc($$, @1.beg_pos); - /*% - %*/ - } - | p_const p_lbracket p_find rbracket - { - pop_pktbl(p, $2); - $$ = new_find_pattern(p, $1, $3, &@$); - /*%%%*/ - nd_set_first_loc($$, @1.beg_pos); - /*% - %*/ - } - | p_const p_lbracket p_kwargs rbracket - { - pop_pktbl(p, $2); - $$ = new_hash_pattern(p, $1, $3, &@$); - /*%%%*/ - nd_set_first_loc($$, @1.beg_pos); - /*% - %*/ - } - | p_const '[' rbracket - { - $$ = new_array_pattern_tail(p, Qnone, 0, 0, Qnone, &@$); - $$ = new_array_pattern(p, $1, Qnone, $$, &@$); - } - | tLBRACK p_args rbracket - { - $$ = new_array_pattern(p, Qnone, Qnone, $2, &@$); - } - | tLBRACK p_find rbracket - { - $$ = new_find_pattern(p, Qnone, $2, &@$); - } - | tLBRACK rbracket - { - $$ = new_array_pattern_tail(p, Qnone, 0, 0, Qnone, &@$); - $$ = new_array_pattern(p, Qnone, Qnone, $$, &@$); - } - | tLBRACE - { - $$ = push_pktbl(p); - $1 = p->ctxt; - p->ctxt.in_kwarg = 0; - } - p_kwargs rbrace - { - pop_pktbl(p, $2); - p->ctxt.in_kwarg = $1.in_kwarg; - $$ = new_hash_pattern(p, Qnone, $3, &@$); - } - | tLBRACE rbrace - { - $$ = new_hash_pattern_tail(p, Qnone, 0, &@$); - $$ = new_hash_pattern(p, Qnone, $$, &@$); - } - | tLPAREN {$$ = push_pktbl(p);} p_expr rparen - { - pop_pktbl(p, $2); - $$ = $3; - } - ; + | p_variable + | p_const p_lparen p_args rparen + { + pop_pktbl(p, $2); + $$ = new_array_pattern(p, $1, Qnone, $3, &@$); + /*%%%*/ + nd_set_first_loc($$, @1.beg_pos); + /*% + %*/ + } + | p_const p_lparen p_find rparen + { + pop_pktbl(p, $2); + $$ = new_find_pattern(p, $1, $3, &@$); + /*%%%*/ + nd_set_first_loc($$, @1.beg_pos); + /*% + %*/ + } + | p_const p_lparen p_kwargs rparen + { + pop_pktbl(p, $2); + $$ = new_hash_pattern(p, $1, $3, &@$); + /*%%%*/ + nd_set_first_loc($$, @1.beg_pos); + /*% + %*/ + } + | p_const '(' rparen + { + $$ = new_array_pattern_tail(p, Qnone, 0, 0, Qnone, &@$); + $$ = new_array_pattern(p, $1, Qnone, $$, &@$); + } + | p_const p_lbracket p_args rbracket + { + pop_pktbl(p, $2); + $$ = new_array_pattern(p, $1, Qnone, $3, &@$); + /*%%%*/ + nd_set_first_loc($$, @1.beg_pos); + /*% + %*/ + } + | p_const p_lbracket p_find rbracket + { + pop_pktbl(p, $2); + $$ = new_find_pattern(p, $1, $3, &@$); + /*%%%*/ + nd_set_first_loc($$, @1.beg_pos); + /*% + %*/ + } + | p_const p_lbracket p_kwargs rbracket + { + pop_pktbl(p, $2); + $$ = new_hash_pattern(p, $1, $3, &@$); + /*%%%*/ + nd_set_first_loc($$, @1.beg_pos); + /*% + %*/ + } + | p_const '[' rbracket + { + $$ = new_array_pattern_tail(p, Qnone, 0, 0, Qnone, &@$); + $$ = new_array_pattern(p, $1, Qnone, $$, &@$); + } + | tLBRACK p_args rbracket + { + $$ = new_array_pattern(p, Qnone, Qnone, $2, &@$); + } + | tLBRACK p_find rbracket + { + $$ = new_find_pattern(p, Qnone, $2, &@$); + } + | tLBRACK rbracket + { + $$ = new_array_pattern_tail(p, Qnone, 0, 0, Qnone, &@$); + $$ = new_array_pattern(p, Qnone, Qnone, $$, &@$); + } + | tLBRACE + { + $$ = push_pktbl(p); + $1 = p->ctxt; + p->ctxt.in_kwarg = 0; + } + p_kwargs rbrace + { + pop_pktbl(p, $2); + p->ctxt.in_kwarg = $1.in_kwarg; + $$ = new_hash_pattern(p, Qnone, $3, &@$); + } + | tLBRACE rbrace + { + $$ = new_hash_pattern_tail(p, Qnone, 0, &@$); + $$ = new_hash_pattern(p, Qnone, $$, &@$); + } + | tLPAREN {$$ = push_pktbl(p);} p_expr rparen + { + pop_pktbl(p, $2); + $$ = $3; + } + ; p_args : p_expr - { - /*%%%*/ - NODE *pre_args = NEW_LIST($1, &@$); - $$ = new_array_pattern_tail(p, pre_args, 0, 0, Qnone, &@$); - /*% - $$ = new_array_pattern_tail(p, rb_ary_new_from_args(1, get_value($1)), 0, 0, Qnone, &@$); - %*/ - } - | p_args_head - { - $$ = new_array_pattern_tail(p, $1, 1, 0, Qnone, &@$); - } - | p_args_head p_arg - { - /*%%%*/ - $$ = new_array_pattern_tail(p, list_concat($1, $2), 0, 0, Qnone, &@$); - /*% - VALUE pre_args = rb_ary_concat($1, get_value($2)); - $$ = new_array_pattern_tail(p, pre_args, 0, 0, Qnone, &@$); - %*/ - } - | p_args_head p_rest - { - $$ = new_array_pattern_tail(p, $1, 1, $2, Qnone, &@$); - } - | p_args_head p_rest ',' p_args_post - { - $$ = new_array_pattern_tail(p, $1, 1, $2, $4, &@$); - } - | p_args_tail - ; + { + /*%%%*/ + NODE *pre_args = NEW_LIST($1, &@$); + $$ = new_array_pattern_tail(p, pre_args, 0, 0, Qnone, &@$); + /*% + $$ = new_array_pattern_tail(p, rb_ary_new_from_args(1, get_value($1)), 0, 0, Qnone, &@$); + %*/ + } + | p_args_head + { + $$ = new_array_pattern_tail(p, $1, 1, 0, Qnone, &@$); + } + | p_args_head p_arg + { + /*%%%*/ + $$ = new_array_pattern_tail(p, list_concat($1, $2), 0, 0, Qnone, &@$); + /*% + VALUE pre_args = rb_ary_concat($1, get_value($2)); + $$ = new_array_pattern_tail(p, pre_args, 0, 0, Qnone, &@$); + %*/ + } + | p_args_head p_rest + { + $$ = new_array_pattern_tail(p, $1, 1, $2, Qnone, &@$); + } + | p_args_head p_rest ',' p_args_post + { + $$ = new_array_pattern_tail(p, $1, 1, $2, $4, &@$); + } + | p_args_tail + ; p_args_head : p_arg ',' - { - $$ = $1; - } - | p_args_head p_arg ',' - { - /*%%%*/ - $$ = list_concat($1, $2); - /*% %*/ - /*% ripper: rb_ary_concat($1, get_value($2)) %*/ - } - ; + { + $$ = $1; + } + | p_args_head p_arg ',' + { + /*%%%*/ + $$ = list_concat($1, $2); + /*% %*/ + /*% ripper: rb_ary_concat($1, get_value($2)) %*/ + } + ; p_args_tail : p_rest - { - $$ = new_array_pattern_tail(p, Qnone, 1, $1, Qnone, &@$); - } - | p_rest ',' p_args_post - { - $$ = new_array_pattern_tail(p, Qnone, 1, $1, $3, &@$); - } - ; + { + $$ = new_array_pattern_tail(p, Qnone, 1, $1, Qnone, &@$); + } + | p_rest ',' p_args_post + { + $$ = new_array_pattern_tail(p, Qnone, 1, $1, $3, &@$); + } + ; p_find : p_rest ',' p_args_post ',' p_rest - { - $$ = new_find_pattern_tail(p, $1, $3, $5, &@$); - } - ; + { + $$ = new_find_pattern_tail(p, $1, $3, $5, &@$); + } + ; p_rest : tSTAR tIDENTIFIER - { - $$ = $2; - } - | tSTAR - { - $$ = 0; - } - ; + { + $$ = $2; + } + | tSTAR + { + $$ = 0; + } + ; p_args_post : p_arg - | p_args_post ',' p_arg - { - /*%%%*/ - $$ = list_concat($1, $3); - /*% %*/ - /*% ripper: rb_ary_concat($1, get_value($3)) %*/ - } - ; + | p_args_post ',' p_arg + { + /*%%%*/ + $$ = list_concat($1, $3); + /*% %*/ + /*% ripper: rb_ary_concat($1, get_value($3)) %*/ + } + ; p_arg : p_expr - { - /*%%%*/ - $$ = NEW_LIST($1, &@$); - /*% %*/ - /*% ripper: rb_ary_new_from_args(1, get_value($1)) %*/ - } - ; + { + /*%%%*/ + $$ = NEW_LIST($1, &@$); + /*% %*/ + /*% ripper: rb_ary_new_from_args(1, get_value($1)) %*/ + } + ; p_kwargs : p_kwarg ',' p_any_kwrest - { - $$ = new_hash_pattern_tail(p, new_unique_key_hash(p, $1, &@$), $3, &@$); - } - | p_kwarg - { - $$ = new_hash_pattern_tail(p, new_unique_key_hash(p, $1, &@$), 0, &@$); - } - | p_kwarg ',' - { - $$ = new_hash_pattern_tail(p, new_unique_key_hash(p, $1, &@$), 0, &@$); - } - | p_any_kwrest - { - $$ = new_hash_pattern_tail(p, new_hash(p, Qnone, &@$), $1, &@$); - } - ; + { + $$ = new_hash_pattern_tail(p, new_unique_key_hash(p, $1, &@$), $3, &@$); + } + | p_kwarg + { + $$ = new_hash_pattern_tail(p, new_unique_key_hash(p, $1, &@$), 0, &@$); + } + | p_kwarg ',' + { + $$ = new_hash_pattern_tail(p, new_unique_key_hash(p, $1, &@$), 0, &@$); + } + | p_any_kwrest + { + $$ = new_hash_pattern_tail(p, new_hash(p, Qnone, &@$), $1, &@$); + } + ; p_kwarg : p_kw - /*% ripper[brace]: rb_ary_new_from_args(1, $1) %*/ - | p_kwarg ',' p_kw - { - /*%%%*/ - $$ = list_concat($1, $3); - /*% %*/ - /*% ripper: rb_ary_push($1, $3) %*/ - } - ; + /*% ripper[brace]: rb_ary_new_from_args(1, $1) %*/ + | p_kwarg ',' p_kw + { + /*%%%*/ + $$ = list_concat($1, $3); + /*% %*/ + /*% ripper: rb_ary_push($1, $3) %*/ + } + ; p_kw : p_kw_label p_expr - { - error_duplicate_pattern_key(p, get_id($1), &@1); - /*%%%*/ - $$ = list_append(p, NEW_LIST(NEW_LIT(ID2SYM($1), &@1), &@$), $2); - /*% %*/ - /*% ripper: rb_ary_new_from_args(2, get_value($1), get_value($2)) %*/ - } - | p_kw_label - { - error_duplicate_pattern_key(p, get_id($1), &@1); - if ($1 && !is_local_id(get_id($1))) { - yyerror1(&@1, "key must be valid as local variables"); - } - error_duplicate_pattern_variable(p, get_id($1), &@1); - /*%%%*/ - $$ = list_append(p, NEW_LIST(NEW_LIT(ID2SYM($1), &@$), &@$), assignable(p, $1, 0, &@$)); - /*% %*/ - /*% ripper: rb_ary_new_from_args(2, get_value($1), Qnil) %*/ - } - ; + { + error_duplicate_pattern_key(p, get_id($1), &@1); + /*%%%*/ + $$ = list_append(p, NEW_LIST(NEW_LIT(ID2SYM($1), &@1), &@$), $2); + /*% %*/ + /*% ripper: rb_ary_new_from_args(2, get_value($1), get_value($2)) %*/ + } + | p_kw_label + { + error_duplicate_pattern_key(p, get_id($1), &@1); + if ($1 && !is_local_id(get_id($1))) { + yyerror1(&@1, "key must be valid as local variables"); + } + error_duplicate_pattern_variable(p, get_id($1), &@1); + /*%%%*/ + $$ = list_append(p, NEW_LIST(NEW_LIT(ID2SYM($1), &@$), &@$), assignable(p, $1, 0, &@$)); + /*% %*/ + /*% ripper: rb_ary_new_from_args(2, get_value($1), Qnil) %*/ + } + ; p_kw_label : tLABEL - | tSTRING_BEG string_contents tLABEL_END - { - YYLTYPE loc = code_loc_gen(&@1, &@3); - /*%%%*/ - if (!$2 || nd_type_p($2, NODE_STR)) { - NODE *node = dsym_node(p, $2, &loc); - $$ = SYM2ID(node->nd_lit); - } - /*% - if (ripper_is_node_yylval($2) && RNODE($2)->nd_cval) { - VALUE label = RNODE($2)->nd_cval; - VALUE rval = RNODE($2)->nd_rval; - $$ = ripper_new_yylval(p, rb_intern_str(label), rval, label); - RNODE($$)->nd_loc = loc; - } - %*/ - else { - yyerror1(&loc, "symbol literal with interpolation is not allowed"); - $$ = 0; - } - } - ; + | tSTRING_BEG string_contents tLABEL_END + { + YYLTYPE loc = code_loc_gen(&@1, &@3); + /*%%%*/ + if (!$2 || nd_type_p($2, NODE_STR)) { + NODE *node = dsym_node(p, $2, &loc); + $$ = SYM2ID(node->nd_lit); + } + /*% + if (ripper_is_node_yylval($2) && RNODE($2)->nd_cval) { + VALUE label = RNODE($2)->nd_cval; + VALUE rval = RNODE($2)->nd_rval; + $$ = ripper_new_yylval(p, rb_intern_str(label), rval, label); + RNODE($$)->nd_loc = loc; + } + %*/ + else { + yyerror1(&loc, "symbol literal with interpolation is not allowed"); + $$ = 0; + } + } + ; p_kwrest : kwrest_mark tIDENTIFIER - { - $$ = $2; - } - | kwrest_mark - { - $$ = 0; - } - ; + { + $$ = $2; + } + | kwrest_mark + { + $$ = 0; + } + ; p_kwnorest : kwrest_mark keyword_nil - { - $$ = 0; - } - ; + { + $$ = 0; + } + ; p_any_kwrest : p_kwrest - | p_kwnorest {$$ = ID2VAL(idNil);} - ; + | p_kwnorest {$$ = ID2VAL(idNil);} + ; p_value : p_primitive - | p_primitive tDOT2 p_primitive - { - /*%%%*/ - value_expr($1); - value_expr($3); - $$ = NEW_DOT2($1, $3, &@$); - /*% %*/ - /*% ripper: dot2!($1, $3) %*/ - } - | p_primitive tDOT3 p_primitive - { - /*%%%*/ - value_expr($1); - value_expr($3); - $$ = NEW_DOT3($1, $3, &@$); - /*% %*/ - /*% ripper: dot3!($1, $3) %*/ - } - | p_primitive tDOT2 - { - /*%%%*/ - value_expr($1); - $$ = NEW_DOT2($1, new_nil_at(p, &@2.end_pos), &@$); - /*% %*/ - /*% ripper: dot2!($1, Qnil) %*/ - } - | p_primitive tDOT3 - { - /*%%%*/ - value_expr($1); - $$ = NEW_DOT3($1, new_nil_at(p, &@2.end_pos), &@$); - /*% %*/ - /*% ripper: dot3!($1, Qnil) %*/ - } - | p_var_ref - | p_expr_ref - | p_const - | tBDOT2 p_primitive - { - /*%%%*/ - value_expr($2); - $$ = NEW_DOT2(new_nil_at(p, &@1.beg_pos), $2, &@$); - /*% %*/ - /*% ripper: dot2!(Qnil, $2) %*/ - } - | tBDOT3 p_primitive - { - /*%%%*/ - value_expr($2); - $$ = NEW_DOT3(new_nil_at(p, &@1.beg_pos), $2, &@$); - /*% %*/ - /*% ripper: dot3!(Qnil, $2) %*/ - } - ; + | p_primitive tDOT2 p_primitive + { + /*%%%*/ + value_expr($1); + value_expr($3); + $$ = NEW_DOT2($1, $3, &@$); + /*% %*/ + /*% ripper: dot2!($1, $3) %*/ + } + | p_primitive tDOT3 p_primitive + { + /*%%%*/ + value_expr($1); + value_expr($3); + $$ = NEW_DOT3($1, $3, &@$); + /*% %*/ + /*% ripper: dot3!($1, $3) %*/ + } + | p_primitive tDOT2 + { + /*%%%*/ + value_expr($1); + $$ = NEW_DOT2($1, new_nil_at(p, &@2.end_pos), &@$); + /*% %*/ + /*% ripper: dot2!($1, Qnil) %*/ + } + | p_primitive tDOT3 + { + /*%%%*/ + value_expr($1); + $$ = NEW_DOT3($1, new_nil_at(p, &@2.end_pos), &@$); + /*% %*/ + /*% ripper: dot3!($1, Qnil) %*/ + } + | p_var_ref + | p_expr_ref + | p_const + | tBDOT2 p_primitive + { + /*%%%*/ + value_expr($2); + $$ = NEW_DOT2(new_nil_at(p, &@1.beg_pos), $2, &@$); + /*% %*/ + /*% ripper: dot2!(Qnil, $2) %*/ + } + | tBDOT3 p_primitive + { + /*%%%*/ + value_expr($2); + $$ = NEW_DOT3(new_nil_at(p, &@1.beg_pos), $2, &@$); + /*% %*/ + /*% ripper: dot3!(Qnil, $2) %*/ + } + ; p_primitive : literal - | strings - | xstring - | regexp - | words - | qwords - | symbols - | qsymbols - | keyword_variable - { - /*%%%*/ - if (!($$ = gettable(p, $1, &@$))) $$ = NEW_BEGIN(0, &@$); - /*% %*/ - /*% ripper: var_ref!($1) %*/ - } - | lambda - ; + | strings + | xstring + | regexp + | words + | qwords + | symbols + | qsymbols + | keyword_variable + { + /*%%%*/ + if (!($$ = gettable(p, $1, &@$))) $$ = NEW_BEGIN(0, &@$); + /*% %*/ + /*% ripper: var_ref!($1) %*/ + } + | lambda + ; p_variable : tIDENTIFIER - { - /*%%%*/ - error_duplicate_pattern_variable(p, $1, &@1); - $$ = assignable(p, $1, 0, &@$); - /*% %*/ - /*% ripper: assignable(p, var_field(p, $1)) %*/ - } - ; + { + /*%%%*/ + error_duplicate_pattern_variable(p, $1, &@1); + $$ = assignable(p, $1, 0, &@$); + /*% %*/ + /*% ripper: assignable(p, var_field(p, $1)) %*/ + } + ; p_var_ref : '^' tIDENTIFIER - { - /*%%%*/ - NODE *n = gettable(p, $2, &@$); - if (!(nd_type_p(n, NODE_LVAR) || nd_type_p(n, NODE_DVAR))) { - compile_error(p, "%"PRIsVALUE": no such local variable", rb_id2str($2)); - } - $$ = n; - /*% %*/ - /*% ripper: var_ref!($2) %*/ - } + { + /*%%%*/ + NODE *n = gettable(p, $2, &@$); + if (!(nd_type_p(n, NODE_LVAR) || nd_type_p(n, NODE_DVAR))) { + compile_error(p, "%"PRIsVALUE": no such local variable", rb_id2str($2)); + } + $$ = n; + /*% %*/ + /*% ripper: var_ref!($2) %*/ + } | '^' nonlocal_var - { - /*%%%*/ - if (!($$ = gettable(p, $2, &@$))) $$ = NEW_BEGIN(0, &@$); - /*% %*/ - /*% ripper: var_ref!($2) %*/ + { + /*%%%*/ + if (!($$ = gettable(p, $2, &@$))) $$ = NEW_BEGIN(0, &@$); + /*% %*/ + /*% ripper: var_ref!($2) %*/ } - ; + ; p_expr_ref : '^' tLPAREN expr_value rparen - { - /*%%%*/ - $$ = NEW_BEGIN($3, &@$); - /*% %*/ - /*% ripper: begin!($3) %*/ - } - ; + { + /*%%%*/ + $$ = NEW_BEGIN($3, &@$); + /*% %*/ + /*% ripper: begin!($3) %*/ + } + ; p_const : tCOLON3 cname - { - /*%%%*/ - $$ = NEW_COLON3($2, &@$); - /*% %*/ - /*% ripper: top_const_ref!($2) %*/ - } - | p_const tCOLON2 cname - { - /*%%%*/ - $$ = NEW_COLON2($1, $3, &@$); - /*% %*/ - /*% ripper: const_path_ref!($1, $3) %*/ - } - | tCONSTANT - { - /*%%%*/ - $$ = gettable(p, $1, &@$); - /*% %*/ - /*% ripper: var_ref!($1) %*/ - } - ; + { + /*%%%*/ + $$ = NEW_COLON3($2, &@$); + /*% %*/ + /*% ripper: top_const_ref!($2) %*/ + } + | p_const tCOLON2 cname + { + /*%%%*/ + $$ = NEW_COLON2($1, $3, &@$); + /*% %*/ + /*% ripper: const_path_ref!($1, $3) %*/ + } + | tCONSTANT + { + /*%%%*/ + $$ = gettable(p, $1, &@$); + /*% %*/ + /*% ripper: var_ref!($1) %*/ + } + ; opt_rescue : k_rescue exc_list exc_var then - compstmt - opt_rescue - { - /*%%%*/ - $$ = NEW_RESBODY($2, - $3 ? block_append(p, node_assign(p, $3, NEW_ERRINFO(&@3), NO_LEX_CTXT, &@3), $5) : $5, - $6, &@$); + compstmt + opt_rescue + { + /*%%%*/ + $$ = NEW_RESBODY($2, + $3 ? block_append(p, node_assign(p, $3, NEW_ERRINFO(&@3), NO_LEX_CTXT, &@3), $5) : $5, + $6, &@$); if ($2) { fixpos($$, $2); @@ -4936,1087 +4936,1087 @@ opt_rescue : k_rescue exc_list exc_var then else { fixpos($$, $5); } - /*% %*/ - /*% ripper: rescue!(escape_Qundef($2), escape_Qundef($3), escape_Qundef($5), escape_Qundef($6)) %*/ - } - | none - ; + /*% %*/ + /*% ripper: rescue!(escape_Qundef($2), escape_Qundef($3), escape_Qundef($5), escape_Qundef($6)) %*/ + } + | none + ; exc_list : arg_value - { - /*%%%*/ - $$ = NEW_LIST($1, &@$); - /*% %*/ - /*% ripper: rb_ary_new3(1, get_value($1)) %*/ - } - | mrhs - { - /*%%%*/ - if (!($$ = splat_array($1))) $$ = $1; - /*% %*/ - /*% ripper: $1 %*/ - } - | none - ; + { + /*%%%*/ + $$ = NEW_LIST($1, &@$); + /*% %*/ + /*% ripper: rb_ary_new3(1, get_value($1)) %*/ + } + | mrhs + { + /*%%%*/ + if (!($$ = splat_array($1))) $$ = $1; + /*% %*/ + /*% ripper: $1 %*/ + } + | none + ; exc_var : tASSOC lhs - { - $$ = $2; - } - | none - ; + { + $$ = $2; + } + | none + ; opt_ensure : k_ensure compstmt - { - /*%%%*/ - $$ = $2; - /*% %*/ - /*% ripper: ensure!($2) %*/ - } - | none - ; + { + /*%%%*/ + $$ = $2; + /*% %*/ + /*% ripper: ensure!($2) %*/ + } + | none + ; literal : numeric - | symbol - ; + | symbol + ; strings : string - { - /*%%%*/ - NODE *node = $1; - if (!node) { - node = NEW_STR(STR_NEW0(), &@$); + { + /*%%%*/ + NODE *node = $1; + if (!node) { + node = NEW_STR(STR_NEW0(), &@$); RB_OBJ_WRITTEN(p->ast, Qnil, node->nd_lit); - } - else { - node = evstr2dstr(p, node); - } - $$ = node; - /*% %*/ - /*% ripper: $1 %*/ - } - ; + } + else { + node = evstr2dstr(p, node); + } + $$ = node; + /*% %*/ + /*% ripper: $1 %*/ + } + ; string : tCHAR - | string1 - | string string1 - { - /*%%%*/ - $$ = literal_concat(p, $1, $2, &@$); - /*% %*/ - /*% ripper: string_concat!($1, $2) %*/ - } - ; + | string1 + | string string1 + { + /*%%%*/ + $$ = literal_concat(p, $1, $2, &@$); + /*% %*/ + /*% ripper: string_concat!($1, $2) %*/ + } + ; string1 : tSTRING_BEG string_contents tSTRING_END - { - /*%%%*/ - $$ = heredoc_dedent(p, $2); - if ($$) nd_set_loc($$, &@$); - /*% %*/ - /*% ripper: string_literal!(heredoc_dedent(p, $2)) %*/ - } - ; + { + /*%%%*/ + $$ = heredoc_dedent(p, $2); + if ($$) nd_set_loc($$, &@$); + /*% %*/ + /*% ripper: string_literal!(heredoc_dedent(p, $2)) %*/ + } + ; xstring : tXSTRING_BEG xstring_contents tSTRING_END - { - /*%%%*/ - $$ = new_xstring(p, heredoc_dedent(p, $2), &@$); - /*% %*/ - /*% ripper: xstring_literal!(heredoc_dedent(p, $2)) %*/ - } - ; + { + /*%%%*/ + $$ = new_xstring(p, heredoc_dedent(p, $2), &@$); + /*% %*/ + /*% ripper: xstring_literal!(heredoc_dedent(p, $2)) %*/ + } + ; regexp : tREGEXP_BEG regexp_contents tREGEXP_END - { - $$ = new_regexp(p, $2, $3, &@$); - } - ; + { + $$ = new_regexp(p, $2, $3, &@$); + } + ; words : tWORDS_BEG ' ' word_list tSTRING_END - { - /*%%%*/ - $$ = make_list($3, &@$); - /*% %*/ - /*% ripper: array!($3) %*/ - } - ; + { + /*%%%*/ + $$ = make_list($3, &@$); + /*% %*/ + /*% ripper: array!($3) %*/ + } + ; word_list : /* none */ - { - /*%%%*/ - $$ = 0; - /*% %*/ - /*% ripper: words_new! %*/ - } - | word_list word ' ' - { - /*%%%*/ - $$ = list_append(p, $1, evstr2dstr(p, $2)); - /*% %*/ - /*% ripper: words_add!($1, $2) %*/ - } - ; + { + /*%%%*/ + $$ = 0; + /*% %*/ + /*% ripper: words_new! %*/ + } + | word_list word ' ' + { + /*%%%*/ + $$ = list_append(p, $1, evstr2dstr(p, $2)); + /*% %*/ + /*% ripper: words_add!($1, $2) %*/ + } + ; word : string_content - /*% ripper[brace]: word_add!(word_new!, $1) %*/ - | word string_content - { - /*%%%*/ - $$ = literal_concat(p, $1, $2, &@$); - /*% %*/ - /*% ripper: word_add!($1, $2) %*/ - } - ; + /*% ripper[brace]: word_add!(word_new!, $1) %*/ + | word string_content + { + /*%%%*/ + $$ = literal_concat(p, $1, $2, &@$); + /*% %*/ + /*% ripper: word_add!($1, $2) %*/ + } + ; symbols : tSYMBOLS_BEG ' ' symbol_list tSTRING_END - { - /*%%%*/ - $$ = make_list($3, &@$); - /*% %*/ - /*% ripper: array!($3) %*/ - } - ; + { + /*%%%*/ + $$ = make_list($3, &@$); + /*% %*/ + /*% ripper: array!($3) %*/ + } + ; symbol_list : /* none */ - { - /*%%%*/ - $$ = 0; - /*% %*/ - /*% ripper: symbols_new! %*/ - } - | symbol_list word ' ' - { - /*%%%*/ - $$ = symbol_append(p, $1, evstr2dstr(p, $2)); - /*% %*/ - /*% ripper: symbols_add!($1, $2) %*/ - } - ; + { + /*%%%*/ + $$ = 0; + /*% %*/ + /*% ripper: symbols_new! %*/ + } + | symbol_list word ' ' + { + /*%%%*/ + $$ = symbol_append(p, $1, evstr2dstr(p, $2)); + /*% %*/ + /*% ripper: symbols_add!($1, $2) %*/ + } + ; qwords : tQWORDS_BEG ' ' qword_list tSTRING_END - { - /*%%%*/ - $$ = make_list($3, &@$); - /*% %*/ - /*% ripper: array!($3) %*/ - } - ; + { + /*%%%*/ + $$ = make_list($3, &@$); + /*% %*/ + /*% ripper: array!($3) %*/ + } + ; qsymbols : tQSYMBOLS_BEG ' ' qsym_list tSTRING_END - { - /*%%%*/ - $$ = make_list($3, &@$); - /*% %*/ - /*% ripper: array!($3) %*/ - } - ; + { + /*%%%*/ + $$ = make_list($3, &@$); + /*% %*/ + /*% ripper: array!($3) %*/ + } + ; qword_list : /* none */ - { - /*%%%*/ - $$ = 0; - /*% %*/ - /*% ripper: qwords_new! %*/ - } - | qword_list tSTRING_CONTENT ' ' - { - /*%%%*/ - $$ = list_append(p, $1, $2); - /*% %*/ - /*% ripper: qwords_add!($1, $2) %*/ - } - ; + { + /*%%%*/ + $$ = 0; + /*% %*/ + /*% ripper: qwords_new! %*/ + } + | qword_list tSTRING_CONTENT ' ' + { + /*%%%*/ + $$ = list_append(p, $1, $2); + /*% %*/ + /*% ripper: qwords_add!($1, $2) %*/ + } + ; qsym_list : /* none */ - { - /*%%%*/ - $$ = 0; - /*% %*/ - /*% ripper: qsymbols_new! %*/ - } - | qsym_list tSTRING_CONTENT ' ' - { - /*%%%*/ - $$ = symbol_append(p, $1, $2); - /*% %*/ - /*% ripper: qsymbols_add!($1, $2) %*/ - } - ; + { + /*%%%*/ + $$ = 0; + /*% %*/ + /*% ripper: qsymbols_new! %*/ + } + | qsym_list tSTRING_CONTENT ' ' + { + /*%%%*/ + $$ = symbol_append(p, $1, $2); + /*% %*/ + /*% ripper: qsymbols_add!($1, $2) %*/ + } + ; string_contents : /* none */ - { - /*%%%*/ - $$ = 0; - /*% %*/ - /*% ripper: string_content! %*/ - /*%%%*/ - /*% - $$ = ripper_new_yylval(p, 0, $$, 0); - %*/ - } - | string_contents string_content - { - /*%%%*/ - $$ = literal_concat(p, $1, $2, &@$); - /*% %*/ - /*% ripper: string_add!($1, $2) %*/ - /*%%%*/ - /*% - if (ripper_is_node_yylval($1) && ripper_is_node_yylval($2) && - !RNODE($1)->nd_cval) { - RNODE($1)->nd_cval = RNODE($2)->nd_cval; - RNODE($1)->nd_rval = add_mark_object(p, $$); - $$ = $1; - } - %*/ - } - ; + { + /*%%%*/ + $$ = 0; + /*% %*/ + /*% ripper: string_content! %*/ + /*%%%*/ + /*% + $$ = ripper_new_yylval(p, 0, $$, 0); + %*/ + } + | string_contents string_content + { + /*%%%*/ + $$ = literal_concat(p, $1, $2, &@$); + /*% %*/ + /*% ripper: string_add!($1, $2) %*/ + /*%%%*/ + /*% + if (ripper_is_node_yylval($1) && ripper_is_node_yylval($2) && + !RNODE($1)->nd_cval) { + RNODE($1)->nd_cval = RNODE($2)->nd_cval; + RNODE($1)->nd_rval = add_mark_object(p, $$); + $$ = $1; + } + %*/ + } + ; xstring_contents: /* none */ - { - /*%%%*/ - $$ = 0; - /*% %*/ - /*% ripper: xstring_new! %*/ - } - | xstring_contents string_content - { - /*%%%*/ - $$ = literal_concat(p, $1, $2, &@$); - /*% %*/ - /*% ripper: xstring_add!($1, $2) %*/ - } - ; + { + /*%%%*/ + $$ = 0; + /*% %*/ + /*% ripper: xstring_new! %*/ + } + | xstring_contents string_content + { + /*%%%*/ + $$ = literal_concat(p, $1, $2, &@$); + /*% %*/ + /*% ripper: xstring_add!($1, $2) %*/ + } + ; regexp_contents: /* none */ - { - /*%%%*/ - $$ = 0; - /*% %*/ - /*% ripper: regexp_new! %*/ - /*%%%*/ - /*% - $$ = ripper_new_yylval(p, 0, $$, 0); - %*/ - } - | regexp_contents string_content - { - /*%%%*/ - NODE *head = $1, *tail = $2; - if (!head) { - $$ = tail; - } - else if (!tail) { - $$ = head; - } - else { - switch (nd_type(head)) { - case NODE_STR: - nd_set_type(head, NODE_DSTR); - break; - case NODE_DSTR: - break; - default: - head = list_append(p, NEW_DSTR(Qnil, &@$), head); - break; - } - $$ = list_append(p, head, tail); - } - /*% - VALUE s1 = 1, s2 = 0, n1 = $1, n2 = $2; - if (ripper_is_node_yylval(n1)) { - s1 = RNODE(n1)->nd_cval; - n1 = RNODE(n1)->nd_rval; - } - if (ripper_is_node_yylval(n2)) { - s2 = RNODE(n2)->nd_cval; - n2 = RNODE(n2)->nd_rval; - } - $$ = dispatch2(regexp_add, n1, n2); - if (!s1 && s2) { - $$ = ripper_new_yylval(p, 0, $$, s2); - } - %*/ - } - ; + { + /*%%%*/ + $$ = 0; + /*% %*/ + /*% ripper: regexp_new! %*/ + /*%%%*/ + /*% + $$ = ripper_new_yylval(p, 0, $$, 0); + %*/ + } + | regexp_contents string_content + { + /*%%%*/ + NODE *head = $1, *tail = $2; + if (!head) { + $$ = tail; + } + else if (!tail) { + $$ = head; + } + else { + switch (nd_type(head)) { + case NODE_STR: + nd_set_type(head, NODE_DSTR); + break; + case NODE_DSTR: + break; + default: + head = list_append(p, NEW_DSTR(Qnil, &@$), head); + break; + } + $$ = list_append(p, head, tail); + } + /*% + VALUE s1 = 1, s2 = 0, n1 = $1, n2 = $2; + if (ripper_is_node_yylval(n1)) { + s1 = RNODE(n1)->nd_cval; + n1 = RNODE(n1)->nd_rval; + } + if (ripper_is_node_yylval(n2)) { + s2 = RNODE(n2)->nd_cval; + n2 = RNODE(n2)->nd_rval; + } + $$ = dispatch2(regexp_add, n1, n2); + if (!s1 && s2) { + $$ = ripper_new_yylval(p, 0, $$, s2); + } + %*/ + } + ; string_content : tSTRING_CONTENT - /*% ripper[brace]: ripper_new_yylval(p, 0, get_value($1), $1) %*/ - | tSTRING_DVAR - { - /* need to backup p->lex.strterm so that a string literal `%&foo,#$&,bar&` can be parsed */ - $$ = p->lex.strterm; - p->lex.strterm = 0; - SET_LEX_STATE(EXPR_BEG); - } - string_dvar - { - p->lex.strterm = $2; - /*%%%*/ - $$ = NEW_EVSTR($3, &@$); - nd_set_line($$, @3.end_pos.lineno); - /*% %*/ - /*% ripper: string_dvar!($3) %*/ - } - | tSTRING_DBEG - { - CMDARG_PUSH(0); - COND_PUSH(0); - } - { - /* need to backup p->lex.strterm so that a string literal `%!foo,#{ !0 },bar!` can be parsed */ - $$ = p->lex.strterm; - p->lex.strterm = 0; - } - { - $$ = p->lex.state; - SET_LEX_STATE(EXPR_BEG); - } - { - $$ = p->lex.brace_nest; - p->lex.brace_nest = 0; - } - { - $$ = p->heredoc_indent; - p->heredoc_indent = 0; - } - compstmt tSTRING_DEND - { - COND_POP(); - CMDARG_POP(); - p->lex.strterm = $3; - SET_LEX_STATE($4); - p->lex.brace_nest = $5; - p->heredoc_indent = $6; - p->heredoc_line_indent = -1; - /*%%%*/ - if ($7) $7->flags &= ~NODE_FL_NEWLINE; - $$ = new_evstr(p, $7, &@$); - /*% %*/ - /*% ripper: string_embexpr!($7) %*/ - } - ; + /*% ripper[brace]: ripper_new_yylval(p, 0, get_value($1), $1) %*/ + | tSTRING_DVAR + { + /* need to backup p->lex.strterm so that a string literal `%&foo,#$&,bar&` can be parsed */ + $$ = p->lex.strterm; + p->lex.strterm = 0; + SET_LEX_STATE(EXPR_BEG); + } + string_dvar + { + p->lex.strterm = $2; + /*%%%*/ + $$ = NEW_EVSTR($3, &@$); + nd_set_line($$, @3.end_pos.lineno); + /*% %*/ + /*% ripper: string_dvar!($3) %*/ + } + | tSTRING_DBEG + { + CMDARG_PUSH(0); + COND_PUSH(0); + } + { + /* need to backup p->lex.strterm so that a string literal `%!foo,#{ !0 },bar!` can be parsed */ + $$ = p->lex.strterm; + p->lex.strterm = 0; + } + { + $$ = p->lex.state; + SET_LEX_STATE(EXPR_BEG); + } + { + $$ = p->lex.brace_nest; + p->lex.brace_nest = 0; + } + { + $$ = p->heredoc_indent; + p->heredoc_indent = 0; + } + compstmt tSTRING_DEND + { + COND_POP(); + CMDARG_POP(); + p->lex.strterm = $3; + SET_LEX_STATE($4); + p->lex.brace_nest = $5; + p->heredoc_indent = $6; + p->heredoc_line_indent = -1; + /*%%%*/ + if ($7) $7->flags &= ~NODE_FL_NEWLINE; + $$ = new_evstr(p, $7, &@$); + /*% %*/ + /*% ripper: string_embexpr!($7) %*/ + } + ; string_dvar : tGVAR - { - /*%%%*/ - $$ = NEW_GVAR($1, &@$); - /*% %*/ - /*% ripper: var_ref!($1) %*/ - } - | tIVAR - { - /*%%%*/ - $$ = NEW_IVAR($1, &@$); - /*% %*/ - /*% ripper: var_ref!($1) %*/ - } - | tCVAR - { - /*%%%*/ - $$ = NEW_CVAR($1, &@$); - /*% %*/ - /*% ripper: var_ref!($1) %*/ - } - | backref - ; + { + /*%%%*/ + $$ = NEW_GVAR($1, &@$); + /*% %*/ + /*% ripper: var_ref!($1) %*/ + } + | tIVAR + { + /*%%%*/ + $$ = NEW_IVAR($1, &@$); + /*% %*/ + /*% ripper: var_ref!($1) %*/ + } + | tCVAR + { + /*%%%*/ + $$ = NEW_CVAR($1, &@$); + /*% %*/ + /*% ripper: var_ref!($1) %*/ + } + | backref + ; symbol : ssym - | dsym - ; + | dsym + ; ssym : tSYMBEG sym - { - SET_LEX_STATE(EXPR_END); - /*%%%*/ - $$ = NEW_LIT(ID2SYM($2), &@$); - /*% %*/ - /*% ripper: symbol_literal!(symbol!($2)) %*/ - } - ; + { + SET_LEX_STATE(EXPR_END); + /*%%%*/ + $$ = NEW_LIT(ID2SYM($2), &@$); + /*% %*/ + /*% ripper: symbol_literal!(symbol!($2)) %*/ + } + ; sym : fname - | nonlocal_var - ; + | nonlocal_var + ; dsym : tSYMBEG string_contents tSTRING_END - { - SET_LEX_STATE(EXPR_END); - /*%%%*/ - $$ = dsym_node(p, $2, &@$); - /*% %*/ - /*% ripper: dyna_symbol!($2) %*/ - } - ; + { + SET_LEX_STATE(EXPR_END); + /*%%%*/ + $$ = dsym_node(p, $2, &@$); + /*% %*/ + /*% ripper: dyna_symbol!($2) %*/ + } + ; numeric : simple_numeric - | tUMINUS_NUM simple_numeric %prec tLOWEST - { - /*%%%*/ - $$ = $2; - RB_OBJ_WRITE(p->ast, &$$->nd_lit, negate_lit(p, $$->nd_lit)); - /*% %*/ - /*% ripper: unary!(ID2VAL(idUMinus), $2) %*/ - } - ; + | tUMINUS_NUM simple_numeric %prec tLOWEST + { + /*%%%*/ + $$ = $2; + RB_OBJ_WRITE(p->ast, &$$->nd_lit, negate_lit(p, $$->nd_lit)); + /*% %*/ + /*% ripper: unary!(ID2VAL(idUMinus), $2) %*/ + } + ; simple_numeric : tINTEGER - | tFLOAT - | tRATIONAL - | tIMAGINARY - ; + | tFLOAT + | tRATIONAL + | tIMAGINARY + ; nonlocal_var : tIVAR - | tGVAR - | tCVAR - ; + | tGVAR + | tCVAR + ; user_variable : tIDENTIFIER - | tCONSTANT - | nonlocal_var - ; + | tCONSTANT + | nonlocal_var + ; keyword_variable: keyword_nil {$$ = KWD2EID(nil, $1);} - | keyword_self {$$ = KWD2EID(self, $1);} - | keyword_true {$$ = KWD2EID(true, $1);} - | keyword_false {$$ = KWD2EID(false, $1);} - | keyword__FILE__ {$$ = KWD2EID(_FILE__, $1);} - | keyword__LINE__ {$$ = KWD2EID(_LINE__, $1);} - | keyword__ENCODING__ {$$ = KWD2EID(_ENCODING__, $1);} - ; + | keyword_self {$$ = KWD2EID(self, $1);} + | keyword_true {$$ = KWD2EID(true, $1);} + | keyword_false {$$ = KWD2EID(false, $1);} + | keyword__FILE__ {$$ = KWD2EID(_FILE__, $1);} + | keyword__LINE__ {$$ = KWD2EID(_LINE__, $1);} + | keyword__ENCODING__ {$$ = KWD2EID(_ENCODING__, $1);} + ; var_ref : user_variable - { - /*%%%*/ - if (!($$ = gettable(p, $1, &@$))) $$ = NEW_BEGIN(0, &@$); - /*% - if (id_is_var(p, get_id($1))) { - $$ = dispatch1(var_ref, $1); - } - else { - $$ = dispatch1(vcall, $1); - } - %*/ - } - | keyword_variable - { - /*%%%*/ - if (!($$ = gettable(p, $1, &@$))) $$ = NEW_BEGIN(0, &@$); - /*% %*/ - /*% ripper: var_ref!($1) %*/ - } - ; + { + /*%%%*/ + if (!($$ = gettable(p, $1, &@$))) $$ = NEW_BEGIN(0, &@$); + /*% + if (id_is_var(p, get_id($1))) { + $$ = dispatch1(var_ref, $1); + } + else { + $$ = dispatch1(vcall, $1); + } + %*/ + } + | keyword_variable + { + /*%%%*/ + if (!($$ = gettable(p, $1, &@$))) $$ = NEW_BEGIN(0, &@$); + /*% %*/ + /*% ripper: var_ref!($1) %*/ + } + ; var_lhs : user_variable - { - /*%%%*/ - $$ = assignable(p, $1, 0, &@$); - /*% %*/ - /*% ripper: assignable(p, var_field(p, $1)) %*/ - } - | keyword_variable - { - /*%%%*/ - $$ = assignable(p, $1, 0, &@$); - /*% %*/ - /*% ripper: assignable(p, var_field(p, $1)) %*/ - } - ; + { + /*%%%*/ + $$ = assignable(p, $1, 0, &@$); + /*% %*/ + /*% ripper: assignable(p, var_field(p, $1)) %*/ + } + | keyword_variable + { + /*%%%*/ + $$ = assignable(p, $1, 0, &@$); + /*% %*/ + /*% ripper: assignable(p, var_field(p, $1)) %*/ + } + ; backref : tNTH_REF - | tBACK_REF - ; + | tBACK_REF + ; superclass : '<' - { - SET_LEX_STATE(EXPR_BEG); - p->command_start = TRUE; - } - expr_value term - { - $$ = $3; - } - | /* none */ - { - /*%%%*/ - $$ = 0; - /*% %*/ - /*% ripper: Qnil %*/ - } - ; + { + SET_LEX_STATE(EXPR_BEG); + p->command_start = TRUE; + } + expr_value term + { + $$ = $3; + } + | /* none */ + { + /*%%%*/ + $$ = 0; + /*% %*/ + /*% ripper: Qnil %*/ + } + ; f_opt_paren_args: f_paren_args - | none - { - p->ctxt.in_argdef = 0; - $$ = new_args_tail(p, Qnone, Qnone, Qnone, &@0); - $$ = new_args(p, Qnone, Qnone, Qnone, Qnone, $$, &@0); - } - ; + | none + { + p->ctxt.in_argdef = 0; + $$ = new_args_tail(p, Qnone, Qnone, Qnone, &@0); + $$ = new_args(p, Qnone, Qnone, Qnone, Qnone, $$, &@0); + } + ; f_paren_args : '(' f_args rparen - { - /*%%%*/ - $$ = $2; - /*% %*/ - /*% ripper: paren!($2) %*/ - SET_LEX_STATE(EXPR_BEG); - p->command_start = TRUE; - p->ctxt.in_argdef = 0; - } + { + /*%%%*/ + $$ = $2; + /*% %*/ + /*% ripper: paren!($2) %*/ + SET_LEX_STATE(EXPR_BEG); + p->command_start = TRUE; + p->ctxt.in_argdef = 0; + } ; f_arglist : f_paren_args - | { - $$ = p->ctxt; - p->ctxt.in_kwarg = 1; - p->ctxt.in_argdef = 1; - SET_LEX_STATE(p->lex.state|EXPR_LABEL); /* force for args */ - } - f_args term - { - p->ctxt.in_kwarg = $1.in_kwarg; - p->ctxt.in_argdef = 0; - $$ = $2; - SET_LEX_STATE(EXPR_BEG); - p->command_start = TRUE; - } - ; + | { + $$ = p->ctxt; + p->ctxt.in_kwarg = 1; + p->ctxt.in_argdef = 1; + SET_LEX_STATE(p->lex.state|EXPR_LABEL); /* force for args */ + } + f_args term + { + p->ctxt.in_kwarg = $1.in_kwarg; + p->ctxt.in_argdef = 0; + $$ = $2; + SET_LEX_STATE(EXPR_BEG); + p->command_start = TRUE; + } + ; args_tail : f_kwarg ',' f_kwrest opt_f_block_arg - { - $$ = new_args_tail(p, $1, $3, $4, &@3); - } - | f_kwarg opt_f_block_arg - { - $$ = new_args_tail(p, $1, Qnone, $2, &@1); - } - | f_any_kwrest opt_f_block_arg - { - $$ = new_args_tail(p, Qnone, $1, $2, &@1); - } - | f_block_arg - { - $$ = new_args_tail(p, Qnone, Qnone, $1, &@1); - } - | args_forward - { - add_forwarding_args(p); - $$ = new_args_tail(p, Qnone, $1, ID2VAL(idFWD_BLOCK), &@1); - /*%%%*/ - ($$->nd_ainfo)->forwarding = 1; - /*% %*/ - } - ; + { + $$ = new_args_tail(p, $1, $3, $4, &@3); + } + | f_kwarg opt_f_block_arg + { + $$ = new_args_tail(p, $1, Qnone, $2, &@1); + } + | f_any_kwrest opt_f_block_arg + { + $$ = new_args_tail(p, Qnone, $1, $2, &@1); + } + | f_block_arg + { + $$ = new_args_tail(p, Qnone, Qnone, $1, &@1); + } + | args_forward + { + add_forwarding_args(p); + $$ = new_args_tail(p, Qnone, $1, ID2VAL(idFWD_BLOCK), &@1); + /*%%%*/ + ($$->nd_ainfo)->forwarding = 1; + /*% %*/ + } + ; opt_args_tail : ',' args_tail - { - $$ = $2; - } - | /* none */ - { - $$ = new_args_tail(p, Qnone, Qnone, Qnone, &@0); - } - ; + { + $$ = $2; + } + | /* none */ + { + $$ = new_args_tail(p, Qnone, Qnone, Qnone, &@0); + } + ; f_args : f_arg ',' f_optarg ',' f_rest_arg opt_args_tail - { - $$ = new_args(p, $1, $3, $5, Qnone, $6, &@$); - } - | f_arg ',' f_optarg ',' f_rest_arg ',' f_arg opt_args_tail - { - $$ = new_args(p, $1, $3, $5, $7, $8, &@$); - } - | f_arg ',' f_optarg opt_args_tail - { - $$ = new_args(p, $1, $3, Qnone, Qnone, $4, &@$); - } - | f_arg ',' f_optarg ',' f_arg opt_args_tail - { - $$ = new_args(p, $1, $3, Qnone, $5, $6, &@$); - } - | f_arg ',' f_rest_arg opt_args_tail - { - $$ = new_args(p, $1, Qnone, $3, Qnone, $4, &@$); - } - | f_arg ',' f_rest_arg ',' f_arg opt_args_tail - { - $$ = new_args(p, $1, Qnone, $3, $5, $6, &@$); - } - | f_arg opt_args_tail - { - $$ = new_args(p, $1, Qnone, Qnone, Qnone, $2, &@$); - } - | f_optarg ',' f_rest_arg opt_args_tail - { - $$ = new_args(p, Qnone, $1, $3, Qnone, $4, &@$); - } - | f_optarg ',' f_rest_arg ',' f_arg opt_args_tail - { - $$ = new_args(p, Qnone, $1, $3, $5, $6, &@$); - } - | f_optarg opt_args_tail - { - $$ = new_args(p, Qnone, $1, Qnone, Qnone, $2, &@$); - } - | f_optarg ',' f_arg opt_args_tail - { - $$ = new_args(p, Qnone, $1, Qnone, $3, $4, &@$); - } - | f_rest_arg opt_args_tail - { - $$ = new_args(p, Qnone, Qnone, $1, Qnone, $2, &@$); - } - | f_rest_arg ',' f_arg opt_args_tail - { - $$ = new_args(p, Qnone, Qnone, $1, $3, $4, &@$); - } - | args_tail - { - $$ = new_args(p, Qnone, Qnone, Qnone, Qnone, $1, &@$); - } - | /* none */ - { - $$ = new_args_tail(p, Qnone, Qnone, Qnone, &@0); - $$ = new_args(p, Qnone, Qnone, Qnone, Qnone, $$, &@0); - } - ; + { + $$ = new_args(p, $1, $3, $5, Qnone, $6, &@$); + } + | f_arg ',' f_optarg ',' f_rest_arg ',' f_arg opt_args_tail + { + $$ = new_args(p, $1, $3, $5, $7, $8, &@$); + } + | f_arg ',' f_optarg opt_args_tail + { + $$ = new_args(p, $1, $3, Qnone, Qnone, $4, &@$); + } + | f_arg ',' f_optarg ',' f_arg opt_args_tail + { + $$ = new_args(p, $1, $3, Qnone, $5, $6, &@$); + } + | f_arg ',' f_rest_arg opt_args_tail + { + $$ = new_args(p, $1, Qnone, $3, Qnone, $4, &@$); + } + | f_arg ',' f_rest_arg ',' f_arg opt_args_tail + { + $$ = new_args(p, $1, Qnone, $3, $5, $6, &@$); + } + | f_arg opt_args_tail + { + $$ = new_args(p, $1, Qnone, Qnone, Qnone, $2, &@$); + } + | f_optarg ',' f_rest_arg opt_args_tail + { + $$ = new_args(p, Qnone, $1, $3, Qnone, $4, &@$); + } + | f_optarg ',' f_rest_arg ',' f_arg opt_args_tail + { + $$ = new_args(p, Qnone, $1, $3, $5, $6, &@$); + } + | f_optarg opt_args_tail + { + $$ = new_args(p, Qnone, $1, Qnone, Qnone, $2, &@$); + } + | f_optarg ',' f_arg opt_args_tail + { + $$ = new_args(p, Qnone, $1, Qnone, $3, $4, &@$); + } + | f_rest_arg opt_args_tail + { + $$ = new_args(p, Qnone, Qnone, $1, Qnone, $2, &@$); + } + | f_rest_arg ',' f_arg opt_args_tail + { + $$ = new_args(p, Qnone, Qnone, $1, $3, $4, &@$); + } + | args_tail + { + $$ = new_args(p, Qnone, Qnone, Qnone, Qnone, $1, &@$); + } + | /* none */ + { + $$ = new_args_tail(p, Qnone, Qnone, Qnone, &@0); + $$ = new_args(p, Qnone, Qnone, Qnone, Qnone, $$, &@0); + } + ; args_forward : tBDOT3 - { - /*%%%*/ + { + /*%%%*/ #ifdef FORWARD_ARGS_WITH_RUBY2_KEYWORDS - $$ = 0; + $$ = 0; #else - $$ = idFWD_KWREST; + $$ = idFWD_KWREST; #endif - /*% %*/ - /*% ripper: args_forward! %*/ - } - ; + /*% %*/ + /*% ripper: args_forward! %*/ + } + ; f_bad_arg : tCONSTANT - { - static const char mesg[] = "formal argument cannot be a constant"; - /*%%%*/ - yyerror1(&@1, mesg); - $$ = 0; - /*% %*/ - /*% ripper[error]: param_error!(ERR_MESG(), $1) %*/ - } - | tIVAR - { - static const char mesg[] = "formal argument cannot be an instance variable"; - /*%%%*/ - yyerror1(&@1, mesg); - $$ = 0; - /*% %*/ - /*% ripper[error]: param_error!(ERR_MESG(), $1) %*/ - } - | tGVAR - { - static const char mesg[] = "formal argument cannot be a global variable"; - /*%%%*/ - yyerror1(&@1, mesg); - $$ = 0; - /*% %*/ - /*% ripper[error]: param_error!(ERR_MESG(), $1) %*/ - } - | tCVAR - { - static const char mesg[] = "formal argument cannot be a class variable"; - /*%%%*/ - yyerror1(&@1, mesg); - $$ = 0; - /*% %*/ - /*% ripper[error]: param_error!(ERR_MESG(), $1) %*/ - } - ; + { + static const char mesg[] = "formal argument cannot be a constant"; + /*%%%*/ + yyerror1(&@1, mesg); + $$ = 0; + /*% %*/ + /*% ripper[error]: param_error!(ERR_MESG(), $1) %*/ + } + | tIVAR + { + static const char mesg[] = "formal argument cannot be an instance variable"; + /*%%%*/ + yyerror1(&@1, mesg); + $$ = 0; + /*% %*/ + /*% ripper[error]: param_error!(ERR_MESG(), $1) %*/ + } + | tGVAR + { + static const char mesg[] = "formal argument cannot be a global variable"; + /*%%%*/ + yyerror1(&@1, mesg); + $$ = 0; + /*% %*/ + /*% ripper[error]: param_error!(ERR_MESG(), $1) %*/ + } + | tCVAR + { + static const char mesg[] = "formal argument cannot be a class variable"; + /*%%%*/ + yyerror1(&@1, mesg); + $$ = 0; + /*% %*/ + /*% ripper[error]: param_error!(ERR_MESG(), $1) %*/ + } + ; f_norm_arg : f_bad_arg - | tIDENTIFIER - { - formal_argument(p, $1); - p->max_numparam = ORDINAL_PARAM; - $$ = $1; - } - ; + | tIDENTIFIER + { + formal_argument(p, $1); + p->max_numparam = ORDINAL_PARAM; + $$ = $1; + } + ; f_arg_asgn : f_norm_arg - { - ID id = get_id($1); - arg_var(p, id); - p->cur_arg = id; - $$ = $1; - } - ; + { + ID id = get_id($1); + arg_var(p, id); + p->cur_arg = id; + $$ = $1; + } + ; f_arg_item : f_arg_asgn - { - p->cur_arg = 0; - /*%%%*/ - $$ = NEW_ARGS_AUX($1, 1, &NULL_LOC); - /*% %*/ - /*% ripper: get_value($1) %*/ - } - | tLPAREN f_margs rparen - { - /*%%%*/ - ID tid = internal_id(p); - YYLTYPE loc; - loc.beg_pos = @2.beg_pos; - loc.end_pos = @2.beg_pos; - arg_var(p, tid); - if (dyna_in_block(p)) { - $2->nd_value = NEW_DVAR(tid, &loc); - } - else { - $2->nd_value = NEW_LVAR(tid, &loc); - } - $$ = NEW_ARGS_AUX(tid, 1, &NULL_LOC); - $$->nd_next = $2; - /*% %*/ - /*% ripper: mlhs_paren!($2) %*/ - } - ; + { + p->cur_arg = 0; + /*%%%*/ + $$ = NEW_ARGS_AUX($1, 1, &NULL_LOC); + /*% %*/ + /*% ripper: get_value($1) %*/ + } + | tLPAREN f_margs rparen + { + /*%%%*/ + ID tid = internal_id(p); + YYLTYPE loc; + loc.beg_pos = @2.beg_pos; + loc.end_pos = @2.beg_pos; + arg_var(p, tid); + if (dyna_in_block(p)) { + $2->nd_value = NEW_DVAR(tid, &loc); + } + else { + $2->nd_value = NEW_LVAR(tid, &loc); + } + $$ = NEW_ARGS_AUX(tid, 1, &NULL_LOC); + $$->nd_next = $2; + /*% %*/ + /*% ripper: mlhs_paren!($2) %*/ + } + ; f_arg : f_arg_item - /*% ripper[brace]: rb_ary_new3(1, get_value($1)) %*/ - | f_arg ',' f_arg_item - { - /*%%%*/ - $$ = $1; - $$->nd_plen++; - $$->nd_next = block_append(p, $$->nd_next, $3->nd_next); - rb_discard_node(p, $3); - /*% %*/ - /*% ripper: rb_ary_push($1, get_value($3)) %*/ - } - ; + /*% ripper[brace]: rb_ary_new3(1, get_value($1)) %*/ + | f_arg ',' f_arg_item + { + /*%%%*/ + $$ = $1; + $$->nd_plen++; + $$->nd_next = block_append(p, $$->nd_next, $3->nd_next); + rb_discard_node(p, $3); + /*% %*/ + /*% ripper: rb_ary_push($1, get_value($3)) %*/ + } + ; f_label : tLABEL - { - arg_var(p, formal_argument(p, $1)); - p->cur_arg = get_id($1); - p->max_numparam = ORDINAL_PARAM; - p->ctxt.in_argdef = 0; - $$ = $1; - } - ; + { + arg_var(p, formal_argument(p, $1)); + p->cur_arg = get_id($1); + p->max_numparam = ORDINAL_PARAM; + p->ctxt.in_argdef = 0; + $$ = $1; + } + ; f_kw : f_label arg_value - { - p->cur_arg = 0; - p->ctxt.in_argdef = 1; - /*%%%*/ - $$ = new_kw_arg(p, assignable(p, $1, $2, &@$), &@$); - /*% %*/ - /*% ripper: rb_assoc_new(get_value(assignable(p, $1)), get_value($2)) %*/ - } - | f_label - { - p->cur_arg = 0; - p->ctxt.in_argdef = 1; - /*%%%*/ - $$ = new_kw_arg(p, assignable(p, $1, NODE_SPECIAL_REQUIRED_KEYWORD, &@$), &@$); - /*% %*/ - /*% ripper: rb_assoc_new(get_value(assignable(p, $1)), 0) %*/ - } - ; + { + p->cur_arg = 0; + p->ctxt.in_argdef = 1; + /*%%%*/ + $$ = new_kw_arg(p, assignable(p, $1, $2, &@$), &@$); + /*% %*/ + /*% ripper: rb_assoc_new(get_value(assignable(p, $1)), get_value($2)) %*/ + } + | f_label + { + p->cur_arg = 0; + p->ctxt.in_argdef = 1; + /*%%%*/ + $$ = new_kw_arg(p, assignable(p, $1, NODE_SPECIAL_REQUIRED_KEYWORD, &@$), &@$); + /*% %*/ + /*% ripper: rb_assoc_new(get_value(assignable(p, $1)), 0) %*/ + } + ; f_block_kw : f_label primary_value - { - p->ctxt.in_argdef = 1; - /*%%%*/ - $$ = new_kw_arg(p, assignable(p, $1, $2, &@$), &@$); - /*% %*/ - /*% ripper: rb_assoc_new(get_value(assignable(p, $1)), get_value($2)) %*/ - } - | f_label - { - p->ctxt.in_argdef = 1; - /*%%%*/ - $$ = new_kw_arg(p, assignable(p, $1, NODE_SPECIAL_REQUIRED_KEYWORD, &@$), &@$); - /*% %*/ - /*% ripper: rb_assoc_new(get_value(assignable(p, $1)), 0) %*/ - } - ; + { + p->ctxt.in_argdef = 1; + /*%%%*/ + $$ = new_kw_arg(p, assignable(p, $1, $2, &@$), &@$); + /*% %*/ + /*% ripper: rb_assoc_new(get_value(assignable(p, $1)), get_value($2)) %*/ + } + | f_label + { + p->ctxt.in_argdef = 1; + /*%%%*/ + $$ = new_kw_arg(p, assignable(p, $1, NODE_SPECIAL_REQUIRED_KEYWORD, &@$), &@$); + /*% %*/ + /*% ripper: rb_assoc_new(get_value(assignable(p, $1)), 0) %*/ + } + ; f_block_kwarg : f_block_kw - { - /*%%%*/ - $$ = $1; - /*% %*/ - /*% ripper: rb_ary_new3(1, get_value($1)) %*/ - } - | f_block_kwarg ',' f_block_kw - { - /*%%%*/ - $$ = kwd_append($1, $3); - /*% %*/ - /*% ripper: rb_ary_push($1, get_value($3)) %*/ - } - ; + { + /*%%%*/ + $$ = $1; + /*% %*/ + /*% ripper: rb_ary_new3(1, get_value($1)) %*/ + } + | f_block_kwarg ',' f_block_kw + { + /*%%%*/ + $$ = kwd_append($1, $3); + /*% %*/ + /*% ripper: rb_ary_push($1, get_value($3)) %*/ + } + ; f_kwarg : f_kw - { - /*%%%*/ - $$ = $1; - /*% %*/ - /*% ripper: rb_ary_new3(1, get_value($1)) %*/ - } - | f_kwarg ',' f_kw - { - /*%%%*/ - $$ = kwd_append($1, $3); - /*% %*/ - /*% ripper: rb_ary_push($1, get_value($3)) %*/ - } - ; + { + /*%%%*/ + $$ = $1; + /*% %*/ + /*% ripper: rb_ary_new3(1, get_value($1)) %*/ + } + | f_kwarg ',' f_kw + { + /*%%%*/ + $$ = kwd_append($1, $3); + /*% %*/ + /*% ripper: rb_ary_push($1, get_value($3)) %*/ + } + ; kwrest_mark : tPOW - | tDSTAR - ; + | tDSTAR + ; f_no_kwarg : p_kwnorest - { - /*%%%*/ - /*% %*/ - /*% ripper: nokw_param!(Qnil) %*/ - } - ; + { + /*%%%*/ + /*% %*/ + /*% ripper: nokw_param!(Qnil) %*/ + } + ; f_kwrest : kwrest_mark tIDENTIFIER - { - arg_var(p, shadowing_lvar(p, get_id($2))); - /*%%%*/ - $$ = $2; - /*% %*/ - /*% ripper: kwrest_param!($2) %*/ - } - | kwrest_mark - { - arg_var(p, idFWD_KWREST); - /*%%%*/ - $$ = idFWD_KWREST; - /*% %*/ - /*% ripper: kwrest_param!(Qnil) %*/ - } - ; + { + arg_var(p, shadowing_lvar(p, get_id($2))); + /*%%%*/ + $$ = $2; + /*% %*/ + /*% ripper: kwrest_param!($2) %*/ + } + | kwrest_mark + { + arg_var(p, idFWD_KWREST); + /*%%%*/ + $$ = idFWD_KWREST; + /*% %*/ + /*% ripper: kwrest_param!(Qnil) %*/ + } + ; f_opt : f_arg_asgn f_eq arg_value - { - p->cur_arg = 0; - p->ctxt.in_argdef = 1; - /*%%%*/ - $$ = NEW_OPT_ARG(0, assignable(p, $1, $3, &@$), &@$); - /*% %*/ - /*% ripper: rb_assoc_new(get_value(assignable(p, $1)), get_value($3)) %*/ - } - ; + { + p->cur_arg = 0; + p->ctxt.in_argdef = 1; + /*%%%*/ + $$ = NEW_OPT_ARG(0, assignable(p, $1, $3, &@$), &@$); + /*% %*/ + /*% ripper: rb_assoc_new(get_value(assignable(p, $1)), get_value($3)) %*/ + } + ; f_block_opt : f_arg_asgn f_eq primary_value - { - p->cur_arg = 0; - p->ctxt.in_argdef = 1; - /*%%%*/ - $$ = NEW_OPT_ARG(0, assignable(p, $1, $3, &@$), &@$); - /*% %*/ - /*% ripper: rb_assoc_new(get_value(assignable(p, $1)), get_value($3)) %*/ - } - ; + { + p->cur_arg = 0; + p->ctxt.in_argdef = 1; + /*%%%*/ + $$ = NEW_OPT_ARG(0, assignable(p, $1, $3, &@$), &@$); + /*% %*/ + /*% ripper: rb_assoc_new(get_value(assignable(p, $1)), get_value($3)) %*/ + } + ; f_block_optarg : f_block_opt - { - /*%%%*/ - $$ = $1; - /*% %*/ - /*% ripper: rb_ary_new3(1, get_value($1)) %*/ - } - | f_block_optarg ',' f_block_opt - { - /*%%%*/ - $$ = opt_arg_append($1, $3); - /*% %*/ - /*% ripper: rb_ary_push($1, get_value($3)) %*/ - } - ; + { + /*%%%*/ + $$ = $1; + /*% %*/ + /*% ripper: rb_ary_new3(1, get_value($1)) %*/ + } + | f_block_optarg ',' f_block_opt + { + /*%%%*/ + $$ = opt_arg_append($1, $3); + /*% %*/ + /*% ripper: rb_ary_push($1, get_value($3)) %*/ + } + ; f_optarg : f_opt - { - /*%%%*/ - $$ = $1; - /*% %*/ - /*% ripper: rb_ary_new3(1, get_value($1)) %*/ - } - | f_optarg ',' f_opt - { - /*%%%*/ - $$ = opt_arg_append($1, $3); - /*% %*/ - /*% ripper: rb_ary_push($1, get_value($3)) %*/ - } - ; + { + /*%%%*/ + $$ = $1; + /*% %*/ + /*% ripper: rb_ary_new3(1, get_value($1)) %*/ + } + | f_optarg ',' f_opt + { + /*%%%*/ + $$ = opt_arg_append($1, $3); + /*% %*/ + /*% ripper: rb_ary_push($1, get_value($3)) %*/ + } + ; restarg_mark : '*' - | tSTAR - ; + | tSTAR + ; f_rest_arg : restarg_mark tIDENTIFIER - { - arg_var(p, shadowing_lvar(p, get_id($2))); - /*%%%*/ - $$ = $2; - /*% %*/ - /*% ripper: rest_param!($2) %*/ - } - | restarg_mark - { - arg_var(p, idFWD_REST); - /*%%%*/ - $$ = idFWD_REST; - /*% %*/ - /*% ripper: rest_param!(Qnil) %*/ - } - ; + { + arg_var(p, shadowing_lvar(p, get_id($2))); + /*%%%*/ + $$ = $2; + /*% %*/ + /*% ripper: rest_param!($2) %*/ + } + | restarg_mark + { + arg_var(p, idFWD_REST); + /*%%%*/ + $$ = idFWD_REST; + /*% %*/ + /*% ripper: rest_param!(Qnil) %*/ + } + ; blkarg_mark : '&' - | tAMPER - ; + | tAMPER + ; f_block_arg : blkarg_mark tIDENTIFIER - { - arg_var(p, shadowing_lvar(p, get_id($2))); - /*%%%*/ - $$ = $2; - /*% %*/ - /*% ripper: blockarg!($2) %*/ - } + { + arg_var(p, shadowing_lvar(p, get_id($2))); + /*%%%*/ + $$ = $2; + /*% %*/ + /*% ripper: blockarg!($2) %*/ + } | blkarg_mark { - arg_var(p, idFWD_BLOCK); + arg_var(p, idFWD_BLOCK); /*%%%*/ - $$ = idFWD_BLOCK; + $$ = idFWD_BLOCK; /*% %*/ - /*% ripper: blockarg!(Qnil) %*/ + /*% ripper: blockarg!(Qnil) %*/ } - ; + ; opt_f_block_arg : ',' f_block_arg - { - $$ = $2; - } - | none - { - $$ = Qnull; - } - ; + { + $$ = $2; + } + | none + { + $$ = Qnull; + } + ; singleton : var_ref - { - value_expr($1); - $$ = $1; - } - | '(' {SET_LEX_STATE(EXPR_BEG);} expr rparen - { - /*%%%*/ - switch (nd_type($3)) { - case NODE_STR: - case NODE_DSTR: - case NODE_XSTR: - case NODE_DXSTR: - case NODE_DREGX: - case NODE_LIT: - case NODE_LIST: - case NODE_ZLIST: - yyerror1(&@3, "can't define singleton method for literals"); - break; - default: - value_expr($3); - break; - } - $$ = $3; - /*% %*/ - /*% ripper: paren!($3) %*/ - } - ; + { + value_expr($1); + $$ = $1; + } + | '(' {SET_LEX_STATE(EXPR_BEG);} expr rparen + { + /*%%%*/ + switch (nd_type($3)) { + case NODE_STR: + case NODE_DSTR: + case NODE_XSTR: + case NODE_DXSTR: + case NODE_DREGX: + case NODE_LIT: + case NODE_LIST: + case NODE_ZLIST: + yyerror1(&@3, "can't define singleton method for literals"); + break; + default: + value_expr($3); + break; + } + $$ = $3; + /*% %*/ + /*% ripper: paren!($3) %*/ + } + ; assoc_list : none - | assocs trailer - { - /*%%%*/ - $$ = $1; - /*% %*/ - /*% ripper: assoclist_from_args!($1) %*/ - } - ; + | assocs trailer + { + /*%%%*/ + $$ = $1; + /*% %*/ + /*% ripper: assoclist_from_args!($1) %*/ + } + ; assocs : assoc - /*% ripper[brace]: rb_ary_new3(1, get_value($1)) %*/ - | assocs ',' assoc - { - /*%%%*/ - NODE *assocs = $1; - NODE *tail = $3; - if (!assocs) { - assocs = tail; - } - else if (tail) { + /*% ripper[brace]: rb_ary_new3(1, get_value($1)) %*/ + | assocs ',' assoc + { + /*%%%*/ + NODE *assocs = $1; + NODE *tail = $3; + if (!assocs) { + assocs = tail; + } + else if (tail) { if (assocs->nd_head && !tail->nd_head && nd_type_p(tail->nd_next, NODE_LIST) && nd_type_p(tail->nd_next->nd_head, NODE_HASH)) { /* DSTAR */ tail = tail->nd_next->nd_head->nd_head; } - assocs = list_concat(assocs, tail); - } - $$ = assocs; - /*% %*/ - /*% ripper: rb_ary_push($1, get_value($3)) %*/ - } - ; + assocs = list_concat(assocs, tail); + } + $$ = assocs; + /*% %*/ + /*% ripper: rb_ary_push($1, get_value($3)) %*/ + } + ; assoc : arg_value tASSOC arg_value - { - /*%%%*/ - if (nd_type_p($1, NODE_STR)) { - nd_set_type($1, NODE_LIT); - RB_OBJ_WRITE(p->ast, &$1->nd_lit, rb_fstring($1->nd_lit)); - } - $$ = list_append(p, NEW_LIST($1, &@$), $3); - /*% %*/ - /*% ripper: assoc_new!($1, $3) %*/ - } - | tLABEL arg_value - { - /*%%%*/ - $$ = list_append(p, NEW_LIST(NEW_LIT(ID2SYM($1), &@1), &@$), $2); - /*% %*/ - /*% ripper: assoc_new!($1, $2) %*/ - } - | tLABEL - { - /*%%%*/ - NODE *val = gettable(p, $1, &@$); - if (!val) val = NEW_BEGIN(0, &@$); - $$ = list_append(p, NEW_LIST(NEW_LIT(ID2SYM($1), &@1), &@$), val); - /*% %*/ - /*% ripper: assoc_new!($1, Qnil) %*/ - } - | tSTRING_BEG string_contents tLABEL_END arg_value - { - /*%%%*/ - YYLTYPE loc = code_loc_gen(&@1, &@3); - $$ = list_append(p, NEW_LIST(dsym_node(p, $2, &loc), &loc), $4); - /*% %*/ - /*% ripper: assoc_new!(dyna_symbol!($2), $4) %*/ - } - | tDSTAR arg_value - { - /*%%%*/ + { + /*%%%*/ + if (nd_type_p($1, NODE_STR)) { + nd_set_type($1, NODE_LIT); + RB_OBJ_WRITE(p->ast, &$1->nd_lit, rb_fstring($1->nd_lit)); + } + $$ = list_append(p, NEW_LIST($1, &@$), $3); + /*% %*/ + /*% ripper: assoc_new!($1, $3) %*/ + } + | tLABEL arg_value + { + /*%%%*/ + $$ = list_append(p, NEW_LIST(NEW_LIT(ID2SYM($1), &@1), &@$), $2); + /*% %*/ + /*% ripper: assoc_new!($1, $2) %*/ + } + | tLABEL + { + /*%%%*/ + NODE *val = gettable(p, $1, &@$); + if (!val) val = NEW_BEGIN(0, &@$); + $$ = list_append(p, NEW_LIST(NEW_LIT(ID2SYM($1), &@1), &@$), val); + /*% %*/ + /*% ripper: assoc_new!($1, Qnil) %*/ + } + | tSTRING_BEG string_contents tLABEL_END arg_value + { + /*%%%*/ + YYLTYPE loc = code_loc_gen(&@1, &@3); + $$ = list_append(p, NEW_LIST(dsym_node(p, $2, &loc), &loc), $4); + /*% %*/ + /*% ripper: assoc_new!(dyna_symbol!($2), $4) %*/ + } + | tDSTAR arg_value + { + /*%%%*/ if (nd_type_p($2, NODE_HASH) && !($2->nd_head && $2->nd_head->nd_alen)) { static VALUE empty_hash; @@ -6028,87 +6028,87 @@ assoc : arg_value tASSOC arg_value } else $$ = list_append(p, NEW_LIST(0, &@$), $2); - /*% %*/ - /*% ripper: assoc_splat!($2) %*/ - } - | tDSTAR - { + /*% %*/ + /*% ripper: assoc_splat!($2) %*/ + } + | tDSTAR + { if (!local_id(p, idFWD_KWREST) || local_id(p, idFWD_ALL)) { compile_error(p, "no anonymous keyword rest parameter"); } - /*%%%*/ + /*%%%*/ $$ = list_append(p, NEW_LIST(0, &@$), NEW_LVAR(idFWD_KWREST, &@$)); - /*% %*/ - /*% ripper: assoc_splat!(Qnil) %*/ - } - ; + /*% %*/ + /*% ripper: assoc_splat!(Qnil) %*/ + } + ; operation : tIDENTIFIER - | tCONSTANT - | tFID - ; + | tCONSTANT + | tFID + ; operation2 : operation - | op - ; + | op + ; operation3 : tIDENTIFIER - | tFID - | op - ; + | tFID + | op + ; dot_or_colon : '.' - | tCOLON2 - ; + | tCOLON2 + ; call_op : '.' - | tANDDOT - ; + | tANDDOT + ; call_op2 : call_op - | tCOLON2 - ; + | tCOLON2 + ; opt_terms : /* none */ - | terms - ; + | terms + ; opt_nl : /* none */ - | '\n' - ; + | '\n' + ; rparen : opt_nl ')' - ; + ; rbracket : opt_nl ']' - ; + ; rbrace : opt_nl '}' - ; + ; trailer : opt_nl - | ',' - ; + | ',' + ; term : ';' {yyerrok;token_flush(p);} - | '\n' - { - @$.end_pos = @$.beg_pos; - token_flush(p); - } - ; + | '\n' + { + @$.end_pos = @$.beg_pos; + token_flush(p); + } + ; terms : term - | terms ';' {yyerrok;} - ; + | terms ';' {yyerrok;} + ; none : /* none */ - { - $$ = Qnull; - } - ; + { + $$ = Qnull; + } + ; %% # undef p # undef yylex @@ -6170,8 +6170,8 @@ parser_has_token(struct parser_params *p) const char *const pcur = p->lex.pcur; const char *const ptok = p->lex.ptok; if (p->keep_tokens && (pcur < ptok)) { - rb_bug("lex.pcur < lex.ptok. (line: %d) %"PRIdPTRDIFF"|%"PRIdPTRDIFF"|%"PRIdPTRDIFF"", - p->ruby_sourceline, ptok - p->lex.pbeg, pcur - ptok, p->lex.pend - pcur); + rb_bug("lex.pcur < lex.ptok. (line: %d) %"PRIdPTRDIFF"|%"PRIdPTRDIFF"|%"PRIdPTRDIFF"", + p->ruby_sourceline, ptok - p->lex.pbeg, pcur - ptok, p->lex.pend - pcur); } return pcur > ptok; } @@ -6180,8 +6180,8 @@ static VALUE code_loc_to_ary(const rb_code_location_t *loc) { VALUE ary = rb_ary_new_from_args(4, - INT2NUM(loc->beg_pos.lineno), INT2NUM(loc->beg_pos.column), - INT2NUM(loc->end_pos.lineno), INT2NUM(loc->end_pos.column)); + INT2NUM(loc->beg_pos.lineno), INT2NUM(loc->beg_pos.column), + INT2NUM(loc->end_pos.lineno), INT2NUM(loc->end_pos.column)); rb_obj_freeze(ary); return ary; @@ -6204,7 +6204,7 @@ parser_append_tokens(struct parser_params *p, VALUE str, enum yytokentype t, int p->token_id++; if (p->debug) { - rb_parser_printf(p, "Append tokens (line: %d) %"PRIsVALUE"\n", line, ary); + rb_parser_printf(p, "Append tokens (line: %d) %"PRIsVALUE"\n", line, ary); } } @@ -6218,8 +6218,8 @@ parser_dispatch_scan_event(struct parser_params *p, enum yytokentype t, int line RUBY_SET_YYLLOC(*p->yylloc); if (p->keep_tokens) { - VALUE str = STR_NEW(p->lex.ptok, p->lex.pcur - p->lex.ptok); - parser_append_tokens(p, str, t, line); + VALUE str = STR_NEW(p->lex.ptok, p->lex.pcur - p->lex.ptok); + parser_append_tokens(p, str, t, line); } token_flush(p); @@ -6239,11 +6239,11 @@ parser_dispatch_delayed_token(struct parser_params *p, enum yytokentype t, int l RUBY_SET_YYLLOC_OF_DELAYED_TOKEN(*p->yylloc); if (p->keep_tokens) { - p->ruby_sourceline = p->delayed.beg_line; - p->lex.ptok = p->lex.pbeg + p->delayed.beg_col; - parser_append_tokens(p, p->delayed.token, t, line); - p->ruby_sourceline = saved_line; - p->lex.ptok = saved_tokp; + p->ruby_sourceline = p->delayed.beg_line; + p->lex.ptok = p->lex.pbeg + p->delayed.beg_col; + parser_append_tokens(p, p->delayed.token, t, line); + p->ruby_sourceline = saved_line; + p->lex.ptok = saved_tokp; } p->delayed.token = Qnil; @@ -6325,13 +6325,13 @@ token_info_setup(token_info *ptinfo, const char *ptr, const rb_code_location_t * { int column = 1, nonspc = 0, i; for (i = 0; i < loc->beg_pos.column; i++, ptr++) { - if (*ptr == '\t') { - column = (((column - 1) / TAB_WIDTH) + 1) * TAB_WIDTH; - } - column++; - if (*ptr != ' ' && *ptr != '\t') { - nonspc = 1; - } + if (*ptr == '\t') { + column = (((column - 1) / TAB_WIDTH) + 1) * TAB_WIDTH; + } + column++; + if (*ptr != ' ' && *ptr != '\t') { + nonspc = 1; + } } ptinfo->beg = loc->beg_pos; @@ -6375,12 +6375,12 @@ token_info_drop(struct parser_params *p, const char *token, rb_code_position_t b p->token_info = ptinfo_beg->next; if (ptinfo_beg->beg.lineno != beg_pos.lineno || - ptinfo_beg->beg.column != beg_pos.column || - strcmp(ptinfo_beg->token, token)) { - compile_error(p, "token position mismatch: %d:%d:%s expected but %d:%d:%s", - beg_pos.lineno, beg_pos.column, token, - ptinfo_beg->beg.lineno, ptinfo_beg->beg.column, - ptinfo_beg->token); + ptinfo_beg->beg.column != beg_pos.column || + strcmp(ptinfo_beg->token, token)) { + compile_error(p, "token position mismatch: %d:%d:%s expected but %d:%d:%s", + beg_pos.lineno, beg_pos.column, token, + ptinfo_beg->beg.lineno, ptinfo_beg->beg.column, + ptinfo_beg->token); } ruby_sized_xfree(ptinfo_beg, sizeof(*ptinfo_beg)); @@ -6398,8 +6398,8 @@ token_info_warn(struct parser_params *p, const char *token, token_info *ptinfo_b if (ptinfo_beg->indent == ptinfo_end->indent) return; /* the indents are matched */ if (!same && ptinfo_beg->indent < ptinfo_end->indent) return; rb_warn3L(ptinfo_end->beg.lineno, - "mismatched indentations at '%s' with '%s' at %d", - WARN_S(token), WARN_S(ptinfo_beg->token), WARN_I(ptinfo_beg->beg.lineno)); + "mismatched indentations at '%s' with '%s' at %d", + WARN_S(token), WARN_S(ptinfo_beg->token), WARN_I(ptinfo_beg->beg.lineno)); } static int @@ -6407,8 +6407,8 @@ parser_precise_mbclen(struct parser_params *p, const char *ptr) { int len = rb_enc_precise_mbclen(ptr, p->lex.pend, p->enc); if (!MBCLEN_CHARFOUND_P(len)) { - compile_error(p, "invalid multibyte char (%s)", rb_enc_name(p->enc)); - return -1; + compile_error(p, "invalid multibyte char (%s)", rb_enc_name(p->enc)); + return -1; } return len; } @@ -6422,13 +6422,13 @@ parser_show_error_line(struct parser_params *p, const YYLTYPE *yylloc) VALUE str; int lineno = p->ruby_sourceline; if (!yylloc) { - return; + return; } else if (yylloc->beg_pos.lineno == lineno) { - str = p->lex.lastline; + str = p->lex.lastline; } else { - return; + return; } ruby_show_error_line(p->error_buffer, yylloc, lineno, str); } @@ -6440,11 +6440,11 @@ parser_yyerror(struct parser_params *p, const YYLTYPE *yylloc, const char *msg) YYLTYPE current; if (!yylloc) { - yylloc = RUBY_SET_YYLLOC(current); + yylloc = RUBY_SET_YYLLOC(current); } else if ((p->ruby_sourceline != yylloc->beg_pos.lineno && - p->ruby_sourceline != yylloc->end_pos.lineno)) { - yylloc = 0; + p->ruby_sourceline != yylloc->end_pos.lineno)) { + yylloc = 0; } #endif compile_error(p, "%s", msg); @@ -6476,13 +6476,13 @@ ruby_show_error_line(VALUE errbuf, const YYLTYPE *yylloc, int lineno, VALUE str) if (!yylloc) return; pend = RSTRING_END(str); if (pend > pbeg && pend[-1] == '\n') { - if (--pend > pbeg && pend[-1] == '\r') --pend; + if (--pend > pbeg && pend[-1] == '\r') --pend; } pt = pend; if (lineno == yylloc->end_pos.lineno && - (pend - pbeg) > yylloc->end_pos.column) { - pt = pbeg + yylloc->end_pos.column; + (pend - pbeg) > yylloc->end_pos.column) { + pt = pbeg + yylloc->end_pos.column; } ptr = ptr_end = pt; @@ -6494,72 +6494,72 @@ ruby_show_error_line(VALUE errbuf, const YYLTYPE *yylloc, int lineno, VALUE str) len = ptr_end - ptr; if (len > 4) { - if (ptr > pbeg) { - ptr = rb_enc_prev_char(pbeg, ptr, pt, rb_enc_get(str)); - if (ptr > pbeg) pre = "..."; - } - if (ptr_end < pend) { - ptr_end = rb_enc_prev_char(pt, ptr_end, pend, rb_enc_get(str)); - if (ptr_end < pend) post = "..."; - } + if (ptr > pbeg) { + ptr = rb_enc_prev_char(pbeg, ptr, pt, rb_enc_get(str)); + if (ptr > pbeg) pre = "..."; + } + if (ptr_end < pend) { + ptr_end = rb_enc_prev_char(pt, ptr_end, pend, rb_enc_get(str)); + if (ptr_end < pend) post = "..."; + } } pb = pbeg; if (lineno == yylloc->beg_pos.lineno) { - pb += yylloc->beg_pos.column; - if (pb > pt) pb = pt; + pb += yylloc->beg_pos.column; + if (pb > pt) pb = pt; } if (pb < ptr) pb = ptr; if (len <= 4 && yylloc->beg_pos.lineno == yylloc->end_pos.lineno) { - return; + return; } if (RTEST(errbuf)) { - mesg = rb_attr_get(errbuf, idMesg); - if (RSTRING_LEN(mesg) > 0 && *(RSTRING_END(mesg)-1) != '\n') - rb_str_cat_cstr(mesg, "\n"); + mesg = rb_attr_get(errbuf, idMesg); + if (RSTRING_LEN(mesg) > 0 && *(RSTRING_END(mesg)-1) != '\n') + rb_str_cat_cstr(mesg, "\n"); } else { - mesg = rb_enc_str_new(0, 0, rb_enc_get(str)); + mesg = rb_enc_str_new(0, 0, rb_enc_get(str)); } if (!errbuf && rb_stderr_tty_p()) { #define CSI_BEGIN "\033[" #define CSI_SGR "m" - rb_str_catf(mesg, - CSI_BEGIN""CSI_SGR"%s" /* pre */ - CSI_BEGIN"1"CSI_SGR"%.*s" - CSI_BEGIN"1;4"CSI_SGR"%.*s" - CSI_BEGIN";1"CSI_SGR"%.*s" - CSI_BEGIN""CSI_SGR"%s" /* post */ - "\n", - pre, - (int)(pb - ptr), ptr, - (int)(pt - pb), pb, - (int)(ptr_end - pt), pt, - post); + rb_str_catf(mesg, + CSI_BEGIN""CSI_SGR"%s" /* pre */ + CSI_BEGIN"1"CSI_SGR"%.*s" + CSI_BEGIN"1;4"CSI_SGR"%.*s" + CSI_BEGIN";1"CSI_SGR"%.*s" + CSI_BEGIN""CSI_SGR"%s" /* post */ + "\n", + pre, + (int)(pb - ptr), ptr, + (int)(pt - pb), pb, + (int)(ptr_end - pt), pt, + post); } else { - char *p2; - - len = ptr_end - ptr; - lim = pt < pend ? pt : pend; - i = (int)(lim - ptr); - buf = ALLOCA_N(char, i+2); - code = ptr; - caret = p2 = buf; - if (ptr <= pb) { - while (ptr < pb) { - *p2++ = *ptr++ == '\t' ? '\t' : ' '; - } - *p2++ = '^'; - ptr++; - } - if (lim > ptr) { - memset(p2, '~', (lim - ptr)); - p2 += (lim - ptr); - } - *p2 = '\0'; - rb_str_catf(mesg, "%s%.*s%s\n""%s%s\n", - pre, (int)len, code, post, - pre, caret); + char *p2; + + len = ptr_end - ptr; + lim = pt < pend ? pt : pend; + i = (int)(lim - ptr); + buf = ALLOCA_N(char, i+2); + code = ptr; + caret = p2 = buf; + if (ptr <= pb) { + while (ptr < pb) { + *p2++ = *ptr++ == '\t' ? '\t' : ' '; + } + *p2++ = '^'; + ptr++; + } + if (lim > ptr) { + memset(p2, '~', (lim - ptr)); + p2 += (lim - ptr); + } + *p2 = '\0'; + rb_str_catf(mesg, "%s%.*s%s\n""%s%s\n", + pre, (int)len, code, post, + pre, caret); } if (!errbuf) rb_write_error_str(mesg); } @@ -6569,16 +6569,16 @@ parser_yyerror(struct parser_params *p, const YYLTYPE *yylloc, const char *msg) { const char *pcur = 0, *ptok = 0; if (p->ruby_sourceline == yylloc->beg_pos.lineno && - p->ruby_sourceline == yylloc->end_pos.lineno) { - pcur = p->lex.pcur; - ptok = p->lex.ptok; - p->lex.ptok = p->lex.pbeg + yylloc->beg_pos.column; - p->lex.pcur = p->lex.pbeg + yylloc->end_pos.column; + p->ruby_sourceline == yylloc->end_pos.lineno) { + pcur = p->lex.pcur; + ptok = p->lex.ptok; + p->lex.ptok = p->lex.pbeg + yylloc->beg_pos.column; + p->lex.pcur = p->lex.pbeg + yylloc->end_pos.column; } parser_yyerror0(p, msg); if (pcur) { - p->lex.ptok = ptok; - p->lex.pcur = pcur; + p->lex.ptok = ptok; + p->lex.pcur = pcur; } return 0; } @@ -6602,10 +6602,10 @@ static int vtable_size(const struct vtable *tbl) { if (!DVARS_TERMINAL_P(tbl)) { - return tbl->pos; + return tbl->pos; } else { - return 0; + return 0; } } #endif @@ -6620,7 +6620,7 @@ vtable_alloc_gen(struct parser_params *p, int line, struct vtable *prev) tbl->prev = prev; #ifndef RIPPER if (p->debug) { - rb_parser_printf(p, "vtable_alloc:%d: %p\n", line, (void *)tbl); + rb_parser_printf(p, "vtable_alloc:%d: %p\n", line, (void *)tbl); } #endif return tbl; @@ -6629,39 +6629,39 @@ vtable_alloc_gen(struct parser_params *p, int line, struct vtable *prev) static void vtable_free_gen(struct parser_params *p, int line, const char *name, - struct vtable *tbl) + struct vtable *tbl) { #ifndef RIPPER if (p->debug) { - rb_parser_printf(p, "vtable_free:%d: %s(%p)\n", line, name, (void *)tbl); + rb_parser_printf(p, "vtable_free:%d: %s(%p)\n", line, name, (void *)tbl); } #endif if (!DVARS_TERMINAL_P(tbl)) { - if (tbl->tbl) { - ruby_sized_xfree(tbl->tbl, tbl->capa * sizeof(ID)); - } - ruby_sized_xfree(tbl, sizeof(*tbl)); + if (tbl->tbl) { + ruby_sized_xfree(tbl->tbl, tbl->capa * sizeof(ID)); + } + ruby_sized_xfree(tbl, sizeof(*tbl)); } } #define vtable_free(tbl) vtable_free_gen(p, __LINE__, #tbl, tbl) static void vtable_add_gen(struct parser_params *p, int line, const char *name, - struct vtable *tbl, ID id) + struct vtable *tbl, ID id) { #ifndef RIPPER if (p->debug) { - rb_parser_printf(p, "vtable_add:%d: %s(%p), %s\n", - line, name, (void *)tbl, rb_id2name(id)); + rb_parser_printf(p, "vtable_add:%d: %s(%p), %s\n", + line, name, (void *)tbl, rb_id2name(id)); } #endif if (DVARS_TERMINAL_P(tbl)) { - rb_parser_fatal(p, "vtable_add: vtable is not allocated (%p)", (void *)tbl); - return; + rb_parser_fatal(p, "vtable_add: vtable is not allocated (%p)", (void *)tbl); + return; } if (tbl->pos == tbl->capa) { - tbl->capa = tbl->capa * 2; - SIZED_REALLOC_N(tbl->tbl, ID, tbl->capa, tbl->pos); + tbl->capa = tbl->capa * 2; + SIZED_REALLOC_N(tbl->tbl, ID, tbl->capa, tbl->pos); } tbl->tbl[tbl->pos++] = id; } @@ -6670,15 +6670,15 @@ vtable_add_gen(struct parser_params *p, int line, const char *name, #ifndef RIPPER static void vtable_pop_gen(struct parser_params *p, int line, const char *name, - struct vtable *tbl, int n) + struct vtable *tbl, int n) { if (p->debug) { - rb_parser_printf(p, "vtable_pop:%d: %s(%p), %d\n", - line, name, (void *)tbl, n); + rb_parser_printf(p, "vtable_pop:%d: %s(%p), %d\n", + line, name, (void *)tbl, n); } if (tbl->pos < n) { - rb_parser_fatal(p, "vtable_pop: unreachable (%d < %d)", tbl->pos, n); - return; + rb_parser_fatal(p, "vtable_pop: unreachable (%d < %d)", tbl->pos, n); + return; } tbl->pos -= n; } @@ -6691,11 +6691,11 @@ vtable_included(const struct vtable * tbl, ID id) int i; if (!DVARS_TERMINAL_P(tbl)) { - for (i = 0; i < tbl->pos; i++) { - if (tbl->tbl[i] == id) { - return i+1; - } - } + for (i = 0; i < tbl->pos; i++) { + if (tbl->tbl[i] == id) { + return i+1; + } + } } return 0; } @@ -6711,12 +6711,12 @@ debug_lines(VALUE fname) ID script_lines; CONST_ID(script_lines, "SCRIPT_LINES__"); if (rb_const_defined_at(rb_cObject, script_lines)) { - VALUE hash = rb_const_get_at(rb_cObject, script_lines); - if (RB_TYPE_P(hash, T_HASH)) { - VALUE lines = rb_ary_new(); - rb_hash_aset(hash, fname, lines); - return lines; - } + VALUE hash = rb_const_get_at(rb_cObject, script_lines); + if (RB_TYPE_P(hash, T_HASH)) { + VALUE lines = rb_ary_new(); + rb_hash_aset(hash, fname, lines); + return lines; + } } return 0; } @@ -6736,18 +6736,18 @@ yycompile0(VALUE arg) VALUE cov = Qfalse; if (!compile_for_eval && !NIL_P(p->ruby_sourcefile_string)) { - p->debug_lines = debug_lines(p->ruby_sourcefile_string); - if (p->debug_lines && p->ruby_sourceline > 0) { - VALUE str = rb_default_rs; - n = p->ruby_sourceline; - do { - rb_ary_push(p->debug_lines, str); - } while (--n); - } + p->debug_lines = debug_lines(p->ruby_sourcefile_string); + if (p->debug_lines && p->ruby_sourceline > 0) { + VALUE str = rb_default_rs; + n = p->ruby_sourceline; + do { + rb_ary_push(p->debug_lines, str); + } while (--n); + } - if (!e_option_supplied(p)) { - cov = Qtrue; - } + if (!e_option_supplied(p)) { + cov = Qtrue; + } } if (p->keep_script_lines || ruby_vm_keep_script_lines) { @@ -6761,7 +6761,7 @@ yycompile0(VALUE arg) parser_prepare(p); #define RUBY_DTRACE_PARSE_HOOK(name) \ if (RUBY_DTRACE_PARSE_##name##_ENABLED()) { \ - RUBY_DTRACE_PARSE_##name(p->ruby_sourcefile, p->ruby_sourceline); \ + RUBY_DTRACE_PARSE_##name(p->ruby_sourcefile, p->ruby_sourceline); \ } RUBY_DTRACE_PARSE_HOOK(BEGIN); n = yyparse(p); @@ -6771,33 +6771,33 @@ yycompile0(VALUE arg) p->lex.strterm = 0; p->lex.pcur = p->lex.pbeg = p->lex.pend = 0; if (n || p->error_p) { - VALUE mesg = p->error_buffer; - if (!mesg) { - mesg = rb_class_new_instance(0, 0, rb_eSyntaxError); - } - if (!p->error_tolerant) { - rb_set_errinfo(mesg); - return FALSE; - } + VALUE mesg = p->error_buffer; + if (!mesg) { + mesg = rb_class_new_instance(0, 0, rb_eSyntaxError); + } + if (!p->error_tolerant) { + rb_set_errinfo(mesg); + return FALSE; + } } tree = p->eval_tree; if (!tree) { - tree = NEW_NIL(&NULL_LOC); + tree = NEW_NIL(&NULL_LOC); } else { - VALUE opt = p->compile_option; - VALUE tokens = p->tokens; - NODE *prelude; - NODE *body = parser_append_options(p, tree->nd_body); - if (!opt) opt = rb_obj_hide(rb_ident_hash_new()); - rb_hash_aset(opt, rb_sym_intern_ascii_cstr("coverage_enabled"), cov); - prelude = block_append(p, p->eval_tree_begin, body); - tree->nd_body = prelude; + VALUE opt = p->compile_option; + VALUE tokens = p->tokens; + NODE *prelude; + NODE *body = parser_append_options(p, tree->nd_body); + if (!opt) opt = rb_obj_hide(rb_ident_hash_new()); + rb_hash_aset(opt, rb_sym_intern_ascii_cstr("coverage_enabled"), cov); + prelude = block_append(p, p->eval_tree_begin, body); + tree->nd_body = prelude; RB_OBJ_WRITE(p->ast, &p->ast->body.compile_option, opt); - if (p->keep_tokens) { - rb_obj_freeze(tokens); - rb_ast_set_tokens(p->ast, tokens); - } + if (p->keep_tokens) { + rb_obj_freeze(tokens); + rb_ast_set_tokens(p->ast, tokens); + } } p->ast->body.root = tree; if (!p->ast->body.script_lines) p->ast->body.script_lines = INT2FIX(p->line_count); @@ -6809,12 +6809,12 @@ yycompile(VALUE vparser, struct parser_params *p, VALUE fname, int line) { rb_ast_t *ast; if (NIL_P(fname)) { - p->ruby_sourcefile_string = Qnil; - p->ruby_sourcefile = "(none)"; + p->ruby_sourcefile_string = Qnil; + p->ruby_sourcefile = "(none)"; } else { - p->ruby_sourcefile_string = rb_fstring(fname); - p->ruby_sourcefile = StringValueCStr(fname); + p->ruby_sourcefile_string = rb_fstring(fname); + p->ruby_sourcefile = StringValueCStr(fname); } p->ruby_sourceline = line - 1; @@ -6838,7 +6838,7 @@ must_be_ascii_compatible(VALUE s) { rb_encoding *enc = rb_enc_get(s); if (!rb_enc_asciicompat(enc)) { - rb_raise(rb_eArgError, "invalid source encoding"); + rb_raise(rb_eArgError, "invalid source encoding"); } return enc; } @@ -6853,9 +6853,9 @@ lex_get_str(struct parser_params *p, VALUE s) len = RSTRING_LEN(s); start = beg; if (p->lex.gets_.ptr) { - if (len == p->lex.gets_.ptr) return Qnil; - beg += p->lex.gets_.ptr; - len -= p->lex.gets_.ptr; + if (len == p->lex.gets_.ptr) return Qnil; + beg += p->lex.gets_.ptr; + len -= p->lex.gets_.ptr; } end = memchr(beg, '\n', len); if (end) len = ++end - beg; @@ -6978,11 +6978,11 @@ parser_str_new(const char *ptr, long len, rb_encoding *enc, int func, rb_encodin str = rb_enc_str_new(ptr, len, enc); if (!(func & STR_FUNC_REGEXP) && rb_enc_asciicompat(enc)) { - if (is_ascii_string(str)) { - } - else if (rb_is_usascii_enc(enc0) && enc != rb_utf8_encoding()) { - rb_enc_associate(str, rb_ascii8bit_encoding()); - } + if (is_ascii_string(str)) { + } + else if (rb_is_usascii_enc(enc0) && enc != rb_utf8_encoding()) { + rb_enc_associate(str, rb_ascii8bit_encoding()); + } } return str; @@ -7001,16 +7001,16 @@ add_delayed_token(struct parser_params *p, const char *tok, const char *end, int #endif if (tok < end) { - if (!has_delayed_token(p)) { - p->delayed.token = rb_str_buf_new(end - tok); - rb_enc_associate(p->delayed.token, p->enc); - p->delayed.beg_line = p->ruby_sourceline; - p->delayed.beg_col = rb_long2int(tok - p->lex.pbeg); - } - rb_str_buf_cat(p->delayed.token, tok, end - tok); - p->delayed.end_line = p->ruby_sourceline; - p->delayed.end_col = rb_long2int(end - p->lex.pbeg); - p->lex.ptok = end; + if (!has_delayed_token(p)) { + p->delayed.token = rb_str_buf_new(end - tok); + rb_enc_associate(p->delayed.token, p->enc); + p->delayed.beg_line = p->ruby_sourceline; + p->delayed.beg_col = rb_long2int(tok - p->lex.pbeg); + } + rb_str_buf_cat(p->delayed.token, tok, end - tok); + p->delayed.end_line = p->ruby_sourceline; + p->delayed.end_col = rb_long2int(end - p->lex.pbeg); + p->lex.ptok = end; } } @@ -7028,35 +7028,35 @@ nextline(struct parser_params *p, int set_encoding) VALUE v = p->lex.nextline; p->lex.nextline = 0; if (!v) { - if (p->eofp) - return -1; - - if (p->lex.pend > p->lex.pbeg && *(p->lex.pend-1) != '\n') { - goto end_of_input; - } - - if (!p->lex.input || NIL_P(v = lex_getline(p))) { - end_of_input: - p->eofp = 1; - lex_goto_eol(p); - return -1; - } + if (p->eofp) + return -1; + + if (p->lex.pend > p->lex.pbeg && *(p->lex.pend-1) != '\n') { + goto end_of_input; + } + + if (!p->lex.input || NIL_P(v = lex_getline(p))) { + end_of_input: + p->eofp = 1; + lex_goto_eol(p); + return -1; + } #ifndef RIPPER - if (p->debug_lines) { - if (set_encoding) rb_enc_associate(v, p->enc); - rb_ary_push(p->debug_lines, v); - } + if (p->debug_lines) { + if (set_encoding) rb_enc_associate(v, p->enc); + rb_ary_push(p->debug_lines, v); + } #endif - p->cr_seen = FALSE; + p->cr_seen = FALSE; } else if (NIL_P(v)) { - /* after here-document without terminator */ - goto end_of_input; + /* after here-document without terminator */ + goto end_of_input; } add_delayed_token(p, p->lex.ptok, p->lex.pend, __LINE__); if (p->heredoc_end > 0) { - p->ruby_sourceline = p->heredoc_end; - p->heredoc_end = 0; + p->ruby_sourceline = p->heredoc_end; + p->heredoc_end = 0; } p->ruby_sourceline++; set_lastline(p, v); @@ -7068,8 +7068,8 @@ static int parser_cr(struct parser_params *p, int c) { if (peek(p, '\n')) { - p->lex.pcur++; - c = '\n'; + p->lex.pcur++; + c = '\n'; } return c; } @@ -7080,11 +7080,11 @@ nextc0(struct parser_params *p, int set_encoding) int c; if (UNLIKELY((p->lex.pcur == p->lex.pend) || p->eofp || RTEST(p->lex.nextline))) { - if (nextline(p, set_encoding)) return -1; + if (nextline(p, set_encoding)) return -1; } c = (unsigned char)*p->lex.pcur++; if (UNLIKELY(c == '\r')) { - c = parser_cr(p, c); + c = parser_cr(p, c); } return c; @@ -7097,7 +7097,7 @@ pushback(struct parser_params *p, int c) if (c == -1) return; p->lex.pcur--; if (p->lex.pcur > p->lex.pbeg && p->lex.pcur[0] == '\n' && p->lex.pcur[-1] == '\r') { - p->lex.pcur--; + p->lex.pcur--; } } @@ -7112,11 +7112,11 @@ looking_at_eol_p(struct parser_params *p) { const char *ptr = p->lex.pcur; while (ptr < p->lex.pend) { - int c = (unsigned char)*ptr++; - int eol = (c == '\n' || c == '#'); - if (eol || !ISSPACE(c)) { - return eol; - } + int c = (unsigned char)*ptr++; + int eol = (c == '\n' || c == '#'); + if (eol || !ISSPACE(c)) { + return eol; + } } return TRUE; } @@ -7127,12 +7127,12 @@ newtok(struct parser_params *p) p->tokidx = 0; p->tokline = p->ruby_sourceline; if (!p->tokenbuf) { - p->toksiz = 60; - p->tokenbuf = ALLOC_N(char, 60); + p->toksiz = 60; + p->tokenbuf = ALLOC_N(char, 60); } if (p->toksiz > 4096) { - p->toksiz = 60; - REALLOC_N(p->tokenbuf, char, 60); + p->toksiz = 60; + REALLOC_N(p->tokenbuf, char, 60); } return p->tokenbuf; } @@ -7143,8 +7143,8 @@ tokspace(struct parser_params *p, int n) p->tokidx += n; if (p->tokidx >= p->toksiz) { - do {p->toksiz *= 2;} while (p->toksiz < p->tokidx); - REALLOC_N(p->tokenbuf, char, p->toksiz); + do {p->toksiz *= 2;} while (p->toksiz < p->tokidx); + REALLOC_N(p->tokenbuf, char, p->toksiz); } return &p->tokenbuf[p->tokidx-n]; } @@ -7154,8 +7154,8 @@ tokadd(struct parser_params *p, int c) { p->tokenbuf[p->tokidx++] = (char)c; if (p->tokidx >= p->toksiz) { - p->toksiz *= 2; - REALLOC_N(p->tokenbuf, char, p->toksiz); + p->toksiz *= 2; + REALLOC_N(p->tokenbuf, char, p->toksiz); } } @@ -7166,9 +7166,9 @@ tok_hex(struct parser_params *p, size_t *numlen) c = scan_hex(p->lex.pcur, 2, numlen); if (!*numlen) { - yyerror0("invalid hex escape"); - token_flush(p); - return 0; + yyerror0("invalid hex escape"); + token_flush(p); + return 0; } p->lex.pcur += *numlen; return c; @@ -7182,23 +7182,23 @@ escaped_control_code(int c) int c2 = 0; switch (c) { case ' ': - c2 = 's'; - break; + c2 = 's'; + break; case '\n': - c2 = 'n'; - break; + c2 = 'n'; + break; case '\t': - c2 = 't'; - break; + c2 = 't'; + break; case '\v': - c2 = 'v'; - break; + c2 = 'v'; + break; case '\r': - c2 = 'r'; - break; + c2 = 'r'; + break; case '\f': - c2 = 'f'; - break; + c2 = 'f'; + break; } return c2; } @@ -7208,7 +7208,7 @@ escaped_control_code(int c) static int tokadd_codepoint(struct parser_params *p, rb_encoding **encp, - int regexp_literal, int wide) + int regexp_literal, int wide) { size_t numlen; int codepoint = scan_hex(p->lex.pcur, wide ? p->lex.pend - p->lex.pcur : 4, &numlen); @@ -7233,21 +7233,21 @@ tokadd_codepoint(struct parser_params *p, rb_encoding **encp, } } if (regexp_literal) { - tokcopy(p, (int)numlen); + tokcopy(p, (int)numlen); } else if (codepoint >= 0x80) { - rb_encoding *utf8 = rb_utf8_encoding(); - if (*encp && utf8 != *encp) { - YYLTYPE loc = RUBY_INIT_YYLLOC(); - compile_error(p, "UTF-8 mixed within %s source", rb_enc_name(*encp)); - parser_show_error_line(p, &loc); - return wide; - } - *encp = utf8; - tokaddmbc(p, codepoint, *encp); + rb_encoding *utf8 = rb_utf8_encoding(); + if (*encp && utf8 != *encp) { + YYLTYPE loc = RUBY_INIT_YYLLOC(); + compile_error(p, "UTF-8 mixed within %s source", rb_enc_name(*encp)); + parser_show_error_line(p, &loc); + return wide; + } + *encp = utf8; + tokaddmbc(p, codepoint, *encp); } else { - tokadd(p, codepoint); + tokadd(p, codepoint); } return TRUE; } @@ -7255,7 +7255,7 @@ tokadd_codepoint(struct parser_params *p, rb_encoding **encp, /* return value is for ?\u3042 */ static void tokadd_utf8(struct parser_params *p, rb_encoding **encp, - int term, int symbol_literal, int regexp_literal) + int term, int symbol_literal, int regexp_literal) { /* * If `term` is not -1, then we allow multiple codepoints in \u{} @@ -7269,50 +7269,50 @@ tokadd_utf8(struct parser_params *p, rb_encoding **encp, if (regexp_literal) { tokadd(p, '\\'); tokadd(p, 'u'); } if (peek(p, open_brace)) { /* handle \u{...} form */ - const char *second = NULL; - int c, last = nextc(p); - if (p->lex.pcur >= p->lex.pend) goto unterminated; - while (ISSPACE(c = *p->lex.pcur) && ++p->lex.pcur < p->lex.pend); - while (c != close_brace) { - if (c == term) goto unterminated; - if (second == multiple_codepoints) - second = p->lex.pcur; - if (regexp_literal) tokadd(p, last); - if (!tokadd_codepoint(p, encp, regexp_literal, TRUE)) { - break; - } - while (ISSPACE(c = *p->lex.pcur)) { - if (++p->lex.pcur >= p->lex.pend) goto unterminated; - last = c; - } - if (term == -1 && !second) - second = multiple_codepoints; - } - - if (c != close_brace) { - unterminated: - token_flush(p); - yyerror0("unterminated Unicode escape"); - return; - } - if (second && second != multiple_codepoints) { - const char *pcur = p->lex.pcur; - p->lex.pcur = second; - dispatch_scan_event(p, tSTRING_CONTENT); - token_flush(p); - p->lex.pcur = pcur; - yyerror0(multiple_codepoints); - token_flush(p); - } - - if (regexp_literal) tokadd(p, close_brace); - nextc(p); + const char *second = NULL; + int c, last = nextc(p); + if (p->lex.pcur >= p->lex.pend) goto unterminated; + while (ISSPACE(c = *p->lex.pcur) && ++p->lex.pcur < p->lex.pend); + while (c != close_brace) { + if (c == term) goto unterminated; + if (second == multiple_codepoints) + second = p->lex.pcur; + if (regexp_literal) tokadd(p, last); + if (!tokadd_codepoint(p, encp, regexp_literal, TRUE)) { + break; + } + while (ISSPACE(c = *p->lex.pcur)) { + if (++p->lex.pcur >= p->lex.pend) goto unterminated; + last = c; + } + if (term == -1 && !second) + second = multiple_codepoints; + } + + if (c != close_brace) { + unterminated: + token_flush(p); + yyerror0("unterminated Unicode escape"); + return; + } + if (second && second != multiple_codepoints) { + const char *pcur = p->lex.pcur; + p->lex.pcur = second; + dispatch_scan_event(p, tSTRING_CONTENT); + token_flush(p); + p->lex.pcur = pcur; + yyerror0(multiple_codepoints); + token_flush(p); + } + + if (regexp_literal) tokadd(p, close_brace); + nextc(p); } else { /* handle \uxxxx form */ - if (!tokadd_codepoint(p, encp, regexp_literal, FALSE)) { - token_flush(p); - return; - } + if (!tokadd_codepoint(p, encp, regexp_literal, FALSE)) { + token_flush(p); + return; + } } } @@ -7327,124 +7327,124 @@ read_escape(struct parser_params *p, int flags, rb_encoding **encp) switch (c = nextc(p)) { case '\\': /* Backslash */ - return c; + return c; case 'n': /* newline */ - return '\n'; + return '\n'; case 't': /* horizontal tab */ - return '\t'; + return '\t'; case 'r': /* carriage-return */ - return '\r'; + return '\r'; case 'f': /* form-feed */ - return '\f'; + return '\f'; case 'v': /* vertical tab */ - return '\13'; + return '\13'; case 'a': /* alarm(bell) */ - return '\007'; + return '\007'; case 'e': /* escape */ - return 033; + return 033; case '0': case '1': case '2': case '3': /* octal constant */ case '4': case '5': case '6': case '7': - pushback(p, c); - c = scan_oct(p->lex.pcur, 3, &numlen); - p->lex.pcur += numlen; - return c; + pushback(p, c); + c = scan_oct(p->lex.pcur, 3, &numlen); + p->lex.pcur += numlen; + return c; case 'x': /* hex constant */ - c = tok_hex(p, &numlen); - if (numlen == 0) return 0; - return c; + c = tok_hex(p, &numlen); + if (numlen == 0) return 0; + return c; case 'b': /* backspace */ - return '\010'; + return '\010'; case 's': /* space */ - return ' '; + return ' '; case 'M': - if (flags & ESCAPE_META) goto eof; - if ((c = nextc(p)) != '-') { - goto eof; - } - if ((c = nextc(p)) == '\\') { - switch (peekc(p)) { - case 'u': case 'U': - nextc(p); - goto eof; - } - return read_escape(p, flags|ESCAPE_META, encp) | 0x80; - } - else if (c == -1 || !ISASCII(c)) goto eof; - else { - int c2 = escaped_control_code(c); - if (c2) { - if (ISCNTRL(c) || !(flags & ESCAPE_CONTROL)) { - WARN_SPACE_CHAR(c2, "\\M-"); - } - else { - WARN_SPACE_CHAR(c2, "\\C-\\M-"); - } - } - else if (ISCNTRL(c)) goto eof; - return ((c & 0xff) | 0x80); - } + if (flags & ESCAPE_META) goto eof; + if ((c = nextc(p)) != '-') { + goto eof; + } + if ((c = nextc(p)) == '\\') { + switch (peekc(p)) { + case 'u': case 'U': + nextc(p); + goto eof; + } + return read_escape(p, flags|ESCAPE_META, encp) | 0x80; + } + else if (c == -1 || !ISASCII(c)) goto eof; + else { + int c2 = escaped_control_code(c); + if (c2) { + if (ISCNTRL(c) || !(flags & ESCAPE_CONTROL)) { + WARN_SPACE_CHAR(c2, "\\M-"); + } + else { + WARN_SPACE_CHAR(c2, "\\C-\\M-"); + } + } + else if (ISCNTRL(c)) goto eof; + return ((c & 0xff) | 0x80); + } case 'C': - if ((c = nextc(p)) != '-') { - goto eof; - } + if ((c = nextc(p)) != '-') { + goto eof; + } case 'c': - if (flags & ESCAPE_CONTROL) goto eof; - if ((c = nextc(p))== '\\') { - switch (peekc(p)) { - case 'u': case 'U': - nextc(p); - goto eof; - } - c = read_escape(p, flags|ESCAPE_CONTROL, encp); - } - else if (c == '?') - return 0177; - else if (c == -1 || !ISASCII(c)) goto eof; - else { - int c2 = escaped_control_code(c); - if (c2) { - if (ISCNTRL(c)) { - if (flags & ESCAPE_META) { - WARN_SPACE_CHAR(c2, "\\M-"); - } - else { - WARN_SPACE_CHAR(c2, ""); - } - } - else { - if (flags & ESCAPE_META) { - WARN_SPACE_CHAR(c2, "\\M-\\C-"); - } - else { - WARN_SPACE_CHAR(c2, "\\C-"); - } - } - } - else if (ISCNTRL(c)) goto eof; - } - return c & 0x9f; + if (flags & ESCAPE_CONTROL) goto eof; + if ((c = nextc(p))== '\\') { + switch (peekc(p)) { + case 'u': case 'U': + nextc(p); + goto eof; + } + c = read_escape(p, flags|ESCAPE_CONTROL, encp); + } + else if (c == '?') + return 0177; + else if (c == -1 || !ISASCII(c)) goto eof; + else { + int c2 = escaped_control_code(c); + if (c2) { + if (ISCNTRL(c)) { + if (flags & ESCAPE_META) { + WARN_SPACE_CHAR(c2, "\\M-"); + } + else { + WARN_SPACE_CHAR(c2, ""); + } + } + else { + if (flags & ESCAPE_META) { + WARN_SPACE_CHAR(c2, "\\M-\\C-"); + } + else { + WARN_SPACE_CHAR(c2, "\\C-"); + } + } + } + else if (ISCNTRL(c)) goto eof; + } + return c & 0x9f; eof: case -1: yyerror0("Invalid escape character syntax"); - token_flush(p); - return '\0'; + token_flush(p); + return '\0'; default: - return c; + return c; } } @@ -7463,35 +7463,35 @@ tokadd_escape(struct parser_params *p, rb_encoding **encp) switch (c = nextc(p)) { case '\n': - return 0; /* just ignore */ + return 0; /* just ignore */ case '0': case '1': case '2': case '3': /* octal constant */ case '4': case '5': case '6': case '7': - { - ruby_scan_oct(--p->lex.pcur, 3, &numlen); - if (numlen == 0) goto eof; - p->lex.pcur += numlen; - tokcopy(p, (int)numlen + 1); - } - return 0; + { + ruby_scan_oct(--p->lex.pcur, 3, &numlen); + if (numlen == 0) goto eof; + p->lex.pcur += numlen; + tokcopy(p, (int)numlen + 1); + } + return 0; case 'x': /* hex constant */ - { - tok_hex(p, &numlen); - if (numlen == 0) return -1; - tokcopy(p, (int)numlen + 2); - } - return 0; + { + tok_hex(p, &numlen); + if (numlen == 0) return -1; + tokcopy(p, (int)numlen + 2); + } + return 0; eof: case -1: yyerror0("Invalid escape character syntax"); - token_flush(p); - return -1; + token_flush(p); + return -1; default: - tokadd(p, '\\'); - tokadd(p, c); + tokadd(p, '\\'); + tokadd(p, c); } return 0; } @@ -7510,26 +7510,26 @@ regx_options(struct parser_params *p) options |= RE_OPTION_ONCE; } else if (rb_char_to_option_kcode(c, &opt, &kc)) { - if (kc >= 0) { - if (kc != rb_ascii8bit_encindex()) kcode = c; - kopt = opt; - } - else { - options |= opt; - } + if (kc >= 0) { + if (kc != rb_ascii8bit_encindex()) kcode = c; + kopt = opt; + } + else { + options |= opt; + } } else { - tokadd(p, c); + tokadd(p, c); } } options |= kopt; pushback(p, c); if (toklen(p)) { - YYLTYPE loc = RUBY_INIT_YYLLOC(); - tokfix(p); - compile_error(p, "unknown regexp option%s - %*s", - toklen(p) > 1 ? "s" : "", toklen(p), tok(p)); - parser_show_error_line(p, &loc); + YYLTYPE loc = RUBY_INIT_YYLLOC(); + tokfix(p); + compile_error(p, "unknown regexp option%s - %*s", + toklen(p) > 1 ? "s" : "", toklen(p), tok(p)); + parser_show_error_line(p, &loc); } return options | RE_OPTION_ENCODING(kcode); } @@ -7552,9 +7552,9 @@ simple_re_meta(int c) case '$': case '*': case '+': case '.': case '?': case '^': case '|': case ')': case ']': case '}': case '>': - return TRUE; + return TRUE; default: - return FALSE; + return FALSE; } } @@ -7562,24 +7562,24 @@ static int parser_update_heredoc_indent(struct parser_params *p, int c) { if (p->heredoc_line_indent == -1) { - if (c == '\n') p->heredoc_line_indent = 0; + if (c == '\n') p->heredoc_line_indent = 0; } else { - if (c == ' ') { - p->heredoc_line_indent++; - return TRUE; - } - else if (c == '\t') { - int w = (p->heredoc_line_indent / TAB_WIDTH) + 1; - p->heredoc_line_indent = w * TAB_WIDTH; - return TRUE; - } - else if (c != '\n') { - if (p->heredoc_indent > p->heredoc_line_indent) { - p->heredoc_indent = p->heredoc_line_indent; - } - p->heredoc_line_indent = -1; - } + if (c == ' ') { + p->heredoc_line_indent++; + return TRUE; + } + else if (c == '\t') { + int w = (p->heredoc_line_indent / TAB_WIDTH) + 1; + p->heredoc_line_indent = w * TAB_WIDTH; + return TRUE; + } + else if (c != '\n') { + if (p->heredoc_indent > p->heredoc_line_indent) { + p->heredoc_indent = p->heredoc_line_indent; + } + p->heredoc_line_indent = -1; + } } return FALSE; } @@ -7604,8 +7604,8 @@ parser_mixed_escape(struct parser_params *p, const char *beg, rb_encoding *enc1, static int tokadd_string(struct parser_params *p, - int func, int term, int paren, long *nest, - rb_encoding **encp, rb_encoding **enc) + int func, int term, int paren, long *nest, + rb_encoding **encp, rb_encoding **enc) { int c; bool erred = false; @@ -7620,9 +7620,9 @@ tokadd_string(struct parser_params *p, (void)(erred || (parser_mixed_escape(p, beg, enc1, enc2), erred = true)) while ((c = nextc(p)) != -1) { - if (p->heredoc_indent > 0) { - parser_update_heredoc_indent(p, c); - } + if (p->heredoc_indent > 0) { + parser_update_heredoc_indent(p, c); + } #ifdef RIPPER if (top_of_line && heredoc_end == p->ruby_sourceline) { pushback(p, c); @@ -7630,60 +7630,60 @@ tokadd_string(struct parser_params *p, } #endif - if (paren && c == paren) { - ++*nest; - } - else if (c == term) { - if (!nest || !*nest) { - pushback(p, c); - break; - } - --*nest; - } - else if ((func & STR_FUNC_EXPAND) && c == '#' && p->lex.pcur < p->lex.pend) { - int c2 = *p->lex.pcur; - if (c2 == '$' || c2 == '@' || c2 == '{') { - pushback(p, c); - break; - } - } - else if (c == '\\') { - c = nextc(p); - switch (c) { - case '\n': - if (func & STR_FUNC_QWORDS) break; - if (func & STR_FUNC_EXPAND) { - if (!(func & STR_FUNC_INDENT) || (p->heredoc_indent < 0)) - continue; - if (c == term) { - c = '\\'; - goto terminate; - } - } - tokadd(p, '\\'); - break; - - case '\\': - if (func & STR_FUNC_ESCAPE) tokadd(p, c); - break; - - case 'u': - if ((func & STR_FUNC_EXPAND) == 0) { - tokadd(p, '\\'); - break; - } - tokadd_utf8(p, enc, term, - func & STR_FUNC_SYMBOL, - func & STR_FUNC_REGEXP); - continue; - - default: - if (c == -1) return -1; - if (!ISASCII(c)) { - if ((func & STR_FUNC_EXPAND) == 0) tokadd(p, '\\'); - goto non_ascii; - } - if (func & STR_FUNC_REGEXP) { + if (paren && c == paren) { + ++*nest; + } + else if (c == term) { + if (!nest || !*nest) { + pushback(p, c); + break; + } + --*nest; + } + else if ((func & STR_FUNC_EXPAND) && c == '#' && p->lex.pcur < p->lex.pend) { + int c2 = *p->lex.pcur; + if (c2 == '$' || c2 == '@' || c2 == '{') { + pushback(p, c); + break; + } + } + else if (c == '\\') { + c = nextc(p); + switch (c) { + case '\n': + if (func & STR_FUNC_QWORDS) break; + if (func & STR_FUNC_EXPAND) { + if (!(func & STR_FUNC_INDENT) || (p->heredoc_indent < 0)) + continue; + if (c == term) { + c = '\\'; + goto terminate; + } + } + tokadd(p, '\\'); + break; + + case '\\': + if (func & STR_FUNC_ESCAPE) tokadd(p, c); + break; + + case 'u': + if ((func & STR_FUNC_EXPAND) == 0) { + tokadd(p, '\\'); + break; + } + tokadd_utf8(p, enc, term, + func & STR_FUNC_SYMBOL, + func & STR_FUNC_REGEXP); + continue; + + default: + if (c == -1) return -1; + if (!ISASCII(c)) { + if ((func & STR_FUNC_EXPAND) == 0) tokadd(p, '\\'); + goto non_ascii; + } + if (func & STR_FUNC_REGEXP) { switch (c) { case 'c': case 'C': @@ -7701,61 +7701,61 @@ tokadd_string(struct parser_params *p, } } - if (c == term && !simple_re_meta(c)) { - tokadd(p, c); - continue; - } - pushback(p, c); - if ((c = tokadd_escape(p, enc)) < 0) - return -1; - if (*enc && *enc != *encp) { - mixed_escape(p->lex.ptok+2, *enc, *encp); - } - continue; - } - else if (func & STR_FUNC_EXPAND) { - pushback(p, c); - if (func & STR_FUNC_ESCAPE) tokadd(p, '\\'); - c = read_escape(p, 0, enc); - } - else if ((func & STR_FUNC_QWORDS) && ISSPACE(c)) { - /* ignore backslashed spaces in %w */ - } - else if (c != term && !(paren && c == paren)) { - tokadd(p, '\\'); - pushback(p, c); - continue; - } - } - } - else if (!parser_isascii(p)) { - non_ascii: - if (!*enc) { - *enc = *encp; - } - else if (*enc != *encp) { - mixed_error(*enc, *encp); - continue; - } - if (tokadd_mbchar(p, c) == -1) return -1; - continue; - } - else if ((func & STR_FUNC_QWORDS) && ISSPACE(c)) { - pushback(p, c); - break; - } + if (c == term && !simple_re_meta(c)) { + tokadd(p, c); + continue; + } + pushback(p, c); + if ((c = tokadd_escape(p, enc)) < 0) + return -1; + if (*enc && *enc != *encp) { + mixed_escape(p->lex.ptok+2, *enc, *encp); + } + continue; + } + else if (func & STR_FUNC_EXPAND) { + pushback(p, c); + if (func & STR_FUNC_ESCAPE) tokadd(p, '\\'); + c = read_escape(p, 0, enc); + } + else if ((func & STR_FUNC_QWORDS) && ISSPACE(c)) { + /* ignore backslashed spaces in %w */ + } + else if (c != term && !(paren && c == paren)) { + tokadd(p, '\\'); + pushback(p, c); + continue; + } + } + } + else if (!parser_isascii(p)) { + non_ascii: + if (!*enc) { + *enc = *encp; + } + else if (*enc != *encp) { + mixed_error(*enc, *encp); + continue; + } + if (tokadd_mbchar(p, c) == -1) return -1; + continue; + } + else if ((func & STR_FUNC_QWORDS) && ISSPACE(c)) { + pushback(p, c); + break; + } if (c & 0x80) { - if (!*enc) { - *enc = *encp; - } - else if (*enc != *encp) { - mixed_error(*enc, *encp); - continue; - } - } - tokadd(p, c); + if (!*enc) { + *enc = *encp; + } + else if (*enc != *encp) { + mixed_error(*enc, *encp); + continue; + } + } + tokadd(p, c); #ifdef RIPPER - top_of_line = (c == '\n'); + top_of_line = (c == '\n'); #endif } terminate: @@ -7779,19 +7779,19 @@ flush_string_content(struct parser_params *p, rb_encoding *enc) { VALUE content = yylval.val; if (!ripper_is_node_yylval(content)) - content = ripper_new_yylval(p, 0, 0, content); + content = ripper_new_yylval(p, 0, 0, content); if (has_delayed_token(p)) { - ptrdiff_t len = p->lex.pcur - p->lex.ptok; - if (len > 0) { - rb_enc_str_buf_cat(p->delayed.token, p->lex.ptok, len, enc); - } - dispatch_delayed_token(p, tSTRING_CONTENT); - p->lex.ptok = p->lex.pcur; - RNODE(content)->nd_rval = yylval.val; + ptrdiff_t len = p->lex.pcur - p->lex.ptok; + if (len > 0) { + rb_enc_str_buf_cat(p->delayed.token, p->lex.ptok, len, enc); + } + dispatch_delayed_token(p, tSTRING_CONTENT); + p->lex.ptok = p->lex.pcur; + RNODE(content)->nd_rval = yylval.val; } dispatch_scan_event(p, tSTRING_CONTENT); if (yylval.val != content) - RNODE(content)->nd_rval = yylval.val; + RNODE(content)->nd_rval = yylval.val; yylval.val = content; } #else @@ -7799,14 +7799,14 @@ static void flush_string_content(struct parser_params *p, rb_encoding *enc) { if (has_delayed_token(p)) { - ptrdiff_t len = p->lex.pcur - p->lex.ptok; - if (len > 0) { - rb_enc_str_buf_cat(p->delayed.token, p->lex.ptok, len, enc); - p->delayed.end_line = p->ruby_sourceline; - p->delayed.end_col = rb_long2int(p->lex.pcur - p->lex.pbeg); - } - dispatch_delayed_token(p, tSTRING_CONTENT); - p->lex.ptok = p->lex.pcur; + ptrdiff_t len = p->lex.pcur - p->lex.ptok; + if (len > 0) { + rb_enc_str_buf_cat(p->delayed.token, p->lex.ptok, len, enc); + p->delayed.end_line = p->ruby_sourceline; + p->delayed.end_col = rb_long2int(p->lex.pcur - p->lex.pbeg); + } + dispatch_delayed_token(p, tSTRING_CONTENT); + p->lex.ptok = p->lex.pcur; } dispatch_scan_event(p, tSTRING_CONTENT); } @@ -7818,12 +7818,12 @@ RUBY_FUNC_EXPORTED const unsigned int ruby_global_name_punct_bits[(0x7e - 0x20 + #ifndef RIPPER #define BIT(c, idx) (((c) / 32 - 1 == idx) ? (1U << ((c) % 32)) : 0) #define SPECIAL_PUNCT(idx) ( \ - BIT('~', idx) | BIT('*', idx) | BIT('$', idx) | BIT('?', idx) | \ - BIT('!', idx) | BIT('@', idx) | BIT('/', idx) | BIT('\\', idx) | \ - BIT(';', idx) | BIT(',', idx) | BIT('.', idx) | BIT('=', idx) | \ - BIT(':', idx) | BIT('<', idx) | BIT('>', idx) | BIT('\"', idx) | \ - BIT('&', idx) | BIT('`', idx) | BIT('\'', idx) | BIT('+', idx) | \ - BIT('0', idx)) + BIT('~', idx) | BIT('*', idx) | BIT('$', idx) | BIT('?', idx) | \ + BIT('!', idx) | BIT('@', idx) | BIT('/', idx) | BIT('\\', idx) | \ + BIT(';', idx) | BIT(',', idx) | BIT('.', idx) | BIT('=', idx) | \ + BIT(':', idx) | BIT('<', idx) | BIT('>', idx) | BIT('\"', idx) | \ + BIT('&', idx) | BIT('`', idx) | BIT('\'', idx) | BIT('+', idx) | \ + BIT('0', idx)) const unsigned int ruby_global_name_punct_bits[] = { SPECIAL_PUNCT(0), SPECIAL_PUNCT(1), @@ -7843,29 +7843,29 @@ parser_peek_variable_name(struct parser_params *p) c = *ptr++; switch (c) { case '$': - if ((c = *ptr) == '-') { - if (++ptr >= p->lex.pend) return 0; - c = *ptr; - } - else if (is_global_name_punct(c) || ISDIGIT(c)) { - return tSTRING_DVAR; - } - break; + if ((c = *ptr) == '-') { + if (++ptr >= p->lex.pend) return 0; + c = *ptr; + } + else if (is_global_name_punct(c) || ISDIGIT(c)) { + return tSTRING_DVAR; + } + break; case '@': - if ((c = *ptr) == '@') { - if (++ptr >= p->lex.pend) return 0; - c = *ptr; - } - break; + if ((c = *ptr) == '@') { + if (++ptr >= p->lex.pend) return 0; + c = *ptr; + } + break; case '{': - p->lex.pcur = ptr; - p->command_start = TRUE; - return tSTRING_DBEG; + p->lex.pcur = ptr; + p->command_start = TRUE; + return tSTRING_DBEG; default: - return 0; + return 0; } if (!ISASCII(c) || c == '_' || ISALPHA(c)) - return tSTRING_DVAR; + return tSTRING_DVAR; return 0; } @@ -7874,8 +7874,8 @@ parser_peek_variable_name(struct parser_params *p) #define IS_BEG() (IS_lex_state(EXPR_BEG_ANY) || IS_lex_state_all(EXPR_ARG|EXPR_LABELED)) #define IS_SPCARG(c) (IS_ARG() && space_seen && !ISSPACE(c)) #define IS_LABEL_POSSIBLE() (\ - (IS_lex_state(EXPR_LABEL|EXPR_ENDFN) && !cmd_state) || \ - IS_ARG()) + (IS_lex_state(EXPR_LABEL|EXPR_ENDFN) && !cmd_state) || \ + IS_ARG()) #define IS_LABEL_SUFFIX(n) (peek_n(p, ':',(n)) && !peek_n(p, ':', (n)+1)) #define IS_AFTER_OPERATOR() IS_lex_state(EXPR_FNAME | EXPR_DOT) @@ -7884,15 +7884,15 @@ parser_string_term(struct parser_params *p, int func) { p->lex.strterm = 0; if (func & STR_FUNC_REGEXP) { - set_yylval_num(regx_options(p)); - dispatch_scan_event(p, tREGEXP_END); - SET_LEX_STATE(EXPR_END); - return tREGEXP_END; + set_yylval_num(regx_options(p)); + dispatch_scan_event(p, tREGEXP_END); + SET_LEX_STATE(EXPR_END); + return tREGEXP_END; } if ((func & STR_FUNC_LABEL) && IS_LABEL_SUFFIX(0)) { - nextc(p); - SET_LEX_STATE(EXPR_ARG|EXPR_LABELED); - return tLABEL_END; + nextc(p); + SET_LEX_STATE(EXPR_ARG|EXPR_LABELED); + return tLABEL_END; } SET_LEX_STATE(EXPR_END); return tSTRING_END; @@ -7910,65 +7910,65 @@ parse_string(struct parser_params *p, rb_strterm_literal_t *quote) VALUE lit; if (func & STR_FUNC_TERM) { - if (func & STR_FUNC_QWORDS) nextc(p); /* delayed term */ - SET_LEX_STATE(EXPR_END); - p->lex.strterm = 0; - return func & STR_FUNC_REGEXP ? tREGEXP_END : tSTRING_END; + if (func & STR_FUNC_QWORDS) nextc(p); /* delayed term */ + SET_LEX_STATE(EXPR_END); + p->lex.strterm = 0; + return func & STR_FUNC_REGEXP ? tREGEXP_END : tSTRING_END; } c = nextc(p); if ((func & STR_FUNC_QWORDS) && ISSPACE(c)) { - do {c = nextc(p);} while (ISSPACE(c)); - space = 1; + do {c = nextc(p);} while (ISSPACE(c)); + space = 1; } if (func & STR_FUNC_LIST) { - quote->u1.func &= ~STR_FUNC_LIST; - space = 1; + quote->u1.func &= ~STR_FUNC_LIST; + space = 1; } if (c == term && !quote->u0.nest) { - if (func & STR_FUNC_QWORDS) { - quote->u1.func |= STR_FUNC_TERM; - pushback(p, c); /* dispatch the term at tSTRING_END */ - add_delayed_token(p, p->lex.ptok, p->lex.pcur, __LINE__); - return ' '; - } - return parser_string_term(p, func); + if (func & STR_FUNC_QWORDS) { + quote->u1.func |= STR_FUNC_TERM; + pushback(p, c); /* dispatch the term at tSTRING_END */ + add_delayed_token(p, p->lex.ptok, p->lex.pcur, __LINE__); + return ' '; + } + return parser_string_term(p, func); } if (space) { - pushback(p, c); - add_delayed_token(p, p->lex.ptok, p->lex.pcur, __LINE__); - return ' '; + pushback(p, c); + add_delayed_token(p, p->lex.ptok, p->lex.pcur, __LINE__); + return ' '; } newtok(p); if ((func & STR_FUNC_EXPAND) && c == '#') { - int t = parser_peek_variable_name(p); - if (t) return t; - tokadd(p, '#'); - c = nextc(p); + int t = parser_peek_variable_name(p); + if (t) return t; + tokadd(p, '#'); + c = nextc(p); } pushback(p, c); if (tokadd_string(p, func, term, paren, "e->u0.nest, - &enc, &base_enc) == -1) { - if (p->eofp) { + &enc, &base_enc) == -1) { + if (p->eofp) { #ifndef RIPPER # define unterminated_literal(mesg) yyerror0(mesg) #else # define unterminated_literal(mesg) compile_error(p, mesg) #endif - literal_flush(p, p->lex.pcur); - if (func & STR_FUNC_QWORDS) { - /* no content to add, bailing out here */ - unterminated_literal("unterminated list meets end of file"); - p->lex.strterm = 0; - return tSTRING_END; - } - if (func & STR_FUNC_REGEXP) { - unterminated_literal("unterminated regexp meets end of file"); - } - else { - unterminated_literal("unterminated string meets end of file"); - } - quote->u1.func |= STR_FUNC_TERM; - } + literal_flush(p, p->lex.pcur); + if (func & STR_FUNC_QWORDS) { + /* no content to add, bailing out here */ + unterminated_literal("unterminated list meets end of file"); + p->lex.strterm = 0; + return tSTRING_END; + } + if (func & STR_FUNC_REGEXP) { + unterminated_literal("unterminated regexp meets end of file"); + } + else { + unterminated_literal("unterminated string meets end of file"); + } + quote->u1.func |= STR_FUNC_TERM; + } } tokfix(p); @@ -7992,59 +7992,59 @@ heredoc_identifier(struct parser_params *p) int indent = 0; if (c == '-') { - c = nextc(p); - func = STR_FUNC_INDENT; - offset++; + c = nextc(p); + func = STR_FUNC_INDENT; + offset++; } else if (c == '~') { - c = nextc(p); - func = STR_FUNC_INDENT; - offset++; - indent = INT_MAX; + c = nextc(p); + func = STR_FUNC_INDENT; + offset++; + indent = INT_MAX; } switch (c) { case '\'': - func |= str_squote; goto quoted; + func |= str_squote; goto quoted; case '"': - func |= str_dquote; goto quoted; + func |= str_dquote; goto quoted; case '`': - token = tXSTRING_BEG; - func |= str_xquote; goto quoted; + token = tXSTRING_BEG; + func |= str_xquote; goto quoted; quoted: - quote++; - offset++; - term = c; - len = 0; - while ((c = nextc(p)) != term) { - if (c == -1 || c == '\r' || c == '\n') { - yyerror0("unterminated here document identifier"); - return -1; - } - } - break; + quote++; + offset++; + term = c; + len = 0; + while ((c = nextc(p)) != term) { + if (c == -1 || c == '\r' || c == '\n') { + yyerror0("unterminated here document identifier"); + return -1; + } + } + break; default: - if (!parser_is_identchar(p)) { - pushback(p, c); - if (func & STR_FUNC_INDENT) { - pushback(p, indent > 0 ? '~' : '-'); - } - return 0; - } - func |= str_dquote; - do { - int n = parser_precise_mbclen(p, p->lex.pcur-1); - if (n < 0) return 0; - p->lex.pcur += --n; - } while ((c = nextc(p)) != -1 && parser_is_identchar(p)); - pushback(p, c); - break; + if (!parser_is_identchar(p)) { + pushback(p, c); + if (func & STR_FUNC_INDENT) { + pushback(p, indent > 0 ? '~' : '-'); + } + return 0; + } + func |= str_dquote; + do { + int n = parser_precise_mbclen(p, p->lex.pcur-1); + if (n < 0) return 0; + p->lex.pcur += --n; + } while ((c = nextc(p)) != -1 && parser_is_identchar(p)); + pushback(p, c); + break; } len = p->lex.pcur - (p->lex.pbeg + offset) - quote; if ((unsigned long)len >= HERETERM_LENGTH_MAX) - yyerror0("too long here document identifier"); + yyerror0("too long here document identifier"); dispatch_scan_event(p, tHEREDOC_BEG); lex_goto_eol(p); @@ -8090,23 +8090,23 @@ dedent_string(VALUE string, int width) RSTRING_GETMEM(string, str, len); for (i = 0; i < len && col < width; i++) { - if (str[i] == ' ') { - col++; - } - else if (str[i] == '\t') { - int n = TAB_WIDTH * (col / TAB_WIDTH + 1); - if (n > width) break; - col = n; - } - else { - break; - } + if (str[i] == ' ') { + col++; + } + else if (str[i] == '\t') { + int n = TAB_WIDTH * (col / TAB_WIDTH + 1); + if (n > width) break; + col = n; + } + else { + break; + } } if (!i) return 0; rb_str_modify(string); str = RSTRING_PTR(string); if (RSTRING_LEN(string) != len) - rb_fatal("literal string changed: %+"PRIsVALUE, string); + rb_fatal("literal string changed: %+"PRIsVALUE, string); MEMMOVE(str, str + i, char, len - i); rb_str_set_len(string, len - i); return i; @@ -8128,39 +8128,39 @@ heredoc_dedent(struct parser_params *p, NODE *root) if (nd_type_p(root, NODE_LIST)) str_node = root->nd_head; while (str_node) { - VALUE lit = str_node->nd_lit; - if (str_node->flags & NODE_FL_NEWLINE) { - dedent_string(lit, indent); - } - if (!prev_lit) { - prev_lit = lit; - } - else if (!literal_concat0(p, prev_lit, lit)) { - return 0; - } - else { - NODE *end = node->nd_end; - node = prev_node->nd_next = node->nd_next; - if (!node) { - if (nd_type_p(prev_node, NODE_DSTR)) - nd_set_type(prev_node, NODE_STR); - break; - } - node->nd_end = end; - goto next_str; - } - - str_node = 0; - while ((node = (prev_node = node)->nd_next) != 0) { - next_str: - if (!nd_type_p(node, NODE_LIST)) break; - if ((str_node = node->nd_head) != 0) { - enum node_type type = nd_type(str_node); - if (type == NODE_STR || type == NODE_DSTR) break; - prev_lit = 0; - str_node = 0; - } - } + VALUE lit = str_node->nd_lit; + if (str_node->flags & NODE_FL_NEWLINE) { + dedent_string(lit, indent); + } + if (!prev_lit) { + prev_lit = lit; + } + else if (!literal_concat0(p, prev_lit, lit)) { + return 0; + } + else { + NODE *end = node->nd_end; + node = prev_node->nd_next = node->nd_next; + if (!node) { + if (nd_type_p(prev_node, NODE_DSTR)) + nd_set_type(prev_node, NODE_STR); + break; + } + node->nd_end = end; + goto next_str; + } + + str_node = 0; + while ((node = (prev_node = node)->nd_next) != 0) { + next_str: + if (!nd_type_p(node, NODE_LIST)) break; + if ((str_node = node->nd_head) != 0) { + enum node_type type = nd_type(str_node); + if (type == NODE_STR || type == NODE_DSTR) break; + prev_lit = 0; + str_node = 0; + } + } } return root; } @@ -8204,13 +8204,13 @@ whole_match_p(struct parser_params *p, const char *eos, long len, int indent) long n; if (indent) { - while (*ptr && ISSPACE(*ptr)) ptr++; + while (*ptr && ISSPACE(*ptr)) ptr++; } n = p->lex.pend - (ptr + len); if (n < 0) return FALSE; if (n > 0 && ptr[len] != '\n') { - if (ptr[len] != '\r') return FALSE; - if (n <= 1 || ptr[len+1] != '\n') return FALSE; + if (ptr[len] != '\r') return FALSE; + if (n <= 1 || ptr[len+1] != '\n') return FALSE; } return strncmp(eos, ptr, len) == 0; } @@ -8239,36 +8239,36 @@ number_literal_suffix(struct parser_params *p, int mask) const char *lastp = p->lex.pcur; while ((c = nextc(p)) != -1) { - if ((mask & NUM_SUFFIX_I) && c == 'i') { - result |= (mask & NUM_SUFFIX_I); - mask &= ~NUM_SUFFIX_I; - /* r after i, rational of complex is disallowed */ - mask &= ~NUM_SUFFIX_R; - continue; - } - if ((mask & NUM_SUFFIX_R) && c == 'r') { - result |= (mask & NUM_SUFFIX_R); - mask &= ~NUM_SUFFIX_R; - continue; - } - if (!ISASCII(c) || ISALPHA(c) || c == '_') { - p->lex.pcur = lastp; - literal_flush(p, p->lex.pcur); - return 0; - } - pushback(p, c); - break; + if ((mask & NUM_SUFFIX_I) && c == 'i') { + result |= (mask & NUM_SUFFIX_I); + mask &= ~NUM_SUFFIX_I; + /* r after i, rational of complex is disallowed */ + mask &= ~NUM_SUFFIX_R; + continue; + } + if ((mask & NUM_SUFFIX_R) && c == 'r') { + result |= (mask & NUM_SUFFIX_R); + mask &= ~NUM_SUFFIX_R; + continue; + } + if (!ISASCII(c) || ISALPHA(c) || c == '_') { + p->lex.pcur = lastp; + literal_flush(p, p->lex.pcur); + return 0; + } + pushback(p, c); + break; } return result; } static enum yytokentype set_number_literal(struct parser_params *p, VALUE v, - enum yytokentype type, int suffix) + enum yytokentype type, int suffix) { if (suffix & NUM_SUFFIX_I) { - v = rb_complex_raw(INT2FIX(0), v); - type = tIMAGINARY; + v = rb_complex_raw(INT2FIX(0), v); + type = tIMAGINARY; } set_yylval_literal(v); SET_LEX_STATE(EXPR_END); @@ -8280,8 +8280,8 @@ set_integer_literal(struct parser_params *p, VALUE v, int suffix) { enum yytokentype type = tINTEGER; if (suffix & NUM_SUFFIX_R) { - v = rb_rational_raw1(v); - type = tRATIONAL; + v = rb_rational_raw1(v); + type = tRATIONAL; } return set_number_literal(p, v, type, suffix); } @@ -8292,7 +8292,7 @@ dispatch_heredoc_end(struct parser_params *p) { VALUE str; if (has_delayed_token(p)) - dispatch_delayed_token(p, tSTRING_CONTENT); + dispatch_delayed_token(p, tSTRING_CONTENT); str = STR_NEW(p->lex.ptok, p->lex.pend - p->lex.ptok); ripper_dispatch1(p, ripper_token2eventid(tHEREDOC_END), str); RUBY_SET_YYLLOC_FROM_STRTERM_HEREDOC(*p->yylloc); @@ -8306,12 +8306,12 @@ static void parser_dispatch_heredoc_end(struct parser_params *p, int line) { if (has_delayed_token(p)) - dispatch_delayed_token(p, tSTRING_CONTENT); + dispatch_delayed_token(p, tSTRING_CONTENT); if (p->keep_tokens) { - VALUE str = STR_NEW(p->lex.ptok, p->lex.pend - p->lex.ptok); - RUBY_SET_YYLLOC_OF_HEREDOC_END(*p->yylloc); - parser_append_tokens(p, str, tHEREDOC_END, line); + VALUE str = STR_NEW(p->lex.ptok, p->lex.pend - p->lex.ptok); + RUBY_SET_YYLLOC_OF_HEREDOC_END(*p->yylloc); + parser_append_tokens(p, str, tHEREDOC_END, line); } RUBY_SET_YYLLOC_FROM_STRTERM_HEREDOC(*p->yylloc); @@ -8338,143 +8338,143 @@ here_document(struct parser_params *p, rb_strterm_heredoc_t *here) if ((c = nextc(p)) == -1) { error: #ifdef RIPPER - if (!has_delayed_token(p)) { - dispatch_scan_event(p, tSTRING_CONTENT); - } - else { - if ((len = p->lex.pcur - p->lex.ptok) > 0) { - if (!(func & STR_FUNC_REGEXP) && rb_enc_asciicompat(enc)) { - int cr = ENC_CODERANGE_UNKNOWN; - rb_str_coderange_scan_restartable(p->lex.ptok, p->lex.pcur, enc, &cr); - if (cr != ENC_CODERANGE_7BIT && - rb_is_usascii_enc(p->enc) && - enc != rb_utf8_encoding()) { - enc = rb_ascii8bit_encoding(); - } - } - rb_enc_str_buf_cat(p->delayed.token, p->lex.ptok, len, enc); - } - dispatch_delayed_token(p, tSTRING_CONTENT); - } - lex_goto_eol(p); + if (!has_delayed_token(p)) { + dispatch_scan_event(p, tSTRING_CONTENT); + } + else { + if ((len = p->lex.pcur - p->lex.ptok) > 0) { + if (!(func & STR_FUNC_REGEXP) && rb_enc_asciicompat(enc)) { + int cr = ENC_CODERANGE_UNKNOWN; + rb_str_coderange_scan_restartable(p->lex.ptok, p->lex.pcur, enc, &cr); + if (cr != ENC_CODERANGE_7BIT && + rb_is_usascii_enc(p->enc) && + enc != rb_utf8_encoding()) { + enc = rb_ascii8bit_encoding(); + } + } + rb_enc_str_buf_cat(p->delayed.token, p->lex.ptok, len, enc); + } + dispatch_delayed_token(p, tSTRING_CONTENT); + } + lex_goto_eol(p); #endif - heredoc_restore(p, &p->lex.strterm->u.heredoc); - compile_error(p, "can't find string \"%.*s\" anywhere before EOF", - (int)len, eos); - token_flush(p); - p->lex.strterm = 0; - SET_LEX_STATE(EXPR_END); - return tSTRING_END; + heredoc_restore(p, &p->lex.strterm->u.heredoc); + compile_error(p, "can't find string \"%.*s\" anywhere before EOF", + (int)len, eos); + token_flush(p); + p->lex.strterm = 0; + SET_LEX_STATE(EXPR_END); + return tSTRING_END; } bol = was_bol(p); if (!bol) { - /* not beginning of line, cannot be the terminator */ + /* not beginning of line, cannot be the terminator */ } else if (p->heredoc_line_indent == -1) { - /* `heredoc_line_indent == -1` means - * - "after an interpolation in the same line", or - * - "in a continuing line" - */ - p->heredoc_line_indent = 0; + /* `heredoc_line_indent == -1` means + * - "after an interpolation in the same line", or + * - "in a continuing line" + */ + p->heredoc_line_indent = 0; } else if (whole_match_p(p, eos, len, indent)) { - dispatch_heredoc_end(p); + dispatch_heredoc_end(p); restore: - heredoc_restore(p, &p->lex.strterm->u.heredoc); - token_flush(p); - p->lex.strterm = 0; - SET_LEX_STATE(EXPR_END); - return tSTRING_END; + heredoc_restore(p, &p->lex.strterm->u.heredoc); + token_flush(p); + p->lex.strterm = 0; + SET_LEX_STATE(EXPR_END); + return tSTRING_END; } if (!(func & STR_FUNC_EXPAND)) { - do { - ptr = RSTRING_PTR(p->lex.lastline); - ptr_end = p->lex.pend; - if (ptr_end > ptr) { - switch (ptr_end[-1]) { - case '\n': - if (--ptr_end == ptr || ptr_end[-1] != '\r') { - ptr_end++; - break; - } - case '\r': - --ptr_end; - } - } - - if (p->heredoc_indent > 0) { - long i = 0; - while (ptr + i < ptr_end && parser_update_heredoc_indent(p, ptr[i])) - i++; - p->heredoc_line_indent = 0; - } - - if (str) - rb_str_cat(str, ptr, ptr_end - ptr); - else - str = STR_NEW(ptr, ptr_end - ptr); - if (ptr_end < p->lex.pend) rb_str_cat(str, "\n", 1); - lex_goto_eol(p); - if (p->heredoc_indent > 0) { - goto flush_str; - } - if (nextc(p) == -1) { - if (str) { - str = 0; - } - goto error; - } - } while (!whole_match_p(p, eos, len, indent)); + do { + ptr = RSTRING_PTR(p->lex.lastline); + ptr_end = p->lex.pend; + if (ptr_end > ptr) { + switch (ptr_end[-1]) { + case '\n': + if (--ptr_end == ptr || ptr_end[-1] != '\r') { + ptr_end++; + break; + } + case '\r': + --ptr_end; + } + } + + if (p->heredoc_indent > 0) { + long i = 0; + while (ptr + i < ptr_end && parser_update_heredoc_indent(p, ptr[i])) + i++; + p->heredoc_line_indent = 0; + } + + if (str) + rb_str_cat(str, ptr, ptr_end - ptr); + else + str = STR_NEW(ptr, ptr_end - ptr); + if (ptr_end < p->lex.pend) rb_str_cat(str, "\n", 1); + lex_goto_eol(p); + if (p->heredoc_indent > 0) { + goto flush_str; + } + if (nextc(p) == -1) { + if (str) { + str = 0; + } + goto error; + } + } while (!whole_match_p(p, eos, len, indent)); } else { - /* int mb = ENC_CODERANGE_7BIT, *mbp = &mb;*/ - newtok(p); - if (c == '#') { - int t = parser_peek_variable_name(p); - if (p->heredoc_line_indent != -1) { - if (p->heredoc_indent > p->heredoc_line_indent) { - p->heredoc_indent = p->heredoc_line_indent; - } - p->heredoc_line_indent = -1; - } - if (t) return t; - tokadd(p, '#'); - c = nextc(p); - } - do { - pushback(p, c); - enc = p->enc; - if ((c = tokadd_string(p, func, '\n', 0, NULL, &enc, &base_enc)) == -1) { - if (p->eofp) goto error; - goto restore; - } - if (c != '\n') { - if (c == '\\') p->heredoc_line_indent = -1; - flush: - str = STR_NEW3(tok(p), toklen(p), enc, func); - flush_str: - set_yylval_str(str); + /* int mb = ENC_CODERANGE_7BIT, *mbp = &mb;*/ + newtok(p); + if (c == '#') { + int t = parser_peek_variable_name(p); + if (p->heredoc_line_indent != -1) { + if (p->heredoc_indent > p->heredoc_line_indent) { + p->heredoc_indent = p->heredoc_line_indent; + } + p->heredoc_line_indent = -1; + } + if (t) return t; + tokadd(p, '#'); + c = nextc(p); + } + do { + pushback(p, c); + enc = p->enc; + if ((c = tokadd_string(p, func, '\n', 0, NULL, &enc, &base_enc)) == -1) { + if (p->eofp) goto error; + goto restore; + } + if (c != '\n') { + if (c == '\\') p->heredoc_line_indent = -1; + flush: + str = STR_NEW3(tok(p), toklen(p), enc, func); + flush_str: + set_yylval_str(str); #ifndef RIPPER - if (bol) yylval.node->flags |= NODE_FL_NEWLINE; + if (bol) yylval.node->flags |= NODE_FL_NEWLINE; #endif - flush_string_content(p, enc); - return tSTRING_CONTENT; - } - tokadd(p, nextc(p)); - if (p->heredoc_indent > 0) { - lex_goto_eol(p); - goto flush; - } - /* if (mbp && mb == ENC_CODERANGE_UNKNOWN) mbp = 0;*/ - if ((c = nextc(p)) == -1) goto error; - } while (!whole_match_p(p, eos, len, indent)); - str = STR_NEW3(tok(p), toklen(p), enc, func); + flush_string_content(p, enc); + return tSTRING_CONTENT; + } + tokadd(p, nextc(p)); + if (p->heredoc_indent > 0) { + lex_goto_eol(p); + goto flush; + } + /* if (mbp && mb == ENC_CODERANGE_UNKNOWN) mbp = 0;*/ + if ((c = nextc(p)) == -1) goto error; + } while (!whole_match_p(p, eos, len, indent)); + str = STR_NEW3(tok(p), toklen(p), enc, func); } dispatch_heredoc_end(p); #ifdef RIPPER str = ripper_new_yylval(p, ripper_token2eventid(tSTRING_CONTENT), - yylval.val, str); + yylval.val, str); #endif heredoc_restore(p, &p->lex.strterm->u.heredoc); token_flush(p); @@ -8515,27 +8515,27 @@ formal_argument(struct parser_params *p, VALUE lhs) switch (id_type(id)) { case ID_LOCAL: - break; + break; #ifndef RIPPER # define ERR(mesg) yyerror0(mesg) #else # define ERR(mesg) (dispatch2(param_error, WARN_S(mesg), lhs), ripper_error(p)) #endif case ID_CONST: - ERR("formal argument cannot be a constant"); - return 0; + ERR("formal argument cannot be a constant"); + return 0; case ID_INSTANCE: - ERR("formal argument cannot be an instance variable"); - return 0; + ERR("formal argument cannot be an instance variable"); + return 0; case ID_GLOBAL: - ERR("formal argument cannot be a global variable"); - return 0; + ERR("formal argument cannot be a global variable"); + return 0; case ID_CLASS: - ERR("formal argument cannot be a class variable"); - return 0; + ERR("formal argument cannot be a class variable"); + return 0; default: - ERR("formal argument must be local variable"); - return 0; + ERR("formal argument must be local variable"); + return 0; #undef ERR } shadowing_lvar(p, id); @@ -8555,16 +8555,16 @@ parser_encode_length(struct parser_params *p, const char *name, long len) long nlen; if (len > 5 && name[nlen = len - 5] == '-') { - if (rb_memcicmp(name + nlen + 1, "unix", 4) == 0) - return nlen; + if (rb_memcicmp(name + nlen + 1, "unix", 4) == 0) + return nlen; } if (len > 4 && name[nlen = len - 4] == '-') { - if (rb_memcicmp(name + nlen + 1, "dos", 3) == 0) - return nlen; - if (rb_memcicmp(name + nlen + 1, "mac", 3) == 0 && - !(len == 8 && rb_memcicmp(name, "utf8-mac", len) == 0)) - /* exclude UTF8-MAC because the encoding named "UTF8" doesn't exist in Ruby */ - return nlen; + if (rb_memcicmp(name + nlen + 1, "dos", 3) == 0) + return nlen; + if (rb_memcicmp(name + nlen + 1, "mac", 3) == 0 && + !(len == 8 && rb_memcicmp(name, "utf8-mac", len) == 0)) + /* exclude UTF8-MAC because the encoding named "UTF8" doesn't exist in Ruby */ + return nlen; } return len; } @@ -8577,26 +8577,26 @@ parser_set_encode(struct parser_params *p, const char *name) VALUE excargs[3]; if (idx < 0) { - excargs[1] = rb_sprintf("unknown encoding name: %s", name); + excargs[1] = rb_sprintf("unknown encoding name: %s", name); error: - excargs[0] = rb_eArgError; - excargs[2] = rb_make_backtrace(); - rb_ary_unshift(excargs[2], rb_sprintf("%"PRIsVALUE":%d", p->ruby_sourcefile_string, p->ruby_sourceline)); - rb_exc_raise(rb_make_exception(3, excargs)); + excargs[0] = rb_eArgError; + excargs[2] = rb_make_backtrace(); + rb_ary_unshift(excargs[2], rb_sprintf("%"PRIsVALUE":%d", p->ruby_sourcefile_string, p->ruby_sourceline)); + rb_exc_raise(rb_make_exception(3, excargs)); } enc = rb_enc_from_index(idx); if (!rb_enc_asciicompat(enc)) { - excargs[1] = rb_sprintf("%s is not ASCII compatible", rb_enc_name(enc)); - goto error; + excargs[1] = rb_sprintf("%s is not ASCII compatible", rb_enc_name(enc)); + goto error; } p->enc = enc; #ifndef RIPPER if (p->debug_lines) { - VALUE lines = p->debug_lines; - long i, n = RARRAY_LEN(lines); - for (i = 0; i < n; ++i) { - rb_enc_associate_index(RARRAY_AREF(lines, i), idx); - } + VALUE lines = p->debug_lines; + long i, n = RARRAY_LEN(lines); + for (i = 0; i < n; ++i) { + rb_enc_associate_index(RARRAY_AREF(lines, i), idx); + } } #endif } @@ -8607,8 +8607,8 @@ comment_at_top(struct parser_params *p) const char *ptr = p->lex.pbeg, *ptr_end = p->lex.pcur - 1; if (p->line_count != (p->has_shebang ? 2 : 1)) return 0; while (ptr < ptr_end) { - if (!ISSPACE(*ptr)) return 0; - ptr++; + if (!ISSPACE(*ptr)) return 0; + ptr++; } return 1; } @@ -8622,7 +8622,7 @@ static void magic_comment_encoding(struct parser_params *p, const char *name, const char *val) { if (!comment_at_top(p)) { - return; + return; } parser_set_encode(p, val); } @@ -8632,15 +8632,15 @@ parser_get_bool(struct parser_params *p, const char *name, const char *val) { switch (*val) { case 't': case 'T': - if (STRCASECMP(val, "true") == 0) { - return TRUE; - } - break; + if (STRCASECMP(val, "true") == 0) { + return TRUE; + } + break; case 'f': case 'F': - if (STRCASECMP(val, "false") == 0) { - return FALSE; - } - break; + if (STRCASECMP(val, "false") == 0) { + return FALSE; + } + break; } return parser_invalid_pragma_value(p, name, val); } @@ -8665,52 +8665,52 @@ parser_set_compile_option_flag(struct parser_params *p, const char *name, const int b; if (p->token_seen) { - rb_warning1("`%s' is ignored after any tokens", WARN_S(name)); - return; + rb_warning1("`%s' is ignored after any tokens", WARN_S(name)); + return; } b = parser_get_bool(p, name, val); if (b < 0) return; if (!p->compile_option) - p->compile_option = rb_obj_hide(rb_ident_hash_new()); + p->compile_option = rb_obj_hide(rb_ident_hash_new()); rb_hash_aset(p->compile_option, ID2SYM(rb_intern(name)), - RBOOL(b)); + RBOOL(b)); } static void parser_set_shareable_constant_value(struct parser_params *p, const char *name, const char *val) { for (const char *s = p->lex.pbeg, *e = p->lex.pcur; s < e; ++s) { - if (*s == ' ' || *s == '\t') continue; - if (*s == '#') break; - rb_warning1("`%s' is ignored unless in comment-only line", WARN_S(name)); - return; + if (*s == ' ' || *s == '\t') continue; + if (*s == '#') break; + rb_warning1("`%s' is ignored unless in comment-only line", WARN_S(name)); + return; } switch (*val) { case 'n': case 'N': - if (STRCASECMP(val, "none") == 0) { - p->ctxt.shareable_constant_value = shareable_none; - return; - } - break; + if (STRCASECMP(val, "none") == 0) { + p->ctxt.shareable_constant_value = shareable_none; + return; + } + break; case 'l': case 'L': - if (STRCASECMP(val, "literal") == 0) { - p->ctxt.shareable_constant_value = shareable_literal; - return; - } - break; + if (STRCASECMP(val, "literal") == 0) { + p->ctxt.shareable_constant_value = shareable_literal; + return; + } + break; case 'e': case 'E': - if (STRCASECMP(val, "experimental_copy") == 0) { - p->ctxt.shareable_constant_value = shareable_copy; - return; - } - if (STRCASECMP(val, "experimental_everything") == 0) { - p->ctxt.shareable_constant_value = shareable_everything; - return; - } - break; + if (STRCASECMP(val, "experimental_copy") == 0) { + p->ctxt.shareable_constant_value = shareable_copy; + return; + } + if (STRCASECMP(val, "experimental_everything") == 0) { + p->ctxt.shareable_constant_value = shareable_everything; + return; + } + break; } parser_invalid_pragma_value(p, name, val); } @@ -8747,29 +8747,29 @@ magic_comment_marker(const char *str, long len) long i = 2; while (i < len) { - switch (str[i]) { - case '-': - if (str[i-1] == '*' && str[i-2] == '-') { - return str + i + 1; - } - i += 2; - break; - case '*': - if (i + 1 >= len) return 0; - if (str[i+1] != '-') { - i += 4; - } - else if (str[i-1] != '-') { - i += 2; - } - else { - return str + i + 2; - } - break; - default: - i += 3; - break; - } + switch (str[i]) { + case '-': + if (str[i-1] == '*' && str[i-2] == '-') { + return str + i + 1; + } + i += 2; + break; + case '*': + if (i + 1 >= len) return 0; + if (str[i+1] != '-') { + i += 4; + } + else if (str[i-1] != '-') { + i += 2; + } + else { + return str + i + 2; + } + break; + default: + i += 3; + break; + } } return 0; } @@ -8781,97 +8781,97 @@ parser_magic_comment(struct parser_params *p, const char *str, long len) VALUE name = 0, val = 0; const char *beg, *end, *vbeg, *vend; #define str_copy(_s, _p, _n) ((_s) \ - ? (void)(rb_str_resize((_s), (_n)), \ - MEMCPY(RSTRING_PTR(_s), (_p), char, (_n)), (_s)) \ - : (void)((_s) = STR_NEW((_p), (_n)))) + ? (void)(rb_str_resize((_s), (_n)), \ + MEMCPY(RSTRING_PTR(_s), (_p), char, (_n)), (_s)) \ + : (void)((_s) = STR_NEW((_p), (_n)))) if (len <= 7) return FALSE; if (!!(beg = magic_comment_marker(str, len))) { - if (!(end = magic_comment_marker(beg, str + len - beg))) - return FALSE; - indicator = TRUE; - str = beg; - len = end - beg - 3; + if (!(end = magic_comment_marker(beg, str + len - beg))) + return FALSE; + indicator = TRUE; + str = beg; + len = end - beg - 3; } /* %r"([^\\s\'\":;]+)\\s*:\\s*(\"(?:\\\\.|[^\"])*\"|[^\"\\s;]+)[\\s;]*" */ while (len > 0) { - const struct magic_comment *mc = magic_comments; - char *s; - int i; - long n = 0; - - for (; len > 0 && *str; str++, --len) { - switch (*str) { - case '\'': case '"': case ':': case ';': - continue; - } - if (!ISSPACE(*str)) break; - } - for (beg = str; len > 0; str++, --len) { - switch (*str) { - case '\'': case '"': case ':': case ';': - break; - default: - if (ISSPACE(*str)) break; - continue; - } - break; - } - for (end = str; len > 0 && ISSPACE(*str); str++, --len); - if (!len) break; - if (*str != ':') { - if (!indicator) return FALSE; - continue; - } - - do str++; while (--len > 0 && ISSPACE(*str)); - if (!len) break; - if (*str == '"') { - for (vbeg = ++str; --len > 0 && *str != '"'; str++) { - if (*str == '\\') { - --len; - ++str; - } - } - vend = str; - if (len) { - --len; - ++str; - } - } - else { - for (vbeg = str; len > 0 && *str != '"' && *str != ';' && !ISSPACE(*str); --len, str++); - vend = str; - } - if (indicator) { - while (len > 0 && (*str == ';' || ISSPACE(*str))) --len, str++; - } - else { - while (len > 0 && (ISSPACE(*str))) --len, str++; - if (len) return FALSE; - } - - n = end - beg; - str_copy(name, beg, n); - s = RSTRING_PTR(name); - for (i = 0; i < n; ++i) { - if (s[i] == '-') s[i] = '_'; - } - do { - if (STRNCASECMP(mc->name, s, n) == 0 && !mc->name[n]) { - n = vend - vbeg; - if (mc->length) { - n = (*mc->length)(p, vbeg, n); - } - str_copy(val, vbeg, n); - (*mc->func)(p, mc->name, RSTRING_PTR(val)); - break; - } - } while (++mc < magic_comments + numberof(magic_comments)); + const struct magic_comment *mc = magic_comments; + char *s; + int i; + long n = 0; + + for (; len > 0 && *str; str++, --len) { + switch (*str) { + case '\'': case '"': case ':': case ';': + continue; + } + if (!ISSPACE(*str)) break; + } + for (beg = str; len > 0; str++, --len) { + switch (*str) { + case '\'': case '"': case ':': case ';': + break; + default: + if (ISSPACE(*str)) break; + continue; + } + break; + } + for (end = str; len > 0 && ISSPACE(*str); str++, --len); + if (!len) break; + if (*str != ':') { + if (!indicator) return FALSE; + continue; + } + + do str++; while (--len > 0 && ISSPACE(*str)); + if (!len) break; + if (*str == '"') { + for (vbeg = ++str; --len > 0 && *str != '"'; str++) { + if (*str == '\\') { + --len; + ++str; + } + } + vend = str; + if (len) { + --len; + ++str; + } + } + else { + for (vbeg = str; len > 0 && *str != '"' && *str != ';' && !ISSPACE(*str); --len, str++); + vend = str; + } + if (indicator) { + while (len > 0 && (*str == ';' || ISSPACE(*str))) --len, str++; + } + else { + while (len > 0 && (ISSPACE(*str))) --len, str++; + if (len) return FALSE; + } + + n = end - beg; + str_copy(name, beg, n); + s = RSTRING_PTR(name); + for (i = 0; i < n; ++i) { + if (s[i] == '-') s[i] = '_'; + } + do { + if (STRNCASECMP(mc->name, s, n) == 0 && !mc->name[n]) { + n = vend - vbeg; + if (mc->length) { + n = (*mc->length)(p, vbeg, n); + } + str_copy(val, vbeg, n); + (*mc->func)(p, mc->name, RSTRING_PTR(val)); + break; + } + } while (++mc < magic_comments + numberof(magic_comments)); #ifdef RIPPER - str_copy(val, vbeg, vend - vbeg); - dispatch2(magic_comment, name, val); + str_copy(val, vbeg, vend - vbeg); + dispatch2(magic_comment, name, val); #endif } @@ -8886,34 +8886,34 @@ set_file_encoding(struct parser_params *p, const char *str, const char *send) VALUE s; for (;;) { - if (send - str <= 6) return; - switch (str[6]) { - case 'C': case 'c': str += 6; continue; - case 'O': case 'o': str += 5; continue; - case 'D': case 'd': str += 4; continue; - case 'I': case 'i': str += 3; continue; - case 'N': case 'n': str += 2; continue; - case 'G': case 'g': str += 1; continue; - case '=': case ':': - sep = 1; - str += 6; - break; - default: - str += 6; - if (ISSPACE(*str)) break; - continue; - } - if (STRNCASECMP(str-6, "coding", 6) == 0) break; - sep = 0; + if (send - str <= 6) return; + switch (str[6]) { + case 'C': case 'c': str += 6; continue; + case 'O': case 'o': str += 5; continue; + case 'D': case 'd': str += 4; continue; + case 'I': case 'i': str += 3; continue; + case 'N': case 'n': str += 2; continue; + case 'G': case 'g': str += 1; continue; + case '=': case ':': + sep = 1; + str += 6; + break; + default: + str += 6; + if (ISSPACE(*str)) break; + continue; + } + if (STRNCASECMP(str-6, "coding", 6) == 0) break; + sep = 0; } for (;;) { - do { - if (++str >= send) return; - } while (ISSPACE(*str)); - if (sep) break; - if (*str != '=' && *str != ':') return; - sep = 1; - str++; + do { + if (++str >= send) return; + } while (ISSPACE(*str)); + if (sep) break; + if (*str != '=' && *str != ':') return; + sep = 1; + str++; } beg = str; while ((*str == '-' || *str == '_' || ISALNUM(*str)) && ++str < send); @@ -8929,25 +8929,25 @@ parser_prepare(struct parser_params *p) p->token_info_enabled = !compile_for_eval && RTEST(ruby_verbose); switch (c) { case '#': - if (peek(p, '!')) p->has_shebang = 1; - break; + if (peek(p, '!')) p->has_shebang = 1; + break; case 0xef: /* UTF-8 BOM marker */ - if (p->lex.pend - p->lex.pcur >= 2 && - (unsigned char)p->lex.pcur[0] == 0xbb && - (unsigned char)p->lex.pcur[1] == 0xbf) { - p->enc = rb_utf8_encoding(); - p->lex.pcur += 2; + if (p->lex.pend - p->lex.pcur >= 2 && + (unsigned char)p->lex.pcur[0] == 0xbb && + (unsigned char)p->lex.pcur[1] == 0xbf) { + p->enc = rb_utf8_encoding(); + p->lex.pcur += 2; #ifndef RIPPER - if (p->debug_lines) { - rb_enc_associate(p->lex.lastline, p->enc); - } + if (p->debug_lines) { + rb_enc_associate(p->lex.lastline, p->enc); + } #endif - p->lex.pbeg = p->lex.pcur; - return; - } - break; + p->lex.pbeg = p->lex.pcur; + return; + } + break; case EOF: - return; + return; } pushback(p, c); p->enc = rb_enc_get(p->lex.lastline); @@ -8997,226 +8997,226 @@ parse_numeric(struct parser_params *p, int c) SET_LEX_STATE(EXPR_END); newtok(p); if (c == '-' || c == '+') { - tokadd(p, c); - c = nextc(p); + tokadd(p, c); + c = nextc(p); } if (c == '0') { - int start = toklen(p); - c = nextc(p); - if (c == 'x' || c == 'X') { - /* hexadecimal */ - c = nextc(p); - if (c != -1 && ISXDIGIT(c)) { - do { - if (c == '_') { - if (nondigit) break; - nondigit = c; - continue; - } - if (!ISXDIGIT(c)) break; - nondigit = 0; - tokadd(p, c); - } while ((c = nextc(p)) != -1); - } - pushback(p, c); - tokfix(p); - if (toklen(p) == start) { - return no_digits(p); - } - else if (nondigit) goto trailing_uc; - suffix = number_literal_suffix(p, NUM_SUFFIX_ALL); - return set_integer_literal(p, rb_cstr_to_inum(tok(p), 16, FALSE), suffix); - } - if (c == 'b' || c == 'B') { - /* binary */ - c = nextc(p); - if (c == '0' || c == '1') { - do { - if (c == '_') { - if (nondigit) break; - nondigit = c; - continue; - } - if (c != '0' && c != '1') break; - nondigit = 0; - tokadd(p, c); - } while ((c = nextc(p)) != -1); - } - pushback(p, c); - tokfix(p); - if (toklen(p) == start) { - return no_digits(p); - } - else if (nondigit) goto trailing_uc; - suffix = number_literal_suffix(p, NUM_SUFFIX_ALL); - return set_integer_literal(p, rb_cstr_to_inum(tok(p), 2, FALSE), suffix); - } - if (c == 'd' || c == 'D') { - /* decimal */ - c = nextc(p); - if (c != -1 && ISDIGIT(c)) { - do { - if (c == '_') { - if (nondigit) break; - nondigit = c; - continue; - } - if (!ISDIGIT(c)) break; - nondigit = 0; - tokadd(p, c); - } while ((c = nextc(p)) != -1); - } - pushback(p, c); - tokfix(p); - if (toklen(p) == start) { - return no_digits(p); - } - else if (nondigit) goto trailing_uc; - suffix = number_literal_suffix(p, NUM_SUFFIX_ALL); - return set_integer_literal(p, rb_cstr_to_inum(tok(p), 10, FALSE), suffix); - } - if (c == '_') { - /* 0_0 */ - goto octal_number; - } - if (c == 'o' || c == 'O') { - /* prefixed octal */ - c = nextc(p); - if (c == -1 || c == '_' || !ISDIGIT(c)) { - return no_digits(p); - } - } - if (c >= '0' && c <= '7') { - /* octal */ - octal_number: - do { - if (c == '_') { - if (nondigit) break; - nondigit = c; - continue; - } - if (c < '0' || c > '9') break; - if (c > '7') goto invalid_octal; - nondigit = 0; - tokadd(p, c); - } while ((c = nextc(p)) != -1); - if (toklen(p) > start) { - pushback(p, c); - tokfix(p); - if (nondigit) goto trailing_uc; - suffix = number_literal_suffix(p, NUM_SUFFIX_ALL); - return set_integer_literal(p, rb_cstr_to_inum(tok(p), 8, FALSE), suffix); - } - if (nondigit) { - pushback(p, c); - goto trailing_uc; - } - } - if (c > '7' && c <= '9') { - invalid_octal: - yyerror0("Invalid octal digit"); - } - else if (c == '.' || c == 'e' || c == 'E') { - tokadd(p, '0'); - } - else { - pushback(p, c); - suffix = number_literal_suffix(p, NUM_SUFFIX_ALL); - return set_integer_literal(p, INT2FIX(0), suffix); - } + int start = toklen(p); + c = nextc(p); + if (c == 'x' || c == 'X') { + /* hexadecimal */ + c = nextc(p); + if (c != -1 && ISXDIGIT(c)) { + do { + if (c == '_') { + if (nondigit) break; + nondigit = c; + continue; + } + if (!ISXDIGIT(c)) break; + nondigit = 0; + tokadd(p, c); + } while ((c = nextc(p)) != -1); + } + pushback(p, c); + tokfix(p); + if (toklen(p) == start) { + return no_digits(p); + } + else if (nondigit) goto trailing_uc; + suffix = number_literal_suffix(p, NUM_SUFFIX_ALL); + return set_integer_literal(p, rb_cstr_to_inum(tok(p), 16, FALSE), suffix); + } + if (c == 'b' || c == 'B') { + /* binary */ + c = nextc(p); + if (c == '0' || c == '1') { + do { + if (c == '_') { + if (nondigit) break; + nondigit = c; + continue; + } + if (c != '0' && c != '1') break; + nondigit = 0; + tokadd(p, c); + } while ((c = nextc(p)) != -1); + } + pushback(p, c); + tokfix(p); + if (toklen(p) == start) { + return no_digits(p); + } + else if (nondigit) goto trailing_uc; + suffix = number_literal_suffix(p, NUM_SUFFIX_ALL); + return set_integer_literal(p, rb_cstr_to_inum(tok(p), 2, FALSE), suffix); + } + if (c == 'd' || c == 'D') { + /* decimal */ + c = nextc(p); + if (c != -1 && ISDIGIT(c)) { + do { + if (c == '_') { + if (nondigit) break; + nondigit = c; + continue; + } + if (!ISDIGIT(c)) break; + nondigit = 0; + tokadd(p, c); + } while ((c = nextc(p)) != -1); + } + pushback(p, c); + tokfix(p); + if (toklen(p) == start) { + return no_digits(p); + } + else if (nondigit) goto trailing_uc; + suffix = number_literal_suffix(p, NUM_SUFFIX_ALL); + return set_integer_literal(p, rb_cstr_to_inum(tok(p), 10, FALSE), suffix); + } + if (c == '_') { + /* 0_0 */ + goto octal_number; + } + if (c == 'o' || c == 'O') { + /* prefixed octal */ + c = nextc(p); + if (c == -1 || c == '_' || !ISDIGIT(c)) { + return no_digits(p); + } + } + if (c >= '0' && c <= '7') { + /* octal */ + octal_number: + do { + if (c == '_') { + if (nondigit) break; + nondigit = c; + continue; + } + if (c < '0' || c > '9') break; + if (c > '7') goto invalid_octal; + nondigit = 0; + tokadd(p, c); + } while ((c = nextc(p)) != -1); + if (toklen(p) > start) { + pushback(p, c); + tokfix(p); + if (nondigit) goto trailing_uc; + suffix = number_literal_suffix(p, NUM_SUFFIX_ALL); + return set_integer_literal(p, rb_cstr_to_inum(tok(p), 8, FALSE), suffix); + } + if (nondigit) { + pushback(p, c); + goto trailing_uc; + } + } + if (c > '7' && c <= '9') { + invalid_octal: + yyerror0("Invalid octal digit"); + } + else if (c == '.' || c == 'e' || c == 'E') { + tokadd(p, '0'); + } + else { + pushback(p, c); + suffix = number_literal_suffix(p, NUM_SUFFIX_ALL); + return set_integer_literal(p, INT2FIX(0), suffix); + } } for (;;) { - switch (c) { - case '0': case '1': case '2': case '3': case '4': - case '5': case '6': case '7': case '8': case '9': - nondigit = 0; - tokadd(p, c); - break; - - case '.': - if (nondigit) goto trailing_uc; - if (seen_point || seen_e) { - goto decode_num; - } - else { - int c0 = nextc(p); - if (c0 == -1 || !ISDIGIT(c0)) { - pushback(p, c0); - goto decode_num; - } - c = c0; - } - seen_point = toklen(p); - tokadd(p, '.'); - tokadd(p, c); - is_float++; - nondigit = 0; - break; - - case 'e': - case 'E': - if (nondigit) { - pushback(p, c); - c = nondigit; - goto decode_num; - } - if (seen_e) { - goto decode_num; - } - nondigit = c; - c = nextc(p); - if (c != '-' && c != '+' && !ISDIGIT(c)) { - pushback(p, c); - nondigit = 0; - goto decode_num; - } - tokadd(p, nondigit); - seen_e++; - is_float++; - tokadd(p, c); - nondigit = (c == '-' || c == '+') ? c : 0; - break; - - case '_': /* `_' in number just ignored */ - if (nondigit) goto decode_num; - nondigit = c; - break; - - default: - goto decode_num; - } - c = nextc(p); + switch (c) { + case '0': case '1': case '2': case '3': case '4': + case '5': case '6': case '7': case '8': case '9': + nondigit = 0; + tokadd(p, c); + break; + + case '.': + if (nondigit) goto trailing_uc; + if (seen_point || seen_e) { + goto decode_num; + } + else { + int c0 = nextc(p); + if (c0 == -1 || !ISDIGIT(c0)) { + pushback(p, c0); + goto decode_num; + } + c = c0; + } + seen_point = toklen(p); + tokadd(p, '.'); + tokadd(p, c); + is_float++; + nondigit = 0; + break; + + case 'e': + case 'E': + if (nondigit) { + pushback(p, c); + c = nondigit; + goto decode_num; + } + if (seen_e) { + goto decode_num; + } + nondigit = c; + c = nextc(p); + if (c != '-' && c != '+' && !ISDIGIT(c)) { + pushback(p, c); + nondigit = 0; + goto decode_num; + } + tokadd(p, nondigit); + seen_e++; + is_float++; + tokadd(p, c); + nondigit = (c == '-' || c == '+') ? c : 0; + break; + + case '_': /* `_' in number just ignored */ + if (nondigit) goto decode_num; + nondigit = c; + break; + + default: + goto decode_num; + } + c = nextc(p); } decode_num: pushback(p, c); if (nondigit) { trailing_uc: - literal_flush(p, p->lex.pcur - 1); - YYLTYPE loc = RUBY_INIT_YYLLOC(); - compile_error(p, "trailing `%c' in number", nondigit); - parser_show_error_line(p, &loc); + literal_flush(p, p->lex.pcur - 1); + YYLTYPE loc = RUBY_INIT_YYLLOC(); + compile_error(p, "trailing `%c' in number", nondigit); + parser_show_error_line(p, &loc); } tokfix(p); if (is_float) { - enum yytokentype type = tFLOAT; - VALUE v; - - suffix = number_literal_suffix(p, seen_e ? NUM_SUFFIX_I : NUM_SUFFIX_ALL); - if (suffix & NUM_SUFFIX_R) { - type = tRATIONAL; - v = parse_rational(p, tok(p), toklen(p), seen_point); - } - else { - double d = strtod(tok(p), 0); - if (errno == ERANGE) { - rb_warning1("Float %s out of range", WARN_S(tok(p))); - errno = 0; - } - v = DBL2NUM(d); - } - return set_number_literal(p, v, type, suffix); + enum yytokentype type = tFLOAT; + VALUE v; + + suffix = number_literal_suffix(p, seen_e ? NUM_SUFFIX_I : NUM_SUFFIX_ALL); + if (suffix & NUM_SUFFIX_R) { + type = tRATIONAL; + v = parse_rational(p, tok(p), toklen(p), seen_point); + } + else { + double d = strtod(tok(p), 0); + if (errno == ERANGE) { + rb_warning1("Float %s out of range", WARN_S(tok(p))); + errno = 0; + } + v = DBL2NUM(d); + } + return set_number_literal(p, v, type, suffix); } suffix = number_literal_suffix(p, NUM_SUFFIX_ALL); return set_integer_literal(p, rb_cstr_to_inum(tok(p), 10, FALSE), suffix); @@ -9230,63 +9230,63 @@ parse_qmark(struct parser_params *p, int space_seen) VALUE lit; if (IS_END()) { - SET_LEX_STATE(EXPR_VALUE); - return '?'; + SET_LEX_STATE(EXPR_VALUE); + return '?'; } c = nextc(p); if (c == -1) { - compile_error(p, "incomplete character syntax"); - return 0; + compile_error(p, "incomplete character syntax"); + return 0; } if (rb_enc_isspace(c, p->enc)) { - if (!IS_ARG()) { - int c2 = escaped_control_code(c); - if (c2) { - WARN_SPACE_CHAR(c2, "?"); - } - } + if (!IS_ARG()) { + int c2 = escaped_control_code(c); + if (c2) { + WARN_SPACE_CHAR(c2, "?"); + } + } ternary: - pushback(p, c); - SET_LEX_STATE(EXPR_VALUE); - return '?'; + pushback(p, c); + SET_LEX_STATE(EXPR_VALUE); + return '?'; } newtok(p); enc = p->enc; if (!parser_isascii(p)) { - if (tokadd_mbchar(p, c) == -1) return 0; + if (tokadd_mbchar(p, c) == -1) return 0; } else if ((rb_enc_isalnum(c, p->enc) || c == '_') && - p->lex.pcur < p->lex.pend && is_identchar(p->lex.pcur, p->lex.pend, p->enc)) { - if (space_seen) { - const char *start = p->lex.pcur - 1, *ptr = start; - do { - int n = parser_precise_mbclen(p, ptr); - if (n < 0) return -1; - ptr += n; - } while (ptr < p->lex.pend && is_identchar(ptr, p->lex.pend, p->enc)); - rb_warn2("`?' just followed by `%.*s' is interpreted as" \ - " a conditional operator, put a space after `?'", - WARN_I((int)(ptr - start)), WARN_S_L(start, (ptr - start))); - } - goto ternary; + p->lex.pcur < p->lex.pend && is_identchar(p->lex.pcur, p->lex.pend, p->enc)) { + if (space_seen) { + const char *start = p->lex.pcur - 1, *ptr = start; + do { + int n = parser_precise_mbclen(p, ptr); + if (n < 0) return -1; + ptr += n; + } while (ptr < p->lex.pend && is_identchar(ptr, p->lex.pend, p->enc)); + rb_warn2("`?' just followed by `%.*s' is interpreted as" \ + " a conditional operator, put a space after `?'", + WARN_I((int)(ptr - start)), WARN_S_L(start, (ptr - start))); + } + goto ternary; } else if (c == '\\') { - if (peek(p, 'u')) { - nextc(p); - enc = rb_utf8_encoding(); - tokadd_utf8(p, &enc, -1, 0, 0); - } - else if (!lex_eol_p(p) && !(c = *p->lex.pcur, ISASCII(c))) { - nextc(p); - if (tokadd_mbchar(p, c) == -1) return 0; - } - else { - c = read_escape(p, 0, &enc); - tokadd(p, c); - } + if (peek(p, 'u')) { + nextc(p); + enc = rb_utf8_encoding(); + tokadd_utf8(p, &enc, -1, 0, 0); + } + else if (!lex_eol_p(p) && !(c = *p->lex.pcur, ISASCII(c))) { + nextc(p); + if (tokadd_mbchar(p, c) == -1) return 0; + } + else { + c = read_escape(p, 0, &enc); + tokadd(p, c); + } } else { - tokadd(p, c); + tokadd(p, c); } tokfix(p); lit = STR_NEW3(tok(p), toklen(p), enc, 0); @@ -9302,92 +9302,92 @@ parse_percent(struct parser_params *p, const int space_seen, const enum lex_stat const char *ptok = p->lex.pcur; if (IS_BEG()) { - int term; - int paren; + int term; + int paren; - c = nextc(p); + c = nextc(p); quotation: - if (c == -1) goto unterminated; - if (!ISALNUM(c)) { - term = c; - if (!ISASCII(c)) goto unknown; - c = 'Q'; - } - else { - term = nextc(p); - if (rb_enc_isalnum(term, p->enc) || !parser_isascii(p)) { - unknown: - pushback(p, term); - c = parser_precise_mbclen(p, p->lex.pcur); - if (c < 0) return 0; - p->lex.pcur += c; - yyerror0("unknown type of %string"); - return 0; - } - } - if (term == -1) { - unterminated: - compile_error(p, "unterminated quoted string meets end of file"); - return 0; - } - paren = term; - if (term == '(') term = ')'; - else if (term == '[') term = ']'; - else if (term == '{') term = '}'; - else if (term == '<') term = '>'; - else paren = 0; - - p->lex.ptok = ptok-1; - switch (c) { - case 'Q': - p->lex.strterm = NEW_STRTERM(str_dquote, term, paren); - return tSTRING_BEG; - - case 'q': - p->lex.strterm = NEW_STRTERM(str_squote, term, paren); - return tSTRING_BEG; - - case 'W': - p->lex.strterm = NEW_STRTERM(str_dword, term, paren); - return tWORDS_BEG; - - case 'w': - p->lex.strterm = NEW_STRTERM(str_sword, term, paren); - return tQWORDS_BEG; - - case 'I': - p->lex.strterm = NEW_STRTERM(str_dword, term, paren); - return tSYMBOLS_BEG; - - case 'i': - p->lex.strterm = NEW_STRTERM(str_sword, term, paren); - return tQSYMBOLS_BEG; - - case 'x': - p->lex.strterm = NEW_STRTERM(str_xquote, term, paren); - return tXSTRING_BEG; - - case 'r': - p->lex.strterm = NEW_STRTERM(str_regexp, term, paren); - return tREGEXP_BEG; - - case 's': - p->lex.strterm = NEW_STRTERM(str_ssym, term, paren); - SET_LEX_STATE(EXPR_FNAME|EXPR_FITEM); - return tSYMBEG; - - default: - yyerror0("unknown type of %string"); - return 0; - } + if (c == -1) goto unterminated; + if (!ISALNUM(c)) { + term = c; + if (!ISASCII(c)) goto unknown; + c = 'Q'; + } + else { + term = nextc(p); + if (rb_enc_isalnum(term, p->enc) || !parser_isascii(p)) { + unknown: + pushback(p, term); + c = parser_precise_mbclen(p, p->lex.pcur); + if (c < 0) return 0; + p->lex.pcur += c; + yyerror0("unknown type of %string"); + return 0; + } + } + if (term == -1) { + unterminated: + compile_error(p, "unterminated quoted string meets end of file"); + return 0; + } + paren = term; + if (term == '(') term = ')'; + else if (term == '[') term = ']'; + else if (term == '{') term = '}'; + else if (term == '<') term = '>'; + else paren = 0; + + p->lex.ptok = ptok-1; + switch (c) { + case 'Q': + p->lex.strterm = NEW_STRTERM(str_dquote, term, paren); + return tSTRING_BEG; + + case 'q': + p->lex.strterm = NEW_STRTERM(str_squote, term, paren); + return tSTRING_BEG; + + case 'W': + p->lex.strterm = NEW_STRTERM(str_dword, term, paren); + return tWORDS_BEG; + + case 'w': + p->lex.strterm = NEW_STRTERM(str_sword, term, paren); + return tQWORDS_BEG; + + case 'I': + p->lex.strterm = NEW_STRTERM(str_dword, term, paren); + return tSYMBOLS_BEG; + + case 'i': + p->lex.strterm = NEW_STRTERM(str_sword, term, paren); + return tQSYMBOLS_BEG; + + case 'x': + p->lex.strterm = NEW_STRTERM(str_xquote, term, paren); + return tXSTRING_BEG; + + case 'r': + p->lex.strterm = NEW_STRTERM(str_regexp, term, paren); + return tREGEXP_BEG; + + case 's': + p->lex.strterm = NEW_STRTERM(str_ssym, term, paren); + SET_LEX_STATE(EXPR_FNAME|EXPR_FITEM); + return tSYMBEG; + + default: + yyerror0("unknown type of %string"); + return 0; + } } if ((c = nextc(p)) == '=') { - set_yylval_id('%'); - SET_LEX_STATE(EXPR_BEG); - return tOP_ASGN; + set_yylval_id('%'); + SET_LEX_STATE(EXPR_BEG); + return tOP_ASGN; } if (IS_SPCARG(c) || (IS_lex_state(EXPR_FITEM) && c == 's')) { - goto quotation; + goto quotation; } SET_LEX_STATE(IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG); pushback(p, c); @@ -9398,8 +9398,8 @@ static int tokadd_ident(struct parser_params *p, int c) { do { - if (tokadd_mbchar(p, c) == -1) return -1; - c = nextc(p); + if (tokadd_mbchar(p, c) == -1) return -1; + c = nextc(p); } while (parser_is_identchar(p)); pushback(p, c); return 0; @@ -9422,17 +9422,17 @@ parse_numvar(struct parser_params *p) int overflow; unsigned long n = ruby_scan_digits(tok(p)+1, toklen(p)-1, 10, &len, &overflow); const unsigned long nth_ref_max = - ((FIXNUM_MAX < INT_MAX) ? FIXNUM_MAX : INT_MAX) >> 1; + ((FIXNUM_MAX < INT_MAX) ? FIXNUM_MAX : INT_MAX) >> 1; /* NTH_REF is left-shifted to be ORed with back-ref flag and * turned into a Fixnum, in compile.c */ if (overflow || n > nth_ref_max) { - /* compile_error()? */ - rb_warn1("`%s' is too big for a number variable, always nil", WARN_S(tok(p))); - return 0; /* $0 is $PROGRAM_NAME, not NTH_REF */ + /* compile_error()? */ + rb_warn1("`%s' is too big for a number variable, always nil", WARN_S(tok(p))); + return 0; /* $0 is $PROGRAM_NAME, not NTH_REF */ } else { - return (int)n; + return (int)n; } } @@ -9448,15 +9448,15 @@ parse_gvar(struct parser_params *p, const enum lex_state_e last_state) c = nextc(p); switch (c) { case '_': /* $_: last read line string */ - c = nextc(p); - if (parser_is_identchar(p)) { - tokadd(p, '$'); - tokadd(p, '_'); - break; - } - pushback(p, c); - c = '_'; - /* fall through */ + c = nextc(p); + if (parser_is_identchar(p)) { + tokadd(p, '$'); + tokadd(p, '_'); + break; + } + pushback(p, c); + c = '_'; + /* fall through */ case '~': /* $~: match-data */ case '*': /* $*: argv */ case '$': /* $$: pid */ @@ -9473,70 +9473,70 @@ parse_gvar(struct parser_params *p, const enum lex_state_e last_state) case '<': /* $<: reading filename */ case '>': /* $>: default output handle */ case '\"': /* $": already loaded files */ - tokadd(p, '$'); - tokadd(p, c); - goto gvar; + tokadd(p, '$'); + tokadd(p, c); + goto gvar; case '-': - tokadd(p, '$'); - tokadd(p, c); - c = nextc(p); - if (parser_is_identchar(p)) { - if (tokadd_mbchar(p, c) == -1) return 0; - } - else { - pushback(p, c); - pushback(p, '-'); - return '$'; - } + tokadd(p, '$'); + tokadd(p, c); + c = nextc(p); + if (parser_is_identchar(p)) { + if (tokadd_mbchar(p, c) == -1) return 0; + } + else { + pushback(p, c); + pushback(p, '-'); + return '$'; + } gvar: - set_yylval_name(TOK_INTERN()); - return tGVAR; + set_yylval_name(TOK_INTERN()); + return tGVAR; case '&': /* $&: last match */ case '`': /* $`: string before last match */ case '\'': /* $': string after last match */ case '+': /* $+: string matches last paren. */ - if (IS_lex_state_for(last_state, EXPR_FNAME)) { - tokadd(p, '$'); - tokadd(p, c); - goto gvar; - } - set_yylval_node(NEW_BACK_REF(c, &_cur_loc)); - return tBACK_REF; + if (IS_lex_state_for(last_state, EXPR_FNAME)) { + tokadd(p, '$'); + tokadd(p, c); + goto gvar; + } + set_yylval_node(NEW_BACK_REF(c, &_cur_loc)); + return tBACK_REF; case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': - tokadd(p, '$'); - do { - tokadd(p, c); - c = nextc(p); - } while (c != -1 && ISDIGIT(c)); - pushback(p, c); - if (IS_lex_state_for(last_state, EXPR_FNAME)) goto gvar; - tokfix(p); - c = parse_numvar(p); - set_yylval_node(NEW_NTH_REF(c, &_cur_loc)); - return tNTH_REF; + tokadd(p, '$'); + do { + tokadd(p, c); + c = nextc(p); + } while (c != -1 && ISDIGIT(c)); + pushback(p, c); + if (IS_lex_state_for(last_state, EXPR_FNAME)) goto gvar; + tokfix(p); + c = parse_numvar(p); + set_yylval_node(NEW_NTH_REF(c, &_cur_loc)); + return tNTH_REF; default: - if (!parser_is_identchar(p)) { - YYLTYPE loc = RUBY_INIT_YYLLOC(); - if (c == -1 || ISSPACE(c)) { - compile_error(p, "`$' without identifiers is not allowed as a global variable name"); - } - else { - pushback(p, c); - compile_error(p, "`$%c' is not allowed as a global variable name", c); - } - parser_show_error_line(p, &loc); - set_yylval_noname(); - return tGVAR; - } - /* fall through */ + if (!parser_is_identchar(p)) { + YYLTYPE loc = RUBY_INIT_YYLLOC(); + if (c == -1 || ISSPACE(c)) { + compile_error(p, "`$' without identifiers is not allowed as a global variable name"); + } + else { + pushback(p, c); + compile_error(p, "`$%c' is not allowed as a global variable name", c); + } + parser_show_error_line(p, &loc); + set_yylval_noname(); + return tGVAR; + } + /* fall through */ case '0': - tokadd(p, '$'); + tokadd(p, '$'); } if (tokadd_ident(p, c)) return 0; @@ -9552,18 +9552,18 @@ parser_numbered_param(struct parser_params *p, int n) if (n < 0) return false; if (DVARS_TERMINAL_P(p->lvtbl->args) || DVARS_TERMINAL_P(p->lvtbl->args->prev)) { - return false; + return false; } if (p->max_numparam == ORDINAL_PARAM) { - compile_error(p, "ordinary parameter is defined"); - return false; + compile_error(p, "ordinary parameter is defined"); + return false; } struct vtable *args = p->lvtbl->args; if (p->max_numparam < n) { - p->max_numparam = n; + p->max_numparam = n; } while (n > args->pos) { - vtable_add(args, NUMPARAM_IDX_TO_ID(args->pos+1)); + vtable_add(args, NUMPARAM_IDX_TO_ID(args->pos+1)); } return true; } @@ -9581,38 +9581,38 @@ parse_atmark(struct parser_params *p, const enum lex_state_e last_state) newtok(p); tokadd(p, '@'); if (c == '@') { - result = tCVAR; - tokadd(p, '@'); - c = nextc(p); + result = tCVAR; + tokadd(p, '@'); + c = nextc(p); } SET_LEX_STATE(IS_lex_state_for(last_state, EXPR_FNAME) ? EXPR_ENDFN : EXPR_END); if (c == -1 || !parser_is_identchar(p)) { - pushback(p, c); - RUBY_SET_YYLLOC(loc); - if (result == tIVAR) { - compile_error(p, "`@' without identifiers is not allowed as an instance variable name"); - } - else { - compile_error(p, "`@@' without identifiers is not allowed as a class variable name"); - } - parser_show_error_line(p, &loc); - set_yylval_noname(); - SET_LEX_STATE(EXPR_END); - return result; + pushback(p, c); + RUBY_SET_YYLLOC(loc); + if (result == tIVAR) { + compile_error(p, "`@' without identifiers is not allowed as an instance variable name"); + } + else { + compile_error(p, "`@@' without identifiers is not allowed as a class variable name"); + } + parser_show_error_line(p, &loc); + set_yylval_noname(); + SET_LEX_STATE(EXPR_END); + return result; } else if (ISDIGIT(c)) { - pushback(p, c); - RUBY_SET_YYLLOC(loc); - if (result == tIVAR) { - compile_error(p, "`@%c' is not allowed as an instance variable name", c); - } - else { - compile_error(p, "`@@%c' is not allowed as a class variable name", c); - } - parser_show_error_line(p, &loc); - set_yylval_noname(); - SET_LEX_STATE(EXPR_END); - return result; + pushback(p, c); + RUBY_SET_YYLLOC(loc); + if (result == tIVAR) { + compile_error(p, "`@%c' is not allowed as an instance variable name", c); + } + else { + compile_error(p, "`@@%c' is not allowed as a class variable name", c); + } + parser_show_error_line(p, &loc); + set_yylval_noname(); + SET_LEX_STATE(EXPR_END); + return result; } if (tokadd_ident(p, c)) return 0; @@ -9630,117 +9630,117 @@ parse_ident(struct parser_params *p, int c, int cmd_state) int enforce_keyword_end = 0; do { - if (!ISASCII(c)) mb = ENC_CODERANGE_UNKNOWN; - if (tokadd_mbchar(p, c) == -1) return 0; - c = nextc(p); + if (!ISASCII(c)) mb = ENC_CODERANGE_UNKNOWN; + if (tokadd_mbchar(p, c) == -1) return 0; + c = nextc(p); } while (parser_is_identchar(p)); if ((c == '!' || c == '?') && !peek(p, '=')) { - result = tFID; - tokadd(p, c); + result = tFID; + tokadd(p, c); } else if (c == '=' && IS_lex_state(EXPR_FNAME) && - (!peek(p, '~') && !peek(p, '>') && (!peek(p, '=') || (peek_n(p, '>', 1))))) { - result = tIDENTIFIER; - tokadd(p, c); + (!peek(p, '~') && !peek(p, '>') && (!peek(p, '=') || (peek_n(p, '>', 1))))) { + result = tIDENTIFIER; + tokadd(p, c); } else { - result = tCONSTANT; /* assume provisionally */ - pushback(p, c); + result = tCONSTANT; /* assume provisionally */ + pushback(p, c); } tokfix(p); if (IS_LABEL_POSSIBLE()) { - if (IS_LABEL_SUFFIX(0)) { - SET_LEX_STATE(EXPR_ARG|EXPR_LABELED); - nextc(p); - set_yylval_name(TOK_INTERN()); - return tLABEL; - } + if (IS_LABEL_SUFFIX(0)) { + SET_LEX_STATE(EXPR_ARG|EXPR_LABELED); + nextc(p); + set_yylval_name(TOK_INTERN()); + return tLABEL; + } } #ifndef RIPPER if (!NIL_P(peek_end_expect_token_locations(p))) { - VALUE end_loc; - int lineno, column; - int beg_pos = (int)(p->lex.ptok - p->lex.pbeg); + VALUE end_loc; + int lineno, column; + int beg_pos = (int)(p->lex.ptok - p->lex.pbeg); - end_loc = peek_end_expect_token_locations(p); - lineno = NUM2INT(rb_ary_entry(end_loc, 0)); - column = NUM2INT(rb_ary_entry(end_loc, 1)); + end_loc = peek_end_expect_token_locations(p); + lineno = NUM2INT(rb_ary_entry(end_loc, 0)); + column = NUM2INT(rb_ary_entry(end_loc, 1)); - if (p->debug) { - rb_parser_printf(p, "enforce_keyword_end check. current: (%d, %d), peek: (%d, %d)\n", - p->ruby_sourceline, beg_pos, lineno, column); - } + if (p->debug) { + rb_parser_printf(p, "enforce_keyword_end check. current: (%d, %d), peek: (%d, %d)\n", + p->ruby_sourceline, beg_pos, lineno, column); + } - if ((p->ruby_sourceline > lineno) && (beg_pos <= column)) { - const struct kwtable *kw; + if ((p->ruby_sourceline > lineno) && (beg_pos <= column)) { + const struct kwtable *kw; - if ((IS_lex_state(EXPR_DOT)) && (kw = rb_reserved_word(tok(p), toklen(p))) && (kw && kw->id[0] == keyword_end)) { - if (p->debug) rb_parser_printf(p, "enforce_keyword_end is enabled\n"); - enforce_keyword_end = 1; - } - } + if ((IS_lex_state(EXPR_DOT)) && (kw = rb_reserved_word(tok(p), toklen(p))) && (kw && kw->id[0] == keyword_end)) { + if (p->debug) rb_parser_printf(p, "enforce_keyword_end is enabled\n"); + enforce_keyword_end = 1; + } + } } #endif if (mb == ENC_CODERANGE_7BIT && (!IS_lex_state(EXPR_DOT) || enforce_keyword_end)) { - const struct kwtable *kw; - - /* See if it is a reserved word. */ - kw = rb_reserved_word(tok(p), toklen(p)); - if (kw) { - enum lex_state_e state = p->lex.state; - if (IS_lex_state_for(state, EXPR_FNAME)) { - SET_LEX_STATE(EXPR_ENDFN); - set_yylval_name(rb_intern2(tok(p), toklen(p))); - return kw->id[0]; - } - SET_LEX_STATE(kw->state); - if (IS_lex_state(EXPR_BEG)) { - p->command_start = TRUE; - } - if (kw->id[0] == keyword_do) { - if (lambda_beginning_p()) { - p->lex.lpar_beg = -1; /* make lambda_beginning_p() == FALSE in the body of "-> do ... end" */ - return keyword_do_LAMBDA; - } - if (COND_P()) return keyword_do_cond; - if (CMDARG_P() && !IS_lex_state_for(state, EXPR_CMDARG)) - return keyword_do_block; - return keyword_do; - } - if (IS_lex_state_for(state, (EXPR_BEG | EXPR_LABELED | EXPR_CLASS))) - return kw->id[0]; - else { - if (kw->id[0] != kw->id[1]) - SET_LEX_STATE(EXPR_BEG | EXPR_LABEL); - return kw->id[1]; - } - } + const struct kwtable *kw; + + /* See if it is a reserved word. */ + kw = rb_reserved_word(tok(p), toklen(p)); + if (kw) { + enum lex_state_e state = p->lex.state; + if (IS_lex_state_for(state, EXPR_FNAME)) { + SET_LEX_STATE(EXPR_ENDFN); + set_yylval_name(rb_intern2(tok(p), toklen(p))); + return kw->id[0]; + } + SET_LEX_STATE(kw->state); + if (IS_lex_state(EXPR_BEG)) { + p->command_start = TRUE; + } + if (kw->id[0] == keyword_do) { + if (lambda_beginning_p()) { + p->lex.lpar_beg = -1; /* make lambda_beginning_p() == FALSE in the body of "-> do ... end" */ + return keyword_do_LAMBDA; + } + if (COND_P()) return keyword_do_cond; + if (CMDARG_P() && !IS_lex_state_for(state, EXPR_CMDARG)) + return keyword_do_block; + return keyword_do; + } + if (IS_lex_state_for(state, (EXPR_BEG | EXPR_LABELED | EXPR_CLASS))) + return kw->id[0]; + else { + if (kw->id[0] != kw->id[1]) + SET_LEX_STATE(EXPR_BEG | EXPR_LABEL); + return kw->id[1]; + } + } } if (IS_lex_state(EXPR_BEG_ANY | EXPR_ARG_ANY | EXPR_DOT)) { - if (cmd_state) { - SET_LEX_STATE(EXPR_CMDARG); - } - else { - SET_LEX_STATE(EXPR_ARG); - } + if (cmd_state) { + SET_LEX_STATE(EXPR_CMDARG); + } + else { + SET_LEX_STATE(EXPR_ARG); + } } else if (p->lex.state == EXPR_FNAME) { - SET_LEX_STATE(EXPR_ENDFN); + SET_LEX_STATE(EXPR_ENDFN); } else { - SET_LEX_STATE(EXPR_END); + SET_LEX_STATE(EXPR_END); } ident = tokenize_ident(p); if (result == tCONSTANT && is_local_id(ident)) result = tIDENTIFIER; if (!IS_lex_state_for(last_state, EXPR_DOT|EXPR_FNAME) && - (result == tIDENTIFIER) && /* not EXPR_FNAME, not attrasgn */ - lvar_defined(p, ident)) { - SET_LEX_STATE(EXPR_END|EXPR_LABEL); + (result == tIDENTIFIER) && /* not EXPR_FNAME, not attrasgn */ + lvar_defined(p, ident)) { + SET_LEX_STATE(EXPR_END|EXPR_LABEL); } return result; } @@ -9749,9 +9749,9 @@ static void warn_cr(struct parser_params *p) { if (!p->cr_seen) { - p->cr_seen = TRUE; - /* carried over with p->lex.nextline for nextc() */ - rb_warn0("encountered \\r in middle of line, treated as a mere space"); + p->cr_seen = TRUE; + /* carried over with p->lex.nextline for nextc() */ + rb_warn0("encountered \\r in middle of line, treated as a mere space"); } } @@ -9767,14 +9767,14 @@ parser_yylex(struct parser_params *p) int token_seen = p->token_seen; if (p->lex.strterm) { - if (p->lex.strterm->flags & STRTERM_HEREDOC) { - token_flush(p); - return here_document(p, &p->lex.strterm->u.heredoc); - } - else { - token_flush(p); - return parse_string(p, &p->lex.strterm->u.literal); - } + if (p->lex.strterm->flags & STRTERM_HEREDOC) { + token_flush(p); + return here_document(p, &p->lex.strterm->u.heredoc); + } + else { + token_flush(p); + return parse_string(p, &p->lex.strterm->u.literal); + } } cmd_state = p->command_start; p->command_start = FALSE; @@ -9789,687 +9789,687 @@ parser_yylex(struct parser_params *p) case '\004': /* ^D */ case '\032': /* ^Z */ case -1: /* end of script. */ - p->eofp = 1; + p->eofp = 1; #ifndef RIPPER - if (!NIL_P(p->end_expect_token_locations) && RARRAY_LEN(p->end_expect_token_locations) > 0) { - pop_end_expect_token_locations(p); - RUBY_SET_YYLLOC_OF_DUMMY_END(*p->yylloc); - return tDUMNY_END; - } + if (!NIL_P(p->end_expect_token_locations) && RARRAY_LEN(p->end_expect_token_locations) > 0) { + pop_end_expect_token_locations(p); + RUBY_SET_YYLLOC_OF_DUMMY_END(*p->yylloc); + return tDUMNY_END; + } #endif - /* Set location for end-of-input because dispatch_scan_event is not called. */ - RUBY_SET_YYLLOC(*p->yylloc); - return END_OF_INPUT; + /* Set location for end-of-input because dispatch_scan_event is not called. */ + RUBY_SET_YYLLOC(*p->yylloc); + return END_OF_INPUT; - /* white spaces */ + /* white spaces */ case '\r': - warn_cr(p); - /* fall through */ + warn_cr(p); + /* fall through */ case ' ': case '\t': case '\f': case '\13': /* '\v' */ - space_seen = 1; - while ((c = nextc(p))) { - switch (c) { - case '\r': - warn_cr(p); - /* fall through */ - case ' ': case '\t': case '\f': - case '\13': /* '\v' */ - break; - default: - goto outofloop; - } - } + space_seen = 1; + while ((c = nextc(p))) { + switch (c) { + case '\r': + warn_cr(p); + /* fall through */ + case ' ': case '\t': case '\f': + case '\13': /* '\v' */ + break; + default: + goto outofloop; + } + } outofloop: - pushback(p, c); - dispatch_scan_event(p, tSP); + pushback(p, c); + dispatch_scan_event(p, tSP); #ifndef RIPPER - token_flush(p); + token_flush(p); #endif - goto retry; + goto retry; case '#': /* it's a comment */ - p->token_seen = token_seen; - /* no magic_comment in shebang line */ - if (!parser_magic_comment(p, p->lex.pcur, p->lex.pend - p->lex.pcur)) { - if (comment_at_top(p)) { - set_file_encoding(p, p->lex.pcur, p->lex.pend); - } - } - lex_goto_eol(p); + p->token_seen = token_seen; + /* no magic_comment in shebang line */ + if (!parser_magic_comment(p, p->lex.pcur, p->lex.pend - p->lex.pcur)) { + if (comment_at_top(p)) { + set_file_encoding(p, p->lex.pcur, p->lex.pend); + } + } + lex_goto_eol(p); dispatch_scan_event(p, tCOMMENT); fallthru = TRUE; - /* fall through */ + /* fall through */ case '\n': - p->token_seen = token_seen; - VALUE prevline = p->lex.lastline; - c = (IS_lex_state(EXPR_BEG|EXPR_CLASS|EXPR_FNAME|EXPR_DOT) && - !IS_lex_state(EXPR_LABELED)); - if (c || IS_lex_state_all(EXPR_ARG|EXPR_LABELED)) { + p->token_seen = token_seen; + VALUE prevline = p->lex.lastline; + c = (IS_lex_state(EXPR_BEG|EXPR_CLASS|EXPR_FNAME|EXPR_DOT) && + !IS_lex_state(EXPR_LABELED)); + if (c || IS_lex_state_all(EXPR_ARG|EXPR_LABELED)) { if (!fallthru) { dispatch_scan_event(p, tIGNORED_NL); } fallthru = FALSE; - if (!c && p->ctxt.in_kwarg) { - goto normal_newline; - } - goto retry; - } - while (1) { - switch (c = nextc(p)) { - case ' ': case '\t': case '\f': case '\r': - case '\13': /* '\v' */ - space_seen = 1; - break; - case '#': - pushback(p, c); - if (space_seen) { - dispatch_scan_event(p, tSP); - token_flush(p); - } - goto retry; - case '&': - case '.': { - dispatch_delayed_token(p, tIGNORED_NL); - if (peek(p, '.') == (c == '&')) { - pushback(p, c); - dispatch_scan_event(p, tSP); - goto retry; - } - } - default: - p->ruby_sourceline--; - p->lex.nextline = p->lex.lastline; - set_lastline(p, prevline); - case -1: /* EOF no decrement*/ - lex_goto_eol(p); - if (c != -1) { - token_flush(p); - RUBY_SET_YYLLOC(*p->yylloc); - } - goto normal_newline; - } - } + if (!c && p->ctxt.in_kwarg) { + goto normal_newline; + } + goto retry; + } + while (1) { + switch (c = nextc(p)) { + case ' ': case '\t': case '\f': case '\r': + case '\13': /* '\v' */ + space_seen = 1; + break; + case '#': + pushback(p, c); + if (space_seen) { + dispatch_scan_event(p, tSP); + token_flush(p); + } + goto retry; + case '&': + case '.': { + dispatch_delayed_token(p, tIGNORED_NL); + if (peek(p, '.') == (c == '&')) { + pushback(p, c); + dispatch_scan_event(p, tSP); + goto retry; + } + } + default: + p->ruby_sourceline--; + p->lex.nextline = p->lex.lastline; + set_lastline(p, prevline); + case -1: /* EOF no decrement*/ + lex_goto_eol(p); + if (c != -1) { + token_flush(p); + RUBY_SET_YYLLOC(*p->yylloc); + } + goto normal_newline; + } + } normal_newline: - p->command_start = TRUE; - SET_LEX_STATE(EXPR_BEG); - return '\n'; + p->command_start = TRUE; + SET_LEX_STATE(EXPR_BEG); + return '\n'; case '*': - if ((c = nextc(p)) == '*') { - if ((c = nextc(p)) == '=') { - set_yylval_id(idPow); - SET_LEX_STATE(EXPR_BEG); - return tOP_ASGN; - } - pushback(p, c); - if (IS_SPCARG(c)) { - rb_warning0("`**' interpreted as argument prefix"); - c = tDSTAR; - } - else if (IS_BEG()) { - c = tDSTAR; - } - else { - c = warn_balanced((enum ruby_method_ids)tPOW, "**", "argument prefix"); - } - } - else { - if (c == '=') { + if ((c = nextc(p)) == '*') { + if ((c = nextc(p)) == '=') { + set_yylval_id(idPow); + SET_LEX_STATE(EXPR_BEG); + return tOP_ASGN; + } + pushback(p, c); + if (IS_SPCARG(c)) { + rb_warning0("`**' interpreted as argument prefix"); + c = tDSTAR; + } + else if (IS_BEG()) { + c = tDSTAR; + } + else { + c = warn_balanced((enum ruby_method_ids)tPOW, "**", "argument prefix"); + } + } + else { + if (c == '=') { set_yylval_id('*'); - SET_LEX_STATE(EXPR_BEG); - return tOP_ASGN; - } - pushback(p, c); - if (IS_SPCARG(c)) { - rb_warning0("`*' interpreted as argument prefix"); - c = tSTAR; - } - else if (IS_BEG()) { - c = tSTAR; - } - else { - c = warn_balanced('*', "*", "argument prefix"); - } - } - SET_LEX_STATE(IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG); - return c; + SET_LEX_STATE(EXPR_BEG); + return tOP_ASGN; + } + pushback(p, c); + if (IS_SPCARG(c)) { + rb_warning0("`*' interpreted as argument prefix"); + c = tSTAR; + } + else if (IS_BEG()) { + c = tSTAR; + } + else { + c = warn_balanced('*', "*", "argument prefix"); + } + } + SET_LEX_STATE(IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG); + return c; case '!': - c = nextc(p); - if (IS_AFTER_OPERATOR()) { - SET_LEX_STATE(EXPR_ARG); - if (c == '@') { - return '!'; - } - } - else { - SET_LEX_STATE(EXPR_BEG); - } - if (c == '=') { - return tNEQ; - } - if (c == '~') { - return tNMATCH; - } - pushback(p, c); - return '!'; + c = nextc(p); + if (IS_AFTER_OPERATOR()) { + SET_LEX_STATE(EXPR_ARG); + if (c == '@') { + return '!'; + } + } + else { + SET_LEX_STATE(EXPR_BEG); + } + if (c == '=') { + return tNEQ; + } + if (c == '~') { + return tNMATCH; + } + pushback(p, c); + return '!'; case '=': - if (was_bol(p)) { - /* skip embedded rd document */ - if (word_match_p(p, "begin", 5)) { - int first_p = TRUE; - - lex_goto_eol(p); - dispatch_scan_event(p, tEMBDOC_BEG); - for (;;) { - lex_goto_eol(p); - if (!first_p) { - dispatch_scan_event(p, tEMBDOC); - } - first_p = FALSE; - c = nextc(p); - if (c == -1) { - compile_error(p, "embedded document meets end of file"); - return END_OF_INPUT; - } - if (c == '=' && word_match_p(p, "end", 3)) { - break; - } - pushback(p, c); - } - lex_goto_eol(p); - dispatch_scan_event(p, tEMBDOC_END); - goto retry; - } - } - - SET_LEX_STATE(IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG); - if ((c = nextc(p)) == '=') { - if ((c = nextc(p)) == '=') { - return tEQQ; - } - pushback(p, c); - return tEQ; - } - if (c == '~') { - return tMATCH; - } - else if (c == '>') { - return tASSOC; - } - pushback(p, c); - return '='; + if (was_bol(p)) { + /* skip embedded rd document */ + if (word_match_p(p, "begin", 5)) { + int first_p = TRUE; + + lex_goto_eol(p); + dispatch_scan_event(p, tEMBDOC_BEG); + for (;;) { + lex_goto_eol(p); + if (!first_p) { + dispatch_scan_event(p, tEMBDOC); + } + first_p = FALSE; + c = nextc(p); + if (c == -1) { + compile_error(p, "embedded document meets end of file"); + return END_OF_INPUT; + } + if (c == '=' && word_match_p(p, "end", 3)) { + break; + } + pushback(p, c); + } + lex_goto_eol(p); + dispatch_scan_event(p, tEMBDOC_END); + goto retry; + } + } + + SET_LEX_STATE(IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG); + if ((c = nextc(p)) == '=') { + if ((c = nextc(p)) == '=') { + return tEQQ; + } + pushback(p, c); + return tEQ; + } + if (c == '~') { + return tMATCH; + } + else if (c == '>') { + return tASSOC; + } + pushback(p, c); + return '='; case '<': - c = nextc(p); - if (c == '<' && - !IS_lex_state(EXPR_DOT | EXPR_CLASS) && - !IS_END() && - (!IS_ARG() || IS_lex_state(EXPR_LABELED) || space_seen)) { - int token = heredoc_identifier(p); - if (token) return token < 0 ? 0 : token; - } - if (IS_AFTER_OPERATOR()) { - SET_LEX_STATE(EXPR_ARG); - } - else { - if (IS_lex_state(EXPR_CLASS)) - p->command_start = TRUE; - SET_LEX_STATE(EXPR_BEG); - } - if (c == '=') { - if ((c = nextc(p)) == '>') { - return tCMP; - } - pushback(p, c); - return tLEQ; - } - if (c == '<') { - if ((c = nextc(p)) == '=') { - set_yylval_id(idLTLT); - SET_LEX_STATE(EXPR_BEG); - return tOP_ASGN; - } - pushback(p, c); - return warn_balanced((enum ruby_method_ids)tLSHFT, "<<", "here document"); - } - pushback(p, c); - return '<'; + c = nextc(p); + if (c == '<' && + !IS_lex_state(EXPR_DOT | EXPR_CLASS) && + !IS_END() && + (!IS_ARG() || IS_lex_state(EXPR_LABELED) || space_seen)) { + int token = heredoc_identifier(p); + if (token) return token < 0 ? 0 : token; + } + if (IS_AFTER_OPERATOR()) { + SET_LEX_STATE(EXPR_ARG); + } + else { + if (IS_lex_state(EXPR_CLASS)) + p->command_start = TRUE; + SET_LEX_STATE(EXPR_BEG); + } + if (c == '=') { + if ((c = nextc(p)) == '>') { + return tCMP; + } + pushback(p, c); + return tLEQ; + } + if (c == '<') { + if ((c = nextc(p)) == '=') { + set_yylval_id(idLTLT); + SET_LEX_STATE(EXPR_BEG); + return tOP_ASGN; + } + pushback(p, c); + return warn_balanced((enum ruby_method_ids)tLSHFT, "<<", "here document"); + } + pushback(p, c); + return '<'; case '>': - SET_LEX_STATE(IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG); - if ((c = nextc(p)) == '=') { - return tGEQ; - } - if (c == '>') { - if ((c = nextc(p)) == '=') { - set_yylval_id(idGTGT); - SET_LEX_STATE(EXPR_BEG); - return tOP_ASGN; - } - pushback(p, c); - return tRSHFT; - } - pushback(p, c); - return '>'; + SET_LEX_STATE(IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG); + if ((c = nextc(p)) == '=') { + return tGEQ; + } + if (c == '>') { + if ((c = nextc(p)) == '=') { + set_yylval_id(idGTGT); + SET_LEX_STATE(EXPR_BEG); + return tOP_ASGN; + } + pushback(p, c); + return tRSHFT; + } + pushback(p, c); + return '>'; case '"': - label = (IS_LABEL_POSSIBLE() ? str_label : 0); - p->lex.strterm = NEW_STRTERM(str_dquote | label, '"', 0); - p->lex.ptok = p->lex.pcur-1; - return tSTRING_BEG; + label = (IS_LABEL_POSSIBLE() ? str_label : 0); + p->lex.strterm = NEW_STRTERM(str_dquote | label, '"', 0); + p->lex.ptok = p->lex.pcur-1; + return tSTRING_BEG; case '`': - if (IS_lex_state(EXPR_FNAME)) { - SET_LEX_STATE(EXPR_ENDFN); - return c; - } - if (IS_lex_state(EXPR_DOT)) { - if (cmd_state) - SET_LEX_STATE(EXPR_CMDARG); - else - SET_LEX_STATE(EXPR_ARG); - return c; - } - p->lex.strterm = NEW_STRTERM(str_xquote, '`', 0); - return tXSTRING_BEG; + if (IS_lex_state(EXPR_FNAME)) { + SET_LEX_STATE(EXPR_ENDFN); + return c; + } + if (IS_lex_state(EXPR_DOT)) { + if (cmd_state) + SET_LEX_STATE(EXPR_CMDARG); + else + SET_LEX_STATE(EXPR_ARG); + return c; + } + p->lex.strterm = NEW_STRTERM(str_xquote, '`', 0); + return tXSTRING_BEG; case '\'': - label = (IS_LABEL_POSSIBLE() ? str_label : 0); - p->lex.strterm = NEW_STRTERM(str_squote | label, '\'', 0); - p->lex.ptok = p->lex.pcur-1; - return tSTRING_BEG; + label = (IS_LABEL_POSSIBLE() ? str_label : 0); + p->lex.strterm = NEW_STRTERM(str_squote | label, '\'', 0); + p->lex.ptok = p->lex.pcur-1; + return tSTRING_BEG; case '?': - return parse_qmark(p, space_seen); + return parse_qmark(p, space_seen); case '&': - if ((c = nextc(p)) == '&') { - SET_LEX_STATE(EXPR_BEG); - if ((c = nextc(p)) == '=') { + if ((c = nextc(p)) == '&') { + SET_LEX_STATE(EXPR_BEG); + if ((c = nextc(p)) == '=') { set_yylval_id(idANDOP); - SET_LEX_STATE(EXPR_BEG); - return tOP_ASGN; - } - pushback(p, c); - return tANDOP; - } - else if (c == '=') { + SET_LEX_STATE(EXPR_BEG); + return tOP_ASGN; + } + pushback(p, c); + return tANDOP; + } + else if (c == '=') { set_yylval_id('&'); - SET_LEX_STATE(EXPR_BEG); - return tOP_ASGN; - } - else if (c == '.') { - set_yylval_id(idANDDOT); - SET_LEX_STATE(EXPR_DOT); - return tANDDOT; - } - pushback(p, c); - if (IS_SPCARG(c)) { - if ((c != ':') || - (c = peekc_n(p, 1)) == -1 || - !(c == '\'' || c == '"' || - is_identchar((p->lex.pcur+1), p->lex.pend, p->enc))) { - rb_warning0("`&' interpreted as argument prefix"); - } - c = tAMPER; - } - else if (IS_BEG()) { - c = tAMPER; - } - else { - c = warn_balanced('&', "&", "argument prefix"); - } - SET_LEX_STATE(IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG); - return c; + SET_LEX_STATE(EXPR_BEG); + return tOP_ASGN; + } + else if (c == '.') { + set_yylval_id(idANDDOT); + SET_LEX_STATE(EXPR_DOT); + return tANDDOT; + } + pushback(p, c); + if (IS_SPCARG(c)) { + if ((c != ':') || + (c = peekc_n(p, 1)) == -1 || + !(c == '\'' || c == '"' || + is_identchar((p->lex.pcur+1), p->lex.pend, p->enc))) { + rb_warning0("`&' interpreted as argument prefix"); + } + c = tAMPER; + } + else if (IS_BEG()) { + c = tAMPER; + } + else { + c = warn_balanced('&', "&", "argument prefix"); + } + SET_LEX_STATE(IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG); + return c; case '|': - if ((c = nextc(p)) == '|') { - SET_LEX_STATE(EXPR_BEG); - if ((c = nextc(p)) == '=') { + if ((c = nextc(p)) == '|') { + SET_LEX_STATE(EXPR_BEG); + if ((c = nextc(p)) == '=') { set_yylval_id(idOROP); - SET_LEX_STATE(EXPR_BEG); - return tOP_ASGN; - } - pushback(p, c); - if (IS_lex_state_for(last_state, EXPR_BEG)) { - c = '|'; - pushback(p, '|'); - return c; - } - return tOROP; - } - if (c == '=') { + SET_LEX_STATE(EXPR_BEG); + return tOP_ASGN; + } + pushback(p, c); + if (IS_lex_state_for(last_state, EXPR_BEG)) { + c = '|'; + pushback(p, '|'); + return c; + } + return tOROP; + } + if (c == '=') { set_yylval_id('|'); - SET_LEX_STATE(EXPR_BEG); - return tOP_ASGN; - } - SET_LEX_STATE(IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG|EXPR_LABEL); - pushback(p, c); - return '|'; + SET_LEX_STATE(EXPR_BEG); + return tOP_ASGN; + } + SET_LEX_STATE(IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG|EXPR_LABEL); + pushback(p, c); + return '|'; case '+': - c = nextc(p); - if (IS_AFTER_OPERATOR()) { - SET_LEX_STATE(EXPR_ARG); - if (c == '@') { - return tUPLUS; - } - pushback(p, c); - return '+'; - } - if (c == '=') { + c = nextc(p); + if (IS_AFTER_OPERATOR()) { + SET_LEX_STATE(EXPR_ARG); + if (c == '@') { + return tUPLUS; + } + pushback(p, c); + return '+'; + } + if (c == '=') { set_yylval_id('+'); - SET_LEX_STATE(EXPR_BEG); - return tOP_ASGN; - } - if (IS_BEG() || (IS_SPCARG(c) && arg_ambiguous(p, '+'))) { - SET_LEX_STATE(EXPR_BEG); - pushback(p, c); - if (c != -1 && ISDIGIT(c)) { - return parse_numeric(p, '+'); - } - return tUPLUS; - } - SET_LEX_STATE(EXPR_BEG); - pushback(p, c); - return warn_balanced('+', "+", "unary operator"); + SET_LEX_STATE(EXPR_BEG); + return tOP_ASGN; + } + if (IS_BEG() || (IS_SPCARG(c) && arg_ambiguous(p, '+'))) { + SET_LEX_STATE(EXPR_BEG); + pushback(p, c); + if (c != -1 && ISDIGIT(c)) { + return parse_numeric(p, '+'); + } + return tUPLUS; + } + SET_LEX_STATE(EXPR_BEG); + pushback(p, c); + return warn_balanced('+', "+", "unary operator"); case '-': - c = nextc(p); - if (IS_AFTER_OPERATOR()) { - SET_LEX_STATE(EXPR_ARG); - if (c == '@') { - return tUMINUS; - } - pushback(p, c); - return '-'; - } - if (c == '=') { + c = nextc(p); + if (IS_AFTER_OPERATOR()) { + SET_LEX_STATE(EXPR_ARG); + if (c == '@') { + return tUMINUS; + } + pushback(p, c); + return '-'; + } + if (c == '=') { set_yylval_id('-'); - SET_LEX_STATE(EXPR_BEG); - return tOP_ASGN; - } - if (c == '>') { - SET_LEX_STATE(EXPR_ENDFN); - return tLAMBDA; - } - if (IS_BEG() || (IS_SPCARG(c) && arg_ambiguous(p, '-'))) { - SET_LEX_STATE(EXPR_BEG); - pushback(p, c); - if (c != -1 && ISDIGIT(c)) { - return tUMINUS_NUM; - } - return tUMINUS; - } - SET_LEX_STATE(EXPR_BEG); - pushback(p, c); - return warn_balanced('-', "-", "unary operator"); + SET_LEX_STATE(EXPR_BEG); + return tOP_ASGN; + } + if (c == '>') { + SET_LEX_STATE(EXPR_ENDFN); + return tLAMBDA; + } + if (IS_BEG() || (IS_SPCARG(c) && arg_ambiguous(p, '-'))) { + SET_LEX_STATE(EXPR_BEG); + pushback(p, c); + if (c != -1 && ISDIGIT(c)) { + return tUMINUS_NUM; + } + return tUMINUS; + } + SET_LEX_STATE(EXPR_BEG); + pushback(p, c); + return warn_balanced('-', "-", "unary operator"); case '.': { int is_beg = IS_BEG(); - SET_LEX_STATE(EXPR_BEG); - if ((c = nextc(p)) == '.') { - if ((c = nextc(p)) == '.') { - if (p->ctxt.in_argdef) { - SET_LEX_STATE(EXPR_ENDARG); - return tBDOT3; - } - if (p->lex.paren_nest == 0 && looking_at_eol_p(p)) { - rb_warn0("... at EOL, should be parenthesized?"); - } - else if (p->lex.lpar_beg >= 0 && p->lex.lpar_beg+1 == p->lex.paren_nest) { - if (IS_lex_state_for(last_state, EXPR_LABEL)) - return tDOT3; - } - return is_beg ? tBDOT3 : tDOT3; - } - pushback(p, c); - return is_beg ? tBDOT2 : tDOT2; - } - pushback(p, c); - if (c != -1 && ISDIGIT(c)) { - char prev = p->lex.pcur-1 > p->lex.pbeg ? *(p->lex.pcur-2) : 0; - parse_numeric(p, '.'); - if (ISDIGIT(prev)) { - yyerror0("unexpected fraction part after numeric literal"); - } - else { - yyerror0("no . floating literal anymore; put 0 before dot"); - } - SET_LEX_STATE(EXPR_END); - p->lex.ptok = p->lex.pcur; - goto retry; - } - set_yylval_id('.'); - SET_LEX_STATE(EXPR_DOT); - return '.'; + SET_LEX_STATE(EXPR_BEG); + if ((c = nextc(p)) == '.') { + if ((c = nextc(p)) == '.') { + if (p->ctxt.in_argdef) { + SET_LEX_STATE(EXPR_ENDARG); + return tBDOT3; + } + if (p->lex.paren_nest == 0 && looking_at_eol_p(p)) { + rb_warn0("... at EOL, should be parenthesized?"); + } + else if (p->lex.lpar_beg >= 0 && p->lex.lpar_beg+1 == p->lex.paren_nest) { + if (IS_lex_state_for(last_state, EXPR_LABEL)) + return tDOT3; + } + return is_beg ? tBDOT3 : tDOT3; + } + pushback(p, c); + return is_beg ? tBDOT2 : tDOT2; + } + pushback(p, c); + if (c != -1 && ISDIGIT(c)) { + char prev = p->lex.pcur-1 > p->lex.pbeg ? *(p->lex.pcur-2) : 0; + parse_numeric(p, '.'); + if (ISDIGIT(prev)) { + yyerror0("unexpected fraction part after numeric literal"); + } + else { + yyerror0("no . floating literal anymore; put 0 before dot"); + } + SET_LEX_STATE(EXPR_END); + p->lex.ptok = p->lex.pcur; + goto retry; + } + set_yylval_id('.'); + SET_LEX_STATE(EXPR_DOT); + return '.'; } case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': - return parse_numeric(p, c); + return parse_numeric(p, c); case ')': - COND_POP(); - CMDARG_POP(); - SET_LEX_STATE(EXPR_ENDFN); - p->lex.paren_nest--; - return c; + COND_POP(); + CMDARG_POP(); + SET_LEX_STATE(EXPR_ENDFN); + p->lex.paren_nest--; + return c; case ']': - COND_POP(); - CMDARG_POP(); - SET_LEX_STATE(EXPR_END); - p->lex.paren_nest--; - return c; + COND_POP(); + CMDARG_POP(); + SET_LEX_STATE(EXPR_END); + p->lex.paren_nest--; + return c; case '}': - /* tSTRING_DEND does COND_POP and CMDARG_POP in the yacc's rule */ - if (!p->lex.brace_nest--) return tSTRING_DEND; - COND_POP(); - CMDARG_POP(); - SET_LEX_STATE(EXPR_END); - p->lex.paren_nest--; - return c; + /* tSTRING_DEND does COND_POP and CMDARG_POP in the yacc's rule */ + if (!p->lex.brace_nest--) return tSTRING_DEND; + COND_POP(); + CMDARG_POP(); + SET_LEX_STATE(EXPR_END); + p->lex.paren_nest--; + return c; case ':': - c = nextc(p); - if (c == ':') { - if (IS_BEG() || IS_lex_state(EXPR_CLASS) || IS_SPCARG(-1)) { - SET_LEX_STATE(EXPR_BEG); - return tCOLON3; - } - set_yylval_id(idCOLON2); - SET_LEX_STATE(EXPR_DOT); - return tCOLON2; - } - if (IS_END() || ISSPACE(c) || c == '#') { - pushback(p, c); - c = warn_balanced(':', ":", "symbol literal"); - SET_LEX_STATE(EXPR_BEG); - return c; - } - switch (c) { - case '\'': - p->lex.strterm = NEW_STRTERM(str_ssym, c, 0); - break; - case '"': - p->lex.strterm = NEW_STRTERM(str_dsym, c, 0); - break; - default: - pushback(p, c); - break; - } - SET_LEX_STATE(EXPR_FNAME); - return tSYMBEG; + c = nextc(p); + if (c == ':') { + if (IS_BEG() || IS_lex_state(EXPR_CLASS) || IS_SPCARG(-1)) { + SET_LEX_STATE(EXPR_BEG); + return tCOLON3; + } + set_yylval_id(idCOLON2); + SET_LEX_STATE(EXPR_DOT); + return tCOLON2; + } + if (IS_END() || ISSPACE(c) || c == '#') { + pushback(p, c); + c = warn_balanced(':', ":", "symbol literal"); + SET_LEX_STATE(EXPR_BEG); + return c; + } + switch (c) { + case '\'': + p->lex.strterm = NEW_STRTERM(str_ssym, c, 0); + break; + case '"': + p->lex.strterm = NEW_STRTERM(str_dsym, c, 0); + break; + default: + pushback(p, c); + break; + } + SET_LEX_STATE(EXPR_FNAME); + return tSYMBEG; case '/': - if (IS_BEG()) { - p->lex.strterm = NEW_STRTERM(str_regexp, '/', 0); - return tREGEXP_BEG; - } - if ((c = nextc(p)) == '=') { + if (IS_BEG()) { + p->lex.strterm = NEW_STRTERM(str_regexp, '/', 0); + return tREGEXP_BEG; + } + if ((c = nextc(p)) == '=') { set_yylval_id('/'); - SET_LEX_STATE(EXPR_BEG); - return tOP_ASGN; - } - pushback(p, c); - if (IS_SPCARG(c)) { - arg_ambiguous(p, '/'); - p->lex.strterm = NEW_STRTERM(str_regexp, '/', 0); - return tREGEXP_BEG; - } - SET_LEX_STATE(IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG); - return warn_balanced('/', "/", "regexp literal"); + SET_LEX_STATE(EXPR_BEG); + return tOP_ASGN; + } + pushback(p, c); + if (IS_SPCARG(c)) { + arg_ambiguous(p, '/'); + p->lex.strterm = NEW_STRTERM(str_regexp, '/', 0); + return tREGEXP_BEG; + } + SET_LEX_STATE(IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG); + return warn_balanced('/', "/", "regexp literal"); case '^': - if ((c = nextc(p)) == '=') { + if ((c = nextc(p)) == '=') { set_yylval_id('^'); - SET_LEX_STATE(EXPR_BEG); - return tOP_ASGN; - } - SET_LEX_STATE(IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG); - pushback(p, c); - return '^'; + SET_LEX_STATE(EXPR_BEG); + return tOP_ASGN; + } + SET_LEX_STATE(IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG); + pushback(p, c); + return '^'; case ';': - SET_LEX_STATE(EXPR_BEG); - p->command_start = TRUE; - return ';'; + SET_LEX_STATE(EXPR_BEG); + p->command_start = TRUE; + return ';'; case ',': - SET_LEX_STATE(EXPR_BEG|EXPR_LABEL); - return ','; + SET_LEX_STATE(EXPR_BEG|EXPR_LABEL); + return ','; case '~': - if (IS_AFTER_OPERATOR()) { - if ((c = nextc(p)) != '@') { - pushback(p, c); - } - SET_LEX_STATE(EXPR_ARG); - } - else { - SET_LEX_STATE(EXPR_BEG); - } - return '~'; + if (IS_AFTER_OPERATOR()) { + if ((c = nextc(p)) != '@') { + pushback(p, c); + } + SET_LEX_STATE(EXPR_ARG); + } + else { + SET_LEX_STATE(EXPR_BEG); + } + return '~'; case '(': - if (IS_BEG()) { - c = tLPAREN; - } - else if (!space_seen) { - /* foo( ... ) => method call, no ambiguity */ - } - else if (IS_ARG() || IS_lex_state_all(EXPR_END|EXPR_LABEL)) { - c = tLPAREN_ARG; - } - else if (IS_lex_state(EXPR_ENDFN) && !lambda_beginning_p()) { - rb_warning0("parentheses after method name is interpreted as " - "an argument list, not a decomposed argument"); - } - p->lex.paren_nest++; - COND_PUSH(0); - CMDARG_PUSH(0); - SET_LEX_STATE(EXPR_BEG|EXPR_LABEL); - return c; + if (IS_BEG()) { + c = tLPAREN; + } + else if (!space_seen) { + /* foo( ... ) => method call, no ambiguity */ + } + else if (IS_ARG() || IS_lex_state_all(EXPR_END|EXPR_LABEL)) { + c = tLPAREN_ARG; + } + else if (IS_lex_state(EXPR_ENDFN) && !lambda_beginning_p()) { + rb_warning0("parentheses after method name is interpreted as " + "an argument list, not a decomposed argument"); + } + p->lex.paren_nest++; + COND_PUSH(0); + CMDARG_PUSH(0); + SET_LEX_STATE(EXPR_BEG|EXPR_LABEL); + return c; case '[': - p->lex.paren_nest++; - if (IS_AFTER_OPERATOR()) { - if ((c = nextc(p)) == ']') { - p->lex.paren_nest--; - SET_LEX_STATE(EXPR_ARG); - if ((c = nextc(p)) == '=') { - return tASET; - } - pushback(p, c); - return tAREF; - } - pushback(p, c); - SET_LEX_STATE(EXPR_ARG|EXPR_LABEL); - return '['; - } - else if (IS_BEG()) { - c = tLBRACK; - } - else if (IS_ARG() && (space_seen || IS_lex_state(EXPR_LABELED))) { - c = tLBRACK; - } - SET_LEX_STATE(EXPR_BEG|EXPR_LABEL); - COND_PUSH(0); - CMDARG_PUSH(0); - return c; + p->lex.paren_nest++; + if (IS_AFTER_OPERATOR()) { + if ((c = nextc(p)) == ']') { + p->lex.paren_nest--; + SET_LEX_STATE(EXPR_ARG); + if ((c = nextc(p)) == '=') { + return tASET; + } + pushback(p, c); + return tAREF; + } + pushback(p, c); + SET_LEX_STATE(EXPR_ARG|EXPR_LABEL); + return '['; + } + else if (IS_BEG()) { + c = tLBRACK; + } + else if (IS_ARG() && (space_seen || IS_lex_state(EXPR_LABELED))) { + c = tLBRACK; + } + SET_LEX_STATE(EXPR_BEG|EXPR_LABEL); + COND_PUSH(0); + CMDARG_PUSH(0); + return c; case '{': - ++p->lex.brace_nest; - if (lambda_beginning_p()) - c = tLAMBEG; - else if (IS_lex_state(EXPR_LABELED)) - c = tLBRACE; /* hash */ - else if (IS_lex_state(EXPR_ARG_ANY | EXPR_END | EXPR_ENDFN)) - c = '{'; /* block (primary) */ - else if (IS_lex_state(EXPR_ENDARG)) - c = tLBRACE_ARG; /* block (expr) */ - else - c = tLBRACE; /* hash */ - if (c != tLBRACE) { - p->command_start = TRUE; - SET_LEX_STATE(EXPR_BEG); - } - else { - SET_LEX_STATE(EXPR_BEG|EXPR_LABEL); - } - ++p->lex.paren_nest; /* after lambda_beginning_p() */ - COND_PUSH(0); - CMDARG_PUSH(0); - return c; + ++p->lex.brace_nest; + if (lambda_beginning_p()) + c = tLAMBEG; + else if (IS_lex_state(EXPR_LABELED)) + c = tLBRACE; /* hash */ + else if (IS_lex_state(EXPR_ARG_ANY | EXPR_END | EXPR_ENDFN)) + c = '{'; /* block (primary) */ + else if (IS_lex_state(EXPR_ENDARG)) + c = tLBRACE_ARG; /* block (expr) */ + else + c = tLBRACE; /* hash */ + if (c != tLBRACE) { + p->command_start = TRUE; + SET_LEX_STATE(EXPR_BEG); + } + else { + SET_LEX_STATE(EXPR_BEG|EXPR_LABEL); + } + ++p->lex.paren_nest; /* after lambda_beginning_p() */ + COND_PUSH(0); + CMDARG_PUSH(0); + return c; case '\\': - c = nextc(p); - if (c == '\n') { - space_seen = 1; - dispatch_scan_event(p, tSP); - goto retry; /* skip \\n */ - } - if (c == ' ') return tSP; - if (ISSPACE(c)) return c; - pushback(p, c); - return '\\'; + c = nextc(p); + if (c == '\n') { + space_seen = 1; + dispatch_scan_event(p, tSP); + goto retry; /* skip \\n */ + } + if (c == ' ') return tSP; + if (ISSPACE(c)) return c; + pushback(p, c); + return '\\'; case '%': - return parse_percent(p, space_seen, last_state); + return parse_percent(p, space_seen, last_state); case '$': - return parse_gvar(p, last_state); + return parse_gvar(p, last_state); case '@': - return parse_atmark(p, last_state); + return parse_atmark(p, last_state); case '_': - if (was_bol(p) && whole_match_p(p, "__END__", 7, 0)) { - p->ruby__end__seen = 1; - p->eofp = 1; + if (was_bol(p) && whole_match_p(p, "__END__", 7, 0)) { + p->ruby__end__seen = 1; + p->eofp = 1; #ifdef RIPPER lex_goto_eol(p); dispatch_scan_event(p, k__END__); #endif return END_OF_INPUT; - } - newtok(p); - break; + } + newtok(p); + break; default: - if (!parser_is_identchar(p)) { - compile_error(p, "Invalid char `\\x%02X' in expression", c); + if (!parser_is_identchar(p)) { + compile_error(p, "Invalid char `\\x%02X' in expression", c); token_flush(p); - goto retry; - } + goto retry; + } - newtok(p); - break; + newtok(p); + break; } return parse_ident(p, c, cmd_state); @@ -10487,9 +10487,9 @@ yylex(YYSTYPE *lval, YYLTYPE *yylloc, struct parser_params *p) t = parser_yylex(p); if (has_delayed_token(p)) - dispatch_delayed_token(p, t); + dispatch_delayed_token(p, t); else if (t != END_OF_INPUT) - dispatch_scan_event(p, t); + dispatch_scan_event(p, t); return t; } @@ -10533,8 +10533,8 @@ static NODE* newline_node(NODE *node) { if (node) { - node = remove_begin(node); - node->flags |= NODE_FL_NEWLINE; + node = remove_begin(node); + node->flags |= NODE_FL_NEWLINE; } return node; } @@ -10574,16 +10574,16 @@ block_append(struct parser_params *p, NODE *head, NODE *tail) case NODE_TRUE: case NODE_FALSE: case NODE_NIL: - parser_warning(p, h, "unused literal ignored"); - return tail; + parser_warning(p, h, "unused literal ignored"); + return tail; default: - h = end = NEW_BLOCK(head, &head->nd_loc); - end->nd_end = end; - head = end; - break; + h = end = NEW_BLOCK(head, &head->nd_loc); + end->nd_end = end; + head = end; + break; case NODE_BLOCK: - end = h->nd_end; - break; + end = h->nd_end; + break; } nd = end->nd_head; @@ -10593,18 +10593,18 @@ block_append(struct parser_params *p, NODE *head, NODE *tail) case NODE_NEXT: case NODE_REDO: case NODE_RETRY: - if (RTEST(ruby_verbose)) { - parser_warning(p, tail, "statement not reached"); - } - break; + if (RTEST(ruby_verbose)) { + parser_warning(p, tail, "statement not reached"); + } + break; default: - break; + break; } if (!nd_type_p(tail, NODE_BLOCK)) { - tail = NEW_BLOCK(tail, &tail->nd_loc); - tail->nd_end = tail; + tail = NEW_BLOCK(tail, &tail->nd_loc); + tail->nd_end = tail; } end->nd_next = tail; h->nd_end = tail->nd_end; @@ -10620,10 +10620,10 @@ list_append(struct parser_params *p, NODE *list, NODE *item) if (list == 0) return NEW_LIST(item, &item->nd_loc); if (list->nd_next) { - last = list->nd_next->nd_end; + last = list->nd_next->nd_end; } else { - last = list; + last = list; } list->nd_alen += 1; @@ -10642,19 +10642,19 @@ list_concat(NODE *head, NODE *tail) NODE *last; if (head->nd_next) { - last = head->nd_next->nd_end; + last = head->nd_next->nd_end; } else { - last = head; + last = head; } head->nd_alen += tail->nd_alen; last->nd_next = tail; if (tail->nd_next) { - head->nd_next->nd_end = tail->nd_next->nd_end; + head->nd_next->nd_end = tail->nd_next->nd_end; } else { - head->nd_next->nd_end = tail; + head->nd_next->nd_end = tail; } nd_set_last_loc(head, nd_last_loc(tail)); @@ -10667,12 +10667,12 @@ literal_concat0(struct parser_params *p, VALUE head, VALUE tail) { if (NIL_P(tail)) return 1; if (!rb_enc_compatible(head, tail)) { - compile_error(p, "string literal encodings differ (%s / %s)", - rb_enc_name(rb_enc_get(head)), - rb_enc_name(rb_enc_get(tail))); - rb_str_resize(head, 0); - rb_str_resize(tail, 0); - return 0; + compile_error(p, "string literal encodings differ (%s / %s)", + rb_enc_name(rb_enc_get(head)), + rb_enc_name(rb_enc_get(tail))); + rb_str_resize(head, 0); + rb_str_resize(tail, 0); + return 0; } rb_str_buf_append(head, tail); return 1; @@ -10683,8 +10683,8 @@ string_literal_head(enum node_type htype, NODE *head) { if (htype != NODE_DSTR) return Qfalse; if (head->nd_next) { - head = head->nd_next->nd_end->nd_head; - if (!head || !nd_type_p(head, NODE_STR)) return Qfalse; + head = head->nd_next->nd_end->nd_head; + if (!head || !nd_type_p(head, NODE_STR)) return Qfalse; } const VALUE lit = head->nd_lit; ASSUME(lit != Qfalse); @@ -10703,79 +10703,79 @@ literal_concat(struct parser_params *p, NODE *head, NODE *tail, const YYLTYPE *l htype = nd_type(head); if (htype == NODE_EVSTR) { - head = new_dstr(p, head, loc); - htype = NODE_DSTR; + head = new_dstr(p, head, loc); + htype = NODE_DSTR; } if (p->heredoc_indent > 0) { - switch (htype) { - case NODE_STR: - nd_set_type(head, NODE_DSTR); - case NODE_DSTR: - return list_append(p, head, tail); - default: - break; - } + switch (htype) { + case NODE_STR: + nd_set_type(head, NODE_DSTR); + case NODE_DSTR: + return list_append(p, head, tail); + default: + break; + } } switch (nd_type(tail)) { case NODE_STR: - if ((lit = string_literal_head(htype, head)) != Qfalse) { - htype = NODE_STR; - } - else { - lit = head->nd_lit; - } - if (htype == NODE_STR) { - if (!literal_concat0(p, lit, tail->nd_lit)) { - error: - rb_discard_node(p, head); - rb_discard_node(p, tail); - return 0; - } - rb_discard_node(p, tail); - } - else { - list_append(p, head, tail); - } - break; + if ((lit = string_literal_head(htype, head)) != Qfalse) { + htype = NODE_STR; + } + else { + lit = head->nd_lit; + } + if (htype == NODE_STR) { + if (!literal_concat0(p, lit, tail->nd_lit)) { + error: + rb_discard_node(p, head); + rb_discard_node(p, tail); + return 0; + } + rb_discard_node(p, tail); + } + else { + list_append(p, head, tail); + } + break; case NODE_DSTR: - if (htype == NODE_STR) { - if (!literal_concat0(p, head->nd_lit, tail->nd_lit)) - goto error; - tail->nd_lit = head->nd_lit; - rb_discard_node(p, head); - head = tail; - } - else if (NIL_P(tail->nd_lit)) { - append: - head->nd_alen += tail->nd_alen - 1; - if (!head->nd_next) { - head->nd_next = tail->nd_next; - } - else if (tail->nd_next) { - head->nd_next->nd_end->nd_next = tail->nd_next; - head->nd_next->nd_end = tail->nd_next->nd_end; - } - rb_discard_node(p, tail); - } - else if ((lit = string_literal_head(htype, head)) != Qfalse) { - if (!literal_concat0(p, lit, tail->nd_lit)) - goto error; - tail->nd_lit = Qnil; - goto append; - } - else { - list_concat(head, NEW_NODE(NODE_LIST, NEW_STR(tail->nd_lit, loc), tail->nd_alen, tail->nd_next, loc)); - } - break; + if (htype == NODE_STR) { + if (!literal_concat0(p, head->nd_lit, tail->nd_lit)) + goto error; + tail->nd_lit = head->nd_lit; + rb_discard_node(p, head); + head = tail; + } + else if (NIL_P(tail->nd_lit)) { + append: + head->nd_alen += tail->nd_alen - 1; + if (!head->nd_next) { + head->nd_next = tail->nd_next; + } + else if (tail->nd_next) { + head->nd_next->nd_end->nd_next = tail->nd_next; + head->nd_next->nd_end = tail->nd_next->nd_end; + } + rb_discard_node(p, tail); + } + else if ((lit = string_literal_head(htype, head)) != Qfalse) { + if (!literal_concat0(p, lit, tail->nd_lit)) + goto error; + tail->nd_lit = Qnil; + goto append; + } + else { + list_concat(head, NEW_NODE(NODE_LIST, NEW_STR(tail->nd_lit, loc), tail->nd_alen, tail->nd_next, loc)); + } + break; case NODE_EVSTR: - if (htype == NODE_STR) { - nd_set_type(head, NODE_DSTR); - head->nd_alen = 1; - } - list_append(p, head, tail); - break; + if (htype == NODE_STR) { + nd_set_type(head, NODE_DSTR); + head->nd_alen = 1; + } + list_append(p, head, tail); + break; } return head; } @@ -10784,7 +10784,7 @@ static NODE * evstr2dstr(struct parser_params *p, NODE *node) { if (nd_type_p(node, NODE_EVSTR)) { - node = new_dstr(p, node, &node->nd_loc); + node = new_dstr(p, node, &node->nd_loc); } return node; } @@ -10795,15 +10795,15 @@ new_evstr(struct parser_params *p, NODE *node, const YYLTYPE *loc) NODE *head = node; if (node) { - switch (nd_type(node)) { - case NODE_STR: - nd_set_type(node, NODE_DSTR); + switch (nd_type(node)) { + case NODE_STR: + nd_set_type(node, NODE_DSTR); return node; case NODE_DSTR: break; case NODE_EVSTR: - return node; - } + return node; + } } return NEW_EVSTR(head, loc); } @@ -10819,7 +10819,7 @@ new_dstr(struct parser_params *p, NODE *node, const YYLTYPE *loc) static NODE * call_bin_op(struct parser_params *p, NODE *recv, ID id, NODE *arg1, - const YYLTYPE *op_loc, const YYLTYPE *loc) + const YYLTYPE *op_loc, const YYLTYPE *loc) { NODE *expr; value_expr(recv); @@ -10868,36 +10868,36 @@ match_op(struct parser_params *p, NODE *node1, NODE *node2, const YYLTYPE *op_lo value_expr(node1); value_expr(node2); if (node1 && (n = nd_once_body(node1)) != 0) { - switch (nd_type(n)) { - case NODE_DREGX: - { - NODE *match = NEW_MATCH2(node1, node2, loc); - nd_set_line(match, line); - return match; - } - - case NODE_LIT: - if (RB_TYPE_P(n->nd_lit, T_REGEXP)) { - const VALUE lit = n->nd_lit; - NODE *match = NEW_MATCH2(node1, node2, loc); - match->nd_args = reg_named_capture_assign(p, lit, loc); - nd_set_line(match, line); - return match; - } - } + switch (nd_type(n)) { + case NODE_DREGX: + { + NODE *match = NEW_MATCH2(node1, node2, loc); + nd_set_line(match, line); + return match; + } + + case NODE_LIT: + if (RB_TYPE_P(n->nd_lit, T_REGEXP)) { + const VALUE lit = n->nd_lit; + NODE *match = NEW_MATCH2(node1, node2, loc); + match->nd_args = reg_named_capture_assign(p, lit, loc); + nd_set_line(match, line); + return match; + } + } } if (node2 && (n = nd_once_body(node2)) != 0) { NODE *match3; - switch (nd_type(n)) { - case NODE_LIT: - if (!RB_TYPE_P(n->nd_lit, T_REGEXP)) break; - /* fallthru */ - case NODE_DREGX: - match3 = NEW_MATCH3(node2, node1, loc); - return match3; - } + switch (nd_type(n)) { + case NODE_LIT: + if (!RB_TYPE_P(n->nd_lit, T_REGEXP)) break; + /* fallthru */ + case NODE_DREGX: + match3 = NEW_MATCH3(node2, node1, loc); + return match3; + } } n = NEW_CALL(node1, tMATCH, NEW_LIST(node2, &node2->nd_loc), loc); @@ -10911,8 +10911,8 @@ past_dvar_p(struct parser_params *p, ID id) { struct vtable *past = p->lvtbl->past; while (past) { - if (vtable_included(past, id)) return 1; - past = past->prev; + if (vtable_included(past, id)) return 1; + past = past->prev; } return 0; } @@ -10925,13 +10925,13 @@ numparam_nested_p(struct parser_params *p) NODE *outer = local->numparam.outer; NODE *inner = local->numparam.inner; if (outer || inner) { - NODE *used = outer ? outer : inner; - compile_error(p, "numbered parameter is already used in\n" - "%s:%d: %s block here", - p->ruby_sourcefile, nd_line(used), - outer ? "outer" : "inner"); - parser_show_error_line(p, &used->nd_loc); - return 1; + NODE *used = outer ? outer : inner; + compile_error(p, "numbered parameter is already used in\n" + "%s:%d: %s block here", + p->ruby_sourcefile, nd_line(used), + outer ? "outer" : "inner"); + parser_show_error_line(p, &used->nd_loc); + return 1; } return 0; } @@ -10943,26 +10943,26 @@ gettable(struct parser_params *p, ID id, const YYLTYPE *loc) NODE *node; switch (id) { case keyword_self: - return NEW_SELF(loc); + return NEW_SELF(loc); case keyword_nil: - return NEW_NIL(loc); + return NEW_NIL(loc); case keyword_true: - return NEW_TRUE(loc); + return NEW_TRUE(loc); case keyword_false: - return NEW_FALSE(loc); + return NEW_FALSE(loc); case keyword__FILE__: - { - VALUE file = p->ruby_sourcefile_string; - if (NIL_P(file)) - file = rb_str_new(0, 0); - else - file = rb_str_dup(file); - node = NEW_STR(file, loc); + { + VALUE file = p->ruby_sourcefile_string; + if (NIL_P(file)) + file = rb_str_new(0, 0); + else + file = rb_str_dup(file); + node = NEW_STR(file, loc); RB_OBJ_WRITTEN(p->ast, Qnil, file); - } - return node; + } + return node; case keyword__LINE__: - return NEW_LIT(INT2FIX(p->tokline), loc); + return NEW_LIT(INT2FIX(p->tokline), loc); case keyword__ENCODING__: node = NEW_LIT(rb_enc_from_encoding(p->enc), loc); RB_OBJ_WRITTEN(p->ast, Qnil, node->nd_lit); @@ -10971,48 +10971,48 @@ gettable(struct parser_params *p, ID id, const YYLTYPE *loc) } switch (id_type(id)) { case ID_LOCAL: - if (dyna_in_block(p) && dvar_defined_ref(p, id, &vidp)) { - if (NUMPARAM_ID_P(id) && numparam_nested_p(p)) return 0; - if (id == p->cur_arg) { + if (dyna_in_block(p) && dvar_defined_ref(p, id, &vidp)) { + if (NUMPARAM_ID_P(id) && numparam_nested_p(p)) return 0; + if (id == p->cur_arg) { compile_error(p, "circular argument reference - %"PRIsWARN, rb_id2str(id)); return 0; - } - if (vidp) *vidp |= LVAR_USED; - node = NEW_DVAR(id, loc); - return node; - } - if (local_id_ref(p, id, &vidp)) { - if (id == p->cur_arg) { + } + if (vidp) *vidp |= LVAR_USED; + node = NEW_DVAR(id, loc); + return node; + } + if (local_id_ref(p, id, &vidp)) { + if (id == p->cur_arg) { compile_error(p, "circular argument reference - %"PRIsWARN, rb_id2str(id)); return 0; - } - if (vidp) *vidp |= LVAR_USED; - node = NEW_LVAR(id, loc); - return node; - } - if (dyna_in_block(p) && NUMPARAM_ID_P(id) && - parser_numbered_param(p, NUMPARAM_ID_TO_IDX(id))) { - if (numparam_nested_p(p)) return 0; - node = NEW_DVAR(id, loc); - struct local_vars *local = p->lvtbl; - if (!local->numparam.current) local->numparam.current = node; - return node; - } + } + if (vidp) *vidp |= LVAR_USED; + node = NEW_LVAR(id, loc); + return node; + } + if (dyna_in_block(p) && NUMPARAM_ID_P(id) && + parser_numbered_param(p, NUMPARAM_ID_TO_IDX(id))) { + if (numparam_nested_p(p)) return 0; + node = NEW_DVAR(id, loc); + struct local_vars *local = p->lvtbl; + if (!local->numparam.current) local->numparam.current = node; + return node; + } # if WARN_PAST_SCOPE - if (!p->ctxt.in_defined && RTEST(ruby_verbose) && past_dvar_p(p, id)) { - rb_warning1("possible reference to past scope - %"PRIsWARN, rb_id2str(id)); - } + if (!p->ctxt.in_defined && RTEST(ruby_verbose) && past_dvar_p(p, id)) { + rb_warning1("possible reference to past scope - %"PRIsWARN, rb_id2str(id)); + } # endif - /* method call without arguments */ - return NEW_VCALL(id, loc); + /* method call without arguments */ + return NEW_VCALL(id, loc); case ID_GLOBAL: - return NEW_GVAR(id, loc); + return NEW_GVAR(id, loc); case ID_INSTANCE: - return NEW_IVAR(id, loc); + return NEW_IVAR(id, loc); case ID_CONST: - return NEW_CONST(id, loc); + return NEW_CONST(id, loc); case ID_CLASS: - return NEW_CVAR(id, loc); + return NEW_CVAR(id, loc); } compile_error(p, "identifier %"PRIsVALUE" is not valid to get", rb_id2str(id)); return 0; @@ -11025,8 +11025,8 @@ opt_arg_append(NODE *opt_list, NODE *opt) opts->nd_loc.end_pos = opt->nd_loc.end_pos; while (opts->nd_next) { - opts = opts->nd_next; - opts->nd_loc.end_pos = opt->nd_loc.end_pos; + opts = opts->nd_next; + opts->nd_loc.end_pos = opt->nd_loc.end_pos; } opts->nd_next = opt; @@ -11037,7 +11037,7 @@ static NODE * kwd_append(NODE *kwlist, NODE *kw) { if (kwlist) { - opt_arg_append(kwlist, kw); + opt_arg_append(kwlist, kw); } return kwlist; } @@ -11054,14 +11054,14 @@ symbol_append(struct parser_params *p, NODE *symbols, NODE *symbol) enum node_type type = nd_type(symbol); switch (type) { case NODE_DSTR: - nd_set_type(symbol, NODE_DSYM); - break; + nd_set_type(symbol, NODE_DSYM); + break; case NODE_STR: - nd_set_type(symbol, NODE_LIT); - RB_OBJ_WRITTEN(p->ast, Qnil, symbol->nd_lit = rb_str_intern(symbol->nd_lit)); - break; + nd_set_type(symbol, NODE_LIT); + RB_OBJ_WRITTEN(p->ast, Qnil, symbol->nd_lit = rb_str_intern(symbol->nd_lit)); + break; default: - compile_error(p, "unexpected node as symbol: %s", ruby_node_name(type)); + compile_error(p, "unexpected node as symbol: %s", ruby_node_name(type)); } return list_append(p, symbols, symbol); } @@ -11073,62 +11073,62 @@ new_regexp(struct parser_params *p, NODE *node, int options, const YYLTYPE *loc) VALUE lit; if (!node) { - node = NEW_LIT(reg_compile(p, STR_NEW0(), options), loc); - RB_OBJ_WRITTEN(p->ast, Qnil, node->nd_lit); + node = NEW_LIT(reg_compile(p, STR_NEW0(), options), loc); + RB_OBJ_WRITTEN(p->ast, Qnil, node->nd_lit); return node; } switch (nd_type(node)) { case NODE_STR: - { - VALUE src = node->nd_lit; - nd_set_type(node, NODE_LIT); - nd_set_loc(node, loc); - RB_OBJ_WRITTEN(p->ast, Qnil, node->nd_lit = reg_compile(p, src, options)); - } - break; + { + VALUE src = node->nd_lit; + nd_set_type(node, NODE_LIT); + nd_set_loc(node, loc); + RB_OBJ_WRITTEN(p->ast, Qnil, node->nd_lit = reg_compile(p, src, options)); + } + break; default: - lit = STR_NEW0(); - node = NEW_NODE(NODE_DSTR, lit, 1, NEW_LIST(node, loc), loc); + lit = STR_NEW0(); + node = NEW_NODE(NODE_DSTR, lit, 1, NEW_LIST(node, loc), loc); RB_OBJ_WRITTEN(p->ast, Qnil, lit); - /* fall through */ + /* fall through */ case NODE_DSTR: - nd_set_type(node, NODE_DREGX); - nd_set_loc(node, loc); - node->nd_cflag = options & RE_OPTION_MASK; - if (!NIL_P(node->nd_lit)) reg_fragment_check(p, node->nd_lit, options); - for (list = (prev = node)->nd_next; list; list = list->nd_next) { - NODE *frag = list->nd_head; - enum node_type type = nd_type(frag); - if (type == NODE_STR || (type == NODE_DSTR && !frag->nd_next)) { - VALUE tail = frag->nd_lit; - if (reg_fragment_check(p, tail, options) && prev && !NIL_P(prev->nd_lit)) { - VALUE lit = prev == node ? prev->nd_lit : prev->nd_head->nd_lit; - if (!literal_concat0(p, lit, tail)) { - return NEW_NIL(loc); /* dummy node on error */ - } - rb_str_resize(tail, 0); - prev->nd_next = list->nd_next; - rb_discard_node(p, list->nd_head); - rb_discard_node(p, list); - list = prev; - } - else { - prev = list; - } - } - else { - prev = 0; - } - } - if (!node->nd_next) { - VALUE src = node->nd_lit; - nd_set_type(node, NODE_LIT); - RB_OBJ_WRITTEN(p->ast, Qnil, node->nd_lit = reg_compile(p, src, options)); - } - if (options & RE_OPTION_ONCE) { - node = NEW_NODE(NODE_ONCE, 0, node, 0, loc); - } - break; + nd_set_type(node, NODE_DREGX); + nd_set_loc(node, loc); + node->nd_cflag = options & RE_OPTION_MASK; + if (!NIL_P(node->nd_lit)) reg_fragment_check(p, node->nd_lit, options); + for (list = (prev = node)->nd_next; list; list = list->nd_next) { + NODE *frag = list->nd_head; + enum node_type type = nd_type(frag); + if (type == NODE_STR || (type == NODE_DSTR && !frag->nd_next)) { + VALUE tail = frag->nd_lit; + if (reg_fragment_check(p, tail, options) && prev && !NIL_P(prev->nd_lit)) { + VALUE lit = prev == node ? prev->nd_lit : prev->nd_head->nd_lit; + if (!literal_concat0(p, lit, tail)) { + return NEW_NIL(loc); /* dummy node on error */ + } + rb_str_resize(tail, 0); + prev->nd_next = list->nd_next; + rb_discard_node(p, list->nd_head); + rb_discard_node(p, list); + list = prev; + } + else { + prev = list; + } + } + else { + prev = 0; + } + } + if (!node->nd_next) { + VALUE src = node->nd_lit; + nd_set_type(node, NODE_LIT); + RB_OBJ_WRITTEN(p->ast, Qnil, node->nd_lit = reg_compile(p, src, options)); + } + if (options & RE_OPTION_ONCE) { + node = NEW_NODE(NODE_ONCE, 0, node, 0, loc); + } + break; } return node; } @@ -11144,23 +11144,23 @@ static NODE * new_xstring(struct parser_params *p, NODE *node, const YYLTYPE *loc) { if (!node) { - VALUE lit = STR_NEW0(); - NODE *xstr = NEW_XSTR(lit, loc); - RB_OBJ_WRITTEN(p->ast, Qnil, lit); - return xstr; + VALUE lit = STR_NEW0(); + NODE *xstr = NEW_XSTR(lit, loc); + RB_OBJ_WRITTEN(p->ast, Qnil, lit); + return xstr; } switch (nd_type(node)) { case NODE_STR: - nd_set_type(node, NODE_XSTR); - nd_set_loc(node, loc); - break; + nd_set_type(node, NODE_XSTR); + nd_set_loc(node, loc); + break; case NODE_DSTR: - nd_set_type(node, NODE_DXSTR); - nd_set_loc(node, loc); - break; + nd_set_type(node, NODE_DXSTR); + nd_set_loc(node, loc); + break; default: - node = NEW_NODE(NODE_DXSTR, Qnil, 1, NEW_LIST(node, loc), loc); - break; + node = NEW_NODE(NODE_DXSTR, Qnil, 1, NEW_LIST(node, loc), loc); + break; } return node; } @@ -11175,19 +11175,19 @@ check_literal_when(struct parser_params *p, NODE *arg, const YYLTYPE *loc) lit = rb_node_case_when_optimizable_literal(arg); if (UNDEF_P(lit)) return; if (nd_type_p(arg, NODE_STR)) { - RB_OBJ_WRITTEN(p->ast, Qnil, arg->nd_lit = lit); + RB_OBJ_WRITTEN(p->ast, Qnil, arg->nd_lit = lit); } if (NIL_P(p->case_labels)) { - p->case_labels = rb_obj_hide(rb_hash_new()); + p->case_labels = rb_obj_hide(rb_hash_new()); } else { - VALUE line = rb_hash_lookup(p->case_labels, lit); - if (!NIL_P(line)) { - rb_warning1("duplicated `when' clause with line %d is ignored", - WARN_IVAL(line)); - return; - } + VALUE line = rb_hash_lookup(p->case_labels, lit); + if (!NIL_P(line)) { + rb_warning1("duplicated `when' clause with line %d is ignored", + WARN_IVAL(line)); + return; + } } rb_hash_aset(p->case_labels, lit, INT2NUM(p->ruby_sourceline)); } @@ -11197,17 +11197,17 @@ static int id_is_var(struct parser_params *p, ID id) { if (is_notop_id(id)) { - switch (id & ID_SCOPE_MASK) { - case ID_GLOBAL: case ID_INSTANCE: case ID_CONST: case ID_CLASS: - return 1; - case ID_LOCAL: - if (dyna_in_block(p)) { - if (NUMPARAM_ID_P(id) || dvar_defined(p, id)) return 1; - } - if (local_id(p, id)) return 1; - /* method call without arguments */ - return 0; - } + switch (id & ID_SCOPE_MASK) { + case ID_GLOBAL: case ID_INSTANCE: case ID_CONST: case ID_CLASS: + return 1; + case ID_LOCAL: + if (dyna_in_block(p)) { + if (NUMPARAM_ID_P(id) || dvar_defined(p, id)) return 1; + } + if (local_id(p, id)) return 1; + /* method call without arguments */ + return 0; + } } compile_error(p, "identifier %"PRIsVALUE" is not valid to get", rb_id2str(id)); return 0; @@ -11219,15 +11219,15 @@ new_regexp(struct parser_params *p, VALUE re, VALUE opt, const YYLTYPE *loc) VALUE src = 0, err; int options = 0; if (ripper_is_node_yylval(re)) { - src = RNODE(re)->nd_cval; - re = RNODE(re)->nd_rval; + src = RNODE(re)->nd_cval; + re = RNODE(re)->nd_rval; } if (ripper_is_node_yylval(opt)) { - options = (int)RNODE(opt)->nd_tag; - opt = RNODE(opt)->nd_rval; + options = (int)RNODE(opt)->nd_tag; + opt = RNODE(opt)->nd_rval; } if (src && NIL_P(parser_reg_compile(p, src, options, &err))) { - compile_error(p, "%"PRIsVALUE, err); + compile_error(p, "%"PRIsVALUE, err); } return dispatch2(regexp_literal, re, opt); } @@ -11237,7 +11237,7 @@ static inline enum lex_state_e parser_set_lex_state(struct parser_params *p, enum lex_state_e ls, int line) { if (p->debug) { - ls = rb_parser_trace_lex_state(p, p->lex.state, ls, line); + ls = rb_parser_trace_lex_state(p, p->lex.state, ls, line); } return p->lex.state = ls; } @@ -11257,16 +11257,16 @@ append_lex_state_name(enum lex_state_e state, VALUE buf) static const char none[] = "NONE"; for (i = 0; i < EXPR_MAX_STATE; ++i, mask <<= 1) { - if ((unsigned)state & mask) { - if (sep) { - rb_str_cat(buf, "|", 1); - } - sep = 1; - rb_str_cat_cstr(buf, rb_parser_lex_state_names[i]); - } + if ((unsigned)state & mask) { + if (sep) { + rb_str_cat(buf, "|", 1); + } + sep = 1; + rb_str_cat_cstr(buf, rb_parser_lex_state_names[i]); + } } if (!sep) { - rb_str_cat(buf, none, sizeof(none)-1); + rb_str_cat(buf, none, sizeof(none)-1); } return buf; } @@ -11277,17 +11277,17 @@ flush_debug_buffer(struct parser_params *p, VALUE out, VALUE str) VALUE mesg = p->debug_buffer; if (!NIL_P(mesg) && RSTRING_LEN(mesg)) { - p->debug_buffer = Qnil; - rb_io_puts(1, &mesg, out); + p->debug_buffer = Qnil; + rb_io_puts(1, &mesg, out); } if (!NIL_P(str) && RSTRING_LEN(str)) { - rb_io_write(p->debug_output, str); + rb_io_write(p->debug_output, str); } } enum lex_state_e rb_parser_trace_lex_state(struct parser_params *p, enum lex_state_e from, - enum lex_state_e to, int line) + enum lex_state_e to, int line) { VALUE mesg; mesg = rb_str_new_cstr("lex_state: "); @@ -11309,18 +11309,18 @@ static void append_bitstack_value(stack_type stack, VALUE mesg) { if (stack == 0) { - rb_str_cat_cstr(mesg, "0"); + rb_str_cat_cstr(mesg, "0"); } else { - stack_type mask = (stack_type)1U << (CHAR_BIT * sizeof(stack_type) - 1); - for (; mask && !(stack & mask); mask >>= 1) continue; - for (; mask; mask >>= 1) rb_str_cat(mesg, stack & mask ? "1" : "0", 1); + stack_type mask = (stack_type)1U << (CHAR_BIT * sizeof(stack_type) - 1); + for (; mask && !(stack & mask); mask >>= 1) continue; + for (; mask; mask >>= 1) rb_str_cat(mesg, stack & mask ? "1" : "0", 1); } } void rb_parser_show_bitstack(struct parser_params *p, stack_type stack, - const char *name, int line) + const char *name, int line) { VALUE mesg = rb_sprintf("%s: ", name); append_bitstack_value(stack, mesg); @@ -11350,7 +11350,7 @@ rb_parser_fatal(struct parser_params *p, const char *fmt, ...) append_bitstack_value(p->cmdarg_stack, mesg); compile_error(p, "cmdarg_stack: %"PRIsVALUE, mesg); if (p->debug_output == rb_ractor_stdout()) - p->debug_output = rb_ractor_stderr(); + p->debug_output = rb_ractor_stderr(); p->debug = TRUE; } @@ -11369,7 +11369,7 @@ rb_parser_set_location_from_strterm_heredoc(struct parser_params *p, rb_strterm_ { int sourceline = here->sourceline; int beg_pos = (int)here->offset - here->quote - - (rb_strlen_lit("<<-") - !(here->func & STR_FUNC_INDENT)); + - (rb_strlen_lit("<<-") - !(here->func & STR_FUNC_INDENT)); int end_pos = (int)here->offset + here->length + here->quote; return rb_parser_set_pos(yylloc, sourceline, beg_pos, end_pos); @@ -11428,55 +11428,55 @@ assignable0(struct parser_params *p, ID id, const char **err) if (!id) return -1; switch (id) { case keyword_self: - *err = "Can't change the value of self"; - return -1; + *err = "Can't change the value of self"; + return -1; case keyword_nil: - *err = "Can't assign to nil"; - return -1; + *err = "Can't assign to nil"; + return -1; case keyword_true: - *err = "Can't assign to true"; - return -1; + *err = "Can't assign to true"; + return -1; case keyword_false: - *err = "Can't assign to false"; - return -1; + *err = "Can't assign to false"; + return -1; case keyword__FILE__: - *err = "Can't assign to __FILE__"; - return -1; + *err = "Can't assign to __FILE__"; + return -1; case keyword__LINE__: - *err = "Can't assign to __LINE__"; - return -1; + *err = "Can't assign to __LINE__"; + return -1; case keyword__ENCODING__: - *err = "Can't assign to __ENCODING__"; - return -1; + *err = "Can't assign to __ENCODING__"; + return -1; } switch (id_type(id)) { case ID_LOCAL: - if (dyna_in_block(p)) { - if (p->max_numparam > NO_PARAM && NUMPARAM_ID_P(id)) { - compile_error(p, "Can't assign to numbered parameter _%d", - NUMPARAM_ID_TO_IDX(id)); - return -1; - } - if (dvar_curr(p, id)) return NODE_DASGN; - if (dvar_defined(p, id)) return NODE_DASGN; - if (local_id(p, id)) return NODE_LASGN; - dyna_var(p, id); - return NODE_DASGN; - } - else { - if (!local_id(p, id)) local_var(p, id); - return NODE_LASGN; - } - break; + if (dyna_in_block(p)) { + if (p->max_numparam > NO_PARAM && NUMPARAM_ID_P(id)) { + compile_error(p, "Can't assign to numbered parameter _%d", + NUMPARAM_ID_TO_IDX(id)); + return -1; + } + if (dvar_curr(p, id)) return NODE_DASGN; + if (dvar_defined(p, id)) return NODE_DASGN; + if (local_id(p, id)) return NODE_LASGN; + dyna_var(p, id); + return NODE_DASGN; + } + else { + if (!local_id(p, id)) local_var(p, id); + return NODE_LASGN; + } + break; case ID_GLOBAL: return NODE_GASGN; case ID_INSTANCE: return NODE_IASGN; case ID_CONST: - if (!p->ctxt.in_def) return NODE_CDECL; - *err = "dynamic constant assignment"; - return -1; + if (!p->ctxt.in_def) return NODE_CDECL; + *err = "dynamic constant assignment"; + return -1; case ID_CLASS: return NODE_CVASGN; default: - compile_error(p, "identifier %"PRIsVALUE" is not valid to set", rb_id2str(id)); + compile_error(p, "identifier %"PRIsVALUE" is not valid to set", rb_id2str(id)); } return -1; } @@ -11524,23 +11524,23 @@ static int shadowing_lvar_0(struct parser_params *p, ID name) { if (dyna_in_block(p)) { - if (dvar_curr(p, name)) { - if (is_private_local_id(name)) return 1; - yyerror0("duplicated argument name"); - } - else if (dvar_defined(p, name) || local_id(p, name)) { - vtable_add(p->lvtbl->vars, name); - if (p->lvtbl->used) { - vtable_add(p->lvtbl->used, (ID)p->ruby_sourceline | LVAR_USED); - } - return 0; - } + if (dvar_curr(p, name)) { + if (is_private_local_id(name)) return 1; + yyerror0("duplicated argument name"); + } + else if (dvar_defined(p, name) || local_id(p, name)) { + vtable_add(p->lvtbl->vars, name); + if (p->lvtbl->used) { + vtable_add(p->lvtbl->used, (ID)p->ruby_sourceline | LVAR_USED); + } + return 0; + } } else { - if (local_id(p, name)) { - if (is_private_local_id(name)) return 1; - yyerror0("duplicated argument name"); - } + if (local_id(p, name)) { + if (is_private_local_id(name)) return 1; + yyerror0("duplicated argument name"); + } } return 1; } @@ -11557,9 +11557,9 @@ new_bv(struct parser_params *p, ID name) { if (!name) return; if (!is_local_id(name)) { - compile_error(p, "invalid local variable - %"PRIsVALUE, - rb_id2str(name)); - return; + compile_error(p, "invalid local variable - %"PRIsVALUE, + rb_id2str(name)); + return; } if (!shadowing_lvar_0(p, name)) return; dyna_var(p, name); @@ -11576,7 +11576,7 @@ static void block_dup_check(struct parser_params *p, NODE *node1, NODE *node2) { if (node2 && node1 && nd_type_p(node1, NODE_BLOCK_PASS)) { - compile_error(p, "both block arg and actual block given"); + compile_error(p, "both block arg and actual block given"); } } @@ -11592,11 +11592,11 @@ rb_backref_error(struct parser_params *p, NODE *node) { switch (nd_type(node)) { case NODE_NTH_REF: - compile_error(p, "Can't set variable $%ld", node->nd_nth); - break; + compile_error(p, "Can't set variable $%ld", node->nd_nth); + break; case NODE_BACK_REF: - compile_error(p, "Can't set variable $%c", (int)node->nd_nth); - break; + compile_error(p, "Can't set variable $%c", (int)node->nd_nth); + break; } } #else @@ -11616,16 +11616,16 @@ arg_append(struct parser_params *p, NODE *node1, NODE *node2, const YYLTYPE *loc if (!node1) return NEW_LIST(node2, &node2->nd_loc); switch (nd_type(node1)) { case NODE_LIST: - return list_append(p, node1, node2); + return list_append(p, node1, node2); case NODE_BLOCK_PASS: - node1->nd_head = arg_append(p, node1->nd_head, node2, loc); - node1->nd_loc.end_pos = node1->nd_head->nd_loc.end_pos; - return node1; + node1->nd_head = arg_append(p, node1->nd_head, node2, loc); + node1->nd_loc.end_pos = node1->nd_head->nd_loc.end_pos; + return node1; case NODE_ARGSPUSH: - node1->nd_body = list_append(p, NEW_LIST(node1->nd_body, &node1->nd_body->nd_loc), node2); - node1->nd_loc.end_pos = node1->nd_body->nd_loc.end_pos; - nd_set_type(node1, NODE_ARGSCAT); - return node1; + node1->nd_body = list_append(p, NEW_LIST(node1->nd_body, &node1->nd_body->nd_loc), node2); + node1->nd_loc.end_pos = node1->nd_body->nd_loc.end_pos; + nd_set_type(node1, NODE_ARGSCAT); + return node1; case NODE_ARGSCAT: if (!nd_type_p(node1->nd_body, NODE_LIST)) break; node1->nd_body = list_append(p, node1->nd_body, node2); @@ -11641,21 +11641,21 @@ arg_concat(struct parser_params *p, NODE *node1, NODE *node2, const YYLTYPE *loc if (!node2) return node1; switch (nd_type(node1)) { case NODE_BLOCK_PASS: - if (node1->nd_head) - node1->nd_head = arg_concat(p, node1->nd_head, node2, loc); - else - node1->nd_head = NEW_LIST(node2, loc); - return node1; + if (node1->nd_head) + node1->nd_head = arg_concat(p, node1->nd_head, node2, loc); + else + node1->nd_head = NEW_LIST(node2, loc); + return node1; case NODE_ARGSPUSH: - if (!nd_type_p(node2, NODE_LIST)) break; - node1->nd_body = list_concat(NEW_LIST(node1->nd_body, loc), node2); - nd_set_type(node1, NODE_ARGSCAT); - return node1; + if (!nd_type_p(node2, NODE_LIST)) break; + node1->nd_body = list_concat(NEW_LIST(node1->nd_body, loc), node2); + nd_set_type(node1, NODE_ARGSCAT); + return node1; case NODE_ARGSCAT: - if (!nd_type_p(node2, NODE_LIST) || - !nd_type_p(node1->nd_body, NODE_LIST)) break; - node1->nd_body = list_concat(node1->nd_body, node2); - return node1; + if (!nd_type_p(node2, NODE_LIST) || + !nd_type_p(node1->nd_body, NODE_LIST)) break; + node1->nd_body = list_concat(node1->nd_body, node2); + return node1; } return NEW_ARGSCAT(node1, node2, loc); } @@ -11665,7 +11665,7 @@ last_arg_append(struct parser_params *p, NODE *args, NODE *last_arg, const YYLTY { NODE *n1; if ((n1 = splat_array(args)) != 0) { - return list_append(p, n1, last_arg); + return list_append(p, n1, last_arg); } return arg_append(p, args, last_arg, loc); } @@ -11675,7 +11675,7 @@ rest_arg_append(struct parser_params *p, NODE *args, NODE *rest_arg, const YYLTY { NODE *n1; if ((nd_type_p(rest_arg, NODE_LIST)) && (n1 = splat_array(args)) != 0) { - return list_concat(n1, rest_arg); + return list_concat(n1, rest_arg); } return arg_concat(p, args, rest_arg, loc); } @@ -11695,21 +11695,21 @@ mark_lvar_used(struct parser_params *p, NODE *rhs) if (!rhs) return; switch (nd_type(rhs)) { case NODE_LASGN: - if (local_id_ref(p, rhs->nd_vid, &vidp)) { - if (vidp) *vidp |= LVAR_USED; - } - break; + if (local_id_ref(p, rhs->nd_vid, &vidp)) { + if (vidp) *vidp |= LVAR_USED; + } + break; case NODE_DASGN: - if (dvar_defined_ref(p, rhs->nd_vid, &vidp)) { - if (vidp) *vidp |= LVAR_USED; - } - break; + if (dvar_defined_ref(p, rhs->nd_vid, &vidp)) { + if (vidp) *vidp |= LVAR_USED; + } + break; #if 0 case NODE_MASGN: - for (rhs = rhs->nd_head; rhs; rhs = rhs->nd_next) { - mark_lvar_used(p, rhs->nd_head); - } - break; + for (rhs = rhs->nd_head; rhs; rhs = rhs->nd_next) { + mark_lvar_used(p, rhs->nd_head); + } + break; #endif } } @@ -11719,33 +11719,33 @@ const_decl_path(struct parser_params *p, NODE **dest) { NODE *n = *dest; if (!nd_type_p(n, NODE_CALL)) { - const YYLTYPE *loc = &n->nd_loc; - VALUE path; - if (n->nd_vid) { - path = rb_id2str(n->nd_vid); - } - else { - n = n->nd_else; - path = rb_ary_new(); - for (; n && nd_type_p(n, NODE_COLON2); n = n->nd_head) { - rb_ary_push(path, rb_id2str(n->nd_mid)); - } - if (n && nd_type_p(n, NODE_CONST)) { - // Const::Name - rb_ary_push(path, rb_id2str(n->nd_vid)); - } - else if (n && nd_type_p(n, NODE_COLON3)) { - // ::Const::Name - rb_ary_push(path, rb_str_new(0, 0)); - } - else { - // expression::Name - rb_ary_push(path, rb_str_new_cstr("...")); - } - path = rb_ary_join(rb_ary_reverse(path), rb_str_new_cstr("::")); - path = rb_fstring(path); - } - *dest = n = NEW_LIT(path, loc); + const YYLTYPE *loc = &n->nd_loc; + VALUE path; + if (n->nd_vid) { + path = rb_id2str(n->nd_vid); + } + else { + n = n->nd_else; + path = rb_ary_new(); + for (; n && nd_type_p(n, NODE_COLON2); n = n->nd_head) { + rb_ary_push(path, rb_id2str(n->nd_mid)); + } + if (n && nd_type_p(n, NODE_CONST)) { + // Const::Name + rb_ary_push(path, rb_id2str(n->nd_vid)); + } + else if (n && nd_type_p(n, NODE_COLON3)) { + // ::Const::Name + rb_ary_push(path, rb_str_new(0, 0)); + } + else { + // expression::Name + rb_ary_push(path, rb_str_new_cstr("...")); + } + path = rb_ary_join(rb_ary_reverse(path), rb_str_new_cstr("::")); + path = rb_fstring(path); + } + *dest = n = NEW_LIT(path, loc); RB_OBJ_WRITTEN(p->ast, Qnil, n->nd_lit); } return n; @@ -11786,15 +11786,15 @@ shareable_literal_value(NODE *node) enum node_type type = nd_type(node); switch (type) { case NODE_TRUE: - return Qtrue; + return Qtrue; case NODE_FALSE: - return Qfalse; + return Qfalse; case NODE_NIL: - return Qnil; + return Qnil; case NODE_LIT: - return node->nd_lit; + return node->nd_lit; default: - return Qundef; + return Qundef; } } @@ -11804,7 +11804,7 @@ shareable_literal_value(NODE *node) static NODE * shareable_literal_constant(struct parser_params *p, enum shareability shareable, - NODE **dest, NODE *value, const YYLTYPE *loc, size_t level) + NODE **dest, NODE *value, const YYLTYPE *loc, size_t level) { # define shareable_literal_constant_next(n) \ shareable_literal_constant(p, shareable, dest, (n), &(n)->nd_loc, level+1) @@ -11817,111 +11817,111 @@ shareable_literal_constant(struct parser_params *p, enum shareability shareable, case NODE_FALSE: case NODE_NIL: case NODE_LIT: - return value; + return value; case NODE_DSTR: - if (shareable == shareable_literal) { - value = NEW_CALL(value, idUMinus, 0, loc); - } - return value; + if (shareable == shareable_literal) { + value = NEW_CALL(value, idUMinus, 0, loc); + } + return value; case NODE_STR: - lit = rb_fstring(value->nd_lit); - nd_set_type(value, NODE_LIT); - RB_OBJ_WRITE(p->ast, &value->nd_lit, lit); - return value; + lit = rb_fstring(value->nd_lit); + nd_set_type(value, NODE_LIT); + RB_OBJ_WRITE(p->ast, &value->nd_lit, lit); + return value; case NODE_ZLIST: - lit = rb_ary_new(); - OBJ_FREEZE_RAW(lit); + lit = rb_ary_new(); + OBJ_FREEZE_RAW(lit); NODE *n = NEW_LIT(lit, loc); RB_OBJ_WRITTEN(p->ast, Qnil, n->nd_lit); return n; case NODE_LIST: - lit = rb_ary_new(); - for (NODE *n = value; n; n = n->nd_next) { - NODE *elt = n->nd_head; - if (elt) { - elt = shareable_literal_constant_next(elt); - if (elt) { - n->nd_head = elt; - } - else if (RTEST(lit)) { - rb_ary_clear(lit); - lit = Qfalse; - } - } - if (RTEST(lit)) { - VALUE e = shareable_literal_value(elt); - if (!UNDEF_P(e)) { - rb_ary_push(lit, e); - } - else { - rb_ary_clear(lit); - lit = Qnil; /* make shareable at runtime */ - } - } - } - break; + lit = rb_ary_new(); + for (NODE *n = value; n; n = n->nd_next) { + NODE *elt = n->nd_head; + if (elt) { + elt = shareable_literal_constant_next(elt); + if (elt) { + n->nd_head = elt; + } + else if (RTEST(lit)) { + rb_ary_clear(lit); + lit = Qfalse; + } + } + if (RTEST(lit)) { + VALUE e = shareable_literal_value(elt); + if (!UNDEF_P(e)) { + rb_ary_push(lit, e); + } + else { + rb_ary_clear(lit); + lit = Qnil; /* make shareable at runtime */ + } + } + } + break; case NODE_HASH: - if (!value->nd_brace) return 0; - lit = rb_hash_new(); - for (NODE *n = value->nd_head; n; n = n->nd_next->nd_next) { - NODE *key = n->nd_head; - NODE *val = n->nd_next->nd_head; - if (key) { - key = shareable_literal_constant_next(key); - if (key) { - n->nd_head = key; - } - else if (RTEST(lit)) { - rb_hash_clear(lit); - lit = Qfalse; - } - } - if (val) { - val = shareable_literal_constant_next(val); - if (val) { - n->nd_next->nd_head = val; - } - else if (RTEST(lit)) { - rb_hash_clear(lit); - lit = Qfalse; - } - } - if (RTEST(lit)) { - VALUE k = shareable_literal_value(key); - VALUE v = shareable_literal_value(val); - if (!UNDEF_P(k) && !UNDEF_P(v)) { - rb_hash_aset(lit, k, v); - } - else { - rb_hash_clear(lit); - lit = Qnil; /* make shareable at runtime */ - } - } - } - break; + if (!value->nd_brace) return 0; + lit = rb_hash_new(); + for (NODE *n = value->nd_head; n; n = n->nd_next->nd_next) { + NODE *key = n->nd_head; + NODE *val = n->nd_next->nd_head; + if (key) { + key = shareable_literal_constant_next(key); + if (key) { + n->nd_head = key; + } + else if (RTEST(lit)) { + rb_hash_clear(lit); + lit = Qfalse; + } + } + if (val) { + val = shareable_literal_constant_next(val); + if (val) { + n->nd_next->nd_head = val; + } + else if (RTEST(lit)) { + rb_hash_clear(lit); + lit = Qfalse; + } + } + if (RTEST(lit)) { + VALUE k = shareable_literal_value(key); + VALUE v = shareable_literal_value(val); + if (!UNDEF_P(k) && !UNDEF_P(v)) { + rb_hash_aset(lit, k, v); + } + else { + rb_hash_clear(lit); + lit = Qnil; /* make shareable at runtime */ + } + } + } + break; default: - if (shareable == shareable_literal && - (SHAREABLE_BARE_EXPRESSION || level > 0)) { - return ensure_shareable_node(p, dest, value, loc); - } - return 0; + if (shareable == shareable_literal && + (SHAREABLE_BARE_EXPRESSION || level > 0)) { + return ensure_shareable_node(p, dest, value, loc); + } + return 0; } /* Array or Hash */ if (!lit) return 0; if (NIL_P(lit)) { - // if shareable_literal, all elements should have been ensured - // as shareable - value = make_shareable_node(p, value, false, loc); + // if shareable_literal, all elements should have been ensured + // as shareable + value = make_shareable_node(p, value, false, loc); } else { - value = NEW_LIT(rb_ractor_make_shareable(lit), loc); + value = NEW_LIT(rb_ractor_make_shareable(lit), loc); RB_OBJ_WRITTEN(p->ast, Qnil, value->nd_lit); } @@ -11931,32 +11931,32 @@ shareable_literal_constant(struct parser_params *p, enum shareability shareable, static NODE * shareable_constant_value(struct parser_params *p, enum shareability shareable, - NODE *lhs, NODE *value, const YYLTYPE *loc) + NODE *lhs, NODE *value, const YYLTYPE *loc) { if (!value) return 0; switch (shareable) { case shareable_none: - return value; + return value; case shareable_literal: - { - NODE *lit = shareable_literal_constant(p, shareable, &lhs, value, loc, 0); - if (lit) return lit; - return value; - } - break; + { + NODE *lit = shareable_literal_constant(p, shareable, &lhs, value, loc, 0); + if (lit) return lit; + return value; + } + break; case shareable_copy: case shareable_everything: - { - NODE *lit = shareable_literal_constant(p, shareable, &lhs, value, loc, 0); - if (lit) return lit; - return make_shareable_node(p, value, shareable == shareable_copy, loc); - } - break; + { + NODE *lit = shareable_literal_constant(p, shareable, &lhs, value, loc, 0); + if (lit) return lit; + return make_shareable_node(p, value, shareable == shareable_copy, loc); + } + break; default: - UNREACHABLE_RETURN(0); + UNREACHABLE_RETURN(0); } } @@ -11967,8 +11967,8 @@ node_assign(struct parser_params *p, NODE *lhs, NODE *rhs, struct lex_context ct switch (nd_type(lhs)) { case NODE_CDECL: - rhs = shareable_constant_value(p, ctxt.shareable_constant_value, lhs, rhs, loc); - /* fallthru */ + rhs = shareable_constant_value(p, ctxt.shareable_constant_value, lhs, rhs, loc); + /* fallthru */ case NODE_GASGN: case NODE_IASGN: @@ -11976,18 +11976,18 @@ node_assign(struct parser_params *p, NODE *lhs, NODE *rhs, struct lex_context ct case NODE_DASGN: case NODE_MASGN: case NODE_CVASGN: - lhs->nd_value = rhs; - nd_set_loc(lhs, loc); - break; + lhs->nd_value = rhs; + nd_set_loc(lhs, loc); + break; case NODE_ATTRASGN: - lhs->nd_args = arg_append(p, lhs->nd_args, rhs, loc); - nd_set_loc(lhs, loc); - break; + lhs->nd_args = arg_append(p, lhs->nd_args, rhs, loc); + nd_set_loc(lhs, loc); + break; default: - /* should not happen */ - break; + /* should not happen */ + break; } return lhs; @@ -11999,67 +11999,67 @@ value_expr_check(struct parser_params *p, NODE *node) NODE *void_node = 0, *vn; if (!node) { - rb_warning0("empty expression"); + rb_warning0("empty expression"); } while (node) { - switch (nd_type(node)) { - case NODE_RETURN: - case NODE_BREAK: - case NODE_NEXT: - case NODE_REDO: - case NODE_RETRY: - return void_node ? void_node : node; - - case NODE_CASE3: - if (!node->nd_body || !nd_type_p(node->nd_body, NODE_IN)) { - compile_error(p, "unexpected node"); - return NULL; - } - if (node->nd_body->nd_body) { - return NULL; - } - /* single line pattern matching */ - return void_node ? void_node : node; - - case NODE_BLOCK: - while (node->nd_next) { - node = node->nd_next; - } - node = node->nd_head; - break; - - case NODE_BEGIN: - node = node->nd_body; - break; - - case NODE_IF: - case NODE_UNLESS: - if (!node->nd_body) { - return NULL; - } - else if (!node->nd_else) { - return NULL; - } - vn = value_expr_check(p, node->nd_body); - if (!vn) return NULL; - if (!void_node) void_node = vn; - node = node->nd_else; - break; - - case NODE_AND: - case NODE_OR: - node = node->nd_1st; - break; - - case NODE_LASGN: - case NODE_DASGN: - case NODE_MASGN: - mark_lvar_used(p, node); - return NULL; - - default: - return NULL; - } + switch (nd_type(node)) { + case NODE_RETURN: + case NODE_BREAK: + case NODE_NEXT: + case NODE_REDO: + case NODE_RETRY: + return void_node ? void_node : node; + + case NODE_CASE3: + if (!node->nd_body || !nd_type_p(node->nd_body, NODE_IN)) { + compile_error(p, "unexpected node"); + return NULL; + } + if (node->nd_body->nd_body) { + return NULL; + } + /* single line pattern matching */ + return void_node ? void_node : node; + + case NODE_BLOCK: + while (node->nd_next) { + node = node->nd_next; + } + node = node->nd_head; + break; + + case NODE_BEGIN: + node = node->nd_body; + break; + + case NODE_IF: + case NODE_UNLESS: + if (!node->nd_body) { + return NULL; + } + else if (!node->nd_else) { + return NULL; + } + vn = value_expr_check(p, node->nd_body); + if (!vn) return NULL; + if (!void_node) void_node = vn; + node = node->nd_else; + break; + + case NODE_AND: + case NODE_OR: + node = node->nd_1st; + break; + + case NODE_LASGN: + case NODE_DASGN: + case NODE_MASGN: + mark_lvar_used(p, node); + return NULL; + + default: + return NULL; + } } return NULL; @@ -12070,9 +12070,9 @@ value_expr_gen(struct parser_params *p, NODE *node) { NODE *void_node = value_expr_check(p, node); if (void_node) { - yyerror1(&void_node->nd_loc, "void value expression"); - /* or "control never reach"? */ - return FALSE; + yyerror1(&void_node->nd_loc, "void value expression"); + /* or "control never reach"? */ + return FALSE; } return TRUE; } @@ -12086,29 +12086,29 @@ void_expr(struct parser_params *p, NODE *node) if (!node || !(node = nd_once_body(node))) return; switch (nd_type(node)) { case NODE_OPCALL: - switch (node->nd_mid) { - case '+': - case '-': - case '*': - case '/': - case '%': - case tPOW: - case tUPLUS: - case tUMINUS: - case '|': - case '^': - case '&': - case tCMP: - case '>': - case tGEQ: - case '<': - case tLEQ: - case tEQ: - case tNEQ: - useless = rb_id2name(node->nd_mid); - break; - } - break; + switch (node->nd_mid) { + case '+': + case '-': + case '*': + case '/': + case '%': + case tPOW: + case tUPLUS: + case tUMINUS: + case '|': + case '^': + case '&': + case tCMP: + case '>': + case tGEQ: + case '<': + case tLEQ: + case tEQ: + case tNEQ: + useless = rb_id2name(node->nd_mid); + break; + } + break; case NODE_LVAR: case NODE_DVAR: @@ -12117,46 +12117,46 @@ void_expr(struct parser_params *p, NODE *node) case NODE_CVAR: case NODE_NTH_REF: case NODE_BACK_REF: - useless = "a variable"; - break; + useless = "a variable"; + break; case NODE_CONST: - useless = "a constant"; - break; + useless = "a constant"; + break; case NODE_LIT: case NODE_STR: case NODE_DSTR: case NODE_DREGX: - useless = "a literal"; - break; + useless = "a literal"; + break; case NODE_COLON2: case NODE_COLON3: - useless = "::"; - break; + useless = "::"; + break; case NODE_DOT2: - useless = ".."; - break; + useless = ".."; + break; case NODE_DOT3: - useless = "..."; - break; + useless = "..."; + break; case NODE_SELF: - useless = "self"; - break; + useless = "self"; + break; case NODE_NIL: - useless = "nil"; - break; + useless = "nil"; + break; case NODE_TRUE: - useless = "true"; - break; + useless = "true"; + break; case NODE_FALSE: - useless = "false"; - break; + useless = "false"; + break; case NODE_DEFINED: - useless = "defined?"; - break; + useless = "defined?"; + break; } if (useless) { - rb_warn1L(nd_line(node), "possibly useless use of %s in void context", WARN_S(useless)); + rb_warn1L(nd_line(node), "possibly useless use of %s in void context", WARN_S(useless)); } } @@ -12169,8 +12169,8 @@ void_stmts(struct parser_params *p, NODE *node) if (!nd_type_p(node, NODE_BLOCK)) return n; while (node->nd_next) { - void_expr(p, node->nd_head); - node = node->nd_next; + void_expr(p, node->nd_head); + node = node->nd_next; } return n; } @@ -12180,7 +12180,7 @@ remove_begin(NODE *node) { NODE **n = &node, *n1 = node; while (n1 && nd_type_p(n1, NODE_BEGIN) && n1->nd_body) { - *n = n1 = n1->nd_body; + *n = n1 = n1->nd_body; } return node; } @@ -12190,7 +12190,7 @@ remove_begin_all(NODE *node) { NODE **n = &node, *n1 = node; while (n1 && nd_type_p(n1, NODE_BEGIN)) { - *n = n1 = n1->nd_body; + *n = n1 = n1->nd_body; } return node; } @@ -12201,8 +12201,8 @@ reduce_nodes(struct parser_params *p, NODE **body) NODE *node = *body; if (!node) { - *body = NEW_NIL(&NULL_LOC); - return; + *body = NEW_NIL(&NULL_LOC); + return; } #define subnodes(n1, n2) \ ((!node->n1) ? (node->n2 ? (body = &node->n2, 1) : 0) : \ @@ -12210,48 +12210,48 @@ reduce_nodes(struct parser_params *p, NODE **body) (reduce_nodes(p, &node->n1), body = &node->n2, 1)) while (node) { - int newline = (int)(node->flags & NODE_FL_NEWLINE); - switch (nd_type(node)) { - end: - case NODE_NIL: - *body = 0; - return; - case NODE_RETURN: - *body = node = node->nd_stts; - if (newline && node) node->flags |= NODE_FL_NEWLINE; - continue; - case NODE_BEGIN: - *body = node = node->nd_body; - if (newline && node) node->flags |= NODE_FL_NEWLINE; - continue; - case NODE_BLOCK: - body = &node->nd_end->nd_head; - break; - case NODE_IF: - case NODE_UNLESS: - if (subnodes(nd_body, nd_else)) break; - return; - case NODE_CASE: - body = &node->nd_body; - break; - case NODE_WHEN: - if (!subnodes(nd_body, nd_next)) goto end; - break; - case NODE_ENSURE: - if (!subnodes(nd_head, nd_resq)) goto end; - break; - case NODE_RESCUE: - if (node->nd_else) { - body = &node->nd_resq; - break; - } - if (!subnodes(nd_head, nd_resq)) goto end; - break; - default: - return; - } - node = *body; - if (newline && node) node->flags |= NODE_FL_NEWLINE; + int newline = (int)(node->flags & NODE_FL_NEWLINE); + switch (nd_type(node)) { + end: + case NODE_NIL: + *body = 0; + return; + case NODE_RETURN: + *body = node = node->nd_stts; + if (newline && node) node->flags |= NODE_FL_NEWLINE; + continue; + case NODE_BEGIN: + *body = node = node->nd_body; + if (newline && node) node->flags |= NODE_FL_NEWLINE; + continue; + case NODE_BLOCK: + body = &node->nd_end->nd_head; + break; + case NODE_IF: + case NODE_UNLESS: + if (subnodes(nd_body, nd_else)) break; + return; + case NODE_CASE: + body = &node->nd_body; + break; + case NODE_WHEN: + if (!subnodes(nd_body, nd_next)) goto end; + break; + case NODE_ENSURE: + if (!subnodes(nd_head, nd_resq)) goto end; + break; + case NODE_RESCUE: + if (node->nd_else) { + body = &node->nd_resq; + break; + } + if (!subnodes(nd_head, nd_resq)) goto end; + break; + default: + return; + } + node = *body; + if (newline && node) node->flags |= NODE_FL_NEWLINE; } #undef subnodes @@ -12263,20 +12263,20 @@ is_static_content(NODE *node) if (!node) return 1; switch (nd_type(node)) { case NODE_HASH: - if (!(node = node->nd_head)) break; + if (!(node = node->nd_head)) break; case NODE_LIST: - do { - if (!is_static_content(node->nd_head)) return 0; - } while ((node = node->nd_next) != 0); + do { + if (!is_static_content(node->nd_head)) return 0; + } while ((node = node->nd_next) != 0); case NODE_LIT: case NODE_STR: case NODE_NIL: case NODE_TRUE: case NODE_FALSE: case NODE_ZLIST: - break; + break; default: - return 0; + return 0; } return 1; } @@ -12290,16 +12290,16 @@ assign_in_cond(struct parser_params *p, NODE *node) case NODE_DASGN: case NODE_GASGN: case NODE_IASGN: - break; + break; default: - return 0; + return 0; } if (!node->nd_value) return 1; if (is_static_content(node->nd_value)) { - /* reports always */ - parser_warn(p, node->nd_value, "found `= literal' in conditional, should be =="); + /* reports always */ + parser_warn(p, node->nd_value, "found `= literal' in conditional, should be =="); } return 1; } @@ -12329,9 +12329,9 @@ range_op(struct parser_params *p, NODE *node, const YYLTYPE *loc) type = nd_type(node); value_expr(node); if (type == NODE_LIT && FIXNUM_P(node->nd_lit)) { - if (!e_option_supplied(p)) parser_warn(p, node, "integer literal in flip-flop"); - ID lineno = rb_intern("$."); - return NEW_CALL(node, tEQ, NEW_LIST(NEW_GVAR(lineno, loc), loc), loc); + if (!e_option_supplied(p)) parser_warn(p, node, "integer literal in flip-flop"); + ID lineno = rb_intern("$."); + return NEW_CALL(node, tEQ, NEW_LIST(NEW_GVAR(lineno, loc), loc), loc); } return cond0(p, node, COND_IN_FF, loc); } @@ -12347,50 +12347,50 @@ cond0(struct parser_params *p, NODE *node, enum cond_type type, const YYLTYPE *l case NODE_DSTR: case NODE_EVSTR: case NODE_STR: - SWITCH_BY_COND_TYPE(type, warn, "string ") - break; + SWITCH_BY_COND_TYPE(type, warn, "string ") + break; case NODE_DREGX: - if (!e_option_supplied(p)) SWITCH_BY_COND_TYPE(type, warning, "regex ") + if (!e_option_supplied(p)) SWITCH_BY_COND_TYPE(type, warning, "regex ") - return NEW_MATCH2(node, NEW_GVAR(idLASTLINE, loc), loc); + return NEW_MATCH2(node, NEW_GVAR(idLASTLINE, loc), loc); case NODE_AND: case NODE_OR: - node->nd_1st = cond0(p, node->nd_1st, COND_IN_COND, loc); - node->nd_2nd = cond0(p, node->nd_2nd, COND_IN_COND, loc); - break; + node->nd_1st = cond0(p, node->nd_1st, COND_IN_COND, loc); + node->nd_2nd = cond0(p, node->nd_2nd, COND_IN_COND, loc); + break; case NODE_DOT2: case NODE_DOT3: - node->nd_beg = range_op(p, node->nd_beg, loc); - node->nd_end = range_op(p, node->nd_end, loc); - if (nd_type_p(node, NODE_DOT2)) nd_set_type(node,NODE_FLIP2); - else if (nd_type_p(node, NODE_DOT3)) nd_set_type(node, NODE_FLIP3); - break; + node->nd_beg = range_op(p, node->nd_beg, loc); + node->nd_end = range_op(p, node->nd_end, loc); + if (nd_type_p(node, NODE_DOT2)) nd_set_type(node,NODE_FLIP2); + else if (nd_type_p(node, NODE_DOT3)) nd_set_type(node, NODE_FLIP3); + break; case NODE_DSYM: warn_symbol: - SWITCH_BY_COND_TYPE(type, warning, "symbol ") - break; + SWITCH_BY_COND_TYPE(type, warning, "symbol ") + break; case NODE_LIT: - if (RB_TYPE_P(node->nd_lit, T_REGEXP)) { - if (!e_option_supplied(p)) SWITCH_BY_COND_TYPE(type, warn, "regex ") - nd_set_type(node, NODE_MATCH); - } - else if (node->nd_lit == Qtrue || - node->nd_lit == Qfalse) { - /* booleans are OK, e.g., while true */ - } - else if (SYMBOL_P(node->nd_lit)) { - goto warn_symbol; - } - else { - SWITCH_BY_COND_TYPE(type, warning, "") - } + if (RB_TYPE_P(node->nd_lit, T_REGEXP)) { + if (!e_option_supplied(p)) SWITCH_BY_COND_TYPE(type, warn, "regex ") + nd_set_type(node, NODE_MATCH); + } + else if (node->nd_lit == Qtrue || + node->nd_lit == Qfalse) { + /* booleans are OK, e.g., while true */ + } + else if (SYMBOL_P(node->nd_lit)) { + goto warn_symbol; + } + else { + SWITCH_BY_COND_TYPE(type, warning, "") + } default: - break; + break; } return node; } @@ -12434,20 +12434,20 @@ new_unless(struct parser_params *p, NODE *cc, NODE *left, NODE *right, const YYL static NODE* logop(struct parser_params *p, ID id, NODE *left, NODE *right, - const YYLTYPE *op_loc, const YYLTYPE *loc) + const YYLTYPE *op_loc, const YYLTYPE *loc) { enum node_type type = id == idAND || id == idANDOP ? NODE_AND : NODE_OR; NODE *op; value_expr(left); if (left && nd_type_p(left, type)) { - NODE *node = left, *second; - while ((second = node->nd_2nd) != 0 && nd_type_p(second, type)) { - node = second; - } - node->nd_2nd = NEW_NODE(type, second, right, 0, loc); - nd_set_line(node->nd_2nd, op_loc->beg_pos.lineno); - left->nd_loc.end_pos = loc->end_pos; - return left; + NODE *node = left, *second; + while ((second = node->nd_2nd) != 0 && nd_type_p(second, type)) { + node = second; + } + node->nd_2nd = NEW_NODE(type, second, right, 0, loc); + nd_set_line(node->nd_2nd, op_loc->beg_pos.lineno); + left->nd_loc.end_pos = loc->end_pos; + return left; } op = NEW_NODE(type, left, right, 0, loc); nd_set_line(op, op_loc->beg_pos.lineno); @@ -12458,7 +12458,7 @@ static void no_blockarg(struct parser_params *p, NODE *node) { if (nd_type_p(node, NODE_BLOCK_PASS)) { - compile_error(p, "block argument should not be given"); + compile_error(p, "block argument should not be given"); } } @@ -12466,15 +12466,15 @@ static NODE * ret_args(struct parser_params *p, NODE *node) { if (node) { - no_blockarg(p, node); - if (nd_type_p(node, NODE_LIST)) { - if (node->nd_next == 0) { - node = node->nd_head; - } - else { - nd_set_type(node, NODE_VALUES); - } - } + no_blockarg(p, node); + if (nd_type_p(node, NODE_LIST)) { + if (node->nd_next == 0) { + node = node->nd_head; + } + else { + nd_set_type(node, NODE_VALUES); + } + } } return node; } @@ -12491,36 +12491,36 @@ static VALUE negate_lit(struct parser_params *p, VALUE lit) { if (FIXNUM_P(lit)) { - return LONG2FIX(-FIX2LONG(lit)); + return LONG2FIX(-FIX2LONG(lit)); } if (SPECIAL_CONST_P(lit)) { #if USE_FLONUM - if (FLONUM_P(lit)) { - return DBL2NUM(-RFLOAT_VALUE(lit)); - } + if (FLONUM_P(lit)) { + return DBL2NUM(-RFLOAT_VALUE(lit)); + } #endif - goto unknown; + goto unknown; } switch (BUILTIN_TYPE(lit)) { case T_BIGNUM: - BIGNUM_NEGATE(lit); - lit = rb_big_norm(lit); - break; + BIGNUM_NEGATE(lit); + lit = rb_big_norm(lit); + break; case T_RATIONAL: - RATIONAL_SET_NUM(lit, negate_lit(p, RRATIONAL(lit)->num)); - break; + RATIONAL_SET_NUM(lit, negate_lit(p, RRATIONAL(lit)->num)); + break; case T_COMPLEX: - RCOMPLEX_SET_REAL(lit, negate_lit(p, RCOMPLEX(lit)->real)); - RCOMPLEX_SET_IMAG(lit, negate_lit(p, RCOMPLEX(lit)->imag)); - break; + RCOMPLEX_SET_REAL(lit, negate_lit(p, RCOMPLEX(lit)->real)); + RCOMPLEX_SET_IMAG(lit, negate_lit(p, RCOMPLEX(lit)->imag)); + break; case T_FLOAT: - lit = DBL2NUM(-RFLOAT_VALUE(lit)); - break; + lit = DBL2NUM(-RFLOAT_VALUE(lit)); + break; unknown: default: - rb_parser_fatal(p, "unknown literal type (%s) passed to negate_lit", - rb_builtin_class_name(lit)); - break; + rb_parser_fatal(p, "unknown literal type (%s) passed to negate_lit", + rb_builtin_class_name(lit)); + break; } return lit; } @@ -12530,10 +12530,10 @@ arg_blk_pass(NODE *node1, NODE *node2) { if (node2) { if (!node1) return node2; - node2->nd_head = node1; - nd_set_first_lineno(node2, nd_first_lineno(node1)); - nd_set_first_column(node2, nd_first_column(node1)); - return node2; + node2->nd_head = node1; + nd_set_first_lineno(node2, nd_first_lineno(node1)); + nd_set_first_column(node2, nd_first_column(node1)); + return node2; } return node1; } @@ -12558,11 +12558,11 @@ new_args(struct parser_params *p, NODE *pre_args, NODE *opt_args, ID rest_arg, N struct rb_args_info *args = tail->nd_ainfo; if (args->forwarding) { - if (rest_arg) { - yyerror1(&tail->nd_loc, "... after rest argument"); - return tail; - } - rest_arg = idFWD_REST; + if (rest_arg) { + yyerror1(&tail->nd_loc, "... after rest argument"); + return tail; + } + rest_arg = idFWD_REST; } args->pre_args_num = pre_args ? rb_long2int(pre_args->nd_plen) : 0; @@ -12605,48 +12605,48 @@ new_args_tail(struct parser_params *p, NODE *kw_args, ID kw_rest_arg, ID block, args->kw_args = kw_args; if (kw_args) { - /* - * def foo(k1: 1, kr1:, k2: 2, **krest, &b) - * variable order: k1, kr1, k2, &b, internal_id, krest - * #=> - * variable order: kr1, k1, k2, internal_id, krest, &b - */ - ID kw_bits = internal_id(p), *required_kw_vars, *kw_vars; - struct vtable *vtargs = p->lvtbl->args; - NODE *kwn = kw_args; + /* + * def foo(k1: 1, kr1:, k2: 2, **krest, &b) + * variable order: k1, kr1, k2, &b, internal_id, krest + * #=> + * variable order: kr1, k1, k2, internal_id, krest, &b + */ + ID kw_bits = internal_id(p), *required_kw_vars, *kw_vars; + struct vtable *vtargs = p->lvtbl->args; + NODE *kwn = kw_args; if (block) block = vtargs->tbl[vtargs->pos-1]; - vtable_pop(vtargs, !!block + !!kw_rest_arg); - required_kw_vars = kw_vars = &vtargs->tbl[vtargs->pos]; - while (kwn) { - if (!NODE_REQUIRED_KEYWORD_P(kwn->nd_body)) - --kw_vars; - --required_kw_vars; - kwn = kwn->nd_next; - } - - for (kwn = kw_args; kwn; kwn = kwn->nd_next) { - ID vid = kwn->nd_body->nd_vid; - if (NODE_REQUIRED_KEYWORD_P(kwn->nd_body)) { - *required_kw_vars++ = vid; - } - else { - *kw_vars++ = vid; - } - } - - arg_var(p, kw_bits); - if (kw_rest_arg) arg_var(p, kw_rest_arg); - if (block) arg_var(p, block); - - args->kw_rest_arg = NEW_DVAR(kw_rest_arg, kw_rest_loc); - args->kw_rest_arg->nd_cflag = kw_bits; + vtable_pop(vtargs, !!block + !!kw_rest_arg); + required_kw_vars = kw_vars = &vtargs->tbl[vtargs->pos]; + while (kwn) { + if (!NODE_REQUIRED_KEYWORD_P(kwn->nd_body)) + --kw_vars; + --required_kw_vars; + kwn = kwn->nd_next; + } + + for (kwn = kw_args; kwn; kwn = kwn->nd_next) { + ID vid = kwn->nd_body->nd_vid; + if (NODE_REQUIRED_KEYWORD_P(kwn->nd_body)) { + *required_kw_vars++ = vid; + } + else { + *kw_vars++ = vid; + } + } + + arg_var(p, kw_bits); + if (kw_rest_arg) arg_var(p, kw_rest_arg); + if (block) arg_var(p, block); + + args->kw_rest_arg = NEW_DVAR(kw_rest_arg, kw_rest_loc); + args->kw_rest_arg->nd_cflag = kw_bits; } else if (kw_rest_arg == idNil) { - args->no_kwarg = 1; + args->no_kwarg = 1; } else if (kw_rest_arg) { - args->kw_rest_arg = NEW_DVAR(kw_rest_arg, kw_rest_loc); + args->kw_rest_arg = NEW_DVAR(kw_rest_arg, kw_rest_loc); } p->ruby_sourceline = saved_line; @@ -12657,12 +12657,12 @@ static NODE * args_with_numbered(struct parser_params *p, NODE *args, int max_numparam) { if (max_numparam > NO_PARAM) { - if (!args) { - YYLTYPE loc = RUBY_INIT_YYLLOC(); - args = new_args_tail(p, 0, 0, 0, 0); - nd_set_loc(args, &loc); - } - args->nd_ainfo->pre_args_num = max_numparam; + if (!args) { + YYLTYPE loc = RUBY_INIT_YYLLOC(); + args = new_args_tail(p, 0, 0, 0, 0); + nd_set_loc(args, &loc); + } + args->nd_ainfo->pre_args_num = max_numparam; } return args; } @@ -12675,13 +12675,13 @@ new_array_pattern(struct parser_params *p, NODE *constant, NODE *pre_arg, NODE * aryptn->nd_pconst = constant; if (pre_arg) { - NODE *pre_args = NEW_LIST(pre_arg, loc); - if (apinfo->pre_args) { - apinfo->pre_args = list_concat(pre_args, apinfo->pre_args); - } - else { - apinfo->pre_args = pre_args; - } + NODE *pre_args = NEW_LIST(pre_arg, loc); + if (apinfo->pre_args) { + apinfo->pre_args = list_concat(pre_args, apinfo->pre_args); + } + else { + apinfo->pre_args = pre_args; + } } return aryptn; } @@ -12700,15 +12700,15 @@ new_array_pattern_tail(struct parser_params *p, NODE *pre_args, int has_rest, ID apinfo->pre_args = pre_args; if (has_rest) { - if (rest_arg) { - apinfo->rest_arg = assignable(p, rest_arg, 0, loc); - } - else { - apinfo->rest_arg = NODE_SPECIAL_NO_NAME_REST; - } + if (rest_arg) { + apinfo->rest_arg = assignable(p, rest_arg, 0, loc); + } + else { + apinfo->rest_arg = NODE_SPECIAL_NO_NAME_REST; + } } else { - apinfo->rest_arg = NULL; + apinfo->rest_arg = NULL; } apinfo->post_args = post_args; @@ -12758,13 +12758,13 @@ new_hash_pattern_tail(struct parser_params *p, NODE *kw_args, ID kw_rest_arg, co NODE *node, *kw_rest_arg_node; if (kw_rest_arg == idNil) { - kw_rest_arg_node = NODE_SPECIAL_NO_REST_KEYWORD; + kw_rest_arg_node = NODE_SPECIAL_NO_REST_KEYWORD; } else if (kw_rest_arg) { - kw_rest_arg_node = assignable(p, kw_rest_arg, 0, loc); + kw_rest_arg_node = assignable(p, kw_rest_arg, 0, loc); } else { - kw_rest_arg_node = NULL; + kw_rest_arg_node = NULL; } node = NEW_NODE(NODE_HSHPTN, 0, kw_args, kw_rest_arg_node, loc); @@ -12779,23 +12779,23 @@ dsym_node(struct parser_params *p, NODE *node, const YYLTYPE *loc) VALUE lit; if (!node) { - return NEW_LIT(ID2SYM(idNULL), loc); + return NEW_LIT(ID2SYM(idNULL), loc); } switch (nd_type(node)) { case NODE_DSTR: - nd_set_type(node, NODE_DSYM); - nd_set_loc(node, loc); - break; + nd_set_type(node, NODE_DSYM); + nd_set_loc(node, loc); + break; case NODE_STR: - lit = node->nd_lit; - RB_OBJ_WRITTEN(p->ast, Qnil, node->nd_lit = ID2SYM(rb_intern_str(lit))); - nd_set_type(node, NODE_LIT); - nd_set_loc(node, loc); - break; + lit = node->nd_lit; + RB_OBJ_WRITTEN(p->ast, Qnil, node->nd_lit = ID2SYM(rb_intern_str(lit))); + nd_set_type(node, NODE_LIT); + nd_set_loc(node, loc); + break; default: - node = NEW_NODE(NODE_DSYM, Qnil, 1, NEW_LIST(node, loc), loc); - break; + node = NEW_NODE(NODE_DSYM, Qnil, 1, NEW_LIST(node, loc), loc); + break; } return node; } @@ -12809,9 +12809,9 @@ append_literal_keys(st_data_t k, st_data_t v, st_data_t h) node->nd_next->nd_end = node->nd_next; node->nd_next->nd_next = 0; if (*result) - list_concat(*result, node); + list_concat(*result, node); else - *result = node; + *result = node; return ST_CONTINUE; } @@ -12820,9 +12820,9 @@ hash_literal_key_p(VALUE k) { switch (OBJ_BUILTIN_TYPE(k)) { case T_NODE: - return false; + return false; default: - return true; + return true; } } @@ -12854,34 +12854,34 @@ remove_duplicate_keys(struct parser_params *p, NODE *hash) NODE *last_expr = 0; rb_code_location_t loc = hash->nd_loc; while (hash && hash->nd_head && hash->nd_next) { - NODE *head = hash->nd_head; - NODE *value = hash->nd_next; - NODE *next = value->nd_next; - st_data_t key = (st_data_t)head; - st_data_t data; - value->nd_next = 0; - if (nd_type_p(head, NODE_LIT) && - st_delete(literal_keys, (key = (st_data_t)head->nd_lit, &key), &data)) { - NODE *dup_value = ((NODE *)data)->nd_next; - rb_compile_warn(p->ruby_sourcefile, nd_line((NODE *)data), - "key %+"PRIsVALUE" is duplicated and overwritten on line %d", - head->nd_lit, nd_line(head)); - if (dup_value == last_expr) { - value->nd_head = block_append(p, dup_value->nd_head, value->nd_head); - } - else { - last_expr->nd_head = block_append(p, dup_value->nd_head, last_expr->nd_head); - } - } - st_insert(literal_keys, (st_data_t)key, (st_data_t)hash); - last_expr = nd_type_p(head, NODE_LIT) ? value : head; - hash = next; + NODE *head = hash->nd_head; + NODE *value = hash->nd_next; + NODE *next = value->nd_next; + st_data_t key = (st_data_t)head; + st_data_t data; + value->nd_next = 0; + if (nd_type_p(head, NODE_LIT) && + st_delete(literal_keys, (key = (st_data_t)head->nd_lit, &key), &data)) { + NODE *dup_value = ((NODE *)data)->nd_next; + rb_compile_warn(p->ruby_sourcefile, nd_line((NODE *)data), + "key %+"PRIsVALUE" is duplicated and overwritten on line %d", + head->nd_lit, nd_line(head)); + if (dup_value == last_expr) { + value->nd_head = block_append(p, dup_value->nd_head, value->nd_head); + } + else { + last_expr->nd_head = block_append(p, dup_value->nd_head, last_expr->nd_head); + } + } + st_insert(literal_keys, (st_data_t)key, (st_data_t)hash); + last_expr = nd_type_p(head, NODE_LIT) ? value : head; + hash = next; } st_foreach(literal_keys, append_literal_keys, (st_data_t)&result); st_free_table(literal_keys); if (hash) { - if (!result) result = hash; - else list_concat(result, hash); + if (!result) result = hash; + else list_concat(result, hash); } result->nd_loc = loc; return result; @@ -12899,13 +12899,13 @@ static void error_duplicate_pattern_variable(struct parser_params *p, ID id, const YYLTYPE *loc) { if (is_private_local_id(id)) { - return; + return; } if (st_is_member(p->pvtbl, id)) { - yyerror1(loc, "duplicated variable name"); + yyerror1(loc, "duplicated variable name"); } else { - st_insert(p->pvtbl, (st_data_t)id, 0); + st_insert(p->pvtbl, (st_data_t)id, 0); } } @@ -12913,11 +12913,11 @@ static void error_duplicate_pattern_key(struct parser_params *p, VALUE key, const YYLTYPE *loc) { if (!p->pktbl) { - p->pktbl = st_init_numtable(); + p->pktbl = st_init_numtable(); } else if (st_is_member(p->pktbl, key)) { - yyerror1(loc, "duplicated key name"); - return; + yyerror1(loc, "duplicated key name"); + return; } st_insert(p->pktbl, (st_data_t)key, 0); } @@ -12937,70 +12937,70 @@ new_op_assign(struct parser_params *p, NODE *lhs, ID op, NODE *rhs, struct lex_c NODE *asgn; if (lhs) { - ID vid = lhs->nd_vid; - YYLTYPE lhs_loc = lhs->nd_loc; - int shareable = ctxt.shareable_constant_value; - if (shareable) { - switch (nd_type(lhs)) { - case NODE_CDECL: - case NODE_COLON2: - case NODE_COLON3: - break; - default: - shareable = 0; - break; - } - } - if (op == tOROP) { - rhs = shareable_constant_value(p, shareable, lhs, rhs, &rhs->nd_loc); - lhs->nd_value = rhs; - nd_set_loc(lhs, loc); - asgn = NEW_OP_ASGN_OR(gettable(p, vid, &lhs_loc), lhs, loc); - if (is_notop_id(vid)) { - switch (id_type(vid)) { - case ID_GLOBAL: - case ID_INSTANCE: - case ID_CLASS: - asgn->nd_aid = vid; - } - } - } - else if (op == tANDOP) { - if (shareable) { - rhs = shareable_constant_value(p, shareable, lhs, rhs, &rhs->nd_loc); - } - lhs->nd_value = rhs; - nd_set_loc(lhs, loc); - asgn = NEW_OP_ASGN_AND(gettable(p, vid, &lhs_loc), lhs, loc); - } - else { - asgn = lhs; - rhs = NEW_CALL(gettable(p, vid, &lhs_loc), op, NEW_LIST(rhs, &rhs->nd_loc), loc); - if (shareable) { - rhs = shareable_constant_value(p, shareable, lhs, rhs, &rhs->nd_loc); - } - asgn->nd_value = rhs; - nd_set_loc(asgn, loc); - } + ID vid = lhs->nd_vid; + YYLTYPE lhs_loc = lhs->nd_loc; + int shareable = ctxt.shareable_constant_value; + if (shareable) { + switch (nd_type(lhs)) { + case NODE_CDECL: + case NODE_COLON2: + case NODE_COLON3: + break; + default: + shareable = 0; + break; + } + } + if (op == tOROP) { + rhs = shareable_constant_value(p, shareable, lhs, rhs, &rhs->nd_loc); + lhs->nd_value = rhs; + nd_set_loc(lhs, loc); + asgn = NEW_OP_ASGN_OR(gettable(p, vid, &lhs_loc), lhs, loc); + if (is_notop_id(vid)) { + switch (id_type(vid)) { + case ID_GLOBAL: + case ID_INSTANCE: + case ID_CLASS: + asgn->nd_aid = vid; + } + } + } + else if (op == tANDOP) { + if (shareable) { + rhs = shareable_constant_value(p, shareable, lhs, rhs, &rhs->nd_loc); + } + lhs->nd_value = rhs; + nd_set_loc(lhs, loc); + asgn = NEW_OP_ASGN_AND(gettable(p, vid, &lhs_loc), lhs, loc); + } + else { + asgn = lhs; + rhs = NEW_CALL(gettable(p, vid, &lhs_loc), op, NEW_LIST(rhs, &rhs->nd_loc), loc); + if (shareable) { + rhs = shareable_constant_value(p, shareable, lhs, rhs, &rhs->nd_loc); + } + asgn->nd_value = rhs; + nd_set_loc(asgn, loc); + } } else { - asgn = NEW_BEGIN(0, loc); + asgn = NEW_BEGIN(0, loc); } return asgn; } static NODE * new_ary_op_assign(struct parser_params *p, NODE *ary, - NODE *args, ID op, NODE *rhs, const YYLTYPE *args_loc, const YYLTYPE *loc) + NODE *args, ID op, NODE *rhs, const YYLTYPE *args_loc, const YYLTYPE *loc) { NODE *asgn; args = make_list(args, args_loc); if (nd_type_p(args, NODE_BLOCK_PASS)) { - args = NEW_ARGSCAT(args, rhs, loc); + args = NEW_ARGSCAT(args, rhs, loc); } else { - args = arg_concat(p, args, rhs, loc); + args = arg_concat(p, args, rhs, loc); } asgn = NEW_OP_ASGN1(ary, op, args, loc); fixpos(asgn, ary); @@ -13009,7 +13009,7 @@ new_ary_op_assign(struct parser_params *p, NODE *ary, static NODE * new_attr_op_assign(struct parser_params *p, NODE *lhs, - ID atype, ID attr, ID op, NODE *rhs, const YYLTYPE *loc) + ID atype, ID attr, ID op, NODE *rhs, const YYLTYPE *loc) { NODE *asgn; @@ -13024,11 +13024,11 @@ new_const_op_assign(struct parser_params *p, NODE *lhs, ID op, NODE *rhs, struct NODE *asgn; if (lhs) { - rhs = shareable_constant_value(p, ctxt.shareable_constant_value, lhs, rhs, loc); - asgn = NEW_OP_CDECL(lhs, op, rhs, loc); + rhs = shareable_constant_value(p, ctxt.shareable_constant_value, lhs, rhs, loc); + asgn = NEW_OP_CDECL(lhs, op, rhs, loc); } else { - asgn = NEW_BEGIN(0, loc); + asgn = NEW_BEGIN(0, loc); } fixpos(asgn, lhs); return asgn; @@ -13038,7 +13038,7 @@ static NODE * const_decl(struct parser_params *p, NODE *path, const YYLTYPE *loc) { if (p->ctxt.in_def) { - yyerror1(loc, "dynamic constant assignment"); + yyerror1(loc, "dynamic constant assignment"); } return NEW_CDECL(0, 0, (path), loc); } @@ -13047,7 +13047,7 @@ static VALUE const_decl(struct parser_params *p, VALUE path) { if (p->ctxt.in_def) { - path = assign_error(p, "dynamic constant assignment", path); + path = assign_error(p, "dynamic constant assignment", path); } return path; } @@ -13098,15 +13098,15 @@ warn_unused_var(struct parser_params *p, struct local_vars *local) if (!local->used) return; cnt = local->used->pos; if (cnt != local->vars->pos) { - rb_parser_fatal(p, "local->used->pos != local->vars->pos"); + rb_parser_fatal(p, "local->used->pos != local->vars->pos"); } #ifndef RIPPER ID *v = local->vars->tbl; ID *u = local->used->tbl; for (int i = 0; i < cnt; ++i) { - if (!v[i] || (u[i] & LVAR_USED)) continue; - if (is_private_local_id(v[i])) continue; - rb_warn1L((int)u[i], "assigned but unused variable - %"PRIsWARN, rb_id2str(v[i])); + if (!v[i] || (u[i] & LVAR_USED)) continue; + if (is_private_local_id(v[i])) continue; + rb_warn1L((int)u[i], "assigned but unused variable - %"PRIsWARN, rb_id2str(v[i])); } #endif } @@ -13144,14 +13144,14 @@ local_pop(struct parser_params *p) { struct local_vars *local = p->lvtbl->prev; if (p->lvtbl->used) { - warn_unused_var(p, p->lvtbl); - vtable_free(p->lvtbl->used); + warn_unused_var(p, p->lvtbl); + vtable_free(p->lvtbl->used); } # if WARN_PAST_SCOPE while (p->lvtbl->past) { - struct vtable *past = p->lvtbl->past; - p->lvtbl->past = past->prev; - vtable_free(past); + struct vtable *past = p->lvtbl->past; + p->lvtbl->past = past->prev; + vtable_free(past); } # endif vtable_free(p->lvtbl->args); @@ -13177,10 +13177,10 @@ local_tbl(struct parser_params *p) MEMCPY(tbl->ids, p->lvtbl->args->tbl, ID, cnt_args); /* remove IDs duplicated to warn shadowing */ for (i = 0, j = cnt_args; i < cnt_vars; ++i) { - ID id = p->lvtbl->vars->tbl[i]; - if (!vtable_included(p->lvtbl->args, id)) { - tbl->ids[j++] = id; - } + ID id = p->lvtbl->vars->tbl[i]; + if (!vtable_included(p->lvtbl->args, id)) { + tbl->ids[j++] = id; + } } if (j < cnt) { tbl = rb_ast_resize_latest_local_table(p->ast, j); @@ -13223,7 +13223,7 @@ local_var(struct parser_params *p, ID id) numparam_name(p, id); vtable_add(p->lvtbl->vars, id); if (p->lvtbl->used) { - vtable_add(p->lvtbl->used, (ID)p->ruby_sourceline); + vtable_add(p->lvtbl->used, (ID)p->ruby_sourceline); } } @@ -13237,21 +13237,21 @@ local_id_ref(struct parser_params *p, ID id, ID **vidrefp) used = p->lvtbl->used; while (vars && !DVARS_TERMINAL_P(vars->prev)) { - vars = vars->prev; - args = args->prev; - if (used) used = used->prev; + vars = vars->prev; + args = args->prev; + if (used) used = used->prev; } if (vars && vars->prev == DVARS_INHERIT) { - return rb_local_defined(id, p->parent_iseq); + return rb_local_defined(id, p->parent_iseq); } else if (vtable_included(args, id)) { - return 1; + return 1; } else { - int i = vtable_included(vars, id); - if (i && used && vidrefp) *vidrefp = &used->tbl[i-1]; - return i != 0; + int i = vtable_included(vars, id); + if (i && used && vidrefp) *vidrefp = &used->tbl[i-1]; + return i != 0; } } @@ -13304,7 +13304,7 @@ numparam_push(struct parser_params *p) struct local_vars *local = p->lvtbl; NODE *inner = local->numparam.inner; if (!local->numparam.outer) { - local->numparam.outer = local->numparam.current; + local->numparam.outer = local->numparam.current; } local->numparam.inner = 0; local->numparam.current = 0; @@ -13320,21 +13320,21 @@ numparam_pop(struct parser_params *p, NODE *prev_inner) #ifndef RIPPER struct local_vars *local = p->lvtbl; if (prev_inner) { - /* prefer first one */ - local->numparam.inner = prev_inner; + /* prefer first one */ + local->numparam.inner = prev_inner; } else if (local->numparam.current) { - /* current and inner are exclusive */ - local->numparam.inner = local->numparam.current; + /* current and inner are exclusive */ + local->numparam.inner = local->numparam.current; } if (p->max_numparam > NO_PARAM) { - /* current and outer are exclusive */ - local->numparam.current = local->numparam.outer; - local->numparam.outer = 0; + /* current and outer are exclusive */ + local->numparam.current = local->numparam.outer; + local->numparam.outer = 0; } else { - /* no numbered parameter */ - local->numparam.current = 0; + /* no numbered parameter */ + local->numparam.current = 0; } #endif } @@ -13345,7 +13345,7 @@ dyna_push(struct parser_params *p) p->lvtbl->args = vtable_alloc(p->lvtbl->args); p->lvtbl->vars = vtable_alloc(p->lvtbl->vars); if (p->lvtbl->used) { - p->lvtbl->used = vtable_alloc(p->lvtbl->used); + p->lvtbl->used = vtable_alloc(p->lvtbl->used); } return p->lvtbl->args; } @@ -13357,9 +13357,9 @@ dyna_pop_vtable(struct parser_params *p, struct vtable **vtblp) *vtblp = tmp->prev; # if WARN_PAST_SCOPE if (p->past_scope_enabled) { - tmp->prev = p->lvtbl->past; - p->lvtbl->past = tmp; - return; + tmp->prev = p->lvtbl->past; + p->lvtbl->past = tmp; + return; } # endif vtable_free(tmp); @@ -13371,9 +13371,9 @@ dyna_pop_1(struct parser_params *p) struct vtable *tmp; if ((tmp = p->lvtbl->used) != 0) { - warn_unused_var(p, p->lvtbl); - p->lvtbl->used = p->lvtbl->used->prev; - vtable_free(tmp); + warn_unused_var(p, p->lvtbl); + p->lvtbl->used = p->lvtbl->used->prev; + vtable_free(tmp); } dyna_pop_vtable(p, &p->lvtbl->args); dyna_pop_vtable(p, &p->lvtbl->vars); @@ -13383,12 +13383,12 @@ static void dyna_pop(struct parser_params *p, const struct vtable *lvargs) { while (p->lvtbl->args != lvargs) { - dyna_pop_1(p); - if (!p->lvtbl->args) { - struct local_vars *local = p->lvtbl->prev; - ruby_sized_xfree(p->lvtbl, sizeof(*p->lvtbl)); - p->lvtbl = local; - } + dyna_pop_1(p); + if (!p->lvtbl->args) { + struct local_vars *local = p->lvtbl->prev; + ruby_sized_xfree(p->lvtbl, sizeof(*p->lvtbl)); + p->lvtbl = local; + } } dyna_pop_1(p); } @@ -13410,17 +13410,17 @@ dvar_defined_ref(struct parser_params *p, ID id, ID **vidrefp) used = p->lvtbl->used; while (!DVARS_TERMINAL_P(vars)) { - if (vtable_included(args, id)) { - return 1; - } - if ((i = vtable_included(vars, id)) != 0) { - if (used && vidrefp) *vidrefp = &used->tbl[i-1]; - return 1; - } - args = args->prev; - vars = vars->prev; - if (!vidrefp) used = 0; - if (used) used = used->prev; + if (vtable_included(args, id)) { + return 1; + } + if ((i = vtable_included(vars, id)) != 0) { + if (used && vidrefp) *vidrefp = &used->tbl[i-1]; + return 1; + } + args = args->prev; + vars = vars->prev; + if (!vidrefp) used = 0; + if (used) used = used->prev; } if (vars == DVARS_INHERIT && !NUMPARAM_ID_P(id)) { @@ -13440,7 +13440,7 @@ static int dvar_curr(struct parser_params *p, ID id) { return (vtable_included(p->lvtbl->args, id) || - vtable_included(p->lvtbl->vars, id)); + vtable_included(p->lvtbl->vars, id)); } static void @@ -13458,13 +13458,13 @@ rb_reg_fragment_setenc(struct parser_params* p, VALUE str, int options) int c = RE_OPTION_ENCODING_IDX(options); if (c) { - int opt, idx; - rb_char_to_option_kcode(c, &opt, &idx); - if (idx != ENCODING_GET(str) && - !is_ascii_string(str)) { + int opt, idx; + rb_char_to_option_kcode(c, &opt, &idx); + if (idx != ENCODING_GET(str) && + !is_ascii_string(str)) { goto error; - } - ENCODING_SET(str, idx); + } + ENCODING_SET(str, idx); } else if (RE_OPTION_ENCODING_NONE(options)) { if (!ENCODING_IS_ASCII8BIT(str) && @@ -13472,16 +13472,16 @@ rb_reg_fragment_setenc(struct parser_params* p, VALUE str, int options) c = 'n'; goto error; } - rb_enc_associate(str, rb_ascii8bit_encoding()); + rb_enc_associate(str, rb_ascii8bit_encoding()); } else if (rb_is_usascii_enc(p->enc)) { - if (!is_ascii_string(str)) { - /* raise in re.c */ - rb_enc_associate(str, rb_usascii_encoding()); - } - else { - rb_enc_associate(str, rb_ascii8bit_encoding()); - } + if (!is_ascii_string(str)) { + /* raise in re.c */ + rb_enc_associate(str, rb_usascii_encoding()); + } + else { + rb_enc_associate(str, rb_ascii8bit_encoding()); + } } return 0; @@ -13505,7 +13505,7 @@ reg_fragment_check(struct parser_params* p, VALUE str, int options) if (err != Qnil) { err = rb_obj_as_string(err); compile_error(p, "%"PRIsVALUE, err); - return 0; + return 0; } return 1; } @@ -13535,7 +13535,7 @@ reg_named_capture_assign_iter(const OnigUChar *name, const OnigUChar *name_end, var = intern_cstr(s, len, enc); if (len < MAX_WORD_LENGTH && rb_reserved_word(s, (int)len)) { - if (!lvar_defined(p, var)) return ST_CONTINUE; + if (!lvar_defined(p, var)) return ST_CONTINUE; } node = node_assign(p, assignable(p, var, 0, arg->loc), NEW_LIT(ID2SYM(var), arg->loc), NO_LEX_CTXT, arg->loc); succ = arg->succ_block; @@ -13582,10 +13582,10 @@ reg_compile(struct parser_params* p, VALUE str, int options) err = rb_errinfo(); re = parser_reg_compile(p, str, options); if (NIL_P(re)) { - VALUE m = rb_attr_get(rb_errinfo(), idMesg); - rb_set_errinfo(err); - compile_error(p, "%"PRIsVALUE, m); - return Qnil; + VALUE m = rb_attr_get(rb_errinfo(), idMesg); + rb_set_errinfo(err); + compile_error(p, "%"PRIsVALUE, m); + return Qnil; } return re; } @@ -13600,8 +13600,8 @@ parser_reg_compile(struct parser_params* p, VALUE str, int options, VALUE *errms if (c) reg_fragment_enc_error(p, str, c); re = rb_parser_reg_compile(p, str, options); if (NIL_P(re)) { - *errmsg = rb_attr_get(rb_errinfo(), idMesg); - rb_set_errinfo(err); + *errmsg = rb_attr_get(rb_errinfo(), idMesg); + rb_set_errinfo(err); } return re; } @@ -13626,32 +13626,32 @@ parser_append_options(struct parser_params *p, NODE *node) const YYLTYPE *const LOC = &default_location; if (p->do_print) { - NODE *print = NEW_FCALL(rb_intern("print"), - NEW_LIST(NEW_GVAR(idLASTLINE, LOC), LOC), - LOC); - node = block_append(p, node, print); + NODE *print = NEW_FCALL(rb_intern("print"), + NEW_LIST(NEW_GVAR(idLASTLINE, LOC), LOC), + LOC); + node = block_append(p, node, print); } if (p->do_loop) { - NODE *irs = NEW_LIST(NEW_GVAR(rb_intern("$/"), LOC), LOC); - - if (p->do_split) { - ID ifs = rb_intern("$;"); - ID fields = rb_intern("$F"); - NODE *args = NEW_LIST(NEW_GVAR(ifs, LOC), LOC); - NODE *split = NEW_GASGN(fields, - NEW_CALL(NEW_GVAR(idLASTLINE, LOC), - rb_intern("split"), args, LOC), - LOC); - node = block_append(p, split, node); - } - if (p->do_chomp) { - NODE *chomp = NEW_LIT(ID2SYM(rb_intern("chomp")), LOC); - chomp = list_append(p, NEW_LIST(chomp, LOC), NEW_TRUE(LOC)); - irs = list_append(p, irs, NEW_HASH(chomp, LOC)); - } - - node = NEW_WHILE(NEW_FCALL(idGets, irs, LOC), node, 1, LOC); + NODE *irs = NEW_LIST(NEW_GVAR(rb_intern("$/"), LOC), LOC); + + if (p->do_split) { + ID ifs = rb_intern("$;"); + ID fields = rb_intern("$F"); + NODE *args = NEW_LIST(NEW_GVAR(ifs, LOC), LOC); + NODE *split = NEW_GASGN(fields, + NEW_CALL(NEW_GVAR(idLASTLINE, LOC), + rb_intern("split"), args, LOC), + LOC); + node = block_append(p, split, node); + } + if (p->do_chomp) { + NODE *chomp = NEW_LIT(ID2SYM(rb_intern("chomp")), LOC); + chomp = list_append(p, NEW_LIST(chomp, LOC), NEW_TRUE(LOC)); + irs = list_append(p, irs, NEW_HASH(chomp, LOC)); + } + + node = NEW_WHILE(NEW_FCALL(idGets, irs, LOC), node, 1, LOC); } return node; @@ -13741,16 +13741,16 @@ parser_free(void *ptr) ruby_sized_xfree(p->tokenbuf, p->toksiz); } for (local = p->lvtbl; local; local = prev) { - if (local->vars) xfree(local->vars); - prev = local->prev; - xfree(local); + if (local->vars) xfree(local->vars); + prev = local->prev; + xfree(local); } { - token_info *ptinfo; - while ((ptinfo = p->token_info) != 0) { - p->token_info = ptinfo->next; - xfree(ptinfo); - } + token_info *ptinfo; + while ((ptinfo = p->token_info) != 0) { + p->token_info = ptinfo->next; + xfree(ptinfo); + } } xfree(ptr); } @@ -13764,8 +13764,8 @@ parser_memsize(const void *ptr) size += p->toksiz; for (local = p->lvtbl; local; local = local->prev) { - size += sizeof(*local); - if (local->vars) size += local->vars->capa * sizeof(ID); + size += sizeof(*local); + if (local->vars) size += local->vars->capa * sizeof(ID); } return size; } @@ -13777,9 +13777,9 @@ static const rb_data_type_t parser_data_type = { "ripper", #endif { - parser_mark, - parser_free, - parser_memsize, + parser_mark, + parser_free, + parser_memsize, }, 0, 0, RUBY_TYPED_FREE_IMMEDIATELY }; @@ -13798,7 +13798,7 @@ rb_parser_new(void) { struct parser_params *p; VALUE parser = TypedData_Make_Struct(0, struct parser_params, - &parser_data_type, p); + &parser_data_type, p); parser_initialize(p); return parser; } @@ -13975,7 +13975,7 @@ rb_parser_set_debug_output(VALUE self, VALUE output) * potential memory leak */ #define NEWHEAP() rb_imemo_tmpbuf_parser_heap(0, p->heap, 0) #define ADD2HEAP(new, cnt, ptr) ((p->heap = (new))->ptr = (ptr), \ - (new)->cnt = (cnt), (ptr)) + (new)->cnt = (cnt), (ptr)) void * rb_parser_malloc(struct parser_params *p, size_t size) @@ -14004,13 +14004,13 @@ rb_parser_realloc(struct parser_params *p, void *ptr, size_t size) size_t cnt = HEAPCNT(1, size); if (ptr && (n = p->heap) != NULL) { - do { - if (n->ptr == ptr) { - n->ptr = ptr = xrealloc(ptr, size); - if (n->cnt) n->cnt = cnt; - return ptr; - } - } while ((n = n->next) != NULL); + do { + if (n->ptr == ptr) { + n->ptr = ptr = xrealloc(ptr, size); + if (n->cnt) n->cnt = cnt; + return ptr; + } + } while ((n = n->next) != NULL); } n = NEWHEAP(); ptr = xrealloc(ptr, size); @@ -14023,11 +14023,11 @@ rb_parser_free(struct parser_params *p, void *ptr) rb_imemo_tmpbuf_t **prev = &p->heap, *n; while ((n = *prev) != NULL) { - if (n->ptr == ptr) { - *prev = n->next; - break; - } - prev = &n->next; + if (n->ptr == ptr) { + *prev = n->next; + break; + } + prev = &n->next; } } #endif @@ -14043,8 +14043,8 @@ rb_parser_printf(struct parser_params *p, const char *fmt, ...) rb_str_vcatf(mesg, fmt, ap); va_end(ap); if (RSTRING_END(mesg)[-1] == '\n') { - rb_io_write(p->debug_output, mesg); - p->debug_buffer = Qnil; + rb_io_write(p->debug_output, mesg); + p->debug_buffer = Qnil; } } @@ -14057,11 +14057,11 @@ parser_compile_error(struct parser_params *p, const char *fmt, ...) p->error_p = 1; va_start(ap, fmt); p->error_buffer = - rb_syntax_error_append(p->error_buffer, - p->ruby_sourcefile_string, - p->ruby_sourceline, - rb_long2int(p->lex.pcur - p->lex.pbeg), - p->enc, fmt, ap); + rb_syntax_error_append(p->error_buffer, + p->ruby_sourcefile_string, + p->ruby_sourceline, + rb_long2int(p->lex.pcur - p->lex.pbeg), + p->enc, fmt, ap); va_end(ap); } @@ -14083,58 +14083,58 @@ RUBY_FUNC_EXPORTED size_t rb_yytnamerr(struct parser_params *p, char *yyres, const char *yystr) { if (*yystr == '"') { - size_t yyn = 0, bquote = 0; - const char *yyp = yystr; - - while (*++yyp) { - switch (*yyp) { - case '`': - if (!bquote) { - bquote = count_char(yyp+1, '`') + 1; - if (yyres) memcpy(&yyres[yyn], yyp, bquote); - yyn += bquote; - yyp += bquote - 1; - break; - } - goto default_char; - - case '\'': - if (bquote && count_char(yyp+1, '\'') + 1 == bquote) { - if (yyres) memcpy(yyres + yyn, yyp, bquote); - yyn += bquote; - yyp += bquote - 1; - bquote = 0; - break; - } - if (yyp[1] && yyp[1] != '\'' && yyp[2] == '\'') { - if (yyres) memcpy(yyres + yyn, yyp, 3); - yyn += 3; - yyp += 2; - break; - } - goto do_not_strip_quotes; - - case ',': - goto do_not_strip_quotes; - - case '\\': - if (*++yyp != '\\') - goto do_not_strip_quotes; - /* Fall through. */ - default_char: - default: - if (yyres) - yyres[yyn] = *yyp; - yyn++; - break; - - case '"': - case '\0': - if (yyres) - yyres[yyn] = '\0'; - return yyn; - } - } + size_t yyn = 0, bquote = 0; + const char *yyp = yystr; + + while (*++yyp) { + switch (*yyp) { + case '`': + if (!bquote) { + bquote = count_char(yyp+1, '`') + 1; + if (yyres) memcpy(&yyres[yyn], yyp, bquote); + yyn += bquote; + yyp += bquote - 1; + break; + } + goto default_char; + + case '\'': + if (bquote && count_char(yyp+1, '\'') + 1 == bquote) { + if (yyres) memcpy(yyres + yyn, yyp, bquote); + yyn += bquote; + yyp += bquote - 1; + bquote = 0; + break; + } + if (yyp[1] && yyp[1] != '\'' && yyp[2] == '\'') { + if (yyres) memcpy(yyres + yyn, yyp, 3); + yyn += 3; + yyp += 2; + break; + } + goto do_not_strip_quotes; + + case ',': + goto do_not_strip_quotes; + + case '\\': + if (*++yyp != '\\') + goto do_not_strip_quotes; + /* Fall through. */ + default_char: + default: + if (yyres) + yyres[yyn] = *yyp; + yyn++; + break; + + case '"': + case '\0': + if (yyres) + yyres[yyn] = '\0'; + return yyn; + } + } do_not_strip_quotes: ; } @@ -14154,7 +14154,7 @@ ripper_validate_object(VALUE self, VALUE x) if (x == Qtrue) return x; if (NIL_P(x)) return x; if (UNDEF_P(x)) - rb_raise(rb_eArgError, "Qundef given"); + rb_raise(rb_eArgError, "Qundef given"); if (FIXNUM_P(x)) return x; if (SYMBOL_P(x)) return x; switch (BUILTIN_TYPE(x)) { @@ -14165,20 +14165,20 @@ ripper_validate_object(VALUE self, VALUE x) case T_FLOAT: case T_COMPLEX: case T_RATIONAL: - break; + break; case T_NODE: - if (!nd_type_p((NODE *)x, NODE_RIPPER)) { - rb_raise(rb_eArgError, "NODE given: %p", (void *)x); - } - x = ((NODE *)x)->nd_rval; - break; + if (!nd_type_p((NODE *)x, NODE_RIPPER)) { + rb_raise(rb_eArgError, "NODE given: %p", (void *)x); + } + x = ((NODE *)x)->nd_rval; + break; default: - rb_raise(rb_eArgError, "wrong type of ruby object: %p (%s)", - (void *)x, rb_obj_classname(x)); + rb_raise(rb_eArgError, "wrong type of ruby object: %p (%s)", + (void *)x, rb_obj_classname(x)); } if (!RBASIC_CLASS(x)) { - rb_raise(rb_eArgError, "hidden ruby object: %p (%s)", - (void *)x, rb_builtin_type_name(TYPE(x))); + rb_raise(rb_eArgError, "hidden ruby object: %p (%s)", + (void *)x, rb_builtin_type_name(TYPE(x))); } return x; } @@ -14295,9 +14295,9 @@ ripper_lex_get_generic(struct parser_params *p, VALUE src) { VALUE line = rb_funcallv_public(src, id_gets, 0, 0); if (!NIL_P(line) && !RB_TYPE_P(line, T_STRING)) { - rb_raise(rb_eTypeError, - "gets returned %"PRIsVALUE" (expected String or nil)", - rb_obj_class(line)); + rb_raise(rb_eTypeError, + "gets returned %"PRIsVALUE" (expected String or nil)", + rb_obj_class(line)); } return line; } @@ -14313,7 +14313,7 @@ ripper_s_allocate(VALUE klass) { struct parser_params *p; VALUE self = TypedData_Make_Struct(klass, struct parser_params, - &parser_data_type, p); + &parser_data_type, p); p->value = self; return self; } @@ -14352,11 +14352,11 @@ ripper_initialize(int argc, VALUE *argv, VALUE self) p->eofp = 0; if (NIL_P(fname)) { fname = STR_NEW2("(ripper)"); - OBJ_FREEZE(fname); + OBJ_FREEZE(fname); } else { - StringValueCStr(fname); - fname = rb_str_new_frozen(fname); + StringValueCStr(fname); + fname = rb_str_new_frozen(fname); } parser_initialize(p); @@ -14491,7 +14491,7 @@ ripper_state(VALUE self) TypedData_Get_Struct(self, struct parser_params, &parser_data_type, p); if (!ripper_initialized_p(p)) { - rb_raise(rb_eArgError, "method called for uninitialized object"); + rb_raise(rb_eArgError, "method called for uninitialized object"); } if (NIL_P(p->parsing_thread)) return Qnil; return INT2NUM(p->lex.state); -- cgit v1.2.3