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
---
 lib/scanf.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib')

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/
-- 
cgit v1.2.3