/[pcre]/code/trunk/pcre_compile.c

Diff of /code/trunk/pcre_compile.c

Parent Directory | Revision Log | View Patch Patch

-revision 81 by nigel,
Sat Feb 24 21:40:59 2007 UTC
+revision 391 by ph10,
Tue Mar 17 21:16:01 2009 UTC
 Line 6
  and semantics are as close as possible to those of the Perl 5 language.
                         Written by Philip Hazel
-            Copyright (c) 1997-2005 University of Cambridge
+            Copyright (c) 1997-2009 University of Cambridge
  -----------------------------------------------------------------------------
  Redistribution and use in source and binary forms, with or without
 Line 42 
 POSSIBILITY OF SUCH DAMAGE.
  supporting internal functions that are not used by other modules. */
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
+ #define NLBLOCK cd             /* Block containing newline information */
+ #define PSSTART start_pattern  /* Field containing processed string start */
+ #define PSEND   end_pattern    /* Field containing processed string end */
  #include "pcre_internal.h"
+ /* When DEBUG is defined, we need the pcre_printint() function, which is also
+ used by pcretest. DEBUG is not defined when building a production library. */
+ #ifdef DEBUG
+ #include "pcre_printint.src"
+ #endif
+ /* Macro for setting individual bits in class bitmaps. */
+ #define SETBIT(a,b) a[b/8] |= (1 << (b%8))
+ /* Maximum length value to check against when making sure that the integer that
+ holds the compiled pattern length does not overflow. We make it a bit less than
+ INT_MAX to allow for adding in group terminating bytes, so that we don't have
+ to check them every time. */
+ #define OFLOW_MAX (INT_MAX - 20)
  /*************************************************
  *      Code parameters and static tables         *
  *************************************************/
- /* Maximum number of items on the nested bracket stacks at compile time. This
+ /* This value specifies the size of stack workspace that is used during the
- applies to the nesting of all kinds of parentheses. It does not limit
+ first pre-compile phase that determines how much memory is required. The regex
- un-nested, non-capturing parentheses. This number can be made bigger if
+ is partly compiled into this space, but the compiled parts are discarded as
- necessary - it is used to dimension one int and one unsigned char vector at
+ soon as they can be, so that hopefully there will never be an overrun. The code
- compile time. */
+ does, however, check for an overrun. The largest amount I've seen used is 218,
+ so this number is very generous.
+ The same workspace is used during the second, actual compile phase for
+ remembering forward references to groups so that they can be filled in at the
+ end. Each entry in this list occupies LINK_SIZE bytes, so even when LINK_SIZE
+ is 4 there is plenty of room. */
- #define BRASTACK_SIZE 200
+ #define COMPILE_WORK_SIZE (4096)
  /* Table for handling escaped characters in the range '0'-'z'. Positive returns
-Line 63 
 are simple data values; negative values
+Line 97 
 are simple data values; negative values
  on. Zero means further processing is needed (for things like \x), or the escape
  is invalid. */
