[GR-17457] Make ranges object literals where possible.

PullRequest: truffleruby/3418

Author: eregon

CHANGELOG.md

@@ -14,6 +14,7 @@ Compatibility:
 * Fix `Array#fill` to raise `TypeError` instead of `ArgumentError` when the length argument is not numeric (#2652, @andrykonchin).
 * Warn when a global variable is not initialized (#2595, @andrykonchin).
 * Fix escaping of `/` by `Regexp#source` (#2569, @andrykonchin).
+* Range literals of integers are now created at parse time like in CRuby (#2622, @aardvark179).
 
 Performance:
 

spec/ruby/core/range/clone_spec.rb

@@ -0,0 +1,26 @@
+require_relative '../../spec_helper'
+
+describe "Range#clone" do
+  it "duplicates the range" do
+    original = (1..3)
+    copy = original.clone
+    copy.begin.should == 1
+    copy.end.should == 3
+    copy.should_not.exclude_end?
+    copy.should_not.equal? original
+
+    original = ("a"..."z")
+    copy = original.clone
+    copy.begin.should == "a"
+    copy.end.should == "z"
+    copy.should.exclude_end?
+    copy.should_not.equal? original
+  end
+
+  it "maintains the frozen state" do
+    (1..2).clone.frozen?.should == (1..2).frozen?
+    (1..).clone.frozen?.should == (1..).frozen?
+    Range.new(1, 2).clone.frozen?.should == Range.new(1, 2).frozen?
+    Class.new(Range).new(1, 2).clone.frozen?.should == Class.new(Range).new(1, 2).frozen?
+  end
+end

spec/ruby/core/range/dup_spec.rb

@@ -2,10 +2,12 @@
 
 describe "Range#dup" do
   it "duplicates the range" do
-    copy = (1..3).dup
+    original = (1..3)
+    copy = original.dup
     copy.begin.should == 1
     copy.end.should == 3
     copy.should_not.exclude_end?
+    copy.should_not.equal?(original)
 
     copy = ("a"..."z").dup
     copy.begin.should == "a"

spec/ruby/core/range/new_spec.rb

@@ -65,5 +65,15 @@
 
       range_exclude.should_not == range_include
     end
+
+    ruby_version_is "3.0" do
+      it "creates a frozen range if the class is Range.class" do
+        Range.new(1, 2).should.frozen?
+      end
+
+      it "does not create a frozen range if the class is not Range.class" do
+        Class.new(Range).new(1, 2).should_not.frozen?
+      end
+    end
   end
 end

spec/ruby/language/range_spec.rb

@@ -10,6 +10,14 @@
     (1...10).should == Range.new(1, 10, true)
   end
 
+  it "creates a simple range as an object literal" do
+    ary = []
+    2.times do
+      ary.push(1..3)
+    end
+    ary[0].should.equal?(ary[1])
+  end
+
   it "creates endless ranges" do
     (1..).should == Range.new(1, nil)
     (1...).should == Range.new(1, nil, true)

spec/tags/core/range/bsearch_tags.txt

@@ -1,4 +1,2 @@
 fails:Range#minmax on an inclusive range should raise RangeError on an endless range without iterating the range
-fails:Range#minmax on an inclusive range raises RangeError or ArgumentError on a beginless range
 fails:Range#minmax on an exclusive range should raise RangeError on an endless range
-fails:Range#minmax on an exclusive range should raise RangeError on a beginless range

spec/tags/core/range/minmax_tags.txt

@@ -1,2 +1 @@
 fails:A class definition extending an object (sclass) allows accessing the block of the original scope
-fails:A class definition extending an object (sclass) does not allow accessing the block of the original scope

spec/tags/language/class_tags.txt

@@ -211,7 +211,7 @@
       <property name="message" value="Don't use transferToInterpreterOnException"/>
     </module>
     <module name="RegexpSinglelineJava">
-      <property name="format" value='"isRuby(?!Value|DynamicObject|SymbolOrString|Rational|[^"]+\|\|)'/> <!-- Rational is not a builtin type -->
+      <property name="format" value='"isRuby(?!Value|DynamicObject|SymbolOrString|Rational|Range|[^"]+\|\|)'/> <!-- Rational is not a builtin type -->
       <property name="message" value="Type the argument instead of using a positive isRuby* guard."/>
     </module>
     <module name="RegexpSinglelineJava">

src/main/.checkstyle_checks.xml

@@ -66,8 +66,6 @@
 import org.truffleruby.core.proc.RubyProc;
 import org.truffleruby.core.queue.RubyQueue;
 import org.truffleruby.core.queue.RubySizedQueue;
-import org.truffleruby.core.range.RubyIntRange;
-import org.truffleruby.core.range.RubyLongRange;
 import org.truffleruby.core.range.RubyObjectRange;
 import org.truffleruby.core.regexp.RegexpCacheKey;
 import org.truffleruby.core.regexp.RegexpTable;
@@ -260,9 +258,7 @@ public static final class ThreadLocalState {
     public final Shape handleShape = createShape(RubyHandle.class);
     public final Shape hashShape = createShape(RubyHash.class);
     public final Shape innerContextShape = createShape(RubyInnerContext.class);
-    public final Shape intRangeShape = createShape(RubyIntRange.class);
     public final Shape ioShape = createShape(RubyIO.class);
-    public final Shape longRangeShape = createShape(RubyLongRange.class);
     public final Shape matchDataShape = createShape(RubyMatchData.class);
     public final Shape methodShape = createShape(RubyMethod.class);
     public final Shape mutexShape = createShape(RubyMutex.class);