Guard the call of check_char_prop since it does not exists when UCP is disabled.

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

1 files changed, 17 insertions, 92 deletions

diff --git a/testdata/testoutput2 b/testdata/testoutput2
index adf76c7..3ec62d0 100644
--- a/testdata/testoutput2
+++ b/testdata/testoutput2
@@ -12784,7 +12784,7 @@ No set of starting bytes
 
 /-- A complete set of tests for auto-possessification of character types --/
 
-/\D+\D \D+\d \D+\S \D+\s \D+\W \D+\w \D+. \D+\C \D+\R \D+\H \D+\h \D+\V \D+\v \D+\X \D+\Z \D+\z \D+$/BZx
+/\D+\D \D+\d \D+\S \D+\s \D+\W \D+\w \D+. \D+\C \D+\R \D+\H \D+\h \D+\V \D+\v \D+\Z \D+\z \D+$/BZx
 ------------------------------------------------------------------
         Bra
         \D+
@@ -12814,8 +12814,6 @@ No set of starting bytes
         \D+
         \v
         \D+
-        extuni
-        \D+
         \Z
         \D++
         \z
@@ -12825,7 +12823,7 @@ No set of starting bytes
         End
 ------------------------------------------------------------------
 
-/\d+\D \d+\d \d+\S \d+\s \d+\W \d+\w \d+. \d+\C \d+\R \d+\H \d+\h \d+\V \d+\v \d+\X \d+\Z \d+\z \d+$/BZx
+/\d+\D \d+\d \d+\S \d+\s \d+\W \d+\w \d+. \d+\C \d+\R \d+\H \d+\h \d+\V \d+\v \d+\Z \d+\z \d+$/BZx
 ------------------------------------------------------------------
         Bra
         \d++
@@ -12854,8 +12852,6 @@ No set of starting bytes
         \V
         \d++
         \v
-        \d+
-        extuni
         \d++
         \Z
         \d++
@@ -12866,7 +12862,7 @@ No set of starting bytes
         End
 ------------------------------------------------------------------
 
-/\S+\D \S+\d \S+\S \S+\s \S+\W \S+\w \S+. \S+\C \S+\R \S+\H \S+\h \S+\V \S+\v \S+\X \S+\Z \S+\z \S+$/BZx
+/\S+\D \S+\d \S+\S \S+\s \S+\W \S+\w \S+. \S+\C \S+\R \S+\H \S+\h \S+\V \S+\v \S+\Z \S+\z \S+$/BZx
 ------------------------------------------------------------------
         Bra
         \S+
@@ -12895,8 +12891,6 @@ No set of starting bytes
         \V
         \S++
         \v
-        \S+
-        extuni
         \S++
         \Z
         \S++
@@ -12907,7 +12901,7 @@ No set of starting bytes
         End
 ------------------------------------------------------------------
 
-/\s+\D \s+\d \s+\S \s+\s \s+\W \s+\w \s+. \s+\C \s+\R \s+\H \s+\h \s+\V \s+\v \s+\X \s+\Z \s+\z \s+$/BZx
+/\s+\D \s+\d \s+\S \s+\s \s+\W \s+\w \s+. \s+\C \s+\R \s+\H \s+\h \s+\V \s+\v \s+\Z \s+\z \s+$/BZx
 ------------------------------------------------------------------
         Bra
         \s+
@@ -12937,8 +12931,6 @@ No set of starting bytes
         \s+
         \v
         \s+
-        extuni
-        \s+
         \Z
         \s++
         \z
@@ -12948,7 +12940,7 @@ No set of starting bytes
         End
 ------------------------------------------------------------------
 
-/\W+\D \W+\d \W+\S \W+\s \W+\W \W+\w \W+. \W+\C \W+\R \W+\H \W+\h \W+\V \W+\v \W+\X \W+\Z \W+\z \W+$/BZx
+/\W+\D \W+\d \W+\S \W+\s \W+\W \W+\w \W+. \W+\C \W+\R \W+\H \W+\h \W+\V \W+\v \W+\Z \W+\z \W+$/BZx
 ------------------------------------------------------------------
         Bra
         \W+
@@ -12978,8 +12970,6 @@ No set of starting bytes
         \W+
         \v
         \W+
-        extuni
-        \W+
         \Z
         \W++
         \z
@@ -12989,7 +12979,7 @@ No set of starting bytes
         End
 ------------------------------------------------------------------
 
-/\w+\D \w+\d \w+\S \w+\s \w+\W \w+\w \w+. \w+\C \w+\R \w+\H \w+\h \w+\V \w+\v \w+\X \w+\Z \w+\z \w+$/BZx
+/\w+\D \w+\d \w+\S \w+\s \w+\W \w+\w \w+. \w+\C \w+\R \w+\H \w+\h \w+\V \w+\v \w+\Z \w+\z \w+$/BZx
 ------------------------------------------------------------------
         Bra
         \w+
