diff options
| -rw-r--r-- | lib/psych/scalar_scanner.rb | 2 | ||||
| -rw-r--r-- | test/psych/test_scalar_scanner.rb | 4 | ||||
| -rw-r--r-- | test/psych/test_string.rb | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/lib/psych/scalar_scanner.rb b/lib/psych/scalar_scanner.rb index f519da1..a849359 100644 --- a/lib/psych/scalar_scanner.rb +++ b/lib/psych/scalar_scanner.rb @@ -100,7 +100,7 @@ module Psych @string_cache[string] = true string else - Float(string.gsub(/[,_]|\.$/, '')) + Float(string.gsub(/[,_]|\.([Ee]|$)/, '\1')) end else int = parse_int string.gsub(/[,_]/, '') diff --git a/test/psych/test_scalar_scanner.rb b/test/psych/test_scalar_scanner.rb index 7ad18c5..2599989 100644 --- a/test/psych/test_scalar_scanner.rb +++ b/test/psych/test_scalar_scanner.rb @@ -74,6 +74,10 @@ module Psych assert ss.tokenize('.nan').nan? end + def test_scan_float_with_exponent_but_no_fraction + assert_equal(0.0, ss.tokenize('0.E+0')) + end + def test_scan_null assert_equal nil, ss.tokenize('null') assert_equal nil, ss.tokenize('~') diff --git a/test/psych/test_string.rb b/test/psych/test_string.rb index 51aef40..25c6353 100644 --- a/test/psych/test_string.rb +++ b/test/psych/test_string.rb @@ -99,6 +99,10 @@ module Psych assert_cycle '+.' end + def test_float_with_no_fractional_before_exponent + assert_cycle '0.E+0' + end + def test_string_subclass_with_anchor y = Psych.load <<-eoyml --- |