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

Diff of /code/trunk/pcre_exec.c

Parent Directory | Revision Log | View Patch Patch

-revision 602 by ph10,
Wed May 25 08:29:03 2011 UTC
+revision 771 by ph10,
Tue Nov 29 15:34:12 2011 UTC
 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 73 
 negative to avoid the external error cod
+Line 75 
 negative to avoid the external error cod
  #define MATCH_ACCEPT       (-999)
  #define MATCH_COMMIT       (-998)
- #define MATCH_PRUNE        (-997)
+ #define MATCH_KETRPOS      (-997)
- #define MATCH_SKIP         (-996)
+ #define MATCH_ONCE         (-996)
- #define MATCH_SKIP_ARG     (-995)
+ #define MATCH_PRUNE        (-995)
- #define MATCH_THEN         (-994)
+ #define MATCH_SKIP         (-994)
+ #define MATCH_SKIP_ARG     (-993)
- /* This is a convenience macro for code that occurs many times. */
+ #define MATCH_THEN         (-992)
- #define MRRETURN(ra) \
-   { \
-   md->mark = markptr; \
-   RRETURN(ra); \
-   }
  /* 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 134 
 while (length-- > 0)
+Line 130 
 while (length-- > 0)
  /* Normally, if a back reference hasn't been set, the length that is passed is
  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:
-Line 181 
 if (caseless)
+Line 177 
 if (caseless)
  #ifdef SUPPORT_UCP
    if (md->utf8)
      {
      /* Match characters up to the end of the reference. NOTE: the number of
      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). */
      USPTR endptr = p + length;
      while (p < endptr)
        {
-Line 206 
 if (caseless)
+Line 202 
 if (caseless)
    /* The same code works when not in UTF-8 mode and in UTF-8 mode when there
    is no UCP support. */
      {
      if (eptr + length > md->end_subject) return -1;
      while (length-- > 0)
        { if (md->lcc[*p++] != md->lcc[*eptr++]) return -1; }
      }
    }
  /* In the caseful case, we can just compare the bytes, whether or not we
  are in UTF-8 mode. */
  else
    {
    if (eptr + length > md->end_subject) return -1;
    while (length-- > 0) if (*p++ != *eptr++) return -1;
    }
  return eptr - eptr_start;
-Line 273 
 enum { RM1=1, RM2,  RM3,  RM4,  RM5,  RM
+Line 269 
 enum { RM1=1, RM2,  RM3,  RM4,  RM5,  RM
         RM31,  RM32, RM33, RM34, RM35, RM36, RM37, RM38, RM39, RM40,
         RM41,  RM42, RM43, RM44, RM45, RM46, RM47, RM48, RM49, RM50,
         RM51,  RM52, RM53, RM54, RM55, RM56, RM57, RM58, RM59, RM60,
-        RM61,  RM62 };
+        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
-Line 283 
 actually used in this definition. */
+Line 279 
 actually used in this definition. */
  #define REGISTER register
  #ifdef PCRE_DEBUG
- #define RMATCH(ra,rb,rc,rd,re,rf,rw) \
+ #define RMATCH(ra,rb,rc,rd,re,rw) \
    { \
    printf("match() called in line %d\n", __LINE__); \
-   rrc = match(ra,rb,mstart,markptr,rc,rd,re,rf,rdepth+1); \
+   rrc = match(ra,rb,mstart,rc,rd,re,rdepth+1); \
    printf("to line %d\n", __LINE__); \
    }
  #define RRETURN(ra) \
-Line 295 
 actually used in this definition. */
+Line 291 
 actually used in this definition. */
    return ra; \
    }
  #else
- #define RMATCH(ra,rb,rc,rd,re,rf,rw) \
+ #define RMATCH(ra,rb,rc,rd,re,rw) \
-   rrc = match(ra,rb,mstart,markptr,rc,rd,re,rf,rdepth+1)
+   rrc = match(ra,rb,mstart,rc,rd,re,rdepth+1)
  #define RRETURN(ra) return ra
  #endif
-Line 309 
 argument of match(), which never changes
+Line 305 
 argument of match(), which never changes
  #define REGISTER
- #define RMATCH(ra,rb,rc,rd,re,rf,rw)\
+ #define RMATCH(ra,rb,rc,rd,re,rw)\
    {\
    heapframe *newframe = (heapframe *)(pcre_stack_malloc)(sizeof(heapframe));\
    if (newframe == NULL) RRETURN(PCRE_ERROR_NOMEMORY);\
-Line 317 
 argument of match(), which never changes
+Line 313 
 argument of match(), which never changes
    newframe->Xeptr = ra;\
    newframe->Xecode = rb;\
    newframe->Xmstart = mstart;\
-   newframe->Xmarkptr = markptr;\
    newframe->Xoffset_top = rc;\
    newframe->Xeptrb = re;\
-   newframe->Xflags = rf;\
    newframe->Xrdepth = frame->Xrdepth + 1;\
    newframe->Xprevframe = frame;\
    frame = newframe;\
-Line 354 
 typedef struct heapframe {
+Line 348 
 typedef struct heapframe {
    USPTR Xeptr;
    const uschar *Xecode;
    USPTR Xmstart;
-   USPTR Xmarkptr;
    int Xoffset_top;
    eptrblock *Xeptrb;
-   int Xflags;
    unsigned int Xrdepth;
    /* Function local variables */
-Line 382 
 typedef struct heapframe {
+Line 374 
 typedef struct heapframe {
    int Xprop_type;
    int Xprop_value;
    int Xprop_fail_result;
-   int Xprop_category;
-   int Xprop_chartype;
-   int Xprop_script;
    int Xoclength;
    uschar Xocchars[8];
  #endif
-Line 439 
 the subject. */
+Line 428 
 the subject. */
        eptr > md->start_used_ptr) \
      { \
      md->hitend = TRUE; \
-     if (md->partial > 1) MRRETURN(PCRE_ERROR_PARTIAL); \
+     if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL); \
      }
  #define SCHECK_PARTIAL()\
    if (md->partial != 0 && eptr > md->start_used_ptr) \
      { \
      md->hitend = TRUE; \
-     if (md->partial > 1) MRRETURN(PCRE_ERROR_PARTIAL); \
+     if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL); \
      }
-Line 460 
 Arguments:
+Line 449 
 Arguments:
     ecode       pointer to current position in compiled code
     mstart      pointer to the current match start position (can be modified
                   by encountering \K)
-    markptr     pointer to the most recent MARK name, or NULL
     offset_top  current top pointer
     md          pointer to "static" info for the match
     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
-Line 480 
 Returns:       MATCH_MATCH if matched
+Line 464 
 Returns:       MATCH_MATCH if matched
  static int
  match(REGISTER USPTR eptr, REGISTER const uschar *ecode, USPTR mstart,
-   const uschar *markptr, int offset_top, match_data *md, eptrblock *eptrb,
+   int offset_top, match_data *md, eptrblock *eptrb, unsigned int rdepth)
-   int flags, 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 511 
 frame->Xprevframe = NULL;            /*
+Line 494 
 frame->Xprevframe = NULL;            /*
  frame->Xeptr = eptr;
  frame->Xecode = ecode;
  frame->Xmstart = mstart;
- frame->Xmarkptr = markptr;
  frame->Xoffset_top = offset_top;
  frame->Xeptrb = eptrb;
- frame->Xflags = flags;
  frame->Xrdepth = rdepth;
  /* This is where control jumps back to to effect "recursion" */
-Line 526 
 HEAP_RECURSE:
+Line 507 
 HEAP_RECURSE:
  #define eptr               frame->Xeptr
  #define ecode              frame->Xecode
  #define mstart             frame->Xmstart
- #define markptr            frame->Xmarkptr
  #define offset_top         frame->Xoffset_top
  #define eptrb              frame->Xeptrb
- #define flags              frame->Xflags
  #define rdepth             frame->Xrdepth
  /* Ditto for the local variables */
-Line 555 
 HEAP_RECURSE:
+Line 534 
 HEAP_RECURSE:
  #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 587 
 i, and fc and c, can be the same variabl
+Line 563 
 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_UTF8                /* Many of these variables are used only  */
+ #ifdef SUPPORT_UTF8
- const uschar *charptr;             /* in small blocks of the code. My normal */
+ const uschar *charptr;
- #endif                             /* style of coding would have declared    */
+ #endif
- const uschar *callpat;             /* them within each of those blocks.      */
+ const uschar *callpat;
- const uschar *data;                /* However, in order to accommodate the   */
+ const uschar *data;
- const uschar *next;                /* version of this code that uses an      */
+ const uschar *next;
- USPTR         pp;                  /* external "stack" implemented on the    */
+ USPTR         pp;
- const uschar *prev;                /* heap, it is easier to declare them all */
+ const uschar *prev;
- USPTR         saved_eptr;          /* here, so the declarations can be cut   */
+ USPTR         saved_eptr;
-                                    /* out in a block. The only declarations  */
- recursion_info new_recursive;      /* within blocks below are for variables  */
+ recursion_info new_recursive;
-                                    /* that do not have to be preserved over  */
- BOOL cur_is_word;                  /* a recursive call to RMATCH().          */
+ BOOL cur_is_word;
  BOOL condition;
  BOOL prev_is_word;
-Line 608 
 BOOL prev_is_word;
+Line 591 
 BOOL prev_is_word;
  int prop_type;
  int prop_value;
  int prop_fail_result;
- int prop_category;
- int prop_chartype;
- int prop_script;
  int oclength;
  uschar occhars[8];
  #endif
-Line 630 
 int stacksave[REC_STACK_SAVE_MAX];
+Line 610 
 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
  /* These statements are here to stop the compiler complaining about unitialized
  variables. */
-Line 667 
 if (md->match_call_count++ >= md->match_
+Line 658 
 if (md->match_call_count++ >= md->match_
  if (rdepth >= md->match_limit_recursion) RRETURN(PCRE_ERROR_RECURSIONLIMIT);
  /* 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 692 
 for (;;)
+Line 687 
 for (;;)
    switch(op)
      {
      case OP_MARK:
-     markptr = ecode + 2;
+     md->nomatch_mark = ecode + 2;
+     md->mark = NULL;    /* In case previously set by assertion */
      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,
-       eptrb, flags, RM55);
+       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
-Line 703 
 for (;;)
+Line 701 
 for (;;)
      position and return MATCH_SKIP. Otherwise, pass back the return code
      unaltered. */
-     if (rrc == MATCH_SKIP_ARG &&
+     else if (rrc == MATCH_SKIP_ARG &&
-         strcmp((char *)markptr, (char *)(md->start_match_ptr)) == 0)
+         strcmp((char *)(ecode + 2), (char *)(md->start_match_ptr)) == 0)
        {
        md->start_match_ptr = eptr;
        RRETURN(MATCH_SKIP);
        }
-     if (md->mark == NULL) md->mark = markptr;
      RRETURN(rrc);
      case OP_FAIL:
-     MRRETURN(MATCH_NOMATCH);
+     RRETURN(MATCH_NOMATCH);
      /* COMMIT overrides PRUNE, SKIP, and THEN */
      case OP_COMMIT:
      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
-       eptrb, flags, RM52);
+       eptrb, RM52);
      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE &&
          rrc != MATCH_SKIP && rrc != MATCH_SKIP_ARG &&
          rrc != MATCH_THEN)
        RRETURN(rrc);
