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

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

Parent Directory | Revision Log | View Patch Patch

-revision 455 by ph10,
Sat Sep 26 19:12:32 2009 UTC
+revision 670 by ph10,
Tue Aug 23 11:16:56 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-2009 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
-Line 118 
 static const short int escapes[] = {
+Line 124 
 static const short int escapes[] = {
       -ESC_H,                  0,
 ,                       -ESC_K,
 ,                       0,
-,                       0,
+      -ESC_N,                  0,
       -ESC_P,                  -ESC_Q,
       -ESC_R,                  -ESC_S,
 ,                       0,
-Line 165 
 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 182 
 string is built from string macros so th
+Line 188 
 string is built from string macros so th
  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[] =
+   "\0"                       /* Empty name is a shorthand for MARK */
+   STRING_MARK0
    STRING_ACCEPT0
    STRING_COMMIT0
    STRING_F0
-Line 196 
 static const char verbnames[] =
+Line 205 
 static const char verbnames[] =
    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 250 
 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 uschar *substitutes[] = {
+   (uschar *)"\\P{Nd}",    /* \D */
+   (uschar *)"\\p{Nd}",    /* \d */
+   (uschar *)"\\P{Xsp}",   /* \S */       /* NOTE: Xsp is Perl space */
+   (uschar *)"\\p{Xsp}",   /* \s */
+   (uschar *)"\\P{Xwd}",   /* \W */
+   (uschar *)"\\p{Xwd}"    /* \w */
+ };
+ static const uschar *posix_substitutes[] = {
+   (uschar *)"\\p{L}",     /* alpha */
+   (uschar *)"\\p{Ll}",    /* lower */
+   (uschar *)"\\p{Lu}",    /* upper */
+   (uschar *)"\\p{Xan}",   /* alnum */
+   NULL,                   /* ascii */
+   (uschar *)"\\h",        /* blank */
+   NULL,                   /* cntrl */
+   (uschar *)"\\p{Nd}",    /* digit */
+   NULL,                   /* graph */
+   NULL,                   /* print */
+   NULL,                   /* punct */
+   (uschar *)"\\p{Xps}",   /* space */    /* NOTE: Xps is POSIX space */
+   (uschar *)"\\p{Xwd}",   /* word */
+   NULL,                   /* xdigit */
+   /* Negated cases */
+   (uschar *)"\\P{L}",     /* ^alpha */
+   (uschar *)"\\P{Ll}",    /* ^lower */
+   (uschar *)"\\P{Lu}",    /* ^upper */
+   (uschar *)"\\P{Xan}",   /* ^alnum */
+   NULL,                   /* ^ascii */
+   (uschar *)"\\H",        /* ^blank */
+   NULL,                   /* ^cntrl */
+   (uschar *)"\\P{Nd}",    /* ^digit */
+   NULL,                   /* ^graph */
+   NULL,                   /* ^print */
+   NULL,                   /* ^punct */
+   (uschar *)"\\P{Xps}",   /* ^space */   /* NOTE: Xps is POSIX space */
+   (uschar *)"\\P{Xwd}",   /* ^word */
+   NULL                    /* ^xdigit */
+ };
+ #define POSIX_SUBSIZE (sizeof(posix_substitutes)/sizeof(uschar *))
+ #endif
  #define STRING(a)  # a
  #define XSTRING(s) STRING(s)
-Line 262 
 the number of relocations needed when a
+Line 320 
 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 309 
 static const char error_texts[] =
+Line 371 
 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 331 
 static const char error_texts[] =
+Line 393 
 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"
+   ;
  /* 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 478 
 static const unsigned char ebcdic_charta
+Line 546 
 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, uschar **, const uschar **, int *, BOOL, BOOL, int, int,
      int *, int *, branch_chain *, compile_data *, int *);
-Line 500 
 static const char *
+Line 568 
 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 uschar *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 571 
 else
+Line 676 
 else
      case CHAR_l:
      case CHAR_L:
-     case CHAR_N:
      case CHAR_u:
      case CHAR_U:
      *errorcodeptr = ERR37;
      break;
-     /* \g must be followed by one of a number of specific things:
+     /* 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 594 
 else
+Line 699 
 else
      the -ESC_g code (cf \k). */
      case CHAR_g:
+     if (isclass) break;
      if (ptr[1] == CHAR_LESS_THAN_SIGN || ptr[1] == CHAR_APOSTROPHE)
        {
        c = -ESC_g;
-Line 772 
 else
+Line 878 
 else
      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 CHAR_c:
-Line 782 
 else
+Line 889 
 else
        *errorcodeptr = ERR2;
        break;
        }
+ #ifndef EBCDIC    /* ASCII/UTF-8 coding */
- #ifndef EBCDIC  /* ASCII/UTF-8 coding */
+     if (c > 127)  /* Excludes all non-ASCII in either mode */
+       {
+       *errorcodeptr = ERR68;
+       break;
+       }
      if (c >= CHAR_a && c <= CHAR_z) c -= 32;
      c ^= 0x40;
- #else           /* EBCDIC coding */
+ #else             /* EBCDIC coding */
      if (c >= CHAR_a && c <= CHAR_z) c += 64;
      c ^= 0xC0;
  #endif
-Line 809 
 else
+Line 920 
 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 909 
 return -1;
+Line 1035 
 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 == 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);
- }
- /*************************************************
  *         Read repeat counts                     *
  *************************************************/
-Line 1017 
 top-level call starts at the beginning o
+Line 1110 
 top-level call starts at the beginning o
  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. We know that if (?P< is
+ returns when it reaches a given numbered subpattern. Recursion is used to keep
- encountered, the name will be terminated by '>' because that is checked in the
+ track of subpatterns that reset the capturing group numbers - the (?| feature.
- first pass. Recursion is used to keep track of subpatterns that reset the
- capturing group numbers - the (?| feature.
+ 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:
    ptrptr       address of the current character pointer (updated)
-Line 1028 
 Arguments:
+Line 1132 
 Arguments:
    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
-Line 1035 
 Returns:       the number of the named s
+Line 1140 
 Returns:       the number of the named s
  static int
  find_parens_sub(uschar **ptrptr, compile_data *cd, const uschar *name, int lorn,
-   BOOL xmode, int *count)
+   BOOL xmode, BOOL utf8, int *count)
  {
  uschar *ptr = *ptrptr;
  int start_count = *count;
-Line 1047 
 dealing with. The very first call may no
+Line 1152 
 dealing with. The very first call may no
  if (ptr[0] == CHAR_LEFT_PARENTHESIS)
    {
-   if (ptr[1] == CHAR_QUESTION_MARK &&
+   /* Handle specials such as (*SKIP) or (*UTF8) etc. */
-       ptr[2] == CHAR_VERTICAL_LINE)
+   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 a normal, unnamed capturing parenthesis */
+   /* Handle comments; all characters are allowed until a ket is reached. */
-   else if (ptr[1] != CHAR_QUESTION_MARK && ptr[1] != CHAR_ASTERISK)
+   else if (ptr[2] == CHAR_NUMBER_SIGN)
      {
-     *count += 1;
+     for (ptr += 3; *ptr != 0; ptr++) if (*ptr == CHAR_RIGHT_PARENTHESIS) break;
-     if (name == NULL && *count == lorn) return *count;
+     goto FAIL_EXIT;
-     ptr++;
      }
    /* 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. */
+   condition (there can't be any nested parens). */
    else if (ptr[2] == CHAR_LEFT_PARENTHESIS)
      {
-Line 1077 
 if (ptr[0] == CHAR_LEFT_PARENTHESIS)
+Line 1196 
 if (ptr[0] == CHAR_LEFT_PARENTHESIS)
        }
      }
-   /* We have either (? or (* and not a condition */
+   /* Start with (? but not a condition. */
    else
      {
-Line 1100 
 if (ptr[0] == CHAR_LEFT_PARENTHESIS)
+Line 1219 
 if (ptr[0] == CHAR_LEFT_PARENTHESIS)
        if (name != NULL && lorn == ptr - thisname &&
            strncmp((const char *)name, (const char *)thisname, lorn) == 0)
          return *count;
        term++;
        }
      }
    }
  /* Past any initial parenthesis handling, scan for parentheses or vertical
- bars. */
+ 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 != 0; ptr++)
+ for (; ptr < cd->end_pattern; ptr++)
    {
    /* Skip over backslashed characters and also entire \Q...\E */
-Line 1146 
 for (; *ptr != 0; ptr++)
+Line 1267 
 for (; *ptr != 0; ptr++)
            break;
          }
        else if (!negate_class && ptr[1] == CHAR_CIRCUMFLEX_ACCENT)
          {
          negate_class = TRUE;
          ptr++;
          }
        else break;
        }
-Line 1182 
 for (; *ptr != 0; ptr++)
+Line 1303 
 for (; *ptr != 0; ptr++)
    if (xmode && *ptr == CHAR_NUMBER_SIGN)
      {
-     while (*(++ptr) != 0 && *ptr != CHAR_NL) {};
+     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) goto FAIL_EXIT;
      continue;
      }
-Line 1191 
 for (; *ptr != 0; ptr++)
+Line 1320 
 for (; *ptr != 0; ptr++)
    if (*ptr == CHAR_LEFT_PARENTHESIS)
      {
-     int rc = find_parens_sub(&ptr, cd, name, lorn, xmode, count);
+     int rc = find_parens_sub(&ptr, cd, name, lorn, xmode, utf8, count);
      if (rc > 0) return rc;
      if (*ptr == 0) goto FAIL_EXIT;
      }
-Line 1199 
 for (; *ptr != 0; ptr++)
+Line 1328 
 for (; *ptr != 0; ptr++)
    else if (*ptr == CHAR_RIGHT_PARENTHESIS)
      {
      if (dup_parens && *count < hwm_count) *count = hwm_count;
-     *ptrptr = ptr;
+     goto FAIL_EXIT;
-     return -1;
      }
    else if (*ptr == CHAR_VERTICAL_LINE && dup_parens)
-Line 1238 
 Arguments:
+Line 1366 
 Arguments:
    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 uschar *name, int lorn, BOOL xmode)
+ find_parens(compile_data *cd, const uschar *name, int lorn, BOOL xmode,
+   BOOL utf8)
  {
  uschar *ptr = (uschar *)cd->start_pattern;
  int count = 0;
-Line 1256 
 matching closing parens. That is why we
+Line 1386 
 matching closing parens. That is why we
  for (;;)
    {
-   rc = find_parens_sub(&ptr, cd, name, lorn, xmode, &count);
+   rc = find_parens_sub(&ptr, cd, name, lorn, xmode, utf8, &count);
    if (rc > 0 || *ptr++ == 0) break;
    }
-Line 1272 
 return rc;
+Line 1402 
 return rc;
  /* 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*
- first_significant_code(const uschar *code, int *options, int optbit,
+ first_significant_code(const uschar *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:
-Line 1315 
 for (;;)
+Line 1435 
 for (;;)
      case OP_CALLOUT:
      case OP_CREF:
+     case OP_NCREF:
      case OP_RREF:
+     case OP_NRREF:
      case OP_DEF:
      code += _pcre_OP_lengths[*code];
      break;
-Line 1336 
 for (;;)
+Line 1458 
 for (;;)
  /* 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. 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
    cd       the "compile data" structure
  Returns:   the fixed length,
               or -1 if there is no fixed length,
               or -2 if \C was encountered
               or -3 if an OP_RECURSE item was encountered and atend is FALSE
  */
  static int
- find_fixedlength(uschar *code, int options, BOOL atend, compile_data *cd)
+ find_fixedlength(uschar *code, BOOL utf8, BOOL atend, compile_data *cd)
  {
  int length = -1;
-Line 1375 
 for (;;)
+Line 1497 
 for (;;)
    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. They will cause a -1 response from the default
+     case of this switch. */
      case OP_CBRA:
      case OP_BRA:
      case OP_ONCE:
      case OP_COND:
-     d = find_fixedlength(cc + ((op == OP_CBRA)? 2:0), options, atend, cd);
+     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);
-Line 1388 
 for (;;)
+Line 1516 
 for (;;)
      /* Reached end of a branch; if it's a ket it is the end of a nested
      call. If it's ALT it is an alternation in a nested call. If it is
-     END it's the end of the outer call. All can be handled by the same code. */
+     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:
      if (length < 0) length = branchlength;
        else if (length != branchlength) return -1;
-Line 1401 
 for (;;)
+Line 1529 
 for (;;)
      cc += 1 + LINK_SIZE;
      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 = (uschar *)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, options, atend, cd);
