14 files changed, 176 insertions, 95 deletions
diff --git a/spec/ruby/core/string/byterindex_spec.rb b/spec/ruby/core/string/byterindex_spec.rb
index 150f709b90..34ecbfbd21 100644
--- a/spec/ruby/core/string/byterindex_spec.rb
+++ b/spec/ruby/core/string/byterindex_spec.rb
@@ -352,8 +352,8 @@ describe "String#byterindex with Regexp" do
     end
 
     it "returns the character index before the finish" do
-       "ありがりがとう".byterindex("が", 9).should == 6
-       "ありがりがとう".byterindex(/が/, 9).should == 6
+      "ありがりがとう".byterindex("が", 9).should == 6
+      "ありがりがとう".byterindex(/が/, 9).should == 6
     end
   end
 end
diff --git a/spec/ruby/core/string/chilled_string_spec.rb b/spec/ruby/core/string/chilled_string_spec.rb
index b8fb6eedc9..968e4ec1f0 100644
--- a/spec/ruby/core/string/chilled_string_spec.rb
+++ b/spec/ruby/core/string/chilled_string_spec.rb
@@ -64,7 +64,7 @@ describe "chilled String" do
           input.freeze
           -> {
             -> {
-            input << "mutated"
+              input << "mutated"
             }.should raise_error(FrozenError)
           }.should_not complain(/literal string will be frozen in the future/)
         end
@@ -133,7 +133,7 @@ describe "chilled String" do
           input.freeze
           -> {
             -> {
-            input << "mutated"
+              input << "mutated"
             }.should raise_error(FrozenError)
           }.should_not complain(/string returned by :chilled\.to_s will be frozen in the future/)
         end
diff --git a/spec/ruby/core/string/lstrip_spec.rb b/spec/ruby/core/string/lstrip_spec.rb
index 99bab6f349..c83650207e 100644
--- a/spec/ruby/core/string/lstrip_spec.rb
+++ b/spec/ruby/core/string/lstrip_spec.rb
@@ -7,11 +7,11 @@ describe "String#lstrip" do
   it_behaves_like :string_strip, :lstrip
 
   it "returns a copy of self with leading whitespace removed" do
-   "  hello  ".lstrip.should == "hello  "
-   "  hello world  ".lstrip.should == "hello world  "
-   "\n\r\t\n\v\r hello world  ".lstrip.should == "hello world  "
-   "hello".lstrip.should == "hello"
-   " こにちわ".lstrip.should == "こにちわ"
+    "  hello  ".lstrip.should == "hello  "
+    "  hello world  ".lstrip.should == "hello world  "
+    "\n\r\t\n\v\r hello world  ".lstrip.should == "hello world  "
+    "hello".lstrip.should == "hello"
+    " こにちわ".lstrip.should == "こにちわ"
   end
 
   it "works with lazy substrings" do
@@ -22,8 +22,8 @@ describe "String#lstrip" do
   end
 
   it "strips leading \\0" do
-   "\x00hello".lstrip.should == "hello"
-   "\000 \000hello\000 \000".lstrip.should == "hello\000 \000"
+    "\x00hello".lstrip.should == "hello"
+    "\000 \000hello\000 \000".lstrip.should == "hello\000 \000"
   end
 end
 
diff --git a/spec/ruby/core/string/rindex_spec.rb b/spec/ruby/core/string/rindex_spec.rb
index 88ce733583..0863a9c3be 100644
--- a/spec/ruby/core/string/rindex_spec.rb
+++ b/spec/ruby/core/string/rindex_spec.rb
@@ -371,8 +371,8 @@ describe "String#rindex with Regexp" do
   end
 
   it "returns the character index before the finish" do
-     "ありがりがとう".rindex("が", 3).should == 2
-     "ありがりがとう".rindex(/が/, 3).should == 2
+    "ありがりがとう".rindex("が", 3).should == 2
+    "ありがりがとう".rindex(/が/, 3).should == 2
   end
 
   it "raises an Encoding::CompatibilityError if the encodings are incompatible" do
diff --git a/spec/ruby/core/string/scan_spec.rb b/spec/ruby/core/string/scan_spec.rb
index 70c3b7fb7b..bbe843b591 100644
--- a/spec/ruby/core/string/scan_spec.rb
+++ b/spec/ruby/core/string/scan_spec.rb
@@ -103,11 +103,11 @@ describe "String#scan with pattern and block" do
     offsets = []
 
     str.scan(/([aeiou])/) do