-     MRRETURN(MATCH_COMMIT);
+     RRETURN(MATCH_COMMIT);
      /* PRUNE overrides THEN */
      case OP_PRUNE:
      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
-       eptrb, flags, RM51);
+       eptrb, RM51);
      if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
-     MRRETURN(MATCH_PRUNE);
+     RRETURN(MATCH_PRUNE);
      case OP_PRUNE_ARG:
+     md->nomatch_mark = ecode + 2;
+     md->mark = NULL;    /* In case previously set by assertion */
      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,
-       eptrb, flags, RM56);
+       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);
-     md->mark = ecode + 2;
      RRETURN(MATCH_PRUNE);
      /* SKIP overrides PRUNE and THEN */
      case OP_SKIP:
      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
-       eptrb, flags, RM53);
+       eptrb, RM53);
      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE && rrc != MATCH_THEN)
        RRETURN(rrc);
      md->start_match_ptr = eptr;   /* Pass back current position */
-     MRRETURN(MATCH_SKIP);
+     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 += _pcre_OP_lengths[*ecode] + ecode[1];
+       break;
+       }
      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,
-       eptrb, flags, RM57);
+       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 is treated the same
+     caught by a matching MARK, or get to the top, where it causes a rematch
-     as PRUNE. */
+     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 bracket or
+     /* For THEN (and THEN_ARG) we pass back the address of the opcode, so that
-     the alt that is at the start of the current branch. This makes it possible
+     the branch in which it occurs can be determined. Overload the start of
-     to skip back past alternatives that precede the THEN within the current
+     match pointer to do this. */
-     branch. */
      case OP_THEN:
      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
-       eptrb, flags, RM54);
+       eptrb, RM54);
      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-     md->start_match_ptr = ecode - GET(ecode, 1);
+     md->start_match_ptr = ecode;
-     MRRETURN(MATCH_THEN);
+     RRETURN(MATCH_THEN);
      case OP_THEN_ARG:
-     RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1+LINK_SIZE],
+     md->nomatch_mark = ecode + 2;
-       offset_top, md, eptrb, flags, RM58);
+     md->mark = NULL;    /* In case previously set by assertion */
+     RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top,
+       md, eptrb, RM58);
+     if ((rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) &&
+          md->mark == NULL) md->mark = ecode + 2;
      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-     md->start_match_ptr = ecode - GET(ecode, 1);
+     md->start_match_ptr = ecode;
-     md->mark = ecode + LINK_SIZE + 2;
      RRETURN(MATCH_THEN);
-     /* Handle a capturing bracket. If there is space in the offset vector, save
+     /* Handle an atomic group that does not contain any capturing parentheses.
-     the current subject position in the working slot at the top of the vector.
+     This can be handled like an assertion. Prior to 8.13, all atomic groups
-     We mustn't change the current values of the data slot, because they may be
+     were handled this way. In 8.13, the code was changed as below for ONCE, so
-     set from a previous iteration of this group, and be referred to by a
+     that backups pass through the group and thereby reset captured values.
-     reference inside the group.
+     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,
-     If the bracket fails to match, we need to restore this value and also the
+     less stack intensive way.
-     values of the final offsets, in case they were set by a previous iteration
-     of the same bracket.
+     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 823 
 for (;;)
+Line 914 
 for (;;)
        md->offset_vector[md->offset_end - number] =
          (int)(eptr - md->start_subject);
-       flags = (op == OP_SCBRA)? match_cbegroup : 0;
+       for (;;)
-       do
          {
+         if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
          RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
-           eptrb, flags, RM1);
+           eptrb, RM1);
-         if (rrc != MATCH_NOMATCH &&
+         if (rrc == MATCH_ONCE) break;  /* Backing up through an atomic group */
-             (rrc != MATCH_THEN || md->start_match_ptr != ecode))
-           RRETURN(rrc);
+         /* 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;
-       if (rrc != MATCH_THEN) md->mark = markptr;
+       /* At this point, rrc will be one of MATCH_ONCE or MATCH_NOMATCH. */
-       RRETURN(MATCH_NOMATCH);
+       RRETURN(rrc);
        }
      /* FALL THROUGH ... Insufficient room for saving captured contents. Treat
-Line 857 
 for (;;)
+Line 969 
 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 += _pcre_OP_lengths[*ecode];
+         goto TAIL_RECURSE;
+         }
+       /* In all other cases, we have to make another call to match(). */
+       RMATCH(eptr, ecode + _pcre_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 uschar *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, eptrb,
+     /* Handle possessive capturing brackets with an unlimited repeat. We come
-           flags, RM48);
+     here from BRAZERO with allow_zero set TRUE. The offset_vector values are
-         if (rrc == MATCH_NOMATCH) md->mark = markptr;
+     handled similarly to the normal case above. However, the matching is
-         RRETURN(rrc);
+     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 = 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 + _pcre_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, eptrb,
+       if (allow_zero || matched_once)
-         flags, RM2);
+         {
-       if (rrc != MATCH_NOMATCH &&
+         ecode += 1 + LINK_SIZE;
-           (rrc != MATCH_THEN || md->start_match_ptr != ecode))
+         break;
-         RRETURN(rrc);
+         }
+       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 = ecode - md->start_code;
+     for (;;)
+       {
+       if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
+       RMATCH(eptr, ecode + _pcre_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. */
-Line 916 
 for (;;)
+Line 1218 
 for (;;)
        if (pcre_callout != NULL)
          {
          pcre_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;
          cb.subject          = (PCRE_SPTR)md->start_subject;
-Line 928 
 for (;;)
+Line 1230 
 for (;;)
          cb.capture_top      = offset_top/2;
          cb.capture_last     = md->capture_last;
          cb.callout_data     = md->callout_data;
-         if ((rrc = (*pcre_callout)(&cb)) > 0) MRRETURN(MATCH_NOMATCH);
+         cb.mark             = md->nomatch_mark;
+         if ((rrc = (*pcre_callout)(&cb)) > 0) RRETURN(MATCH_NOMATCH);
          if (rrc < 0) RRETURN(rrc);
          }
        ecode += _pcre_OP_lengths[OP_CALLOUT];
-Line 948 
 for (;;)
+Line 1251 
 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;
            for (i = 0; i < md->name_count; i++)
-Line 1081 
 for (;;)
+Line 1384 
 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, 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);
          }
-       else if (rrc != MATCH_NOMATCH &&
-               (rrc != MATCH_THEN || md->start_match_ptr != ecode))
+       /* 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 1106 
 for (;;)
+Line 1414 
 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, eptrb, match_cbegroup, RM49);
-         RRETURN(rrc);
-         }
-       else                       /* Group must match something */
          {
-         flags = 0;
+         ecode += 1 + LINK_SIZE;
          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 1156 
 for (;;)
+Line 1470 
 for (;;)
      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;
-       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 &&
-       MRRETURN(MATCH_NOMATCH);
+              mstart == md->start_subject + md->start_offset)))
+       RRETURN(MATCH_NOMATCH);
      /* Otherwise, we have a match. */
-Line 1192 
 for (;;)
+Line 1495 
 for (;;)
      md->start_match_ptr = mstart;       /* and the start (\K can modify) */
      /* For some reason, the macros don't work properly if an expression is
-     given as the argument to MRRETURN when the heap is in use. */
+     given as the argument to RRETURN when the heap is in use. */
      rrc = (op == OP_END)? MATCH_MATCH : MATCH_ACCEPT;
-     MRRETURN(rrc);
+     RRETURN(rrc);
      /* 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, NULL, 0,
+       RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM4);
-         RM4);
        if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)
          {
          mstart = md->start_match_ptr;   /* In case \K reset it */
          break;
          }
-       if (rrc != MATCH_NOMATCH &&
-           (rrc != MATCH_THEN || md->start_match_ptr != ecode))
+       /* PCRE does not allow THEN to escape beyond an assertion; it is treated
-         RRETURN(rrc);
+       as NOMATCH. */
+       if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
        ecode += GET(ecode, 1);
        }
      while (*ecode == OP_ALT);
-     if (*ecode == OP_KET) MRRETURN(MATCH_NOMATCH);
+     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 1240 
 for (;;)
+Line 1557 
 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, 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 || rrc == MATCH_ACCEPT) MRRETURN(MATCH_NOMATCH);
        if (rrc == MATCH_SKIP || rrc == MATCH_PRUNE || rrc == MATCH_COMMIT)
          {
          do ecode += GET(ecode,1); while (*ecode == OP_ALT);
          break;
          }
-       if (rrc != MATCH_NOMATCH &&
-           (rrc != MATCH_THEN || md->start_match_ptr != ecode))
+       /* PCRE does not allow THEN to escape beyond an assertion; it is treated
-         RRETURN(rrc);
+       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 1275 
 for (;;)
+Line 1600 
 for (;;)
        while (i-- > 0)
          {
          eptr--;
-         if (eptr < md->start_subject) MRRETURN(MATCH_NOMATCH);
+         if (eptr < md->start_subject) RRETURN(MATCH_NOMATCH);
          BACKCHAR(eptr);
          }
        }
-Line 1286 
 for (;;)
+Line 1611 
 for (;;)
        {
        eptr -= GET(ecode, 1);
-       if (eptr < md->start_subject) MRRETURN(MATCH_NOMATCH);
+       if (eptr < md->start_subject) RRETURN(MATCH_NOMATCH);
        }
      /* Save the earliest consulted character, then skip to next op code */
-Line 1303 
 for (;;)
