From 1720e7e0dff72463bd0715200ca48b0af365e7c2 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 28 Mar 2010 04:26:42 +0000
Subject: * lib/scanf.rb: fix max width modifier for %f.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27077 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                | 4 ++++
 lib/scanf.rb             | 5 +++--
 test/scanf/test_scanf.rb | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 989e08bab5..6ad753140f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Mar 28 10:03:51 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/scanf.rb: fix max width modifier for %f.
+
 Sun Mar 28 10:35:45 2010  Ryan Davis  <ryand-ruby@zenspider.com>
 
 	* lib/minitest/*.rb: Imported minitest 1.6.0 r5717.
diff --git a/lib/scanf.rb b/lib/scanf.rb
index ed39a48292..ffc0d90f49 100644
--- a/lib/scanf.rb
+++ b/lib/scanf.rb
@@ -410,11 +410,12 @@ module Scanf
 
           # %f
         when /%\*?[efgEFG]/
-          [ '([-+]?((\d+(?>(?=[^\d.]|$)))|(\d*(\.(\d*([eE][-+]?\d+)?)))))', :extract_float ]
+          [ '([-+]?(?:\d+(?![\d.])|\d*\.\d*(?:[eE][-+]?\d+)?))', :extract_float ]
 
           # %5f
         when /%\*?(\d+)[efgEFG]/
-          [ "(\\S{1,#{$1}})", :extract_float ]
+          [ '(?=[-+]?(?:\d+(?![\d.])|\d*\.\d*(?:[eE][-+]?\d+)?))' +
+            "(\\S{1,#{$1}})", :extract_float ]
 
           # %5s
         when /%\*?(\d+)s/
diff --git a/test/scanf/test_scanf.rb b/test/scanf/test_scanf.rb
index 4526e73641..2ec4e54d94 100644
--- a/test/scanf/test_scanf.rb
+++ b/test/scanf/test_scanf.rb
@@ -269,7 +269,7 @@ module ScanfTests
       [ "%[[:upper:]]", "ABCdefGHI", [ "ABC" ] ],
 
 # Testing 'f'
-      [ "%2f", "x", [0.0] ],  # width-floats match anything (by design)
+      [ "%2f", "x", [] ],
       [ "%F", "1.23e45", [1.23e+45] ],
       [ "%e", "3.25ee", [3.25] ],
       [ "%E", "3..25", [3.0] ],
-- 
cgit v1.2.3