[Truffle] Integrate Kernel changes.

jruby · May 2, 2016 · b940941 · b940941
1 parent 86a6c19
commit b940941
Showing 3 changed files with 32 additions and 85 deletions.
diff --git a/truffle/src/main/ruby/core.rb b/truffle/src/main/ruby/core.rb
@@ -140,7 +140,6 @@ def self.omit(reason)
 Truffle::Boot.require_core 'core/rubinius/common/array'
 Truffle::Boot.require_core 'core/rubinius/api/shims/array'
 Truffle::Boot.require_core 'core/rubinius/common/kernel'
-Truffle::Boot.require_core 'core/rubinius/api/shims/kernel'
 Truffle::Boot.require_core 'core/rubinius/common/identity_map'
 #Truffle::Boot.require_core 'core/rubinius/common/loaded_features'
 #Truffle::Boot.require_core 'core/rubinius/common/global'

diff --git a/truffle/src/main/ruby/core/rubinius/api/shims/kernel.rb b/truffle/src/main/ruby/core/rubinius/api/shims/kernel.rb
diff --git a/truffle/src/main/ruby/core/rubinius/common/kernel.rb b/truffle/src/main/ruby/core/rubinius/common/kernel.rb
@@ -1,3 +1,11 @@
+# Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved. This
+# code is released under a tri EPL/GPL/LGPL license. You can use it,
+# redistribute it and/or modify it under the terms of the:
+#
+# Eclipse Public License version 1.0
+# GNU General Public License version 2
+# GNU Lesser General Public License version 2.1
+
 # Copyright (c) 2007-2015, Evan Phoenix and contributors
 # All rights reserved.
 #
@@ -345,9 +353,12 @@ def exit!(code=1)
 
   def extend(*modules)
     raise ArgumentError, "wrong number of arguments (0 for 1+)" if modules.empty?
-    Rubinius.check_frozen
 
     modules.reverse_each do |mod|
+      if !mod.kind_of?(Module) or mod.kind_of?(Class)
+        raise TypeError, "wrong argument type #{mod.class} (expected Module)"
+      end
+
       Rubinius.privately do
         mod.extend_object self
       end
@@ -517,15 +528,29 @@ def lambda
   end
   module_function :lambda
 
-  def load(name, wrap=false)
-    cl = Rubinius::CodeLoader.new(name)
-    cl.load(wrap)
+  def load(filename, wrap = false)
+    filename = Rubinius::Type.coerce_to_path filename
 
-    Rubinius.run_script cl.compiled_code
+    # load absolute path
+    if filename.start_with? File::SEPARATOR
+      return Truffle::Kernel.load File.expand_path(filename), wrap
+    end
 
-    Rubinius::CodeLoader.loaded_hook.trigger!(name)
+    # try relative
+    if filename.start_with? '.'
+      return Truffle::Kernel.load File.expand_path(File.join(Dir.pwd, filename)), wrap
+    end
+
+    # try to find relative path in $LOAD_PATH
+    [Dir.pwd, *$LOAD_PATH].each do |dir|
+      path = File.expand_path(File.join(dir, filename))
+      if File.exist? path
+        return Truffle::Kernel.load path, wrap
+      end
+    end
 
-    return true
+    # file not found trigger an error
+    Truffle::Kernel.load filename, wrap
   end
   module_function :load