+Line 1628 
 for (;;)
      if (pcre_callout != NULL)
        {
        pcre_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;
        cb.subject          = (PCRE_SPTR)md->start_subject;
-Line 1315 
 for (;;)
+Line 1640 
 for (;;)
        cb.capture_top      = offset_top/2;
        cb.capture_last     = md->capture_last;
        cb.callout_data     = md->callout_data;
-       if ((rrc = (*pcre_callout)(&cb)) > 0) MRRETURN(MATCH_NOMATCH);
+       cb.mark             = md->nomatch_mark;
+       if ((rrc = (*pcre_callout)(&cb)) > 0) RRETURN(MATCH_NOMATCH);
        if (rrc < 0) RRETURN(rrc);
        }
      ecode += 2 + 2*LINK_SIZE;
-Line 1325 
 for (;;)
+Line 1651 
 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 1367 
 for (;;)
+Line 1703 
 for (;;)
            (int *)(pcre_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_offset_top = offset_top;
-       /* 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
          {
+         if (cbegroup) md->match_function_type = MATCH_CBEGROUP;
          RMATCH(eptr, callpat + _pcre_OP_lengths[*callpat], offset_top,
-           md, eptrb, flags, RM6);
+           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);
-           MRRETURN(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 */
            }
-         else if (rrc != MATCH_NOMATCH &&
-                 (rrc != MATCH_THEN || md->start_match_ptr != ecode))
+         /* 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)
-Line 1399 
 for (;;)
+Line 1747 
 for (;;)
            }
          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 1409 
 for (;;)
+Line 1755 
 for (;;)
        md->recursive = new_recursive.prevrec;
        if (new_recursive.offset_save != stacksave)
          (pcre_free)(new_recursive.offset_save);
-       MRRETURN(MATCH_NOMATCH);
+       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, but resetting
-     the start-of-match value in case it was changed by \K. */
-     case OP_ONCE:
-     prev = ecode;
-     saved_eptr = eptr;
-     do
-       {
-       RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, 0, RM7);
-       if (rrc == MATCH_MATCH)  /* Note: _not_ MATCH_ACCEPT */
-         {
-         mstart = md->start_match_ptr;
-         break;
-         }
-       if (rrc != MATCH_NOMATCH &&
-           (rrc != MATCH_THEN || md->start_match_ptr != ecode))
-         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
+     RECURSION_MATCHED:
-     preceding bracket, in the appropriate order. The second "call" of match()
+     break;
-     uses tail recursion, to avoid using another stack frame. */
-     if (*ecode == OP_KETRMIN)
-       {
-       RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, 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, 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 1500 
 for (;;)
+Line 1775 
 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, 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, 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 or an atomic group, stop
+     /* If we are at the end of an assertion group or a non-capturing atomic
-     matching and return MATCH_MATCH, but record the current high water mark for
+     group, stop matching and return MATCH_MATCH, but record the current high
-     use by positive assertions. We also need to record the match start in case
+     water mark for use by positive assertions. We also need to record the match
-     it was changed by \K. */
+     start in case it was changed by \K. */
-     if (*prev == OP_ASSERT || *prev == OP_ASSERT_NOT ||
+     if ((*prev >= OP_ASSERT && *prev <= OP_ASSERTBACK_NOT) ||
-         *prev == OP_ASSERTBACK || *prev == OP_ASSERTBACK_NOT ||
+          *prev == OP_ONCE_NC)
-         *prev == OP_ONCE)
        {
-       md->end_match_ptr = eptr;      /* For ONCE */
+       md->end_match_ptr = eptr;      /* For ONCE_NC */
        md->end_offset_top = offset_top;
        md->start_match_ptr = mstart;
-       MRRETURN(MATCH_MATCH);
+       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 1576 
 for (;;)
+Line 1857 
 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] = (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 */
-         memcpy(md->offset_vector, rec->offset_save,
+         RRETURN(MATCH_ONCE);
-           rec->saved_max * sizeof(int));
-         offset_top = rec->save_offset_top;
-         ecode = rec->after_call;
-         break;
          }
+       ecode += 1 + LINK_SIZE;    /* Carry on at this level */
+       break;
        }
-     /* For a non-repeating ket, just continue at this level. This also
+     /* OP_KETRPOS is a possessive repeating ket. Remember the current position,
-     happens for a repeating ket if no characters were matched in the group.
+     and return the MATCH_KETRPOS. This makes it possible to do the repeats one
-     This is the forcible breaking of infinite loops as implemented in Perl
+     at a time from the outer level, thus saving stack. */
-.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, 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, 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 1634 
 for (;;)
+Line 1958 
 for (;;)
        }
      else  /* OP_KETRMAX */
        {
-       RMATCH(eptr, prev, offset_top, md, 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 */
-Line 1645 
 for (;;)
+Line 1977 
 for (;;)
      /* Not multiline mode: start of subject assertion, unless notbol. */
      case OP_CIRC:
-     if (md->notbol && eptr == md->start_subject) MRRETURN(MATCH_NOMATCH);
+     if (md->notbol && eptr == md->start_subject) RRETURN(MATCH_NOMATCH);
      /* Start of subject assertion */
      case OP_SOD:
-     if (eptr != md->start_subject) MRRETURN(MATCH_NOMATCH);
+     if (eptr != md->start_subject) RRETURN(MATCH_NOMATCH);
      ecode++;
      break;
      /* Multiline mode: start of subject unless notbol, or after any newline. */
      case OP_CIRCM:
-     if (md->notbol && eptr == md->start_subject) MRRETURN(MATCH_NOMATCH);
+     if (md->notbol && eptr == md->start_subject) RRETURN(MATCH_NOMATCH);
      if (eptr != md->start_subject &&
          (eptr == md->end_subject || !WAS_NEWLINE(eptr)))
-       MRRETURN(MATCH_NOMATCH);
+       RRETURN(MATCH_NOMATCH);
      ecode++;
      break;
      /* Start of match assertion */
      case OP_SOM:
-     if (eptr != md->start_subject + md->start_offset) MRRETURN(MATCH_NOMATCH);
+     if (eptr != md->start_subject + md->start_offset) RRETURN(MATCH_NOMATCH);
      ecode++;
      break;
-Line 1683 
 for (;;)
+Line 2015 
 for (;;)
      case OP_DOLLM:
      if (eptr < md->end_subject)
-       { if (!IS_NEWLINE(eptr)) MRRETURN(MATCH_NOMATCH); }
+       { if (!IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH); }
      else
        {
-       if (md->noteol) MRRETURN(MATCH_NOMATCH);
+       if (md->noteol) RRETURN(MATCH_NOMATCH);
        SCHECK_PARTIAL();
        }
      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) MRRETURN(MATCH_NOMATCH);
+     if (md->noteol) RRETURN(MATCH_NOMATCH);
      if (!md->endonly) goto ASSERT_NL_OR_EOS;
      /* ... else fall through for endonly */
-Line 1704 
 for (;;)
+Line 2036 
 for (;;)
      /* End of subject assertion (\z) */
      case OP_EOD:
-     if (eptr < md->end_subject) MRRETURN(MATCH_NOMATCH);
+     if (eptr < md->end_subject) RRETURN(MATCH_NOMATCH);
      SCHECK_PARTIAL();
      ecode++;
      break;
-Line 1715 
 for (;;)
+Line 2047 
 for (;;)
      ASSERT_NL_OR_EOS:
      if (eptr < md->end_subject &&
          (!IS_NEWLINE(eptr) || eptr != md->end_subject - md->nllen))
-       MRRETURN(MATCH_NOMATCH);
+       RRETURN(MATCH_NOMATCH);
      /* Either at end of string or \n before end. */
-Line 1837 
 for (;;)
+Line 2169 
 for (;;)
        if ((*ecode++ == OP_WORD_BOUNDARY)?
             cur_is_word == prev_is_word : cur_is_word != prev_is_word)
-         MRRETURN(MATCH_NOMATCH);
+         RRETURN(MATCH_NOMATCH);
        }
      break;
      /* Match a single character type; inline for speed */
      case OP_ANY:
-     if (IS_NEWLINE(eptr)) MRRETURN(MATCH_NOMATCH);
+     if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);
      /* 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();
-       MRRETURN(MATCH_NOMATCH);
+       RRETURN(MATCH_NOMATCH);
        }
+     eptr++;
      if (utf8) while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
      ecode++;
      break;
-Line 1861 
 for (;;)
+Line 2194 
 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();
-       MRRETURN(MATCH_NOMATCH);
+       RRETURN(MATCH_NOMATCH);
        }
+     eptr++;
      ecode++;
      break;
-Line 1873 
 for (;;)
+Line 2207 
 for (;;)
      if (eptr >= md->end_subject)
        {
        SCHECK_PARTIAL();
-       MRRETURN(MATCH_NOMATCH);
+       RRETURN(MATCH_NOMATCH);
        }
      GETCHARINCTEST(c, eptr);
      if (
-Line 1882 
 for (;;)
+Line 2216 
 for (;;)
  #endif
         (md->ctypes[c] & ctype_digit) != 0
         )
-       MRRETURN(MATCH_NOMATCH);
+       RRETURN(MATCH_NOMATCH);
      ecode++;
      break;
-Line 1890 
 for (;;)
+Line 2224 
 for (;;)
      if (eptr >= md->end_subject)
        {
        SCHECK_PARTIAL();
-       MRRETURN(MATCH_NOMATCH);
+       RRETURN(MATCH_NOMATCH);
        }
      GETCHARINCTEST(c, eptr);
      if (
-Line 1899 
 for (;;)
+Line 2233 
 for (;;)
  #endif
         (md->ctypes[c] & ctype_digit) == 0
         )
-       MRRETURN(MATCH_NOMATCH);
+       RRETURN(MATCH_NOMATCH);
      ecode++;
      break;
-Line 1907 
 for (;;)
+Line 2241 
 for (;;)
      if (eptr >= md->end_subject)
        {
        SCHECK_PARTIAL();
-       MRRETURN(MATCH_NOMATCH);
+       RRETURN(MATCH_NOMATCH);
        }
      GETCHARINCTEST(c, eptr);
      if (
-Line 1916 
 for (;;)
+Line 2250 
 for (;;)
  #endif
         (md->ctypes[c] & ctype_space) != 0
         )
-       MRRETURN(MATCH_NOMATCH);
+       RRETURN(MATCH_NOMATCH);
      ecode++;
      break;
-Line 1924 
 for (;;)
+Line 2258 
 for (;;)
      if (eptr >= md->end_subject)
        {
        SCHECK_PARTIAL();
-       MRRETURN(MATCH_NOMATCH);
+       RRETURN(MATCH_NOMATCH);
        }
      GETCHARINCTEST(c, eptr);
      if (
-Line 1933 
 for (;;)
+Line 2267 
 for (;;)
  #endif
         (md->ctypes[c] & ctype_space) == 0
         )
-       MRRETURN(MATCH_NOMATCH);
+       RRETURN(MATCH_NOMATCH);
      ecode++;
      break;
-Line 1941 
 for (;;)
+Line 2275 
 for (;;)
      if (eptr >= md->end_subject)
        {
        SCHECK_PARTIAL();
-       MRRETURN(MATCH_NOMATCH);
+       RRETURN(MATCH_NOMATCH);
        }
      GETCHARINCTEST(c, eptr);
      if (
-Line 1950 
 for (;;)
+Line 2284 
 for (;;)
  #endif
         (md->ctypes[c] & ctype_word) != 0
         )
-       MRRETURN(MATCH_NOMATCH);
+       RRETURN(MATCH_NOMATCH);
      ecode++;
      break;
-Line 1958 
 for (;;)
+Line 2292 
 for (;;)
      if (eptr >= md->end_subject)
        {
        SCHECK_PARTIAL();
-       MRRETURN(MATCH_NOMATCH);
+       RRETURN(MATCH_NOMATCH);
        }
      GETCHARINCTEST(c, eptr);
      if (
-Line 1967 
 for (;;)
+Line 2301 
 for (;;)
  #endif
         (md->ctypes[c] & ctype_word) == 0
         )
-       MRRETURN(MATCH_NOMATCH);
+       RRETURN(MATCH_NOMATCH);
      ecode++;
      break;
-Line 1975 
 for (;;)
+Line 2309 
 for (;;)
      if (eptr >= md->end_subject)
        {
        SCHECK_PARTIAL();
-       MRRETURN(MATCH_NOMATCH);
+       RRETURN(MATCH_NOMATCH);
        }
      GETCHARINCTEST(c, eptr);
      switch(c)
        {
-       default: MRRETURN(MATCH_NOMATCH);
+       default: RRETURN(MATCH_NOMATCH);
        case 0x000d:
        if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
        break;
-Line 1994 
 for (;;)
+Line 2328 
 for (;;)
        case 0x0085:
        case 0x2028:
        case 0x2029:
-       if (md->bsr_anycrlf) MRRETURN(MATCH_NOMATCH);
+       if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
        break;
        }
      ecode++;
-Line 2004 
 for (;;)
+Line 2338 
 for (;;)
      if (eptr >= md->end_subject)
        {
        SCHECK_PARTIAL();
-       MRRETURN(MATCH_NOMATCH);
+       RRETURN(MATCH_NOMATCH);
        }
      GETCHARINCTEST(c, eptr);
      switch(c)
-Line 2029 
 for (;;)
+Line 2363 
 for (;;)
        case 0x202f:    /* NARROW NO-BREAK SPACE */
        case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
        case 0x3000:    /* IDEOGRAPHIC SPACE */
