Correct tests for link sizes 3 and 4

git-svn-id: svn://vcs.exim.org/pcre/code/trunk@162 2f5784b3-3f2a-0410-8824-cb99058d5e15

7 files changed, 626 insertions, 662 deletions

diff --git a/RunTest b/RunTest
index d886001..4a0751e 100755
--- a/RunTest
+++ b/RunTest
@@ -127,19 +127,14 @@ fi
 # PCRE tests that are not Perl-compatible - API & error tests, mostly
 
 if [ $do2 = yes ] ; then
-  if [ "$link_size" = "2" ] ; then
-    echo "Test 2: API and error handling (not Perl compatible)"
-    $valgrind ./pcretest -q $testdata/testinput2 testtry
-    if [ $? = 0 ] ; then
-      $cf $testdata/testoutput2 testtry
-      if [ $? != 0 ] ; then exit 1; fi
-    else exit 1
-    fi
-    echo "OK"
-  else
-    echo Test 2 skipped for link size other than 2 \($link_size\)
-    echo " "
+  echo "Test 2: API and error handling (not Perl compatible)"
+  $valgrind ./pcretest -q $testdata/testinput2 testtry
+  if [ $? = 0 ] ; then
+    $cf $testdata/testoutput2 testtry
+    if [ $? != 0 ] ; then exit 1; fi
+  else exit 1
   fi
+  echo "OK"
 fi
 
 # Locale-specific tests, provided that either the "fr_FR" or the "french"
@@ -202,35 +197,25 @@ if [ $do4 = yes ] ; then
 fi
 
 if [ $do5 = yes ] ; then
-  if [ "$link_size" = "2" ] ; then
-    echo "Test 5: API and internals for UTF-8 support (not Perl compatible)"
-    $valgrind ./pcretest -q $testdata/testinput5 testtry
-    if [ $? = 0 ] ; then
-      $cf $testdata/testoutput5 testtry
-      if [ $? != 0 ] ; then exit 1; fi
-    else exit 1
-    fi
-    echo "OK"
-  else
-    echo Test 5 skipped for link size other than 2 \($link_size\)
-    echo " "
+  echo "Test 5: API and internals for UTF-8 support (not Perl compatible)"
+  $valgrind ./pcretest -q $testdata/testinput5 testtry
+  if [ $? = 0 ] ; then
+    $cf $testdata/testoutput5 testtry
+    if [ $? != 0 ] ; then exit 1; fi
+  else exit 1
   fi
+  echo "OK"
 fi
 
 if [ $do6 = yes ] ; then
-  if [ "$link_size" = "2" ] ; then
-    echo "Test 6: Unicode property support"
-    $valgrind ./pcretest -q $testdata/testinput6 testtry
-    if [ $? = 0 ] ; then
-      $cf $testdata/testoutput6 testtry
-      if [ $? != 0 ] ; then exit 1; fi
-    else exit 1
-    fi
-    echo "OK"
-  else
-    echo Test 6 skipped for link size other than 2 \($link_size\)
-    echo " "
+  echo "Test 6: Unicode property support"
+  $valgrind ./pcretest -q $testdata/testinput6 testtry
+  if [ $? = 0 ] ; then
+    $cf $testdata/testoutput6 testtry
+    if [ $? != 0 ] ; then exit 1; fi
+  else exit 1
   fi
+  echo "OK"
 fi
 
 # Tests for DFA matching support
diff --git a/testdata/testinput2 b/testdata/testinput2
index 9e2b862..2806846 100644
--- a/testdata/testinput2
+++ b/testdata/testinput2
@@ -440,7 +440,7 @@
 
 /word ((?:[a-zA-Z0-9]+ )((?:[a-zA-Z0-9]+ )((?:[a-zA-Z0-9]+ )((?:[a-zA-Z0-9]+
 )((?:[a-zA-Z0-9]+ )((?:[a-zA-Z0-9]+ )((?:[a-zA-Z0-9]+ )((?:[a-zA-Z0-9]+
-)?)?)?)?)?)?)?)?)?otherword/IM
+)?)?)?)?)?)?)?)?)?otherword/I
 
 /.*X/IDZ
 
@@ -796,9 +796,9 @@
 
 /--------------------------------------------------------------------/I
 
-/#/IxMDZ
+/#/IxDZ
 
-/a#/IxMDZ
+/a#/IxDZ
 
 /[\s]/DZ
 
