akr	2008-02-18 12:51:34 +0900 (Mon, 18 Feb 2008)

  New Revision: 15535

  Modified files:
    trunk/re.c
    trunk/test/ruby/test_string.rb

  Log:
    add tests for sub/gsub with hash.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/test/ruby/test_string.rb?r1=15535&r2=15534&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/re.c?r1=15535&r2=15534&diff_format=u

Index: re.c
===================================================================
--- re.c	(revision 15534)
+++ re.c	(revision 15535)
@@ -3152,7 +3152,8 @@
 }
 
 static void
-re_warn(const char* s) {
+re_warn(const char *s)
+{
     rb_warn("%s", s);
 }
 
Index: test/ruby/test_string.rb
===================================================================
--- test/ruby/test_string.rb	(revision 15534)
+++ test/ruby/test_string.rb	(revision 15535)
@@ -575,6 +575,24 @@
     assert_nil(a.sub!(S('X'), S('Y')))
   end
 
+  def test_sub_hash
+    assert_equal('azc', 'abc'.sub(/b/, "b" => "z"))
+    assert_equal('ac', 'abc'.sub(/b/, {}))
+    assert_equal('a1c', 'abc'.sub(/b/, "b" => 1))
+    assert_equal('aBc', 'abc'.sub(/b/, Hash.new {|h, k| k.upcase }))
+    assert_equal('aBcabc', 'abcabc'.sub(/b/, Hash.new {|h, k| h[k] = k.upcase }))
+    assert_equal('aBcdef', 'abcdef'.sub(/de|b/, "b" => "B", "de" => "DE"))
+  end
+
+  def test_gsub_hash
+    assert_equal('azc', 'abc'.gsub(/b/, "b" => "z"))
+    assert_equal('ac', 'abc'.gsub(/b/, {}))
+    assert_equal('a1c', 'abc'.gsub(/b/, "b" => 1))
+    assert_equal('aBc', 'abc'.gsub(/b/, Hash.new {|h, k| k.upcase }))
+    assert_equal('aBcaBc', 'abcabc'.gsub(/b/, Hash.new {|h, k| h[k] = k.upcase }))
+    assert_equal('aBcDEf', 'abcdef'.gsub(/de|b/, "b" => "B", "de" => "DE"))
+  end
+
   def test_hash
     assert_equal(S("hello").hash, S("hello").hash)
     assert(S("hello").hash != S("helLO").hash)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/