From 76a2e626692407a80ad406ddfd0c90d712810f14 Mon Sep 17 00:00:00 2001 From: "Philip.Hazel" Date: Mon, 3 Aug 2015 17:25:55 +0000 Subject: [PATCH] Maintenance on tests for Perl compatibility --- perltest.sh | 2 +- testdata/testinput1 | 35 +------------------------------ testdata/testinput2 | 36 +++++++++++++++++++++++++++++++ testdata/testinput4 | 8 ------- testdata/testinput5 | 8 +++++++ testdata/testoutput1 | 46 +--------------------------------------- testdata/testoutput2 | 50 ++++++++++++++++++++++++++++++++++++++++++++ testdata/testoutput4 | 10 --------- testdata/testoutput5 | 10 +++++++++ 9 files changed, 107 insertions(+), 98 deletions(-) diff --git a/perltest.sh b/perltest.sh index f011ccc..5dd26c6 100755 --- a/perltest.sh +++ b/perltest.sh @@ -204,7 +204,7 @@ for (;;) printf "data> " if $interact; last NEXT_RE if ! ($_ = <$infile>); chomp; - printf $outfile "$_\n" if ! $interact; + printf $outfile "%s", "$_\n" if ! $interact; s/\s+$//; # Remove trailing space s/^\s+//; # Remove leading space diff --git a/testdata/testinput1 b/testdata/testinput1 index f5b801c..e27366b 100644 --- a/testdata/testinput1 +++ b/testdata/testinput1 @@ -1448,18 +1448,6 @@ ABCabc abcABC -/ab{3cd/ - ab{3cd - -/ab{3,cd/ - ab{3,cd - -/ab{3,4a}cd/ - ab{3,4a}cd - -/{4,5a}bc/ - {4,5a}bc - /abc$/ abc abc\n @@ -1931,9 +1919,6 @@ x\nb\n a\bx\n -/\x0{ab}/ - \0{ab} - /(A|B)*?CD/ CD @@ -4290,12 +4275,6 @@ ** Failers aaaaaa -/ab\Cde/ - abXde - -/(?<=ab\Cde)X/ - abZdeX - /\H\h\V\v/ X X\x0a X\x09X\x0b @@ -4351,7 +4330,7 @@ ** Failers defabcxyz -/^(a(b))\1\g1\g{1}\g-1\g{-1}\g{-02}Z/ +/^(a(b))\1\g1\g{1}\g-1\g{-1}\g{-2}Z/ ababababbbabZXXXX /(?tom|bon)-\g{A}/ @@ -5216,18 +5195,6 @@ name)/mark /(?:.*?a)(?<=ba)/ aba -/.*?a(*PRUNE)b/ - aab - -/.*?a(*PRUNE)b/s - aab - -/^a(*PRUNE)b/s - aab - -/.*?a(*SKIP)b/ - aab - /(?>.*?a)b/s aab diff --git a/testdata/testinput2 b/testdata/testinput2 index 29346d9..0c7ea4f 100644 --- a/testdata/testinput2 +++ b/testdata/testinput2 @@ -4372,4 +4372,40 @@ a random value. /Ix /(?|(?'a'aaa)|(?'a'b))(?'a'cccc)\k'a'/I,dupnames +/ab{3cd/ + ab{3cd + +/ab{3,cd/ + ab{3,cd + +/ab{3,4a}cd/ + ab{3,4a}cd + +/{4,5a}bc/ + {4,5a}bc + +/\x0{ab}/ + \0{ab} + +/ab\Cde/ + abXde + +/(?<=ab\Cde)X/ + abZdeX + +/^(a(b))\1\g1\g{1}\g-1\g{-1}\g{-02}Z/ + ababababbbabZXXXX + +/.*?a(*PRUNE)b/ + aab + +/.*?a(*PRUNE)b/s + aab + +/^a(*PRUNE)b/s + aab + +/.*?a(*SKIP)b/ + aab + # End of testinput2 diff --git a/testdata/testinput4 b/testdata/testinput4 index 421b3fb..c50169d 100644 --- a/testdata/testinput4 +++ b/testdata/testinput4 @@ -2221,12 +2221,4 @@ "[\S\V\H]"utf -/\C\X*TӅ; -{0,6}\v+ F -/utf - Ӆ\x0a - -/\C(\W?ſ)'?{{/utf - \\C(\\W?ſ)'?{{ - # End of testinput4 diff --git a/testdata/testinput5 b/testdata/testinput5 index 47afd25..4ddc47d 100644 --- a/testdata/testinput5 +++ b/testdata/testinput5 @@ -1653,4 +1653,12 @@ "(*UTF)(*UCP)(.UTF).+X(\V+;\^(\D|)!999}(?(?C{7(?C')\H*\S*/^\x5\xa\\xd3\x85n?(;\D*(?m).[^mH+((*UCP)(*U:F)})(?!^)(?'" +/\C\X*TӅ; +{0,6}\v+ F +/utf + Ӆ\x0a + +/\C(\W?ſ)'?{{/utf + \\C(\\W?ſ)'?{{ + # End of testinput5 diff --git a/testdata/testoutput1 b/testdata/testoutput1 index 153186d..343830f 100644 --- a/testdata/testoutput1 +++ b/testdata/testoutput1 @@ -2084,22 +2084,6 @@ No match 0: abcABC 1: abc -/ab{3cd/ - ab{3cd - 0: ab{3cd - -/ab{3,cd/ - ab{3,cd - 0: ab{3,cd - -/ab{3,4a}cd/ - ab{3,4a}cd - 0: ab{3,4a}cd - -/{4,5a}bc/ - {4,5a}bc - 0: {4,5a}bc - /abc$/ abc 0: abc @@ -2994,10 +2978,6 @@ No match a\bx\n 0: x -/\x0{ab}/ - \0{ab} - 0: \x00{ab} - /(A|B)*?CD/ CD 0: CD @@ -7017,14 +6997,6 @@ No match aaaaaa No match -/ab\Cde/ - abXde - 0: abXde - -/(?<=ab\Cde)X/ - abZdeX - 0: X - /\H\h\V\v/ X X\x0a 0: X X\x0a @@ -7125,7 +7097,7 @@ No match defabcxyz No match -/^(a(b))\1\g1\g{1}\g-1\g{-1}\g{-02}Z/ +/^(a(b))\1\g1\g{1}\g-1\g{-1}\g{-2}Z/ ababababbbabZXXXX 0: ababababbbabZ 1: ab @@ -8675,22 +8647,6 @@ No match aba 0: aba -/.*?a(*PRUNE)b/ - aab - 0: ab - -/.*?a(*PRUNE)b/s - aab - 0: ab - -/^a(*PRUNE)b/s - aab -No match - -/.*?a(*SKIP)b/ - aab - 0: ab - /(?>.*?a)b/s aab 0: ab diff --git a/testdata/testoutput2 b/testdata/testoutput2 index 9e10df2..51ddcec 100644 --- a/testdata/testoutput2 +++ b/testdata/testoutput2 @@ -14611,4 +14611,54 @@ Starting code units: a b Last code unit = 'c' Subject length lower bound = 0 +/ab{3cd/ + ab{3cd + 0: ab{3cd + +/ab{3,cd/ + ab{3,cd + 0: ab{3,cd + +/ab{3,4a}cd/ + ab{3,4a}cd + 0: ab{3,4a}cd + +/{4,5a}bc/ + {4,5a}bc + 0: {4,5a}bc + +/\x0{ab}/ + \0{ab} + 0: \x00{ab} + +/ab\Cde/ + abXde + 0: abXde + +/(?<=ab\Cde)X/ + abZdeX + 0: X + +/^(a(b))\1\g1\g{1}\g-1\g{-1}\g{-02}Z/ + ababababbbabZXXXX + 0: ababababbbabZ + 1: ab + 2: b + +/.*?a(*PRUNE)b/ + aab + 0: ab + +/.*?a(*PRUNE)b/s + aab + 0: ab + +/^a(*PRUNE)b/s + aab +No match + +/.*?a(*SKIP)b/ + aab + 0: ab + # End of testinput2 diff --git a/testdata/testoutput4 b/testdata/testoutput4 index e8090a9..8364515 100644 --- a/testdata/testoutput4 +++ b/testdata/testoutput4 @@ -3741,14 +3741,4 @@ No match "[\S\V\H]"utf -/\C\X*TӅ; -{0,6}\v+ F -/utf - Ӆ\x0a -No match - -/\C(\W?ſ)'?{{/utf - \\C(\\W?ſ)'?{{ -No match - # End of testinput4 diff --git a/testdata/testoutput5 b/testdata/testoutput5 index 080c194..3ee04a6 100644 --- a/testdata/testoutput5 +++ b/testdata/testoutput5 @@ -4053,4 +4053,14 @@ Failed: error 122 at offset 1227: unmatched closing parenthesis "(*UTF)(*UCP)(.UTF).+X(\V+;\^(\D|)!999}(?(?C{7(?C')\H*\S*/^\x5\xa\\xd3\x85n?(;\D*(?m).[^mH+((*UCP)(*U:F)})(?!^)(?'" Failed: error 124 at offset 113: letter or underscore expected after (?< or (?' +/\C\X*TӅ; +{0,6}\v+ F +/utf + Ӆ\x0a +No match + +/\C(\W?ſ)'?{{/utf + \\C(\\W?ſ)'?{{ +No match + # End of testinput5