summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2014-06-14 01:03:39 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2014-06-14 01:03:39 +0900
commit0042e586db875fca2631c243cb41599e9782b05a (patch)
tree9c4c05263ed8844c9038f6288f23067eccc43dfe
parente4b01da97ea28ad1c13f848c55c73dc1cc080760 (diff)
parentb5ef16ba0336aef1cbdd57805a76bbf4e05c1cdb (diff)
downloadmruby-0042e586db875fca2631c243cb41599e9782b05a.tar.gz
mruby-0042e586db875fca2631c243cb41599e9782b05a.zip
Merge pull request #2344 from yui-knk/fix-locals
Change to always use locals->car->car.
-rw-r--r--src/parse.y6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/parse.y b/src/parse.y
index e88437602..2c7e788d9 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -253,7 +253,11 @@ local_var_p(parser_state *p, mrb_sym sym)
static void
local_add_f(parser_state *p, mrb_sym sym)
{
- p->locals->car = push(p->locals->car, nsym(sym));
+ if (p->locals->car && !p->locals->car->car) {
+ p->locals->car->car = nsym(sym);
+ } else {
+ p->locals->car = push(p->locals->car, nsym(sym));
+ }
}
static void