/[pcre]/code/branches/pcre16/pcre_compile.c

Diff of /code/branches/pcre16/pcre_compile.c

Parent Directory | Revision Log | View Patch Patch

-code/trunk/pcre_compile.c
revision 360 by ph10,
Wed Jul  9 20:00:28 2008 UTC
+code/branches/pcre16/pcre_compile.c
revision 764 by zherczeg,
Wed Nov 23 17:23:20 2011 UTC
 Line 6
  and semantics are as close as possible to those of the Perl 5 language.
                         Written by Philip Hazel
-            Copyright (c) 1997-2008 University of Cambridge
+            Copyright (c) 1997-2011 University of Cambridge
  -----------------------------------------------------------------------------
  Redistribution and use in source and binary forms, with or without
 Line 53 
 supporting internal functions that are n
  #include "pcre_internal.h"
- /* When DEBUG is defined, we need the pcre_printint() function, which is also
+ /* When PCRE_DEBUG is defined, we need the pcre_printint() function, which is
- used by pcretest. DEBUG is not defined when building a production library. */
+ also used by pcretest. PCRE_DEBUG is not defined when building a production
+ library. */
- #ifdef DEBUG
+ #ifdef PCRE_DEBUG
  #include "pcre_printint.src"
  #endif
-Line 91 
 is 4 there is plenty of room. */
+Line 92 
 is 4 there is plenty of room. */
  #define COMPILE_WORK_SIZE (4096)
+ /* The overrun tests check for a slightly smaller size so that they detect the
+ overrun before it actually does run off the end of the data block. */
+ #define WORK_SIZE_CHECK (COMPILE_WORK_SIZE - 100)
  /* Table for handling escaped characters in the range '0'-'z'. Positive returns
  are simple data values; negative values are for special things like \d and so
  on. Zero means further processing is needed (for things like \x), or the escape
  is invalid. */
- #ifndef EBCDIC  /* This is the "normal" table for ASCII systems */
+ #ifndef EBCDIC
+ /* This is the "normal" table for ASCII systems or for EBCDIC systems running
+ in UTF-8 mode. */
  static const short int escapes[] = {
-,      0,      0,      0,      0,      0,      0,      0,   /* 0 - 7 */
+,                       0,
-,      0,    ':',    ';',    '<',    '=',    '>',    '?',   /* 8 - ? */
+,                       0,
-    '@', -ESC_A, -ESC_B, -ESC_C, -ESC_D, -ESC_E,      0, -ESC_G,   /* @ - G */
+,                       0,
- -ESC_H,      0,      0, -ESC_K,      0,      0,      0,      0,   /* H - O */
+,                       0,
- -ESC_P, -ESC_Q, -ESC_R, -ESC_S,      0,      0, -ESC_V, -ESC_W,   /* P - W */
+,                       0,
- -ESC_X,      0, -ESC_Z,    '[',   '\\',    ']',    '^',    '_',   /* X - _ */
+      CHAR_COLON,              CHAR_SEMICOLON,
-    '`',      7, -ESC_b,      0, -ESC_d,  ESC_e,  ESC_f,      0,   /* ` - g */
+      CHAR_LESS_THAN_SIGN,     CHAR_EQUALS_SIGN,
- -ESC_h,      0,      0, -ESC_k,      0,      0,  ESC_n,      0,   /* h - o */
+      CHAR_GREATER_THAN_SIGN,  CHAR_QUESTION_MARK,
- -ESC_p,      0,  ESC_r, -ESC_s,  ESC_tee,    0, -ESC_v, -ESC_w,   /* p - w */
+      CHAR_COMMERCIAL_AT,      -ESC_A,
-,      0, -ESC_z                                            /* x - z */
+      -ESC_B,                  -ESC_C,
+      -ESC_D,                  -ESC_E,
+,                       -ESC_G,
+      -ESC_H,                  0,
+,                       -ESC_K,
+,                       0,
+      -ESC_N,                  0,
+      -ESC_P,                  -ESC_Q,
+      -ESC_R,                  -ESC_S,
+,                       0,
+      -ESC_V,                  -ESC_W,
+      -ESC_X,                  0,
+      -ESC_Z,                  CHAR_LEFT_SQUARE_BRACKET,
+      CHAR_BACKSLASH,          CHAR_RIGHT_SQUARE_BRACKET,
+      CHAR_CIRCUMFLEX_ACCENT,  CHAR_UNDERSCORE,
+      CHAR_GRAVE_ACCENT,       7,
+      -ESC_b,                  0,
+      -ESC_d,                  ESC_e,
+      ESC_f,                   0,
+      -ESC_h,                  0,
+,                       -ESC_k,
+,                       0,
+      ESC_n,                   0,
+      -ESC_p,                  0,
+      ESC_r,                   -ESC_s,
+      ESC_tee,                 0,
+      -ESC_v,                  -ESC_w,
+,                       0,
+      -ESC_z
  };
