diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-05-31 23:18:00 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-05-31 23:18:00 +0200 |
| commit | 54dafde1707b253036f42e6e3478c2e9d61bf4b9 (patch) | |
| tree | 28d7c2ca6ce62d70c3b31a37decd4a59159e99cc /src/testdir | |
| parent | 4b78063368eca61c8c8991d3c9afc18d5a474b82 (diff) | |
| download | vim-git-54dafde1707b253036f42e6e3478c2e9d61bf4b9.tar.gz | |
updated for version 7.3.1084v7.3.1084
Problem: New regexp engine: only accepts up to \{,10}.
Solution: Remove upper limit. Remove dead code with NFA_PLUS.
Diffstat (limited to 'src/testdir')
| -rw-r--r-- | src/testdir/test64.in | 8 | ||||
| -rw-r--r-- | src/testdir/test64.ok | 14 |
2 files changed, 20 insertions, 2 deletions
diff --git a/src/testdir/test64.in b/src/testdir/test64.in index dffcf52b3..b1f1fb101 100644 --- a/src/testdir/test64.in +++ b/src/testdir/test64.in @@ -182,7 +182,9 @@ STARTTEST :call add(tl, [2, 'a\{0,}', 'oij sdigfusnf', '']) :call add(tl, [2, 'a\{0,}', 'aaaaa aa', 'aaaaa']) :call add(tl, [2, 'a\{2,}', 'sdfiougjdsafg']) -:call add(tl, [0, 'a\{2,}', 'aaaaasfoij ', 'aaaaa']) +:call add(tl, [2, 'a\{2,}', 'aaaaasfoij ', 'aaaaa']) +:call add(tl, [2, 'a\{5,}', 'xxaaaaxxx ']) +:call add(tl, [2, 'a\{5,}', 'xxaaaaaxxx ', 'aaaaa']) :call add(tl, [2, 'a\{,0}', 'oidfguih iuhi hiu aaaa', '']) :call add(tl, [2, 'a\{,5}', 'abcd', 'a']) :call add(tl, [2, 'a\{,5}', 'aaaaaaaaaa', 'aaaaa']) @@ -225,7 +227,9 @@ STARTTEST :" :" Test greedy-ness and lazy-ness :call add(tl, [2, 'a\{-2,7}','aaaaaaaaaaaaa', 'aa']) +:call add(tl, [2, 'a\{-2,7}x','aaaaaaaaax', 'aaaaaaax']) :call add(tl, [2, 'a\{2,7}','aaaaaaaaaaaaaaaaaaaa', 'aaaaaaa']) +:call add(tl, [2, 'a\{2,7}x','aaaaaaaaax', 'aaaaaaax']) :call add(tl, [2, '\vx(.{-,8})yz(.*)','xayxayzxayzxayz','xayxayzxayzxayz','ayxa','xayzxayz']) :call add(tl, [2, '\vx(.*)yz(.*)','xayxayzxayzxayz','xayxayzxayzxayz', 'ayxayzxayzxa','']) :call add(tl, [2, '\v(a{1,2}){-2,3}','aaaaaaa','aaaa','aa']) @@ -366,7 +370,7 @@ STARTTEST :call add(tl, [2, '\_[^a]\+', "asfi\n9888", "sfi\n9888"]) :" :"""" Requiring lots of states. -:call add(tl, [0, '[0-9a-zA-Z]\{8}-\([0-9a-zA-Z]\{4}-\)\{3}[0-9a-zA-Z]\{12}', " 12345678-1234-1234-1234-123456789012 ", "12345678-1234-1234-1234-123456789012", "1234-"]) +:call add(tl, [2, '[0-9a-zA-Z]\{8}-\([0-9a-zA-Z]\{4}-\)\{3}[0-9a-zA-Z]\{12}', " 12345678-1234-1234-1234-123456789012 ", "12345678-1234-1234-1234-123456789012", "1234-"]) :" :" :"""" Run the tests diff --git a/src/testdir/test64.ok b/src/testdir/test64.ok index 5a13e060a..f5f12119b 100644 --- a/src/testdir/test64.ok +++ b/src/testdir/test64.ok @@ -389,6 +389,13 @@ OK 1 - a\{2,} OK 2 - a\{2,} OK 0 - a\{2,} OK 1 - a\{2,} +OK 2 - a\{2,} +OK 0 - a\{5,} +OK 1 - a\{5,} +OK 2 - a\{5,} +OK 0 - a\{5,} +OK 1 - a\{5,} +OK 2 - a\{5,} OK 0 - a\{,0} OK 1 - a\{,0} OK 2 - a\{,0} @@ -486,9 +493,15 @@ OK 2 - \v(a|b*)+ OK 0 - a\{-2,7} OK 1 - a\{-2,7} OK 2 - a\{-2,7} +OK 0 - a\{-2,7}x +OK 1 - a\{-2,7}x +OK 2 - a\{-2,7}x OK 0 - a\{2,7} OK 1 - a\{2,7} OK 2 - a\{2,7} +OK 0 - a\{2,7}x +OK 1 - a\{2,7}x +OK 2 - a\{2,7}x OK 0 - \vx(.{-,8})yz(.*) OK 1 - \vx(.{-,8})yz(.*) OK 2 - \vx(.{-,8})yz(.*) @@ -803,6 +816,7 @@ OK 1 - \_[^a]\+ OK 2 - \_[^a]\+ OK 0 - [0-9a-zA-Z]\{8}-\([0-9a-zA-Z]\{4}-\)\{3}[0-9a-zA-Z]\{12} OK 1 - [0-9a-zA-Z]\{8}-\([0-9a-zA-Z]\{4}-\)\{3}[0-9a-zA-Z]\{12} +OK 2 - [0-9a-zA-Z]\{8}-\([0-9a-zA-Z]\{4}-\)\{3}[0-9a-zA-Z]\{12} 192.168.0.1 192.168.0.1 192.168.0.1 |