From 1c2a2827b3db4468f2beda0a1dac8cecf0075f2b Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Mon, 9 Oct 2017 08:54:25 +0900 Subject: Replace lvar_defined with local_var_p --- mrbgems/mruby-compiler/core/parse.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mrbgems/mruby-compiler/core/parse.y b/mrbgems/mruby-compiler/core/parse.y index ddf5856c5..0cebeeb49 100644 --- a/mrbgems/mruby-compiler/core/parse.y +++ b/mrbgems/mruby-compiler/core/parse.y @@ -5498,7 +5498,7 @@ parser_yylex(parser_state *p) pylval.id = ident; #if 0 - if (last_state != EXPR_DOT && islower(tok(p)[0]) && lvar_defined(ident)) { + if (last_state != EXPR_DOT && islower(tok(p)[0]) && local_var_p(p, ident)) { p->lstate = EXPR_END; } #endif -- cgit v1.2.3 From 82983330a3770dd44f6b9cadea3ef2def16cce19 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Mon, 9 Oct 2017 08:56:46 +0900 Subject: Fix parse error on TRICK2013/yhara --- mrbgems/mruby-compiler/core/parse.y | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mrbgems/mruby-compiler/core/parse.y b/mrbgems/mruby-compiler/core/parse.y index 0cebeeb49..82e4c7bdd 100644 --- a/mrbgems/mruby-compiler/core/parse.y +++ b/mrbgems/mruby-compiler/core/parse.y @@ -5078,6 +5078,9 @@ parser_yylex(parser_state *p) else if (IS_SPCARG(-1)) { c = tLPAREN_ARG; } + else if (p->lstate == EXPR_END && space_seen) { + c = tLPAREN_ARG; + } p->paren_nest++; COND_PUSH(0); CMDARG_PUSH(0); @@ -5497,11 +5500,9 @@ parser_yylex(parser_state *p) mrb_sym ident = intern_cstr(tok(p)); pylval.id = ident; -#if 0 if (last_state != EXPR_DOT && islower(tok(p)[0]) && local_var_p(p, ident)) { p->lstate = EXPR_END; } -#endif } return result; } -- cgit v1.2.3