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

Diff of /code/trunk/pcre_exec.c

Parent Directory | Revision Log | View Patch Patch

-revision 482 by ph10,
Mon Jan  4 15:55:46 2010 UTC
+revision 852 by zherczeg,
Thu Jan  5 19:18:12 2012 UTC
 Line 6
  and semantics are as close as possible to those of the Perl 5 language.
                         Written by Philip Hazel
-            Copyright (c) 1997-2010 University of Cambridge
+            Copyright (c) 1997-2012 University of Cambridge
  -----------------------------------------------------------------------------
  Redistribution and use in source and binary forms, with or without
 Line 57 
 possible. There are also some static sup
  #undef min
  #undef max
- /* Flag bits for the match() function */
+ /* Values for setting in md->match_function_type to indicate two special types
+ of call to match(). We do it this way to save on using another stack variable,
+ as stack usage is to be discouraged. */
- #define match_condassert     0x01  /* Called to check a condition assertion */
+ #define MATCH_CONDASSERT     1  /* Called to check a condition assertion */
- #define match_cbegroup       0x02  /* Could-be-empty unlimited repeat group */
+ #define MATCH_CBEGROUP       2  /* Could-be-empty unlimited repeat group */
  /* Non-error returns from the match() function. Error returns are externally
  defined PCRE_ERROR_xxx codes, which are all negative. */
-Line 71 
 defined PCRE_ERROR_xxx codes, which are
+Line 73 
 defined PCRE_ERROR_xxx codes, which are
  /* Special internal returns from the match() function. Make them sufficiently
  negative to avoid the external error codes. */
- #define MATCH_COMMIT       (-999)
+ #define MATCH_ACCEPT       (-999)
- #define MATCH_PRUNE        (-998)
+ #define MATCH_COMMIT       (-998)
- #define MATCH_SKIP         (-997)
+ #define MATCH_KETRPOS      (-997)
- #define MATCH_THEN         (-996)
+ #define MATCH_ONCE         (-996)
+ #define MATCH_PRUNE        (-995)
+ #define MATCH_SKIP         (-994)
+ #define MATCH_SKIP_ARG     (-993)
+ #define MATCH_THEN         (-992)
  /* Maximum number of ints of offset to save on the stack for recursive calls.
  If the offset vector is bigger, malloc is used. This should be a multiple of 3,
-Line 107 
 Returns:     nothing
+Line 113 
 Returns:     nothing
  */
  static void
- pchars(const uschar *p, int length, BOOL is_subject, match_data *md)
+ pchars(const pcre_uchar *p, int length, BOOL is_subject, match_data *md)
  {
  unsigned int c;
  if (is_subject && length > md->end_subject - p) length = md->end_subject - p;
-Line 122 
 while (length-- > 0)
+Line 128 
 while (length-- > 0)
  *          Match a back-reference                *
  *************************************************/
- /* If a back reference hasn't been set, the length that is passed is greater
+ /* Normally, if a back reference hasn't been set, the length that is passed is
- than the number of characters left in the string, so the match fails.
+ negative, so the match always fails. However, in JavaScript compatibility mode,
+ the length passed is zero. Note that in caseless UTF-8 mode, the number of
+ subject bytes matched may be different to the number of reference bytes.
  Arguments:
    offset      index into the offset vector
-   eptr        points into the subject
+   eptr        pointer into the subject
-   length      length to be matched
+   length      length of reference to be matched (number of bytes)
    md          points to match data block
-   ims         the ims flags
+   caseless    TRUE if caseless
- Returns:      TRUE if matched
+ Returns:      < 0 if not matched, otherwise the number of subject bytes matched
  */
- static BOOL
+ static int
- match_ref(int offset, register USPTR eptr, int length, match_data *md,
+ match_ref(int offset, register PCRE_PUCHAR eptr, int length, match_data *md,
-   unsigned long int ims)
+   BOOL caseless)
  {
- USPTR p = md->start_subject + md->offset_vector[offset];
+ PCRE_PUCHAR eptr_start = eptr;
+ register PCRE_PUCHAR p = md->start_subject + md->offset_vector[offset];
  #ifdef PCRE_DEBUG
  if (eptr >= md->end_subject)
-Line 154 
 pchars(p, length, FALSE, md);
+Line 163 
 pchars(p, length, FALSE, md);
  printf("\n");
  #endif
- /* Always fail if not enough characters left */
+ /* Always fail if reference not set (and not JavaScript compatible). */
- if (length > md->end_subject - eptr) return FALSE;
+ if (length < 0) return -1;
  /* Separate the caseless case for speed. In UTF-8 mode we can only do this
  properly if Unicode properties are supported. Otherwise, we can check only
  ASCII characters. */
- if ((ims & PCRE_CASELESS) != 0)
+ if (caseless)
    {
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
  #ifdef SUPPORT_UCP
-   if (md->utf8)
+   if (md->utf)
      {
-     USPTR endptr = eptr + length;
+     /* Match characters up to the end of the reference. NOTE: the number of
-     while (eptr < endptr)
+     bytes matched may differ, because there are some characters whose upper and
+     lower case versions code as different numbers of bytes. For example, U+023A
+     (2 bytes in UTF-8) is the upper case version of U+2C65 (3 bytes in UTF-8);
+     a sequence of 3 of the former uses 6 bytes, as does a sequence of two of
+     the latter. It is important, therefore, to check the length along the
+     reference, not along the subject (earlier code did this wrong). */
+     PCRE_PUCHAR endptr = p + length;
+     while (p < endptr)
        {
        int c, d;
+       if (eptr >= md->end_subject) return -1;
        GETCHARINC(c, eptr);
        GETCHARINC(d, p);
-       if (c != d && c != UCD_OTHERCASE(d)) return FALSE;
+       if (c != d && c != UCD_OTHERCASE(d)) return -1;
        }
      }
    else
-Line 183 
 if ((ims & PCRE_CASELESS) != 0)
+Line 201 
 if ((ims & PCRE_CASELESS) != 0)
    /* The same code works when not in UTF-8 mode and in UTF-8 mode when there
    is no UCP support. */
+     {
-   while (length-- > 0)
+     if (eptr + length > md->end_subject) return -1;
-     { if (md->lcc[*p++] != md->lcc[*eptr++]) return FALSE; }
+     while (length-- > 0)
+       {
+       if (TABLE_GET(*p, md->lcc, *p) != TABLE_GET(*eptr, md->lcc, *eptr)) return -1;
+       p++;
+       eptr++;
+       }
+     }
    }
  /* In the caseful case, we can just compare the bytes, whether or not we
  are in UTF-8 mode. */
  else
-   { while (length-- > 0) if (*p++ != *eptr++) return FALSE; }
+   {
+   if (eptr + length > md->end_subject) return -1;
+   while (length-- > 0) if (*p++ != *eptr++) return -1;
+   }
- return TRUE;
+ return (int)(eptr - eptr_start);
  }
-Line 245 
 enum { RM1=1, RM2,  RM3,  RM4,  RM5,  RM
+Line 272 
 enum { RM1=1, RM2,  RM3,  RM4,  RM5,  RM
         RM21,  RM22, RM23, RM24, RM25, RM26, RM27, RM28, RM29, RM30,
         RM31,  RM32, RM33, RM34, RM35, RM36, RM37, RM38, RM39, RM40,
         RM41,  RM42, RM43, RM44, RM45, RM46, RM47, RM48, RM49, RM50,
-        RM51,  RM52, RM53, RM54 };
+        RM51,  RM52, RM53, RM54, RM55, RM56, RM57, RM58, RM59, RM60,
+        RM61,  RM62, RM63, RM64, RM65, RM66 };
  /* These versions of the macros use the stack, as normal. There are debugging
  versions and production versions. Note that the "rw" argument of RMATCH isn't
- actuall used in this definition. */
+ actually used in this definition. */
  #ifndef NO_RECURSE
  #define REGISTER register
  #ifdef PCRE_DEBUG
- #define RMATCH(ra,rb,rc,rd,re,rf,rg,rw) \
+ #define RMATCH(ra,rb,rc,rd,re,rw) \
    { \
    printf("match() called in line %d\n", __LINE__); \
-   rrc = match(ra,rb,mstart,rc,rd,re,rf,rg,rdepth+1); \
+   rrc = match(ra,rb,mstart,rc,rd,re,rdepth+1); \
    printf("to line %d\n", __LINE__); \
    }
  #define RRETURN(ra) \
-Line 267 
 actuall used in this definition. */
+Line 295 
 actuall used in this definition. */
    return ra; \
    }
  #else
- #define RMATCH(ra,rb,rc,rd,re,rf,rg,rw) \
+ #define RMATCH(ra,rb,rc,rd,re,rw) \
-   rrc = match(ra,rb,mstart,rc,rd,re,rf,rg,rdepth+1)
+   rrc = match(ra,rb,mstart,rc,rd,re,rdepth+1)
  #define RRETURN(ra) return ra
  #endif
-Line 281 
 argument of match(), which never changes
+Line 309 
 argument of match(), which never changes
  #define REGISTER
- #define RMATCH(ra,rb,rc,rd,re,rf,rg,rw)\
+ #define RMATCH(ra,rb,rc,rd,re,rw)\
    {\
-   heapframe *newframe = (pcre_stack_malloc)(sizeof(heapframe));\
+   heapframe *newframe = (heapframe *)(PUBL(stack_malloc))(sizeof(heapframe));\
+   if (newframe == NULL) RRETURN(PCRE_ERROR_NOMEMORY);\
    frame->Xwhere = rw; \
    newframe->Xeptr = ra;\
    newframe->Xecode = rb;\
    newframe->Xmstart = mstart;\
    newframe->Xoffset_top = rc;\
-   newframe->Xims = re;\
+   newframe->Xeptrb = re;\
-   newframe->Xeptrb = rf;\
-   newframe->Xflags = rg;\
    newframe->Xrdepth = frame->Xrdepth + 1;\
    newframe->Xprevframe = frame;\
    frame = newframe;\
-Line 303 
 argument of match(), which never changes
+Line 330 
 argument of match(), which never changes
  #define RRETURN(ra)\
    {\
-   heapframe *newframe = frame;\
+   heapframe *oldframe = frame;\
-   frame = newframe->Xprevframe;\
+   frame = oldframe->Xprevframe;\
-   (pcre_stack_free)(newframe);\
+   (PUBL(stack_free))(oldframe);\
    if (frame != NULL)\
      {\
      rrc = ra;\
-Line 322 
 typedef struct heapframe {
+Line 349 
 typedef struct heapframe {
    /* Function arguments that may change */
-   USPTR Xeptr;
+   PCRE_PUCHAR Xeptr;
-   const uschar *Xecode;
+   const pcre_uchar *Xecode;
-   USPTR Xmstart;
+   PCRE_PUCHAR Xmstart;
    int Xoffset_top;
-   long int Xims;
    eptrblock *Xeptrb;
-   int Xflags;
    unsigned int Xrdepth;
    /* Function local variables */
-   USPTR Xcallpat;
+   PCRE_PUCHAR Xcallpat;
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-   USPTR Xcharptr;
+   PCRE_PUCHAR Xcharptr;
  #endif
-   USPTR Xdata;
+   PCRE_PUCHAR Xdata;
-   USPTR Xnext;
+   PCRE_PUCHAR Xnext;
-   USPTR Xpp;
+   PCRE_PUCHAR Xpp;
-   USPTR Xprev;
+   PCRE_PUCHAR Xprev;
-   USPTR Xsaved_eptr;
+   PCRE_PUCHAR Xsaved_eptr;
    recursion_info Xnew_recursive;
-Line 349 
 typedef struct heapframe {
+Line 374 
 typedef struct heapframe {
    BOOL Xcondition;
    BOOL Xprev_is_word;
-   unsigned long int Xoriginal_ims;
  #ifdef SUPPORT_UCP
    int Xprop_type;
    int Xprop_value;
    int Xprop_fail_result;
-   int Xprop_category;
-   int Xprop_chartype;
-   int Xprop_script;
    int Xoclength;
-   uschar Xocchars[8];
+   pcre_uchar Xocchars[6];
  #endif
    int Xcodelink;
-Line 401 
 returns a negative (error) response, the
+Line 421 
 returns a negative (error) response, the
  same response. */
  /* These macros pack up tests that are used for partial matching, and which
- appears several times in the code. We set the "hit end" flag if the pointer is
+ appear several times in the code. We set the "hit end" flag if the pointer is
  at the end of the subject and also past the start of the subject (i.e.
  something has been matched). For hard partial matching, we then return
  immediately. The second one is used when we already know we are past the end of
  the subject. */
  #define CHECK_PARTIAL()\
-   if (md->partial != 0 && eptr >= md->end_subject && eptr > mstart)\
+   if (md->partial != 0 && eptr >= md->end_subject && \
-     {\
+       eptr > md->start_used_ptr) \
-     md->hitend = TRUE;\
+     { \
-     if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);\
+     md->hitend = TRUE; \
+     if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL); \
      }
  #define SCHECK_PARTIAL()\
-   if (md->partial != 0 && eptr > mstart)\
+   if (md->partial != 0 && eptr > md->start_used_ptr) \
-     {\
+     { \
-     md->hitend = TRUE;\
+     md->hitend = TRUE; \
-     if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);\
+     if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL); \
      }
  /* Performance note: It might be tempting to extract commonly used fields from
- the md structure (e.g. utf8, end_subject) into individual variables to improve
+ the md structure (e.g. utf, end_subject) into individual variables to improve
  performance. Tests using gcc on a SPARC disproved this; in the first case, it
  made performance worse.
-Line 434 
 Arguments:
+Line 455 
 Arguments:
                   by encountering \K)
     offset_top  current top pointer
     md          pointer to "static" info for the match
-    ims         current /i, /m, and /s options
     eptrb       pointer to chain of blocks containing eptr at start of
                   brackets - for testing for empty matches
-    flags       can contain
-                  match_condassert - this is an assertion condition
-                  match_cbegroup - this is the start of an unlimited repeat
-                    group that can match an empty string
     rdepth      the recursion depth
  Returns:       MATCH_MATCH if matched            )  these values are >= 0
                 MATCH_NOMATCH if failed to match  )
+                a negative MATCH_xxx value for PRUNE, SKIP, etc
                 a negative PCRE_ERROR_xxx value if aborted by an error condition
                   (e.g. stopped by repeated call or recursion limit)
  */
  static int
- match(REGISTER USPTR eptr, REGISTER const uschar *ecode, USPTR mstart,
+ match(REGISTER PCRE_PUCHAR eptr, REGISTER const pcre_uchar *ecode,
-   int offset_top, match_data *md, unsigned long int ims, eptrblock *eptrb,
+   PCRE_PUCHAR mstart, int offset_top, match_data *md, eptrblock *eptrb,
-   int flags, unsigned int rdepth)
+   unsigned int rdepth)
  {
  /* These variables do not need to be preserved over recursion in this function,
  so they can be ordinary variables in all cases. Mark some of them with
-Line 461 
 so they can be ordinary variables in all
+Line 478 
 so they can be ordinary variables in all
  register int  rrc;         /* Returns from recursive calls */
  register int  i;           /* Used for loops not involving calls to RMATCH() */
  register unsigned int c;   /* Character values not kept over RMATCH() calls */
- register BOOL utf8;        /* Local copy of UTF-8 flag for speed */
+ register BOOL utf;         /* Local copy of UTF flag for speed */
  BOOL minimize, possessive; /* Quantifier options */
+ BOOL caseless;
  int condcode;
  /* When recursion is not being used, all "local" variables that have to be
-Line 472 
 heap storage. Set up the top-level frame
+Line 490 
 heap storage. Set up the top-level frame
  heap whenever RMATCH() does a "recursion". See the macro definitions above. */
  #ifdef NO_RECURSE
- heapframe *frame = (pcre_stack_malloc)(sizeof(heapframe));
+ heapframe *frame = (heapframe *)(PUBL(stack_malloc))(sizeof(heapframe));
+ if (frame == NULL) RRETURN(PCRE_ERROR_NOMEMORY);
  frame->Xprevframe = NULL;            /* Marks the top level */
  /* Copy in the original argument variables */
-Line 481 
 frame->Xeptr = eptr;
+Line 500 
 frame->Xeptr = eptr;
  frame->Xecode = ecode;
  frame->Xmstart = mstart;
  frame->Xoffset_top = offset_top;
- frame->Xims = ims;
  frame->Xeptrb = eptrb;
- frame->Xflags = flags;
  frame->Xrdepth = rdepth;
  /* This is where control jumps back to to effect "recursion" */
-Line 496 
 HEAP_RECURSE:
+Line 513 
 HEAP_RECURSE:
  #define ecode              frame->Xecode
  #define mstart             frame->Xmstart
  #define offset_top         frame->Xoffset_top
- #define ims                frame->Xims
  #define eptrb              frame->Xeptrb
- #define flags              frame->Xflags
  #define rdepth             frame->Xrdepth
  /* Ditto for the local variables */
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
  #define charptr            frame->Xcharptr
  #endif
  #define callpat            frame->Xcallpat
-Line 520 
 HEAP_RECURSE:
+Line 535 
 HEAP_RECURSE:
  #define condition          frame->Xcondition
  #define prev_is_word       frame->Xprev_is_word
- #define original_ims       frame->Xoriginal_ims
  #ifdef SUPPORT_UCP
  #define prop_type          frame->Xprop_type
  #define prop_value         frame->Xprop_value
  #define prop_fail_result   frame->Xprop_fail_result
- #define prop_category      frame->Xprop_category
- #define prop_chartype      frame->Xprop_chartype
- #define prop_script        frame->Xprop_script
  #define oclength           frame->Xoclength
  #define occhars            frame->Xocchars
  #endif
-Line 558 
 i, and fc and c, can be the same variabl
+Line 568 
 i, and fc and c, can be the same variabl
  #define fi i
  #define fc c
+ /* Many of the following variables are used only in small blocks of the code.
+ My normal style of coding would have declared them within each of those blocks.
+ However, in order to accommodate the version of this code that uses an external
+ "stack" implemented on the heap, it is easier to declare them all here, so the
+ declarations can be cut out in a block. The only declarations within blocks
+ below are for variables that do not have to be preserved over a recursive call
+ to RMATCH(). */
+ #ifdef SUPPORT_UTF
+ const pcre_uchar *charptr;
+ #endif
+ const pcre_uchar *callpat;
+ const pcre_uchar *data;
+ const pcre_uchar *next;
+ PCRE_PUCHAR       pp;
+ const pcre_uchar *prev;
+ PCRE_PUCHAR       saved_eptr;
+ recursion_info new_recursive;
- #ifdef SUPPORT_UTF8                /* Many of these variables are used only  */
+ BOOL cur_is_word;
- const uschar *charptr;             /* in small blocks of the code. My normal */
- #endif                             /* style of coding would have declared    */
- const uschar *callpat;             /* them within each of those blocks.      */
- const uschar *data;                /* However, in order to accommodate the   */
- const uschar *next;                /* version of this code that uses an      */
- USPTR         pp;                  /* external "stack" implemented on the    */
- const uschar *prev;                /* heap, it is easier to declare them all */
- USPTR         saved_eptr;          /* here, so the declarations can be cut   */
-                                    /* out in a block. The only declarations  */
- recursion_info new_recursive;      /* within blocks below are for variables  */
-                                    /* that do not have to be preserved over  */
- BOOL cur_is_word;                  /* a recursive call to RMATCH().          */
  BOOL condition;
  BOOL prev_is_word;
- unsigned long int original_ims;
  #ifdef SUPPORT_UCP
  int prop_type;
  int prop_value;
  int prop_fail_result;
- int prop_category;
- int prop_chartype;
- int prop_script;
  int oclength;
- uschar occhars[8];
+ pcre_uchar occhars[6];
  #endif
  int codelink;
-Line 603 
 int stacksave[REC_STACK_SAVE_MAX];
+Line 615 
 int stacksave[REC_STACK_SAVE_MAX];
  eptrblock newptrb;
  #endif     /* NO_RECURSE */
+ /* To save space on the stack and in the heap frame, I have doubled up on some
+ of the local variables that are used only in localised parts of the code, but
+ still need to be preserved over recursive calls of match(). These macros define
+ the alternative names that are used. */
+ #define allow_zero    cur_is_word
+ #define cbegroup      condition
+ #define code_offset   codelink
+ #define condassert    condition
+ #define matched_once  prev_is_word
+ #define foc           number
  /* These statements are here to stop the compiler complaining about unitialized
  variables. */
-Line 627 
 defined). However, RMATCH isn't like a f
+Line 651 
 defined). However, RMATCH isn't like a f
  complicated macro. It has to be used in one particular way. This shouldn't,
  however, impact performance when true recursion is being used. */
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
- utf8 = md->utf8;       /* Local copy of the flag */
+ utf = md->utf;       /* Local copy of the flag */
  #else
- utf8 = FALSE;
+ utf = FALSE;
  #endif
  /* First check that we haven't called match() too many times, or that we
-Line 639 
 haven't exceeded the recursive call limi
+Line 663 
 haven't exceeded the recursive call limi
  if (md->match_call_count++ >= md->match_limit) RRETURN(PCRE_ERROR_MATCHLIMIT);
  if (rdepth >= md->match_limit_recursion) RRETURN(PCRE_ERROR_RECURSIONLIMIT);
- original_ims = ims;    /* Save for resetting on ')' */
  /* At the start of a group with an unlimited repeat that may match an empty
- string, the match_cbegroup flag is set. When this is the case, add the current
+ string, the variable md->match_function_type is set to MATCH_CBEGROUP. It is
- subject pointer to the chain of such remembered pointers, to be checked when we
+ done this way to save having to use another function argument, which would take
- hit the closing ket, in order to break infinite loops that match no characters.
+ up space on the stack. See also MATCH_CONDASSERT below.
- When match() is called in other circumstances, don't add to the chain. The
- match_cbegroup flag must NOT be used with tail recursion, because the memory
+ When MATCH_CBEGROUP is set, add the current subject pointer to the chain of
- block that is used is on the stack, so a new one may be required for each
+ such remembered pointers, to be checked when we hit the closing ket, in order
- match(). */
+ to break infinite loops that match no characters. When match() is called in
+ other circumstances, don't add to the chain. The MATCH_CBEGROUP feature must
+ NOT be used with tail recursion, because the memory block that is used is on
+ the stack, so a new one may be required for each match(). */
- if ((flags & match_cbegroup) != 0)
+ if (md->match_function_type == MATCH_CBEGROUP)
    {
    newptrb.epb_saved_eptr = eptr;
    newptrb.epb_prev = eptrb;
    eptrb = &newptrb;
+   md->match_function_type = 0;
    }
  /* Now start processing the opcodes. */
-Line 666 
 for (;;)
+Line 692 
 for (;;)
    switch(op)
      {
+     case OP_MARK:
+     md->nomatch_mark = ecode + 2;
+     md->mark = NULL;    /* In case previously set by assertion */
+     RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top, md,
+       eptrb, RM55);
+     if ((rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) &&
+          md->mark == NULL) md->mark = ecode + 2;
+     /* A return of MATCH_SKIP_ARG means that matching failed at SKIP with an
+     argument, and we must check whether that argument matches this MARK's
+     argument. It is passed back in md->start_match_ptr (an overloading of that
+     variable). If it does match, we reset that variable to the current subject
+     position and return MATCH_SKIP. Otherwise, pass back the return code
+     unaltered. */
+     else if (rrc == MATCH_SKIP_ARG &&
+         STRCMP_UC_UC(ecode + 2, md->start_match_ptr) == 0)
+       {
+       md->start_match_ptr = eptr;
+       RRETURN(MATCH_SKIP);
+       }
+     RRETURN(rrc);
      case OP_FAIL:
      RRETURN(MATCH_NOMATCH);
-     case OP_PRUNE:
+     /* COMMIT overrides PRUNE, SKIP, and THEN */
-     RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
-       ims, eptrb, flags, RM51);
-     if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-     RRETURN(MATCH_PRUNE);
      case OP_COMMIT:
-     RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
+     RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
-       ims, eptrb, flags, RM52);
+       eptrb, RM52);
-     if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+     if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE &&
+         rrc != MATCH_SKIP && rrc != MATCH_SKIP_ARG &&
+         rrc != MATCH_THEN)
+       RRETURN(rrc);
      RRETURN(MATCH_COMMIT);
