From f02d2f82bf10351f480ea312f40cb840e2437f93 Mon Sep 17 00:00:00 2001
From: Benoit Daloze <eregontp@gmail.com>
Date: Fri, 27 Nov 2020 14:55:31 +0100
Subject: Update to ruby/spec@ac878ad

---
 spec/ruby/core/string/fixtures/classes.rb | 11 +++++++++++
 spec/ruby/core/string/gsub_spec.rb        |  5 +++++
 spec/ruby/core/string/unpack/w_spec.rb    | 10 ++++++++++
 3 files changed, 26 insertions(+)

(limited to 'spec/ruby/core/string')

diff --git a/spec/ruby/core/string/fixtures/classes.rb b/spec/ruby/core/string/fixtures/classes.rb
index 1cc7600abb..26fcd51b5d 100644
--- a/spec/ruby/core/string/fixtures/classes.rb
+++ b/spec/ruby/core/string/fixtures/classes.rb
@@ -46,4 +46,15 @@ module StringSpecs
       self.replace(str)
     end
   end
+
+  class SpecialVarProcessor
+    def process(match)
+      if $~ != nil
+        str = $~[0]
+      else
+        str = "unset"
+      end
+      "<#{str}>"
+    end
+  end
 end
diff --git a/spec/ruby/core/string/gsub_spec.rb b/spec/ruby/core/string/gsub_spec.rb
index 54a2be0fed..6789199ff3 100644
--- a/spec/ruby/core/string/gsub_spec.rb
+++ b/spec/ruby/core/string/gsub_spec.rb
@@ -475,6 +475,11 @@ describe "String#gsub with pattern and block" do
     offsets.should == [[1, 2], [4, 5]]
   end
 
+  it "does not set $~ for procs created from methods" do
+    str = "hello"
+    str.gsub("l", &StringSpecs::SpecialVarProcessor.new.method(:process)).should == "he<unset><unset>o"
+  end
+
   it "restores $~ after leaving the block" do
     [/./, "l"].each do |pattern|
       old_md = nil
diff --git a/spec/ruby/core/string/unpack/w_spec.rb b/spec/ruby/core/string/unpack/w_spec.rb
index 166ae58869..011c75f5c4 100644
--- a/spec/ruby/core/string/unpack/w_spec.rb
+++ b/spec/ruby/core/string/unpack/w_spec.rb
@@ -23,3 +23,13 @@ describe "String#unpack with directive 'w'" do
     "\x01\x02\x03".unpack("w w").should == [1, 2]
   end
 end
+
+describe "String#unpack with directive 'w*'" do
+
+  it "decodes BER-compressed integers" do
+    "\x01\x02\x03\x04".unpack("w*").should == [1, 2, 3, 4]
+    "\x00\xCE\x0F\x84\x80\x80\x80\x80\x80\x80\x80\x80\x00\x01\x00".unpack("w*").should == [0, 9999, 2**65, 1, 0]
+    "\x81\x80\x80\x80\x80\x80\x80\x80\x80\x00\x90\x80\x80\x80\x80\x80\x80\x80\x03\x01\x02".unpack("w*").should == [2**63, (2**60 + 3), 1, 2]
+  end
+
+end
-- 
cgit v1.2.3