Keep all corelib globals in relevant files

opal · Oct 25, 2013 · 302ded2 · 302ded2
1 parent 1174f5b
commit 302ded2
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 44 deletions.
diff --git a/corelib/boolean.rb b/corelib/boolean.rb
@@ -34,3 +34,6 @@ def to_n
 
 TrueClass = Boolean
 FalseClass = Boolean
+
+TRUE = true
+FALSE = false
diff --git a/corelib/io.rb b/corelib/io.rb
@@ -37,3 +37,33 @@ def readpartial(integer, outbuf = nil)
     end
   end
 end
+
+STDERR        = $stderr = IO.new
+STDIN         = $stdin  = IO.new
+STDOUT        = $stdout = IO.new
+
+def $stdout.puts(*strs)
+  %x{
+    for (var i = 0; i < strs.length; i++) {
+      if(strs[i] instanceof Array) {
+        #{ puts(*`strs[i]`) }
+      } else {
+        console.log(#{`strs[i]`.to_s});
+      }
+    }
+  }
+  nil
+end
+
+def $stderr.puts(*strs)
+  %x{
+    for (var i = 0; i < strs.length; i++) {
+      if(strs[i] instanceof Array) {
+        #{ puts(*`strs[i]`) }
+      } else {
+        console.warn(#{`strs[i]`.to_s});
+      }
+    }
+  }
+  nil
+end
diff --git a/corelib/main.rb b/corelib/main.rb
@@ -0,0 +1,7 @@
+def self.to_s
+  'main'
+end
+
+def self.include(mod)
+  Object.include mod
+end
diff --git a/corelib/native.rb b/corelib/native.rb
@@ -265,3 +265,6 @@ def nil?
     false
   end
 end
+
+# native global
+$$ = $global = Native(`Opal.global`)
diff --git a/corelib/nil_class.rb b/corelib/nil_class.rb
@@ -58,3 +58,5 @@ def object_id
   end
   alias hash object_id
 end
+
+NIL = nil
diff --git a/corelib/opal.rb b/corelib/opal.rb
@@ -22,6 +22,7 @@
 require 'struct'
 require 'native'
 require 'io'
+require 'main'
 
 # regexp matches
 $& = $~ = $` = $' = nil
@@ -33,56 +34,12 @@
 $/            = "\n"
 $,            = " "
 
-# native global
-$$ = $global = Native(`Opal.global`)
-
 ARGV          = []
 ARGF          = Object.new
 ENV           = {}
-TRUE          = true
-FALSE         = false
-NIL           = nil
-
-STDERR        = $stderr = IO.new
-STDIN         = $stdin  = IO.new
-STDOUT        = $stdout = IO.new
-
-def $stdout.puts(*strs)
-  %x{
-    for (var i = 0; i < strs.length; i++) {
-      if(strs[i] instanceof Array) {
-        #{ puts(*`strs[i]`) }
-      } else {
-        console.log(#{`strs[i]`.to_s});
-      }
-    }
-  }
-  nil
-end
-
-def $stderr.puts(*strs)
-  %x{
-    for (var i = 0; i < strs.length; i++) {
-      if(strs[i] instanceof Array) {
-        #{ puts(*`strs[i]`) }
-      } else {
-        console.warn(#{`strs[i]`.to_s});
-      }
-    }
-  }
-  nil
-end
 
 RUBY_PLATFORM = 'opal'
 RUBY_ENGINE   = 'opal'
 RUBY_VERSION  = '1.9.3'
 RUBY_ENGINE_VERSION = '0.4.4'
 RUBY_RELEASE_DATE = '2013-08-13'
-
-def self.to_s
-  'main'
-end
-
-def self.include(mod)
-  Object.include mod
-end