-       md = $~
-       md.string.should == str
-       matches << md.to_a
-       offsets << md.offset(0)
-       str
+      md = $~
+      md.string.should == str
+      matches << md.to_a
+      offsets << md.offset(0)
+      str
     end
 
     matches.should == [["e", "e"], ["o", "o"]]
@@ -117,11 +117,11 @@ describe "String#scan with pattern and block" do
     offsets = []
 
     str.scan("l") do
-       md = $~
-       md.string.should == str
-       matches << md.to_a
-       offsets << md.offset(0)
-       str
+      md = $~
+      md.string.should == str
+      matches << md.to_a
+      offsets << md.offset(0)
+      str
     end
 
     matches.should == [["l"], ["l"]]
diff --git a/spec/ruby/core/string/shared/slice.rb b/spec/ruby/core/string/shared/slice.rb
index 2f69b9ddce..7b9b9f6a14 100644
--- a/spec/ruby/core/string/shared/slice.rb
+++ b/spec/ruby/core/string/shared/slice.rb
@@ -119,6 +119,18 @@ describe :string_slice_index_length, shared: true do
     "hello there".send(@method, -4,-3).should == nil
   end
 
+  platform_is pointer_size: 64 do
+    it "returns nil if the length is negative big value" do
+      "hello there".send(@method, 4, -(1 << 31)).should == nil
+
+      # by some reason length < -(1 << 31) on CI on Windows leads to
+      # 'RangeError: bignum too big to convert into `long'' error
+      platform_is_not :windows do
+        "hello there".send(@method, 4, -(1 << 63)).should == nil
+      end
+    end
+  end
+
   it "calls to_int on the given index and the given length" do
     "hello".send(@method, 0.5, 1).should == "h"
     "hello".send(@method, 0.5, 2.5).should == "he"
@@ -152,6 +164,11 @@ describe :string_slice_index_length, shared: true do
     -> { "hello".send(@method, 0, bignum_value) }.should raise_error(RangeError)
   end
 
+  it "raises a RangeError if the index or length is too small" do
+    -> { "hello".send(@method, -bignum_value, 1) }.should raise_error(RangeError)
+    -> { "hello".send(@method, 0, -bignum_value) }.should raise_error(RangeError)
+  end
+
   it "returns String instances" do
     s = StringSpecs::MyString.new("hello")
     s.send(@method, 0,0).should be_an_instance_of(String)
diff --git a/spec/ruby/core/string/sub_spec.rb b/spec/ruby/core/string/sub_spec.rb
index 4f9f87a433..6ff28ec851 100644
--- a/spec/ruby/core/string/sub_spec.rb
+++ b/spec/ruby/core/string/sub_spec.rb
@@ -232,10 +232,10 @@ describe "String#sub with pattern and block" do
     offsets = []
 
     str.sub(/([aeiou])/) do
-       md = $~
-       md.string.should == str
-       offsets << md.offset(0)
-       str
+      md = $~
+      md.string.should == str
+      offsets << md.offset(0)
+      str
     end.should == "hhellollo"
 
     offsets.should == [[1, 2]]
@@ -339,10 +339,10 @@ describe "String#sub! with pattern and block" do
     offsets = []
 
     str.dup.sub!(/([aeiou])/) do
-       md = $~
-       md.string.should == str
-       offsets << md.offset(0)
-       str
+      md = $~
+      md.string.should == str
+      offsets << md.offset(0)
+      str
     end.should == "hhellollo"
 
     offsets.should == [[1, 2]]
diff --git a/spec/ruby/core/string/swapcase_spec.rb b/spec/ruby/core/string/swapcase_spec.rb
index 7f4c68366d..011a213501 100644
--- a/spec/ruby/core/string/swapcase_spec.rb
+++ b/spec/ruby/core/string/swapcase_spec.rb
@@ -5,9 +5,9 @@ require_relative 'fixtures/classes'
 
 describe "String#swapcase" do
   it "returns a new string with all uppercase chars from self converted to lowercase and vice versa" do
