diff options
| author | Nobuyoshi Nakada <[email protected]> | 2022-10-28 19:28:17 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <[email protected]> | 2022-12-02 01:35:45 +0900 |
| commit | c0dc717c45fc3abc64a337c3481bc4555b675d87 (patch) | |
| tree | 9b319eabb00659bed4d57b1afa5ba58e7932ba79 | |
| parent | 914cf26d6e65307910854723964e75edaa748377 (diff) | |
[Bug #19087] Disallow successive underscores in Complex string
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/6645
| -rw-r--r-- | complex.c | 6 | ||||
| -rw-r--r-- | test/ruby/test_complex.rb | 22 |
2 files changed, 25 insertions, 3 deletions
@@ -1751,9 +1751,9 @@ read_digits(const char **s, int strict, while (isdecimal(**s) || **s == '_') { if (**s == '_') { - if (strict) { - if (us) - return 0; + if (us) { + if (strict) return 0; + break; } us = 1; } diff --git a/test/ruby/test_complex.rb b/test/ruby/test_complex.rb index b35aedb6b0..edbdffd069 100644 --- a/test/ruby/test_complex.rb +++ b/test/ruby/test_complex.rb @@ -853,20 +853,42 @@ class Complex_Test < Test::Unit::TestCase assert_equal(Complex(0), '_5'.to_c) assert_equal(Complex(5), '5_'.to_c) assert_equal(Complex(5), '5x'.to_c) + assert_equal(Complex(51), '5_1'.to_c) + assert_equal(Complex(5), '5__1'.to_c) assert_equal(Complex(5), '5+_3i'.to_c) assert_equal(Complex(5), '5+3_i'.to_c) assert_equal(Complex(5,3), '5+3i_'.to_c) assert_equal(Complex(5,3), '5+3ix'.to_c) + assert_equal(Complex(5,31), '5+3_1i'.to_c) + assert_equal(Complex(5), '5+3__1i'.to_c) + assert_equal(Complex(51), Complex('5_1')) + assert_equal(Complex(5,31), Complex('5+3_1i')) + assert_equal(Complex(5,31), Complex('5+3_1I')) + assert_equal(Complex(5,31), Complex('5+3_1j')) + assert_equal(Complex(5,31), Complex('5+3_1J')) + assert_equal(Complex(0,31), Complex('3_1i')) + assert_equal(Complex(0,31), Complex('3_1I')) + assert_equal(Complex(0,31), Complex('3_1j')) + assert_equal(Complex(0,31), Complex('3_1J')) assert_raise(ArgumentError){ Complex('')} assert_raise(ArgumentError){ Complex('_')} assert_raise(ArgumentError){ Complex("\f\n\r\t\v5\0")} assert_raise(ArgumentError){ Complex('_5')} assert_raise(ArgumentError){ Complex('5_')} + assert_raise(ArgumentError){ Complex('5__1')} assert_raise(ArgumentError){ Complex('5x')} assert_raise(ArgumentError){ Complex('5+_3i')} assert_raise(ArgumentError){ Complex('5+3_i')} assert_raise(ArgumentError){ Complex('5+3i_')} assert_raise(ArgumentError){ Complex('5+3ix')} + assert_raise(ArgumentError){ Complex('5+3__1i')} + assert_raise(ArgumentError){ Complex('5+3__1I')} + assert_raise(ArgumentError){ Complex('5+3__1j')} + assert_raise(ArgumentError){ Complex('5+3__1J')} + assert_raise(ArgumentError){ Complex('3__1i')} + assert_raise(ArgumentError){ Complex('3__1I')} + assert_raise(ArgumentError){ Complex('3__1j')} + assert_raise(ArgumentError){ Complex('3__1J')} assert_equal(Complex(Rational(1,5)), '1/5'.to_c) assert_equal(Complex(Rational(-1,5)), '-1/5'.to_c) |