@@ -13018,8 +13008,6 @@ No set of starting bytes
         \V
         \w++
         \v
-        \w+
-        extuni
         \w++
         \Z
         \w++
@@ -13030,7 +13018,7 @@ No set of starting bytes
         End
 ------------------------------------------------------------------
 
-/\C+\D \C+\d \C+\S \C+\s \C+\W \C+\w \C+. \C+\C \C+\R \C+\H \C+\h \C+\V \C+\v \C+\X \C+\Z \C+\z \C+$/BZx
+/\C+\D \C+\d \C+\S \C+\s \C+\W \C+\w \C+. \C+\C \C+\R \C+\H \C+\h \C+\V \C+\v \C+\Z \C+\z \C+$/BZx
 ------------------------------------------------------------------
         Bra
         AllAny+
@@ -13060,8 +13048,6 @@ No set of starting bytes
         AllAny+
         \v
         AllAny+
-        extuni
-        AllAny+
         \Z
         AllAny++
         \z
@@ -13071,7 +13057,7 @@ No set of starting bytes
         End
 ------------------------------------------------------------------
 
-/\R+\D \R+\d \R+\S \R+\s \R+\W \R+\w \R+. \R+\C \R+\R \R+\H \R+\h \R+\V \R+\v \R+\X \R+\Z \R+\z \R+$/BZx
+/\R+\D \R+\d \R+\S \R+\s \R+\W \R+\w \R+. \R+\C \R+\R \R+\H \R+\h \R+\V \R+\v \R+\Z \R+\z \R+$/BZx
 ------------------------------------------------------------------
         Bra
         \R+
@@ -13101,8 +13087,6 @@ No set of starting bytes
         \R+
         \v
         \R+
-        extuni
-        \R+
         \Z
         \R++
         \z
@@ -13112,7 +13096,7 @@ No set of starting bytes
         End
 ------------------------------------------------------------------
 
-/\H+\D \H+\d \H+\S \H+\s \H+\W \H+\w \H+. \H+\C \H+\R \H+\H \H+\h \H+\V \H+\v \H+\X \H+\Z \H+\z \H+$/BZx
+/\H+\D \H+\d \H+\S \H+\s \H+\W \H+\w \H+. \H+\C \H+\R \H+\H \H+\h \H+\V \H+\v \H+\Z \H+\z \H+$/BZx
 ------------------------------------------------------------------
         Bra
         \H+
@@ -13142,8 +13126,6 @@ No set of starting bytes
         \H+
         \v
         \H+
-        extuni
-        \H+
         \Z
         \H++
         \z
@@ -13153,7 +13135,7 @@ No set of starting bytes
         End
 ------------------------------------------------------------------
 
-/\h+\D \h+\d \h+\S \h+\s \h+\W \h+\w \h+. \h+\C \h+\R \h+\H \h+\h \h+\V \h+\v \h+\X \h+\Z \h+\z \h+$/BZx
+/\h+\D \h+\d \h+\S \h+\s \h+\W \h+\w \h+. \h+\C \h+\R \h+\H \h+\h \h+\V \h+\v \h+\Z \h+\z \h+$/BZx
 ------------------------------------------------------------------
         Bra
         \h+
@@ -13183,8 +13165,6 @@ No set of starting bytes
         \h++
         \v
         \h+
-        extuni
-        \h+
         \Z
         \h++
         \z
@@ -13194,7 +13174,7 @@ No set of starting bytes
         End
 ------------------------------------------------------------------
 
-/\V+\D \V+\d \V+\S \V+\s \V+\W \V+\w \V+. \V+\C \V+\R \V+\H \V+\h \V+\V \V+\v \V+\X \V+\Z \V+\z \V+$/BZx
+/\V+\D \V+\d \V+\S \V+\s \V+\W \V+\w \V+. \V+\C \V+\R \V+\H \V+\h \V+\V \V+\v \V+\Z \V+\z \V+$/BZx
 ------------------------------------------------------------------
         Bra
         \V+
@@ -13224,8 +13204,6 @@ No set of starting bytes
         \V++
         \v
         \V+
-        extuni
-        \V+
         \Z
         \V++
         \z
@@ -13235,7 +13213,7 @@ No set of starting bytes
         End
 ------------------------------------------------------------------
 
-/\v+\D \v+\d \v+\S \v+\s \v+\W \v+\w \v+. \v+\C \v+\R \v+\H \v+\h \v+\V \v+\v \v+\X \v+\Z \v+\z \v+$/BZx
+/\v+\D \v+\d \v+\S \v+\s \v+\W \v+\w \v+. \v+\C \v+\R \v+\H \v+\h \v+\V \v+\v \v+\Z \v+\z \v+$/BZx
 ------------------------------------------------------------------
         Bra
         \v+
@@ -13265,8 +13243,6 @@ No set of starting bytes
         \v+
         \v
         \v+
