]>
Commit | Line | Data |
---|---|---|
d2415672 AG |
1 | To: vim-dev@vim.org |
2 | Subject: Patch 7.1.180 | |
3 | Fcc: outbox | |
4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
5 | Mime-Version: 1.0 | |
6 | Content-Type: text/plain; charset=ISO-8859-1 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ------------ | |
9 | ||
10 | Patch 7.1.180 | |
11 | Problem: Regexp patterns not tested sufficiently. | |
12 | Solution: Add more checks to the regexp test. | |
13 | Files: src/testdir/test64.in, src/testdir/test64.ok | |
14 | ||
15 | ||
16 | *** ../vim-7.1.179/src/testdir/test64.in Tue Sep 25 17:54:41 2007 | |
17 | --- src/testdir/test64.in Mon Dec 31 14:20:23 2007 | |
18 | *************** | |
19 | *** 14,23 **** | |
20 | --- 14,136 ---- | |
21 | :" etc. | |
22 | :" When there is no match use only the first two items. | |
23 | :let tl = [] | |
24 | + :call add(tl, ['ab', 'aab', 'ab']) | |
25 | :call add(tl, ['b', 'abcdef', 'b']) | |
26 | :call add(tl, ['bc*', 'abccccdef', 'bcccc']) | |
27 | :call add(tl, ['bc\{-}', 'abccccdef', 'b']) | |
28 | :call add(tl, ['bc\{-}\(d\)', 'abccccdef', 'bccccd', 'd']) | |
29 | + :call add(tl, ['bc*', 'abbdef', 'b']) | |
30 | + :call add(tl, ['c*', 'ccc', 'ccc']) | |
31 | + :call add(tl, ['bc*', 'abdef', 'b']) | |
32 | + :call add(tl, ['c*', 'abdef', '']) | |
33 | + :call add(tl, ['bc\+', 'abccccdef', 'bcccc']) | |
34 | + :call add(tl, ['bc\+', 'abdef']) "no match | |
35 | + :" | |
36 | + :"operator \| | |
37 | + :call add(tl, ['a\|ab', 'cabd', 'a']) "alternation is ordered | |
38 | + :" | |
39 | + :call add(tl, ['c\?', 'ccb', 'c']) | |
40 | + :call add(tl, ['bc\?', 'abd', 'b']) | |
41 | + :call add(tl, ['bc\?', 'abccd', 'bc']) | |
42 | + :" | |
43 | + :call add(tl, ['\va{1}', 'ab', 'a']) | |
44 | + :" | |
45 | + :call add(tl, ['\va{2}', 'aa', 'aa']) | |
46 | + :call add(tl, ['\va{2}', 'caad', 'aa']) | |
47 | + :call add(tl, ['\va{2}', 'aba']) | |
48 | + :call add(tl, ['\va{2}', 'ab']) | |
49 | + :call add(tl, ['\va{2}', 'abaa', 'aa']) | |
50 | + :call add(tl, ['\va{2}', 'aaa', 'aa']) | |
51 | + :" | |
52 | + :call add(tl, ['\vb{1}', 'abca', 'b']) | |
53 | + :call add(tl, ['\vba{2}', 'abaa', 'baa']) | |
54 | + :call add(tl, ['\vba{3}', 'aabaac']) | |
55 | + :" | |
56 | + :call add(tl, ['\v(ab){1}', 'ab', 'ab', 'ab']) | |
57 | + :call add(tl, ['\v(ab){1}', 'dabc', 'ab', 'ab']) | |
58 | + :call add(tl, ['\v(ab){1}', 'acb']) | |
59 | + :" | |
60 | + :call add(tl, ['\v(ab){0,2}', 'acb', "", ""]) | |
61 | + :call add(tl, ['\v(ab){0,2}', 'ab', 'ab', 'ab']) | |
62 | + :call add(tl, ['\v(ab){1,2}', 'ab', 'ab', 'ab']) | |
63 | + :call add(tl, ['\v(ab){1,2}', 'ababc', 'abab', 'ab']) | |
64 | + :call add(tl, ['\v(ab){2,4}', 'ababcab', 'abab', 'ab']) | |
65 | + :call add(tl, ['\v(ab){2,4}', 'abcababa', 'abab', 'ab']) | |
66 | + :" | |
67 | + :call add(tl, ['\v(ab){2}', 'abab', 'abab', 'ab']) | |
68 | + :call add(tl, ['\v(ab){2}', 'cdababe', 'abab', 'ab']) | |
69 | + :call add(tl, ['\v(ab){2}', 'abac']) | |
70 | + :call add(tl, ['\v(ab){2}', 'abacabab', 'abab', 'ab']) | |
71 | + :call add(tl, ['\v((ab){2}){2}', 'abababab', 'abababab', 'abab', 'ab']) | |
72 | + :call add(tl, ['\v((ab){2}){2}', 'abacabababab', 'abababab', 'abab', 'ab']) | |
73 | + :" | |
74 | + :call add(tl, ['\v(a{1}){1}', 'a', 'a', 'a']) | |
75 | + :call add(tl, ['\v(a{2}){1}', 'aa', 'aa', 'aa']) | |
76 | + :call add(tl, ['\v(a{2}){1}', 'aaac', 'aa', 'aa']) | |
77 | + :call add(tl, ['\v(a{2}){1}', 'daaac', 'aa', 'aa']) | |
78 | + :call add(tl, ['\v(a{1}){2}', 'daaac', 'aa', 'a']) | |
79 | + :call add(tl, ['\v(a{1}){2}', 'aaa', 'aa', 'a']) | |
80 | + :call add(tl, ['\v(a{2})+', 'adaac', 'aa', 'aa']) | |
81 | + :call add(tl, ['\v(a{2})+', 'aa', 'aa', 'aa']) | |
82 | + :call add(tl, ['\v(a{2}){1}', 'aa', 'aa', 'aa']) | |
83 | + :call add(tl, ['\v(a{1}){2}', 'aa', 'aa', 'a']) | |
84 | + :call add(tl, ['\v(a{1}){1}', 'a', 'a', 'a']) | |
85 | + :call add(tl, ['\v(a{2}){2}', 'aaaa', 'aaaa', 'aa']) | |
86 | + :call add(tl, ['\v(a{2}){2}', 'aaabaaaa', 'aaaa', 'aa']) | |
87 | + :" | |
88 | + :call add(tl, ['\v(a+){2}', 'dadaac', 'aa', 'a']) | |
89 | + :call add(tl, ['\v(a{3}){2}', 'aaaaaaa', 'aaaaaa', 'aaa']) | |
90 | + :" | |
91 | + :call add(tl, ['\v(a{1,2}){2}', 'daaac', 'aaa', 'a']) | |
92 | + :call add(tl, ['\v(a{1,3}){2}', 'daaaac', 'aaaa', 'a']) | |
93 | + :call add(tl, ['\v(a{1,3}){2}', 'daaaaac', 'aaaaa', 'aa']) | |
94 | + :call add(tl, ['\v(a{1,3}){3}', 'daac']) | |
95 | + :call add(tl, ['\v(a{1,2}){2}', 'dac']) | |
96 | + :call add(tl, ['\v(a+)+', 'daac', 'aa', 'aa']) | |
97 | + :call add(tl, ['\v(a+)+', 'aaa', 'aaa', 'aaa']) | |
98 | + :call add(tl, ['\v(a+){1,2}', 'aaa', 'aaa', 'aaa']) | |
99 | + :call add(tl, ['\v(a+)(a+)', 'aaa', 'aaa', 'aa', 'a']) | |
100 | + :call add(tl, ['\v(a{3})+', 'daaaac', 'aaa', 'aaa']) | |
101 | + :call add(tl, ['\v(a|b|c)+', 'aacb', 'aacb', 'b']) | |
102 | + :call add(tl, ['\v(a|b|c){2}', 'abcb', 'ab', 'b']) | |
103 | + :call add(tl, ['\v(abc){2}', 'abcabd', ]) | |
104 | + :call add(tl, ['\v(abc){2}', 'abdabcabc','abcabc', 'abc']) | |
105 | + :" | |
106 | + :call add(tl, ['a*', 'cc', '']) | |
107 | + :call add(tl, ['\v(a*)+', 'cc', '']) | |
108 | + :call add(tl, ['\v((ab)+)+', 'ab', 'ab', 'ab', 'ab']) | |
109 | + :call add(tl, ['\v(((ab)+)+)+', 'ab', 'ab', 'ab', 'ab', 'ab']) | |
110 | + :call add(tl, ['\v(((ab)+)+)+', 'dababc', 'abab', 'abab', 'abab', 'ab']) | |
111 | + :call add(tl, ['\v(a{0,2})+', 'cc', '']) | |
112 | + :call add(tl, ['\v(a*)+', '', '']) | |
113 | + :call add(tl, ['\v((a*)+)+', '', '']) | |
114 | + :call add(tl, ['\v((ab)*)+', '', '']) | |
115 | + :call add(tl, ['\va{1,3}', 'aab', 'aa']) | |
116 | + :call add(tl, ['\va{2,3}', 'abaa', 'aa']) | |
117 | + :" | |
118 | + :call add(tl, ['\v((ab)+|c*)+', 'abcccaba', 'abcccab', '', 'ab']) | |
119 | + :call add(tl, ['\v(a{2})|(b{3})', 'bbabbbb', 'bbb', '', 'bbb']) | |
120 | + :call add(tl, ['\va{2}|b{2}', 'abab']) | |
121 | + :call add(tl, ['\v(a)+|(c)+', 'bbacbaacbbb', 'a', 'a']) | |
122 | + :call add(tl, ['\vab{2,3}c', 'aabbccccccccccccc', 'abbc']) | |
123 | + :call add(tl, ['\vab{2,3}c', 'aabbbccccccccccccc', 'abbbc']) | |
124 | + :call add(tl, ['\vab{2,3}cd{2,3}e', 'aabbbcddee', 'abbbcdde']) | |
125 | + :call add(tl, ['\va(bc){2}d', 'aabcbfbc' ]) | |
126 | + :call add(tl, ['\va*a{2}', 'a', ]) | |
127 | + :call add(tl, ['\va*a{2}', 'aa', 'aa' ]) | |
128 | + :call add(tl, ['\va*a{2}', 'aaa', 'aaa' ]) | |
129 | + :call add(tl, ['\va*a{2}', 'bbbabcc', ]) | |
130 | + :call add(tl, ['\va*b*|a*c*', 'a', 'a']) | |
131 | + :call add(tl, ['\va{1}b{1}|a{1}b{1}', '']) | |
132 | + :" | |
133 | + :"submatches | |
134 | + :call add(tl, ['\v(a)', 'ab', 'a', 'a']) | |
135 | + :call add(tl, ['\v(a)(b)', 'ab', 'ab', 'a', 'b']) | |
136 | + :call add(tl, ['\v(ab)(b)(c)', 'abbc', 'abbc', 'ab', 'b', 'c']) | |
137 | + :call add(tl, ['\v((a)(b))', 'ab', 'ab', 'ab', 'a', 'b']) | |
138 | + :call add(tl, ['\v(a)|(b)', 'ab', 'a', 'a']) | |
139 | + :" | |
140 | + :call add(tl, ['\v(a*)+', 'aaaa', 'aaaa', '']) | |
141 | :call add(tl, ['x', 'abcdef']) | |
142 | :" | |
143 | :for t in tl | |
144 | *** ../vim-7.1.179/src/testdir/test64.ok Tue Aug 14 17:28:14 2007 | |
145 | --- src/testdir/test64.ok Mon Dec 31 14:20:26 2007 | |
146 | *************** | |
147 | *** 4,6 **** | |
148 | --- 4,102 ---- | |
149 | OK | |
150 | OK | |
151 | OK | |
152 | + OK | |
153 | + OK | |
154 | + OK | |
155 | + OK | |
156 | + OK | |
157 | + OK | |
158 | + OK | |
159 | + OK | |
160 | + OK | |
161 | + OK | |
162 | + OK | |
163 | + OK | |
164 | + OK | |
165 | + OK | |
166 | + OK | |
167 | + OK | |
168 | + OK | |
169 | + OK | |
170 | + OK | |
171 | + OK | |
172 | + OK | |
173 | + OK | |
174 | + OK | |
175 | + OK | |
176 | + OK | |
177 | + OK | |
178 | + OK | |
179 | + OK | |
180 | + OK | |
181 | + OK | |
182 | + OK | |
183 | + OK | |
184 | + OK | |
185 | + OK | |
186 | + OK | |
187 | + OK | |
188 | + OK | |
189 | + OK | |
190 | + OK | |
191 | + OK | |
192 | + OK | |
193 | + OK | |
194 | + OK | |
195 | + OK | |
196 | + OK | |
197 | + OK | |
198 | + OK | |
199 | + OK | |
200 | + OK | |
201 | + OK | |
202 | + OK | |
203 | + OK | |
204 | + OK | |
205 | + OK | |
206 | + OK | |
207 | + OK | |
208 | + OK | |
209 | + OK | |
210 | + OK | |
211 | + OK | |
212 | + OK | |
213 | + OK | |
214 | + OK | |
215 | + OK | |
216 | + OK | |
217 | + OK | |
218 | + OK | |
219 | + OK | |
220 | + OK | |
221 | + OK | |
222 | + OK | |
223 | + OK | |
224 | + OK | |
225 | + OK | |
226 | + OK | |
227 | + OK | |
228 | + OK | |
229 | + OK | |
230 | + OK | |
231 | + OK | |
232 | + OK | |
233 | + OK | |
234 | + OK | |
235 | + OK | |
236 | + OK | |
237 | + OK | |
238 | + OK | |
239 | + OK | |
240 | + OK | |
241 | + OK | |
242 | + OK | |
243 | + OK | |
244 | + OK | |
245 | + OK | |
246 | + OK | |
247 | + OK | |
248 | *** ../vim-7.1.179/src/version.c Tue Jan 1 16:25:33 2008 | |
249 | --- src/version.c Tue Jan 1 17:34:32 2008 | |
250 | *************** | |
251 | *** 668,669 **** | |
252 | --- 668,671 ---- | |
253 | { /* Add new patch number below this line */ | |
254 | + /**/ | |
255 | + 180, | |
256 | /**/ | |
257 | ||
258 | -- | |
259 | CONCORDE: Message for you, sir. | |
260 | He falls forward revealing the arrow with the note. | |
261 | "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD | |
262 | ||
263 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
264 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
265 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
266 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |