[Truffle] Move Rubinius core files out of kernel since everything is …

…"kernel" in that directory.
enebo · Feb 9, 2015 · b22e25a · b22e25a
1 parent fbc17d5
commit b22e25a
Show file tree

Hide file tree

Showing 46 changed files with 50 additions and 48 deletions.
diff --git a/COPYING b/COPYING
@@ -108,9 +108,11 @@ lib/ruby/1.9, and lib/ruby/site_ruby/1.8/rubygems*.
  The Rubinius API implementation in truffle/src/main/ruby/core/rubinius/api
  is copyright (c) 2011, Evan Phoenix, and released under the 3-clause BSD license.
 
- The Rubinius core library implementation in truffle/src/main/ruby/core/rubinius/kernel
- is copyright (c) 2007-2014, Evan Phoenix and contributors, and released under
- the 3-clause BSD license.
+ The Rubinius core library implementation
+ in truffle/src/main/ruby/core/rubinius/bootstrap
+ and truffle/src/main/ruby/core/rubinius/common is
+ copyright (c) 2007-2014, Evan Phoenix and contributors,
+ and released under the 3-clause BSD license.
 
 The complete text of the Eclipse Public License is as follows:
 

diff --git a/truffle/src/main/java/org/jruby/truffle/translator/BodyTranslator.java b/truffle/src/main/java/org/jruby/truffle/translator/BodyTranslator.java
@@ -920,7 +920,7 @@ public RubyNode visitConstNode(org.jruby.ast.ConstNode node) {
          * we will because we'll translate that to ::Rubinius. But it is a simpler translation.
          */
 
-        if (node.getName().equals("Rubinius") && sourceSection.getSource().getPath().startsWith("core:/core/rubinius/kernel")) {
+        if (node.getName().equals("Rubinius") && sourceSection.getSource().getPath().startsWith("core:/core/rubinius")) {
             return new org.jruby.ast.Colon3Node(node.getPosition(), node.getName()).accept(this);
         }
 
@@ -1504,7 +1504,7 @@ public RubyNode visitInstVarNode(org.jruby.ast.InstVarNode node) {
          * self, and @start to be 0.
          */
 
-        if (sourceSection.getSource().getPath().equals("core:/core/rubinius/kernel/common/array.rb")) {
+        if (sourceSection.getSource().getPath().equals("core:/core/rubinius/common/array.rb")) {
             if (nameWithoutSigil.equals("@total")) {
                 return new RubyCallNode(context, sourceSection,
                         "size",

diff --git a/truffle/src/main/ruby/core.rb b/truffle/src/main/ruby/core.rb
@@ -21,52 +21,52 @@
 require_relative 'core/rubinius/api/shims/metrics'
 
 # Load bootstrap (ordered according to Rubinius' load_order.txt)
-require_relative 'core/rubinius/kernel/bootstrap/basic_object'
-require_relative 'core/rubinius/kernel/bootstrap/false'
-require_relative 'core/rubinius/kernel/bootstrap/gc'
-require_relative 'core/rubinius/kernel/bootstrap/kernel'
-require_relative 'core/rubinius/kernel/bootstrap/nil'
-require_relative 'core/rubinius/kernel/bootstrap/regexp'
-require_relative 'core/rubinius/kernel/bootstrap/rubinius'
-require_relative 'core/rubinius/kernel/bootstrap/string'
-require_relative 'core/rubinius/kernel/bootstrap/symbol'
-require_relative 'core/rubinius/kernel/bootstrap/time'
-require_relative 'core/rubinius/kernel/bootstrap/true'
-require_relative 'core/rubinius/kernel/bootstrap/type'
+require_relative 'core/rubinius/bootstrap/basic_object'
+require_relative 'core/rubinius/bootstrap/false'
+require_relative 'core/rubinius/bootstrap/gc'
+require_relative 'core/rubinius/bootstrap/kernel'
+require_relative 'core/rubinius/bootstrap/nil'
+require_relative 'core/rubinius/bootstrap/regexp'
+require_relative 'core/rubinius/bootstrap/rubinius'
+require_relative 'core/rubinius/bootstrap/string'
+require_relative 'core/rubinius/bootstrap/symbol'
+require_relative 'core/rubinius/bootstrap/time'
+require_relative 'core/rubinius/bootstrap/true'
+require_relative 'core/rubinius/bootstrap/type'
 
 # Load common (ordered according to Rubinius' load_order.txt)
-require_relative 'core/rubinius/kernel/common/enumerator'
-require_relative 'core/rubinius/kernel/common/enumerable'
-require_relative 'core/rubinius/kernel/common/exception'
-require_relative 'core/rubinius/kernel/common/undefined'
-require_relative 'core/rubinius/kernel/common/type'
-require_relative 'core/rubinius/kernel/common/array'
-require_relative 'core/rubinius/kernel/common/kernel'
-require_relative 'core/rubinius/kernel/common/comparable'
-require_relative 'core/rubinius/kernel/common/numeric'
-require_relative 'core/rubinius/kernel/common/identity_map'
-require_relative 'core/rubinius/kernel/common/integer'
-require_relative 'core/rubinius/kernel/common/fixnum'
-require_relative 'core/rubinius/kernel/common/false'
-require_relative 'core/rubinius/kernel/common/float'
-require_relative 'core/rubinius/kernel/common/immediate'
-require_relative 'core/rubinius/kernel/common/main'
-require_relative 'core/rubinius/kernel/common/marshal'
-require_relative 'core/rubinius/kernel/common/nil'
-require_relative 'core/rubinius/kernel/common/object_space'
-require_relative 'core/rubinius/kernel/common/proc'
-require_relative 'core/rubinius/kernel/common/string'
-require_relative 'core/rubinius/kernel/common/struct'
-require_relative 'core/rubinius/kernel/common/regexp'
-require_relative 'core/rubinius/kernel/common/signal'
-require_relative 'core/rubinius/kernel/common/mutex'
-require_relative 'core/rubinius/kernel/common/throw_catch'
-require_relative 'core/rubinius/kernel/common/time'
-require_relative 'core/rubinius/kernel/common/true'
+require_relative 'core/rubinius/common/enumerator'
+require_relative 'core/rubinius/common/enumerable'
+require_relative 'core/rubinius/common/exception'
+require_relative 'core/rubinius/common/undefined'
+require_relative 'core/rubinius/common/type'
+require_relative 'core/rubinius/common/array'
+require_relative 'core/rubinius/common/kernel'
+require_relative 'core/rubinius/common/comparable'
+require_relative 'core/rubinius/common/numeric'
+require_relative 'core/rubinius/common/identity_map'
+require_relative 'core/rubinius/common/integer'
+require_relative 'core/rubinius/common/fixnum'
+require_relative 'core/rubinius/common/false'
+require_relative 'core/rubinius/common/float'
+require_relative 'core/rubinius/common/immediate'
+require_relative 'core/rubinius/common/main'
+require_relative 'core/rubinius/common/marshal'
+require_relative 'core/rubinius/common/nil'
+require_relative 'core/rubinius/common/object_space'
+require_relative 'core/rubinius/common/proc'
+require_relative 'core/rubinius/common/string'
+require_relative 'core/rubinius/common/struct'
+require_relative 'core/rubinius/common/regexp'
+require_relative 'core/rubinius/common/signal'
+require_relative 'core/rubinius/common/mutex'
+require_relative 'core/rubinius/common/throw_catch'
+require_relative 'core/rubinius/common/time'
+require_relative 'core/rubinius/common/true'
 
-require_relative 'core/rubinius/kernel/common/rational'
-require_relative 'core/rubinius/kernel/common/complex'
-require_relative 'core/rubinius/kernel/common/gc'
+require_relative 'core/rubinius/common/rational'
+require_relative 'core/rubinius/common/complex'
+require_relative 'core/rubinius/common/gc'
 
 # Load JRuby+Truffle classes
 require_relative 'core/array'

diff --git a/...rubinius/kernel/bootstrap/basic_object.rb → ...y/core/rubinius/bootstrap/basic_object.rb b/...rubinius/kernel/bootstrap/basic_object.rb → ...y/core/rubinius/bootstrap/basic_object.rb
diff --git a/...y/core/rubinius/kernel/bootstrap/false.rb → ...ain/ruby/core/rubinius/bootstrap/false.rb b/...y/core/rubinius/kernel/bootstrap/false.rb → ...ain/ruby/core/rubinius/bootstrap/false.rb
diff --git a/...ruby/core/rubinius/kernel/bootstrap/gc.rb → ...c/main/ruby/core/rubinius/bootstrap/gc.rb b/...ruby/core/rubinius/kernel/bootstrap/gc.rb → ...c/main/ruby/core/rubinius/bootstrap/gc.rb
diff --git a/.../core/rubinius/kernel/bootstrap/kernel.rb → ...in/ruby/core/rubinius/bootstrap/kernel.rb b/.../core/rubinius/kernel/bootstrap/kernel.rb → ...in/ruby/core/rubinius/bootstrap/kernel.rb
diff --git a/...uby/core/rubinius/kernel/bootstrap/nil.rb → .../main/ruby/core/rubinius/bootstrap/nil.rb b/...uby/core/rubinius/kernel/bootstrap/nil.rb → .../main/ruby/core/rubinius/bootstrap/nil.rb
diff --git a/.../core/rubinius/kernel/bootstrap/regexp.rb → ...in/ruby/core/rubinius/bootstrap/regexp.rb b/.../core/rubinius/kernel/bootstrap/regexp.rb → ...in/ruby/core/rubinius/bootstrap/regexp.rb
diff --git a/...ore/rubinius/kernel/bootstrap/rubinius.rb → .../ruby/core/rubinius/bootstrap/rubinius.rb b/...ore/rubinius/kernel/bootstrap/rubinius.rb → .../ruby/core/rubinius/bootstrap/rubinius.rb
diff --git a/.../core/rubinius/kernel/bootstrap/string.rb → ...in/ruby/core/rubinius/bootstrap/string.rb b/.../core/rubinius/kernel/bootstrap/string.rb → ...in/ruby/core/rubinius/bootstrap/string.rb
diff --git a/.../core/rubinius/kernel/bootstrap/symbol.rb → ...in/ruby/core/rubinius/bootstrap/symbol.rb b/.../core/rubinius/kernel/bootstrap/symbol.rb → ...in/ruby/core/rubinius/bootstrap/symbol.rb
diff --git a/...by/core/rubinius/kernel/bootstrap/time.rb → ...main/ruby/core/rubinius/bootstrap/time.rb b/...by/core/rubinius/kernel/bootstrap/time.rb → ...main/ruby/core/rubinius/bootstrap/time.rb
diff --git a/...by/core/rubinius/kernel/bootstrap/true.rb → ...main/ruby/core/rubinius/bootstrap/true.rb b/...by/core/rubinius/kernel/bootstrap/true.rb → ...main/ruby/core/rubinius/bootstrap/true.rb
diff --git a/...by/core/rubinius/kernel/bootstrap/type.rb → ...main/ruby/core/rubinius/bootstrap/type.rb b/...by/core/rubinius/kernel/bootstrap/type.rb → ...main/ruby/core/rubinius/bootstrap/type.rb
diff --git a/...ruby/core/rubinius/kernel/common/array.rb → ...c/main/ruby/core/rubinius/common/array.rb b/...ruby/core/rubinius/kernel/common/array.rb → ...c/main/ruby/core/rubinius/common/array.rb
diff --git a/...core/rubinius/kernel/common/comparable.rb → ...n/ruby/core/rubinius/common/comparable.rb b/...core/rubinius/kernel/common/comparable.rb → ...n/ruby/core/rubinius/common/comparable.rb
diff --git a/...by/core/rubinius/kernel/common/complex.rb → ...main/ruby/core/rubinius/common/complex.rb b/...by/core/rubinius/kernel/common/complex.rb → ...main/ruby/core/rubinius/common/complex.rb
diff --git a/...core/rubinius/kernel/common/enumerable.rb → ...n/ruby/core/rubinius/common/enumerable.rb b/...core/rubinius/kernel/common/enumerable.rb → ...n/ruby/core/rubinius/common/enumerable.rb
diff --git a/...core/rubinius/kernel/common/enumerator.rb → ...n/ruby/core/rubinius/common/enumerator.rb b/...core/rubinius/kernel/common/enumerator.rb → ...n/ruby/core/rubinius/common/enumerator.rb
diff --git a/.../core/rubinius/kernel/common/exception.rb → ...in/ruby/core/rubinius/common/exception.rb b/.../core/rubinius/kernel/common/exception.rb → ...in/ruby/core/rubinius/common/exception.rb
diff --git a/...ruby/core/rubinius/kernel/common/false.rb → ...c/main/ruby/core/rubinius/common/false.rb b/...ruby/core/rubinius/kernel/common/false.rb → ...c/main/ruby/core/rubinius/common/false.rb
diff --git a/...uby/core/rubinius/kernel/common/fixnum.rb → .../main/ruby/core/rubinius/common/fixnum.rb b/...uby/core/rubinius/kernel/common/fixnum.rb → .../main/ruby/core/rubinius/common/fixnum.rb
diff --git a/...ruby/core/rubinius/kernel/common/float.rb → ...c/main/ruby/core/rubinius/common/float.rb b/...ruby/core/rubinius/kernel/common/float.rb → ...c/main/ruby/core/rubinius/common/float.rb
diff --git a/...in/ruby/core/rubinius/kernel/common/gc.rb → .../src/main/ruby/core/rubinius/common/gc.rb b/...in/ruby/core/rubinius/kernel/common/gc.rb → .../src/main/ruby/core/rubinius/common/gc.rb
diff --git a/...re/rubinius/kernel/common/identity_map.rb → ...ruby/core/rubinius/common/identity_map.rb b/...re/rubinius/kernel/common/identity_map.rb → ...ruby/core/rubinius/common/identity_map.rb
diff --git a/.../core/rubinius/kernel/common/immediate.rb → ...in/ruby/core/rubinius/common/immediate.rb b/.../core/rubinius/kernel/common/immediate.rb → ...in/ruby/core/rubinius/common/immediate.rb
diff --git a/...by/core/rubinius/kernel/common/integer.rb → ...main/ruby/core/rubinius/common/integer.rb b/...by/core/rubinius/kernel/common/integer.rb → ...main/ruby/core/rubinius/common/integer.rb
diff --git a/...uby/core/rubinius/kernel/common/kernel.rb → .../main/ruby/core/rubinius/common/kernel.rb b/...uby/core/rubinius/kernel/common/kernel.rb → .../main/ruby/core/rubinius/common/kernel.rb
diff --git a/.../ruby/core/rubinius/kernel/common/main.rb → ...rc/main/ruby/core/rubinius/common/main.rb b/.../ruby/core/rubinius/kernel/common/main.rb → ...rc/main/ruby/core/rubinius/common/main.rb
diff --git a/...by/core/rubinius/kernel/common/marshal.rb → ...main/ruby/core/rubinius/common/marshal.rb b/...by/core/rubinius/kernel/common/marshal.rb → ...main/ruby/core/rubinius/common/marshal.rb
diff --git a/...ruby/core/rubinius/kernel/common/mutex.rb → ...c/main/ruby/core/rubinius/common/mutex.rb b/...ruby/core/rubinius/kernel/common/mutex.rb → ...c/main/ruby/core/rubinius/common/mutex.rb
diff --git a/...n/ruby/core/rubinius/kernel/common/nil.rb → ...src/main/ruby/core/rubinius/common/nil.rb b/...n/ruby/core/rubinius/kernel/common/nil.rb → ...src/main/ruby/core/rubinius/common/nil.rb
diff --git a/...by/core/rubinius/kernel/common/numeric.rb → ...main/ruby/core/rubinius/common/numeric.rb b/...by/core/rubinius/kernel/common/numeric.rb → ...main/ruby/core/rubinius/common/numeric.rb
diff --git a/...re/rubinius/kernel/common/object_space.rb → ...ruby/core/rubinius/common/object_space.rb b/...re/rubinius/kernel/common/object_space.rb → ...ruby/core/rubinius/common/object_space.rb
diff --git a/.../ruby/core/rubinius/kernel/common/proc.rb → ...rc/main/ruby/core/rubinius/common/proc.rb b/.../ruby/core/rubinius/kernel/common/proc.rb → ...rc/main/ruby/core/rubinius/common/proc.rb
diff --git a/...y/core/rubinius/kernel/common/rational.rb → ...ain/ruby/core/rubinius/common/rational.rb b/...y/core/rubinius/kernel/common/rational.rb → ...ain/ruby/core/rubinius/common/rational.rb
diff --git a/...uby/core/rubinius/kernel/common/regexp.rb → .../main/ruby/core/rubinius/common/regexp.rb b/...uby/core/rubinius/kernel/common/regexp.rb → .../main/ruby/core/rubinius/common/regexp.rb
diff --git a/...uby/core/rubinius/kernel/common/signal.rb → .../main/ruby/core/rubinius/common/signal.rb b/...uby/core/rubinius/kernel/common/signal.rb → .../main/ruby/core/rubinius/common/signal.rb
diff --git a/...uby/core/rubinius/kernel/common/string.rb → .../main/ruby/core/rubinius/common/string.rb b/...uby/core/rubinius/kernel/common/string.rb → .../main/ruby/core/rubinius/common/string.rb
diff --git a/...uby/core/rubinius/kernel/common/struct.rb → .../main/ruby/core/rubinius/common/struct.rb b/...uby/core/rubinius/kernel/common/struct.rb → .../main/ruby/core/rubinius/common/struct.rb
diff --git a/...ore/rubinius/kernel/common/throw_catch.rb → .../ruby/core/rubinius/common/throw_catch.rb b/...ore/rubinius/kernel/common/throw_catch.rb → .../ruby/core/rubinius/common/throw_catch.rb
diff --git a/.../ruby/core/rubinius/kernel/common/time.rb → ...rc/main/ruby/core/rubinius/common/time.rb b/.../ruby/core/rubinius/kernel/common/time.rb → ...rc/main/ruby/core/rubinius/common/time.rb
diff --git a/.../ruby/core/rubinius/kernel/common/true.rb → ...rc/main/ruby/core/rubinius/common/true.rb b/.../ruby/core/rubinius/kernel/common/true.rb → ...rc/main/ruby/core/rubinius/common/true.rb
diff --git a/.../ruby/core/rubinius/kernel/common/type.rb → ...rc/main/ruby/core/rubinius/common/type.rb b/.../ruby/core/rubinius/kernel/common/type.rb → ...rc/main/ruby/core/rubinius/common/type.rb
diff --git a/.../core/rubinius/kernel/common/undefined.rb → ...in/ruby/core/rubinius/common/undefined.rb b/.../core/rubinius/kernel/common/undefined.rb → ...in/ruby/core/rubinius/common/undefined.rb