diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-03-28 04:26:42 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-03-28 04:26:42 +0000 |
| commit | 1720e7e0dff72463bd0715200ca48b0af365e7c2 (patch) | |
| tree | 534860e5271f26cc5cfcd3661f1ea28f11a86922 | |
| parent | 1392791a9e1b046f9e14711a24e51a4e5875c100 (diff) | |
* 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
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | lib/scanf.rb | 5 | ||||
| -rw-r--r-- | test/scanf/test_scanf.rb | 2 |
3 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,7 @@ +Sun Mar 28 10:03:51 2010 NARUSE, Yui <[email protected]> + + * lib/scanf.rb: fix max width modifier for %f. + Sun Mar 28 10:35:45 2010 Ryan Davis <[email protected]> * 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] ], |