-       MRRETURN(MATCH_NOMATCH);
+       RRETURN(MATCH_NOMATCH);
        }
      ecode++;
      break;
-Line 2038 
 for (;;)
+Line 2372 
 for (;;)
      if (eptr >= md->end_subject)
        {
        SCHECK_PARTIAL();
-       MRRETURN(MATCH_NOMATCH);
+       RRETURN(MATCH_NOMATCH);
        }
      GETCHARINCTEST(c, eptr);
      switch(c)
        {
-       default: MRRETURN(MATCH_NOMATCH);
+       default: RRETURN(MATCH_NOMATCH);
        case 0x09:      /* HT */
        case 0x20:      /* SPACE */
        case 0xa0:      /* NBSP */
-Line 2072 
 for (;;)
+Line 2406 
 for (;;)
      if (eptr >= md->end_subject)
        {
        SCHECK_PARTIAL();
-       MRRETURN(MATCH_NOMATCH);
+       RRETURN(MATCH_NOMATCH);
        }
      GETCHARINCTEST(c, eptr);
      switch(c)
-Line 2085 
 for (;;)
+Line 2419 
 for (;;)
        case 0x85:      /* NEL */
        case 0x2028:    /* LINE SEPARATOR */
        case 0x2029:    /* PARAGRAPH SEPARATOR */
-       MRRETURN(MATCH_NOMATCH);
+       RRETURN(MATCH_NOMATCH);
        }
      ecode++;
      break;
-Line 2094 
 for (;;)
+Line 2428 
 for (;;)
      if (eptr >= md->end_subject)
        {
        SCHECK_PARTIAL();
-       MRRETURN(MATCH_NOMATCH);
+       RRETURN(MATCH_NOMATCH);
        }
      GETCHARINCTEST(c, eptr);
      switch(c)
        {
-       default: MRRETURN(MATCH_NOMATCH);
+       default: RRETURN(MATCH_NOMATCH);
        case 0x0a:      /* LF */
        case 0x0b:      /* VT */
        case 0x0c:      /* FF */
-Line 2121 
 for (;;)
+Line 2455 
 for (;;)
      if (eptr >= md->end_subject)
        {
        SCHECK_PARTIAL();
-       MRRETURN(MATCH_NOMATCH);
+       RRETURN(MATCH_NOMATCH);
        }
      GETCHARINCTEST(c, eptr);
        {
-Line 2130 
 for (;;)
+Line 2464 
 for (;;)
        switch(ecode[1])
          {
          case PT_ANY:
-         if (op == OP_NOTPROP) MRRETURN(MATCH_NOMATCH);
+         if (op == OP_NOTPROP) RRETURN(MATCH_NOMATCH);
          break;
          case PT_LAMP:
          if ((prop->chartype == ucp_Lu ||
               prop->chartype == ucp_Ll ||
               prop->chartype == ucp_Lt) == (op == OP_NOTPROP))
-           MRRETURN(MATCH_NOMATCH);
+           RRETURN(MATCH_NOMATCH);
          break;
          case PT_GC:
          if ((ecode[2] != _pcre_ucp_gentype[prop->chartype]) == (op == OP_PROP))
-           MRRETURN(MATCH_NOMATCH);
+           RRETURN(MATCH_NOMATCH);
          break;
          case PT_PC:
          if ((ecode[2] != prop->chartype) == (op == OP_PROP))
-           MRRETURN(MATCH_NOMATCH);
+           RRETURN(MATCH_NOMATCH);
          break;
          case PT_SC:
          if ((ecode[2] != prop->script) == (op == OP_PROP))
-           MRRETURN(MATCH_NOMATCH);
+           RRETURN(MATCH_NOMATCH);
          break;
          /* These are specials */
-Line 2160 
 for (;;)
+Line 2494 
 for (;;)
          case PT_ALNUM:
          if ((_pcre_ucp_gentype[prop->chartype] == ucp_L ||
               _pcre_ucp_gentype[prop->chartype] == ucp_N) == (op == OP_NOTPROP))
-           MRRETURN(MATCH_NOMATCH);
+           RRETURN(MATCH_NOMATCH);
          break;
          case PT_SPACE:    /* Perl space */
          if ((_pcre_ucp_gentype[prop->chartype] == ucp_Z ||
               c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR)
                 == (op == OP_NOTPROP))
-           MRRETURN(MATCH_NOMATCH);
+           RRETURN(MATCH_NOMATCH);
          break;
          case PT_PXSPACE:  /* POSIX space */
-Line 2175 
 for (;;)
+Line 2509 
 for (;;)
               c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||
               c == CHAR_FF || c == CHAR_CR)
                 == (op == OP_NOTPROP))
-           MRRETURN(MATCH_NOMATCH);
+           RRETURN(MATCH_NOMATCH);
          break;
          case PT_WORD:
          if ((_pcre_ucp_gentype[prop->chartype] == ucp_L ||
               _pcre_ucp_gentype[prop->chartype] == ucp_N ||
               c == CHAR_UNDERSCORE) == (op == OP_NOTPROP))
-           MRRETURN(MATCH_NOMATCH);
+           RRETURN(MATCH_NOMATCH);
          break;
          /* This should never occur */
-Line 2202 
 for (;;)
+Line 2536 
 for (;;)
      if (eptr >= md->end_subject)
        {
        SCHECK_PARTIAL();
-       MRRETURN(MATCH_NOMATCH);
+       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) MRRETURN(MATCH_NOMATCH);
+       if (!utf8) 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 2234 
 for (;;)
+Line 2561 
 for (;;)
      loops). */
      case OP_REF:
      case OP_REFI:
      caseless = op == OP_REFI;
      offset = GET2(ecode, 1) << 1;               /* Doubled ref number */
      ecode += 3;
-Line 2286 
 for (;;)
+Line 2613 
 for (;;)
        if ((length = match_ref(offset, eptr, length, md, caseless)) < 0)
          {
          CHECK_PARTIAL();
-         MRRETURN(MATCH_NOMATCH);
+         RRETURN(MATCH_NOMATCH);
          }
        eptr += length;
        continue;              /* With the main loop */
-Line 2303 
 for (;;)
+Line 2630 
 for (;;)
      for (i = 1; i <= min; i++)
        {
        int slength;
        if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
          {
          CHECK_PARTIAL();
-         MRRETURN(MATCH_NOMATCH);
+         RRETURN(MATCH_NOMATCH);
          }
        eptr += slength;
        }
-Line 2323 
 for (;;)
+Line 2650 
 for (;;)
        {
        for (fi = min;; fi++)
          {
          int slength;
-         RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM14);
+         RMATCH(eptr, ecode, offset_top, md, eptrb, RM14);
          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-         if (fi >= max) MRRETURN(MATCH_NOMATCH);
+         if (fi >= max) RRETURN(MATCH_NOMATCH);
          if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
            {
            CHECK_PARTIAL();
-           MRRETURN(MATCH_NOMATCH);
+           RRETURN(MATCH_NOMATCH);
            }
          eptr += slength;
          }
-Line 2344 
 for (;;)
+Line 2671 
 for (;;)
        pp = eptr;
        for (i = min; i < max; i++)
          {
          int slength;
          if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
            {
            CHECK_PARTIAL();
-Line 2354 
 for (;;)
+Line 2681 
 for (;;)
          }
        while (eptr >= pp)
          {
-         RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM15);
+         RMATCH(eptr, ecode, offset_top, md, eptrb, RM15);
          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
          eptr -= length;
          }
-       MRRETURN(MATCH_NOMATCH);
+       RRETURN(MATCH_NOMATCH);
        }
      /* Control never gets here */
-Line 2419 
 for (;;)
+Line 2746 
 for (;;)
            if (eptr >= md->end_subject)
              {
              SCHECK_PARTIAL();
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
              }
            GETCHARINC(c, eptr);
            if (c > 255)
              {
-             if (op == OP_CLASS) MRRETURN(MATCH_NOMATCH);
+             if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
              }
            else
              {
-             if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);
+             if ((data[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
              }
            }
          }
