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

Diff of /code/trunk/pcre_exec.c

Parent Directory | Revision Log | View Patch Patch

-revision 615 by ph10,
Mon Jul 11 14:23:06 2011 UTC
+revision 924 by zherczeg,
Wed Feb 22 10:23:56 2012 UTC
 Line 6
  and semantics are as close as possible to those of the Perl 5 language.
                         Written by Philip Hazel
-            Copyright (c) 1997-2011 University of Cambridge
+            Copyright (c) 1997-2012 University of Cambridge
  -----------------------------------------------------------------------------
  Redistribution and use in source and binary forms, with or without
 Line 57 
 possible. There are also some static sup
  #undef min
  #undef max
  /* 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     1  /* Called to check a condition assertion */
 Line 76 
 negative to avoid the external error cod
  #define MATCH_ACCEPT       (-999)
  #define MATCH_COMMIT       (-998)
  #define MATCH_KETRPOS      (-997)
- #define MATCH_PRUNE        (-996)
+ #define MATCH_ONCE         (-996)
- #define MATCH_SKIP         (-995)
+ #define MATCH_PRUNE        (-995)
- #define MATCH_SKIP_ARG     (-994)
+ #define MATCH_SKIP         (-994)
- #define MATCH_THEN         (-993)
+ #define MATCH_SKIP_ARG     (-993)
+ #define MATCH_THEN         (-992)
- /* This is a convenience macro for code that occurs many times. */
- #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 120 
 Returns:     nothing
+Line 113 
 Returns:     nothing
  */
  static void
- pchars(const uschar *p, int length, BOOL is_subject, match_data *md)
+ pchars(const pcre_uchar *p, int length, BOOL is_subject, match_data *md)
  {
  unsigned int c;
  if (is_subject && length > md->end_subject - p) length = md->end_subject - p;
-Line 137 
 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 147 
 Arguments:
+Line 140 
 Arguments:
    md          points to match data block
    caseless    TRUE if caseless
- Returns:      < 0 if not matched, otherwise the number of subject bytes matched
+ Returns:      >= 0 the number of subject bytes matched
+               -1 no match
+               -2 partial match; always given if at end subject
  */
  static int
- match_ref(int offset, register USPTR eptr, int length, match_data *md,
+ match_ref(int offset, register PCRE_PUCHAR eptr, int length, match_data *md,
    BOOL caseless)
  {
- USPTR eptr_start = eptr;
+ PCRE_PUCHAR eptr_start = eptr;
- register USPTR p = md->start_subject + md->offset_vector[offset];
+ register PCRE_PUCHAR p = md->start_subject + md->offset_vector[offset];
  #ifdef PCRE_DEBUG
  if (eptr >= md->end_subject)
-Line 170 
 pchars(p, length, FALSE, md);
+Line 165 
 pchars(p, length, FALSE, md);
  printf("\n");
  #endif
- /* Always fail if reference not set (and not JavaScript compatible). */
+ /* Always fail if reference not set (and not JavaScript compatible - in that
+ case the length is passed as zero). */
  if (length < 0) return -1;
-Line 180 
 ASCII characters. */
+Line 176 
 ASCII characters. */
  if (caseless)
    {
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
  #ifdef SUPPORT_UCP
-   if (md->utf8)
+   if (md->utf)
      {
      /* 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;
+     PCRE_PUCHAR endptr = p + length;
      while (p < endptr)
        {
        int c, d;
-       if (eptr >= md->end_subject) return -1;
+       if (eptr >= md->end_subject) return -2;   /* Partial match */
        GETCHARINC(c, eptr);
        GETCHARINC(d, p);
        if (c != d && c != UCD_OTHERCASE(d)) return -1;
-Line 209 
 if (caseless)
+Line 205 
 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; }
+       {
-     }
+       if (eptr >= md->end_subject) return -2;   /* Partial match */
+       if (TABLE_GET(*p, md->lcc, *p) != TABLE_GET(*eptr, md->lcc, *eptr)) return -1;
+       p++;
+       eptr++;
+       }
+     }
    }
  /* In the caseful case, we can just compare the bytes, whether or not we
  are in UTF-8 mode. */
  else
    {
-   if (eptr + length > md->end_subject) return -1;
+   while (length-- > 0)
-   while (length-- > 0) if (*p++ != *eptr++) return -1;
+     {
+     if (eptr >= md->end_subject) return -2;   /* Partial match */
+     if (*p++ != *eptr++) return -1;
+     }
    }
- return eptr - eptr_start;
+ return (int)(eptr - eptr_start);
  }
-Line 276 
 enum { RM1=1, RM2,  RM3,  RM4,  RM5,  RM
+Line 279 
 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, RM63};
+        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 289 
 actually used in this definition. */
+Line 292 
 actually used in this definition. */
  #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,rdepth+1); \
+   rrc = match(ra,rb,mstart,rc,rd,re,rdepth+1); \
    printf("to line %d\n", __LINE__); \
    }
  #define RRETURN(ra) \
-Line 299 
 actually used in this definition. */
+Line 302 
 actually used in this definition. */
    }
  #else
  #define RMATCH(ra,rb,rc,rd,re,rw) \
-   rrc = match(ra,rb,mstart,markptr,rc,rd,re,rdepth+1)
+   rrc = match(ra,rb,mstart,rc,rd,re,rdepth+1)
  #define RRETURN(ra) return ra
  #endif
-Line 314 
 argument of match(), which never changes