+     /* PRUNE overrides THEN */
+     case OP_PRUNE:
+     RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
+       eptrb, RM51);
+     if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
+     RRETURN(MATCH_PRUNE);
+     case OP_PRUNE_ARG:
+     md->nomatch_mark = ecode + 2;
+     md->mark = NULL;    /* In case previously set by assertion */
+     RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top, md,
+       eptrb, RM56);
+     if ((rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) &&
+          md->mark == NULL) md->mark = ecode + 2;
+     if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
+     RRETURN(MATCH_PRUNE);
+     /* SKIP overrides PRUNE and THEN */
      case OP_SKIP:
-     RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
+     RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
-       ims, eptrb, flags, RM53);
+       eptrb, RM53);
-     if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+     if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE && rrc != MATCH_THEN)
+       RRETURN(rrc);
      md->start_match_ptr = eptr;   /* Pass back current position */
      RRETURN(MATCH_SKIP);
+     /* Note that, for Perl compatibility, SKIP with an argument does NOT set
+     nomatch_mark. There is a flag that disables this opcode when re-matching a
+     pattern that ended with a SKIP for which there was not a matching MARK. */
+     case OP_SKIP_ARG:
+     if (md->ignore_skip_arg)
+       {
+       ecode += PRIV(OP_lengths)[*ecode] + ecode[1];
+       break;
+       }
+     RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top, md,
+       eptrb, RM57);
+     if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE && rrc != MATCH_THEN)
+       RRETURN(rrc);
+     /* Pass back the current skip name by overloading md->start_match_ptr and
+     returning the special MATCH_SKIP_ARG return code. This will either be
+     caught by a matching MARK, or get to the top, where it causes a rematch
+     with the md->ignore_skip_arg flag set. */
+     md->start_match_ptr = ecode + 2;
+     RRETURN(MATCH_SKIP_ARG);
+     /* For THEN (and THEN_ARG) we pass back the address of the opcode, so that
+     the branch in which it occurs can be determined. Overload the start of
+     match pointer to do this. */
      case OP_THEN:
-     RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
+     RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
-       ims, eptrb, flags, RM54);
+       eptrb, RM54);
      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+     md->start_match_ptr = ecode;
      RRETURN(MATCH_THEN);
-     /* Handle a capturing bracket. If there is space in the offset vector, save
+     case OP_THEN_ARG:
-     the current subject position in the working slot at the top of the vector.
+     md->nomatch_mark = ecode + 2;
-     We mustn't change the current values of the data slot, because they may be
+     md->mark = NULL;    /* In case previously set by assertion */
-     set from a previous iteration of this group, and be referred to by a
+     RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top,
-     reference inside the group.
+       md, eptrb, RM58);
+     if ((rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) &&
-     If the bracket fails to match, we need to restore this value and also the
+          md->mark == NULL) md->mark = ecode + 2;
-     values of the final offsets, in case they were set by a previous iteration
+     if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-     of the same bracket.
+     md->start_match_ptr = ecode;
+     RRETURN(MATCH_THEN);
+     /* Handle an atomic group that does not contain any capturing parentheses.
+     This can be handled like an assertion. Prior to 8.13, all atomic groups
+     were handled this way. In 8.13, the code was changed as below for ONCE, so
+     that backups pass through the group and thereby reset captured values.
+     However, this uses a lot more stack, so in 8.20, atomic groups that do not
+     contain any captures generate OP_ONCE_NC, which can be handled in the old,
+     less stack intensive way.
+     Check the alternative branches in turn - the matching won't pass the KET
+     for this kind of subpattern. If any one branch matches, we carry on as at
+     the end of a normal bracket, leaving the subject pointer, but resetting
+     the start-of-match value in case it was changed by \K. */
+     case OP_ONCE_NC:
+     prev = ecode;
+     saved_eptr = eptr;
+     do
+       {
+       RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM64);
+       if (rrc == MATCH_MATCH)  /* Note: _not_ MATCH_ACCEPT */
+         {
+         mstart = md->start_match_ptr;
+         break;
+         }
+       if (rrc == MATCH_THEN)
+         {
+         next = ecode + GET(ecode,1);
+         if (md->start_match_ptr < next &&
+             (*ecode == OP_ALT || *next == OP_ALT))
+           rrc = MATCH_NOMATCH;
+         }
+       if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+       ecode += GET(ecode,1);
+       }
+     while (*ecode == OP_ALT);
+     /* If hit the end of the group (which could be repeated), fail */
+     if (*ecode != OP_ONCE_NC && *ecode != OP_ALT) RRETURN(MATCH_NOMATCH);
+     /* Continue as from after the group, updating the offsets high water
+     mark, since extracts may have been taken. */
+     do ecode += GET(ecode, 1); while (*ecode == OP_ALT);
+     offset_top = md->end_offset_top;
+     eptr = md->end_match_ptr;
+     /* For a non-repeating ket, just continue at this level. This also
+     happens for a repeating ket if no characters were matched in the group.
+     This is the forcible breaking of infinite loops as implemented in Perl
+.005. */
+     if (*ecode == OP_KET || eptr == saved_eptr)
+       {
+       ecode += 1+LINK_SIZE;
+       break;
+       }
+     /* The repeating kets try the rest of the pattern or restart from the
+     preceding bracket, in the appropriate order. The second "call" of match()
+     uses tail recursion, to avoid using another stack frame. */
+     if (*ecode == OP_KETRMIN)
+       {
+       RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM65);
+       if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+       ecode = prev;
+       goto TAIL_RECURSE;
+       }
+     else  /* OP_KETRMAX */
+       {
+       md->match_function_type = MATCH_CBEGROUP;
+       RMATCH(eptr, prev, offset_top, md, eptrb, RM66);
+       if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+       ecode += 1 + LINK_SIZE;
+       goto TAIL_RECURSE;
+       }
+     /* Control never gets here */
+     /* Handle a capturing bracket, other than those that are possessive with an
+     unlimited repeat. If there is space in the offset vector, save the current
+     subject position in the working slot at the top of the vector. We mustn't
+     change the current values of the data slot, because they may be set from a
+     previous iteration of this group, and be referred to by a reference inside
+     the group. A failure to match might occur after the group has succeeded,
+     if something later on doesn't match. For this reason, we need to restore
+     the working value and also the values of the final offsets, in case they
+     were set by a previous iteration of the same bracket.
      If there isn't enough space in the offset vector, treat this as if it were
      a non-capturing bracket. Don't worry about setting the flag for the error
-Line 728 
 for (;;)
+Line 917 
 for (;;)
        save_capture_last = md->capture_last;
        DPRINTF(("saving %d %d %d\n", save_offset1, save_offset2, save_offset3));
-       md->offset_vector[md->offset_end - number] = eptr - md->start_subject;
+       md->offset_vector[md->offset_end - number] =
+         (int)(eptr - md->start_subject);
-       flags = (op == OP_SCBRA)? match_cbegroup : 0;
+       for (;;)
-       do
          {
-         RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
+         if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
-           ims, eptrb, flags, RM1);
+         RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
-         if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
+           eptrb, RM1);
+         if (rrc == MATCH_ONCE) break;  /* Backing up through an atomic group */
+         /* If we backed up to a THEN, check whether it is within the current
+         branch by comparing the address of the THEN that is passed back with
+         the end of the branch. If it is within the current branch, and the
+         branch is one of two or more alternatives (it either starts or ends
+         with OP_ALT), we have reached the limit of THEN's action, so convert
+         the return code to NOMATCH, which will cause normal backtracking to
+         happen from now on. Otherwise, THEN is passed back to an outer
+         alternative. This implements Perl's treatment of parenthesized groups,
+         where a group not containing | does not affect the current alternative,
+         that is, (X) is NOT the same as (X|(*F)). */
+         if (rrc == MATCH_THEN)
+           {
+           next = ecode + GET(ecode,1);
+           if (md->start_match_ptr < next &&
+               (*ecode == OP_ALT || *next == OP_ALT))
+             rrc = MATCH_NOMATCH;
+           }
+         /* Anything other than NOMATCH is passed back. */
+         if (rrc != MATCH_NOMATCH) RRETURN(rrc);
          md->capture_last = save_capture_last;
          ecode += GET(ecode, 1);
+         if (*ecode != OP_ALT) break;
          }
-       while (*ecode == OP_ALT);
        DPRINTF(("bracket %d failed\n", number));
        md->offset_vector[offset] = save_offset1;
        md->offset_vector[offset+1] = save_offset2;
        md->offset_vector[md->offset_end - number] = save_offset3;
-       RRETURN(MATCH_NOMATCH);
+       /* At this point, rrc will be one of MATCH_ONCE or MATCH_NOMATCH. */
+       RRETURN(rrc);
        }
      /* FALL THROUGH ... Insufficient room for saving captured contents. Treat
-Line 761 
 for (;;)
+Line 975 
 for (;;)
      /* VVVVVVVVVVVVVVVVVVVVVVVVV */
      /* VVVVVVVVVVVVVVVVVVVVVVVVV */
-     /* Non-capturing bracket. Loop for all the alternatives. When we get to the
+     /* Non-capturing or atomic group, except for possessive with unlimited
-     final alternative within the brackets, we would return the result of a
+     repeat and ONCE group with no captures. Loop for all the alternatives.
-     recursive call to match() whatever happened. We can reduce stack usage by
-     turning this into a tail recursion, except in the case when match_cbegroup
+     When we get to the final alternative within the brackets, we used to return
-     is set.*/
+     the result of a recursive call to match() whatever happened so it was
+     possible to reduce stack usage by turning this into a tail recursion,
+     except in the case of a possibly empty group. However, now that there is
+     the possiblity of (*THEN) occurring in the final alternative, this
+     optimization is no longer always possible.
+     We can optimize if we know there are no (*THEN)s in the pattern; at present
+     this is the best that can be done.
+     MATCH_ONCE is returned when the end of an atomic group is successfully
+     reached, but subsequent matching fails. It passes back up the tree (causing
+     captured values to be reset) until the original atomic group level is
+     reached. This is tested by comparing md->once_target with the start of the
+     group. At this point, the return is converted into MATCH_NOMATCH so that
+     previous backup points can be taken. */
+     case OP_ONCE:
      case OP_BRA:
      case OP_SBRA:
      DPRINTF(("start non-capturing bracket\n"));