-Line 2441 
 for (;;)
+Line 2768 
 for (;;)
            if (eptr >= md->end_subject)
              {
              SCHECK_PARTIAL();
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
              }
            c = *eptr++;
-           if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);
+           if ((data[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
            }
          }
-Line 2464 
 for (;;)
+Line 2791 
 for (;;)
            {
            for (fi = min;; fi++)
              {
-             RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM16);
+             RMATCH(eptr, ecode, offset_top, md, eptrb, RM16);
              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-             if (fi >= max) MRRETURN(MATCH_NOMATCH);
+             if (fi >= max) RRETURN(MATCH_NOMATCH);
              if (eptr >= md->end_subject)
                {
                SCHECK_PARTIAL();
-               MRRETURN(MATCH_NOMATCH);
+               RRETURN(MATCH_NOMATCH);
                }
              GETCHARINC(c, eptr);
              if (c > 255)
                {
-               if (op == OP_CLASS) MRRETURN(MATCH_NOMATCH);
+               if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
                }
              else
                {
-               if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);
+               if ((data[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
                }
              }
            }
-Line 2489 
 for (;;)
+Line 2816 
 for (;;)
            {
            for (fi = min;; fi++)
              {
-             RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM17);
+             RMATCH(eptr, ecode, offset_top, md, eptrb, RM17);
              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-             if (fi >= max) MRRETURN(MATCH_NOMATCH);
+             if (fi >= max) RRETURN(MATCH_NOMATCH);
              if (eptr >= md->end_subject)
                {
                SCHECK_PARTIAL();
-               MRRETURN(MATCH_NOMATCH);
+               RRETURN(MATCH_NOMATCH);
                }
              c = *eptr++;
-             if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);
+             if ((data[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
              }
            }
          /* Control never gets here */
-Line 2535 
 for (;;)
+Line 2862 
 for (;;)
              }
            for (;;)
              {
-             RMATCH(eptr, ecode, offset_top, md, 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 2558 
 for (;;)
+Line 2885 
 for (;;)
              }
            while (eptr >= pp)
              {
-             RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM19);
+             RMATCH(eptr, ecode, offset_top, md, eptrb, RM19);
              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
              eptr--;
              }
            }
-         MRRETURN(MATCH_NOMATCH);
+         RRETURN(MATCH_NOMATCH);
          }
        }
      /* Control never gets here */
-Line 2616 
 for (;;)
+Line 2943 
 for (;;)
          if (eptr >= md->end_subject)
            {
            SCHECK_PARTIAL();
-           MRRETURN(MATCH_NOMATCH);
+           RRETURN(MATCH_NOMATCH);
            }
          GETCHARINCTEST(c, eptr);
-         if (!_pcre_xclass(c, data)) MRRETURN(MATCH_NOMATCH);
+         if (!_pcre_xclass(c, data)) RRETURN(MATCH_NOMATCH);
          }
        /* If max == min we can continue with the main loop without the
-Line 2634 
 for (;;)
+Line 2961 
 for (;;)
          {
          for (fi = min;; fi++)
            {
-           RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM20);
+           RMATCH(eptr, ecode, offset_top, md, eptrb, RM20);
            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-           if (fi >= max) MRRETURN(MATCH_NOMATCH);
+           if (fi >= max) RRETURN(MATCH_NOMATCH);
            if (eptr >= md->end_subject)
              {
              SCHECK_PARTIAL();
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
              }
            GETCHARINCTEST(c, eptr);
-           if (!_pcre_xclass(c, data)) MRRETURN(MATCH_NOMATCH);
+           if (!_pcre_xclass(c, data)) RRETURN(MATCH_NOMATCH);
            }
          /* Control never gets here */
          }
-Line 2667 
 for (;;)
+Line 2994 
 for (;;)
            }
          for(;;)
            {
-           RMATCH(eptr, ecode, offset_top, md, 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);
            }
-         MRRETURN(MATCH_NOMATCH);
+         RRETURN(MATCH_NOMATCH);
          }
        /* Control never gets here */
-Line 2691 
 for (;;)
+Line 3018 
 for (;;)
        if (length > md->end_subject - eptr)
          {
          CHECK_PARTIAL();             /* Not SCHECK_PARTIAL() */
-         MRRETURN(MATCH_NOMATCH);
+         RRETURN(MATCH_NOMATCH);
          }
-       while (length-- > 0) if (*ecode++ != *eptr++) MRRETURN(MATCH_NOMATCH);
+       while (length-- > 0) if (*ecode++ != *eptr++) RRETURN(MATCH_NOMATCH);
        }
      else
  #endif
-Line 2703 
 for (;;)
+Line 3030 
 for (;;)
        if (md->end_subject - eptr < 1)
          {
          SCHECK_PARTIAL();            /* This one can use SCHECK_PARTIAL() */
-         MRRETURN(MATCH_NOMATCH);
+         RRETURN(MATCH_NOMATCH);
          }
-       if (ecode[1] != *eptr++) MRRETURN(MATCH_NOMATCH);
+       if (ecode[1] != *eptr++) RRETURN(MATCH_NOMATCH);
        ecode += 2;
        }
      break;
-Line 2723 
 for (;;)
+Line 3050 
 for (;;)
        if (length > md->end_subject - eptr)
          {
          CHECK_PARTIAL();             /* Not SCHECK_PARTIAL() */
-         MRRETURN(MATCH_NOMATCH);
+         RRETURN(MATCH_NOMATCH);
          }
        /* If the pattern character's value is < 128, we have only one byte, and
-Line 2731 
 for (;;)
+Line 3058 
 for (;;)
        if (fc < 128)
          {
-         if (md->lcc[*ecode++] != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);
+         if (md->lcc[*ecode++] != md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH);
          }
        /* Otherwise we must pick up the subject character */
-Line 2750 
 for (;;)
+Line 3077 
 for (;;)
  #ifdef SUPPORT_UCP
            if (dc != UCD_OTHERCASE(fc))
  #endif
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
            }
          }
        }
-Line 2762 
 for (;;)
+Line 3089 
 for (;;)
        if (md->end_subject - eptr < 1)
          {
          SCHECK_PARTIAL();            /* This one can use SCHECK_PARTIAL() */
-         MRRETURN(MATCH_NOMATCH);
+         RRETURN(MATCH_NOMATCH);
          }
-       if (md->lcc[ecode[1]] != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);
+       if (md->lcc[ecode[1]] != md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH);
        ecode += 2;
        }
      break;
-Line 2870 
 for (;;)
+Line 3197 
 for (;;)
            else
              {
              CHECK_PARTIAL();
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
              }
            }
-Line 2880 
 for (;;)
+Line 3207 
 for (;;)
            {
            for (fi = min;; fi++)
              {
-             RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM22);
+             RMATCH(eptr, ecode, offset_top, md, eptrb, RM22);
              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-             if (fi >= max) MRRETURN(MATCH_NOMATCH);
+             if (fi >= max) RRETURN(MATCH_NOMATCH);
              if (eptr <= md->end_subject - length &&
                memcmp(eptr, charptr, length) == 0) eptr += length;
  #ifdef SUPPORT_UCP
-Line 2893 
 for (;;)
+Line 3220 
 for (;;)
              else
                {
                CHECK_PARTIAL();
-               MRRETURN(MATCH_NOMATCH);
+               RRETURN(MATCH_NOMATCH);
                }
              }
            /* Control never gets here */
-Line 2922 
 for (;;)
+Line 3249 
 for (;;)
            for(;;)
              {
-             RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM23);
+             RMATCH(eptr, ecode, offset_top, md, eptrb, RM23);
              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-             if (eptr == pp) { MRRETURN(MATCH_NOMATCH); }
+             if (eptr == pp) { RRETURN(MATCH_NOMATCH); }
  #ifdef SUPPORT_UCP
              eptr--;
              BACKCHAR(eptr);
-Line 2967 
 for (;;)
+Line 3294 
 for (;;)
          if (eptr >= md->end_subject)
            {
            SCHECK_PARTIAL();
-           MRRETURN(MATCH_NOMATCH);
+           RRETURN(MATCH_NOMATCH);
            }
-         if (fc != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);
+         if (fc != md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH);
          }
        if (min == max) continue;
        if (minimize)
          {
          for (fi = min;; fi++)
            {
-           RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM24);
+           RMATCH(eptr, ecode, offset_top, md, eptrb, RM24);
            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-           if (fi >= max) MRRETURN(MATCH_NOMATCH);
+           if (fi >= max) RRETURN(MATCH_NOMATCH);
            if (eptr >= md->end_subject)
              {
              SCHECK_PARTIAL();
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
              }
-           if (fc != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);
+           if (fc != md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH);
            }
          /* Control never gets here */
          }
-Line 3006 
 for (;;)
+Line 3333 
 for (;;)
          while (eptr >= pp)
            {
-           RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM25);
+           RMATCH(eptr, ecode, offset_top, md, eptrb, RM25);
            eptr--;
            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
            }
-         MRRETURN(MATCH_NOMATCH);
+         RRETURN(MATCH_NOMATCH);
          }
        /* Control never gets here */
        }
-Line 3024 
 for (;;)
+Line 3351 
 for (;;)
          if (eptr >= md->end_subject)
            {
            SCHECK_PARTIAL();
-           MRRETURN(MATCH_NOMATCH);
+           RRETURN(MATCH_NOMATCH);
            }
-         if (fc != *eptr++) MRRETURN(MATCH_NOMATCH);
+         if (fc != *eptr++) RRETURN(MATCH_NOMATCH);
          }
        if (min == max) continue;
-Line 3035 
 for (;;)
+Line 3362 
 for (;;)
          {
          for (fi = min;; fi++)
            {
-           RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM26);
+           RMATCH(eptr, ecode, offset_top, md, eptrb, RM26);
            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-           if (fi >= max) MRRETURN(MATCH_NOMATCH);
+           if (fi >= max) RRETURN(MATCH_NOMATCH);
            if (eptr >= md->end_subject)
              {
              SCHECK_PARTIAL();
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
              }
-           if (fc != *eptr++) MRRETURN(MATCH_NOMATCH);
+           if (fc != *eptr++) RRETURN(MATCH_NOMATCH);
            }
          /* Control never gets here */
          }
-Line 3064 
 for (;;)
+Line 3391 
 for (;;)
          while (eptr >= pp)
            {
-           RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM27);
+           RMATCH(eptr, ecode, offset_top, md, eptrb, RM27);
            eptr--;
            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
            }
