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

Diff of /code/trunk/pcre_exec.c

Parent Directory | Revision Log | View Patch Patch

-revision 85 by nigel,
Sat Feb 24 21:41:13 2007 UTC
+revision 120 by ph10,
Mon Mar 12 11:36:14 2007 UTC
 Line 6
  and semantics are as close as possible to those of the Perl 5 language.
                         Written by Philip Hazel
-            Copyright (c) 1997-2005 University of Cambridge
+            Copyright (c) 1997-2007 University of Cambridge
  -----------------------------------------------------------------------------
  Redistribution and use in source and binary forms, with or without
 Line 42 
 POSSIBILITY OF SUCH DAMAGE.
  pattern matching using an NFA algorithm, trying to mimic Perl as closely as
  possible. There are also some static supporting functions. */
+ #define NLBLOCK md             /* Block containing newline information */
+ #define PSSTART start_subject  /* Field containing processed string start */
+ #define PSEND   end_subject    /* Field containing processed string end */
  #include "pcre_internal.h"
+ /* The chain of eptrblocks for tail recursions uses memory in stack workspace,
+ obtained at top level, the size of which is defined by EPTR_WORK_SIZE. */
- /* Structure for building a chain of data that actually lives on the
+ #define EPTR_WORK_SIZE (1000)
- stack, for holding the values of the subject pointer at the start of each
- subpattern, so as to detect when an empty string has been matched by a
- subpattern - to break infinite loops. When NO_RECURSE is set, these blocks
- are on the heap, not on the stack. */
- typedef struct eptrblock {
-   struct eptrblock *epb_prev;
-   const uschar *epb_saved_eptr;
- } eptrblock;
  /* Flag bits for the match() function */
- #define match_condassert   0x01    /* Called to check a condition assertion */
+ #define match_condassert     0x01  /* Called to check a condition assertion */
- #define match_isgroup      0x02    /* Set if start of bracketed group */
+ #define match_cbegroup       0x02  /* Could-be-empty unlimited repeat group */
+ #define match_tail_recursed  0x04  /* Tail recursive call */
  /* Non-error returns from the match() function. Error returns are externally
  defined PCRE_ERROR_xxx codes, which are all negative. */
-Line 101 
 Returns:     nothing