- #else           /* This is the "abnormal" table for EBCDIC systems */
+ #else
+ /* This is the "abnormal" table for EBCDIC systems without UTF-8 support. */
  static const short int escapes[] = {
  /*  48 */     0,     0,      0,     '.',    '<',   '(',    '+',    '|',
  /*  50 */   '&',     0,      0,       0,      0,     0,      0,      0,
-Line 130 
 static const short int escapes[] = {
+Line 171 
 static const short int escapes[] = {
  /*  B8 */     0,     0,      0,       0,      0,   ']',    '=',    '-',
  /*  C0 */   '{',-ESC_A, -ESC_B,  -ESC_C, -ESC_D,-ESC_E,      0, -ESC_G,
  /*  C8 */-ESC_H,     0,      0,       0,      0,     0,      0,      0,
- /*  D0 */   '}',     0, -ESC_K,       0,      0,     0,      0, -ESC_P,
+ /*  D0 */   '}',     0, -ESC_K,       0,      0,-ESC_N,      0, -ESC_P,
  /*  D8 */-ESC_Q,-ESC_R,      0,       0,      0,     0,      0,      0,
  /*  E0 */  '\\',     0, -ESC_S,       0,      0,-ESC_V, -ESC_W, -ESC_X,
  /*  E8 */     0,-ESC_Z,      0,       0,      0,     0,      0,      0,
-Line 142 
 static const short int escapes[] = {
+Line 183 
 static const short int escapes[] = {
  /* Table of special "verbs" like (*PRUNE). This is a short table, so it is
  searched linearly. Put all the names into a single string, in order to reduce
- the number of relocations when a shared library is dynamically linked. */
+ the number of relocations when a shared library is dynamically linked. The
+ string is built from string macros so that it works in UTF-8 mode on EBCDIC
+ platforms. */
  typedef struct verbitem {
-   int   len;
+   int   len;                 /* Length of verb name */
-   int   op;
+   int   op;                  /* Op when no arg, or -1 if arg mandatory */
+   int   op_arg;              /* Op when arg present, or -1 if not allowed */
  } verbitem;
  static const char verbnames[] =
-   "ACCEPT\0"
+   "\0"                       /* Empty name is a shorthand for MARK */
-   "COMMIT\0"
+   STRING_MARK0
-   "F\0"
+   STRING_ACCEPT0
-   "FAIL\0"
+   STRING_COMMIT0
-   "PRUNE\0"
+   STRING_F0
-   "SKIP\0"
+   STRING_FAIL0
-   "THEN";
+   STRING_PRUNE0
+   STRING_SKIP0
+   STRING_THEN;
  static const verbitem verbs[] = {
-   { 6, OP_ACCEPT },
+   { 0, -1,        OP_MARK },
-   { 6, OP_COMMIT },
+   { 4, -1,        OP_MARK },
-   { 1, OP_FAIL },
+   { 6, OP_ACCEPT, -1 },
-   { 4, OP_FAIL },
+   { 6, OP_COMMIT, -1 },
-   { 5, OP_PRUNE },
+   { 1, OP_FAIL,   -1 },
-   { 4, OP_SKIP  },
+   { 4, OP_FAIL,   -1 },
-   { 4, OP_THEN  }
+   { 5, OP_PRUNE,  OP_PRUNE_ARG },
+   { 4, OP_SKIP,   OP_SKIP_ARG  },
+   { 4, OP_THEN,   OP_THEN_ARG  }
  };
  static const int verbcount = sizeof(verbs)/sizeof(verbitem);
-Line 178 
 length entry. The first three must be al
+Line 226 
 length entry. The first three must be al
  for handling case independence. */
  static const char posix_names[] =
-   "alpha\0"  "lower\0"  "upper\0"  "alnum\0"  "ascii\0"  "blank\0"
+   STRING_alpha0 STRING_lower0 STRING_upper0 STRING_alnum0
-   "cntrl\0"  "digit\0"  "graph\0"  "print\0"  "punct\0"  "space\0"
+   STRING_ascii0 STRING_blank0 STRING_cntrl0 STRING_digit0
-   "word\0"   "xdigit";
+   STRING_graph0 STRING_print0 STRING_punct0 STRING_space0
+   STRING_word0  STRING_xdigit;
- static const uschar posix_name_lengths[] = {
+ static const pcre_uint8 posix_name_lengths[] = {
 , 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 6, 0 };
  /* Table of class bit maps for each POSIX class. Each class is formed from a
-Line 212 
 static const int posix_class_maps[] = {
+Line 261 
 static const int posix_class_maps[] = {
    cbit_xdigit,-1,          0              /* xdigit */
  };
+ /* Table of substitutes for \d etc when PCRE_UCP is set. The POSIX class
+ substitutes must be in the order of the names, defined above, and there are
+ both positive and negative cases. NULL means no substitute. */
+ #ifdef SUPPORT_UCP
+ static const pcre_uchar string_PNd[]  = {
+   CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
+   CHAR_N, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
+ static const pcre_uchar string_pNd[]  = {
+   CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
+   CHAR_N, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
+ static const pcre_uchar string_PXsp[] = {
+   CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
+   CHAR_X, CHAR_s, CHAR_p, CHAR_RIGHT_CURLY_BRACKET, '\0' };
+ static const pcre_uchar string_pXsp[] = {
+   CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
+   CHAR_X, CHAR_s, CHAR_p, CHAR_RIGHT_CURLY_BRACKET, '\0' };
+ static const pcre_uchar string_PXwd[] = {
+   CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
+   CHAR_X, CHAR_w, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
+ static const pcre_uchar string_pXwd[] = {
+   CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
+   CHAR_X, CHAR_w, CHAR_d, CHAR_RIGHT_CURLY_BRACKET, '\0' };
+ static const pcre_uchar *substitutes[] = {
+   string_PNd,           /* \D */
+   string_pNd,           /* \d */
+   string_PXsp,          /* \S */       /* NOTE: Xsp is Perl space */
+   string_pXsp,          /* \s */
+   string_PXwd,          /* \W */
+   string_pXwd           /* \w */
+ };
+ static const pcre_uchar string_pL[] =   {
+   CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
+   CHAR_L, CHAR_RIGHT_CURLY_BRACKET, '\0' };
+ static const pcre_uchar string_pLl[] =  {
+   CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
+   CHAR_L, CHAR_l, CHAR_RIGHT_CURLY_BRACKET, '\0' };
+ static const pcre_uchar string_pLu[] =  {
+   CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
+   CHAR_L, CHAR_u, CHAR_RIGHT_CURLY_BRACKET, '\0' };
+ static const pcre_uchar string_pXan[] = {
+   CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
+   CHAR_X, CHAR_a, CHAR_n, CHAR_RIGHT_CURLY_BRACKET, '\0' };
+ static const pcre_uchar string_h[] =    {
+   CHAR_BACKSLASH, CHAR_h, '\0' };
+ static const pcre_uchar string_pXps[] = {
+   CHAR_BACKSLASH, CHAR_p, CHAR_LEFT_CURLY_BRACKET,
+   CHAR_X, CHAR_p, CHAR_s, CHAR_RIGHT_CURLY_BRACKET, '\0' };
+ static const pcre_uchar string_PL[] =   {
+   CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
+   CHAR_L, CHAR_RIGHT_CURLY_BRACKET, '\0' };
+ static const pcre_uchar string_PLl[] =  {
+   CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
+   CHAR_L, CHAR_l, CHAR_RIGHT_CURLY_BRACKET, '\0' };
+ static const pcre_uchar string_PLu[] =  {
+   CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
+   CHAR_L, CHAR_u, CHAR_RIGHT_CURLY_BRACKET, '\0' };
+ static const pcre_uchar string_PXan[] = {
+   CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
+   CHAR_X, CHAR_a, CHAR_n, CHAR_RIGHT_CURLY_BRACKET, '\0' };
+ static const pcre_uchar string_H[] =    {
+   CHAR_BACKSLASH, CHAR_H, '\0' };
+ static const pcre_uchar string_PXps[] = {
+   CHAR_BACKSLASH, CHAR_P, CHAR_LEFT_CURLY_BRACKET,
+   CHAR_X, CHAR_p, CHAR_s, CHAR_RIGHT_CURLY_BRACKET, '\0' };
+ static const pcre_uchar *posix_substitutes[] = {
+   string_pL,            /* alpha */
+   string_pLl,           /* lower */
+   string_pLu,           /* upper */
+   string_pXan,          /* alnum */
+   NULL,                 /* ascii */
+   string_h,             /* blank */
+   NULL,                 /* cntrl */
+   string_pNd,           /* digit */
+   NULL,                 /* graph */
+   NULL,                 /* print */
+   NULL,                 /* punct */
+   string_pXps,          /* space */    /* NOTE: Xps is POSIX space */
+   string_pXwd,          /* word */
+   NULL,                 /* xdigit */
+   /* Negated cases */
+   string_PL,            /* ^alpha */
+   string_PLl,           /* ^lower */
+   string_PLu,           /* ^upper */
+   string_PXan,          /* ^alnum */
+   NULL,                 /* ^ascii */
+   string_H,             /* ^blank */
+   NULL,                 /* ^cntrl */
+   string_PNd,           /* ^digit */
+   NULL,                 /* ^graph */
+   NULL,                 /* ^print */
+   NULL,                 /* ^punct */
+   string_PXps,          /* ^space */   /* NOTE: Xps is POSIX space */
+   string_PXwd,          /* ^word */
+   NULL                  /* ^xdigit */
+ };
+ #define POSIX_SUBSIZE (sizeof(posix_substitutes) / sizeof(pcre_uchar *))
+ #endif
  #define STRING(a)  # a
  #define XSTRING(s) STRING(s)
-Line 224 
 the number of relocations needed when a
+Line 374 
 the number of relocations needed when a
  it is now one long string. We cannot use a table of offsets, because the
  lengths of inserts such as XSTRING(MAX_NAME_SIZE) are not known. Instead, we
  simply count through to the one we want - this isn't a performance issue
- because these strings are used only when there is a compilation error. */
+ because these strings are used only when there is a compilation error.
+ Each substring ends with \0 to insert a null character. This includes the final
+ substring, so that the whole string ends with \0\0, which can be detected when
+ counting through. */
  static const char error_texts[] =
    "no error\0"
-Line 271 
 static const char error_texts[] =
+Line 425 
 static const char error_texts[] =
    /* 35 */
    "invalid condition (?(0)\0"
    "\\C not allowed in lookbehind assertion\0"
-   "PCRE does not support \\L, \\l, \\N, \\U, or \\u\0"
+   "PCRE does not support \\L, \\l, \\N{name}, \\U, or \\u\0"
    "number after (?C is > 255\0"
    "closing ) for (?C expected\0"
    /* 40 */
-Line 293 
 static const char error_texts[] =
+Line 447 
 static const char error_texts[] =
    "internal error: previously-checked referenced subpattern not found\0"
    "DEFINE group contains more than one branch\0"
    /* 55 */
-   "repeating a DEFINE group is not allowed\0"
+   "repeating a DEFINE group is not allowed\0"  /** DEAD **/
    "inconsistent NEWLINE options\0"
    "\\g is not followed by a braced, angle-bracketed, or quoted name/number or by a plain number\0"
    "a numbered reference must not be zero\0"
-   "(*VERB) with an argument is not supported\0"
+   "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)\0"
    /* 60 */
    "(*VERB) not recognized\0"
    "number is too big\0"
    "subpattern name expected\0"
    "digit expected after (?+\0"
-   "] is an invalid data character in JavaScript compatibility mode";
+   "] is an invalid data character in JavaScript compatibility mode\0"
+   /* 65 */
+   "different names for subpatterns of the same number are not allowed\0"
+   "(*MARK) must have an argument\0"
+   "this version of PCRE is not compiled with PCRE_UCP support\0"
+   "\\c must be followed by an ASCII character\0"
+   "\\k is not followed by a braced, angle-bracketed, or quoted name\0"
+   /* 70 */
+   "internal error: unknown opcode in find_fixedlength()\0"
+   ;
  /* Table to identify digits and hex digits. This is used when compiling
  patterns. Note that the tables in chartables are dependent on the locale, and
-Line 322 
 For convenience, we use the same bit def
+Line 484 
 For convenience, we use the same bit def
  Then we can use ctype_digit and ctype_xdigit in the code. */
- #ifndef EBCDIC  /* This is the "normal" case, for ASCII systems */
+ #ifndef EBCDIC
+ /* This is the "normal" case, for ASCII systems, and EBCDIC systems running in
+ UTF-8 mode. */
  static const unsigned char digitab[] =
    {
 x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7 */
-Line 358 
 static const unsigned char digitab[] =
+Line 524 
 static const unsigned char digitab[] =
 x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 240-247 */
 x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};/* 248-255 */
- #else           /* This is the "abnormal" case, for EBCDIC systems */
+ #else
+ /* This is the "abnormal" case, for EBCDIC systems not running in UTF-8 mode. */
  static const unsigned char digitab[] =
    {
 x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7  0 */
-Line 433 
 static const unsigned char ebcdic_charta
+Line 602 
 static const unsigned char ebcdic_charta
  /* Definition to allow mutual recursion */
  static BOOL
-   compile_regex(int, int, uschar **, const uschar **, int *, BOOL, BOOL, int,
+   compile_regex(int, pcre_uchar **, const pcre_uchar **, int *, BOOL, BOOL, int, int,
      int *, int *, branch_chain *, compile_data *, int *);
-Line 455 
 static const char *
+Line 624 
 static const char *
  find_error_text(int n)
  {
  const char *s = error_texts;
- for (; n > 0; n--) while (*s++ != 0);
+ for (; n > 0; n--)
+   {
+   while (*s++ != 0) {};
+   if (*s == 0) return "Error text not found (please report)";
+   }
  return s;
  }
  /*************************************************
+ *            Check for counted repeat            *
+ *************************************************/
+ /* This function is called when a '{' is encountered in a place where it might
+ start a quantifier. It looks ahead to see if it really is a quantifier or not.
+ It is only a quantifier if it is one of the forms {ddd} {ddd,} or {ddd,ddd}
+ where the ddds are digits.
+ Arguments:
+   p         pointer to the first char after '{'
+ Returns:    TRUE or FALSE
+ */
+ static BOOL
+ is_counted_repeat(const pcre_uchar *p)
+ {
+ if ((digitab[*p++] & ctype_digit) == 0) return FALSE;
+ while ((digitab[*p] & ctype_digit) != 0) p++;
+ if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;
+ if (*p++ != CHAR_COMMA) return FALSE;
+ if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;
+ if ((digitab[*p++] & ctype_digit) == 0) return FALSE;
+ while ((digitab[*p] & ctype_digit) != 0) p++;
+ return (*p == CHAR_RIGHT_CURLY_BRACKET);
+ }
+ /*************************************************
  *            Handle escapes                      *
  *************************************************/
-Line 485 
 Returns:         zero or positive => a d
+Line 691 
 Returns:         zero or positive => a d
  */
  static int
- check_escape(const uschar **ptrptr, int *errorcodeptr, int bracount,
+ check_escape(const pcre_uchar **ptrptr, int *errorcodeptr, int bracount,
    int options, BOOL isclass)
  {
  BOOL utf8 = (options & PCRE_UTF8) != 0;
- const uschar *ptr = *ptrptr + 1;
+ const pcre_uchar *ptr = *ptrptr + 1;
  int c, i;
  GETCHARINCTEST(c, ptr);           /* Get character value, increment pointer */
-Line 503 
 if (c == 0) *errorcodeptr = ERR1;
+Line 709 
 if (c == 0) *errorcodeptr = ERR1;
  in a table. A non-zero result is something that can be returned immediately.
  Otherwise further processing may be required. */
- #ifndef EBCDIC  /* ASCII coding */
+ #ifndef EBCDIC  /* ASCII/UTF-8 coding */
- else if (c < '0' || c > 'z') {}                           /* Not alphanumeric */
+ else if (c < CHAR_0 || c > CHAR_z) {}                     /* Not alphanumeric */
- else if ((i = escapes[c - '0']) != 0) c = i;
+ else if ((i = escapes[c - CHAR_0]) != 0) c = i;
  #else           /* EBCDIC coding */
  else if (c < 'a' || (ebcdic_chartab[c] & 0x0E) == 0) {}   /* Not alphanumeric */
-Line 516 
 else if ((i = escapes[c - 0x48]) != 0)
+Line 722 
 else if ((i = escapes[c - 0x48]) != 0)
  else
    {
-   const uschar *oldptr;
+   const pcre_uchar *oldptr;
    BOOL braced, negated;
    switch (c)
-Line 524 
 else
+Line 730 
 else
      /* A number of Perl escapes are not handled by PCRE. We give an explicit
      error. */
-     case 'l':
+     case CHAR_l:
-     case 'L':
+     case CHAR_L:
-     case 'N':
-     case 'u':
-     case 'U':
      *errorcodeptr = ERR37;
      break;
-     /* \g must be followed by one of a number of specific things:
+     case CHAR_u:
+     if ((options & PCRE_JAVASCRIPT_COMPAT) != 0)
+       {
+       /* In JavaScript, \u must be followed by four hexadecimal numbers.
+       Otherwise it is a lowercase u letter. */
+       if ((digitab[ptr[1]] & ctype_xdigit) != 0 && (digitab[ptr[2]] & ctype_xdigit) != 0
+            && (digitab[ptr[3]] & ctype_xdigit) != 0 && (digitab[ptr[4]] & ctype_xdigit) != 0)
+         {
+         c = 0;
+         for (i = 0; i < 4; ++i)
+           {
+           register int cc = *(++ptr);
+ #ifndef EBCDIC  /* ASCII/UTF-8 coding */
+           if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
+           c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
+ #else           /* EBCDIC coding */
+           if (cc >= CHAR_a && cc <= CHAR_z) cc += 64;  /* Convert to upper case */
+           c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
+ #endif
+           }
+         }
+       }
+     else
+       *errorcodeptr = ERR37;
+     break;
+     case CHAR_U:
+     /* In JavaScript, \U is an uppercase U letter. */
+     if ((options & PCRE_JAVASCRIPT_COMPAT) == 0) *errorcodeptr = ERR37;
+     break;
+     /* In a character class, \g is just a literal "g". Outside a character
+     class, \g must be followed by one of a number of specific things:
      (1) A number, either plain or braced. If positive, it is an absolute
      backreference. If negative, it is a relative backreference. This is a Perl
-Line 548 
 else
+Line 783 
 else
      (possibly recursive) subroutine calls, _not_ backreferences. Just return
      the -ESC_g code (cf \k). */
-     case 'g':
+     case CHAR_g:
-     if (ptr[1] == '<' || ptr[1] == '\'')
+     if (isclass) break;
+     if (ptr[1] == CHAR_LESS_THAN_SIGN || ptr[1] == CHAR_APOSTROPHE)
        {
        c = -ESC_g;
        break;
-Line 557 
 else
+Line 793 
 else
      /* Handle the Perl-compatible cases */
-     if (ptr[1] == '{')
+     if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)
        {
-       const uschar *p;
+       const pcre_uchar *p;
-       for (p = ptr+2; *p != 0 && *p != '}'; p++)
+       for (p = ptr+2; *p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET; p++)
-         if (*p != '-' && (digitab[*p] & ctype_digit) == 0) break;
+         if (*p != CHAR_MINUS && (digitab[*p] & ctype_digit) == 0) break;
-       if (*p != 0 && *p != '}')
+       if (*p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET)
          {
          c = -ESC_k;
          break;
-Line 572 
 else
+Line 808 
 else
        }
      else braced = FALSE;
-     if (ptr[1] == '-')
+     if (ptr[1] == CHAR_MINUS)
        {
        negated = TRUE;
        ptr++;
-Line 581 
 else
+Line 817 
 else
      c = 0;
      while ((digitab[ptr[1]] & ctype_digit) != 0)
-       c = c * 10 + *(++ptr) - '0';
+       c = c * 10 + *(++ptr) - CHAR_0;
      if (c < 0)   /* Integer overflow */
        {
-Line 589 
 else
+Line 825 
 else
        break;
        }
-     if (braced && *(++ptr) != '}')
+     if (braced && *(++ptr) != CHAR_RIGHT_CURLY_BRACKET)
        {
        *errorcodeptr = ERR57;
        break;
-Line 626 
 else
+Line 862 
 else
      value is greater than 377, the least significant 8 bits are taken. Inside a
      character class, \ followed by a digit is always an octal number. */
-     case '1': case '2': case '3': case '4': case '5':
+     case CHAR_1: case CHAR_2: case CHAR_3: case CHAR_4: case CHAR_5:
-     case '6': case '7': case '8': case '9':
+     case CHAR_6: case CHAR_7: case CHAR_8: case CHAR_9:
      if (!isclass)
        {
        oldptr = ptr;
-       c -= '0';
+       c -= CHAR_0;
        while ((digitab[ptr[1]] & ctype_digit) != 0)
-         c = c * 10 + *(++ptr) - '0';
+         c = c * 10 + *(++ptr) - CHAR_0;
        if (c < 0)    /* Integer overflow */
          {
          *errorcodeptr = ERR61;
-Line 652 
 else
+Line 888 
 else
      generates a binary zero byte and treats the digit as a following literal.
      Thus we have to pull back the pointer by one. */
-     if ((c = *ptr) >= '8')
+     if ((c = *ptr) >= CHAR_8)
        {
        ptr--;
        c = 0;
-Line 665 
 else
+Line 901 
 else
      to do). Nowadays we allow for larger numbers in UTF-8 mode, but no more
      than 3 octal digits. */
-     case '0':
+     case CHAR_0:
-     c -= '0';
+     c -= CHAR_0;
-     while(i++ < 2 && ptr[1] >= '0' && ptr[1] <= '7')
+     while(i++ < 2 && ptr[1] >= CHAR_0 && ptr[1] <= CHAR_7)
-         c = c * 8 + *(++ptr) - '0';
+         c = c * 8 + *(++ptr) - CHAR_0;
      if (!utf8 && c > 255) *errorcodeptr = ERR51;
      break;
-Line 676 
 else
+Line 912 
 else
      than 0xff in utf8 mode, but only if the ddd are hex digits. If not, { is
      treated as a data character. */
-     case 'x':
+     case CHAR_x:
-     if (ptr[1] == '{')
+     if ((options & PCRE_JAVASCRIPT_COMPAT) != 0)
+       {
+       /* In JavaScript, \x must be followed by two hexadecimal numbers.
+       Otherwise it is a lowercase x letter. */
+       if ((digitab[ptr[1]] & ctype_xdigit) != 0 && (digitab[ptr[2]] & ctype_xdigit) != 0)
+         {
+         c = 0;
+         for (i = 0; i < 2; ++i)
+           {
+           register int cc = *(++ptr);
+ #ifndef EBCDIC  /* ASCII/UTF-8 coding */
+           if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
+           c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
+ #else           /* EBCDIC coding */
+           if (cc >= CHAR_a && cc <= CHAR_z) cc += 64;  /* Convert to upper case */
+           c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
+ #endif
+           }
+         }
+       break;
+       }
+     if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)
        {
-       const uschar *pt = ptr + 2;
+       const pcre_uchar *pt = ptr + 2;
        int count = 0;
        c = 0;
        while ((digitab[*pt] & ctype_xdigit) != 0)
          {
          register int cc = *pt++;
-         if (c == 0 && cc == '0') continue;     /* Leading zeroes */
+         if (c == 0 && cc == CHAR_0) continue;     /* Leading zeroes */
          count++;
- #ifndef EBCDIC  /* ASCII coding */
+ #ifndef EBCDIC  /* ASCII/UTF-8 coding */
-         if (cc >= 'a') cc -= 32;               /* Convert to upper case */
+         if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
-         c = (c << 4) + cc - ((cc < 'A')? '0' : ('A' - 10));
+         c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
  #else           /* EBCDIC coding */
-         if (cc >= 'a' && cc <= 'z') cc += 64;  /* Convert to upper case */
+         if (cc >= CHAR_a && cc <= CHAR_z) cc += 64;  /* Convert to upper case */
-         c = (c << 4) + cc - ((cc >= '0')? '0' : ('A' - 10));
+         c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
  #endif
          }
-       if (*pt == '}')
+       if (*pt == CHAR_RIGHT_CURLY_BRACKET)
          {
          if (c < 0 || count > (utf8? 8 : 2)) *errorcodeptr = ERR34;
          ptr = pt;
-Line 714 
 else
+Line 972 
 else
      c = 0;
      while (i++ < 2 && (digitab[ptr[1]] & ctype_xdigit) != 0)
        {
-       int cc;                               /* Some compilers don't like ++ */
+       int cc;                                  /* Some compilers don't like */
-       cc = *(++ptr);                        /* in initializers */
+       cc = *(++ptr);                           /* ++ in initializers */
- #ifndef EBCDIC  /* ASCII coding */
+ #ifndef EBCDIC  /* ASCII/UTF-8 coding */
-       if (cc >= 'a') cc -= 32;              /* Convert to upper case */
+       if (cc >= CHAR_a) cc -= 32;              /* Convert to upper case */
-       c = c * 16 + cc - ((cc < 'A')? '0' : ('A' - 10));
+       c = c * 16 + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
  #else           /* EBCDIC coding */
-       if (cc <= 'z') cc += 64;              /* Convert to upper case */
+       if (cc <= CHAR_z) cc += 64;              /* Convert to upper case */
-       c = c * 16 + cc - ((cc >= '0')? '0' : ('A' - 10));
+       c = c * 16 + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
  #endif
        }
      break;
      /* For \c, a following letter is upper-cased; then the 0x40 bit is flipped.
-     This coding is ASCII-specific, but then the whole concept of \cx is
+     An error is given if the byte following \c is not an ASCII character. This
+     coding is ASCII-specific, but then the whole concept of \cx is
      ASCII-specific. (However, an EBCDIC equivalent has now been added.) */
-     case 'c':
+     case CHAR_c:
      c = *(++ptr);
      if (c == 0)
        {
        *errorcodeptr = ERR2;
        break;
        }
+ #ifndef EBCDIC    /* ASCII/UTF-8 coding */
- #ifndef EBCDIC  /* ASCII coding */
+     if (c > 127)  /* Excludes all non-ASCII in either mode */
-     if (c >= 'a' && c <= 'z') c -= 32;
+       {
+       *errorcodeptr = ERR68;
+       break;
+       }
+     if (c >= CHAR_a && c <= CHAR_z) c -= 32;
      c ^= 0x40;
- #else           /* EBCDIC coding */
+ #else             /* EBCDIC coding */
-     if (c >= 'a' && c <= 'z') c += 64;
+     if (c >= CHAR_a && c <= CHAR_z) c += 64;
      c ^= 0xC0;
  #endif
      break;
-Line 764 
 else
+Line 1027 
 else
      }
    }
+ /* Perl supports \N{name} for character names, as well as plain \N for "not
+ newline". PCRE does not support \N{name}. However, it does support
+ quantification such as \N{2,3}. */
+ if (c == -ESC_N && ptr[1] == CHAR_LEFT_CURLY_BRACKET &&
+      !is_counted_repeat(ptr+2))
+   *errorcodeptr = ERR37;
+ /* If PCRE_UCP is set, we change the values for \d etc. */
+ if ((options & PCRE_UCP) != 0 && c <= -ESC_D && c >= -ESC_w)
+   c -= (ESC_DU - ESC_D);
+ /* Set the pointer to the final character before returning. */
  *ptrptr = ptr;
  return c;
  }
-Line 790 
 Returns:         type value from ucp_typ
+Line 1068 
 Returns:         type value from ucp_typ
  */
  static int
- get_ucp(const uschar **ptrptr, BOOL *negptr, int *dptr, int *errorcodeptr)
+ get_ucp(const pcre_uchar **ptrptr, BOOL *negptr, int *dptr, int *errorcodeptr)
  {
  int c, i, bot, top;
- const uschar *ptr = *ptrptr;
+ const pcre_uchar *ptr = *ptrptr;
- char name[32];
+ pcre_uchar name[32];
  c = *(++ptr);
  if (c == 0) goto ERROR_RETURN;
-Line 804 
 if (c == 0) goto ERROR_RETURN;
+Line 1082 
 if (c == 0) goto ERROR_RETURN;
  /* \P or \p can be followed by a name in {}, optionally preceded by ^ for
  negation. */
- if (c == '{')
+ if (c == CHAR_LEFT_CURLY_BRACKET)
    {
-   if (ptr[1] == '^')
+   if (ptr[1] == CHAR_CIRCUMFLEX_ACCENT)
      {
      *negptr = TRUE;
      ptr++;
-Line 815 
 if (c == '{')
+Line 1093 
 if (c == '{')
      {
      c = *(++ptr);
      if (c == 0) goto ERROR_RETURN;
-     if (c == '}') break;
+     if (c == CHAR_RIGHT_CURLY_BRACKET) break;
      name[i] = c;
      }
-   if (c !='}') goto ERROR_RETURN;
+   if (c != CHAR_RIGHT_CURLY_BRACKET) goto ERROR_RETURN;
    name[i] = 0;
    }
-Line 835 
 else
+Line 1113 
 else
  /* Search for a recognized property name using binary chop */
  bot = 0;
- top = _pcre_utt_size;
+ top = PRIV(utt_size);
  while (bot < top)
    {
    i = (bot + top) >> 1;
-   c = strcmp(name, _pcre_utt_names + _pcre_utt[i].name_offset);
+   c = STRCMP_UC_C8(name, PRIV(utt_names) + PRIV(utt)[i].name_offset);
    if (c == 0)
      {
-     *dptr = _pcre_utt[i].value;
+     *dptr = PRIV(utt)[i].value;
-     return _pcre_utt[i].type;
+     return PRIV(utt)[i].type;
      }
    if (c > 0) bot = i + 1; else top = i;
    }
-Line 864 
 return -1;
+Line 1142 
 return -1;
  /*************************************************
- *            Check for counted repeat            *
- *************************************************/
- /* This function is called when a '{' is encountered in a place where it might
- start a quantifier. It looks ahead to see if it really is a quantifier or not.
- It is only a quantifier if it is one of the forms {ddd} {ddd,} or {ddd,ddd}
- where the ddds are digits.
- Arguments:
-   p         pointer to the first char after '{'
- Returns:    TRUE or FALSE
- */
- static BOOL
- is_counted_repeat(const uschar *p)
- {
- if ((digitab[*p++] & ctype_digit) == 0) return FALSE;
- while ((digitab[*p] & ctype_digit) != 0) p++;
- if (*p == '}') return TRUE;
- if (*p++ != ',') return FALSE;
- if (*p == '}') return TRUE;
- if ((digitab[*p++] & ctype_digit) == 0) return FALSE;
- while ((digitab[*p] & ctype_digit) != 0) p++;
- return (*p == '}');
- }
- /*************************************************
  *         Read repeat counts                     *
  *************************************************/
-Line 915 
 Returns:         pointer to '}' on succe
+Line 1160 
 Returns:         pointer to '}' on succe
                   current ptr on error, with errorcodeptr set non-zero
  */
- static const uschar *
+ static const pcre_uchar *
- read_repeat_counts(const uschar *p, int *minp, int *maxp, int *errorcodeptr)
+ read_repeat_counts(const pcre_uchar *p, int *minp, int *maxp, int *errorcodeptr)
  {
  int min = 0;
  int max = -1;
-Line 924 
 int max = -1;
+Line 1169 
 int max = -1;
  /* Read the minimum value and do a paranoid check: a negative value indicates
  an integer overflow. */
- while ((digitab[*p] & ctype_digit) != 0) min = min * 10 + *p++ - '0';
+ while ((digitab[*p] & ctype_digit) != 0) min = min * 10 + *p++ - CHAR_0;
  if (min < 0 || min > 65535)
    {
    *errorcodeptr = ERR5;
-Line 934 
 if (min < 0 || min > 65535)
+Line 1179 
 if (min < 0 || min > 65535)
  /* Read the maximum value if there is one, and again do a paranoid on its size.
  Also, max must not be less than min. */
- if (*p == '}') max = min; else
+ if (*p == CHAR_RIGHT_CURLY_BRACKET) max = min; else
    {
-   if (*(++p) != '}')
+   if (*(++p) != CHAR_RIGHT_CURLY_BRACKET)
      {
      max = 0;
-     while((digitab[*p] & ctype_digit) != 0) max = max * 10 + *p++ - '0';
+     while((digitab[*p] & ctype_digit) != 0) max = max * 10 + *p++ - CHAR_0;
      if (max < 0 || max > 65535)
        {
        *errorcodeptr = ERR5;
-Line 964 
 return p;
+Line 1209 
 return p;
  /*************************************************
- *       Find forward referenced subpattern       *
+ *  Subroutine for finding forward reference      *
  *************************************************/
- /* This function scans along a pattern's text looking for capturing
+ /* This recursive function is called only from find_parens() below. The
+ top-level call starts at the beginning of the pattern. All other calls must
+ start at a parenthesis. It scans along a pattern's text looking for capturing
  subpatterns, and counting them. If it finds a named pattern that matches the
  name it is given, it returns its number. Alternatively, if the name is NULL, it
- returns when it reaches a given numbered subpattern. This is used for forward
+ returns when it reaches a given numbered subpattern. Recursion is used to keep
- references to subpatterns. We know that if (?P< is encountered, the name will
+ track of subpatterns that reset the capturing group numbers - the (?| feature.
- be terminated by '>' because that is checked in the first pass.
+ This function was originally called only from the second pass, in which we know
+ that if (?< or (?' or (?P< is encountered, the name will be correctly
+ terminated because that is checked in the first pass. There is now one call to
+ this function in the first pass, to check for a recursive back reference by
+ name (so that we can make the whole group atomic). In this case, we need check
+ only up to the current position in the pattern, and that is still OK because
+ and previous occurrences will have been checked. To make this work, the test
+ for "end of pattern" is a check against cd->end_pattern in the main loop,
+ instead of looking for a binary zero. This means that the special first-pass
+ call can adjust cd->end_pattern temporarily. (Checks for binary zero while
+ processing items within the loop are OK, because afterwards the main loop will
+ terminate.)
  Arguments:
-   ptr          current position in the pattern
+   ptrptr       address of the current character pointer (updated)
    cd           compile background data
    name         name to seek, or NULL if seeking a numbered subpattern
    lorn         name length, or subpattern number if name is NULL
    xmode        TRUE if we are in /x mode
+   utf8         TRUE if we are in UTF-8 mode
+   count        pointer to the current capturing subpattern number (updated)
  Returns:       the number of the named subpattern, or -1 if not found
  */
  static int
- find_parens(const uschar *ptr, compile_data *cd, const uschar *name, int lorn,
+ find_parens_sub(pcre_uchar **ptrptr, compile_data *cd, const pcre_uchar *name, int lorn,
-   BOOL xmode)
+   BOOL xmode, BOOL utf8, int *count)
  {
- const uschar *thisname;
+ pcre_uchar *ptr = *ptrptr;
- int count = cd->bracount;
+ int start_count = *count;
+ int hwm_count = start_count;
+ BOOL dup_parens = FALSE;
- for (; *ptr != 0; ptr++)
+ /* If the first character is a parenthesis, check on the type of group we are
+ dealing with. The very first call may not start with a parenthesis. */
+ if (ptr[0] == CHAR_LEFT_PARENTHESIS)
    {
-   int term;
+   /* Handle specials such as (*SKIP) or (*UTF8) etc. */
+   if (ptr[1] == CHAR_ASTERISK) ptr += 2;
+   /* Handle a normal, unnamed capturing parenthesis. */
+   else if (ptr[1] != CHAR_QUESTION_MARK)
+     {
+     *count += 1;
+     if (name == NULL && *count == lorn) return *count;
+     ptr++;
+     }
+   /* All cases now have (? at the start. Remember when we are in a group
+   where the parenthesis numbers are duplicated. */
+   else if (ptr[2] == CHAR_VERTICAL_LINE)
+     {
+     ptr += 3;
+     dup_parens = TRUE;
+     }
+   /* Handle comments; all characters are allowed until a ket is reached. */
+   else if (ptr[2] == CHAR_NUMBER_SIGN)
+     {
+     for (ptr += 3; *ptr != 0; ptr++) if (*ptr == CHAR_RIGHT_PARENTHESIS) break;
+     goto FAIL_EXIT;
+     }
+   /* Handle a condition. If it is an assertion, just carry on so that it
+   is processed as normal. If not, skip to the closing parenthesis of the
+   condition (there can't be any nested parens). */
+   else if (ptr[2] == CHAR_LEFT_PARENTHESIS)
+     {
+     ptr += 2;
+     if (ptr[1] != CHAR_QUESTION_MARK)
+       {
+       while (*ptr != 0 && *ptr != CHAR_RIGHT_PARENTHESIS) ptr++;
+       if (*ptr != 0) ptr++;
+       }
+     }
+   /* Start with (? but not a condition. */
+   else
+     {
+     ptr += 2;
+     if (*ptr == CHAR_P) ptr++;                      /* Allow optional P */
+     /* We have to disambiguate (?<! and (?<= from (?<name> for named groups */
+     if ((*ptr == CHAR_LESS_THAN_SIGN && ptr[1] != CHAR_EXCLAMATION_MARK &&
+         ptr[1] != CHAR_EQUALS_SIGN) || *ptr == CHAR_APOSTROPHE)
+       {
+       int term;
+       const pcre_uchar *thisname;
+       *count += 1;
+       if (name == NULL && *count == lorn) return *count;
+       term = *ptr++;
+       if (term == CHAR_LESS_THAN_SIGN) term = CHAR_GREATER_THAN_SIGN;
+       thisname = ptr;
+       while (*ptr != term) ptr++;
+       if (name != NULL && lorn == ptr - thisname &&
+           STRNCMP_UC_UC(name, thisname, lorn) == 0)
+         return *count;
+       term++;
+       }
+     }
+   }
+ /* Past any initial parenthesis handling, scan for parentheses or vertical
+ bars. Stop if we get to cd->end_pattern. Note that this is important for the
+ first-pass call when this value is temporarily adjusted to stop at the current
+ position. So DO NOT change this to a test for binary zero. */
+ for (; ptr < cd->end_pattern; ptr++)
+   {
    /* Skip over backslashed characters and also entire \Q...\E */
-   if (*ptr == '\\')
+   if (*ptr == CHAR_BACKSLASH)
      {
-     if (*(++ptr) == 0) return -1;
+     if (*(++ptr) == 0) goto FAIL_EXIT;
-     if (*ptr == 'Q') for (;;)
+     if (*ptr == CHAR_Q) for (;;)
        {
-       while (*(++ptr) != 0 && *ptr != '\\');
+       while (*(++ptr) != 0 && *ptr != CHAR_BACKSLASH) {};
-       if (*ptr == 0) return -1;
+       if (*ptr == 0) goto FAIL_EXIT;
-       if (*(++ptr) == 'E') break;
+       if (*(++ptr) == CHAR_E) break;
        }
      continue;
      }
-Line 1012 
 for (; *ptr != 0; ptr++)
+Line 1355 
 for (; *ptr != 0; ptr++)
    /* Skip over character classes; this logic must be similar to the way they
    are handled for real. If the first character is '^', skip it. Also, if the
    first few characters (either before or after ^) are \Q\E or \E we skip them
-   too. This makes for compatibility with Perl. */
+   too. This makes for compatibility with Perl. Note the use of STR macros to
+   encode "Q\\E" so that it works in UTF-8 on EBCDIC platforms. */
-   if (*ptr == '[')
+   if (*ptr == CHAR_LEFT_SQUARE_BRACKET)
      {
      BOOL negate_class = FALSE;
      for (;;)
        {
-       int c = *(++ptr);
+       if (ptr[1] == CHAR_BACKSLASH)
-       if (c == '\\')
          {
-         if (ptr[1] == 'E') ptr++;
+         if (ptr[2] == CHAR_E)
-           else if (strncmp((const char *)ptr+1, "Q\\E", 3) == 0) ptr += 3;
+           ptr+= 2;
-             else break;
+         else if (STRNCMP_UC_C8(ptr + 2,
+                  STR_Q STR_BACKSLASH STR_E, 3) == 0)
+           ptr += 4;
+         else
+           break;
          }
-       else if (!negate_class && c == '^')
+       else if (!negate_class && ptr[1] == CHAR_CIRCUMFLEX_ACCENT)
+         {
          negate_class = TRUE;
+         ptr++;
+         }
        else break;
        }
      /* If the next character is ']', it is a data character that must be
      skipped, except in JavaScript compatibility mode. */
-     if (ptr[1] == ']' && (cd->external_options & PCRE_JAVASCRIPT_COMPAT) == 0)
+     if (ptr[1] == CHAR_RIGHT_SQUARE_BRACKET &&
+         (cd->external_options & PCRE_JAVASCRIPT_COMPAT) == 0)
        ptr++;
-     while (*(++ptr) != ']')
+     while (*(++ptr) != CHAR_RIGHT_SQUARE_BRACKET)
        {
        if (*ptr == 0) return -1;
-       if (*ptr == '\\')
+       if (*ptr == CHAR_BACKSLASH)
          {
-         if (*(++ptr) == 0) return -1;
+         if (*(++ptr) == 0) goto FAIL_EXIT;
-         if (*ptr == 'Q') for (;;)
+         if (*ptr == CHAR_Q) for (;;)
            {
-           while (*(++ptr) != 0 && *ptr != '\\');
+           while (*(++ptr) != 0 && *ptr != CHAR_BACKSLASH) {};
-           if (*ptr == 0) return -1;
+           if (*ptr == 0) goto FAIL_EXIT;
-           if (*(++ptr) == 'E') break;
+           if (*(++ptr) == CHAR_E) break;
            }
          continue;
          }
-Line 1057 
 for (; *ptr != 0; ptr++)
+Line 1408 
 for (; *ptr != 0; ptr++)
    /* Skip comments in /x mode */
-   if (xmode && *ptr == '#')
+   if (xmode && *ptr == CHAR_NUMBER_SIGN)
      {
-     while (*(++ptr) != 0 && *ptr != '\n');
+     ptr++;
-     if (*ptr == 0) return -1;
+     while (*ptr != 0)
+       {
+       if (IS_NEWLINE(ptr)) { ptr += cd->nllen - 1; break; }
+       ptr++;
+ #ifdef SUPPORT_UTF8
+       if (utf8) while ((*ptr & 0xc0) == 0x80) ptr++;
+ #endif
+       }
+     if (*ptr == 0) goto FAIL_EXIT;
      continue;
      }
-   /* An opening parens must now be a real metacharacter */
+   /* Check for the special metacharacters */
-   if (*ptr != '(') continue;
+   if (*ptr == CHAR_LEFT_PARENTHESIS)
-   if (ptr[1] != '?' && ptr[1] != '*')
      {
-     count++;
+     int rc = find_parens_sub(&ptr, cd, name, lorn, xmode, utf8, count);
-     if (name == NULL && count == lorn) return count;
+     if (rc > 0) return rc;
-     continue;
+     if (*ptr == 0) goto FAIL_EXIT;
+     }
+   else if (*ptr == CHAR_RIGHT_PARENTHESIS)
+     {
+     if (dup_parens && *count < hwm_count) *count = hwm_count;
+     goto FAIL_EXIT;
      }
-   ptr += 2;
+   else if (*ptr == CHAR_VERTICAL_LINE && dup_parens)
-   if (*ptr == 'P') ptr++;                      /* Allow optional P */
+     {
+     if (*count > hwm_count) hwm_count = *count;
+     *count = start_count;
+     }
+   }
-   /* We have to disambiguate (?<! and (?<= from (?<name> */
+ FAIL_EXIT:
+ *ptrptr = ptr;
+ return -1;
+ }
-   if ((*ptr != '<' || ptr[1] == '!' || ptr[1] == '=') &&
-        *ptr != '\'')
-     continue;
-   count++;
-   if (name == NULL && count == lorn) return count;
-   term = *ptr++;
+ /*************************************************
-   if (term == '<') term = '>';
+ *       Find forward referenced subpattern       *
-   thisname = ptr;
+ *************************************************/
-   while (*ptr != term) ptr++;
-   if (name != NULL && lorn == ptr - thisname &&
+ /* This function scans along a pattern's text looking for capturing
-       strncmp((const char *)name, (const char *)thisname, lorn) == 0)
+ subpatterns, and counting them. If it finds a named pattern that matches the
-     return count;
+ name it is given, it returns its number. Alternatively, if the name is NULL, it
+ returns when it reaches a given numbered subpattern. This is used for forward
+ references to subpatterns. We used to be able to start this scan from the
+ current compiling point, using the current count value from cd->bracount, and
+ do it all in a single loop, but the addition of the possibility of duplicate
+ subpattern numbers means that we have to scan from the very start, in order to
+ take account of such duplicates, and to use a recursive function to keep track
+ of the different types of group.
+ Arguments:
+   cd           compile background data
+   name         name to seek, or NULL if seeking a numbered subpattern
+   lorn         name length, or subpattern number if name is NULL
+   xmode        TRUE if we are in /x mode
+   utf8         TRUE if we are in UTF-8 mode
+ Returns:       the number of the found subpattern, or -1 if not found
+ */
+ static int
+ find_parens(compile_data *cd, const pcre_uchar *name, int lorn, BOOL xmode,
+   BOOL utf8)
+ {
+ pcre_uchar *ptr = (pcre_uchar *)cd->start_pattern;
+ int count = 0;
+ int rc;
+ /* If the pattern does not start with an opening parenthesis, the first call
+ to find_parens_sub() will scan right to the end (if necessary). However, if it
+ does start with a parenthesis, find_parens_sub() will return when it hits the
+ matching closing parens. That is why we have to have a loop. */
+ for (;;)
+   {
+   rc = find_parens_sub(&ptr, cd, name, lorn, xmode, utf8, &count);
+   if (rc > 0 || *ptr++ == 0) break;
    }
- return -1;
+ return rc;
  }
  /*************************************************
  *      Find first significant op code            *
  *************************************************/
  /* This is called by several functions that scan a compiled expression looking
  for a fixed first character, or an anchoring op code etc. It skips over things
- that do not influence this. For some calls, a change of option is important.
+ that do not influence this. For some calls, it makes sense to skip negative
- For some calls, it makes sense to skip negative forward and all backward
+ forward and all backward assertions, and also the \b assertion; for others it
- assertions, and also the \b assertion; for others it does not.
+ does not.
  Arguments:
    code         pointer to the start of the group
-   options      pointer to external options
-   optbit       the option bit whose changing is significant, or
-                  zero if none are
    skipassert   TRUE if certain assertions are to be skipped
  Returns:       pointer to the first significant opcode
  */
- static const uschar*
+ static const pcre_uchar*
- first_significant_code(const uschar *code, int *options, int optbit,
+ first_significant_code(const pcre_uchar *code, BOOL skipassert)
-   BOOL skipassert)
  {
  for (;;)
    {
    switch ((int)*code)
      {
-     case OP_OPT:
-     if (optbit > 0 && ((int)code[1] & optbit) != (*options & optbit))
-       *options = (int)code[1];
-     code += 2;
-     break;
      case OP_ASSERT_NOT:
      case OP_ASSERTBACK:
      case OP_ASSERTBACK_NOT:
      if (!skipassert) return code;
      do code += GET(code, 1); while (*code == OP_ALT);
-     code += _pcre_OP_lengths[*code];
+     code += PRIV(OP_lengths)[*code];
      break;
      case OP_WORD_BOUNDARY:
-Line 1149 
 for (;;)
+Line 1542 
 for (;;)
      case OP_CALLOUT:
      case OP_CREF:
+     case OP_NCREF:
      case OP_RREF:
+     case OP_NRREF:
      case OP_DEF:
-     code += _pcre_OP_lengths[*code];
+     code += PRIV(OP_lengths)[*code];
      break;
      default:
-Line 1165 
 for (;;)
+Line 1560 
 for (;;)
  /*************************************************
- *        Find the fixed length of a pattern      *
+ *        Find the fixed length of a branch       *
  *************************************************/
- /* Scan a pattern and compute the fixed length of subject that will match it,
+ /* Scan a branch and compute the fixed length of subject that will match it,
  if the length is fixed. This is needed for dealing with backward assertions.
- In UTF8 mode, the result is in characters rather than bytes.
+ In UTF8 mode, the result is in characters rather than bytes. The branch is
+ temporarily terminated with OP_END when this function is called.
+ This function is called when a backward assertion is encountered, so that if it
+ fails, the error message can point to the correct place in the pattern.
+ However, we cannot do this when the assertion contains subroutine calls,
+ because they can be forward references. We solve this by remembering this case
+ and doing the check at the end; a flag specifies which mode we are running in.
  Arguments:
    code     points to the start of the pattern (the bracket)
-   options  the compiling options
+   utf8     TRUE in UTF-8 mode
+   atend    TRUE if called when the pattern is complete
- Returns:   the fixed length, or -1 if there is no fixed length,
+   cd       the "compile data" structure
-              or -2 if \C was encountered
+ Returns:   the fixed length,
+              or -1 if there is no fixed length,
+              or -2 if \C was encountered (in UTF-8 mode only)
+              or -3 if an OP_RECURSE item was encountered and atend is FALSE
+              or -4 if an unknown opcode was encountered (internal error)
  */
  static int
- find_fixedlength(uschar *code, int options)
+ find_fixedlength(pcre_uchar *code, BOOL utf8, BOOL atend, compile_data *cd)
  {
  int length = -1;
  register int branchlength = 0;
- register uschar *cc = code + 1 + LINK_SIZE;
+ register pcre_uchar *cc = code + 1 + LINK_SIZE;
  /* Scan along the opcodes for this branch. If we get to the end of the
  branch, check the length against that of the other branches. */
-Line 1194 
 branch, check the length against that of
+Line 1601 
 branch, check the length against that of
  for (;;)
    {
    int d;
+   pcre_uchar *ce, *cs;
    register int op = *cc;
    switch (op)
      {
+     /* We only need to continue for OP_CBRA (normal capturing bracket) and
+     OP_BRA (normal non-capturing bracket) because the other variants of these
+     opcodes are all concerned with unlimited repeated groups, which of course
+     are not of fixed length. */
      case OP_CBRA:
      case OP_BRA:
      case OP_ONCE:
+     case OP_ONCE_NC:
      case OP_COND:
-     d = find_fixedlength(cc + ((op == OP_CBRA)? 2:0), options);
+     d = find_fixedlength(cc + ((op == OP_CBRA)? 2:0), utf8, atend, cd);
      if (d < 0) return d;
      branchlength += d;
      do cc += GET(cc, 1); while (*cc == OP_ALT);
      cc += 1 + LINK_SIZE;
      break;
-     /* Reached end of a branch; if it's a ket it is the end of a nested
+     /* Reached end of a branch; if it's a ket it is the end of a nested call.
-     call. If it's ALT it is an alternation in a nested call. If it is
+     If it's ALT it is an alternation in a nested call. An ACCEPT is effectively
-     END it's the end of the outer call. All can be handled by the same code. */
+     an ALT. If it is END it's the end of the outer call. All can be handled by
+     the same code. Note that we must not include the OP_KETRxxx opcodes here,
+     because they all imply an unlimited repeat. */
      case OP_ALT:
      case OP_KET:
-     case OP_KETRMAX:
-     case OP_KETRMIN:
      case OP_END:
+     case OP_ACCEPT:
+     case OP_ASSERT_ACCEPT:
      if (length < 0) length = branchlength;
        else if (length != branchlength) return -1;
      if (*cc != OP_ALT) return length;
-Line 1224 
 for (;;)
+Line 1640 
 for (;;)
      branchlength = 0;
      break;
+     /* A true recursion implies not fixed length, but a subroutine call may
+     be OK. If the subroutine is a forward reference, we can't deal with
+     it until the end of the pattern, so return -3. */
+     case OP_RECURSE:
+     if (!atend) return -3;
+     cs = ce = (pcre_uchar *)cd->start_code + GET(cc, 1);  /* Start subpattern */
+     do ce += GET(ce, 1); while (*ce == OP_ALT);           /* End subpattern */
+     if (cc > cs && cc < ce) return -1;                    /* Recursion */
+     d = find_fixedlength(cs + 2, utf8, atend, cd);
+     if (d < 0) return d;
+     branchlength += d;
+     cc += 1 + LINK_SIZE;
+     break;
      /* Skip over assertive subpatterns */
      case OP_ASSERT:
-Line 1235 
 for (;;)
+Line 1666 
 for (;;)
      /* Skip over things that don't match chars */
-     case OP_REVERSE:
+     case OP_MARK:
+     case OP_PRUNE_ARG:
+     case OP_SKIP_ARG:
+     case OP_THEN_ARG:
+     cc += cc[1] + PRIV(OP_lengths)[*cc];
+     break;
+     case OP_CALLOUT:
+     case OP_CIRC:
+     case OP_CIRCM:
+     case OP_CLOSE:
+     case OP_COMMIT:
      case OP_CREF:
-     case OP_RREF:
      case OP_DEF:
-     case OP_OPT:
+     case OP_DOLL:
-     case OP_CALLOUT:
+     case OP_DOLLM:
-     case OP_SOD:
-     case OP_SOM:
      case OP_EOD:
      case OP_EODN:
-     case OP_CIRC:
+     case OP_FAIL:
-     case OP_DOLL:
+     case OP_NCREF:
+     case OP_NRREF:
      case OP_NOT_WORD_BOUNDARY:
+     case OP_PRUNE:
+     case OP_REVERSE:
+     case OP_RREF:
+     case OP_SET_SOM:
+     case OP_SKIP:
+     case OP_SOD:
+     case OP_SOM:
+     case OP_THEN:
      case OP_WORD_BOUNDARY:
-     cc += _pcre_OP_lengths[*cc];
+     cc += PRIV(OP_lengths)[*cc];
      break;
      /* Handle literal characters */
      case OP_CHAR:
-     case OP_CHARNC:
+     case OP_CHARI:
      case OP_NOT:
+     case OP_NOTI:
      branchlength++;
      cc += 2;
  #ifdef SUPPORT_UTF8
-     if ((options & PCRE_UTF8) != 0)
+     if (utf8 && cc[-1] >= 0xc0) cc += PRIV(utf8_table4)[cc[-1] & 0x3f];
-       {
-       while ((*cc & 0xc0) == 0x80) cc++;
-       }
  #endif
      break;
-Line 1271 
 for (;;)
+Line 1717 
 for (;;)
      need to skip over a multibyte character in UTF8 mode.  */
      case OP_EXACT:
+     case OP_EXACTI:
+     case OP_NOTEXACT:
+     case OP_NOTEXACTI:
      branchlength += GET2(cc,1);
      cc += 4;
  #ifdef SUPPORT_UTF8
-     if ((options & PCRE_UTF8) != 0)
+     if (utf8 && cc[-1] >= 0xc0) cc += PRIV(utf8_table4)[cc[-1] & 0x3f];
-       {
-       while((*cc & 0x80) == 0x80) cc++;
-       }
  #endif
      break;
-Line 1294 
 for (;;)
+Line 1740 
 for (;;)
      cc += 2;
      /* Fall through */
+     case OP_HSPACE:
+     case OP_VSPACE:
+     case OP_NOT_HSPACE:
+     case OP_NOT_VSPACE:
      case OP_NOT_DIGIT:
      case OP_DIGIT:
      case OP_NOT_WHITESPACE:
-Line 1306 
 for (;;)
+Line 1756 
 for (;;)
      cc++;
      break;
-     /* The single-byte matcher isn't allowed */
+     /* The single-byte matcher isn't allowed. This only happens in UTF-8 mode;
+     otherwise \C is coded as OP_ALLANY. */
      case OP_ANYBYTE:
      return -2;
-Line 1325 
 for (;;)
+Line 1776 
 for (;;)
      switch (*cc)
        {
+       case OP_CRPLUS:
+       case OP_CRMINPLUS:
        case OP_CRSTAR:
        case OP_CRMINSTAR:
        case OP_CRQUERY:
-Line 1345 
 for (;;)
+Line 1798 
 for (;;)
      /* Anything else is variable length */
-     default:
+     case OP_ANYNL:
+     case OP_BRAMINZERO:
+     case OP_BRAPOS:
+     case OP_BRAPOSZERO:
+     case OP_BRAZERO:
+     case OP_CBRAPOS:
+     case OP_EXTUNI:
+     case OP_KETRMAX:
+     case OP_KETRMIN:
+     case OP_KETRPOS:
+     case OP_MINPLUS:
+     case OP_MINPLUSI:
+     case OP_MINQUERY:
+     case OP_MINQUERYI:
+     case OP_MINSTAR:
+     case OP_MINSTARI:
+     case OP_MINUPTO:
+     case OP_MINUPTOI:
+     case OP_NOTMINPLUS:
+     case OP_NOTMINPLUSI:
+     case OP_NOTMINQUERY:
+     case OP_NOTMINQUERYI:
+     case OP_NOTMINSTAR:
+     case OP_NOTMINSTARI:
+     case OP_NOTMINUPTO:
+     case OP_NOTMINUPTOI:
+     case OP_NOTPLUS:
+     case OP_NOTPLUSI:
+     case OP_NOTPOSPLUS:
+     case OP_NOTPOSPLUSI:
+     case OP_NOTPOSQUERY:
+     case OP_NOTPOSQUERYI:
+     case OP_NOTPOSSTAR:
+     case OP_NOTPOSSTARI:
+     case OP_NOTPOSUPTO:
+     case OP_NOTPOSUPTOI:
+     case OP_NOTQUERY:
+     case OP_NOTQUERYI:
+     case OP_NOTSTAR:
+     case OP_NOTSTARI:
+     case OP_NOTUPTO:
+     case OP_NOTUPTOI:
+     case OP_PLUS:
+     case OP_PLUSI:
+     case OP_POSPLUS:
+     case OP_POSPLUSI:
+     case OP_POSQUERY:
+     case OP_POSQUERYI:
+     case OP_POSSTAR:
+     case OP_POSSTARI:
+     case OP_POSUPTO:
+     case OP_POSUPTOI:
+     case OP_QUERY:
+     case OP_QUERYI:
+     case OP_REF:
+     case OP_REFI:
+     case OP_SBRA:
+     case OP_SBRAPOS:
+     case OP_SCBRA:
+     case OP_SCBRAPOS:
+     case OP_SCOND:
+     case OP_SKIPZERO:
+     case OP_STAR:
+     case OP_STARI:
+     case OP_TYPEMINPLUS:
+     case OP_TYPEMINQUERY:
+     case OP_TYPEMINSTAR:
+     case OP_TYPEMINUPTO:
+     case OP_TYPEPLUS:
+     case OP_TYPEPOSPLUS:
+     case OP_TYPEPOSQUERY:
+     case OP_TYPEPOSSTAR:
+     case OP_TYPEPOSUPTO:
+     case OP_TYPEQUERY:
+     case OP_TYPESTAR:
+     case OP_TYPEUPTO:
+     case OP_UPTO:
+     case OP_UPTOI:
      return -1;
+     /* Catch unrecognized opcodes so that when new ones are added they
+     are not forgotten, as has happened in the past. */
+     default:
+     return -4;
      }
    }
  /* Control never gets here */
-Line 1356 
 for (;;)
+Line 1892 
 for (;;)
  /*************************************************
- *    Scan compiled regex for numbered bracket    *
+ *    Scan compiled regex for specific bracket    *
  *************************************************/
  /* This little function scans through a compiled pattern until it finds a
- capturing bracket with the given number.
+ capturing bracket with the given number, or, if the number is negative, an
+ instance of OP_REVERSE for a lookbehind. The function is global in the C sense
+ so that it can be called from pcre_study() when finding the minimum matching
+ length.
  Arguments:
    code        points to start of expression
    utf8        TRUE in UTF-8 mode
-   number      the required bracket number
+   number      the required bracket number or negative to find a lookbehind
  Returns:      pointer to the opcode for the bracket, or NULL if not found
  */
- static const uschar *
+ const pcre_uchar *
- find_bracket(const uschar *code, BOOL utf8, int number)
+ PRIV(find_bracket)(const pcre_uchar *code, BOOL utf8, int number)
  {
  for (;;)
    {
    register int c = *code;
    if (c == OP_END) return NULL;
    /* XCLASS is used for classes that cannot be represented just by a bit
-Line 1384 
 for (;;)
+Line 1924 
 for (;;)
    if (c == OP_XCLASS) code += GET(code, 1);
+   /* Handle recursion */
+   else if (c == OP_REVERSE)
+     {
+     if (number < 0) return (pcre_uchar *)code;
+     code += PRIV(OP_lengths)[c];
+     }
    /* Handle capturing bracket */
-   else if (c == OP_CBRA)
+   else if (c == OP_CBRA || c == OP_SCBRA ||
+            c == OP_CBRAPOS || c == OP_SCBRAPOS)
      {
      int n = GET2(code, 1+LINK_SIZE);
-     if (n == number) return (uschar *)code;
+     if (n == number) return (pcre_uchar *)code;
-     code += _pcre_OP_lengths[c];
+     code += PRIV(OP_lengths)[c];
      }
    /* Otherwise, we can get the item's length from the table, except that for
    repeated character types, we have to test for \p and \P, which have an extra
-   two bytes of parameters. */
+   two bytes of parameters, and for MARK/PRUNE/SKIP/THEN with an argument, we
+   must add in its length. */
    else
      {
-Line 1419 
 for (;;)
+Line 1969 
 for (;;)
        case OP_TYPEPOSUPTO:
        if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;
        break;
+       case OP_MARK:
+       case OP_PRUNE_ARG:
+       case OP_SKIP_ARG:
+       code += code[1];
+       break;
+       case OP_THEN_ARG:
+       code += code[1];
+       break;
        }
      /* Add in the fixed length from the table */
-     code += _pcre_OP_lengths[c];
+     code += PRIV(OP_lengths)[c];
    /* In UTF-8 mode, opcodes that are followed by a character may be followed by
    a multi-byte character. The length in the table is a minimum, so we have to
-Line 1433 
 for (;;)
+Line 1993 
 for (;;)
      if (utf8) switch(c)
        {
        case OP_CHAR:
-       case OP_CHARNC:
+       case OP_CHARI:
        case OP_EXACT:
+       case OP_EXACTI:
        case OP_UPTO:
+       case OP_UPTOI:
        case OP_MINUPTO:
+       case OP_MINUPTOI:
        case OP_POSUPTO:
+       case OP_POSUPTOI:
        case OP_STAR:
+       case OP_STARI:
        case OP_MINSTAR:
+       case OP_MINSTARI:
        case OP_POSSTAR:
+       case OP_POSSTARI:
        case OP_PLUS:
+       case OP_PLUSI:
        case OP_MINPLUS:
+       case OP_MINPLUSI:
        case OP_POSPLUS:
+       case OP_POSPLUSI:
        case OP_QUERY:
+       case OP_QUERYI:
        case OP_MINQUERY:
+       case OP_MINQUERYI:
        case OP_POSQUERY:
-       if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];
+       case OP_POSQUERYI:
+       if (code[-1] >= 0xc0) code += PRIV(utf8_table4)[code[-1] & 0x3f];
        break;
        }
+ #else
+     (void)(utf8);  /* Keep compiler happy by referencing function argument */
  #endif
      }
    }
-Line 1471 
 Arguments:
+Line 2046 
 Arguments:
  Returns:      pointer to the opcode for OP_RECURSE, or NULL if not found
  */
- static const uschar *
+ static const pcre_uchar *
- find_recurse(const uschar *code, BOOL utf8)
+ find_recurse(const pcre_uchar *code, BOOL utf8)
  {
  for (;;)
    {
-Line 1488 
 for (;;)
+Line 2063 
 for (;;)
    /* Otherwise, we can get the item's length from the table, except that for
    repeated character types, we have to test for \p and \P, which have an extra
-   two bytes of parameters. */
+   two bytes of parameters, and for MARK/PRUNE/SKIP/THEN with an argument, we
+   must add in its length. */
    else
      {
-Line 1512 
 for (;;)
+Line 2088 
 for (;;)
        case OP_TYPEEXACT:
        if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;
        break;
+       case OP_MARK:
+       case OP_PRUNE_ARG:
+       case OP_SKIP_ARG:
+       code += code[1];
+       break;
+       case OP_THEN_ARG:
+       code += code[1];
+       break;
        }
      /* Add in the fixed length from the table */
-     code += _pcre_OP_lengths[c];
+     code += PRIV(OP_lengths)[c];
      /* In UTF-8 mode, opcodes that are followed by a character may be followed
      by a multi-byte character. The length in the table is a minimum, so we have
-Line 1526 
 for (;;)
+Line 2112 
 for (;;)
      if (utf8) switch(c)
        {
        case OP_CHAR:
-       case OP_CHARNC:
+       case OP_CHARI:
        case OP_EXACT:
+       case OP_EXACTI:
        case OP_UPTO:
+       case OP_UPTOI:
        case OP_MINUPTO:
+       case OP_MINUPTOI:
        case OP_POSUPTO:
+       case OP_POSUPTOI:
        case OP_STAR:
+       case OP_STARI:
        case OP_MINSTAR:
+       case OP_MINSTARI:
        case OP_POSSTAR:
+       case OP_POSSTARI:
        case OP_PLUS:
+       case OP_PLUSI:
        case OP_MINPLUS:
+       case OP_MINPLUSI:
        case OP_POSPLUS:
+       case OP_POSPLUSI:
        case OP_QUERY:
+       case OP_QUERYI:
        case OP_MINQUERY:
+       case OP_MINQUERYI:
        case OP_POSQUERY:
-       if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];
+       case OP_POSQUERYI:
+       if (code[-1] >= 0xc0) code += PRIV(utf8_table4)[code[-1] & 0x3f];
        break;
        }
+ #else
+     (void)(utf8);  /* Keep compiler happy by referencing function argument */
  #endif
      }
    }
-Line 1566 
 Arguments:
+Line 2167 
 Arguments:
    code        points to start of search
    endcode     points to where to stop
    utf8        TRUE if in UTF8 mode
+   cd          contains pointers to tables etc.
  Returns:      TRUE if what is matched could be empty
  */
  static BOOL
- could_be_empty_branch(const uschar *code, const uschar *endcode, BOOL utf8)
+ could_be_empty_branch(const pcre_uchar *code, const pcre_uchar *endcode,
+   BOOL utf8, compile_data *cd)
  {
  register int c;
- for (code = first_significant_code(code + _pcre_OP_lengths[*code], NULL, 0, TRUE);
+ for (code = first_significant_code(code + PRIV(OP_lengths)[*code], TRUE);
       code < endcode;
-      code = first_significant_code(code + _pcre_OP_lengths[c], NULL, 0, TRUE))
+      code = first_significant_code(code + PRIV(OP_lengths)[c], TRUE))
    {
-   const uschar *ccode;
+   const pcre_uchar *ccode;
    c = *code;
-Line 1592 
 for (code = first_significant_code(code
+Line 2195 
 for (code = first_significant_code(code
      continue;
      }
+   /* For a recursion/subroutine call, if its end has been reached, which
+   implies a backward reference subroutine call, we can scan it. If it's a
+   forward reference subroutine call, we can't. To detect forward reference
+   we have to scan up the list that is kept in the workspace. This function is
+   called only when doing the real compile, not during the pre-compile that
+   measures the size of the compiled pattern. */
+   if (c == OP_RECURSE)
+     {
+     const pcre_uchar *scode;
+     BOOL empty_branch;
+     /* Test for forward reference */
+     for (scode = cd->start_workspace; scode < cd->hwm; scode += LINK_SIZE)
+       if (GET(scode, 0) == code + 1 - cd->start_code) return TRUE;
+     /* Not a forward reference, test for completed backward reference */
+     empty_branch = FALSE;
+     scode = cd->start_code + GET(code, 1);
+     if (GET(scode, 1) == 0) return TRUE;    /* Unclosed */
+     /* Completed backwards reference */
+     do
+       {
+       if (could_be_empty_branch(scode, endcode, utf8, cd))
+         {
+         empty_branch = TRUE;
+         break;
+         }
+       scode += GET(scode, 1);
+       }
+     while (*scode == OP_ALT);
+     if (!empty_branch) return FALSE;  /* All branches are non-empty */
+     continue;
+     }
    /* Groups with zero repeats can of course be empty; skip them. */
-   if (c == OP_BRAZERO || c == OP_BRAMINZERO || c == OP_SKIPZERO)
+   if (c == OP_BRAZERO || c == OP_BRAMINZERO || c == OP_SKIPZERO ||
+       c == OP_BRAPOSZERO)
+     {
+     code += PRIV(OP_lengths)[c];
+     do code += GET(code, 1); while (*code == OP_ALT);
+     c = *code;
+     continue;
+     }
+   /* A nested group that is already marked as "could be empty" can just be
+   skipped. */
+   if (c == OP_SBRA  || c == OP_SBRAPOS ||
+       c == OP_SCBRA || c == OP_SCBRAPOS)
      {
-     code += _pcre_OP_lengths[c];
      do code += GET(code, 1); while (*code == OP_ALT);
      c = *code;
      continue;
-Line 1604 
 for (code = first_significant_code(code
+Line 2259 
 for (code = first_significant_code(code
    /* For other groups, scan the branches. */
-   if (c == OP_BRA || c == OP_CBRA || c == OP_ONCE || c == OP_COND)
+   if (c == OP_BRA  || c == OP_BRAPOS ||
+       c == OP_CBRA || c == OP_CBRAPOS ||
+       c == OP_ONCE || c == OP_ONCE_NC ||
+       c == OP_COND)
      {
      BOOL empty_branch;
      if (GET(code, 1) == 0) return TRUE;    /* Hit unclosed bracket */
-     /* Scan a closed bracket */
+     /* If a conditional group has only one branch, there is a second, implied,
+     empty branch, so just skip over the conditional, because it could be empty.
+     Otherwise, scan the individual branches of the group. */
-     empty_branch = FALSE;
+     if (c == OP_COND && code[GET(code, 1)] != OP_ALT)
-     do
-       {
-       if (!empty_branch && could_be_empty_branch(code, endcode, utf8))
-         empty_branch = TRUE;
        code += GET(code, 1);
+     else
+       {
+       empty_branch = FALSE;
+       do
+         {
+         if (!empty_branch && could_be_empty_branch(code, endcode, utf8, cd))
+           empty_branch = TRUE;
+         code += GET(code, 1);
+         }
+       while (*code == OP_ALT);
+       if (!empty_branch) return FALSE;   /* All branches are non-empty */
        }
-     while (*code == OP_ALT);
-     if (!empty_branch) return FALSE;   /* All branches are non-empty */
      c = *code;
      continue;
      }
-Line 1630 
 for (code = first_significant_code(code
+Line 2296 
 for (code = first_significant_code(code
      {
      /* Check for quantifiers after a class. XCLASS is used for classes that
      cannot be represented just by a bit map. This includes negated single
-     high-valued characters. The length in _pcre_OP_lengths[] is zero; the
+     high-valued characters. The length in PRIV(OP_lengths)[] is zero; the
      actual length is stored in the compiled code, so we must update "code"
      here. */
-Line 1683 
 for (code = first_significant_code(code
+Line 2349 
 for (code = first_significant_code(code
      case OP_ALLANY:
      case OP_ANYBYTE:
      case OP_CHAR:
-     case OP_CHARNC:
+     case OP_CHARI:
      case OP_NOT:
+     case OP_NOTI:
      case OP_PLUS:
      case OP_MINPLUS:
      case OP_POSPLUS:
-Line 1724 
 for (code = first_significant_code(code
+Line 2391 
 for (code = first_significant_code(code
      case OP_KET:
      case OP_KETRMAX:
      case OP_KETRMIN:
+     case OP_KETRPOS:
      case OP_ALT:
      return TRUE;
-Line 1732 
 for (code = first_significant_code(code
+Line 2400 
 for (code = first_significant_code(code
  #ifdef SUPPORT_UTF8
      case OP_STAR:
+     case OP_STARI:
      case OP_MINSTAR:
+     case OP_MINSTARI:
      case OP_POSSTAR:
+     case OP_POSSTARI:
      case OP_QUERY:
+     case OP_QUERYI:
      case OP_MINQUERY:
+     case OP_MINQUERYI:
      case OP_POSQUERY:
+     case OP_POSQUERYI:
+     if (utf8 && code[1] >= 0xc0) code += PRIV(utf8_table4)[code[1] & 0x3f];
+     break;
      case OP_UPTO:
+     case OP_UPTOI:
      case OP_MINUPTO:
+     case OP_MINUPTOI:
      case OP_POSUPTO:
-     if (utf8) while ((code[2] & 0xc0) == 0x80) code++;
+     case OP_POSUPTOI:
+     if (utf8 && code[3] >= 0xc0) code += PRIV(utf8_table4)[code[3] & 0x3f];
      break;
  #endif
+     /* MARK, and PRUNE/SKIP/THEN with an argument must skip over the argument
+     string. */
+     case OP_MARK:
+     case OP_PRUNE_ARG:
+     case OP_SKIP_ARG:
+     code += code[1];
+     break;
+     case OP_THEN_ARG:
+     code += code[1];
+     break;
+     /* None of the remaining opcodes are required to match a character. */
+     default:
+     break;
      }
    }
-Line 1759 
 return TRUE;
+Line 2457 
 return TRUE;
  the current branch of the current pattern to see if it could match the empty
  string. If it could, we must look outwards for branches at other levels,
  stopping when we pass beyond the bracket which is the subject of the recursion.
+ This function is called only during the real compile, not during the
+ pre-compile.
  Arguments:
    code        points to start of the recursion
    endcode     points to where to stop (current RECURSE item)
    bcptr       points to the chain of current (unclosed) branch starts
    utf8        TRUE if in UTF-8 mode
+   cd          pointers to tables etc
  Returns:      TRUE if what is matched could be empty
  */
  static BOOL
- could_be_empty(const uschar *code, const uschar *endcode, branch_chain *bcptr,
+ could_be_empty(const pcre_uchar *code, const pcre_uchar *endcode,
-   BOOL utf8)
+   branch_chain *bcptr, BOOL utf8, compile_data *cd)
  {
- while (bcptr != NULL && bcptr->current >= code)
+ while (bcptr != NULL && bcptr->current_branch >= code)
    {
-   if (!could_be_empty_branch(bcptr->current, endcode, utf8)) return FALSE;
+   if (!could_be_empty_branch(bcptr->current_branch, endcode, utf8, cd))
+     return FALSE;
    bcptr = bcptr->outer;
    }
  return TRUE;
-Line 1807 
 where Perl recognizes it as the POSIX cl
+Line 2509 
 where Perl recognizes it as the POSIX cl
  "l\ower". This is a lesser evil that not diagnosing bad classes when Perl does,
  I think.
+ A user pointed out that PCRE was rejecting [:a[:digit:]] whereas Perl was not.
+ It seems that the appearance of a nested POSIX class supersedes an apparent
+ external class. For example, [:a[:digit:]b:] matches "a", "b", ":", or
+ a digit.
+ In Perl, unescaped square brackets may also appear as part of class names. For
+ example, [:a[:abc]b:] gives unknown POSIX class "[:abc]b:]". However, for
+ [:a[:abc]b][b:] it gives unknown POSIX class "[:abc]b][b:]", which does not
+ seem right at all. PCRE does not allow closing square brackets in POSIX class
+ names.
  Arguments:
    ptr      pointer to the initial [
    endptr   where to return the end pointer
-Line 1815 
 Returns:   TRUE or FALSE
+Line 2528 
 Returns:   TRUE or FALSE
  */
  static BOOL
- check_posix_syntax(const uschar *ptr, const uschar **endptr)
+ check_posix_syntax(const pcre_uchar *ptr, const pcre_uchar **endptr)
  {
  int terminator;          /* Don't combine these lines; the Solaris cc */
  terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */
  for (++ptr; *ptr != 0; ptr++)
    {
-   if (*ptr == '\\' && ptr[1] == ']') ptr++; else
+   if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)
+     ptr++;
+   else if (*ptr == CHAR_RIGHT_SQUARE_BRACKET) return FALSE;
+   else
      {
-     if (*ptr == ']') return FALSE;
+     if (*ptr == terminator && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)
-     if (*ptr == terminator && ptr[1] == ']')
        {
        *endptr = ptr;
        return TRUE;
        }
+     if (*ptr == CHAR_LEFT_SQUARE_BRACKET &&
+          (ptr[1] == CHAR_COLON || ptr[1] == CHAR_DOT ||
+           ptr[1] == CHAR_EQUALS_SIGN) &&
+         check_posix_syntax(ptr, endptr))
+       return FALSE;
      }
    }
  return FALSE;
-Line 1852 
 Returns:     a value representing the na
+Line 2572 
 Returns:     a value representing the na
  */
  static int
- check_posix_name(const uschar *ptr, int len)
+ check_posix_name(const pcre_uchar *ptr, int len)
  {
  const char *pn = posix_names;
  register int yield = 0;
  while (posix_name_lengths[yield] != 0)
    {
    if (len == posix_name_lengths[yield] &&
-     strncmp((const char *)ptr, pn, len) == 0) return yield;
+     STRNCMP_UC_C8(ptr, pn, len) == 0) return yield;
    pn += posix_name_lengths[yield] + 1;
    yield++;
    }
-Line 1899 
 Returns:     nothing
+Line 2619 
 Returns:     nothing
  */
  static void
- adjust_recurse(uschar *group, int adjust, BOOL utf8, compile_data *cd,
+ adjust_recurse(pcre_uchar *group, int adjust, BOOL utf8, compile_data *cd,
-   uschar *save_hwm)
+   pcre_uchar *save_hwm)
  {
- uschar *ptr = group;
+ pcre_uchar *ptr = group;
- while ((ptr = (uschar *)find_recurse(ptr, utf8)) != NULL)
+ while ((ptr = (pcre_uchar *)find_recurse(ptr, utf8)) != NULL)
    {
    int offset;
-   uschar *hc;
+   pcre_uchar *hc;
    /* See if this recursion is on the forward reference list. If so, adjust the
    reference. */
-Line 1952 
 Arguments:
+Line 2672 
 Arguments:
  Returns:         new code pointer
  */
- static uschar *
+ static pcre_uchar *
- auto_callout(uschar *code, const uschar *ptr, compile_data *cd)
+ auto_callout(pcre_uchar *code, const pcre_uchar *ptr, compile_data *cd)
  {
  *code++ = OP_CALLOUT;
  *code++ = 255;
- PUT(code, 0, ptr - cd->start_pattern);  /* Pattern offset */
+ PUT(code, 0, (int)(ptr - cd->start_pattern));  /* Pattern offset */
- PUT(code, LINK_SIZE, 0);                /* Default length */
+ PUT(code, LINK_SIZE, 0);                       /* Default length */
- return code + 2*LINK_SIZE;
+ return code + 2 * LINK_SIZE;
  }
-Line 1981 
 Returns:             nothing
+Line 2701 
 Returns:             nothing
  */
  static void
- complete_callout(uschar *previous_callout, const uschar *ptr, compile_data *cd)
+ complete_callout(pcre_uchar *previous_callout, const pcre_uchar *ptr, compile_data *cd)
  {
- int length = ptr - cd->start_pattern - GET(previous_callout, 2);
+ int length = (int)(ptr - cd->start_pattern - GET(previous_callout, 2));
  PUT(previous_callout, 2 + LINK_SIZE, length);
  }
-Line 2033 
 for (++c; c <= d; c++)
+Line 2753 
 for (++c; c <= d; c++)
  return TRUE;
  }
+ /*************************************************
+ *        Check a character and a property        *
+ *************************************************/
+ /* This function is called by check_auto_possessive() when a property item
+ is adjacent to a fixed character.
+ Arguments:
+   c            the character
+   ptype        the property type
+   pdata        the data for the type
+   negated      TRUE if it's a negated property (\P or \p{^)
+ Returns:       TRUE if auto-possessifying is OK
+ */
+ static BOOL
+ check_char_prop(int c, int ptype, int pdata, BOOL negated)
+ {
+ const ucd_record *prop = GET_UCD(c);
+ switch(ptype)
+   {
+   case PT_LAMP:
+   return (prop->chartype == ucp_Lu ||
+           prop->chartype == ucp_Ll ||
+           prop->chartype == ucp_Lt) == negated;
+   case PT_GC:
+   return (pdata == PRIV(ucp_gentype)[prop->chartype]) == negated;
+   case PT_PC:
+   return (pdata == prop->chartype) == negated;
+   case PT_SC:
+   return (pdata == prop->script) == negated;
+   /* These are specials */
+   case PT_ALNUM:
+   return (PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
+           PRIV(ucp_gentype)[prop->chartype] == ucp_N) == negated;
+   case PT_SPACE:    /* Perl space */
+   return (PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
+           c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR)
+           == negated;
+   case PT_PXSPACE:  /* POSIX space */
+   return (PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
+           c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||
+           c == CHAR_FF || c == CHAR_CR)
+           == negated;
+   case PT_WORD:
+   return (PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
+           PRIV(ucp_gentype)[prop->chartype] == ucp_N ||
+           c == CHAR_UNDERSCORE) == negated;
+   }
+ return FALSE;
+ }
  #endif  /* SUPPORT_UCP */
-Line 2046 
 whether the next thing could possibly ma
+Line 2829 
 whether the next thing could possibly ma
  sense to automatically possessify the repeated item.
  Arguments:
-   op_code       the repeated op code
+   previous      pointer to the repeated opcode
-   this          data for this item, depends on the opcode
    utf8          TRUE in UTF-8 mode
-   utf8_char     used for utf8 character bytes, NULL if not relevant
    ptr           next character in pattern
    options       options bits
    cd            contains pointers to tables etc.
-Line 2058 
 Returns:        TRUE if possessifying is
+Line 2839 
 Returns:        TRUE if possessifying is
  */
  static BOOL
- check_auto_possessive(int op_code, int item, BOOL utf8, uschar *utf8_char,
+ check_auto_possessive(const pcre_uchar *previous, BOOL utf8,
-   const uschar *ptr, int options, compile_data *cd)
+   const pcre_uchar *ptr, int options, compile_data *cd)
  {
- int next;
+ int c, next;
+ int op_code = *previous++;
  /* Skip whitespace and comments in extended mode */
-Line 2070 
 if ((options & PCRE_EXTENDED) != 0)
+Line 2852 
 if ((options & PCRE_EXTENDED) != 0)
    for (;;)
      {
      while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;
-     if (*ptr == '#')
+     if (*ptr == CHAR_NUMBER_SIGN)
        {
-       while (*(++ptr) != 0)
+       ptr++;
+       while (*ptr != 0)
+         {
          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }
+         ptr++;
+ #ifdef SUPPORT_UTF8
+         if (utf8) while ((*ptr & 0xc0) == 0x80) ptr++;
+ #endif
+         }
        }
      else break;
      }
-Line 2082 
 if ((options & PCRE_EXTENDED) != 0)
+Line 2871 
 if ((options & PCRE_EXTENDED) != 0)
  /* If the next item is one that we can handle, get its value. A non-negative
  value is a character, a negative value is an escape value. */
- if (*ptr == '\\')
+ if (*ptr == CHAR_BACKSLASH)
    {
    int temperrorcode = 0;
    next = check_escape(&ptr, &temperrorcode, cd->bracount, options, FALSE);
-Line 2107 
 if ((options & PCRE_EXTENDED) != 0)
+Line 2896 
 if ((options & PCRE_EXTENDED) != 0)
    for (;;)
      {
      while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;
-     if (*ptr == '#')
+     if (*ptr == CHAR_NUMBER_SIGN)
        {
-       while (*(++ptr) != 0)
+       ptr++;
+       while (*ptr != 0)
+         {
          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }
+         ptr++;
+ #ifdef SUPPORT_UTF8
+         if (utf8) while ((*ptr & 0xc0) == 0x80) ptr++;
+ #endif
+         }
        }
      else break;
      }
-Line 2118 
 if ((options & PCRE_EXTENDED) != 0)
+Line 2914 
 if ((options & PCRE_EXTENDED) != 0)
  /* If the next thing is itself optional, we have to give up. */
- if (*ptr == '*' || *ptr == '?' || strncmp((char *)ptr, "{0,", 3) == 0)
+ if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||
-   return FALSE;
+   STRNCMP_UC_C8(ptr, STR_LEFT_CURLY_BRACKET STR_0 STR_COMMA, 3) == 0)
+     return FALSE;
- /* Now compare the next item with the previous opcode. If the previous is a
- positive single character match, "item" either contains the character or, if
- "item" is greater than 127 in utf8 mode, the character's bytes are in
- utf8_char. */
- /* Handle cases when the next item is a character. */
+ /* Now compare the next item with the previous opcode. First, handle cases when
+ the next item is a character. */
  if (next >= 0) switch(op_code)
    {
    case OP_CHAR:
  #ifdef SUPPORT_UTF8
-   if (utf8 && item > 127) { GETCHAR(item, utf8_char); }
+   GETCHARTEST(c, previous);
+ #else
+   c = *previous;
  #endif
-   return item != next;
+   return c != next;
-   /* For CHARNC (caseless character) we must check the other case. If we have
+   /* For CHARI (caseless character) we must check the other case. If we have
    Unicode property support, we can use it to test the other case of
    high-valued characters. */
-   case OP_CHARNC:
+   case OP_CHARI:
  #ifdef SUPPORT_UTF8
-   if (utf8 && item > 127) { GETCHAR(item, utf8_char); }
+   GETCHARTEST(c, previous);
+ #else
+   c = *previous;
  #endif
-   if (item == next) return FALSE;
+   if (c == next) return FALSE;
  #ifdef SUPPORT_UTF8
    if (utf8)
      {
-Line 2156 
 if (next >= 0) switch(op_code)
+Line 2952 
 if (next >= 0) switch(op_code)
  #else
      othercase = NOTACHAR;
  #endif
-     return (unsigned int)item != othercase;
+     return (unsigned int)c != othercase;
      }
    else
  #endif  /* SUPPORT_UTF8 */
-   return (item != cd->fcc[next]);  /* Non-UTF-8 mode */
+   return (c != cd->fcc[next]);  /* Non-UTF-8 mode */
-   /* For OP_NOT, "item" must be a single-byte character. */
+   /* For OP_NOT and OP_NOTI, the data is always a single-byte character. These
+   opcodes are not used for multi-byte characters, because they are coded using
+   an XCLASS instead. */
    case OP_NOT:
-   if (item == next) return TRUE;
+   return (c = *previous) == next;
-   if ((options & PCRE_CASELESS) == 0) return FALSE;
+   case OP_NOTI:
+   if ((c = *previous) == next) return TRUE;
  #ifdef SUPPORT_UTF8
    if (utf8)
      {
-Line 2177 
 if (next >= 0) switch(op_code)
+Line 2977 
 if (next >= 0) switch(op_code)
  #else
      othercase = NOTACHAR;
  #endif
-     return (unsigned int)item == othercase;
+     return (unsigned int)c == othercase;
      }
    else
  #endif  /* SUPPORT_UTF8 */
-   return (item == cd->fcc[next]);  /* Non-UTF-8 mode */
+   return (c == cd->fcc[next]);  /* Non-UTF-8 mode */
+   /* Note that OP_DIGIT etc. are generated only when PCRE_UCP is *not* set.
+   When it is set, \d etc. are converted into OP_(NOT_)PROP codes. */
    case OP_DIGIT:
    return next > 127 || (cd->ctypes[next] & ctype_digit) == 0;
-Line 2224 
 if (next >= 0) switch(op_code)
+Line 3027 
 if (next >= 0) switch(op_code)
      case 0x202f:
      case 0x205f:
      case 0x3000:
-     return op_code != OP_HSPACE;
+     return op_code == OP_NOT_HSPACE;
      default:
-     return op_code == OP_HSPACE;
+     return op_code != OP_NOT_HSPACE;
      }
+   case OP_ANYNL:
    case OP_VSPACE:
    case OP_NOT_VSPACE:
    switch(next)
-Line 2240 
 if (next >= 0) switch(op_code)
+Line 3044 
 if (next >= 0) switch(op_code)
      case 0x85:
      case 0x2028:
      case 0x2029:
-     return op_code != OP_VSPACE;
+     return op_code == OP_NOT_VSPACE;
      default:
-     return op_code == OP_VSPACE;
+     return op_code != OP_NOT_VSPACE;
      }
+ #ifdef SUPPORT_UCP
+   case OP_PROP:
+   return check_char_prop(next, previous[0], previous[1], FALSE);
+   case OP_NOTPROP:
+   return check_char_prop(next, previous[0], previous[1], TRUE);
+ #endif
    default:
    return FALSE;
    }
- /* Handle the case when the next item is \d, \s, etc. */
+ /* Handle the case when the next item is \d, \s, etc. Note that when PCRE_UCP
+ is set, \d turns into ESC_du rather than ESC_d, etc., so ESC_d etc. are
+ generated only when PCRE_UCP is *not* set, that is, when only ASCII
+ characteristics are recognized. Similarly, the opcodes OP_DIGIT etc. are
+ replaced by OP_PROP codes when PCRE_UCP is set. */
  switch(op_code)
    {
    case OP_CHAR:
-   case OP_CHARNC:
+   case OP_CHARI:
  #ifdef SUPPORT_UTF8
-   if (utf8 && item > 127) { GETCHAR(item, utf8_char); }
+   GETCHARTEST(c, previous);
+ #else
+   c = *previous;
  #endif
    switch(-next)
      {
      case ESC_d:
-     return item > 127 || (cd->ctypes[item] & ctype_digit) == 0;
+     return c > 127 || (cd->ctypes[c] & ctype_digit) == 0;
      case ESC_D:
-     return item <= 127 && (cd->ctypes[item] & ctype_digit) != 0;
+     return c <= 127 && (cd->ctypes[c] & ctype_digit) != 0;
      case ESC_s:
-     return item > 127 || (cd->ctypes[item] & ctype_space) == 0;
+     return c > 127 || (cd->ctypes[c] & ctype_space) == 0;
      case ESC_S:
-     return item <= 127 && (cd->ctypes[item] & ctype_space) != 0;
+     return c <= 127 && (cd->ctypes[c] & ctype_space) != 0;
      case ESC_w:
-     return item > 127 || (cd->ctypes[item] & ctype_word) == 0;
+     return c > 127 || (cd->ctypes[c] & ctype_word) == 0;
      case ESC_W:
-     return item <= 127 && (cd->ctypes[item] & ctype_word) != 0;
+     return c <= 127 && (cd->ctypes[c] & ctype_word) != 0;
      case ESC_h:
      case ESC_H:
-     switch(item)
+     switch(c)
        {
        case 0x09:
        case 0x20:
-Line 2309 
 switch(op_code)
+Line 3127 
 switch(op_code)
      case ESC_v:
      case ESC_V:
-     switch(item)
+     switch(c)
        {
        case 0x0a:
        case 0x0b:
-Line 2323 
 switch(op_code)
+Line 3141 
 switch(op_code)
        return -next == ESC_v;
        }
+     /* When PCRE_UCP is set, these values get generated for \d etc. Find
+     their substitutions and process them. The result will always be either
+     -ESC_p or -ESC_P. Then fall through to process those values. */
+ #ifdef SUPPORT_UCP
+     case ESC_du:
+     case ESC_DU:
+     case ESC_wu:
+     case ESC_WU:
+     case ESC_su:
+     case ESC_SU:
+       {
+       int temperrorcode = 0;
+       ptr = substitutes[-next - ESC_DU];
+       next = check_escape(&ptr, &temperrorcode, 0, options, FALSE);
+       if (temperrorcode != 0) return FALSE;
+       ptr++;    /* For compatibility */
+       }
+     /* Fall through */
+     case ESC_p:
+     case ESC_P:
+       {
+       int ptype, pdata, errorcodeptr;
+       BOOL negated;
+       ptr--;      /* Make ptr point at the p or P */
+       ptype = get_ucp(&ptr, &negated, &pdata, &errorcodeptr);
+       if (ptype < 0) return FALSE;
+       ptr++;      /* Point past the final curly ket */
+       /* If the property item is optional, we have to give up. (When generated
+       from \d etc by PCRE_UCP, this test will have been applied much earlier,
+       to the original \d etc. At this point, ptr will point to a zero byte. */
+       if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||
+         STRNCMP_UC_C8(ptr, STR_LEFT_CURLY_BRACKET STR_0 STR_COMMA, 3) == 0)
+           return FALSE;
+       /* Do the property check. */
+       return check_char_prop(c, ptype, pdata, (next == -ESC_P) != negated);
+       }
+ #endif
      default:
      return FALSE;
      }
+   /* In principle, support for Unicode properties should be integrated here as
+   well. It means re-organizing the above code so as to get hold of the property
+   values before switching on the op-code. However, I wonder how many patterns
+   combine ASCII \d etc with Unicode properties? (Note that if PCRE_UCP is set,
+   these op-codes are never generated.) */
    case OP_DIGIT:
    return next == -ESC_D || next == -ESC_s || next == -ESC_W ||
-          next == -ESC_h || next == -ESC_v;
+          next == -ESC_h || next == -ESC_v || next == -ESC_R;
    case OP_NOT_DIGIT:
    return next == -ESC_d;
    case OP_WHITESPACE:
-   return next == -ESC_S || next == -ESC_d || next == -ESC_w;
+   return next == -ESC_S || next == -ESC_d || next == -ESC_w || next == -ESC_R;
    case OP_NOT_WHITESPACE:
    return next == -ESC_s || next == -ESC_h || next == -ESC_v;
    case OP_HSPACE:
-   return next == -ESC_S || next == -ESC_H || next == -ESC_d || next == -ESC_w;
+   return next == -ESC_S || next == -ESC_H || next == -ESC_d ||
+          next == -ESC_w || next == -ESC_v || next == -ESC_R;
    case OP_NOT_HSPACE:
    return next == -ESC_h;
    /* Can't have \S in here because VT matches \S (Perl anomaly) */
+   case OP_ANYNL:
    case OP_VSPACE:
    return next == -ESC_V || next == -ESC_d || next == -ESC_w;
    case OP_NOT_VSPACE:
-   return next == -ESC_v;
+   return next == -ESC_v || next == -ESC_R;
    case OP_WORDCHAR:
-   return next == -ESC_W || next == -ESC_s || next == -ESC_h || next == -ESC_v;
+   return next == -ESC_W || next == -ESC_s || next == -ESC_h ||
+          next == -ESC_v || next == -ESC_R;
    case OP_NOT_WORDCHAR:
    return next == -ESC_w || next == -ESC_d;
-Line 2386 
 Arguments:
+Line 3258 
 Arguments:
    firstbyteptr   set to initial literal character, or < 0 (REQ_UNSET, REQ_NONE)
    reqbyteptr     set to the last literal character required, else < 0
    bcptr          points to current branch chain
+   cond_depth     conditional nesting depth
    cd             contains pointers to tables etc.
    lengthptr      NULL during the real compile phase
                   points to length accumulator during pre-compile phase
-Line 2395 
 Returns:         TRUE on success
+Line 3268 
 Returns:         TRUE on success
  */
  static BOOL
- compile_branch(int *optionsptr, uschar **codeptr, const uschar **ptrptr,
+ compile_branch(int *optionsptr, pcre_uchar **codeptr,
-   int *errorcodeptr, int *firstbyteptr, int *reqbyteptr, branch_chain *bcptr,
+   const pcre_uchar **ptrptr, int *errorcodeptr, int *firstbyteptr,
-   compile_data *cd, int *lengthptr)
+   int *reqbyteptr, branch_chain *bcptr, int cond_depth, compile_data *cd,
+   int *lengthptr)
  {
  int repeat_type, op_type;
  int repeat_min = 0, repeat_max = 0;      /* To please picky compilers */
-Line 2406 
 int greedy_default, greedy_non_default;
+Line 3280 
 int greedy_default, greedy_non_default;
  int firstbyte, reqbyte;
  int zeroreqbyte, zerofirstbyte;
  int req_caseopt, reqvary, tempreqvary;
- int options = *optionsptr;
+ int options = *optionsptr;               /* May change dynamically */
  int after_manual_callout = 0;
  int length_prevgroup = 0;
  register int c;
- register uschar *code = *codeptr;
+ register pcre_uchar *code = *codeptr;
- uschar *last_code = code;
+ pcre_uchar *last_code = code;
- uschar *orig_code = code;
+ pcre_uchar *orig_code = code;
- uschar *tempcode;
+ pcre_uchar *tempcode;
  BOOL inescq = FALSE;
  BOOL groupsetfirstbyte = FALSE;
- const uschar *ptr = *ptrptr;
+ const pcre_uchar *ptr = *ptrptr;
- const uschar *tempptr;
+ const pcre_uchar *tempptr;
- uschar *previous = NULL;
+ const pcre_uchar *nestptr = NULL;
- uschar *previous_callout = NULL;
+ pcre_uchar *previous = NULL;
- uschar *save_hwm = NULL;
+ pcre_uchar *previous_callout = NULL;
- uschar classbits[32];
+ pcre_uchar *save_hwm = NULL;
+ pcre_uchar classbits[32];
+ /* We can fish out the UTF-8 setting once and for all into a BOOL, but we
+ must not do this for other options (e.g. PCRE_EXTENDED) because they may change
+ dynamically as we process the pattern. */
  #ifdef SUPPORT_UTF8
  BOOL class_utf8;
  BOOL utf8 = (options & PCRE_UTF8) != 0;
- uschar *class_utf8data;
+ pcre_uint8 *class_utf8data;
- uschar *class_utf8data_base;
+ pcre_uint8 *class_utf8data_base;
- uschar utf8_char[6];
+ pcre_uint8 utf8_char[6];
  #else
  BOOL utf8 = FALSE;
- uschar *utf8_char = NULL;
  #endif
- #ifdef DEBUG
+ #ifdef PCRE_DEBUG
  if (lengthptr != NULL) DPRINTF((">> start branch\n"));
  #endif
-Line 2482 
 for (;; ptr++)
+Line 3360 
 for (;; ptr++)
    int subfirstbyte;
    int terminator;
    int mclength;
-   uschar mcbuffer[8];
+   int tempbracount;
+   pcre_uchar mcbuffer[8];
    /* Get next byte in the pattern */
    c = *ptr;
+   /* If we are at the end of a nested substitution, revert to the outer level
+   string. Nesting only happens one level deep. */
+   if (c == 0 && nestptr != NULL)
+     {
+     ptr = nestptr;
+     nestptr = NULL;
+     c = *ptr;
+     }
    /* If we are in the pre-compile phase, accumulate the length used for the
    previous cycle of this loop. */
    if (lengthptr != NULL)
      {
- #ifdef DEBUG
+ #ifdef PCRE_DEBUG
      if (code > cd->hwm) cd->hwm = code;                 /* High water info */
  #endif
-     if (code > cd->start_workspace + COMPILE_WORK_SIZE) /* Check for overrun */
+     if (code > cd->start_workspace + WORK_SIZE_CHECK)   /* Check for overrun */
        {
        *errorcodeptr = ERR52;
        goto FAILED;
-Line 2518 
 for (;; ptr++)
+Line 3407 
 for (;; ptr++)
        goto FAILED;
        }
-     *lengthptr += code - last_code;
+     *lengthptr += (int)(code - last_code);
-     DPRINTF(("length=%d added %d c=%c\n", *lengthptr, code - last_code, c));
+     DPRINTF(("length=%d added %d c=%c\n", *lengthptr, (int)(code - last_code),
+       c));
      /* If "previous" is set and it is not at the start of the work space, move
      it back to there, in order to avoid filling up the work space. Otherwise,
-Line 2545 
 for (;; ptr++)
+Line 3435 
 for (;; ptr++)
    /* In the real compile phase, just check the workspace used by the forward
    reference list. */
-   else if (cd->hwm > cd->start_workspace + COMPILE_WORK_SIZE)
+   else if (cd->hwm > cd->start_workspace + WORK_SIZE_CHECK)
      {
      *errorcodeptr = ERR52;
      goto FAILED;
-Line 2555 
 for (;; ptr++)
+Line 3445 
 for (;; ptr++)
    if (inescq && c != 0)
      {
-     if (c == '\\' && ptr[1] == 'E')
+     if (c == CHAR_BACKSLASH && ptr[1] == CHAR_E)
        {
        inescq = FALSE;
        ptr++;
-Line 2581 
 for (;; ptr++)
+Line 3471 
 for (;; ptr++)
    /* Fill in length of a previous callout, except when the next thing is
    a quantifier. */
-   is_quantifier = c == '*' || c == '+' || c == '?' ||
+   is_quantifier =
-     (c == '{' && is_counted_repeat(ptr+1));
+     c == CHAR_ASTERISK || c == CHAR_PLUS || c == CHAR_QUESTION_MARK ||
+     (c == CHAR_LEFT_CURLY_BRACKET && is_counted_repeat(ptr+1));
    if (!is_quantifier && previous_callout != NULL &&
         after_manual_callout-- <= 0)
-Line 2592 
 for (;; ptr++)
+Line 3483 
 for (;; ptr++)
      previous_callout = NULL;
      }
-   /* In extended mode, skip white space and comments */
+   /* In extended mode, skip white space and comments. */
    if ((options & PCRE_EXTENDED) != 0)
      {
      if ((cd->ctypes[c] & ctype_space) != 0) continue;
-     if (c == '#')
+     if (c == CHAR_NUMBER_SIGN)
        {
-       while (*(++ptr) != 0)
+       ptr++;
+       while (*ptr != 0)
          {
          if (IS_NEWLINE(ptr)) { ptr += cd->nllen - 1; break; }
+         ptr++;
+ #ifdef SUPPORT_UTF8
+         if (utf8) while ((*ptr & 0xc0) == 0x80) ptr++;
+ #endif
          }
        if (*ptr != 0) continue;
-Line 2622 
 for (;; ptr++)
+Line 3518 
 for (;; ptr++)
      {
      /* ===================================================================*/
      case 0:                        /* The branch terminates at string end */
-     case '|':                      /* or | or ) */
+     case CHAR_VERTICAL_LINE:       /* or | or ) */
-     case ')':
+     case CHAR_RIGHT_PARENTHESIS:
      *firstbyteptr = firstbyte;
      *reqbyteptr = reqbyte;
      *codeptr = code;
-Line 2635 
 for (;; ptr++)
+Line 3531 
 for (;; ptr++)
          *errorcodeptr = ERR20;
          goto FAILED;
          }
-       *lengthptr += code - last_code;   /* To include callout length */
+       *lengthptr += (int)(code - last_code);   /* To include callout length */
        DPRINTF((">> end branch\n"));
        }
      return TRUE;
-Line 2645 
 for (;; ptr++)
+Line 3541 
 for (;; ptr++)
      /* Handle single-character metacharacters. In multiline mode, ^ disables
      the setting of any following char as a first character. */
-     case '^':
+     case CHAR_CIRCUMFLEX_ACCENT:
+     previous = NULL;
      if ((options & PCRE_MULTILINE) != 0)
        {
        if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
+       *code++ = OP_CIRCM;
        }
-     previous = NULL;
+     else *code++ = OP_CIRC;
-     *code++ = OP_CIRC;
      break;
-     case '$':
+     case CHAR_DOLLAR_SIGN:
      previous = NULL;
-     *code++ = OP_DOLL;
+     *code++ = ((options & PCRE_MULTILINE) != 0)? OP_DOLLM : OP_DOLL;
      break;
      /* There can never be a first char if '.' is first, whatever happens about
      repeats. The value of reqbyte doesn't change either. */
-     case '.':
+     case CHAR_DOT:
      if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
      zerofirstbyte = firstbyte;
      zeroreqbyte = reqbyte;
-Line 2686 
 for (;; ptr++)
+Line 3583 
 for (;; ptr++)
      In JavaScript compatibility mode, an isolated ']' causes an error. In
      default (Perl) mode, it is treated as a data character. */
-     case ']':
+     case CHAR_RIGHT_SQUARE_BRACKET:
      if ((cd->external_options & PCRE_JAVASCRIPT_COMPAT) != 0)
        {
        *errorcodeptr = ERR64;
-Line 2694 
 for (;; ptr++)
+Line 3591 
 for (;; ptr++)
        }
      goto NORMAL_CHAR;
-     case '[':
+     case CHAR_LEFT_SQUARE_BRACKET:
      previous = code;
      /* PCRE supports POSIX class stuff inside a class. Perl gives an error if
      they are encountered at the top level, so we'll do that too. */
-     if ((ptr[1] == ':' || ptr[1] == '.' || ptr[1] == '=') &&
+     if ((ptr[1] == CHAR_COLON || ptr[1] == CHAR_DOT ||
+          ptr[1] == CHAR_EQUALS_SIGN) &&
          check_posix_syntax(ptr, &tempptr))
        {
-       *errorcodeptr = (ptr[1] == ':')? ERR13 : ERR31;
+       *errorcodeptr = (ptr[1] == CHAR_COLON)? ERR13 : ERR31;
        goto FAILED;
        }
-Line 2715 
 for (;; ptr++)
+Line 3613 
 for (;; ptr++)
      for (;;)
        {
        c = *(++ptr);
-       if (c == '\\')
+       if (c == CHAR_BACKSLASH)
          {
-         if (ptr[1] == 'E') ptr++;
+         if (ptr[1] == CHAR_E)
-           else if (strncmp((const char *)ptr+1, "Q\\E", 3) == 0) ptr += 3;
+           ptr++;
-             else break;
+         else if (STRNCMP_UC_C8(ptr + 1,
+                           STR_Q STR_BACKSLASH STR_E, 3) == 0)
+           ptr += 3;
+         else
+           break;
          }
-       else if (!negate_class && c == '^')
+       else if (!negate_class && c == CHAR_CIRCUMFLEX_ACCENT)
          negate_class = TRUE;
        else break;
        }
-Line 2731 
 for (;; ptr++)
+Line 3633 
 for (;; ptr++)
      that. In JS mode, [] must always fail, so generate OP_FAIL, whereas
      [^] must match any character, so generate OP_ALLANY. */
-     if (c ==']' && (cd->external_options & PCRE_JAVASCRIPT_COMPAT) != 0)
+     if (c == CHAR_RIGHT_SQUARE_BRACKET &&
+         (cd->external_options & PCRE_JAVASCRIPT_COMPAT) != 0)
        {
        *code++ = negate_class? OP_ALLANY : OP_FAIL;
        if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
-Line 2757 
 for (;; ptr++)
+Line 3660 
 for (;; ptr++)
      than 256), because in that case the compiled code doesn't use the bit map.
      */
-     memset(classbits, 0, 32 * sizeof(uschar));
+     memset(classbits, 0, 32 * sizeof(pcre_uint8));
  #ifdef SUPPORT_UTF8
      class_utf8 = FALSE;                       /* No chars >= 256 */
-Line 2771 
 for (;; ptr++)
+Line 3674 
 for (;; ptr++)
      if (c != 0) do
        {
-       const uschar *oldptr;
+       const pcre_uchar *oldptr;
  #ifdef SUPPORT_UTF8
        if (utf8 && c > 127)
-Line 2796 
 for (;; ptr++)
+Line 3699 
 for (;; ptr++)
        if (inescq)
          {
-         if (c == '\\' && ptr[1] == 'E')     /* If we are at \E */
+         if (c == CHAR_BACKSLASH && ptr[1] == CHAR_E)  /* If we are at \E */
            {
            inescq = FALSE;                   /* Reset literal state */
            ptr++;                            /* Skip the 'E' */
-Line 2811 
 for (;; ptr++)
+Line 3714 
 for (;; ptr++)
        [.ch.] and [=ch=] ("collating elements") and fault them, as Perl
 .6 and 5.8 do. */
-       if (c == '[' &&
+       if (c == CHAR_LEFT_SQUARE_BRACKET &&
-           (ptr[1] == ':' || ptr[1] == '.' || ptr[1] == '=') &&
+           (ptr[1] == CHAR_COLON || ptr[1] == CHAR_DOT ||
-           check_posix_syntax(ptr, &tempptr))
+            ptr[1] == CHAR_EQUALS_SIGN) && check_posix_syntax(ptr, &tempptr))
          {
          BOOL local_negate = FALSE;
          int posix_class, taboffset, tabopt;
-         register const uschar *cbits = cd->cbits;
+         register const pcre_uint8 *cbits = cd->cbits;
-         uschar pbits[32];
+         pcre_uint8 pbits[32];
-         if (ptr[1] != ':')
+         if (ptr[1] != CHAR_COLON)
            {
            *errorcodeptr = ERR31;
            goto FAILED;
            }
          ptr += 2;
-         if (*ptr == '^')
+         if (*ptr == CHAR_CIRCUMFLEX_ACCENT)
            {
            local_negate = TRUE;
            should_flip_negation = TRUE;  /* Note negative special */
            ptr++;
            }
-         posix_class = check_posix_name(ptr, tempptr - ptr);
+         posix_class = check_posix_name(ptr, (int)(tempptr - ptr));
          if (posix_class < 0)
            {
            *errorcodeptr = ERR30;
-Line 2848 
 for (;; ptr++)
+Line 3751 
 for (;; ptr++)
          if ((options & PCRE_CASELESS) != 0 && posix_class <= 2)
            posix_class = 0;
-         /* We build the bit map for the POSIX class in a chunk of local store
+         /* When PCRE_UCP is set, some of the POSIX classes are converted to
-         because we may be adding and subtracting from it, and we don't want to
+         different escape sequences that use Unicode properties. */
-         subtract bits that may be in the main map already. At the end we or the
-         result into the bit map that is being built. */
+ #ifdef SUPPORT_UCP
+         if ((options & PCRE_UCP) != 0)
+           {
+           int pc = posix_class + ((local_negate)? POSIX_SUBSIZE/2 : 0);
+           if (posix_substitutes[pc] != NULL)
+             {
+             nestptr = tempptr + 1;
+             ptr = posix_substitutes[pc] - 1;
+             continue;
+             }
+           }
+ #endif
+         /* In the non-UCP case, we build the bit map for the POSIX class in a
+         chunk of local store because we may be adding and subtracting from it,
+         and we don't want to subtract bits that may be in the main map already.
+         At the end we or the result into the bit map that is being built. */
          posix_class *= 3;
          /* Copy in the first table (always present) */
          memcpy(pbits, cbits + posix_class_maps[posix_class],
-* sizeof(uschar));
+* sizeof(pcre_uint8));
          /* If there is a second table, add or remove it as required. */
-Line 2895 
 for (;; ptr++)
+Line 3813 
 for (;; ptr++)
        /* Backslash may introduce a single character, or it may introduce one
        of the specials, which just set a flag. The sequence \b is a special
-       case. Inside a class (and only there) it is treated as backspace.
+       case. Inside a class (and only there) it is treated as backspace. We
-       Elsewhere it marks a word boundary. Other escapes have preset maps ready
+       assume that other escapes have more than one character in them, so set
-       to 'or' into the one we are building. We assume they have more than one
+       class_charcount bigger than one. Unrecognized escapes fall through and
-       character in them, so set class_charcount bigger than one. */
+       are either treated as literal characters (by default), or are faulted if
+       PCRE_EXTRA is set. */
-       if (c == '\\')
+       if (c == CHAR_BACKSLASH)
          {
          c = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);
          if (*errorcodeptr != 0) goto FAILED;
-         if (-c == ESC_b) c = '\b';       /* \b is backspace in a class */
+         if (-c == ESC_b) c = CHAR_BS;    /* \b is backspace in a class */
-         else if (-c == ESC_X) c = 'X';   /* \X is literal X in a class */
-         else if (-c == ESC_R) c = 'R';   /* \R is literal R in a class */
          else if (-c == ESC_Q)            /* Handle start of quoted string */
            {
-           if (ptr[1] == '\\' && ptr[2] == 'E')
+           if (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)
              {
              ptr += 2; /* avoid empty string */
              }
-Line 2921 
 for (;; ptr++)
+Line 3838 
 for (;; ptr++)
          if (c < 0)
            {
-           register const uschar *cbits = cd->cbits;
+           register const pcre_uint8 *cbits = cd->cbits;
            class_charcount += 2;     /* Greater than 1 is what matters */
-           /* Save time by not doing this in the pre-compile phase. */
+           switch (-c)
-           if (lengthptr == NULL) switch (-c)
              {
+ #ifdef SUPPORT_UCP
+             case ESC_du:     /* These are the values given for \d etc */
+             case ESC_DU:     /* when PCRE_UCP is set. We replace the */
+             case ESC_wu:     /* escape sequence with an appropriate \p */
+             case ESC_WU:     /* or \P to test Unicode properties instead */
+             case ESC_su:     /* of the default ASCII testing. */
+             case ESC_SU:
+             nestptr = ptr;
+             ptr = substitutes[-c - ESC_DU] - 1;  /* Just before substitute */
+             class_charcount -= 2;                /* Undo! */
+             continue;
+ #endif
              case ESC_d:
              for (c = 0; c < 32; c++) classbits[c] |= cbits[c+cbit_digit];
              continue;
-Line 2946 
 for (;; ptr++)
+Line 3873 
 for (;; ptr++)
              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_word];
              continue;
+             /* Perl 5.004 onwards omits VT from \s, but we must preserve it
+             if it was previously set by something earlier in the character
+             class. */
              case ESC_s:
-             for (c = 0; c < 32; c++) classbits[c] |= cbits[c+cbit_space];
+             classbits[0] |= cbits[cbit_space];
-             classbits[1] &= ~0x08;   /* Perl 5.004 onwards omits VT from \s */
+             classbits[1] |= cbits[cbit_space+1] & ~0x08;
+             for (c = 2; c < 32; c++) classbits[c] |= cbits[c+cbit_space];
              continue;
              case ESC_S:
-Line 2957 
 for (;; ptr++)
+Line 3889 
 for (;; ptr++)
              classbits[1] |= 0x08;    /* Perl 5.004 onwards omits VT from \s */
              continue;
-             default:    /* Not recognized; fall through */
+             case ESC_h:
-             break;      /* Need "default" setting to stop compiler warning. */
-             }
-           /* In the pre-compile phase, just do the recognition. */
-           else if (c == -ESC_d || c == -ESC_D || c == -ESC_w ||
-                    c == -ESC_W || c == -ESC_s || c == -ESC_S) continue;
-           /* We need to deal with \H, \h, \V, and \v in both phases because
-           they use extra memory. */
-           if (-c == ESC_h)
-             {
              SETBIT(classbits, 0x09); /* VT */
              SETBIT(classbits, 0x20); /* SPACE */
              SETBIT(classbits, 0xa0); /* NSBP */
-Line 2979 
 for (;; ptr++)
+Line 3898 
 for (;; ptr++)
                {
                class_utf8 = TRUE;
                *class_utf8data++ = XCL_SINGLE;
-               class_utf8data += _pcre_ord2utf8(0x1680, class_utf8data);
+               class_utf8data += PRIV(ord2utf8)(0x1680, class_utf8data);
                *class_utf8data++ = XCL_SINGLE;
-               class_utf8data += _pcre_ord2utf8(0x180e, class_utf8data);
+               class_utf8data += PRIV(ord2utf8)(0x180e, class_utf8data);
                *class_utf8data++ = XCL_RANGE;
-               class_utf8data += _pcre_ord2utf8(0x2000, class_utf8data);
+               class_utf8data += PRIV(ord2utf8)(0x2000, class_utf8data);
-               class_utf8data += _pcre_ord2utf8(0x200A, class_utf8data);
+               class_utf8data += PRIV(ord2utf8)(0x200A, class_utf8data);
                *class_utf8data++ = XCL_SINGLE;
-               class_utf8data += _pcre_ord2utf8(0x202f, class_utf8data);
+               class_utf8data += PRIV(ord2utf8)(0x202f, class_utf8data);
                *class_utf8data++ = XCL_SINGLE;
-               class_utf8data += _pcre_ord2utf8(0x205f, class_utf8data);
+               class_utf8data += PRIV(ord2utf8)(0x205f, class_utf8data);
                *class_utf8data++ = XCL_SINGLE;
-               class_utf8data += _pcre_ord2utf8(0x3000, class_utf8data);
+               class_utf8data += PRIV(ord2utf8)(0x3000, class_utf8data);
                }
  #endif
              continue;
-             }
-           if (-c == ESC_H)
+             case ESC_H:
-             {
              for (c = 0; c < 32; c++)
                {
                int x = 0xff;
-Line 3016 
 for (;; ptr++)
+Line 3933 
 for (;; ptr++)
                {
                class_utf8 = TRUE;
                *class_utf8data++ = XCL_RANGE;
-               class_utf8data += _pcre_ord2utf8(0x0100, class_utf8data);
+               class_utf8data += PRIV(ord2utf8)(0x0100, class_utf8data);
-               class_utf8data += _pcre_ord2utf8(0x167f, class_utf8data);
+               class_utf8data += PRIV(ord2utf8)(0x167f, class_utf8data);
                *class_utf8data++ = XCL_RANGE;
-               class_utf8data += _pcre_ord2utf8(0x1681, class_utf8data);
+               class_utf8data += PRIV(ord2utf8)(0x1681, class_utf8data);
-               class_utf8data += _pcre_ord2utf8(0x180d, class_utf8data);
+               class_utf8data += PRIV(ord2utf8)(0x180d, class_utf8data);
                *class_utf8data++ = XCL_RANGE;
-               class_utf8data += _pcre_ord2utf8(0x180f, class_utf8data);
+               class_utf8data += PRIV(ord2utf8)(0x180f, class_utf8data);
-               class_utf8data += _pcre_ord2utf8(0x1fff, class_utf8data);
+               class_utf8data += PRIV(ord2utf8)(0x1fff, class_utf8data);
                *class_utf8data++ = XCL_RANGE;
-               class_utf8data += _pcre_ord2utf8(0x200B, class_utf8data);
+               class_utf8data += PRIV(ord2utf8)(0x200B, class_utf8data);
-               class_utf8data += _pcre_ord2utf8(0x202e, class_utf8data);
+               class_utf8data += PRIV(ord2utf8)(0x202e, class_utf8data);
                *class_utf8data++ = XCL_RANGE;
-               class_utf8data += _pcre_ord2utf8(0x2030, class_utf8data);
+               class_utf8data += PRIV(ord2utf8)(0x2030, class_utf8data);
-               class_utf8data += _pcre_ord2utf8(0x205e, class_utf8data);
+               class_utf8data += PRIV(ord2utf8)(0x205e, class_utf8data);
                *class_utf8data++ = XCL_RANGE;
-               class_utf8data += _pcre_ord2utf8(0x2060, class_utf8data);
+               class_utf8data += PRIV(ord2utf8)(0x2060, class_utf8data);
-               class_utf8data += _pcre_ord2utf8(0x2fff, class_utf8data);
+               class_utf8data += PRIV(ord2utf8)(0x2fff, class_utf8data);
                *class_utf8data++ = XCL_RANGE;
-               class_utf8data += _pcre_ord2utf8(0x3001, class_utf8data);
+               class_utf8data += PRIV(ord2utf8)(0x3001, class_utf8data);
-               class_utf8data += _pcre_ord2utf8(0x7fffffff, class_utf8data);
+               class_utf8data += PRIV(ord2utf8)(0x7fffffff, class_utf8data);
                }
  #endif
              continue;
-             }
-           if (-c == ESC_v)
+             case ESC_v:
-             {
              SETBIT(classbits, 0x0a); /* LF */
              SETBIT(classbits, 0x0b); /* VT */
              SETBIT(classbits, 0x0c); /* FF */
-Line 3053 
 for (;; ptr++)
+Line 3968 
 for (;; ptr++)
                {
                class_utf8 = TRUE;
                *class_utf8data++ = XCL_RANGE;
-               class_utf8data += _pcre_ord2utf8(0x2028, class_utf8data);
+               class_utf8data += PRIV(ord2utf8)(0x2028, class_utf8data);
-               class_utf8data += _pcre_ord2utf8(0x2029, class_utf8data);
+               class_utf8data += PRIV(ord2utf8)(0x2029, class_utf8data);
                }
  #endif
              continue;
-             }
-           if (-c == ESC_V)
+             case ESC_V:
-             {
              for (c = 0; c < 32; c++)
                {
                int x = 0xff;
-Line 3083 
 for (;; ptr++)
+Line 3996 
 for (;; ptr++)
                {
                class_utf8 = TRUE;
                *class_utf8data++ = XCL_RANGE;
-               class_utf8data += _pcre_ord2utf8(0x0100, class_utf8data);
+               class_utf8data += PRIV(ord2utf8)(0x0100, class_utf8data);
-               class_utf8data += _pcre_ord2utf8(0x2027, class_utf8data);
+               class_utf8data += PRIV(ord2utf8)(0x2027, class_utf8data);
                *class_utf8data++ = XCL_RANGE;
-               class_utf8data += _pcre_ord2utf8(0x2029, class_utf8data);
+               class_utf8data += PRIV(ord2utf8)(0x2029, class_utf8data);
-               class_utf8data += _pcre_ord2utf8(0x7fffffff, class_utf8data);
+               class_utf8data += PRIV(ord2utf8)(0x7fffffff, class_utf8data);
                }
  #endif
              continue;
-             }
-           /* We need to deal with \P and \p in both phases. */
  #ifdef SUPPORT_UCP
-           if (-c == ESC_p || -c == ESC_P)
+             case ESC_p:
-             {
+             case ESC_P:
-             BOOL negated;
+               {
-             int pdata;
+               BOOL negated;
-             int ptype = get_ucp(&ptr, &negated, &pdata, errorcodeptr);
+               int pdata;
-             if (ptype < 0) goto FAILED;
+               int ptype = get_ucp(&ptr, &negated, &pdata, errorcodeptr);
-             class_utf8 = TRUE;
+               if (ptype < 0) goto FAILED;
-             *class_utf8data++ = ((-c == ESC_p) != negated)?
+               class_utf8 = TRUE;
-               XCL_PROP : XCL_NOTPROP;
+               *class_utf8data++ = ((-c == ESC_p) != negated)?
-             *class_utf8data++ = ptype;
+                 XCL_PROP : XCL_NOTPROP;
-             *class_utf8data++ = pdata;
+               *class_utf8data++ = ptype;
-             class_charcount -= 2;   /* Not a < 256 character */
+               *class_utf8data++ = pdata;
-             continue;
+               class_charcount -= 2;   /* Not a < 256 character */
-             }
+               continue;
+               }
  #endif
-           /* Unrecognized escapes are faulted if PCRE is running in its
+             /* Unrecognized escapes are faulted if PCRE is running in its
-           strict mode. By default, for compatibility with Perl, they are
+             strict mode. By default, for compatibility with Perl, they are
-           treated as literals. */
+             treated as literals. */
-           if ((options & PCRE_EXTRA) != 0)
+             default:
-             {
+             if ((options & PCRE_EXTRA) != 0)
-             *errorcodeptr = ERR7;
+               {
-             goto FAILED;
+               *errorcodeptr = ERR7;
+               goto FAILED;
+               }
+             class_charcount -= 2;  /* Undo the default count from above */
+             c = *ptr;              /* Get the final character and fall through */
+             break;
              }
-           class_charcount -= 2;  /* Undo the default count from above */
-           c = *ptr;              /* Get the final character and fall through */
            }
          /* Fall through if we have a single character (c >= 0). This may be
-Line 3136 
 for (;; ptr++)
+Line 4049 
 for (;; ptr++)
        entirely. The code for handling \Q and \E is messy. */
        CHECK_RANGE:
-       while (ptr[1] == '\\' && ptr[2] == 'E')
+       while (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)
          {
          inescq = FALSE;
          ptr += 2;
-Line 3146 
 for (;; ptr++)
+Line 4059 
 for (;; ptr++)
        /* Remember \r or \n */
-       if (c == '\r' || c == '\n') cd->external_flags |= PCRE_HASCRORLF;
+       if (c == CHAR_CR || c == CHAR_NL) cd->external_flags |= PCRE_HASCRORLF;
        /* Check for range */
-       if (!inescq && ptr[1] == '-')
+       if (!inescq && ptr[1] == CHAR_MINUS)
          {
          int d;
          ptr += 2;
-         while (*ptr == '\\' && ptr[1] == 'E') ptr += 2;
+         while (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_E) ptr += 2;
          /* If we hit \Q (not followed by \E) at this point, go into escaped
          mode. */
-         while (*ptr == '\\' && ptr[1] == 'Q')
+         while (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_Q)
            {
            ptr += 2;
-           if (*ptr == '\\' && ptr[1] == 'E') { ptr += 2; continue; }
+           if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_E)
+             { ptr += 2; continue; }
            inescq = TRUE;
            break;
            }
-         if (*ptr == 0 || (!inescq && *ptr == ']'))
+         if (*ptr == 0 || (!inescq && *ptr == CHAR_RIGHT_SQUARE_BRACKET))
            {
            ptr = oldptr;
            goto LONE_SINGLE_CHARACTER;
-Line 3186 
 for (;; ptr++)
+Line 4100 
 for (;; ptr++)
          not any of the other escapes. Perl 5.6 treats a hyphen as a literal
          in such circumstances. */
-         if (!inescq && d == '\\')
+         if (!inescq && d == CHAR_BACKSLASH)
            {
            d = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);
            if (*errorcodeptr != 0) goto FAILED;
-           /* \b is backspace; \X is literal X; \R is literal R; any other
+           /* \b is backspace; any other special means the '-' was literal */
-           special means the '-' was literal */
            if (d < 0)
              {
-             if (d == -ESC_b) d = '\b';
+             if (d == -ESC_b) d = CHAR_BS; else
-             else if (d == -ESC_X) d = 'X';
-             else if (d == -ESC_R) d = 'R'; else
                {
                ptr = oldptr;
                goto LONE_SINGLE_CHARACTER;  /* A few lines below */
-Line 3219 
 for (;; ptr++)
+Line 4130 
 for (;; ptr++)
          /* Remember \r or \n */
-         if (d == '\r' || d == '\n') cd->external_flags |= PCRE_HASCRORLF;
+         if (d == CHAR_CR || d == CHAR_NL) cd->external_flags |= PCRE_HASCRORLF;
          /* In UTF-8 mode, if the upper limit is > 255, or > 127 for caseless
          matching, we have to use an XCLASS with extra data items. Caseless
-Line 3267 
 for (;; ptr++)
+Line 4178 
 for (;; ptr++)
                else
                  {
                  *class_utf8data++ = XCL_RANGE;
-                 class_utf8data += _pcre_ord2utf8(occ, class_utf8data);
+                 class_utf8data += PRIV(ord2utf8)(occ, class_utf8data);
                  }
-               class_utf8data += _pcre_ord2utf8(ocd, class_utf8data);
+               class_utf8data += PRIV(ord2utf8)(ocd, class_utf8data);
                }
              }
  #endif  /* SUPPORT_UCP */
-Line 3278 
 for (;; ptr++)
+Line 4189 
 for (;; ptr++)
            overlapping ranges. */
            *class_utf8data++ = XCL_RANGE;
-           class_utf8data += _pcre_ord2utf8(c, class_utf8data);
+           class_utf8data += PRIV(ord2utf8)(c, class_utf8data);
-           class_utf8data += _pcre_ord2utf8(d, class_utf8data);
+           class_utf8data += PRIV(ord2utf8)(d, class_utf8data);
            /* With UCP support, we are done. Without UCP support, there is no
            caseless matching for UTF-8 characters > 127; we can use the bit map
-Line 3333 
 for (;; ptr++)
+Line 4244 
 for (;; ptr++)
          {
          class_utf8 = TRUE;
          *class_utf8data++ = XCL_SINGLE;
-         class_utf8data += _pcre_ord2utf8(c, class_utf8data);
+         class_utf8data += PRIV(ord2utf8)(c, class_utf8data);
  #ifdef SUPPORT_UCP
          if ((options & PCRE_CASELESS) != 0)
-Line 3342 
 for (;; ptr++)
+Line 4253 
 for (;; ptr++)
            if ((othercase = UCD_OTHERCASE(c)) != c)
              {