@@ -926,11 +926,11 @@
 
 /[[:space:]/I
 
-/[\s]/IDZM
+/[\s]/IDZ
 
-/[[:space:]]/IDZM
+/[[:space:]]/IDZ
 
-/[[:space:]abcde]/IDZM
+/[[:space:]abcde]/IDZ
 
 /< (?: (?(R) \d++  | [^<>]*+) | (?R)) * >/Ix
     <>
@@ -942,9 +942,9 @@
     *** Failers
     <abc
 
-|8J\$WE\<\.rX\+ix\[d1b\!H\#\?vV0vrK\:ZH1\=2M\>iV\;\?aPhFB\<\*vW\@QW\@sO9\}cfZA\-i\'w\%hKd6gt1UJP\,15_\#QY\$M\^Mss_U\/\]\&LK9\[5vQub\^w\[KDD\<EjmhUZ\?\.akp2dF\>qmj\;2\}YWFdYx\.Ap\]hjCPTP\(n28k\+3\;o\&WXqs\/gOXdr\$\:r\'do0\;b4c\(f_Gr\=\"\\4\)\[01T7ajQJvL\$W\~mL_sS\/4h\:x\*\[ZN\=KLs\&L5zX\/\/\>it\,o\:aU\(\;Z\>pW\&T7oP\'2K\^E\:x9\'c\[\%z\-\,64JQ5AeH_G\#KijUKghQw\^\\vea3a\?kka_G\$8\#\`\*kynsxzBLru\'\]k_\[7FrVx\}\^\=\$blx\>s\-N\%j\;D\*aZDnsw\:YKZ\%Q\.Kne9\#hP\?\+b3\(SOvL\,\^\;\&u5\@\?5C5Bhb\=m\-vEh_L15Jl\]U\)0RP6\{q\%L\^_z5E\'Dw6X\b|IDZM
+|8J\$WE\<\.rX\+ix\[d1b\!H\#\?vV0vrK\:ZH1\=2M\>iV\;\?aPhFB\<\*vW\@QW\@sO9\}cfZA\-i\'w\%hKd6gt1UJP\,15_\#QY\$M\^Mss_U\/\]\&LK9\[5vQub\^w\[KDD\<EjmhUZ\?\.akp2dF\>qmj\;2\}YWFdYx\.Ap\]hjCPTP\(n28k\+3\;o\&WXqs\/gOXdr\$\:r\'do0\;b4c\(f_Gr\=\"\\4\)\[01T7ajQJvL\$W\~mL_sS\/4h\:x\*\[ZN\=KLs\&L5zX\/\/\>it\,o\:aU\(\;Z\>pW\&T7oP\'2K\^E\:x9\'c\[\%z\-\,64JQ5AeH_G\#KijUKghQw\^\\vea3a\?kka_G\$8\#\`\*kynsxzBLru\'\]k_\[7FrVx\}\^\=\$blx\>s\-N\%j\;D\*aZDnsw\:YKZ\%Q\.Kne9\#hP\?\+b3\(SOvL\,\^\;\&u5\@\?5C5Bhb\=m\-vEh_L15Jl\]U\)0RP6\{q\%L\^_z5E\'Dw6X\b|IDZ
 
-|\$\<\.X\+ix\[d1b\!H\#\?vV0vrK\:ZH1\=2M\>iV\;\?aPhFB\<\*vW\@QW\@sO9\}cfZA\-i\'w\%hKd6gt1UJP\,15_\#QY\$M\^Mss_U\/\]\&LK9\[5vQub\^w\[KDD\<EjmhUZ\?\.akp2dF\>qmj\;2\}YWFdYx\.Ap\]hjCPTP\(n28k\+3\;o\&WXqs\/gOXdr\$\:r\'do0\;b4c\(f_Gr\=\"\\4\)\[01T7ajQJvL\$W\~mL_sS\/4h\:x\*\[ZN\=KLs\&L5zX\/\/\>it\,o\:aU\(\;Z\>pW\&T7oP\'2K\^E\:x9\'c\[\%z\-\,64JQ5AeH_G\#KijUKghQw\^\\vea3a\?kka_G\$8\#\`\*kynsxzBLru\'\]k_\[7FrVx\}\^\=\$blx\>s\-N\%j\;D\*aZDnsw\:YKZ\%Q\.Kne9\#hP\?\+b3\(SOvL\,\^\;\&u5\@\?5C5Bhb\=m\-vEh_L15Jl\]U\)0RP6\{q\%L\^_z5E\'Dw6X\b|IDZM
+|\$\<\.X\+ix\[d1b\!H\#\?vV0vrK\:ZH1\=2M\>iV\;\?aPhFB\<\*vW\@QW\@sO9\}cfZA\-i\'w\%hKd6gt1UJP\,15_\#QY\$M\^Mss_U\/\]\&LK9\[5vQub\^w\[KDD\<EjmhUZ\?\.akp2dF\>qmj\;2\}YWFdYx\.Ap\]hjCPTP\(n28k\+3\;o\&WXqs\/gOXdr\$\:r\'do0\;b4c\(f_Gr\=\"\\4\)\[01T7ajQJvL\$W\~mL_sS\/4h\:x\*\[ZN\=KLs\&L5zX\/\/\>it\,o\:aU\(\;Z\>pW\&T7oP\'2K\^E\:x9\'c\[\%z\-\,64JQ5AeH_G\#KijUKghQw\^\\vea3a\?kka_G\$8\#\`\*kynsxzBLru\'\]k_\[7FrVx\}\^\=\$blx\>s\-N\%j\;D\*aZDnsw\:YKZ\%Q\.Kne9\#hP\?\+b3\(SOvL\,\^\;\&u5\@\?5C5Bhb\=m\-vEh_L15Jl\]U\)0RP6\{q\%L\^_z5E\'Dw6X\b|IDZ
 
 /(.*)\d+\1/I
 
@@ -1700,137 +1700,137 @@ a random value. /Ix
 /Ix
   large nest
 
-/a*\d/B
+/a*\d/BZ
 
-/a*\D/B
+/a*\D/BZ
 
-/0*\d/B
+/0*\d/BZ
 
-/0*\D/B
+/0*\D/BZ
 
-/a*\s/B
+/a*\s/BZ
 
-/a*\S/B
+/a*\S/BZ
 
-/ *\s/B
+/ *\s/BZ
 
-/ *\S/B
+/ *\S/BZ
 
-/a*\w/B
+/a*\w/BZ
 
-/a*\W/B
+/a*\W/BZ
 
-/=*\w/B
+/=*\w/BZ
 
-/=*\W/B
+/=*\W/BZ
 
-/\d*a/B
+/\d*a/BZ
 
-/\d*2/B
+/\d*2/BZ
 
-/\d*\d/B
+/\d*\d/BZ
 
-/\d*\D/B
+/\d*\D/BZ
 
-/\d*\s/B
+/\d*\s/BZ
 
-/\d*\S/B
+/\d*\S/BZ
 
-/\d*\w/B
+/\d*\w/BZ
 
-/\d*\W/B
+/\d*\W/BZ
 
-/\D*a/B
+/\D*a/BZ
 
-/\D*2/B
+/\D*2/BZ
 
-/\D*\d/B
+/\D*\d/BZ
 
-/\D*\D/B
+/\D*\D/BZ
 
-/\D*\s/B
+/\D*\s/BZ
 
-/\D*\S/B
+/\D*\S/BZ
 
-/\D*\w/B
+/\D*\w/BZ
 
-/\D*\W/B
+/\D*\W/BZ
 
-/\s*a/B
+/\s*a/BZ
 
-/\s*2/B
+/\s*2/BZ
 
-/\s*\d/B
+/\s*\d/BZ
 
-/\s*\D/B
+/\s*\D/BZ
 
-/\s*\s/B
+/\s*\s/BZ
 
-/\s*\S/B
+/\s*\S/BZ
 
-/\s*\w/B
+/\s*\w/BZ
 
-/\s*\W/B
+/\s*\W/BZ
 
-/\S*a/B
+/\S*a/BZ
 
-/\S*2/B
+/\S*2/BZ
 
-/\S*\d/B
+/\S*\d/BZ
 
-/\S*\D/B
+/\S*\D/BZ
 
-/\S*\s/B
+/\S*\s/BZ
 
-/\S*\S/B
+/\S*\S/BZ
 
-/\S*\w/B
+/\S*\w/BZ
 
-/\S*\W/B
+/\S*\W/BZ
 
-/\w*a/B
+/\w*a/BZ
 
-/\w*2/B
+/\w*2/BZ
 
-/\w*\d/B
+/\w*\d/BZ
 
-/\w*\D/B
+/\w*\D/BZ
 
-/\w*\s/B
+/\w*\s/BZ
 
-/\w*\S/B
+/\w*\S/BZ
 
-/\w*\w/B
+/\w*\w/BZ
 
-/\w*\W/B
+/\w*\W/BZ
 
-/\W*a/B
+/\W*a/BZ
 
-/\W*2/B
+/\W*2/BZ
 
-/\W*\d/B
+/\W*\d/BZ
 
-/\W*\D/B
+/\W*\D/BZ
 
-/\W*\s/B
+/\W*\s/BZ
 
-/\W*\S/B
+/\W*\S/BZ
 
-/\W*\w/B
+/\W*\w/BZ
 
-/\W*\W/B
+/\W*\W/BZ
 
-/[^a]+a/B
+/[^a]+a/BZ
 
-/[^a]+a/Bi
+/[^a]+a/BZi
 
-/[^a]+A/Bi
+/[^a]+A/BZi
 
-/[^a]+b/B
+/[^a]+b/BZ
 
-/[^a]+\d/B
+/[^a]+\d/BZ
 
-/a*[^a]/B
+/a*[^a]/BZ
 
 /(?P<abc>x)(?P<xyz>y)/I
     xy\Cabc\Cxyz
@@ -1885,23 +1885,23 @@ a random value. /Ix
     Xaaa
     Xaba
 
-/^[\E\Qa\E-\Qz\E]+/B
+/^[\E\Qa\E-\Qz\E]+/BZ
 
-/^[a\Q]bc\E]/B
+/^[a\Q]bc\E]/BZ
 
-/^[a-\Q\E]/B
+/^[a-\Q\E]/BZ
 
-/^(?P>abc)[()](?<abc>)/B
+/^(?P>abc)[()](?<abc>)/BZ
 
-/^((?(abc)y)[()](?P<abc>x))+/B
+/^((?(abc)y)[()](?P<abc>x))+/BZ
     (xy)x
 
-/^(?P>abc)\Q()\E(?<abc>)/B
+/^(?P>abc)\Q()\E(?<abc>)/BZ
 
-/^(?P>abc)[a\Q(]\E(](?<abc>)/B
+/^(?P>abc)[a\Q(]\E(](?<abc>)/BZ
 
 /^(?P>abc) # this is (a comment)
-  (?<abc>)/Bx
+  (?<abc>)/BZx
 
 /^\W*(?:(?<one>(?<two>.)\W*(?&one)\W*\k<two>|)|(?<three>(?<four>.)\W*(?&three)\W*\k'four'|\W*.\W*))\W*$/Ii
     1221
diff --git a/testdata/testinput5 b/testdata/testinput5
index 65ae0b3..c99bee7 100644
--- a/testdata/testinput5
+++ b/testdata/testinput5
@@ -1,20 +1,20 @@
-/\x{100}/8DZM
+/\x{100}/8DZ
 
-/\x{1000}/8DZM
+/\x{1000}/8DZ
 
-/\x{10000}/8DZM
+/\x{10000}/8DZ
 
-/\x{100000}/8DZM
+/\x{100000}/8DZ
 
-/\x{1000000}/8DZM
+/\x{1000000}/8DZ
 
-/\x{4000000}/8DZM
+/\x{4000000}/8DZ
 
-/\x{7fffFFFF}/8DZM
+/\x{7fffFFFF}/8DZ
 
-/[\x{ff}]/8DZM
+/[\x{ff}]/8DZ
 
-/[\x{100}]/8DZM
+/[\x{100}]/8DZ
 
 /\x{ffffffff}/8
 
@@ -153,13 +153,13 @@ can't tell the difference.) --/
 
 /[^\x{c4}]/8DZ
 
-/[\x{100}]/8DZM
+/[\x{100}]/8DZ
     \x{100}
     Z\x{100}
     \x{100}Z
     *** Failers 
 
-/[Z\x{100}]/8DZM
+/[Z\x{100}]/8DZ
     Z\x{100}
     \x{100}
     \x{100}Z
@@ -296,11 +296,11 @@ can't tell the difference.) --/
  A (x) (?41) B/8x
     AxxB     
 
-/^[\x{100}\E-\Q\E\x{150}]/B8
+/^[\x{100}\E-\Q\E\x{150}]/BZ8
 
-/^[\QĀ\E-\QŐ\E]/B8
+/^[\QĀ\E-\QŐ\E]/BZ8
 
-/^[\QĀ\E-\QŐ\E/B8
+/^[\QĀ\E-\QŐ\E/BZ8
 
 /^abc./mgx8<any>
     abc1 \x0aabc2 \x0babc3xx \x0cabc4 \x0dabc5xx \x0d\x0aabc6 \x{0085}abc7 \x{2028}abc8 \x{2029}abc9 JUNK
diff --git a/testdata/testinput6 b/testdata/testinput6
index 3a658cb..1028845 100644
--- a/testdata/testinput6
+++ b/testdata/testinput6
@@ -333,10 +333,10 @@
 
 /[abc\p{L}\x{0660}]/8DZ
 
-/[\p{Nd}]/8DZM
+/[\p{Nd}]/8DZ
     1234
 
-/[\p{Nd}+-]+/8DZM
+/[\p{Nd}+-]+/8DZ
     1234
     12-34
     12+\x{661}-34  
diff --git a/testdata/testoutput2 b/testdata/testoutput2
index d88e489..8684dd7 100644
--- a/testdata/testoutput2
+++ b/testdata/testoutput2
@@ -1102,8 +1102,7 @@ No need char
 
 /word ((?:[a-zA-Z0-9]+ )((?:[a-zA-Z0-9]+ )((?:[a-zA-Z0-9]+ )((?:[a-zA-Z0-9]+
 )((?:[a-zA-Z0-9]+ )((?:[a-zA-Z0-9]+ )((?:[a-zA-Z0-9]+ )((?:[a-zA-Z0-9]+
-)?)?)?)?)?)?)?)?)?otherword/IM
-Memory allocation (code space): 444
+)?)?)?)?)?)?)?)?)?otherword/I
 Capturing subpattern count = 8
 Partial matching not supported
 No options
