summaryrefslogtreecommitdiffhomepage
path: root/mrbgems/mruby-compiler
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2017-10-09 12:39:13 +0900
committerGitHub <[email protected]>2017-10-09 12:39:13 +0900
commit80e03f3ffb40aa1cf6d40c1305fcd913bf82ab1d (patch)
treeb81700e38b0a79abf6a69ed5a62fbba6c7132d52 /mrbgems/mruby-compiler
parentc3c882f681451c76ad6ffde984ec33432c5b579a (diff)
parent82983330a3770dd44f6b9cadea3ef2def16cce19 (diff)
downloadmruby-80e03f3ffb40aa1cf6d40c1305fcd913bf82ab1d.tar.gz
mruby-80e03f3ffb40aa1cf6d40c1305fcd913bf82ab1d.zip
Merge pull request #3824 from nobu/bug/paren_arg
Bug/paren arg
Diffstat (limited to 'mrbgems/mruby-compiler')
-rw-r--r--mrbgems/mruby-compiler/core/parse.y7
1 files changed, 4 insertions, 3 deletions
diff --git a/mrbgems/mruby-compiler/core/parse.y b/mrbgems/mruby-compiler/core/parse.y
index ddf5856c5..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]) && lvar_defined(ident)) {
+ if (last_state != EXPR_DOT && islower(tok(p)[0]) && local_var_p(p, ident)) {
p->lstate = EXPR_END;
}
-#endif
}
return result;
}