Revert "Reapply "[Feature #6012] Extend source_location for end position"

This reverts commit 8f5e0d8ff82ff63d60da445826fa44be3d8d0820.

Author: eregon

core/method/source_location_spec.rb

@@ -11,23 +11,23 @@
   end
 
   it "sets the first value to the path of the file in which the method was defined" do
-    file = @method.source_location[0]
+    file = @method.source_location.first
     file.should be_an_instance_of(String)
     file.should == File.realpath('fixtures/classes.rb', __dir__)
   end
 
   it "sets the last value to an Integer representing the line on which the method was defined" do
-    line = @method.source_location[1]
+    line = @method.source_location.last
     line.should be_an_instance_of(Integer)
     line.should == 5
   end
 
   it "returns the last place the method was defined" do
-    MethodSpecs::SourceLocation.method(:redefined).source_location[1].should == 13
+    MethodSpecs::SourceLocation.method(:redefined).source_location.last.should == 13
   end
 
   it "returns the location of the original method even if it was aliased" do
-    MethodSpecs::SourceLocation.new.method(:aka).source_location[1].should == 17
+    MethodSpecs::SourceLocation.new.method(:aka).source_location.last.should == 17
   end
 
   it "works for methods defined with a block" do
@@ -108,13 +108,7 @@ def f
     c = Class.new do
       eval('def self.m; end', nil, "foo", 100)
     end
-    location = c.method(:m).source_location
-    ruby_version_is(""..."4.0") do
-      location.should == ["foo", 100]
-    end
-    ruby_version_is("4.0") do
-      location.should == ["foo", 100, 0, 100, 15]
-    end
+    c.method(:m).source_location.should == ["foo", 100]
   end
 
   describe "for a Method generated by respond_to_missing?" do

core/proc/source_location_spec.rb

@@ -17,64 +17,57 @@
   end
 
   it "sets the first value to the path of the file in which the proc was defined" do
-    file = @proc.source_location[0]
+    file = @proc.source_location.first
     file.should be_an_instance_of(String)
     file.should == File.realpath('fixtures/source_location.rb', __dir__)
 
-    file = @proc_new.source_location[0]
+    file = @proc_new.source_location.first
     file.should be_an_instance_of(String)
     file.should == File.realpath('fixtures/source_location.rb', __dir__)
 
-    file = @lambda.source_location[0]
+    file = @lambda.source_location.first
     file.should be_an_instance_of(String)
     file.should == File.realpath('fixtures/source_location.rb', __dir__)
 
-    file = @method.source_location[0]
+    file = @method.source_location.first
     file.should be_an_instance_of(String)
     file.should == File.realpath('fixtures/source_location.rb', __dir__)
   end
 
-  it "sets the second value to an Integer representing the line on which the proc was defined" do
-    line = @proc.source_location[1]
+  it "sets the last value to an Integer representing the line on which the proc was defined" do
+    line = @proc.source_location.last
     line.should be_an_instance_of(Integer)
     line.should == 4
 
-    line = @proc_new.source_location[1]
+    line = @proc_new.source_location.last
     line.should be_an_instance_of(Integer)
     line.should == 12
 
-    line = @lambda.source_location[1]
+    line = @lambda.source_location.last
     line.should be_an_instance_of(Integer)
     line.should == 8
 
-    line = @method.source_location[1]
+    line = @method.source_location.last
     line.should be_an_instance_of(Integer)
     line.should == 15
   end
 
   it "works even if the proc was created on the same line" do
-    ruby_version_is(""..."4.0") do
-      proc { true }.source_location.should == [__FILE__, __LINE__]
-      Proc.new { true }.source_location.should == [__FILE__, __LINE__]
-      -> { true }.source_location.should == [__FILE__, __LINE__]
-    end
-    ruby_version_is("4.0") do
-      proc { true }.source_location.should == [__FILE__, __LINE__, 11, __LINE__, 19]
-      Proc.new { true }.source_location.should == [__FILE__, __LINE__, 15, __LINE__, 23]
-      -> { true }.source_location.should == [__FILE__, __LINE__, 6, __LINE__, 17]
-    end
+    proc { true }.source_location.should == [__FILE__, __LINE__]
+    Proc.new { true }.source_location.should == [__FILE__, __LINE__]
+    -> { true }.source_location.should == [__FILE__, __LINE__]
   end
 
   it "returns the first line of a multi-line proc (i.e. the line containing 'proc do')" do
-    ProcSpecs::SourceLocation.my_multiline_proc.source_location[1].should == 20
-    ProcSpecs::SourceLocation.my_multiline_proc_new.source_location[1].should == 34
-    ProcSpecs::SourceLocation.my_multiline_lambda.source_location[1].should == 27
+    ProcSpecs::SourceLocation.my_multiline_proc.source_location.last.should == 20
+    ProcSpecs::SourceLocation.my_multiline_proc_new.source_location.last.should == 34
+    ProcSpecs::SourceLocation.my_multiline_lambda.source_location.last.should == 27
   end
 
   it "returns the location of the proc's body; not necessarily the proc itself" do
-    ProcSpecs::SourceLocation.my_detached_proc.source_location[1].should == 41
-    ProcSpecs::SourceLocation.my_detached_proc_new.source_location[1].should == 51
-    ProcSpecs::SourceLocation.my_detached_lambda.source_location[1].should == 46
+    ProcSpecs::SourceLocation.my_detached_proc.source_location.last.should == 41
+    ProcSpecs::SourceLocation.my_detached_proc_new.source_location.last.should == 51
+    ProcSpecs::SourceLocation.my_detached_lambda.source_location.last.should == 46
   end
 
   it "returns the same value for a proc-ified method as the method reports" do
@@ -93,12 +86,6 @@
 
   it "works for eval with a given line" do
     proc = eval('-> {}', nil, "foo", 100)
-    location = proc.source_location
-    ruby_version_is(""..."4.0") do
-      location.should == ["foo", 100]
-    end
-    ruby_version_is("4.0") do
-      location.should == ["foo", 100, 0, 100, 5]
-    end
+    proc.source_location.should == ["foo", 100]
   end
 end

core/unboundmethod/source_location_spec.rb

@@ -7,23 +7,23 @@
   end
 
   it "sets the first value to the path of the file in which the method was defined" do
-    file = @method.source_location[0]
+    file = @method.source_location.first
     file.should be_an_instance_of(String)
     file.should == File.realpath('fixtures/classes.rb', __dir__)
   end
 
-  it "sets the second value to an Integer representing the line on which the method was defined" do
-    line = @method.source_location[1]
+  it "sets the last value to an Integer representing the line on which the method was defined" do
+    line = @method.source_location.last
     line.should be_an_instance_of(Integer)
     line.should == 5
   end
 
   it "returns the last place the method was defined" do
-    UnboundMethodSpecs::SourceLocation.method(:redefined).unbind.source_location[1].should == 13
+    UnboundMethodSpecs::SourceLocation.method(:redefined).unbind.source_location.last.should == 13
   end
 
   it "returns the location of the original method even if it was aliased" do
-    UnboundMethodSpecs::SourceLocation.instance_method(:aka).source_location[1].should == 17
+    UnboundMethodSpecs::SourceLocation.instance_method(:aka).source_location.last.should == 17
   end
 
   it "works for define_method methods" do
@@ -54,12 +54,6 @@
     c = Class.new do
       eval('def m; end', nil, "foo", 100)
     end
-    location = c.instance_method(:m).source_location
-    ruby_version_is(""..."4.0") do
-      location.should == ["foo", 100]
-    end
-    ruby_version_is("4.0") do
-      location.should == ["foo", 100, 0, 100, 10]
-    end
+    c.instance_method(:m).source_location.should == ["foo", 100]
   end
 end