From 85290986334d2eb781eb9135277593a5613fa3c5 Mon Sep 17 00:00:00 2001 From: Patrik Nyblom Date: Fri, 19 Jul 2013 17:52:05 +0200 Subject: Integrate new PCRE test suites The relevant testoutputNN files were copied from the PCRE distribution and some corrections were done to run_pcre_tests.erl. Also made test generator be more compiler friendly The re_testoutput1_replacement_test and re_testoutput1_split_test modules that are generated by run_pcre_tests.erl (offline, when a new version of PCRE is integrated in the VM) took forever to compile, as one single huge function contained all the tests. The autogenerated tests are now split into ~50 functions, which reduces compile time to approximately a third. New automatic test suites are also generated from the new testoutputNN files, and checked in. --- lib/stdlib/test/re_SUITE_data/testoutput10 | 252 +++++++++++++++++------------ 1 file changed, 148 insertions(+), 104 deletions(-) (limited to 'lib/stdlib/test/re_SUITE_data/testoutput10') diff --git a/lib/stdlib/test/re_SUITE_data/testoutput10 b/lib/stdlib/test/re_SUITE_data/testoutput10 index dbd59241ad..c1c85f9a3b 100644 --- a/lib/stdlib/test/re_SUITE_data/testoutput10 +++ b/lib/stdlib/test/re_SUITE_data/testoutput10 @@ -1,19 +1,18 @@ /-- These are a few representative patterns whose lengths and offsets are to be shown when the link size is 2. This is just a doublecheck test to ensure the sizes don't go horribly wrong when something is changed. The pattern contents -are all themselves checked in other tests. --/ +are all themselves checked in other tests. Unicode, including property support, +is required for these tests. --/ /((?i)b)/BM -Memory allocation (code space): 21 +Memory allocation (code space): 17 ------------------------------------------------------------------ - 0 17 Bra - 3 9 CBra 1 - 8 01 Opt - 10 NC b - 12 9 Ket - 15 00 Opt - 17 17 Ket - 20 End + 0 13 Bra + 3 7 CBra 1 + 8 /i b + 10 7 Ket + 13 13 Ket + 16 End ------------------------------------------------------------------ /(?s)(.*X|^B)/BM @@ -21,7 +20,7 @@ Memory allocation (code space): 25 ------------------------------------------------------------------ 0 21 Bra 3 9 CBra 1 - 8 Any* + 8 AllAny* 10 X 12 6 Alt 15 ^ @@ -32,21 +31,18 @@ Memory allocation (code space): 25 ------------------------------------------------------------------ /(?s:.*X|^B)/BM -Memory allocation (code space): 29 +Memory allocation (code space): 23 ------------------------------------------------------------------ - 0 25 Bra - 3 9 Bra - 6 04 Opt - 8 Any* - 10 X - 12 8 Alt - 15 04 Opt - 17 ^ - 18 B - 20 17 Ket - 23 00 Opt - 25 25 Ket - 28 End + 0 19 Bra + 3 7 Bra + 6 AllAny* + 8 X + 10 6 Alt + 13 ^ + 14 B + 16 13 Ket + 19 19 Ket + 22 End ------------------------------------------------------------------ /^[[:alnum:]]/BM @@ -115,17 +111,15 @@ Memory allocation (code space): 19 ------------------------------------------------------------------ /(x)*+/BM -Memory allocation (code space): 24 +Memory allocation (code space): 18 ------------------------------------------------------------------ - 0 20 Bra - 3 14 Once - 6 Brazero - 7 7 CBra 1 - 12 x - 14 7 KetRmax - 17 14 Ket - 20 20 Ket - 23 End + 0 14 Bra + 3 Braposzero + 4 7 CBraPos 1 + 9 x + 11 7 KetRpos + 14 14 Ket + 17 End ------------------------------------------------------------------ /^((a+)(?U)([ab]+)(?-U)([bc]+)(\w*))/BM @@ -172,18 +166,16 @@ Memory allocation (code space): 816 ------------------------------------------------------------------ /(a(?1)b)/BM -Memory allocation (code space): 28 +Memory allocation (code space): 22 ------------------------------------------------------------------ - 0 24 Bra - 3 18 CBra 1 + 0 18 Bra + 3 12 CBra 1 8 a - 10 6 Once - 13 3 Recurse - 16 6 Ket - 19 b - 21 18 Ket - 24 24 Ket - 27 End + 10 3 Recurse + 13 b + 15 12 Ket + 18 18 Ket + 21 End ------------------------------------------------------------------ /(a(?1)+b)/BM @@ -202,7 +194,7 @@ Memory allocation (code space): 28 ------------------------------------------------------------------ /a(?Pb|c)d(?Pe)/BM -Memory allocation (code space): 42 +Memory allocation (code space): 36 ------------------------------------------------------------------ 0 32 Bra 3 a @@ -220,7 +212,7 @@ Memory allocation (code space): 42 ------------------------------------------------------------------ /(?:a(?Pc(?Pd)))(?Pa)/BM -Memory allocation (code space): 54 +Memory allocation (code space): 45 ------------------------------------------------------------------ 0 41 Bra 3 25 Bra @@ -240,9 +232,9 @@ Memory allocation (code space): 54 ------------------------------------------------------------------ /(?Pa)...(?P=a)bbb(?P>a)d/BM -Memory allocation (code space): 43 +Memory allocation (code space): 34 ------------------------------------------------------------------ - 0 36 Bra + 0 30 Bra 3 7 CBra 1 8 a 10 7 Ket @@ -251,12 +243,10 @@ Memory allocation (code space): 43 15 Any 16 \1 19 bbb - 25 6 Once - 28 3 Recurse - 31 6 Ket - 34 d - 36 36 Ket - 39 End + 25 3 Recurse + 28 d + 30 30 Ket + 33 End ------------------------------------------------------------------ /abc(?C255)de(?C)f/BM @@ -327,32 +317,17 @@ Memory allocation (code space): 12 11 End ------------------------------------------------------------------ -/\x{1000000}/8BM -Memory allocation (code space): 13 ------------------------------------------------------------------- - 0 9 Bra - 3 \x{1000000} - 9 9 Ket - 12 End ------------------------------------------------------------------- - -/\x{4000000}/8BM -Memory allocation (code space): 14 +/\x{10ffff}/8BM +Memory allocation (code space): 12 ------------------------------------------------------------------ - 0 10 Bra - 3 \x{4000000} - 10 10 Ket - 13 End + 0 8 Bra + 3 \x{10ffff} + 8 8 Ket + 11 End ------------------------------------------------------------------ -/\x{7fffFFFF}/8BM -Memory allocation (code space): 14 ------------------------------------------------------------------- - 0 10 Bra - 3 \x{7fffffff} - 10 10 Ket - 13 End ------------------------------------------------------------------- +/\x{110000}/8BM +Failed: character value in \x{...} sequence is too large at offset 9 /[\x{ff}]/8BM Memory allocation (code space): 10 @@ -364,12 +339,12 @@ Memory allocation (code space): 10 ------------------------------------------------------------------ /[\x{100}]/8BM -Memory allocation (code space): 15 +Memory allocation (code space): 10 ------------------------------------------------------------------ - 0 11 Bra - 3 [\x{100}] - 11 11 Ket - 14 End + 0 6 Bra + 3 \x{100} + 6 6 Ket + 9 End ------------------------------------------------------------------ /\x80/8BM @@ -399,7 +374,7 @@ Memory allocation (code space): 18 17 End ------------------------------------------------------------------ Capturing subpattern count = 0 -Options: utf8 +Options: utf First char = 'A' Need char = '.' @@ -412,9 +387,9 @@ Memory allocation (code space): 19 18 End ------------------------------------------------------------------ Capturing subpattern count = 0 -Options: utf8 -First char = 237 -Need char = 180 +Options: utf +First char = \x{ed} +Need char = \x{b4} /\x{65e5}\x{672c}\x{8a9e}/D8M Memory allocation (code space): 19 @@ -425,17 +400,17 @@ Memory allocation (code space): 19 18 End ------------------------------------------------------------------ Capturing subpattern count = 0 -Options: utf8 -First char = 230 -Need char = 158 +Options: utf +First char = \x{e6} +Need char = \x{9e} /[\x{100}]/8BM -Memory allocation (code space): 15 +Memory allocation (code space): 10 ------------------------------------------------------------------ - 0 11 Bra - 3 [\x{100}] - 11 11 Ket - 14 End + 0 6 Bra + 3 \x{100} + 6 6 Ket + 9 End ------------------------------------------------------------------ /[Z\x{100}]/8BM @@ -537,7 +512,7 @@ Memory allocation (code space): 48 Memory allocation (code space): 25 ------------------------------------------------------------------ 0 21 Bra - 3 NC A\x{391}\x{10427}\x{ff3a}\x{1fb0} + 3 /i A\x{391}\x{10427}\x{ff3a}\x{1fb0} 21 21 Ket 24 End ------------------------------------------------------------------ @@ -616,7 +591,7 @@ Memory allocation (code space): 9 Memory allocation (code space): 9 ------------------------------------------------------------------ 0 5 Bra - 3 \xaa + 3 \x{aa} 5 5 Ket 8 End ------------------------------------------------------------------ @@ -652,18 +627,87 @@ Memory allocation (code space): 9 Memory allocation (code space): 9 ------------------------------------------------------------------ 0 5 Bra - 3 [^\xaa] + 3 [^\x{aa}] 5 5 Ket 8 End ------------------------------------------------------------------ /[^\xaa]/8BM -Memory allocation (code space): 40 +Memory allocation (code space): 10 ------------------------------------------------------------------ - 0 36 Bra - 3 [\x00-\xa9\xab-\xff] (neg) - 36 36 Ket - 39 End + 0 6 Bra + 3 [^\x{aa}] + 6 6 Ket + 9 End +------------------------------------------------------------------ + +/[^\d]/8WB +------------------------------------------------------------------ + 0 11 Bra + 3 [^\p{Nd}] + 11 11 Ket + 14 End ------------------------------------------------------------------ -/ End of testinput10 / +/[[:^alpha:][:^cntrl:]]+/8WB +------------------------------------------------------------------ + 0 44 Bra + 3 [ -~\x80-\xff\P{L}]+ + 44 44 Ket + 47 End +------------------------------------------------------------------ + +/[[:^cntrl:][:^alpha:]]+/8WB +------------------------------------------------------------------ + 0 44 Bra + 3 [ -~\x80-\xff\P{L}]+ + 44 44 Ket + 47 End +------------------------------------------------------------------ + +/[[:alpha:]]+/8WB +------------------------------------------------------------------ + 0 12 Bra + 3 [\p{L}]+ + 12 12 Ket + 15 End +------------------------------------------------------------------ + +/[[:^alpha:]\S]+/8WB +------------------------------------------------------------------ + 0 15 Bra + 3 [\P{L}\P{Xsp}]+ + 15 15 Ket + 18 End +------------------------------------------------------------------ + +/abc(d|e)(*THEN)x(123(*THEN)4|567(b|q)(*THEN)xx)/B +------------------------------------------------------------------ + 0 73 Bra + 3 abc + 9 7 CBra 1 + 14 d + 16 5 Alt + 19 e + 21 12 Ket + 24 *THEN + 25 x + 27 14 CBra 2 + 32 123 + 38 *THEN + 39 4 + 41 29 Alt + 44 567 + 50 7 CBra 3 + 55 b + 57 5 Alt + 60 q + 62 12 Ket + 65 *THEN + 66 xx + 70 43 Ket + 73 73 Ket + 76 End +------------------------------------------------------------------ + +/-- End of testinput11 --/ -- cgit v1.2.3