Changes a way of assining values to nilClass, falseClass and trueClas…

…s variables.
jruby · Jul 20, 2012 · 3d96865 · 3d96865
1 parent e63a12d
commit 3d96865
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 15 deletions.
diff --git a/src/org/jruby/Ruby.java b/src/org/jruby/Ruby.java
@@ -1249,9 +1249,9 @@ private void initRoot() {
         //topSelf = TopSelfFactory.createTopSelf(this);
 
         // Pre-create all the core classes potentially referenced during startup
-        RubyNil.createNilClass(this);
-        RubyBoolean.createFalseClass(this);
-        RubyBoolean.createTrueClass(this);
+        nilClass = RubyNil.createNilClass(this);
+        falseClass = RubyBoolean.createFalseClass(this);
+        trueClass = RubyBoolean.createTrueClass(this);
 
         rootInitialized = true;
     }
@@ -1911,23 +1911,14 @@ public IRubyObject[] getSingleNilArray() {
     public RubyClass getNilClass() {
         return nilClass;
     }
-    void setNilClass(RubyClass nilClass) {
-        this.nilClass = nilClass;
-    }
 
     public RubyClass getTrueClass() {
         return trueClass;
     }
-    void setTrueClass(RubyClass trueClass) {
-        this.trueClass = trueClass;
-    }
 
     public RubyClass getFalseClass() {
         return falseClass;
     }
-    void setFalseClass(RubyClass falseClass) {
-        this.falseClass = falseClass;
-    }
 
     public RubyClass getProc() {
         return procClass;

diff --git a/src/org/jruby/RubyBoolean.java b/src/org/jruby/RubyBoolean.java
@@ -77,7 +77,6 @@ public Class<?> getJavaClass() {
 
     public static RubyClass createFalseClass(Ruby runtime) {
         RubyClass falseClass = runtime.defineClass("FalseClass", runtime.getObject(), ObjectAllocator.NOT_ALLOCATABLE_ALLOCATOR);
-        runtime.setFalseClass(falseClass);
         falseClass.index = ClassIndex.FALSE;
         falseClass.setReifiedClass(RubyBoolean.class);
 
@@ -90,7 +89,6 @@ public static RubyClass createFalseClass(Ruby runtime) {
 
     public static RubyClass createTrueClass(Ruby runtime) {
         RubyClass trueClass = runtime.defineClass("TrueClass", runtime.getObject(), ObjectAllocator.NOT_ALLOCATABLE_ALLOCATOR);
-        runtime.setTrueClass(trueClass);
         trueClass.index = ClassIndex.TRUE;
         trueClass.setReifiedClass(RubyBoolean.class);
 

diff --git a/src/org/jruby/RubyNil.java b/src/org/jruby/RubyNil.java
@@ -58,7 +58,6 @@ public IRubyObject allocate(Ruby runtime, RubyClass klass) {
 
     public static RubyClass createNilClass(Ruby runtime) {
         RubyClass nilClass = runtime.defineClass("NilClass", runtime.getObject(), NIL_ALLOCATOR);
-        runtime.setNilClass(nilClass);
         nilClass.index = ClassIndex.NIL;
         nilClass.setReifiedClass(RubyNil.class);