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

[ruby/psych] fix parsing integer values with '_' at the end

Browse source 
https://github.com/ruby/psych/commit/e0bb853014
This commit is contained in:
Alexandr Opak 2021-01-29 13:04:37 +01:00 committed by Hiroshi SHIBATA
parent 31ba0921f8
commit 48b50cb4fe
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -13,10 +13,10 @@ module Psych
FLOAT = /^(?:[-+]?([0-9][0-9_,]*)?\.[0-9]*([eE][-+][0-9]+)?(?# base 10))$/x
# Taken from http://yaml.org/type/int.html
INTEGER = /^(?:[-+]?0b[0-1_,]+ (?# base 2)
|[-+]?0[0-7_,]+ (?# base 8)
|[-+]?(?:0|[1-9][0-9_,]*) (?# base 10)
|[-+]?0x[0-9a-fA-F_,]+ (?# base 16))$/x
INTEGER = /^(?:[-+]?0b[0-1_,]+ (?# base 2)
|[-+]?0[0-7_,]+ (?# base 8)
|[-+]?(?:\d|[1-9][0-9_,]*[^_]) (?# base 10)
|[-+]?0x[0-9a-fA-F_,]+ (?# base 16))$/x
attr_reader :class_loader

9
test/psych/test_scalar_scanner.rb
View file

@ -118,13 +118,20 @@ module Psych
assert_equal "_100", ss.tokenize('_100')
end
def test_scan_strings_ending_with_underscores
assert_equal "100_", ss.tokenize('100_')
end
def test_scan_int_commas_and_underscores
# NB: This test is to ensure backward compatibility with prior Psych versions,
# not to test against any actual YAML specification.
assert_equal 123_456_789, ss.tokenize('123_456_789')
assert_equal 123_456_789, ss.tokenize('123,456,789')
assert_equal 123_456_789, ss.tokenize('1_2,3,4_5,6_789')
assert_equal 123_456_789, ss.tokenize('1_2,3,4_5,6_789_')
assert_equal 1, ss.tokenize('1')
assert_equal 1 ss.tokenize('+1')
assert_equal -1 ss.tokenize('-1')
assert_equal 0b010101010, ss.tokenize('0b010101010')
assert_equal 0b010101010, ss.tokenize('0b0,1_0,1_,0,1_01,0')