@@ -2693,8 +2692,7 @@ No options
 First char = '-'
 Need char = '-'
 
-/#/IxMDZ
-Memory allocation (code space): 7
+/#/IxDZ
 ------------------------------------------------------------------
         Bra 0
         Ket
@@ -2705,8 +2703,7 @@ Options: extended
 No first char
 No need char
 
-/a#/IxMDZ
-Memory allocation (code space): 9
+/a#/IxDZ
 ------------------------------------------------------------------
         Bra 0
         a
@@ -3248,8 +3245,7 @@ Failed: missing terminating ] for character class at offset 3
 /[[:space:]/I
 Failed: missing terminating ] for character class at offset 10
 
-/[\s]/IDZM
-Memory allocation (code space): 40
+/[\s]/IDZ
 ------------------------------------------------------------------
         Bra 0
         [\x09\x0a\x0c\x0d ]
@@ -3261,8 +3257,7 @@ No options
 No first char
 No need char
 
-/[[:space:]]/IDZM
-Memory allocation (code space): 40
+/[[:space:]]/IDZ
 ------------------------------------------------------------------
         Bra 0
         [\x09-\x0d ]
@@ -3274,8 +3269,7 @@ No options
 No first char
 No need char
 
-/[[:space:]abcde]/IDZM
-Memory allocation (code space): 40
+/[[:space:]abcde]/IDZ
 ------------------------------------------------------------------
         Bra 0
         [\x09-\x0d a-e]