-        extuni
-        \v+
         \Z
         \v++
         \z
@@ -13276,48 +13252,7 @@ No set of starting bytes
         End
 ------------------------------------------------------------------
 
-/\X+\D \X+\d \X+\S \X+\s \X+\W \X+\w \X+. \X+\C \X+\R \X+\H \X+\h \X+\V \X+\v \X+\X \X+\Z \X+\z \X+$/BZx
-------------------------------------------------------------------
-        Bra
-        extuni+
-        \D
-        extuni+
-        \d
-        extuni+
-        \S
-        extuni+
-        \s
-        extuni+
-        \W
-        extuni+
-        \w
-        extuni+
-        Any
-        extuni+
-        AllAny
-        extuni+
-        \R
-        extuni+
-        \H
-        extuni+
-        \h
-        extuni+
-        \V
-        extuni+
-        \v
-        extuni+
-        extuni
-        extuni+
-        \Z
-        extuni++
-        \z
-        extuni+
-        $
-        Ket
-        End
-------------------------------------------------------------------
-
-/ a+\D  a+\d  a+\S  a+\s  a+\W  a+\w  a+.  a+\C  a+\R  a+\H  a+\h  a+\V  a+\v  a+\X  a+\Z  a+\z  a+$/BZx
+/ a+\D  a+\d  a+\S  a+\s  a+\W  a+\w  a+.  a+\C  a+\R  a+\H  a+\h  a+\V  a+\v  a+\Z  a+\z  a+$/BZx
 ------------------------------------------------------------------
         Bra
         a+
@@ -13346,8 +13281,6 @@ No set of starting bytes
         \V
         a++
         \v
-        a+
-        extuni
         a++
         \Z
         a++
@@ -13358,7 +13291,7 @@ No set of starting bytes
         End
 ------------------------------------------------------------------
 
-/\n+\D \n+\d \n+\S \n+\s \n+\W \n+\w \n+. \n+\C \n+\R \n+\H \n+\h \n+\V \n+\v \n+\X \n+\Z \n+\z \n+$/BZx
+/\n+\D \n+\d \n+\S \n+\s \n+\W \n+\w \n+. \n+\C \n+\R \n+\H \n+\h \n+\V \n+\v \n+\Z \n+\z \n+$/BZx
 ------------------------------------------------------------------
         Bra
         \x0a+
@@ -13388,8 +13321,6 @@ No set of starting bytes
         \x0a+
         \v
         \x0a+
-        extuni
-        \x0a+
         \Z
         \x0a++
         \z
@@ -13399,7 +13330,7 @@ No set of starting bytes
         End
 ------------------------------------------------------------------
 
-/ .+\D  .+\d  .+\S  .+\s  .+\W  .+\w  .+.  .+\C  .+\R  .+\H  .+\h  .+\V  .+\v  .+\X  .+\Z  .+\z  .+$/BZx
+/ .+\D  .+\d  .+\S  .+\s  .+\W  .+\w  .+.  .+\C  .+\R  .+\H  .+\h  .+\V  .+\v  .+\Z  .+\z  .+$/BZx
 ------------------------------------------------------------------
         Bra
         Any+
@@ -13429,8 +13360,6 @@ No set of starting bytes
         Any+
         \v
         Any+
-        extuni
-        Any+
         \Z
         Any++
         \z
@@ -13440,7 +13369,7 @@ No set of starting bytes
         End
 ------------------------------------------------------------------
 
-/ .+\D  .+\d  .+\S  .+\s  .+\W  .+\w  .+.  .+\C  .+\R  .+\H  .+\h  .+\V  .+\v  .+\X  .+\Z  .+\z  .+$/BZxs
+/ .+\D  .+\d  .+\S  .+\s  .+\W  .+\w  .+.  .+\C  .+\R  .+\H  .+\h  .+\V  .+\v  .+\Z  .+\z  .+$/BZxs
 ------------------------------------------------------------------
         Bra
         AllAny+
@@ -13470,8 +13399,6 @@ No set of starting bytes
         AllAny+
         \v
         AllAny+
-        extuni
-        AllAny+
         \Z
         AllAny++
         \z
@@ -13481,7 +13408,7 @@ No set of starting bytes
         End
 ------------------------------------------------------------------
 
-/\D+$  \d+$  \S+$  \s+$  \W+$  \w+$  \C+$  \R+$  \H+$  \h+$  \V+$  \v+$  \X+$   a+$  \n+$   .+$  .+$/BZxm
+/\D+$  \d+$  \S+$  \s+$  \W+$  \w+$  \C+$  \R+$  \H+$  \h+$  \V+$  \v+$   a+$  \n+$   .+$  .+$/BZxm
 ------------------------------------------------------------------
         Bra
         \D+
@@ -13508,8 +13435,6 @@ No set of starting bytes
      /m $
         \v+
      /m $
-        extuni+
-     /m $
         a+
      /m $
         \x0a+