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

* ext/psych/lib/psych/scalar_scanner.rb: Match values against the

Browse source 
floating point spec defined in YAML to avoid erronious parses.
* test/psych/test_numeric.rb: corresponding test.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33383 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tenderlove 2011-10-03 21:21:31 +00:00
parent 1721fca3ad
commit bd3b0d470c
3 changed files with 31 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Tue Oct 4 06:20:19 2011 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/psych/lib/psych/scalar_scanner.rb: Match values against the
floating point spec defined in YAML to avoid erronious parses.
* test/psych/test_numeric.rb: corresponding test.
Tue Oct 4 05:59:24 2011 Aaron Patterson <aaron@tenderlovemaking.com> Tue Oct 4 05:59:24 2011 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/psych/lib/psych/visitors/to_ruby.rb: ToRuby visitor can be * ext/psych/lib/psych/visitors/to_ruby.rb: ToRuby visitor can be

12
ext/psych/lib/psych/scalar_scanner.rb
View file

@ -7,6 +7,12 @@ module Psych
# Taken from http://yaml.org/type/timestamp.html # Taken from http://yaml.org/type/timestamp.html
TIME = /^\d{4}-\d{1,2}-\d{1,2}([Tt]|\s+)\d{1,2}:\d\d:\d\d(\.\d*)?(\s*Z|[-+]\d{1,2}(:\d\d)?)?/ TIME = /^\d{4}-\d{1,2}-\d{1,2}([Tt]|\s+)\d{1,2}:\d\d:\d\d(\.\d*)?(\s*Z|[-+]\d{1,2}(:\d\d)?)?/
# Taken from http://yaml.org/type/float.html
FLOAT = /^(?:[-+]?([0-9][0-9_,]*)?\.[0-9.]*([eE][-+][0-9]+)?(?# base 10)
|[-+]?[0-9][0-9_,]*(:[0-5]?[0-9])+\.[0-9_]*(?# base 60)
|[-+]?\.(inf|Inf|INF)(?# infinity)
|\.(nan|NaN|NAN)(?# not a number))$/x
# Create a new scanner # Create a new scanner
def initialize def initialize
@string_cache = {} @string_cache = {}
@ -67,10 +73,14 @@ module Psych
i += (n.to_f * 60 ** (e - 2).abs) i += (n.to_f * 60 ** (e - 2).abs)
end end
i i
when FLOAT
return Float(string.gsub(/[,_]/, '')) rescue ArgumentError
@string_cache[string] = true
string
else else
if string.count('.') < 2 if string.count('.') < 2
return Integer(string.gsub(/[,_]/, '')) rescue ArgumentError return Integer(string.gsub(/[,_]/, '')) rescue ArgumentError
return Float(string.gsub(/[,_]/, '')) rescue ArgumentError
end end
@string_cache[string] = true @string_cache[string] = true

14
test/psych/test_numeric.rb Normal file
View file

@ -0,0 +1,14 @@
require 'psych/helper'
module Psych
###
# Test numerics from YAML spec:
# http://yaml.org/type/float.html
# http://yaml.org/type/int.html
class TestNumeric < TestCase
def test_non_float_with_0
str = Psych.load('--- 090')
assert_equal '090', str
end
end
end