-         MRRETURN(MATCH_NOMATCH);
+         RRETURN(MATCH_NOMATCH);
          }
        }
      /* Control never gets here */
-Line 3077 
 for (;;)
+Line 3404 
 for (;;)
      checking can be multibyte. */
      case OP_NOT:
      case OP_NOTI:
      if (eptr >= md->end_subject)
        {
        SCHECK_PARTIAL();
-       MRRETURN(MATCH_NOMATCH);
+       RRETURN(MATCH_NOMATCH);
        }
      ecode++;
      GETCHARINCTEST(c, eptr);
-Line 3091 
 for (;;)
+Line 3418 
 for (;;)
        if (c < 256)
  #endif
        c = md->lcc[c];
-       if (md->lcc[*ecode++] == c) MRRETURN(MATCH_NOMATCH);
+       if (md->lcc[*ecode++] == c) RRETURN(MATCH_NOMATCH);
        }
      else    /* Caseful */
        {
-       if (*ecode++ == c) MRRETURN(MATCH_NOMATCH);
+       if (*ecode++ == c) RRETURN(MATCH_NOMATCH);
        }
      break;
-Line 3202 
 for (;;)
+Line 3529 
 for (;;)
            if (eptr >= md->end_subject)
              {
              SCHECK_PARTIAL();
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
              }
            GETCHARINC(d, eptr);
            if (d < 256) d = md->lcc[d];
-           if (fc == d) MRRETURN(MATCH_NOMATCH);
+           if (fc == d) RRETURN(MATCH_NOMATCH);
            }
          }
        else
-Line 3219 
 for (;;)
+Line 3546 
 for (;;)
            if (eptr >= md->end_subject)
              {
              SCHECK_PARTIAL();
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
              }
-           if (fc == md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);
+           if (fc == md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH);
            }
          }
-Line 3236 
 for (;;)
+Line 3563 
 for (;;)
            register unsigned int d;
            for (fi = min;; fi++)
              {
-             RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM28);
+             RMATCH(eptr, ecode, offset_top, md, eptrb, RM28);
              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-             if (fi >= max) MRRETURN(MATCH_NOMATCH);
+             if (fi >= max) RRETURN(MATCH_NOMATCH);
              if (eptr >= md->end_subject)
                {
                SCHECK_PARTIAL();
-               MRRETURN(MATCH_NOMATCH);
+               RRETURN(MATCH_NOMATCH);
                }
              GETCHARINC(d, eptr);
              if (d < 256) d = md->lcc[d];
-             if (fc == d) MRRETURN(MATCH_NOMATCH);
+             if (fc == d) RRETURN(MATCH_NOMATCH);
              }
            }
          else
-Line 3255 
 for (;;)
+Line 3582 
 for (;;)
            {
            for (fi = min;; fi++)
              {
-             RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM29);
+             RMATCH(eptr, ecode, offset_top, md, eptrb, RM29);
              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-             if (fi >= max) MRRETURN(MATCH_NOMATCH);
+             if (fi >= max) RRETURN(MATCH_NOMATCH);
              if (eptr >= md->end_subject)
                {
                SCHECK_PARTIAL();
-               MRRETURN(MATCH_NOMATCH);
+               RRETURN(MATCH_NOMATCH);
                }
-             if (fc == md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);
+             if (fc == md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH);
              }
            }
          /* Control never gets here */
-Line 3296 
 for (;;)
+Line 3623 
 for (;;)
          if (possessive) continue;
          for(;;)
              {
-             RMATCH(eptr, ecode, offset_top, md, 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 3319 
 for (;;)
+Line 3646 
 for (;;)
            if (possessive) continue;
            while (eptr >= pp)
              {
-             RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM31);
+             RMATCH(eptr, ecode, offset_top, md, eptrb, RM31);
              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
              eptr--;
              }
            }
-         MRRETURN(MATCH_NOMATCH);
+         RRETURN(MATCH_NOMATCH);
          }
        /* Control never gets here */
        }
-Line 3344 
 for (;;)
+Line 3671 
 for (;;)
            if (eptr >= md->end_subject)
              {
              SCHECK_PARTIAL();
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
              }
            GETCHARINC(d, eptr);
-           if (fc == d) MRRETURN(MATCH_NOMATCH);
+           if (fc == d) RRETURN(MATCH_NOMATCH);
            }
          }
        else
-Line 3359 
 for (;;)
+Line 3686 
 for (;;)
            if (eptr >= md->end_subject)
              {
              SCHECK_PARTIAL();
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
              }
-           if (fc == *eptr++) MRRETURN(MATCH_NOMATCH);
+           if (fc == *eptr++) RRETURN(MATCH_NOMATCH);
            }
          }
-Line 3376 
 for (;;)
+Line 3703 
 for (;;)
            register unsigned int d;
            for (fi = min;; fi++)
              {
-             RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM32);
+             RMATCH(eptr, ecode, offset_top, md, eptrb, RM32);
              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-             if (fi >= max) MRRETURN(MATCH_NOMATCH);
+             if (fi >= max) RRETURN(MATCH_NOMATCH);
              if (eptr >= md->end_subject)
                {
                SCHECK_PARTIAL();
-               MRRETURN(MATCH_NOMATCH);
+               RRETURN(MATCH_NOMATCH);
                }
              GETCHARINC(d, eptr);
-             if (fc == d) MRRETURN(MATCH_NOMATCH);
+             if (fc == d) RRETURN(MATCH_NOMATCH);
              }
            }
          else
-Line 3394 
 for (;;)
+Line 3721 
 for (;;)
            {
            for (fi = min;; fi++)
              {
-             RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM33);
+             RMATCH(eptr, ecode, offset_top, md, eptrb, RM33);
              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-             if (fi >= max) MRRETURN(MATCH_NOMATCH);
+             if (fi >= max) RRETURN(MATCH_NOMATCH);
              if (eptr >= md->end_subject)
                {
                SCHECK_PARTIAL();
-               MRRETURN(MATCH_NOMATCH);
+               RRETURN(MATCH_NOMATCH);
                }
-             if (fc == *eptr++) MRRETURN(MATCH_NOMATCH);
+             if (fc == *eptr++) RRETURN(MATCH_NOMATCH);
              }
            }
          /* Control never gets here */
-Line 3434 
 for (;;)
+Line 3761 
 for (;;)
            if (possessive) continue;
            for(;;)
              {
-             RMATCH(eptr, ecode, offset_top, md, 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 3457 
 for (;;)
+Line 3784 
 for (;;)
            if (possessive) continue;
            while (eptr >= pp)
              {
-             RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM35);
+             RMATCH(eptr, ecode, offset_top, md, eptrb, RM35);
              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
              eptr--;
              }
            }
-         MRRETURN(MATCH_NOMATCH);
+         RRETURN(MATCH_NOMATCH);
          }
        }
      /* Control never gets here */
-Line 3557 
 for (;;)
+Line 3884 
 for (;;)
          switch(prop_type)
            {
            case PT_ANY:
-           if (prop_fail_result) MRRETURN(MATCH_NOMATCH);
+           if (prop_fail_result) RRETURN(MATCH_NOMATCH);
            for (i = 1; i <= min; i++)
              {
              if (eptr >= md->end_subject)
                {
                SCHECK_PARTIAL();
-               MRRETURN(MATCH_NOMATCH);
+               RRETURN(MATCH_NOMATCH);
                }
              GETCHARINCTEST(c, eptr);
              }
-Line 3572 
 for (;;)
+Line 3899 
 for (;;)
            case PT_LAMP:
            for (i = 1; i <= min; i++)
              {
+             int chartype;
              if (eptr >= md->end_subject)
                {
                SCHECK_PARTIAL();
-               MRRETURN(MATCH_NOMATCH);
+               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)
-               MRRETURN(MATCH_NOMATCH);
+               RRETURN(MATCH_NOMATCH);
              }
            break;
-Line 3592 
 for (;;)
+Line 3920 
 for (;;)
              if (eptr >= md->end_subject)
                {
                SCHECK_PARTIAL();
-               MRRETURN(MATCH_NOMATCH);
+               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);
-               MRRETURN(MATCH_NOMATCH);
              }
            break;
-Line 3607 
 for (;;)
+Line 3934 
 for (;;)
              if (eptr >= md->end_subject)
                {
                SCHECK_PARTIAL();
-               MRRETURN(MATCH_NOMATCH);
+               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);
-               MRRETURN(MATCH_NOMATCH);
              }
            break;
-Line 3622 
 for (;;)
+Line 3948 
 for (;;)
              if (eptr >= md->end_subject)
                {
                SCHECK_PARTIAL();
-               MRRETURN(MATCH_NOMATCH);
+               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);
-               MRRETURN(MATCH_NOMATCH);
              }
            break;
            case PT_ALNUM:
            for (i = 1; i <= min; i++)
              {
+             int category;
              if (eptr >= md->end_subject)
                {
                SCHECK_PARTIAL();
-               MRRETURN(MATCH_NOMATCH);
+               RRETURN(MATCH_NOMATCH);
                }
              GETCHARINCTEST(c, eptr);
-             prop_category = UCD_CATEGORY(c);
+             category = UCD_CATEGORY(c);
-             if ((prop_category == ucp_L || prop_category == ucp_N)
+             if ((category == ucp_L || category == ucp_N) == prop_fail_result)
-                    == prop_fail_result)
+               RRETURN(MATCH_NOMATCH);
-               MRRETURN(MATCH_NOMATCH);
              }
            break;
-Line 3653 
 for (;;)
+Line 3978 
 for (;;)
              if (eptr >= md->end_subject)
                {
                SCHECK_PARTIAL();
-               MRRETURN(MATCH_NOMATCH);
+               RRETURN(MATCH_NOMATCH);
                }
              GETCHARINCTEST(c, eptr);