+Line 317 
 argument of match(), which never changes
  #define RMATCH(ra,rb,rc,rd,re,rw)\
    {\
-   heapframe *newframe = (heapframe *)(pcre_stack_malloc)(sizeof(heapframe));\
+   heapframe *newframe = (heapframe *)(PUBL(stack_malloc))(sizeof(heapframe));\
    if (newframe == NULL) RRETURN(PCRE_ERROR_NOMEMORY);\
    frame->Xwhere = rw; \
    newframe->Xeptr = ra;\
    newframe->Xecode = rb;\
    newframe->Xmstart = mstart;\
-   newframe->Xmarkptr = markptr;\
    newframe->Xoffset_top = rc;\
    newframe->Xeptrb = re;\
    newframe->Xrdepth = frame->Xrdepth + 1;\
-Line 336 
 argument of match(), which never changes
+Line 338 
 argument of match(), which never changes
    {\
    heapframe *oldframe = frame;\
    frame = oldframe->Xprevframe;\
-   (pcre_stack_free)(oldframe);\
+   if (oldframe != &frame_zero) (PUBL(stack_free))(oldframe);\
    if (frame != NULL)\
      {\
      rrc = ra;\
-Line 353 
 typedef struct heapframe {
+Line 355 
 typedef struct heapframe {
    /* Function arguments that may change */
-   USPTR Xeptr;
+   PCRE_PUCHAR Xeptr;
-   const uschar *Xecode;
+   const pcre_uchar *Xecode;
-   USPTR Xmstart;
+   PCRE_PUCHAR Xmstart;
-   USPTR Xmarkptr;
    int Xoffset_top;
    eptrblock *Xeptrb;
    unsigned int Xrdepth;
    /* Function local variables */
-   USPTR Xcallpat;
+   PCRE_PUCHAR Xcallpat;
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-   USPTR Xcharptr;
+   PCRE_PUCHAR Xcharptr;
  #endif
-   USPTR Xdata;
+   PCRE_PUCHAR Xdata;
-   USPTR Xnext;
+   PCRE_PUCHAR Xnext;
-   USPTR Xpp;
+   PCRE_PUCHAR Xpp;
-   USPTR Xprev;
+   PCRE_PUCHAR Xprev;
-   USPTR Xsaved_eptr;
+   PCRE_PUCHAR Xsaved_eptr;
    recursion_info Xnew_recursive;
-Line 383 
 typedef struct heapframe {
+Line 384 
 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];
+   pcre_uchar Xocchars[6];
  #endif
    int Xcodelink;
-Line 429 
 returns a negative (error) response, the
+Line 427 
 returns a negative (error) response, the
  same response. */
  /* These macros pack up tests that are used for partial matching, and which
- appears several times in the code. We set the "hit end" flag if the pointer is
+ appear several times in the code. We set the "hit end" flag if the pointer is
  at the end of the subject and also past the start of the subject (i.e.
  something has been matched). For hard partial matching, we then return
  immediately. The second one is used when we already know we are past the end of
-Line 440 
 the subject. */
+Line 438 
 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); \
      }
  /* Performance note: It might be tempting to extract commonly used fields from
- the md structure (e.g. utf8, end_subject) into individual variables to improve
+ the md structure (e.g. utf, end_subject) into individual variables to improve
  performance. Tests using gcc on a SPARC disproved this; in the first case, it
  made performance worse.
-Line 461 
 Arguments:
+Line 459 
 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
-Line 476 
 Returns:       MATCH_MATCH if matched
+Line 473 
 Returns:       MATCH_MATCH if matched
  */
  static int
- match(REGISTER USPTR eptr, REGISTER const uschar *ecode, USPTR mstart,
+ match(REGISTER PCRE_PUCHAR eptr, REGISTER const pcre_uchar *ecode,
-   const uschar *markptr, int offset_top, match_data *md, eptrblock *eptrb,
+   PCRE_PUCHAR mstart, int offset_top, match_data *md, eptrblock *eptrb,
    unsigned int rdepth)
  {
  /* These variables do not need to be preserved over recursion in this function,
-Line 487 
 so they can be ordinary variables in all
+Line 484 
 so they can be ordinary variables in all
  register int  rrc;         /* Returns from recursive calls */
  register int  i;           /* Used for loops not involving calls to RMATCH() */
  register unsigned int c;   /* Character values not kept over RMATCH() calls */
- register BOOL utf8;        /* Local copy of UTF-8 flag for speed */
+ register BOOL utf;         /* Local copy of UTF flag for speed */
  BOOL minimize, possessive; /* Quantifier options */
  BOOL caseless;
  int condcode;
  /* When recursion is not being used, all "local" variables that have to be
- preserved over calls to RMATCH() are part of a "frame" which is obtained from
+ preserved over calls to RMATCH() are part of a "frame". We set up the top-level
- heap storage. Set up the top-level frame here; others are obtained from the
+ frame on the stack here; subsequent instantiations are obtained from the heap
- heap whenever RMATCH() does a "recursion". See the macro definitions above. */
+ whenever RMATCH() does a "recursion". See the macro definitions above. Putting
+ the top-level on the stack rather than malloc-ing them all gives a performance
+ boost in many cases where there is not much "recursion". */
  #ifdef NO_RECURSE
- heapframe *frame = (heapframe *)(pcre_stack_malloc)(sizeof(heapframe));
+ heapframe frame_zero;
- if (frame == NULL) RRETURN(PCRE_ERROR_NOMEMORY);
+ heapframe *frame = &frame_zero;
  frame->Xprevframe = NULL;            /* Marks the top level */
  /* Copy in the original argument variables */
-Line 508 
 frame->Xprevframe = NULL;            /*
+Line 507 
 frame->Xprevframe = NULL;            /*
  frame->Xeptr = eptr;
  frame->Xecode = ecode;
  frame->Xmstart = mstart;
- frame->Xmarkptr = markptr;
  frame->Xoffset_top = offset_top;
  frame->Xeptrb = eptrb;
  frame->Xrdepth = rdepth;
-Line 522 
 HEAP_RECURSE:
+Line 520 
 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 rdepth             frame->Xrdepth
  /* Ditto for the local variables */
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
  #define charptr            frame->Xcharptr
  #endif
  #define callpat            frame->Xcallpat
-Line 550 
 HEAP_RECURSE:
+Line 547 
 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 590 
 declarations can be cut out in a block.
+Line 584 
 declarations can be cut out in a block.
  below are for variables that do not have to be preserved over a recursive call
  to RMATCH(). */
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
- const uschar *charptr;
+ const pcre_uchar *charptr;
  #endif
- const uschar *callpat;
+ const pcre_uchar *callpat;
- const uschar *data;
+ const pcre_uchar *data;
- const uschar *next;
+ const pcre_uchar *next;
- USPTR         pp;
+ PCRE_PUCHAR       pp;
- const uschar *prev;
+ const pcre_uchar *prev;
- USPTR         saved_eptr;
+ PCRE_PUCHAR       saved_eptr;
  recursion_info new_recursive;
  BOOL cur_is_word;
  BOOL condition;
  BOOL prev_is_word;
-Line 610 
 BOOL prev_is_word;
+Line 604 
 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];
+ pcre_uchar occhars[6];
  #endif
  int codelink;
-Line 630 
 int save_offset1, save_offset2, save_off
+Line 621 
 int save_offset1, save_offset2, save_off
  int stacksave[REC_STACK_SAVE_MAX];
  eptrblock newptrb;
+ /* There is a special fudge for calling match() in a way that causes it to
+ measure the size of its basic stack frame when the stack is being used for
+ recursion. The second argument (ecode) being NULL triggers this behaviour. It
+ cannot normally ever be NULL. The return is the negated value of the frame
+ size. */
+ if (ecode == NULL)
+   {
+   if (rdepth == 0)
+     return match((PCRE_PUCHAR)&rdepth, NULL, NULL, 0, NULL, NULL, 1);
+   else
+     {
+     int len = (char *)&rdepth - (char *)eptr;
+     return (len > 0)? -len : len;
+     }
+   }
  #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
-Line 642 
 the alternative names that are used. */
+Line 650 
 the alternative names that are used. */
  #define code_offset   codelink
  #define condassert    condition
  #define matched_once  prev_is_word
+ #define foc           number
+ #define save_mark     data
  /* These statements are here to stop the compiler complaining about unitialized
  variables. */
-Line 667 
 defined). However, RMATCH isn't like a f
+Line 677 
 defined). However, RMATCH isn't like a f
  complicated macro. It has to be used in one particular way. This shouldn't,
  however, impact performance when true recursion is being used. */
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
- utf8 = md->utf8;       /* Local copy of the flag */
+ utf = md->utf;       /* Local copy of the flag */
  #else
- utf8 = FALSE;
+ utf = FALSE;
  #endif
  /* First check that we haven't called match() too many times, or that we
-Line 680 
 if (md->match_call_count++ >= md->match_
+Line 690 
 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 variable md->match_function_type is set to MATCH_CBEGROUP. It is
  done this way to save having to use another function argument, which would take
  up space on the stack. See also MATCH_CONDASSERT below.
  When MATCH_CBEGROUP is set, add the current subject pointer to the chain of
-Line 705 
 for (;;)
+Line 715 
 for (;;)
    {
    minimize = possessive = FALSE;
    op = *ecode;
    switch(op)
      {
      case OP_MARK:
-     markptr = ecode + 2;
+     md->nomatch_mark = ecode + 2;
-     RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,
+     md->mark = NULL;    /* In case previously set by assertion */
+     RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top, md,
        eptrb, RM55);
+     if ((rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) &&
+          md->mark == NULL) md->mark = ecode + 2;
      /* A return of MATCH_SKIP_ARG means that matching failed at SKIP with an
      argument, and we must check whether that argument matches this MARK's
-Line 720 
 for (;;)
+Line 733 
 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_UC_UC(ecode + 2, 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,
+     RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
        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,
+     RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
        eptrb, RM51);
      if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
-     MRRETURN(MATCH_PRUNE);
+     RRETURN(MATCH_PRUNE);
      case OP_PRUNE_ARG:
-     RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,
+     md->nomatch_mark = ecode + 2;
+     md->mark = NULL;    /* In case previously set by assertion */
+     RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top, md,
        eptrb, RM56);
+     if ((rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) &&
+          md->mark == NULL) md->mark = ecode + 2;
      if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
-     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,
+     RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
        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:
-     RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,
+     if (md->ignore_skip_arg)
+       {
+       ecode += PRIV(OP_lengths)[*ecode] + ecode[1];
+       break;
+       }
+     RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top, md,
        eptrb, RM57);
      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE && rrc != MATCH_THEN)
        RRETURN(rrc);
      /* Pass back the current skip name by overloading md->start_match_ptr and
      returning the special MATCH_SKIP_ARG return code. This will either be
-     caught by a matching MARK, or get to the top, where it 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,
+     RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
        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, RM58);
+     md->mark = NULL;    /* In case previously set by assertion */
+     RMATCH(eptr, ecode + PRIV(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 an atomic group that does not contain any capturing parentheses.
+     This can be handled like an assertion. Prior to 8.13, all atomic groups
+     were handled this way. In 8.13, the code was changed as below for ONCE, so
+     that backups pass through the group and thereby reset captured values.
+     However, this uses a lot more stack, so in 8.20, atomic groups that do not
+     contain any captures generate OP_ONCE_NC, which can be handled in the old,
+     less stack intensive way.
+     Check the alternative branches in turn - the matching won't pass the KET
+     for this kind of subpattern. If any one branch matches, we carry on as at
+     the end of a normal bracket, leaving the subject pointer, but resetting
+     the start-of-match value in case it was changed by \K. */
+     case OP_ONCE_NC:
+     prev = ecode;
+     saved_eptr = eptr;
+     save_mark = md->mark;
+     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);
+       md->mark = save_mark;
+       }
+     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. If we fail to match, we need to restore this value and also the
+     the group. A failure to match might occur after the group has succeeded,
-     values of the final offsets, in case they were set by a previous iteration
+     if something later on doesn't match. For this reason, we need to restore
-     of the same bracket.
+     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 820 
 for (;;)
+Line 929 
 for (;;)
      case OP_SCBRA:
      number = GET2(ecode, 1+LINK_SIZE);
      offset = number << 1;
  #ifdef PCRE_DEBUG
      printf("start bracket %d\n", number);
      printf("subject=");
-Line 834 
 for (;;)
+Line 943 
 for (;;)
        save_offset2 = md->offset_vector[offset+1];
        save_offset3 = md->offset_vector[md->offset_end - number];
        save_capture_last = md->capture_last;
+       save_mark = md->mark;
        DPRINTF(("saving %d %d %d\n", save_offset1, save_offset2, save_offset3));
        md->offset_vector[md->offset_end - number] =
-Line 841 
 for (;;)
+Line 951 
 for (;;)
        for (;;)
          {
          if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
-         RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
+         RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
            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;
+         md->mark = save_mark;
+         if (*ecode != OP_ALT) break;
          }
        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 == NULL) 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 873 
 for (;;)
+Line 1005 
 for (;;)
      /* VVVVVVVVVVVVVVVVVVVVVVVVV */
      /* VVVVVVVVVVVVVVVVVVVVVVVVV */
-     /* Non-capturing bracket, except for possessive with unlimited repeat. Loop
+     /* Non-capturing or atomic group, except for possessive with unlimited
-     for all the alternatives. When we get to the final alternative within the
+     repeat and ONCE group with no captures. Loop for all the alternatives.
-     brackets, we used to return the result of a recursive call to match()
-     whatever happened so it was possible to reduce stack usage by turning this
+     When we get to the final alternative within the brackets, we used to return
-     into a tail recursion, except in the case of a possibly empty group.
+     the result of a recursive call to match() whatever happened so it was
-     However, now that there is the possiblity of (*THEN) occurring in the final
+     possible to reduce stack usage by turning this into a tail recursion,
-     alternative, this optimization is no longer possible. */
+     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"));
      for (;;)
        {
-       if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
+       if (op >= OP_SBRA || op == OP_ONCE) md->match_function_type = MATCH_CBEGROUP;
-       RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md, eptrb,
+       /* If this is not a possibly empty group, and there are no (*THEN)s in
+       the pattern, and this is the final alternative, optimize as described
+       above. */
+       else if (!md->hasthen && ecode[GET(ecode, 1)] != OP_ALT)
+         {
+         ecode += PRIV(OP_lengths)[*ecode];
+         goto TAIL_RECURSE;
+         }
+       /* In all other cases, we have to make another call to match(). */
+       save_mark = md->mark;
+       RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md, eptrb,
          RM2);
-       if (rrc != MATCH_NOMATCH &&
-           (rrc != MATCH_THEN || md->start_match_ptr != ecode))
+       /* 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 (rrc == MATCH_ONCE)
+           {
+           const pcre_uchar *scode = ecode;
+           if (*scode != OP_ONCE)           /* If not at start, find it */
+             {
+             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;
+       md->mark = save_mark;
+       if (*ecode != OP_ALT) break;
        }