@@ -3310,8 +3304,7 @@ No match
     <abc
 No match
 
-|8J\$WE\<\.rX\+ix\[d1b\!H\#\?vV0vrK\:ZH1\=2M\>iV\;\?aPhFB\<\*vW\@QW\@sO9\}cfZA\-i\'w\%hKd6gt1UJP\,15_\#QY\$M\^Mss_U\/\]\&LK9\[5vQub\^w\[KDD\<EjmhUZ\?\.akp2dF\>qmj\;2\}YWFdYx\.Ap\]hjCPTP\(n28k\+3\;o\&WXqs\/gOXdr\$\:r\'do0\;b4c\(f_Gr\=\"\\4\)\[01T7ajQJvL\$W\~mL_sS\/4h\:x\*\[ZN\=KLs\&L5zX\/\/\>it\,o\:aU\(\;Z\>pW\&T7oP\'2K\^E\:x9\'c\[\%z\-\,64JQ5AeH_G\#KijUKghQw\^\\vea3a\?kka_G\$8\#\`\*kynsxzBLru\'\]k_\[7FrVx\}\^\=\$blx\>s\-N\%j\;D\*aZDnsw\:YKZ\%Q\.Kne9\#hP\?\+b3\(SOvL\,\^\;\&u5\@\?5C5Bhb\=m\-vEh_L15Jl\]U\)0RP6\{q\%L\^_z5E\'Dw6X\b|IDZM
-Memory allocation (code space): 826
+|8J\$WE\<\.rX\+ix\[d1b\!H\#\?vV0vrK\:ZH1\=2M\>iV\;\?aPhFB\<\*vW\@QW\@sO9\}cfZA\-i\'w\%hKd6gt1UJP\,15_\#QY\$M\^Mss_U\/\]\&LK9\[5vQub\^w\[KDD\<EjmhUZ\?\.akp2dF\>qmj\;2\}YWFdYx\.Ap\]hjCPTP\(n28k\+3\;o\&WXqs\/gOXdr\$\:r\'do0\;b4c\(f_Gr\=\"\\4\)\[01T7ajQJvL\$W\~mL_sS\/4h\:x\*\[ZN\=KLs\&L5zX\/\/\>it\,o\:aU\(\;Z\>pW\&T7oP\'2K\^E\:x9\'c\[\%z\-\,64JQ5AeH_G\#KijUKghQw\^\\vea3a\?kka_G\$8\#\`\*kynsxzBLru\'\]k_\[7FrVx\}\^\=\$blx\>s\-N\%j\;D\*aZDnsw\:YKZ\%Q\.Kne9\#hP\?\+b3\(SOvL\,\^\;\&u5\@\?5C5Bhb\=m\-vEh_L15Jl\]U\)0RP6\{q\%L\^_z5E\'Dw6X\b|IDZ
 ------------------------------------------------------------------
         Bra 0
         8J$WE<.rX+ix[d1b!H#?vV0vrK:ZH1=2M>iV;?aPhFB<*vW@QW@sO9}cfZA-i'w%hKd6gt1UJP,15_#QY$M^Mss_U/]&LK9[5vQub^w[KDD<EjmhUZ?.akp2dF>qmj;2}YWFdYx.Ap]hjCPTP(n28k+3;o&WXqs/gOXdr$:r'do0;b4c(f_Gr="\4)[01T7ajQJvL$W~mL_sS/4h:x*[ZN=KLs&L5zX//>it,o:aU(;Z>pW&T7oP'2K^E:x9'c[%z-,64JQ5AeH_G#KijUKghQw^\vea3a?kka_G$8#`*kynsxzBLru']k_[7FrVx}^=$blx>s-N%j;D*aZDnsw:YKZ%Q.Kne9#hP?+b3(SOvL,^;&u5@?5C5Bhb=m-vEh_L15Jl]U)0RP6{q%L^_z5E'Dw6X
@@ -3324,8 +3317,7 @@ No options
 First char = '8'
 Need char = 'X'
 
-|\$\<\.X\+ix\[d1b\!H\#\?vV0vrK\:ZH1\=2M\>iV\;\?aPhFB\<\*vW\@QW\@sO9\}cfZA\-i\'w\%hKd6gt1UJP\,15_\#QY\$M\^Mss_U\/\]\&LK9\[5vQub\^w\[KDD\<EjmhUZ\?\.akp2dF\>qmj\;2\}YWFdYx\.Ap\]hjCPTP\(n28k\+3\;o\&WXqs\/gOXdr\$\:r\'do0\;b4c\(f_Gr\=\"\\4\)\[01T7ajQJvL\$W\~mL_sS\/4h\:x\*\[ZN\=KLs\&L5zX\/\/\>it\,o\:aU\(\;Z\>pW\&T7oP\'2K\^E\:x9\'c\[\%z\-\,64JQ5AeH_G\#KijUKghQw\^\\vea3a\?kka_G\$8\#\`\*kynsxzBLru\'\]k_\[7FrVx\}\^\=\$blx\>s\-N\%j\;D\*aZDnsw\:YKZ\%Q\.Kne9\#hP\?\+b3\(SOvL\,\^\;\&u5\@\?5C5Bhb\=m\-vEh_L15Jl\]U\)0RP6\{q\%L\^_z5E\'Dw6X\b|IDZM
-Memory allocation (code space): 816
+|\$\<\.X\+ix\[d1b\!H\#\?vV0vrK\:ZH1\=2M\>iV\;\?aPhFB\<\*vW\@QW\@sO9\}cfZA\-i\'w\%hKd6gt1UJP\,15_\#QY\$M\^Mss_U\/\]\&LK9\[5vQub\^w\[KDD\<EjmhUZ\?\.akp2dF\>qmj\;2\}YWFdYx\.Ap\]hjCPTP\(n28k\+3\;o\&WXqs\/gOXdr\$\:r\'do0\;b4c\(f_Gr\=\"\\4\)\[01T7ajQJvL\$W\~mL_sS\/4h\:x\*\[ZN\=KLs\&L5zX\/\/\>it\,o\:aU\(\;Z\>pW\&T7oP\'2K\^E\:x9\'c\[\%z\-\,64JQ5AeH_G\#KijUKghQw\^\\vea3a\?kka_G\$8\#\`\*kynsxzBLru\'\]k_\[7FrVx\}\^\=\$blx\>s\-N\%j\;D\*aZDnsw\:YKZ\%Q\.Kne9\#hP\?\+b3\(SOvL\,\^\;\&u5\@\?5C5Bhb\=m\-vEh_L15Jl\]U\)0RP6\{q\%L\^_z5E\'Dw6X\b|IDZ
 ------------------------------------------------------------------
         Bra 0
         $<.X+ix[d1b!H#?vV0vrK:ZH1=2M>iV;?aPhFB<*vW@QW@sO9}cfZA-i'w%hKd6gt1UJP,15_#QY$M^Mss_U/]&LK9[5vQub^w[KDD<EjmhUZ?.akp2dF>qmj;2}YWFdYx.Ap]hjCPTP(n28k+3;o&WXqs/gOXdr$:r'do0;b4c(f_Gr="\4)[01T7ajQJvL$W~mL_sS/4h:x*[ZN=KLs&L5zX//>it,o:aU(;Z>pW&T7oP'2K^E:x9'c[%z-,64JQ5AeH_G#KijUKghQw^\vea3a?kka_G$8#`*kynsxzBLru']k_[7FrVx}^=$blx>s-N%j;D*aZDnsw:YKZ%Q.Kne9#hP?+b3(SOvL,^;&u5@?5C5Bhb=m-vEh_L15Jl]U)0RP6{q%L^_z5E'Dw6X
@@ -6821,598 +6813,598 @@ Matched, but too many substrings
 13: a
 14: a
 
-/a*\d/B
+/a*\d/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     a*+
-  5     \d
-  6   6 Ket
-  9     End
+        Bra 0
+        a*+
+        \d
+        Ket
+        End
 ------------------------------------------------------------------
 
-/a*\D/B
+/a*\D/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     a*
-  5     \D
-  6   6 Ket
-  9     End
+        Bra 0
+        a*
+        \D
+        Ket
+        End
 ------------------------------------------------------------------
 
-/0*\d/B
+/0*\d/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     0*
-  5     \d
-  6   6 Ket
-  9     End
+        Bra 0
+        0*
+        \d
+        Ket
+        End
 ------------------------------------------------------------------
 
-/0*\D/B
+/0*\D/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     0*+
-  5     \D
-  6   6 Ket
-  9     End
+        Bra 0
+        0*+
+        \D
+        Ket
+        End
 ------------------------------------------------------------------
 
-/a*\s/B
+/a*\s/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     a*+
-  5     \s
-  6   6 Ket
-  9     End
+        Bra 0
+        a*+
+        \s
+        Ket
+        End
 ------------------------------------------------------------------
 
-/a*\S/B
+/a*\S/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     a*
-  5     \S
-  6   6 Ket
-  9     End
+        Bra 0
+        a*
+        \S
+        Ket
+        End
 ------------------------------------------------------------------
 
-/ *\s/B
+/ *\s/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3      *
-  5     \s
-  6   6 Ket
-  9     End
+        Bra 0
+         *
+        \s
+        Ket
+        End
 ------------------------------------------------------------------
 
-/ *\S/B
+/ *\S/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3      *+
-  5     \S
-  6   6 Ket
-  9     End
+        Bra 0
+         *+
+        \S
+        Ket
+        End
 ------------------------------------------------------------------
 
-/a*\w/B
+/a*\w/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     a*
-  5     \w
-  6   6 Ket
-  9     End
+        Bra 0
+        a*
+        \w
+        Ket
+        End
 ------------------------------------------------------------------
 
-/a*\W/B
+/a*\W/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     a*+
-  5     \W
-  6   6 Ket
-  9     End
+        Bra 0
+        a*+
+        \W
+        Ket
+        End
 ------------------------------------------------------------------
 
-/=*\w/B
+/=*\w/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     =*+
-  5     \w
-  6   6 Ket
-  9     End
+        Bra 0
+        =*+
+        \w
+        Ket
+        End
 ------------------------------------------------------------------
 
-/=*\W/B
+/=*\W/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     =*
-  5     \W
-  6   6 Ket
-  9     End
+        Bra 0
+        =*
+        \W
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\d*a/B
+/\d*a/BZ
 ------------------------------------------------------------------
-  0   7 Bra 0
-  3     \d*+
-  5     a
-  7   7 Ket
- 10     End
+        Bra 0
+        \d*+
+        a
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\d*2/B
+/\d*2/BZ
 ------------------------------------------------------------------
-  0   7 Bra 0
-  3     \d*
-  5     2
-  7   7 Ket
- 10     End
+        Bra 0
+        \d*
+        2
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\d*\d/B
+/\d*\d/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \d*
-  5     \d
-  6   6 Ket
-  9     End
+        Bra 0
+        \d*
+        \d
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\d*\D/B
+/\d*\D/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \d*+
-  5     \D
-  6   6 Ket
-  9     End
+        Bra 0
+        \d*+
+        \D
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\d*\s/B
+/\d*\s/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \d*+
-  5     \s
-  6   6 Ket
-  9     End
+        Bra 0
+        \d*+
+        \s
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\d*\S/B
+/\d*\S/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \d*
-  5     \S
-  6   6 Ket
-  9     End
+        Bra 0
+        \d*
+        \S
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\d*\w/B
+/\d*\w/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \d*
-  5     \w
-  6   6 Ket
-  9     End
+        Bra 0
+        \d*
+        \w
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\d*\W/B
+/\d*\W/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \d*+
-  5     \W
-  6   6 Ket
-  9     End
+        Bra 0
+        \d*+
+        \W
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\D*a/B
+/\D*a/BZ
 ------------------------------------------------------------------
-  0   7 Bra 0
-  3     \D*
-  5     a
-  7   7 Ket
- 10     End
+        Bra 0
+        \D*
+        a
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\D*2/B
+/\D*2/BZ
 ------------------------------------------------------------------
-  0   7 Bra 0
-  3     \D*+
-  5     2
-  7   7 Ket
- 10     End
+        Bra 0
+        \D*+
+        2
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\D*\d/B
+/\D*\d/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \D*+
-  5     \d
-  6   6 Ket
-  9     End
+        Bra 0
+        \D*+
+        \d
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\D*\D/B
+/\D*\D/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \D*
-  5     \D
-  6   6 Ket
-  9     End
+        Bra 0
+        \D*
+        \D
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\D*\s/B
+/\D*\s/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \D*
-  5     \s
-  6   6 Ket
-  9     End
+        Bra 0
+        \D*
+        \s
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\D*\S/B
+/\D*\S/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \D*
-  5     \S
-  6   6 Ket
-  9     End
+        Bra 0
+        \D*
+        \S
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\D*\w/B
+/\D*\w/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \D*
-  5     \w
-  6   6 Ket
-  9     End
+        Bra 0
+        \D*
+        \w
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\D*\W/B
+/\D*\W/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \D*
-  5     \W
-  6   6 Ket
-  9     End
+        Bra 0
+        \D*
+        \W
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\s*a/B
+/\s*a/BZ
 ------------------------------------------------------------------
-  0   7 Bra 0
-  3     \s*+
-  5     a
-  7   7 Ket
- 10     End
+        Bra 0
+        \s*+
+        a
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\s*2/B
+/\s*2/BZ
 ------------------------------------------------------------------
-  0   7 Bra 0
-  3     \s*+
-  5     2
-  7   7 Ket
- 10     End
+        Bra 0
+        \s*+
+        2
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\s*\d/B
+/\s*\d/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \s*+
-  5     \d
-  6   6 Ket
-  9     End
+        Bra 0
+        \s*+
+        \d
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\s*\D/B
+/\s*\D/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \s*
-  5     \D
-  6   6 Ket
-  9     End
+        Bra 0
+        \s*
+        \D
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\s*\s/B
+/\s*\s/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \s*
-  5     \s
-  6   6 Ket
-  9     End
+        Bra 0
+        \s*
+        \s
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\s*\S/B
+/\s*\S/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \s*+
-  5     \S
-  6   6 Ket
-  9     End
+        Bra 0
+        \s*+
+        \S
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\s*\w/B
+/\s*\w/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \s*+
-  5     \w
-  6   6 Ket
-  9     End
+        Bra 0
+        \s*+
+        \w
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\s*\W/B
+/\s*\W/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \s*
-  5     \W
-  6   6 Ket
-  9     End
+        Bra 0
+        \s*
+        \W
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\S*a/B
+/\S*a/BZ
 ------------------------------------------------------------------
-  0   7 Bra 0
-  3     \S*
-  5     a
-  7   7 Ket
- 10     End
+        Bra 0
+        \S*
+        a
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\S*2/B
+/\S*2/BZ
 ------------------------------------------------------------------
-  0   7 Bra 0
-  3     \S*
-  5     2
-  7   7 Ket
- 10     End
+        Bra 0
+        \S*
+        2
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\S*\d/B
+/\S*\d/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \S*
-  5     \d
-  6   6 Ket
-  9     End
+        Bra 0
+        \S*
+        \d
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\S*\D/B
+/\S*\D/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \S*
-  5     \D
-  6   6 Ket
-  9     End
+        Bra 0
+        \S*
+        \D
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\S*\s/B
+/\S*\s/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \S*+
-  5     \s
-  6   6 Ket
-  9     End
+        Bra 0
+        \S*+
+        \s
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\S*\S/B
+/\S*\S/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \S*
-  5     \S
-  6   6 Ket
-  9     End
+        Bra 0
+        \S*
+        \S
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\S*\w/B
+/\S*\w/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \S*
-  5     \w
-  6   6 Ket
-  9     End
+        Bra 0
+        \S*
+        \w
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\S*\W/B
+/\S*\W/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \S*
-  5     \W
-  6   6 Ket
-  9     End
+        Bra 0
+        \S*
+        \W
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\w*a/B
+/\w*a/BZ
 ------------------------------------------------------------------
-  0   7 Bra 0
-  3     \w*
-  5     a
-  7   7 Ket
- 10     End
+        Bra 0
+        \w*
+        a
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\w*2/B
+/\w*2/BZ
 ------------------------------------------------------------------
-  0   7 Bra 0
-  3     \w*
-  5     2
-  7   7 Ket
- 10     End
+        Bra 0
+        \w*
+        2
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\w*\d/B
+/\w*\d/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \w*
-  5     \d
-  6   6 Ket
-  9     End
+        Bra 0
+        \w*
+        \d
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\w*\D/B
+/\w*\D/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \w*
-  5     \D
-  6   6 Ket
-  9     End
+        Bra 0
+        \w*
+        \D
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\w*\s/B
+/\w*\s/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \w*+
-  5     \s
-  6   6 Ket
-  9     End
+        Bra 0
+        \w*+
+        \s
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\w*\S/B
+/\w*\S/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \w*
-  5     \S
-  6   6 Ket
-  9     End
+        Bra 0
+        \w*
+        \S
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\w*\w/B
+/\w*\w/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \w*
-  5     \w
-  6   6 Ket
-  9     End
+        Bra 0
+        \w*
+        \w
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\w*\W/B
+/\w*\W/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \w*+
-  5     \W
-  6   6 Ket
-  9     End
+        Bra 0
+        \w*+
+        \W
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\W*a/B
+/\W*a/BZ
 ------------------------------------------------------------------
-  0   7 Bra 0
-  3     \W*+
-  5     a
-  7   7 Ket
- 10     End
+        Bra 0
+        \W*+
+        a
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\W*2/B
+/\W*2/BZ
 ------------------------------------------------------------------
-  0   7 Bra 0
-  3     \W*+
-  5     2
-  7   7 Ket
- 10     End
+        Bra 0
+        \W*+
+        2
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\W*\d/B
+/\W*\d/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \W*+
-  5     \d
-  6   6 Ket
-  9     End
+        Bra 0
+        \W*+
+        \d
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\W*\D/B
+/\W*\D/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \W*
-  5     \D
-  6   6 Ket
-  9     End
+        Bra 0
+        \W*
+        \D
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\W*\s/B
+/\W*\s/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \W*
-  5     \s
-  6   6 Ket
-  9     End
+        Bra 0
+        \W*
+        \s
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\W*\S/B
+/\W*\S/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \W*
-  5     \S
-  6   6 Ket
-  9     End
+        Bra 0
+        \W*
+        \S
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\W*\w/B
+/\W*\w/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \W*+
-  5     \w
-  6   6 Ket
-  9     End
+        Bra 0
+        \W*+
+        \w
+        Ket
+        End
 ------------------------------------------------------------------
 
-/\W*\W/B
+/\W*\W/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \W*
-  5     \W
-  6   6 Ket
-  9     End
+        Bra 0
+        \W*
+        \W
+        Ket
+        End
 ------------------------------------------------------------------
 
-/[^a]+a/B
+/[^a]+a/BZ
 ------------------------------------------------------------------
-  0   7 Bra 0
-  3     [^a]++
-  5     a
-  7   7 Ket
- 10     End
+        Bra 0
+        [^a]++
+        a
+        Ket
+        End
 ------------------------------------------------------------------
 
-/[^a]+a/Bi
+/[^a]+a/BZi
 ------------------------------------------------------------------
-  0   7 Bra 0
-  3     [^A]++
-  5  NC a
-  7   7 Ket
- 10     End
+        Bra 0
+        [^A]++
+     NC a
+        Ket
+        End
 ------------------------------------------------------------------
 
-/[^a]+A/Bi
+/[^a]+A/BZi
 ------------------------------------------------------------------
-  0   7 Bra 0
-  3     [^A]++
-  5  NC A
-  7   7 Ket
- 10     End
+        Bra 0
+        [^A]++
+     NC A
+        Ket
+        End
 ------------------------------------------------------------------
 
-/[^a]+b/B
+/[^a]+b/BZ
 ------------------------------------------------------------------
-  0   7 Bra 0
-  3     [^a]+
-  5     b
-  7   7 Ket
- 10     End
+        Bra 0
+        [^a]+
+        b
+        Ket
+        End
 ------------------------------------------------------------------
 
-/[^a]+\d/B
+/[^a]+\d/BZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     [^a]+
-  5     \d
-  6   6 Ket
-  9     End
+        Bra 0
+        [^a]+
+        \d
+        Ket
+        End
 ------------------------------------------------------------------
 
-/a*[^a]/B
+/a*[^a]/BZ
 ------------------------------------------------------------------
-  0   7 Bra 0
-  3     a*
-  5     [^a]
-  7   7 Ket
- 10     End
+        Bra 0
+        a*
+        [^a]
+        Ket
+        End
 ------------------------------------------------------------------
 
 /(?P<abc>x)(?P<xyz>y)/I
@@ -7547,109 +7539,109 @@ No match
  0: Xa
  1: a
 
-/^[\E\Qa\E-\Qz\E]+/B
+/^[\E\Qa\E-\Qz\E]+/BZ
 ------------------------------------------------------------------
-  0  38 Bra 0
-  3     ^
-  4     [a-z]+
- 38  38 Ket
- 41     End
+        Bra 0
+        ^
+        [a-z]+
+        Ket
+        End
 ------------------------------------------------------------------
 
-/^[a\Q]bc\E]/B
+/^[a\Q]bc\E]/BZ
 ------------------------------------------------------------------
-  0  37 Bra 0
-  3     ^
-  4     [\]a-c]
- 37  37 Ket
- 40     End
+        Bra 0
+        ^
+        [\]a-c]
+        Ket
+        End
 ------------------------------------------------------------------
 
-/^[a-\Q\E]/B
+/^[a-\Q\E]/BZ
 ------------------------------------------------------------------
-  0  37 Bra 0
-  3     ^
-  4     [\-a]
- 37  37 Ket
- 40     End
+        Bra 0
+        ^
+        [\-a]
+        Ket
+        End
 ------------------------------------------------------------------
 
-/^(?P>abc)[()](?<abc>)/B
+/^(?P>abc)[()](?<abc>)/BZ
 ------------------------------------------------------------------
-  0  54 Bra 0
-  3     ^
-  4   6 Once
-  7  46 Recurse
- 10   6 Ket
- 13     [()]
- 46   5 Bra 1
- 51   5 Ket
- 54  54 Ket
- 57     End
+        Bra 0
+        ^
+        Once
+        Recurse
+        Ket
+        [()]
+        Bra 1
+        Ket
+        Ket
+        End
 ------------------------------------------------------------------
 
-/^((?(abc)y)[()](?P<abc>x))+/B
+/^((?(abc)y)[()](?P<abc>x))+/BZ
 ------------------------------------------------------------------
-  0  66 Bra 0
-  3     ^
-  4  59 Bra 1
-  9   8 Cond
- 12   2 Cond ref
- 15     y
- 17   8 Ket
- 20     [()]
- 53   7 Bra 2
- 58     x
- 60   7 Ket
- 63  59 KetRmax
- 66  66 Ket
- 69     End
+        Bra 0
+        ^
+        Bra 1
+        Cond
+      2 Cond ref
+        y
+        Ket
+        [()]
+        Bra 2
+        x
+        Ket
+        KetRmax
+        Ket
+        End
 ------------------------------------------------------------------
     (xy)x
  0: (xy)x
  1: y)x
  2: x
 
-/^(?P>abc)\Q()\E(?<abc>)/B
+/^(?P>abc)\Q()\E(?<abc>)/BZ
 ------------------------------------------------------------------
-  0  25 Bra 0
-  3     ^
-  4   6 Once
-  7  17 Recurse
- 10   6 Ket
- 13     ()
- 17   5 Bra 1
- 22   5 Ket
- 25  25 Ket
- 28     End
+        Bra 0
+        ^
+        Once
+        Recurse
+        Ket
+        ()
+        Bra 1
+        Ket
+        Ket
+        End
 ------------------------------------------------------------------
 
-/^(?P>abc)[a\Q(]\E(](?<abc>)/B
+/^(?P>abc)[a\Q(]\E(](?<abc>)/BZ
 ------------------------------------------------------------------
-  0  54 Bra 0
-  3     ^
-  4   6 Once
-  7  46 Recurse
- 10   6 Ket
- 13     [(\]a]
- 46   5 Bra 1
- 51   5 Ket
- 54  54 Ket
- 57     End
+        Bra 0
+        ^
+        Once
+        Recurse
+        Ket
+        [(\]a]
+        Bra 1
+        Ket
+        Ket
+        End
 ------------------------------------------------------------------
 
 /^(?P>abc) # this is (a comment)
-  (?<abc>)/Bx
-------------------------------------------------------------------
-  0  21 Bra 0
-  3     ^
-  4   6 Once
-  7  13 Recurse
- 10   6 Ket
- 13   5 Bra 1
- 18   5 Ket
- 21  21 Ket
- 24     End
+  (?<abc>)/BZx
+------------------------------------------------------------------
+        Bra 0
+        ^
+        Once
+        Recurse
+        Ket
+        Bra 1
+        Ket
+        Ket
+        End
 ------------------------------------------------------------------
 
 /^\W*(?:(?<one>(?<two>.)\W*(?&one)\W*\k<two>|)|(?<three>(?<four>.)\W*(?&three)\W*\k'four'|\W*.\W*))\W*$/Ii
diff --git a/testdata/testoutput5 b/testdata/testoutput5
index 16da5ec..cf80cd9 100644
--- a/testdata/testoutput5
+++ b/testdata/testoutput5
@@ -1,5 +1,4 @@
-/\x{100}/8DZM
-Memory allocation (code space): 10
+/\x{100}/8DZ
 ------------------------------------------------------------------
         Bra 0
         \x{100}
@@ -11,8 +10,7 @@ Options: utf8
 First char = 196
 Need char = 128
 
-/\x{1000}/8DZM
-Memory allocation (code space): 11
+/\x{1000}/8DZ
 ------------------------------------------------------------------
         Bra 0
         \x{1000}
@@ -24,8 +22,7 @@ Options: utf8
 First char = 225
 Need char = 128
 
-/\x{10000}/8DZM
-Memory allocation (code space): 12
+/\x{10000}/8DZ
 ------------------------------------------------------------------
         Bra 0
         \x{10000}
@@ -37,8 +34,7 @@ Options: utf8
 First char = 240
 Need char = 128
 
-/\x{100000}/8DZM
-Memory allocation (code space): 12
+/\x{100000}/8DZ
 ------------------------------------------------------------------
         Bra 0
         \x{100000}
@@ -50,8 +46,7 @@ Options: utf8
 First char = 244
 Need char = 128
 
-/\x{1000000}/8DZM
-Memory allocation (code space): 13
+/\x{1000000}/8DZ
 ------------------------------------------------------------------
         Bra 0
         \x{1000000}
@@ -63,8 +58,7 @@ Options: utf8
 First char = 249
 Need char = 128
 
-/\x{4000000}/8DZM
-Memory allocation (code space): 14
+/\x{4000000}/8DZ
 ------------------------------------------------------------------
         Bra 0
         \x{4000000}
@@ -76,8 +70,7 @@ Options: utf8
 First char = 252
 Need char = 128
 
-/\x{7fffFFFF}/8DZM
-Memory allocation (code space): 14
+/\x{7fffFFFF}/8DZ
 ------------------------------------------------------------------
         Bra 0
         \x{7fffffff}
@@ -89,8 +82,7 @@ Options: utf8
 First char = 253
 Need char = 191
 
-/[\x{ff}]/8DZM
-Memory allocation (code space): 10
+/[\x{ff}]/8DZ
 ------------------------------------------------------------------
         Bra 0
         \x{ff}
@@ -102,8 +94,7 @@ Options: utf8
 First char = 195
 Need char = 191
 
-/[\x{100}]/8DZM
-Memory allocation (code space): 15
+/[\x{100}]/8DZ
 ------------------------------------------------------------------
         Bra 0
         [\x{100}]
@@ -678,8 +669,7 @@ Options: utf8
 No first char
 No need char
 
-/[\x{100}]/8DZM
-Memory allocation (code space): 15
+/[\x{100}]/8DZ
 ------------------------------------------------------------------
         Bra 0
         [\x{100}]
@@ -699,8 +689,7 @@ No need char
     *** Failers 
 No match
 
-/[Z\x{100}]/8DZM
-Memory allocation (code space): 47
+/[Z\x{100}]/8DZ
 ------------------------------------------------------------------
         Bra 0
         [Z\x{100}]
@@ -1265,25 +1254,25 @@ Matched, but too many substrings
 13: 
 14: 
 
-/^[\x{100}\E-\Q\E\x{150}]/B8
+/^[\x{100}\E-\Q\E\x{150}]/BZ8
 ------------------------------------------------------------------
-  0  14 Bra 0
-  3     ^
-  4     [\x{100}-\x{150}]
- 14  14 Ket
- 17     End
+        Bra 0
+        ^
+        [\x{100}-\x{150}]
+        Ket
+        End
 ------------------------------------------------------------------
 
-/^[\QĀ\E-\QŐ\E]/B8
+/^[\QĀ\E-\QŐ\E]/BZ8
 ------------------------------------------------------------------
-  0  14 Bra 0
-  3     ^
-  4     [\x{100}-\x{150}]
- 14  14 Ket
- 17     End
+        Bra 0
+        ^
+        [\x{100}-\x{150}]
+        Ket
+        End
 ------------------------------------------------------------------
 
-/^[\QĀ\E-\QŐ\E/B8
+/^[\QĀ\E-\QŐ\E/BZ8
 Failed: missing terminating ] for character class at offset 15
 
 /^abc./mgx8<any>
diff --git a/testdata/testoutput6 b/testdata/testoutput6
index d09f038..f6a1d0e 100644
--- a/testdata/testoutput6
+++ b/testdata/testoutput6
@@ -608,8 +608,7 @@ Options: utf8
 No first char
 No need char
 
-/[\p{Nd}]/8DZM
-Memory allocation (code space): 15
+/[\p{Nd}]/8DZ
 ------------------------------------------------------------------
         Bra 0
         [\p{Nd}]
@@ -623,8 +622,7 @@ No need char
     1234
  0: 1
 
-/[\p{Nd}+-]+/8DZM
-Memory allocation (code space): 48
+/[\p{Nd}+-]+/8DZ
 ------------------------------------------------------------------
         Bra 0
         [+\-\p{Nd}]+