-     flags = (op >= OP_SBRA)? match_cbegroup : 0;
      for (;;)
        {
-       if (ecode[GET(ecode, 1)] != OP_ALT)   /* Final alternative */
+       if (op >= OP_SBRA || op == OP_ONCE) md->match_function_type = MATCH_CBEGROUP;
+       /* If this is not a possibly empty group, and there are no (*THEN)s in
+       the pattern, and this is the final alternative, optimize as described
+       above. */
+       else if (!md->hasthen && ecode[GET(ecode, 1)] != OP_ALT)
+         {
+         ecode += PRIV(OP_lengths)[*ecode];
+         goto TAIL_RECURSE;
+         }
+       /* In all other cases, we have to make another call to match(). */
+       RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md, eptrb,
+         RM2);
+       /* See comment in the code for capturing groups above about handling
+       THEN. */
+       if (rrc == MATCH_THEN)
+         {
+         next = ecode + GET(ecode,1);
+         if (md->start_match_ptr < next &&
+             (*ecode == OP_ALT || *next == OP_ALT))
+           rrc = MATCH_NOMATCH;
+         }
+       if (rrc != MATCH_NOMATCH)
          {
-         if (flags == 0)    /* Not a possibly empty group */
+         if (rrc == MATCH_ONCE)
            {
-           ecode += _pcre_OP_lengths[*ecode];
+           const pcre_uchar *scode = ecode;
-           DPRINTF(("bracket 0 tail recursion\n"));
+           if (*scode != OP_ONCE)           /* If not at start, find it */
-           goto TAIL_RECURSE;
+             {
+             while (*scode == OP_ALT) scode += GET(scode, 1);
+             scode -= GET(scode, 1);
+             }
+           if (md->once_target == scode) rrc = MATCH_NOMATCH;
            }
+         RRETURN(rrc);
+         }
+       ecode += GET(ecode, 1);
+       if (*ecode != OP_ALT) break;
+       }
-         /* Possibly empty group; can't use tail recursion. */
+     RRETURN(MATCH_NOMATCH);
-         RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md, ims,
+     /* Handle possessive capturing brackets with an unlimited repeat. We come
-           eptrb, flags, RM48);
+     here from BRAZERO with allow_zero set TRUE. The offset_vector values are
-         RRETURN(rrc);
+     handled similarly to the normal case above. However, the matching is
+     different. The end of these brackets will always be OP_KETRPOS, which
+     returns MATCH_KETRPOS without going further in the pattern. By this means
+     we can handle the group by iteration rather than recursion, thereby
+     reducing the amount of stack needed. */
+     case OP_CBRAPOS:
+     case OP_SCBRAPOS:
+     allow_zero = FALSE;
+     POSSESSIVE_CAPTURE:
+     number = GET2(ecode, 1+LINK_SIZE);
+     offset = number << 1;
+ #ifdef PCRE_DEBUG
+     printf("start possessive bracket %d\n", number);
+     printf("subject=");
+     pchars(eptr, 16, TRUE, md);
+     printf("\n");
+ #endif
+     if (offset < md->offset_max)
+       {
+       matched_once = FALSE;
+       code_offset = (int)(ecode - md->start_code);
+       save_offset1 = md->offset_vector[offset];
+       save_offset2 = md->offset_vector[offset+1];
+       save_offset3 = md->offset_vector[md->offset_end - number];
+       save_capture_last = md->capture_last;
+       DPRINTF(("saving %d %d %d\n", save_offset1, save_offset2, save_offset3));
+       /* Each time round the loop, save the current subject position for use
+       when the group matches. For MATCH_MATCH, the group has matched, so we
+       restart it with a new subject starting position, remembering that we had
+       at least one match. For MATCH_NOMATCH, carry on with the alternatives, as
+       usual. If we haven't matched any alternatives in any iteration, check to
+       see if a previous iteration matched. If so, the group has matched;
+       continue from afterwards. Otherwise it has failed; restore the previous
+       capture values before returning NOMATCH. */
+       for (;;)
+         {
+         md->offset_vector[md->offset_end - number] =
+           (int)(eptr - md->start_subject);
+         if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
+         RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
+           eptrb, RM63);
+         if (rrc == MATCH_KETRPOS)
+           {
+           offset_top = md->end_offset_top;
+           eptr = md->end_match_ptr;
+           ecode = md->start_code + code_offset;
+           save_capture_last = md->capture_last;
+           matched_once = TRUE;
+           continue;
+           }
+         /* See comment in the code for capturing groups above about handling
+         THEN. */
+         if (rrc == MATCH_THEN)
+           {
+           next = ecode + GET(ecode,1);
+           if (md->start_match_ptr < next &&
+               (*ecode == OP_ALT || *next == OP_ALT))
+             rrc = MATCH_NOMATCH;
+           }
+         if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+         md->capture_last = save_capture_last;
+         ecode += GET(ecode, 1);
+         if (*ecode != OP_ALT) break;
          }
-       /* For non-final alternatives, continue the loop for a NOMATCH result;
+       if (!matched_once)
-       otherwise return. */
+         {
+         md->offset_vector[offset] = save_offset1;
+         md->offset_vector[offset+1] = save_offset2;
+         md->offset_vector[md->offset_end - number] = save_offset3;
+         }
-       RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md, ims,
+       if (allow_zero || matched_once)
-         eptrb, flags, RM2);
+         {
-       if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
+         ecode += 1 + LINK_SIZE;
+         break;
+         }
+       RRETURN(MATCH_NOMATCH);
+       }
+     /* FALL THROUGH ... Insufficient room for saving captured contents. Treat
+     as a non-capturing bracket. */
+     /* VVVVVVVVVVVVVVVVVVVVVVVVV */
+     /* VVVVVVVVVVVVVVVVVVVVVVVVV */
+     DPRINTF(("insufficient capture room: treat as non-capturing\n"));
+     /* VVVVVVVVVVVVVVVVVVVVVVVVV */
+     /* VVVVVVVVVVVVVVVVVVVVVVVVV */
+     /* Non-capturing possessive bracket with unlimited repeat. We come here
+     from BRAZERO with allow_zero = TRUE. The code is similar to the above,
+     without the capturing complication. It is written out separately for speed
+     and cleanliness. */
+     case OP_BRAPOS:
+     case OP_SBRAPOS:
+     allow_zero = FALSE;
+     POSSESSIVE_NON_CAPTURE:
+     matched_once = FALSE;
+     code_offset = (int)(ecode - md->start_code);
+     for (;;)
+       {
+       if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
+       RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
+         eptrb, RM48);
+       if (rrc == MATCH_KETRPOS)
+         {
+         offset_top = md->end_offset_top;
+         eptr = md->end_match_ptr;
+         ecode = md->start_code + code_offset;
+         matched_once = TRUE;
+         continue;
+         }
+       /* See comment in the code for capturing groups above about handling
+       THEN. */
+       if (rrc == MATCH_THEN)
+         {
+         next = ecode + GET(ecode,1);
+         if (md->start_match_ptr < next &&
+             (*ecode == OP_ALT || *next == OP_ALT))
+           rrc = MATCH_NOMATCH;
+         }
+       if (rrc != MATCH_NOMATCH) RRETURN(rrc);
        ecode += GET(ecode, 1);
+       if (*ecode != OP_ALT) break;
        }
+     if (matched_once || allow_zero)
+       {
+       ecode += 1 + LINK_SIZE;
+       break;
+       }
+     RRETURN(MATCH_NOMATCH);
      /* Control never reaches here. */
      /* Conditional group: compilation checked that there are no more than
      two branches. If the condition is false, skipping the first branch takes us
      past the end if there is only one branch, but that's OK because that is
-     exactly what going to the ket would do. As there is only one branch to be
+     exactly what going to the ket would do. */
-     obeyed, we can use tail recursion to avoid using another stack frame. */
      case OP_COND:
      case OP_SCOND:
-     codelink= GET(ecode, 1);
+     codelink = GET(ecode, 1);
      /* Because of the way auto-callout works during compile, a callout item is
      inserted between OP_COND and an assertion condition. */
      if (ecode[LINK_SIZE+1] == OP_CALLOUT)
        {
-       if (pcre_callout != NULL)
+       if (PUBL(callout) != NULL)
          {
-         pcre_callout_block cb;
+         PUBL(callout_block) cb;
-         cb.version          = 1;   /* Version 1 of the callout block */
+         cb.version          = 2;   /* Version 1 of the callout block */
          cb.callout_number   = ecode[LINK_SIZE+2];
          cb.offset_vector    = md->offset_vector;
+ #ifdef COMPILE_PCRE8
          cb.subject          = (PCRE_SPTR)md->start_subject;
-         cb.subject_length   = md->end_subject - md->start_subject;
+ #else
-         cb.start_match      = mstart - md->start_subject;
+         cb.subject          = (PCRE_SPTR16)md->start_subject;
-         cb.current_position = eptr - md->start_subject;
+ #endif
+         cb.subject_length   = (int)(md->end_subject - md->start_subject);
+         cb.start_match      = (int)(mstart - md->start_subject);
+         cb.current_position = (int)(eptr - md->start_subject);
          cb.pattern_position = GET(ecode, LINK_SIZE + 3);
          cb.next_item_length = GET(ecode, 3 + 2*LINK_SIZE);
          cb.capture_top      = offset_top/2;
          cb.capture_last     = md->capture_last;
          cb.callout_data     = md->callout_data;
-         if ((rrc = (*pcre_callout)(&cb)) > 0) RRETURN(MATCH_NOMATCH);
+         cb.mark             = md->nomatch_mark;
+         if ((rrc = (*PUBL(callout))(&cb)) > 0) RRETURN(MATCH_NOMATCH);
          if (rrc < 0) RRETURN(rrc);
          }
-       ecode += _pcre_OP_lengths[OP_CALLOUT];
+       ecode += PRIV(OP_lengths)[OP_CALLOUT];
        }
      condcode = ecode[LINK_SIZE+1];
-Line 849 
 for (;;)
+Line 1261 
 for (;;)
        else
          {
          int recno = GET2(ecode, LINK_SIZE + 2);   /* Recursion group number*/
-         condition =  (recno == RREF_ANY || recno == md->recursive->group_num);
+         condition = (recno == RREF_ANY || recno == md->recursive->group_num);
          /* If the test is for recursion into a specific subpattern, and it is
          false, but the test was set up by name, scan the table to see if the
          name refers to any other numbers, and test them. The condition is true
          if any one is set. */
-         if (!condition && condcode == OP_NRREF && recno != RREF_ANY)
+         if (!condition && condcode == OP_NRREF)
            {
-           uschar *slotA = md->name_table;
+           pcre_uchar *slotA = md->name_table;
            for (i = 0; i < md->name_count; i++)
              {
              if (GET2(slotA, 0) == recno) break;
-Line 871 
 for (;;)
+Line 1283 
 for (;;)
            if (i < md->name_count)
              {
-             uschar *slotB = slotA;
+             pcre_uchar *slotB = slotA;
              while (slotB > md->name_table)
                {
                slotB -= md->name_entry_size;
-               if (strcmp((char *)slotA + 2, (char *)slotB + 2) == 0)
+               if (STRCMP_UC_UC(slotA + IMM2_SIZE, slotB + IMM2_SIZE) == 0)
                  {
                  condition = GET2(slotB, 0) == md->recursive->group_num;
                  if (condition) break;
-Line 891 
 for (;;)
+Line 1303 
 for (;;)
                for (i++; i < md->name_count; i++)
                  {
                  slotB += md->name_entry_size;
-                 if (strcmp((char *)slotA + 2, (char *)slotB + 2) == 0)
+                 if (STRCMP_UC_UC(slotA + IMM2_SIZE, slotB + IMM2_SIZE) == 0)
                    {
                    condition = GET2(slotB, 0) == md->recursive->group_num;
                    if (condition) break;
-Line 904 
 for (;;)
+Line 1316 
 for (;;)
          /* Chose branch according to the condition */
-         ecode += condition? 3 : GET(ecode, 1);
+         ecode += condition? 1 + IMM2_SIZE : GET(ecode, 1);
          }
        }
-Line 921 
 for (;;)
+Line 1333 
 for (;;)
        if (!condition && condcode == OP_NCREF)
          {
          int refno = offset >> 1;
-         uschar *slotA = md->name_table;
+         pcre_uchar *slotA = md->name_table;
          for (i = 0; i < md->name_count; i++)
            {
-Line 935 
 for (;;)
+Line 1347 
 for (;;)
          if (i < md->name_count)
            {
-           uschar *slotB = slotA;
+           pcre_uchar *slotB = slotA;
            while (slotB > md->name_table)
              {
              slotB -= md->name_entry_size;
-             if (strcmp((char *)slotA + 2, (char *)slotB + 2) == 0)
+             if (STRCMP_UC_UC(slotA + IMM2_SIZE, slotB + IMM2_SIZE) == 0)
                {
                offset = GET2(slotB, 0) << 1;
                condition = offset < offset_top &&
-Line 957 
 for (;;)
+Line 1369 
 for (;;)
              for (i++; i < md->name_count; i++)
                {
                slotB += md->name_entry_size;
-               if (strcmp((char *)slotA + 2, (char *)slotB + 2) == 0)
+               if (STRCMP_UC_UC(slotA + IMM2_SIZE, slotB + IMM2_SIZE) == 0)
                  {
                  offset = GET2(slotB, 0) << 1;
                  condition = offset < offset_top &&
-Line 972 
 for (;;)
+Line 1384 
 for (;;)
        /* Chose branch according to the condition */
-       ecode += condition? 3 : GET(ecode, 1);
+       ecode += condition? 1 + IMM2_SIZE : GET(ecode, 1);
        }
      else if (condcode == OP_DEF)     /* DEFINE - always false */
-Line 982 
 for (;;)
+Line 1394 
 for (;;)
        }
      /* The condition is an assertion. Call match() to evaluate it - setting
-     the final argument match_condassert causes it to stop at the end of an
+     md->match_function_type to MATCH_CONDASSERT causes it to stop at the end of
-     assertion. */
+     an assertion. */
      else
        {
-       RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, NULL,
+       md->match_function_type = MATCH_CONDASSERT;
-           match_condassert, RM3);
+       RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM3);
        if (rrc == MATCH_MATCH)
          {
+         if (md->end_offset_top > offset_top)
+           offset_top = md->end_offset_top;  /* Captures may have happened */
          condition = TRUE;
          ecode += 1 + LINK_SIZE + GET(ecode, LINK_SIZE + 2);
          while (*ecode == OP_ALT) ecode += GET(ecode, 1);
          }
+       /* PCRE doesn't allow the effect of (*THEN) to escape beyond an
+       assertion; it is therefore treated as NOMATCH. */
        else if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN)
          {
          RRETURN(rrc);         /* Need braces because of following else */
-Line 1006 
 for (;;)
+Line 1424 
 for (;;)
          }
        }
-     /* We are now at the branch that is to be obeyed. As there is only one,
+     /* We are now at the branch that is to be obeyed. As there is only one, can
-     we can use tail recursion to avoid using another stack frame, except when
+     use tail recursion to avoid using another stack frame, except when there is
-     match_cbegroup is required for an unlimited repeat of a possibly empty
+     unlimited repeat of a possibly empty group. In the latter case, a recursive
-     group. If the second alternative doesn't exist, we can just plough on. */
+     call to match() is always required, unless the second alternative doesn't
+     exist, in which case we can just plough on. Note that, for compatibility
+     with Perl, the | in a conditional group is NOT treated as creating two
+     alternatives. If a THEN is encountered in the branch, it propagates out to
+     the enclosing alternative (unless nested in a deeper set of alternatives,
+     of course). */
      if (condition || *ecode == OP_ALT)
        {
-       ecode += 1 + LINK_SIZE;
+       if (op != OP_SCOND)
-       if (op == OP_SCOND)        /* Possibly empty group */
          {
-         RMATCH(eptr, ecode, offset_top, md, ims, eptrb, match_cbegroup, RM49);
+         ecode += 1 + LINK_SIZE;
-         RRETURN(rrc);
-         }
-       else                       /* Group must match something */
-         {
-         flags = 0;
          goto TAIL_RECURSE;
          }
+       md->match_function_type = MATCH_CBEGROUP;
+       RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM49);
+       RRETURN(rrc);
        }
-     else                         /* Condition false & no alternative */
+      /* Condition false & no alternative; continue after the group. */
+     else
        {
        ecode += 1 + LINK_SIZE;
        }
-Line 1049 
 for (;;)
+Line 1473 
 for (;;)
        {
        md->offset_vector[offset] =
          md->offset_vector[md->offset_end - number];
-       md->offset_vector[offset+1] = eptr - md->start_subject;
+       md->offset_vector[offset+1] = (int)(eptr - md->start_subject);
        if (offset_top <= offset) offset_top = offset + 2;
        }
-     ecode += 3;
+     ecode += 1 + IMM2_SIZE;
      break;
-     /* End of the pattern, either real or forced. If we are in a top-level
+     /* End of the pattern, either real or forced. */
-     recursion, we should restore the offsets appropriately and continue from
-     after the call. */
-     case OP_ACCEPT:
      case OP_END:
-     if (md->recursive != NULL && md->recursive->group_num == 0)
+     case OP_ACCEPT:
-       {
+     case OP_ASSERT_ACCEPT:
-       recursion_info *rec = md->recursive;
-       DPRINTF(("End of pattern in a (?0) recursion\n"));
-       md->recursive = rec->prevrec;
-       memmove(md->offset_vector, rec->offset_save,
-         rec->saved_max * sizeof(int));
-       offset_top = rec->save_offset_top;
-       mstart = rec->save_start;
-       ims = original_ims;
-       ecode = rec->after_call;
-       break;
-       }
-     /* Otherwise, if we have matched an empty string, fail if PCRE_NOTEMPTY is
+     /* If we have matched an empty string, fail if not in an assertion and not
-     set, or if PCRE_NOTEMPTY_ATSTART is set and we have matched at the start of
+     in a recursion if either PCRE_NOTEMPTY is set, or if PCRE_NOTEMPTY_ATSTART
-     the subject. In both cases, backtracking will then try other alternatives,
+     is set and we have matched at the start of the subject. In both cases,
-     if any. */
+     backtracking will then try other alternatives, if any. */
-     if (eptr == mstart &&
+     if (eptr == mstart && op != OP_ASSERT_ACCEPT &&
-         (md->notempty ||
+          md->recursive == NULL &&
-           (md->notempty_atstart &&
+          (md->notempty ||
-             mstart == md->start_subject + md->start_offset)))
+            (md->notempty_atstart &&
+              mstart == md->start_subject + md->start_offset)))
        RRETURN(MATCH_NOMATCH);
      /* Otherwise, we have a match. */
-Line 1092 
 for (;;)
+Line 1503 
 for (;;)
      md->end_match_ptr = eptr;           /* Record where we ended */
      md->end_offset_top = offset_top;    /* and how many extracts were taken */
      md->start_match_ptr = mstart;       /* and the start (\K can modify) */
-     RRETURN(MATCH_MATCH);
-     /* Change option settings */
+     /* For some reason, the macros don't work properly if an expression is
+     given as the argument to RRETURN when the heap is in use. */
-     case OP_OPT:
+     rrc = (op == OP_END)? MATCH_MATCH : MATCH_ACCEPT;
-     ims = ecode[1];
+     RRETURN(rrc);
-     ecode += 2;
-     DPRINTF(("ims set to %02lx\n", ims));
-     break;
      /* Assertion brackets. Check the alternative branches in turn - the
      matching won't pass the KET for an assertion. If any one branch matches,
      the assertion is true. Lookbehind assertions have an OP_REVERSE item at the
      start of each branch to move the current point backwards, so the code at
-     this level is identical to the lookahead case. */
+     this level is identical to the lookahead case. When the assertion is part
+     of a condition, we want to return immediately afterwards. The caller of
+     this incarnation of the match() function will have set MATCH_CONDASSERT in
+     md->match_function type, and one of these opcodes will be the first opcode
+     that is processed. We use a local variable that is preserved over calls to
+     match() to remember this case. */
      case OP_ASSERT:
      case OP_ASSERTBACK:
+     if (md->match_function_type == MATCH_CONDASSERT)
+       {
+       condassert = TRUE;
+       md->match_function_type = 0;
+       }
+     else condassert = FALSE;
      do
        {
-       RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, NULL, 0,
+       RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM4);
-         RM4);
+       if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)
-       if (rrc == MATCH_MATCH) break;
+         {
+         mstart = md->start_match_ptr;   /* In case \K reset it */
+         break;
+         }
+       /* PCRE does not allow THEN to escape beyond an assertion; it is treated
+       as NOMATCH. */
        if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
        ecode += GET(ecode, 1);
        }
      while (*ecode == OP_ALT);
      if (*ecode == OP_KET) RRETURN(MATCH_NOMATCH);
      /* If checking an assertion for a condition, return MATCH_MATCH. */
-     if ((flags & match_condassert) != 0) RRETURN(MATCH_MATCH);
+     if (condassert) RRETURN(MATCH_MATCH);
      /* Continue from after the assertion, updating the offsets high water
      mark, since extracts may have been taken during the assertion. */
-Line 1139 
 for (;;)
+Line 1567 
 for (;;)
      case OP_ASSERT_NOT:
      case OP_ASSERTBACK_NOT:
+     if (md->match_function_type == MATCH_CONDASSERT)
+       {
+       condassert = TRUE;
+       md->match_function_type = 0;
+       }
+     else condassert = FALSE;
      do
        {
-       RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, NULL, 0,
+       RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM5);
-         RM5);
+       if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) RRETURN(MATCH_NOMATCH);
-       if (rrc == MATCH_MATCH) RRETURN(MATCH_NOMATCH);
        if (rrc == MATCH_SKIP || rrc == MATCH_PRUNE || rrc == MATCH_COMMIT)
          {
          do ecode += GET(ecode,1); while (*ecode == OP_ALT);
          break;
          }
+       /* PCRE does not allow THEN to escape beyond an assertion; it is treated
+       as NOMATCH. */
        if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
        ecode += GET(ecode,1);
        }
      while (*ecode == OP_ALT);
-     if ((flags & match_condassert) != 0) RRETURN(MATCH_MATCH);
+     if (condassert) RRETURN(MATCH_MATCH);  /* Condition assertion */
      ecode += 1 + LINK_SIZE;
      continue;
-Line 1165 
 for (;;)
+Line 1603 
 for (;;)
      back a number of characters, not bytes. */
      case OP_REVERSE:
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-     if (utf8)
+     if (utf)
        {
        i = GET(ecode, 1);
        while (i-- > 0)
-Line 1197 
 for (;;)
+Line 1635 
 for (;;)
      function is able to force a failure. */
      case OP_CALLOUT:
-     if (pcre_callout != NULL)
+     if (PUBL(callout) != NULL)
        {
-       pcre_callout_block cb;
+       PUBL(callout_block) cb;
-       cb.version          = 1;   /* Version 1 of the callout block */
+       cb.version          = 2;   /* Version 1 of the callout block */
        cb.callout_number   = ecode[1];
        cb.offset_vector    = md->offset_vector;
+ #ifdef COMPILE_PCRE8
        cb.subject          = (PCRE_SPTR)md->start_subject;
-       cb.subject_length   = md->end_subject - md->start_subject;
+ #else
-       cb.start_match      = mstart - md->start_subject;
+       cb.subject          = (PCRE_SPTR16)md->start_subject;
-       cb.current_position = eptr - md->start_subject;
+ #endif
+       cb.subject_length   = (int)(md->end_subject - md->start_subject);
+       cb.start_match      = (int)(mstart - md->start_subject);
+       cb.current_position = (int)(eptr - md->start_subject);
        cb.pattern_position = GET(ecode, 2);
        cb.next_item_length = GET(ecode, 2 + LINK_SIZE);
        cb.capture_top      = offset_top/2;
        cb.capture_last     = md->capture_last;
        cb.callout_data     = md->callout_data;
-       if ((rrc = (*pcre_callout)(&cb)) > 0) RRETURN(MATCH_NOMATCH);
+       cb.mark             = md->nomatch_mark;
+       if ((rrc = (*PUBL(callout))(&cb)) > 0) RRETURN(MATCH_NOMATCH);
        if (rrc < 0) RRETURN(rrc);
        }
      ecode += 2 + 2*LINK_SIZE;
-Line 1222 
 for (;;)
+Line 1665 
 for (;;)
      offset data is the offset to the starting bracket from the start of the
      whole pattern. (This is so that it works from duplicated subpatterns.)
-     If there are any capturing brackets started but not finished, we have to
+     The state of the capturing groups is preserved over recursion, and
-     save their starting points and reinstate them after the recursion. However,
+     re-instated afterwards. We don't know how many are started and not yet
-     we don't know how many such there are (offset_top records the completed
+     finished (offset_top records the completed total) so we just have to save
-     total) so we just have to save all the potential data. There may be up to
+     all the potential data. There may be up to 65535 such values, which is too
-such values, which is too large to put on the stack, but using malloc
+     large to put on the stack, but using malloc for small numbers seems
-     for small numbers seems expensive. As a compromise, the stack is used when
+     expensive. As a compromise, the stack is used when there are no more than
-     there are no more than REC_STACK_SAVE_MAX values to store; otherwise malloc
+     REC_STACK_SAVE_MAX values to store; otherwise malloc is used.
-     is used. A problem is what to do if the malloc fails ... there is no way of
-     returning to the top level with an error. Save the top REC_STACK_SAVE_MAX
-     values on the stack, and accept that the rest may be wrong.
      There are also other values that have to be saved. We use a chained
      sequence of blocks that actually live on the stack. Thanks to Robin Houston
-     for the original version of this logic. */
+     for the original version of this logic. It has, however, been hacked around
+     a lot, so he is not to blame for the current way it works. */
      case OP_RECURSE:
        {
+       recursion_info *ri;
+       int recno;
        callpat = md->start_code + GET(ecode, 1);
-       new_recursive.group_num = (callpat == md->start_code)? 0 :
+       recno = (callpat == md->start_code)? 0 :
          GET2(callpat, 1 + LINK_SIZE);
+       /* Check for repeating a recursion without advancing the subject pointer.
+       This should catch convoluted mutual recursions. (Some simple cases are
+       caught at compile time.) */
+       for (ri = md->recursive; ri != NULL; ri = ri->prevrec)
+         if (recno == ri->group_num && eptr == ri->subject_position)
+           RRETURN(PCRE_ERROR_RECURSELOOP);
        /* Add to "recursing stack" */
+       new_recursive.group_num = recno;
+       new_recursive.subject_position = eptr;
        new_recursive.prevrec = md->recursive;
        md->recursive = &new_recursive;
-       /* Find where to continue from afterwards */
+       /* Where to continue from afterwards */
        ecode += 1 + LINK_SIZE;
-       new_recursive.after_call = ecode;
-       /* Now save the offset data. */
+       /* Now save the offset data */
        new_recursive.saved_max = md->offset_end;
        if (new_recursive.saved_max <= REC_STACK_SAVE_MAX)
-Line 1261 
 for (;;)
+Line 1714 
 for (;;)
        else
          {
          new_recursive.offset_save =
-           (int *)(pcre_malloc)(new_recursive.saved_max * sizeof(int));
+           (int *)(PUBL(malloc))(new_recursive.saved_max * sizeof(int));
          if (new_recursive.offset_save == NULL) RRETURN(PCRE_ERROR_NOMEMORY);
          }
        memcpy(new_recursive.offset_save, md->offset_vector,
              new_recursive.saved_max * sizeof(int));
-       new_recursive.save_start = mstart;
-       new_recursive.save_offset_top = offset_top;
-       mstart = eptr;
-       /* OK, now we can do the recursion. For each top-level alternative we
+       /* OK, now we can do the recursion. After processing each alternative,
-       restore the offset and recursion data. */
+       restore the offset data. If there were nested recursions, md->recursive
+       might be changed, so reset it before looping. */
        DPRINTF(("Recursing into group %d\n", new_recursive.group_num));
-       flags = (*callpat >= OP_SBRA)? match_cbegroup : 0;
+       cbegroup = (*callpat >= OP_SBRA);
        do
          {
-         RMATCH(eptr, callpat + _pcre_OP_lengths[*callpat], offset_top,
+         if (cbegroup) md->match_function_type = MATCH_CBEGROUP;
-           md, ims, eptrb, flags, RM6);
+         RMATCH(eptr, callpat + PRIV(OP_lengths)[*callpat], offset_top,
-         if (rrc == MATCH_MATCH)
+           md, eptrb, RM6);
+         memcpy(md->offset_vector, new_recursive.offset_save,
+             new_recursive.saved_max * sizeof(int));
+         md->recursive = new_recursive.prevrec;
+         if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)
            {
            DPRINTF(("Recursion matched\n"));
-           md->recursive = new_recursive.prevrec;
            if (new_recursive.offset_save != stacksave)
-             (pcre_free)(new_recursive.offset_save);
+             (PUBL(free))(new_recursive.offset_save);
-           RRETURN(MATCH_MATCH);
+           /* Set where we got to in the subject, and reset the start in case
+           it was changed by \K. This *is* propagated back out of a recursion,
+           for Perl compatibility. */
+           eptr = md->end_match_ptr;
+           mstart = md->start_match_ptr;
+           goto RECURSION_MATCHED;        /* Exit loop; end processing */
            }
+         /* PCRE does not allow THEN to escape beyond a recursion; it is treated
+         as NOMATCH. */
          else if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN)
            {
            DPRINTF(("Recursion gave error %d\n", rrc));
            if (new_recursive.offset_save != stacksave)
-             (pcre_free)(new_recursive.offset_save);
+             (PUBL(free))(new_recursive.offset_save);
            RRETURN(rrc);
            }
          md->recursive = &new_recursive;
-         memcpy(md->offset_vector, new_recursive.offset_save,
-             new_recursive.saved_max * sizeof(int));
          callpat += GET(callpat, 1);
          }
        while (*callpat == OP_ALT);