-     if (rrc != MATCH_THEN && md->mark == NULL) md->mark = markptr;
      RRETURN(MATCH_NOMATCH);
      /* Handle possessive capturing brackets with an unlimited repeat. We come
      here from BRAZERO with allow_zero set TRUE. The offset_vector values are
      handled similarly to the normal case above. However, the matching is
      different. The end of these brackets will always be OP_KETRPOS, which
      returns MATCH_KETRPOS without going further in the pattern. By this means
      we can handle the group by iteration rather than recursion, thereby
      reducing the amount of stack needed. */
      case OP_CBRAPOS:
      case OP_SCBRAPOS:
      allow_zero = FALSE;
      POSSESSIVE_CAPTURE:
      number = GET2(ecode, 1+LINK_SIZE);
      offset = number << 1;
-Line 925 
 for (;;)
+Line 1108 
 for (;;)
      if (offset < md->offset_max)
        {
        matched_once = FALSE;
-       code_offset = ecode - md->start_code;
+       code_offset = (int)(ecode - md->start_code);
        save_offset1 = md->offset_vector[offset];
        save_offset2 = md->offset_vector[offset+1];
-Line 933 
 for (;;)
+Line 1116 
 for (;;)
        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,
+         RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
            eptrb, RM63);
          if (rrc == MATCH_KETRPOS)
            {
            offset_top = md->end_offset_top;
            eptr = md->end_match_ptr;
            ecode = md->start_code + code_offset;
            save_capture_last = md->capture_last;
            matched_once = TRUE;
            continue;
            }
-         if (rrc != MATCH_NOMATCH &&
-             (rrc != MATCH_THEN || md->start_match_ptr != ecode))
+         /* See comment in the code for capturing groups above about handling
-           RRETURN(rrc);
+         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;
          }
        if (!matched_once)
          {
          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 == NULL) md->mark = markptr;
        if (allow_zero || matched_once)
          {
          ecode += 1 + LINK_SIZE;
          break;
          }
        RRETURN(MATCH_NOMATCH);
        }
      /* FALL THROUGH ... Insufficient room for saving captured contents. Treat
      as a non-capturing bracket. */
-Line 995 
 for (;;)
+Line 1187 
 for (;;)
      /* 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;
+     code_offset = (int)(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,
+       RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
          eptrb, RM48);
        if (rrc == MATCH_KETRPOS)
          {
          offset_top = md->end_offset_top;
          eptr = md->end_match_ptr;
          ecode = md->start_code + code_offset;
          matched_once = TRUE;
          continue;
          }
-       if (rrc != MATCH_NOMATCH &&
-           (rrc != MATCH_THEN || md->start_match_ptr != ecode))
+       /* See comment in the code for capturing groups above about handling
-         RRETURN(rrc);
+       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. */
-Line 1051 
 for (;;)
+Line 1253 
 for (;;)
      if (ecode[LINK_SIZE+1] == OP_CALLOUT)
        {
-       if (pcre_callout != NULL)
+       if (PUBL(callout) != NULL)
          {
-         pcre_callout_block cb;
+         PUBL(callout_block) cb;
-         cb.version          = 1;   /* Version 1 of the callout block */
+         cb.version          = 2;   /* Version 1 of the callout block */
          cb.callout_number   = ecode[LINK_SIZE+2];
          cb.offset_vector    = md->offset_vector;
+ #ifdef COMPILE_PCRE8
          cb.subject          = (PCRE_SPTR)md->start_subject;
+ #else
+         cb.subject          = (PCRE_SPTR16)md->start_subject;
+ #endif
          cb.subject_length   = (int)(md->end_subject - md->start_subject);
          cb.start_match      = (int)(mstart - md->start_subject);
          cb.current_position = (int)(eptr - md->start_subject);
-Line 1066 
 for (;;)
+Line 1272 
 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 = (*PUBL(callout))(&cb)) > 0) RRETURN(MATCH_NOMATCH);
          if (rrc < 0) RRETURN(rrc);
          }
-       ecode += _pcre_OP_lengths[OP_CALLOUT];
+       ecode += PRIV(OP_lengths)[OP_CALLOUT];
        }
      condcode = ecode[LINK_SIZE+1];
-Line 1086 
 for (;;)
