From b5f05971f5349753966067e9af2555801a32c1ac Mon Sep 17 00:00:00 2001 From: tenderlove Date: Sat, 13 Aug 2011 00:00:26 +0000 Subject: * ext/psych/lib/psych/scalar_scanner.rb: Only consider strings with fewer than 2 dots to be numbers. [ruby-core:38915] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32957 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/psych/lib/psych/scalar_scanner.rb | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1bcfad895e..afca33f16f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Aug 13 08:55:38 2011 Aaron Patterson + + * ext/psych/lib/psych/scalar_scanner.rb: Only consider strings + with fewer than 2 dots to be numbers. [ruby-core:38915] + Sat Aug 13 08:47:20 2011 Tadayoshi Funaba * ext/date/date_core.c: [ruby-core:38855]. diff --git a/ext/psych/lib/psych/scalar_scanner.rb b/ext/psych/lib/psych/scalar_scanner.rb index 29d66ee4cc..b92d3c075e 100644 --- a/ext/psych/lib/psych/scalar_scanner.rb +++ b/ext/psych/lib/psych/scalar_scanner.rb @@ -68,8 +68,11 @@ module Psych end i else - return Integer(string.gsub(/[,_]/, '')) rescue ArgumentError - return Float(string.gsub(/[,_]/, '')) rescue ArgumentError + if string.count('.') < 2 + return Integer(string.gsub(/[,_]/, '')) rescue ArgumentError + return Float(string.gsub(/[,_]/, '')) rescue ArgumentError + end + @string_cache[string] = true string end -- cgit v1.2.3