-Line 1306 
 for (;;)
+Line 1768 
 for (;;)
        DPRINTF(("Recursion didn't match\n"));
        md->recursive = new_recursive.prevrec;
        if (new_recursive.offset_save != stacksave)
-         (pcre_free)(new_recursive.offset_save);
+         (PUBL(free))(new_recursive.offset_save);
        RRETURN(MATCH_NOMATCH);
        }
-     /* Control never reaches here */
-     /* "Once" brackets are like assertion brackets except that after a match,
-     the point in the subject string is not moved back. Thus there can never be
-     a move back into the brackets. Friedl calls these "atomic" subpatterns.
-     Check the alternative branches in turn - the matching won't pass the KET
-     for this kind of subpattern. If any one branch matches, we carry on as at
-     the end of a normal bracket, leaving the subject pointer. */
-     case OP_ONCE:
+     RECURSION_MATCHED:
-     prev = ecode;
+     break;
-     saved_eptr = eptr;
-     do
-       {
-       RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, eptrb, 0, RM7);
-       if (rrc == MATCH_MATCH) break;
-       if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
-       ecode += GET(ecode,1);
-       }
-     while (*ecode == OP_ALT);
-     /* If hit the end of the group (which could be repeated), fail */
-     if (*ecode != OP_ONCE && *ecode != OP_ALT) RRETURN(MATCH_NOMATCH);
-     /* Continue as from after the assertion, updating the offsets high water
-     mark, since extracts may have been taken. */
-     do ecode += GET(ecode, 1); while (*ecode == OP_ALT);
-     offset_top = md->end_offset_top;
-     eptr = md->end_match_ptr;
-     /* For a non-repeating ket, just continue at this level. This also
-     happens for a repeating ket if no characters were matched in the group.
-     This is the forcible breaking of infinite loops as implemented in Perl
-.005. If there is an options reset, it will get obeyed in the normal
-     course of events. */
-     if (*ecode == OP_KET || eptr == saved_eptr)
-       {
-       ecode += 1+LINK_SIZE;
-       break;
-       }
-     /* The repeating kets try the rest of the pattern or restart from the
-     preceding bracket, in the appropriate order. The second "call" of match()
-     uses tail recursion, to avoid using another stack frame. We need to reset
-     any options that changed within the bracket before re-running it, so
-     check the next opcode. */
-     if (ecode[1+LINK_SIZE] == OP_OPT)
-       {
-       ims = (ims & ~PCRE_IMS) | ecode[4];
-       DPRINTF(("ims set to %02lx at group repeat\n", ims));
-       }
-     if (*ecode == OP_KETRMIN)
-       {
-       RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, eptrb, 0, RM8);
-       if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-       ecode = prev;
-       flags = 0;
-       goto TAIL_RECURSE;
-       }
-     else  /* OP_KETRMAX */
-       {
-       RMATCH(eptr, prev, offset_top, md, ims, eptrb, match_cbegroup, RM9);
-       if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-       ecode += 1 + LINK_SIZE;
-       flags = 0;
-       goto TAIL_RECURSE;
-       }
-     /* Control never gets here */
      /* An alternation is the end of a branch; scan along to find the end of the
      bracketed group and go to there. */
-Line 1399 
 for (;;)
+Line 1789 
 for (;;)
      optional ones preceded by BRAZERO or BRAMINZERO. */
      case OP_BRAZERO:
-       {
+     next = ecode + 1;
-       next = ecode+1;
+     RMATCH(eptr, next, offset_top, md, eptrb, RM10);
-       RMATCH(eptr, next, offset_top, md, ims, eptrb, 0, RM10);
+     if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-       if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+     do next += GET(next, 1); while (*next == OP_ALT);
-       do next += GET(next,1); while (*next == OP_ALT);
+     ecode = next + 1 + LINK_SIZE;
-       ecode = next + 1 + LINK_SIZE;
-       }
      break;
      case OP_BRAMINZERO:
-       {
+     next = ecode + 1;
-       next = ecode+1;
+     do next += GET(next, 1); while (*next == OP_ALT);
-       do next += GET(next, 1); while (*next == OP_ALT);
+     RMATCH(eptr, next + 1+LINK_SIZE, offset_top, md, eptrb, RM11);
-       RMATCH(eptr, next + 1+LINK_SIZE, offset_top, md, ims, eptrb, 0, RM11);
+     if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-       if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+     ecode++;
-       ecode++;
-       }
      break;
      case OP_SKIPZERO:
-       {
+     next = ecode+1;
-       next = ecode+1;
+     do next += GET(next,1); while (*next == OP_ALT);
-       do next += GET(next,1); while (*next == OP_ALT);
+     ecode = next + 1 + LINK_SIZE;
-       ecode = next + 1 + LINK_SIZE;
-       }
      break;
+     /* BRAPOSZERO occurs before a possessive bracket group. Don't do anything
+     here; just jump to the group, with allow_zero set TRUE. */
+     case OP_BRAPOSZERO:
+     op = *(++ecode);
+     allow_zero = TRUE;
+     if (op == OP_CBRAPOS || op == OP_SCBRAPOS) goto POSSESSIVE_CAPTURE;
+       goto POSSESSIVE_NON_CAPTURE;
      /* End of a group, repeated or non-repeating. */
      case OP_KET:
      case OP_KETRMIN:
      case OP_KETRMAX:
+     case OP_KETRPOS:
      prev = ecode - GET(ecode, 1);
      /* If this was a group that remembered the subject start, in order to break
      infinite repeats of empty string matches, retrieve the subject start from
      the chain. Otherwise, set it NULL. */
-     if (*prev >= OP_SBRA)
+     if (*prev >= OP_SBRA || *prev == OP_ONCE)
        {
        saved_eptr = eptrb->epb_saved_eptr;   /* Value at start of group */
        eptrb = eptrb->epb_prev;              /* Backup to previous group */
        }
      else saved_eptr = NULL;
-     /* If we are at the end of an assertion group, stop matching and return
+     /* If we are at the end of an assertion group or a non-capturing atomic
-     MATCH_MATCH, but record the current high water mark for use by positive
+     group, stop matching and return MATCH_MATCH, but record the current high
-     assertions. Do this also for the "once" (atomic) groups. */
+     water mark for use by positive assertions. We also need to record the match
+     start in case it was changed by \K. */
-     if (*prev == OP_ASSERT || *prev == OP_ASSERT_NOT ||
-         *prev == OP_ASSERTBACK || *prev == OP_ASSERTBACK_NOT ||
+     if ((*prev >= OP_ASSERT && *prev <= OP_ASSERTBACK_NOT) ||
-         *prev == OP_ONCE)
+          *prev == OP_ONCE_NC)
        {
-       md->end_match_ptr = eptr;      /* For ONCE */
+       md->end_match_ptr = eptr;      /* For ONCE_NC */
        md->end_offset_top = offset_top;
-       RRETURN(MATCH_MATCH);
+       md->start_match_ptr = mstart;
+       RRETURN(MATCH_MATCH);         /* Sets md->mark */
        }
      /* For capturing groups we have to check the group number back at the start
      and if necessary complete handling an extraction by setting the offsets and
-     bumping the high water mark. Note that whole-pattern recursion is coded as
+     bumping the high water mark. Whole-pattern recursion is coded as a recurse
-     a recurse into group 0, so it won't be picked up here. Instead, we catch it
+     into group 0, so it won't be picked up here. Instead, we catch it when the
-     when the OP_END is reached. Other recursion is handled here. */
+     OP_END is reached. Other recursion is handled here. We just have to record
+     the current subject position and start match pointer and give a MATCH
+     return. */
-     if (*prev == OP_CBRA || *prev == OP_SCBRA)
+     if (*prev == OP_CBRA || *prev == OP_SCBRA ||
+         *prev == OP_CBRAPOS || *prev == OP_SCBRAPOS)
        {
        number = GET2(prev, 1+LINK_SIZE);
        offset = number << 1;
-Line 1473 
 for (;;)
+Line 1871 
 for (;;)
        printf("\n");
  #endif
+       /* Handle a recursively called group. */
+       if (md->recursive != NULL && md->recursive->group_num == number)
+         {
+         md->end_match_ptr = eptr;
+         md->start_match_ptr = mstart;
+         RRETURN(MATCH_MATCH);
+         }
+       /* Deal with capturing */
        md->capture_last = number;
        if (offset >= md->offset_max) md->offset_overflow = TRUE; else
          {
+         /* If offset is greater than offset_top, it means that we are
+         "skipping" a capturing group, and that group's offsets must be marked
+         unset. In earlier versions of PCRE, all the offsets were unset at the
+         start of matching, but this doesn't work because atomic groups and
+         assertions can cause a value to be set that should later be unset.
+         Example: matching /(?>(a))b|(a)c/ against "ac". This sets group 1 as
+         part of the atomic group, but this is not on the final matching path,
+         so must be unset when 2 is set. (If there is no group 2, there is no
+         problem, because offset_top will then be 2, indicating no capture.) */
+         if (offset > offset_top)
+           {
+           register int *iptr = md->offset_vector + offset_top;
+           register int *iend = md->offset_vector + offset;
+           while (iptr < iend) *iptr++ = -1;
+           }
+         /* Now make the extraction */
          md->offset_vector[offset] =
            md->offset_vector[md->offset_end - number];
-         md->offset_vector[offset+1] = eptr - md->start_subject;
+         md->offset_vector[offset+1] = (int)(eptr - md->start_subject);
          if (offset_top <= offset) offset_top = offset + 2;
          }
+       }
-       /* Handle a recursively called group. Restore the offsets
+     /* For an ordinary non-repeating ket, just continue at this level. This
-       appropriately and continue from after the call. */
+     also happens for a repeating ket if no characters were matched in the
+     group. This is the forcible breaking of infinite loops as implemented in
+     Perl 5.005. For a non-repeating atomic group that includes captures,
+     establish a backup point by processing the rest of the pattern at a lower
+     level. If this results in a NOMATCH return, pass MATCH_ONCE back to the
+     original OP_ONCE level, thereby bypassing intermediate backup points, but
+     resetting any captures that happened along the way. */
-       if (md->recursive != NULL && md->recursive->group_num == number)
+     if (*ecode == OP_KET || eptr == saved_eptr)
+       {
+       if (*prev == OP_ONCE)
          {
-         recursion_info *rec = md->recursive;
+         RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM12);
-         DPRINTF(("Recursion (%d) succeeded - continuing\n", number));
+         if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-         md->recursive = rec->prevrec;
+         md->once_target = prev;  /* Level at which to change to MATCH_NOMATCH */
-         mstart = rec->save_start;
+         RRETURN(MATCH_ONCE);
-         memcpy(md->offset_vector, rec->offset_save,
-           rec->saved_max * sizeof(int));
-         offset_top = rec->save_offset_top;
-         ecode = rec->after_call;
-         ims = original_ims;
-         break;
          }
