From 39d9294d14ba1bc2603bfa80b9e729de554224bf Mon Sep 17 00:00:00 2001 From: "Philip.Hazel" Date: Fri, 24 Mar 2017 18:40:15 +0000 Subject: [PATCH] Move some tests back into test 1 now that JIT has been updated. --- testdata/testinput1 | 23 +++++++++++++++ testdata/testinput2 | 26 ----------------- testdata/testoutput1 | 66 ++++++++++++++++++++++++++++++++++++++++++ testdata/testoutput2 | 69 -------------------------------------------- 4 files changed, 89 insertions(+), 95 deletions(-) diff --git a/testdata/testinput1 b/testdata/testinput1 index 79b168f..29fad9e 100644 --- a/testdata/testinput1 +++ b/testdata/testinput1 @@ -5882,4 +5882,27 @@ ef) x/x,mark Ab Ac +/^(.|(.)(?1)\2)$/ + a + aba + abcba + ababa + abcdcba + +/^((.)(?1)\2|.?)$/ + a + aba + abba + abcba + ababa + abccba + abcdcba + abcddcba + +/^(.)(\1|a(?2))/ + bab + +/^(.|(.)(?1)?\2)$/ + abcba + # End of testinput1 diff --git a/testdata/testinput2 b/testdata/testinput2 index 564d613..c7220e0 100644 --- a/testdata/testinput2 +++ b/testdata/testinput2 @@ -4978,32 +4978,6 @@ a)"xI AZB AZBDZ -# These four are temporarily here instead of test 1 while waiting for a JIT -# update. They require backtracking into recursions. - -/^(.|(.)(?1)\2)$/ - a - aba - abcba - ababa - abcdcba - -/^((.)(?1)\2|.?)$/ - a - aba - abba - abcba - ababa - abccba - abcdcba - abcddcba - -/^(.)(\1|a(?2))/ - bab - -/^(.|(.)(?1)?\2)$/ - abcba - # The first of these, when run by Perl, gives the mark 'aa', which is wrong. '(?>a(*:aa))b|ac' mark diff --git a/testdata/testoutput1 b/testdata/testoutput1 index aaedeb6..333ea76 100644 --- a/testdata/testoutput1 +++ b/testdata/testoutput1 @@ -9401,4 +9401,70 @@ No match Ac 0: c +/^(.|(.)(?1)\2)$/ + a + 0: a + 1: a + aba + 0: aba + 1: aba + 2: a + abcba + 0: abcba + 1: abcba + 2: a + ababa + 0: ababa + 1: ababa + 2: a + abcdcba + 0: abcdcba + 1: abcdcba + 2: a + +/^((.)(?1)\2|.?)$/ + a + 0: a + 1: a + aba + 0: aba + 1: aba + 2: a + abba + 0: abba + 1: abba + 2: a + abcba + 0: abcba + 1: abcba + 2: a + ababa + 0: ababa + 1: ababa + 2: a + abccba + 0: abccba + 1: abccba + 2: a + abcdcba + 0: abcdcba + 1: abcdcba + 2: a + abcddcba + 0: abcddcba + 1: abcddcba + 2: a + +/^(.)(\1|a(?2))/ + bab + 0: bab + 1: b + 2: ab + +/^(.|(.)(?1)?\2)$/ + abcba + 0: abcba + 1: abcba + 2: a + # End of testinput1 diff --git a/testdata/testoutput2 b/testdata/testoutput2 index 1b54993..01b0013 100644 --- a/testdata/testoutput2 +++ b/testdata/testoutput2 @@ -15482,75 +15482,6 @@ No match 1: B 2: Z -# These four are temporarily here instead of test 1 while waiting for a JIT -# update. They require backtracking into recursions. - -/^(.|(.)(?1)\2)$/ - a - 0: a - 1: a - aba - 0: aba - 1: aba - 2: a - abcba - 0: abcba - 1: abcba - 2: a - ababa - 0: ababa - 1: ababa - 2: a - abcdcba - 0: abcdcba - 1: abcdcba - 2: a - -/^((.)(?1)\2|.?)$/ - a - 0: a - 1: a - aba - 0: aba - 1: aba - 2: a - abba - 0: abba - 1: abba - 2: a - abcba - 0: abcba - 1: abcba - 2: a - ababa - 0: ababa - 1: ababa - 2: a - abccba - 0: abccba - 1: abccba - 2: a - abcdcba - 0: abcdcba - 1: abcdcba - 2: a - abcddcba - 0: abcddcba - 1: abcddcba - 2: a - -/^(.)(\1|a(?2))/ - bab - 0: bab - 1: b - 2: ab - -/^(.|(.)(?1)?\2)$/ - abcba - 0: abcba - 1: abcba - 2: a - # The first of these, when run by Perl, gives the mark 'aa', which is wrong. '(?>a(*:aa))b|ac' mark