+Line 98 
 Returns:     nothing
  static void
  pchars(const uschar *p, int length, BOOL is_subject, match_data *md)
  {
- int c;
+ unsigned int c;
  if (is_subject && length > md->end_subject - p) length = md->end_subject - p;
  while (length-- > 0)
    if (isprint(c = *(p++))) printf("%c", c); else printf("\\x%02x", c);
-Line 128 
 Returns:      TRUE if matched
+Line 125 
 Returns:      TRUE if matched
  */
  static BOOL
- match_ref(int offset, register const uschar *eptr, int length, match_data *md,
+ match_ref(int offset, register USPTR eptr, int length, match_data *md,
    unsigned long int ims)
  {
- const uschar *p = md->start_subject + md->offset_vector[offset];
+ USPTR p = md->start_subject + md->offset_vector[offset];
  #ifdef DEBUG
  if (eptr >= md->end_subject)
-Line 169 
 return TRUE;
+Line 166 
 return TRUE;
  ****************************************************************************
                     RECURSION IN THE match() FUNCTION
- The match() function is highly recursive. Some regular expressions can cause
+ The match() function is highly recursive, though not every recursive call
- it to recurse thousands of times. I was writing for Unix, so I just let it
+ increases the recursive depth. Nevertheless, some regular expressions can cause
- call itself recursively. This uses the stack for saving everything that has
+ it to recurse to a great depth. I was writing for Unix, so I just let it call
- to be saved for a recursive call. On Unix, the stack can be large, and this
+ itself recursively. This uses the stack for saving everything that has to be
- works fine.
+ saved for a recursive call. On Unix, the stack can be large, and this works
+ fine.
- It turns out that on non-Unix systems there are problems with programs that
- use a lot of stack. (This despite the fact that every last chip has oodles
+ It turns out that on some non-Unix-like systems there are problems with
- of memory these days, and techniques for extending the stack have been known
+ programs that use a lot of stack. (This despite the fact that every last chip
- for decades.) So....
+ has oodles of memory these days, and techniques for extending the stack have
+ been known for decades.) So....
  There is a fudge, triggered by defining NO_RECURSE, which avoids recursive
  calls by keeping local variables that need to be preserved in blocks of memory
- obtained from malloc instead instead of on the stack. Macros are used to
+ obtained from malloc() instead instead of on the stack. Macros are used to
  achieve this so that the actual code doesn't look very different to what it
  always used to.
  ****************************************************************************
  ***************************************************************************/
- /* These versions of the macros use the stack, as normal */
+ /* These versions of the macros use the stack, as normal. There are debugging
+ versions and production versions. */
  #ifndef NO_RECURSE
  #define REGISTER register
- #define RMATCH(rx,ra,rb,rc,rd,re,rf,rg) rx = match(ra,rb,rc,rd,re,rf,rg)
+ #ifdef DEBUG
+ #define RMATCH(rx,ra,rb,rc,rd,re,rf,rg) \
+   { \
+   printf("match() called in line %d\n", __LINE__); \
+   rx = match(ra,rb,rc,rd,re,rf,rg,rdepth+1); \
+   printf("to line %d\n", __LINE__); \
+   }
+ #define RRETURN(ra) \
+   { \
+   printf("match() returned %d from line %d ", ra, __LINE__); \
+   return ra; \
+   }
+ #else
+ #define RMATCH(rx,ra,rb,rc,rd,re,rf,rg) \
+   rx = match(ra,rb,rc,rd,re,rf,rg,rdepth+1)
  #define RRETURN(ra) return ra
+ #endif
  #else
-Line 215 
 match(), which never changes. */
+Line 230 
 match(), which never changes. */
      newframe->Xims = re;\
      newframe->Xeptrb = rf;\
      newframe->Xflags = rg;\
+     newframe->Xrdepth = frame->Xrdepth + 1;\
      newframe->Xprevframe = frame;\
      frame = newframe;\
      DPRINTF(("restarting from line %d\n", __LINE__));\
-Line 256 
 typedef struct heapframe {
+Line 272 
 typedef struct heapframe {
    long int Xims;
    eptrblock *Xeptrb;
    int Xflags;
+   unsigned int Xrdepth;
    /* Function local variables */
-Line 271 
 typedef struct heapframe {
+Line 288 
 typedef struct heapframe {
    BOOL Xcur_is_word;
    BOOL Xcondition;
-   BOOL Xminimize;
    BOOL Xprev_is_word;
    unsigned long int Xoriginal_ims;
  #ifdef SUPPORT_UCP
    int Xprop_type;
+   int Xprop_value;
    int Xprop_fail_result;
    int Xprop_category;
    int Xprop_chartype;
-   int Xprop_othercase;
+   int Xprop_script;
-   int Xprop_test_against;
+   int Xoclength;
-   int *Xprop_test_variable;
+   uschar Xocchars[8];
  #endif
    int Xctype;
-   int Xfc;
+   unsigned int Xfc;
    int Xfi;
    int Xlength;
    int Xmax;
-Line 320 
 typedef struct heapframe {
+Line 337 
 typedef struct heapframe {
  *         Match from current position            *
  *************************************************/
- /* On entry ecode points to the first opcode, and eptr to the first character
+ /* This function is called recursively in many circumstances. Whenever it
- in the subject string, while eptrb holds the value of eptr at the start of the
- last bracketed group - used for breaking infinite loops matching zero-length
- strings. This function is called recursively in many circumstances. Whenever it
  returns a negative (error) response, the outer incarnation must also return the
  same response.
-Line 333 
 performance. Tests using gcc on a SPARC
+Line 347 
 performance. Tests using gcc on a SPARC
  made performance worse.
  Arguments:
-    eptr        pointer in subject
+    eptr        pointer to current character in subject
-    ecode       position in code
+    ecode       pointer to current position in compiled code
     offset_top  current top pointer
     md          pointer to "static" info for the match
     ims         current /i, /m, and /s options
-Line 342 
 Arguments:
+Line 356 
 Arguments:
                   brackets - for testing for empty matches
     flags       can contain
                   match_condassert - this is an assertion condition
-                  match_isgroup - this is the start of a bracketed group
+                  match_cbegroup - this is the start of an unlimited repeat
+                    group that can match an empty string
+                  match_tail_recursed - this is a tail_recursed group
+    rdepth      the recursion depth
  Returns:       MATCH_MATCH if matched            )  these values are >= 0
                 MATCH_NOMATCH if failed to match  )
                 a negative PCRE_ERROR_xxx value if aborted by an error condition
-                  (e.g. stopped by recursion limit)
+                  (e.g. stopped by repeated call or recursion limit)
  */
  static int
- match(REGISTER const uschar *eptr, REGISTER const uschar *ecode,
+ match(REGISTER USPTR eptr, REGISTER const uschar *ecode,
    int offset_top, match_data *md, unsigned long int ims, eptrblock *eptrb,
-   int flags)
+   int flags, unsigned int rdepth)
  {
  /* These variables do not need to be preserved over recursion in this function,
- so they can be ordinary variables in all cases. Mark them with "register"
+ so they can be ordinary variables in all cases. Mark some of them with
- because they are used a lot in loops. */
+ "register" because they are used a lot in loops. */
- register int  rrc;    /* Returns from recursive calls */
+ register int  rrc;         /* Returns from recursive calls */
- register int  i;      /* Used for loops not involving calls to RMATCH() */
+ register int  i;           /* Used for loops not involving calls to RMATCH() */
- register int  c;      /* Character values not kept over RMATCH() calls */
+ register unsigned int c;   /* Character values not kept over RMATCH() calls */
- register BOOL utf8;   /* Local copy of UTF-8 flag for speed */
+ register BOOL utf8;        /* Local copy of UTF-8 flag for speed */
+ BOOL minimize, possessive; /* Quantifier options */
  /* 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
-Line 381 
 frame->Xoffset_top = offset_top;
+Line 400 
 frame->Xoffset_top = offset_top;
  frame->Xims = ims;
  frame->Xeptrb = eptrb;
  frame->Xflags = flags;
+ frame->Xrdepth = rdepth;
  /* This is where control jumps back to to effect "recursion" */
-Line 394 
 HEAP_RECURSE:
+Line 414 
 HEAP_RECURSE:
  #define ims                frame->Xims
  #define eptrb              frame->Xeptrb
  #define flags              frame->Xflags
+ #define rdepth             frame->Xrdepth
  /* Ditto for the local variables */
-Line 411 
 HEAP_RECURSE:
+Line 432 
 HEAP_RECURSE:
  #define cur_is_word        frame->Xcur_is_word
  #define condition          frame->Xcondition
- #define minimize           frame->Xminimize
  #define prev_is_word       frame->Xprev_is_word
  #define original_ims       frame->Xoriginal_ims
  #ifdef SUPPORT_UCP
  #define prop_type          frame->Xprop_type
+ #define prop_value         frame->Xprop_value
  #define prop_fail_result   frame->Xprop_fail_result
  #define prop_category      frame->Xprop_category
  #define prop_chartype      frame->Xprop_chartype
- #define prop_othercase     frame->Xprop_othercase
+ #define prop_script        frame->Xprop_script
- #define prop_test_against  frame->Xprop_test_against
+ #define oclength           frame->Xoclength
- #define prop_test_variable frame->Xprop_test_variable
+ #define occhars            frame->Xocchars
  #endif
  #define ctype              frame->Xctype
-Line 447 
 HEAP_RECURSE:
+Line 468 
 HEAP_RECURSE:
  get preserved during recursion in the normal way. In this environment, fi and
  i, and fc and c, can be the same variables. */
- #else
+ #else         /* NO_RECURSE not defined */
  #define fi i
  #define fc c
- #ifdef SUPPORT_UTF8                /* Many of these variables are used ony */
+ #ifdef SUPPORT_UTF8                /* Many of these variables are used only  */
- const uschar *charptr;             /* small blocks of the code. My normal  */
+ const uschar *charptr;             /* in small blocks of the code. My normal */
- #endif                             /* style of coding would have declared  */
+ #endif                             /* style of coding would have declared    */
- const uschar *callpat;             /* them within each of those blocks.    */
+ const uschar *callpat;             /* them within each of those blocks.      */
- const uschar *data;                /* However, in order to accommodate the */
+ const uschar *data;                /* However, in order to accommodate the   */
- const uschar *next;                /* version of this code that uses an    */
+ const uschar *next;                /* version of this code that uses an      */
- const uschar *pp;                  /* external "stack" implemented on the  */
+ USPTR         pp;                  /* external "stack" implemented on the    */
- const uschar *prev;                /* heap, it is easier to declare them   */
+ const uschar *prev;                /* heap, it is easier to declare them all */
- const uschar *saved_eptr;          /* all here, so the declarations can    */
+ USPTR         saved_eptr;          /* here, so the declarations can be cut   */
-                                    /* be cut out in a block. The only      */
+                                    /* out in a block. The only declarations  */
- recursion_info new_recursive;      /* declarations within blocks below are */
+ recursion_info new_recursive;      /* within blocks below are for variables  */
-                                    /* for variables that do not have to    */
+                                    /* that do not have to be preserved over  */
- BOOL cur_is_word;                  /* be preserved over a recursive call   */
+ BOOL cur_is_word;                  /* a recursive call to RMATCH().          */
- BOOL condition;                    /* to RMATCH().                         */
+ BOOL condition;
- BOOL minimize;
  BOOL prev_is_word;
  unsigned long int original_ims;
  #ifdef SUPPORT_UCP
  int prop_type;
+ int prop_value;
  int prop_fail_result;
  int prop_category;
  int prop_chartype;
- int prop_othercase;
+ int prop_script;
- int prop_test_against;
+ int oclength;
- int *prop_test_variable;
+ uschar occhars[8];
  #endif
  int ctype;
-Line 493 
 int save_offset1, save_offset2, save_off
+Line 514 
 int save_offset1, save_offset2, save_off
  int stacksave[REC_STACK_SAVE_MAX];
  eptrblock newptrb;
- #endif
+ #endif     /* NO_RECURSE */
  /* These statements are here to stop the compiler complaining about unitialized
  variables. */
  #ifdef SUPPORT_UCP
+ prop_value = 0;
  prop_fail_result = 0;
- prop_test_against = 0;
- prop_test_variable = NULL;
  #endif
- /* OK, now we can get on with the real code of the function. Recursion is
- specified by the macros RMATCH and RRETURN. When NO_RECURSE is *not* defined,
+ /* This label is used for tail recursion, which is used in a few cases even
- these just turn into a recursive call to match() and a "return", respectively.
+ when NO_RECURSE is not defined, in order to reduce the amount of stack that is
- However, RMATCH isn't like a function call because it's quite a complicated
+ used. Thanks to Ian Taylor for noticing this possibility and sending the
- macro. It has to be used in one particular way. This shouldn't, however, impact
+ original patch. */
- performance when true recursion is being used. */
+ TAIL_RECURSE:
+ /* OK, now we can get on with the real code of the function. Recursive calls
+ are specified by the macro RMATCH and RRETURN is used to return. When
+ NO_RECURSE is *not* defined, these just turn into a recursive call to match()
+ and a "return", respectively (possibly with some debugging if DEBUG is
+ defined). However, RMATCH isn't like a function call because it's quite a
+ complicated macro. It has to be used in one particular way. This shouldn't,
+ however, impact performance when true recursion is being used. */
+ /* First check that we haven't called match() too many times, or that we
+ haven't exceeded the recursive call limit. */
  if (md->match_call_count++ >= md->match_limit) RRETURN(PCRE_ERROR_MATCHLIMIT);
+ if (rdepth >= md->match_limit_recursion) RRETURN(PCRE_ERROR_RECURSIONLIMIT);
  original_ims = ims;    /* Save for resetting on ')' */
+ #ifdef SUPPORT_UTF8
  utf8 = md->utf8;       /* Local copy of the flag */
+ #else
+ utf8 = FALSE;
+ #endif
- /* At the start of a bracketed group, add the current subject pointer to the
+ /* At the start of a group with an unlimited repeat that may match an empty
- stack of such pointers, to be re-instated at the end of the group when we hit
+ string, the match_cbegroup flag is set. When this is the case, add the current
- the closing ket. When match() is called in other circumstances, we don't add to
+ subject pointer to the chain of such remembered pointers, to be checked when we
- this stack. */
+ hit the closing ket, in order to break infinite loops that match no characters.
+ When match() is called in other circumstances, don't add to the chain. If this
+ is a tail recursion, use a block from the workspace, as the one on the stack is
+ already used. */
- if ((flags & match_isgroup) != 0)
+ if ((flags & match_cbegroup) != 0)
    {
-   newptrb.epb_prev = eptrb;
+   eptrblock *p;
-   newptrb.epb_saved_eptr = eptr;
+   if ((flags & match_tail_recursed) != 0)
-   eptrb = &newptrb;
+     {
+     if (md->eptrn >= EPTR_WORK_SIZE) RRETURN(PCRE_ERROR_NULLWSLIMIT);
+     p = md->eptrchain + md->eptrn++;
+     }
+   else p = &newptrb;
+   p->epb_saved_eptr = eptr;
+   p->epb_prev = eptrb;
+   eptrb = p;
    }
- /* Now start processing the operations. */
+ /* Now start processing the opcodes. */
  for (;;)
    {
+   minimize = possessive = FALSE;
    op = *ecode;
-   minimize = FALSE;
    /* For partial matching, remember if we ever hit the end of the subject after
    matching at least one subject character. */
-Line 543 
 for (;;)
+Line 591 
 for (;;)
        eptr > md->start_match)
      md->hitend = TRUE;
-   /* Opening capturing bracket. If there is space in the offset vector, save
+   switch(op)
-   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 the bracket fails to match, we need to restore this 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 case
-   here; that is handled in the code for KET. */
-   if (op > OP_BRA)
      {
-     number = op - OP_BRA;
+     /* Handle a capturing bracket. If there is space in the offset vector, save
+     the current subject position in the working slot at the top of the vector.
-     /* For extended extraction brackets (large number), we have to fish out the
+     We mustn't change the current values of the data slot, because they may be
-     number from a dummy opcode at the start. */
+     set from a previous iteration of this group, and be referred to by a
+     reference inside the group.
-     if (number > EXTRACT_BASIC_MAX)
-       number = GET2(ecode, 2+LINK_SIZE);
+     If the bracket fails to match, we need to restore this 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
+     case here; that is handled in the code for KET. */
+     case OP_CBRA:
+     case OP_SCBRA:
+     number = GET2(ecode, 1+LINK_SIZE);
      offset = number << 1;
  #ifdef DEBUG
-     printf("start bracket %d subject=", number);
+     printf("start bracket %d\n", number);
+     printf("subject=");
      pchars(eptr, 16, TRUE, md);
      printf("\n");
  #endif
-Line 584 
 for (;;)
+Line 629 
 for (;;)
        DPRINTF(("saving %d %d %d\n", save_offset1, save_offset2, save_offset3));
        md->offset_vector[md->offset_end - number] = eptr - md->start_subject;
+       flags = (op == OP_SCBRA)? match_cbegroup : 0;
        do
          {
-         RMATCH(rrc, eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, eptrb,
+         RMATCH(rrc, eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
-           match_isgroup);
+           ims, eptrb, flags);
          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
          md->capture_last = save_capture_last;
          ecode += GET(ecode, 1);
-Line 603 
 for (;;)
+Line 649 
 for (;;)
        RRETURN(MATCH_NOMATCH);
        }
-     /* Insufficient room for saving captured contents */
+     /* Insufficient room for saving captured contents. Treat as a non-capturing
+     bracket. */
-     else op = OP_BRA;
+     DPRINTF(("insufficient capture room: treat as non-capturing\n"));
-     }
-   /* Other types of node can be handled by a switch */
+     /* Non-capturing bracket. Loop for all the alternatives. When we get to the
+     final alternative within the brackets, we would return the result of a
+     recursive call to match() whatever happened. We can reduce stack usage by
+     turning this into a tail recursion. */
-   switch(op)
+     case OP_BRA:
-     {
+     case OP_SBRA:
-     case OP_BRA:     /* Non-capturing bracket: optimized */
+     DPRINTF(("start non-capturing bracket\n"));
-     DPRINTF(("start bracket 0\n"));
+     flags = (op >= OP_SBRA)? match_cbegroup : 0;
-     do
+     for (;;)
        {
-       RMATCH(rrc, eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, eptrb,
+       if (ecode[GET(ecode, 1)] != OP_ALT)
-         match_isgroup);
+         {
+         ecode += _pcre_OP_lengths[*ecode];
+         flags |= match_tail_recursed;
+         DPRINTF(("bracket 0 tail recursion\n"));
+         goto TAIL_RECURSE;
+         }
+       /* For non-final alternatives, continue the loop for a NOMATCH result;
+       otherwise return. */
+       RMATCH(rrc, eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md, ims,
+         eptrb, flags);
        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
        ecode += GET(ecode, 1);
        }
-     while (*ecode == OP_ALT);
+     /* Control never reaches here. */
-     DPRINTF(("bracket 0 failed\n"));
-     RRETURN(MATCH_NOMATCH);
      /* Conditional group: compilation checked that there are no more than
      two branches. If the condition is false, skipping the first branch takes us
      past the end if there is only one branch, but that's OK because that is
-     exactly what going to the ket would do. */
+     exactly what going to the ket would do. As there is only one branch to be
+     obeyed, we can use tail recursion to avoid using another stack frame. */
      case OP_COND:
-     if (ecode[LINK_SIZE+1] == OP_CREF) /* Condition extract or recurse test */
+     case OP_SCOND:
+     if (ecode[LINK_SIZE+1] == OP_RREF)         /* Recursion test */
+       {
+       offset = GET2(ecode, LINK_SIZE + 2);     /* Recursion group number*/
+       condition = md->recursive != NULL &&
+         (offset == RREF_ANY || offset == md->recursive->group_num);
+       ecode += condition? 3 : GET(ecode, 1);
+       }
+     else if (ecode[LINK_SIZE+1] == OP_CREF)    /* Group used test */
        {
        offset = GET2(ecode, LINK_SIZE+2) << 1;  /* Doubled ref number */
-       condition = (offset == CREF_RECURSE * 2)?
+       condition = offset < offset_top && md->offset_vector[offset] >= 0;
-         (md->recursive != NULL) :
+       ecode += condition? 3 : GET(ecode, 1);
-         (offset < offset_top && md->offset_vector[offset] >= 0);
+       }
-       RMATCH(rrc, eptr, ecode + (condition?
-         (LINK_SIZE + 4) : (LINK_SIZE + 1 + GET(ecode, 1))),
+     else if (ecode[LINK_SIZE+1] == OP_DEF)     /* DEFINE - always false */
-         offset_top, md, ims, eptrb, match_isgroup);
+       {
-       RRETURN(rrc);
+       condition = FALSE;
+       ecode += GET(ecode, 1);
        }
      /* The condition is an assertion. Call match() to evaluate it - setting
-     the final argument TRUE causes it to stop at the end of an assertion. */
+     the final argument match_condassert causes it to stop at the end of an
+     assertion. */
      else
        {
        RMATCH(rrc, eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, NULL,
-           match_condassert | match_isgroup);
+           match_condassert);
        if (rrc == MATCH_MATCH)
          {
-         ecode += 1 + LINK_SIZE + GET(ecode, LINK_SIZE+2);
+         condition = TRUE;
+         ecode += 1 + LINK_SIZE + GET(ecode, LINK_SIZE + 2);
          while (*ecode == OP_ALT) ecode += GET(ecode, 1);
          }
        else if (rrc != MATCH_NOMATCH)
          {
          RRETURN(rrc);         /* Need braces because of following else */
          }
-       else ecode += GET(ecode, 1);
+       else
-       RMATCH(rrc, eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, eptrb,
+         {
-         match_isgroup);
+         condition = FALSE;
-       RRETURN(rrc);
+         ecode += GET(ecode, 1);
+         }
        }
-     /* Control never reaches here */
-     /* Skip over conditional reference or large extraction number data if
+     /* We are now at the branch that is to be obeyed. As there is only one,
-     encountered. */
+     we can use tail recursion to avoid using another stack frame. If the second
+     alternative doesn't exist, we can just plough on. */
-     case OP_CREF:
+     if (condition || *ecode == OP_ALT)
-     case OP_BRANUMBER:
+       {
-     ecode += 3;
+       ecode += 1 + LINK_SIZE;
+       flags = match_tail_recursed | ((op == OP_SCOND)? match_cbegroup : 0);
+       goto TAIL_RECURSE;
+       }
+     else
+       {
+       ecode += 1 + LINK_SIZE;
+       }
      break;
-     /* End of the pattern. If we are in a recursion, we should restore the
-     offsets appropriately and continue from after the call. */
+     /* End of the pattern. If we are in a top-level recursion, we should
+     restore the offsets appropriately and continue from after the call. */
      case OP_END:
      if (md->recursive != NULL && md->recursive->group_num == 0)
        {
        recursion_info *rec = md->recursive;
-       DPRINTF(("Hit the end in a (?0) recursion\n"));
+       DPRINTF(("End of pattern in a (?0) recursion\n"));
        md->recursive = rec->prevrec;
        memmove(md->offset_vector, rec->offset_save,
          rec->saved_max * sizeof(int));
-Line 717 
 for (;;)
+Line 797 
 for (;;)
      case OP_ASSERTBACK:
      do
        {
-       RMATCH(rrc, eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, NULL,
+       RMATCH(rrc, eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, NULL, 0);
-         match_isgroup);
        if (rrc == MATCH_MATCH) break;
        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
        ecode += GET(ecode, 1);
-Line 744 
 for (;;)
+Line 823 
 for (;;)
      case OP_ASSERTBACK_NOT:
      do
        {
-       RMATCH(rrc, eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, NULL,
+       RMATCH(rrc, eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, NULL, 0);
-         match_isgroup);
        if (rrc == MATCH_MATCH) RRETURN(MATCH_NOMATCH);
        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
        ecode += GET(ecode,1);
-Line 766 
 for (;;)
+Line 844 
 for (;;)
  #ifdef SUPPORT_UTF8
      if (utf8)
        {
-       c = GET(ecode,1);
+       i = GET(ecode, 1);
-       for (i = 0; i < c; i++)
+       while (i-- > 0)
          {
          eptr--;
          if (eptr < md->start_subject) RRETURN(MATCH_NOMATCH);
-Line 780 
 for (;;)
+Line 858 
 for (;;)
      /* No UTF-8 support, or not in UTF-8 mode: count is byte count */
        {
-       eptr -= GET(ecode,1);
+       eptr -= GET(ecode, 1);
        if (eptr < md->start_subject) RRETURN(MATCH_NOMATCH);
        }
-Line 800 
 for (;;)
+Line 878 
 for (;;)
        cb.version          = 1;   /* Version 1 of the callout block */
        cb.callout_number   = ecode[1];
        cb.offset_vector    = md->offset_vector;
-       cb.subject          = (const char *)md->start_subject;
+       cb.subject          = (PCRE_SPTR)md->start_subject;
        cb.subject_length   = md->end_subject - md->start_subject;
        cb.start_match      = md->start_match - md->start_subject;
        cb.current_position = eptr - md->start_subject;
-Line 837 
 for (;;)
+Line 915 
 for (;;)
      case OP_RECURSE:
        {
        callpat = md->start_code + GET(ecode, 1);
-       new_recursive.group_num = *callpat - OP_BRA;
+       new_recursive.group_num = (callpat == md->start_code)? 0 :
+         GET2(callpat, 1 + LINK_SIZE);
-       /* For extended extraction brackets (large number), we have to fish out
-       the number from a dummy opcode at the start. */
-       if (new_recursive.group_num > EXTRACT_BASIC_MAX)
-         new_recursive.group_num = GET2(callpat, 2+LINK_SIZE);
        /* Add to "recursing stack" */
-Line 876 
 for (;;)
+Line 949 
 for (;;)
        restore the offset and recursion data. */
        DPRINTF(("Recursing into group %d\n", new_recursive.group_num));
+       flags = (*callpat >= OP_SBRA)? match_cbegroup : 0;
        do
          {
-         RMATCH(rrc, eptr, callpat + 1 + LINK_SIZE, offset_top, md, ims,
+         RMATCH(rrc, eptr, callpat + _pcre_OP_lengths[*callpat], offset_top,
-             eptrb, match_isgroup);
+           md, ims, eptrb, flags);
          if (rrc == MATCH_MATCH)
            {
+           DPRINTF(("Recursion matched\n"));
            md->recursive = new_recursive.prevrec;
            if (new_recursive.offset_save != stacksave)
              (pcre_free)(new_recursive.offset_save);
            RRETURN(MATCH_MATCH);
            }
-         else if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+         else if (rrc != MATCH_NOMATCH)
+           {
+           DPRINTF(("Recursion gave error %d\n", rrc));
+           RRETURN(rrc);
+           }
          md->recursive = &new_recursive;
          memcpy(md->offset_vector, new_recursive.offset_save,
-Line 912 
 for (;;)
+Line 991 
 for (;;)
      the end of a normal bracket, leaving the subject pointer. */
      case OP_ONCE:
-       {
+     prev = ecode;
-       prev = ecode;
+     saved_eptr = eptr;
-       saved_eptr = eptr;
-       do
+     do
-         {
+       {
-         RMATCH(rrc, eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims,
+       RMATCH(rrc, eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims,
-           eptrb, match_isgroup);
+         eptrb, 0);
-         if (rrc == MATCH_MATCH) break;
+       if (rrc == MATCH_MATCH) break;
-         if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+       if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-         ecode += GET(ecode,1);
+       ecode += GET(ecode,1);
-         }
+       }
-       while (*ecode == OP_ALT);
+     while (*ecode == OP_ALT);
-       /* If hit the end of the group (which could be repeated), fail */
+     /* If hit the end of the group (which could be repeated), fail */
-       if (*ecode != OP_ONCE && *ecode != OP_ALT) RRETURN(MATCH_NOMATCH);
+     if (*ecode != OP_ONCE && *ecode != OP_ALT) RRETURN(MATCH_NOMATCH);
-       /* Continue as from after the assertion, updating the offsets high water
+     /* Continue as from after the assertion, updating the offsets high water
-       mark, since extracts may have been taken. */
+     mark, since extracts may have been taken. */
-       do ecode += GET(ecode,1); while (*ecode == OP_ALT);
+     do ecode += GET(ecode, 1); while (*ecode == OP_ALT);
-       offset_top = md->end_offset_top;
+     offset_top = md->end_offset_top;
-       eptr = md->end_match_ptr;
+     eptr = md->end_match_ptr;
-       /* For a non-repeating ket, just continue at this level. This also
+     /* 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.
+     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
+     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. */
+     course of events. */
-       if (*ecode == OP_KET || eptr == saved_eptr)
+     if (*ecode == OP_KET || eptr == saved_eptr)
-         {
+       {
-         ecode += 1+LINK_SIZE;
+       ecode += 1+LINK_SIZE;
-         break;
+       break;
-         }
+       }
-       /* The repeating kets try the rest of the pattern or restart from the
+     /* The repeating kets try the rest of the pattern or restart from the
-       preceding bracket, in the appropriate order. We need to reset any options
+     preceding bracket, in the appropriate order. The second "call" of match()
-       that changed within the bracket before re-running it, so check the next
+     uses tail recursion, to avoid using another stack frame. We need to reset
-       opcode. */
+     any options that changed within the bracket before re-running it, so
+     check the next opcode. */
-       if (ecode[1+LINK_SIZE] == OP_OPT)
+     if (ecode[1+LINK_SIZE] == OP_OPT)
-         {
+       {
-         ims = (ims & ~PCRE_IMS) | ecode[4];
+       ims = (ims & ~PCRE_IMS) | ecode[4];
-         DPRINTF(("ims set to %02lx at group repeat\n", ims));
+       DPRINTF(("ims set to %02lx at group repeat\n", ims));
-         }
+       }
-       if (*ecode == OP_KETRMIN)
+     if (*ecode == OP_KETRMIN)
-         {
+       {
-         RMATCH(rrc, eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, eptrb, 0);
+       RMATCH(rrc, eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, eptrb, 0);
-         if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+       if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-         RMATCH(rrc, eptr, prev, offset_top, md, ims, eptrb, match_isgroup);
+       ecode = prev;
-         if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+       flags = match_tail_recursed;
-         }
+       goto TAIL_RECURSE;
-       else  /* OP_KETRMAX */
+       }
-         {
+     else  /* OP_KETRMAX */
-         RMATCH(rrc, eptr, prev, offset_top, md, ims, eptrb, match_isgroup);
+       {
-         if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+       RMATCH(rrc, eptr, prev, offset_top, md, ims, eptrb, match_cbegroup);
-         RMATCH(rrc, eptr, ecode + 1+LINK_SIZE, offset_top, md, ims, eptrb, 0);
+       if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-         if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+       ecode += 1 + LINK_SIZE;
-         }
+       flags = match_tail_recursed;
+       goto TAIL_RECURSE;
        }
-     RRETURN(MATCH_NOMATCH);
+     /* 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 994 
 for (;;)
+Line 1074 
 for (;;)
      case OP_BRAZERO:
        {
        next = ecode+1;
-       RMATCH(rrc, eptr, next, offset_top, md, ims, eptrb, match_isgroup);
+       RMATCH(rrc, eptr, next, offset_top, md, ims, eptrb, 0);
        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
        do next += GET(next,1); while (*next == OP_ALT);
-       ecode = next + 1+LINK_SIZE;
+       ecode = next + 1 + LINK_SIZE;
        }
      break;
      case OP_BRAMINZERO:
        {
        next = ecode+1;
-       do next += GET(next,1); while (*next == OP_ALT);
+       do next += GET(next, 1); while (*next == OP_ALT);
-       RMATCH(rrc, eptr, next + 1+LINK_SIZE, offset_top, md, ims, eptrb,
+       RMATCH(rrc, eptr, next + 1+LINK_SIZE, offset_top, md, ims, eptrb, 0);
-         match_isgroup);
        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
        ecode++;
        }
      break;
-     /* End of a group, repeated or non-repeating. If we are at the end of
+     /* End of a group, repeated or non-repeating. */
-     an assertion "group", stop matching and return MATCH_MATCH, but record the
-     current high water mark for use by positive assertions. Do this also
-     for the "once" (not-backup up) groups. */
      case OP_KET:
      case OP_KETRMIN:
      case OP_KETRMAX:
-       {
+     prev = ecode - GET(ecode, 1);
-       prev = ecode - GET(ecode, 1);
-       saved_eptr = eptrb->epb_saved_eptr;
-       /* Back up the stack of bracket start pointers. */
+     /* 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. */
-       eptrb = eptrb->epb_prev;
+     if (*prev >= OP_SBRA)
+       {
-       if (*prev == OP_ASSERT || *prev == OP_ASSERT_NOT ||
+       saved_eptr = eptrb->epb_saved_eptr;   /* Value at start of group */
-           *prev == OP_ASSERTBACK || *prev == OP_ASSERTBACK_NOT ||
+       eptrb = eptrb->epb_prev;              /* Backup to previous group */
-           *prev == OP_ONCE)
+       }
-         {
+     else saved_eptr = NULL;
-         md->end_match_ptr = eptr;      /* For ONCE */
-         md->end_offset_top = offset_top;
-         RRETURN(MATCH_MATCH);
-         }
-       /* In all other cases except a conditional group we have to check the
+     /* If we are at the end of an assertion group, stop matching and return
-       group number back at the start and if necessary complete handling an
+     MATCH_MATCH, but record the current high water mark for use by positive
-       extraction by setting the offsets and bumping the high water mark. */
+     assertions. Do this also for the "once" (atomic) groups. */
-       if (*prev != OP_COND)
+     if (*prev == OP_ASSERT || *prev == OP_ASSERT_NOT ||
-         {
+         *prev == OP_ASSERTBACK || *prev == OP_ASSERTBACK_NOT ||
-         number = *prev - OP_BRA;
+         *prev == OP_ONCE)
+       {
+       md->end_match_ptr = eptr;      /* For ONCE */
+       md->end_offset_top = offset_top;
+       RRETURN(MATCH_MATCH);
+       }
-         /* For extended extraction brackets (large number), we have to fish out
+     /* For capturing groups we have to check the group number back at the start
-         the number from a dummy opcode 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
+     a recurse into group 0, so it won't be picked up here. Instead, we catch it
+     when the OP_END is reached. Other recursion is handled here. */
-         if (number > EXTRACT_BASIC_MAX) number = GET2(prev, 2+LINK_SIZE);
+     if (*prev == OP_CBRA || *prev == OP_SCBRA)
-         offset = number << 1;
+       {
+       number = GET2(prev, 1+LINK_SIZE);
+       offset = number << 1;
  #ifdef DEBUG
-         printf("end bracket %d", number);
+       printf("end bracket %d", number);
-         printf("\n");
+       printf("\n");
  #endif
-         /* Test for a numbered group. This includes groups called as a result
+       md->capture_last = number;
-         of recursion. Note that whole-pattern recursion is coded as a recurse
+       if (offset >= md->offset_max) md->offset_overflow = TRUE; else
-         into group 0, so it won't be picked up here. Instead, we catch it when
+         {
-         the OP_END is reached. */
+         md->offset_vector[offset] =
+           md->offset_vector[md->offset_end - number];
-         if (number > 0)
+         md->offset_vector[offset+1] = eptr - md->start_subject;
-           {
+         if (offset_top <= offset) offset_top = offset + 2;
-           md->capture_last = number;
+         }
-           if (offset >= md->offset_max) md->offset_overflow = TRUE; else
-             {
+       /* Handle a recursively called group. Restore the offsets
-             md->offset_vector[offset] =
+       appropriately and continue from after the call. */
-               md->offset_vector[md->offset_end - number];
-             md->offset_vector[offset+1] = eptr - md->start_subject;
+       if (md->recursive != NULL && md->recursive->group_num == number)
-             if (offset_top <= offset) offset_top = offset + 2;
+         {
-             }
+         recursion_info *rec = md->recursive;
+         DPRINTF(("Recursion (%d) succeeded - continuing\n", number));
-           /* Handle a recursively called group. Restore the offsets
+         md->recursive = rec->prevrec;
-           appropriately and continue from after the call. */
+         md->start_match = rec->save_start;
+         memcpy(md->offset_vector, rec->offset_save,
-           if (md->recursive != NULL && md->recursive->group_num == number)
+           rec->saved_max * sizeof(int));
-             {
+         ecode = rec->after_call;
-             recursion_info *rec = md->recursive;
+         ims = original_ims;
-             DPRINTF(("Recursion (%d) succeeded - continuing\n", number));
+         break;
-             md->recursive = rec->prevrec;
-             md->start_match = rec->save_start;
-             memcpy(md->offset_vector, rec->offset_save,
-               rec->saved_max * sizeof(int));
-             ecode = rec->after_call;
-             ims = original_ims;
-             break;
-             }
-           }
          }
+       }
-       /* Reset the value of the ims flags, in case they got changed during
+     /* For both capturing and non-capturing groups, reset the value of the ims
-       the group. */
+     flags, in case they got changed during the group. */
-       ims = original_ims;
+     ims = original_ims;
-       DPRINTF(("ims reset to %02lx\n", ims));
+     DPRINTF(("ims reset to %02lx\n", ims));
-       /* For a non-repeating ket, just continue at this level. This also
+     /* 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.
+     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
+     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. */
+     course of events. */
-       if (*ecode == OP_KET || eptr == saved_eptr)
+     if (*ecode == OP_KET || eptr == saved_eptr)
-         {
+       {
-         ecode += 1 + LINK_SIZE;
+       ecode += 1 + LINK_SIZE;
-         break;
+       break;
-         }
+       }
-       /* The repeating kets try the rest of the pattern or restart from the
+     /* The repeating kets try the rest of the pattern or restart from the
-       preceding bracket, in the appropriate order. */
+     preceding bracket, in the appropriate order. In the second case, we can use
+     tail recursion to avoid using another stack frame. */
-       if (*ecode == OP_KETRMIN)
+     flags = (*prev >= OP_SBRA)? match_cbegroup : 0;
-         {
-         RMATCH(rrc, eptr, ecode + 1+LINK_SIZE, offset_top, md, ims, eptrb, 0);
-         if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-         RMATCH(rrc, eptr, prev, offset_top, md, ims, eptrb, match_isgroup);
-         if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-         }
-       else  /* OP_KETRMAX */
-         {
-         RMATCH(rrc, eptr, prev, offset_top, md, ims, eptrb, match_isgroup);
-         if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-         RMATCH(rrc, eptr, ecode + 1+LINK_SIZE, offset_top, md, ims, eptrb, 0);
-         if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-         }
-       }
-     RRETURN(MATCH_NOMATCH);
+     if (*ecode == OP_KETRMIN)
+       {
+       RMATCH(rrc, eptr, ecode + 1+LINK_SIZE, offset_top, md, ims, eptrb, 0);
+       if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+       ecode = prev;
+       flags |= match_tail_recursed;
+       goto TAIL_RECURSE;
+       }
+     else  /* OP_KETRMAX */
+       {
+       RMATCH(rrc, eptr, prev, offset_top, md, ims, eptrb, flags);
+       if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+       ecode += 1 + LINK_SIZE;
+       flags = match_tail_recursed;
+       goto TAIL_RECURSE;
+       }
+     /* Control never gets here */
      /* Start of subject unless notbol, or after internal newline if multiline */
-Line 1135 
 for (;;)
+Line 1212 
 for (;;)
      if (md->notbol && eptr == md->start_subject) RRETURN(MATCH_NOMATCH);
      if ((ims & PCRE_MULTILINE) != 0)
        {
-       if (eptr != md->start_subject && eptr[-1] != NEWLINE)
+       if (eptr != md->start_subject &&
+           (eptr == md->end_subject || !WAS_NEWLINE(eptr)))
          RRETURN(MATCH_NOMATCH);
        ecode++;
        break;
-Line 1163 
 for (;;)
+Line 1241 
 for (;;)
      if ((ims & PCRE_MULTILINE) != 0)
        {
        if (eptr < md->end_subject)
-         { if (*eptr != NEWLINE) RRETURN(MATCH_NOMATCH); }
+         { if (!IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH); }
        else
          { if (md->noteol) RRETURN(MATCH_NOMATCH); }
        ecode++;
-Line 1174 
 for (;;)
+Line 1252 
 for (;;)
        if (md->noteol) RRETURN(MATCH_NOMATCH);
        if (!md->endonly)
          {
-         if (eptr < md->end_subject - 1 ||
+         if (eptr != md->end_subject &&
-            (eptr == md->end_subject - 1 && *eptr != NEWLINE))
+             (!IS_NEWLINE(eptr) || eptr != md->end_subject - md->nllen))
            RRETURN(MATCH_NOMATCH);
          ecode++;
          break;
          }
        }
-     /* ... else fall through */
+     /* ... else fall through for endonly */
      /* End of subject assertion (\z) */
-Line 1193 
 for (;;)
+Line 1271 
 for (;;)
      /* End of subject or ending \n assertion (\Z) */
      case OP_EODN:
-     if (eptr < md->end_subject - 1 ||
+     if (eptr != md->end_subject &&
-        (eptr == md->end_subject - 1 && *eptr != NEWLINE)) RRETURN(MATCH_NOMATCH);
+         (!IS_NEWLINE(eptr) || eptr != md->end_subject - md->nllen))
+       RRETURN(MATCH_NOMATCH);
      ecode++;
      break;
-Line 1247 
 for (;;)
+Line 1326 
 for (;;)
      /* Match a single character type; inline for speed */
      case OP_ANY:
-     if ((ims & PCRE_DOTALL) == 0 && eptr < md->end_subject && *eptr == NEWLINE)
+     if ((ims & PCRE_DOTALL) == 0)
-       RRETURN(MATCH_NOMATCH);
+       {
+       if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);
+       }
      if (eptr++ >= md->end_subject) RRETURN(MATCH_NOMATCH);
- #ifdef SUPPORT_UTF8
      if (utf8)
        while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
- #endif
      ecode++;
      break;
-Line 1343 
 for (;;)
+Line 1422 
 for (;;)
      ecode++;
      break;
+     case OP_ANYNL:
+     if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+     GETCHARINCTEST(c, eptr);
+     switch(c)
+       {
+       default: RRETURN(MATCH_NOMATCH);
+       case 0x000d:
+       if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
+       break;
+       case 0x000a:
+       case 0x000b:
+       case 0x000c:
+       case 0x0085:
+       case 0x2028:
+       case 0x2029:
+       break;
+       }
+     ecode++;
+     break;
  #ifdef SUPPORT_UCP
      /* Check the next character by Unicode property. We will get here only
      if the support is in the binary; otherwise a compile-time error occurs. */
-Line 1352 
 for (;;)
+Line 1451 
 for (;;)
      if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
      GETCHARINCTEST(c, eptr);
        {
-       int chartype, rqdtype;
+       int chartype, script;
-       int othercase;
+       int category = _pcre_ucp_findprop(c, &chartype, &script);
-       int category = _pcre_ucp_findchar(c, &chartype, &othercase);
-       rqdtype = *(++ecode);
-       ecode++;
-       if (rqdtype >= 128)
+       switch(ecode[1])
          {
-         if ((rqdtype - 128 != category) == (op == OP_PROP))
+         case PT_ANY:
+         if (op == OP_NOTPROP) RRETURN(MATCH_NOMATCH);
+         break;
+         case PT_LAMP:
+         if ((chartype == ucp_Lu ||
+              chartype == ucp_Ll ||
+              chartype == ucp_Lt) == (op == OP_NOTPROP))
            RRETURN(MATCH_NOMATCH);
-         }
+          break;
-       else
-         {
+         case PT_GC:
-         if ((rqdtype != chartype) == (op == OP_PROP))
+         if ((ecode[2] != category) == (op == OP_PROP))
+           RRETURN(MATCH_NOMATCH);
+         break;
+         case PT_PC:
+         if ((ecode[2] != chartype) == (op == OP_PROP))
            RRETURN(MATCH_NOMATCH);
+         break;
+         case PT_SC:
+         if ((ecode[2] != script) == (op == OP_PROP))
+           RRETURN(MATCH_NOMATCH);
+         break;
+         default:
+         RRETURN(PCRE_ERROR_INTERNAL);
          }
+       ecode += 3;
        }
      break;
-Line 1379 
 for (;;)
+Line 1497 
 for (;;)
      if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
      GETCHARINCTEST(c, eptr);
        {
-       int chartype;
+       int chartype, script;
-       int othercase;
+       int category = _pcre_ucp_findprop(c, &chartype, &script);
-       int category = _pcre_ucp_findchar(c, &chartype, &othercase);
        if (category == ucp_M) RRETURN(MATCH_NOMATCH);
        while (eptr < md->end_subject)
          {
-Line 1390 
 for (;;)
+Line 1507 
 for (;;)
            {
            GETCHARLEN(c, eptr, len);
            }
-         category = _pcre_ucp_findchar(c, &chartype, &othercase);
+         category = _pcre_ucp_findprop(c, &chartype, &script);
          if (category != ucp_M) break;
          eptr += len;
          }
-Line 1683 
 for (;;)
+Line 1800 
 for (;;)
            while (eptr >= pp)
              {
              RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
-             eptr--;
              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+             eptr--;
              }
            }
-Line 1836 
 for (;;)
+Line 1953 
 for (;;)
        else
          {
-         int dc;
+         unsigned int dc;
          GETCHARINC(dc, eptr);
          ecode += length;
          /* If we have Unicode property support, we can use it to test the other
-         case of the character, if there is one. The result of _pcre_ucp_findchar() is
+         case of the character, if there is one. */
-         < 0 if the char isn't found, and othercase is returned as zero if there
-         isn't one. */
          if (fc != dc)
            {
  #ifdef SUPPORT_UCP
-           int chartype;
+           if (dc != _pcre_ucp_othercase(fc))
-           int othercase;
-           if (_pcre_ucp_findchar(fc, &chartype, &othercase) < 0 || dc != othercase)
  #endif
              RRETURN(MATCH_NOMATCH);
            }
-Line 1867 
 for (;;)
+Line 1980 
 for (;;)
        }
      break;
-     /* Match a single character repeatedly; different opcodes share code. */
+     /* Match a single character repeatedly. */
      case OP_EXACT:
      min = max = GET2(ecode, 1);
      ecode += 3;
      goto REPEATCHAR;
+     case OP_POSUPTO:
+     possessive = TRUE;
+     /* Fall through */
      case OP_UPTO:
      case OP_MINUPTO:
      min = 0;
-Line 1882 
 for (;;)
+Line 1999 
 for (;;)
      ecode += 3;
      goto REPEATCHAR;
+     case OP_POSSTAR:
+     possessive = TRUE;
+     min = 0;
+     max = INT_MAX;
+     ecode++;
+     goto REPEATCHAR;
+     case OP_POSPLUS:
+     possessive = TRUE;
+     min = 1;
+     max = INT_MAX;
+     ecode++;
+     goto REPEATCHAR;
+     case OP_POSQUERY:
+     possessive = TRUE;
+     min = 0;
+     max = 1;
+     ecode++;
+     goto REPEATCHAR;
      case OP_STAR:
      case OP_MINSTAR:
      case OP_PLUS:
-Line 1913 
 for (;;)
+Line 2051 
 for (;;)
        if (length > 1)
          {
-         int oclength = 0;
-         uschar occhars[8];
  #ifdef SUPPORT_UCP
-         int othercase;
+         unsigned int othercase;
-         int chartype;
          if ((ims & PCRE_CASELESS) != 0 &&
-              _pcre_ucp_findchar(fc, &chartype, &othercase) >= 0 &&
+             (othercase = _pcre_ucp_othercase(fc)) != NOTACHAR)
-              othercase > 0)
            oclength = _pcre_ord2utf8(othercase, occhars);
+         else oclength = 0;
  #endif  /* SUPPORT_UCP */
          for (i = 1; i <= min; i++)
            {
            if (memcmp(eptr, charptr, length) == 0) eptr += length;
+ #ifdef SUPPORT_UCP
            /* Need braces because of following else */
            else if (oclength == 0) { RRETURN(MATCH_NOMATCH); }
            else
-Line 1935 
 for (;;)
+Line 2070 
 for (;;)
              if (memcmp(eptr, occhars, oclength) != 0) RRETURN(MATCH_NOMATCH);
              eptr += oclength;
              }
+ #else   /* without SUPPORT_UCP */
+           else { RRETURN(MATCH_NOMATCH); }
+ #endif  /* SUPPORT_UCP */
            }
          if (min == max) continue;
-Line 1947 
 for (;;)
+Line 2085 
 for (;;)
              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
              if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
              if (memcmp(eptr, charptr, length) == 0) eptr += length;
+ #ifdef SUPPORT_UCP
              /* Need braces because of following else */
              else if (oclength == 0) { RRETURN(MATCH_NOMATCH); }
              else
-Line 1954 
 for (;;)
+Line 2093 
 for (;;)
                if (memcmp(eptr, occhars, oclength) != 0) RRETURN(MATCH_NOMATCH);
                eptr += oclength;
                }
+ #else   /* without SUPPORT_UCP */
+             else { RRETURN (MATCH_NOMATCH); }
+ #endif  /* SUPPORT_UCP */
              }
            /* Control never gets here */
            }
-         else
+         else  /* Maximize */
            {
            pp = eptr;
            for (i = min; i < max; i++)
              {
              if (eptr > md->end_subject - length) break;
              if (memcmp(eptr, charptr, length) == 0) eptr += length;
+ #ifdef SUPPORT_UCP
              else if (oclength == 0) break;
              else
                {
                if (memcmp(eptr, occhars, oclength) != 0) break;
                eptr += oclength;
                }
+ #else   /* without SUPPORT_UCP */
+             else break;
+ #endif  /* SUPPORT_UCP */
              }
-           while (eptr >= pp)
+           if (possessive) continue;
+           for(;;)
             {
             RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            if (eptr == pp) RRETURN(MATCH_NOMATCH);
+ #ifdef SUPPORT_UCP
+            eptr--;
+            BACKCHAR(eptr);
+ #else   /* without SUPPORT_UCP */
             eptr -= length;
+ #endif  /* SUPPORT_UCP */
             }
-           RRETURN(MATCH_NOMATCH);
            }
          /* Control never gets here */
          }
-Line 2025 
 for (;;)
+Line 2179 
 for (;;)
            }
          /* Control never gets here */
          }
-       else
+       else  /* Maximize */
          {
          pp = eptr;
          for (i = min; i < max; i++)
-Line 2033 
 for (;;)
+Line 2187 
 for (;;)
            if (eptr >= md->end_subject || fc != md->lcc[*eptr]) break;
            eptr++;
            }
+         if (possessive) continue;
          while (eptr >= pp)
            {
            RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
-Line 2061 
 for (;;)
+Line 2216 
 for (;;)
            }
          /* Control never gets here */
          }
-       else
+       else  /* Maximize */
          {
          pp = eptr;
          for (i = min; i < max; i++)
-Line 2069 
 for (;;)
+Line 2224 
 for (;;)
            if (eptr >= md->end_subject || fc != *eptr) break;
            eptr++;
            }
+         if (possessive) continue;
          while (eptr >= pp)
            {
            RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
-Line 2121 
 for (;;)
+Line 2277 
 for (;;)
      ecode += 3;
      goto REPEATNOTCHAR;
+     case OP_NOTPOSSTAR:
+     possessive = TRUE;
+     min = 0;
+     max = INT_MAX;
+     ecode++;
+     goto REPEATNOTCHAR;
+     case OP_NOTPOSPLUS:
+     possessive = TRUE;
+     min = 1;
+     max = INT_MAX;
+     ecode++;
+     goto REPEATNOTCHAR;
+     case OP_NOTPOSQUERY:
+     possessive = TRUE;
+     min = 0;
+     max = 1;
+     ecode++;
+     goto REPEATNOTCHAR;
+     case OP_NOTPOSUPTO:
+     possessive = TRUE;
+     min = 0;
+     max = GET2(ecode, 1);
+     ecode += 3;
+     goto REPEATNOTCHAR;
      case OP_NOTSTAR:
      case OP_NOTMINSTAR:
      case OP_NOTPLUS:
-Line 2160 
 for (;;)
+Line 2344 
 for (;;)
        /* UTF-8 mode */
        if (utf8)
          {
-         register int d;
+         register unsigned int d;
          for (i = 1; i <= min; i++)
            {
            GETCHARINC(d, eptr);
-Line 2185 
 for (;;)
+Line 2369 
 for (;;)
          /* UTF-8 mode */
          if (utf8)
            {
-           register int d;
+           register unsigned int d;
            for (fi = min;; fi++)
              {
              RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
-Line 2221 
 for (;;)
+Line 2405 
 for (;;)
          /* UTF-8 mode */
          if (utf8)
            {
-           register int d;
+           register unsigned int d;
            for (i = min; i < max; i++)
              {
              int len = 1;
-Line 2231 
 for (;;)
+Line 2415 
 for (;;)
              if (fc == d) break;
              eptr += len;
              }
-           for(;;)
+         if (possessive) continue;
+         for(;;)
              {
              RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-Line 2248 
 for (;;)
+Line 2433 
 for (;;)
              if (eptr >= md->end_subject || fc == md->lcc[*eptr]) break;
              eptr++;
              }
+           if (possessive) continue;
            while (eptr >= pp)
              {
              RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
-Line 2269 
 for (;;)
+Line 2455 
 for (;;)
        /* UTF-8 mode */
        if (utf8)
          {
-         register int d;
+         register unsigned int d;
          for (i = 1; i <= min; i++)
            {
            GETCHARINC(d, eptr);
-Line 2292 
 for (;;)
+Line 2478 
 for (;;)
          /* UTF-8 mode */
          if (utf8)
            {
-           register int d;
+           register unsigned int d;
            for (fi = min;; fi++)
              {
              RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
-Line 2327 
 for (;;)
+Line 2513 
 for (;;)
          /* UTF-8 mode */
          if (utf8)
            {
-           register int d;
+           register unsigned int d;
            for (i = min; i < max; i++)
              {
              int len = 1;
-Line 2336 
 for (;;)
+Line 2522 
 for (;;)
              if (fc == d) break;
              eptr += len;
              }
+           if (possessive) continue;
            for(;;)
              {
              RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
-Line 2353 
 for (;;)
+Line 2540 
 for (;;)
              if (eptr >= md->end_subject || fc == *eptr) break;
              eptr++;
              }
+           if (possessive) continue;
            while (eptr >= pp)
              {
              RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
-Line 2384 
 for (;;)
+Line 2572 
 for (;;)
      ecode += 3;
      goto REPEATTYPE;
+     case OP_TYPEPOSSTAR:
+     possessive = TRUE;
+     min = 0;
+     max = INT_MAX;
+     ecode++;
+     goto REPEATTYPE;
+     case OP_TYPEPOSPLUS:
+     possessive = TRUE;
+     min = 1;
+     max = INT_MAX;
+     ecode++;
+     goto REPEATTYPE;
+     case OP_TYPEPOSQUERY:
+     possessive = TRUE;
+     min = 0;
+     max = 1;
+     ecode++;
+     goto REPEATTYPE;
+     case OP_TYPEPOSUPTO:
+     possessive = TRUE;
+     min = 0;
+     max = GET2(ecode, 1);
+     ecode += 3;
+     goto REPEATTYPE;
      case OP_TYPESTAR:
      case OP_TYPEMINSTAR:
      case OP_TYPEPLUS:
-Line 2408 
 for (;;)
+Line 2624 
 for (;;)
        {
        prop_fail_result = ctype == OP_NOTPROP;
        prop_type = *ecode++;
-       if (prop_type >= 128)
+       prop_value = *ecode++;
-         {
-         prop_test_against = prop_type - 128;
-         prop_test_variable = &prop_category;
-         }
-       else
-         {
-         prop_test_against = prop_type;
-         prop_test_variable = &prop_chartype;
-         }
        }
      else prop_type = -1;
  #endif
-Line 2434 
 for (;;)
+Line 2641 
 for (;;)
      if (min > 0)
        {
  #ifdef SUPPORT_UCP
-       if (prop_type > 0)
+       if (prop_type >= 0)
          {
-         for (i = 1; i <= min; i++)
+         switch(prop_type)
            {
-           GETCHARINC(c, eptr);
+           case PT_ANY:
-           prop_category = _pcre_ucp_findchar(c, &prop_chartype, &prop_othercase);
+           if (prop_fail_result) RRETURN(MATCH_NOMATCH);
-           if ((*prop_test_variable == prop_test_against) == prop_fail_result)
+           for (i = 1; i <= min; i++)
-             RRETURN(MATCH_NOMATCH);
+             {
-           }
+             if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
-         }
+             GETCHARINC(c, eptr);
+             }
+           break;
-       /* Match extended Unicode sequences. We will get here only if the
+           case PT_LAMP:
-       support is in the binary; otherwise a compile-time error occurs. */
+           for (i = 1; i <= min; i++)
+             {
+             if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+             GETCHARINC(c, eptr);
+             prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+             if ((prop_chartype == ucp_Lu ||
+                  prop_chartype == ucp_Ll ||
+                  prop_chartype == ucp_Lt) == prop_fail_result)
+               RRETURN(MATCH_NOMATCH);
+             }
+           break;
+           case PT_GC:
+           for (i = 1; i <= min; i++)
+             {
+             if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+             GETCHARINC(c, eptr);
+             prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+             if ((prop_category == prop_value) == prop_fail_result)
+               RRETURN(MATCH_NOMATCH);
+             }
+           break;
+           case PT_PC:
+           for (i = 1; i <= min; i++)
+             {
+             if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+             GETCHARINC(c, eptr);
+             prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+             if ((prop_chartype == prop_value) == prop_fail_result)
+               RRETURN(MATCH_NOMATCH);
+             }
+           break;
+           case PT_SC:
+           for (i = 1; i <= min; i++)
+             {
+             if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+             GETCHARINC(c, eptr);
+             prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+             if ((prop_script == prop_value) == prop_fail_result)
+               RRETURN(MATCH_NOMATCH);
+             }
+           break;
+           default:
+           RRETURN(PCRE_ERROR_INTERNAL);
+           }
+         }
+       /* Match extended Unicode sequences. We will get here only if the
+       support is in the binary; otherwise a compile-time error occurs. */
        else if (ctype == OP_EXTUNI)
          {
          for (i = 1; i <= min; i++)
            {
            GETCHARINCTEST(c, eptr);
-           prop_category = _pcre_ucp_findchar(c, &prop_chartype, &prop_othercase);
+           prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
            if (prop_category == ucp_M) RRETURN(MATCH_NOMATCH);
            while (eptr < md->end_subject)
              {
-Line 2462 
 for (;;)
+Line 2722 
 for (;;)
                {
                GETCHARLEN(c, eptr, len);
                }
-             prop_category = _pcre_ucp_findchar(c, &prop_chartype, &prop_othercase);
+             prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
              if (prop_category != ucp_M) break;
              eptr += len;
              }
-Line 2481 
 for (;;)
+Line 2741 
 for (;;)
          for (i = 1; i <= min; i++)
            {
            if (eptr >= md->end_subject ||
-              (*eptr++ == NEWLINE && (ims & PCRE_DOTALL) == 0))
+                ((ims & PCRE_DOTALL) == 0 && IS_NEWLINE(eptr)))
              RRETURN(MATCH_NOMATCH);
+           eptr++;
            while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
            }
          break;
-Line 2491 
 for (;;)
+Line 2752 
 for (;;)
          eptr += min;
          break;
+         case OP_ANYNL:
+         for (i = 1; i <= min; i++)
+           {
+           if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+           GETCHARINC(c, eptr);
+           switch(c)
+             {
+             default: RRETURN(MATCH_NOMATCH);
+             case 0x000d:
+             if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
+             break;
+             case 0x000a:
+             case 0x000b:
+             case 0x000c:
+             case 0x0085:
+             case 0x2028:
+             case 0x2029:
+             break;
+             }
+           }
+         break;
          case OP_NOT_DIGIT:
          for (i = 1; i <= min; i++)
            {
-Line 2559 
 for (;;)
+Line 2842 
 for (;;)
  #endif     /* SUPPORT_UTF8 */
        /* Code for the non-UTF-8 case for minimum matching of operators other
-       than OP_PROP and OP_NOTPROP. */
+       than OP_PROP and OP_NOTPROP. We can assume that there are the minimum
+       number of bytes present, as this was tested above. */
        switch(ctype)
          {
-Line 2567 
 for (;;)
+Line 2851 
 for (;;)
          if ((ims & PCRE_DOTALL) == 0)
            {
            for (i = 1; i <= min; i++)
-             if (*eptr++ == NEWLINE) RRETURN(MATCH_NOMATCH);
+             {
+             if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);
+             eptr++;
+             }
            }
          else eptr += min;
          break;
-Line 2576 
 for (;;)
+Line 2863 
 for (;;)
          eptr += min;
          break;
+         /* Because of the CRLF case, we can't assume the minimum number of
+         bytes are present in this case. */
+         case OP_ANYNL:
+         for (i = 1; i <= min; i++)
+           {
+           if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+           switch(*eptr++)
+             {
+             default: RRETURN(MATCH_NOMATCH);
+             case 0x000d:
+             if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
+             break;
+             case 0x000a:
+             case 0x000b:
+             case 0x000c:
+             case 0x0085:
+             break;
+             }
+           }
+         break;
          case OP_NOT_DIGIT:
          for (i = 1; i <= min; i++)
            if ((md->ctypes[*eptr++] & ctype_digit) != 0) RRETURN(MATCH_NOMATCH);
-Line 2624 
 for (;;)
+Line 2933 
 for (;;)
      if (minimize)
        {
  #ifdef SUPPORT_UCP
-       if (prop_type > 0)
+       if (prop_type >= 0)
          {
-         for (fi = min;; fi++)
+         switch(prop_type)
            {
-           RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
+           case PT_ANY:
-           if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+           for (fi = min;; fi++)
-           if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+             {
-           GETCHARINC(c, eptr);
+             RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
-           prop_category = _pcre_ucp_findchar(c, &prop_chartype, &prop_othercase);
+             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-           if ((*prop_test_variable == prop_test_against) == prop_fail_result)
+             if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
-             RRETURN(MATCH_NOMATCH);
+             GETCHARINC(c, eptr);
+             if (prop_fail_result) RRETURN(MATCH_NOMATCH);
+             }
+           /* Control never gets here */
+           case PT_LAMP:
+           for (fi = min;; fi++)
+             {
+             RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
+             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+             if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+             GETCHARINC(c, eptr);
+             prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+             if ((prop_chartype == ucp_Lu ||
+                  prop_chartype == ucp_Ll ||
+                  prop_chartype == ucp_Lt) == prop_fail_result)
+               RRETURN(MATCH_NOMATCH);
+             }
+           /* Control never gets here */
+           case PT_GC:
+           for (fi = min;; fi++)
+             {
+             RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
+             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+             if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+             GETCHARINC(c, eptr);
+             prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+             if ((prop_category == prop_value) == prop_fail_result)
+               RRETURN(MATCH_NOMATCH);
+             }
+           /* Control never gets here */
+           case PT_PC:
+           for (fi = min;; fi++)
+             {
+             RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
+             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+             if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+             GETCHARINC(c, eptr);
+             prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+             if ((prop_chartype == prop_value) == prop_fail_result)
+               RRETURN(MATCH_NOMATCH);
+             }
+           /* Control never gets here */
+           case PT_SC:
+           for (fi = min;; fi++)
+             {
+             RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
+             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+             if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+             GETCHARINC(c, eptr);
+             prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+             if ((prop_script == prop_value) == prop_fail_result)
+               RRETURN(MATCH_NOMATCH);
+             }
+           /* Control never gets here */
+           default:
+           RRETURN(PCRE_ERROR_INTERNAL);
            }
          }
-Line 2649 
 for (;;)
+Line 3018 
 for (;;)
            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
            if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
            GETCHARINCTEST(c, eptr);
-           prop_category = _pcre_ucp_findchar(c, &prop_chartype, &prop_othercase);
+           prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
            if (prop_category == ucp_M) RRETURN(MATCH_NOMATCH);
            while (eptr < md->end_subject)
              {
-Line 2658 
 for (;;)
+Line 3027 
 for (;;)
                {
                GETCHARLEN(c, eptr, len);
                }
-             prop_category = _pcre_ucp_findchar(c, &prop_chartype, &prop_othercase);
+             prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
              if (prop_category != ucp_M) break;
              eptr += len;
              }
-Line 2676 
 for (;;)
+Line 3045 
 for (;;)
            {
            RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-           if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+           if (fi >= max || eptr >= md->end_subject ||
+                (ctype == OP_ANY && (ims & PCRE_DOTALL) == 0 &&
+                 IS_NEWLINE(eptr)))
+             RRETURN(MATCH_NOMATCH);
            GETCHARINC(c, eptr);
            switch(ctype)
              {
-             case OP_ANY:
+             case OP_ANY:        /* This is the DOTALL case */
-             if ((ims & PCRE_DOTALL) == 0 && c == NEWLINE) RRETURN(MATCH_NOMATCH);
              break;
              case OP_ANYBYTE:
              break;
+             case OP_ANYNL:
+             switch(c)
+               {
+               default: RRETURN(MATCH_NOMATCH);
+               case 0x000d:
+               if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
+               break;
+               case 0x000a:
+               case 0x000b:
+               case 0x000c:
+               case 0x0085:
+               case 0x2028:
+               case 0x2029:
+               break;
+               }
+             break;
              case OP_NOT_DIGIT:
              if (c < 256 && (md->ctypes[c] & ctype_digit) != 0)
                RRETURN(MATCH_NOMATCH);
-Line 2731 
 for (;;)
+Line 3119 
 for (;;)
            {
            RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-           if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+           if (fi >= max || eptr >= md->end_subject ||
+                ((ims & PCRE_DOTALL) == 0 && IS_NEWLINE(eptr)))
+             RRETURN(MATCH_NOMATCH);
            c = *eptr++;
            switch(ctype)
              {
-             case OP_ANY:
+             case OP_ANY:   /* This is the DOTALL case */
-             if ((ims & PCRE_DOTALL) == 0 && c == NEWLINE) RRETURN(MATCH_NOMATCH);
              break;
              case OP_ANYBYTE:
              break;
+             case OP_ANYNL:
+             switch(c)
+               {
+               default: RRETURN(MATCH_NOMATCH);
+               case 0x000d:
+               if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
+               break;
+               case 0x000a:
+               case 0x000b:
+               case 0x000c:
+               case 0x0085:
+               break;
+               }
+             break;
              case OP_NOT_DIGIT:
              if ((md->ctypes[c] & ctype_digit) != 0) RRETURN(MATCH_NOMATCH);
              break;
-Line 2774 
 for (;;)
+Line 3179 
 for (;;)
        /* Control never gets here */
        }
-     /* If maximizing it is worth using inline code for speed, doing the type
+     /* If maximizing, it is worth using inline code for speed, doing the type
      test once at the start (i.e. keep it out of the loop). Again, keep the
      UTF-8 and UCP stuff separate. */
-Line 2783 
 for (;;)
+Line 3188 
 for (;;)
        pp = eptr;  /* Remember where we started */
  #ifdef SUPPORT_UCP
-       if (prop_type > 0)
+       if (prop_type >= 0)
          {
-         for (i = min; i < max; i++)
+         switch(prop_type)
            {
-           int len = 1;
+           case PT_ANY:
-           if (eptr >= md->end_subject) break;
+           for (i = min; i < max; i++)
-           GETCHARLEN(c, eptr, len);
+             {
-           prop_category = _pcre_ucp_findchar(c, &prop_chartype, &prop_othercase);
+             int len = 1;
-           if ((*prop_test_variable == prop_test_against) == prop_fail_result)
+             if (eptr >= md->end_subject) break;
-             break;
+             GETCHARLEN(c, eptr, len);
-           eptr+= len;
+             if (prop_fail_result) break;
+             eptr+= len;
+             }
+           break;
+           case PT_LAMP:
+           for (i = min; i < max; i++)
+             {
+             int len = 1;
+             if (eptr >= md->end_subject) break;
+             GETCHARLEN(c, eptr, len);
+             prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+             if ((prop_chartype == ucp_Lu ||
+                  prop_chartype == ucp_Ll ||
+                  prop_chartype == ucp_Lt) == prop_fail_result)
+               break;
+             eptr+= len;
+             }
+           break;
+           case PT_GC:
+           for (i = min; i < max; i++)
+             {
+             int len = 1;
+             if (eptr >= md->end_subject) break;
+             GETCHARLEN(c, eptr, len);
+             prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+             if ((prop_category == prop_value) == prop_fail_result)
+               break;
+             eptr+= len;
+             }
+           break;
+           case PT_PC:
+           for (i = min; i < max; i++)
+             {
+             int len = 1;
+             if (eptr >= md->end_subject) break;
+             GETCHARLEN(c, eptr, len);
+             prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+             if ((prop_chartype == prop_value) == prop_fail_result)
+               break;
+             eptr+= len;
+             }
+           break;
+           case PT_SC:
+           for (i = min; i < max; i++)
+             {
+             int len = 1;
+             if (eptr >= md->end_subject) break;
+             GETCHARLEN(c, eptr, len);
+             prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+             if ((prop_script == prop_value) == prop_fail_result)
+               break;
+             eptr+= len;
+             }
+           break;
            }
          /* eptr is now past the end of the maximum run */
+         if (possessive) continue;
          for(;;)
            {
            RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
-Line 2816 
 for (;;)
+Line 3279 
 for (;;)
            {
            if (eptr >= md->end_subject) break;
            GETCHARINCTEST(c, eptr);
-           prop_category = _pcre_ucp_findchar(c, &prop_chartype, &prop_othercase);
+           prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
            if (prop_category == ucp_M) break;
            while (eptr < md->end_subject)
              {
-Line 2825 
 for (;;)
+Line 3288 
 for (;;)
                {
                GETCHARLEN(c, eptr, len);
                }
-             prop_category = _pcre_ucp_findchar(c, &prop_chartype, &prop_othercase);
+             prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
              if (prop_category != ucp_M) break;
              eptr += len;
              }
-Line 2833 
 for (;;)
+Line 3296 
 for (;;)
          /* eptr is now past the end of the maximum run */
+         if (possessive) continue;
          for(;;)
            {
            RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
-Line 2846 
 for (;;)
+Line 3310 
 for (;;)
                {
                GETCHARLEN(c, eptr, len);
                }
-             prop_category = _pcre_ucp_findchar(c, &prop_chartype, &prop_othercase);
+             prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
              if (prop_category != ucp_M) break;
              eptr--;
              }
-Line 2865 
 for (;;)
+Line 3329 
 for (;;)
            {
            case OP_ANY:
-           /* Special code is required for UTF8, but when the maximum is unlimited
+           /* Special code is required for UTF8, but when the maximum is
-           we don't need it, so we repeat the non-UTF8 code. This is probably
+           unlimited we don't need it, so we repeat the non-UTF8 code. This is
-           worth it, because .* is quite a common idiom. */
+           probably worth it, because .* is quite a common idiom. */
            if (max < INT_MAX)
              {
-Line 2875 
 for (;;)
+Line 3339 
 for (;;)
                {
                for (i = min; i < max; i++)
                  {
-                 if (eptr >= md->end_subject || *eptr == NEWLINE) break;
+                 if (eptr >= md->end_subject || IS_NEWLINE(eptr)) break;
                  eptr++;
                  while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
                  }
-Line 2884 
 for (;;)
+Line 3348 
 for (;;)
                {
                for (i = min; i < max; i++)
                  {
+                 if (eptr >= md->end_subject) break;
                  eptr++;
                  while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
                  }
-Line 2898 
 for (;;)
+Line 3363 
 for (;;)
                {
                for (i = min; i < max; i++)
                  {
-                 if (eptr >= md->end_subject || *eptr == NEWLINE) break;
+                 if (eptr >= md->end_subject || IS_NEWLINE(eptr)) break;
                  eptr++;
                  }
                break;
-Line 2906 
 for (;;)
+Line 3371 
 for (;;)
              else
                {
                c = max - min;
-               if (c > md->end_subject - eptr) c = md->end_subject - eptr;
+               if (c > (unsigned int)(md->end_subject - eptr))
+                 c = md->end_subject - eptr;
                eptr += c;
                }
              }
-Line 2916 
 for (;;)
+Line 3382 
 for (;;)
            case OP_ANYBYTE:
            c = max - min;
-           if (c > md->end_subject - eptr) c = md->end_subject - eptr;
+           if (c > (unsigned int)(md->end_subject - eptr))
+             c = md->end_subject - eptr;
            eptr += c;
            break;
+           case OP_ANYNL:
+           for (i = min; i < max; i++)
+             {
+             int len = 1;
+             if (eptr >= md->end_subject) break;
+             GETCHARLEN(c, eptr, len);
+             if (c == 0x000d)
+               {
+               if (++eptr >= md->end_subject) break;
+               if (*eptr == 0x000a) eptr++;
+               }
+             else
+               {
+               if (c != 0x000a && c != 0x000b && c != 0x000c &&
+                   c != 0x0085 && c != 0x2028 && c != 0x2029)
+                 break;
+               eptr += len;
+               }
+             }
+           break;
            case OP_NOT_DIGIT:
            for (i = min; i < max; i++)
              {
-Line 2992 
 for (;;)
+Line 3480 
 for (;;)
          /* eptr is now past the end of the maximum run */
+         if (possessive) continue;
          for(;;)
            {
            RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
-Line 3012 
 for (;;)
+Line 3501 
 for (;;)
              {
              for (i = min; i < max; i++)
                {
-               if (eptr >= md->end_subject || *eptr == NEWLINE) break;
+               if (eptr >= md->end_subject || IS_NEWLINE(eptr)) break;
                eptr++;
                }
              break;
-Line 3021 
 for (;;)
+Line 3510 
 for (;;)
            case OP_ANYBYTE:
            c = max - min;
-           if (c > md->end_subject - eptr) c = md->end_subject - eptr;
+           if (c > (unsigned int)(md->end_subject - eptr))
+             c = md->end_subject - eptr;
            eptr += c;
            break;
+           case OP_ANYNL:
+           for (i = min; i < max; i++)
+             {
+             if (eptr >= md->end_subject) break;
+             c = *eptr;
+             if (c == 0x000d)
+               {
+               if (++eptr >= md->end_subject) break;
+               if (*eptr == 0x000a) eptr++;
+               }
+             else
+               {
+               if (c != 0x000a && c != 0x000b && c != 0x000c && c != 0x0085)
+                 break;
+               eptr++;
+               }
+             }
+           break;
            case OP_NOT_DIGIT:
            for (i = min; i < max; i++)
              {
-Line 3085 
 for (;;)
+Line 3594 
 for (;;)
          /* eptr is now past the end of the maximum run */
+         if (possessive) continue;
          while (eptr >= pp)
            {
            RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
-Line 3099 
 for (;;)
+Line 3609 
 for (;;)
        }
      /* Control never gets here */
-     /* There's been some horrible disaster. Since all codes > OP_BRA are
+     /* There's been some horrible disaster. Arrival here can only mean there is
-     for capturing brackets, and there shouldn't be any gaps between 0 and
+     something seriously wrong in the code above or the OP_xxx definitions. */
-     OP_BRA, arrival here can only mean there is something seriously wrong
-     in the code above or the OP_xxx definitions. */
      default:
      DPRINTF(("Unknown opcode %d\n", *ecode));
-     RRETURN(PCRE_ERROR_UNKNOWN_NODE);
+     RRETURN(PCRE_ERROR_UNKNOWN_OPCODE);
      }
    /* Do not stick any code in here without much thought; it is assumed
-Line 3144 
 Undefine all the macros that were define
+Line 3652 
 Undefine all the macros that were define
  #undef cur_is_word
  #undef condition
- #undef minimize
  #undef prev_is_word
  #undef original_ims
-Line 3200 
 Returns:          > 0 => success; value
+Line 3707 
 Returns:          > 0 => success; value
                   < -1 => some kind of unexpected problem
  */
- PCRE_EXPORT int
+ PCRE_DATA_SCOPE int
  pcre_exec(const pcre *argument_re, const pcre_extra *extra_data,
-   const char *subject, int length, int start_offset, int options, int *offsets,
+   PCRE_SPTR subject, int length, int start_offset, int options, int *offsets,
    int offsetcount)
  {
  int rc, resetcount, ocount;
  int first_byte = -1;
  int req_byte = -1;
  int req_byte2 = -1;
- unsigned long int ims = 0;
+ int newline;
+ unsigned long int ims;
  BOOL using_temporary_offsets = FALSE;
  BOOL anchored;
  BOOL startline;
  BOOL firstline;
  BOOL first_byte_caseless = FALSE;
  BOOL req_byte_caseless = FALSE;
+ BOOL utf8;
  match_data match_block;
+ match_data *md = &match_block;
  const uschar *tables;
  const uschar *start_bits = NULL;
- const uschar *start_match = (const uschar *)subject + start_offset;
+ USPTR start_match = (USPTR)subject + start_offset;
- const uschar *end_subject;
+ USPTR end_subject;
- const uschar *req_byte_ptr = start_match - 1;
+ USPTR req_byte_ptr = start_match - 1;
+ eptrblock eptrchain[EPTR_WORK_SIZE];
  pcre_study_data internal_study;
  const pcre_study_data *study;
-Line 3241 
 if (offsetcount < 0) return PCRE_ERROR_B
+Line 3752 
 if (offsetcount < 0) return PCRE_ERROR_B
  the default values. */
  study = NULL;
- match_block.match_limit = MATCH_LIMIT;
+ md->match_limit = MATCH_LIMIT;
- match_block.callout_data = NULL;
+ md->match_limit_recursion = MATCH_LIMIT_RECURSION;
+ md->callout_data = NULL;
  /* The table pointer is always in native byte order. */
-Line 3254 
 if (extra_data != NULL)
+Line 3766 
 if (extra_data != NULL)
    if ((flags & PCRE_EXTRA_STUDY_DATA) != 0)
      study = (const pcre_study_data *)extra_data->study_data;
    if ((flags & PCRE_EXTRA_MATCH_LIMIT) != 0)
-     match_block.match_limit = extra_data->match_limit;
+     md->match_limit = extra_data->match_limit;
+   if ((flags & PCRE_EXTRA_MATCH_LIMIT_RECURSION) != 0)
+     md->match_limit_recursion = extra_data->match_limit_recursion;
    if ((flags & PCRE_EXTRA_CALLOUT_DATA) != 0)
-     match_block.callout_data = extra_data->callout_data;
+     md->callout_data = extra_data->callout_data;
    if ((flags & PCRE_EXTRA_TABLES) != 0) tables = extra_data->tables;
    }
-Line 3286 
 firstline = (re->options & PCRE_FIRSTLIN
+Line 3800 
 firstline = (re->options & PCRE_FIRSTLIN
  /* The code starts after the real_pcre block and the capture name table. */
- match_block.start_code = (const uschar *)external_re + re->name_table_offset +
+ md->start_code = (const uschar *)external_re + re->name_table_offset +
    re->name_count * re->name_entry_size;
- match_block.start_subject = (const uschar *)subject;
+ md->start_subject = (USPTR)subject;
- match_block.start_offset = start_offset;
+ md->start_offset = start_offset;
- match_block.end_subject = match_block.start_subject + length;
+ md->end_subject = md->start_subject + length;
- end_subject = match_block.end_subject;
+ end_subject = md->end_subject;
- match_block.endonly = (re->options & PCRE_DOLLAR_ENDONLY) != 0;
+ md->endonly = (re->options & PCRE_DOLLAR_ENDONLY) != 0;
- match_block.utf8 = (re->options & PCRE_UTF8) != 0;
+ utf8 = md->utf8 = (re->options & PCRE_UTF8) != 0;
- match_block.notbol = (options & PCRE_NOTBOL) != 0;
+ md->notbol = (options & PCRE_NOTBOL) != 0;
- match_block.noteol = (options & PCRE_NOTEOL) != 0;
+ md->noteol = (options & PCRE_NOTEOL) != 0;
- match_block.notempty = (options & PCRE_NOTEMPTY) != 0;
+ md->notempty = (options & PCRE_NOTEMPTY) != 0;
- match_block.partial = (options & PCRE_PARTIAL) != 0;
+ md->partial = (options & PCRE_PARTIAL) != 0;
- match_block.hitend = FALSE;
+ md->hitend = FALSE;
+ md->recursive = NULL;                   /* No recursion at top level */
+ md->eptrchain = eptrchain;              /* Make workspace generally available */
- match_block.recursive = NULL;                   /* No recursion at top level */
+ md->lcc = tables + lcc_offset;
+ md->ctypes = tables + ctypes_offset;
- match_block.lcc = tables + lcc_offset;
+ /* Handle different types of newline. The three bits give eight cases. If
- match_block.ctypes = tables + ctypes_offset;
+ nothing is set at run time, whatever was used at compile time applies. */
+ switch ((((options & PCRE_NEWLINE_BITS) == 0)? re->options : options) &
+        PCRE_NEWLINE_BITS)
+   {
+   case 0: newline = NEWLINE; break;   /* Compile-time default */
+   case PCRE_NEWLINE_CR: newline = '\r'; break;
+   case PCRE_NEWLINE_LF: newline = '\n'; break;
+   case PCRE_NEWLINE_CR+
+        PCRE_NEWLINE_LF: newline = ('\r' << 8) | '\n'; break;
+   case PCRE_NEWLINE_ANY: newline = -1; break;
+   default: return PCRE_ERROR_BADNEWLINE;
+   }
+ if (newline < 0)
+   {
+   md->nltype = NLTYPE_ANY;
+   }
+ else
+   {
+   md->nltype = NLTYPE_FIXED;
+   if (newline > 255)
+     {
+     md->nllen = 2;
+     md->nl[0] = (newline >> 8) & 255;
+     md->nl[1] = newline & 255;
+     }
+   else
+     {
+     md->nllen = 1;
+     md->nl[0] = newline;
+     }
+   }
  /* Partial matching is supported only for a restricted set of regexes at the
  moment. */
- if (match_block.partial && (re->options & PCRE_NOPARTIAL) != 0)
+ if (md->partial && (re->options & PCRE_NOPARTIAL) != 0)
    return PCRE_ERROR_BADPARTIAL;
  /* Check a UTF-8 string if required. Unfortunately there's no way of passing
  back the character offset. */
  #ifdef SUPPORT_UTF8
- if (match_block.utf8 && (options & PCRE_NO_UTF8_CHECK) == 0)
+ if (utf8 && (options & PCRE_NO_UTF8_CHECK) == 0)
    {
    if (_pcre_valid_utf8((uschar *)subject, length) >= 0)
      return PCRE_ERROR_BADUTF8;
-Line 3350 
 ocount = offsetcount - (offsetcount % 3)
+Line 3900 
 ocount = offsetcount - (offsetcount % 3)
  if (re->top_backref > 0 && re->top_backref >= ocount/3)
    {
    ocount = re->top_backref * 3 + 3;
-   match_block.offset_vector = (int *)(pcre_malloc)(ocount * sizeof(int));
+   md->offset_vector = (int *)(pcre_malloc)(ocount * sizeof(int));
-   if (match_block.offset_vector == NULL) return PCRE_ERROR_NOMEMORY;
+   if (md->offset_vector == NULL) return PCRE_ERROR_NOMEMORY;
    using_temporary_offsets = TRUE;
    DPRINTF(("Got memory to hold back references\n"));
    }
- else match_block.offset_vector = offsets;
+ else md->offset_vector = offsets;
- match_block.offset_end = ocount;
+ md->offset_end = ocount;
- match_block.offset_max = (2*ocount)/3;
+ md->offset_max = (2*ocount)/3;
- match_block.offset_overflow = FALSE;
+ md->offset_overflow = FALSE;
- match_block.capture_last = -1;
+ md->capture_last = -1;
  /* Compute the minimum number of offsets that we need to reset each time. Doing
  this makes a huge difference to execution time when there aren't many brackets
-Line 3373 
 if (resetcount > offsetcount) resetcount
+Line 3923 
 if (resetcount > offsetcount) resetcount
  never be used unless previously set, but they get saved and restored, and so we
  initialize them to avoid reading uninitialized locations. */
- if (match_block.offset_vector != NULL)
+ if (md->offset_vector != NULL)
    {
-   register int *iptr = match_block.offset_vector + ocount;
+   register int *iptr = md->offset_vector + ocount;
    register int *iend = iptr - resetcount/2 + 1;
    while (--iptr >= iend) *iptr = -1;
    }
-Line 3392 
 if (!anchored)
+Line 3942 
 if (!anchored)
      {
      first_byte = re->first_byte & 255;
      if ((first_byte_caseless = ((re->first_byte & REQ_CASELESS) != 0)) == TRUE)
-       first_byte = match_block.lcc[first_byte];
+       first_byte = md->lcc[first_byte];
      }
    else
      if (!startline && study != NULL &&
-Line 3410 
 if ((re->options & PCRE_REQCHSET) != 0)
+Line 3960 
 if ((re->options & PCRE_REQCHSET) != 0)
    req_byte2 = (tables + fcc_offset)[req_byte];  /* case flipped */
    }
+ /* ==========================================================================*/
  /* Loop for handling unanchored repeated matching attempts; for anchored regexs
  the loop runs just once. */
- do
+ for(;;)
    {
-   const uschar *save_end_subject = end_subject;
+   USPTR save_end_subject = end_subject;
    /* Reset the maximum number of extractions we might see. */
-   if (match_block.offset_vector != NULL)
+   if (md->offset_vector != NULL)
      {
-     register int *iptr = match_block.offset_vector;
+     register int *iptr = md->offset_vector;
      register int *iend = iptr + resetcount;
      while (iptr < iend) *iptr++ = -1;
      }
    /* Advance to a unique first char if possible. If firstline is TRUE, the
    start of the match is constrained to the first line of a multiline string.
-   Implement this by temporarily adjusting end_subject so that we stop scanning
+   That is, the match must be before or at the first newline. Implement this by
-   at a newline. If the match fails at the newline, later code breaks this loop.
+   temporarily adjusting end_subject so that we stop scanning at a newline. If
-   */
+   the match fails at the newline, later code breaks this loop. */
    if (firstline)
      {
-     const uschar *t = start_match;
+     USPTR t = start_match;
-     while (t < save_end_subject && *t != '\n') t++;
+     while (t < md->end_subject && !IS_NEWLINE(t)) t++;
      end_subject = t;
      }
-Line 3445 
 do
+Line 3998 
 do
      {
      if (first_byte_caseless)
        while (start_match < end_subject &&
-              match_block.lcc[*start_match] != first_byte)
+              md->lcc[*start_match] != first_byte)
          start_match++;
      else
        while (start_match < end_subject && *start_match != first_byte)
          start_match++;
      }
-   /* Or to just after \n for a multiline match if possible */
+   /* Or to just after a linebreak for a multiline match if possible */
    else if (startline)
      {
-     if (start_match > match_block.start_subject + start_offset)
+     if (start_match > md->start_subject + start_offset)
        {
-       while (start_match < end_subject && start_match[-1] != NEWLINE)
+       while (start_match <= end_subject && !WAS_NEWLINE(start_match))
          start_match++;
        }
      }
-Line 3480 
 do
+Line 4033 
 do
  #ifdef DEBUG  /* Sigh. Some compilers never learn. */
    printf(">>>> Match against: ");
-   pchars(start_match, end_subject - start_match, TRUE, &match_block);
+   pchars(start_match, end_subject - start_match, TRUE, md);
    printf("\n");
  #endif
-Line 3494 
 do
+Line 4047 
 do
    HOWEVER: when the subject string is very, very long, searching to its end can
    take a long time, and give bad performance on quite ordinary patterns. This
-   showed up when somebody was matching /^C/ on a 32-megabyte string... so we
+   showed up when somebody was matching something like /^\d+C/ on a 32-megabyte
-   don't do this when the string is sufficiently long.
+   string... so we don't do this when the string is sufficiently long.
    ALSO: this processing is disabled when partial matching is requested.
    */
    if (req_byte >= 0 &&
        end_subject - start_match < REQ_BYTE_MAX &&
-       !match_block.partial)
+       !md->partial)
      {
-     register const uschar *p = start_match + ((first_byte >= 0)? 1 : 0);
+     register USPTR p = start_match + ((first_byte >= 0)? 1 : 0);
      /* We don't need to repeat the search if we haven't yet reached the
      place we found it at last time. */
-Line 3527 
 do
+Line 4080 
 do
            }
          }
-       /* If we can't find the required character, break the matching loop */
+       /* If we can't find the required character, break the matching loop,
+       forcing a match failure. */
-       if (p >= end_subject) break;
+       if (p >= end_subject)
+         {
+         rc = MATCH_NOMATCH;
+         break;
+         }
        /* If we have found the required character, save the point where we
        found it, so that we don't search again next time round the loop if
-Line 3539 
 do
+Line 4097 
 do
        }
      }
-   /* When a match occurs, substrings will be set for all internal extractions;
+   /* OK, we can now run the match. */
-   we just need to set up the whole thing as substring 0 before returning. If
-   there were too many extractions, set the return code to zero. In the case
-   where we had to get some local store to hold offsets for backreferences, copy
-   those back references that we can. In this case there need not be overflow
-   if certain parts of the pattern were not used. */
-   match_block.start_match = start_match;
-   match_block.match_call_count = 0;
-   rc = match(start_match, match_block.start_code, 2, &match_block, ims, NULL,
-     match_isgroup);
-   /* When the result is no match, if the subject's first character was a
-   newline and the PCRE_FIRSTLINE option is set, break (which will return
-   PCRE_ERROR_NOMATCH). The option requests that a match occur before the first
-   newline in the subject. Otherwise, advance the pointer to the next character
-   and continue - but the continuation will actually happen only when the
-   pattern is not anchored. */
-   if (rc == MATCH_NOMATCH)
+   md->start_match = start_match;
-     {
+   md->match_call_count = 0;
-     if (firstline && *start_match == NEWLINE) break;
+   md->eptrn = 0;                          /* Next free eptrchain slot */
-     start_match++;
+   rc = match(start_match, md->start_code, 2, md, ims, NULL, 0, 0);
+   /* Any return other than MATCH_NOMATCH breaks the loop. */
+   if (rc != MATCH_NOMATCH) break;
+   /* If PCRE_FIRSTLINE is set, the match must happen before or at the first
+   newline in the subject (though it may continue over the newline). Therefore,
+   if we have just failed to match, starting at a newline, do not continue. */
+   if (firstline && IS_NEWLINE(start_match)) break;
+   /* Advance the match position by one character. */
+   start_match++;
  #ifdef SUPPORT_UTF8
-     if (match_block.utf8)
+   if (utf8)
-       while(start_match < end_subject && (*start_match & 0xc0) == 0x80)
+     while(start_match < end_subject && (*start_match & 0xc0) == 0x80)
-         start_match++;
+       start_match++;
  #endif
-     continue;
-     }
-   if (rc != MATCH_MATCH)
+   /* Break the loop if the pattern is anchored or if we have passed the end of
-     {
+   the subject. */
-     DPRINTF((">>>> error: returning %d\n", rc));
-     return rc;
-     }
-   /* We have a match! Copy the offset information from temporary store if
+   if (anchored || start_match > end_subject) break;
-   necessary */
+   /* If we have just passed a CR and the newline option is CRLF or ANY, and we
+   are now at a LF, advance the match position by one more character. */
+   if (start_match[-1] == '\r' &&
+        (md->nltype == NLTYPE_ANY || md->nllen == 2) &&
+        start_match < end_subject &&
+        *start_match == '\n')
+     start_match++;
+   }   /* End of for(;;) "bumpalong" loop */
+ /* ==========================================================================*/
+ /* We reach here when rc is not MATCH_NOMATCH, or if one of the stopping
+ conditions is true:
+ (1) The pattern is anchored;
+ (2) We are past the end of the subject;
+ (3) PCRE_FIRSTLINE is set and we have failed to match at a newline, because
+     this option requests that a match occur at or before the first newline in
+     the subject.
+ When we have a match and the offset vector is big enough to deal with any
+ backreferences, captured substring offsets will already be set up. In the case
+ where we had to get some local store to hold offsets for backreference
+ processing, copy those that we can. In this case there need not be overflow if
+ certain parts of the pattern were not used, even though there are more
+ capturing parentheses than vector slots. */
+ if (rc == MATCH_MATCH)
+   {
    if (using_temporary_offsets)
      {
      if (offsetcount >= 4)
        {
-       memcpy(offsets + 2, match_block.offset_vector + 2,
+       memcpy(offsets + 2, md->offset_vector + 2,
          (offsetcount - 2) * sizeof(int));
        DPRINTF(("Copied offsets from temporary memory\n"));
        }
-     if (match_block.end_offset_top > offsetcount)
+     if (md->end_offset_top > offsetcount) md->offset_overflow = TRUE;
-       match_block.offset_overflow = TRUE;
      DPRINTF(("Freeing temporary memory\n"));
-     (pcre_free)(match_block.offset_vector);
+     (pcre_free)(md->offset_vector);
      }
-   rc = match_block.offset_overflow? 0 : match_block.end_offset_top/2;
+   /* Set the return code to the number of captured strings, or 0 if there are
+   too many to fit into the vector. */
+   rc = md->offset_overflow? 0 : md->end_offset_top/2;
+   /* If there is space, set up the whole thing as substring 0. */
    if (offsetcount < 2) rc = 0; else
      {
-     offsets[0] = start_match - match_block.start_subject;
+     offsets[0] = start_match - md->start_subject;
-     offsets[1] = match_block.end_match_ptr - match_block.start_subject;
+     offsets[1] = md->end_match_ptr - md->start_subject;
      }
    DPRINTF((">>>> returning %d\n", rc));
    return rc;
    }
- /* This "while" is the end of the "do" above */
+ /* Control gets here if there has been an error, or if the overall match
+ attempt has failed at all permitted starting positions. */
- while (!anchored && start_match <= end_subject);
  if (using_temporary_offsets)
    {
    DPRINTF(("Freeing temporary memory\n"));
-   (pcre_free)(match_block.offset_vector);
+   (pcre_free)(md->offset_vector);
    }
- if (match_block.partial && match_block.hitend)
+ if (rc != MATCH_NOMATCH)
+   {
+   DPRINTF((">>>> error: returning %d\n", rc));
+   return rc;
+   }
+ else if (md->partial && md->hitend)
    {
    DPRINTF((">>>> returning PCRE_ERROR_PARTIAL\n"));
    return PCRE_ERROR_PARTIAL;

 Legend:



Removed from v.85
 


changed lines


 
Added in v.120
 Legend:



Removed from v.85
 


changed lines


 
Added in v.120
-Removed from v.85
+Added in v.120

webmaster@exim.org	ViewVC Help
Powered by ViewVC 1.1.12