p->tree may be NULL; close #161

cb8b4691 · Yukihiro Matsumoto · 64218879 · cb8b4691
Commit cb8b4691 authored May 19, 2012 by Yukihiro Matsumoto
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 6 deletions

src/parse.y src/parse.y +8 -6

No files found.
--- a/src/parse.y
+++ b/src/parse.y
@@ -4630,9 +4630,6 @@ mrb_parser_parse(parser_state *p)
  }
  yyparse(p);
  tree = p->tree;
-  if ((int)tree->car == NODE_SCOPE) {
-    p->locals = cons(tree->cdr->car, 0);
-  }
  if (!tree) {
    if (p->begin_tree) {
      tree = p->begin_tree;
@@ -4641,9 +4638,14 @@ mrb_parser_parse(parser_state *p)
      tree = new_nil(p);
    }
  }
-  else if (p->begin_tree) {
+  else {
-    tree = new_begin(p, p->begin_tree);
+    if ((int)tree->car == NODE_SCOPE) {
-    append(tree, p->tree);
+      p->locals = cons(tree->cdr->car, 0);
+    }
+    if (p->begin_tree) {
+      tree = new_begin(p, p->begin_tree);
+      append(tree, p->tree);
+    }
  }
 }