Merge branch 'master' of github.com:mruby/mruby

1 files changed, 2 insertions, 20 deletions

diff --git a/src/state.c b/src/state.c
index 9b33d6ad9..18d104555 100644
--- a/src/state.c
+++ b/src/state.c
@@ -11,6 +11,7 @@
 #include <mruby/variable.h>
 #include <mruby/debug.h>
 #include <mruby/string.h>
+#include <mruby/class.h>
 
 void mrb_init_core(mrb_state*);
 void mrb_init_mrbgems(mrb_state*);
@@ -18,12 +19,6 @@ void mrb_init_mrbgems(mrb_state*);
 void mrb_gc_init(mrb_state*, mrb_gc *gc);
 void mrb_gc_destroy(mrb_state*, mrb_gc *gc);
 
-static mrb_value
-inspect_main(mrb_state *mrb, mrb_value mod)
-{
-  return mrb_str_new_lit(mrb, "main");
-}
-
 MRB_API mrb_state*
 mrb_open_core(mrb_allocf f, void *ud)
 {
@@ -145,11 +140,6 @@ mrb_irep_cutref(mrb_state *mrb, mrb_irep *irep)
     irep->reps[i] = NULL;
     if (tmp) mrb_irep_decref(mrb, tmp);
   }
-  if (irep->outer) {
-    tmp = irep->outer;
-    irep->outer = NULL;
-    if (tmp) mrb_irep_decref(mrb, tmp);
-  }
 }
 
 void
@@ -176,10 +166,6 @@ mrb_irep_free(mrb_state *mrb, mrb_irep *irep)
     if (irep->reps[i])
       mrb_irep_decref(mrb, irep->reps[i]);
   }
-  if (irep->outer) {
-    if (irep->outer)
-      mrb_irep_decref(mrb, irep->outer);
-  }
   mrb_free(mrb, irep->reps);
   mrb_free(mrb, irep->lv);
   if (irep->own_filename) {
@@ -237,6 +223,7 @@ mrb_str_pool(mrb_state *mrb, mrb_value str)
       ns->as.heap.ptr[len] = '\0';
     }
   }
+  RSTR_SET_POOL_FLAG(ns);
   MRB_SET_FROZEN_FLAG(ns);
   return mrb_obj_value(ns);
 }
@@ -294,11 +281,6 @@ mrb_add_irep(mrb_state *mrb)
 MRB_API mrb_value
 mrb_top_self(mrb_state *mrb)
 {
-  if (!mrb->top_self) {
-    mrb->top_self = (struct RObject*)mrb_obj_alloc(mrb, MRB_TT_OBJECT, mrb->object_class);
-    mrb_define_singleton_method(mrb, mrb->top_self, "inspect", inspect_main, MRB_ARGS_NONE());
-    mrb_define_singleton_method(mrb, mrb->top_self, "to_s", inspect_main, MRB_ARGS_NONE());
-  }
   return mrb_obj_value(mrb->top_self);
 }