Merge pull request #464 in G/truffleruby from truffle-namespace-cleanup to master

eregon · eregon · commit 13bd0c45ec50 · 2018-11-24T05:28:12.000-08:00
* commit '547d23a326a9793d659ecafeb29818996de88ee6':
  Remove more unneeded :: constants qualifications in core
  Remove unneeded :: constants qualifications
  Add slow tag
  Update comment about Truffle::Binding.of_caller
  The spec needs to run in a fresh process
  Add the 2 remaining constants as explicit exclusions for conflicting Truffle constants
  Remove unused Config module
  Remove unused Truffle::Process
  Define GC methods directly without Truffle::GC
  Move GC.count spec to ruby/spec
  Add spec for Truffle constants conflicting with Object constants
  Remove unused Truffle::Array
diff --git a/spec/ruby/core/gc/count_spec.rb b/spec/ruby/core/gc/count_spec.rb
@@ -4,4 +4,14 @@
   it "returns an integer" do
     GC.count.should be_kind_of(Integer)
   end
+
+  it "increases as collections are run" do
+    count_before = GC.count
+    i = 0
+    while GC.count <= count_before and i < 10
+      GC.start
+      i += 1
+    end
+    GC.count.should > count_before
+  end
 end
diff --git a/spec/tags/core/gc/count_tags.txt b/spec/tags/core/gc/count_tags.txt
@@ -0,0 +1 @@
+slow:GC.count increases as collections are run
diff --git a/spec/tags/truffle/constants_tags.txt b/spec/tags/truffle/constants_tags.txt
@@ -0,0 +1 @@
+slow:Truffle has no common constants with Object
diff --git a/spec/tags/truffle/gc/count_tags.txt b/spec/tags/truffle/gc/count_tags.txt
diff --git a/spec/tags/truffle/gc/time_tags.txt b/spec/tags/truffle/gc/time_tags.txt
@@ -1 +1 @@
-slow:Truffle::GC.time increases as collections are run
+slow:GC.time increases as collections are run
diff --git a/spec/truffle/gc/count_spec.rb b/spec/truffle/gc/count_spec.rb
diff --git a/spec/truffle/gc/time_spec.rb b/spec/truffle/gc/time_spec.rb
@@ -8,20 +8,20 @@
 
 require_relative '../../ruby/spec_helper'
 
-describe "Truffle::GC.time" do
-  
+describe "GC.time" do
+
   it "returns an Integer" do
-    Truffle::GC.time.should be_kind_of(Integer)
+    GC.time.should be_kind_of(Integer)
   end
   
   it "increases as collections are run" do
-    time_before = Truffle::GC.time
+    time_before = GC.time
     i = 0
-    while Truffle::GC.time <= time_before and i < 10
+    while GC.time <= time_before and i < 10
       GC.start
       i += 1
     end
-    Truffle::GC.time.should > time_before
+    GC.time.should > time_before
   end
 
 end
diff --git a/spec/truffle/truffle/constants_spec.rb b/spec/truffle/truffle/constants_spec.rb
@@ -0,0 +1,22 @@
+# Copyright (c) 2018 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, or
+# GNU General Public License version 2, or
+# GNU Lesser General Public License version 2.1.
+
+require_relative '../../ruby/spec_helper'
+
+describe "Truffle" do
+
+  it "has no common constants with Object" do
+    known_offenders = [
+      :Gem, # Truffle::Gem::BCrypt, to remove with truffleruby-tool
+      :Binding, # Truffle::Binding.of_caller, should move under TruffleRuby
+    ]
+    code = "puts((Truffle.constants & Object.constants) - #{known_offenders.inspect})"
+    ruby_exe(code).should == ""
+  end
+
+end
diff --git a/src/main/java/org/truffleruby/builtins/BuiltinsClasses.java b/src/main/java/org/truffleruby/builtins/BuiltinsClasses.java
@@ -14,14 +14,14 @@
 
 import org.truffleruby.cext.CExtNodesBuiltins;
 import org.truffleruby.cext.CExtNodesFactory;
+import org.truffleruby.core.GCNodesBuiltins;
+import org.truffleruby.core.GCNodesFactory;
 import org.truffleruby.core.MainNodesBuiltins;
 import org.truffleruby.core.MainNodesFactory;
 import org.truffleruby.core.MathNodesBuiltins;
 import org.truffleruby.core.MathNodesFactory;
 import org.truffleruby.core.ProcessNodesBuiltins;
 import org.truffleruby.core.ProcessNodesFactory;
-import org.truffleruby.core.TruffleGCNodesBuiltins;
-import org.truffleruby.core.TruffleGCNodesFactory;
 import org.truffleruby.core.TruffleSystemNodesBuiltins;
 import org.truffleruby.core.TruffleSystemNodesFactory;
 import org.truffleruby.core.VMPrimitiveNodesBuiltins;