+       ecode += 1 + LINK_SIZE;    /* Carry on at this level */
+       break;
        }
-     /* For both capturing and non-capturing groups, reset the value of the ims
+     /* OP_KETRPOS is a possessive repeating ket. Remember the current position,
-     flags, in case they got changed during the group. */
+     and return the MATCH_KETRPOS. This makes it possible to do the repeats one
+     at a time from the outer level, thus saving stack. */
-     ims = original_ims;
-     DPRINTF(("ims reset to %02lx\n", ims));
-     /* For a non-repeating ket, just continue at this level. This also
-     happens for a repeating ket if no characters were matched in the group.
-     This is the forcible breaking of infinite loops as implemented in Perl
-.005. If there is an options reset, it will get obeyed in the normal
-     course of events. */
-     if (*ecode == OP_KET || eptr == saved_eptr)
+     if (*ecode == OP_KETRPOS)
        {
-       ecode += 1 + LINK_SIZE;
+       md->end_match_ptr = eptr;
-       break;
+       md->end_offset_top = offset_top;
+       RRETURN(MATCH_KETRPOS);
        }
-     /* The repeating kets try the rest of the pattern or restart from the
+     /* The normal repeating kets try the rest of the pattern or restart from
-     preceding bracket, in the appropriate order. In the second case, we can use
+     the preceding bracket, in the appropriate order. In the second case, we can
-     tail recursion to avoid using another stack frame, unless we have an
+     use tail recursion to avoid using another stack frame, unless we have an
-     unlimited repeat of a group that can match an empty string. */
+     an atomic group or an unlimited repeat of a group that can match an empty
+     string. */
-     flags = (*prev >= OP_SBRA)? match_cbegroup : 0;
      if (*ecode == OP_KETRMIN)
        {
-       RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, eptrb, 0, RM12);
+       RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM7);
        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-       if (flags != 0)    /* Could match an empty string */
+       if (*prev == OP_ONCE)
          {
-         RMATCH(eptr, prev, offset_top, md, ims, eptrb, flags, RM50);
+         RMATCH(eptr, prev, offset_top, md, eptrb, RM8);
+         if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+         md->once_target = prev;  /* Level at which to change to MATCH_NOMATCH */
+         RRETURN(MATCH_ONCE);
+         }
+       if (*prev >= OP_SBRA)    /* Could match an empty string */
+         {
+         md->match_function_type = MATCH_CBEGROUP;
+         RMATCH(eptr, prev, offset_top, md, eptrb, RM50);
          RRETURN(rrc);
          }
        ecode = prev;
-Line 1539 
 for (;;)
+Line 1972 
 for (;;)
        }
      else  /* OP_KETRMAX */
        {
-       RMATCH(eptr, prev, offset_top, md, ims, eptrb, flags, RM13);
+       if (*prev >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
+       RMATCH(eptr, prev, offset_top, md, eptrb, RM13);
+       if (rrc == MATCH_ONCE && md->once_target == prev) rrc = MATCH_NOMATCH;
        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+       if (*prev == OP_ONCE)
+         {
+         RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM9);
+         if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+         md->once_target = prev;
+         RRETURN(MATCH_ONCE);
+         }
        ecode += 1 + LINK_SIZE;
-       flags = 0;
        goto TAIL_RECURSE;
        }
      /* Control never gets here */
-     /* Start of subject unless notbol, or after internal newline if multiline */
+     /* Not multiline mode: start of subject assertion, unless notbol. */
      case OP_CIRC:
      if (md->notbol && eptr == md->start_subject) RRETURN(MATCH_NOMATCH);
-     if ((ims & PCRE_MULTILINE) != 0)
-       {
-       if (eptr != md->start_subject &&
-           (eptr == md->end_subject || !WAS_NEWLINE(eptr)))
-         RRETURN(MATCH_NOMATCH);
-       ecode++;
-       break;
-       }
-     /* ... else fall through */
      /* Start of subject assertion */
-Line 1568 
 for (;;)
+Line 2000 
 for (;;)
      ecode++;
      break;
+     /* Multiline mode: start of subject unless notbol, or after any newline. */
+     case OP_CIRCM:
+     if (md->notbol && eptr == md->start_subject) RRETURN(MATCH_NOMATCH);
+     if (eptr != md->start_subject &&
+         (eptr == md->end_subject || !WAS_NEWLINE(eptr)))
+       RRETURN(MATCH_NOMATCH);
+     ecode++;
+     break;
      /* Start of match assertion */
      case OP_SOM:
-Line 1582 
 for (;;)
+Line 2024 
 for (;;)
      ecode++;
      break;
-     /* Assert before internal newline if multiline, or before a terminating
+     /* Multiline mode: assert before any newline, or before end of subject
-     newline unless endonly is set, else end of subject unless noteol is set. */
+     unless noteol is set. */
-     case OP_DOLL:
+     case OP_DOLLM:
-     if ((ims & PCRE_MULTILINE) != 0)
+     if (eptr < md->end_subject)
-       {
+       { if (!IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH); }
-       if (eptr < md->end_subject)
-         { if (!IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH); }
-       else
-         { if (md->noteol) RRETURN(MATCH_NOMATCH); }
-       ecode++;
-       break;
-       }
      else
        {
        if (md->noteol) RRETURN(MATCH_NOMATCH);
-       if (!md->endonly)
+       SCHECK_PARTIAL();
-         {
-         if (eptr != md->end_subject &&
-             (!IS_NEWLINE(eptr) || eptr != md->end_subject - md->nllen))
-           RRETURN(MATCH_NOMATCH);
-         ecode++;
-         break;
-         }
        }
+     ecode++;
+     break;
+     /* Not multiline mode: assert before a terminating newline or before end of
+     subject unless noteol is set. */
+     case OP_DOLL:
+     if (md->noteol) RRETURN(MATCH_NOMATCH);
+     if (!md->endonly) goto ASSERT_NL_OR_EOS;
      /* ... else fall through for endonly */
      /* End of subject assertion (\z) */
      case OP_EOD:
      if (eptr < md->end_subject) RRETURN(MATCH_NOMATCH);
+     SCHECK_PARTIAL();
      ecode++;
      break;
      /* End of subject or ending \n assertion (\Z) */
      case OP_EODN:
-     if (eptr != md->end_subject &&
+     ASSERT_NL_OR_EOS:
+     if (eptr < md->end_subject &&
          (!IS_NEWLINE(eptr) || eptr != md->end_subject - md->nllen))
        RRETURN(MATCH_NOMATCH);
+     /* Either at end of string or \n before end. */
+     SCHECK_PARTIAL();
      ecode++;
      break;
-Line 1636 
 for (;;)
+Line 2080 
 for (;;)
        be "non-word" characters. Remember the earliest consulted character for
        partial matching. */
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-       if (utf8)
+       if (utf)
          {
+         /* Get status of previous character */
          if (eptr == md->start_subject) prev_is_word = FALSE; else
            {
-           USPTR lastptr = eptr - 1;
+           PCRE_PUCHAR lastptr = eptr - 1;
-           while((*lastptr & 0xc0) == 0x80) lastptr--;
+           BACKCHAR(lastptr);
            if (lastptr < md->start_used_ptr) md->start_used_ptr = lastptr;
            GETCHAR(c, lastptr);
+ #ifdef SUPPORT_UCP
+           if (md->use_ucp)
+             {
+             if (c == '_') prev_is_word = TRUE; else
+               {
+               int cat = UCD_CATEGORY(c);
+               prev_is_word = (cat == ucp_L || cat == ucp_N);
+               }
+             }
+           else
+ #endif
            prev_is_word = c < 256 && (md->ctypes[c] & ctype_word) != 0;
            }
+         /* Get status of next character */
          if (eptr >= md->end_subject)
            {
            SCHECK_PARTIAL();
-Line 1655 
 for (;;)
+Line 2115 
 for (;;)
          else
            {
            GETCHAR(c, eptr);
+ #ifdef SUPPORT_UCP
+           if (md->use_ucp)
+             {
+             if (c == '_') cur_is_word = TRUE; else
+               {
+               int cat = UCD_CATEGORY(c);
+               cur_is_word = (cat == ucp_L || cat == ucp_N);
+               }
+             }
+           else
+ #endif
            cur_is_word = c < 256 && (md->ctypes[c] & ctype_word) != 0;
            }
          }
        else
  #endif
-       /* Not in UTF-8 mode */
+       /* Not in UTF-8 mode, but we may still have PCRE_UCP set, and for
+       consistency with the behaviour of \w we do use it in this case. */
          {
+         /* Get status of previous character */
          if (eptr == md->start_subject) prev_is_word = FALSE; else
            {
            if (eptr <= md->start_used_ptr) md->start_used_ptr = eptr - 1;
-           prev_is_word = ((md->ctypes[eptr[-1]] & ctype_word) != 0);
+ #ifdef SUPPORT_UCP
+           if (md->use_ucp)
+             {
+             c = eptr[-1];
+             if (c == '_') prev_is_word = TRUE; else
+               {
+               int cat = UCD_CATEGORY(c);
+               prev_is_word = (cat == ucp_L || cat == ucp_N);
+               }
+             }
+           else
+ #endif
+           prev_is_word = MAX_255(eptr[-1])
+             && ((md->ctypes[eptr[-1]] & ctype_word) != 0);
            }
+         /* Get status of next character */
          if (eptr >= md->end_subject)
            {
            SCHECK_PARTIAL();
            cur_is_word = FALSE;
            }
-         else cur_is_word = ((md->ctypes[*eptr] & ctype_word) != 0);
+         else
+ #ifdef SUPPORT_UCP
+         if (md->use_ucp)
+           {
+           c = *eptr;
+           if (c == '_') cur_is_word = TRUE; else
+             {
+             int cat = UCD_CATEGORY(c);
+             cur_is_word = (cat == ucp_L || cat == ucp_N);
+             }
+           }
+         else
+ #endif
+         cur_is_word = MAX_255(*eptr)
+           && ((md->ctypes[*eptr] & ctype_word) != 0);
          }
        /* Now see if the situation is what we want */
-Line 1692 
 for (;;)
+Line 2196 
 for (;;)
      /* Fall through */
      case OP_ALLANY:
-     if (eptr++ >= md->end_subject)
+     if (eptr >= md->end_subject)   /* DO NOT merge the eptr++ here; it must */
-       {
+       {                            /* not be updated before SCHECK_PARTIAL. */
        SCHECK_PARTIAL();
        RRETURN(MATCH_NOMATCH);
        }
-     if (utf8) while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
+     eptr++;
+ #ifdef SUPPORT_UTF
+     if (utf) ACROSSCHAR(eptr < md->end_subject, *eptr, eptr++);
+ #endif
      ecode++;
      break;
-Line 1705 
 for (;;)
+Line 2212 
 for (;;)
      any byte, even newline, independent of the setting of PCRE_DOTALL. */
      case OP_ANYBYTE:
-     if (eptr++ >= md->end_subject)
+     if (eptr >= md->end_subject)   /* DO NOT merge the eptr++ here; it must */
-       {
+       {                            /* not be updated before SCHECK_PARTIAL. */
        SCHECK_PARTIAL();
        RRETURN(MATCH_NOMATCH);
        }
+     eptr++;
      ecode++;
      break;
-Line 1721 
 for (;;)
+Line 2229 
 for (;;)
        }
      GETCHARINCTEST(c, eptr);
      if (
- #ifdef SUPPORT_UTF8
+ #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
         c < 256 &&
  #endif
         (md->ctypes[c] & ctype_digit) != 0
-Line 1738 
 for (;;)
+Line 2246 
 for (;;)
        }
      GETCHARINCTEST(c, eptr);
      if (
- #ifdef SUPPORT_UTF8
+ #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
-        c >= 256 ||
+        c > 255 ||
  #endif
         (md->ctypes[c] & ctype_digit) == 0
         )
-Line 1755 
 for (;;)
+Line 2263 
 for (;;)
        }
      GETCHARINCTEST(c, eptr);
      if (
- #ifdef SUPPORT_UTF8
+ #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
         c < 256 &&
  #endif
         (md->ctypes[c] & ctype_space) != 0
-Line 1772 
 for (;;)
+Line 2280 
 for (;;)
        }
      GETCHARINCTEST(c, eptr);
      if (
- #ifdef SUPPORT_UTF8
+ #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
-        c >= 256 ||
+        c > 255 ||
  #endif
         (md->ctypes[c] & ctype_space) == 0
         )
-Line 1789 
 for (;;)
+Line 2297 
 for (;;)
        }
      GETCHARINCTEST(c, eptr);
      if (
- #ifdef SUPPORT_UTF8
+ #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
         c < 256 &&
  #endif
         (md->ctypes[c] & ctype_word) != 0
-Line 1806 
 for (;;)
+Line 2314 
 for (;;)
        }
      GETCHARINCTEST(c, eptr);
      if (
- #ifdef SUPPORT_UTF8
+ #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
-        c >= 256 ||
+        c > 255 ||
  #endif
         (md->ctypes[c] & ctype_word) == 0
         )
-Line 1825 
 for (;;)
+Line 2333 
 for (;;)
      switch(c)
        {
        default: RRETURN(MATCH_NOMATCH);
        case 0x000d:
        if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
        break;
-Line 1981 
 for (;;)
+Line 2490 
 for (;;)
               prop->chartype == ucp_Ll ||
               prop->chartype == ucp_Lt) == (op == OP_NOTPROP))
            RRETURN(MATCH_NOMATCH);
-          break;
+         break;
          case PT_GC:
-         if ((ecode[2] != _pcre_ucp_gentype[prop->chartype]) == (op == OP_PROP))
+         if ((ecode[2] != PRIV(ucp_gentype)[prop->chartype]) == (op == OP_PROP))
            RRETURN(MATCH_NOMATCH);
          break;
-Line 1998 
 for (;;)
+Line 2507 
 for (;;)
            RRETURN(MATCH_NOMATCH);
          break;
+         /* These are specials */
+         case PT_ALNUM:
+         if ((PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
+              PRIV(ucp_gentype)[prop->chartype] == ucp_N) == (op == OP_NOTPROP))
+           RRETURN(MATCH_NOMATCH);
+         break;
+         case PT_SPACE:    /* Perl space */
+         if ((PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
+              c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR)
+                == (op == OP_NOTPROP))
+           RRETURN(MATCH_NOMATCH);
+         break;
+         case PT_PXSPACE:  /* POSIX space */
+         if ((PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
+              c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||
+              c == CHAR_FF || c == CHAR_CR)
+                == (op == OP_NOTPROP))
+           RRETURN(MATCH_NOMATCH);
+         break;
+         case PT_WORD:
+         if ((PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
+              PRIV(ucp_gentype)[prop->chartype] == ucp_N ||
+              c == CHAR_UNDERSCORE) == (op == OP_NOTPROP))
+           RRETURN(MATCH_NOMATCH);
+         break;
+         /* This should never occur */
          default:
          RRETURN(PCRE_ERROR_INTERNAL);
          }
-Line 2016 
 for (;;)
+Line 2557 
 for (;;)
        RRETURN(MATCH_NOMATCH);
        }
      GETCHARINCTEST(c, eptr);
+     if (UCD_CATEGORY(c) == ucp_M) RRETURN(MATCH_NOMATCH);
+     while (eptr < md->end_subject)
        {
-       int category = UCD_CATEGORY(c);
+       int len = 1;
-       if (category == ucp_M) RRETURN(MATCH_NOMATCH);
+       if (!utf) c = *eptr; else { GETCHARLEN(c, eptr, len); }
-       while (eptr < md->end_subject)
+       if (UCD_CATEGORY(c) != ucp_M) break;
-         {
+       eptr += len;
-         int len = 1;
-         if (!utf8) c = *eptr; else
-           {
-           GETCHARLEN(c, eptr, len);
-           }
-         category = UCD_CATEGORY(c);
-         if (category != ucp_M) break;
-         eptr += len;
-         }
        }
      ecode++;
      break;
-Line 2045 
 for (;;)
+Line 2579 
 for (;;)
      loops). */
      case OP_REF:
-       {
+     case OP_REFI:
-       offset = GET2(ecode, 1) << 1;               /* Doubled ref number */
+     caseless = op == OP_REFI;
-       ecode += 3;
+     offset = GET2(ecode, 1) << 1;               /* Doubled ref number */
+     ecode += 1 + IMM2_SIZE;
-       /* If the reference is unset, there are two possibilities:
+     /* If the reference is unset, there are two possibilities:
-       (a) In the default, Perl-compatible state, set the length to be longer
+     (a) In the default, Perl-compatible state, set the length negative;
-       than the amount of subject left; this ensures that every attempt at a
+     this ensures that every attempt at a match fails. We can't just fail
-       match fails. We can't just fail here, because of the possibility of
+     here, because of the possibility of quantifiers with zero minima.
-       quantifiers with zero minima.
-       (b) If the JavaScript compatibility flag is set, set the length to zero
+     (b) If the JavaScript compatibility flag is set, set the length to zero
-       so that the back reference matches an empty string.
+     so that the back reference matches an empty string.
-       Otherwise, set the length to the length of what was matched by the
+     Otherwise, set the length to the length of what was matched by the
-       referenced subpattern. */
+     referenced subpattern. */
-       if (offset >= offset_top || md->offset_vector[offset] < 0)
+     if (offset >= offset_top || md->offset_vector[offset] < 0)
-         length = (md->jscript_compat)? 0 : md->end_subject - eptr + 1;
+       length = (md->jscript_compat)? 0 : -1;
-       else
+     else
-         length = md->offset_vector[offset+1] - md->offset_vector[offset];
+       length = md->offset_vector[offset+1] - md->offset_vector[offset];
-       /* Set up for repetition, or handle the non-repeated case */
+     /* Set up for repetition, or handle the non-repeated case */
-       switch (*ecode)
+     switch (*ecode)
-         {
+       {
-         case OP_CRSTAR:
+       case OP_CRSTAR:
-         case OP_CRMINSTAR:
+       case OP_CRMINSTAR:
-         case OP_CRPLUS:
+       case OP_CRPLUS:
-         case OP_CRMINPLUS:
+       case OP_CRMINPLUS:
-         case OP_CRQUERY:
+       case OP_CRQUERY:
-         case OP_CRMINQUERY:
+       case OP_CRMINQUERY:
-         c = *ecode++ - OP_CRSTAR;
+       c = *ecode++ - OP_CRSTAR;
-         minimize = (c & 1) != 0;
+       minimize = (c & 1) != 0;
-         min = rep_min[c];                 /* Pick up values from tables; */
+       min = rep_min[c];                 /* Pick up values from tables; */
-         max = rep_max[c];                 /* zero for max => infinity */
+       max = rep_max[c];                 /* zero for max => infinity */
-         if (max == 0) max = INT_MAX;
+       if (max == 0) max = INT_MAX;
-         break;
+       break;
-         case OP_CRRANGE:
+       case OP_CRRANGE:
-         case OP_CRMINRANGE:
+       case OP_CRMINRANGE:
-         minimize = (*ecode == OP_CRMINRANGE);
+       minimize = (*ecode == OP_CRMINRANGE);
-         min = GET2(ecode, 1);
+       min = GET2(ecode, 1);
-         max = GET2(ecode, 3);
+       max = GET2(ecode, 1 + IMM2_SIZE);
-         if (max == 0) max = INT_MAX;
+       if (max == 0) max = INT_MAX;
-         ecode += 5;
+       ecode += 1 + 2 * IMM2_SIZE;
-         break;
+       break;
-         default:               /* No repeat follows */
+       default:               /* No repeat follows */
-         if (!match_ref(offset, eptr, length, md, ims))
+       if ((length = match_ref(offset, eptr, length, md, caseless)) < 0)
-           {
+         {
-           CHECK_PARTIAL();
+         CHECK_PARTIAL();
-           RRETURN(MATCH_NOMATCH);
+         RRETURN(MATCH_NOMATCH);
-           }
-         eptr += length;
-         continue;              /* With the main loop */
          }
+       eptr += length;
+       continue;              /* With the main loop */
+       }
-       /* If the length of the reference is zero, just continue with the
+     /* Handle repeated back references. If the length of the reference is
-       main loop. */
+     zero, just continue with the main loop. If the length is negative, it
+     means the reference is unset in non-Java-compatible mode. If the minimum is
+     zero, we can continue at the same level without recursion. For any other
+     minimum, carrying on will result in NOMATCH. */
-       if (length == 0) continue;
+     if (length == 0) continue;
+     if (length < 0 && min == 0) continue;
-       /* First, ensure the minimum number of matches are present. We get back
+     /* First, ensure the minimum number of matches are present. We get back
-       the length of the reference string explicitly rather than passing the
+     the length of the reference string explicitly rather than passing the
-       address of eptr, so that eptr can be a register variable. */
+     address of eptr, so that eptr can be a register variable. */
-       for (i = 1; i <= min; i++)
+     for (i = 1; i <= min; i++)
+       {
+       int slength;
+       if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
          {
-         if (!match_ref(offset, eptr, length, md, ims))
+         CHECK_PARTIAL();
-           {
+         RRETURN(MATCH_NOMATCH);
-           CHECK_PARTIAL();
-           RRETURN(MATCH_NOMATCH);
-           }
-         eptr += length;
          }
+       eptr += slength;
+       }
-       /* If min = max, continue at the same level without recursion.
+     /* If min = max, continue at the same level without recursion.
-       They are not both allowed to be zero. */
+     They are not both allowed to be zero. */
-       if (min == max) continue;
+     if (min == max) continue;
-       /* If minimizing, keep trying and advancing the pointer */
+     /* If minimizing, keep trying and advancing the pointer */
-       if (minimize)
+     if (minimize)
+       {
+       for (fi = min;; fi++)
          {
-         for (fi = min;; fi++)
+         int slength;
+         RMATCH(eptr, ecode, offset_top, md, eptrb, RM14);
+         if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+         if (fi >= max) RRETURN(MATCH_NOMATCH);
+         if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
            {
-           RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM14);
+           CHECK_PARTIAL();
-           if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+           RRETURN(MATCH_NOMATCH);
-           if (fi >= max) RRETURN(MATCH_NOMATCH);
-           if (!match_ref(offset, eptr, length, md, ims))
-             {
-             CHECK_PARTIAL();
-             RRETURN(MATCH_NOMATCH);
-             }
-           eptr += length;
            }
-         /* Control never gets here */
+         eptr += slength;
          }
+       /* Control never gets here */
+       }
-       /* If maximizing, find the longest string and work backwards */
+     /* If maximizing, find the longest string and work backwards */
-       else
+     else
+       {
+       pp = eptr;
+       for (i = min; i < max; i++)
          {
-         pp = eptr;
+         int slength;
-         for (i = min; i < max; i++)
+         if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
-           {
-           if (!match_ref(offset, eptr, length, md, ims))
-             {
-             CHECK_PARTIAL();
-             break;
-             }
-           eptr += length;
-           }
-         while (eptr >= pp)
            {
-           RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM15);
+           CHECK_PARTIAL();
-           if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+           break;
-           eptr -= length;
            }
-         RRETURN(MATCH_NOMATCH);
+         eptr += slength;
          }
+       while (eptr >= pp)
+         {
+         RMATCH(eptr, ecode, offset_top, md, eptrb, RM15);
+         if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+         eptr -= length;
+         }
+       RRETURN(MATCH_NOMATCH);
        }
      /* Control never gets here */
-Line 2185 
 for (;;)
+Line 2725 
 for (;;)
      case OP_NCLASS:
      case OP_CLASS:
        {
+       /* The data variable is saved across frames, so the byte map needs to
+       be stored there. */
+ #define BYTE_MAP ((pcre_uint8 *)data)
        data = ecode + 1;                /* Save for matching */
-       ecode += 33;                     /* Advance past the item */
+       ecode += 1 + (32 / sizeof(pcre_uchar)); /* Advance past the item */
        switch (*ecode)
          {
-Line 2207 
 for (;;)
+Line 2750 
 for (;;)
          case OP_CRMINRANGE:
          minimize = (*ecode == OP_CRMINRANGE);
          min = GET2(ecode, 1);
-         max = GET2(ecode, 3);
+         max = GET2(ecode, 1 + IMM2_SIZE);
          if (max == 0) max = INT_MAX;
-         ecode += 5;
+         ecode += 1 + 2 * IMM2_SIZE;
          break;
          default:               /* No repeat follows */
-Line 2219 
 for (;;)
+Line 2762 
 for (;;)
        /* First, ensure the minimum number of matches are present. */
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-       /* UTF-8 mode */
+       if (utf)
-       if (utf8)
          {
          for (i = 1; i <= min; i++)
            {
-Line 2236 
 for (;;)
+Line 2778 
 for (;;)
              if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
              }
            else
-             {
+             if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
-             if ((data[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
-             }
            }
          }
        else
  #endif
-       /* Not UTF-8 mode */
+       /* Not UTF mode */
          {
          for (i = 1; i <= min; i++)
            {
-Line 2253 
 for (;;)
+Line 2793 
 for (;;)
              RRETURN(MATCH_NOMATCH);
              }
            c = *eptr++;
-           if ((data[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
+ #ifndef COMPILE_PCRE8
+           if (c > 255)
+             {
+             if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
+             }
+           else
+ #endif
+             if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
            }
          }
-Line 2267 
 for (;;)
+Line 2814 
 for (;;)
        if (minimize)
          {
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-         /* UTF-8 mode */
+         if (utf)
-         if (utf8)
            {
            for (fi = min;; fi++)
              {
-             RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM16);
+             RMATCH(eptr, ecode, offset_top, md, eptrb, RM16);
              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
              if (fi >= max) RRETURN(MATCH_NOMATCH);
              if (eptr >= md->end_subject)
-Line 2287 
 for (;;)
+Line 2833 
 for (;;)
                if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
                }
              else
-               {
+               if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
-               if ((data[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
-               }
              }
            }
          else
  #endif
-         /* Not UTF-8 mode */
+         /* Not UTF mode */
            {
            for (fi = min;; fi++)
              {
-             RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM17);
+             RMATCH(eptr, ecode, offset_top, md, eptrb, RM17);
              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
              if (fi >= max) RRETURN(MATCH_NOMATCH);
              if (eptr >= md->end_subject)
-Line 2307 
 for (;;)
+Line 2851 
 for (;;)
                RRETURN(MATCH_NOMATCH);
                }
              c = *eptr++;
-             if ((data[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
+ #ifndef COMPILE_PCRE8
+             if (c > 255)
+               {
+               if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
+               }
+             else
+ #endif
+               if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
              }
            }
          /* Control never gets here */
-Line 2319 
 for (;;)
+Line 2870 
 for (;;)
          {
          pp = eptr;
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-         /* UTF-8 mode */
+         if (utf)
-         if (utf8)
            {
            for (i = min; i < max; i++)
              {
-Line 2337 
 for (;;)
+Line 2887 
 for (;;)
                if (op == OP_CLASS) break;
                }
              else
-               {
+               if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) break;
-               if ((data[c/8] & (1 << (c&7))) == 0) break;
-               }
              eptr += len;
              }
            for (;;)
              {
-             RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM18);
+             RMATCH(eptr, ecode, offset_top, md, eptrb, RM18);
              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
              if (eptr-- == pp) break;        /* Stop if tried at original pos */
              BACKCHAR(eptr);
-Line 2352 
 for (;;)
+Line 2900 
 for (;;)
            }
          else
  #endif
-           /* Not UTF-8 mode */
+           /* Not UTF mode */
            {
            for (i = min; i < max; i++)
              {
-Line 2362 
 for (;;)
+Line 2910 
 for (;;)
                break;
                }
              c = *eptr;
-             if ((data[c/8] & (1 << (c&7))) == 0) break;
+ #ifndef COMPILE_PCRE8
+             if (c > 255)
+               {
+               if (op == OP_CLASS) break;
+               }
+             else
+ #endif
+               if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) break;
              eptr++;
              }
            while (eptr >= pp)
              {
-             RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM19);
+             RMATCH(eptr, ecode, offset_top, md, eptrb, RM19);
              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
              eptr--;
              }
-Line 2375 
 for (;;)
+Line 2930 
 for (;;)
          RRETURN(MATCH_NOMATCH);
          }
+ #undef BYTE_MAP
        }
      /* Control never gets here */
-Line 2383 
 for (;;)
+Line 2939 
 for (;;)
      when UTF-8 mode mode is supported. Nevertheless, we may not be in UTF-8
      mode, because Unicode properties are supported in non-UTF-8 mode. */
- #ifdef SUPPORT_UTF8
+ #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
      case OP_XCLASS:
        {
        data = ecode + 1 + LINK_SIZE;                /* Save for matching */
-Line 2408 
 for (;;)
+Line 2964 
 for (;;)
          case OP_CRMINRANGE:
          minimize = (*ecode == OP_CRMINRANGE);
          min = GET2(ecode, 1);
-         max = GET2(ecode, 3);
+         max = GET2(ecode, 1 + IMM2_SIZE);
          if (max == 0) max = INT_MAX;
-         ecode += 5;
+         ecode += 1 + 2 * IMM2_SIZE;
          break;
          default:               /* No repeat follows */
-Line 2428 
 for (;;)
+Line 2984 
 for (;;)
            RRETURN(MATCH_NOMATCH);
            }
          GETCHARINCTEST(c, eptr);
-         if (!_pcre_xclass(c, data)) RRETURN(MATCH_NOMATCH);
+         if (!PRIV(xclass)(c, data, utf)) RRETURN(MATCH_NOMATCH);
          }
        /* If max == min we can continue with the main loop without the
-Line 2443 
 for (;;)
+Line 2999 
 for (;;)
          {
          for (fi = min;; fi++)
            {
-           RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM20);
+           RMATCH(eptr, ecode, offset_top, md, eptrb, RM20);
            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
            if (fi >= max) RRETURN(MATCH_NOMATCH);
            if (eptr >= md->end_subject)
-Line 2452 
 for (;;)
+Line 3008 
 for (;;)
              RRETURN(MATCH_NOMATCH);
              }
            GETCHARINCTEST(c, eptr);
-           if (!_pcre_xclass(c, data)) RRETURN(MATCH_NOMATCH);
+           if (!PRIV(xclass)(c, data, utf)) RRETURN(MATCH_NOMATCH);
            }
          /* Control never gets here */
          }
-Line 2470 
 for (;;)
+Line 3026 
 for (;;)
              SCHECK_PARTIAL();
              break;
              }
+ #ifdef SUPPORT_UTF
            GETCHARLENTEST(c, eptr, len);
-           if (!_pcre_xclass(c, data)) break;
+ #else
+           c = *eptr;
+ #endif
+           if (!PRIV(xclass)(c, data, utf)) break;
            eptr += len;
            }
          for(;;)
            {
-           RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM21);
+           RMATCH(eptr, ecode, offset_top, md, eptrb, RM21);
            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
            if (eptr-- == pp) break;        /* Stop if tried at original pos */
-           if (utf8) BACKCHAR(eptr);
+ #ifdef SUPPORT_UTF
+           if (utf) BACKCHAR(eptr);
+ #endif
            }
          RRETURN(MATCH_NOMATCH);
          }
-Line 2491 
 for (;;)
+Line 3053 
 for (;;)
      /* Match a single character, casefully */
      case OP_CHAR:
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-     if (utf8)
+     if (utf)
        {
        length = 1;
        ecode++;
-Line 2506 
 for (;;)
+Line 3068 
 for (;;)
        }
      else
  #endif
