[Truffle] Get rid of Tuple and just use Array.

jruby · Jul 5, 2016 · 166c897 · 166c897
1 parent 24dd66d
commit 166c897
Showing 4 changed files with 2 additions and 34 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/core/CoreLibrary.java b/truffle/src/main/java/org/jruby/truffle/core/CoreLibrary.java
@@ -210,7 +210,6 @@ public class CoreLibrary {
     private final DynamicObjectFactory timeFactory;
     private final DynamicObject transcodingClass;
     private final DynamicObject trueClass;
-    private final DynamicObject tupleClass;
     private final DynamicObject typeErrorClass;
     private final DynamicObject zeroDivisionErrorClass;
     private final DynamicObject enumerableModule;
@@ -657,7 +656,6 @@ public CoreLibrary(RubyContext context) {
         lookupTableClass = defineClass(rubiniusModule, hashClass, "LookupTable");
         defineClass(rubiniusModule, objectClass, "StringData");
         transcodingClass = defineClass(encodingClass, objectClass, "Transcoding");
-        tupleClass = defineClass(rubiniusModule, arrayClass, "Tuple");
         randomizerClass = defineClass(rubiniusModule, objectClass, "Randomizer");
         atomicReferenceClass = defineClass(rubiniusModule, objectClass, "AtomicReference");
         Layouts.CLASS.setInstanceFactoryUnsafe(atomicReferenceClass,
@@ -1374,10 +1372,6 @@ public DynamicObject getTranscodingClass() {
         return transcodingClass;
     }
 
-    public DynamicObject getTupleClass() {
-        return tupleClass;
-    }
-
     public DynamicObject getRubiniusChannelClass() {
         return rubiniusChannelClass;
     }

diff --git a/truffle/src/main/ruby/core/identity_map.rb b/truffle/src/main/ruby/core/identity_map.rb
@@ -40,7 +40,7 @@ module Rubinius
   class IdentityMap
     attr_reader :size
 
-    Row = Table = Rubinius::Tuple
+    Row = Table = Array
     MIN_CAPACITY = 64
     MIN_ROW = 10
     ROW_GROWTH = 9

diff --git a/truffle/src/main/ruby/core/regexp.rb b/truffle/src/main/ruby/core/regexp.rb
@@ -41,7 +41,7 @@ class Regexp
 
   OPTION_MASK = IGNORECASE | EXTENDED | MULTILINE | FIXEDENCODING | NOENCODING | DONT_CAPTURE_GROUP | CAPTURE_GROUP
 
-  ESCAPE_TABLE = Rubinius::Tuple.new(256)
+  ESCAPE_TABLE = Array.new(256)
 
   # Seed it with direct replacements
   i = 0

diff --git a/truffle/src/main/ruby/core/tuple.rb b/truffle/src/main/ruby/core/tuple.rb
@@ -34,31 +34,7 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-module Rubinius
-
-  class Tuple < Array
-
-    def self.pattern(num, val)
-       Tuple.new(num, val)
-    end
-
-    def self.create(*args)
-      ret = Tuple.new(args.size)
-
-      args.each_with_index do |arg, index|
-        ret[index] = arg
-      end
-
-      ret
-    end
-
-  end
-
-end
-
-
 class Array
-
   def copy_from(other, start, length, dest)
     Truffle.primitive :tuple_copy_from
 
@@ -100,13 +76,11 @@ def copy_from(other, start, length, dest)
     self
   end
 
-
   def swap(a, b)
     temp = at(a)
     self[a] = at(b)
     self[b] = temp
   end
 
   alias_method :put, :[]=
-
 end