@@ -182,6 +182,7 @@ public static void setupBuiltinsLazy(CoreMethodNodeManager coreManager, Primitiv
         FalseClassNodesBuiltins.setup(coreManager, primitiveManager);
         FiberNodesBuiltins.setup(coreManager, primitiveManager);
         FloatNodesBuiltins.setup(coreManager, primitiveManager);
+        GCNodesBuiltins.setup(coreManager, primitiveManager);
         JavaUtilitiesNodesBuiltins.setup(coreManager, primitiveManager);
         HashNodesBuiltins.setup(coreManager, primitiveManager);
         IntegerNodesBuiltins.setup(coreManager, primitiveManager);
@@ -221,7 +222,6 @@ public static void setupBuiltinsLazy(CoreMethodNodeManager coreManager, Primitiv
         TruffleBindingNodesBuiltins.setup(coreManager, primitiveManager);
         TruffleBootNodesBuiltins.setup(coreManager, primitiveManager);
         TruffleDebugNodesBuiltins.setup(coreManager, primitiveManager);
-        TruffleGCNodesBuiltins.setup(coreManager, primitiveManager);
         TruffleGraalNodesBuiltins.setup(coreManager, primitiveManager);
         TruffleKernelNodesBuiltins.setup(coreManager, primitiveManager);
         TrufflePosixNodesBuiltins.setup(coreManager, primitiveManager);
@@ -249,7 +249,7 @@ public static List<List<? extends NodeFactory<? extends RubyNode>>> getCoreNodeF
             ByteArrayNodesFactory.getFactories(),
             CExtNodesFactory.getFactories(),
             ClassNodesFactory.getFactories(),
-                ConditionVariableNodesFactory.getFactories(),
+            ConditionVariableNodesFactory.getFactories(),
             CoverageNodesFactory.getFactories(),
             DigestNodesFactory.getFactories(),
             EncodingConverterNodesFactory.getFactories(),
@@ -258,6 +258,7 @@ public static List<List<? extends NodeFactory<? extends RubyNode>>> getCoreNodeF
             FalseClassNodesFactory.getFactories(),
             FiberNodesFactory.getFactories(),
             FloatNodesFactory.getFactories(),
+            GCNodesFactory.getFactories(),
             JavaUtilitiesNodesFactory.getFactories(),
             HashNodesFactory.getFactories(),
             IntegerNodesFactory.getFactories(),
@@ -297,7 +298,6 @@ public static List<List<? extends NodeFactory<? extends RubyNode>>> getCoreNodeF
             TruffleBindingNodesFactory.getFactories(),
             TruffleBootNodesFactory.getFactories(),
             TruffleDebugNodesFactory.getFactories(),
-            TruffleGCNodesFactory.getFactories(),
             TruffleGraalNodesFactory.getFactories(),
             TruffleKernelNodesFactory.getFactories(),
             TrufflePosixNodesFactory.getFactories(),
diff --git a/src/main/java/org/truffleruby/core/CoreLibrary.java b/src/main/java/org/truffleruby/core/CoreLibrary.java
@@ -491,7 +491,6 @@ public CoreLibrary(RubyContext context) {
         // Modules
 
         DynamicObject comparableModule = defineModule("Comparable");
-        defineModule("Config");
         enumerableModule = defineModule("Enumerable");
         defineModule("GC");
         kernelModule = defineModule("Kernel");
@@ -526,14 +525,11 @@ public CoreLibrary(RubyContext context) {
         defineModule(truffleModule, "Coverage");
         defineModule(truffleModule, "Graal");
         defineModule(truffleModule, "Ropes");
-        defineModule(truffleModule, "GC");
-        defineModule(truffleModule, "Array");
         truffleRegexpOperationsModule = defineModule(truffleModule, "RegexpOperations");
         defineModule(truffleModule, "StringOperations");
         truffleBootModule = defineModule(truffleModule, "Boot");
         defineModule(truffleModule, "System");
         truffleKernelOperationsModule = defineModule(truffleModule, "KernelOperations");
-        defineModule(truffleModule, "Process");
         defineModule(truffleModule, "Binding");
         defineModule(truffleModule, "POSIX");
         defineModule(truffleModule, "Readline");
diff --git a/src/main/java/org/truffleruby/core/GCNodes.java b/src/main/java/org/truffleruby/core/GCNodes.java
@@ -18,8 +18,8 @@
 import java.lang.management.GarbageCollectorMXBean;
 import java.lang.management.ManagementFactory;
 
-@CoreClass("Truffle::GC")
-public abstract class TruffleGCNodes {
+@CoreClass("GC")
+public abstract class GCNodes {
 
     @CoreMethod(names = "count", onSingleton = true)
     public abstract static class CountNode extends CoreMethodArrayArgumentsNode {
diff --git a/src/main/ruby/core/enumerable.rb b/src/main/ruby/core/enumerable.rb
@@ -33,7 +33,7 @@ module Enumerable
   def chunk(&original_block)
     initial_state = nil
     raise ArgumentError, 'no block given' unless block_given?
-    ::Enumerator.new do |yielder|
+    Enumerator.new do |yielder|
       previous = nil
       accumulate = []
       if initial_state.nil?
diff --git a/src/main/ruby/core/gc.rb b/src/main/ruby/core/gc.rb
@@ -74,18 +74,10 @@ def garbage_collect
     GC.start
   end
 
-  def self.count
-    Truffle::GC.count
-  end
-
-  def self.time
-    Truffle::GC.time
-  end
-
   def self.stat
     {
-      count: Truffle::GC.count,
-      time: Truffle::GC.time,
+      count: GC.count,
+      time: GC.time,
     }
   end
 
diff --git a/src/main/ruby/core/io.rb b/src/main/ruby/core/io.rb
@@ -53,11 +53,11 @@ module WaitReadable; end
   module WaitWritable; end
 
   class EAGAINWaitReadable < Errno::EAGAIN
-    include ::IO::WaitReadable
+    include IO::WaitReadable
   end
 
   class EAGAINWaitWritable < Errno::EAGAIN
-    include ::IO::WaitWritable
+    include IO::WaitWritable
   end
 
   class EWOULDBLOCKWaitReadable < Errno::EAGAIN
diff --git a/src/main/ruby/core/thread.rb b/src/main/ruby/core/thread.rb
@@ -450,7 +450,7 @@ def wait(mutex, timeout=nil)
       timeout = Truffle::Type.rb_num2long(timeout)
     end
 
-    if defined?(::Mutex_m) && mutex.kind_of?(Mutex_m)
+    if defined?(::Mutex_m) && mutex.kind_of?(::Mutex_m)
       raw_mutex = mutex.instance_variable_get(:@_mutex)
     else
       raw_mutex = mutex
diff --git a/src/main/ruby/core/truffle/interop.rb b/src/main/ruby/core/truffle/interop.rb
@@ -66,7 +66,7 @@ def self.object_key_info(object, name)
         modifiable = has_key && !frozen
         removable = modifiable
         insertable = !frozen
-      elsif object.is_a?(::Array)
+      elsif object.is_a?(Array)
         in_bounds = name.is_a?(Integer) && name >= 0 && name < object.size
         readable = in_bounds
         insertable = in_bounds && !object.frozen?
@@ -152,12 +152,12 @@ def self.java_array(*array)
     
     def self.to_java_array(array)
       Truffle.primitive :to_java_array
-      to_java_array(Truffle::Type.coerce_to(array, ::Array, :to_a))
+      to_java_array(Truffle::Type.coerce_to(array, Array, :to_a))
     end
     
     def self.to_java_list(array)
       Truffle.primitive :to_java_list
-      to_java_list(Truffle::Type.coerce_to(array, ::Array, :to_a))
+      to_java_list(Truffle::Type.coerce_to(array, Array, :to_a))
     end
     
     def self.special_form(receiver, name, *args)
@@ -269,7 +269,7 @@ def self.to_array(object)
         raise 'foreign object does not have a size to turn it into an array'
       end
       
-      ::Array.new(Truffle::Interop.size(object)) do |n|
+      Array.new(Truffle::Interop.size(object)) do |n|
         Truffle::Interop.read(object, n)
       end
     end
diff --git a/src/main/ruby/core/truffle/io_operations.rb b/src/main/ruby/core/truffle/io_operations.rb
@@ -35,7 +35,7 @@ def self.puts(io, *args)
         args.each do |arg|
           if arg.equal? nil
             str = ''
-          elsif arg.kind_of?(::Array)
+          elsif arg.kind_of?(Array)
             if Thread.guarding? arg
               str = '[...]'
             else
diff --git a/src/main/ruby/core/truffle/kernel_operations.rb b/src/main/ruby/core/truffle/kernel_operations.rb
@@ -123,11 +123,11 @@ def self.internal_raise(exc, msg, ctx, internal)
         else
           exc = exc.exception msg
         end
-        raise ::TypeError, 'exception class/object expected' unless exc.kind_of?(::Exception)
+        raise TypeError, 'exception class/object expected' unless exc.kind_of?(Exception)
       elsif exc.kind_of? String
-        exc = ::RuntimeError.exception exc
+        exc = RuntimeError.exception exc
       else
-        raise ::TypeError, 'exception class/object expected'
+        raise TypeError, 'exception class/object expected'
       end
 
       unless skip
diff --git a/src/main/ruby/core/truffle/process_operations.rb b/src/main/ruby/core/truffle/process_operations.rb

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+slow:GC.count increases as collections are run`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+slow:Truffle has no common constants with Object`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-slow:Truffle::GC.time increases as collections are run`
	`1`	`+slow:GC.time increases as collections are run`