Added Self#init() method which creates the static singleton instance …

…instead of doing so within Self#node()
bakkdoor · Sep 8, 2010 · f1b90a8 · f1b90a8
1 parent 49a9cd6
commit f1b90a8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/src/bootstrap/core_classes.cc b/src/bootstrap/core_classes.cc
@@ -7,6 +7,9 @@
 #include "../nil.h"
 #include "../true.h"
 
+#include "../parser/nodes/self.h"
+
+
 namespace fancy {
 
   /**
@@ -142,6 +145,9 @@ namespace fancy {
       global_scope->define("true", t);
       // a hack for "def NATIVE" method definitions:
       global_scope->define("NATIVE", new FancyObject(ObjectClass));
+
+      // initialize Self node singleton instance
+      Self::init();
     }
 
   }

diff --git a/src/parser/nodes/self.cc b/src/parser/nodes/self.cc
@@ -7,11 +7,15 @@ namespace fancy {
 
       Self* Self::_self_node = NULL;
       Self* Self::node()
+      {
+        return _self_node;
+      }
+
+      void Self::init()
       {
         if(!_self_node) {
           _self_node = new Self();
         }
-        return _self_node;
       }
 
       Self::Self() : Identifier("self")

diff --git a/src/parser/nodes/self.h b/src/parser/nodes/self.h
@@ -11,6 +11,7 @@ namespace fancy {
       {
       public:
         static Self* node();
+        static void init();
       private:
         Self();
         virtual ~Self() {}