+Line 1293 
 for (;;)
        else
          {
          int recno = GET2(ecode, LINK_SIZE + 2);   /* Recursion group number*/
-         condition =  (recno == RREF_ANY || recno == md->recursive->group_num);
+         condition = (recno == RREF_ANY || recno == md->recursive->group_num);
          /* If the test is for recursion into a specific subpattern, and it is
          false, but the test was set up by name, scan the table to see if the
          name refers to any other numbers, and test them. The condition is true
          if any one is set. */
-         if (!condition && condcode == OP_NRREF && recno != RREF_ANY)
+         if (!condition && condcode == OP_NRREF)
            {
-           uschar *slotA = md->name_table;
+           pcre_uchar *slotA = md->name_table;
            for (i = 0; i < md->name_count; i++)
              {
              if (GET2(slotA, 0) == recno) break;
-Line 1108 
 for (;;)
+Line 1315 
 for (;;)
            if (i < md->name_count)
              {
-             uschar *slotB = slotA;
+             pcre_uchar *slotB = slotA;
              while (slotB > md->name_table)
                {
                slotB -= md->name_entry_size;
-               if (strcmp((char *)slotA + 2, (char *)slotB + 2) == 0)
+               if (STRCMP_UC_UC(slotA + IMM2_SIZE, slotB + IMM2_SIZE) == 0)
                  {
                  condition = GET2(slotB, 0) == md->recursive->group_num;
                  if (condition) break;
-Line 1128 
 for (;;)
+Line 1335 
 for (;;)
                for (i++; i < md->name_count; i++)
                  {
                  slotB += md->name_entry_size;
-                 if (strcmp((char *)slotA + 2, (char *)slotB + 2) == 0)
+                 if (STRCMP_UC_UC(slotA + IMM2_SIZE, slotB + IMM2_SIZE) == 0)
                    {
                    condition = GET2(slotB, 0) == md->recursive->group_num;
                    if (condition) break;
-Line 1141 
 for (;;)
+Line 1348 
 for (;;)
          /* Chose branch according to the condition */
-         ecode += condition? 3 : GET(ecode, 1);
+         ecode += condition? 1 + IMM2_SIZE : GET(ecode, 1);
          }
        }
-Line 1158 
 for (;;)
+Line 1365 
 for (;;)
        if (!condition && condcode == OP_NCREF)
          {
          int refno = offset >> 1;
-         uschar *slotA = md->name_table;
+         pcre_uchar *slotA = md->name_table;
          for (i = 0; i < md->name_count; i++)
            {
-Line 1172 
 for (;;)
+Line 1379 
 for (;;)
          if (i < md->name_count)
            {
-           uschar *slotB = slotA;
+           pcre_uchar *slotB = slotA;
            while (slotB > md->name_table)
              {
              slotB -= md->name_entry_size;
-             if (strcmp((char *)slotA + 2, (char *)slotB + 2) == 0)
+             if (STRCMP_UC_UC(slotA + IMM2_SIZE, slotB + IMM2_SIZE) == 0)
                {
                offset = GET2(slotB, 0) << 1;
                condition = offset < offset_top &&
-Line 1194 
 for (;;)
+Line 1401 
 for (;;)
              for (i++; i < md->name_count; i++)
                {
                slotB += md->name_entry_size;
-               if (strcmp((char *)slotA + 2, (char *)slotB + 2) == 0)
+               if (STRCMP_UC_UC(slotA + IMM2_SIZE, slotB + IMM2_SIZE) == 0)
                  {
                  offset = GET2(slotB, 0) << 1;
                  condition = offset < offset_top &&
-Line 1209 
 for (;;)
+Line 1416 
 for (;;)
        /* Chose branch according to the condition */
-       ecode += condition? 3 : GET(ecode, 1);
+       ecode += condition? 1 + IMM2_SIZE : GET(ecode, 1);
        }
      else if (condcode == OP_DEF)     /* DEFINE - always false */
-Line 1224 
 for (;;)
+Line 1431 
 for (;;)
      else
        {
        md->match_function_type = MATCH_CONDASSERT;
        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 1244 
 for (;;)
+Line 1456 
 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 used to use tail recursion to avoid using another stack frame, except
+     use tail recursion to avoid using another stack frame, except when there is
-     when there was unlimited repeat of a possibly empty group. However, that
+     unlimited repeat of a possibly empty group. In the latter case, a recursive
-     strategy no longer works because of the possibilty of (*THEN) being
+     call to match() is always required, unless the second alternative doesn't
-     encountered in the branch. A recursive call to match() is always required,
+     exist, in which case we can just plough on. Note that, for compatibility
-     unless the second alternative doesn't exist, in which case we can just
+     with Perl, the | in a conditional group is NOT treated as creating two
-     plough on. */
+     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)
        {
-       if (op == OP_SCOND) md->match_function_type = MATCH_CBEGROUP;
+       if (op != OP_SCOND)
+         {
+         ecode += 1 + LINK_SIZE;
+         goto TAIL_RECURSE;
+         }
+       md->match_function_type = MATCH_CBEGROUP;
        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM49);
-       if (rrc == MATCH_THEN && md->start_match_ptr == ecode)
-         rrc = MATCH_NOMATCH;
        RRETURN(rrc);
        }
-     else                         /* Condition false & no alternative */
+      /* Condition false & no alternative; continue after the group. */
+     else
        {
        ecode += 1 + LINK_SIZE;
        }
-Line 1287 
 for (;;)
+Line 1508 
 for (;;)
        md->offset_vector[offset+1] = (int)(eptr - md->start_subject);
        if (offset_top <= offset) offset_top = offset + 2;
        }
-     ecode += 3;
+     ecode += 1 + IMM2_SIZE;
      break;
-     /* End of the pattern, either real or forced. If we are in a recursion, we
+     /* End of the pattern, either real or forced. */
-     should restore the offsets appropriately, and if it's a top-level
-     recursion, continue from after the call. */
-     case OP_ACCEPT:
-     case OP_ASSERT_ACCEPT:
      case OP_END:
-     if (md->recursive != NULL)
+     case OP_ACCEPT:
-       {
+     case OP_ASSERT_ACCEPT:
-       recursion_info *rec = md->recursive;
-       md->recursive = rec->prevrec;
-       memmove(md->offset_vector, rec->offset_save,
-         rec->saved_max * sizeof(int));
-       offset_top = rec->save_offset_top;
-       if (rec->group_num == 0)
-         {
-         ecode = rec->after_call;
-         break;
-         }
-       }
-     /* Otherwise, if we have matched an empty string, fail if not in an
+     /* If we have matched an empty string, fail if not in an assertion and not
-     assertion and if either PCRE_NOTEMPTY is set, or if PCRE_NOTEMPTY_ATSTART
+     in a recursion if either PCRE_NOTEMPTY is set, or if PCRE_NOTEMPTY_ATSTART
      is set and we have matched at the start of the subject. In both cases,
      backtracking will then try other alternatives, if any. */
-     else if (eptr == mstart && op != OP_ASSERT_ACCEPT &&
+     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. */
      md->end_match_ptr = eptr;           /* Record where we ended */
      md->end_offset_top = offset_top;    /* and how many extracts were taken */
      md->start_match_ptr = mstart;       /* and the start (\K can modify) */
      /* 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. 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:
+     save_mark = md->mark;
      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, RM4);
-Line 1363 
 for (;;)
+Line 1571 
 for (;;)
          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);
+       md->mark = save_mark;
        }
      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. */
-Line 1390 
 for (;;)
+Line 1601 
 for (;;)
      case OP_ASSERT_NOT:
      case OP_ASSERTBACK_NOT:
+     save_mark = md->mark;
      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, RM5);
-       if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) MRRETURN(MATCH_NOMATCH);
+       md->mark = save_mark;
+       if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) RRETURN(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 (condassert) RRETURN(MATCH_MATCH);  /* Condition assertion */
      ecode += 1 + LINK_SIZE;
      continue;
-Line 1424 
 for (;;)
+Line 1639 
 for (;;)
      back a number of characters, not bytes. */
      case OP_REVERSE:
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-     if (utf8)
+     if (utf)
        {
        i = GET(ecode, 1);
        while (i-- > 0)
          {
          eptr--;
-         if (eptr < md->start_subject) MRRETURN(MATCH_NOMATCH);
+         if (eptr < md->start_subject) RRETURN(MATCH_NOMATCH);
          BACKCHAR(eptr);
          }
        }
-Line 1442 
 for (;;)
+Line 1657 
 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 1456 
 for (;;)
+Line 1671 
 for (;;)
      function is able to force a failure. */
      case OP_CALLOUT:
-     if (pcre_callout != NULL)
+     if (PUBL(callout) != NULL)
        {
-       pcre_callout_block cb;
+       PUBL(callout_block) cb;
-       cb.version          = 1;   /* Version 1 of the callout block */
+       cb.version          = 2;   /* Version 1 of the callout block */
        cb.callout_number   = ecode[1];
        cb.offset_vector    = md->offset_vector;
+ #ifdef COMPILE_PCRE8
        cb.subject          = (PCRE_SPTR)md->start_subject;
+ #else
+       cb.subject          = (PCRE_SPTR16)md->start_subject;
+ #endif
        cb.subject_length   = (int)(md->end_subject - md->start_subject);
        cb.start_match      = (int)(mstart - md->start_subject);
        cb.current_position = (int)(eptr - md->start_subject);
-Line 1471 
 for (;;)
+Line 1690 
 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 = (*PUBL(callout))(&cb)) > 0) RRETURN(MATCH_NOMATCH);
        if (rrc < 0) RRETURN(rrc);
        }
      ecode += 2 + 2*LINK_SIZE;
-Line 1481 
 for (;;)
+Line 1701 
 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 1520 
 for (;;)
+Line 1750 
 for (;;)
        else
          {
          new_recursive.offset_save =
-           (int *)(pcre_malloc)(new_recursive.saved_max * sizeof(int));
+           (int *)(PUBL(malloc))(new_recursive.saved_max * sizeof(int));
          if (new_recursive.offset_save == NULL) RRETURN(PCRE_ERROR_NOMEMORY);
          }
        memcpy(new_recursive.offset_save, md->offset_vector,
              new_recursive.saved_max * sizeof(int));
-       new_recursive.save_offset_top = offset_top;
+       /* OK, now we can do the recursion. After processing each alternative,
-       /* OK, now we can do the recursion. For each top-level alternative we
+       restore the offset data. If there were nested recursions, md->recursive
-       restore the offset and recursion data. */
+       might be changed, so reset it before looping. */
        DPRINTF(("Recursing into group %d\n", new_recursive.group_num));
        cbegroup = (*callpat >= OP_SBRA);
        do
          {
          if (cbegroup) md->match_function_type = MATCH_CBEGROUP;
-         RMATCH(eptr, callpat + _pcre_OP_lengths[*callpat], offset_top,
+         RMATCH(eptr, callpat + PRIV(OP_lengths)[*callpat], offset_top,
            md, eptrb, RM6);
+         memcpy(md->offset_vector, new_recursive.offset_save,
+             new_recursive.saved_max * sizeof(int));
+         md->recursive = new_recursive.prevrec;
          if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)
            {
            DPRINTF(("Recursion matched\n"));
-           md->recursive = new_recursive.prevrec;
            if (new_recursive.offset_save != stacksave)
-             (pcre_free)(new_recursive.offset_save);
+             (PUBL(free))(new_recursive.offset_save);
-           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)
-             (pcre_free)(new_recursive.offset_save);
+             (PUBL(free))(new_recursive.offset_save);
            RRETURN(rrc);
            }
          md->recursive = &new_recursive;
-         memcpy(md->offset_vector, new_recursive.offset_save,
-             new_recursive.saved_max * sizeof(int));
          callpat += GET(callpat, 1);
          }
        while (*callpat == OP_ALT);
-Line 1565 
 for (;;)
+Line 1804 
 for (;;)
        DPRINTF(("Recursion didn't match\n"));
        md->recursive = new_recursive.prevrec;
        if (new_recursive.offset_save != stacksave)
-         (pcre_free)(new_recursive.offset_save);
+         (PUBL(free))(new_recursive.offset_save);
-       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, 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 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 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, RM8);
-       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, RM9);
-       if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-       ecode += 1 + LINK_SIZE;
-       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 1654 
 for (;;)
+Line 1823 
 for (;;)
      at all - i.e. it could be ()* or ()? or even (){0} in the pattern. Brackets
      with fixed upper repeat limits are compiled as a number of copies, with the
      optional ones preceded by BRAZERO or BRAMINZERO. */
      case OP_BRAZERO:
      next = ecode + 1;
      RMATCH(eptr, next, offset_top, md, eptrb, RM10);
-Line 1662 
 for (;;)
+Line 1831 
 for (;;)
      do next += GET(next, 1); while (*next == OP_ALT);
      ecode = next + 1 + LINK_SIZE;
      break;
      case OP_BRAMINZERO:
      next = ecode + 1;
      do next += GET(next, 1); while (*next == OP_ALT);
-Line 1676 
 for (;;)
+Line 1845 
 for (;;)
      do next += GET(next,1); while (*next == OP_ALT);
      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;
-Line 1691 
 for (;;)
+Line 1860 
 for (;;)
      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 ||
          *prev == OP_CBRAPOS || *prev == OP_SCBRAPOS)
-Line 1737 
 for (;;)
+Line 1907 
 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] =
-Line 1764 
 for (;;)
+Line 1945 
 for (;;)
          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
-       appropriately and continue from after the call. */
-       if (md->recursive != NULL && md->recursive->group_num == number)
-         {
-         recursion_info *rec = md->recursive;
-         DPRINTF(("Recursion (%d) succeeded - continuing\n", number));
-         md->recursive = rec->prevrec;
-         memcpy(md->offset_vector, rec->offset_save,
-           rec->saved_max * sizeof(int));
-         offset_top = rec->save_offset_top;
-         ecode = rec->after_call;
-         break;
-         }
        }
-     /* For a non-repeating ket, just continue at this level. This also
+     /* For an ordinary non-repeating ket, just continue at this level. This
-     happens for a repeating ket if no characters were matched in the group.
+     also happens for a repeating ket if no characters were matched in the
-     This is the forcible breaking of infinite loops as implemented in Perl
+     group. This is the forcible breaking of infinite loops as implemented in
-.005. If there is an options reset, it will get obeyed in the normal
+     Perl 5.005. For a non-repeating atomic group that includes captures,
-     course of events. */
+     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 (*ecode == OP_KET || eptr == saved_eptr)
        {
-       ecode += 1 + LINK_SIZE;
+       if (*prev == OP_ONCE)
+         {
+         RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM12);
+         if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+         md->once_target = prev;  /* Level at which to change to MATCH_NOMATCH */
+         RRETURN(MATCH_ONCE);
+         }
+       ecode += 1 + LINK_SIZE;    /* Carry on at this level */
        break;
        }
      /* OP_KETRPOS is a possessive repeating ket. Remember the current position,
      and return the MATCH_KETRPOS. This makes it possible to do the repeats one
      at a time from the outer level, thus saving stack. */
      if (*ecode == OP_KETRPOS)
        {
        md->end_match_ptr = eptr;
        md->end_offset_top = offset_top;
        RRETURN(MATCH_KETRPOS);
        }
      /* The normal repeating kets try the rest of the pattern or restart from
      the preceding bracket, in the appropriate order. In the second case, we can
      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. */
      if (*ecode == OP_KETRMIN)
        {
-       RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM12);
+       RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM7);
        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+       if (*prev == OP_ONCE)
+         {
+         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);
          }
-Line 1824 
 for (;;)
+Line 2008 
 for (;;)
        }
      else  /* OP_KETRMAX */
        {
        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;
        goto TAIL_RECURSE;
        }
-Line 1835 
 for (;;)
+Line 2027 
 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 1873 
 for (;;)
+Line 2065 
 for (;;)
      case OP_DOLLM:
      if (eptr < md->end_subject)