-   "Hello".swapcase.should == "hELLO"
-   "cYbEr_PuNk11".swapcase.should == "CyBeR_pUnK11"
-   "+++---111222???".swapcase.should == "+++---111222???"
+    "Hello".swapcase.should == "hELLO"
+    "cYbEr_PuNk11".swapcase.should == "CyBeR_pUnK11"
+    "+++---111222???".swapcase.should == "+++---111222???"
   end
 
   it "returns a String in the same encoding as self" do
diff --git a/spec/ruby/core/string/to_c_spec.rb b/spec/ruby/core/string/to_c_spec.rb
index 9d24f1f56c..4864a98e39 100644
--- a/spec/ruby/core/string/to_c_spec.rb
+++ b/spec/ruby/core/string/to_c_spec.rb
@@ -18,13 +18,17 @@ describe "String#to_c" do
     end
   end
 
-  it "understands Float::INFINITY" do
-    'Infinity'.to_c.should == Complex(0, 1)
-    '-Infinity'.to_c.should == Complex(0, -1)
-  end
+  context "it treats special float value strings as characters" do
+    it "parses any string that starts with 'I' as 1i" do
+      'Infinity'.to_c.should == Complex(0, 1)
+      '-Infinity'.to_c.should == Complex(0, -1)
+      'Insecure'.to_c.should == Complex(0, 1)
+      '-Insecure'.to_c.should == Complex(0, -1)
+    end
 
-  it "understands Float::NAN" do
-    'NaN'.to_c.should == Complex(0, 0)
+    it "does not parse any numeric information in 'NaN'" do
+      'NaN'.to_c.should == Complex(0, 0)
+    end
   end
 
   it "allows null-byte" do
diff --git a/spec/ruby/core/string/to_f_spec.rb b/spec/ruby/core/string/to_f_spec.rb
index cf64ecfc5d..72e2a90b13 100644
--- a/spec/ruby/core/string/to_f_spec.rb
+++ b/spec/ruby/core/string/to_f_spec.rb
@@ -5,16 +5,15 @@ require_relative 'fixtures/classes'
 
 describe "String#to_f" do
   it "treats leading characters of self as a floating point number" do
-   "123.45e1".to_f.should == 1234.5
-   "45.67 degrees".to_f.should == 45.67
-   "0".to_f.should == 0.0
-   "123.45e1".to_f.should == 1234.5
+    "123.45e1".to_f.should == 1234.5
+    "45.67 degrees".to_f.should == 45.67
+    "0".to_f.should == 0.0
 
-   ".5".to_f.should == 0.5
-   ".5e1".to_f.should == 5.0
-   "5.".to_f.should == 5.0
-   "5e".to_f.should == 5.0
-   "5E".to_f.should == 5.0
+    ".5".to_f.should == 0.5
+    ".5e1".to_f.should == 5.0
+    "5.".to_f.should == 5.0
+    "5e".to_f.should == 5.0
+    "5E".to_f.should == 5.0
   end
 
   it "treats special float value strings as characters" do
@@ -43,18 +42,39 @@ describe "String#to_f" do
     "1_234_567.890_1".to_f.should == 1_234_567.890_1
   end
 
-  it "returns 0 for strings with any non-digit in them" do
-    "blah".to_f.should == 0
-    "0b5".to_f.should == 0
-    "0d5".to_f.should == 0
-    "0o5".to_f.should == 0
-    "0xx5".to_f.should == 0
-  end
-
   it "returns 0 for strings with leading underscores" do
     "_9".to_f.should == 0
   end
 
+  it "stops if the underscore is not followed or preceded by a number" do
+    "1__2".to_f.should == 1.0
+    "1_.2".to_f.should == 1.0
+    "1._2".to_f.should == 1.0
+    "1.2_e2".to_f.should == 1.2
+    "1.2e_2".to_f.should == 1.2
+    "1_x2".to_f.should == 1.0
+    "1x_2".to_f.should == 1.0
+    "+_1".to_f.should == 0.0
+    "-_1".to_f.should == 0.0
+  end
+
+  it "does not allow prefixes to autodetect the base" do
+    "0b10".to_f.should == 0
+    "010".to_f.should == 10
+    "0o10".to_f.should == 0
+    "0d10".to_f.should == 0
+    "0x10".to_f.should == 0
+  end
+
+  it "treats any non-numeric character other than '.', 'e' and '_' as terminals" do
+    "blah".to_f.should == 0
+    "1b5".to_f.should == 1
+    "1d5".to_f.should == 1
+    "1o5".to_f.should == 1
+    "1xx5".to_f.should == 1
+    "x5".to_f.should == 0
+  end
+
   it "takes an optional sign" do
     "-45.67 degrees".to_f.should == -45.67
     "+45.67 degrees".to_f.should == 45.67
