diff options
Diffstat (limited to 'test/strscan')
| -rw-r--r-- | test/strscan/test_ractor.rb | 8 | ||||
| -rw-r--r-- | test/strscan/test_stringscanner.rb | 970 |
2 files changed, 666 insertions, 312 deletions
diff --git a/test/strscan/test_ractor.rb b/test/strscan/test_ractor.rb index a5de7e56ed..a13fd8fd13 100644 --- a/test/strscan/test_ractor.rb +++ b/test/strscan/test_ractor.rb @@ -3,11 +3,15 @@ require 'test/unit' class TestStringScannerRactor < Test::Unit::TestCase def setup - omit "Ractor not defined" unless defined? Ractor + omit("Ractor not defined") unless defined? Ractor end def test_ractor assert_in_out_err([], <<-"end;", ["stra", " ", "strb", " ", "strc"], []) + class Ractor + alias value take unless method_defined? :value # compat with Ruby 3.4 and olders + end + require "strscan" $VERBOSE = nil r = Ractor.new do @@ -22,7 +26,7 @@ class TestStringScannerRactor < Test::Unit::TestCase s.scan(/\\w+/) ] end - puts r.take.compact + puts r.value.compact end; end end diff --git a/test/strscan/test_stringscanner.rb b/test/strscan/test_stringscanner.rb index 143cf7197d..96a1badb1f 100644 --- a/test/strscan/test_stringscanner.rb +++ b/test/strscan/test_stringscanner.rb @@ -9,53 +9,40 @@ require 'test/unit' module StringScannerTests def test_peek_byte - omit("not implemented on TruffleRuby") if RUBY_ENGINE == "truffleruby" s = create_string_scanner('ab') - assert_equal 97, s.peek_byte - assert_equal 97, s.scan_byte - assert_equal 98, s.peek_byte - assert_equal 98, s.scan_byte - assert_nil s.peek_byte - assert_nil s.scan_byte + assert_equal(97, s.peek_byte) + assert_equal(97, s.scan_byte) + assert_equal(98, s.peek_byte) + assert_equal(98, s.scan_byte) + assert_nil(s.peek_byte) + assert_nil(s.scan_byte) end def test_scan_byte - omit("not implemented on TruffleRuby") if RUBY_ENGINE == "truffleruby" s = create_string_scanner('ab') - assert_equal 97, s.scan_byte - assert_equal 98, s.scan_byte - assert_nil s.scan_byte + assert_equal(2, s.match?(/(?<a>ab)/)) # set named_captures + assert_equal(97, s.scan_byte) + assert_equal({}, s.named_captures) + assert_equal(98, s.scan_byte) + assert_nil(s.scan_byte) str = "\244\242".dup.force_encoding("euc-jp") s = StringScanner.new(str) - assert_equal str.getbyte(s.pos), s.scan_byte - assert_equal str.getbyte(s.pos), s.scan_byte - assert_nil s.scan_byte + assert_equal(str.getbyte(s.pos), s.scan_byte) + assert_equal(str.getbyte(s.pos), s.scan_byte) + assert_nil(s.scan_byte) end def test_s_new s = create_string_scanner('test string') - assert_instance_of StringScanner, s - assert_equal false, s.eos? + assert_instance_of(StringScanner, s) + assert_equal(false, s.eos?) str = 'test string'.dup s = create_string_scanner(str, false) - assert_instance_of StringScanner, s - assert_equal false, s.eos? - assert_same str, s.string - end - - UNINIT_ERROR = ArgumentError - - def test_s_allocate - s = StringScanner.allocate - assert_equal '#<StringScanner (uninitialized)>', s.inspect.sub(/StringScanner_C/, 'StringScanner') - assert_raise(UNINIT_ERROR) { s.eos? } - assert_raise(UNINIT_ERROR) { s.scan(/a/) } - s.string = 'test' - assert_equal '#<StringScanner 0/4 @ "test">', s.inspect.sub(/StringScanner_C/, 'StringScanner') - assert_nothing_raised(UNINIT_ERROR) { s.eos? } - assert_equal false, s.eos? + assert_instance_of(StringScanner, s) + assert_equal(false, s.eos?) + assert_same(str, s.string) end def test_s_mustc @@ -67,170 +54,166 @@ module StringScannerTests def test_dup s = create_string_scanner('test string') d = s.dup - assert_equal s.inspect, d.inspect - assert_equal s.string, d.string - assert_equal s.pos, d.pos - assert_equal s.matched?, d.matched? - assert_equal s.eos?, d.eos? + assert_equal(s.inspect, d.inspect) + assert_equal(s.string, d.string) + assert_equal(s.pos, d.pos) + assert_equal(s.matched?, d.matched?) + assert_equal(s.eos?, d.eos?) s = create_string_scanner('test string') s.scan(/test/) d = s.dup - assert_equal s.inspect, d.inspect - assert_equal s.string, d.string - assert_equal s.pos, d.pos - assert_equal s.matched?, d.matched? - assert_equal s.eos?, d.eos? + assert_equal(s.inspect, d.inspect) + assert_equal(s.string, d.string) + assert_equal(s.pos, d.pos) + assert_equal(s.matched?, d.matched?) + assert_equal(s.eos?, d.eos?) s = create_string_scanner('test string') s.scan(/test/) s.scan(/NOT MATCH/) d = s.dup - assert_equal s.inspect, d.inspect - assert_equal s.string, d.string - assert_equal s.pos, d.pos - assert_equal s.matched?, d.matched? - assert_equal s.eos?, d.eos? + assert_equal(s.inspect, d.inspect) + assert_equal(s.string, d.string) + assert_equal(s.pos, d.pos) + assert_equal(s.matched?, d.matched?) + assert_equal(s.eos?, d.eos?) s = create_string_scanner('test string') s.terminate d = s.dup - assert_equal s.inspect, d.inspect - assert_equal s.string, d.string - assert_equal s.pos, d.pos - assert_equal s.matched?, d.matched? - assert_equal s.eos?, d.eos? + assert_equal(s.inspect, d.inspect) + assert_equal(s.string, d.string) + assert_equal(s.pos, d.pos) + assert_equal(s.matched?, d.matched?) + assert_equal(s.eos?, d.eos?) end def test_const_Version - assert_instance_of String, StringScanner::Version - assert_equal true, StringScanner::Version.frozen? - end - - def test_const_Id - assert_instance_of String, StringScanner::Id - assert_equal true, StringScanner::Id.frozen? + assert_instance_of(String, StringScanner::Version) + assert_equal(true, StringScanner::Version.frozen?) end def test_inspect str = 'test string'.dup s = create_string_scanner(str, false) - assert_instance_of String, s.inspect - assert_equal s.inspect, s.inspect - assert_equal '#<StringScanner 0/11 @ "test ...">', s.inspect.sub(/StringScanner_C/, 'StringScanner') + assert_instance_of(String, s.inspect) + assert_equal(s.inspect, s.inspect) + assert_equal('#<StringScanner 0/11 @ "test ...">', s.inspect.sub(/StringScanner_C/, 'StringScanner')) s.get_byte - assert_equal '#<StringScanner 1/11 "t" @ "est s...">', s.inspect.sub(/StringScanner_C/, 'StringScanner') + assert_equal('#<StringScanner 1/11 "t" @ "est s...">', s.inspect.sub(/StringScanner_C/, 'StringScanner')) s = create_string_scanner("\n") - assert_equal '#<StringScanner 0/1 @ "\n">', s.inspect + assert_equal('#<StringScanner 0/1 @ "\n">', s.inspect) end def test_eos? s = create_string_scanner('test string') - assert_equal false, s.eos? - assert_equal false, s.eos? + assert_equal(false, s.eos?) + assert_equal(false, s.eos?) s.scan(/\w+/) - assert_equal false, s.eos? - assert_equal false, s.eos? + assert_equal(false, s.eos?) + assert_equal(false, s.eos?) s.scan(/\s+/) s.scan(/\w+/) - assert_equal true, s.eos? - assert_equal true, s.eos? + assert_equal(true, s.eos?) + assert_equal(true, s.eos?) s.scan(/\w+/) - assert_equal true, s.eos? + assert_equal(true, s.eos?) s = create_string_scanner('test'.dup) s.scan(/te/) - s.string.replace '' - assert_equal true, s.eos? + s.string.replace('') + assert_equal(true, s.eos?) end def test_bol? s = create_string_scanner("a\nbbb\n\ncccc\nddd\r\neee") - assert_equal true, s.bol? - assert_equal true, s.bol? + assert_equal(true, s.bol?) + assert_equal(true, s.bol?) s.scan(/a/) - assert_equal false, s.bol? - assert_equal false, s.bol? + assert_equal(false, s.bol?) + assert_equal(false, s.bol?) s.scan(/\n/) - assert_equal true, s.bol? + assert_equal(true, s.bol?) s.scan(/b/) - assert_equal false, s.bol? + assert_equal(false, s.bol?) s.scan(/b/) - assert_equal false, s.bol? + assert_equal(false, s.bol?) s.scan(/b/) - assert_equal false, s.bol? + assert_equal(false, s.bol?) s.scan(/\n/) - assert_equal true, s.bol? + assert_equal(true, s.bol?) s.unscan - assert_equal false, s.bol? + assert_equal(false, s.bol?) s.scan(/\n/) s.scan(/\n/) - assert_equal true, s.bol? + assert_equal(true, s.bol?) s.scan(/c+\n/) - assert_equal true, s.bol? + assert_equal(true, s.bol?) s.scan(/d+\r\n/) - assert_equal true, s.bol? + assert_equal(true, s.bol?) s.scan(/e+/) - assert_equal false, s.bol? + assert_equal(false, s.bol?) end def test_string s = create_string_scanner('test string') - assert_equal 'test string', s.string - s.scan(/test/) - assert_equal 'test string', s.string + assert_equal('test string', s.string) + s.scan(/(?<t>test)/) # set named_captures + assert_equal('test string', s.string) s.string = 'a' - assert_equal 'a', s.string + assert_equal({}, s.named_captures) + assert_equal('a', s.string) s.scan(/a/) s.string = 'b' - assert_equal 0, s.pos + assert_equal(0, s.pos) end def test_string_set_is_equal name = 'tenderlove' s = create_string_scanner(name) - assert_equal name.object_id, s.string.object_id + assert_equal(name.object_id, s.string.object_id) s.string = name - assert_equal name.object_id, s.string.object_id + assert_equal(name.object_id, s.string.object_id) end def test_string_append s = create_string_scanner('tender'.dup) s << 'love' - assert_equal 'tenderlove', s.string + assert_equal('tenderlove', s.string) s.string = 'tender'.dup s << 'love' - assert_equal 'tenderlove', s.string + assert_equal('tenderlove', s.string) end def test_pos s = create_string_scanner('test string') - assert_equal 0, s.pos + assert_equal(0, s.pos) s.get_byte - assert_equal 1, s.pos + assert_equal(1, s.pos) s.get_byte - assert_equal 2, s.pos + assert_equal(2, s.pos) s.terminate - assert_equal 11, s.pos + assert_equal(11, s.pos) end def test_pos_unicode s = create_string_scanner("abcädeföghi") - assert_equal 0, s.charpos - assert_equal "abcä", s.scan_until(/ä/) - assert_equal 4, s.charpos - assert_equal "defö", s.scan_until(/ö/) - assert_equal 8, s.charpos + assert_equal(0, s.charpos) + assert_equal("abcä", s.scan_until(/ä/)) + assert_equal(4, s.charpos) + assert_equal("defö", s.scan_until(/ö/)) + assert_equal(8, s.charpos) s.terminate - assert_equal 11, s.charpos + assert_equal(11, s.charpos) end def test_charpos_not_use_string_methods - omit "not supported on TruffleRuby" if RUBY_ENGINE == "truffleruby" + omit("not supported on TruffleRuby") if RUBY_ENGINE == "truffleruby" string = +'abcädeföghi' scanner = create_string_scanner(string) @@ -241,254 +224,300 @@ module StringScannerTests end end - assert_equal 0, scanner.charpos - assert_equal "abcä", scanner.scan_until(/ä/) - assert_equal 4, scanner.charpos - assert_equal "defö", scanner.scan_until(/ö/) - assert_equal 8, scanner.charpos + assert_equal(0, scanner.charpos) + assert_equal("abcä", scanner.scan_until(/ä/)) + assert_equal(4, scanner.charpos) + assert_equal("defö", scanner.scan_until(/ö/)) + assert_equal(8, scanner.charpos) end def test_concat s = create_string_scanner('a'.dup) s.scan(/a/) - s.concat 'b' - assert_equal false, s.eos? - assert_equal 'b', s.scan(/b/) - assert_equal true, s.eos? - s.concat 'c' - assert_equal false, s.eos? - assert_equal 'c', s.scan(/c/) - assert_equal true, s.eos? + s.concat('b') + assert_equal(false, s.eos?) + assert_equal('b', s.scan(/b/)) + assert_equal(true, s.eos?) + s.concat('c') + assert_equal(false, s.eos?) + assert_equal('c', s.scan(/c/)) + assert_equal(true, s.eos?) end def test_scan - s = create_string_scanner('stra strb strc', true) + s = create_string_scanner("stra strb\0strc", true) tmp = s.scan(/\w+/) - assert_equal 'stra', tmp + assert_equal('stra', tmp) tmp = s.scan(/\s+/) - assert_equal ' ', tmp + assert_equal(' ', tmp) - assert_equal 'strb', s.scan(/\w+/) - assert_equal ' ', s.scan(/\s+/) + assert_equal('strb', s.scan(/\w+/)) + assert_equal("\u0000", s.scan(/\0/)) tmp = s.scan(/\w+/) - assert_equal 'strc', tmp + assert_equal('strc', tmp) - assert_nil s.scan(/\w+/) - assert_nil s.scan(/\w+/) + assert_nil(s.scan(/\w+/)) + assert_nil(s.scan(/\w+/)) str = 'stra strb strc'.dup s = create_string_scanner(str, false) tmp = s.scan(/\w+/) - assert_equal 'stra', tmp + assert_equal('stra', tmp) tmp = s.scan(/\s+/) - assert_equal ' ', tmp + assert_equal(' ', tmp) - assert_equal 'strb', s.scan(/\w+/) - assert_equal ' ', s.scan(/\s+/) + assert_equal('strb', s.scan(/\w+/)) + assert_equal(' ', s.scan(/\s+/)) tmp = s.scan(/\w+/) - assert_equal 'strc', tmp + assert_equal('strc', tmp) - assert_nil s.scan(/\w+/) - assert_nil s.scan(/\w+/) + assert_nil(s.scan(/\w+/)) + assert_nil(s.scan(/\w+/)) s = create_string_scanner('test'.dup) s.scan(/te/) # This assumes #string does not duplicate string, # but it is implementation specific issue. # DO NOT RELY ON THIS FEATURE. - s.string.replace '' - # unspecified: assert_equal 2, s.pos - assert_equal nil, s.scan(/test/) + s.string.replace('') + # unspecified: assert_equal(2, s.pos + assert_equal(nil, s.scan(/test/)) # [ruby-bugs:4361] s = create_string_scanner("") - assert_equal "", s.scan(//) - assert_equal "", s.scan(//) + assert_equal("", s.scan(//)) + assert_equal("", s.scan(//)) end def test_scan_string - s = create_string_scanner('stra strb strc') - assert_equal 'str', s.scan('str') - assert_equal 'str', s[0] - assert_equal 3, s.pos - assert_equal 'a ', s.scan('a ') + s = create_string_scanner("stra strb\0strc") + assert_equal('str', s.scan('str')) + assert_equal('str', s[0]) + assert_equal(3, s.pos) + assert_equal('a ', s.scan('a ')) + assert_equal('strb', s.scan('strb')) + assert_equal("\u0000", s.scan("\0")) + assert_equal('strc', s.scan('strc')) str = 'stra strb strc'.dup s = create_string_scanner(str, false) matched = s.scan('str') - assert_equal 'str', matched + assert_equal('str', matched) + + s = create_string_scanner("str") + assert_equal(nil, s.scan("str\0\0")) end def test_skip s = create_string_scanner('stra strb strc', true) - assert_equal 4, s.skip(/\w+/) - assert_equal 1, s.skip(/\s+/) - assert_equal 4, s.skip(/\w+/) - assert_equal 1, s.skip(/\s+/) - assert_equal 4, s.skip(/\w+/) - assert_nil s.skip(/\w+/) - assert_nil s.skip(/\s+/) - assert_equal true, s.eos? + assert_equal(4, s.skip(/\w+/)) + assert_equal(1, s.skip(/\s+/)) + assert_equal(4, s.skip(/\w+/)) + assert_equal(1, s.skip(/\s+/)) + assert_equal(4, s.skip(/\w+/)) + assert_nil( s.skip(/\w+/)) + assert_nil( s.skip(/\s+/)) + assert_equal(true, s.eos?) s = create_string_scanner('test'.dup) s.scan(/te/) - s.string.replace '' - assert_equal nil, s.skip(/./) + s.string.replace('') + assert_equal(nil, s.skip(/./)) # [ruby-bugs:4361] s = create_string_scanner("") - assert_equal 0, s.skip(//) - assert_equal 0, s.skip(//) + assert_equal(0, s.skip(//)) + assert_equal(0, s.skip(//)) end def test_skip_with_begenning_of_string_anchor_match s = create_string_scanner("a\nb") - assert_equal 2, s.skip(/a\n/) - assert_equal 1, s.skip(/\Ab/) + assert_equal(2, s.skip(/a\n/)) + assert_equal(1, s.skip(/\Ab/)) end def test_skip_with_begenning_of_line_anchor_match s = create_string_scanner("a\nbc") - assert_equal 2, s.skip(/a\n/) - assert_equal 1, s.skip(/^b/) - assert_equal 1, s.skip(/^c/) + assert_equal(2, s.skip(/a\n/)) + assert_equal(1, s.skip(/^b/)) + assert_equal(1, s.skip(/^c/)) end def test_getch s = create_string_scanner('abcde') - assert_equal 'a', s.getch - assert_equal 'b', s.getch - assert_equal 'c', s.getch - assert_equal 'd', s.getch - assert_equal 'e', s.getch - assert_nil s.getch + assert_equal(3, s.match?(/(?<a>abc)/)) # set named_captures + assert_equal('a', s.getch) + assert_equal({}, s.named_captures) + assert_equal('b', s.getch) + assert_equal('c', s.getch) + assert_equal('d', s.getch) + assert_equal('e', s.getch) + assert_nil( s.getch) s = create_string_scanner("\244\242".dup.force_encoding("euc-jp")) - assert_equal "\244\242".dup.force_encoding("euc-jp"), s.getch - assert_nil s.getch + assert_equal("\244\242".dup.force_encoding("euc-jp"), s.getch) + assert_nil(s.getch) s = create_string_scanner('test'.dup) s.scan(/te/) - s.string.replace '' - assert_equal nil, s.getch + s.string.replace('') + assert_equal(nil, s.getch) end def test_get_byte s = create_string_scanner('abcde') - assert_equal 'a', s.get_byte - assert_equal 'b', s.get_byte - assert_equal 'c', s.get_byte - assert_equal 'd', s.get_byte - assert_equal 'e', s.get_byte - assert_nil s.get_byte - assert_nil s.get_byte + assert_equal(3, s.match?(/(?<a>abc)/)) # set named_captures + assert_equal('a', s.get_byte) + assert_equal({}, s.named_captures) + assert_equal('b', s.get_byte) + assert_equal('c', s.get_byte) + assert_equal('d', s.get_byte) + assert_equal('e', s.get_byte) + assert_nil( s.get_byte) + assert_nil( s.get_byte) s = create_string_scanner("\244\242".dup.force_encoding("euc-jp")) - assert_equal "\244".dup.force_encoding("euc-jp"), s.get_byte - assert_equal "\242".dup.force_encoding("euc-jp"), s.get_byte - assert_nil s.get_byte + assert_equal("\244".dup.force_encoding("euc-jp"), s.get_byte) + assert_equal("\242".dup.force_encoding("euc-jp"), s.get_byte) + assert_nil(s.get_byte) s = create_string_scanner('test'.dup) s.scan(/te/) - s.string.replace '' - assert_equal nil, s.get_byte + s.string.replace('') + assert_equal(nil, s.get_byte) end def test_matched s = create_string_scanner('stra strb strc') s.scan(/\w+/) - assert_equal 'stra', s.matched - s.scan(/\s+/) - assert_equal ' ', s.matched - s.scan('st') - assert_equal 'st', s.matched - s.scan(/\w+/) - assert_equal 'rb', s.matched + assert_equal('stra', s.matched) + s.scan_until(/\w+/) + assert_equal('strb', s.matched) s.scan(/\s+/) - assert_equal ' ', s.matched + assert_equal(' ', s.matched) s.scan(/\w+/) - assert_equal 'strc', s.matched + assert_equal('strc', s.matched) s.scan(/\w+/) - assert_nil s.matched + assert_nil(s.matched) s.getch - assert_nil s.matched + assert_nil(s.matched) s = create_string_scanner('stra strb strc') s.getch - assert_equal 's', s.matched + assert_equal('s', s.matched) s.get_byte - assert_equal 't', s.matched - assert_equal 't', s.matched + assert_equal('t', s.matched) + assert_equal('t', s.matched) + end + + def test_matched_string + s = create_string_scanner('stra strb strc') + s.scan('stra') + assert_equal('stra', s.matched) + s.scan_until('strb') + assert_equal('strb', s.matched) + s.scan(' ') + assert_equal(' ', s.matched) + s.scan('strc') + assert_equal('strc', s.matched) + s.scan('c') + assert_nil(s.matched) + s.getch + assert_nil(s.matched) end def test_AREF s = create_string_scanner('stra strb strc') - s.scan(/\w+/) - assert_nil s[-2] - assert_equal 'stra', s[-1] - assert_equal 'stra', s[0] - assert_nil s[1] + s.scan(/\s+/) + assert_nil( s[-2]) + assert_nil( s[-1]) + assert_nil( s[0]) + assert_nil( s[1]) + assert_nil( s[:c]) + assert_nil( s['c']) + + s.scan("not match") + assert_nil( s[-2]) + assert_nil( s[-1]) + assert_nil( s[0]) + assert_nil( s[1]) + assert_nil( s[:c]) + assert_nil( s['c']) + + s.check(/\w+/) + assert_nil( s[-2]) + assert_equal('stra', s[-1]) + assert_equal('stra', s[0]) + assert_nil( s[1]) + assert_raise(IndexError) { s[:c] } + assert_raise(IndexError) { s['c'] } + + s.scan("stra") + assert_nil( s[-2]) + assert_equal('stra', s[-1]) + assert_equal('stra', s[0]) + assert_nil( s[1]) assert_raise(IndexError) { s[:c] } assert_raise(IndexError) { s['c'] } s.skip(/\s+/) - assert_nil s[-2] - assert_equal ' ', s[-1] - assert_equal ' ', s[0] - assert_nil s[1] + assert_nil( s[-2]) + assert_equal(' ', s[-1]) + assert_equal(' ', s[0]) + assert_nil( s[1]) s.scan(/(s)t(r)b/) - assert_nil s[-100] - assert_nil s[-4] - assert_equal 'strb', s[-3] - assert_equal 's', s[-2] - assert_equal 'r', s[-1] - assert_equal 'strb', s[0] - assert_equal 's', s[1] - assert_equal 'r', s[2] - assert_nil s[3] - assert_nil s[100] + assert_nil( s[-100]) + assert_nil( s[-4]) + assert_equal('strb', s[-3]) + assert_equal('s', s[-2]) + assert_equal('r', s[-1]) + assert_equal('strb', s[0]) + assert_equal('s', s[1]) + assert_equal('r', s[2]) + assert_nil( s[3]) + assert_nil( s[100]) s.scan(/\s+/) s.getch - assert_nil s[-2] - assert_equal 's', s[-1] - assert_equal 's', s[0] - assert_nil s[1] + assert_nil( s[-2]) + assert_equal('s', s[-1]) + assert_equal('s', s[0]) + assert_nil( s[1]) s.get_byte - assert_nil s[-2] - assert_equal 't', s[-1] - assert_equal 't', s[0] - assert_nil s[1] + assert_nil( s[-2]) + assert_equal('t', s[-1]) + assert_equal('t', s[0]) + assert_nil( s[1]) s.scan(/.*/) s.scan(/./) - assert_nil s[0] - assert_nil s[0] + assert_nil( s[0]) + assert_nil( s[0]) s = create_string_scanner("\244\242".dup.force_encoding("euc-jp")) s.getch - assert_equal "\244\242".dup.force_encoding("euc-jp"), s[0] + assert_equal("\244\242".dup.force_encoding("euc-jp"), s[0]) s = create_string_scanner("foo bar baz") s.scan(/(?<a>\w+) (?<b>\w+) (\w+)/) - assert_equal 'foo', s[1] - assert_equal 'bar', s[2] - assert_nil s[3] - assert_equal 'foo', s[:a] - assert_equal 'bar', s[:b] + assert_equal('foo', s[1]) + assert_equal('bar', s[2]) + assert_nil(s[3]) + assert_equal('foo', s[:a]) + assert_equal('bar', s[:b]) assert_raise(IndexError) { s[:c] } - assert_equal 'foo', s['a'] - assert_equal 'bar', s['b'] + assert_equal('foo', s['a']) + assert_equal('bar', s['b']) assert_raise(IndexError) { s['c'] } # see https://github.com/jruby/jruby/issues/7644 unless RUBY_ENGINE == "jruby" && RbConfig::CONFIG['host_os'] =~ /mswin|win32|mingw/ @@ -496,91 +525,186 @@ module StringScannerTests end end + def assert_integer_at(s, specifier, *to_i_args) + assert_equal(s[specifier]&.to_i(*to_i_args), + s.integer_at(specifier, *to_i_args)) + end + + def test_integer_at + s = create_string_scanner("before 20260514 after") + s.skip_until(" ") + assert_equal("20260514", s.scan(/(\d{4})(\d{2})(\d{2})/)) + assert_integer_at(s, 0) # 20260514 + assert_integer_at(s, 1) # 2026 + assert_integer_at(s, 2) # 5 + assert_integer_at(s, 3) # 14 + assert_integer_at(s, 4) # nil + assert_integer_at(s, -1) # 14 + assert_integer_at(s, -2) # 5 + assert_integer_at(s, -3) # 2026 + assert_integer_at(s, -4) # 20260514 + assert_integer_at(s, -5) # nil + end + + def test_integer_at_name_string + s = create_string_scanner("before 20260514 after") + s.skip_until(" ") + assert_equal("20260514", s.scan(/(?<y>\d{4})(?<m>\d{2})(?<d>\d{2})/)) + assert_integer_at(s, "y") + assert_integer_at(s, "m") + assert_integer_at(s, "d") + end + + def test_integer_at_name_symbol + s = create_string_scanner("before 20260514 after") + s.skip_until(" ") + assert_equal("20260514", s.scan(/(?<y>\d{4})(?<m>\d{2})(?<d>\d{2})/)) + assert_integer_at(s, :y) + assert_integer_at(s, :m) + assert_integer_at(s, :d) + end + + def test_integer_at_base + s = create_string_scanner("before 111 after") + s.skip_until(" ") + assert_equal("111", s.scan(/\d+/)) + assert_integer_at(s, 0, 2) + end + + def test_integer_at_base_auto + s = create_string_scanner("before 0xa_f after") + s.skip_until(" ") + assert_equal("0xa_f", s.scan(/0x[\h_]+/)) + assert_integer_at(s, 0, 0) # 0xaf + end + def test_pre_match s = create_string_scanner('a b c d e') s.scan(/\w/) - assert_equal '', s.pre_match + assert_equal('', s.pre_match) s.skip(/\s/) - assert_equal 'a', s.pre_match + assert_equal('a', s.pre_match) s.scan('b') - assert_equal 'a ', s.pre_match + assert_equal('a ', s.pre_match) s.scan_until(/c/) - assert_equal 'a b ', s.pre_match + assert_equal('a b ', s.pre_match) s.getch - assert_equal 'a b c', s.pre_match + assert_equal('a b c', s.pre_match) s.get_byte - assert_equal 'a b c ', s.pre_match + assert_equal('a b c ', s.pre_match) s.get_byte - assert_equal 'a b c d', s.pre_match + assert_equal('a b c d', s.pre_match) s.scan(/never match/) - assert_nil s.pre_match + assert_nil(s.pre_match) + end + + def test_pre_match_string + s = create_string_scanner('a b c d e') + s.scan('a') + assert_equal('', s.pre_match) + s.skip(' ') + assert_equal('a', s.pre_match) + s.scan('b') + assert_equal('a ', s.pre_match) + s.scan_until('c') + assert_equal('a b ', s.pre_match) + s.getch + assert_equal('a b c', s.pre_match) + s.get_byte + assert_equal('a b c ', s.pre_match) + s.get_byte + assert_equal('a b c d', s.pre_match) + s.scan('never match') + assert_nil(s.pre_match) end def test_post_match s = create_string_scanner('a b c d e') s.scan(/\w/) - assert_equal ' b c d e', s.post_match + assert_equal(' b c d e', s.post_match) s.skip(/\s/) - assert_equal 'b c d e', s.post_match + assert_equal('b c d e', s.post_match) s.scan('b') - assert_equal ' c d e', s.post_match + assert_equal(' c d e', s.post_match) s.scan_until(/c/) - assert_equal ' d e', s.post_match + assert_equal(' d e', s.post_match) s.getch - assert_equal 'd e', s.post_match + assert_equal('d e', s.post_match) s.get_byte - assert_equal ' e', s.post_match + assert_equal(' e', s.post_match) s.get_byte - assert_equal 'e', s.post_match + assert_equal('e', s.post_match) s.scan(/never match/) - assert_nil s.post_match + assert_nil(s.post_match) s.scan(/./) - assert_equal '', s.post_match + assert_equal('', s.post_match) s.scan(/./) - assert_nil s.post_match + assert_nil(s.post_match) end - def test_terminate - s = create_string_scanner('ssss') + def test_post_match_string + s = create_string_scanner('a b c d e') + s.scan('a') + assert_equal(' b c d e', s.post_match) + s.skip(' ') + assert_equal('b c d e', s.post_match) + s.scan('b') + assert_equal(' c d e', s.post_match) + s.scan_until('c') + assert_equal(' d e', s.post_match) s.getch + assert_equal('d e', s.post_match) + s.get_byte + assert_equal(' e', s.post_match) + s.get_byte + assert_equal('e', s.post_match) + s.scan('never match') + assert_nil(s.post_match) + end + + def test_terminate + s = create_string_scanner('abcd') + s.scan(/(?<a>ab)/) # set named_captures s.terminate - assert_equal true, s.eos? + assert_equal({}, s.named_captures) + assert_equal(true, s.eos?) s.terminate - assert_equal true, s.eos? + assert_equal(true, s.eos?) end def test_reset - s = create_string_scanner('ssss') - s.getch + s = create_string_scanner('abcd') + s.scan(/(?<a>ab)/) # set named_captures s.reset - assert_equal 0, s.pos + assert_equal({}, s.named_captures) + assert_equal(0, s.pos) s.scan(/\w+/) s.reset - assert_equal 0, s.pos + assert_equal(0, s.pos) s.reset - assert_equal 0, s.pos + assert_equal(0, s.pos) end def test_matched_size s = create_string_scanner('test string') - assert_nil s.matched_size + assert_nil(s.matched_size) s.scan(/test/) - assert_equal 4, s.matched_size - assert_equal 4, s.matched_size + assert_equal(4, s.matched_size) + assert_equal(4, s.matched_size) s.scan(//) - assert_equal 0, s.matched_size + assert_equal(0, s.matched_size) s.scan(/x/) - assert_nil s.matched_size - assert_nil s.matched_size + assert_nil(s.matched_size) + assert_nil(s.matched_size) s.terminate - assert_nil s.matched_size + assert_nil(s.matched_size) s = create_string_scanner('test string') - assert_nil s.matched_size + assert_nil(s.matched_size) s.scan(/test/) - assert_equal 4, s.matched_size + assert_equal(4, s.matched_size) s.terminate - assert_nil s.matched_size + assert_nil(s.matched_size) end def test_empty_encoding_utf8 @@ -605,8 +729,6 @@ module StringScannerTests end def test_invalid_encoding_string - omit "no encoding check on TruffleRuby for scan(String)" if RUBY_ENGINE == "truffleruby" - str = "\xA1\xA2".dup.force_encoding("euc-jp") ss = create_string_scanner(str) assert_raise(Encoding::CompatibilityError) do @@ -668,13 +790,48 @@ module StringScannerTests assert_equal(nil, s.exist?(/e/)) end - def test_exist_p_string + def test_exist_p_invalid_argument s = create_string_scanner("test string") assert_raise(TypeError) do - s.exist?(" ") + s.exist?(1) end end + def test_exist_p_string + s = create_string_scanner("test string") + assert_equal(3, s.exist?("s")) + assert_equal(0, s.pos) + s.scan("test") + assert_equal(2, s.exist?("s")) + assert_equal(4, s.pos) + assert_equal(nil, s.exist?("e")) + end + + def test_scan_until + s = create_string_scanner("Foo Bar\0Baz") + assert_equal("Foo", s.scan_until(/Foo/)) + assert_equal(3, s.pos) + assert_equal(" Bar", s.scan_until(/Bar/)) + assert_equal(7, s.pos) + assert_equal(nil, s.skip_until(/Qux/)) + assert_equal("\u0000Baz", s.scan_until(/Baz/)) + assert_equal(11, s.pos) + end + + def test_scan_until_string + s = create_string_scanner("Foo Bar\0Baz") + assert_equal("Foo", s.scan_until("Foo")) + assert_equal(3, s.pos) + assert_equal(" Bar", s.scan_until("Bar")) + assert_equal(7, s.pos) + assert_equal(nil, s.skip_until("Qux")) + assert_equal("\u0000Baz", s.scan_until("Baz")) + assert_equal(11, s.pos) + + s = create_string_scanner("str") + assert_equal(nil, s.scan_until("str\0\0")) + end + def test_skip_until s = create_string_scanner("Foo Bar Baz") assert_equal(3, s.skip_until(/Foo/)) @@ -684,6 +841,15 @@ module StringScannerTests assert_equal(nil, s.skip_until(/Qux/)) end + def test_skip_until_string + s = create_string_scanner("Foo Bar Baz") + assert_equal(3, s.skip_until("Foo")) + assert_equal(3, s.pos) + assert_equal(4, s.skip_until("Bar")) + assert_equal(7, s.pos) + assert_equal(nil, s.skip_until("Qux")) + end + def test_check_until s = create_string_scanner("Foo Bar Baz") assert_equal("Foo", s.check_until(/Foo/)) @@ -693,6 +859,15 @@ module StringScannerTests assert_equal(nil, s.check_until(/Qux/)) end + def test_check_until_string + s = create_string_scanner("Foo Bar Baz") + assert_equal("Foo", s.check_until("Foo")) + assert_equal(0, s.pos) + assert_equal("Foo Bar", s.check_until("Bar")) + assert_equal(0, s.pos) + assert_equal(nil, s.check_until("Qux")) + end + def test_search_full s = create_string_scanner("Foo Bar Baz") assert_equal(8, s.search_full(/Bar /, false, false)) @@ -705,6 +880,18 @@ module StringScannerTests assert_equal(11, s.pos) end + def test_search_full_string + s = create_string_scanner("Foo Bar Baz") + assert_equal(8, s.search_full("Bar ", false, false)) + assert_equal(0, s.pos) + assert_equal("Foo Bar ", s.search_full("Bar ", false, true)) + assert_equal(0, s.pos) + assert_equal(8, s.search_full("Bar ", true, false)) + assert_equal(8, s.pos) + assert_equal("Baz", s.search_full("az", true, true)) + assert_equal(11, s.pos) + end + def test_peek s = create_string_scanner("test string") assert_equal("test st", s.peek(7)) @@ -718,11 +905,12 @@ module StringScannerTests def test_unscan s = create_string_scanner('test string') - assert_equal("test", s.scan(/\w+/)) + assert_equal(4, s.skip(/(?<t>test)/)) # set named_captures s.unscan + assert_equal({}, s.named_captures) assert_equal("te", s.scan(/../)) assert_equal(nil, s.scan(/\d/)) - assert_raise(ScanError) { s.unscan } + assert_raise(StringScanner::Error) { s.unscan } end def test_rest @@ -752,15 +940,13 @@ module StringScannerTests end def test_aref_without_regex - omit "#[:missing] always raises on TruffleRuby if matched" if RUBY_ENGINE == "truffleruby" - s = create_string_scanner('abc') s.get_byte - assert_nil(s[:c]) - assert_nil(s["c"]) + assert_raise(IndexError) { s[:c] } + assert_raise(IndexError) { s['c'] } s.getch - assert_nil(s[:c]) - assert_nil(s["c"]) + assert_raise(IndexError) { s[:c] } + assert_raise(IndexError) { s['c'] } end def test_size @@ -789,30 +975,194 @@ module StringScannerTests def test_scan_aref_repeatedly s = StringScanner.new('test string') - assert_equal "test", s.scan(/\w(\w)(\w*)/) - assert_equal "test", s[0] - assert_equal "e", s[1] - assert_equal "st", s[2] - assert_nil s.scan(/\w+/) - assert_nil s[0] - assert_nil s[1] - assert_nil s[2] - assert_equal " ", s.scan(/\s+/) - assert_equal " ", s[0] - assert_nil s[1] - assert_nil s[2] - assert_equal "string", s.scan(/\w(\w)(\w*)/) - assert_equal "string", s[0] - assert_equal "t", s[1] - assert_equal "ring", s[2] + assert_equal("test", s.scan(/\w(\w)(\w*)/)) + assert_equal("test", s[0]) + assert_equal("e", s[1]) + assert_equal("st", s[2]) + assert_nil( s.scan(/\w+/)) + assert_nil( s[0]) + assert_nil( s[1]) + assert_nil( s[2]) + assert_equal(" ", s.scan(/\s+/)) + assert_equal(" ", s[0]) + assert_nil( s[1]) + assert_nil( s[2]) + assert_equal("string", s.scan(/\w(\w)(\w*)/)) + assert_equal("string", s[0]) + assert_equal("t", s[1]) + assert_equal("ring", s[2]) end def test_named_captures - omit("not implemented on TruffleRuby") if ["truffleruby"].include?(RUBY_ENGINE) scan = StringScanner.new("foobarbaz") assert_equal({}, scan.named_captures) assert_equal(9, scan.match?(/(?<f>foo)(?<r>bar)(?<z>baz)/)) assert_equal({"f" => "foo", "r" => "bar", "z" => "baz"}, scan.named_captures) + assert_equal(9, scan.match?("foobarbaz")) + assert_equal({}, scan.named_captures) + end + + def test_named_captures_same_name_union + scan = StringScanner.new("123") + assert_equal(1, scan.match?(/(?<number>0)|(?<number>1)|(?<number>2)/)) + assert_equal({"number" => "1"}, scan.named_captures) + end + + def test_scan_integer + s = create_string_scanner('abc') + assert_equal(3, s.match?(/(?<a>abc)/)) # set named_captures + assert_nil(s.scan_integer) + assert_equal({}, s.named_captures) + assert_equal(0, s.pos) + refute_predicate(s, :matched?) + + s = create_string_scanner('123abc') + assert_equal(123, s.scan_integer) + assert_equal(3, s.pos) + assert_predicate(s, :matched?) + + s = create_string_scanner('-123abc') + assert_equal(-123, s.scan_integer) + assert_equal(4, s.pos) + assert_predicate(s, :matched?) + + s = create_string_scanner('+123') + assert_equal(123, s.scan_integer) + assert_equal(4, s.pos) + assert_predicate(s, :matched?) + + s = create_string_scanner('-abc') + assert_nil(s.scan_integer) + assert_equal(0, s.pos) + refute_predicate(s, :matched?) + + s = create_string_scanner('-') + assert_nil(s.scan_integer) + assert_equal(0, s.pos) + refute_predicate(s, :matched?) + + s = create_string_scanner('+') + assert_nil(s.scan_integer) + assert_equal(0, s.pos) + refute_predicate(s, :matched?) + + huge_integer = '1' * 2_000 + s = create_string_scanner(huge_integer) + assert_equal(huge_integer.to_i, s.scan_integer) + assert_equal(2_000, s.pos) + assert_predicate(s, :matched?) + + s = create_string_scanner('abc1') + s.pos = 3 + assert_equal(1, s.scan_integer) + assert_equal(4, s.pos) + assert_predicate(s, :matched?) + end + + def test_scan_integer_unmatch + s = create_string_scanner('123abc') + assert_equal(123, s.scan_integer) + assert_equal(3, s.pos) + + s.unscan + assert_equal(0, s.pos) + end + + def test_scan_integer_encoding + s = create_string_scanner('123abc'.encode(Encoding::UTF_32LE)) + assert_raise(Encoding::CompatibilityError) do + s.scan_integer + end + end + + def test_scan_integer_matched + s = create_string_scanner("42abc") + assert_equal(42, s.scan_integer) + assert_equal("42", s.matched) + + s = create_string_scanner("42abc") + assert_equal(0x42abc, s.scan_integer(base: 16)) + assert_equal("42abc", s.matched) + end + + def test_scan_integer_base_16 + s = create_string_scanner('0') + assert_equal(0x0, s.scan_integer(base: 16)) + assert_equal(1, s.pos) + assert_predicate(s, :matched?) + + s = create_string_scanner('abc') + assert_equal(3, s.match?(/(?<a>abc)/)) # set named_captures + assert_equal(0xabc, s.scan_integer(base: 16)) + assert_equal({}, s.named_captures) + assert_equal(3, s.pos) + assert_predicate(s, :matched?) + + s = create_string_scanner('123abc') + assert_equal(0x123abc, s.scan_integer(base: 16)) + assert_equal(6, s.pos) + assert_predicate(s, :matched?) + + s = create_string_scanner('0x123abc') + assert_equal(0x123abc, s.scan_integer(base: 16)) + assert_equal(8, s.pos) + assert_predicate(s, :matched?) + + s = create_string_scanner('0x123ABC') + assert_equal(0x123abc, s.scan_integer(base: 16)) + assert_equal(8, s.pos) + assert_predicate(s, :matched?) + + s = create_string_scanner('-0x123ABC') + assert_equal(-0x123abc, s.scan_integer(base: 16)) + assert_equal(9, s.pos) + assert_predicate(s, :matched?) + + s = create_string_scanner('+0x123ABC') + assert_equal(+0x123abc, s.scan_integer(base: 16)) + assert_equal(9, s.pos) + assert_predicate(s, :matched?) + + s = create_string_scanner('0x') + assert_equal(0, s.scan_integer(base: 16)) + assert_equal(1, s.pos) + assert_predicate(s, :matched?) + + s = create_string_scanner('0xyz') + assert_equal(0, s.scan_integer(base: 16)) + assert_equal(1, s.pos) + assert_predicate(s, :matched?) + + s = create_string_scanner('-0x') + assert_equal(0, s.scan_integer(base: 16)) + assert_equal(2, s.pos) + assert_predicate(s, :matched?) + + s = create_string_scanner('+0x') + assert_equal(0, s.scan_integer(base: 16)) + assert_equal(2, s.pos) + assert_predicate(s, :matched?) + + s = create_string_scanner('-123abc') + assert_equal(-0x123abc, s.scan_integer(base: 16)) + assert_equal(7, s.pos) + assert_predicate(s, :matched?) + + s = create_string_scanner('+123') + assert_equal(0x123, s.scan_integer(base: 16)) + assert_equal(4, s.pos) + assert_predicate(s, :matched?) + + s = create_string_scanner('-abc') + assert_equal(-0xabc, s.scan_integer(base: 16)) + assert_equal(4, s.pos) + assert_predicate(s, :matched?) + + huge_integer = 'F' * 2_000 + s = create_string_scanner(huge_integer) + assert_equal(huge_integer.to_i(16), s.scan_integer(base: 16)) + assert_equal(2_000, s.pos) + assert_predicate(s, :matched?) end end @@ -846,25 +1196,25 @@ class TestStringScannerFixedAnchor < Test::Unit::TestCase def test_skip_with_begenning_of_string_anchor_match s = create_string_scanner("a") - assert_equal 1, s.skip(/\Aa/) + assert_equal(1, s.skip(/\Aa/)) end def test_skip_with_begenning_of_string_anchor_not_match s = create_string_scanner("a\nb") - assert_equal 2, s.skip(/a\n/) - assert_nil s.skip(/\Ab/) + assert_equal(2, s.skip(/a\n/)) + assert_nil( s.skip(/\Ab/)) end def test_skip_with_begenning_of_line_anchor_match s = create_string_scanner("a\nb") - assert_equal 2, s.skip(/a\n/) - assert_equal 1, s.skip(/^b/) + assert_equal(2, s.skip(/a\n/)) + assert_equal(1, s.skip(/^b/)) end def test_skip_with_begenning_of_line_anchor_not_match s = create_string_scanner("ab") - assert_equal 1, s.skip(/a/) - assert_nil s.skip(/^b/) + assert_equal(1, s.skip(/a/)) + assert_nil( s.skip(/^b/)) end # ruby/strscan#86 @@ -872,6 +1222,6 @@ class TestStringScannerFixedAnchor < Test::Unit::TestCase s = "hellohello"[5..-1] ss = StringScanner.new(s).scan(/hello/) - assert_equal "hello", ss + assert_equal("hello", ss) end end |