1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/psych/lib/psych/scalar_scanner.rb: use normal begin / rescue

Browse Source 
since postfix rescue cannot receive the exception class. Thanks
  nagachika!

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33401 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tenderlove 2011-10-04 16:24:58 +00:00
parent 92a05ea2cf
commit b7c66e31de
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Wed Oct 5 01:22:08 2011 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/psych/lib/psych/scalar_scanner.rb: use normal begin / rescue
since postfix rescue cannot receive the exception class. Thanks
nagachika!
Tue Oct 4 21:10:08 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Oct 4 21:10:08 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* class.c (class_alloc): allocate extra memory after containing * class.c (class_alloc): allocate extra memory after containing

10
ext/psych/lib/psych/scalar_scanner.rb
View File

@ -74,13 +74,19 @@ module Psych
end end
i i
when FLOAT when FLOAT
return Float(string.gsub(/[,_]/, '')) rescue ArgumentError begin
return Float(string.gsub(/[,_]/, ''))
rescue ArgumentError
end
@string_cache[string] = true @string_cache[string] = true
string string
else else
if string.count('.') < 2 if string.count('.') < 2
return Integer(string.gsub(/[,_]/, '')) rescue ArgumentError begin
return Integer(string.gsub(/[,_]/, ''))
rescue ArgumentError
end
end end
@string_cache[string] = true @string_cache[string] = true