Skip to content

Commit 8baaece

Browse files
committed
[ruby/prism] [Bug #21831] Fix denominator of rational float literal
Denominators can contain underscores in fraction part as well as other numeric literals. [Bug #21831]: https://bugs.ruby-lang.org/issues/21831 ruby/prism@e247cb58c7
1 parent a071078 commit 8baaece

File tree

3 files changed

+22
-2
lines changed

3 files changed

+22
-2
lines changed

prism/prism.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3962,9 +3962,13 @@ pm_float_node_rational_create(pm_parser_t *parser, const pm_token_t *token) {
39623962
memcpy(digits + (point - start), point + 1, (unsigned long) (end - point - 1));
39633963
pm_integer_parse(&node->numerator, PM_INTEGER_BASE_DEFAULT, digits, digits + length - 1);
39643964

3965+
size_t fract_length = 0;
3966+
for (const uint8_t *fract = point; fract < end; ++fract) {
3967+
if (*fract != '_') ++fract_length;
3968+
}
39653969
digits[0] = '1';
3966-
if (end - point > 1) memset(digits + 1, '0', (size_t) (end - point - 1));
3967-
pm_integer_parse(&node->denominator, PM_INTEGER_BASE_DEFAULT, digits, digits + (end - point));
3970+
if (fract_length > 1) memset(digits + 1, '0', fract_length - 1);
3971+
pm_integer_parse(&node->denominator, PM_INTEGER_BASE_DEFAULT, digits, digits + fract_length);
39683972
xfree(digits);
39693973

39703974
pm_integers_reduce(&node->numerator, &node->denominator);

test/prism/result/numeric_value_test.rb

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,27 @@ module Prism
66
class NumericValueTest < TestCase
77
def test_numeric_value
88
assert_equal 123, Prism.parse_statement("123").value
9+
assert_equal 123, Prism.parse_statement("1_23").value
910
assert_equal 3.14, Prism.parse_statement("3.14").value
11+
assert_equal 3.14, Prism.parse_statement("3.1_4").value
1012
assert_equal 42i, Prism.parse_statement("42i").value
13+
assert_equal 42i, Prism.parse_statement("4_2i").value
1114
assert_equal 42.1ri, Prism.parse_statement("42.1ri").value
15+
assert_equal 42.1ri, Prism.parse_statement("42.1_0ri").value
1216
assert_equal 3.14i, Prism.parse_statement("3.14i").value
17+
assert_equal 3.14i, Prism.parse_statement("3.1_4i").value
1318
assert_equal 42r, Prism.parse_statement("42r").value
19+
assert_equal 42r, Prism.parse_statement("4_2r").value
1420
assert_equal 0.5r, Prism.parse_statement("0.5r").value
21+
assert_equal 0.5r, Prism.parse_statement("0.5_0r").value
1522
assert_equal 42ri, Prism.parse_statement("42ri").value
23+
assert_equal 42ri, Prism.parse_statement("4_2ri").value
1624
assert_equal 0.5ri, Prism.parse_statement("0.5ri").value
25+
assert_equal 0.5ri, Prism.parse_statement("0.5_0ri").value
1726
assert_equal 0xFFr, Prism.parse_statement("0xFFr").value
27+
assert_equal 0xFFr, Prism.parse_statement("0xF_Fr").value
1828
assert_equal 0xFFri, Prism.parse_statement("0xFFri").value
29+
assert_equal 0xFFri, Prism.parse_statement("0xF_Fri").value
1930
end
2031
end
2132
end

test/ruby/test_literal.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -682,6 +682,11 @@ def test_float
682682
$VERBOSE = verbose_bak
683683
end
684684

685+
def test_rational_float
686+
assert_equal(12, 0.12r * 100)
687+
assert_equal(12, 0.1_2r * 100)
688+
end
689+
685690
def test_symbol_list
686691
assert_equal([:foo, :bar], %i[foo bar])
687692
assert_equal([:"\"foo"], %i["foo])

0 commit comments

Comments
 (0)