kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* lib/scanf.rb: fix %[egEFG] isn't accept.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27074 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2010-03-28 00:56:35 +00:00
parent c08277c62d
commit 63dd50961e
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Sun Mar 28 09:28:33 2010 NARUSE, Yui <naruse@ruby-lang.org>
* lib/scanf.rb: fix %[egEFG] isn't accept.
Sun Mar 28 09:53:02 2010 Tanaka Akira <akr@fsij.org> Sun Mar 28 09:53:02 2010 Tanaka Akira <akr@fsij.org>
* time.c: rename small integer specialization related identifiers. * time.c: rename small integer specialization related identifiers.

6
lib/scanf.rb
View file

@ -409,11 +409,11 @@ module Scanf
[ "([-+][0-7]{1,#{$1.to_i-1}}|[0-7]{1,#{$1}})", :extract_octal ] [ "([-+][0-7]{1,#{$1.to_i-1}}|[0-7]{1,#{$1}})", :extract_octal ]
# %f # %f
when /%\*?f/ when /%\*?[efgEFG]/
[ '([-+]?((\d+(?>(?=[^\d.]|$)))|(\d*(\.(\d*([eE][-+]?\d+)?)))))', :extract_float ] [ '([-+]?((\d+(?>(?=[^\d.]|$)))|(\d*(\.(\d*([eE][-+]?\d+)?)))))', :extract_float ]
# %5f # %5f
when /%\*?(\d+)f/ when /%\*?(\d+)[efgEFG]/
[ "(\\S{1,#{$1}})", :extract_float ] [ "(\\S{1,#{$1}})", :extract_float ]
# %5s # %5s
@ -490,7 +490,7 @@ module Scanf
attr_reader :string_left, :last_spec_tried, attr_reader :string_left, :last_spec_tried,
:last_match_tried, :matched_count, :space :last_match_tried, :matched_count, :space
SPECIFIERS = 'diuXxofeEgsc' SPECIFIERS = 'diuXxofFeEgGsc'
REGEX = / REGEX = /
# possible space, followed by... # possible space, followed by...
(?:\s* (?:\s*

10
test/scanf/test_scanf.rb
View file

@ -270,11 +270,11 @@ module ScanfTests
# Testing 'f' # Testing 'f'
[ "%2f", "x", [0.0] ], # width-floats match anything (by design) [ "%2f", "x", [0.0] ], # width-floats match anything (by design)
[ "%f", "1.23e45", [1.23e+45] ], [ "%F", "1.23e45", [1.23e+45] ],
[ "%f", "3.25ee", [3.25] ], [ "%e", "3.25ee", [3.25] ],
[ "%f", "3..25", [3.0] ], [ "%E", "3..25", [3.0] ],
[ "%f", "+3.25", [3.25] ], [ "%g", "+3.25", [3.25] ],
[ "%f", "+3.25e2", [325.0] ], [ "%G", "+3.25e2", [325.0] ],
[ "%f", "3.z", [3.0] ], [ "%f", "3.z", [3.0] ],
# Testing embedded matches including literal '[' behavior # Testing embedded matches including literal '[' behavior