- #if !EBCDIC   /* This is the "normal" table for ASCII systems */
+ #ifndef EBCDIC
- static const short int escapes[] = {
-,      0,      0,      0,      0,      0,      0,      0,   /* 0 - 7 */
+ /* This is the "normal" table for ASCII systems or for EBCDIC systems running
-,      0,    ':',    ';',    '<',    '=',    '>',    '?',   /* 8 - ? */
+ in UTF-8 mode. */
-    '@', -ESC_A, -ESC_B, -ESC_C, -ESC_D, -ESC_E,      0, -ESC_G,   /* @ - G */
-,      0,      0,      0,      0,      0,      0,      0,   /* H - O */
+ static const short int escapes[] = {
- -ESC_P, -ESC_Q,      0, -ESC_S,      0,      0,      0, -ESC_W,   /* P - W */
+,                       0,
- -ESC_X,      0, -ESC_Z,    '[',   '\\',    ']',    '^',    '_',   /* X - _ */
+,                       0,
-    '`',      7, -ESC_b,      0, -ESC_d,  ESC_e,  ESC_f,      0,   /* ` - g */
+,                       0,
-,      0,      0,      0,      0,      0,  ESC_n,      0,   /* h - o */
+,                       0,
- -ESC_p,      0,  ESC_r, -ESC_s,  ESC_tee,    0,      0, -ESC_w,   /* p - w */
+,                       0,
-,      0, -ESC_z                                            /* x - z */
+      CHAR_COLON,              CHAR_SEMICOLON,
+      CHAR_LESS_THAN_SIGN,     CHAR_EQUALS_SIGN,
+      CHAR_GREATER_THAN_SIGN,  CHAR_QUESTION_MARK,
+      CHAR_COMMERCIAL_AT,      -ESC_A,
+      -ESC_B,                  -ESC_C,
+      -ESC_D,                  -ESC_E,
+,                       -ESC_G,
+      -ESC_H,                  0,
+,                       -ESC_K,
+,                       0,
+,                       0,
+      -ESC_P,                  -ESC_Q,
+      -ESC_R,                  -ESC_S,
+,                       0,
+      -ESC_V,                  -ESC_W,
+      -ESC_X,                  0,
+      -ESC_Z,                  CHAR_LEFT_SQUARE_BRACKET,
+      CHAR_BACKSLASH,          CHAR_RIGHT_SQUARE_BRACKET,
+      CHAR_CIRCUMFLEX_ACCENT,  CHAR_UNDERSCORE,
+      CHAR_GRAVE_ACCENT,       7,
+      -ESC_b,                  0,
+      -ESC_d,                  ESC_e,
+      ESC_f,                   0,
+      -ESC_h,                  0,
+,                       -ESC_k,
+,                       0,
+      ESC_n,                   0,
+      -ESC_p,                  0,
+      ESC_r,                   -ESC_s,
+      ESC_tee,                 0,
+      -ESC_v,                  -ESC_w,
+,                       0,
+      -ESC_z
  };
- #else         /* This is the "abnormal" table for EBCDIC systems */
+ #else
+ /* This is the "abnormal" table for EBCDIC systems without UTF-8 support. */
  static const short int escapes[] = {
  /*  48 */     0,     0,      0,     '.',    '<',   '(',    '+',    '|',
  /*  50 */   '&',     0,      0,       0,      0,     0,      0,      0,
-Line 87 
 static const short int escapes[] = {
+Line 156 
 static const short int escapes[] = {
  /*  70 */     0,     0,      0,       0,      0,     0,      0,      0,
  /*  78 */     0,   '`',    ':',     '#',    '@',  '\'',    '=',    '"',
  /*  80 */     0,     7, -ESC_b,       0, -ESC_d, ESC_e,  ESC_f,      0,
- /*  88 */     0,     0,      0,     '{',      0,     0,      0,      0,
+ /*  88 */-ESC_h,     0,      0,     '{',      0,     0,      0,      0,
- /*  90 */     0,     0,      0,     'l',      0, ESC_n,      0, -ESC_p,
+ /*  90 */     0,     0, -ESC_k,     'l',      0, ESC_n,      0, -ESC_p,
  /*  98 */     0, ESC_r,      0,     '}',      0,     0,      0,      0,
- /*  A0 */     0,   '~', -ESC_s, ESC_tee,      0,     0, -ESC_w,      0,
+ /*  A0 */     0,   '~', -ESC_s, ESC_tee,      0,-ESC_v, -ESC_w,      0,
  /*  A8 */     0,-ESC_z,      0,       0,      0,   '[',      0,      0,
  /*  B0 */     0,     0,      0,       0,      0,     0,      0,      0,
  /*  B8 */     0,     0,      0,       0,      0,   ']',    '=',    '-',
  /*  C0 */   '{',-ESC_A, -ESC_B,  -ESC_C, -ESC_D,-ESC_E,      0, -ESC_G,
- /*  C8 */     0,     0,      0,       0,      0,     0,      0,      0,
+ /*  C8 */-ESC_H,     0,      0,       0,      0,     0,      0,      0,
- /*  D0 */   '}',     0,      0,       0,      0,     0,      0, -ESC_P,
+ /*  D0 */   '}',     0, -ESC_K,       0,      0,     0,      0, -ESC_P,
- /*  D8 */-ESC_Q,     0,      0,       0,      0,     0,      0,      0,
+ /*  D8 */-ESC_Q,-ESC_R,      0,       0,      0,     0,      0,      0,
- /*  E0 */  '\\',     0, -ESC_S,       0,      0,     0, -ESC_W, -ESC_X,
+ /*  E0 */  '\\',     0, -ESC_S,       0,      0,-ESC_V, -ESC_W, -ESC_X,
  /*  E8 */     0,-ESC_Z,      0,       0,      0,     0,      0,      0,
  /*  F0 */     0,     0,      0,       0,      0,     0,      0,      0,
  /*  F8 */     0,     0,      0,       0,      0,     0,      0,      0
-Line 106 
 static const short int escapes[] = {
+Line 175 
 static const short int escapes[] = {
  #endif
- /* Tables of names of POSIX character classes and their lengths. The list is
+ /* Table of special "verbs" like (*PRUNE). This is a short table, so it is
- terminated by a zero length entry. The first three must be alpha, upper, lower,
+ searched linearly. Put all the names into a single string, in order to reduce
- as this is assumed for handling case independence. */
+ the number of relocations when a shared library is dynamically linked. The
+ string is built from string macros so that it works in UTF-8 mode on EBCDIC
- static const char *const posix_names[] = {
+ platforms. */
-   "alpha", "lower", "upper",
-   "alnum", "ascii", "blank", "cntrl", "digit", "graph",
+ typedef struct verbitem {
-   "print", "punct", "space", "word",  "xdigit" };
+   int   len;
+   int   op;
+ } verbitem;
+ static const char verbnames[] =
+   STRING_ACCEPT0
+   STRING_COMMIT0
+   STRING_F0
+   STRING_FAIL0
+   STRING_PRUNE0
+   STRING_SKIP0
+   STRING_THEN;
+ static const verbitem verbs[] = {
+   { 6, OP_ACCEPT },
+   { 6, OP_COMMIT },
+   { 1, OP_FAIL },
+   { 4, OP_FAIL },
+   { 5, OP_PRUNE },
+   { 4, OP_SKIP  },
+   { 4, OP_THEN  }
+ };
+ static const int verbcount = sizeof(verbs)/sizeof(verbitem);
+ /* Tables of names of POSIX character classes and their lengths. The names are
+ now all in a single string, to reduce the number of relocations when a shared
+ library is dynamically loaded. The list of lengths is terminated by a zero
+ length entry. The first three must be alpha, lower, upper, as this is assumed
+ for handling case independence. */
+ static const char posix_names[] =
+   STRING_alpha0 STRING_lower0 STRING_upper0 STRING_alnum0
+   STRING_ascii0 STRING_blank0 STRING_cntrl0 STRING_digit0
+   STRING_graph0 STRING_print0 STRING_punct0 STRING_space0
+   STRING_word0  STRING_xdigit;
  static const uschar posix_name_lengths[] = {
 , 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 6, 0 };
- /* Table of class bit maps for each POSIX class; up to three may be combined
+ /* Table of class bit maps for each POSIX class. Each class is formed from a
- to form the class. The table for [:blank:] is dynamically modified to remove
+ base map, with an optional addition or removal of another map. Then, for some
- the vertical space characters. */
+ classes, there is some additional tweaking: for [:blank:] the vertical space
+ characters are removed, and for [:alpha:] and [:alnum:] the underscore
+ character is removed. The triples in the table consist of the base map offset,
+ second map offset or -1 if no second map, and a non-negative value for map
+ addition or a negative value for map subtraction (if there are two maps). The
+ absolute value of the third field has these meanings: 0 => no tweaking, 1 =>
+ remove vertical space characters, 2 => remove underscore. */
  static const int posix_class_maps[] = {
-   cbit_lower, cbit_upper, -1,             /* alpha */
+   cbit_word,  cbit_digit, -2,             /* alpha */
-   cbit_lower, -1,         -1,             /* lower */
+   cbit_lower, -1,          0,             /* lower */
-   cbit_upper, -1,         -1,             /* upper */
+   cbit_upper, -1,          0,             /* upper */
-   cbit_digit, cbit_lower, cbit_upper,     /* alnum */
+   cbit_word,  -1,          2,             /* alnum - word without underscore */
-   cbit_print, cbit_cntrl, -1,             /* ascii */
+   cbit_print, cbit_cntrl,  0,             /* ascii */
-   cbit_space, -1,         -1,             /* blank - a GNU extension */
+   cbit_space, -1,          1,             /* blank - a GNU extension */
-   cbit_cntrl, -1,         -1,             /* cntrl */
+   cbit_cntrl, -1,          0,             /* cntrl */
-   cbit_digit, -1,         -1,             /* digit */
+   cbit_digit, -1,          0,             /* digit */
-   cbit_graph, -1,         -1,             /* graph */
+   cbit_graph, -1,          0,             /* graph */
-   cbit_print, -1,         -1,             /* print */
+   cbit_print, -1,          0,             /* print */
-   cbit_punct, -1,         -1,             /* punct */
+   cbit_punct, -1,          0,             /* punct */
-   cbit_space, -1,         -1,             /* space */
+   cbit_space, -1,          0,             /* space */
-   cbit_word,  -1,         -1,             /* word - a Perl extension */
+   cbit_word,  -1,          0,             /* word - a Perl extension */
-   cbit_xdigit,-1,         -1              /* xdigit */
+   cbit_xdigit,-1,          0              /* xdigit */
  };
- /* The texts of compile-time error messages. These are "char *" because they
+ #define STRING(a)  # a
- are passed to the outside world. */
+ #define XSTRING(s) STRING(s)
- static const char *error_texts[] = {
+ /* The texts of compile-time error messages. These are "char *" because they
-   "no error",
+ are passed to the outside world. Do not ever re-use any error number, because
-   "\\ at end of pattern",
+ they are documented. Always add a new error instead. Messages marked DEAD below
-   "\\c at end of pattern",
+ are no longer used. This used to be a table of strings, but in order to reduce
-   "unrecognized character follows \\",
+ the number of relocations needed when a shared library is loaded dynamically,
-   "numbers out of order in {} quantifier",
+ 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. */
+ static const char error_texts[] =
+   "no error\0"
+   "\\ at end of pattern\0"
+   "\\c at end of pattern\0"
+   "unrecognized character follows \\\0"
+   "numbers out of order in {} quantifier\0"
    /* 5 */
-   "number too big in {} quantifier",
+   "number too big in {} quantifier\0"
-   "missing terminating ] for character class",
+   "missing terminating ] for character class\0"
-   "invalid escape sequence in character class",
+   "invalid escape sequence in character class\0"
-   "range out of order in character class",
+   "range out of order in character class\0"
-   "nothing to repeat",
+   "nothing to repeat\0"
    /* 10 */
-   "operand of unlimited repeat could match the empty string",
+   "operand of unlimited repeat could match the empty string\0"  /** DEAD **/
-   "internal error: unexpected repeat",
+   "internal error: unexpected repeat\0"
-   "unrecognized character after (?",
+   "unrecognized character after (? or (?-\0"
-   "POSIX named classes are supported only within a class",
+   "POSIX named classes are supported only within a class\0"
-   "missing )",
+   "missing )\0"
    /* 15 */
-   "reference to non-existent subpattern",
+   "reference to non-existent subpattern\0"
-   "erroffset passed as NULL",
+   "erroffset passed as NULL\0"
-   "unknown option bit(s) set",
+   "unknown option bit(s) set\0"
-   "missing ) after comment",
+   "missing ) after comment\0"
-   "parentheses nested too deeply",
+   "parentheses nested too deeply\0"  /** DEAD **/
    /* 20 */
-   "regular expression too large",
+   "regular expression is too large\0"
-   "failed to get memory",
+   "failed to get memory\0"
-   "unmatched parentheses",
+   "unmatched parentheses\0"
-   "internal error: code overflow",
+   "internal error: code overflow\0"
-   "unrecognized character after (?<",
+   "unrecognized character after (?<\0"
    /* 25 */
-   "lookbehind assertion is not fixed length",
+   "lookbehind assertion is not fixed length\0"
-   "malformed number after (?(",
+   "malformed number or name after (?(\0"
-   "conditional group contains more than two branches",
+   "conditional group contains more than two branches\0"
-   "assertion expected after (?(",
+   "assertion expected after (?(\0"
-   "(?R or (?digits must be followed by )",
+   "(?R or (?[+-]digits must be followed by )\0"
    /* 30 */
-   "unknown POSIX class name",
+   "unknown POSIX class name\0"
-   "POSIX collating elements are not supported",
+   "POSIX collating elements are not supported\0"
-   "this version of PCRE is not compiled with PCRE_UTF8 support",
+   "this version of PCRE is not compiled with PCRE_UTF8 support\0"
-   "spare error",
+   "spare error\0"  /** DEAD **/
-   "character value in \\x{...} sequence is too large",
+   "character value in \\x{...} sequence is too large\0"
    /* 35 */
-   "invalid condition (?(0)",
+   "invalid condition (?(0)\0"
-   "\\C not allowed in lookbehind assertion",
+   "\\C not allowed in lookbehind assertion\0"
-   "PCRE does not support \\L, \\l, \\N, \\U, or \\u",
+   "PCRE does not support \\L, \\l, \\N, \\U, or \\u\0"
-   "number after (?C is > 255",
+   "number after (?C is > 255\0"
-   "closing ) for (?C expected",
+   "closing ) for (?C expected\0"
    /* 40 */
-   "recursive call could loop indefinitely",
+   "recursive call could loop indefinitely\0"
-   "unrecognized character after (?P",
+   "unrecognized character after (?P\0"
-   "syntax error after (?P",
+   "syntax error in subpattern name (missing terminator)\0"
-   "two named groups have the same name",
+   "two named subpatterns have the same name\0"
-   "invalid UTF-8 string",
+   "invalid UTF-8 string\0"
    /* 45 */
-   "support for \\P, \\p, and \\X has not been compiled",
+   "support for \\P, \\p, and \\X has not been compiled\0"
-   "malformed \\P or \\p sequence",
+   "malformed \\P or \\p sequence\0"
-   "unknown property name after \\P or \\p"
+   "unknown property name after \\P or \\p\0"
- };
+   "subpattern name is too long (maximum " XSTRING(MAX_NAME_SIZE) " characters)\0"
+   "too many named subpatterns (maximum " XSTRING(MAX_NAME_COUNT) ")\0"
+   /* 50 */
+   "repeated subpattern is too long\0"    /** DEAD **/
+   "octal value is greater than \\377 (not in UTF-8 mode)\0"
+   "internal error: overran compiling workspace\0"
+   "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"
+   "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"
+   /* 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";
  /* Table to identify digits and hex digits. This is used when compiling
-Line 220 
 For convenience, we use the same bit def
+Line 360 
 For convenience, we use the same bit def
  Then we can use ctype_digit and ctype_xdigit in the code. */
- #if !EBCDIC    /* This is the "normal" case, for ASCII systems */
+ #ifndef EBCDIC
+ /* This is the "normal" case, for ASCII systems, and EBCDIC systems running in
+ UTF-8 mode. */
  static const unsigned char digitab[] =
    {
 x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7 */
-Line 256 
 static const unsigned char digitab[] =
+Line 400 
 static const unsigned char digitab[] =
 x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 240-247 */
 x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};/* 248-255 */
- #else          /* This is the "abnormal" case, for EBCDIC systems */
+ #else
+ /* This is the "abnormal" case, for EBCDIC systems not running in UTF-8 mode. */
  static const unsigned char digitab[] =
    {
 x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7  0 */
-Line 270 
 static const unsigned char digitab[] =
+Line 417 
 static const unsigned char digitab[] =
 x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*    - 71 40 */
 x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  72- |     */
 x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  & - 87 50 */
-x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  88- �     */
+x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  88- 95    */
 x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  - -103 60 */
 x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 104- ?     */
 x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 112-119 70 */
-Line 304 
 static const unsigned char ebcdic_charta
+Line 451 
 static const unsigned char ebcdic_charta
 x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*    - 71 */
 x00,0x00,0x00,0x80,0x00,0x80,0x80,0x80, /*  72- |  */
 x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  & - 87 */
-x00,0x00,0x00,0x80,0x80,0x80,0x00,0x00, /*  88- �  */
+x00,0x00,0x00,0x80,0x80,0x80,0x00,0x00, /*  88- 95 */
 x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  - -103 */
 x00,0x00,0x00,0x00,0x00,0x10,0x00,0x80, /* 104- ?  */
 x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 112-119 */
-Line 331 
 static const unsigned char ebcdic_charta
+Line 478 
 static const unsigned char ebcdic_charta
  /* Definition to allow mutual recursion */
  static BOOL
-   compile_regex(int, int, int *, uschar **, const uschar **, int *, BOOL, int,
+   compile_regex(int, int, uschar **, const uschar **, int *, BOOL, BOOL, int,
-     int *, int *, branch_chain *, compile_data *);
+     int *, int *, branch_chain *, compile_data *, int *);
+ /*************************************************
+ *            Find an error text                  *
+ *************************************************/
+ /* The error texts are now all in one long string, to save on relocations. As
+ some of the text is of unknown length, we can't use a table of offsets.
+ Instead, just count through the strings. This is not a performance issue
+ because it happens only when there has been a compilation error.
+ Argument:   the error number
+ Returns:    pointer to the error string
+ */
+ static const char *
+ find_error_text(int n)
+ {
+ const char *s = error_texts;
+ for (; n > 0; n--) while (*s++ != 0) {};
+ return s;
+ }
  /*************************************************
-Line 342 
 static BOOL
+Line 511 
 static BOOL
  /* This function is called when a \ has been encountered. It either returns a
  positive value for a simple escape such as \n, or a negative value which
- encodes one of the more complicated things such as \d. When UTF-8 is enabled,
+ encodes one of the more complicated things such as \d. A backreference to group
- a positive value greater than 255 may be returned. On entry, ptr is pointing at
+ n is returned as -(ESC_REF + n); ESC_REF is the highest ESC_xxx macro. When
- the \. On exit, it is on the final character of the escape sequence.
+ UTF-8 is enabled, a positive value greater than 255 may be returned. On entry,
+ ptr is pointing at the \. On exit, it is on the final character of the escape
+ sequence.
  Arguments:
    ptrptr         points to the pattern position pointer
-Line 355 
 Arguments:
+Line 526 
 Arguments:
  Returns:         zero or positive => a data character
                   negative => a special escape sequence
-                  on error, errorptr is set
+                  on error, errorcodeptr is set
  */
  static int
  check_escape(const uschar **ptrptr, int *errorcodeptr, int bracount,
    int options, BOOL isclass)
  {
- const uschar *ptr = *ptrptr;
+ BOOL utf8 = (options & PCRE_UTF8) != 0;
+ const uschar *ptr = *ptrptr + 1;
  int c, i;
+ GETCHARINCTEST(c, ptr);           /* Get character value, increment pointer */
+ ptr--;                            /* Set pointer back to the last byte */
  /* If backslash is at the end of the pattern, it's an error. */
- c = *(++ptr);
  if (c == 0) *errorcodeptr = ERR1;
- /* Non-alphamerics are literals. For digits or letters, do an initial lookup in
+ /* Non-alphanumerics are literals. For digits or letters, do an initial lookup
- a table. A non-zero result is something that can be returned immediately.
+ in a table. A non-zero result is something that can be returned immediately.
  Otherwise further processing may be required. */
- #if !EBCDIC    /* ASCII coding */
+ #ifndef EBCDIC  /* ASCII/UTF-8 coding */
- else if (c < '0' || c > 'z') {}                           /* Not alphameric */
+ else if (c < CHAR_0 || c > CHAR_z) {}                     /* Not alphanumeric */
- else if ((i = escapes[c - '0']) != 0) c = i;
+ else if ((i = escapes[c - CHAR_0]) != 0) c = i;
- #else          /* EBCDIC coding */
+ #else           /* EBCDIC coding */
- else if (c < 'a' || (ebcdic_chartab[c] & 0x0E) == 0) {}   /* Not alphameric */
+ else if (c < 'a' || (ebcdic_chartab[c] & 0x0E) == 0) {}   /* Not alphanumeric */
  else if ((i = escapes[c - 0x48]) != 0)  c = i;
  #endif
-Line 388 
 else if ((i = escapes[c - 0x48]) != 0)
+Line 562 
 else if ((i = escapes[c - 0x48]) != 0)
  else
    {
    const uschar *oldptr;
+   BOOL braced, negated;
    switch (c)
      {
      /* A number of Perl escapes are not handled by PCRE. We give an explicit
      error. */
-     case 'l':
+     case CHAR_l:
-     case 'L':
+     case CHAR_L:
-     case 'N':
+     case CHAR_N:
-     case 'u':
+     case CHAR_u:
-     case 'U':
+     case CHAR_U:
      *errorcodeptr = ERR37;
      break;
+     /* \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
+.10 feature.
+     (2) Perl 5.10 also supports \g{name} as a reference to a named group. This
+     is part of Perl's movement towards a unified syntax for back references. As
+     this is synonymous with \k{name}, we fudge it up by pretending it really
+     was \k.
+     (3) For Oniguruma compatibility we also support \g followed by a name or a
+     number either in angle brackets or in single quotes. However, these are
+     (possibly recursive) subroutine calls, _not_ backreferences. Just return
+     the -ESC_g code (cf \k). */
+     case CHAR_g:
+     if (ptr[1] == CHAR_LESS_THAN_SIGN || ptr[1] == CHAR_APOSTROPHE)
+       {
+       c = -ESC_g;
+       break;
+       }
+     /* Handle the Perl-compatible cases */
+     if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)
+       {
+       const uschar *p;
+       for (p = ptr+2; *p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET; p++)
+         if (*p != CHAR_MINUS && (digitab[*p] & ctype_digit) == 0) break;
+       if (*p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET)
+         {
+         c = -ESC_k;
+         break;
+         }
+       braced = TRUE;
+       ptr++;
+       }
+     else braced = FALSE;
+     if (ptr[1] == CHAR_MINUS)
+       {
+       negated = TRUE;
+       ptr++;
+       }
+     else negated = FALSE;
+     c = 0;
+     while ((digitab[ptr[1]] & ctype_digit) != 0)
+       c = c * 10 + *(++ptr) - CHAR_0;
+     if (c < 0)   /* Integer overflow */
+       {
+       *errorcodeptr = ERR61;
+       break;
+       }
+     if (braced && *(++ptr) != CHAR_RIGHT_CURLY_BRACKET)
+       {
+       *errorcodeptr = ERR57;
+       break;
+       }
+     if (c == 0)
+       {
+       *errorcodeptr = ERR58;
+       break;
+       }
+     if (negated)
+       {
+       if (c > bracount)
+         {
+         *errorcodeptr = ERR15;
+         break;
+         }
+       c = bracount - (c - 1);
+       }
+     c = -(ESC_REF + c);
+     break;
      /* The handling of escape sequences consisting of a string of digits
      starting with one that is not zero is not straightforward. By experiment,
      the way Perl works seems to be as follows:
-Line 413 
 else
+Line 671 
 else
      value is greater than 377, the least significant 8 bits are taken. Inside a
      character class, \ followed by a digit is always an octal number. */
-     case '1': case '2': case '3': case '4': case '5':
+     case CHAR_1: case CHAR_2: case CHAR_3: case CHAR_4: case CHAR_5:
-     case '6': case '7': case '8': case '9':
+     case CHAR_6: case CHAR_7: case CHAR_8: case CHAR_9:
      if (!isclass)
        {
        oldptr = ptr;
-       c -= '0';
+       c -= CHAR_0;
        while ((digitab[ptr[1]] & ctype_digit) != 0)
-         c = c * 10 + *(++ptr) - '0';
+         c = c * 10 + *(++ptr) - CHAR_0;
+       if (c < 0)    /* Integer overflow */
+         {
+         *errorcodeptr = ERR61;
+         break;
+         }
        if (c < 10 || c <= bracount)
          {
          c = -(ESC_REF + c);
-Line 434 
 else
+Line 697 
 else
      generates a binary zero byte and treats the digit as a following literal.
      Thus we have to pull back the pointer by one. */
-     if ((c = *ptr) >= '8')
+     if ((c = *ptr) >= CHAR_8)
        {
        ptr--;
        c = 0;
-Line 442 
 else
+Line 705 
 else
        }
      /* \0 always starts an octal number, but we may drop through to here with a
-     larger first octal digit. */
+     larger first octal digit. The original code used just to take the least
+     significant 8 bits of octal numbers (I think this is what early Perls used
-     case '0':
+     to do). Nowadays we allow for larger numbers in UTF-8 mode, but no more
-     c -= '0';
+     than 3 octal digits. */
-     while(i++ < 2 && ptr[1] >= '0' && ptr[1] <= '7')
-         c = c * 8 + *(++ptr) - '0';
+     case CHAR_0:
-     c &= 255;     /* Take least significant 8 bits */
+     c -= CHAR_0;
+     while(i++ < 2 && ptr[1] >= CHAR_0 && ptr[1] <= CHAR_7)
+         c = c * 8 + *(++ptr) - CHAR_0;
+     if (!utf8 && c > 255) *errorcodeptr = ERR51;
      break;
-     /* \x is complicated when UTF-8 is enabled. \x{ddd} is a character number
+     /* \x is complicated. \x{ddd} is a character number which can be greater
-     which can be greater than 0xff, but only if the ddd are hex digits. */
+     than 0xff in utf8 mode, but only if the ddd are hex digits. If not, { is
+     treated as a data character. */
-     case 'x':
+     case CHAR_x:
- #ifdef SUPPORT_UTF8
+     if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)
-     if (ptr[1] == '{' && (options & PCRE_UTF8) != 0)
        {
        const uschar *pt = ptr + 2;
-       register int count = 0;
+       int count = 0;
        c = 0;
        while ((digitab[*pt] & ctype_xdigit) != 0)
          {
-         int cc = *pt++;
+         register int cc = *pt++;
+         if (c == 0 && cc == CHAR_0) continue;     /* Leading zeroes */
          count++;
- #if !EBCDIC    /* ASCII coding */
-         if (cc >= 'a') cc -= 32;               /* Convert to upper case */
+ #ifndef EBCDIC  /* ASCII/UTF-8 coding */
-         c = c * 16 + cc - ((cc < 'A')? '0' : ('A' - 10));
+         if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
- #else          /* EBCDIC coding */
+         c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
-         if (cc >= 'a' && cc <= 'z') cc += 64;  /* Convert to upper case */
+ #else           /* EBCDIC coding */
-         c = c * 16 + cc - ((cc >= '0')? '0' : ('A' - 10));
+         if (cc >= CHAR_a && cc <= CHAR_z) cc += 64;  /* Convert to upper case */
+         c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
  #endif
          }
-       if (*pt == '}')
+       if (*pt == CHAR_RIGHT_CURLY_BRACKET)
          {
-         if (c < 0 || count > 8) *errorcodeptr = ERR34;
+         if (c < 0 || count > (utf8? 8 : 2)) *errorcodeptr = ERR34;
          ptr = pt;
          break;
          }
        /* If the sequence of hex digits does not end with '}', then we don't
        recognize this construct; fall through to the normal \x handling. */
        }
- #endif
-     /* Read just a single hex char */
+     /* Read just a single-byte hex-defined char */
      c = 0;
      while (i++ < 2 && (digitab[ptr[1]] & ctype_xdigit) != 0)
        {
-       int cc;                               /* Some compilers don't like ++ */
+       int cc;                                  /* Some compilers don't like */
-       cc = *(++ptr);                        /* in initializers */
+       cc = *(++ptr);                           /* ++ in initializers */
- #if !EBCDIC    /* ASCII coding */
+ #ifndef EBCDIC  /* ASCII/UTF-8 coding */
-       if (cc >= 'a') cc -= 32;              /* Convert to upper case */
+       if (cc >= CHAR_a) cc -= 32;              /* Convert to upper case */
-       c = c * 16 + cc - ((cc < 'A')? '0' : ('A' - 10));
+       c = c * 16 + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
- #else          /* EBCDIC coding */
+ #else           /* EBCDIC coding */
-       if (cc <= 'z') cc += 64;              /* Convert to upper case */
+       if (cc <= CHAR_z) cc += 64;              /* Convert to upper case */
-       c = c * 16 + cc - ((cc >= '0')? '0' : ('A' - 10));
+       c = c * 16 + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
  #endif
        }
      break;
-     /* Other special escapes not starting with a digit are straightforward */
+     /* 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
+     ASCII-specific. (However, an EBCDIC equivalent has now been added.) */
-     case 'c':
+     case CHAR_c:
      c = *(++ptr);
      if (c == 0)
        {
        *errorcodeptr = ERR2;
-       return 0;
+       break;
        }
-     /* A letter is upper-cased; then the 0x40 bit is flipped. This coding
+ #ifndef EBCDIC  /* ASCII/UTF-8 coding */
-     is ASCII-specific, but then the whole concept of \cx is ASCII-specific.
+     if (c >= CHAR_a && c <= CHAR_z) c -= 32;
-     (However, an EBCDIC equivalent has now been added.) */
- #if !EBCDIC    /* ASCII coding */
-     if (c >= 'a' && c <= 'z') c -= 32;
      c ^= 0x40;
- #else          /* EBCDIC coding */
+ #else           /* EBCDIC coding */
-     if (c >= 'a' && c <= 'z') c += 64;
+     if (c >= CHAR_a && c <= CHAR_z) c += 64;
      c ^= 0xC0;
  #endif
      break;
      /* PCRE_EXTRA enables extensions to Perl in the matter of escapes. Any
-     other alphameric following \ is an error if PCRE_EXTRA was set; otherwise,
+     other alphanumeric following \ is an error if PCRE_EXTRA was set;
-     for Perl compatibility, it is a literal. This code looks a bit odd, but
+     otherwise, for Perl compatibility, it is a literal. This code looks a bit
-     there used to be some cases other than the default, and there may be again
+     odd, but there used to be some cases other than the default, and there may
-     in future, so I haven't "optimized" it. */
+     be again in future, so I haven't "optimized" it. */
      default:
      if ((options & PCRE_EXTRA) != 0) switch(c)
-Line 560 
 escape sequence.
+Line 828 
 escape sequence.
  Argument:
    ptrptr         points to the pattern position pointer
    negptr         points to a boolean that is set TRUE for negation else FALSE
+   dptr           points to an int that is set to the detailed property value
    errorcodeptr   points to the error code variable
- Returns:     value from ucp_type_table, or -1 for an invalid type
+ Returns:         type value from ucp_type_table, or -1 for an invalid type
  */
  static int
- get_ucp(const uschar **ptrptr, BOOL *negptr, int *errorcodeptr)
+ get_ucp(const uschar **ptrptr, BOOL *negptr, int *dptr, int *errorcodeptr)
  {
  int c, i, bot, top;
  const uschar *ptr = *ptrptr;
- char name[4];
+ char name[32];
  c = *(++ptr);
  if (c == 0) goto ERROR_RETURN;
  *negptr = FALSE;
- /* \P or \p can be followed by a one- or two-character name in {}, optionally
+ /* \P or \p can be followed by a name in {}, optionally preceded by ^ for
- preceded by ^ for negation. */
+ negation. */
- if (c == '{')
+ if (c == CHAR_LEFT_CURLY_BRACKET)
    {
-   if (ptr[1] == '^')
+   if (ptr[1] == CHAR_CIRCUMFLEX_ACCENT)
      {
      *negptr = TRUE;
      ptr++;
      }
-   for (i = 0; i <= 2; i++)
+   for (i = 0; i < (int)sizeof(name) - 1; i++)
      {
      c = *(++ptr);
      if (c == 0) goto ERROR_RETURN;
-     if (c == '}') break;
+     if (c == CHAR_RIGHT_CURLY_BRACKET) break;
      name[i] = c;
      }
-   if (c !='}')   /* Try to distinguish error cases */
+   if (c != CHAR_RIGHT_CURLY_BRACKET) goto ERROR_RETURN;
-     {
-     while (*(++ptr) != 0 && *ptr != '}');
-     if (*ptr == '}') goto UNKNOWN_RETURN; else goto ERROR_RETURN;
-     }
    name[i] = 0;
    }
-Line 619 
 top = _pcre_utt_size;
+Line 884 
 top = _pcre_utt_size;
  while (bot < top)
    {
-   i = (bot + top)/2;
+   i = (bot + top) >> 1;
-   c = strcmp(name, _pcre_utt[i].name);
+   c = strcmp(name, _pcre_utt_names + _pcre_utt[i].name_offset);
-   if (c == 0) return _pcre_utt[i].value;
+   if (c == 0)
+     {
+     *dptr = _pcre_utt[i].value;
+     return _pcre_utt[i].type;
+     }
    if (c > 0) bot = i + 1; else top = i;
    }
- UNKNOWN_RETURN:
  *errorcodeptr = ERR47;
  *ptrptr = ptr;
  return -1;
-Line 660 
 is_counted_repeat(const uschar *p)
+Line 928 
 is_counted_repeat(const uschar *p)
  {
  if ((digitab[*p++] & ctype_digit) == 0) return FALSE;
  while ((digitab[*p] & ctype_digit) != 0) p++;
- if (*p == '}') return TRUE;
+ if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;
- if (*p++ != ',') return FALSE;
+ if (*p++ != CHAR_COMMA) return FALSE;
- if (*p == '}') return TRUE;
+ 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 == '}');
+ return (*p == CHAR_RIGHT_CURLY_BRACKET);
  }
-Line 701 
 int max = -1;
+Line 969 
 int max = -1;
  /* Read the minimum value and do a paranoid check: a negative value indicates
  an integer overflow. */
- while ((digitab[*p] & ctype_digit) != 0) min = min * 10 + *p++ - '0';
+ while ((digitab[*p] & ctype_digit) != 0) min = min * 10 + *p++ - CHAR_0;
  if (min < 0 || min > 65535)
    {
    *errorcodeptr = ERR5;
-Line 711 
 if (min < 0 || min > 65535)
+Line 979 
 if (min < 0 || min > 65535)
  /* Read the maximum value if there is one, and again do a paranoid on its size.
  Also, max must not be less than min. */
- if (*p == '}') max = min; else
+ if (*p == CHAR_RIGHT_CURLY_BRACKET) max = min; else
    {
-   if (*(++p) != '}')
+   if (*(++p) != CHAR_RIGHT_CURLY_BRACKET)
      {
      max = 0;
-     while((digitab[*p] & ctype_digit) != 0) max = max * 10 + *p++ - '0';
+     while((digitab[*p] & ctype_digit) != 0) max = max * 10 + *p++ - CHAR_0;
      if (max < 0 || max > 65535)
        {
        *errorcodeptr = ERR5;
-Line 741 
 return p;
+Line 1009 
 return p;
  /*************************************************
+ *       Find forward referenced subpattern       *
+ *************************************************/
+ /* This function scans along a pattern's text looking for capturing
+ subpatterns, and counting them. If it finds a named pattern that matches the
+ name it is given, it returns its number. Alternatively, if the name is NULL, it
+ returns when it reaches a given numbered subpattern. This is used for forward
+ references to subpatterns. We know that if (?P< is encountered, the name will
+ be terminated by '>' because that is checked in the first pass.
+ Arguments:
+   ptr          current position in the pattern
+   cd           compile background data
+   name         name to seek, or NULL if seeking a numbered subpattern
+   lorn         name length, or subpattern number if name is NULL
+   xmode        TRUE if we are in /x mode
+ Returns:       the number of the named subpattern, or -1 if not found
+ */
+ static int
+ find_parens(const uschar *ptr, compile_data *cd, const uschar *name, int lorn,
+   BOOL xmode)
+ {
+ const uschar *thisname;
+ int count = cd->bracount;
+ for (; *ptr != 0; ptr++)
+   {
+   int term;
+   /* Skip over backslashed characters and also entire \Q...\E */
+   if (*ptr == CHAR_BACKSLASH)
+     {
+     if (*(++ptr) == 0) return -1;
+     if (*ptr == CHAR_Q) for (;;)
+       {
+       while (*(++ptr) != 0 && *ptr != CHAR_BACKSLASH) {};
+       if (*ptr == 0) return -1;
+       if (*(++ptr) == CHAR_E) break;
+       }
+     continue;
+     }
+   /* Skip over character classes; this logic must be similar to the way they
+   are handled for real. If the first character is '^', skip it. Also, if the
+   first few characters (either before or after ^) are \Q\E or \E we skip them
+   too. This makes for compatibility with Perl. Note the use of STR macros to
+   encode "Q\\E" so that it works in UTF-8 on EBCDIC platforms. */
+   if (*ptr == CHAR_LEFT_SQUARE_BRACKET)
+     {
+     BOOL negate_class = FALSE;
+     for (;;)
+       {
+       int c = *(++ptr);
+       if (c == CHAR_BACKSLASH)
+         {
+         if (ptr[1] == CHAR_E)
+           ptr++;
+         else if (strncmp((const char *)ptr+1,
+                  STR_Q STR_BACKSLASH STR_E, 3) == 0)
+           ptr += 3;
+         else
+           break;
+         }
+       else if (!negate_class && c == CHAR_CIRCUMFLEX_ACCENT)
+         negate_class = TRUE;
+       else break;
+       }
+     /* If the next character is ']', it is a data character that must be
+     skipped, except in JavaScript compatibility mode. */
+     if (ptr[1] == CHAR_RIGHT_SQUARE_BRACKET &&
+         (cd->external_options & PCRE_JAVASCRIPT_COMPAT) == 0)
+       ptr++;
+     while (*(++ptr) != CHAR_RIGHT_SQUARE_BRACKET)
+       {
+       if (*ptr == 0) return -1;
+       if (*ptr == CHAR_BACKSLASH)
+         {
+         if (*(++ptr) == 0) return -1;
+         if (*ptr == CHAR_Q) for (;;)
+           {
+           while (*(++ptr) != 0 && *ptr != CHAR_BACKSLASH) {};
+           if (*ptr == 0) return -1;
+           if (*(++ptr) == CHAR_E) break;
+           }
+         continue;
+         }
+       }
+     continue;
+     }
+   /* Skip comments in /x mode */
+   if (xmode && *ptr == CHAR_NUMBER_SIGN)
+     {
+     while (*(++ptr) != 0 && *ptr != CHAR_NL) {};
+     if (*ptr == 0) return -1;
+     continue;
+     }
+   /* An opening parens must now be a real metacharacter */
+   if (*ptr != CHAR_LEFT_PARENTHESIS) continue;
+   if (ptr[1] != CHAR_QUESTION_MARK && ptr[1] != CHAR_ASTERISK)
+     {
+     count++;
+     if (name == NULL && count == lorn) return count;
+     continue;
+     }
+   ptr += 2;
+   if (*ptr == CHAR_P) ptr++;                      /* Allow optional P */
+   /* We have to disambiguate (?<! and (?<= from (?<name> */
+   if ((*ptr != CHAR_LESS_THAN_SIGN || ptr[1] == CHAR_EXCLAMATION_MARK ||
+       ptr[1] == CHAR_EQUALS_SIGN) && *ptr != CHAR_APOSTROPHE)
+     continue;
+   count++;
+   if (name == NULL && count == lorn) return count;
+   term = *ptr++;
+   if (term == CHAR_LESS_THAN_SIGN) term = CHAR_GREATER_THAN_SIGN;
+   thisname = ptr;
+   while (*ptr != term) ptr++;
+   if (name != NULL && lorn == ptr - thisname &&
+       strncmp((const char *)name, (const char *)thisname, lorn) == 0)
+     return count;
+   }
+ return -1;
+ }
+ /*************************************************
  *      Find first significant op code            *
  *************************************************/
-Line 789 
 for (;;)
+Line 1200 
 for (;;)
      case OP_CALLOUT:
      case OP_CREF:
-     case OP_BRANUMBER:
+     case OP_RREF:
+     case OP_DEF:
      code += _pcre_OP_lengths[*code];
      break;
-Line 834 
 for (;;)
+Line 1246 
 for (;;)
    {
    int d;
    register int op = *cc;
-   if (op >= OP_BRA) op = OP_BRA;
    switch (op)
      {
+     case OP_CBRA:
      case OP_BRA:
      case OP_ONCE:
      case OP_COND:
-     d = find_fixedlength(cc, options);
+     d = find_fixedlength(cc + ((op == OP_CBRA)? 2:0), options);
      if (d < 0) return d;
      branchlength += d;
      do cc += GET(cc, 1); while (*cc == OP_ALT);
-Line 876 
 for (;;)
+Line 1287 
 for (;;)
      /* Skip over things that don't match chars */
      case OP_REVERSE:
-     case OP_BRANUMBER:
      case OP_CREF:
+     case OP_RREF:
+     case OP_DEF:
      case OP_OPT:
      case OP_CALLOUT:
      case OP_SOD:
-Line 895 
 for (;;)
+Line 1307 
 for (;;)
      case OP_CHAR:
      case OP_CHARNC:
+     case OP_NOT:
      branchlength++;
      cc += 2;
  #ifdef SUPPORT_UTF8
-Line 921 
 for (;;)
+Line 1334 
 for (;;)
      case OP_TYPEEXACT:
      branchlength += GET2(cc,1);
+     if (cc[3] == OP_PROP || cc[3] == OP_NOTPROP) cc += 2;
      cc += 4;
      break;
-Line 928 
 for (;;)
+Line 1342 
 for (;;)
      case OP_PROP:
      case OP_NOTPROP:
-     cc++;
+     cc += 2;
      /* Fall through */
      case OP_NOT_DIGIT:
-Line 938 
 for (;;)
+Line 1352 
 for (;;)
      case OP_NOT_WORDCHAR:
      case OP_WORDCHAR:
      case OP_ANY:
+     case OP_ALLANY:
      branchlength++;
      cc++;
      break;
-Line 1009 
 Returns:      pointer to the opcode for
+Line 1424 
 Returns:      pointer to the opcode for
  static const uschar *
  find_bracket(const uschar *code, BOOL utf8, int number)
  {
- #ifndef SUPPORT_UTF8
- utf8 = utf8;               /* Stop pedantic compilers complaining */
- #endif
  for (;;)
    {
    register int c = *code;
    if (c == OP_END) return NULL;
-   else if (c > OP_BRA)
+   /* XCLASS is used for classes that cannot be represented just by a bit
+   map. This includes negated single high-valued characters. The length in
+   the table is zero; the actual length is stored in the compiled code. */
+   if (c == OP_XCLASS) code += GET(code, 1);
+   /* Handle capturing bracket */
+   else if (c == OP_CBRA)
      {
-     int n = c - OP_BRA;
+     int n = GET2(code, 1+LINK_SIZE);
-     if (n > EXTRACT_BASIC_MAX) n = GET2(code, 2+LINK_SIZE);
      if (n == number) return (uschar *)code;
-     code += _pcre_OP_lengths[OP_BRA];
+     code += _pcre_OP_lengths[c];
      }
+   /* Otherwise, we can get the item's length from the table, except that for
+   repeated character types, we have to test for \p and \P, which have an extra
+   two bytes of parameters. */
    else
      {
-     code += _pcre_OP_lengths[c];
+     switch(c)
+       {
+       case OP_TYPESTAR:
+       case OP_TYPEMINSTAR:
+       case OP_TYPEPLUS:
+       case OP_TYPEMINPLUS:
+       case OP_TYPEQUERY:
+       case OP_TYPEMINQUERY:
+       case OP_TYPEPOSSTAR:
+       case OP_TYPEPOSPLUS:
+       case OP_TYPEPOSQUERY:
+       if (code[1] == OP_PROP || code[1] == OP_NOTPROP) code += 2;
+       break;
- #ifdef SUPPORT_UTF8
+       case OP_TYPEUPTO:
+       case OP_TYPEMINUPTO:
+       case OP_TYPEEXACT:
+       case OP_TYPEPOSUPTO:
+       if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;
+       break;
+       }
-     /* In UTF-8 mode, opcodes that are followed by a character may be followed
+     /* Add in the fixed length from the table */
-     by a multi-byte character. The length in the table is a minimum, so we have
-     to scan along to skip the extra bytes. All opcodes are less than 128, so we
+     code += _pcre_OP_lengths[c];
-     can use relatively efficient code. */
+   /* In UTF-8 mode, opcodes that are followed by a character may be followed by
+   a multi-byte character. The length in the table is a minimum, so we have to
+   arrange to skip the extra bytes. */
+ #ifdef SUPPORT_UTF8
      if (utf8) switch(c)
        {
        case OP_CHAR:
-Line 1042 
 for (;;)
+Line 1488 
 for (;;)
        case OP_EXACT:
        case OP_UPTO:
        case OP_MINUPTO:
+       case OP_POSUPTO:
        case OP_STAR:
        case OP_MINSTAR:
+       case OP_POSSTAR:
        case OP_PLUS:
        case OP_MINPLUS:
+       case OP_POSPLUS:
        case OP_QUERY:
        case OP_MINQUERY:
-       while ((*code & 0xc0) == 0x80) code++;
+       case OP_POSQUERY:
-       break;
+       if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];
-       /* XCLASS is used for classes that cannot be represented just by a bit
-       map. This includes negated single high-valued characters. The length in
-       the table is zero; the actual length is stored in the compiled code. */
-       case OP_XCLASS:
-       code += GET(code, 1) + 1;
        break;
        }
+ #else
+     (void)(utf8);  /* Keep compiler happy by referencing function argument */
  #endif
      }
    }
-Line 1083 
 Returns:      pointer to the opcode for
+Line 1527 
 Returns:      pointer to the opcode for
  static const uschar *
  find_recurse(const uschar *code, BOOL utf8)
  {
- #ifndef SUPPORT_UTF8
- utf8 = utf8;               /* Stop pedantic compilers complaining */
- #endif
  for (;;)
    {
    register int c = *code;
    if (c == OP_END) return NULL;
-   else if (c == OP_RECURSE) return code;
+   if (c == OP_RECURSE) return code;
-   else if (c > OP_BRA)
-     {
+   /* XCLASS is used for classes that cannot be represented just by a bit
-     code += _pcre_OP_lengths[OP_BRA];
+   map. This includes negated single high-valued characters. The length in
-     }
+   the table is zero; the actual length is stored in the compiled code. */
+   if (c == OP_XCLASS) code += GET(code, 1);
+   /* 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. */
    else
      {
-     code += _pcre_OP_lengths[c];
+     switch(c)
+       {
+       case OP_TYPESTAR:
+       case OP_TYPEMINSTAR:
+       case OP_TYPEPLUS:
+       case OP_TYPEMINPLUS:
+       case OP_TYPEQUERY:
+       case OP_TYPEMINQUERY:
+       case OP_TYPEPOSSTAR:
+       case OP_TYPEPOSPLUS:
+       case OP_TYPEPOSQUERY:
+       if (code[1] == OP_PROP || code[1] == OP_NOTPROP) code += 2;
+       break;
- #ifdef SUPPORT_UTF8
+       case OP_TYPEPOSUPTO:
+       case OP_TYPEUPTO:
+       case OP_TYPEMINUPTO:
+       case OP_TYPEEXACT:
+       if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;
+       break;
+       }
+     /* Add in the fixed length from the table */
+     code += _pcre_OP_lengths[c];
      /* In UTF-8 mode, opcodes that are followed by a character may be followed
      by a multi-byte character. The length in the table is a minimum, so we have
-     to scan along to skip the extra bytes. All opcodes are less than 128, so we
+     to arrange to skip the extra bytes. */
-     can use relatively efficient code. */
+ #ifdef SUPPORT_UTF8
      if (utf8) switch(c)
        {
        case OP_CHAR:
-Line 1114 
 for (;;)
+Line 1583 
 for (;;)
        case OP_EXACT:
        case OP_UPTO:
        case OP_MINUPTO:
+       case OP_POSUPTO:
        case OP_STAR:
        case OP_MINSTAR:
+       case OP_POSSTAR:
        case OP_PLUS:
        case OP_MINPLUS:
+       case OP_POSPLUS:
        case OP_QUERY:
        case OP_MINQUERY:
-       while ((*code & 0xc0) == 0x80) code++;
+       case OP_POSQUERY:
-       break;
+       if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];
-       /* XCLASS is used for classes that cannot be represented just by a bit
-       map. This includes negated single high-valued characters. The length in
-       the table is zero; the actual length is stored in the compiled code. */
-       case OP_XCLASS:
-       code += GET(code, 1) + 1;
        break;
        }
+ #else
+     (void)(utf8);  /* Keep compiler happy by referencing function argument */
  #endif
      }
    }
-Line 1143 
 for (;;)
+Line 1610 
 for (;;)
  *************************************************/
  /* This function scans through a branch of a compiled pattern to see whether it
- can match the empty string or not. It is called only from could_be_empty()
+ can match the empty string or not. It is called from could_be_empty()
- below. Note that first_significant_code() skips over assertions. If we hit an
+ below and from compile_branch() when checking for an unlimited repeat of a
- unclosed bracket, we return "empty" - this means we've struck an inner bracket
+ group that can match nothing. Note that first_significant_code() skips over
- whose current branch will already have been scanned.
+ backward and negative forward assertions when its final argument is TRUE. If we
+ hit an unclosed bracket, we return "empty" - this means we've struck an inner
+ bracket whose current branch will already have been scanned.
  Arguments:
    code        points to start of search
-Line 1160 
 static BOOL
+Line 1629 
 static BOOL
  could_be_empty_branch(const uschar *code, const uschar *endcode, BOOL utf8)
  {
  register int c;
- for (code = first_significant_code(code + 1 + LINK_SIZE, NULL, 0, TRUE);
+ for (code = first_significant_code(code + _pcre_OP_lengths[*code], NULL, 0, TRUE);
       code < endcode;
       code = first_significant_code(code + _pcre_OP_lengths[c], NULL, 0, TRUE))
    {
-Line 1168 
 for (code = first_significant_code(code
+Line 1637 
 for (code = first_significant_code(code
    c = *code;
-   if (c >= OP_BRA)
+   /* Skip over forward assertions; the other assertions are skipped by
+   first_significant_code() with a TRUE final argument. */
+   if (c == OP_ASSERT)
+     {
+     do code += GET(code, 1); while (*code == OP_ALT);
+     c = *code;
+     continue;
+     }
+   /* Groups with zero repeats can of course be empty; skip them. */
+   if (c == OP_BRAZERO || c == OP_BRAMINZERO || c == OP_SKIPZERO)
+     {
+     code += _pcre_OP_lengths[c];
+     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)
      {
      BOOL empty_branch;
      if (GET(code, 1) == 0) return TRUE;    /* Hit unclosed bracket */
-Line 1184 
 for (code = first_significant_code(code
+Line 1675 
 for (code = first_significant_code(code
        }
      while (*code == OP_ALT);
      if (!empty_branch) return FALSE;   /* All branches are non-empty */
-     code += 1 + LINK_SIZE;
      c = *code;
+     continue;
      }
-   else switch (c)
+   /* Handle the other opcodes */
+   switch (c)
      {
-     /* Check for quantifiers after a class */
+     /* Check for quantifiers after a class. XCLASS is used for classes that
+     cannot be represented just by a bit map. This includes negated single
+     high-valued characters. The length in _pcre_OP_lengths[] is zero; the
+     actual length is stored in the compiled code, so we must update "code"
+     here. */
  #ifdef SUPPORT_UTF8
      case OP_XCLASS:
-     ccode = code + GET(code, 1);
+     ccode = code += GET(code, 1);
      goto CHECK_CLASS_REPEAT;
  #endif
-Line 1238 
 for (code = first_significant_code(code
+Line 1735 
 for (code = first_significant_code(code
      case OP_NOT_WORDCHAR:
      case OP_WORDCHAR:
      case OP_ANY:
+     case OP_ALLANY:
      case OP_ANYBYTE:
      case OP_CHAR:
      case OP_CHARNC:
      case OP_NOT:
      case OP_PLUS:
      case OP_MINPLUS:
+     case OP_POSPLUS:
      case OP_EXACT:
      case OP_NOTPLUS:
      case OP_NOTMINPLUS:
+     case OP_NOTPOSPLUS:
      case OP_NOTEXACT:
      case OP_TYPEPLUS:
      case OP_TYPEMINPLUS:
+     case OP_TYPEPOSPLUS:
      case OP_TYPEEXACT:
      return FALSE;
+     /* These are going to continue, as they may be empty, but we have to
+     fudge the length for the \p and \P cases. */
+     case OP_TYPESTAR:
+     case OP_TYPEMINSTAR:
+     case OP_TYPEPOSSTAR:
+     case OP_TYPEQUERY:
+     case OP_TYPEMINQUERY:
+     case OP_TYPEPOSQUERY:
+     if (code[1] == OP_PROP || code[1] == OP_NOTPROP) code += 2;
+     break;
+     /* Same for these */
+     case OP_TYPEUPTO:
+     case OP_TYPEMINUPTO:
+     case OP_TYPEPOSUPTO:
+     if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;
+     break;
      /* End of branch */
      case OP_KET:
-Line 1261 
 for (code = first_significant_code(code
+Line 1782 
 for (code = first_significant_code(code
      case OP_ALT:
      return TRUE;
-     /* In UTF-8 mode, STAR, MINSTAR, QUERY, MINQUERY, UPTO, and MINUPTO  may be
+     /* In UTF-8 mode, STAR, MINSTAR, POSSTAR, QUERY, MINQUERY, POSQUERY, UPTO,
-     followed by a multibyte character */
+     MINUPTO, and POSUPTO may be followed by a multibyte character */
  #ifdef SUPPORT_UTF8
      case OP_STAR:
      case OP_MINSTAR:
+     case OP_POSSTAR:
      case OP_QUERY:
      case OP_MINQUERY:
+     case OP_POSQUERY:
      case OP_UPTO:
      case OP_MINUPTO:
+     case OP_POSUPTO:
      if (utf8) while ((code[2] & 0xc0) == 0x80) code++;
      break;
  #endif
-Line 1319 
 return TRUE;
+Line 1843 
 return TRUE;
  *************************************************/
  /* This function is called when the sequence "[:" or "[." or "[=" is
- encountered in a character class. It checks whether this is followed by an
+ encountered in a character class. It checks whether this is followed by a
- optional ^ and then a sequence of letters, terminated by a matching ":]" or
+ sequence of characters terminated by a matching ":]" or ".]" or "=]". If we
- ".]" or "=]".
+ reach an unescaped ']' without the special preceding character, return FALSE.
+ Originally, this function only recognized a sequence of letters between the
+ terminators, but it seems that Perl recognizes any sequence of characters,
+ though of course unknown POSIX names are subsequently rejected. Perl gives an
+ "Unknown POSIX class" error for [:f\oo:] for example, where previously PCRE
+ didn't consider this to be a POSIX class. Likewise for [:1234:].
+ The problem in trying to be exactly like Perl is in the handling of escapes. We
+ have to be sure that [abc[:x\]pqr] is *not* treated as containing a POSIX
+ class, but [abc[:x\]pqr:]] is (so that an error can be generated). The code
+ below handles the special case of \], but does not try to do any other escape
+ processing. This makes it different from Perl for cases such as [:l\ower:]
+ where Perl recognizes it as the POSIX class "lower" but PCRE does not recognize
+ "l\ower". This is a lesser evil that not diagnosing bad classes when Perl does,
+ I think.
- Argument:
+ Arguments:
    ptr      pointer to the initial [
    endptr   where to return the end pointer
-   cd       pointer to compile data
  Returns:   TRUE or FALSE
  */
  static BOOL
- check_posix_syntax(const uschar *ptr, const uschar **endptr, compile_data *cd)
+ check_posix_syntax(const uschar *ptr, const uschar **endptr)
  {
  int terminator;          /* Don't combine these lines; the Solaris cc */
  terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */
- if (*(++ptr) == '^') ptr++;
+ for (++ptr; *ptr != 0; ptr++)
- while ((cd->ctypes[*ptr] & ctype_letter) != 0) ptr++;
- if (*ptr == terminator && ptr[1] == ']')
    {
-   *endptr = ptr;
+   if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET) ptr++; else
-   return TRUE;
+     {
+     if (*ptr == CHAR_RIGHT_SQUARE_BRACKET) return FALSE;
+     if (*ptr == terminator && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)
+       {
+       *endptr = ptr;
+       return TRUE;
+       }
+     }
    }
  return FALSE;
  }
-Line 1366 
 Returns:     a value representing the na
+Line 1909 
 Returns:     a value representing the na
  static int
  check_posix_name(const uschar *ptr, int len)
  {
+ const char *pn = posix_names;
  register int yield = 0;
  while (posix_name_lengths[yield] != 0)
    {
    if (len == posix_name_lengths[yield] &&
-     strncmp((const char *)ptr, posix_names[yield], len) == 0) return yield;
+     strncmp((const char *)ptr, pn, len) == 0) return yield;
+   pn += posix_name_lengths[yield] + 1;
    yield++;
    }
  return -1;
-Line 1385 
 return -1;
+Line 1930 
 return -1;
  that is referenced. This means that groups can be replicated for fixed
  repetition simply by copying (because the recursion is allowed to refer to
  earlier groups that are outside the current group). However, when a group is
- optional (i.e. the minimum quantifier is zero), OP_BRAZERO is inserted before
+ optional (i.e. the minimum quantifier is zero), OP_BRAZERO or OP_SKIPZERO is
- it, after it has been compiled. This means that any OP_RECURSE items within it
+ inserted before it, after it has been compiled. This means that any OP_RECURSE
- that refer to the group itself or any contained groups have to have their
+ items within it that refer to the group itself or any contained groups have to
- offsets adjusted. That is the job of this function. Before it is called, the
+ have their offsets adjusted. That one of the jobs of this function. Before it
- partially compiled regex must be temporarily terminated with OP_END.
+ is called, the partially compiled regex must be temporarily terminated with
+ OP_END.
+ This function has been extended with the possibility of forward references for
+ recursions and subroutine calls. It must also check the list of such references
+ for the group we are dealing with. If it finds that one of the recursions in
+ the current group is on this list, it adjusts the offset in the list, not the
+ value in the reference (which is a group number).
  Arguments:
    group      points to the start of the group
    adjust     the amount by which the group is to be moved
    utf8       TRUE in UTF-8 mode
    cd         contains pointers to tables etc.
+   save_hwm   the hwm forward reference pointer at the start of the group
  Returns:     nothing
  */
  static void
- adjust_recurse(uschar *group, int adjust, BOOL utf8, compile_data *cd)
+ adjust_recurse(uschar *group, int adjust, BOOL utf8, compile_data *cd,
+   uschar *save_hwm)
  {
  uschar *ptr = group;
  while ((ptr = (uschar *)find_recurse(ptr, utf8)) != NULL)
    {
-   int offset = GET(ptr, 1);
+   int offset;
-   if (cd->start_code + offset >= group) PUT(ptr, 1, offset + adjust);
+   uschar *hc;
-   ptr += 1 + LINK_SIZE;
-   }
- }
+   /* See if this recursion is on the forward reference list. If so, adjust the
+   reference. */
- /*************************************************
+   for (hc = save_hwm; hc < cd->hwm; hc += LINK_SIZE)
- *        Insert an automatic callout point       *
+     {
+     offset = GET(hc, 0);
+     if (cd->start_code + offset == ptr + 1)
+       {
+       PUT(hc, 0, offset + adjust);
+       break;
+       }
+     }
+   /* Otherwise, adjust the recursion offset if it's after the start of this
+   group. */
+   if (hc >= cd->hwm)
+     {
+     offset = GET(ptr, 1);
+     if (cd->start_code + offset >= group) PUT(ptr, 1, offset + adjust);
+     }
+   ptr += 1 + LINK_SIZE;
+   }
+ }
+ /*************************************************
+ *        Insert an automatic callout point       *
  *************************************************/
  /* This function is called when the PCRE_AUTO_CALLOUT option is set, to insert
-Line 1486 
 Yield:        TRUE when range returned;
+Line 2064 
 Yield:        TRUE when range returned;
  */
  static BOOL
- get_othercase_range(int *cptr, int d, int *ocptr, int *odptr)
+ get_othercase_range(unsigned int *cptr, unsigned int d, unsigned int *ocptr,
+   unsigned int *odptr)
  {
- int c, chartype, othercase, next;
+ unsigned int c, othercase, next;
  for (c = *cptr; c <= d; c++)
-   {
+   { if ((othercase = UCD_OTHERCASE(c)) != c) break; }
-   if (_pcre_ucp_findchar(c, &chartype, &othercase) == ucp_L && othercase != 0)
-     break;
-   }
  if (c > d) return FALSE;
-Line 1503 
 next = othercase + 1;
+Line 2079 
 next = othercase + 1;
  for (++c; c <= d; c++)
    {
-   if (_pcre_ucp_findchar(c, &chartype, &othercase) != ucp_L ||
+   if (UCD_OTHERCASE(c) != next) break;
-         othercase != next)
-     break;
    next++;
    }
-Line 1517 
 return TRUE;
+Line 2091 
 return TRUE;
  #endif  /* SUPPORT_UCP */
+ /*************************************************
+ *     Check if auto-possessifying is possible    *
+ *************************************************/
+ /* This function is called for unlimited repeats of certain items, to see
+ whether the next thing could possibly match the repeated item. If not, it makes
+ sense to automatically possessify the repeated item.
+ Arguments:
+   op_code       the repeated op code
+   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.
+ Returns:        TRUE if possessifying is wanted
+ */
+ static BOOL
+ check_auto_possessive(int op_code, int item, BOOL utf8, uschar *utf8_char,
+   const uschar *ptr, int options, compile_data *cd)
+ {
+ int next;
+ /* Skip whitespace and comments in extended mode */
+ if ((options & PCRE_EXTENDED) != 0)
+   {
+   for (;;)
+     {
+     while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;
+     if (*ptr == CHAR_NUMBER_SIGN)
+       {
+       while (*(++ptr) != 0)
+         if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }
+       }
+     else break;
+     }
+   }
+ /* If the next item is one that we can handle, get its value. A non-negative
+ value is a character, a negative value is an escape value. */
+ if (*ptr == CHAR_BACKSLASH)
+   {
+   int temperrorcode = 0;
+   next = check_escape(&ptr, &temperrorcode, cd->bracount, options, FALSE);
+   if (temperrorcode != 0) return FALSE;
+   ptr++;    /* Point after the escape sequence */
+   }
+ else if ((cd->ctypes[*ptr] & ctype_meta) == 0)
+   {
+ #ifdef SUPPORT_UTF8
+   if (utf8) { GETCHARINC(next, ptr); } else
+ #endif
+   next = *ptr++;
+   }
+ else return FALSE;
+ /* Skip whitespace and comments in extended mode */
+ if ((options & PCRE_EXTENDED) != 0)
+   {
+   for (;;)
+     {
+     while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;
+     if (*ptr == CHAR_NUMBER_SIGN)
+       {
+       while (*(++ptr) != 0)
+         if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }
+       }
+     else break;
+     }
+   }
+ /* If the next thing is itself optional, we have to give up. */
+ if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||
+   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
+ positive single character match, "item" either contains the character or, if
+ "item" is greater than 127 in utf8 mode, the character's bytes are in
+ utf8_char. */
+ /* Handle cases when the next item is a character. */
+ if (next >= 0) switch(op_code)
+   {
+   case OP_CHAR:
+ #ifdef SUPPORT_UTF8
+   if (utf8 && item > 127) { GETCHAR(item, utf8_char); }
+ #else
+   (void)(utf8_char);  /* Keep compiler happy by referencing function argument */
+ #endif
+   return item != next;
+   /* For CHARNC (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:
+ #ifdef SUPPORT_UTF8
+   if (utf8 && item > 127) { GETCHAR(item, utf8_char); }
+ #endif
+   if (item == next) return FALSE;
+ #ifdef SUPPORT_UTF8
+   if (utf8)
+     {
+     unsigned int othercase;
+     if (next < 128) othercase = cd->fcc[next]; else
+ #ifdef SUPPORT_UCP
+     othercase = UCD_OTHERCASE((unsigned int)next);
+ #else
+     othercase = NOTACHAR;
+ #endif
+     return (unsigned int)item != othercase;
+     }
+   else
+ #endif  /* SUPPORT_UTF8 */
+   return (item != cd->fcc[next]);  /* Non-UTF-8 mode */
+   /* For OP_NOT, "item" must be a single-byte character. */
+   case OP_NOT:
+   if (item == next) return TRUE;
+   if ((options & PCRE_CASELESS) == 0) return FALSE;
+ #ifdef SUPPORT_UTF8
+   if (utf8)
+     {
+     unsigned int othercase;
+     if (next < 128) othercase = cd->fcc[next]; else
+ #ifdef SUPPORT_UCP
+     othercase = UCD_OTHERCASE(next);
+ #else
+     othercase = NOTACHAR;
+ #endif
+     return (unsigned int)item == othercase;
+     }
+   else
+ #endif  /* SUPPORT_UTF8 */
+   return (item == cd->fcc[next]);  /* Non-UTF-8 mode */
+   case OP_DIGIT:
+   return next > 127 || (cd->ctypes[next] & ctype_digit) == 0;
+   case OP_NOT_DIGIT:
+   return next <= 127 && (cd->ctypes[next] & ctype_digit) != 0;
+   case OP_WHITESPACE:
+   return next > 127 || (cd->ctypes[next] & ctype_space) == 0;
+   case OP_NOT_WHITESPACE:
+   return next <= 127 && (cd->ctypes[next] & ctype_space) != 0;
+   case OP_WORDCHAR:
+   return next > 127 || (cd->ctypes[next] & ctype_word) == 0;
+   case OP_NOT_WORDCHAR:
+   return next <= 127 && (cd->ctypes[next] & ctype_word) != 0;
+   case OP_HSPACE:
+   case OP_NOT_HSPACE:
+   switch(next)
+     {
+     case 0x09:
+     case 0x20:
+     case 0xa0:
+     case 0x1680:
+     case 0x180e:
+     case 0x2000:
+     case 0x2001:
+     case 0x2002:
+     case 0x2003:
+     case 0x2004:
+     case 0x2005:
+     case 0x2006:
+     case 0x2007:
+     case 0x2008:
+     case 0x2009:
+     case 0x200A:
+     case 0x202f:
+     case 0x205f:
+     case 0x3000:
+     return op_code != OP_HSPACE;
+     default:
+     return op_code == OP_HSPACE;
+     }
+   case OP_VSPACE:
+   case OP_NOT_VSPACE:
+   switch(next)
+     {
+     case 0x0a:
+     case 0x0b:
+     case 0x0c:
+     case 0x0d:
+     case 0x85:
+     case 0x2028:
+     case 0x2029:
+     return op_code != OP_VSPACE;
+     default:
+     return op_code == OP_VSPACE;
+     }
+   default:
+   return FALSE;
+   }
+ /* Handle the case when the next item is \d, \s, etc. */
+ switch(op_code)
+   {
+   case OP_CHAR:
+   case OP_CHARNC:
+ #ifdef SUPPORT_UTF8
+   if (utf8 && item > 127) { GETCHAR(item, utf8_char); }
+ #endif
+   switch(-next)
+     {
+     case ESC_d:
+     return item > 127 || (cd->ctypes[item] & ctype_digit) == 0;
+     case ESC_D:
+     return item <= 127 && (cd->ctypes[item] & ctype_digit) != 0;
+     case ESC_s:
+     return item > 127 || (cd->ctypes[item] & ctype_space) == 0;
+     case ESC_S:
+     return item <= 127 && (cd->ctypes[item] & ctype_space) != 0;
+     case ESC_w:
+     return item > 127 || (cd->ctypes[item] & ctype_word) == 0;
+     case ESC_W:
+     return item <= 127 && (cd->ctypes[item] & ctype_word) != 0;
+     case ESC_h:
+     case ESC_H:
+     switch(item)
+       {
+       case 0x09:
+       case 0x20:
+       case 0xa0:
+       case 0x1680:
+       case 0x180e:
+       case 0x2000:
+       case 0x2001:
+       case 0x2002:
+       case 0x2003:
+       case 0x2004:
+       case 0x2005:
+       case 0x2006:
+       case 0x2007:
+       case 0x2008:
+       case 0x2009:
+       case 0x200A:
+       case 0x202f:
+       case 0x205f:
+       case 0x3000:
+       return -next != ESC_h;
+       default:
+       return -next == ESC_h;
+       }
+     case ESC_v:
+     case ESC_V:
+     switch(item)
+       {
+       case 0x0a:
+       case 0x0b:
+       case 0x0c:
+       case 0x0d:
+       case 0x85:
+       case 0x2028:
+       case 0x2029:
+       return -next != ESC_v;
+       default:
+       return -next == ESC_v;
+       }
+     default:
+     return FALSE;
+     }
+   case OP_DIGIT:
+   return next == -ESC_D || next == -ESC_s || next == -ESC_W ||
+          next == -ESC_h || next == -ESC_v;
+   case OP_NOT_DIGIT:
+   return next == -ESC_d;
+   case OP_WHITESPACE:
+   return next == -ESC_S || next == -ESC_d || next == -ESC_w;
+   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;
+   case OP_NOT_HSPACE:
+   return next == -ESC_h;
+   /* Can't have \S in here because VT matches \S (Perl anomaly) */
+   case OP_VSPACE:
+   return next == -ESC_V || next == -ESC_d || next == -ESC_w;
+   case OP_NOT_VSPACE:
+   return next == -ESC_v;
+   case OP_WORDCHAR:
+   return next == -ESC_W || next == -ESC_s || next == -ESC_h || next == -ESC_v;
+   case OP_NOT_WORDCHAR:
+   return next == -ESC_w || next == -ESC_d;
+   default:
+   return FALSE;
+   }
+ /* Control does not reach here */
+ }
  /*************************************************
  *           Compile one branch                   *
  *************************************************/
- /* Scan the pattern, compiling it into the code vector. If the options are
+ /* Scan the pattern, compiling it into the a vector. If the options are
  changed during the branch, the pointer is used to change the external options
- bits.
+ bits. 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:
    optionsptr     pointer to the option bits
-   brackets       points to number of extracting brackets used
    codeptr        points to the pointer to the current code point
    ptrptr         points to the current pattern pointer
    errorcodeptr   points to error code variable
-Line 1535 
 Arguments:
+Line 2445 
 Arguments:
    reqbyteptr     set to the last literal character required, else < 0
    bcptr          points to current branch chain
    cd             contains pointers to tables etc.
+   lengthptr      NULL during the real compile phase
+                  points to length accumulator during pre-compile phase
  Returns:         TRUE on success
                   FALSE, with *errorcodeptr set non-zero on error
  */
  static BOOL
- compile_branch(int *optionsptr, int *brackets, uschar **codeptr,
+ compile_branch(int *optionsptr, uschar **codeptr, const uschar **ptrptr,
-   const uschar **ptrptr, int *errorcodeptr, int *firstbyteptr,
+   int *errorcodeptr, int *firstbyteptr, int *reqbyteptr, branch_chain *bcptr,
-   int *reqbyteptr, branch_chain *bcptr, compile_data *cd)
+   compile_data *cd, int *lengthptr)
  {
  int repeat_type, op_type;
  int repeat_min = 0, repeat_max = 0;      /* To please picky compilers */
-Line 1552 
 int greedy_default, greedy_non_default;
+Line 2464 
 int greedy_default, greedy_non_default;
  int firstbyte, reqbyte;
  int zeroreqbyte, zerofirstbyte;
  int req_caseopt, reqvary, tempreqvary;
- int condcount = 0;
  int options = *optionsptr;
  int after_manual_callout = 0;
+ int length_prevgroup = 0;
  register int c;
  register uschar *code = *codeptr;
+ uschar *last_code = code;
+ uschar *orig_code = code;
  uschar *tempcode;
  BOOL inescq = FALSE;
  BOOL groupsetfirstbyte = FALSE;
-Line 1564 
 const uschar *ptr = *ptrptr;
+Line 2478 
 const uschar *ptr = *ptrptr;
  const uschar *tempptr;
  uschar *previous = NULL;
  uschar *previous_callout = NULL;
+ uschar *save_hwm = NULL;
  uschar classbits[32];
  #ifdef SUPPORT_UTF8
  BOOL class_utf8;
  BOOL utf8 = (options & PCRE_UTF8) != 0;
  uschar *class_utf8data;
+ uschar *class_utf8data_base;
  uschar utf8_char[6];
  #else
  BOOL utf8 = FALSE;
+ uschar *utf8_char = NULL;
+ #endif
+ #ifdef DEBUG
+ if (lengthptr != NULL) DPRINTF((">> start branch\n"));
  #endif
  /* Set up the default and non-default settings for greediness */
-Line 1604 
 req_caseopt = ((options & PCRE_CASELESS)
+Line 2525 
 req_caseopt = ((options & PCRE_CASELESS)
  for (;; ptr++)
    {
    BOOL negate_class;
+   BOOL should_flip_negation;
    BOOL possessive_quantifier;
    BOOL is_quantifier;
+   BOOL is_recurse;
+   BOOL reset_bracount;
    int class_charcount;
    int class_lastchar;
    int newoptions;
    int recno;
+   int refsign;
    int skipbytes;
    int subreqbyte;
    int subfirstbyte;
+   int terminator;
    int mclength;
    uschar mcbuffer[8];
-   /* Next byte in the pattern */
+   /* Get next byte in the pattern */
    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
+     if (code > cd->hwm) cd->hwm = code;                 /* High water info */
+ #endif
+     if (code > cd->start_workspace + COMPILE_WORK_SIZE) /* Check for overrun */
+       {
+       *errorcodeptr = ERR52;
+       goto FAILED;
+       }
+     /* There is at least one situation where code goes backwards: this is the
+     case of a zero quantifier after a class (e.g. [ab]{0}). At compile time,
+     the class is simply eliminated. However, it is created first, so we have to
+     allow memory for it. Therefore, don't ever reduce the length at this point.
+     */
+     if (code < last_code) code = last_code;
+     /* Paranoid check for integer overflow */
+     if (OFLOW_MAX - *lengthptr < code - last_code)
+       {
+       *errorcodeptr = ERR20;
+       goto FAILED;
+       }
+     *lengthptr += 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
+     it back to there, in order to avoid filling up the work space. Otherwise,
+     if "previous" is NULL, reset the current code pointer to the start. */
+     if (previous != NULL)
+       {
+       if (previous > orig_code)
+         {
+         memmove(orig_code, previous, code - previous);
+         code -= previous - orig_code;
+         previous = orig_code;
+         }
+       }
+     else code = orig_code;
+     /* Remember where this code item starts so we can pick up the length
+     next time round. */
+     last_code = code;
+     }
+   /* 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)
+     {
+     *errorcodeptr = ERR52;
+     goto FAILED;
+     }
    /* If in \Q...\E, check for the end; if not, we have a literal */
    if (inescq && c != 0)
      {
-     if (c == '\\' && ptr[1] == 'E')
+     if (c == CHAR_BACKSLASH && ptr[1] == CHAR_E)
        {
        inescq = FALSE;
        ptr++;
-Line 1634 
 for (;; ptr++)
+Line 2623 
 for (;; ptr++)
        {
        if (previous_callout != NULL)
          {
-         complete_callout(previous_callout, ptr, cd);
+         if (lengthptr == NULL)  /* Don't attempt in pre-compile phase */
+           complete_callout(previous_callout, ptr, cd);
          previous_callout = NULL;
          }
        if ((options & PCRE_AUTO_CALLOUT) != 0)
-Line 1649 
 for (;; ptr++)
+Line 2639 
 for (;; ptr++)
    /* Fill in length of a previous callout, except when the next thing is
    a quantifier. */
-   is_quantifier = c == '*' || c == '+' || c == '?' ||
+   is_quantifier =
-     (c == '{' && is_counted_repeat(ptr+1));
+     c == CHAR_ASTERISK || c == CHAR_PLUS || c == CHAR_QUESTION_MARK ||
+     (c == CHAR_LEFT_CURLY_BRACKET && is_counted_repeat(ptr+1));
    if (!is_quantifier && previous_callout != NULL &&
         after_manual_callout-- <= 0)
      {
-     complete_callout(previous_callout, ptr, cd);
+     if (lengthptr == NULL)      /* Don't attempt in pre-compile phase */
+       complete_callout(previous_callout, ptr, cd);
      previous_callout = NULL;
      }
-Line 1664 
 for (;; ptr++)
+Line 2656 
 for (;; ptr++)
    if ((options & PCRE_EXTENDED) != 0)
      {
      if ((cd->ctypes[c] & ctype_space) != 0) continue;
-     if (c == '#')
+     if (c == CHAR_NUMBER_SIGN)
        {
-       /* The space before the ; is to avoid a warning on a silly compiler
+       while (*(++ptr) != 0)
-       on the Macintosh. */
+         {
-       while ((c = *(++ptr)) != 0 && c != NEWLINE) ;
+         if (IS_NEWLINE(ptr)) { ptr += cd->nllen - 1; break; }
-       if (c != 0) continue;   /* Else fall through to handle end of string */
+         }
+       if (*ptr != 0) continue;
+       /* Else fall through to handle end of string */
+       c = 0;
        }
      }
-Line 1683 
 for (;; ptr++)
+Line 2679 
 for (;; ptr++)
    switch(c)
      {
-     /* The branch terminates at end of string, |, or ). */
+     /* ===================================================================*/
+     case 0:                        /* The branch terminates at string end */
-     case 0:
+     case CHAR_VERTICAL_LINE:       /* or | or ) */
-     case '|':
+     case CHAR_RIGHT_PARENTHESIS:
-     case ')':
      *firstbyteptr = firstbyte;
      *reqbyteptr = reqbyte;
      *codeptr = code;
      *ptrptr = ptr;
+     if (lengthptr != NULL)
+       {
+       if (OFLOW_MAX - *lengthptr < code - last_code)
+         {
+         *errorcodeptr = ERR20;
+         goto FAILED;
+         }
+       *lengthptr += code - last_code;   /* To include callout length */
+       DPRINTF((">> end branch\n"));
+       }
      return TRUE;
+     /* ===================================================================*/
      /* Handle single-character metacharacters. In multiline mode, ^ disables
      the setting of any following char as a first character. */
-     case '^':
+     case CHAR_CIRCUMFLEX_ACCENT:
      if ((options & PCRE_MULTILINE) != 0)
        {
        if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
-Line 1706 
 for (;; ptr++)
+Line 2713 
 for (;; ptr++)
      *code++ = OP_CIRC;
      break;
-     case '$':
+     case CHAR_DOLLAR_SIGN:
      previous = NULL;
      *code++ = OP_DOLL;
      break;
-Line 1714 
 for (;; ptr++)
+Line 2721 
 for (;; ptr++)
      /* There can never be a first char if '.' is first, whatever happens about
      repeats. The value of reqbyte doesn't change either. */
-     case '.':
+     case CHAR_DOT:
      if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
      zerofirstbyte = firstbyte;
      zeroreqbyte = reqbyte;
      previous = code;
-     *code++ = OP_ANY;
+     *code++ = ((options & PCRE_DOTALL) != 0)? OP_ALLANY: OP_ANY;
      break;
-     /* Character classes. If the included characters are all < 255 in value, we
-     build a 32-byte bitmap of the permitted characters, except in the special
+     /* ===================================================================*/
-     case where there is only one such character. For negated classes, we build
+     /* Character classes. If the included characters are all < 256, we build a
-     the map as usual, then invert it at the end. However, we use a different
+-byte bitmap of the permitted characters, except in the special case
-     opcode so that data characters > 255 can be handled correctly.
+     where there is only one such character. For negated classes, we build the
+     map as usual, then invert it at the end. However, we use a different opcode
+     so that data characters > 255 can be handled correctly.
      If the class contains characters outside the 0-255 range, a different
      opcode is compiled. It may optionally have a bit map for characters < 256,
      but those above are are explicitly listed afterwards. A flag byte tells
      whether the bitmap is present, and whether this is a negated class or not.
-     */
-     case '[':
+     In JavaScript compatibility mode, an isolated ']' causes an error. In
+     default (Perl) mode, it is treated as a data character. */
+     case CHAR_RIGHT_SQUARE_BRACKET:
+     if ((cd->external_options & PCRE_JAVASCRIPT_COMPAT) != 0)
+       {
+       *errorcodeptr = ERR64;
+       goto FAILED;
+       }
+     goto NORMAL_CHAR;
+     case CHAR_LEFT_SQUARE_BRACKET:
      previous = code;
      /* PCRE supports POSIX class stuff inside a class. Perl gives an error if
      they are encountered at the top level, so we'll do that too. */
-     if ((ptr[1] == ':' || ptr[1] == '.' || ptr[1] == '=') &&
+     if ((ptr[1] == CHAR_COLON || ptr[1] == CHAR_DOT ||
-         check_posix_syntax(ptr, &tempptr, cd))
+          ptr[1] == CHAR_EQUALS_SIGN) &&
+         check_posix_syntax(ptr, &tempptr))
        {
-       *errorcodeptr = (ptr[1] == ':')? ERR13 : ERR31;
+       *errorcodeptr = (ptr[1] == CHAR_COLON)? ERR13 : ERR31;
        goto FAILED;
        }
-     /* If the first character is '^', set the negation flag and skip it. */
+     /* If the first character is '^', set the negation flag and skip it. Also,
+     if the first few characters (either before or after ^) are \Q\E or \E we
+     skip them too. This makes for compatibility with Perl. */
-     if ((c = *(++ptr)) == '^')
+     negate_class = FALSE;
+     for (;;)
        {
-       negate_class = TRUE;
        c = *(++ptr);
+       if (c == CHAR_BACKSLASH)
+         {
+         if (ptr[1] == CHAR_E)
+           ptr++;
+         else if (strncmp((const char *)ptr+1,
+                           STR_Q STR_BACKSLASH STR_E, 3) == 0)
+           ptr += 3;
+         else
+           break;
+         }
+       else if (!negate_class && c == CHAR_CIRCUMFLEX_ACCENT)
+         negate_class = TRUE;
+       else break;
        }
-     else
+     /* Empty classes are allowed in JavaScript compatibility mode. Otherwise,
+     an initial ']' is taken as a data character -- the code below handles
+     that. In JS mode, [] must always fail, so generate OP_FAIL, whereas
+     [^] must match any character, so generate OP_ALLANY. */
+     if (c == CHAR_RIGHT_SQUARE_BRACKET &&
+         (cd->external_options & PCRE_JAVASCRIPT_COMPAT) != 0)
        {
-       negate_class = FALSE;
+       *code++ = negate_class? OP_ALLANY : OP_FAIL;
+       if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
+       zerofirstbyte = firstbyte;
+       break;
        }
+     /* If a class contains a negative special such as \S, we need to flip the
+     negation flag at the end, so that support for characters > 255 works
+     correctly (they are all included in the class). */
+     should_flip_negation = FALSE;
      /* Keep a count of chars with values < 256 so that we can optimize the case
-     of just a single character (as long as it's < 256). For higher valued UTF-8
+     of just a single character (as long as it's < 256). However, For higher
-     characters, we don't yet do any optimization. */
+     valued UTF-8 characters, we don't yet do any optimization. */
      class_charcount = 0;
      class_lastchar = -1;
+     /* Initialize the 32-char bit map to all zeros. We build the map in a
+     temporary bit of memory, in case the class contains only 1 character (less
+     than 256), because in that case the compiled code doesn't use the bit map.
+     */
+     memset(classbits, 0, 32 * sizeof(uschar));
  #ifdef SUPPORT_UTF8
      class_utf8 = FALSE;                       /* No chars >= 256 */
-     class_utf8data = code + LINK_SIZE + 34;   /* For UTF-8 items */
+     class_utf8data = code + LINK_SIZE + 2;    /* For UTF-8 items */
+     class_utf8data_base = class_utf8data;     /* For resetting in pass 1 */
  #endif
-     /* Initialize the 32-char bit map to all zeros. We have to build the
-     map in a temporary bit of store, in case the class contains only 1
-     character (< 256), because in that case the compiled code doesn't use the
-     bit map. */
-     memset(classbits, 0, 32 * sizeof(uschar));
      /* Process characters until ] is reached. By writing this as a "do" it
-     means that an initial ] is taken as a data character. The first pass
+     means that an initial ] is taken as a data character. At the start of the
-     through the regex checked the overall syntax, so we don't need to be very
+     loop, c contains the first byte of the character. */
-     strict here. At the start of the loop, c contains the first byte of the
-     character. */
-     do
+     if (c != 0) do
        {
+       const uschar *oldptr;
  #ifdef SUPPORT_UTF8
        if (utf8 && c > 127)
          {                           /* Braces are required because the */
          GETCHARLEN(c, ptr, ptr);    /* macro generates multiple statements */
          }
+       /* In the pre-compile phase, accumulate the length of any UTF-8 extra
+       data and reset the pointer. This is so that very large classes that
+       contain a zillion UTF-8 characters no longer overwrite the work space
+       (which is on the stack). */
+       if (lengthptr != NULL)
+         {
+         *lengthptr += class_utf8data - class_utf8data_base;
+         class_utf8data = class_utf8data_base;
+         }
  #endif
        /* Inside \Q...\E everything is literal except \E */
        if (inescq)
          {
-         if (c == '\\' && ptr[1] == 'E')
+         if (c == CHAR_BACKSLASH && ptr[1] == CHAR_E)  /* If we are at \E */
            {
-           inescq = FALSE;
+           inescq = FALSE;                   /* Reset literal state */
-           ptr++;
+           ptr++;                            /* Skip the 'E' */
-           continue;
+           continue;                         /* Carry on with next */
            }
-         else goto LONE_SINGLE_CHARACTER;
+         goto CHECK_RANGE;                   /* Could be range if \E follows */
          }
        /* Handle POSIX class names. Perl allows a negation extension of the
-Line 1812 
 for (;; ptr++)
+Line 2876 
 for (;; ptr++)
        [.ch.] and [=ch=] ("collating elements") and fault them, as Perl
 .6 and 5.8 do. */
-       if (c == '[' &&
+       if (c == CHAR_LEFT_SQUARE_BRACKET &&
-           (ptr[1] == ':' || ptr[1] == '.' || ptr[1] == '=') &&
+           (ptr[1] == CHAR_COLON || ptr[1] == CHAR_DOT ||
-           check_posix_syntax(ptr, &tempptr, cd))
+            ptr[1] == CHAR_EQUALS_SIGN) && check_posix_syntax(ptr, &tempptr))
          {
          BOOL local_negate = FALSE;
-         int posix_class, i;
+         int posix_class, taboffset, tabopt;
          register const uschar *cbits = cd->cbits;
+         uschar pbits[32];
-         if (ptr[1] != ':')
+         if (ptr[1] != CHAR_COLON)
            {
            *errorcodeptr = ERR31;
            goto FAILED;
            }
          ptr += 2;
-         if (*ptr == '^')
+         if (*ptr == CHAR_CIRCUMFLEX_ACCENT)
            {
            local_negate = TRUE;
+           should_flip_negation = TRUE;  /* Note negative special */
            ptr++;
            }
-Line 1847 
 for (;; ptr++)
+Line 2913 
 for (;; ptr++)
          if ((options & PCRE_CASELESS) != 0 && posix_class <= 2)
            posix_class = 0;
-         /* Or into the map we are building up to 3 of the static class
+         /* We build the bit map for the POSIX class in a chunk of local store
-         tables, or their negations. The [:blank:] class sets up the same
+         because we may be adding and subtracting from it, and we don't want to
-         chars as the [:space:] class (all white space). We remove the vertical
+         subtract bits that may be in the main map already. At the end we or the
-         white space chars afterwards. */
+         result into the bit map that is being built. */
          posix_class *= 3;
-         for (i = 0; i < 3; i++)
+         /* Copy in the first table (always present) */
+         memcpy(pbits, cbits + posix_class_maps[posix_class],
+* sizeof(uschar));
+         /* If there is a second table, add or remove it as required. */
+         taboffset = posix_class_maps[posix_class + 1];
+         tabopt = posix_class_maps[posix_class + 2];
+         if (taboffset >= 0)
            {
-           BOOL blankclass = strncmp((char *)ptr, "blank", 5) == 0;
+           if (tabopt >= 0)
-           int taboffset = posix_class_maps[posix_class + i];
+             for (c = 0; c < 32; c++) pbits[c] |= cbits[c + taboffset];
-           if (taboffset < 0) break;
-           if (local_negate)
-             {
-             if (i == 0)
-               for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+taboffset];
-             else
-               for (c = 0; c < 32; c++) classbits[c] &= ~cbits[c+taboffset];
-             if (blankclass) classbits[1] |= 0x3c;
-             }
            else
-             {
+             for (c = 0; c < 32; c++) pbits[c] &= ~cbits[c + taboffset];
-             for (c = 0; c < 32; c++) classbits[c] |= cbits[c+taboffset];
-             if (blankclass) classbits[1] &= ~0x3c;
-             }
            }
+         /* Not see if we need to remove any special characters. An option
+         value of 1 removes vertical space and 2 removes underscore. */
+         if (tabopt < 0) tabopt = -tabopt;
+         if (tabopt == 1) pbits[1] &= ~0x3c;
+           else if (tabopt == 2) pbits[11] &= 0x7f;
+         /* Add the POSIX table or its complement into the main table that is
+         being built and we are done. */
+         if (local_negate)
+           for (c = 0; c < 32; c++) classbits[c] |= ~pbits[c];
+         else
+           for (c = 0; c < 32; c++) classbits[c] |= pbits[c];
          ptr = tempptr + 1;
          class_charcount = 10;  /* Set > 1; assumes more than 1 per class */
          continue;    /* End of POSIX syntax handling */
          }
        /* Backslash may introduce a single character, or it may introduce one
-       of the specials, which just set a flag. Escaped items are checked for
+       of the specials, which just set a flag. The sequence \b is a special
-       validity in the pre-compiling pass. The sequence \b is a special case.
+       case. Inside a class (and only there) it is treated as backspace.
-       Inside a class (and only there) it is treated as backspace. Elsewhere
+       Elsewhere it marks a word boundary. Other escapes have preset maps ready
-       it marks a word boundary. Other escapes have preset maps ready to
+       to 'or' into the one we are building. We assume they have more than one
-       or into the one we are building. We assume they have more than one
        character in them, so set class_charcount bigger than one. */
-       if (c == '\\')
+       if (c == CHAR_BACKSLASH)
          {
-         c = check_escape(&ptr, errorcodeptr, *brackets, options, TRUE);
+         c = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);
+         if (*errorcodeptr != 0) goto FAILED;
-         if (-c == ESC_b) c = '\b';       /* \b is backslash in a class */
+         if (-c == ESC_b) c = CHAR_BS;       /* \b is backspace in a class */
-         else if (-c == ESC_X) c = 'X';   /* \X is literal X in a class */
+         else if (-c == ESC_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] == '\\' && ptr[2] == 'E')
+           if (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)
              {
              ptr += 2; /* avoid empty string */
              }
            else inescq = TRUE;
            continue;
            }
+         else if (-c == ESC_E) continue;  /* Ignore orphan \E */
          if (c < 0)
            {
            register const uschar *cbits = cd->cbits;
            class_charcount += 2;     /* Greater than 1 is what matters */
-           switch (-c)
+           /* Save time by not doing this in the pre-compile phase. */
+           if (lengthptr == NULL) switch (-c)
              {
              case ESC_d:
              for (c = 0; c < 32; c++) classbits[c] |= cbits[c+cbit_digit];
              continue;
              case ESC_D:
+             should_flip_negation = TRUE;
              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_digit];
              continue;
-Line 1921 
 for (;; ptr++)
+Line 3007 
 for (;; ptr++)
              continue;
              case ESC_W:
+             should_flip_negation = TRUE;
              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_word];
              continue;
-Line 1930 
 for (;; ptr++)
+Line 3017 
 for (;; ptr++)
              continue;
              case ESC_S:
+             should_flip_negation = TRUE;
              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_space];
              classbits[1] |= 0x08;    /* Perl 5.004 onwards omits VT from \s */
              continue;
- #ifdef SUPPORT_UCP
+             default:    /* Not recognized; fall through */
-             case ESC_p:
+             break;      /* Need "default" setting to stop compiler warning. */
-             case ESC_P:
+             }
+           /* 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 */
+ #ifdef SUPPORT_UTF8
+             if (utf8)
                {
-               BOOL negated;
-               int property = get_ucp(&ptr, &negated, errorcodeptr);
-               if (property < 0) goto FAILED;
                class_utf8 = TRUE;
-               *class_utf8data++ = ((-c == ESC_p) != negated)?
+               *class_utf8data++ = XCL_SINGLE;
-                 XCL_PROP : XCL_NOTPROP;
+               class_utf8data += _pcre_ord2utf8(0x1680, class_utf8data);
-               *class_utf8data++ = property;
+               *class_utf8data++ = XCL_SINGLE;
-               class_charcount -= 2;   /* Not a < 256 character */
+               class_utf8data += _pcre_ord2utf8(0x180e, class_utf8data);
+               *class_utf8data++ = XCL_RANGE;
+               class_utf8data += _pcre_ord2utf8(0x2000, class_utf8data);
+               class_utf8data += _pcre_ord2utf8(0x200A, class_utf8data);
+               *class_utf8data++ = XCL_SINGLE;
+               class_utf8data += _pcre_ord2utf8(0x202f, class_utf8data);
+               *class_utf8data++ = XCL_SINGLE;
+               class_utf8data += _pcre_ord2utf8(0x205f, class_utf8data);
+               *class_utf8data++ = XCL_SINGLE;
+               class_utf8data += _pcre_ord2utf8(0x3000, class_utf8data);
                }
-             continue;
  #endif
+             continue;
+             }
-             /* Unrecognized escapes are faulted if PCRE is running in its
+           if (-c == ESC_H)
-             strict mode. By default, for compatibility with Perl, they are
+             {
-             treated as literals. */
+             for (c = 0; c < 32; c++)
-             default:
-             if ((options & PCRE_EXTRA) != 0)
                {
-               *errorcodeptr = ERR7;
+               int x = 0xff;
-               goto FAILED;
+               switch (c)
-               }
+                 {
-             c = *ptr;              /* The final character */
+                 case 0x09/8: x ^= 1 << (0x09%8); break;
-             class_charcount -= 2;  /* Undo the default count from above */
+                 case 0x20/8: x ^= 1 << (0x20%8); break;
+                 case 0xa0/8: x ^= 1 << (0xa0%8); break;
+                 default: break;
+                 }
+               classbits[c] |= x;
+               }
+ #ifdef SUPPORT_UTF8
+             if (utf8)
+               {
+               class_utf8 = TRUE;
+               *class_utf8data++ = XCL_RANGE;
+               class_utf8data += _pcre_ord2utf8(0x0100, class_utf8data);
+               class_utf8data += _pcre_ord2utf8(0x167f, class_utf8data);
+               *class_utf8data++ = XCL_RANGE;
+               class_utf8data += _pcre_ord2utf8(0x1681, class_utf8data);
+               class_utf8data += _pcre_ord2utf8(0x180d, class_utf8data);
+               *class_utf8data++ = XCL_RANGE;
+               class_utf8data += _pcre_ord2utf8(0x180f, class_utf8data);
+               class_utf8data += _pcre_ord2utf8(0x1fff, class_utf8data);
+               *class_utf8data++ = XCL_RANGE;
+               class_utf8data += _pcre_ord2utf8(0x200B, class_utf8data);
+               class_utf8data += _pcre_ord2utf8(0x202e, class_utf8data);
+               *class_utf8data++ = XCL_RANGE;
+               class_utf8data += _pcre_ord2utf8(0x2030, class_utf8data);
+               class_utf8data += _pcre_ord2utf8(0x205e, class_utf8data);
+               *class_utf8data++ = XCL_RANGE;
+               class_utf8data += _pcre_ord2utf8(0x2060, class_utf8data);
+               class_utf8data += _pcre_ord2utf8(0x2fff, class_utf8data);
+               *class_utf8data++ = XCL_RANGE;
+               class_utf8data += _pcre_ord2utf8(0x3001, class_utf8data);
+               class_utf8data += _pcre_ord2utf8(0x7fffffff, class_utf8data);
+               }
+ #endif
+             continue;
+             }
+           if (-c == ESC_v)
+             {
+             SETBIT(classbits, 0x0a); /* LF */
+             SETBIT(classbits, 0x0b); /* VT */
+             SETBIT(classbits, 0x0c); /* FF */
+             SETBIT(classbits, 0x0d); /* CR */
+             SETBIT(classbits, 0x85); /* NEL */
+ #ifdef SUPPORT_UTF8
+             if (utf8)
+               {
+               class_utf8 = TRUE;
+               *class_utf8data++ = XCL_RANGE;
+               class_utf8data += _pcre_ord2utf8(0x2028, class_utf8data);
+               class_utf8data += _pcre_ord2utf8(0x2029, class_utf8data);
+               }
+ #endif
+             continue;
+             }
+           if (-c == ESC_V)
+             {
+             for (c = 0; c < 32; c++)
+               {
+               int x = 0xff;
+               switch (c)
+                 {
+                 case 0x0a/8: x ^= 1 << (0x0a%8);
+                              x ^= 1 << (0x0b%8);
+                              x ^= 1 << (0x0c%8);
+                              x ^= 1 << (0x0d%8);
+                              break;
+                 case 0x85/8: x ^= 1 << (0x85%8); break;
+                 default: break;
+                 }
+               classbits[c] |= x;
+               }
+ #ifdef SUPPORT_UTF8
+             if (utf8)
+               {
+               class_utf8 = TRUE;
+               *class_utf8data++ = XCL_RANGE;
+               class_utf8data += _pcre_ord2utf8(0x0100, class_utf8data);
+               class_utf8data += _pcre_ord2utf8(0x2027, class_utf8data);
+               *class_utf8data++ = XCL_RANGE;
+               class_utf8data += _pcre_ord2utf8(0x2029, class_utf8data);
+               class_utf8data += _pcre_ord2utf8(0x7fffffff, class_utf8data);
+               }
+ #endif
+             continue;
+             }
+           /* We need to deal with \P and \p in both phases. */
+ #ifdef SUPPORT_UCP
+           if (-c == ESC_p || -c == ESC_P)
+             {
+             BOOL negated;
+             int pdata;
+             int ptype = get_ucp(&ptr, &negated, &pdata, errorcodeptr);
+             if (ptype < 0) goto FAILED;
+             class_utf8 = TRUE;
+             *class_utf8data++ = ((-c == ESC_p) != negated)?
+               XCL_PROP : XCL_NOTPROP;
+             *class_utf8data++ = ptype;
+             *class_utf8data++ = pdata;
+             class_charcount -= 2;   /* Not a < 256 character */
+             continue;
+             }
+ #endif
+           /* Unrecognized escapes are faulted if PCRE is running in its
+           strict mode. By default, for compatibility with Perl, they are
+           treated as literals. */
+           if ((options & PCRE_EXTRA) != 0)
+             {
+             *errorcodeptr = ERR7;
+             goto FAILED;
              }
+           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
-         > 256 in UTF-8 mode. */
+         greater than 256 in UTF-8 mode. */
          }   /* End of backslash handling */
        /* A single character may be followed by '-' to form a range. However,
        Perl does not permit ']' to be the end of the range. A '-' character
-       here is treated as a literal. */
+       at the end is treated as a literal. Perl ignores orphaned \E sequences
+       entirely. The code for handling \Q and \E is messy. */
+       CHECK_RANGE:
+       while (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)
+         {
+         inescq = FALSE;
+         ptr += 2;
+         }
+       oldptr = ptr;
-       if (ptr[1] == '-' && ptr[2] != ']')
+       /* Remember \r or \n */
+       if (c == CHAR_CR || c == CHAR_NL) cd->external_flags |= PCRE_HASCRORLF;
+       /* Check for range */
+       if (!inescq && ptr[1] == CHAR_MINUS)
          {
          int d;
          ptr += 2;
+         while (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_E) ptr += 2;
+         /* If we hit \Q (not followed by \E) at this point, go into escaped
+         mode. */
+         while (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_Q)
+           {
+           ptr += 2;
+           if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_E)
+             { ptr += 2; continue; }
+           inescq = TRUE;
+           break;
+           }
+         if (*ptr == 0 || (!inescq && *ptr == CHAR_RIGHT_SQUARE_BRACKET))
+           {
+           ptr = oldptr;
+           goto LONE_SINGLE_CHARACTER;
+           }
  #ifdef SUPPORT_UTF8
          if (utf8)
-Line 1992 
 for (;; ptr++)
+Line 3252 
 for (;; ptr++)
          not any of the other escapes. Perl 5.6 treats a hyphen as a literal
          in such circumstances. */
-         if (d == '\\')
+         if (!inescq && d == CHAR_BACKSLASH)
            {
-           const uschar *oldptr = ptr;
+           d = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);
-           d = check_escape(&ptr, errorcodeptr, *brackets, options, TRUE);
+           if (*errorcodeptr != 0) goto FAILED;
-           /* \b is backslash; \X is literal X; any other special means the '-'
+           /* \b is backspace; \X is literal X; \R is literal R; any other
-           was literal */
+           special means the '-' was literal */
            if (d < 0)
              {
-             if (d == -ESC_b) d = '\b';
+             if (d == -ESC_b) d = CHAR_BS;
-             else if (d == -ESC_X) d = 'X'; else
+             else if (d == -ESC_X) d = CHAR_X;
+             else if (d == -ESC_R) d = CHAR_R; else
                {
-               ptr = oldptr - 2;
+               ptr = oldptr;
                goto LONE_SINGLE_CHARACTER;  /* A few lines below */
                }
              }
            }
-         /* The check that the two values are in the correct order happens in
+         /* Check that the two values are in the correct order. Optimize
-         the pre-pass. Optimize one-character ranges */
+         one-character ranges */
+         if (d < c)
+           {
+           *errorcodeptr = ERR8;
+           goto FAILED;
+           }
          if (d == c) goto LONE_SINGLE_CHARACTER;  /* A few lines below */
+         /* Remember \r or \n */
+         if (d == CHAR_CR || d == CHAR_NL) cd->external_flags |= PCRE_HASCRORLF;
          /* In UTF-8 mode, if the upper limit is > 255, or > 127 for caseless
          matching, we have to use an XCLASS with extra data items. Caseless
          matching for characters > 127 is available only if UCP support is
-Line 2033 
 for (;; ptr++)
+Line 3304 
 for (;; ptr++)
  #ifdef SUPPORT_UCP
            if ((options & PCRE_CASELESS) != 0)
              {
-             int occ, ocd;
+             unsigned int occ, ocd;
-             int cc = c;
+             unsigned int cc = c;
-             int origd = d;
+             unsigned int origd = d;
              while (get_othercase_range(&cc, origd, &occ, &ocd))
                {
-               if (occ >= c && ocd <= d) continue;  /* Skip embedded ranges */
+               if (occ >= (unsigned int)c &&
+                   ocd <= (unsigned int)d)
+                 continue;                          /* Skip embedded ranges */
-               if (occ < c  && ocd >= c - 1)        /* Extend the basic range */
+               if (occ < (unsigned int)c  &&
+                   ocd >= (unsigned int)c - 1)      /* Extend the basic range */
                  {                                  /* if there is overlap,   */
                  c = occ;                           /* noting that if occ < c */
                  continue;                          /* we can't have ocd > d  */
                  }                                  /* because a subrange is  */
-               if (ocd > d && occ <= d + 1)         /* always shorter than    */
+               if (ocd > (unsigned int)d &&
+                   occ <= (unsigned int)d + 1)      /* always shorter than    */
                  {                                  /* the basic range.       */
                  d = ocd;
                  continue;
-Line 2093 
 for (;; ptr++)
+Line 3368 
 for (;; ptr++)
          ranges that lie entirely within 0-127 when there is UCP support; else
          for partial ranges without UCP support. */
-         for (; c <= d; c++)
+         class_charcount += d - c + 1;
+         class_lastchar = d;
+         /* We can save a bit of time by skipping this in the pre-compile. */
+         if (lengthptr == NULL) for (; c <= d; c++)
            {
            classbits[c/8] |= (1 << (c&7));
            if ((options & PCRE_CASELESS) != 0)
-Line 2101 
 for (;; ptr++)
+Line 3381 
 for (;; ptr++)
              int uc = cd->fcc[c];           /* flip case */
              classbits[uc/8] |= (1 << (uc&7));
              }
-           class_charcount++;                /* in case a one-char range */
-           class_lastchar = c;
            }
          continue;   /* Go get the next char in the class */
-Line 2126 
 for (;; ptr++)
+Line 3404 
 for (;; ptr++)
  #ifdef SUPPORT_UCP
          if ((options & PCRE_CASELESS) != 0)
            {
-           int chartype;
+           unsigned int othercase;
-           int othercase;
+           if ((othercase = UCD_OTHERCASE(c)) != c)
-           if (_pcre_ucp_findchar(c, &chartype, &othercase) >= 0 &&
-                othercase > 0)
              {
              *class_utf8data++ = XCL_SINGLE;
              class_utf8data += _pcre_ord2utf8(othercase, class_utf8data);
-Line 2154 
 for (;; ptr++)
+Line 3430 
 for (;; ptr++)
          }
        }
-     /* Loop until ']' reached; the check for end of string happens inside the
+     /* Loop until ']' reached. This "while" is the end of the "do" above. */
-     loop. This "while" is the end of the "do" above. */
+     while ((c = *(++ptr)) != 0 && (c != CHAR_RIGHT_SQUARE_BRACKET || inescq));
+     if (c == 0)                          /* Missing terminating ']' */
+       {
+       *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
-     while ((c = *(++ptr)) != ']' || inescq);
      /* If class_charcount is 1, we saw precisely one character whose value is
-     less than 256. In non-UTF-8 mode we can always optimize. In UTF-8 mode, we
+     less than 256. As long as there were no characters >= 128 and there was no
-     can optimize the negative case only if there were no characters >= 128
+     use of \p or \P, in other words, no use of any XCLASS features, we can
-     because OP_NOT and the related opcodes like OP_NOTSTAR operate on
+     optimize.
-     single-bytes only. This is an historical hangover. Maybe one day we can
-     tidy these opcodes to handle multi-byte characters.
+     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
+     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
-Line 2174 
 for (;; ptr++)
+Line 3477 
 for (;; ptr++)
      reqbyte, save the previous value for reinstating. */
  #ifdef SUPPORT_UTF8
-     if (class_charcount == 1 &&
+     if (class_charcount == 1 && !class_utf8 &&
-           (!utf8 ||
+       (!utf8 || !negate_class || class_lastchar < 128))
-           (!class_utf8 && (!negate_class || class_lastchar < 128))))
  #else
      if (class_charcount == 1)
  #endif
-Line 2220 
 for (;; ptr++)
+Line 3521 
 for (;; ptr++)
      zeroreqbyte = reqbyte;
      /* If there are characters with values > 255, we have to compile an
-     extended class, with its own opcode. If there are no characters < 256,
+     extended class, with its own opcode, unless there was a negated special
-     we can omit the bitmap. */
+     such as \S in the class, because in that case all characters > 255 are in
+     the class, so any that were explicitly given as well can be ignored. If
+     (when there are explicit characters > 255 that must be listed) there are no
+     characters < 256, we can omit the bitmap in the actual compiled code. */
  #ifdef SUPPORT_UTF8
-     if (class_utf8)
+     if (class_utf8 && !should_flip_negation)
        {
        *class_utf8data++ = XCL_END;    /* Marks the end of extra data */
        *code++ = OP_XCLASS;
        code += LINK_SIZE;
        *code = negate_class? XCL_NOT : 0;
-       /* If the map is required, install it, and move on to the end of
+       /* If the map is required, move up the extra data to make room for it;
-       the extra data */
+       otherwise just move the code pointer to the end of the extra data. */
        if (class_charcount > 0)
          {
          *code++ |= XCL_MAP;
+         memmove(code + 32, code, class_utf8data - code);
          memcpy(code, classbits, 32);
-         code = class_utf8data;
+         code = class_utf8data + 32;
-         }
-       /* If the map is not required, slide down the extra data. */
-       else
-         {
-         int len = class_utf8data - (code + 33);
-         memmove(code + 1, code + 33, len);
-         code += len + 1;
          }
+       else code = class_utf8data;
        /* Now fill in the complete length of the item */
-Line 2257 
 for (;; ptr++)
+Line 3554 
 for (;; ptr++)
        }
  #endif
-     /* If there are no characters > 255, negate the 32-byte map if necessary,
+     /* If there are no characters > 255, set the opcode to OP_CLASS or
-     and copy it into the code vector. If this is the first thing in the branch,
+     OP_NCLASS, depending on whether the whole class was negated and whether
-     there can be no first char setting, whatever the repeat count. Any reqbyte
+     there were negative specials such as \S in the class. Then copy the 32-byte
-     setting must remain unchanged after any kind of repeat. */
+     map into the code vector, negating it if necessary. */
+     *code++ = (negate_class == should_flip_negation) ? OP_CLASS : OP_NCLASS;
      if (negate_class)
        {
-       *code++ = OP_NCLASS;
+       if (lengthptr == NULL)    /* Save time in the pre-compile phase */
-       for (c = 0; c < 32; c++) code[c] = ~classbits[c];
+         for (c = 0; c < 32; c++) code[c] = ~classbits[c];
        }
      else
        {
-       *code++ = OP_CLASS;
        memcpy(code, classbits, 32);
        }
      code += 32;
      break;
+     /* ===================================================================*/
      /* Various kinds of repeat; '{' is not necessarily a quantifier, but this
      has been tested above. */
-     case '{':
+     case CHAR_LEFT_CURLY_BRACKET:
      if (!is_quantifier) goto NORMAL_CHAR;
      ptr = read_repeat_counts(ptr+1, &repeat_min, &repeat_max, errorcodeptr);
      if (*errorcodeptr != 0) goto FAILED;
      goto REPEAT;
-     case '*':
+     case CHAR_ASTERISK:
      repeat_min = 0;
      repeat_max = -1;
      goto REPEAT;
-     case '+':
+     case CHAR_PLUS:
      repeat_min = 1;
      repeat_max = -1;
      goto REPEAT;
-     case '?':
+     case CHAR_QUESTION_MARK:
      repeat_min = 0;
      repeat_max = 1;
-Line 2329 
 for (;; ptr++)
+Line 3628 
 for (;; ptr++)
      but if PCRE_UNGREEDY is set, it works the other way round. We change the
      repeat type to the non-default. */
-     if (ptr[1] == '+')
+     if (ptr[1] == CHAR_PLUS)
        {
        repeat_type = 0;                  /* Force greedy */
        possessive_quantifier = TRUE;
        ptr++;
        }
-     else if (ptr[1] == '?')
+     else if (ptr[1] == CHAR_QUESTION_MARK)
        {
        repeat_type = greedy_non_default;
        ptr++;
        }
      else repeat_type = greedy_default;
-     /* If previous was a recursion, we need to wrap it inside brackets so that
-     it can be replicated if necessary. */
-     if (*previous == OP_RECURSE)
-       {
-       memmove(previous + 1 + LINK_SIZE, previous, 1 + LINK_SIZE);
-       code += 1 + LINK_SIZE;
-       *previous = OP_BRA;
-       PUT(previous, 1, code - previous);
-       *code = OP_KET;
-       PUT(code, 1, code - previous);
-       code += 1 + LINK_SIZE;
-       }
      /* 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
-Line 2389 
 for (;; ptr++)
+Line 3674 
 for (;; ptr++)
          if (repeat_min > 1) reqbyte = c | req_caseopt | cd->req_varyopt;
          }
+       /* If the repetition is unlimited, it pays to see if the next thing on
+       the line is something that cannot possibly match this character. If so,
+       automatically possessifying this item gains some performance in the case
+       where the match fails. */
+       if (!possessive_quantifier &&
+           repeat_max < 0 &&
+           check_auto_possessive(*previous, c, utf8, utf8_char, ptr + 1,
+             options, cd))
+         {
+         repeat_type = 0;    /* Force greedy */
+         possessive_quantifier = TRUE;
+         }
        goto OUTPUT_SINGLE_REPEAT;   /* Code shared with single character types */
        }
      /* 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. OP_NOT is currently used only for single-byte chars. */
+     repeat_type. We can also test for auto-possessification. OP_NOT is
+     currently used only for single-byte chars. */
      else if (*previous == OP_NOT)
        {
        op_type = OP_NOTSTAR - OP_STAR;  /* Use "not" opcodes */
        c = previous[1];
+       if (!possessive_quantifier &&
+           repeat_max < 0 &&
+           check_auto_possessive(OP_NOT, c, utf8, NULL, ptr + 1, options, cd))
+         {
+         repeat_type = 0;    /* Force greedy */
+         possessive_quantifier = TRUE;
+         }
        goto OUTPUT_SINGLE_REPEAT;
        }
-Line 2414 
 for (;; ptr++)
+Line 3721 
 for (;; ptr++)
      else if (*previous < OP_EODN)
        {
        uschar *oldcode;
-       int prop_type;
+       int prop_type, prop_value;
        op_type = OP_TYPESTAR - OP_STAR;  /* Use type opcodes */
        c = *previous;
+       if (!possessive_quantifier &&
+           repeat_max < 0 &&
+           check_auto_possessive(c, 0, utf8, NULL, ptr + 1, options, cd))
+         {
+         repeat_type = 0;    /* Force greedy */
+         possessive_quantifier = TRUE;
+         }
        OUTPUT_SINGLE_REPEAT:
-       prop_type = (*previous == OP_PROP || *previous == OP_NOTPROP)?
+       if (*previous == OP_PROP || *previous == OP_NOTPROP)
-         previous[1] : -1;
+         {
+         prop_type = previous[1];
+         prop_value = previous[2];
+         }
+       else prop_type = prop_value = -1;
        oldcode = code;
        code = previous;                  /* Usually overwrite previous item */
-Line 2433 
 for (;; ptr++)
+Line 3752 
 for (;; ptr++)
        /* 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->nopartial = TRUE;
+       if (repeat_max != 1) cd->external_flags |= PCRE_NOPARTIAL;
        /* Combine the op_type with the repeat_type */
-Line 2454 
 for (;; ptr++)
+Line 3773 
 for (;; ptr++)
          }
        /* A repeat minimum of 1 is optimized into some special cases. If the
-       maximum is unlimited, we use OP_PLUS. Otherwise, the original item it
+       maximum is unlimited, we use OP_PLUS. Otherwise, the original item is
        left in place and, if the maximum is greater than 1, we use OP_UPTO with
        one less than the maximum. */
-Line 2481 
 for (;; ptr++)
+Line 3800 
 for (;; ptr++)
          /* If the maximum is unlimited, insert an OP_STAR. Before doing so,
          we have to insert the character for the previous code. For a repeated
-         Unicode property match, there is an extra byte that defines the
+         Unicode property match, there are two extra bytes that define the
          required property. In UTF-8 mode, long characters have their length in
          c, with the 0x80 bit as a flag. */
-Line 2497 
 for (;; ptr++)
+Line 3816 
 for (;; ptr++)
  #endif
              {
              *code++ = c;
-             if (prop_type >= 0) *code++ = prop_type;
+             if (prop_type >= 0)
+               {
+               *code++ = prop_type;
+               *code++ = prop_value;
+               }
              }
            *code++ = OP_STAR + repeat_type;
            }
          /* Else insert an UPTO if the max is greater than the min, again
-         preceded by the character, for the previously inserted code. */
+         preceded by the character, for the previously inserted code. If the
+         UPTO is just for 1 instance, we can use QUERY instead. */
          else if (repeat_max != repeat_min)
            {
-Line 2516 
 for (;; ptr++)
+Line 3840 
 for (;; ptr++)
            else
  #endif
            *code++ = c;
-           if (prop_type >= 0) *code++ = prop_type;
+           if (prop_type >= 0)
+             {
+             *code++ = prop_type;
+             *code++ = prop_value;
+             }
            repeat_max -= repeat_min;
-           *code++ = OP_UPTO + repeat_type;
-           PUT2INC(code, 0, repeat_max);
+           if (repeat_max == 1)
+             {
+             *code++ = OP_QUERY + repeat_type;
+             }
+           else
+             {
+             *code++ = OP_UPTO + repeat_type;
+             PUT2INC(code, 0, repeat_max);
+             }
            }
          }
-Line 2535 
 for (;; ptr++)
+Line 3871 
 for (;; ptr++)
  #endif
        *code++ = c;
-       /* For a repeated Unicode property match, there is an extra byte that
+       /* For a repeated Unicode property match, there are two extra bytes that
-       defines the required property. */
+       define the required property. */
  #ifdef SUPPORT_UCP
-       if (prop_type >= 0) *code++ = prop_type;
+       if (prop_type >= 0)
+         {
+         *code++ = prop_type;
+         *code++ = prop_value;
+         }
  #endif
        }
-Line 2562 
 for (;; ptr++)
+Line 3902 
 for (;; ptr++)
        /* 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->nopartial = TRUE;
+       if (repeat_max != 1) cd->external_flags |= PCRE_NOPARTIAL;
        if (repeat_min == 0 && repeat_max == -1)
          *code++ = OP_CRSTAR + repeat_type;
-Line 2582 
 for (;; ptr++)
+Line 3922 
 for (;; ptr++)
      /* If previous was a bracket group, we may have to replicate it in certain
      cases. */
-     else if (*previous >= OP_BRA || *previous == OP_ONCE ||
+     else if (*previous == OP_BRA  || *previous == OP_CBRA ||
-              *previous == OP_COND)
+              *previous == OP_ONCE || *previous == OP_COND)
        {
        register int i;
        int ketoffset = 0;
        int len = code - previous;
        uschar *bralink = NULL;
+       /* Repeating a DEFINE group is pointless */
+       if (*previous == OP_COND && previous[LINK_SIZE+1] == OP_DEF)
+         {
+         *errorcodeptr = ERR55;
+         goto FAILED;
+         }
        /* If the maximum repeat count is unlimited, find the end of the bracket
        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
-Line 2612 
 for (;; ptr++)
+Line 3960 
 for (;; ptr++)
        if (repeat_min == 0)
          {
-         /* If the maximum is also zero, we just omit the group from the output
+         /* If the maximum is also zero, we used to just omit the group from the
-         altogether. */
+         output altogether, like this:
-         if (repeat_max == 0)
-           {
-           code = previous;
-           goto END_REPEAT;
-           }
-         /* If the maximum is 1 or unlimited, we just have to stick in the
+         ** if (repeat_max == 0)
-         BRAZERO and do no more at this point. However, we do need to adjust
+         **   {
-         any OP_RECURSE calls inside the group that refer to the group itself or
+         **   code = previous;
-         any internal group, because the offset is from the start of the whole
+         **   goto END_REPEAT;
-         regex. Temporarily terminate the pattern while doing this. */
+         **   }
+         However, that fails when a group is referenced as a subroutine from
+         elsewhere in the pattern, so now we stick in OP_SKIPZERO in front of it
+         so that it is skipped on execution. As we 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
+         OP_RECURSE calls inside the group that refer to the group itself or any
+         internal or forward referenced group, because the offset is from the
+         start of the whole regex. Temporarily terminate the pattern while doing
+         this. */
-         if (repeat_max <= 1)
+         if (repeat_max <= 1)    /* Covers 0, 1, and unlimited */
            {
            *code = OP_END;
-           adjust_recurse(previous, 1, utf8, cd);
+           adjust_recurse(previous, 1, utf8, cd, save_hwm);
            memmove(previous+1, previous, len);
            code++;
+           if (repeat_max == 0)
+             {
+             *previous++ = OP_SKIPZERO;
+             goto END_REPEAT;
+             }
            *previous++ = OP_BRAZERO + repeat_type;
            }
-Line 2648 
 for (;; ptr++)
+Line 4007 
 for (;; ptr++)
            {
            int offset;
            *code = OP_END;
-           adjust_recurse(previous, 2 + LINK_SIZE, utf8, cd);
+           adjust_recurse(previous, 2 + LINK_SIZE, utf8, cd, save_hwm);
            memmove(previous + 2 + LINK_SIZE, previous, len);
            code += 2 + LINK_SIZE;
            *previous++ = OP_BRAZERO + repeat_type;
-Line 2668 
 for (;; ptr++)
+Line 4027 
 for (;; ptr++)
        /* If the minimum is greater than zero, replicate the group as many
        times as necessary, and adjust the maximum to the number of subsequent
        copies that we need. If we set a first char from the group, and didn't
-       set a required char, copy the latter from the former. */
+       set a required char, copy the latter from the former. If there are any
+       forward reference subroutine calls in the group, there will be entries on
+       the workspace list; replicate these with an appropriate increment. */
        else
          {
          if (repeat_min > 1)
            {
-           if (groupsetfirstbyte && reqbyte < 0) reqbyte = firstbyte;
+           /* In the pre-compile phase, we don't actually do the replication. We
-           for (i = 1; i < repeat_min; i++)
+           just adjust the length as if we had. Do some paranoid checks for
+           potential integer overflow. */
+           if (lengthptr != NULL)
+             {
+             int delta = (repeat_min - 1)*length_prevgroup;
+             if ((double)(repeat_min - 1)*(double)length_prevgroup >
+                                                             (double)INT_MAX ||
+                 OFLOW_MAX - *lengthptr < delta)
+               {
+               *errorcodeptr = ERR20;
+               goto FAILED;
+               }
+             *lengthptr += delta;
+             }
+           /* This is compiling for real */
+           else
              {
-             memcpy(code, previous, len);
+             if (groupsetfirstbyte && reqbyte < 0) reqbyte = firstbyte;
-             code += len;
+             for (i = 1; i < repeat_min; i++)
+               {
+               uschar *hc;
+               uschar *this_hwm = cd->hwm;
+               memcpy(code, previous, len);
+               for (hc = save_hwm; hc < this_hwm; hc += LINK_SIZE)
+                 {
+                 PUT(cd->hwm, 0, GET(hc, 0) + len);
+                 cd->hwm += LINK_SIZE;
+                 }
+               save_hwm = this_hwm;
+               code += len;
+               }
              }
            }
          if (repeat_max > 0) repeat_max -= repeat_min;
          }
-Line 2688 
 for (;; ptr++)
+Line 4080 
 for (;; ptr++)
        the maximum is limited, it replicates the group in a nested fashion,
        remembering the bracket starts on a stack. In the case of a zero minimum,
        the first one was set up above. In all cases the repeat_max now specifies
-       the number of additional copies needed. */
+       the number of additional copies needed. Again, we must remember to
+       replicate entries on the forward reference list. */
        if (repeat_max >= 0)
          {
-         for (i = repeat_max - 1; i >= 0; i--)
+         /* In the pre-compile phase, we don't actually do the replication. We
+         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. */
+         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 *
+                 (double)(length_prevgroup + 1 + 2 + 2*LINK_SIZE)
+                   > (double)INT_MAX ||
+               OFLOW_MAX - *lengthptr < delta)
+             {
+             *errorcodeptr = ERR20;
+             goto FAILED;
+             }
+           *lengthptr += delta;
+           }
+         /* This is compiling for real */
+         else for (i = repeat_max - 1; i >= 0; i--)
            {
+           uschar *hc;
+           uschar *this_hwm = cd->hwm;
            *code++ = OP_BRAZERO + repeat_type;
            /* All but the final copy start a new nesting, maintaining the
-Line 2709 
 for (;; ptr++)
+Line 4128 
 for (;; ptr++)
              }
            memcpy(code, previous, len);
+           for (hc = save_hwm; hc < this_hwm; hc += LINK_SIZE)
+             {
+             PUT(cd->hwm, 0, GET(hc, 0) + len + ((i != 0)? 2+LINK_SIZE : 1));
+             cd->hwm += LINK_SIZE;
+             }
+           save_hwm = this_hwm;
            code += len;
            }
-Line 2731 
 for (;; ptr++)
+Line 4156 
 for (;; ptr++)
        /* If the maximum is unlimited, set a repeater in the final copy. We
        can't just offset backwards from the current code point, because we
        don't know if there's been an options resetting after the ket. The
-       correct offset was computed above. */
+       correct offset was computed above.
+       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,
+       convert the initial operator to the S form (e.g. OP_BRA -> OP_SBRA) so
+       that runtime checking can be done. [This check is also applied to
+       atomic groups at runtime, but in a different way.] */
-       else code[-ketoffset] = OP_KETRMAX + repeat_type;
+       else
+         {
+         uschar *ketcode = code - ketoffset;
+         uschar *bracode = ketcode - GET(ketcode, 1);
+         *ketcode = OP_KETRMAX + repeat_type;
+         if (lengthptr == NULL && *bracode != OP_ONCE)
+           {
+           uschar *scode = bracode;
+           do
+             {
+             if (could_be_empty_branch(scode, ketcode, utf8))
+               {
+               *bracode += OP_SBRA - OP_BRA;
+               break;
+               }
+             scode += GET(scode, 1);
+             }
+           while (*scode == OP_ALT);
+           }
+         }
        }
+     /* If previous is OP_FAIL, it was generated by an empty class [] in
+     JavaScript mode. The other ways in which OP_FAIL can be generated, that is
+     by (*FAIL) or (?!) set previous to NULL, which gives a "nothing to repeat"
+     error above. We can just ignore the repeat in JS case. */
+     else if (*previous == OP_FAIL) goto END_REPEAT;
      /* Else there's some kind of shambles */
      else
-Line 2744 
 for (;; ptr++)
+Line 4201 
 for (;; ptr++)
        goto FAILED;
        }
-     /* If the character following a repeat is '+', we wrap the entire repeated
+     /* If the character following a repeat is '+', or if certain optimization
-     item inside OP_ONCE brackets. This is just syntactic sugar, taken from
+     tests above succeeded, possessive_quantifier is TRUE. For some of the
-     Sun's Java package. The repeated item starts at tempcode, not at previous,
+     simpler opcodes, there is an special alternative opcode for this. For
-     which might be the first part of a string whose (former) last char we
+     anything else, we wrap the entire repeated item inside OP_ONCE brackets.
-     repeated. However, we don't support '+' after a greediness '?'. */
+     The '+' notation is just syntactic sugar, taken from Sun's Java package,
+     but the special opcodes can optimize it a bit. 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
+     length of what remains before proceeding. */
      if (possessive_quantifier)
        {
-       int len = code - tempcode;
+       int len;
-       memmove(tempcode + 1+LINK_SIZE, tempcode, len);
+       if (*tempcode == OP_EXACT || *tempcode == OP_TYPEEXACT ||
-       code += 1 + LINK_SIZE;
+           *tempcode == OP_NOTEXACT)
-       len += 1 + LINK_SIZE;
+         tempcode += _pcre_OP_lengths[*tempcode] +
-       tempcode[0] = OP_ONCE;
+           ((*tempcode == OP_TYPEEXACT &&
-       *code++ = OP_KET;
+              (tempcode[3] == OP_PROP || tempcode[3] == OP_NOTPROP))? 2:0);
-       PUTINC(code, 0, len);
+       len = code - tempcode;
-       PUT(tempcode, 1, len);
+       if (len > 0) switch (*tempcode)
+         {
+         case OP_STAR:  *tempcode = OP_POSSTAR; break;
+         case OP_PLUS:  *tempcode = OP_POSPLUS; break;
+         case OP_QUERY: *tempcode = OP_POSQUERY; break;
+         case OP_UPTO:  *tempcode = OP_POSUPTO; 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;
+         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;
+         default:
+         memmove(tempcode + 1+LINK_SIZE, tempcode, len);
+         code += 1 + LINK_SIZE;
+         len += 1 + LINK_SIZE;
+         tempcode[0] = OP_ONCE;
+         *code++ = OP_KET;
+         PUTINC(code, 0, len);
+         PUT(tempcode, 1, len);
+         break;
+         }
        }
      /* In all case we no longer have a previous item. We also set the
-Line 2772 
 for (;; ptr++)
+Line 4262 
 for (;; ptr++)
      break;
-     /* Start of nested bracket sub-expression, or comment or lookahead or
+     /* ===================================================================*/
-     lookbehind or option setting or condition. First deal with special things
+     /* Start of nested parenthesized sub-expression, or comment or lookahead or
-     that can come after a bracket; all are introduced by ?, and the appearance
+     lookbehind or option setting or condition or all the other extended
-     of any of them means that this is not a referencing group. They were
+     parenthesis forms.  */
-     checked for validity in the first pass over the string, so we don't have to
-     check for syntax errors here.  */
-     case '(':
+     case CHAR_LEFT_PARENTHESIS:
      newoptions = options;
      skipbytes = 0;
+     bravalue = OP_CBRA;
+     save_hwm = cd->hwm;
+     reset_bracount = FALSE;
+     /* First deal with various "verbs" that can be introduced by '*'. */
+     if (*(++ptr) == CHAR_ASTERISK && (cd->ctypes[ptr[1]] & ctype_letter) != 0)
+       {
+       int i, namelen;
+       const char *vn = verbnames;
+       const uschar *name = ++ptr;
+       previous = NULL;
+       while ((cd->ctypes[*++ptr] & ctype_letter) != 0) {};
+       if (*ptr == CHAR_COLON)
+         {
+         *errorcodeptr = ERR59;   /* Not supported */
+         goto FAILED;
+         }
+       if (*ptr != CHAR_RIGHT_PARENTHESIS)
+         {
+         *errorcodeptr = ERR60;
+         goto FAILED;
+         }
+       namelen = ptr - name;
+       for (i = 0; i < verbcount; i++)
+         {
+         if (namelen == verbs[i].len &&
+             strncmp((char *)name, vn, namelen) == 0)
+           {
+           *code = verbs[i].op;
+           if (*code++ == OP_ACCEPT) cd->had_accept = TRUE;
+           break;
+           }
+         vn += verbs[i].len + 1;
+         }
+       if (i < verbcount) continue;
+       *errorcodeptr = ERR60;
+       goto FAILED;
+       }
-     if (*(++ptr) == '?')
+     /* Deal with the extended parentheses; all are introduced by '?', and the
+     appearance of any of them means that this is not a capturing group. */
+     else if (*ptr == CHAR_QUESTION_MARK)
        {
-       int set, unset;
+       int i, set, unset, namelen;
        int *optset;
+       const uschar *name;
+       uschar *slot;
        switch (*(++ptr))
          {
-         case '#':                 /* Comment; skip to ket */
+         case CHAR_NUMBER_SIGN:                 /* Comment; skip to ket */
          ptr++;
-         while (*ptr != ')') ptr++;
+         while (*ptr != 0 && *ptr != CHAR_RIGHT_PARENTHESIS) ptr++;
+         if (*ptr == 0)
+           {
+           *errorcodeptr = ERR18;
+           goto FAILED;
+           }
          continue;
-         case ':':                 /* Non-extracting bracket */
+         /* ------------------------------------------------------------ */
+         case CHAR_VERTICAL_LINE:  /* Reset capture count for each branch */
+         reset_bracount = TRUE;
+         /* Fall through */
+         /* ------------------------------------------------------------ */
+         case CHAR_COLON:          /* Non-capturing bracket */
          bravalue = OP_BRA;
          ptr++;
          break;
-         case '(':