-             prop_category = UCD_CATEGORY(c);
+             if ((UCD_CATEGORY(c) == ucp_Z || c == CHAR_HT || c == CHAR_NL ||
-             if ((prop_category == ucp_Z || c == CHAR_HT || c == CHAR_NL ||
                   c == CHAR_FF || c == CHAR_CR)
                     == prop_fail_result)
-               MRRETURN(MATCH_NOMATCH);
+               RRETURN(MATCH_NOMATCH);
              }
            break;
-Line 3670 
 for (;;)
+Line 3994 
 for (;;)
              if (eptr >= md->end_subject)
                {
                SCHECK_PARTIAL();
-               MRRETURN(MATCH_NOMATCH);
+               RRETURN(MATCH_NOMATCH);
                }
              GETCHARINCTEST(c, eptr);
-             prop_category = UCD_CATEGORY(c);
+             if ((UCD_CATEGORY(c) == ucp_Z || c == CHAR_HT || c == CHAR_NL ||
-             if ((prop_category == ucp_Z || c == CHAR_HT || c == CHAR_NL ||
                   c == CHAR_VT || c == CHAR_FF || c == CHAR_CR)
                     == prop_fail_result)
-               MRRETURN(MATCH_NOMATCH);
+               RRETURN(MATCH_NOMATCH);
              }
            break;
            case PT_WORD:
            for (i = 1; i <= min; i++)
              {
+             int category;
              if (eptr >= md->end_subject)
                {
                SCHECK_PARTIAL();
-               MRRETURN(MATCH_NOMATCH);
+               RRETURN(MATCH_NOMATCH);
                }
              GETCHARINCTEST(c, eptr);
-             prop_category = UCD_CATEGORY(c);
+             category = UCD_CATEGORY(c);
-             if ((prop_category == ucp_L || prop_category == ucp_N ||
+             if ((category == ucp_L || category == ucp_N || c == CHAR_UNDERSCORE)
-                  c == CHAR_UNDERSCORE)
                     == prop_fail_result)
-               MRRETURN(MATCH_NOMATCH);
+               RRETURN(MATCH_NOMATCH);
              }
            break;
-Line 3715 
 for (;;)
+Line 4038 
 for (;;)
            if (eptr >= md->end_subject)
              {
              SCHECK_PARTIAL();
-             MRRETURN(MATCH_NOMATCH);
+             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) MRRETURN(MATCH_NOMATCH);
            while (eptr < md->end_subject)
              {
              int len = 1;
-             if (!utf8) c = *eptr;
+             if (!utf8) 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 3746 
 for (;;)
+Line 4066 
 for (;;)
            if (eptr >= md->end_subject)
              {
              SCHECK_PARTIAL();
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
              }
-           if (IS_NEWLINE(eptr)) MRRETURN(MATCH_NOMATCH);
+           if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);
            eptr++;
            while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
            }
-Line 3760 
 for (;;)
+Line 4080 
 for (;;)
            if (eptr >= md->end_subject)
              {
              SCHECK_PARTIAL();
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
              }
            eptr++;
            while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
-Line 3768 
 for (;;)
+Line 4088 
 for (;;)
          break;
          case OP_ANYBYTE:
-         if (eptr > md->end_subject - min) MRRETURN(MATCH_NOMATCH);
+         if (eptr > md->end_subject - min) RRETURN(MATCH_NOMATCH);
          eptr += min;
          break;
-Line 3778 
 for (;;)
+Line 4098 
 for (;;)
            if (eptr >= md->end_subject)
              {
              SCHECK_PARTIAL();
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
              }
            GETCHARINC(c, eptr);
            switch(c)
              {
-             default: MRRETURN(MATCH_NOMATCH);
+             default: RRETURN(MATCH_NOMATCH);
              case 0x000d:
              if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
              break;
-Line 3797 
 for (;;)
+Line 4117 
 for (;;)
              case 0x0085:
              case 0x2028:
              case 0x2029:
-             if (md->bsr_anycrlf) MRRETURN(MATCH_NOMATCH);
+             if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
              break;
              }
            }
-Line 3809 
 for (;;)
+Line 4129 
 for (;;)
            if (eptr >= md->end_subject)
              {
              SCHECK_PARTIAL();
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
              }
            GETCHARINC(c, eptr);
            switch(c)
-Line 3834 
 for (;;)
+Line 4154 
 for (;;)
              case 0x202f:    /* NARROW NO-BREAK SPACE */
              case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
              case 0x3000:    /* IDEOGRAPHIC SPACE */
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
              }
            }
          break;
-Line 3845 
 for (;;)
+Line 4165 
 for (;;)
            if (eptr >= md->end_subject)
              {
              SCHECK_PARTIAL();
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
              }
            GETCHARINC(c, eptr);
            switch(c)
              {
-             default: MRRETURN(MATCH_NOMATCH);
+             default: RRETURN(MATCH_NOMATCH);
              case 0x09:      /* HT */
              case 0x20:      /* SPACE */
              case 0xa0:      /* NBSP */
-Line 3881 
 for (;;)
+Line 4201 
 for (;;)
            if (eptr >= md->end_subject)
              {
              SCHECK_PARTIAL();
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
              }
            GETCHARINC(c, eptr);
            switch(c)
-Line 3894 
 for (;;)
+Line 4214 
 for (;;)
              case 0x85:      /* NEL */
              case 0x2028:    /* LINE SEPARATOR */
              case 0x2029:    /* PARAGRAPH SEPARATOR */
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
              }
            }
          break;
-Line 3905 
 for (;;)
+Line 4225 
 for (;;)
            if (eptr >= md->end_subject)
              {
              SCHECK_PARTIAL();
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
              }
            GETCHARINC(c, eptr);
            switch(c)
              {
-             default: MRRETURN(MATCH_NOMATCH);
+             default: RRETURN(MATCH_NOMATCH);
              case 0x0a:      /* LF */
              case 0x0b:      /* VT */
              case 0x0c:      /* FF */
-Line 3929 
 for (;;)
+Line 4249 
 for (;;)
            if (eptr >= md->end_subject)
              {
              SCHECK_PARTIAL();
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
              }
            GETCHARINC(c, eptr);
            if (c < 128 && (md->ctypes[c] & ctype_digit) != 0)
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
            }
          break;
-Line 3943 
 for (;;)
+Line 4263 
 for (;;)
            if (eptr >= md->end_subject)
              {
              SCHECK_PARTIAL();
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
              }
            if (*eptr >= 128 || (md->ctypes[*eptr++] & ctype_digit) == 0)
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
            /* No need to skip more bytes - we know it's a 1-byte character */
            }
          break;
-Line 3957 
 for (;;)
+Line 4277 
 for (;;)
            if (eptr >= md->end_subject)
              {
              SCHECK_PARTIAL();
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
              }
            if (*eptr < 128 && (md->ctypes[*eptr] & ctype_space) != 0)
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
            while (++eptr < md->end_subject && (*eptr & 0xc0) == 0x80);
            }
          break;
-Line 3971 
 for (;;)
+Line 4291 
 for (;;)
            if (eptr >= md->end_subject)
              {
              SCHECK_PARTIAL();
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
              }
            if (*eptr >= 128 || (md->ctypes[*eptr++] & ctype_space) == 0)
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
            /* No need to skip more bytes - we know it's a 1-byte character */
            }
          break;
-Line 3985 
 for (;;)
+Line 4305 
 for (;;)
            if (eptr >= md->end_subject)
              {
              SCHECK_PARTIAL();
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
              }
            if (*eptr < 128 && (md->ctypes[*eptr] & ctype_word) != 0)
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
            while (++eptr < md->end_subject && (*eptr & 0xc0) == 0x80);
            }
          break;
-Line 3999 
 for (;;)
+Line 4319 
 for (;;)
            if (eptr >= md->end_subject)
              {
              SCHECK_PARTIAL();
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
              }
            if (*eptr >= 128 || (md->ctypes[*eptr++] & ctype_word) == 0)
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
            /* No need to skip more bytes - we know it's a 1-byte character */
            }
          break;
-Line 4025 
 for (;;)
+Line 4345 
 for (;;)
            if (eptr >= md->end_subject)
              {
              SCHECK_PARTIAL();
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
              }
-           if (IS_NEWLINE(eptr)) MRRETURN(MATCH_NOMATCH);
+           if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);
            eptr++;
            }
          break;
-Line 4036 
 for (;;)
+Line 4356 
 for (;;)
          if (eptr > md->end_subject - min)
            {
            SCHECK_PARTIAL();
-           MRRETURN(MATCH_NOMATCH);
+           RRETURN(MATCH_NOMATCH);
            }
          eptr += min;
          break;
-Line 4045 
 for (;;)
+Line 4365 
 for (;;)
          if (eptr > md->end_subject - min)
            {
            SCHECK_PARTIAL();
-           MRRETURN(MATCH_NOMATCH);
+           RRETURN(MATCH_NOMATCH);
            }
          eptr += min;
          break;
-Line 4056 
 for (;;)
+Line 4376 
 for (;;)
            if (eptr >= md->end_subject)
              {
              SCHECK_PARTIAL();
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
              }
            switch(*eptr++)
              {
-             default: MRRETURN(MATCH_NOMATCH);
+             default: RRETURN(MATCH_NOMATCH);
              case 0x000d:
              if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
              break;
              case 0x000a:
              break;
              case 0x000b:
              case 0x000c:
              case 0x0085:
-             if (md->bsr_anycrlf) MRRETURN(MATCH_NOMATCH);
+             if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
              break;
              }
            }
-Line 4084 
 for (;;)
+Line 4404 
 for (;;)
            if (eptr >= md->end_subject)
              {
              SCHECK_PARTIAL();
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
              }
            switch(*eptr++)
              {
-Line 4092 
 for (;;)
+Line 4412 
 for (;;)
              case 0x09:      /* HT */
              case 0x20:      /* SPACE */
              case 0xa0:      /* NBSP */
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
              }
            }
          break;
-Line 4103 
 for (;;)
+Line 4423 
 for (;;)
            if (eptr >= md->end_subject)
              {
              SCHECK_PARTIAL();
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
              }
            switch(*eptr++)
              {
-             default: MRRETURN(MATCH_NOMATCH);
+             default: RRETURN(MATCH_NOMATCH);
              case 0x09:      /* HT */
              case 0x20:      /* SPACE */
              case 0xa0:      /* NBSP */
-Line 4122 
 for (;;)
+Line 4442 
 for (;;)
            if (eptr >= md->end_subject)
              {
              SCHECK_PARTIAL();
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
              }
            switch(*eptr++)
              {
-Line 4132 
 for (;;)
+Line 4452 
 for (;;)
              case 0x0c:      /* FF */
              case 0x0d:      /* CR */
              case 0x85:      /* NEL */
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
              }
            }
          break;
-Line 4143 
 for (;;)
+Line 4463 
 for (;;)
            if (eptr >= md->end_subject)
              {
              SCHECK_PARTIAL();
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
              }
            switch(*eptr++)
              {
-             default: MRRETURN(MATCH_NOMATCH);
+             default: RRETURN(MATCH_NOMATCH);
              case 0x0a:      /* LF */
              case 0x0b:      /* VT */
              case 0x0c:      /* FF */
-Line 4164 
 for (;;)
+Line 4484 
 for (;;)
            if (eptr >= md->end_subject)
              {
              SCHECK_PARTIAL();
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
              }
-           if ((md->ctypes[*eptr++] & ctype_digit) != 0) MRRETURN(MATCH_NOMATCH);
+           if ((md->ctypes[*eptr++] & ctype_digit) != 0) RRETURN(MATCH_NOMATCH);
            }
          break;
