[Truffle] Try to clarify control flow in Kernel#load.

jruby · May 2, 2016 · 317099c · 317099c
1 parent b940941
commit 317099c
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/truffle/src/main/ruby/core/rubinius/common/kernel.rb b/truffle/src/main/ruby/core/rubinius/common/kernel.rb
@@ -536,13 +536,18 @@ def load(filename, wrap = false)
       return Truffle::Kernel.load File.expand_path(filename), wrap
     end
 
-    # try relative
+    # if path starts with . only try relative paths
     if filename.start_with? '.'
-      return Truffle::Kernel.load File.expand_path(File.join(Dir.pwd, filename)), wrap
+      return Truffle::Kernel.load File.expand_path(filename), wrap
+    end
+
+    # try to resolve with current working directory
+    if File.exist? filename
+      return Truffle::Kernel.load File.expand_path(filename), wrap
     end
 
     # try to find relative path in $LOAD_PATH
-    [Dir.pwd, *$LOAD_PATH].each do |dir|
+    $LOAD_PATH.each do |dir|
       path = File.expand_path(File.join(dir, filename))
       if File.exist? path
         return Truffle::Kernel.load path, wrap