-       { if (!IS_NEWLINE(eptr)) MRRETURN(MATCH_NOMATCH); }
+       {
+       if (!IS_NEWLINE(eptr))
+         {
+         if (md->partial != 0 &&
+             eptr + 1 >= md->end_subject &&
+             NLBLOCK->nltype == NLTYPE_FIXED &&
+             NLBLOCK->nllen == 2 &&
+             *eptr == NLBLOCK->nl[0])
+           {
+           md->hitend = TRUE;
+           if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
+           }
+         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 1894 
 for (;;)
+Line 2100 
 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 1905 
 for (;;)
+Line 2111 
 for (;;)
      ASSERT_NL_OR_EOS:
      if (eptr < md->end_subject &&
          (!IS_NEWLINE(eptr) || eptr != md->end_subject - md->nllen))
-       MRRETURN(MATCH_NOMATCH);
+       {
+       if (md->partial != 0 &&
+           eptr + 1 >= md->end_subject &&
+           NLBLOCK->nltype == NLTYPE_FIXED &&
+           NLBLOCK->nllen == 2 &&
+           *eptr == NLBLOCK->nl[0])
+         {
+         md->hitend = TRUE;
+         if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
+         }
+       RRETURN(MATCH_NOMATCH);
+       }
      /* Either at end of string or \n before end. */
-Line 1924 
 for (;;)
+Line 2141 
 for (;;)
        be "non-word" characters. Remember the earliest consulted character for
        partial matching. */
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-       if (utf8)
+       if (utf)
          {
          /* Get status of previous character */
          if (eptr == md->start_subject) prev_is_word = FALSE; else
            {
-           USPTR lastptr = eptr - 1;
+           PCRE_PUCHAR lastptr = eptr - 1;
-           while((*lastptr & 0xc0) == 0x80) lastptr--;
+           BACKCHAR(lastptr);
            if (lastptr < md->start_used_ptr) md->start_used_ptr = lastptr;
            GETCHAR(c, lastptr);
  #ifdef SUPPORT_UCP
-Line 1997 
 for (;;)
+Line 2214 
 for (;;)
              }
            else
  #endif
-           prev_is_word = ((md->ctypes[eptr[-1]] & ctype_word) != 0);
+           prev_is_word = MAX_255(eptr[-1])
+             && ((md->ctypes[eptr[-1]] & ctype_word) != 0);
            }
          /* Get status of next character */
-Line 2020 
 for (;;)
+Line 2238 
 for (;;)
            }
          else
  #endif
-         cur_is_word = ((md->ctypes[*eptr] & ctype_word) != 0);
+         cur_is_word = MAX_255(*eptr)
+           && ((md->ctypes[*eptr] & ctype_word) != 0);
          }
        /* Now see if the situation is what we want */
        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 */
+     /* Match any single character type except newline; have to take care with
+     CRLF newlines and partial matching. */
      case OP_ANY:
-     if (IS_NEWLINE(eptr)) MRRETURN(MATCH_NOMATCH);
+     if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);
+     if (md->partial != 0 &&
+         eptr + 1 >= md->end_subject &&
+         NLBLOCK->nltype == NLTYPE_FIXED &&
+         NLBLOCK->nllen == 2 &&
+         *eptr == NLBLOCK->nl[0])
+       {
+       md->hitend = TRUE;
+       if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
+       }
      /* Fall through */
+     /* Match any single character whatsoever. */
      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);
        }
-     if (utf8) while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
+     eptr++;
+ #ifdef SUPPORT_UTF
+     if (utf) ACROSSCHAR(eptr < md->end_subject, *eptr, eptr++);
+ #endif
      ecode++;
      break;
-Line 2051 
 for (;;)
+Line 2286 
 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 2063 
 for (;;)
+Line 2299 
 for (;;)
      if (eptr >= md->end_subject)
        {
        SCHECK_PARTIAL();
-       MRRETURN(MATCH_NOMATCH);
+       RRETURN(MATCH_NOMATCH);
        }
      GETCHARINCTEST(c, eptr);
      if (
- #ifdef SUPPORT_UTF8
+ #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
         c < 256 &&
  #endif
         (md->ctypes[c] & ctype_digit) != 0
         )
-       MRRETURN(MATCH_NOMATCH);
+       RRETURN(MATCH_NOMATCH);
      ecode++;
      break;
-Line 2080 
 for (;;)
+Line 2316 
 for (;;)
      if (eptr >= md->end_subject)
        {
        SCHECK_PARTIAL();
-       MRRETURN(MATCH_NOMATCH);
+       RRETURN(MATCH_NOMATCH);
        }
      GETCHARINCTEST(c, eptr);
      if (
- #ifdef SUPPORT_UTF8
+ #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
-        c >= 256 ||
+        c > 255 ||
  #endif
         (md->ctypes[c] & ctype_digit) == 0
         )
-       MRRETURN(MATCH_NOMATCH);
+       RRETURN(MATCH_NOMATCH);
      ecode++;
      break;
-Line 2097 
 for (;;)
+Line 2333 
 for (;;)
      if (eptr >= md->end_subject)
        {
        SCHECK_PARTIAL();
-       MRRETURN(MATCH_NOMATCH);
+       RRETURN(MATCH_NOMATCH);
        }
      GETCHARINCTEST(c, eptr);
      if (
- #ifdef SUPPORT_UTF8
+ #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
         c < 256 &&
  #endif
         (md->ctypes[c] & ctype_space) != 0
         )
-       MRRETURN(MATCH_NOMATCH);
+       RRETURN(MATCH_NOMATCH);
      ecode++;
      break;
-Line 2114 
 for (;;)
+Line 2350 
 for (;;)
      if (eptr >= md->end_subject)
        {
        SCHECK_PARTIAL();
-       MRRETURN(MATCH_NOMATCH);
+       RRETURN(MATCH_NOMATCH);
        }
      GETCHARINCTEST(c, eptr);
      if (
- #ifdef SUPPORT_UTF8
+ #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
-        c >= 256 ||
+        c > 255 ||
  #endif
         (md->ctypes[c] & ctype_space) == 0
         )
-       MRRETURN(MATCH_NOMATCH);
+       RRETURN(MATCH_NOMATCH);
      ecode++;
      break;
-Line 2131 
 for (;;)
+Line 2367 
 for (;;)
      if (eptr >= md->end_subject)
        {
        SCHECK_PARTIAL();
-       MRRETURN(MATCH_NOMATCH);
+       RRETURN(MATCH_NOMATCH);
        }
      GETCHARINCTEST(c, eptr);
      if (
- #ifdef SUPPORT_UTF8
+ #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
         c < 256 &&
  #endif
         (md->ctypes[c] & ctype_word) != 0
         )
-       MRRETURN(MATCH_NOMATCH);
+       RRETURN(MATCH_NOMATCH);
      ecode++;
      break;
-Line 2148 
 for (;;)
+Line 2384 
 for (;;)
      if (eptr >= md->end_subject)
        {
        SCHECK_PARTIAL();
-       MRRETURN(MATCH_NOMATCH);
+       RRETURN(MATCH_NOMATCH);
        }
      GETCHARINCTEST(c, eptr);
      if (
- #ifdef SUPPORT_UTF8
+ #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
-        c >= 256 ||
+        c > 255 ||
  #endif
         (md->ctypes[c] & ctype_word) == 0
         )
-       MRRETURN(MATCH_NOMATCH);
+       RRETURN(MATCH_NOMATCH);
      ecode++;
      break;
-Line 2165 
 for (;;)
+Line 2401 
 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++;
+       if (eptr >= md->end_subject)
+         {
+         SCHECK_PARTIAL();
+         }
+       else if (*eptr == 0x0a) eptr++;
        break;
        case 0x000a:
-Line 2184 
 for (;;)
+Line 2424 
 for (;;)
        case 0x0085:
        case 0x2028:
        case 0x2029:
-       if (md->bsr_anycrlf) MRRETURN(MATCH_NOMATCH);
+       if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
        break;
        }
      ecode++;
-Line 2194 
 for (;;)
+Line 2434 
 for (;;)
      if (eptr >= md->end_subject)
        {
        SCHECK_PARTIAL();
-       MRRETURN(MATCH_NOMATCH);
+       RRETURN(MATCH_NOMATCH);
        }
      GETCHARINCTEST(c, eptr);
      switch(c)
-Line 2219 
 for (;;)
+Line 2459 
 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 2228 
 for (;;)
+Line 2468 
 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 2262 
 for (;;)
+Line 2502 
 for (;;)
      if (eptr >= md->end_subject)
        {
        SCHECK_PARTIAL();
-       MRRETURN(MATCH_NOMATCH);
+       RRETURN(MATCH_NOMATCH);
        }
      GETCHARINCTEST(c, eptr);
      switch(c)
-Line 2275 
 for (;;)
+Line 2515 
 for (;;)
        case 0x85:      /* NEL */
        case 0x2028:    /* LINE SEPARATOR */
        case 0x2029:    /* PARAGRAPH SEPARATOR */
-       MRRETURN(MATCH_NOMATCH);
+       RRETURN(MATCH_NOMATCH);
        }
      ecode++;
      break;
-Line 2284 
 for (;;)
+Line 2524 
 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 2311 
 for (;;)
+Line 2551 
 for (;;)
      if (eptr >= md->end_subject)
        {
        SCHECK_PARTIAL();
-       MRRETURN(MATCH_NOMATCH);
+       RRETURN(MATCH_NOMATCH);
        }
      GETCHARINCTEST(c, eptr);
        {
-Line 2320 
 for (;;)
+Line 2560 
 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))