+     /* Not UTF mode */
-     /* Non-UTF-8 mode */
        {
        if (md->end_subject - eptr < 1)
          {
-Line 2519 
 for (;;)
+Line 3080 
 for (;;)
        }
      break;
-     /* Match a single character, caselessly */
+     /* Match a single character, caselessly. If we are at the end of the
+     subject, give up immediately. */
+     case OP_CHARI:
+     if (eptr >= md->end_subject)
+       {
+       SCHECK_PARTIAL();
+       RRETURN(MATCH_NOMATCH);
+       }
-     case OP_CHARNC:
+ #ifdef SUPPORT_UTF
- #ifdef SUPPORT_UTF8
+     if (utf)
-     if (utf8)
        {
        length = 1;
        ecode++;
        GETCHARLEN(fc, ecode, length);
-       if (length > md->end_subject - eptr)
-         {
-         CHECK_PARTIAL();             /* Not SCHECK_PARTIAL() */
-         RRETURN(MATCH_NOMATCH);
-         }
        /* If the pattern character's value is < 128, we have only one byte, and
-       can use the fast lookup table. */
+       we know that its other case must also be one byte long, so we can use the
+       fast lookup table. We know that there is at least one byte left in the
+       subject. */
        if (fc < 128)
          {
-         if (md->lcc[*ecode++] != md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH);
+         if (md->lcc[fc]
+             != TABLE_GET(*eptr, md->lcc, *eptr)) RRETURN(MATCH_NOMATCH);
+         ecode++;
+         eptr++;
          }
-       /* Otherwise we must pick up the subject character */
+       /* Otherwise we must pick up the subject character. Note that we cannot
+       use the value of "length" to check for sufficient bytes left, because the
+       other case of the character may have more or fewer bytes.  */
        else
          {
-Line 2564 
 for (;;)
+Line 3133 
 for (;;)
          }
        }
      else
- #endif   /* SUPPORT_UTF8 */
+ #endif   /* SUPPORT_UTF */
-     /* Non-UTF-8 mode */
+     /* Not UTF mode */
        {
-       if (md->end_subject - eptr < 1)
+       if (TABLE_GET(ecode[1], md->lcc, ecode[1])
-         {
+           != TABLE_GET(*eptr, md->lcc, *eptr)) RRETURN(MATCH_NOMATCH);
-         SCHECK_PARTIAL();            /* This one can use SCHECK_PARTIAL() */
+       eptr++;
-         RRETURN(MATCH_NOMATCH);
-         }
-       if (md->lcc[ecode[1]] != md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH);
        ecode += 2;
        }
      break;
-Line 2581 
 for (;;)
+Line 3147 
 for (;;)
      /* Match a single character repeatedly. */
      case OP_EXACT:
+     case OP_EXACTI:
      min = max = GET2(ecode, 1);
-     ecode += 3;
+     ecode += 1 + IMM2_SIZE;
      goto REPEATCHAR;
      case OP_POSUPTO:
+     case OP_POSUPTOI:
      possessive = TRUE;
      /* Fall through */
      case OP_UPTO:
+     case OP_UPTOI:
      case OP_MINUPTO:
+     case OP_MINUPTOI:
      min = 0;
      max = GET2(ecode, 1);
-     minimize = *ecode == OP_MINUPTO;
+     minimize = *ecode == OP_MINUPTO || *ecode == OP_MINUPTOI;
-     ecode += 3;
+     ecode += 1 + IMM2_SIZE;
      goto REPEATCHAR;
      case OP_POSSTAR:
+     case OP_POSSTARI:
      possessive = TRUE;
      min = 0;
      max = INT_MAX;
-Line 2605 
 for (;;)
+Line 3176 
 for (;;)
      goto REPEATCHAR;
      case OP_POSPLUS:
+     case OP_POSPLUSI:
      possessive = TRUE;
      min = 1;
      max = INT_MAX;
-Line 2612 
 for (;;)
+Line 3184 
 for (;;)
      goto REPEATCHAR;
      case OP_POSQUERY:
+     case OP_POSQUERYI:
      possessive = TRUE;
      min = 0;
      max = 1;
-Line 2619 
 for (;;)
+Line 3192 
 for (;;)
      goto REPEATCHAR;
      case OP_STAR:
+     case OP_STARI:
      case OP_MINSTAR:
+     case OP_MINSTARI:
      case OP_PLUS:
+     case OP_PLUSI:
      case OP_MINPLUS:
+     case OP_MINPLUSI:
      case OP_QUERY:
+     case OP_QUERYI:
      case OP_MINQUERY:
-     c = *ecode++ - OP_STAR;
+     case OP_MINQUERYI:
+     c = *ecode++ - ((op < OP_STARI)? OP_STAR : OP_STARI);
      minimize = (c & 1) != 0;
      min = rep_min[c];                 /* Pick up values from tables; */
      max = rep_max[c];                 /* zero for max => infinity */
      if (max == 0) max = INT_MAX;
-Line 2634 
 for (;;)
+Line 3212 
 for (;;)
      /* Common code for all repeated single-character matches. */
      REPEATCHAR:
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-     if (utf8)
+     if (utf)
        {
        length = 1;
        charptr = ecode;
-Line 2649 
 for (;;)
+Line 3227 
 for (;;)
          {
  #ifdef SUPPORT_UCP
          unsigned int othercase;
-         if ((ims & PCRE_CASELESS) != 0 &&
+         if (op >= OP_STARI &&     /* Caseless */
              (othercase = UCD_OTHERCASE(fc)) != fc)
-           oclength = _pcre_ord2utf8(othercase, occhars);
+           oclength = PRIV(ord2utf)(othercase, occhars);
          else oclength = 0;
  #endif  /* SUPPORT_UCP */
          for (i = 1; i <= min; i++)
            {
            if (eptr <= md->end_subject - length &&
-             memcmp(eptr, charptr, length) == 0) eptr += length;
+             memcmp(eptr, charptr, IN_UCHARS(length)) == 0) eptr += length;
  #ifdef SUPPORT_UCP
            else if (oclength > 0 &&
                     eptr <= md->end_subject - oclength &&
-                    memcmp(eptr, occhars, oclength) == 0) eptr += oclength;
+                    memcmp(eptr, occhars, IN_UCHARS(oclength)) == 0) eptr += oclength;
  #endif  /* SUPPORT_UCP */
            else
              {
-Line 2677 
 for (;;)
+Line 3255 
 for (;;)
            {
            for (fi = min;; fi++)
              {
-             RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM22);
+             RMATCH(eptr, ecode, offset_top, md, eptrb, RM22);
              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
              if (fi >= max) RRETURN(MATCH_NOMATCH);
              if (eptr <= md->end_subject - length &&
-               memcmp(eptr, charptr, length) == 0) eptr += length;
+               memcmp(eptr, charptr, IN_UCHARS(length)) == 0) eptr += length;
  #ifdef SUPPORT_UCP
              else if (oclength > 0 &&
                       eptr <= md->end_subject - oclength &&
-                      memcmp(eptr, occhars, oclength) == 0) eptr += oclength;
+                      memcmp(eptr, occhars, IN_UCHARS(oclength)) == 0) eptr += oclength;
  #endif  /* SUPPORT_UCP */
              else
                {
-Line 2702 
 for (;;)
+Line 3280 
 for (;;)
            for (i = min; i < max; i++)
              {
              if (eptr <= md->end_subject - length &&
-                 memcmp(eptr, charptr, length) == 0) eptr += length;
+                 memcmp(eptr, charptr, IN_UCHARS(length)) == 0) eptr += length;
  #ifdef SUPPORT_UCP
              else if (oclength > 0 &&
                       eptr <= md->end_subject - oclength &&
-                      memcmp(eptr, occhars, oclength) == 0) eptr += oclength;
+                      memcmp(eptr, occhars, IN_UCHARS(oclength)) == 0) eptr += oclength;
  #endif  /* SUPPORT_UCP */
              else
                {
-Line 2719 
 for (;;)
+Line 3297 
 for (;;)
            for(;;)
              {
-             RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM23);
+             RMATCH(eptr, ecode, offset_top, md, eptrb, RM23);
              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
              if (eptr == pp) { RRETURN(MATCH_NOMATCH); }
  #ifdef SUPPORT_UCP
-Line 2738 
 for (;;)
+Line 3316 
 for (;;)
        value of fc will always be < 128. */
        }
      else
- #endif  /* SUPPORT_UTF8 */
+ #endif  /* SUPPORT_UTF */
+       /* When not in UTF-8 mode, load a single-byte character. */
-     /* When not in UTF-8 mode, load a single-byte character. */
+       fc = *ecode++;
-     fc = *ecode++;
-     /* The value of fc at this point is always less than 256, though we may or
+     /* The value of fc at this point is always one character, though we may
-     may not be in UTF-8 mode. The code is duplicated for the caseless and
+     or may not be in UTF mode. The code is duplicated for the caseless and
      caseful cases, for speed, since matching characters is likely to be quite
      common. First, ensure the minimum number of matches are present. If min =
      max, continue at the same level without recursing. Otherwise, if
-Line 2756 
 for (;;)
+Line 3332 
 for (;;)
      DPRINTF(("matching %c{%d,%d} against subject %.*s\n", fc, min, max,
        max, eptr));
-     if ((ims & PCRE_CASELESS) != 0)
+     if (op >= OP_STARI)  /* Caseless */
        {
-       fc = md->lcc[fc];
+ #ifdef COMPILE_PCRE8
+       /* fc must be < 128 if UTF is enabled. */
+       foc = md->fcc[fc];
+ #else
+ #ifdef SUPPORT_UTF
+ #ifdef SUPPORT_UCP
+       if (utf && fc > 127)
+         foc = UCD_OTHERCASE(fc);
+ #else
+       if (utf && fc > 127)
+         foc = fc;
+ #endif /* SUPPORT_UCP */
+       else
+ #endif /* SUPPORT_UTF */
+         foc = TABLE_GET(fc, md->fcc, fc);
+ #endif /* COMPILE_PCRE8 */
        for (i = 1; i <= min; i++)
          {
          if (eptr >= md->end_subject)
-Line 2766 
 for (;;)
+Line 3358 
 for (;;)
            SCHECK_PARTIAL();
            RRETURN(MATCH_NOMATCH);
            }
-         if (fc != md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH);
+         if (fc != *eptr && foc != *eptr) RRETURN(MATCH_NOMATCH);
+         eptr++;
          }
        if (min == max) continue;
        if (minimize)
          {
          for (fi = min;; fi++)
            {
-           RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM24);
+           RMATCH(eptr, ecode, offset_top, md, eptrb, RM24);
            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
            if (fi >= max) RRETURN(MATCH_NOMATCH);
            if (eptr >= md->end_subject)
-Line 2781 
 for (;;)
+Line 3374 
 for (;;)
              SCHECK_PARTIAL();
              RRETURN(MATCH_NOMATCH);
              }
-           if (fc != md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH);
+           if (fc != *eptr && foc != *eptr) RRETURN(MATCH_NOMATCH);
+           eptr++;
            }
          /* Control never gets here */
          }
-Line 2795 
 for (;;)
+Line 3389 
 for (;;)
              SCHECK_PARTIAL();
              break;
              }
-           if (fc != md->lcc[*eptr]) break;
+           if (fc != *eptr && foc != *eptr) break;
            eptr++;
            }
-Line 2803 
 for (;;)
+Line 3397 
 for (;;)
          while (eptr >= pp)
            {
-           RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM25);
+           RMATCH(eptr, ecode, offset_top, md, eptrb, RM25);
            eptr--;
            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
            }
-Line 2832 
 for (;;)
+Line 3426 
 for (;;)
          {
          for (fi = min;; fi++)
            {
-           RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM26);
+           RMATCH(eptr, ecode, offset_top, md, eptrb, RM26);
            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
            if (fi >= max) RRETURN(MATCH_NOMATCH);
            if (eptr >= md->end_subject)
-Line 2861 
 for (;;)
+Line 3455 
 for (;;)
          while (eptr >= pp)
            {
-           RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM27);
+           RMATCH(eptr, ecode, offset_top, md, eptrb, RM27);
            eptr--;
            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
            }
-Line 2874 
 for (;;)
+Line 3468 
 for (;;)
      checking can be multibyte. */
      case OP_NOT:
+     case OP_NOTI:
      if (eptr >= md->end_subject)
        {
        SCHECK_PARTIAL();
-Line 2881 
 for (;;)
+Line 3476 
 for (;;)
        }
      ecode++;
      GETCHARINCTEST(c, eptr);
-     if ((ims & PCRE_CASELESS) != 0)
+     if (op == OP_NOTI)         /* The caseless case */
        {
- #ifdef SUPPORT_UTF8
+       register int ch, och;
-       if (c < 256)
+       ch = *ecode++;
- #endif
+ #ifdef COMPILE_PCRE8
-       c = md->lcc[c];
+       /* ch must be < 128 if UTF is enabled. */
-       if (md->lcc[*ecode++] == c) RRETURN(MATCH_NOMATCH);
+       och = md->fcc[ch];
+ #else
+ #ifdef SUPPORT_UTF
+ #ifdef SUPPORT_UCP
+       if (utf && ch > 127)
+         och = UCD_OTHERCASE(ch);
+ #else
+       if (utf && ch > 127)
+         och = ch;
+ #endif /* SUPPORT_UCP */
+       else
+ #endif /* SUPPORT_UTF */
+         och = TABLE_GET(ch, md->fcc, ch);
+ #endif /* COMPILE_PCRE8 */
+       if (ch == c || och == c) RRETURN(MATCH_NOMATCH);
        }
-     else
+     else    /* Caseful */
        {
        if (*ecode++ == c) RRETURN(MATCH_NOMATCH);
        }
-Line 2903 
 for (;;)
+Line 3512 
 for (;;)
      about... */
      case OP_NOTEXACT:
+     case OP_NOTEXACTI:
      min = max = GET2(ecode, 1);
-     ecode += 3;
+     ecode += 1 + IMM2_SIZE;
      goto REPEATNOTCHAR;
      case OP_NOTUPTO:
+     case OP_NOTUPTOI:
      case OP_NOTMINUPTO:
+     case OP_NOTMINUPTOI:
      min = 0;
      max = GET2(ecode, 1);
-     minimize = *ecode == OP_NOTMINUPTO;
+     minimize = *ecode == OP_NOTMINUPTO || *ecode == OP_NOTMINUPTOI;
-     ecode += 3;
+     ecode += 1 + IMM2_SIZE;
      goto REPEATNOTCHAR;
      case OP_NOTPOSSTAR:
+     case OP_NOTPOSSTARI:
      possessive = TRUE;
      min = 0;
      max = INT_MAX;
-Line 2923 
 for (;;)
+Line 3536 
 for (;;)
      goto REPEATNOTCHAR;
      case OP_NOTPOSPLUS:
+     case OP_NOTPOSPLUSI:
      possessive = TRUE;
      min = 1;
      max = INT_MAX;
-Line 2930 
 for (;;)
+Line 3544 
 for (;;)
      goto REPEATNOTCHAR;
      case OP_NOTPOSQUERY:
+     case OP_NOTPOSQUERYI:
      possessive = TRUE;
      min = 0;
      max = 1;
-Line 2937 
 for (;;)
+Line 3552 
 for (;;)
      goto REPEATNOTCHAR;
      case OP_NOTPOSUPTO:
+     case OP_NOTPOSUPTOI:
      possessive = TRUE;
      min = 0;
      max = GET2(ecode, 1);
-     ecode += 3;
+     ecode += 1 + IMM2_SIZE;
      goto REPEATNOTCHAR;
      case OP_NOTSTAR:
+     case OP_NOTSTARI:
      case OP_NOTMINSTAR:
+     case OP_NOTMINSTARI:
      case OP_NOTPLUS:
+     case OP_NOTPLUSI:
      case OP_NOTMINPLUS:
+     case OP_NOTMINPLUSI:
      case OP_NOTQUERY:
+     case OP_NOTQUERYI:
      case OP_NOTMINQUERY:
-     c = *ecode++ - OP_NOTSTAR;
+     case OP_NOTMINQUERYI:
+     c = *ecode++ - ((op >= OP_NOTSTARI)? OP_NOTSTARI: OP_NOTSTAR);
      minimize = (c & 1) != 0;
      min = rep_min[c];                 /* Pick up values from tables; */
      max = rep_max[c];                 /* zero for max => infinity */
-Line 2971 
 for (;;)
+Line 3593 
 for (;;)
      DPRINTF(("negative matching %c{%d,%d} against subject %.*s\n", fc, min, max,
        max, eptr));
-     if ((ims & PCRE_CASELESS) != 0)
+     if (op >= OP_NOTSTARI)     /* Caseless */
        {
-       fc = md->lcc[fc];
+ #ifdef COMPILE_PCRE8
+       /* fc must be < 128 if UTF is enabled. */
+       foc = md->fcc[fc];
+ #else
+ #ifdef SUPPORT_UTF
+ #ifdef SUPPORT_UCP
+       if (utf && fc > 127)
+         foc = UCD_OTHERCASE(fc);
+ #else
+       if (utf && fc > 127)
+         foc = fc;
+ #endif /* SUPPORT_UCP */
+       else
+ #endif /* SUPPORT_UTF */
+         foc = TABLE_GET(fc, md->fcc, fc);
+ #endif /* COMPILE_PCRE8 */
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-       /* UTF-8 mode */
+       if (utf)
-       if (utf8)
          {
          register unsigned int d;
          for (i = 1; i <= min; i++)
-Line 2988 
 for (;;)
+Line 3624 
 for (;;)
              RRETURN(MATCH_NOMATCH);
              }
            GETCHARINC(d, eptr);
-           if (d < 256) d = md->lcc[d];
+           if (fc == d || foc == d) RRETURN(MATCH_NOMATCH);
-           if (fc == d) RRETURN(MATCH_NOMATCH);
            }
          }
        else
  #endif
+       /* Not UTF mode */
-       /* Not UTF-8 mode */
          {
          for (i = 1; i <= min; i++)
            {
-Line 3004 
 for (;;)
+Line 3638 
 for (;;)
              SCHECK_PARTIAL();
              RRETURN(MATCH_NOMATCH);
              }
-           if (fc == md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH);
+           if (fc == *eptr || foc == *eptr) RRETURN(MATCH_NOMATCH);
+           eptr++;
            }
          }
-Line 3012 
 for (;;)
+Line 3647 
 for (;;)
        if (minimize)
          {
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-         /* UTF-8 mode */
+         if (utf)
-         if (utf8)
            {
            register unsigned int d;
            for (fi = min;; fi++)
              {
-             RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM28);
+             RMATCH(eptr, ecode, offset_top, md, eptrb, RM28);
              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
              if (fi >= max) RRETURN(MATCH_NOMATCH);
              if (eptr >= md->end_subject)
-Line 3028 
 for (;;)
+Line 3662 
 for (;;)
                RRETURN(MATCH_NOMATCH);
                }
              GETCHARINC(d, eptr);
-             if (d < 256) d = md->lcc[d];
+             if (fc == d || foc == d) RRETURN(MATCH_NOMATCH);
-             if (fc == d) RRETURN(MATCH_NOMATCH);
              }
            }
          else
  #endif
-         /* Not UTF-8 mode */
+         /* Not UTF mode */
            {
            for (fi = min;; fi++)
              {
-             RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM29);
+             RMATCH(eptr, ecode, offset_top, md, eptrb, RM29);
              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
              if (fi >= max) RRETURN(MATCH_NOMATCH);
              if (eptr >= md->end_subject)
-Line 3046 
 for (;;)
+Line 3679 
 for (;;)
                SCHECK_PARTIAL();
                RRETURN(MATCH_NOMATCH);
                }
-             if (fc == md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH);
+             if (fc == *eptr || foc == *eptr) RRETURN(MATCH_NOMATCH);
+             eptr++;
              }
            }
          /* Control never gets here */
-Line 3058 
 for (;;)
+Line 3692 
 for (;;)
          {
          pp = eptr;
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-         /* UTF-8 mode */
+         if (utf)
-         if (utf8)
            {
            register unsigned int d;
            for (i = min; i < max; i++)
-Line 3072 
 for (;;)
+Line 3705 
 for (;;)
                break;
                }
              GETCHARLEN(d, eptr, len);
-             if (d < 256) d = md->lcc[d];
+             if (fc == d || foc == d) break;
-             if (fc == d) break;
              eptr += len;
              }
          if (possessive) continue;
          for(;;)
              {
-             RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM30);
+             RMATCH(eptr, ecode, offset_top, md, eptrb, RM30);
              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
              if (eptr-- == pp) break;        /* Stop if tried at original pos */
              BACKCHAR(eptr);
-Line 3087 
 for (;;)
+Line 3719 
 for (;;)
            }
          else
  #endif
-         /* Not UTF-8 mode */
+         /* Not UTF mode */
            {
            for (i = min; i < max; i++)
              {
-Line 3096 
 for (;;)
+Line 3728 
 for (;;)
                SCHECK_PARTIAL();
                break;
                }
-             if (fc == md->lcc[*eptr]) break;
+             if (fc == *eptr || foc == *eptr) break;
              eptr++;
              }
            if (possessive) continue;
            while (eptr >= pp)
              {
-             RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM31);
+             RMATCH(eptr, ecode, offset_top, md, eptrb, RM31);
              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
              eptr--;
              }
-Line 3117 
 for (;;)