-Line 4176 
 for (;;)
+Line 4496 
 for (;;)
            if (eptr >= md->end_subject)
              {
              SCHECK_PARTIAL();
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
              }
-           if ((md->ctypes[*eptr++] & ctype_digit) == 0) MRRETURN(MATCH_NOMATCH);
+           if ((md->ctypes[*eptr++] & ctype_digit) == 0) RRETURN(MATCH_NOMATCH);
            }
          break;
-Line 4188 
 for (;;)
+Line 4508 
 for (;;)
            if (eptr >= md->end_subject)
              {
              SCHECK_PARTIAL();
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
              }
-           if ((md->ctypes[*eptr++] & ctype_space) != 0) MRRETURN(MATCH_NOMATCH);
+           if ((md->ctypes[*eptr++] & ctype_space) != 0) RRETURN(MATCH_NOMATCH);
            }
          break;
-Line 4200 
 for (;;)
+Line 4520 
 for (;;)
            if (eptr >= md->end_subject)
              {
              SCHECK_PARTIAL();
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
              }
-           if ((md->ctypes[*eptr++] & ctype_space) == 0) MRRETURN(MATCH_NOMATCH);
+           if ((md->ctypes[*eptr++] & ctype_space) == 0) RRETURN(MATCH_NOMATCH);
            }
          break;
-Line 4212 
 for (;;)
+Line 4532 
 for (;;)
            if (eptr >= md->end_subject)
              {
              SCHECK_PARTIAL();
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
              }
            if ((md->ctypes[*eptr++] & ctype_word) != 0)
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
            }
          break;
-Line 4225 
 for (;;)
+Line 4545 
 for (;;)
            if (eptr >= md->end_subject)
              {
              SCHECK_PARTIAL();
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
              }
            if ((md->ctypes[*eptr++] & ctype_word) == 0)
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
            }
          break;
-Line 4255 
 for (;;)
+Line 4575 
 for (;;)
            case PT_ANY:
            for (fi = min;; fi++)
              {
-             RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM36);
+             RMATCH(eptr, ecode, offset_top, md, eptrb, RM36);
              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-             if (fi >= max) MRRETURN(MATCH_NOMATCH);
+             if (fi >= max) RRETURN(MATCH_NOMATCH);
              if (eptr >= md->end_subject)
                {
                SCHECK_PARTIAL();
-               MRRETURN(MATCH_NOMATCH);
+               RRETURN(MATCH_NOMATCH);
                }
              GETCHARINCTEST(c, eptr);
-             if (prop_fail_result) MRRETURN(MATCH_NOMATCH);
+             if (prop_fail_result) RRETURN(MATCH_NOMATCH);
              }
            /* Control never gets here */
            case PT_LAMP:
            for (fi = min;; fi++)
              {
-             RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM37);
+             int chartype;
+             RMATCH(eptr, ecode, offset_top, md, eptrb, RM37);
              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-             if (fi >= max) MRRETURN(MATCH_NOMATCH);
+             if (fi >= max) RRETURN(MATCH_NOMATCH);
              if (eptr >= md->end_subject)
                {
                SCHECK_PARTIAL();
-               MRRETURN(MATCH_NOMATCH);
+               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)
-               MRRETURN(MATCH_NOMATCH);
+               RRETURN(MATCH_NOMATCH);
              }
            /* Control never gets here */
            case PT_GC:
            for (fi = min;; fi++)
              {
-             RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM38);
+             RMATCH(eptr, ecode, offset_top, md, eptrb, RM38);
              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-             if (fi >= max) MRRETURN(MATCH_NOMATCH);
+             if (fi >= max) RRETURN(MATCH_NOMATCH);
              if (eptr >= md->end_subject)
                {
                SCHECK_PARTIAL();
-               MRRETURN(MATCH_NOMATCH);
+               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);
-               MRRETURN(MATCH_NOMATCH);
              }
            /* Control never gets here */
            case PT_PC:
            for (fi = min;; fi++)
              {
-             RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM39);
+             RMATCH(eptr, ecode, offset_top, md, eptrb, RM39);
              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-             if (fi >= max) MRRETURN(MATCH_NOMATCH);
+             if (fi >= max) RRETURN(MATCH_NOMATCH);
              if (eptr >= md->end_subject)
                {
                SCHECK_PARTIAL();
-               MRRETURN(MATCH_NOMATCH);
+               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);
-               MRRETURN(MATCH_NOMATCH);
              }
            /* Control never gets here */
            case PT_SC:
            for (fi = min;; fi++)
              {
-             RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM40);
+             RMATCH(eptr, ecode, offset_top, md, eptrb, RM40);
              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-             if (fi >= max) MRRETURN(MATCH_NOMATCH);
+             if (fi >= max) RRETURN(MATCH_NOMATCH);
              if (eptr >= md->end_subject)
                {
                SCHECK_PARTIAL();
-               MRRETURN(MATCH_NOMATCH);
+               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);
-               MRRETURN(MATCH_NOMATCH);
              }
            /* Control never gets here */
            case PT_ALNUM:
            for (fi = min;; fi++)
              {
-             RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM59);
+             int category;
+             RMATCH(eptr, ecode, offset_top, md, eptrb, RM59);
              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-             if (fi >= max) MRRETURN(MATCH_NOMATCH);
+             if (fi >= max) RRETURN(MATCH_NOMATCH);
              if (eptr >= md->end_subject)
                {
                SCHECK_PARTIAL();
-               MRRETURN(MATCH_NOMATCH);
+               RRETURN(MATCH_NOMATCH);
                }
              GETCHARINCTEST(c, eptr);
-             prop_category = UCD_CATEGORY(c);
+             category = UCD_CATEGORY(c);
-             if ((prop_category == ucp_L || prop_category == ucp_N)
+             if ((category == ucp_L || category == ucp_N) == prop_fail_result)
-                    == prop_fail_result)
+               RRETURN(MATCH_NOMATCH);
-               MRRETURN(MATCH_NOMATCH);
              }
            /* Control never gets here */
            case PT_SPACE:    /* Perl space */
            for (fi = min;; fi++)
              {
-             RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM60);
+             RMATCH(eptr, ecode, offset_top, md, eptrb, RM60);
              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-             if (fi >= max) MRRETURN(MATCH_NOMATCH);
+             if (fi >= max) RRETURN(MATCH_NOMATCH);
              if (eptr >= md->end_subject)
                {
                SCHECK_PARTIAL();
-               MRRETURN(MATCH_NOMATCH);
+               RRETURN(MATCH_NOMATCH);
                }
              GETCHARINCTEST(c, eptr);
-             prop_category = UCD_CATEGORY(c);
+             if ((UCD_CATEGORY(c) == ucp_Z || c == CHAR_HT || c == CHAR_NL ||
-             if ((prop_category == ucp_Z || c == CHAR_HT || c == CHAR_NL ||
                   c == CHAR_FF || c == CHAR_CR)
                     == prop_fail_result)
-               MRRETURN(MATCH_NOMATCH);
+               RRETURN(MATCH_NOMATCH);
              }
            /* Control never gets here */
            case PT_PXSPACE:  /* POSIX space */
            for (fi = min;; fi++)
              {
-             RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM61);
+             RMATCH(eptr, ecode, offset_top, md, eptrb, RM61);
              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-             if (fi >= max) MRRETURN(MATCH_NOMATCH);
+             if (fi >= max) RRETURN(MATCH_NOMATCH);
              if (eptr >= md->end_subject)
                {
                SCHECK_PARTIAL();
-               MRRETURN(MATCH_NOMATCH);
+               RRETURN(MATCH_NOMATCH);
                }
              GETCHARINCTEST(c, eptr);
-             prop_category = UCD_CATEGORY(c);
+             if ((UCD_CATEGORY(c) == ucp_Z || c == CHAR_HT || c == CHAR_NL ||
-             if ((prop_category == ucp_Z || c == CHAR_HT || c == CHAR_NL ||
                   c == CHAR_VT || c == CHAR_FF || c == CHAR_CR)
                     == prop_fail_result)
-               MRRETURN(MATCH_NOMATCH);
+               RRETURN(MATCH_NOMATCH);
              }
            /* Control never gets here */
            case PT_WORD:
            for (fi = min;; fi++)
              {
-             RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM62);
+             int category;
+             RMATCH(eptr, ecode, offset_top, md, eptrb, RM62);
              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-             if (fi >= max) MRRETURN(MATCH_NOMATCH);
+             if (fi >= max) RRETURN(MATCH_NOMATCH);
              if (eptr >= md->end_subject)
                {
                SCHECK_PARTIAL();
-               MRRETURN(MATCH_NOMATCH);
+               RRETURN(MATCH_NOMATCH);
                }
              GETCHARINCTEST(c, eptr);
-             prop_category = UCD_CATEGORY(c);
+             category = UCD_CATEGORY(c);
-             if ((prop_category == ucp_L ||
+             if ((category == ucp_L ||
-                  prop_category == ucp_N ||
+                  category == ucp_N ||
                   c == CHAR_UNDERSCORE)
                     == prop_fail_result)
-               MRRETURN(MATCH_NOMATCH);
+               RRETURN(MATCH_NOMATCH);
              }
            /* Control never gets here */
-Line 4436 
 for (;;)
+Line 4753 
 for (;;)
          {
          for (fi = min;; fi++)
            {
-           RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM41);
+           RMATCH(eptr, ecode, offset_top, md, eptrb, RM41);
            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-           if (fi >= max) MRRETURN(MATCH_NOMATCH);
+           if (fi >= max) RRETURN(MATCH_NOMATCH);
            if (eptr >= md->end_subject)
              {
              SCHECK_PARTIAL();
-             MRRETURN(MATCH_NOMATCH);
+             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) MRRETURN(MATCH_NOMATCH);
            while (eptr < md->end_subject)
              {
              int len = 1;
-             if (!utf8) c = *eptr;
+             if (!utf8) 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;
              }
            }
          }
        else
  #endif     /* SUPPORT_UCP */
-Line 4468 
 for (;;)
+Line 4781 
 for (;;)
          {
          for (fi = min;; fi++)
            {
-           RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM42);
+           RMATCH(eptr, ecode, offset_top, md, eptrb, RM42);
            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-           if (fi >= max) MRRETURN(MATCH_NOMATCH);
+           if (fi >= max) RRETURN(MATCH_NOMATCH);
            if (eptr >= md->end_subject)