@@ -63,8 +83,48 @@ describe "String#to_f" do
     (1.0 / "-0".to_f).to_s.should == "-Infinity"
   end
 
+  it "treats a second 'e' as terminal" do
+    "1.234e1e2".to_f.should == 1.234e1
+  end
+
+  it "treats a second '.' as terminal" do
+    "1.2.3".to_f.should == 1.2
+  end
+
+  it "treats a '.' after an 'e' as terminal" do
+    "1.234e1.9".to_f.should == 1.234e1
+  end
+
   it "returns 0.0 if the conversion fails" do
     "bad".to_f.should == 0.0
     "thx1138".to_f.should == 0.0
   end
+
+  it "ignores leading and trailing whitespace" do
+    "  1.2".to_f.should == 1.2
+    "1.2  ".to_f.should == 1.2
+    " 1.2 ".to_f.should == 1.2
+    "\t1.2".to_f.should == 1.2
+    "\n1.2".to_f.should == 1.2
+    "\v1.2".to_f.should == 1.2
+    "\f1.2".to_f.should == 1.2
+    "\r1.2".to_f.should == 1.2
+  end
+
+  it "treats non-printable ASCII characters as terminals" do
+    "\0001.2".to_f.should == 0
+    "\0011.2".to_f.should == 0
+    "\0371.2".to_f.should == 0
+    "\1771.2".to_f.should == 0
+    "\2001.2".b.to_f.should == 0
+    "\3771.2".b.to_f.should == 0
+  end
+
+  ruby_version_is "3.2" do
+    it "raises Encoding::CompatibilityError if String is in not ASCII-compatible encoding" do
+      -> {
+        '1.2'.encode("UTF-16").to_f
+      }.should raise_error(Encoding::CompatibilityError, "ASCII incompatible encoding: UTF-16")
+    end
+  end
 end
diff --git a/spec/ruby/core/string/to_i_spec.rb b/spec/ruby/core/string/to_i_spec.rb
index 9931502baa..39f69acda3 100644
--- a/spec/ruby/core/string/to_i_spec.rb
+++ b/spec/ruby/core/string/to_i_spec.rb
@@ -10,7 +10,7 @@ describe "String#to_i" do
     "1_2_3asdf".to_i.should == 123
   end
 
-  it "ignores multiple non-consecutive underscoes when the first digit is 0" do
+  it "ignores multiple non-consecutive underscores when the first digit is 0" do
     (2..16).each do |base|
       "0_0_010".to_i(base).should == base;
     end
diff --git a/spec/ruby/core/string/to_r_spec.rb b/spec/ruby/core/string/to_r_spec.rb
index 7e1d635d3b..4ffbb10d98 100644
--- a/spec/ruby/core/string/to_r_spec.rb
+++ b/spec/ruby/core/string/to_r_spec.rb
@@ -33,6 +33,10 @@ describe "String#to_r" do
     "-20".to_r.should == Rational(-20, 1)
   end
 
+  it "accepts leading plus signs" do
+    "+20".to_r.should == Rational(20, 1)
+  end
+
   it "does not treat a leading period without a numeric prefix as a decimal point" do
     ".9".to_r.should_not == Rational(8106479329266893, 9007199254740992)
   end
diff --git a/spec/ruby/core/string/unpack1_spec.rb b/spec/ruby/core/string/unpack1_spec.rb
index df830916a3..3b3b879f75 100644
--- a/spec/ruby/core/string/unpack1_spec.rb
+++ b/spec/ruby/core/string/unpack1_spec.rb
@@ -8,29 +8,27 @@ describe "String#unpack1" do
     "A".unpack1("B*").should == "01000001"
   end
 