+Line 3749 
 for (;;)
      else
        {
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-       /* UTF-8 mode */
+       if (utf)
-       if (utf8)
          {
          register unsigned int d;
          for (i = 1; i <= min; i++)
-Line 3135 
 for (;;)
+Line 3766 
 for (;;)
          }
        else
  #endif
-       /* Not UTF-8 mode */
+       /* Not UTF mode */
          {
          for (i = 1; i <= min; i++)
            {
-Line 3152 
 for (;;)
+Line 3783 
 for (;;)
        if (minimize)
          {
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-         /* UTF-8 mode */
+         if (utf)
-         if (utf8)
            {
            register unsigned int d;
            for (fi = min;; fi++)
              {
-             RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM32);
+             RMATCH(eptr, ecode, offset_top, md, eptrb, RM32);
              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
              if (fi >= max) RRETURN(MATCH_NOMATCH);
              if (eptr >= md->end_subject)
-Line 3173 
 for (;;)
+Line 3803 
 for (;;)
            }
          else
  #endif
-         /* Not UTF-8 mode */
+         /* Not UTF mode */
            {
            for (fi = min;; fi++)
              {
-             RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM33);
+             RMATCH(eptr, ecode, offset_top, md, eptrb, RM33);
              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
              if (fi >= max) RRETURN(MATCH_NOMATCH);
              if (eptr >= md->end_subject)
-Line 3197 
 for (;;)
+Line 3827 
 for (;;)
          {
          pp = eptr;
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-         /* UTF-8 mode */
+         if (utf)
-         if (utf8)
            {
            register unsigned int d;
            for (i = min; i < max; i++)
-Line 3217 
 for (;;)
+Line 3846 
 for (;;)
            if (possessive) continue;
            for(;;)
              {
-             RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM34);
+             RMATCH(eptr, ecode, offset_top, md, eptrb, RM34);
              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
              if (eptr-- == pp) break;        /* Stop if tried at original pos */
              BACKCHAR(eptr);
-Line 3225 
 for (;;)
+Line 3854 
 for (;;)
            }
          else
  #endif
-         /* Not UTF-8 mode */
+         /* Not UTF mode */
            {
            for (i = min; i < max; i++)
              {
-Line 3240 
 for (;;)
+Line 3869 
 for (;;)
            if (possessive) continue;
            while (eptr >= pp)
              {
-             RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM35);
+             RMATCH(eptr, ecode, offset_top, md, eptrb, RM35);
              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
              eptr--;
              }
-Line 3258 
 for (;;)
+Line 3887 
 for (;;)
      case OP_TYPEEXACT:
      min = max = GET2(ecode, 1);
      minimize = TRUE;
-     ecode += 3;
+     ecode += 1 + IMM2_SIZE;
      goto REPEATTYPE;
      case OP_TYPEUPTO:
-Line 3266 
 for (;;)
+Line 3895 
 for (;;)
      min = 0;
      max = GET2(ecode, 1);
      minimize = *ecode == OP_TYPEMINUPTO;
-     ecode += 3;
+     ecode += 1 + IMM2_SIZE;
      goto REPEATTYPE;
      case OP_TYPEPOSSTAR:
-Line 3294 
 for (;;)
+Line 3923 
 for (;;)
      possessive = TRUE;
      min = 0;
      max = GET2(ecode, 1);
-     ecode += 3;
+     ecode += 1 + IMM2_SIZE;
      goto REPEATTYPE;
      case OP_TYPESTAR:
-Line 3355 
 for (;;)
+Line 3984 
 for (;;)
            case PT_LAMP:
            for (i = 1; i <= min; i++)
              {
+             int chartype;
              if (eptr >= md->end_subject)
                {
                SCHECK_PARTIAL();
                RRETURN(MATCH_NOMATCH);
                }
              GETCHARINCTEST(c, eptr);
-             prop_chartype = UCD_CHARTYPE(c);
+             chartype = UCD_CHARTYPE(c);
-             if ((prop_chartype == ucp_Lu ||
+             if ((chartype == ucp_Lu ||
-                  prop_chartype == ucp_Ll ||
+                  chartype == ucp_Ll ||
-                  prop_chartype == ucp_Lt) == prop_fail_result)
+                  chartype == ucp_Lt) == prop_fail_result)
                RRETURN(MATCH_NOMATCH);
              }
            break;
-Line 3378 
 for (;;)
+Line 4008 
 for (;;)
                RRETURN(MATCH_NOMATCH);
                }
              GETCHARINCTEST(c, eptr);
-             prop_category = UCD_CATEGORY(c);
+             if ((UCD_CATEGORY(c) == prop_value) == prop_fail_result)
-             if ((prop_category == prop_value) == prop_fail_result)
                RRETURN(MATCH_NOMATCH);
              }
            break;
-Line 3393 
 for (;;)
+Line 4022 
 for (;;)
                RRETURN(MATCH_NOMATCH);
                }
              GETCHARINCTEST(c, eptr);
-             prop_chartype = UCD_CHARTYPE(c);
+             if ((UCD_CHARTYPE(c) == prop_value) == prop_fail_result)
-             if ((prop_chartype == prop_value) == prop_fail_result)
                RRETURN(MATCH_NOMATCH);
              }
            break;
-Line 3408 
 for (;;)
+Line 4036 
 for (;;)
                RRETURN(MATCH_NOMATCH);
                }
              GETCHARINCTEST(c, eptr);
-             prop_script = UCD_SCRIPT(c);
+             if ((UCD_SCRIPT(c) == prop_value) == prop_fail_result)
-             if ((prop_script == prop_value) == prop_fail_result)
+               RRETURN(MATCH_NOMATCH);
+             }
+           break;
+           case PT_ALNUM:
+           for (i = 1; i <= min; i++)
+             {
+             int category;
+             if (eptr >= md->end_subject)
+               {
+               SCHECK_PARTIAL();
+               RRETURN(MATCH_NOMATCH);
+               }
+             GETCHARINCTEST(c, eptr);
+             category = UCD_CATEGORY(c);
+             if ((category == ucp_L || category == ucp_N) == prop_fail_result)
+               RRETURN(MATCH_NOMATCH);
+             }
+           break;
+           case PT_SPACE:    /* Perl space */
+           for (i = 1; i <= min; i++)
+             {
+             if (eptr >= md->end_subject)
+               {
+               SCHECK_PARTIAL();
+               RRETURN(MATCH_NOMATCH);
+               }
+             GETCHARINCTEST(c, eptr);
+             if ((UCD_CATEGORY(c) == ucp_Z || c == CHAR_HT || c == CHAR_NL ||
+                  c == CHAR_FF || c == CHAR_CR)
+                    == prop_fail_result)
+               RRETURN(MATCH_NOMATCH);
+             }
+           break;
+           case PT_PXSPACE:  /* POSIX space */
+           for (i = 1; i <= min; i++)
+             {
+             if (eptr >= md->end_subject)
+               {
+               SCHECK_PARTIAL();
+               RRETURN(MATCH_NOMATCH);
+               }
+             GETCHARINCTEST(c, eptr);
+             if ((UCD_CATEGORY(c) == ucp_Z || c == CHAR_HT || c == CHAR_NL ||
+                  c == CHAR_VT || c == CHAR_FF || c == CHAR_CR)
+                    == prop_fail_result)
+               RRETURN(MATCH_NOMATCH);
+             }
+           break;
+           case PT_WORD:
+           for (i = 1; i <= min; i++)
+             {
+             int category;
+             if (eptr >= md->end_subject)
+               {
+               SCHECK_PARTIAL();
+               RRETURN(MATCH_NOMATCH);
+               }
+             GETCHARINCTEST(c, eptr);
+             category = UCD_CATEGORY(c);
+             if ((category == ucp_L || category == ucp_N || c == CHAR_UNDERSCORE)
+                    == prop_fail_result)
                RRETURN(MATCH_NOMATCH);
              }
            break;
+           /* This should not occur */
            default:
            RRETURN(PCRE_ERROR_INTERNAL);
            }
-Line 3432 
 for (;;)
+Line 4126 
 for (;;)
              RRETURN(MATCH_NOMATCH);
              }
            GETCHARINCTEST(c, eptr);
-           prop_category = UCD_CATEGORY(c);
+           if (UCD_CATEGORY(c) == ucp_M) RRETURN(MATCH_NOMATCH);
-           if (prop_category == ucp_M) RRETURN(MATCH_NOMATCH);
            while (eptr < md->end_subject)
              {
              int len = 1;
-             if (!utf8) c = *eptr;
+             if (!utf) c = *eptr; else { GETCHARLEN(c, eptr, len); }
-               else { GETCHARLEN(c, eptr, len); }
+             if (UCD_CATEGORY(c) != ucp_M) break;
-             prop_category = UCD_CATEGORY(c);
-             if (prop_category != ucp_M) break;
              eptr += len;
              }
            }
-Line 3451 
 for (;;)
+Line 4142 
 for (;;)
  /* Handle all other cases when the coding is UTF-8 */
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-       if (utf8) switch(ctype)
+       if (utf) switch(ctype)
          {
          case OP_ANY:
          for (i = 1; i <= min; i++)
-Line 3464 
 for (;;)
+Line 4155 
 for (;;)
              }
            if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);
            eptr++;
-           while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
+           ACROSSCHAR(eptr < md->end_subject, *eptr, eptr++);
            }
          break;
-Line 3477 
 for (;;)
+Line 4168 
 for (;;)
              RRETURN(MATCH_NOMATCH);
              }
            eptr++;
-           while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
+           ACROSSCHAR(eptr < md->end_subject, *eptr, eptr++);
            }
          break;
-Line 3498 
 for (;;)
+Line 4189 
 for (;;)
            switch(c)
              {
              default: RRETURN(MATCH_NOMATCH);
              case 0x000d:
              if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
              break;
-Line 3658 
 for (;;)
+Line 4350 
 for (;;)
              SCHECK_PARTIAL();
              RRETURN(MATCH_NOMATCH);
              }
-           if (*eptr >= 128 || (md->ctypes[*eptr++] & ctype_digit) == 0)
+           if (*eptr >= 128 || (md->ctypes[*eptr] & ctype_digit) == 0)
              RRETURN(MATCH_NOMATCH);
+           eptr++;
            /* No need to skip more bytes - we know it's a 1-byte character */
            }
          break;
-Line 3674 
 for (;;)
+Line 4367 
 for (;;)
              }
            if (*eptr < 128 && (md->ctypes[*eptr] & ctype_space) != 0)
              RRETURN(MATCH_NOMATCH);
-           while (++eptr < md->end_subject && (*eptr & 0xc0) == 0x80);
+           eptr++;
+           ACROSSCHAR(eptr < md->end_subject, *eptr, eptr++);
            }
          break;
-Line 3686 
 for (;;)
+Line 4380 
 for (;;)
              SCHECK_PARTIAL();
              RRETURN(MATCH_NOMATCH);
              }
-           if (*eptr >= 128 || (md->ctypes[*eptr++] & ctype_space) == 0)
+           if (*eptr >= 128 || (md->ctypes[*eptr] & ctype_space) == 0)
              RRETURN(MATCH_NOMATCH);
+           eptr++;
            /* No need to skip more bytes - we know it's a 1-byte character */
            }
          break;
-Line 3702 
 for (;;)
+Line 4397 
 for (;;)
              }
            if (*eptr < 128 && (md->ctypes[*eptr] & ctype_word) != 0)
              RRETURN(MATCH_NOMATCH);
-           while (++eptr < md->end_subject && (*eptr & 0xc0) == 0x80);
+           eptr++;
+           ACROSSCHAR(eptr < md->end_subject, *eptr, eptr++);
            }
          break;
-Line 3714 
 for (;;)
+Line 4410 
 for (;;)
              SCHECK_PARTIAL();
              RRETURN(MATCH_NOMATCH);
              }
-           if (*eptr >= 128 || (md->ctypes[*eptr++] & ctype_word) == 0)
+           if (*eptr >= 128 || (md->ctypes[*eptr] & ctype_word) == 0)
              RRETURN(MATCH_NOMATCH);
+           eptr++;
            /* No need to skip more bytes - we know it's a 1-byte character */
            }
          break;
-Line 3725 
 for (;;)
+Line 4422 
 for (;;)
          }  /* End switch(ctype) */
        else
- #endif     /* SUPPORT_UTF8 */
+ #endif     /* SUPPORT_UTF */
        /* Code for the non-UTF-8 case for minimum matching of operators other
        than OP_PROP and OP_NOTPROP. */
-Line 3774 
 for (;;)
+Line 4471 
 for (;;)
            switch(*eptr++)
              {
              default: RRETURN(MATCH_NOMATCH);
              case 0x000d:
              if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
              break;
              case 0x000a:
              break;
              case 0x000b:
              case 0x000c:
              case 0x0085:
+ #ifdef COMPILE_PCRE16
+             case 0x2028:
+             case 0x2029:
+ #endif
              if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
              break;
              }
-Line 3803 
 for (;;)
+Line 4506 
 for (;;)
              case 0x09:      /* HT */
              case 0x20:      /* SPACE */
              case 0xa0:      /* NBSP */
+ #ifdef COMPILE_PCRE16
+             case 0x1680:    /* OGHAM SPACE MARK */
+             case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
+             case 0x2000:    /* EN QUAD */
+             case 0x2001:    /* EM QUAD */
+             case 0x2002:    /* EN SPACE */
+             case 0x2003:    /* EM SPACE */
+             case 0x2004:    /* THREE-PER-EM SPACE */
+             case 0x2005:    /* FOUR-PER-EM SPACE */
+             case 0x2006:    /* SIX-PER-EM SPACE */
+             case 0x2007:    /* FIGURE SPACE */
+             case 0x2008:    /* PUNCTUATION SPACE */
+             case 0x2009:    /* THIN SPACE */
+             case 0x200A:    /* HAIR SPACE */
+             case 0x202f:    /* NARROW NO-BREAK SPACE */
+             case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
+             case 0x3000:    /* IDEOGRAPHIC SPACE */
+ #endif
              RRETURN(MATCH_NOMATCH);
              }
            }
-Line 3822 
 for (;;)
+Line 4543 
 for (;;)
              case 0x09:      /* HT */
              case 0x20:      /* SPACE */
              case 0xa0:      /* NBSP */
+ #ifdef COMPILE_PCRE16
+             case 0x1680:    /* OGHAM SPACE MARK */
+             case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
+             case 0x2000:    /* EN QUAD */
+             case 0x2001:    /* EM QUAD */
+             case 0x2002:    /* EN SPACE */
+             case 0x2003:    /* EM SPACE */
+             case 0x2004:    /* THREE-PER-EM SPACE */
+             case 0x2005:    /* FOUR-PER-EM SPACE */
+             case 0x2006:    /* SIX-PER-EM SPACE */
+             case 0x2007:    /* FIGURE SPACE */
+             case 0x2008:    /* PUNCTUATION SPACE */
+             case 0x2009:    /* THIN SPACE */
+             case 0x200A:    /* HAIR SPACE */
+             case 0x202f:    /* NARROW NO-BREAK SPACE */
+             case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
+             case 0x3000:    /* IDEOGRAPHIC SPACE */
+ #endif
              break;
              }
            }
-Line 3843 
 for (;;)
+Line 4582 
 for (;;)
              case 0x0c:      /* FF */
              case 0x0d:      /* CR */
              case 0x85:      /* NEL */
+ #ifdef COMPILE_PCRE16
+             case 0x2028:    /* LINE SEPARATOR */
+             case 0x2029:    /* PARAGRAPH SEPARATOR */
+ #endif
              RRETURN(MATCH_NOMATCH);
              }
            }
-Line 3864 
 for (;;)
+Line 4607 
 for (;;)
              case 0x0c:      /* FF */
              case 0x0d:      /* CR */
              case 0x85:      /* NEL */
+ #ifdef COMPILE_PCRE16
+             case 0x2028:    /* LINE SEPARATOR */
+             case 0x2029:    /* PARAGRAPH SEPARATOR */
+ #endif
              break;
              }
            }
-Line 3877 
 for (;;)
+Line 4624 
 for (;;)
              SCHECK_PARTIAL();
              RRETURN(MATCH_NOMATCH);
              }
-           if ((md->ctypes[*eptr++] & ctype_digit) != 0) RRETURN(MATCH_NOMATCH);
+           if (MAX_255(*eptr) && (md->ctypes[*eptr] & ctype_digit) != 0)
+             RRETURN(MATCH_NOMATCH);
+           eptr++;
            }
          break;
-Line 3889 
 for (;;)
+Line 4638 
 for (;;)
              SCHECK_PARTIAL();
              RRETURN(MATCH_NOMATCH);
              }
-           if ((md->ctypes[*eptr++] & ctype_digit) == 0) RRETURN(MATCH_NOMATCH);
+           if (!MAX_255(*eptr) || (md->ctypes[*eptr] & ctype_digit) == 0)
+             RRETURN(MATCH_NOMATCH);
+           eptr++;
            }
          break;
-Line 3901 
 for (;;)
+Line 4652 
 for (;;)
              SCHECK_PARTIAL();
              RRETURN(MATCH_NOMATCH);
              }
-           if ((md->ctypes[*eptr++] & ctype_space) != 0) RRETURN(MATCH_NOMATCH);
+           if (MAX_255(*eptr) && (md->ctypes[*eptr] & ctype_space) != 0)
+             RRETURN(MATCH_NOMATCH);
+           eptr++;
            }
          break;
-Line 3913 
 for (;;)
+Line 4666 
 for (;;)
              SCHECK_PARTIAL();
              RRETURN(MATCH_NOMATCH);
              }
-           if ((md->ctypes[*eptr++] & ctype_space) == 0) RRETURN(MATCH_NOMATCH);
+           if (!MAX_255(*eptr) || (md->ctypes[*eptr] & ctype_space) == 0)
+             RRETURN(MATCH_NOMATCH);
+           eptr++;
            }
          break;
-Line 3925 
 for (;;)
+Line 4680 
 for (;;)
              SCHECK_PARTIAL();
              RRETURN(MATCH_NOMATCH);
              }
-           if ((md->ctypes[*eptr++] & ctype_word) != 0)
+           if (MAX_255(*eptr) && (md->ctypes[*eptr] & ctype_word) != 0)
              RRETURN(MATCH_NOMATCH);
+           eptr++;
            }
          break;
-Line 3938 
 for (;;)
+Line 4694 
 for (;;)
              SCHECK_PARTIAL();
              RRETURN(MATCH_NOMATCH);
              }
-           if ((md->ctypes[*eptr++] & ctype_word) == 0)
+           if (!MAX_255(*eptr) || (md->ctypes[*eptr] & ctype_word) == 0)
              RRETURN(MATCH_NOMATCH);
+           eptr++;
            }
     &n