1 files changed, 22 insertions, 19 deletions

diff --git a/src/parse.y b/src/parse.y
index 205405065..93923aa71 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -2875,15 +2875,15 @@ var_ref         : variable
                 | keyword_self
                     {
                       $$ = new_self(p);
-                       }
+                    }
                 | keyword_true
                     {
                       $$ = new_true(p);
-                       }
+                    }
                 | keyword_false
                     {
                       $$ = new_false(p);
-                       }
+                    }
                 | keyword__FILE__
                     {
                       if (!p->filename) {
@@ -5336,20 +5336,20 @@ mrb_parser_parse(parser_state *p, mrbc_context *c)
 
   MRB_TRY(p->jmp) {
 
-  p->cmd_start = TRUE;
-  p->in_def = p->in_single = 0;
-  p->nerr = p->nwarn = 0;
-  p->lex_strterm = NULL;
+    p->cmd_start = TRUE;
+    p->in_def = p->in_single = 0;
+    p->nerr = p->nwarn = 0;
+    p->lex_strterm = NULL;
 
-  parser_init_cxt(p, c);
-  yyparse(p);
-  if (!p->tree) {
-    p->tree = new_nil(p);
-  }
-  parser_update_cxt(p, c);
-  if (c && c->dump_result) {
-    mrb_parser_dump(p->mrb, p->tree, 0);
-  }
+    parser_init_cxt(p, c);
+    yyparse(p);
+    if (!p->tree) {
+      p->tree = new_nil(p);
+    }
+    parser_update_cxt(p, c);
+    if (c && c->dump_result) {
+      mrb_parser_dump(p->mrb, p->tree, 0);
+    }
 
   }
   MRB_CATCH(p->jmp) {
@@ -5472,7 +5472,8 @@ mrb_parser_set_filename(struct mrb_parser_state *p, const char *f)
   p->filename_table[p->filename_table_length - 1] = sym;
 }
 
-char const* mrb_parser_get_filename(struct mrb_parser_state* p, uint16_t idx) {
+char const*
+mrb_parser_get_filename(struct mrb_parser_state* p, uint16_t idx) {
   if (idx >= p->filename_table_length) { return NULL; }
   else {
     return mrb_sym2name_len(p->mrb, p->filename_table[idx], NULL);
@@ -5521,6 +5522,7 @@ load_exec(mrb_state *mrb, parser_state *p, mrbc_context *c)
   struct RClass *target = mrb->object_class;
   struct RProc *proc;
   mrb_value v;
+  unsigned int keep = 0;
 
   if (!p) {
     return mrb_undef_value();
@@ -5554,12 +5556,13 @@ load_exec(mrb_state *mrb, parser_state *p, mrbc_context *c)
     if (c->target_class) {
       target = c->target_class;
     }
+    keep = c->slen + 1;
   }
   proc->target_class = target;
   if (mrb->c->ci) {
     mrb->c->ci->target_class = target;
   }
-  v = mrb_toplevel_run(mrb, proc);
+  v = mrb_toplevel_run_keep(mrb, proc, keep);
   if (mrb->exc) return mrb_nil_value();
   return v;
 }
@@ -5853,7 +5856,7 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset)
     {
       node *n2 = tree->car;
 
-      if (n2  && (n2->car || n2->cdr)) {
+      if (n2 && (n2->car || n2->cdr)) {
         dump_prefix(offset+1);
         printf("local variables:\n");
         dump_prefix(offset+2);