+         if ((ecode[2] != PRIV(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 */
          case PT_ALNUM:
-         if ((_pcre_ucp_gentype[prop->chartype] == ucp_L ||
+         if ((PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
-              _pcre_ucp_gentype[prop->chartype] == ucp_N) == (op == OP_NOTPROP))
+              PRIV(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 ||
+         if ((PRIV(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 */
-         if ((_pcre_ucp_gentype[prop->chartype] == ucp_Z ||
+         if ((PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
               c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||
               c == CHAR_FF || c == CHAR_CR)
                 == (op == OP_NOTPROP))
-           MRRETURN(MATCH_NOMATCH);
+           RRETURN(MATCH_NOMATCH);
          break;
          case PT_WORD:
-         if ((_pcre_ucp_gentype[prop->chartype] == ucp_L ||
+         if ((PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
-              _pcre_ucp_gentype[prop->chartype] == ucp_N ||
+              PRIV(ucp_gentype)[prop->chartype] == ucp_N ||
               c == CHAR_UNDERSCORE) == (op == OP_NOTPROP))
-           MRRETURN(MATCH_NOMATCH);
+           RRETURN(MATCH_NOMATCH);
          break;
          /* This should never occur */
-Line 2392 
 for (;;)
+Line 2632 
 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 (!utf) c = *eptr; else { GETCHARLEN(c, eptr, len); }
-       while (eptr < md->end_subject)
+       if (UCD_CATEGORY(c) != ucp_M) break;
-         {
+       eptr += len;
-         int len = 1;
-         if (!utf8) c = *eptr; else
-           {
-           GETCHARLEN(c, eptr, len);
-           }
-         category = UCD_CATEGORY(c);
-         if (category != ucp_M) break;
-         eptr += len;
-         }
        }
+     CHECK_PARTIAL();
      ecode++;
      break;
  #endif
-Line 2424 
 for (;;)
+Line 2658 
 for (;;)
      loops). */
      case OP_REF:
      case OP_REFI:
      caseless = op == OP_REFI;
      offset = GET2(ecode, 1) << 1;               /* Doubled ref number */
-     ecode += 3;
+     ecode += 1 + IMM2_SIZE;
      /* If the reference is unset, there are two possibilities:
-Line 2467 
 for (;;)
+Line 2701 
 for (;;)
        case OP_CRMINRANGE:
        minimize = (*ecode == OP_CRMINRANGE);
        min = GET2(ecode, 1);
-       max = GET2(ecode, 3);
+       max = GET2(ecode, 1 + IMM2_SIZE);
        if (max == 0) max = INT_MAX;
-       ecode += 5;
+       ecode += 1 + 2 * IMM2_SIZE;
        break;
        default:               /* No repeat follows */
        if ((length = match_ref(offset, eptr, length, md, caseless)) < 0)
          {
+         if (length == -2) eptr = md->end_subject;   /* Partial match */
          CHECK_PARTIAL();
-         MRRETURN(MATCH_NOMATCH);
+         RRETURN(MATCH_NOMATCH);
          }
        eptr += length;
        continue;              /* With the main loop */
        }
      /* Handle repeated back references. If the length of the reference is
-     zero, just continue with the main loop. */
+     zero, just continue with the main loop. If the length is negative, it
+     means the reference is unset in non-Java-compatible mode. If the minimum is
+     zero, we can continue at the same level without recursion. For any other
+     minimum, carrying on will result in NOMATCH. */
      if (length == 0) continue;
+     if (length < 0 && min == 0) continue;
      /* First, ensure the minimum number of matches are present. We get back
      the length of the reference string explicitly rather than passing the
-Line 2493 
 for (;;)
+Line 2732 
 for (;;)
      for (i = 1; i <= min; i++)
        {
        int slength;
        if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
          {
+         if (slength == -2) eptr = md->end_subject;   /* Partial match */
          CHECK_PARTIAL();
-         MRRETURN(MATCH_NOMATCH);
+         RRETURN(MATCH_NOMATCH);
          }
        eptr += slength;
        }
-Line 2513 
 for (;;)
+Line 2753 
 for (;;)
        {
        for (fi = min;; fi++)
          {
          int slength;
          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)
            {
+           if (slength == -2) eptr = md->end_subject;   /* Partial match */
            CHECK_PARTIAL();
-           MRRETURN(MATCH_NOMATCH);
+           RRETURN(MATCH_NOMATCH);
            }
          eptr += slength;
          }
-Line 2534 
 for (;;)
+Line 2775 
 for (;;)
        pp = eptr;
        for (i = min; i < max; i++)
          {
          int slength;
          if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
            {
-           CHECK_PARTIAL();
+           /* Can't use CHECK_PARTIAL because we don't want to update eptr in
+           the soft partial matching case. */
+           if (slength == -2 && md->partial != 0 &&
+               md->end_subject > md->start_used_ptr)
+             {
+             md->hitend = TRUE;
+             if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
+             }
            break;
            }
          eptr += slength;
          }
        while (eptr >= pp)
          {
          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 2566 
 for (;;)
+Line 2816 
 for (;;)
      case OP_NCLASS:
      case OP_CLASS:
        {
+       /* The data variable is saved across frames, so the byte map needs to
+       be stored there. */
+ #define BYTE_MAP ((pcre_uint8 *)data)
        data = ecode + 1;                /* Save for matching */
-       ecode += 33;                     /* Advance past the item */
+       ecode += 1 + (32 / sizeof(pcre_uchar)); /* Advance past the item */
        switch (*ecode)
          {
-Line 2588 
 for (;;)
+Line 2841 
 for (;;)
          case OP_CRMINRANGE:
          minimize = (*ecode == OP_CRMINRANGE);
          min = GET2(ecode, 1);
-         max = GET2(ecode, 3);
+         max = GET2(ecode, 1 + IMM2_SIZE);
          if (max == 0) max = INT_MAX;
-         ecode += 5;
+         ecode += 1 + 2 * IMM2_SIZE;
          break;
          default:               /* No repeat follows */
-Line 2600 
 for (;;)
+Line 2853 
 for (;;)
        /* First, ensure the minimum number of matches are present. */
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-       /* UTF-8 mode */
+       if (utf)
-       if (utf8)
          {
          for (i = 1; i <= min; i++)
            {
            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 ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
-             if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);
-             }
            }
          }
        else
  #endif
-       /* Not UTF-8 mode */
+       /* Not UTF mode */
          {
          for (i = 1; i <= min; i++)
            {
            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);
+ #ifndef COMPILE_PCRE8
+           if (c > 255)
+             {
+             if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
+             }
+           else
+ #endif
+             if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
            }
          }
-Line 2648 
 for (;;)
+Line 2905 
 for (;;)
        if (minimize)
          {
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-         /* UTF-8 mode */
+         if (utf)
-         if (utf8)
            {
            for (fi = min;; fi++)
              {
              RMATCH(eptr, ecode, offset_top, md, 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 ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
-               if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);
-               }
              }
            }
          else
  #endif
-         /* Not UTF-8 mode */
+         /* Not UTF mode */
            {
            for (fi = min;; fi++)
              {
              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);
+ #ifndef COMPILE_PCRE8
+             if (c > 255)
+               {
+               if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
+               }
+             else
+ #endif
+               if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
              }
            }
          /* Control never gets here */
-Line 2700 
 for (;;)
+Line 2961 
 for (;;)
          {
          pp = eptr;
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-         /* UTF-8 mode */
+         if (utf)
-         if (utf8)
            {
            for (i = min; i < max; i++)
              {
-Line 2718 
 for (;;)
+Line 2978 
 for (;;)
                if (op == OP_CLASS) break;
                }
              else
-               {
+               if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) break;
-               if ((data[c/8] & (1 << (c&7))) == 0) break;
-               }
              eptr += len;
              }
            for (;;)
-Line 2733 
 for (;;)
+Line 2991 
 for (;;)
            }
          else
  #endif
-           /* Not UTF-8 mode */
+           /* Not UTF mode */
            {
            for (i = min; i < max; i++)
              {
-Line 2743 
 for (;;)
+Line 3001 
 for (;;)
                break;
                }
              c = *eptr;
-             if ((data[c/8] & (1 << (c&7))) == 0) break;
+ #ifndef COMPILE_PCRE8
+             if (c > 255)
+               {
+               if (op == OP_CLASS) break;
+               }
+             else
+ #endif
+               if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) break;
              eptr++;
              }
            while (eptr >= pp)
-Line 2754 
 for (;;)
+Line 3019 
 for (;;)
              }
            }
-         MRRETURN(MATCH_NOMATCH);
+         RRETURN(MATCH_NOMATCH);
          }
+ #undef BYTE_MAP
        }
      /* Control never gets here */
-Line 2764 
 for (;;)
+Line 3030 
 for (;;)
      when UTF-8 mode mode is supported. Nevertheless, we may not be in UTF-8
      mode, because Unicode properties are supported in non-UTF-8 mode. */
- #ifdef SUPPORT_UTF8
+ #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
      case OP_XCLASS:
        {
        data = ecode + 1 + LINK_SIZE;                /* Save for matching */
-Line 2789 
 for (;;)
+Line 3055 
 for (;;)
          case OP_CRMINRANGE:
          minimize = (*ecode == OP_CRMINRANGE);
          min = GET2(ecode, 1);
-         max = GET2(ecode, 3);
+         max = GET2(ecode, 1 + IMM2_SIZE);
          if (max == 0) max = INT_MAX;
-         ecode += 5;
+         ecode += 1 + 2 * IMM2_SIZE;
          break;
          default:               /* No repeat follows */
-Line 2806 
 for (;;)
+Line 3072 
 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 (!PRIV(xclass)(c, data, utf)) RRETURN(MATCH_NOMATCH);
          }
        /* If max == min we can continue with the main loop without the
-Line 2826 
 for (;;)
+Line 3092 
 for (;;)
            {
            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 (!PRIV(xclass)(c, data, utf)) RRETURN(MATCH_NOMATCH);
            }
          /* Control never gets here */
          }
-Line 2851 
 for (;;)
+Line 3117 
 for (;;)
              SCHECK_PARTIAL();
              break;
              }
+ #ifdef SUPPORT_UTF
            GETCHARLENTEST(c, eptr, len);
-           if (!_pcre_xclass(c, data)) break;
+ #else
+           c = *eptr;
+ #endif
+           if (!PRIV(xclass)(c, data, utf)) break;
            eptr += len;
            }
          for(;;)
-Line 2860 
 for (;;)
+Line 3130 
 for (;;)
            RMATCH(eptr, ecode, offset_top, md, eptrb, RM21);
            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
            if (eptr-- == pp) break;        /* Stop if tried at original pos */
-           if (utf8) BACKCHAR(eptr);
+ #ifdef SUPPORT_UTF
+           if (utf) BACKCHAR(eptr);
+ #endif
            }
-         MRRETURN(MATCH_NOMATCH);
+         RRETURN(MATCH_NOMATCH);
          }
        /* Control never gets here */
-Line 2872 
 for (;;)
