dblack	2008-09-03 21:54:13 +0900 (Wed, 03 Sep 2008)

  New Revision: 19094

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=19094

  Log:
    * lib/scanf.rb: fixed bug involving matching literal '['
    
    * test/scanf/test_scanf.rb: added test for scanf.rb fix

  Modified files:
    trunk/ChangeLog
    trunk/lib/scanf.rb
    trunk/test/scanf/test_scanf.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19093)
+++ ChangeLog	(revision 19094)
@@ -1,3 +1,9 @@
+Wed Sep  3 21:49:00 2008  David A. Black <dblack@r...>
+
+        * lib/scanf.rb: fixed bug involving matching literal '['
+
+        * test/scanf/test_scanf.rb: added test for scanf.rb fix
+
 Wed Sep  3 21:31:59 2008  Tanaka Akira  <akr@f...>
 
 	* transcode_data.h (WORDINDEX_SHIFT_BITS): defined.
Index: lib/scanf.rb
===================================================================
--- lib/scanf.rb	(revision 19093)
+++ lib/scanf.rb	(revision 19094)
@@ -325,7 +325,7 @@
     end
 
     def count_space?
-      /(?:\A|\S)%\*?\d*c|\[/.match(@spec_string)
+      /(?:\A|\S)%\*?\d*c|%\d*\[/.match(@spec_string)
     end
 
     def initialize(str)
Index: test/scanf/test_scanf.rb
===================================================================
--- test/scanf/test_scanf.rb	(revision 19093)
+++ test/scanf/test_scanf.rb	(revision 19094)
@@ -276,6 +276,13 @@
       [ "%f", "+3.25", [3.25] ],
       [ "%f", "+3.25e2", [325.0] ],
       [ "%f", "3.z", [3.0] ],
+
+# Testing embedded matches including literal '[' behavior
+      [",%d,%f", ",10,1.1", [10,1.1] ],
+      [" ,%d,%f", " ,10,1.1", [10,1.1] ],
+      ["[%d,%f", "[10,1.1", [10,1.1] ],
+      [" [%d,%f", " [10,1.1", [10,1.1] ],
+
      ]
     end
   end

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