-  ruby_version_is "3.1" do
-    it "starts unpacking from the given offset" do
-      "ZZABCD".unpack1('x3C', offset: 2).should == "ABCD".unpack('x3C')[0]
-      "ZZZZaG9nZWZ1Z2E=".unpack1("m", offset: 4).should == "hogefuga"
-      "ZA".unpack1("B*", offset: 1).should == "01000001"
-    end
+  it "starts unpacking from the given offset" do
+    "ZZABCD".unpack1('x3C', offset: 2).should == "ABCD".unpack('x3C')[0]
+    "ZZZZaG9nZWZ1Z2E=".unpack1("m", offset: 4).should == "hogefuga"
+    "ZA".unpack1("B*", offset: 1).should == "01000001"
+  end
 
-    it "traits offset as a bytes offset" do
-      "؈".unpack("CC").should == [216, 136]
-      "؈".unpack1("C").should == 216
-      "؈".unpack1("C", offset: 1).should == 136
-    end
+  it "traits offset as a bytes offset" do
+    "؈".unpack("CC").should == [216, 136]
+    "؈".unpack1("C").should == 216
+    "؈".unpack1("C", offset: 1).should == 136
+  end
 
-    it "raises an ArgumentError when the offset is negative" do
-      -> { "a".unpack1("C", offset: -1) }.should raise_error(ArgumentError, "offset can't be negative")
-    end
+  it "raises an ArgumentError when the offset is negative" do
+    -> { "a".unpack1("C", offset: -1) }.should raise_error(ArgumentError, "offset can't be negative")
+  end
 
-    it "returns nil if the offset is at the end of the string" do
-      "a".unpack1("C", offset: 1).should == nil
-    end
+  it "returns nil if the offset is at the end of the string" do
+    "a".unpack1("C", offset: 1).should == nil
+  end
 
-    it "raises an ArgumentError when the offset is larger than the string bytesize" do
-      -> { "a".unpack1("C", offset: 2) }.should raise_error(ArgumentError, "offset outside of string")
-    end
+  it "raises an ArgumentError when the offset is larger than the string bytesize" do
+    -> { "a".unpack1("C", offset: 2) }.should raise_error(ArgumentError, "offset outside of string")
   end
 end
diff --git a/spec/ruby/core/string/unpack_spec.rb b/spec/ruby/core/string/unpack_spec.rb
index 52b4af3a95..083484ebe9 100644
--- a/spec/ruby/core/string/unpack_spec.rb
+++ b/spec/ruby/core/string/unpack_spec.rb
@@ -9,26 +9,24 @@ describe "String#unpack" do
     -> { "abc".unpack(1) }.should raise_error(TypeError)
   end
 
-  ruby_version_is "3.1" do
-    it "starts unpacking from the given offset" do
-      "abc".unpack("CC", offset: 1).should == [98, 99]
-    end
+  it "starts unpacking from the given offset" do
+    "abc".unpack("CC", offset: 1).should == [98, 99]
+  end
 
-    it "traits offset as a bytes offset" do
-      "؈".unpack("CC").should == [216, 136]
-      "؈".unpack("CC", offset: 1).should == [136, nil]
-    end
+  it "traits offset as a bytes offset" do
+    "؈".unpack("CC").should == [216, 136]
+    "؈".unpack("CC", offset: 1).should == [136, nil]
+  end
 
-    it "raises an ArgumentError when the offset is negative" do
-      -> { "a".unpack("C", offset: -1) }.should raise_error(ArgumentError, "offset can't be negative")
-    end
+  it "raises an ArgumentError when the offset is negative" do
+    -> { "a".unpack("C", offset: -1) }.should raise_error(ArgumentError, "offset can't be negative")
+  end
 
-    it "returns nil if the offset is at the end of the string" do
-      "a".unpack("C", offset: 1).should == [nil]
-    end
+  it "returns nil if the offset is at the end of the string" do
+    "a".unpack("C", offset: 1).should == [nil]
+  end
 
-    it "raises an ArgumentError when the offset is larget than the string" do
-      -> { "a".unpack("C", offset: 2) }.should raise_error(ArgumentError, "offset outside of string")
-    end
+  it "raises an ArgumentError when the offset is larget than the string" do
+    -> { "a".unpack("C", offset: 2) }.should raise_error(ArgumentError, "offset outside of string")
   end
 end