+Line 3144 
 for (;;)
      /* Match a single character, casefully */
      case OP_CHAR:
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-     if (utf8)
+     if (utf)
        {
        length = 1;
        ecode++;
-Line 2881 
 for (;;)
+Line 3153 
 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
+     /* Not UTF mode */
-     /* Non-UTF-8 mode */
        {
        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;
-     /* Match a single character, caselessly */
+     /* Match a single character, caselessly. If we are at the end of the
+     subject, give up immediately. */
      case OP_CHARI:
- #ifdef SUPPORT_UTF8
+     if (eptr >= md->end_subject)
-     if (utf8)
+       {
+       SCHECK_PARTIAL();
+       RRETURN(MATCH_NOMATCH);
+       }
+ #ifdef SUPPORT_UTF
+     if (utf)
        {
        length = 1;
        ecode++;
        GETCHARLEN(fc, ecode, length);
-       if (length > md->end_subject - eptr)
-         {
-         CHECK_PARTIAL();             /* Not SCHECK_PARTIAL() */
-         MRRETURN(MATCH_NOMATCH);
-         }
        /* If the pattern character's value is < 128, we have only one byte, and
-       can use the fast lookup table. */
+       we know that its other case must also be one byte long, so we can use the
+       fast lookup table. We know that there is at least one byte left in the
+       subject. */
        if (fc < 128)
          {
-         if (md->lcc[*ecode++] != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);
+         if (md->lcc[fc]
+             != TABLE_GET(*eptr, md->lcc, *eptr)) RRETURN(MATCH_NOMATCH);
+         ecode++;
+         eptr++;
          }
-       /* Otherwise we must pick up the subject character */
+       /* Otherwise we must pick up the subject character. Note that we cannot
+       use the value of "length" to check for sufficient bytes left, because the
+       other case of the character may have more or fewer bytes.  */
        else
          {
-Line 2940 
 for (;;)
+Line 3219 
 for (;;)
  #ifdef SUPPORT_UCP
            if (dc != UCD_OTHERCASE(fc))
  #endif
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
            }
          }
        }
      else
- #endif   /* SUPPORT_UTF8 */
+ #endif   /* SUPPORT_UTF */
-     /* Non-UTF-8 mode */
+     /* Not UTF mode */
        {
-       if (md->end_subject - eptr < 1)
+       if (TABLE_GET(ecode[1], md->lcc, ecode[1])
-         {
+           != TABLE_GET(*eptr, md->lcc, *eptr)) RRETURN(MATCH_NOMATCH);
-         SCHECK_PARTIAL();            /* This one can use SCHECK_PARTIAL() */
+       eptr++;
-         MRRETURN(MATCH_NOMATCH);
-         }
-       if (md->lcc[ecode[1]] != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);
        ecode += 2;
        }
      break;
-Line 2964 
 for (;;)
+Line 3240 
 for (;;)
      case OP_EXACT:
      case OP_EXACTI:
      min = max = GET2(ecode, 1);
-     ecode += 3;
+     ecode += 1 + IMM2_SIZE;
      goto REPEATCHAR;
      case OP_POSUPTO:
-Line 2979 
 for (;;)
+Line 3255 
 for (;;)
      min = 0;
      max = GET2(ecode, 1);
      minimize = *ecode == OP_MINUPTO || *ecode == OP_MINUPTOI;
-     ecode += 3;
+     ecode += 1 + IMM2_SIZE;
      goto REPEATCHAR;
      case OP_POSSTAR:
-Line 3027 
 for (;;)
+Line 3303 
 for (;;)
      /* Common code for all repeated single-character matches. */
      REPEATCHAR:
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-     if (utf8)
+     if (utf)
        {
        length = 1;
        charptr = ecode;
-Line 3044 
 for (;;)
+Line 3320 
 for (;;)
          unsigned int othercase;
          if (op >= OP_STARI &&     /* Caseless */
              (othercase = UCD_OTHERCASE(fc)) != fc)
-           oclength = _pcre_ord2utf8(othercase, occhars);
+           oclength = PRIV(ord2utf)(othercase, occhars);
          else oclength = 0;
  #endif  /* SUPPORT_UCP */
          for (i = 1; i <= min; i++)
            {
            if (eptr <= md->end_subject - length &&
-             memcmp(eptr, charptr, length) == 0) eptr += length;
+             memcmp(eptr, charptr, IN_UCHARS(length)) == 0) eptr += length;
  #ifdef SUPPORT_UCP
            else if (oclength > 0 &&
                     eptr <= md->end_subject - oclength &&
-                    memcmp(eptr, occhars, oclength) == 0) eptr += oclength;
+                    memcmp(eptr, occhars, IN_UCHARS(oclength)) == 0) eptr += oclength;
  #endif  /* SUPPORT_UCP */
            else
              {
              CHECK_PARTIAL();
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
              }
            }
-Line 3072 
 for (;;)
+Line 3348 
 for (;;)
              {
              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;
+               memcmp(eptr, charptr, IN_UCHARS(length)) == 0) eptr += length;
  #ifdef SUPPORT_UCP
              else if (oclength > 0 &&
                       eptr <= md->end_subject - oclength &&
-                      memcmp(eptr, occhars, oclength) == 0) eptr += oclength;
+                      memcmp(eptr, occhars, IN_UCHARS(oclength)) == 0) eptr += oclength;
  #endif  /* SUPPORT_UCP */
              else
                {
                CHECK_PARTIAL();
-               MRRETURN(MATCH_NOMATCH);
+               RRETURN(MATCH_NOMATCH);
                }
              }
            /* Control never gets here */
-Line 3095 
 for (;;)
+Line 3371 
 for (;;)
            for (i = min; i < max; i++)
              {
              if (eptr <= md->end_subject - length &&
-                 memcmp(eptr, charptr, length) == 0) eptr += length;
+                 memcmp(eptr, charptr, IN_UCHARS(length)) == 0) eptr += length;
  #ifdef SUPPORT_UCP
              else if (oclength > 0 &&
                       eptr <= md->end_subject - oclength &&
-                      memcmp(eptr, occhars, oclength) == 0) eptr += oclength;
+                      memcmp(eptr, occhars, IN_UCHARS(oclength)) == 0) eptr += oclength;
  #endif  /* SUPPORT_UCP */
              else
                {
-Line 3114 
 for (;;)
+Line 3390 
 for (;;)
              {
              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 3131 
 for (;;)
+Line 3407 
 for (;;)
        value of fc will always be < 128. */
        }
      else
- #endif  /* SUPPORT_UTF8 */
+ #endif  /* SUPPORT_UTF */
+       /* When not in UTF-8 mode, load a single-byte character. */
-     /* When not in UTF-8 mode, load a single-byte character. */
+       fc = *ecode++;
-     fc = *ecode++;
+     /* The value of fc at this point is always one character, though we may
+     or may not be in UTF mode. The code is duplicated for the caseless and
-     /* The value of fc at this point is always less than 256, though we may or
-     may not be in UTF-8 mode. The code is duplicated for the caseless and
      caseful cases, for speed, since matching characters is likely to be quite
      common. First, ensure the minimum number of matches are present. If min =
      max, continue at the same level without recursing. Otherwise, if
-Line 3151 
 for (;;)
+Line 3425 
 for (;;)
      if (op >= OP_STARI)  /* Caseless */
        {
-       fc = md->lcc[fc];
+ #ifdef COMPILE_PCRE8
+       /* fc must be < 128 if UTF is enabled. */
+       foc = md->fcc[fc];
+ #else
+ #ifdef SUPPORT_UTF
+ #ifdef SUPPORT_UCP
+       if (utf && fc > 127)
+         foc = UCD_OTHERCASE(fc);
+ #else
+       if (utf && fc > 127)
+         foc = fc;
+ #endif /* SUPPORT_UCP */
+       else
+ #endif /* SUPPORT_UTF */
+         foc = TABLE_GET(fc, md->fcc, fc);
+ #endif /* COMPILE_PCRE8 */
        for (i = 1; i <= min; i++)
          {
          if (eptr >= md->end_subject)
            {
            SCHECK_PARTIAL();
-           MRRETURN(MATCH_NOMATCH);
+           RRETURN(MATCH_NOMATCH);
            }
-         if (fc != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);
+         if (fc != *eptr && foc != *eptr) RRETURN(MATCH_NOMATCH);
+         eptr++;
          }
        if (min == max) continue;
        if (minimize)
-Line 3168 
 for (;;)
+Line 3459 
 for (;;)
            {
            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 != *eptr && foc != *eptr) RRETURN(MATCH_NOMATCH);
+           eptr++;
            }
          /* Control never gets here */
          }
-Line 3188 
 for (;;)
+Line 3480 
 for (;;)
              SCHECK_PARTIAL();
              break;
              }
-           if (fc != md->lcc[*eptr]) break;
+           if (fc != *eptr && foc != *eptr) break;
            eptr++;
            }
-Line 3200 
 for (;;)
+Line 3492 
 for (;;)
            eptr--;
            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
            }
-         MRRETURN(MATCH_NOMATCH);
+         RRETURN(MATCH_NOMATCH);
          }
        /* Control never gets here */
        }
-Line 3214 
 for (;;)
+Line 3506 
 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 3227 
 for (;;)
+Line 3519 
 for (;;)
            {
            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 3258 
 for (;;)
+Line 3550 
 for (;;)
            eptr--;
            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
            }
-         MRRETURN(MATCH_NOMATCH);
+         RRETURN(MATCH_NOMATCH);
          }
        }
      /* Control never gets here */
-Line 3267 
 for (;;)
+Line 3559 
 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++;
+ #ifdef SUPPORT_UTF
-     GETCHARINCTEST(c, eptr);
+     if (utf)
-     if (op == OP_NOTI)         /* The caseless case */
        {
- #ifdef SUPPORT_UTF8
+       register unsigned int ch, och;
-       if (c < 256)
+       ecode++;
+       GETCHARINC(ch, ecode);
+       GETCHARINC(c, eptr);
+       if (op == OP_NOT)
+         {
+         if (ch == c) RRETURN(MATCH_NOMATCH);
+         }
+       else
+         {
+ #ifdef SUPPORT_UCP
+         if (ch > 127)
+           och = UCD_OTHERCASE(ch);
+ #else
+         if (ch > 127)
+           och = ch;
+ #endif /* SUPPORT_UCP */
+         else
+           och = TABLE_GET(ch, md->fcc, ch);
+         if (ch == c || och == c) RRETURN(MATCH_NOMATCH);
+         }
+       }
+     else
  #endif