+     d = find_fixedlength(cs + 2, utf8, atend, cd);
      if (d < 0) return d;
      branchlength += d;
      cc += 1 + LINK_SIZE;
      break;
      /* Skip over assertive subpatterns */
-Line 1430 
 for (;;)
+Line 1558 
 for (;;)
      case OP_REVERSE:
      case OP_CREF:
+     case OP_NCREF:
      case OP_RREF:
+     case OP_NRREF:
      case OP_DEF:
-     case OP_OPT:
      case OP_CALLOUT:
      case OP_SOD:
      case OP_SOM:
+     case OP_SET_SOM:
      case OP_EOD:
      case OP_EODN:
      case OP_CIRC:
+     case OP_CIRCM:
      case OP_DOLL:
+     case OP_DOLLM:
      case OP_NOT_WORD_BOUNDARY:
      case OP_WORD_BOUNDARY:
      cc += _pcre_OP_lengths[*cc];
-Line 1448 
 for (;;)
+Line 1580 
 for (;;)
      /* 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 && cc[-1] >= 0xc0)
+     if (utf8 && cc[-1] >= 0xc0) cc += _pcre_utf8_table4[cc[-1] & 0x3f];
-       cc += _pcre_utf8_table4[cc[-1] & 0x3f];
  #endif
      break;
-Line 1465 
 for (;;)
+Line 1597 
 for (;;)
      branchlength += GET2(cc,1);
      cc += 4;
  #ifdef SUPPORT_UTF8
-     if ((options & PCRE_UTF8) != 0 && cc[-1] >= 0xc0)
+     if (utf8 && cc[-1] >= 0xc0) cc += _pcre_utf8_table4[cc[-1] & 0x3f];
-       cc += _pcre_utf8_table4[cc[-1] & 0x3f];
  #endif
      break;
-Line 1550 
 for (;;)
+Line 1681 
 for (;;)
  /* This little function scans through a compiled pattern until it finds a
  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:
-Line 1568 
 _pcre_find_bracket(const uschar *code, B
+Line 1699 
 _pcre_find_bracket(const uschar *code, B
  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 1575 
 for (;;)
+Line 1707 
 for (;;)
    the table is zero; the actual length is stored in the compiled code. */
    if (c == OP_XCLASS) code += GET(code, 1);
    /* Handle recursion */
    else if (c == OP_REVERSE)
      {
      if (number < 0) return (uschar *)code;
      code += _pcre_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;
-Line 1595 
 for (;;)
+Line 1728 
 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 1619 
 for (;;)
+Line 1753 
 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+LINK_SIZE];
+       break;
        }
      /* Add in the fixed length from the table */
-Line 1633 
 for (;;)
+Line 1777 
 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:
+       case OP_POSQUERYI:
        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];
        break;
        }
-Line 1690 
 for (;;)
+Line 1847 
 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 1714 
 for (;;)
+Line 1872 
 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+LINK_SIZE];
+       break;
        }
      /* Add in the fixed length from the table */
-Line 1728 
 for (;;)
+Line 1896 
 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:
+       case OP_POSQUERYI:
        if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];
        break;
        }
-Line 1770 
 Arguments:
+Line 1951 
 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 uschar *code, const uschar *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 + _pcre_OP_lengths[*code], TRUE);
       code < endcode;
-      code = first_significant_code(code + _pcre_OP_lengths[c], NULL, 0, TRUE))
+      code = first_significant_code(code + _pcre_OP_lengths[c], TRUE))
    {
    const uschar *ccode;
-Line 1796 
 for (code = first_significant_code(code
+Line 1979 
 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 uschar *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 += _pcre_OP_lengths[c];
      do code += GET(code, 1); while (*code == OP_ALT);
-Line 1806 
 for (code = first_significant_code(code
+Line 2030 
 for (code = first_significant_code(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)
+     {
+     do code += GET(code, 1); while (*code == OP_ALT);
+     c = *code;
+     continue;
+     }
    /* 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_COND)
      {
      BOOL empty_branch;
      if (GET(code, 1) == 0) return TRUE;    /* Hit unclosed bracket */
-Line 1824 
 for (code = first_significant_code(code
+Line 2061 
 for (code = first_significant_code(code
        empty_branch = FALSE;
        do
          {
-         if (!empty_branch && could_be_empty_branch(code, endcode, utf8))
+         if (!empty_branch && could_be_empty_branch(code, endcode, utf8, cd))
            empty_branch = TRUE;
          code += GET(code, 1);
          }
-Line 1895 
 for (code = first_significant_code(code
+Line 2132 
 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 1936 
 for (code = first_significant_code(code
+Line 2174 
 for (code = first_significant_code(code
      case OP_KET:
      case OP_KETRMAX:
      case OP_KETRMIN:
+     case OP_KETRPOS:
      case OP_ALT:
      return TRUE;
-Line 1944 
 for (code = first_significant_code(code
+Line 2183 
 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 += _pcre_utf8_table4[code[1] & 0x3f];
      break;
      case OP_UPTO:
+     case OP_UPTOI:
      case OP_MINUPTO:
+     case OP_MINUPTOI:
      case OP_POSUPTO:
+     case OP_POSUPTOI:
      if (utf8 && code[3] >= 0xc0) code += _pcre_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+LINK_SIZE];
+     break;
+     /* None of the remaining opcodes are required to match a character. */
+     default:
+     break;
      }
    }
-Line 1974 
 return TRUE;
+Line 2240 
 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,
-   BOOL utf8)
+   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 2022 
 where Perl recognizes it as the POSIX cl
+Line 2292 
 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 2036 
 int terminator;          /* Don't combin
+Line 2317 
 int terminator;          /* Don't combin
  terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */
  for (++ptr; *ptr != 0; ptr++)
    {
-   if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET) 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 == CHAR_RIGHT_SQUARE_BRACKET) return FALSE;
      if (*ptr == terminator && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)
        {
        *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 2172 
 auto_callout(uschar *code, const uschar
+Line 2460 
 auto_callout(uschar *code, const uschar
  {
  *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;
  }
-Line 2198 
 Returns:             nothing
+Line 2486 
 Returns:             nothing
  static void
  complete_callout(uschar *previous_callout, const uschar *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 2248 
 for (++c; c <= d; c++)
+Line 2536 
 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 == _pcre_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 (_pcre_ucp_gentype[prop->chartype] == ucp_L ||
+           _pcre_ucp_gentype[prop->chartype] == ucp_N) == negated;
+   case PT_SPACE:    /* Perl space */
+   return (_pcre_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 (_pcre_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 (_pcre_ucp_gentype[prop->chartype] == ucp_L ||
+           _pcre_ucp_gentype[prop->chartype] == ucp_N ||
+           c == CHAR_UNDERSCORE) == negated;
+   }
+ return FALSE;
+ }
  #endif  /* SUPPORT_UCP */
-Line 2261 
 whether the next thing could possibly ma
+Line 2612 
 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 2273 
 Returns:        TRUE if possessifying is
+Line 2622 
 Returns:        TRUE if possessifying is
  */
  static BOOL
- check_auto_possessive(int op_code, int item, BOOL utf8, uschar *utf8_char,
+ check_auto_possessive(const uschar *previous, BOOL utf8, const uschar *ptr,
-   const uschar *ptr, int options, compile_data *cd)
+   int options, compile_data *cd)
  {
- int next;
+ int c, next;
+ int op_code = *previous++;
  /* Skip whitespace and comments in extended mode */
-Line 2287 
 if ((options & PCRE_EXTENDED) != 0)
+Line 2637 
 if ((options & PCRE_EXTENDED) != 0)
      while ((cd->ctypes[*ptr] & ctype_space) != 0) 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 2324 
 if ((options & PCRE_EXTENDED) != 0)
+Line 2681 
 if ((options & PCRE_EXTENDED) != 0)
      while ((cd->ctypes[*ptr] & ctype_space) != 0) 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 2337 
 if (*ptr == CHAR_ASTERISK || *ptr == CHA
+Line 2701 
 if (*ptr == CHAR_ASTERISK || *ptr == CHA
    strncmp((char *)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
+ /* Now compare the next item with the previous opcode. First, handle cases when
- positive single character match, "item" either contains the character or, if
+ the next item is a character. */
- "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. */
  if (next >= 0) switch(op_code)
    {
    case OP_CHAR:
  #ifdef SUPPORT_UTF8
-   if (utf8 && item > 127) { GETCHAR(item, utf8_char); }
+   GETCHARTEST(c, previous);
  #else
-   (void)(utf8_char);  /* Keep compiler happy by referencing function argument */
+   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 2374 
 if (next >= 0) switch(op_code)
+Line 2735 
 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 2395 
 if (next >= 0) switch(op_code)
+Line 2760 
 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 2442 
 if (next >= 0) switch(op_code)
+Line 2810 
 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 2458 
 if (next >= 0) switch(op_code)
+Line 2827 
 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 2527 
 switch(op_code)
+Line 2910 
 switch(op_code)
      case ESC_v:
      case ESC_V:
-     switch(item)
+     switch(c)
        {
        case 0x0a:
        case 0x0b:
-Line 2541 
 switch(op_code)
+Line 2924 
 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((char *)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 2604 
 Arguments:
+Line 3041 
 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 2615 
 Returns:         TRUE on success
+Line 3053 
 Returns:         TRUE on success
  static BOOL
  compile_branch(int *optionsptr, uschar **codeptr, const uschar **ptrptr,
    int *errorcodeptr, int *firstbyteptr, int *reqbyteptr, branch_chain *bcptr,
-   compile_data *cd, int *lengthptr)
+   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 2624 
 int greedy_default, greedy_non_default;
+Line 3062 
 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;
-Line 2636 
 BOOL inescq = FALSE;
+Line 3074 
 BOOL inescq = FALSE;
  BOOL groupsetfirstbyte = FALSE;
  const uschar *ptr = *ptrptr;
  const uschar *tempptr;
+ const uschar *nestptr = NULL;
  uschar *previous = NULL;
  uschar *previous_callout = NULL;
  uschar *save_hwm = NULL;
  uschar 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;
-Line 2649 
 uschar *class_utf8data_base;
+Line 3092 
 uschar *class_utf8data_base;
  uschar 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 2706 
 for (;; ptr++)
+Line 3148 
 for (;; ptr++)
    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 2736 
 for (;; ptr++)
+Line 3188 
 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));
      /* If "previous" is set and it is not at the start of the work space, move
-Line 2763 
 for (;; ptr++)
+Line 3215 
 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 2811 
 for (;; ptr++)
+Line 3263 
 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 == 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 2854 
 for (;; ptr++)
+Line 3311 
 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 2865 
 for (;; ptr++)
+Line 3322 
 for (;; ptr++)
      the setting of any following char as a first character. */
      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 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
-Line 3059 
 for (;; ptr++)
+Line 3517 
 for (;; ptr++)
            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 3073 
 for (;; ptr++)
+Line 3531 
 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;
-Line 3120 
 for (;; ptr++)
+Line 3593 
 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 == CHAR_BACKSLASH)
          {
          c = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);
          if (*errorcodeptr != 0) goto FAILED;
-         if (-c == ESC_b) c = CHAR_BS;       /* \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 = CHAR_X;   /* \X is literal X in a class */
-         else if (-c == ESC_R) c = CHAR_R;   /* \R is literal R in a class */
          else if (-c == ESC_Q)            /* Handle start of quoted string */
            {
            if (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)
-Line 3149 
 for (;; ptr++)
+Line 3621 
 for (;; ptr++)
            register const uschar *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 3171 
 for (;; ptr++)
+Line 3653 
 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 3182 
 for (;; ptr++)
+Line 3669 
 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 3219 
 for (;; ptr++)
+Line 3693 
 for (;; ptr++)
                }
  #endif
              continue;
-             }
-           if (-c == ESC_H)
+             case ESC_H:
-             {
              for (c = 0; c < 32; c++)
                {
                int x = 0xff;
-Line 3264 
 for (;; ptr++)
+Line 3736 
 for (;; ptr++)
                }
  #endif
              continue;
-             }
-           if (-c == ESC_v)
+             case ESC_v:
-             {
              SETBIT(classbits, 0x0a); /* LF */
              SETBIT(classbits, 0x0b); /* VT */
              SETBIT(classbits, 0x0c); /* FF */
-Line 3283 
 for (;; ptr++)
+Line 3753 
 for (;; ptr++)
                }
  #endif
              continue;
-             }
-           if (-c == ESC_V)
+             case ESC_V:
-             {
              for (c = 0; c < 32; c++)
                {
                int x = 0xff;
-Line 3316 
 for (;; ptr++)
+Line 3784 
 for (;; ptr++)
                }
  #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 3417 
 for (;; ptr++)
+Line 3885 
 for (;; ptr++)
            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 = CHAR_BS;
+             if (d == -ESC_b) d = CHAR_BS; else
-             else if (d == -ESC_X) d = CHAR_X;
-             else if (d == -ESC_R) d = CHAR_R; else
                {
                ptr = oldptr;
                goto LONE_SINGLE_CHARACTER;  /* A few lines below */
-Line 3590 
 for (;; ptr++)
+Line 4055 
 for (;; ptr++)
          }
        }
-     /* Loop until ']' reached. This "while" is the end of the "do" above. */
+     /* Loop until ']' reached. This "while" is the end of the "do" far above.
+     If we are at the end of an internal nested string, revert to the outer
+     string. */
+     while (((c = *(++ptr)) != 0 ||
+            (nestptr != NULL &&
+              (ptr = nestptr, nestptr = NULL, c = *(++ptr)) != 0)) &&
+            (c != CHAR_RIGHT_SQUARE_BRACKET || inescq));
-     while ((c = *(++ptr)) != 0 && (c != CHAR_RIGHT_SQUARE_BRACKET || inescq));
+     /* Check for missing terminating ']' */
-     if (c == 0)                          /* Missing terminating ']' */
+     if (c == 0)
        {
        *errorcodeptr = ERR6;
        goto FAILED;
        }
- /* This code has been disabled because it would mean that \s counts as
- an explicit \r or \n reference, and that's not really what is wanted. Now
- we set the flag only if there is a literal "\r" or "\n" in the class. */
- #if 0
-     /* Remember whether \r or \n are in this class */
-     if (negate_class)
-       {
-       if ((classbits[1] & 0x24) != 0x24) cd->external_flags |= PCRE_HASCRORLF;
-       }
-     else
-       {
-       if ((classbits[1] & 0x24) != 0) cd->external_flags |= PCRE_HASCRORLF;
-       }
- #endif
      /* If class_charcount is 1, we saw precisely one character whose value is
      less than 256. As long as there were no characters >= 128 and there was no
      use of \p or \P, in other words, no use of any XCLASS features, we can
-Line 3626 
 we set the flag only if there is a liter
+Line 4079 
 we set the flag only if there is a liter
      In UTF-8 mode, we can optimize the negative case only if there were no
      characters >= 128 because OP_NOT and the related opcodes like OP_NOTSTAR
-     operate on single-bytes only. This is an historical hangover. Maybe one day
+     operate on single-bytes characters only. This is an historical hangover.
-     we can tidy these opcodes to handle multi-byte characters.
+     Maybe one day we can tidy these opcodes to handle multi-byte characters.
      The optimization throws away the bit map. We turn the item into a
--character OP_CHAR[NC] if it's positive, or OP_NOT if it's negative. Note
+-character OP_CHAR[I] if it's positive, or OP_NOT[I] if it's negative.
-     that OP_NOT does not support multibyte characters. In the positive case, it
+     Note that OP_NOT[I] does not support multibyte characters. In the positive
-     can cause firstbyte to be set. Otherwise, there can be no first char if
+     case, it can cause firstbyte to be set. Otherwise, there can be no first
-     this item is first, whatever repeat count may follow. In the case of
+     char if this item is first, whatever repeat count may follow. In the case
-     reqbyte, save the previous value for reinstating. */
+     of reqbyte, save the previous value for reinstating. */
  #ifdef SUPPORT_UTF8
      if (class_charcount == 1 && !class_utf8 &&
-Line 3645 
 we set the flag only if there is a liter
+Line 4098 
 we set the flag only if there is a liter
        {
        zeroreqbyte = reqbyte;
-       /* The OP_NOT opcode works on one-byte characters only. */
+       /* The OP_NOT[I] opcodes work on one-byte characters only. */
        if (negate_class)
          {
          if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
          zerofirstbyte = firstbyte;
-         *code++ = OP_NOT;
+         *code++ = ((options & PCRE_CASELESS) != 0)? OP_NOTI: OP_NOT;
          *code++ = class_lastchar;
          break;
          }
-Line 3682 
 we set the flag only if there is a liter
+Line 4135 
 we set the flag only if there is a liter
      /* If there are characters with values > 255, we have to compile an
      extended class, with its own opcode, unless there was a negated special
-     such as \S in the class, because in that case all characters > 255 are in
+     such as \S in the class, and PCRE_UCP is not set, because in that case all
-     the class, so any that were explicitly given as well can be ignored. If
+     characters > 255 are in the class, so any that were explicitly given as
-     (when there are explicit characters > 255 that must be listed) there are no
+     well can be ignored. If (when there are explicit characters > 255 that must
-     characters < 256, we can omit the bitmap in the actual compiled code. */
+     be listed) there are no characters < 256, we can omit the bitmap in the
+     actual compiled code. */
  #ifdef SUPPORT_UTF8
-     if (class_utf8 && !should_flip_negation)
+     if (class_utf8 && (!should_flip_negation || (options & PCRE_UCP) != 0))
        {
        *class_utf8data++ = XCL_END;    /* Marks the end of extra data */
        *code++ = OP_XCLASS;
-Line 3714 
 we set the flag only if there is a liter
+Line 4168 
 we set the flag only if there is a liter
        }
  #endif
-     /* If there are no characters > 255, set the opcode to OP_CLASS or
+     /* If there are no characters > 255, or they are all to be included or
-     OP_NCLASS, depending on whether the whole class was negated and whether
+     excluded, set the opcode to OP_CLASS or OP_NCLASS, depending on whether the
-     there were negative specials such as \S in the class. Then copy the 32-byte
+     whole class was negated and whether there were negative specials such as \S
-     map into the code vector, negating it if necessary. */
+     (non-UCP) in the class. Then copy the 32-byte map into the code vector,
+     negating it if necessary. */
      *code++ = (negate_class == should_flip_negation) ? OP_CLASS : OP_NCLASS;
      if (negate_class)
-Line 3777 
 we set the flag only if there is a liter
+Line 4232 
 we set the flag only if there is a liter
      op_type = 0;                    /* Default single-char op codes */
      possessive_quantifier = FALSE;  /* Default not possessive quantifier */
-     /* Save start of previous item, in case we have to move it up to make space
+     /* Save start of previous item, in case we have to move it up in order to
-     for an inserted OP_ONCE for the additional '+' extension. */
+     insert something before it. */
      tempcode = previous;
-Line 3801 
 we set the flag only if there is a liter
+Line 4256 
 we set the flag only if there is a liter
        }
      else repeat_type = greedy_default;
+     /* If previous was a recursion call, wrap it in atomic brackets so that
+     previous becomes the atomic group. All recursions were so wrapped in the
+     past, but it no longer happens for non-repeated recursions. In fact, the
+     repeated ones could be re-implemented independently so as not to need this,
+     but for the moment we rely on the code for repeating groups. */
+     if (*previous == OP_RECURSE)
+       {
+       memmove(previous + 1 + LINK_SIZE, previous, 1 + LINK_SIZE);
+       *previous = OP_ONCE;
+       PUT(previous, 1, 2 + 2*LINK_SIZE);
+       previous[2 + 2*LINK_SIZE] = OP_KET;
+       PUT(previous, 3 + 2*LINK_SIZE, 2 + 2*LINK_SIZE);
+       code += 2 + 2 * LINK_SIZE;
+       length_prevgroup = 3 + 3*LINK_SIZE;
+       /* When actually compiling, we need to check whether this was a forward
+       reference, and if so, adjust the offset. */
+       if (lengthptr == NULL && cd->hwm >= cd->start_workspace + LINK_SIZE)
+         {
+         int offset = GET(cd->hwm, -LINK_SIZE);
+         if (offset == previous + 1 - cd->start_code)
+           PUT(cd->hwm, -LINK_SIZE, offset + 1 + LINK_SIZE);
+         }
+       }
+     /* Now handle repetition for the different types of item. */
      /* If previous was a character match, abolish the item and generate a
      repeat item instead. If a char item has a minumum of more than one, ensure
      that it is set in reqbyte - it might not be if a sequence such as x{3} is
      the first thing in a branch because the x will have gone into firstbyte
      instead.  */
-     if (*previous == OP_CHAR || *previous == OP_CHARNC)
+     if (*previous == OP_CHAR || *previous == OP_CHARI)
        {
+       op_type = (*previous == OP_CHAR)? 0 : OP_STARI - OP_STAR;
        /* Deal with UTF-8 characters that take up more than one byte. It's
        easier to write this out separately than try to macrify it. Use c to
        hold the length of the character in bytes, plus 0x80 to flag that it's a
-Line 3841 
 we set the flag only if there is a liter
+Line 4327 
 we set the flag only if there is a liter
        if (!possessive_quantifier &&
            repeat_max < 0 &&
-           check_auto_possessive(*previous, c, utf8, utf8_char, ptr + 1,
+           check_auto_possessive(previous, utf8, ptr + 1, options, cd))
-             options, cd))
          {
          repeat_type = 0;    /* Force greedy */
          possessive_quantifier = TRUE;
-Line 3854 
 we set the flag only if there is a liter
+Line 4339 
 we set the flag only if there is a liter
      /* If previous was a single negated character ([^a] or similar), we use
      one of the special opcodes, replacing it. The code is shared with single-
      character repeats by setting opt_type to add a suitable offset into
-     repeat_type. We can also test for auto-possessification. OP_NOT is
+     repeat_type. We can also test for auto-possessification. OP_NOT and OP_NOTI
-     currently used only for single-byte chars. */
+     are currently used only for single-byte chars. */
-     else if (*previous == OP_NOT)
+     else if (*previous == OP_NOT || *previous == OP_NOTI)
        {
-       op_type = OP_NOTSTAR - OP_STAR;  /* Use "not" opcodes */
+       op_type = ((*previous == OP_NOT)? OP_NOTSTAR : OP_NOTSTARI) - OP_STAR;
        c = previous[1];
        if (!possessive_quantifier &&
            repeat_max < 0 &&
-           check_auto_possessive(OP_NOT, c, utf8, NULL, ptr + 1, options, cd))
+           check_auto_possessive(previous, utf8, ptr + 1, options, cd))
          {
          repeat_type = 0;    /* Force greedy */
          possessive_quantifier = TRUE;
-Line 3887 
 we set the flag only if there is a liter
+Line 4372 
 we set the flag only if there is a liter
        if (!possessive_quantifier &&
            repeat_max < 0 &&
-           check_auto_possessive(c, 0, utf8, NULL, ptr + 1, options, cd))
+           check_auto_possessive(previous, utf8, ptr + 1, options, cd))
          {
          repeat_type = 0;    /* Force greedy */
          possessive_quantifier = TRUE;
-Line 3909 
 we set the flag only if there is a liter
+Line 4394 
 we set the flag only if there is a liter
        if (repeat_max == 0) goto END_REPEAT;
        /*--------------------------------------------------------------------*/
        /* This code is obsolete from release 8.00; the restriction was finally
        removed: */
        /* All real repeats make it impossible to handle partial matching (maybe
        one day we will be able to remove this restriction). */
        /* if (repeat_max != 1) cd->external_flags |= PCRE_NOPARTIAL; */
        /*--------------------------------------------------------------------*/
        /* Combine the op_type with the repeat_type */
-Line 4056 
 we set the flag only if there is a liter
+Line 4541 
 we set the flag only if there is a liter
  #ifdef SUPPORT_UTF8
               *previous == OP_XCLASS ||
  #endif
-              *previous == OP_REF)
+              *previous == OP_REF ||
+              *previous == OP_REFI)
        {
        if (repeat_max == 0)
          {
-Line 4064 
 we set the flag only if there is a liter
+Line 4550 
 we set the flag only if there is a liter
          goto END_REPEAT;
          }
        /*--------------------------------------------------------------------*/
        /* This code is obsolete from release 8.00; the restriction was finally
        removed: */
-Line 4072 
 we set the flag only if there is a liter
+Line 4558 
 we set the flag only if there is a liter
        one day we will be able to remove this restriction). */
        /* if (repeat_max != 1) cd->external_flags |= PCRE_NOPARTIAL; */
        /*--------------------------------------------------------------------*/
        if (repeat_min == 0 && repeat_max == -1)
          *code++ = OP_CRSTAR + repeat_type;
-Line 4090 
 we set the flag only if there is a liter
+Line 4576 
 we set the flag only if there is a liter
        }
      /* If previous was a bracket group, we may have to replicate it in certain
-     cases. */
+     cases. Note that at this point we can encounter only the "basic" bracket
+     opcodes such as BRA and CBRA, as this is the place where they get converted
+     into the more special varieties such as BRAPOS and SBRA. A test for >=
+     OP_ASSERT and <= OP_COND includes ASSERT, ASSERT_NOT, ASSERTBACK,
+     ASSERTBACK_NOT, ONCE, BRA, CBRA, and COND. Originally, PCRE did not allow
+     repetition of assertions, but now it does, for Perl compatibility. */
-     else if (*previous == OP_BRA  || *previous == OP_CBRA ||
+     else if (*previous >= OP_ASSERT && *previous <= OP_COND)
-              *previous == OP_ONCE || *previous == OP_COND)
        {
        register int i;
-       int ketoffset = 0;
+       int len = (int)(code - previous);
-       int len = code - previous;
        uschar *bralink = NULL;
+       uschar *brazeroptr = NULL;
-       /* Repeating a DEFINE group is pointless */
+       /* Repeating a DEFINE group is pointless, but Perl allows the syntax, so
+       we just ignore the repeat. */
        if (*previous == OP_COND && previous[LINK_SIZE+1] == OP_DEF)
-         {
+         goto END_REPEAT;
-         *errorcodeptr = ERR55;
-         goto FAILED;
+       /* There is no sense in actually repeating assertions. The only potential
-         }
+       use of repetition is in cases when the assertion is optional. Therefore,
+       if the minimum is greater than zero, just ignore the repeat. If the
+       maximum is not not zero or one, set it to 1. */
-       /* If the maximum repeat count is unlimited, find the end of the bracket
+       if (*previous < OP_ONCE)    /* Assertion */
-       by scanning through from the start, and compute the offset back to it
+         {
-       from the current code pointer. There may be an OP_OPT setting following
+         if (repeat_min > 0) goto END_REPEAT;
-       the final KET, so we can't find the end just by going back from the code
+         if (repeat_max < 0 || repeat_max > 1) repeat_max = 1;
-       pointer. */
-       if (repeat_max == -1)
-         {
-         register uschar *ket = previous;
-         do ket += GET(ket, 1); while (*ket != OP_KET);
-         ketoffset = code - ket;
          }
        /* The case of a zero minimum is special because of the need to stick
-Line 4139 
 we set the flag only if there is a liter
+Line 4625 
 we set the flag only if there is a liter
          **   goto END_REPEAT;
          **   }
-         However, that fails when a group is referenced as a subroutine from
+         However, that fails when a group or a subgroup within it is referenced
-         elsewhere in the pattern, so now we stick in OP_SKIPZERO in front of it
+         as a subroutine from elsewhere in the pattern, so now we stick in
-         so that it is skipped on execution. As we don't have a list of which
+         OP_SKIPZERO in front of it so that it is skipped on execution. As we
-         groups are referenced, we cannot do this selectively.
+         don't have a list of which groups are referenced, we cannot do this
+         selectively.
          If the maximum is 1 or unlimited, we just have to stick in the BRAZERO
          and do no more at this point. However, we do need to adjust any
-Line 4162 
 we set the flag only if there is a liter
+Line 4649 
 we set the flag only if there is a liter
              *previous++ = OP_SKIPZERO;
              goto END_REPEAT;
              }
+           brazeroptr = previous;    /* Save for possessive optimizing */
            *previous++ = OP_BRAZERO + repeat_type;
            }
-Line 4186 
 we set the flag only if there is a liter
+Line 4674 
 we set the flag only if there is a liter
            /* We chain together the bracket offset fields that have to be
            filled in later when the ends of the brackets are reached. */
-           offset = (bralink == NULL)? 0 : previous - bralink;
+           offset = (bralink == NULL)? 0 : (int)(previous - bralink);
            bralink = previous;
            PUTINC(previous, 0, offset);
            }
-Line 4207 
 we set the flag only if there is a liter
+Line 4695 
 we set the flag only if there is a liter
            {
            /* In the pre-compile phase, we don't actually do the replication. We
            just adjust the length as if we had. Do some paranoid checks for
-           potential integer overflow. */
+           potential integer overflow. The INT64_OR_DOUBLE type is a 64-bit
+           integer type when available, otherwise double. */
            if (lengthptr != NULL)
              {
              int delta = (repeat_min - 1)*length_prevgroup;
-             if ((double)(repeat_min - 1)*(double)length_prevgroup >
+             if ((INT64_OR_DOUBLE)(repeat_min - 1)*
-                                                             (double)INT_MAX ||
+                   (INT64_OR_DOUBLE)length_prevgroup >
+                     (INT64_OR_DOUBLE)INT_MAX ||
                  OFLOW_MAX - *lengthptr < delta)
                {
                *errorcodeptr = ERR20;
-Line 4259 
 we set the flag only if there is a liter
+Line 4749 
 we set the flag only if there is a liter
          just adjust the length as if we had. For each repetition we must add 1
          to the length for BRAZERO and for all but the last repetition we must
          add 2 + 2*LINKSIZE to allow for the nesting that occurs. Do some
-         paranoid checks to avoid integer overflow. */
+         paranoid checks to avoid integer overflow. The INT64_OR_DOUBLE type is
+         a 64-bit integer type when available, otherwise double. */
          if (lengthptr != NULL && repeat_max > 0)
            {
            int delta = repeat_max * (length_prevgroup + 1 + 2 + 2*LINK_SIZE) -
 - 2*LINK_SIZE;   /* Last one doesn't nest */
-           if ((double)repeat_max *
+           if ((INT64_OR_DOUBLE)repeat_max *
-                 (double)(length_prevgroup + 1 + 2 + 2*LINK_SIZE)
+                 (INT64_OR_DOUBLE)(length_prevgroup + 1 + 2 + 2*LINK_SIZE)
-                   > (double)INT_MAX ||
+                   > (INT64_OR_DOUBLE)INT_MAX ||
                OFLOW_MAX - *lengthptr < delta)
              {
              *errorcodeptr = ERR20;
-Line 4292 
 we set the flag only if there is a liter
+Line 4783 
 we set the flag only if there is a liter
              {
              int offset;
              *code++ = OP_BRA;
-             offset = (bralink == NULL)? 0 : code - bralink;
+             offset = (bralink == NULL)? 0 : (int)(code - bralink);
              bralink = code;
              PUTINC(code, 0, offset);
              }
-Line 4313 
 we set the flag only if there is a liter
+Line 4804 
 we set the flag only if there is a liter
          while (bralink != NULL)
            {
            int oldlinkoffset;
-           int offset = code - bralink + 1;
+           int offset = (int)(code - bralink + 1);
            uschar *bra = code - offset;
            oldlinkoffset = GET(bra, 1);
            bralink = (oldlinkoffset == 0)? NULL : bralink - oldlinkoffset;
-Line 4323 
 we set the flag only if there is a liter
+Line 4814 
 we set the flag only if there is a liter
            }
          }
-       /* If the maximum is unlimited, set a repeater in the final copy. We
+       /* If the maximum is unlimited, set a repeater in the final copy. For
-       can't just offset backwards from the current code point, because we
+       ONCE brackets, that's all we need to do. However, possessively repeated
-       don't know if there's been an options resetting after the ket. The
+       ONCE brackets can be converted into non-capturing brackets, as the
-       correct offset was computed above.
+       behaviour of (?:xx)++ is the same as (?>xx)++ and this saves having to
+       deal with possessive ONCEs specially.
+       Otherwise, if the quantifier was possessive, we convert the BRA code to
+       the POS form, and the KET code to KETRPOS. (It turns out to be convenient
+       at runtime to detect this kind of subpattern at both the start and at the
+       end.) The use of special opcodes makes it possible to reduce greatly the
+       stack usage in pcre_exec(). If the group is preceded by OP_BRAZERO,
+       convert this to OP_BRAPOSZERO. Then cancel the possessive flag so that
+       the default action below, of wrapping everything inside atomic brackets,
+       does not happen.
        Then, when we are doing the actual compile phase, check to see whether
-       this group is a non-atomic one that could match an empty string. If so,
+       this group is one that could match an empty string. If so, convert the
-       convert the initial operator to the S form (e.g. OP_BRA -> OP_SBRA) so
+       initial operator to the S form (e.g. OP_BRA -> OP_SBRA) so that runtime
-       that runtime checking can be done. [This check is also applied to
+       checking can be done. [This check is also applied to ONCE groups at
-       atomic groups at runtime, but in a different way.] */
+       runtime, but in a different way.] */
        else
          {
-         uschar *ketcode = code - ketoffset;
+         uschar *ketcode = code - 1 - LINK_SIZE;
          uschar *bracode = ketcode - GET(ketcode, 1);
-         *ketcode = OP_KETRMAX + repeat_type;
-         if (lengthptr == NULL && *bracode != OP_ONCE)
+         if (*bracode == OP_ONCE && possessive_quantifier) *bracode = OP_BRA;
+         if (*bracode == OP_ONCE)
+           *ketcode = OP_KETRMAX + repeat_type;
+         else
            {
-           uschar *scode = bracode;
+           if (possessive_quantifier)
-           do
+             {
+             *bracode += 1;                   /* Switch to xxxPOS opcodes */
+             *ketcode = OP_KETRPOS;
+             if (brazeroptr != NULL) *brazeroptr = OP_BRAPOSZERO;
+             possessive_quantifier = FALSE;
+             }
+           else *ketcode = OP_KETRMAX + repeat_type;
+           if (lengthptr == NULL)
              {
-             if (could_be_empty_branch(scode, ketcode, utf8))
+             uschar *scode = bracode;
+             do
                {
-               *bracode += OP_SBRA - OP_BRA;
+               if (could_be_empty_branch(scode, ketcode, utf8, cd))
-               break;
+                 {
+                 *bracode += OP_SBRA - OP_BRA;
+                 break;
+                 }
+               scode += GET(scode, 1);
                }
-             scode += GET(scode, 1);
+             while (*scode == OP_ALT);
              }
-           while (*scode == OP_ALT);
            }
          }
        }
-Line 4372 
 we set the flag only if there is a liter
+Line 4888 
 we set the flag only if there is a liter
        }
      /* If the character following a repeat is '+', or if certain optimization
-     tests above succeeded, possessive_quantifier is TRUE. For some of the
+     tests above succeeded, possessive_quantifier is TRUE. For some opcodes,
-     simpler opcodes, there is an special alternative opcode for this. For
+     there are special alternative opcodes for this case. For anything else, we
-     anything else, we wrap the entire repeated item inside OP_ONCE brackets.
+     wrap the entire repeated item inside OP_ONCE brackets. Logically, the '+'
-     The '+' notation is just syntactic sugar, taken from Sun's Java package,
+     notation is just syntactic sugar, taken from Sun's Java package, but the
-     but the special opcodes can optimize it a bit. The repeated item starts at
+     special opcodes can optimize it.
-     tempcode, not at previous, which might be the first part of a string whose
-     (former) last char we repeated.
+     Possessively repeated subpatterns have already been handled in the code
+     just above, so possessive_quantifier is always FALSE for them at this
+     stage.
+     Note that the repeated item starts at tempcode, not at previous, which
+     might be the first part of a string whose (former) last char we repeated.
      Possessifying an 'exact' quantifier has no effect, so we can ignore it. But
      an 'upto' may follow. We skip over an 'exact' item, and then test the
-Line 4387 
 we set the flag only if there is a liter
+Line 4908 
 we set the flag only if there is a liter
      if (possessive_quantifier)
        {
        int len;
        if (*tempcode == OP_TYPEEXACT)
          tempcode += _pcre_OP_lengths[*tempcode] +
            ((tempcode[3] == OP_PROP || tempcode[3] == OP_NOTPROP)? 2 : 0);
        else if (*tempcode == OP_EXACT || *tempcode == OP_NOTEXACT)
          {
          tempcode += _pcre_OP_lengths[*tempcode];
-Line 4399 
 we set the flag only if there is a liter
+Line 4920 
 we set the flag only if there is a liter
          if (utf8 && tempcode[-1] >= 0xc0)
            tempcode += _pcre_utf8_table4[tempcode[-1] & 0x3f];
  #endif
          }
-       len = code - tempcode;
+       len = (int)(code - tempcode);
        if (len > 0) switch (*tempcode)
          {
          case OP_STAR:  *tempcode = OP_POSSTAR; break;
-Line 4409 
 we set the flag only if there is a liter
+Line 4930 
 we set the flag only if there is a liter
          case OP_QUERY: *tempcode = OP_POSQUERY; break;
          case OP_UPTO:  *tempcode = OP_POSUPTO; break;
-         case OP_TYPESTAR:  *tempcode = OP_TYPEPOSSTAR; break;
+         case OP_STARI:  *tempcode = OP_POSSTARI; break;
-         case OP_TYPEPLUS:  *tempcode = OP_TYPEPOSPLUS; break;
+         case OP_PLUSI:  *tempcode = OP_POSPLUSI; break;
-         case OP_TYPEQUERY: *tempcode = OP_TYPEPOSQUERY; break;
+         case OP_QUERYI: *tempcode = OP_POSQUERYI; break;
-         case OP_TYPEUPTO:  *tempcode = OP_TYPEPOSUPTO; break;
+         case OP_UPTOI:  *tempcode = OP_POSUPTOI; break;
          case OP_NOTSTAR:  *tempcode = OP_NOTPOSSTAR; break;
          case OP_NOTPLUS:  *tempcode = OP_NOTPOSPLUS; break;
          case OP_NOTQUERY: *tempcode = OP_NOTPOSQUERY; break;
          case OP_NOTUPTO:  *tempcode = OP_NOTPOSUPTO; break;
+         case OP_NOTSTARI:  *tempcode = OP_NOTPOSSTARI; break;
+         case OP_NOTPLUSI:  *tempcode = OP_NOTPOSPLUSI; break;
+         case OP_NOTQUERYI: *tempcode = OP_NOTPOSQUERYI; break;
+         case OP_NOTUPTOI:  *tempcode = OP_NOTPOSUPTOI; break;
+         case OP_TYPESTAR:  *tempcode = OP_TYPEPOSSTAR; break;
+         case OP_TYPEPLUS:  *tempcode = OP_TYPEPOSPLUS; break;
+         case OP_TYPEQUERY: *tempcode = OP_TYPEPOSQUERY; break;
+         case OP_TYPEUPTO:  *tempcode = OP_TYPEPOSUPTO; break;
+         /* Because we are moving code along, we must ensure that any
+         pending recursive references are updated. */
          default:
+         *code = OP_END;
+         adjust_recurse(tempcode, 1 + LINK_SIZE, utf8, cd, save_hwm);
          memmove(tempcode + 1+LINK_SIZE, tempcode, len);
          code += 1 + LINK_SIZE;
          len += 1 + LINK_SIZE;
-Line 4455 
 we set the flag only if there is a liter
+Line 4991 
 we set the flag only if there is a liter
      /* First deal with various "verbs" that can be introduced by '*'. */
-     if (*(++ptr) == CHAR_ASTERISK && (cd->ctypes[ptr[1]] & ctype_letter) != 0)
+     if (*(++ptr) == CHAR_ASTERISK &&
+          ((cd->ctypes[ptr[1]] & ctype_letter) != 0 || ptr[1] == ':'))
        {
        int i, namelen;
+       int arglen = 0;
        const char *vn = verbnames;
-       const uschar *name = ++ptr;
+       const uschar *name = ptr + 1;
+       const uschar *arg = NULL;
        previous = NULL;
        while ((cd->ctypes[*++ptr] & ctype_letter) != 0) {};
+       namelen = (int)(ptr - name);
+       /* It appears that Perl allows any characters whatsoever, other than
+       a closing parenthesis, to appear in arguments, so we no longer insist on
+       letters, digits, and underscores. */
        if (*ptr == CHAR_COLON)
          {
-         *errorcodeptr = ERR59;   /* Not supported */
+         arg = ++ptr;
-         goto FAILED;
+         while (*ptr != 0 && *ptr != CHAR_RIGHT_PARENTHESIS) ptr++;
+         arglen = (int)(ptr - arg);
          }
        if (*ptr != CHAR_RIGHT_PARENTHESIS)
          {
          *errorcodeptr = ERR60;
          goto FAILED;
          }
-       namelen = ptr - name;
+       /* Scan the table of verb names */
        for (i = 0; i < verbcount; i++)
          {
          if (namelen == verbs[i].len &&
              strncmp((char *)name, vn, namelen) == 0)
            {
-           /* Check for open captures before ACCEPT */
+           /* Check for open captures before ACCEPT and convert it to
+           ASSERT_ACCEPT if in an assertion. */
            if (verbs[i].op == OP_ACCEPT)
              {
              open_capitem *oc;
-             cd->had_accept = TRUE;
+             if (arglen != 0)
+               {
+               *errorcodeptr = ERR59;
+               goto FAILED;
+               }
+             cd->had_accept = TRUE;
              for (oc = cd->open_caps; oc != NULL; oc = oc->next)
                {
                *code++ = OP_CLOSE;
                PUT2INC(code, 0, oc->number);
                }
-             }
+             *code++ = (cd->assert_depth > 0)? OP_ASSERT_ACCEPT : OP_ACCEPT;
-           *code++ = verbs[i].op;
+             }
-           break;
+           /* Handle other cases with/without an argument */
+           else if (arglen == 0)
+             {
+             if (verbs[i].op < 0)   /* Argument is mandatory */
+               {
+               *errorcodeptr = ERR66;
+               goto FAILED;
+               }
+             *code = verbs[i].op;
+             if (*code++ == OP_THEN)
+               {
+               PUT(code, 0, code - bcptr->current_branch - 1);
+               code += LINK_SIZE;
+               }
+             }
+           else
+             {
+             if (verbs[i].op_arg < 0)   /* Argument is forbidden */
+               {
+               *errorcodeptr = ERR59;
+               goto FAILED;
+               }
+             *code = verbs[i].op_arg;
+             if (*code++ == OP_THEN_ARG)
+               {
+               PUT(code, 0, code - bcptr->current_branch - 1);
+               code += LINK_SIZE;
+               }
+             *code++ = arglen;
+             memcpy(code, arg, arglen);
+             code += arglen;
+             *code++ = 0;
+             }
+           break;  /* Found verb, exit loop */
            }
          vn += verbs[i].len + 1;
          }
-       if (i < verbcount) continue;
-       *errorcodeptr = ERR60;
+       if (i < verbcount) continue;    /* Successfully handled a verb */
+       *errorcodeptr = ERR60;          /* Verb not recognized */
        goto FAILED;
        }
-Line 4615 
 we set the flag only if there is a liter
+Line 5209 
 we set the flag only if there is a liter
                recno * 10 + *ptr - CHAR_0 : -1;
            ptr++;
            }
-         namelen = ptr - name;
+         namelen = (int)(ptr - name);
          if ((terminator > 0 && *ptr++ != terminator) ||
              *ptr++ != CHAR_RIGHT_PARENTHESIS)
-Line 4652 
 we set the flag only if there is a liter
+Line 5246 
 we set the flag only if there is a liter
            }
          /* Otherwise (did not start with "+" or "-"), start by looking for the
-         name. */
+         name. If we find a name, add one to the opcode to change OP_CREF or
+         OP_RREF into OP_NCREF or OP_NRREF. These behave exactly the same,
+         except they record that the reference was originally to a name. The
+         information is used to check duplicate names. */
          slot = cd->name_table;
          for (i = 0; i < cd->names_found; i++)
-Line 4667 
 we set the flag only if there is a liter
+Line 5264 
 we set the flag only if there is a liter
            {
            recno = GET2(slot, 0);
            PUT2(code, 2+LINK_SIZE, recno);
+           code[1+LINK_SIZE]++;
            }
          /* Search the pattern for a forward reference */
          else if ((i = find_parens(cd, name, namelen,
-                         (options & PCRE_EXTENDED) != 0)) > 0)
+                         (options & PCRE_EXTENDED) != 0, utf8)) > 0)
            {
            PUT2(code, 2+LINK_SIZE, i);
+           code[1+LINK_SIZE]++;
            }
          /* If terminator == 0 it means that the name followed directly after
-Line 4739 
 we set the flag only if there is a liter
+Line 5338 
 we set the flag only if there is a liter
          /* ------------------------------------------------------------ */
          case CHAR_EQUALS_SIGN:                 /* Positive lookahead */
          bravalue = OP_ASSERT;
+         cd->assert_depth += 1;
          ptr++;
          break;
-Line 4753 
 we set the flag only if there is a liter
+Line 5353 
 we set the flag only if there is a liter
            continue;
            }
          bravalue = OP_ASSERT_NOT;
+         cd->assert_depth += 1;
          break;
-Line 4762 
 we set the flag only if there is a liter
+Line 5363 
 we set the flag only if there is a liter
            {
            case CHAR_EQUALS_SIGN:               /* Positive lookbehind */
            bravalue = OP_ASSERTBACK;
+           cd->assert_depth += 1;
            ptr += 2;
            break;
            case CHAR_EXCLAMATION_MARK:          /* Negative lookbehind */
            bravalue = OP_ASSERTBACK_NOT;
+           cd->assert_depth += 1;
            ptr += 2;
            break;
-Line 4806 
 we set the flag only if there is a liter
+Line 5409 
 we set the flag only if there is a liter
              goto FAILED;
              }
            *code++ = n;
-           PUT(code, 0, ptr - cd->start_pattern + 1);  /* Pattern offset */
+           PUT(code, 0, (int)(ptr - cd->start_pattern + 1)); /* Pattern offset */
-           PUT(code, LINK_SIZE, 0);                    /* Default length */
+           PUT(code, LINK_SIZE, 0);                          /* Default length */
            code += 2 * LINK_SIZE;
            }
          previous = NULL;
-Line 4840 
 we set the flag only if there is a liter
+Line 5443 
 we set the flag only if there is a liter
            name = ++ptr;
            while ((cd->ctypes[*ptr] & ctype_word) != 0) ptr++;
-           namelen = ptr - name;
+           namelen = (int)(ptr - name);
            /* In the pre-compile phase, just do a syntax check. */
-Line 4867 
 we set the flag only if there is a liter
+Line 5470 
 we set the flag only if there is a liter
                }
              }
-           /* In the real compile, create the entry in the table */
+           /* In the real compile, create the entry in the table, maintaining
+           alphabetical order. Duplicate names for different numbers are
+           permitted only if PCRE_DUPNAMES is set. Duplicate names for the same
+           number are always OK. (An existing number can be re-used if (?|
+           appears in the pattern.) In either event, a duplicate name results in
+           a duplicate entry in the table, even if the number is the same. This
+           is because the number of names, and hence the table size, is computed
+           in the pre-compile, and it affects various numbers and pointers which
+           would all have to be modified, and the compiled code moved down, if
+           duplicates with the same number were omitted from the table. This
+           doesn't seem worth the hassle. However, *different* names for the
+           same number are not permitted. */
            else
              {
+             BOOL dupname = FALSE;
              slot = cd->name_table;
              for (i = 0; i < cd->names_found; i++)
                {
                int crc = memcmp(name, slot+2, namelen);
-Line 4879 
 we set the flag only if there is a liter
+Line 5495 
 we set the flag only if there is a liter
                  {
                  if (slot[2+namelen] == 0)
                    {
-                   if ((options & PCRE_DUPNAMES) == 0)
+                   if (GET2(slot, 0) != cd->bracount + 1 &&
+                       (options & PCRE_DUPNAMES) == 0)
                      {
                      *errorcodeptr = ERR43;
                      goto FAILED;
                      }
+                   else dupname = TRUE;
                    }
-                 else crc = -1;      /* Current name is substring */
+                 else crc = -1;      /* Current name is a substring */
                  }
+               /* Make space in the table and break the loop for an earlier
+               name. For a duplicate or later name, carry on. We do this for
+               duplicates so that in the simple case (when ?(| is not used) they
+               are in order of their numbers. */
                if (crc < 0)
                  {
                  memmove(slot + cd->name_entry_size, slot,
                    (cd->names_found - i) * cd->name_entry_size);
                  break;
                  }
+               /* Continue the loop for a later or duplicate name */
                slot += cd->name_entry_size;
                }
+             /* For non-duplicate names, check for a duplicate number before
+             adding the new name. */
+             if (!dupname)
+               {
+               uschar *cslot = cd->name_table;
+               for (i = 0; i < cd->names_found; i++)
+                 {
+                 if (cslot != slot)
+                   {
+                   if (GET2(cslot, 0) == cd->bracount + 1)
+                     {
+                     *errorcodeptr = ERR65;
+                     goto FAILED;
+                     }
+                   }
+                 else i--;
+                 cslot += cd->name_entry_size;
+                 }
+               }
              PUT2(slot, 0, cd->bracount + 1);
              memcpy(slot + 2, name, namelen);
              slot[2+namelen] = 0;
              }
            }
-         /* In both cases, count the number of names we've encountered. */
+         /* In both pre-compile and compile, count the number of names we've
+         encountered. */
-         ptr++;                    /* Move past > or ' */
          cd->names_found++;
+         ptr++;                    /* Move past > or ' */
          goto NUMBERED_GROUP;
-Line 4924 
 we set the flag only if there is a liter
+Line 5573 
 we set the flag only if there is a liter
          NAMED_REF_OR_RECURSE:
          name = ++ptr;
          while ((cd->ctypes[*ptr] & ctype_word) != 0) ptr++;
-         namelen = ptr - name;
+         namelen = (int)(ptr - name);
-         /* In the pre-compile phase, do a syntax check and set a dummy
+         /* In the pre-compile phase, do a syntax check. We used to just set
-         reference number. */
+         a dummy reference number, because it was not used in the first pass.
+         However, with the change of recursive back references to be atomic,
+         we have to look for the number so that this state can be identified, as
+         otherwise the incorrect length is computed. If it's not a backwards
+         reference, the dummy number will do. */
          if (lengthptr != NULL)
            {
+           const uschar *temp;
            if (namelen == 0)
              {
              *errorcodeptr = ERR62;
-Line 4946 
 we set the flag only if there is a liter
+Line 5601 
 we set the flag only if there is a liter
              *errorcodeptr = ERR48;
              goto FAILED;
              }
-           recno = 0;
+           /* The name table does not exist in the first pass, so we cannot
+           do a simple search as in the code below. Instead, we have to scan the
+           pattern to find the number. It is important that we scan it only as
+           far as we have got because the syntax of named subpatterns has not
+           been checked for the rest of the pattern, and find_parens() assumes
+           correct syntax. In any case, it's a waste of resources to scan
+           further. We stop the scan at the current point by temporarily
+           adjusting the value of cd->endpattern. */
+           temp = cd->end_pattern;
+           cd->end_pattern = ptr;
+           recno = find_parens(cd, name, namelen,
+             (options & PCRE_EXTENDED) != 0, utf8);
+           cd->end_pattern = temp;
+           if (recno < 0) recno = 0;    /* Forward ref; set dummy number */
            }
          /* In the real compile, seek the name in the table. We check the name
-Line 4971 
 we set the flag only if there is a liter
+Line 5641 
 we set the flag only if there is a liter
              }
            else if ((recno =                /* Forward back reference */
                      find_parens(cd, name, namelen,
-                       (options & PCRE_EXTENDED) != 0)) <= 0)
+                       (options & PCRE_EXTENDED) != 0, utf8)) <= 0)
              {
              *errorcodeptr = ERR15;
              goto FAILED;
-Line 5074 
 we set the flag only if there is a liter
+Line 5744 
 we set the flag only if there is a liter
            if (lengthptr == NULL)
              {
              *code = OP_END;
              if (recno != 0)
                called = _pcre_find_bracket(cd->start_code, utf8, recno);
              /* Forward reference */
-Line 5082 
 we set the flag only if there is a liter
+Line 5752 
 we set the flag only if there is a liter
              if (called == NULL)
                {
                if (find_parens(cd, NULL, recno,
-                     (options & PCRE_EXTENDED) != 0) < 0)
+                     (options & PCRE_EXTENDED) != 0, utf8) < 0)
                  {
                  *errorcodeptr = ERR15;
                  goto FAILED;
                  }
+               /* Fudge the value of "called" so that when it is inserted as an
+               offset below, what it actually inserted is the reference number
+               of the group. Then remember the forward reference. */
                called = cd->start_code + recno;
-               PUTINC(cd->hwm, 0, code + 2 + LINK_SIZE - cd->start_code);
+               PUTINC(cd->hwm, 0, (int)(code + 1 - cd->start_code));
                }
              /* If not a forward reference, and the subpattern is still open,
              this is a recursive call. We check to see if this is a left
-             recursion that could loop for ever, and diagnose that case. */
+             recursion that could loop for ever, and diagnose that case. We
+             must not, however, do this check if we are in a conditional
+             subpattern because the condition might be testing for recursion in
+             a pattern such as /(?(R)a+|(?R)b)/, which is perfectly valid.
+             Forever loops are also detected at runtime, so those that occur in
+             conditional subpatterns will be picked up then. */
-             else if (GET(called, 1) == 0 &&
+             else if (GET(called, 1) == 0 && cond_depth <= 0 &&
-                      could_be_empty(called, code, bcptr, utf8))
+                      could_be_empty(called, code, bcptr, utf8, cd))
                {
                *errorcodeptr = ERR40;
                goto FAILED;
                }
              }
-           /* Insert the recursion/subroutine item, automatically wrapped inside
+           /* Insert the recursion/subroutine item. */
-           "once" brackets. Set up a "previous group" length so that a
-           subsequent quantifier will work. */
-           *code = OP_ONCE;
-           PUT(code, 1, 2 + 2*LINK_SIZE);
-           code += 1 + LINK_SIZE;
            *code = OP_RECURSE;
-           PUT(code, 1, called - cd->start_code);
+           PUT(code, 1, (int)(called - cd->start_code));
-           code += 1 + LINK_SIZE;
-           *code = OP_KET;
-           PUT(code, 1, 2 + 2*LINK_SIZE);
            code += 1 + LINK_SIZE;
-           length_prevgroup = 3 + 3*LINK_SIZE;
            }
          /* Can't determine a first byte now */
-Line 5180 
 we set the flag only if there is a liter
+Line 5848 
 we set the flag only if there is a liter
          is necessary to ensure we correctly detect the start of the pattern in
          both phases.
-         If we are not at the pattern start, compile code to change the ims
+         If we are not at the pattern start, reset the greedy defaults and the
-         options if this setting actually changes any of them, and reset the
+         case value for firstbyte and reqbyte. */
-         greedy defaults and the case value for firstbyte and reqbyte. */
          if (*ptr == CHAR_RIGHT_PARENTHESIS)
            {
-Line 5191 
 we set the flag only if there is a liter
+Line 5858 
 we set the flag only if there is a liter
              {
              cd->external_options = newoptions;
              }
-          else
+           else
              {
-             if ((options & PCRE_IMS) != (newoptions & PCRE_IMS))
-               {
-               *code++ = OP_OPT;
-               *code++ = newoptions & PCRE_IMS;
-               }
              greedy_default = ((newoptions & PCRE_UNGREEDY) != 0);
              greedy_non_default = greedy_default ^ 1;
              req_caseopt = ((newoptions & PCRE_CASELESS) != 0)? REQ_CASELESS : 0;
              }
            /* Change options at this level, and pass them back for use
-           in subsequent branches. When not at the start of the pattern, this
+           in subsequent branches. */
-           information is also necessary so that a resetting item can be
-           compiled at the end of a group (if we are in a group). */
            *optionsptr = options = newoptions;
            previous = NULL;       /* This item can't be repeated */
-Line 5223 
 we set the flag only if there is a liter
+Line 5883 
 we set the flag only if there is a liter
          }     /* End of switch for character following (? */
        }       /* End of (? handling */
-     /* Opening parenthesis not followed by '?'. If PCRE_NO_AUTO_CAPTURE is set,
+     /* Opening parenthesis not followed by '*' or '?'. If PCRE_NO_AUTO_CAPTURE
-     all unadorned brackets become non-capturing and behave like (?:...)
+     is set, all unadorned brackets become non-capturing and behave like (?:...)
      brackets. */
      else if ((options & PCRE_NO_AUTO_CAPTURE) != 0)
-Line 5242 
 we set the flag only if there is a liter
+Line 5902 
 we set the flag only if there is a liter
        skipbytes = 2;
        }
-     /* Process nested bracketed regex. Assertions may not be repeated, but
+     /* Process nested bracketed regex. Assertions used not to be repeatable,
-     other kinds can be. All their opcodes are >= OP_ONCE. We copy code into a
+     but this was changed for Perl compatibility, so all kinds can now be
-     non-register variable in order to be able to pass its address because some
+     repeated. We copy code into a non-register variable (tempcode) in order to
-     compilers complain otherwise. Pass in a new setting for the ims options if
+     be able to pass its address because some compilers complain otherwise. */
-     they have changed. */
-     previous = (bravalue >= OP_ONCE)? code : NULL;
+     previous = code;                      /* For handling repetition */
      *code = bravalue;
      tempcode = code;
-     tempreqvary = cd->req_varyopt;     /* Save value before bracket */
+     tempreqvary = cd->req_varyopt;        /* Save value before bracket */
-     length_prevgroup = 0;              /* Initialize for pre-compile phase */
+     length_prevgroup = 0;                 /* Initialize for pre-compile phase */
      if (!compile_regex(
-          newoptions,                   /* The complete new option state */
+          newoptions,                      /* The complete new option state */
-          options & PCRE_IMS,           /* The previous ims option state */
+          &tempcode,                       /* Where to put code (updated) */
-          &tempcode,                    /* Where to put code (updated) */
+          &ptr,                            /* Input pointer (updated) */
-          &ptr,                         /* Input pointer (updated) */
+          errorcodeptr,                    /* Where to put an error message */
-          errorcodeptr,                 /* Where to put an error message */
           (bravalue == OP_ASSERTBACK ||
            bravalue == OP_ASSERTBACK_NOT), /* TRUE if back assert */
-          reset_bracount,               /* True if (?| group */
+          reset_bracount,                  /* True if (?| group */
-          skipbytes,                    /* Skip over bracket number */
+          skipbytes,                       /* Skip over bracket number */
-          &subfirstbyte,                /* For possible first char */
+          cond_depth +
-          &subreqbyte,                  /* For possible last char */
+            ((bravalue == OP_COND)?1:0),   /* Depth of condition subpatterns */
-          bcptr,                        /* Current branch chain */
+          &subfirstbyte,                   /* For possible first char */
-          cd,                           /* Tables block */
+          &subreqbyte,                     /* For possible last char */
-          (lengthptr == NULL)? NULL :   /* Actual compile phase */
+          bcptr,                           /* Current branch chain */
-            &length_prevgroup           /* Pre-compile phase */
+          cd,                              /* Tables block */
+          (lengthptr == NULL)? NULL :      /* Actual compile phase */
+            &length_prevgroup              /* Pre-compile phase */
           ))
        goto FAILED;
+     if (bravalue >= OP_ASSERT && bravalue <= OP_ASSERTBACK_NOT)
+       cd->assert_depth -= 1;
      /* At the end of compiling, code is still pointing to the start of the
      group, while tempcode has been updated to point past the end of the group
      and any option resetting that may follow it. The pattern pointer (ptr)
-Line 5343 
 we set the flag only if there is a liter
+Line 6006 
 we set the flag only if there is a liter
          goto FAILED;
          }
        *lengthptr += length_prevgroup - 2 - 2*LINK_SIZE;
-       *code++ = OP_BRA;
+       code++;   /* This already contains bravalue */
        PUTINC(code, 0, 1 + LINK_SIZE);
        *code++ = OP_KET;
        PUTINC(code, 0, 1 + LINK_SIZE);
-Line 5416 
 we set the flag only if there is a liter
+Line 6079 
 we set the flag only if there is a liter
      /* ===================================================================*/
      /* Handle metasequences introduced by \. For ones like \d, the ESC_ values
-     are arranged to be the negation of the corresponding OP_values. For the
+     are arranged to be the negation of the corresponding OP_values in the
-     back references, the values are ESC_REF plus the reference number. Only
+     default case when PCRE_UCP is not set. For the back references, the values
-     back references and those types that consume a character may be repeated.
+     are ESC_REF plus the reference number. Only back references and those types
-     We can test for values between ESC_b and ESC_Z for the latter; this may
+     that consume a character may be repeated. We can test for values between
-     have to change if any new ones are ever created. */
+     ESC_b and ESC_Z for the latter; this may have to change if any new ones are
+     ever created. */
      case CHAR_BACKSLASH:
      tempptr = ptr;
-Line 5510 
 we set the flag only if there is a liter
+Line 6174 
 we set the flag only if there is a liter
          }
        /* \k<name> or \k'name' is a back reference by name (Perl syntax).
-       We also support \k{name} (.NET syntax) */
+       We also support \k{name} (.NET syntax).  */
-       if (-c == ESC_k && (ptr[1] == CHAR_LESS_THAN_SIGN ||
+       if (-c == ESC_k)
-           ptr[1] == CHAR_APOSTROPHE || ptr[1] == CHAR_LEFT_CURLY_BRACKET))
          {
+         if ((ptr[1] != CHAR_LESS_THAN_SIGN &&
+           ptr[1] != CHAR_APOSTROPHE && ptr[1] != CHAR_LEFT_CURLY_BRACKET))
+           {
+           *errorcodeptr = ERR69;
+           break;
+           }
          is_recurse = FALSE;
          terminator = (*(++ptr) == CHAR_LESS_THAN_SIGN)?
            CHAR_GREATER_THAN_SIGN : (*ptr == CHAR_APOSTROPHE)?
-Line 5528 
 we set the flag only if there is a liter
+Line 6197 
 we set the flag only if there is a liter
        if (-c >= ESC_REF)
          {
+         open_capitem *oc;
          recno = -c - ESC_REF;
          HANDLE_REFERENCE:    /* Come here from named backref handling */
          if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
          previous = code;
-         *code++ = OP_REF;
+         *code++ = ((options & PCRE_CASELESS) != 0)? OP_REFI : OP_REF;
          PUT2INC(code, 0, recno);
          cd->backref_map |= (recno < 32)? (1 << recno) : 1;
          if (recno > cd->top_backref) cd->top_backref = recno;
+         /* Check to see if this back reference is recursive, that it, it
+         is inside the group that it references. A flag is set so that the
+         group can be made atomic. */
+         for (oc = cd->open_caps; oc != NULL; oc = oc->next)
+           {
+           if (oc->number == recno)
+             {
+             oc->flag = TRUE;
+             break;
+             }
+           }
          }
        /* So are Unicode property matches, if supported. */
-Line 5566 
 we set the flag only if there is a liter
+Line 6249 
 we set the flag only if there is a liter
  #endif
        /* For the rest (including \X when Unicode properties are supported), we
-       can obtain the OP value by negating the escape value. */
+       can obtain the OP value by negating the escape value in the default
+       situation when PCRE_UCP is not set. When it *is* set, we substitute
+       Unicode property tests. */
        else
          {
-         previous = (-c > ESC_b && -c < ESC_Z)? code : NULL;
+ #ifdef SUPPORT_UCP
-         *code++ = -c;
+         if (-c >= ESC_DU && -c <= ESC_wu)
+           {
+           nestptr = ptr + 1;                   /* Where to resume */
+           ptr = substitutes[-c - ESC_DU] - 1;  /* Just before substitute */
+           }
+         else
+ #endif
+           {
+           previous = (-c > ESC_b && -c < ESC_Z)? code : NULL;
+           *code++ = -c;
+           }
          }
        continue;
        }
-Line 5616 
 we set the flag only if there is a liter
+Line 6311 
 we set the flag only if there is a liter
      ONE_CHAR:
      previous = code;
-     *code++ = ((options & PCRE_CASELESS) != 0)? OP_CHARNC : OP_CHAR;
+     *code++ = ((options & PCRE_CASELESS) != 0)? OP_CHARI : OP_CHAR;
      for (c = 0; c < mclength; c++) *code++ = mcbuffer[c];
      /* Remember if \r or \n were seen */
-Line 5680 
 return FALSE;
+Line 6375 
 return FALSE;
  /* On entry, ptr is pointing past the bracket character, but on return it
  points to the closing bracket, or vertical bar, or end of string. The code
  variable is pointing at the byte into which the BRA operator has been stored.
- If the ims options are changed at the start (for a (?ims: group) or during any
- branch, we need to insert an OP_OPT item at the start of every following branch
- to ensure they get set correctly at run time, and also pass the new options
- into every subsequent branch compile.
  This function is used during the pre-compile phase when we are trying to find
  out the amount of memory needed, as well as during the real compile phase. The
  value of lengthptr distinguishes the two phases.
  Arguments:
    options        option bits, including any changes for this subpattern
-   oldims         previous settings of ims option bits
    codeptr        -> the address of the current code pointer
    ptrptr         -> the address of the current pattern pointer
    errorcodeptr   -> pointer to error code variable
    lookbehind     TRUE if this is a lookbehind assertion
    reset_bracount TRUE to reset the count for each branch
    skipbytes      skip this many bytes at start (for brackets and OP_COND)
+   cond_depth     depth of nesting for conditional subpatterns
    firstbyteptr   place to put the first required character, or a negative number
    reqbyteptr     place to put the last required character, or a negative number
    bcptr          pointer to the chain of currently open branches
-Line 5709 
 Returns:         TRUE on success
+Line 6399 
 Returns:         TRUE on success
  */
  static BOOL
- compile_regex(int options, int oldims, uschar **codeptr, const uschar **ptrptr,
+ compile_regex(int options, uschar **codeptr, const uschar **ptrptr,
    int *errorcodeptr, BOOL lookbehind, BOOL reset_bracount, int skipbytes,
-   int *firstbyteptr, int *reqbyteptr, branch_chain *bcptr, compile_data *cd,
+   int cond_depth, int *firstbyteptr, int *reqbyteptr, branch_chain *bcptr,
-   int *lengthptr)
+   compile_data *cd, int *lengthptr)
  {
  const uschar *ptr = *ptrptr;
  uschar *code = *codeptr;
-Line 5729 
 int max_bracount;
+Line 6419 
 int max_bracount;
  branch_chain bc;
  bc.outer = bcptr;
- bc.current = code;
+ bc.current_branch = code;
  firstbyte = reqbyte = REQ_UNSET;
-Line 5748 
 them global. It tests the value of lengt
+Line 6438 
 them global. It tests the value of lengt
  pre-compile phase to find out whether anything has yet been compiled or not. */
  /* If this is a capturing subpattern, add to the chain of open capturing items
- so that we can detect them if (*ACCEPT) is encountered. */
+ so that we can detect them if (*ACCEPT) is encountered. This is also used to
+ detect groups that contain recursive back references to themselves. Note that
+ only OP_CBRA need be tested here; changing this opcode to one of its variants,
+ e.g. OP_SCBRAPOS, happens later, after the group has been compiled. */
  if (*code == OP_CBRA)
    {
    capnumber = GET2(code, 1 + LINK_SIZE);
    capitem.number = capnumber;
    capitem.next = cd->open_caps;
-   cd->open_caps = &capitem;
+   capitem.flag = FALSE;
-   }
+   cd->open_caps = &capitem;
+   }
  /* Offset is set zero to mark that this bracket is still open */
-Line 5773 
 for (;;)
+Line 6467 
 for (;;)
    if (reset_bracount) cd->bracount = orig_bracount;
-   /* Handle a change of ims options at the start of the branch */
-   if ((options & PCRE_IMS) != oldims)
-     {
-     *code++ = OP_OPT;
-     *code++ = options & PCRE_IMS;
-     length += 2;
-     }
    /* Set up dummy OP_REVERSE if lookbehind assertion */
    if (lookbehind)
-Line 5796 
 for (;;)
+Line 6481 
 for (;;)
    into the length. */
    if (!compile_branch(&options, &code, &ptr, errorcodeptr, &branchfirstbyte,
-         &branchreqbyte, &bc, cd, (lengthptr == NULL)? NULL : &length))
+         &branchreqbyte, &bc, cond_depth, cd,
+         (lengthptr == NULL)? NULL : &length))
      {
      *ptrptr = ptr;
      return FALSE;
-Line 5852 
 for (;;)
+Line 6538 
 for (;;)
      /* If lookbehind, check that this branch matches a fixed-length string, and
      put the length into the OP_REVERSE item. Temporarily mark the end of the
      branch with OP_END. If the branch contains OP_RECURSE, the result is -3
      because there may be forward references that we can't check here. Set a
      flag to cause another lookbehind check at the end. Why not do it all at the
      end? Because common, erroneous checks are picked up here and the offset of
      the problem can be shown. */
      if (lookbehind)
        {
        int fixed_length;
        *code = OP_END;
-       fixed_length = find_fixedlength(last_branch, options, FALSE, cd);
+       fixed_length = find_fixedlength(last_branch,  (options & PCRE_UTF8) != 0,
+         FALSE, cd);
        DPRINTF(("fixed length = %d\n", fixed_length));
        if (fixed_length == -3)
          {
          cd->check_lookbehind = TRUE;
          }
        else if (fixed_length < 0)
          {
          *errorcodeptr = (fixed_length == -2)? ERR36 : ERR25;
-Line 5883 
 for (;;)
+Line 6570 
 for (;;)
    of offsets, with the field in the BRA item now becoming an offset to the
    first alternative. If there are no alternatives, it points to the end of the
    group. The length in the terminating ket is always the length of the whole
-   bracketed item. If any of the ims options were changed inside the group,
+   bracketed item. Return leaving the pointer at the terminating char. */
-   compile a resetting op-code following, except at the very end of the pattern.
-   Return leaving the pointer at the terminating char. */
    if (*ptr != CHAR_VERTICAL_LINE)
      {
      if (lengthptr == NULL)
        {
-       int branch_length = code - last_branch;
+       int branch_length = (int)(code - last_branch);
        do
          {
          int prev_length = GET(last_branch, 1);
-Line 5901 
 for (;;)
+Line 6586 
 for (;;)
          }
        while (branch_length > 0);
        }
-     /* If it was a capturing subpattern, remove it from the chain. */
-     if (capnumber > 0) cd->open_caps = cd->open_caps->next;
      /* Fill in the ket */
      *code = OP_KET;
-     PUT(code, 1, code - start_bracket);
+     PUT(code, 1, (int)(code - start_bracket));
      code += 1 + LINK_SIZE;
-     /* Resetting option if needed */
+     /* If it was a capturing subpattern, check to see if it contained any
+     recursive back references. If so, we must wrap it in atomic brackets.
+     In any event, remove the block from the chain. */
-     if ((options & PCRE_IMS) != oldims && *ptr == CHAR_RIGHT_PARENTHESIS)
+     if (capnumber > 0)
        {
-       *code++ = OP_OPT;
+       if (cd->open_caps->flag)
-       *code++ = oldims;
+         {
-       length += 2;
+         memmove(start_bracket + 1 + LINK_SIZE, start_bracket,
+           code - start_bracket);
+         *start_bracket = OP_ONCE;
+         code += 1 + LINK_SIZE;
+         PUT(start_bracket, 1, (int)(code - start_bracket));
+         *code = OP_KET;
+         PUT(code, 1, (int)(code - start_bracket));
+         code += 1 + LINK_SIZE;
+         length += 2 + 2*LINK_SIZE;
+         }
+       cd->open_caps = cd->open_caps->next;
        }
      /* Retain the highest bracket number, in case resetting was used. */
-Line 5960 
 for (;;)
+Line 6653 
 for (;;)
    else
      {
      *code = OP_ALT;
-     PUT(code, 1, code - last_branch);
+     PUT(code, 1, (int)(code - last_branch));
-     bc.current = last_branch = code;
+     bc.current_branch = last_branch = code;
      code += 1 + LINK_SIZE;
      }
-Line 5980 
 for (;;)
+Line 6673 
 for (;;)
  /* Try to find out if this is an anchored regular expression. Consider each
  alternative branch. If they all start with OP_SOD or OP_CIRC, or with a bracket
  all of whose alternatives start with OP_SOD or OP_CIRC (recurse ad lib), then
- it's anchored. However, if this is a multiline pattern, then only OP_SOD
+ it's anchored. However, if this is a multiline pattern, then only OP_SOD will
- counts, since OP_CIRC can match in the middle.
+ be found, because ^ generates OP_CIRCM in that mode.
  We can also consider a regex to be anchored if OP_SOM starts all its branches.
  This is the code for \G, which means "match at start of match position, taking
-Line 6002 
 of the more common cases more precisely.
+Line 6695 
 of the more common cases more precisely.
  Arguments:
    code           points to start of expression (the bracket)
-   options        points to the options setting
    bracket_map    a bitmap of which brackets we are inside while testing; this
                    handles up to substring 31; after that we just have to take
                    the less precise approach
-Line 6012 
 Returns:     TRUE or FALSE
+Line 6704 
 Returns:     TRUE or FALSE
  */
  static BOOL
- is_anchored(register const uschar *code, int *options, unsigned int bracket_map,
+ is_anchored(register const uschar *code, unsigned int bracket_map,
    unsigned int backref_map)
  {
  do {
     const uschar *scode = first_significant_code(code + _pcre_OP_lengths[*code],
-      options, PCRE_MULTILINE, FALSE);
+      FALSE);
     register int op = *scode;
     /* Non-capturing brackets */
-    if (op == OP_BRA)
+    if (op == OP_BRA  || op == OP_BRAPOS ||
+        op == OP_SBRA || op == OP_SBRAPOS)
       {
-      if (!is_anchored(scode, options, bracket_map, backref_map)) return FALSE;
+      if (!is_anchored(scode, bracket_map, backref_map)) return FALSE;
       }
     /* Capturing brackets */
-    else if (op == OP_CBRA)
+    else if (op == OP_CBRA  || op == OP_CBRAPOS ||
+             op == OP_SCBRA || op == OP_SCBRAPOS)
       {
       int n = GET2(scode, 1+LINK_SIZE);
       int new_map = bracket_map | ((n < 32)? (1 << n) : 1);
-      if (!is_anchored(scode, options, new_map, backref_map)) return FALSE;
+      if (!is_anchored(scode, new_map, backref_map)) return FALSE;
       }
     /* Other brackets */
     else if (op == OP_ASSERT || op == OP_ONCE || op == OP_COND)
       {
-      if (!is_anchored(scode, options, bracket_map, backref_map)) return FALSE;
+      if (!is_anchored(scode, bracket_map, backref_map)) return FALSE;
       }
     /* .* is not anchored unless DOTALL is set (which generates OP_ALLANY) and
-Line 6055 
 do {
+Line 6749 
 do {
     /* Check for explicit anchoring */
-    else if (op != OP_SOD && op != OP_SOM &&
+    else if (op != OP_SOD && op != OP_SOM && op != OP_CIRC) return FALSE;
-            ((*options & PCRE_MULTILINE) != 0 || op != OP_CIRC))
-      return FALSE;
     code += GET(code, 1);
     }
  while (*code == OP_ALT);   /* Loop for each alternative */
-Line 6093 
 is_startline(const uschar *code, unsigne
+Line 6785 
 is_startline(const uschar *code, unsigne
  {
  do {
     const uschar *scode = first_significant_code(code + _pcre_OP_lengths[*code],
-      NULL, 0, FALSE);
+      FALSE);
     register int op = *scode;
     /* If we are at the start of a conditional assertion group, *both* the
-Line 6108 
 do {
+Line 6800 
 do {
       switch (*scode)
         {
         case OP_CREF:
+        case OP_NCREF:
         case OP_RREF:
+        case OP_NRREF:
         case OP_DEF:
         return FALSE;
-Line 6118 
 do {
+Line 6812 
 do {
         scode += 1 + LINK_SIZE;
         break;
         }
-      scode = first_significant_code(scode, NULL, 0, FALSE);
+      scode = first_significant_code(scode, FALSE);
       op = *scode;
       }
     /* Non-capturing brackets */
-    if (op == OP_BRA)
+    if (op == OP_BRA  || op == OP_BRAPOS ||
+        op == OP_SBRA || op == OP_SBRAPOS)
       {
       if (!is_startline(scode, bracket_map, backref_map)) return FALSE;
       }
     /* Capturing brackets */