-       c = md->lcc[c];
-       if (md->lcc[*ecode++] == c) MRRETURN(MATCH_NOMATCH);
-       }
-     else    /* Caseful */
        {
-       if (*ecode++ == c) MRRETURN(MATCH_NOMATCH);
+       register unsigned int ch = ecode[1];
+       c = *eptr++;
+       if (ch == c || (op == OP_NOTI && TABLE_GET(ch, md->fcc, ch) == c))
+         RRETURN(MATCH_NOMATCH);
+       ecode += 2;
        }
      break;
-Line 3299 
 for (;;)
+Line 3613 
 for (;;)
      case OP_NOTEXACT:
      case OP_NOTEXACTI:
      min = max = GET2(ecode, 1);
-     ecode += 3;
+     ecode += 1 + IMM2_SIZE;
      goto REPEATNOTCHAR;
      case OP_NOTUPTO:
-Line 3309 
 for (;;)
+Line 3623 
 for (;;)
      min = 0;
      max = GET2(ecode, 1);
      minimize = *ecode == OP_NOTMINUPTO || *ecode == OP_NOTMINUPTOI;
-     ecode += 3;
+     ecode += 1 + IMM2_SIZE;
      goto REPEATNOTCHAR;
      case OP_NOTPOSSTAR:
-Line 3341 
 for (;;)
+Line 3655 
 for (;;)
      possessive = TRUE;
      min = 0;
      max = GET2(ecode, 1);
-     ecode += 3;
+     ecode += 1 + IMM2_SIZE;
      goto REPEATNOTCHAR;
      case OP_NOTSTAR:
-Line 3365 
 for (;;)
+Line 3679 
 for (;;)
      /* Common code for all repeated single-byte matches. */
      REPEATNOTCHAR:
-     fc = *ecode++;
+     GETCHARINCTEST(fc, ecode);
      /* The code is duplicated for the caseless and caseful cases, for speed,
      since matching characters is likely to be quite common. First, ensure the
-Line 3380 
 for (;;)
+Line 3694 
 for (;;)
      if (op >= OP_NOTSTARI)     /* Caseless */
        {
-       fc = md->lcc[fc];
+ #ifdef SUPPORT_UTF
+ #ifdef SUPPORT_UCP
+       if (utf && fc > 127)
+         foc = UCD_OTHERCASE(fc);
+ #else
+       if (utf && fc > 127)
+         foc = fc;
+ #endif /* SUPPORT_UCP */
+       else
+ #endif /* SUPPORT_UTF */
+         foc = TABLE_GET(fc, md->fcc, fc);
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-       /* UTF-8 mode */
+       if (utf)
-       if (utf8)
          {
          register unsigned int d;
          for (i = 1; i <= min; i++)
-Line 3392 
 for (;;)
+Line 3715 
 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 || (unsigned int)foc == d) RRETURN(MATCH_NOMATCH);
-           if (fc == d) MRRETURN(MATCH_NOMATCH);
            }
          }
        else
  #endif
+       /* Not UTF mode */
-       /* Not UTF-8 mode */
          {
          for (i = 1; i <= min; i++)
            {
            if (eptr >= md->end_subject)
              {
              SCHECK_PARTIAL();
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
              }
-           if (fc == md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);
+           if (fc == *eptr || foc == *eptr) RRETURN(MATCH_NOMATCH);
+           eptr++;
            }
          }
-Line 3419 
 for (;;)
+Line 3741 
 for (;;)
        if (minimize)
          {
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-         /* UTF-8 mode */
+         if (utf)
-         if (utf8)
            {
            register unsigned int d;
            for (fi = min;; fi++)
              {
              RMATCH(eptr, ecode, offset_top, md, 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 || (unsigned int)foc == d) RRETURN(MATCH_NOMATCH);
-             if (fc == d) MRRETURN(MATCH_NOMATCH);
              }
            }
          else
  #endif
-         /* Not UTF-8 mode */
+         /* Not UTF mode */
            {
            for (fi = min;; fi++)
              {
              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 == *eptr || foc == *eptr) RRETURN(MATCH_NOMATCH);
+             eptr++;
              }
            }
          /* Control never gets here */
-Line 3465 
 for (;;)
+Line 3786 
 for (;;)
          {
          pp = eptr;
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-         /* UTF-8 mode */
+         if (utf)
-         if (utf8)
            {
            register unsigned int d;
            for (i = min; i < max; i++)
-Line 3479 
 for (;;)
+Line 3799 
 for (;;)
                break;
                }
              GETCHARLEN(d, eptr, len);
-             if (d < 256) d = md->lcc[d];
+             if (fc == d || (unsigned int)foc == d) break;
-             if (fc == d) break;
              eptr += len;
              }
-         if (possessive) continue;
+           if (possessive) continue;
-         for(;;)
+           for(;;)
              {
              RMATCH(eptr, ecode, offset_top, md, eptrb, RM30);
              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-Line 3494 
 for (;;)
+Line 3813 
 for (;;)
            }
          else
  #endif
-         /* Not UTF-8 mode */
+         /* Not UTF mode */
            {
            for (i = min; i < max; i++)
              {
-Line 3503 
 for (;;)
+Line 3822 
 for (;;)
                SCHECK_PARTIAL();
                break;
                }
-             if (fc == md->lcc[*eptr]) break;
+             if (fc == *eptr || foc == *eptr) break;
              eptr++;
              }
            if (possessive) continue;
-Line 3515 
 for (;;)
+Line 3834 
 for (;;)
              }
            }
-         MRRETURN(MATCH_NOMATCH);
+         RRETURN(MATCH_NOMATCH);
          }
        /* Control never gets here */
        }
-Line 3524 
 for (;;)
+Line 3843 
 for (;;)
      else
        {
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-       /* UTF-8 mode */
+       if (utf)
-       if (utf8)
          {
          register unsigned int d;
          for (i = 1; i <= min; i++)
-Line 3534 
 for (;;)
+Line 3852 
 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
  #endif
-       /* Not UTF-8 mode */
+       /* Not UTF mode */
          {
          for (i = 1; i <= min; i++)
            {
            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 3559 
 for (;;)
+Line 3877 
 for (;;)
        if (minimize)
          {
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-         /* UTF-8 mode */
+         if (utf)
-         if (utf8)
            {
            register unsigned int d;
            for (fi = min;; fi++)
              {
              RMATCH(eptr, ecode, offset_top, md, 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
  #endif
-         /* Not UTF-8 mode */
+         /* Not UTF mode */
            {
            for (fi = min;; fi++)
              {
              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 3604 
 for (;;)
+Line 3921 
 for (;;)
          {
          pp = eptr;
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-         /* UTF-8 mode */
+         if (utf)
-         if (utf8)
            {
            register unsigned int d;
            for (i = min; i < max; i++)
-Line 3632 
 for (;;)
+Line 3948 
 for (;;)
            }
          else
  #endif
-         /* Not UTF-8 mode */
+         /* Not UTF mode */
            {
            for (i = min; i < max; i++)
              {
-Line 3653 
 for (;;)
+Line 3969 
 for (;;)
              }
            }
-         MRRETURN(MATCH_NOMATCH);
+         RRETURN(MATCH_NOMATCH);
          }
        }
      /* Control never gets here */
-Line 3665 
 for (;;)
+Line 3981 
 for (;;)
      case OP_TYPEEXACT:
      min = max = GET2(ecode, 1);
      minimize = TRUE;
-     ecode += 3;
+     ecode += 1 + IMM2_SIZE;
      goto REPEATTYPE;
      case OP_TYPEUPTO:
-Line 3673 
 for (;;)
+Line 3989 
 for (;;)
      min = 0;
      max = GET2(ecode, 1);
      minimize = *ecode == OP_TYPEMINUPTO;
-     ecode += 3;
+     ecode += 1 + IMM2_SIZE;
      goto REPEATTYPE;
      case OP_TYPEPOSSTAR:
-Line 3701 
 for (;;)
+Line 4017 
 for (;;)
      possessive = TRUE;
      min = 0;
      max = GET2(ecode, 1);
-     ecode += 3;
+     ecode += 1 + IMM2_SIZE;
      goto REPEATTYPE;
      case OP_TYPESTAR:
-Line 3747 
 for (;;)
+Line 4063 
 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 3762 
 for (;;)
+Line 4078 
 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 3782 
 for (;;)
+Line 4099 
 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 3797 
 for (;;)
+Line 4113 
 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 3812 
 for (;;)
+Line 4127 
 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 3843 
 for (;;)
+Line 4157 
 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 3860 
 for (;;)
+Line 4173 
 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 3905 
 for (;;)
+Line 4217 
 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 (!utf) c = *eptr; else { GETCHARLEN(c, eptr, len); }
-               else { GETCHARLEN(c, eptr, len); }
+             if (UCD_CATEGORY(c) != ucp_M) break;
-             prop_category = UCD_CATEGORY(c);
-             if (prop_category != ucp_M) break;
              eptr += len;
              }
+           CHECK_PARTIAL();
            }
          }
-Line 3927 
 for (;;)
+Line 4237 
 for (;;)
  /* Handle all other cases when the coding is UTF-8 */
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-       if (utf8) switch(ctype)
+       if (utf) switch(ctype)
          {
          case OP_ANY:
          for (i = 1; i <= min; i++)
-Line 3936 
 for (;;)
+Line 4246 
 for (;;)
            if (eptr >= md->end_subject)
              {
              SCHECK_PARTIAL();
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
+             }
+           if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);
+           if (md->partial != 0 &&
+               eptr + 1 >= md->end_subject &&
+               NLBLOCK->nltype == NLTYPE_FIXED &&
+               NLBLOCK->nllen == 2 &&
+               *eptr == NLBLOCK->nl[0])
+             {
+             md->hitend = TRUE;
+             if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);
              }
-           if (IS_NEWLINE(eptr)) MRRETURN(MATCH_NOMATCH);
            eptr++;
-           while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
+           ACROSSCHAR(eptr < md->end_subject, *eptr, eptr++);
            }
          break;
-Line 3950 
 for (;;)
+Line 4269 
 for (;;)
            if (eptr >= md->end_subject)
              {
              SCHECK_PARTIAL();
-             MRRETURN(MATCH_NOMATCH);
+             RRETURN(MATCH_NOMATCH);
              }
            eptr++;
-           while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
+           ACROSSCHAR(eptr < md->end_subject, *eptr, eptr++);
            }
          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 3968 
 for (;;)
+Line 4287 
 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 3987 
 for (;;)
+Line 4306 
 for (;;)
              case 0x0085: