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

Diff of /code/trunk/pcre_exec.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 475 by ph10, Sat Jan 2 18:21:30 2010 UTC revision 608 by ph10, Sun Jun 12 16:25:55 2011 UTC
# Line 6  Line 6 
6  and semantics are as close as possible to those of the Perl 5 language.  and semantics are as close as possible to those of the Perl 5 language.
7    
8                         Written by Philip Hazel                         Written by Philip Hazel
9             Copyright (c) 1997-2010 University of Cambridge             Copyright (c) 1997-2011 University of Cambridge
10    
11  -----------------------------------------------------------------------------  -----------------------------------------------------------------------------
12  Redistribution and use in source and binary forms, with or without  Redistribution and use in source and binary forms, with or without
# Line 57  possible. There are also some static sup Line 57  possible. There are also some static sup
57  #undef min  #undef min
58  #undef max  #undef max
59    
60  /* Flag bits for the match() function */  /* Values for setting in md->match_function_type to indicate two special types
61    of call to match(). We do it this way to save on using another stack variable,
62    as stack usage is to be discouraged. */
63    
64  #define match_condassert     0x01  /* Called to check a condition assertion */  #define MATCH_CONDASSERT     1  /* Called to check a condition assertion */
65  #define match_cbegroup       0x02  /* Could-be-empty unlimited repeat group */  #define MATCH_CBEGROUP       2  /* Could-be-empty unlimited repeat group */
66    
67  /* Non-error returns from the match() function. Error returns are externally  /* Non-error returns from the match() function. Error returns are externally
68  defined PCRE_ERROR_xxx codes, which are all negative. */  defined PCRE_ERROR_xxx codes, which are all negative. */
# Line 71  defined PCRE_ERROR_xxx codes, which are Line 73  defined PCRE_ERROR_xxx codes, which are
73  /* Special internal returns from the match() function. Make them sufficiently  /* Special internal returns from the match() function. Make them sufficiently
74  negative to avoid the external error codes. */  negative to avoid the external error codes. */
75    
76  #define MATCH_COMMIT       (-999)  #define MATCH_ACCEPT       (-999)
77  #define MATCH_PRUNE        (-998)  #define MATCH_COMMIT       (-998)
78  #define MATCH_SKIP         (-997)  #define MATCH_KETRPOS      (-997)
79  #define MATCH_THEN         (-996)  #define MATCH_PRUNE        (-996)
80    #define MATCH_SKIP         (-995)
81    #define MATCH_SKIP_ARG     (-994)
82    #define MATCH_THEN         (-993)
83    
84    /* This is a convenience macro for code that occurs many times. */
85    
86    #define MRRETURN(ra) \
87      { \
88      md->mark = markptr; \
89      RRETURN(ra); \
90      }
91    
92  /* Maximum number of ints of offset to save on the stack for recursive calls.  /* Maximum number of ints of offset to save on the stack for recursive calls.
93  If the offset vector is bigger, malloc is used. This should be a multiple of 3,  If the offset vector is bigger, malloc is used. This should be a multiple of 3,
# Line 122  while (length-- > 0) Line 135  while (length-- > 0)
135  *          Match a back-reference                *  *          Match a back-reference                *
136  *************************************************/  *************************************************/
137    
138  /* If a back reference hasn't been set, the length that is passed is greater  /* Normally, if a back reference hasn't been set, the length that is passed is
139  than the number of characters left in the string, so the match fails.  negative, so the match always fails. However, in JavaScript compatibility mode,
140    the length passed is zero. Note that in caseless UTF-8 mode, the number of
141    subject bytes matched may be different to the number of reference bytes.
142    
143  Arguments:  Arguments:
144    offset      index into the offset vector    offset      index into the offset vector
145    eptr        points into the subject    eptr        pointer into the subject
146    length      length to be matched    length      length of reference to be matched (number of bytes)
147    md          points to match data block    md          points to match data block
148    ims         the ims flags    caseless    TRUE if caseless
149    
150  Returns:      TRUE if matched  Returns:      < 0 if not matched, otherwise the number of subject bytes matched
151  */  */
152    
153  static BOOL  static int
154  match_ref(int offset, register USPTR eptr, int length, match_data *md,  match_ref(int offset, register USPTR eptr, int length, match_data *md,
155    unsigned long int ims)    BOOL caseless)
156  {  {
157  USPTR p = md->start_subject + md->offset_vector[offset];  USPTR eptr_start = eptr;
158    register USPTR p = md->start_subject + md->offset_vector[offset];
159    
160  #ifdef PCRE_DEBUG  #ifdef PCRE_DEBUG
161  if (eptr >= md->end_subject)  if (eptr >= md->end_subject)
# Line 154  pchars(p, length, FALSE, md); Line 170  pchars(p, length, FALSE, md);
170  printf("\n");  printf("\n");
171  #endif  #endif
172    
173  /* Always fail if not enough characters left */  /* Always fail if reference not set (and not JavaScript compatible). */
174    
175  if (length > md->end_subject - eptr) return FALSE;  if (length < 0) return -1;
176    
177  /* Separate the caseless case for speed. In UTF-8 mode we can only do this  /* Separate the caseless case for speed. In UTF-8 mode we can only do this
178  properly if Unicode properties are supported. Otherwise, we can check only  properly if Unicode properties are supported. Otherwise, we can check only
179  ASCII characters. */  ASCII characters. */
180    
181  if ((ims & PCRE_CASELESS) != 0)  if (caseless)
182    {    {
183  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
184  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
185    if (md->utf8)    if (md->utf8)
186      {      {
187      USPTR endptr = eptr + length;      /* Match characters up to the end of the reference. NOTE: the number of
188      while (eptr < endptr)      bytes matched may differ, because there are some characters whose upper and
189        lower case versions code as different numbers of bytes. For example, U+023A
190        (2 bytes in UTF-8) is the upper case version of U+2C65 (3 bytes in UTF-8);
191        a sequence of 3 of the former uses 6 bytes, as does a sequence of two of
192        the latter. It is important, therefore, to check the length along the
193        reference, not along the subject (earlier code did this wrong). */
194    
195        USPTR endptr = p + length;
196        while (p < endptr)
197        {        {
198        int c, d;        int c, d;
199          if (eptr >= md->end_subject) return -1;
200        GETCHARINC(c, eptr);        GETCHARINC(c, eptr);
201        GETCHARINC(d, p);        GETCHARINC(d, p);
202        if (c != d && c != UCD_OTHERCASE(d)) return FALSE;        if (c != d && c != UCD_OTHERCASE(d)) return -1;
203        }        }
204      }      }
205    else    else
# Line 183  if ((ims & PCRE_CASELESS) != 0) Line 208  if ((ims & PCRE_CASELESS) != 0)
208    
209    /* The same code works when not in UTF-8 mode and in UTF-8 mode when there    /* The same code works when not in UTF-8 mode and in UTF-8 mode when there
210    is no UCP support. */    is no UCP support. */
211        {
212    while (length-- > 0)      if (eptr + length > md->end_subject) return -1;
213      { if (md->lcc[*p++] != md->lcc[*eptr++]) return FALSE; }      while (length-- > 0)
214          { if (md->lcc[*p++] != md->lcc[*eptr++]) return -1; }
215        }
216    }    }
217    
218  /* In the caseful case, we can just compare the bytes, whether or not we  /* In the caseful case, we can just compare the bytes, whether or not we
219  are in UTF-8 mode. */  are in UTF-8 mode. */
220    
221  else  else
222    { while (length-- > 0) if (*p++ != *eptr++) return FALSE; }    {
223      if (eptr + length > md->end_subject) return -1;
224      while (length-- > 0) if (*p++ != *eptr++) return -1;
225      }
226    
227  return TRUE;  return eptr - eptr_start;
228  }  }
229    
230    
# Line 245  enum { RM1=1, RM2,  RM3,  RM4,  RM5,  RM Line 275  enum { RM1=1, RM2,  RM3,  RM4,  RM5,  RM
275         RM21,  RM22, RM23, RM24, RM25, RM26, RM27, RM28, RM29, RM30,         RM21,  RM22, RM23, RM24, RM25, RM26, RM27, RM28, RM29, RM30,
276         RM31,  RM32, RM33, RM34, RM35, RM36, RM37, RM38, RM39, RM40,         RM31,  RM32, RM33, RM34, RM35, RM36, RM37, RM38, RM39, RM40,
277         RM41,  RM42, RM43, RM44, RM45, RM46, RM47, RM48, RM49, RM50,         RM41,  RM42, RM43, RM44, RM45, RM46, RM47, RM48, RM49, RM50,
278         RM51,  RM52, RM53, RM54 };         RM51,  RM52, RM53, RM54, RM55, RM56, RM57, RM58, RM59, RM60,
279           RM61,  RM62, RM63, RM64 };
280    
281  /* These versions of the macros use the stack, as normal. There are debugging  /* These versions of the macros use the stack, as normal. There are debugging
282  versions and production versions. Note that the "rw" argument of RMATCH isn't  versions and production versions. Note that the "rw" argument of RMATCH isn't
283  actuall used in this definition. */  actually used in this definition. */
284    
285  #ifndef NO_RECURSE  #ifndef NO_RECURSE
286  #define REGISTER register  #define REGISTER register
287    
288  #ifdef PCRE_DEBUG  #ifdef PCRE_DEBUG
289  #define RMATCH(ra,rb,rc,rd,re,rf,rg,rw) \  #define RMATCH(ra,rb,rc,rd,re,rw) \
290    { \    { \
291    printf("match() called in line %d\n", __LINE__); \    printf("match() called in line %d\n", __LINE__); \
292    rrc = match(ra,rb,mstart,rc,rd,re,rf,rg,rdepth+1); \    rrc = match(ra,rb,mstart,markptr,rc,rd,re,rdepth+1); \
293    printf("to line %d\n", __LINE__); \    printf("to line %d\n", __LINE__); \
294    }    }
295  #define RRETURN(ra) \  #define RRETURN(ra) \
# Line 267  actuall used in this definition. */ Line 298  actuall used in this definition. */
298    return ra; \    return ra; \
299    }    }
300  #else  #else
301  #define RMATCH(ra,rb,rc,rd,re,rf,rg,rw) \  #define RMATCH(ra,rb,rc,rd,re,rw) \
302    rrc = match(ra,rb,mstart,rc,rd,re,rf,rg,rdepth+1)    rrc = match(ra,rb,mstart,markptr,rc,rd,re,rdepth+1)
303  #define RRETURN(ra) return ra  #define RRETURN(ra) return ra
304  #endif  #endif
305    
# Line 281  argument of match(), which never changes Line 312  argument of match(), which never changes
312    
313  #define REGISTER  #define REGISTER
314    
315  #define RMATCH(ra,rb,rc,rd,re,rf,rg,rw)\  #define RMATCH(ra,rb,rc,rd,re,rw)\
316    {\    {\
317    heapframe *newframe = (pcre_stack_malloc)(sizeof(heapframe));\    heapframe *newframe = (heapframe *)(pcre_stack_malloc)(sizeof(heapframe));\
318      if (newframe == NULL) RRETURN(PCRE_ERROR_NOMEMORY);\
319    frame->Xwhere = rw; \    frame->Xwhere = rw; \
320    newframe->Xeptr = ra;\    newframe->Xeptr = ra;\
321    newframe->Xecode = rb;\    newframe->Xecode = rb;\
322    newframe->Xmstart = mstart;\    newframe->Xmstart = mstart;\
323      newframe->Xmarkptr = markptr;\
324    newframe->Xoffset_top = rc;\    newframe->Xoffset_top = rc;\
325    newframe->Xims = re;\    newframe->Xeptrb = re;\
   newframe->Xeptrb = rf;\  
   newframe->Xflags = rg;\  
326    newframe->Xrdepth = frame->Xrdepth + 1;\    newframe->Xrdepth = frame->Xrdepth + 1;\
327    newframe->Xprevframe = frame;\    newframe->Xprevframe = frame;\
328    frame = newframe;\    frame = newframe;\
# Line 303  argument of match(), which never changes Line 334  argument of match(), which never changes
334    
335  #define RRETURN(ra)\  #define RRETURN(ra)\
336    {\    {\
337    heapframe *newframe = frame;\    heapframe *oldframe = frame;\
338    frame = newframe->Xprevframe;\    frame = oldframe->Xprevframe;\
339    (pcre_stack_free)(newframe);\    (pcre_stack_free)(oldframe);\
340    if (frame != NULL)\    if (frame != NULL)\
341      {\      {\
342      rrc = ra;\      rrc = ra;\
# Line 325  typedef struct heapframe { Line 356  typedef struct heapframe {
356    USPTR Xeptr;    USPTR Xeptr;
357    const uschar *Xecode;    const uschar *Xecode;
358    USPTR Xmstart;    USPTR Xmstart;
359      USPTR Xmarkptr;
360    int Xoffset_top;    int Xoffset_top;
   long int Xims;  
361    eptrblock *Xeptrb;    eptrblock *Xeptrb;
   int Xflags;  
362    unsigned int Xrdepth;    unsigned int Xrdepth;
363    
364    /* Function local variables */    /* Function local variables */
# Line 349  typedef struct heapframe { Line 379  typedef struct heapframe {
379    BOOL Xcondition;    BOOL Xcondition;
380    BOOL Xprev_is_word;    BOOL Xprev_is_word;
381    
   unsigned long int Xoriginal_ims;  
   
382  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
383    int Xprop_type;    int Xprop_type;
384    int Xprop_value;    int Xprop_value;
# Line 408  immediately. The second one is used when Line 436  immediately. The second one is used when
436  the subject. */  the subject. */
437    
438  #define CHECK_PARTIAL()\  #define CHECK_PARTIAL()\
439    if (md->partial != 0 && eptr >= md->end_subject && eptr > mstart)\    if (md->partial != 0 && eptr >= md->end_subject && \
440      {\        eptr > md->start_used_ptr) \
441      md->hitend = TRUE;\      { \
442      if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);\      md->hitend = TRUE; \
443        if (md->partial > 1) MRRETURN(PCRE_ERROR_PARTIAL); \
444      }      }
445    
446  #define SCHECK_PARTIAL()\  #define SCHECK_PARTIAL()\
447    if (md->partial != 0 && eptr > mstart)\    if (md->partial != 0 && eptr > md->start_used_ptr) \
448      {\      { \
449      md->hitend = TRUE;\      md->hitend = TRUE; \
450      if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL);\      if (md->partial > 1) MRRETURN(PCRE_ERROR_PARTIAL); \
451      }      }
452    
453    
# Line 432  Arguments: Line 461  Arguments:
461     ecode       pointer to current position in compiled code     ecode       pointer to current position in compiled code
462     mstart      pointer to the current match start position (can be modified     mstart      pointer to the current match start position (can be modified
463                   by encountering \K)                   by encountering \K)
464       markptr     pointer to the most recent MARK name, or NULL
465     offset_top  current top pointer     offset_top  current top pointer
466     md          pointer to "static" info for the match     md          pointer to "static" info for the match
    ims         current /i, /m, and /s options  
467     eptrb       pointer to chain of blocks containing eptr at start of     eptrb       pointer to chain of blocks containing eptr at start of
468                   brackets - for testing for empty matches                   brackets - for testing for empty matches
    flags       can contain  
                  match_condassert - this is an assertion condition  
                  match_cbegroup - this is the start of an unlimited repeat  
                    group that can match an empty string  
469     rdepth      the recursion depth     rdepth      the recursion depth
470    
471  Returns:       MATCH_MATCH if matched            )  these values are >= 0  Returns:       MATCH_MATCH if matched            )  these values are >= 0
472                 MATCH_NOMATCH if failed to match  )                 MATCH_NOMATCH if failed to match  )
473                   a negative MATCH_xxx value for PRUNE, SKIP, etc
474                 a negative PCRE_ERROR_xxx value if aborted by an error condition                 a negative PCRE_ERROR_xxx value if aborted by an error condition
475                   (e.g. stopped by repeated call or recursion limit)                   (e.g. stopped by repeated call or recursion limit)
476  */  */
477    
478  static int  static int
479  match(REGISTER USPTR eptr, REGISTER const uschar *ecode, USPTR mstart,  match(REGISTER USPTR eptr, REGISTER const uschar *ecode, USPTR mstart,
480    int offset_top, match_data *md, unsigned long int ims, eptrblock *eptrb,    const uschar *markptr, int offset_top, match_data *md, eptrblock *eptrb,
481    int flags, unsigned int rdepth)    unsigned int rdepth)
482  {  {
483  /* These variables do not need to be preserved over recursion in this function,  /* These variables do not need to be preserved over recursion in this function,
484  so they can be ordinary variables in all cases. Mark some of them with  so they can be ordinary variables in all cases. Mark some of them with
# Line 464  register unsigned int c;   /* Character Line 490  register unsigned int c;   /* Character
490  register BOOL utf8;        /* Local copy of UTF-8 flag for speed */  register BOOL utf8;        /* Local copy of UTF-8 flag for speed */
491    
492  BOOL minimize, possessive; /* Quantifier options */  BOOL minimize, possessive; /* Quantifier options */
493    BOOL caseless;
494  int condcode;  int condcode;
495    
496  /* When recursion is not being used, all "local" variables that have to be  /* When recursion is not being used, all "local" variables that have to be
# Line 472  heap storage. Set up the top-level frame Line 499  heap storage. Set up the top-level frame
499  heap whenever RMATCH() does a "recursion". See the macro definitions above. */  heap whenever RMATCH() does a "recursion". See the macro definitions above. */
500    
501  #ifdef NO_RECURSE  #ifdef NO_RECURSE
502  heapframe *frame = (pcre_stack_malloc)(sizeof(heapframe));  heapframe *frame = (heapframe *)(pcre_stack_malloc)(sizeof(heapframe));
503    if (frame == NULL) RRETURN(PCRE_ERROR_NOMEMORY);
504  frame->Xprevframe = NULL;            /* Marks the top level */  frame->Xprevframe = NULL;            /* Marks the top level */
505    
506  /* Copy in the original argument variables */  /* Copy in the original argument variables */
# Line 480  frame->Xprevframe = NULL;            /* Line 508  frame->Xprevframe = NULL;            /*
508  frame->Xeptr = eptr;  frame->Xeptr = eptr;
509  frame->Xecode = ecode;  frame->Xecode = ecode;
510  frame->Xmstart = mstart;  frame->Xmstart = mstart;
511    frame->Xmarkptr = markptr;
512  frame->Xoffset_top = offset_top;  frame->Xoffset_top = offset_top;
 frame->Xims = ims;  
513  frame->Xeptrb = eptrb;  frame->Xeptrb = eptrb;
 frame->Xflags = flags;  
514  frame->Xrdepth = rdepth;  frame->Xrdepth = rdepth;
515    
516  /* This is where control jumps back to to effect "recursion" */  /* This is where control jumps back to to effect "recursion" */
# Line 495  HEAP_RECURSE: Line 522  HEAP_RECURSE:
522  #define eptr               frame->Xeptr  #define eptr               frame->Xeptr
523  #define ecode              frame->Xecode  #define ecode              frame->Xecode
524  #define mstart             frame->Xmstart  #define mstart             frame->Xmstart
525    #define markptr            frame->Xmarkptr
526  #define offset_top         frame->Xoffset_top  #define offset_top         frame->Xoffset_top
 #define ims                frame->Xims  
527  #define eptrb              frame->Xeptrb  #define eptrb              frame->Xeptrb
 #define flags              frame->Xflags  
528  #define rdepth             frame->Xrdepth  #define rdepth             frame->Xrdepth
529    
530  /* Ditto for the local variables */  /* Ditto for the local variables */
# Line 520  HEAP_RECURSE: Line 546  HEAP_RECURSE:
546  #define condition          frame->Xcondition  #define condition          frame->Xcondition
547  #define prev_is_word       frame->Xprev_is_word  #define prev_is_word       frame->Xprev_is_word
548    
 #define original_ims       frame->Xoriginal_ims  
   
549  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
550  #define prop_type          frame->Xprop_type  #define prop_type          frame->Xprop_type
551  #define prop_value         frame->Xprop_value  #define prop_value         frame->Xprop_value
# Line 558  i, and fc and c, can be the same variabl Line 582  i, and fc and c, can be the same variabl
582  #define fi i  #define fi i
583  #define fc c  #define fc c
584    
585    /* Many of the following variables are used only in small blocks of the code.
586  #ifdef SUPPORT_UTF8                /* Many of these variables are used only  */  My normal style of coding would have declared them within each of those blocks.
587  const uschar *charptr;             /* in small blocks of the code. My normal */  However, in order to accommodate the version of this code that uses an external
588  #endif                             /* style of coding would have declared    */  "stack" implemented on the heap, it is easier to declare them all here, so the
589  const uschar *callpat;             /* them within each of those blocks.      */  declarations can be cut out in a block. The only declarations within blocks
590  const uschar *data;                /* However, in order to accommodate the   */  below are for variables that do not have to be preserved over a recursive call
591  const uschar *next;                /* version of this code that uses an      */  to RMATCH(). */
592  USPTR         pp;                  /* external "stack" implemented on the    */  
593  const uschar *prev;                /* heap, it is easier to declare them all */  #ifdef SUPPORT_UTF8
594  USPTR         saved_eptr;          /* here, so the declarations can be cut   */  const uschar *charptr;
595                                     /* out in a block. The only declarations  */  #endif
596  recursion_info new_recursive;      /* within blocks below are for variables  */  const uschar *callpat;
597                                     /* that do not have to be preserved over  */  const uschar *data;
598  BOOL cur_is_word;                  /* a recursive call to RMATCH().          */  const uschar *next;
599    USPTR         pp;
600    const uschar *prev;
601    USPTR         saved_eptr;
602    
603    recursion_info new_recursive;
604    
605    BOOL cur_is_word;
606  BOOL condition;  BOOL condition;
607  BOOL prev_is_word;  BOOL prev_is_word;
608    
 unsigned long int original_ims;  
   
609  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
610  int prop_type;  int prop_type;
611  int prop_value;  int prop_value;
# Line 603  int stacksave[REC_STACK_SAVE_MAX]; Line 632  int stacksave[REC_STACK_SAVE_MAX];
632  eptrblock newptrb;  eptrblock newptrb;
633  #endif     /* NO_RECURSE */  #endif     /* NO_RECURSE */
634    
635    /* To save space on the stack and in the heap frame, I have doubled up on some
636    of the local variables that are used only in localised parts of the code, but
637    still need to be preserved over recursive calls of match(). These macros define
638    the alternative names that are used. */
639    
640    #define allow_zero    cur_is_word
641    #define cbegroup      condition
642    #define code_offset   codelink
643    #define condassert    condition
644    #define matched_once  prev_is_word
645    
646  /* These statements are here to stop the compiler complaining about unitialized  /* These statements are here to stop the compiler complaining about unitialized
647  variables. */  variables. */
648    
# Line 639  haven't exceeded the recursive call limi Line 679  haven't exceeded the recursive call limi
679  if (md->match_call_count++ >= md->match_limit) RRETURN(PCRE_ERROR_MATCHLIMIT);  if (md->match_call_count++ >= md->match_limit) RRETURN(PCRE_ERROR_MATCHLIMIT);
680  if (rdepth >= md->match_limit_recursion) RRETURN(PCRE_ERROR_RECURSIONLIMIT);  if (rdepth >= md->match_limit_recursion) RRETURN(PCRE_ERROR_RECURSIONLIMIT);
681    
 original_ims = ims;    /* Save for resetting on ')' */  
   
682  /* At the start of a group with an unlimited repeat that may match an empty  /* At the start of a group with an unlimited repeat that may match an empty
683  string, the match_cbegroup flag is set. When this is the case, add the current  string, the variable md->match_function_type is set to MATCH_CBEGROUP. It is
684  subject pointer to the chain of such remembered pointers, to be checked when we  done this way to save having to use another function argument, which would take
685  hit the closing ket, in order to break infinite loops that match no characters.  up space on the stack. See also MATCH_CONDASSERT below.
686  When match() is called in other circumstances, don't add to the chain. The  
687  match_cbegroup flag must NOT be used with tail recursion, because the memory  When MATCH_CBEGROUP is set, add the current subject pointer to the chain of
688  block that is used is on the stack, so a new one may be required for each  such remembered pointers, to be checked when we hit the closing ket, in order
689  match(). */  to break infinite loops that match no characters. When match() is called in
690    other circumstances, don't add to the chain. The MATCH_CBEGROUP feature must
691    NOT be used with tail recursion, because the memory block that is used is on
692    the stack, so a new one may be required for each match(). */
693    
694  if ((flags & match_cbegroup) != 0)  if (md->match_function_type == MATCH_CBEGROUP)
695    {    {
696    newptrb.epb_saved_eptr = eptr;    newptrb.epb_saved_eptr = eptr;
697    newptrb.epb_prev = eptrb;    newptrb.epb_prev = eptrb;
698    eptrb = &newptrb;    eptrb = &newptrb;
699      md->match_function_type = 0;
700    }    }
701    
702  /* Now start processing the opcodes. */  /* Now start processing the opcodes. */
# Line 663  for (;;) Line 705  for (;;)
705    {    {
706    minimize = possessive = FALSE;    minimize = possessive = FALSE;
707    op = *ecode;    op = *ecode;
708    
709    switch(op)    switch(op)
710      {      {
711        case OP_MARK:
712        markptr = ecode + 2;
713        RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,
714          eptrb, RM55);
715    
716        /* A return of MATCH_SKIP_ARG means that matching failed at SKIP with an
717        argument, and we must check whether that argument matches this MARK's
718        argument. It is passed back in md->start_match_ptr (an overloading of that
719        variable). If it does match, we reset that variable to the current subject
720        position and return MATCH_SKIP. Otherwise, pass back the return code
721        unaltered. */
722    
723        if (rrc == MATCH_SKIP_ARG &&
724            strcmp((char *)markptr, (char *)(md->start_match_ptr)) == 0)
725          {
726          md->start_match_ptr = eptr;
727          RRETURN(MATCH_SKIP);
728          }
729    
730        if (md->mark == NULL) md->mark = markptr;
731        RRETURN(rrc);
732    
733      case OP_FAIL:      case OP_FAIL:
734      RRETURN(MATCH_NOMATCH);      MRRETURN(MATCH_NOMATCH);
735    
736        /* COMMIT overrides PRUNE, SKIP, and THEN */
737    
738        case OP_COMMIT:
739        RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
740          eptrb, RM52);
741        if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE &&
742            rrc != MATCH_SKIP && rrc != MATCH_SKIP_ARG &&
743            rrc != MATCH_THEN)
744          RRETURN(rrc);
745        MRRETURN(MATCH_COMMIT);
746    
747        /* PRUNE overrides THEN */
748    
749      case OP_PRUNE:      case OP_PRUNE:
750      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
751        ims, eptrb, flags, RM51);        eptrb, RM51);
752      if (rrc != MATCH_NOMATCH) RRETURN(rrc);      if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
753        MRRETURN(MATCH_PRUNE);
754    
755        case OP_PRUNE_ARG:
756        RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,
757          eptrb, RM56);
758        if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
759        md->mark = ecode + 2;
760      RRETURN(MATCH_PRUNE);      RRETURN(MATCH_PRUNE);
761    
762      case OP_COMMIT:      /* SKIP overrides PRUNE and THEN */
     RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,  
       ims, eptrb, flags, RM52);  
     if (rrc != MATCH_NOMATCH) RRETURN(rrc);  
     RRETURN(MATCH_COMMIT);  
763    
764      case OP_SKIP:      case OP_SKIP:
765      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
766        ims, eptrb, flags, RM53);        eptrb, RM53);
767      if (rrc != MATCH_NOMATCH) RRETURN(rrc);      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE && rrc != MATCH_THEN)
768          RRETURN(rrc);
769      md->start_match_ptr = eptr;   /* Pass back current position */      md->start_match_ptr = eptr;   /* Pass back current position */
770      RRETURN(MATCH_SKIP);      MRRETURN(MATCH_SKIP);
771    
772        case OP_SKIP_ARG:
773        RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,
774          eptrb, RM57);
775        if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE && rrc != MATCH_THEN)
776          RRETURN(rrc);
777    
778        /* Pass back the current skip name by overloading md->start_match_ptr and
779        returning the special MATCH_SKIP_ARG return code. This will either be
780        caught by a matching MARK, or get to the top, where it is treated the same
781        as PRUNE. */
782    
783        md->start_match_ptr = ecode + 2;
784        RRETURN(MATCH_SKIP_ARG);
785    
786        /* For THEN (and THEN_ARG) we pass back the address of the bracket or
787        the alt that is at the start of the current branch. This makes it possible
788        to skip back past alternatives that precede the THEN within the current
789        branch. */
790    
791      case OP_THEN:      case OP_THEN:
792      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
793        ims, eptrb, flags, RM54);        eptrb, RM54);
794      if (rrc != MATCH_NOMATCH) RRETURN(rrc);      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
795      RRETURN(MATCH_THEN);      md->start_match_ptr = ecode - GET(ecode, 1);
796        MRRETURN(MATCH_THEN);
797    
798      /* Handle a capturing bracket. If there is space in the offset vector, save      case OP_THEN_ARG:
799      the current subject position in the working slot at the top of the vector.      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1+LINK_SIZE],
800      We mustn't change the current values of the data slot, because they may be        offset_top, md, eptrb, RM58);
801      set from a previous iteration of this group, and be referred to by a      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
802      reference inside the group.      md->start_match_ptr = ecode - GET(ecode, 1);
803        md->mark = ecode + LINK_SIZE + 2;
804        RRETURN(MATCH_THEN);
805    
806      If the bracket fails to match, we need to restore this value and also the      /* Handle a capturing bracket, other than those that are possessive with an
807        unlimited repeat. If there is space in the offset vector, save the current
808        subject position in the working slot at the top of the vector. We mustn't
809        change the current values of the data slot, because they may be set from a
810        previous iteration of this group, and be referred to by a reference inside
811        the group. If we fail to match, we need to restore this value and also the
812      values of the final offsets, in case they were set by a previous iteration      values of the final offsets, in case they were set by a previous iteration
813      of the same bracket.      of the same bracket.
814    
# Line 712  for (;;) Line 820  for (;;)
820      case OP_SCBRA:      case OP_SCBRA:
821      number = GET2(ecode, 1+LINK_SIZE);      number = GET2(ecode, 1+LINK_SIZE);
822      offset = number << 1;      offset = number << 1;
823    
824  #ifdef PCRE_DEBUG  #ifdef PCRE_DEBUG
825      printf("start bracket %d\n", number);      printf("start bracket %d\n", number);
826      printf("subject=");      printf("subject=");
# Line 728  for (;;) Line 836  for (;;)
836        save_capture_last = md->capture_last;        save_capture_last = md->capture_last;
837    
838        DPRINTF(("saving %d %d %d\n", save_offset1, save_offset2, save_offset3));        DPRINTF(("saving %d %d %d\n", save_offset1, save_offset2, save_offset3));
839        md->offset_vector[md->offset_end - number] = eptr - md->start_subject;        md->offset_vector[md->offset_end - number] =
840            (int)(eptr - md->start_subject);
841    
842        flags = (op == OP_SCBRA)? match_cbegroup : 0;        for (;;)
       do  
843          {          {
844          RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,          if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
845            ims, eptrb, flags, RM1);          RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
846          if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);            eptrb, RM1);
847            if (rrc != MATCH_NOMATCH &&
848                (rrc != MATCH_THEN || md->start_match_ptr != ecode))
849              RRETURN(rrc);
850          md->capture_last = save_capture_last;          md->capture_last = save_capture_last;
851          ecode += GET(ecode, 1);          ecode += GET(ecode, 1);
852            if (*ecode != OP_ALT) break;
853          }          }
       while (*ecode == OP_ALT);  
854    
855        DPRINTF(("bracket %d failed\n", number));        DPRINTF(("bracket %d failed\n", number));
856    
# Line 747  for (;;) Line 858  for (;;)
858        md->offset_vector[offset+1] = save_offset2;        md->offset_vector[offset+1] = save_offset2;
859        md->offset_vector[md->offset_end - number] = save_offset3;        md->offset_vector[md->offset_end - number] = save_offset3;
860    
861          if (rrc != MATCH_THEN) md->mark = markptr;
862        RRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
863        }        }
864    
# Line 761  for (;;) Line 873  for (;;)
873      /* VVVVVVVVVVVVVVVVVVVVVVVVV */      /* VVVVVVVVVVVVVVVVVVVVVVVVV */
874      /* VVVVVVVVVVVVVVVVVVVVVVVVV */      /* VVVVVVVVVVVVVVVVVVVVVVVVV */
875    
876      /* Non-capturing bracket. Loop for all the alternatives. When we get to the      /* Non-capturing bracket, except for possessive with unlimited repeat. Loop
877      final alternative within the brackets, we would return the result of a      for all the alternatives. When we get to the final alternative within the
878      recursive call to match() whatever happened. We can reduce stack usage by      brackets, we would return the result of a recursive call to match()
879      turning this into a tail recursion, except in the case when match_cbegroup      whatever happened. We can reduce stack usage by turning this into a tail
880      is set.*/      recursion, except in the case of a possibly empty group.*/
881    
882      case OP_BRA:      case OP_BRA:
883      case OP_SBRA:      case OP_SBRA:
884      DPRINTF(("start non-capturing bracket\n"));      DPRINTF(("start non-capturing bracket\n"));
     flags = (op >= OP_SBRA)? match_cbegroup : 0;  
885      for (;;)      for (;;)
886        {        {
887        if (ecode[GET(ecode, 1)] != OP_ALT)   /* Final alternative */        if (ecode[GET(ecode, 1)] != OP_ALT)   /* Final alternative */
888          {          {
889          if (flags == 0)    /* Not a possibly empty group */          if (op >= OP_SBRA)   /* Possibly empty group */
890            {            {
891            ecode += _pcre_OP_lengths[*ecode];            md->match_function_type = MATCH_CBEGROUP;
892            DPRINTF(("bracket 0 tail recursion\n"));            RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md, eptrb,
893            goto TAIL_RECURSE;              RM48);
894            }            if (rrc == MATCH_NOMATCH) md->mark = markptr;
895              RRETURN(rrc);
896              }
897            /* Not a possibly empty group; use tail recursion */
898            ecode += _pcre_OP_lengths[*ecode];
899            DPRINTF(("bracket 0 tail recursion\n"));
900            goto TAIL_RECURSE;
901            }
902    
903          /* Possibly empty group; can't use tail recursion. */        /* For non-final alternatives, continue the loop for a NOMATCH result;
904          otherwise return. */
905    
906          RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md, ims,        if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
907            eptrb, flags, RM48);        RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md, eptrb,
908            RM2);
909          if (rrc != MATCH_NOMATCH &&
910              (rrc != MATCH_THEN || md->start_match_ptr != ecode))
911          RRETURN(rrc);          RRETURN(rrc);
912          ecode += GET(ecode, 1);
913          }
914        /* Control never reaches here. */
915    
916        /* Handle possessive capturing brackets with an unlimited repeat. We come
917        here from BRAZERO with allow_zero set TRUE. The offset_vector values are
918        handled similarly to the normal case above. However, the matching is
919        different. The end of these brackets will always be OP_KETRPOS, which
920        returns MATCH_KETRPOS without going further in the pattern. By this means
921        we can handle the group by iteration rather than recursion, thereby
922        reducing the amount of stack needed. */
923    
924        case OP_CBRAPOS:
925        case OP_SCBRAPOS:
926        allow_zero = FALSE;
927    
928        POSSESSIVE_CAPTURE:
929        number = GET2(ecode, 1+LINK_SIZE);
930        offset = number << 1;
931    
932    #ifdef PCRE_DEBUG
933        printf("start possessive bracket %d\n", number);
934        printf("subject=");
935        pchars(eptr, 16, TRUE, md);
936        printf("\n");
937    #endif
938    
939        if (offset < md->offset_max)
940          {
941          matched_once = FALSE;
942          code_offset = ecode - md->start_code;
943    
944          save_offset1 = md->offset_vector[offset];
945          save_offset2 = md->offset_vector[offset+1];
946          save_offset3 = md->offset_vector[md->offset_end - number];
947          save_capture_last = md->capture_last;
948    
949          DPRINTF(("saving %d %d %d\n", save_offset1, save_offset2, save_offset3));
950    
951          /* Each time round the loop, save the current subject position for use
952          when the group matches. For MATCH_MATCH, the group has matched, so we
953          restart it with a new subject starting position, remembering that we had
954          at least one match. For MATCH_NOMATCH, carry on with the alternatives, as
955          usual. If we haven't matched any alternatives in any iteration, check to
956          see if a previous iteration matched. If so, the group has matched;
957          continue from afterwards. Otherwise it has failed; restore the previous
958          capture values before returning NOMATCH. */
959    
960          for (;;)
961            {
962            md->offset_vector[md->offset_end - number] =
963              (int)(eptr - md->start_subject);
964            if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
965            RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
966              eptrb, RM63);
967            if (rrc == MATCH_KETRPOS)
968              {
969              offset_top = md->end_offset_top;
970              eptr = md->end_match_ptr;
971              ecode = md->start_code + code_offset;
972              save_capture_last = md->capture_last;
973              matched_once = TRUE;
974              continue;
975              }
976            if (rrc != MATCH_NOMATCH &&
977                (rrc != MATCH_THEN || md->start_match_ptr != ecode))
978              RRETURN(rrc);
979            md->capture_last = save_capture_last;
980            ecode += GET(ecode, 1);
981            if (*ecode != OP_ALT) break;
982          }          }
983    
984          if (!matched_once)
985            {
986            md->offset_vector[offset] = save_offset1;
987            md->offset_vector[offset+1] = save_offset2;
988            md->offset_vector[md->offset_end - number] = save_offset3;
989            }
990    
991          if (rrc != MATCH_THEN) md->mark = markptr;
992          if (allow_zero || matched_once)
993            {
994            ecode += 1 + LINK_SIZE;
995            break;
996            }
997    
998          RRETURN(MATCH_NOMATCH);
999          }
1000    
1001        /* FALL THROUGH ... Insufficient room for saving captured contents. Treat
1002        as a non-capturing bracket. */
1003    
1004        /* For non-final alternatives, continue the loop for a NOMATCH result;      /* VVVVVVVVVVVVVVVVVVVVVVVVV */
1005        otherwise return. */      /* VVVVVVVVVVVVVVVVVVVVVVVVV */
1006    
1007        DPRINTF(("insufficient capture room: treat as non-capturing\n"));
1008    
1009        /* VVVVVVVVVVVVVVVVVVVVVVVVV */
1010        /* VVVVVVVVVVVVVVVVVVVVVVVVV */
1011    
1012        /* Non-capturing possessive bracket with unlimited repeat. We come here
1013        from BRAZERO with allow_zero = TRUE. The code is similar to the above,
1014        without the capturing complication. It is written out separately for speed
1015        and cleanliness. */
1016    
1017        case OP_BRAPOS:
1018        case OP_SBRAPOS:
1019        allow_zero = FALSE;
1020    
1021        POSSESSIVE_NON_CAPTURE:
1022        matched_once = FALSE;
1023        code_offset = ecode - md->start_code;
1024    
1025        RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md, ims,      for (;;)
1026          eptrb, flags, RM2);        {
1027        if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);        if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
1028          RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
1029            eptrb, RM64);
1030          if (rrc == MATCH_KETRPOS)
1031            {
1032            eptr = md->end_match_ptr;
1033            ecode = md->start_code + code_offset;
1034            matched_once = TRUE;
1035            continue;
1036            }
1037          if (rrc != MATCH_NOMATCH &&
1038              (rrc != MATCH_THEN || md->start_match_ptr != ecode))
1039            RRETURN(rrc);
1040        ecode += GET(ecode, 1);        ecode += GET(ecode, 1);
1041          if (*ecode != OP_ALT) break;
1042        }        }
1043    
1044        if (matched_once || allow_zero)
1045          {
1046          ecode += 1 + LINK_SIZE;
1047          break;
1048          }
1049        RRETURN(MATCH_NOMATCH);
1050    
1051      /* Control never reaches here. */      /* Control never reaches here. */
1052    
1053      /* Conditional group: compilation checked that there are no more than      /* Conditional group: compilation checked that there are no more than
# Line 807  for (;;) Line 1058  for (;;)
1058    
1059      case OP_COND:      case OP_COND:
1060      case OP_SCOND:      case OP_SCOND:
1061      codelink= GET(ecode, 1);      codelink = GET(ecode, 1);
1062    
1063      /* Because of the way auto-callout works during compile, a callout item is      /* Because of the way auto-callout works during compile, a callout item is
1064      inserted between OP_COND and an assertion condition. */      inserted between OP_COND and an assertion condition. */
# Line 821  for (;;) Line 1072  for (;;)
1072          cb.callout_number   = ecode[LINK_SIZE+2];          cb.callout_number   = ecode[LINK_SIZE+2];
1073          cb.offset_vector    = md->offset_vector;          cb.offset_vector    = md->offset_vector;
1074          cb.subject          = (PCRE_SPTR)md->start_subject;          cb.subject          = (PCRE_SPTR)md->start_subject;
1075          cb.subject_length   = md->end_subject - md->start_subject;          cb.subject_length   = (int)(md->end_subject - md->start_subject);
1076          cb.start_match      = mstart - md->start_subject;          cb.start_match      = (int)(mstart - md->start_subject);
1077          cb.current_position = eptr - md->start_subject;          cb.current_position = (int)(eptr - md->start_subject);
1078          cb.pattern_position = GET(ecode, LINK_SIZE + 3);          cb.pattern_position = GET(ecode, LINK_SIZE + 3);
1079          cb.next_item_length = GET(ecode, 3 + 2*LINK_SIZE);          cb.next_item_length = GET(ecode, 3 + 2*LINK_SIZE);
1080          cb.capture_top      = offset_top/2;          cb.capture_top      = offset_top/2;
1081          cb.capture_last     = md->capture_last;          cb.capture_last     = md->capture_last;
1082          cb.callout_data     = md->callout_data;          cb.callout_data     = md->callout_data;
1083          if ((rrc = (*pcre_callout)(&cb)) > 0) RRETURN(MATCH_NOMATCH);          if ((rrc = (*pcre_callout)(&cb)) > 0) MRRETURN(MATCH_NOMATCH);
1084          if (rrc < 0) RRETURN(rrc);          if (rrc < 0) RRETURN(rrc);
1085          }          }
1086        ecode += _pcre_OP_lengths[OP_CALLOUT];        ecode += _pcre_OP_lengths[OP_CALLOUT];
# Line 982  for (;;) Line 1233  for (;;)
1233        }        }
1234    
1235      /* The condition is an assertion. Call match() to evaluate it - setting      /* The condition is an assertion. Call match() to evaluate it - setting
1236      the final argument match_condassert causes it to stop at the end of an      md->match_function_type to MATCH_CONDASSERT causes it to stop at the end of
1237      assertion. */      an assertion. */
1238    
1239      else      else
1240        {        {
1241        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, NULL,        md->match_function_type = MATCH_CONDASSERT;
1242            match_condassert, RM3);        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM3);
1243        if (rrc == MATCH_MATCH)        if (rrc == MATCH_MATCH)
1244          {          {
1245          condition = TRUE;          condition = TRUE;
1246          ecode += 1 + LINK_SIZE + GET(ecode, LINK_SIZE + 2);          ecode += 1 + LINK_SIZE + GET(ecode, LINK_SIZE + 2);
1247          while (*ecode == OP_ALT) ecode += GET(ecode, 1);          while (*ecode == OP_ALT) ecode += GET(ecode, 1);
1248          }          }
1249        else if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN)        else if (rrc != MATCH_NOMATCH &&
1250                  (rrc != MATCH_THEN || md->start_match_ptr != ecode))
1251          {          {
1252          RRETURN(rrc);         /* Need braces because of following else */          RRETURN(rrc);         /* Need braces because of following else */
1253          }          }
# Line 1008  for (;;) Line 1260  for (;;)
1260    
1261      /* We are now at the branch that is to be obeyed. As there is only one,      /* We are now at the branch that is to be obeyed. As there is only one,
1262      we can use tail recursion to avoid using another stack frame, except when      we can use tail recursion to avoid using another stack frame, except when
1263      match_cbegroup is required for an unlimited repeat of a possibly empty      we have an unlimited repeat of a possibly empty group. If the second
1264      group. If the second alternative doesn't exist, we can just plough on. */      alternative doesn't exist, we can just plough on. */
1265    
1266      if (condition || *ecode == OP_ALT)      if (condition || *ecode == OP_ALT)
1267        {        {
1268        ecode += 1 + LINK_SIZE;        ecode += 1 + LINK_SIZE;
1269        if (op == OP_SCOND)        /* Possibly empty group */        if (op == OP_SCOND)        /* Possibly empty group */
1270          {          {
1271          RMATCH(eptr, ecode, offset_top, md, ims, eptrb, match_cbegroup, RM49);          md->match_function_type = MATCH_CBEGROUP;
1272            RMATCH(eptr, ecode, offset_top, md, eptrb, RM49);
1273          RRETURN(rrc);          RRETURN(rrc);
1274          }          }
1275        else                       /* Group must match something */        else goto TAIL_RECURSE;
         {  
         flags = 0;  
         goto TAIL_RECURSE;  
         }  
1276        }        }
1277      else                         /* Condition false & no alternative */      else                         /* Condition false & no alternative */
1278        {        {
# Line 1049  for (;;) Line 1298  for (;;)
1298        {        {
1299        md->offset_vector[offset] =        md->offset_vector[offset] =
1300          md->offset_vector[md->offset_end - number];          md->offset_vector[md->offset_end - number];
1301        md->offset_vector[offset+1] = eptr - md->start_subject;        md->offset_vector[offset+1] = (int)(eptr - md->start_subject);
1302        if (offset_top <= offset) offset_top = offset + 2;        if (offset_top <= offset) offset_top = offset + 2;
1303        }        }
1304      ecode += 3;      ecode += 3;
1305      break;      break;
1306    
1307    
1308      /* End of the pattern, either real or forced. If we are in a top-level      /* End of the pattern, either real or forced. If we are in a recursion, we
1309      recursion, we should restore the offsets appropriately and continue from      should restore the offsets appropriately, and if it's a top-level
1310      after the call. */      recursion, continue from after the call. */
1311    
1312      case OP_ACCEPT:      case OP_ACCEPT:
1313      case OP_END:      case OP_END:
1314      if (md->recursive != NULL && md->recursive->group_num == 0)      if (md->recursive != NULL)
1315        {        {
1316        recursion_info *rec = md->recursive;        recursion_info *rec = md->recursive;
       DPRINTF(("End of pattern in a (?0) recursion\n"));  
1317        md->recursive = rec->prevrec;        md->recursive = rec->prevrec;
1318        memmove(md->offset_vector, rec->offset_save,        memmove(md->offset_vector, rec->offset_save,
1319          rec->saved_max * sizeof(int));          rec->saved_max * sizeof(int));
1320        offset_top = rec->save_offset_top;        offset_top = rec->save_offset_top;
1321        mstart = rec->save_start;        if (rec->group_num == 0)
1322        ims = original_ims;          {
1323        ecode = rec->after_call;          ecode = rec->after_call;
1324        break;          break;
1325            }
1326        }        }
1327    
1328      /* Otherwise, if we have matched an empty string, fail if PCRE_NOTEMPTY is      /* Otherwise, if we have matched an empty string, fail if PCRE_NOTEMPTY is
# Line 1081  for (;;) Line 1330  for (;;)
1330      the subject. In both cases, backtracking will then try other alternatives,      the subject. In both cases, backtracking will then try other alternatives,
1331      if any. */      if any. */
1332    
1333      if (eptr == mstart &&      else if (eptr == mstart &&
1334          (md->notempty ||          (md->notempty ||
1335            (md->notempty_atstart &&            (md->notempty_atstart &&
1336              mstart == md->start_subject + md->start_offset)))              mstart == md->start_subject + md->start_offset)))
1337        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
1338    
1339      /* Otherwise, we have a match. */      /* Otherwise, we have a match. */
1340    
1341      md->end_match_ptr = eptr;           /* Record where we ended */      md->end_match_ptr = eptr;           /* Record where we ended */
1342      md->end_offset_top = offset_top;    /* and how many extracts were taken */      md->end_offset_top = offset_top;    /* and how many extracts were taken */
1343      md->start_match_ptr = mstart;       /* and the start (\K can modify) */      md->start_match_ptr = mstart;       /* and the start (\K can modify) */
     RRETURN(MATCH_MATCH);  
1344    
1345      /* Change option settings */      /* For some reason, the macros don't work properly if an expression is
1346        given as the argument to MRRETURN when the heap is in use. */
1347    
1348      case OP_OPT:      rrc = (op == OP_END)? MATCH_MATCH : MATCH_ACCEPT;
1349      ims = ecode[1];      MRRETURN(rrc);
     ecode += 2;  
     DPRINTF(("ims set to %02lx\n", ims));  
     break;  
1350    
1351      /* Assertion brackets. Check the alternative branches in turn - the      /* Assertion brackets. Check the alternative branches in turn - the
1352      matching won't pass the KET for an assertion. If any one branch matches,      matching won't pass the KET for an assertion. If any one branch matches,
1353      the assertion is true. Lookbehind assertions have an OP_REVERSE item at the      the assertion is true. Lookbehind assertions have an OP_REVERSE item at the
1354      start of each branch to move the current point backwards, so the code at      start of each branch to move the current point backwards, so the code at
1355      this level is identical to the lookahead case. */      this level is identical to the lookahead case. When the assertion is part
1356        of a condition, we want to return immediately afterwards. The caller of
1357        this incarnation of the match() function will have set MATCH_CONDASSERT in
1358        md->match_function type, and one of these opcodes will be the first opcode
1359        that is processed. We use a local variable that is preserved over calls to
1360        match() to remember this case. */
1361    
1362      case OP_ASSERT:      case OP_ASSERT:
1363      case OP_ASSERTBACK:      case OP_ASSERTBACK:
1364        if (md->match_function_type == MATCH_CONDASSERT)
1365          {
1366          condassert = TRUE;
1367          md->match_function_type = 0;
1368          }
1369        else condassert = FALSE;
1370    
1371      do      do
1372        {        {
1373        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, NULL, 0,        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM4);
1374          RM4);        if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)
1375        if (rrc == MATCH_MATCH) break;          {
1376        if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);          mstart = md->start_match_ptr;   /* In case \K reset it */
1377            break;
1378            }
1379          if (rrc != MATCH_NOMATCH &&
1380              (rrc != MATCH_THEN || md->start_match_ptr != ecode))
1381            RRETURN(rrc);
1382        ecode += GET(ecode, 1);        ecode += GET(ecode, 1);
1383        }        }
1384      while (*ecode == OP_ALT);      while (*ecode == OP_ALT);
1385      if (*ecode == OP_KET) RRETURN(MATCH_NOMATCH);  
1386        if (*ecode == OP_KET) MRRETURN(MATCH_NOMATCH);
1387    
1388      /* If checking an assertion for a condition, return MATCH_MATCH. */      /* If checking an assertion for a condition, return MATCH_MATCH. */
1389    
1390      if ((flags & match_condassert) != 0) RRETURN(MATCH_MATCH);      if (condassert) RRETURN(MATCH_MATCH);
1391    
1392      /* Continue from after the assertion, updating the offsets high water      /* Continue from after the assertion, updating the offsets high water
1393      mark, since extracts may have been taken during the assertion. */      mark, since extracts may have been taken during the assertion. */
# Line 1134  for (;;) Line 1398  for (;;)
1398      continue;      continue;
1399    
1400      /* Negative assertion: all branches must fail to match. Encountering SKIP,      /* Negative assertion: all branches must fail to match. Encountering SKIP,
1401      PRUNE, or COMMIT means we must assume failure without checking subsequent      PRUNE, or COMMIT means we must assume failure without checking subsequent
1402      branches. */      branches. */
1403    
1404      case OP_ASSERT_NOT:      case OP_ASSERT_NOT:
1405      case OP_ASSERTBACK_NOT:      case OP_ASSERTBACK_NOT:
1406        if (md->match_function_type == MATCH_CONDASSERT)
1407          {
1408          condassert = TRUE;
1409          md->match_function_type = 0;
1410          }
1411        else condassert = FALSE;
1412    
1413      do      do
1414        {        {
1415        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, NULL, 0,        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM5);
1416          RM5);        if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) MRRETURN(MATCH_NOMATCH);
       if (rrc == MATCH_MATCH) RRETURN(MATCH_NOMATCH);  
1417        if (rrc == MATCH_SKIP || rrc == MATCH_PRUNE || rrc == MATCH_COMMIT)        if (rrc == MATCH_SKIP || rrc == MATCH_PRUNE || rrc == MATCH_COMMIT)
1418          {          {
1419          do ecode += GET(ecode,1); while (*ecode == OP_ALT);          do ecode += GET(ecode,1); while (*ecode == OP_ALT);
1420          break;          break;
1421          }          }
1422        if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);        if (rrc != MATCH_NOMATCH &&
1423              (rrc != MATCH_THEN || md->start_match_ptr != ecode))
1424            RRETURN(rrc);
1425        ecode += GET(ecode,1);        ecode += GET(ecode,1);
1426        }        }
1427      while (*ecode == OP_ALT);      while (*ecode == OP_ALT);
1428    
1429      if ((flags & match_condassert) != 0) RRETURN(MATCH_MATCH);      if (condassert) RRETURN(MATCH_MATCH);  /* Condition assertion */
1430    
1431      ecode += 1 + LINK_SIZE;      ecode += 1 + LINK_SIZE;
1432      continue;      continue;
1433    
# Line 1172  for (;;) Line 1444  for (;;)
1444        while (i-- > 0)        while (i-- > 0)
1445          {          {
1446          eptr--;          eptr--;
1447          if (eptr < md->start_subject) RRETURN(MATCH_NOMATCH);          if (eptr < md->start_subject) MRRETURN(MATCH_NOMATCH);
1448          BACKCHAR(eptr);          BACKCHAR(eptr);
1449          }          }
1450        }        }
# Line 1183  for (;;) Line 1455  for (;;)
1455    
1456        {        {
1457        eptr -= GET(ecode, 1);        eptr -= GET(ecode, 1);
1458        if (eptr < md->start_subject) RRETURN(MATCH_NOMATCH);        if (eptr < md->start_subject) MRRETURN(MATCH_NOMATCH);
1459        }        }
1460    
1461      /* Save the earliest consulted character, then skip to next op code */      /* Save the earliest consulted character, then skip to next op code */
# Line 1204  for (;;) Line 1476  for (;;)
1476        cb.callout_number   = ecode[1];        cb.callout_number   = ecode[1];
1477        cb.offset_vector    = md->offset_vector;        cb.offset_vector    = md->offset_vector;
1478        cb.subject          = (PCRE_SPTR)md->start_subject;        cb.subject          = (PCRE_SPTR)md->start_subject;
1479        cb.subject_length   = md->end_subject - md->start_subject;        cb.subject_length   = (int)(md->end_subject - md->start_subject);
1480        cb.start_match      = mstart - md->start_subject;        cb.start_match      = (int)(mstart - md->start_subject);
1481        cb.current_position = eptr - md->start_subject;        cb.current_position = (int)(eptr - md->start_subject);
1482        cb.pattern_position = GET(ecode, 2);        cb.pattern_position = GET(ecode, 2);
1483        cb.next_item_length = GET(ecode, 2 + LINK_SIZE);        cb.next_item_length = GET(ecode, 2 + LINK_SIZE);
1484        cb.capture_top      = offset_top/2;        cb.capture_top      = offset_top/2;
1485        cb.capture_last     = md->capture_last;        cb.capture_last     = md->capture_last;
1486        cb.callout_data     = md->callout_data;        cb.callout_data     = md->callout_data;
1487        if ((rrc = (*pcre_callout)(&cb)) > 0) RRETURN(MATCH_NOMATCH);        if ((rrc = (*pcre_callout)(&cb)) > 0) MRRETURN(MATCH_NOMATCH);
1488        if (rrc < 0) RRETURN(rrc);        if (rrc < 0) RRETURN(rrc);
1489        }        }
1490      ecode += 2 + 2*LINK_SIZE;      ecode += 2 + 2*LINK_SIZE;
# Line 1267  for (;;) Line 1539  for (;;)
1539    
1540        memcpy(new_recursive.offset_save, md->offset_vector,        memcpy(new_recursive.offset_save, md->offset_vector,
1541              new_recursive.saved_max * sizeof(int));              new_recursive.saved_max * sizeof(int));
       new_recursive.save_start = mstart;  
1542        new_recursive.save_offset_top = offset_top;        new_recursive.save_offset_top = offset_top;
1543        mstart = eptr;  
   
1544        /* OK, now we can do the recursion. For each top-level alternative we        /* OK, now we can do the recursion. For each top-level alternative we
1545        restore the offset and recursion data. */        restore the offset and recursion data. */
1546    
1547        DPRINTF(("Recursing into group %d\n", new_recursive.group_num));        DPRINTF(("Recursing into group %d\n", new_recursive.group_num));
1548        flags = (*callpat >= OP_SBRA)? match_cbegroup : 0;        cbegroup = (*callpat >= OP_SBRA);
1549        do        do
1550          {          {
1551            if (cbegroup) md->match_function_type = MATCH_CBEGROUP;
1552          RMATCH(eptr, callpat + _pcre_OP_lengths[*callpat], offset_top,          RMATCH(eptr, callpat + _pcre_OP_lengths[*callpat], offset_top,
1553            md, ims, eptrb, flags, RM6);            md, eptrb, RM6);
1554          if (rrc == MATCH_MATCH)          if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)
1555            {            {
1556            DPRINTF(("Recursion matched\n"));            DPRINTF(("Recursion matched\n"));
1557            md->recursive = new_recursive.prevrec;            md->recursive = new_recursive.prevrec;
1558            if (new_recursive.offset_save != stacksave)            if (new_recursive.offset_save != stacksave)
1559              (pcre_free)(new_recursive.offset_save);              (pcre_free)(new_recursive.offset_save);
1560            RRETURN(MATCH_MATCH);            MRRETURN(MATCH_MATCH);
1561            }            }
1562          else if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN)          else if (rrc != MATCH_NOMATCH &&
1563                    (rrc != MATCH_THEN || md->start_match_ptr != ecode))
1564            {            {
1565            DPRINTF(("Recursion gave error %d\n", rrc));            DPRINTF(("Recursion gave error %d\n", rrc));
1566            if (new_recursive.offset_save != stacksave)            if (new_recursive.offset_save != stacksave)
# Line 1307  for (;;) Line 1579  for (;;)
1579        md->recursive = new_recursive.prevrec;        md->recursive = new_recursive.prevrec;
1580        if (new_recursive.offset_save != stacksave)        if (new_recursive.offset_save != stacksave)
1581          (pcre_free)(new_recursive.offset_save);          (pcre_free)(new_recursive.offset_save);
1582        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
1583        }        }
1584      /* Control never reaches here */      /* Control never reaches here */
1585    
# Line 1316  for (;;) Line 1588  for (;;)
1588      a move back into the brackets. Friedl calls these "atomic" subpatterns.      a move back into the brackets. Friedl calls these "atomic" subpatterns.
1589      Check the alternative branches in turn - the matching won't pass the KET      Check the alternative branches in turn - the matching won't pass the KET
1590      for this kind of subpattern. If any one branch matches, we carry on as at      for this kind of subpattern. If any one branch matches, we carry on as at
1591      the end of a normal bracket, leaving the subject pointer. */      the end of a normal bracket, leaving the subject pointer, but resetting
1592        the start-of-match value in case it was changed by \K. */
1593    
1594      case OP_ONCE:      case OP_ONCE:
1595      prev = ecode;      prev = ecode;
# Line 1324  for (;;) Line 1597  for (;;)
1597    
1598      do      do
1599        {        {
1600        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, eptrb, 0, RM7);        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM7);
1601        if (rrc == MATCH_MATCH) break;        if (rrc == MATCH_MATCH)  /* Note: _not_ MATCH_ACCEPT */
1602        if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);          {
1603            mstart = md->start_match_ptr;
1604            break;
1605            }
1606          if (rrc != MATCH_NOMATCH &&
1607              (rrc != MATCH_THEN || md->start_match_ptr != ecode))
1608            RRETURN(rrc);
1609        ecode += GET(ecode,1);        ecode += GET(ecode,1);
1610        }        }
1611      while (*ecode == OP_ALT);      while (*ecode == OP_ALT);
# Line 1357  for (;;) Line 1636  for (;;)
1636    
1637      /* 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
1638      preceding bracket, in the appropriate order. The second "call" of match()      preceding bracket, in the appropriate order. The second "call" of match()
1639      uses tail recursion, to avoid using another stack frame. We need to reset      uses tail recursion, to avoid using another stack frame. */
     any options that changed within the bracket before re-running it, so  
     check the next opcode. */  
   
     if (ecode[1+LINK_SIZE] == OP_OPT)  
       {  
       ims = (ims & ~PCRE_IMS) | ecode[4];  
       DPRINTF(("ims set to %02lx at group repeat\n", ims));  
       }  
1640    
1641      if (*ecode == OP_KETRMIN)      if (*ecode == OP_KETRMIN)
1642        {        {
1643        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, eptrb, 0, RM8);        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM8);
1644        if (rrc != MATCH_NOMATCH) RRETURN(rrc);        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1645        ecode = prev;        ecode = prev;
       flags = 0;  
1646        goto TAIL_RECURSE;        goto TAIL_RECURSE;
1647        }        }
1648      else  /* OP_KETRMAX */      else  /* OP_KETRMAX */
1649        {        {
1650        RMATCH(eptr, prev, offset_top, md, ims, eptrb, match_cbegroup, RM9);        md->match_function_type = MATCH_CBEGROUP;
1651          RMATCH(eptr, prev, offset_top, md, eptrb, RM9);
1652        if (rrc != MATCH_NOMATCH) RRETURN(rrc);        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1653        ecode += 1 + LINK_SIZE;        ecode += 1 + LINK_SIZE;
       flags = 0;  
1654        goto TAIL_RECURSE;        goto TAIL_RECURSE;
1655        }        }
1656      /* Control never gets here */      /* Control never gets here */
# Line 1397  for (;;) Line 1667  for (;;)
1667      at all - i.e. it could be ()* or ()? or even (){0} in the pattern. Brackets      at all - i.e. it could be ()* or ()? or even (){0} in the pattern. Brackets
1668      with fixed upper repeat limits are compiled as a number of copies, with the      with fixed upper repeat limits are compiled as a number of copies, with the
1669      optional ones preceded by BRAZERO or BRAMINZERO. */      optional ones preceded by BRAZERO or BRAMINZERO. */
1670    
1671      case OP_BRAZERO:      case OP_BRAZERO:
1672        {      next = ecode + 1;
1673        next = ecode+1;      RMATCH(eptr, next, offset_top, md, eptrb, RM10);
1674        RMATCH(eptr, next, offset_top, md, ims, eptrb, 0, RM10);      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1675        if (rrc != MATCH_NOMATCH) RRETURN(rrc);      do next += GET(next, 1); while (*next == OP_ALT);
1676        do next += GET(next,1); while (*next == OP_ALT);      ecode = next + 1 + LINK_SIZE;
       ecode = next + 1 + LINK_SIZE;  
       }  
1677      break;      break;
1678    
1679      case OP_BRAMINZERO:      case OP_BRAMINZERO:
1680        {      next = ecode + 1;
1681        next = ecode+1;      do next += GET(next, 1); while (*next == OP_ALT);
1682        do next += GET(next, 1); while (*next == OP_ALT);      RMATCH(eptr, next + 1+LINK_SIZE, offset_top, md, eptrb, RM11);
1683        RMATCH(eptr, next + 1+LINK_SIZE, offset_top, md, ims, eptrb, 0, RM11);      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1684        if (rrc != MATCH_NOMATCH) RRETURN(rrc);      ecode++;
       ecode++;  
       }  
1685      break;      break;
1686    
1687      case OP_SKIPZERO:      case OP_SKIPZERO:
1688        {      next = ecode+1;
1689        next = ecode+1;      do next += GET(next,1); while (*next == OP_ALT);
1690        do next += GET(next,1); while (*next == OP_ALT);      ecode = next + 1 + LINK_SIZE;
       ecode = next + 1 + LINK_SIZE;  
       }  
1691      break;      break;
1692    
1693        /* BRAPOSZERO occurs before a possessive bracket group. Don't do anything
1694        here; just jump to the group, with allow_zero set TRUE. */
1695    
1696        case OP_BRAPOSZERO:
1697        op = *(++ecode);
1698        allow_zero = TRUE;
1699        if (op == OP_CBRAPOS || op == OP_SCBRAPOS) goto POSSESSIVE_CAPTURE;
1700          goto POSSESSIVE_NON_CAPTURE;
1701    
1702      /* End of a group, repeated or non-repeating. */      /* End of a group, repeated or non-repeating. */
1703    
1704      case OP_KET:      case OP_KET:
1705      case OP_KETRMIN:      case OP_KETRMIN:
1706      case OP_KETRMAX:      case OP_KETRMAX:
1707        case OP_KETRPOS:
1708      prev = ecode - GET(ecode, 1);      prev = ecode - GET(ecode, 1);
1709    
1710      /* If this was a group that remembered the subject start, in order to break      /* If this was a group that remembered the subject start, in order to break
# Line 1444  for (;;) Line 1718  for (;;)
1718        }        }
1719      else saved_eptr = NULL;      else saved_eptr = NULL;
1720    
1721      /* If we are at the end of an assertion group, stop matching and return      /* If we are at the end of an assertion group or an atomic group, stop
1722      MATCH_MATCH, but record the current high water mark for use by positive      matching and return MATCH_MATCH, but record the current high water mark for
1723      assertions. Do this also for the "once" (atomic) groups. */      use by positive assertions. We also need to record the match start in case
1724        it was changed by \K. */
1725    
1726      if (*prev == OP_ASSERT || *prev == OP_ASSERT_NOT ||      if (*prev == OP_ASSERT || *prev == OP_ASSERT_NOT ||
1727          *prev == OP_ASSERTBACK || *prev == OP_ASSERTBACK_NOT ||          *prev == OP_ASSERTBACK || *prev == OP_ASSERTBACK_NOT ||
# Line 1454  for (;;) Line 1729  for (;;)
1729        {        {
1730        md->end_match_ptr = eptr;      /* For ONCE */        md->end_match_ptr = eptr;      /* For ONCE */
1731        md->end_offset_top = offset_top;        md->end_offset_top = offset_top;
1732        RRETURN(MATCH_MATCH);        md->start_match_ptr = mstart;
1733          MRRETURN(MATCH_MATCH);
1734        }        }
1735    
1736      /* For capturing groups we have to check the group number back at the start      /* For capturing groups we have to check the group number back at the start
# Line 1463  for (;;) Line 1739  for (;;)
1739      a recurse into group 0, so it won't be picked up here. Instead, we catch it      a recurse into group 0, so it won't be picked up here. Instead, we catch it
1740      when the OP_END is reached. Other recursion is handled here. */      when the OP_END is reached. Other recursion is handled here. */
1741    
1742      if (*prev == OP_CBRA || *prev == OP_SCBRA)      if (*prev == OP_CBRA || *prev == OP_SCBRA ||
1743            *prev == OP_CBRAPOS || *prev == OP_SCBRAPOS)
1744        {        {
1745        number = GET2(prev, 1+LINK_SIZE);        number = GET2(prev, 1+LINK_SIZE);
1746        offset = number << 1;        offset = number << 1;
# Line 1478  for (;;) Line 1755  for (;;)
1755          {          {
1756          md->offset_vector[offset] =          md->offset_vector[offset] =
1757            md->offset_vector[md->offset_end - number];            md->offset_vector[md->offset_end - number];
1758          md->offset_vector[offset+1] = eptr - md->start_subject;          md->offset_vector[offset+1] = (int)(eptr - md->start_subject);
1759          if (offset_top <= offset) offset_top = offset + 2;          if (offset_top <= offset) offset_top = offset + 2;
1760          }          }
1761    
# Line 1490  for (;;) Line 1767  for (;;)
1767          recursion_info *rec = md->recursive;          recursion_info *rec = md->recursive;
1768          DPRINTF(("Recursion (%d) succeeded - continuing\n", number));          DPRINTF(("Recursion (%d) succeeded - continuing\n", number));
1769          md->recursive = rec->prevrec;          md->recursive = rec->prevrec;
         mstart = rec->save_start;  
1770          memcpy(md->offset_vector, rec->offset_save,          memcpy(md->offset_vector, rec->offset_save,
1771            rec->saved_max * sizeof(int));            rec->saved_max * sizeof(int));
1772          offset_top = rec->save_offset_top;          offset_top = rec->save_offset_top;
1773          ecode = rec->after_call;          ecode = rec->after_call;
         ims = original_ims;  
1774          break;          break;
1775          }          }
1776        }        }
1777    
     /* For both capturing and non-capturing groups, reset the value of the ims  
     flags, in case they got changed during the group. */  
   
     ims = original_ims;  
     DPRINTF(("ims reset to %02lx\n", ims));  
   
1778      /* For a non-repeating ket, just continue at this level. This also      /* For a non-repeating ket, just continue at this level. This also
1779      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.
1780      This is the forcible breaking of infinite loops as implemented in Perl      This is the forcible breaking of infinite loops as implemented in Perl
# Line 1517  for (;;) Line 1786  for (;;)
1786        ecode += 1 + LINK_SIZE;        ecode += 1 + LINK_SIZE;
1787        break;        break;
1788        }        }
1789    
1790      /* The repeating kets try the rest of the pattern or restart from the      /* OP_KETRPOS is a possessive repeating ket. Remember the current position,
1791      preceding bracket, in the appropriate order. In the second case, we can use      and return the MATCH_KETRPOS. This makes it possible to do the repeats one
1792      tail recursion to avoid using another stack frame, unless we have an      at a time from the outer level, thus saving stack. */
1793    
1794        if (*ecode == OP_KETRPOS)
1795          {
1796          md->end_match_ptr = eptr;
1797          md->end_offset_top = offset_top;
1798          RRETURN(MATCH_KETRPOS);
1799          }
1800    
1801        /* The normal repeating kets try the rest of the pattern or restart from
1802        the preceding bracket, in the appropriate order. In the second case, we can
1803        use tail recursion to avoid using another stack frame, unless we have an
1804      unlimited repeat of a group that can match an empty string. */      unlimited repeat of a group that can match an empty string. */
1805    
     flags = (*prev >= OP_SBRA)? match_cbegroup : 0;  
   
1806      if (*ecode == OP_KETRMIN)      if (*ecode == OP_KETRMIN)
1807        {        {
1808        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, eptrb, 0, RM12);        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM12);
1809        if (rrc != MATCH_NOMATCH) RRETURN(rrc);        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1810        if (flags != 0)    /* Could match an empty string */        if (*prev >= OP_SBRA)    /* Could match an empty string */
1811          {          {
1812          RMATCH(eptr, prev, offset_top, md, ims, eptrb, flags, RM50);          md->match_function_type = MATCH_CBEGROUP;
1813            RMATCH(eptr, prev, offset_top, md, eptrb, RM50);
1814          RRETURN(rrc);          RRETURN(rrc);
1815          }          }
1816        ecode = prev;        ecode = prev;
# Line 1539  for (;;) Line 1818  for (;;)
1818        }        }
1819      else  /* OP_KETRMAX */      else  /* OP_KETRMAX */
1820        {        {
1821        RMATCH(eptr, prev, offset_top, md, ims, eptrb, flags, RM13);        if (*prev >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
1822          RMATCH(eptr, prev, offset_top, md, eptrb, RM13);
1823        if (rrc != MATCH_NOMATCH) RRETURN(rrc);        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1824        ecode += 1 + LINK_SIZE;        ecode += 1 + LINK_SIZE;
       flags = 0;  
1825        goto TAIL_RECURSE;        goto TAIL_RECURSE;
1826        }        }
1827      /* Control never gets here */      /* Control never gets here */
1828    
1829      /* Start of subject unless notbol, or after internal newline if multiline */      /* Not multiline mode: start of subject assertion, unless notbol. */
1830    
1831      case OP_CIRC:      case OP_CIRC:
1832      if (md->notbol && eptr == md->start_subject) RRETURN(MATCH_NOMATCH);      if (md->notbol && eptr == md->start_subject) MRRETURN(MATCH_NOMATCH);
1833      if ((ims & PCRE_MULTILINE) != 0)  
       {  
       if (eptr != md->start_subject &&  
           (eptr == md->end_subject || !WAS_NEWLINE(eptr)))  
         RRETURN(MATCH_NOMATCH);  
       ecode++;  
       break;  
       }  
     /* ... else fall through */  
   
1834      /* Start of subject assertion */      /* Start of subject assertion */
1835    
1836      case OP_SOD:      case OP_SOD:
1837      if (eptr != md->start_subject) RRETURN(MATCH_NOMATCH);      if (eptr != md->start_subject) MRRETURN(MATCH_NOMATCH);
1838        ecode++;
1839        break;
1840    
1841        /* Multiline mode: start of subject unless notbol, or after any newline. */
1842    
1843        case OP_CIRCM:
1844        if (md->notbol && eptr == md->start_subject) MRRETURN(MATCH_NOMATCH);
1845        if (eptr != md->start_subject &&
1846            (eptr == md->end_subject || !WAS_NEWLINE(eptr)))
1847          MRRETURN(MATCH_NOMATCH);
1848      ecode++;      ecode++;
1849      break;      break;
1850    
1851      /* Start of match assertion */      /* Start of match assertion */
1852    
1853      case OP_SOM:      case OP_SOM:
1854      if (eptr != md->start_subject + md->start_offset) RRETURN(MATCH_NOMATCH);      if (eptr != md->start_subject + md->start_offset) MRRETURN(MATCH_NOMATCH);
1855      ecode++;      ecode++;
1856      break;      break;
1857    
# Line 1582  for (;;) Line 1862  for (;;)
1862      ecode++;      ecode++;
1863      break;      break;
1864    
1865      /* Assert before internal newline if multiline, or before a terminating      /* Multiline mode: assert before any newline, or before end of subject
1866      newline unless endonly is set, else end of subject unless noteol is set. */      unless noteol is set. */
1867    
1868      case OP_DOLL:      case OP_DOLLM:
1869      if ((ims & PCRE_MULTILINE) != 0)      if (eptr < md->end_subject)
1870        {        { if (!IS_NEWLINE(eptr)) MRRETURN(MATCH_NOMATCH); }
       if (eptr < md->end_subject)  
         { if (!IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH); }  
       else  
         { if (md->noteol) RRETURN(MATCH_NOMATCH); }  
       ecode++;  
       break;  
       }  
1871      else      else
1872        {        {
1873        if (md->noteol) RRETURN(MATCH_NOMATCH);        if (md->noteol) MRRETURN(MATCH_NOMATCH);
1874        if (!md->endonly)        SCHECK_PARTIAL();
         {  
         if (eptr != md->end_subject &&  
             (!IS_NEWLINE(eptr) || eptr != md->end_subject - md->nllen))  
           RRETURN(MATCH_NOMATCH);  
         ecode++;  
         break;  
         }  
1875        }        }
1876        ecode++;
1877        break;
1878    
1879        /* Not multiline mode: assert before a terminating newline or before end of
1880        subject unless noteol is set. */
1881    
1882        case OP_DOLL:
1883        if (md->noteol) MRRETURN(MATCH_NOMATCH);
1884        if (!md->endonly) goto ASSERT_NL_OR_EOS;
1885    
1886      /* ... else fall through for endonly */      /* ... else fall through for endonly */
1887    
1888      /* End of subject assertion (\z) */      /* End of subject assertion (\z) */
1889    
1890      case OP_EOD:      case OP_EOD:
1891      if (eptr < md->end_subject) RRETURN(MATCH_NOMATCH);      if (eptr < md->end_subject) MRRETURN(MATCH_NOMATCH);
1892        SCHECK_PARTIAL();
1893      ecode++;      ecode++;
1894      break;      break;
1895    
1896      /* End of subject or ending \n assertion (\Z) */      /* End of subject or ending \n assertion (\Z) */
1897    
1898      case OP_EODN:      case OP_EODN:
1899      if (eptr != md->end_subject &&      ASSERT_NL_OR_EOS:
1900        if (eptr < md->end_subject &&
1901          (!IS_NEWLINE(eptr) || eptr != md->end_subject - md->nllen))          (!IS_NEWLINE(eptr) || eptr != md->end_subject - md->nllen))
1902        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
1903    
1904        /* Either at end of string or \n before end. */
1905    
1906        SCHECK_PARTIAL();
1907      ecode++;      ecode++;
1908      break;      break;
1909    
# Line 1639  for (;;) Line 1921  for (;;)
1921  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
1922        if (utf8)        if (utf8)
1923          {          {
1924            /* Get status of previous character */
1925    
1926          if (eptr == md->start_subject) prev_is_word = FALSE; else          if (eptr == md->start_subject) prev_is_word = FALSE; else
1927            {            {
1928            USPTR lastptr = eptr - 1;            USPTR lastptr = eptr - 1;
1929            while((*lastptr & 0xc0) == 0x80) lastptr--;            while((*lastptr & 0xc0) == 0x80) lastptr--;
1930            if (lastptr < md->start_used_ptr) md->start_used_ptr = lastptr;            if (lastptr < md->start_used_ptr) md->start_used_ptr = lastptr;
1931            GETCHAR(c, lastptr);            GETCHAR(c, lastptr);
1932    #ifdef SUPPORT_UCP
1933              if (md->use_ucp)
1934                {
1935                if (c == '_') prev_is_word = TRUE; else
1936                  {
1937                  int cat = UCD_CATEGORY(c);
1938                  prev_is_word = (cat == ucp_L || cat == ucp_N);
1939                  }
1940                }
1941              else
1942    #endif
1943            prev_is_word = c < 256 && (md->ctypes[c] & ctype_word) != 0;            prev_is_word = c < 256 && (md->ctypes[c] & ctype_word) != 0;
1944            }            }
1945    
1946            /* Get status of next character */
1947    
1948          if (eptr >= md->end_subject)          if (eptr >= md->end_subject)
1949            {            {
1950            SCHECK_PARTIAL();            SCHECK_PARTIAL();
# Line 1655  for (;;) Line 1953  for (;;)
1953          else          else
1954            {            {
1955            GETCHAR(c, eptr);            GETCHAR(c, eptr);
1956    #ifdef SUPPORT_UCP
1957              if (md->use_ucp)
1958                {
1959                if (c == '_') cur_is_word = TRUE; else
1960                  {
1961                  int cat = UCD_CATEGORY(c);
1962                  cur_is_word = (cat == ucp_L || cat == ucp_N);
1963                  }
1964                }
1965              else
1966    #endif
1967            cur_is_word = c < 256 && (md->ctypes[c] & ctype_word) != 0;            cur_is_word = c < 256 && (md->ctypes[c] & ctype_word) != 0;
1968            }            }
1969          }          }
1970        else        else
1971  #endif  #endif
1972    
1973        /* Not in UTF-8 mode */        /* Not in UTF-8 mode, but we may still have PCRE_UCP set, and for
1974          consistency with the behaviour of \w we do use it in this case. */
1975    
1976          {          {
1977            /* Get status of previous character */
1978    
1979          if (eptr == md->start_subject) prev_is_word = FALSE; else          if (eptr == md->start_subject) prev_is_word = FALSE; else
1980            {            {
1981            if (eptr <= md->start_used_ptr) md->start_used_ptr = eptr - 1;            if (eptr <= md->start_used_ptr) md->start_used_ptr = eptr - 1;
1982    #ifdef SUPPORT_UCP
1983              if (md->use_ucp)
1984                {
1985                c = eptr[-1];
1986                if (c == '_') prev_is_word = TRUE; else
1987                  {
1988                  int cat = UCD_CATEGORY(c);
1989                  prev_is_word = (cat == ucp_L || cat == ucp_N);
1990                  }
1991                }
1992              else
1993    #endif
1994            prev_is_word = ((md->ctypes[eptr[-1]] & ctype_word) != 0);            prev_is_word = ((md->ctypes[eptr[-1]] & ctype_word) != 0);
1995            }            }
1996    
1997            /* Get status of next character */
1998    
1999          if (eptr >= md->end_subject)          if (eptr >= md->end_subject)
2000            {            {
2001            SCHECK_PARTIAL();            SCHECK_PARTIAL();
2002            cur_is_word = FALSE;            cur_is_word = FALSE;
2003            }            }
2004          else cur_is_word = ((md->ctypes[*eptr] & ctype_word) != 0);          else
2005    #ifdef SUPPORT_UCP
2006            if (md->use_ucp)
2007              {
2008              c = *eptr;
2009              if (c == '_') cur_is_word = TRUE; else
2010                {
2011                int cat = UCD_CATEGORY(c);
2012                cur_is_word = (cat == ucp_L || cat == ucp_N);
2013                }
2014              }
2015            else
2016    #endif
2017            cur_is_word = ((md->ctypes[*eptr] & ctype_word) != 0);
2018          }          }
2019    
2020        /* Now see if the situation is what we want */        /* Now see if the situation is what we want */
2021    
2022        if ((*ecode++ == OP_WORD_BOUNDARY)?        if ((*ecode++ == OP_WORD_BOUNDARY)?
2023             cur_is_word == prev_is_word : cur_is_word != prev_is_word)             cur_is_word == prev_is_word : cur_is_word != prev_is_word)
2024          RRETURN(MATCH_NOMATCH);          MRRETURN(MATCH_NOMATCH);
2025        }        }
2026      break;      break;
2027    
2028      /* Match a single character type; inline for speed */      /* Match a single character type; inline for speed */
2029    
2030      case OP_ANY:      case OP_ANY:
2031      if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);      if (IS_NEWLINE(eptr)) MRRETURN(MATCH_NOMATCH);
2032      /* Fall through */      /* Fall through */
2033    
2034      case OP_ALLANY:      case OP_ALLANY:
2035      if (eptr++ >= md->end_subject)      if (eptr++ >= md->end_subject)
2036        {        {
2037        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2038        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2039        }        }
2040      if (utf8) while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;      if (utf8) while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
2041      ecode++;      ecode++;
# Line 1708  for (;;) Line 2048  for (;;)
2048      if (eptr++ >= md->end_subject)      if (eptr++ >= md->end_subject)
2049        {        {
2050        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2051        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2052        }        }
2053      ecode++;      ecode++;
2054      break;      break;
# Line 1717  for (;;) Line 2057  for (;;)
2057      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2058        {        {
2059        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2060        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2061        }        }
2062      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2063      if (      if (
# Line 1726  for (;;) Line 2066  for (;;)
2066  #endif  #endif
2067         (md->ctypes[c] & ctype_digit) != 0         (md->ctypes[c] & ctype_digit) != 0
2068         )         )
2069        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2070      ecode++;      ecode++;
2071      break;      break;
2072    
# Line 1734  for (;;) Line 2074  for (;;)
2074      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2075        {        {
2076        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2077        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2078        }        }
2079      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2080      if (      if (
# Line 1743  for (;;) Line 2083  for (;;)
2083  #endif  #endif
2084         (md->ctypes[c] & ctype_digit) == 0         (md->ctypes[c] & ctype_digit) == 0
2085         )         )
2086        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2087      ecode++;      ecode++;
2088      break;      break;
2089    
# Line 1751  for (;;) Line 2091  for (;;)
2091      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2092        {        {
2093        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2094        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2095        }        }
2096      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2097      if (      if (
# Line 1760  for (;;) Line 2100  for (;;)
2100  #endif  #endif
2101         (md->ctypes[c] & ctype_space) != 0         (md->ctypes[c] & ctype_space) != 0
2102         )         )
2103        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2104      ecode++;      ecode++;
2105      break;      break;
2106    
# Line 1768  for (;;) Line 2108  for (;;)
2108      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2109        {        {
2110        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2111        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2112        }        }
2113      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2114      if (      if (
# Line 1777  for (;;) Line 2117  for (;;)
2117  #endif  #endif
2118         (md->ctypes[c] & ctype_space) == 0         (md->ctypes[c] & ctype_space) == 0
2119         )         )
2120        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2121      ecode++;      ecode++;
2122      break;      break;
2123    
# Line 1785  for (;;) Line 2125  for (;;)
2125      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2126        {        {
2127        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2128        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2129        }        }
2130      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2131      if (      if (
# Line 1794  for (;;) Line 2134  for (;;)
2134  #endif  #endif
2135         (md->ctypes[c] & ctype_word) != 0         (md->ctypes[c] & ctype_word) != 0
2136         )         )
2137        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2138      ecode++;      ecode++;
2139      break;      break;
2140    
# Line 1802  for (;;) Line 2142  for (;;)
2142      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2143        {        {
2144        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2145        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2146        }        }
2147      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2148      if (      if (
# Line 1811  for (;;) Line 2151  for (;;)
2151  #endif  #endif
2152         (md->ctypes[c] & ctype_word) == 0         (md->ctypes[c] & ctype_word) == 0
2153         )         )
2154        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2155      ecode++;      ecode++;
2156      break;      break;
2157    
# Line 1819  for (;;) Line 2159  for (;;)
2159      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2160        {        {
2161        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2162        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2163        }        }
2164      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2165      switch(c)      switch(c)
2166        {        {
2167        default: RRETURN(MATCH_NOMATCH);        default: MRRETURN(MATCH_NOMATCH);
2168    
2169        case 0x000d:        case 0x000d:
2170        if (eptr < md->end_subject && *eptr == 0x0a) eptr++;        if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
2171        break;        break;
# Line 1837  for (;;) Line 2178  for (;;)
2178        case 0x0085:        case 0x0085:
2179        case 0x2028:        case 0x2028:
2180        case 0x2029:        case 0x2029:
2181        if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);        if (md->bsr_anycrlf) MRRETURN(MATCH_NOMATCH);
2182        break;        break;
2183        }        }
2184      ecode++;      ecode++;
# Line 1847  for (;;) Line 2188  for (;;)
2188      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2189        {        {
2190        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2191        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2192        }        }
2193      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2194      switch(c)      switch(c)
# Line 1872  for (;;) Line 2213  for (;;)
2213        case 0x202f:    /* NARROW NO-BREAK SPACE */        case 0x202f:    /* NARROW NO-BREAK SPACE */
2214        case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */        case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
2215        case 0x3000:    /* IDEOGRAPHIC SPACE */        case 0x3000:    /* IDEOGRAPHIC SPACE */
2216        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2217        }        }
2218      ecode++;      ecode++;
2219      break;      break;
# Line 1881  for (;;) Line 2222  for (;;)
2222      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2223        {        {
2224        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2225        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2226        }        }
2227      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2228      switch(c)      switch(c)
2229        {        {
2230        default: RRETURN(MATCH_NOMATCH);        default: MRRETURN(MATCH_NOMATCH);
2231        case 0x09:      /* HT */        case 0x09:      /* HT */
2232        case 0x20:      /* SPACE */        case 0x20:      /* SPACE */
2233        case 0xa0:      /* NBSP */        case 0xa0:      /* NBSP */
# Line 1915  for (;;) Line 2256  for (;;)
2256      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2257        {        {
2258        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2259        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2260        }        }
2261      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2262      switch(c)      switch(c)
# Line 1928  for (;;) Line 2269  for (;;)
2269        case 0x85:      /* NEL */        case 0x85:      /* NEL */
2270        case 0x2028:    /* LINE SEPARATOR */        case 0x2028:    /* LINE SEPARATOR */
2271        case 0x2029:    /* PARAGRAPH SEPARATOR */        case 0x2029:    /* PARAGRAPH SEPARATOR */
2272        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2273        }        }
2274      ecode++;      ecode++;
2275      break;      break;
# Line 1937  for (;;) Line 2278  for (;;)
2278      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2279        {        {
2280        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2281        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2282        }        }
2283      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2284      switch(c)      switch(c)
2285        {        {
2286        default: RRETURN(MATCH_NOMATCH);        default: MRRETURN(MATCH_NOMATCH);
2287        case 0x0a:      /* LF */        case 0x0a:      /* LF */
2288        case 0x0b:      /* VT */        case 0x0b:      /* VT */
2289        case 0x0c:      /* FF */        case 0x0c:      /* FF */
# Line 1964  for (;;) Line 2305  for (;;)
2305      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2306        {        {
2307        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2308        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2309        }        }
2310      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2311        {        {
# Line 1973  for (;;) Line 2314  for (;;)
2314        switch(ecode[1])        switch(ecode[1])
2315          {          {
2316          case PT_ANY:          case PT_ANY:
2317          if (op == OP_NOTPROP) RRETURN(MATCH_NOMATCH);          if (op == OP_NOTPROP) MRRETURN(MATCH_NOMATCH);
2318          break;          break;
2319    
2320          case PT_LAMP:          case PT_LAMP:
2321          if ((prop->chartype == ucp_Lu ||          if ((prop->chartype == ucp_Lu ||
2322               prop->chartype == ucp_Ll ||               prop->chartype == ucp_Ll ||
2323               prop->chartype == ucp_Lt) == (op == OP_NOTPROP))               prop->chartype == ucp_Lt) == (op == OP_NOTPROP))
2324            RRETURN(MATCH_NOMATCH);            MRRETURN(MATCH_NOMATCH);
2325           break;          break;
2326    
2327          case PT_GC:          case PT_GC:
2328          if ((ecode[2] != _pcre_ucp_gentype[prop->chartype]) == (op == OP_PROP))          if ((ecode[2] != _pcre_ucp_gentype[prop->chartype]) == (op == OP_PROP))
2329            RRETURN(MATCH_NOMATCH);            MRRETURN(MATCH_NOMATCH);
2330          break;          break;
2331    
2332          case PT_PC:          case PT_PC:
2333          if ((ecode[2] != prop->chartype) == (op == OP_PROP))          if ((ecode[2] != prop->chartype) == (op == OP_PROP))
2334            RRETURN(MATCH_NOMATCH);            MRRETURN(MATCH_NOMATCH);
2335          break;          break;
2336    
2337          case PT_SC:          case PT_SC:
2338          if ((ecode[2] != prop->script) == (op == OP_PROP))          if ((ecode[2] != prop->script) == (op == OP_PROP))
2339            RRETURN(MATCH_NOMATCH);            MRRETURN(MATCH_NOMATCH);
2340            break;
2341    
2342            /* These are specials */
2343    
2344            case PT_ALNUM:
2345            if ((_pcre_ucp_gentype[prop->chartype] == ucp_L ||
2346                 _pcre_ucp_gentype[prop->chartype] == ucp_N) == (op == OP_NOTPROP))
2347              MRRETURN(MATCH_NOMATCH);
2348          break;          break;
2349    
2350            case PT_SPACE:    /* Perl space */
2351            if ((_pcre_ucp_gentype[prop->chartype] == ucp_Z ||
2352                 c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR)
2353                   == (op == OP_NOTPROP))
2354              MRRETURN(MATCH_NOMATCH);
2355            break;
2356    
2357            case PT_PXSPACE:  /* POSIX space */
2358            if ((_pcre_ucp_gentype[prop->chartype] == ucp_Z ||
2359                 c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||
2360                 c == CHAR_FF || c == CHAR_CR)
2361                   == (op == OP_NOTPROP))
2362              MRRETURN(MATCH_NOMATCH);
2363            break;
2364    
2365            case PT_WORD:
2366            if ((_pcre_ucp_gentype[prop->chartype] == ucp_L ||
2367                 _pcre_ucp_gentype[prop->chartype] == ucp_N ||
2368                 c == CHAR_UNDERSCORE) == (op == OP_NOTPROP))
2369              MRRETURN(MATCH_NOMATCH);
2370            break;
2371    
2372            /* This should never occur */
2373    
2374          default:          default:
2375          RRETURN(PCRE_ERROR_INTERNAL);          RRETURN(PCRE_ERROR_INTERNAL);
2376          }          }
# Line 2013  for (;;) Line 2386  for (;;)
2386      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2387        {        {
2388        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2389        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2390        }        }
2391      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2392        {        {
2393        int category = UCD_CATEGORY(c);        int category = UCD_CATEGORY(c);
2394        if (category == ucp_M) RRETURN(MATCH_NOMATCH);        if (category == ucp_M) MRRETURN(MATCH_NOMATCH);
2395        while (eptr < md->end_subject)        while (eptr < md->end_subject)
2396          {          {
2397          int len = 1;          int len = 1;
# Line 2045  for (;;) Line 2418  for (;;)
2418      loops). */      loops). */
2419    
2420      case OP_REF:      case OP_REF:
2421        {      case OP_REFI:
2422        offset = GET2(ecode, 1) << 1;               /* Doubled ref number */      caseless = op == OP_REFI;
2423        ecode += 3;      offset = GET2(ecode, 1) << 1;               /* Doubled ref number */
2424        ecode += 3;
2425    
2426        /* If the reference is unset, there are two possibilities:      /* If the reference is unset, there are two possibilities:
2427    
2428        (a) In the default, Perl-compatible state, set the length to be longer      (a) In the default, Perl-compatible state, set the length negative;
2429        than the amount of subject left; this ensures that every attempt at a      this ensures that every attempt at a match fails. We can't just fail
2430        match fails. We can't just fail here, because of the possibility of      here, because of the possibility of quantifiers with zero minima.
       quantifiers with zero minima.  
2431    
2432        (b) If the JavaScript compatibility flag is set, set the length to zero      (b) If the JavaScript compatibility flag is set, set the length to zero
2433        so that the back reference matches an empty string.      so that the back reference matches an empty string.
2434    
2435        Otherwise, set the length to the length of what was matched by the      Otherwise, set the length to the length of what was matched by the
2436        referenced subpattern. */      referenced subpattern. */
2437    
2438        if (offset >= offset_top || md->offset_vector[offset] < 0)      if (offset >= offset_top || md->offset_vector[offset] < 0)
2439          length = (md->jscript_compat)? 0 : md->end_subject - eptr + 1;        length = (md->jscript_compat)? 0 : -1;
2440        else      else
2441          length = md->offset_vector[offset+1] - md->offset_vector[offset];        length = md->offset_vector[offset+1] - md->offset_vector[offset];
2442    
2443        /* Set up for repetition, or handle the non-repeated case */      /* Set up for repetition, or handle the non-repeated case */
2444    
2445        switch (*ecode)      switch (*ecode)
2446          {        {
2447          case OP_CRSTAR:        case OP_CRSTAR:
2448          case OP_CRMINSTAR:        case OP_CRMINSTAR:
2449          case OP_CRPLUS:        case OP_CRPLUS:
2450          case OP_CRMINPLUS:        case OP_CRMINPLUS:
2451          case OP_CRQUERY:        case OP_CRQUERY:
2452          case OP_CRMINQUERY:        case OP_CRMINQUERY:
2453          c = *ecode++ - OP_CRSTAR;        c = *ecode++ - OP_CRSTAR;
2454          minimize = (c & 1) != 0;        minimize = (c & 1) != 0;
2455          min = rep_min[c];                 /* Pick up values from tables; */        min = rep_min[c];                 /* Pick up values from tables; */
2456          max = rep_max[c];                 /* zero for max => infinity */        max = rep_max[c];                 /* zero for max => infinity */
2457          if (max == 0) max = INT_MAX;        if (max == 0) max = INT_MAX;
2458          break;        break;
   
         case OP_CRRANGE:  
         case OP_CRMINRANGE:  
         minimize = (*ecode == OP_CRMINRANGE);  
         min = GET2(ecode, 1);  
         max = GET2(ecode, 3);  
         if (max == 0) max = INT_MAX;  
         ecode += 5;  
         break;  
2459    
2460          default:               /* No repeat follows */        case OP_CRRANGE:
2461          if (!match_ref(offset, eptr, length, md, ims))        case OP_CRMINRANGE:
2462            {        minimize = (*ecode == OP_CRMINRANGE);
2463            CHECK_PARTIAL();        min = GET2(ecode, 1);
2464            RRETURN(MATCH_NOMATCH);        max = GET2(ecode, 3);
2465            }        if (max == 0) max = INT_MAX;
2466          eptr += length;        ecode += 5;
2467          continue;              /* With the main loop */        break;
2468    
2469          default:               /* No repeat follows */
2470          if ((length = match_ref(offset, eptr, length, md, caseless)) < 0)
2471            {
2472            CHECK_PARTIAL();
2473            MRRETURN(MATCH_NOMATCH);
2474          }          }
2475          eptr += length;
2476          continue;              /* With the main loop */
2477          }
2478    
2479        /* If the length of the reference is zero, just continue with the      /* Handle repeated back references. If the length of the reference is
2480        main loop. */      zero, just continue with the main loop. */
2481    
2482        if (length == 0) continue;      if (length == 0) continue;
2483    
2484        /* First, ensure the minimum number of matches are present. We get back      /* First, ensure the minimum number of matches are present. We get back
2485        the length of the reference string explicitly rather than passing the      the length of the reference string explicitly rather than passing the
2486        address of eptr, so that eptr can be a register variable. */      address of eptr, so that eptr can be a register variable. */
2487    
2488        for (i = 1; i <= min; i++)      for (i = 1; i <= min; i++)
2489          {
2490          int slength;
2491          if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
2492          {          {
2493          if (!match_ref(offset, eptr, length, md, ims))          CHECK_PARTIAL();
2494            {          MRRETURN(MATCH_NOMATCH);
           CHECK_PARTIAL();  
           RRETURN(MATCH_NOMATCH);  
           }  
         eptr += length;  
2495          }          }
2496          eptr += slength;
2497          }
2498    
2499        /* If min = max, continue at the same level without recursion.      /* If min = max, continue at the same level without recursion.
2500        They are not both allowed to be zero. */      They are not both allowed to be zero. */
2501    
2502        if (min == max) continue;      if (min == max) continue;
2503    
2504        /* If minimizing, keep trying and advancing the pointer */      /* If minimizing, keep trying and advancing the pointer */
2505    
2506        if (minimize)      if (minimize)
2507          {
2508          for (fi = min;; fi++)
2509          {          {
2510          for (fi = min;; fi++)          int slength;
2511            RMATCH(eptr, ecode, offset_top, md, eptrb, RM14);
2512            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2513            if (fi >= max) MRRETURN(MATCH_NOMATCH);
2514            if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
2515            {            {
2516            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM14);            CHECK_PARTIAL();
2517            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            MRRETURN(MATCH_NOMATCH);
           if (fi >= max) RRETURN(MATCH_NOMATCH);  
           if (!match_ref(offset, eptr, length, md, ims))  
             {  
             CHECK_PARTIAL();  
             RRETURN(MATCH_NOMATCH);  
             }  
           eptr += length;  
2518            }            }
2519          /* Control never gets here */          eptr += slength;
2520          }          }
2521          /* Control never gets here */
2522          }
2523    
2524        /* If maximizing, find the longest string and work backwards */      /* If maximizing, find the longest string and work backwards */
2525    
2526        else      else
2527          {
2528          pp = eptr;
2529          for (i = min; i < max; i++)
2530          {          {
2531          pp = eptr;          int slength;
2532          for (i = min; i < max; i++)          if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
           {  
           if (!match_ref(offset, eptr, length, md, ims))  
             {  
             CHECK_PARTIAL();  
             break;  
             }  
           eptr += length;  
           }  
         while (eptr >= pp)  
2533            {            {
2534            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM15);            CHECK_PARTIAL();
2535            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            break;
           eptr -= length;  
2536            }            }
2537          RRETURN(MATCH_NOMATCH);          eptr += slength;
2538            }
2539          while (eptr >= pp)
2540            {
2541            RMATCH(eptr, ecode, offset_top, md, eptrb, RM15);
2542            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2543            eptr -= length;
2544          }          }
2545          MRRETURN(MATCH_NOMATCH);
2546        }        }
2547      /* Control never gets here */      /* Control never gets here */
2548    
# Line 2228  for (;;) Line 2603  for (;;)
2603            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
2604              {              {
2605              SCHECK_PARTIAL();              SCHECK_PARTIAL();
2606              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
2607              }              }
2608            GETCHARINC(c, eptr);            GETCHARINC(c, eptr);
2609            if (c > 255)            if (c > 255)
2610              {              {
2611              if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);              if (op == OP_CLASS) MRRETURN(MATCH_NOMATCH);
2612              }              }
2613            else            else
2614              {              {
2615              if ((data[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);              if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);
2616              }              }
2617            }            }
2618          }          }
# Line 2250  for (;;) Line 2625  for (;;)
2625            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
2626              {              {
2627              SCHECK_PARTIAL();              SCHECK_PARTIAL();
2628              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
2629              }              }
2630            c = *eptr++;            c = *eptr++;
2631            if ((data[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);            if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);
2632            }            }
2633          }          }
2634    
# Line 2273  for (;;) Line 2648  for (;;)
2648            {            {
2649            for (fi = min;; fi++)            for (fi = min;; fi++)
2650              {              {
2651              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM16);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM16);
2652              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2653              if (fi >= max) RRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
2654              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
2655                {                {
2656                SCHECK_PARTIAL();                SCHECK_PARTIAL();
2657                RRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
2658                }                }
2659              GETCHARINC(c, eptr);              GETCHARINC(c, eptr);
2660              if (c > 255)              if (c > 255)
2661                {                {
2662                if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);                if (op == OP_CLASS) MRRETURN(MATCH_NOMATCH);
2663                }                }
2664              else              else
2665                {                {
2666                if ((data[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);                if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);
2667                }                }
2668              }              }
2669            }            }
# Line 2298  for (;;) Line 2673  for (;;)
2673            {            {
2674            for (fi = min;; fi++)            for (fi = min;; fi++)
2675              {              {
2676              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM17);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM17);
2677              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2678              if (fi >= max) RRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
2679              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
2680                {                {
2681                SCHECK_PARTIAL();                SCHECK_PARTIAL();
2682                RRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
2683                }                }
2684              c = *eptr++;              c = *eptr++;
2685              if ((data[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);              if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);
2686              }              }
2687            }            }
2688          /* Control never gets here */          /* Control never gets here */
# Line 2344  for (;;) Line 2719  for (;;)
2719              }              }
2720            for (;;)            for (;;)
2721              {              {
2722              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM18);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM18);
2723              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2724              if (eptr-- == pp) break;        /* Stop if tried at original pos */              if (eptr-- == pp) break;        /* Stop if tried at original pos */
2725              BACKCHAR(eptr);              BACKCHAR(eptr);
# Line 2367  for (;;) Line 2742  for (;;)
2742              }              }
2743            while (eptr >= pp)            while (eptr >= pp)
2744              {              {
2745              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM19);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM19);
2746              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2747              eptr--;              eptr--;
2748              }              }
2749            }            }
2750    
2751          RRETURN(MATCH_NOMATCH);          MRRETURN(MATCH_NOMATCH);
2752          }          }
2753        }        }
2754      /* Control never gets here */      /* Control never gets here */
# Line 2425  for (;;) Line 2800  for (;;)
2800          if (eptr >= md->end_subject)          if (eptr >= md->end_subject)
2801            {            {
2802            SCHECK_PARTIAL();            SCHECK_PARTIAL();
2803            RRETURN(MATCH_NOMATCH);            MRRETURN(MATCH_NOMATCH);
2804            }            }
2805          GETCHARINCTEST(c, eptr);          GETCHARINCTEST(c, eptr);
2806          if (!_pcre_xclass(c, data)) RRETURN(MATCH_NOMATCH);          if (!_pcre_xclass(c, data)) MRRETURN(MATCH_NOMATCH);
2807          }          }
2808    
2809        /* If max == min we can continue with the main loop without the        /* If max == min we can continue with the main loop without the
# Line 2443  for (;;) Line 2818  for (;;)
2818          {          {
2819          for (fi = min;; fi++)          for (fi = min;; fi++)
2820            {            {
2821            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM20);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM20);
2822            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2823            if (fi >= max) RRETURN(MATCH_NOMATCH);            if (fi >= max) MRRETURN(MATCH_NOMATCH);
2824            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
2825              {              {
2826              SCHECK_PARTIAL();              SCHECK_PARTIAL();
2827              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
2828              }              }
2829            GETCHARINCTEST(c, eptr);            GETCHARINCTEST(c, eptr);
2830            if (!_pcre_xclass(c, data)) RRETURN(MATCH_NOMATCH);            if (!_pcre_xclass(c, data)) MRRETURN(MATCH_NOMATCH);
2831            }            }
2832          /* Control never gets here */          /* Control never gets here */
2833          }          }
# Line 2476  for (;;) Line 2851  for (;;)
2851            }            }
2852          for(;;)          for(;;)
2853            {            {
2854            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM21);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM21);
2855            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2856            if (eptr-- == pp) break;        /* Stop if tried at original pos */            if (eptr-- == pp) break;        /* Stop if tried at original pos */
2857            if (utf8) BACKCHAR(eptr);            if (utf8) BACKCHAR(eptr);
2858            }            }
2859          RRETURN(MATCH_NOMATCH);          MRRETURN(MATCH_NOMATCH);
2860          }          }
2861    
2862        /* Control never gets here */        /* Control never gets here */
# Line 2500  for (;;) Line 2875  for (;;)
2875        if (length > md->end_subject - eptr)        if (length > md->end_subject - eptr)
2876          {          {
2877          CHECK_PARTIAL();             /* Not SCHECK_PARTIAL() */          CHECK_PARTIAL();             /* Not SCHECK_PARTIAL() */
2878          RRETURN(MATCH_NOMATCH);          MRRETURN(MATCH_NOMATCH);
2879          }          }
2880        while (length-- > 0) if (*ecode++ != *eptr++) RRETURN(MATCH_NOMATCH);        while (length-- > 0) if (*ecode++ != *eptr++) MRRETURN(MATCH_NOMATCH);
2881        }        }
2882      else      else
2883  #endif  #endif
# Line 2512  for (;;) Line 2887  for (;;)
2887        if (md->end_subject - eptr < 1)        if (md->end_subject - eptr < 1)
2888          {          {
2889          SCHECK_PARTIAL();            /* This one can use SCHECK_PARTIAL() */          SCHECK_PARTIAL();            /* This one can use SCHECK_PARTIAL() */
2890          RRETURN(MATCH_NOMATCH);          MRRETURN(MATCH_NOMATCH);
2891          }          }
2892        if (ecode[1] != *eptr++) RRETURN(MATCH_NOMATCH);        if (ecode[1] != *eptr++) MRRETURN(MATCH_NOMATCH);
2893        ecode += 2;        ecode += 2;
2894        }        }
2895      break;      break;
2896    
2897      /* Match a single character, caselessly */      /* Match a single character, caselessly */
2898    
2899      case OP_CHARNC:      case OP_CHARI:
2900  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
2901      if (utf8)      if (utf8)
2902        {        {
# Line 2532  for (;;) Line 2907  for (;;)
2907        if (length > md->end_subject - eptr)        if (length > md->end_subject - eptr)
2908          {          {
2909          CHECK_PARTIAL();             /* Not SCHECK_PARTIAL() */          CHECK_PARTIAL();             /* Not SCHECK_PARTIAL() */
2910          RRETURN(MATCH_NOMATCH);          MRRETURN(MATCH_NOMATCH);
2911          }          }
2912    
2913        /* If the pattern character's value is < 128, we have only one byte, and        /* If the pattern character's value is < 128, we have only one byte, and
# Line 2540  for (;;) Line 2915  for (;;)
2915    
2916        if (fc < 128)        if (fc < 128)
2917          {          {
2918          if (md->lcc[*ecode++] != md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH);          if (md->lcc[*ecode++] != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);
2919          }          }
2920    
2921        /* Otherwise we must pick up the subject character */        /* Otherwise we must pick up the subject character */
# Line 2559  for (;;) Line 2934  for (;;)
2934  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2935            if (dc != UCD_OTHERCASE(fc))            if (dc != UCD_OTHERCASE(fc))
2936  #endif  #endif
2937              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
2938            }            }
2939          }          }
2940        }        }
# Line 2571  for (;;) Line 2946  for (;;)
2946        if (md->end_subject - eptr < 1)        if (md->end_subject - eptr < 1)
2947          {          {
2948          SCHECK_PARTIAL();            /* This one can use SCHECK_PARTIAL() */          SCHECK_PARTIAL();            /* This one can use SCHECK_PARTIAL() */
2949          RRETURN(MATCH_NOMATCH);          MRRETURN(MATCH_NOMATCH);
2950          }          }
2951        if (md->lcc[ecode[1]] != md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH);        if (md->lcc[ecode[1]] != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);
2952        ecode += 2;        ecode += 2;
2953        }        }
2954      break;      break;
# Line 2581  for (;;) Line 2956  for (;;)
2956      /* Match a single character repeatedly. */      /* Match a single character repeatedly. */
2957    
2958      case OP_EXACT:      case OP_EXACT:
2959        case OP_EXACTI:
2960      min = max = GET2(ecode, 1);      min = max = GET2(ecode, 1);
2961      ecode += 3;      ecode += 3;
2962      goto REPEATCHAR;      goto REPEATCHAR;
2963    
2964      case OP_POSUPTO:      case OP_POSUPTO:
2965        case OP_POSUPTOI:
2966      possessive = TRUE;      possessive = TRUE;
2967      /* Fall through */      /* Fall through */
2968    
2969      case OP_UPTO:      case OP_UPTO:
2970        case OP_UPTOI:
2971      case OP_MINUPTO:      case OP_MINUPTO:
2972        case OP_MINUPTOI:
2973      min = 0;      min = 0;
2974      max = GET2(ecode, 1);      max = GET2(ecode, 1);
2975      minimize = *ecode == OP_MINUPTO;      minimize = *ecode == OP_MINUPTO || *ecode == OP_MINUPTOI;
2976      ecode += 3;      ecode += 3;
2977      goto REPEATCHAR;      goto REPEATCHAR;
2978    
2979      case OP_POSSTAR:      case OP_POSSTAR:
2980        case OP_POSSTARI:
2981      possessive = TRUE;      possessive = TRUE;
2982      min = 0;      min = 0;
2983      max = INT_MAX;      max = INT_MAX;
# Line 2605  for (;;) Line 2985  for (;;)
2985      goto REPEATCHAR;      goto REPEATCHAR;
2986    
2987      case OP_POSPLUS:      case OP_POSPLUS:
2988        case OP_POSPLUSI:
2989      possessive = TRUE;      possessive = TRUE;
2990      min = 1;      min = 1;
2991      max = INT_MAX;      max = INT_MAX;
# Line 2612  for (;;) Line 2993  for (;;)
2993      goto REPEATCHAR;      goto REPEATCHAR;
2994    
2995      case OP_POSQUERY:      case OP_POSQUERY:
2996        case OP_POSQUERYI:
2997      possessive = TRUE;      possessive = TRUE;
2998      min = 0;      min = 0;
2999      max = 1;      max = 1;
# Line 2619  for (;;) Line 3001  for (;;)
3001      goto REPEATCHAR;      goto REPEATCHAR;
3002    
3003      case OP_STAR:      case OP_STAR:
3004        case OP_STARI:
3005      case OP_MINSTAR:      case OP_MINSTAR:
3006        case OP_MINSTARI:
3007      case OP_PLUS:      case OP_PLUS:
3008        case OP_PLUSI:
3009      case OP_MINPLUS:      case OP_MINPLUS:
3010        case OP_MINPLUSI:
3011      case OP_QUERY:      case OP_QUERY:
3012        case OP_QUERYI:
3013      case OP_MINQUERY:      case OP_MINQUERY:
3014      c = *ecode++ - OP_STAR;      case OP_MINQUERYI:
3015        c = *ecode++ - ((op < OP_STARI)? OP_STAR : OP_STARI);
3016      minimize = (c & 1) != 0;      minimize = (c & 1) != 0;
   
3017      min = rep_min[c];                 /* Pick up values from tables; */      min = rep_min[c];                 /* Pick up values from tables; */
3018      max = rep_max[c];                 /* zero for max => infinity */      max = rep_max[c];                 /* zero for max => infinity */
3019      if (max == 0) max = INT_MAX;      if (max == 0) max = INT_MAX;
# Line 2649  for (;;) Line 3036  for (;;)
3036          {          {
3037  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3038          unsigned int othercase;          unsigned int othercase;
3039          if ((ims & PCRE_CASELESS) != 0 &&          if (op >= OP_STARI &&     /* Caseless */
3040              (othercase = UCD_OTHERCASE(fc)) != fc)              (othercase = UCD_OTHERCASE(fc)) != fc)
3041            oclength = _pcre_ord2utf8(othercase, occhars);            oclength = _pcre_ord2utf8(othercase, occhars);
3042          else oclength = 0;          else oclength = 0;
# Line 2667  for (;;) Line 3054  for (;;)
3054            else            else
3055              {              {
3056              CHECK_PARTIAL();              CHECK_PARTIAL();
3057              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
3058              }              }
3059            }            }
3060    
# Line 2677  for (;;) Line 3064  for (;;)
3064            {            {
3065            for (fi = min;; fi++)            for (fi = min;; fi++)
3066              {              {
3067              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM22);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM22);
3068              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3069              if (fi >= max) RRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
3070              if (eptr <= md->end_subject - length &&              if (eptr <= md->end_subject - length &&
3071                memcmp(eptr, charptr, length) == 0) eptr += length;                memcmp(eptr, charptr, length) == 0) eptr += length;
3072  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
# Line 2690  for (;;) Line 3077  for (;;)
3077              else              else
3078                {                {
3079                CHECK_PARTIAL();                CHECK_PARTIAL();
3080                RRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3081                }                }
3082              }              }
3083            /* Control never gets here */            /* Control never gets here */
# Line 2719  for (;;) Line 3106  for (;;)
3106    
3107            for(;;)            for(;;)
3108              {              {
3109              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM23);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM23);
3110              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3111              if (eptr == pp) { RRETURN(MATCH_NOMATCH); }              if (eptr == pp) { MRRETURN(MATCH_NOMATCH); }
3112  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3113              eptr--;              eptr--;
3114              BACKCHAR(eptr);              BACKCHAR(eptr);
# Line 2756  for (;;) Line 3143  for (;;)
3143      DPRINTF(("matching %c{%d,%d} against subject %.*s\n", fc, min, max,      DPRINTF(("matching %c{%d,%d} against subject %.*s\n", fc, min, max,
3144        max, eptr));        max, eptr));
3145    
3146      if ((ims & PCRE_CASELESS) != 0)      if (op >= OP_STARI)  /* Caseless */
3147        {        {
3148        fc = md->lcc[fc];        fc = md->lcc[fc];
3149        for (i = 1; i <= min; i++)        for (i = 1; i <= min; i++)
# Line 2764  for (;;) Line 3151  for (;;)
3151          if (eptr >= md->end_subject)          if (eptr >= md->end_subject)
3152            {            {
3153            SCHECK_PARTIAL();            SCHECK_PARTIAL();
3154            RRETURN(MATCH_NOMATCH);            MRRETURN(MATCH_NOMATCH);
3155            }            }
3156          if (fc != md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH);          if (fc != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);
3157          }          }
3158        if (min == max) continue;        if (min == max) continue;
3159        if (minimize)        if (minimize)
3160          {          {
3161          for (fi = min;; fi++)          for (fi = min;; fi++)
3162            {            {
3163            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM24);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM24);
3164            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3165            if (fi >= max) RRETURN(MATCH_NOMATCH);            if (fi >= max) MRRETURN(MATCH_NOMATCH);
3166            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3167              {              {
3168              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3169              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
3170              }              }
3171            if (fc != md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH);            if (fc != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);
3172            }            }
3173          /* Control never gets here */          /* Control never gets here */
3174          }          }
# Line 2803  for (;;) Line 3190  for (;;)
3190    
3191          while (eptr >= pp)          while (eptr >= pp)
3192            {            {
3193            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM25);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM25);
3194            eptr--;            eptr--;
3195            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3196            }            }
3197          RRETURN(MATCH_NOMATCH);          MRRETURN(MATCH_NOMATCH);
3198          }          }
3199        /* Control never gets here */        /* Control never gets here */
3200        }        }
# Line 2821  for (;;) Line 3208  for (;;)
3208          if (eptr >= md->end_subject)          if (eptr >= md->end_subject)
3209            {            {
3210            SCHECK_PARTIAL();            SCHECK_PARTIAL();
3211            RRETURN(MATCH_NOMATCH);            MRRETURN(MATCH_NOMATCH);
3212            }            }
3213          if (fc != *eptr++) RRETURN(MATCH_NOMATCH);          if (fc != *eptr++) MRRETURN(MATCH_NOMATCH);
3214          }          }
3215    
3216        if (min == max) continue;        if (min == max) continue;
# Line 2832  for (;;) Line 3219  for (;;)
3219          {          {
3220          for (fi = min;; fi++)          for (fi = min;; fi++)
3221            {            {
3222            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM26);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM26);
3223            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3224            if (fi >= max) RRETURN(MATCH_NOMATCH);            if (fi >= max) MRRETURN(MATCH_NOMATCH);
3225            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3226              {              {
3227              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3228              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
3229              }              }
3230            if (fc != *eptr++) RRETURN(MATCH_NOMATCH);            if (fc != *eptr++) MRRETURN(MATCH_NOMATCH);
3231            }            }
3232          /* Control never gets here */          /* Control never gets here */
3233          }          }
# Line 2861  for (;;) Line 3248  for (;;)
3248    
3249          while (eptr >= pp)          while (eptr >= pp)
3250            {            {
3251            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM27);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM27);
3252            eptr--;            eptr--;
3253            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3254            }            }
3255          RRETURN(MATCH_NOMATCH);          MRRETURN(MATCH_NOMATCH);
3256          }          }
3257        }        }
3258      /* Control never gets here */      /* Control never gets here */
# Line 2874  for (;;) Line 3261  for (;;)
3261      checking can be multibyte. */      checking can be multibyte. */
3262    
3263      case OP_NOT:      case OP_NOT:
3264        case OP_NOTI:
3265      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
3266        {        {
3267        SCHECK_PARTIAL();        SCHECK_PARTIAL();
3268        RRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
3269        }        }
3270      ecode++;      ecode++;
3271      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
3272      if ((ims & PCRE_CASELESS) != 0)      if (op == OP_NOTI)         /* The caseless case */
3273        {        {
3274  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
3275        if (c < 256)        if (c < 256)
3276  #endif  #endif
3277        c = md->lcc[c];        c = md->lcc[c];
3278        if (md->lcc[*ecode++] == c) RRETURN(MATCH_NOMATCH);        if (md->lcc[*ecode++] == c) MRRETURN(MATCH_NOMATCH);
3279        }        }
3280      else      else    /* Caseful */
3281        {        {
3282        if (*ecode++ == c) RRETURN(MATCH_NOMATCH);        if (*ecode++ == c) MRRETURN(MATCH_NOMATCH);
3283        }        }
3284      break;      break;
3285    
# Line 2903  for (;;) Line 3291  for (;;)
3291      about... */      about... */
3292    
3293      case OP_NOTEXACT:      case OP_NOTEXACT:
3294        case OP_NOTEXACTI:
3295      min = max = GET2(ecode, 1);      min = max = GET2(ecode, 1);
3296      ecode += 3;      ecode += 3;
3297      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3298    
3299      case OP_NOTUPTO:      case OP_NOTUPTO:
3300        case OP_NOTUPTOI:
3301      case OP_NOTMINUPTO:      case OP_NOTMINUPTO:
3302        case OP_NOTMINUPTOI:
3303      min = 0;      min = 0;
3304      max = GET2(ecode, 1);      max = GET2(ecode, 1);
3305      minimize = *ecode == OP_NOTMINUPTO;      minimize = *ecode == OP_NOTMINUPTO || *ecode == OP_NOTMINUPTOI;
3306      ecode += 3;      ecode += 3;
3307      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3308    
3309      case OP_NOTPOSSTAR:      case OP_NOTPOSSTAR:
3310        case OP_NOTPOSSTARI:
3311      possessive = TRUE;      possessive = TRUE;
3312      min = 0;      min = 0;
3313      max = INT_MAX;      max = INT_MAX;
# Line 2923  for (;;) Line 3315  for (;;)
3315      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3316    
3317      case OP_NOTPOSPLUS:      case OP_NOTPOSPLUS:
3318        case OP_NOTPOSPLUSI:
3319      possessive = TRUE;      possessive = TRUE;
3320      min = 1;      min = 1;
3321      max = INT_MAX;      max = INT_MAX;
# Line 2930  for (;;) Line 3323  for (;;)
3323      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3324    
3325      case OP_NOTPOSQUERY:      case OP_NOTPOSQUERY:
3326        case OP_NOTPOSQUERYI:
3327      possessive = TRUE;      possessive = TRUE;
3328      min = 0;      min = 0;
3329      max = 1;      max = 1;
# Line 2937  for (;;) Line 3331  for (;;)
3331      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3332    
3333      case OP_NOTPOSUPTO:      case OP_NOTPOSUPTO:
3334        case OP_NOTPOSUPTOI:
3335      possessive = TRUE;      possessive = TRUE;
3336      min = 0;      min = 0;
3337      max = GET2(ecode, 1);      max = GET2(ecode, 1);
# Line 2944  for (;;) Line 3339  for (;;)
3339      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3340    
3341      case OP_NOTSTAR:      case OP_NOTSTAR:
3342        case OP_NOTSTARI:
3343      case OP_NOTMINSTAR:      case OP_NOTMINSTAR:
3344        case OP_NOTMINSTARI:
3345      case OP_NOTPLUS:      case OP_NOTPLUS:
3346        case OP_NOTPLUSI:
3347      case OP_NOTMINPLUS:      case OP_NOTMINPLUS:
3348        case OP_NOTMINPLUSI:
3349      case OP_NOTQUERY:      case OP_NOTQUERY:
3350        case OP_NOTQUERYI:
3351      case OP_NOTMINQUERY:      case OP_NOTMINQUERY:
3352      c = *ecode++ - OP_NOTSTAR;      case OP_NOTMINQUERYI:
3353        c = *ecode++ - ((op >= OP_NOTSTARI)? OP_NOTSTARI: OP_NOTSTAR);
3354      minimize = (c & 1) != 0;      minimize = (c & 1) != 0;
3355      min = rep_min[c];                 /* Pick up values from tables; */      min = rep_min[c];                 /* Pick up values from tables; */
3356      max = rep_max[c];                 /* zero for max => infinity */      max = rep_max[c];                 /* zero for max => infinity */
# Line 2971  for (;;) Line 3372  for (;;)
3372      DPRINTF(("negative matching %c{%d,%d} against subject %.*s\n", fc, min, max,      DPRINTF(("negative matching %c{%d,%d} against subject %.*s\n", fc, min, max,
3373        max, eptr));        max, eptr));
3374    
3375      if ((ims & PCRE_CASELESS) != 0)      if (op >= OP_NOTSTARI)     /* Caseless */
3376        {        {
3377        fc = md->lcc[fc];        fc = md->lcc[fc];
3378    
# Line 2985  for (;;) Line 3386  for (;;)
3386            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3387              {              {
3388              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3389              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
3390              }              }
3391            GETCHARINC(d, eptr);            GETCHARINC(d, eptr);
3392            if (d < 256) d = md->lcc[d];            if (d < 256) d = md->lcc[d];
3393            if (fc == d) RRETURN(MATCH_NOMATCH);            if (fc == d) MRRETURN(MATCH_NOMATCH);
3394            }            }
3395          }          }
3396        else        else
# Line 3002  for (;;) Line 3403  for (;;)
3403            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3404              {              {
3405              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3406              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
3407              }              }
3408            if (fc == md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH);            if (fc == md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);
3409            }            }
3410          }          }
3411    
# Line 3019  for (;;) Line 3420  for (;;)
3420            register unsigned int d;            register unsigned int d;
3421            for (fi = min;; fi++)            for (fi = min;; fi++)
3422              {              {
3423              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM28);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM28);
3424              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3425              if (fi >= max) RRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
3426              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3427                {                {
3428                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3429                RRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3430                }                }
3431              GETCHARINC(d, eptr);              GETCHARINC(d, eptr);
3432              if (d < 256) d = md->lcc[d];              if (d < 256) d = md->lcc[d];
3433              if (fc == d) RRETURN(MATCH_NOMATCH);              if (fc == d) MRRETURN(MATCH_NOMATCH);
3434              }              }
3435            }            }
3436          else          else
# Line 3038  for (;;) Line 3439  for (;;)
3439            {            {
3440            for (fi = min;; fi++)            for (fi = min;; fi++)
3441              {              {
3442              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM29);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM29);
3443              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3444              if (fi >= max) RRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
3445              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3446                {                {
3447                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3448                RRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3449                }                }
3450              if (fc == md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH);              if (fc == md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);
3451              }              }
3452            }            }
3453          /* Control never gets here */          /* Control never gets here */
# Line 3079  for (;;) Line 3480  for (;;)
3480          if (possessive) continue;          if (possessive) continue;
3481          for(;;)          for(;;)
3482              {              {
3483              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM30);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM30);
3484              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3485              if (eptr-- == pp) break;        /* Stop if tried at original pos */              if (eptr-- == pp) break;        /* Stop if tried at original pos */
3486              BACKCHAR(eptr);              BACKCHAR(eptr);
# Line 3102  for (;;) Line 3503  for (;;)
3503            if (possessive) continue;            if (possessive) continue;
3504            while (eptr >= pp)            while (eptr >= pp)
3505              {              {
3506              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM31);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM31);
3507              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3508              eptr--;              eptr--;
3509              }              }
3510            }            }
3511    
3512          RRETURN(MATCH_NOMATCH);          MRRETURN(MATCH_NOMATCH);
3513          }          }
3514        /* Control never gets here */        /* Control never gets here */
3515        }        }
# Line 3127  for (;;) Line 3528  for (;;)
3528            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3529              {              {
3530              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3531              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
3532              }              }
3533            GETCHARINC(d, eptr);            GETCHARINC(d, eptr);
3534            if (fc == d) RRETURN(MATCH_NOMATCH);            if (fc == d) MRRETURN(MATCH_NOMATCH);
3535            }            }
3536          }          }
3537        else        else
# Line 3142  for (;;) Line 3543  for (;;)
3543            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3544              {              {
3545              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3546              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
3547              }              }
3548            if (fc == *eptr++) RRETURN(MATCH_NOMATCH);            if (fc == *eptr++) MRRETURN(MATCH_NOMATCH);
3549            }            }
3550          }          }
3551    
# Line 3159  for (;;) Line 3560  for (;;)
3560            register unsigned int d;            register unsigned int d;
3561            for (fi = min;; fi++)            for (fi = min;; fi++)
3562              {              {
3563              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM32);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM32);
3564              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3565              if (fi >= max) RRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
3566              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3567                {                {
3568                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3569                RRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3570                }                }
3571              GETCHARINC(d, eptr);              GETCHARINC(d, eptr);
3572              if (fc == d) RRETURN(MATCH_NOMATCH);              if (fc == d) MRRETURN(MATCH_NOMATCH);
3573              }              }
3574            }            }
3575          else          else
# Line 3177  for (;;) Line 3578  for (;;)
3578            {            {
3579            for (fi = min;; fi++)            for (fi = min;; fi++)
3580              {              {
3581              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM33);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM33);
3582              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3583              if (fi >= max) RRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
3584              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3585                {                {
3586                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3587                RRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3588                }                }
3589              if (fc == *eptr++) RRETURN(MATCH_NOMATCH);              if (fc == *eptr++) MRRETURN(MATCH_NOMATCH);
3590              }              }
3591            }            }
3592          /* Control never gets here */          /* Control never gets here */
# Line 3217  for (;;) Line 3618  for (;;)
3618            if (possessive) continue;            if (possessive) continue;
3619            for(;;)            for(;;)
3620              {              {
3621              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM34);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM34);
3622              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3623              if (eptr-- == pp) break;        /* Stop if tried at original pos */              if (eptr-- == pp) break;        /* Stop if tried at original pos */
3624              BACKCHAR(eptr);              BACKCHAR(eptr);
# Line 3240  for (;;) Line 3641  for (;;)
3641            if (possessive) continue;            if (possessive) continue;
3642            while (eptr >= pp)            while (eptr >= pp)
3643              {              {
3644              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM35);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM35);
3645              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3646              eptr--;              eptr--;
3647              }              }
3648            }            }
3649    
3650          RRETURN(MATCH_NOMATCH);          MRRETURN(MATCH_NOMATCH);
3651          }          }
3652        }        }
3653      /* Control never gets here */      /* Control never gets here */
# Line 3340  for (;;) Line 3741  for (;;)
3741          switch(prop_type)          switch(prop_type)
3742            {            {
3743            case PT_ANY:            case PT_ANY:
3744            if (prop_fail_result) RRETURN(MATCH_NOMATCH);            if (prop_fail_result) MRRETURN(MATCH_NOMATCH);
3745            for (i = 1; i <= min; i++)            for (i = 1; i <= min; i++)
3746              {              {
3747              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3748                {                {
3749                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3750                RRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3751                }                }
3752              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
3753              }              }
# Line 3358  for (;;) Line 3759  for (;;)
3759              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3760                {                {
3761                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3762                RRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3763                }                }
3764              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
3765              prop_chartype = UCD_CHARTYPE(c);              prop_chartype = UCD_CHARTYPE(c);
3766              if ((prop_chartype == ucp_Lu ||              if ((prop_chartype == ucp_Lu ||
3767                   prop_chartype == ucp_Ll ||                   prop_chartype == ucp_Ll ||
3768                   prop_chartype == ucp_Lt) == prop_fail_result)                   prop_chartype == ucp_Lt) == prop_fail_result)
3769                RRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3770              }              }
3771            break;            break;
3772    
# Line 3375  for (;;) Line 3776  for (;;)
3776              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3777                {                {
3778                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3779                RRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3780                }                }
3781              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
3782              prop_category = UCD_CATEGORY(c);              prop_category = UCD_CATEGORY(c);
3783              if ((prop_category == prop_value) == prop_fail_result)              if ((prop_category == prop_value) == prop_fail_result)
3784                RRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3785              }              }
3786            break;            break;
3787    
# Line 3390  for (;;) Line 3791  for (;;)
3791              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3792                {                {
3793                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3794                RRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3795                }                }
3796              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
3797              prop_chartype = UCD_CHARTYPE(c);              prop_chartype = UCD_CHARTYPE(c);
3798              if ((prop_chartype == prop_value) == prop_fail_result)              if ((prop_chartype == prop_value) == prop_fail_result)
3799                RRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3800              }              }
3801            break;            break;
3802    
# Line 3405  for (;;) Line 3806  for (;;)
3806              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3807                {                {
3808                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3809                RRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3810                }                }
3811              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
3812              prop_script = UCD_SCRIPT(c);              prop_script = UCD_SCRIPT(c);
3813              if ((prop_script == prop_value) == prop_fail_result)              if ((prop_script == prop_value) == prop_fail_result)
3814                RRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3815                }
3816              break;
3817    
3818              case PT_ALNUM:
3819              for (i = 1; i <= min; i++)
3820                {
3821                if (eptr >= md->end_subject)
3822                  {
3823                  SCHECK_PARTIAL();
3824                  MRRETURN(MATCH_NOMATCH);
3825                  }
3826                GETCHARINCTEST(c, eptr);
3827                prop_category = UCD_CATEGORY(c);
3828                if ((prop_category == ucp_L || prop_category == ucp_N)
3829                       == prop_fail_result)
3830                  MRRETURN(MATCH_NOMATCH);
3831                }
3832              break;
3833    
3834              case PT_SPACE:    /* Perl space */
3835              for (i = 1; i <= min; i++)
3836                {
3837                if (eptr >= md->end_subject)
3838                  {
3839                  SCHECK_PARTIAL();
3840                  MRRETURN(MATCH_NOMATCH);
3841                  }
3842                GETCHARINCTEST(c, eptr);
3843                prop_category = UCD_CATEGORY(c);
3844                if ((prop_category == ucp_Z || c == CHAR_HT || c == CHAR_NL ||
3845                     c == CHAR_FF || c == CHAR_CR)
3846                       == prop_fail_result)
3847                  MRRETURN(MATCH_NOMATCH);
3848                }
3849              break;
3850    
3851              case PT_PXSPACE:  /* POSIX space */
3852              for (i = 1; i <= min; i++)
3853                {
3854                if (eptr >= md->end_subject)
3855                  {
3856                  SCHECK_PARTIAL();
3857                  MRRETURN(MATCH_NOMATCH);
3858                  }
3859                GETCHARINCTEST(c, eptr);
3860                prop_category = UCD_CATEGORY(c);
3861                if ((prop_category == ucp_Z || c == CHAR_HT || c == CHAR_NL ||
3862                     c == CHAR_VT || c == CHAR_FF || c == CHAR_CR)
3863                       == prop_fail_result)
3864                  MRRETURN(MATCH_NOMATCH);
3865                }
3866              break;
3867    
3868              case PT_WORD:
3869              for (i = 1; i <= min; i++)
3870                {
3871                if (eptr >= md->end_subject)
3872                  {
3873                  SCHECK_PARTIAL();
3874                  MRRETURN(MATCH_NOMATCH);
3875                  }
3876                GETCHARINCTEST(c, eptr);
3877                prop_category = UCD_CATEGORY(c);
3878                if ((prop_category == ucp_L || prop_category == ucp_N ||
3879                     c == CHAR_UNDERSCORE)
3880                       == prop_fail_result)
3881                  MRRETURN(MATCH_NOMATCH);
3882              }              }
3883            break;            break;
3884    
3885              /* This should not occur */
3886    
3887            default:            default:
3888            RRETURN(PCRE_ERROR_INTERNAL);            RRETURN(PCRE_ERROR_INTERNAL);
3889            }            }
# Line 3429  for (;;) Line 3899  for (;;)
3899            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3900              {              {
3901              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3902              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
3903              }              }
3904            GETCHARINCTEST(c, eptr);            GETCHARINCTEST(c, eptr);
3905            prop_category = UCD_CATEGORY(c);            prop_category = UCD_CATEGORY(c);
3906            if (prop_category == ucp_M) RRETURN(MATCH_NOMATCH);            if (prop_category == ucp_M) MRRETURN(MATCH_NOMATCH);
3907            while (eptr < md->end_subject)            while (eptr < md->end_subject)
3908              {              {
3909              int len = 1;              int len = 1;
# Line 3460  for (;;) Line 3930  for (;;)
3930            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3931              {              {
3932              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3933              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
3934              }              }
3935            if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);            if (IS_NEWLINE(eptr)) MRRETURN(MATCH_NOMATCH);
3936            eptr++;            eptr++;
3937            while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;            while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
3938            }            }
# Line 3474  for (;;) Line 3944  for (;;)
3944            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3945              {              {
3946              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3947              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
3948              }              }
3949            eptr++;            eptr++;
3950            while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;            while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
# Line 3482  for (;;) Line 3952  for (;;)
3952          break;          break;
3953    
3954          case OP_ANYBYTE:          case OP_ANYBYTE:
3955          if (eptr > md->end_subject - min) RRETURN(MATCH_NOMATCH);          if (eptr > md->end_subject - min) MRRETURN(MATCH_NOMATCH);
3956          eptr += min;          eptr += min;
3957          break;          break;
3958    
# Line 3492  for (;;) Line 3962  for (;;)
3962            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3963              {              {
3964              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3965              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
3966              }              }
3967            GETCHARINC(c, eptr);            GETCHARINC(c, eptr);
3968            switch(c)            switch(c)
3969              {              {
3970              default: RRETURN(MATCH_NOMATCH);              default: MRRETURN(MATCH_NOMATCH);
3971    
3972              case 0x000d:              case 0x000d:
3973              if (eptr < md->end_subject && *eptr == 0x0a) eptr++;              if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
3974              break;              break;
# Line 3510  for (;;) Line 3981  for (;;)
3981              case 0x0085:              case 0x0085:
3982              case 0x2028:              case 0x2028:
3983              case 0x2029:              case 0x2029:
3984              if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);              if (md->bsr_anycrlf) MRRETURN(MATCH_NOMATCH);
3985              break;              break;
3986              }              }
3987            }            }
# Line 3522  for (;;) Line 3993  for (;;)
3993            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3994              {              {
3995              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3996              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
3997              }              }
3998            GETCHARINC(c, eptr);            GETCHARINC(c, eptr);
3999            switch(c)            switch(c)
# Line 3547  for (;;) Line 4018  for (;;)
4018              case 0x202f:    /* NARROW NO-BREAK SPACE */              case 0x202f:    /* NARROW NO-BREAK SPACE */
4019              case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */              case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
4020              case 0x3000:    /* IDEOGRAPHIC SPACE */              case 0x3000:    /* IDEOGRAPHIC SPACE */
4021              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
4022              }              }
4023            }            }
4024          break;          break;
# Line 3558  for (;;) Line 4029  for (;;)
4029            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4030              {              {
4031              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4032              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
4033              }              }
4034            GETCHARINC(c, eptr);            GETCHARINC(c, eptr);
4035            switch(c)            switch(c)
4036              {              {
4037              default: RRETURN(MATCH_NOMATCH);              default: MRRETURN(MATCH_NOMATCH);
4038              case 0x09:      /* HT */              case 0x09:      /* HT */
4039              case 0x20:      /* SPACE */              case 0x20:      /* SPACE */
4040              case 0xa0:      /* NBSP */              case 0xa0:      /* NBSP */
# Line 3594  for (;;) Line 4065  for (;;)
4065            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4066              {              {
4067              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4068              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
4069              }              }
4070            GETCHARINC(c, eptr);            GETCHARINC(c, eptr);
4071            switch(c)            switch(c)
# Line 3607  for (;;) Line 4078  for (;;)
4078              case 0x85:      /* NEL */              case 0x85:      /* NEL */
4079              case 0x2028:    /* LINE SEPARATOR */              case 0x2028:    /* LINE SEPARATOR */
4080              case 0x2029:    /* PARAGRAPH SEPARATOR */              case 0x2029:    /* PARAGRAPH SEPARATOR */
4081              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
4082              }              }
4083            }            }
4084          break;          break;
# Line 3618  for (;;) Line 4089  for (;;)
4089            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4090              {              {
4091              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4092              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
4093              }              }
4094            GETCHARINC(c, eptr);            GETCHARINC(c, eptr);
4095            switch(c)            switch(c)
4096              {              {
4097              default: RRETURN(MATCH_NOMATCH);              default: MRRETURN(MATCH_NOMATCH);
4098              case 0x0a:      /* LF */              case 0x0a:      /* LF */
4099              case 0x0b:      /* VT */              case 0x0b:      /* VT */
4100              case 0x0c:      /* FF */              case 0x0c:      /* FF */
# Line 3642  for (;;) Line 4113  for (;;)
4113            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4114              {              {
4115              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4116              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
4117              }              }
4118            GETCHARINC(c, eptr);            GETCHARINC(c, eptr);
4119            if (c < 128 && (md->ctypes[c] & ctype_digit) != 0)            if (c < 128 && (md->ctypes[c] & ctype_digit) != 0)
4120              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
4121            }            }
4122          break;          break;
4123    
# Line 3656  for (;;) Line 4127  for (;;)
4127            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4128              {              {
4129              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4130              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
4131              }              }
4132            if (*eptr >= 128 || (md->ctypes[*eptr++] & ctype_digit) == 0)            if (*eptr >= 128 || (md->ctypes[*eptr++] & ctype_digit) == 0)
4133              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
4134            /* No need to skip more bytes - we know it's a 1-byte character */            /* No need to skip more bytes - we know it's a 1-byte character */
4135            }            }
4136          break;          break;
# Line 3670  for (;;) Line 4141  for (;;)
4141            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4142              {              {
4143              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4144              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
4145              }              }
4146            if (*eptr < 128 && (md->ctypes[*eptr] & ctype_space) != 0)            if (*eptr < 128 && (md->ctypes[*eptr] & ctype_space) != 0)
4147              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
4148            while (++eptr < md->end_subject && (*eptr & 0xc0) == 0x80);            while (++eptr < md->end_subject && (*eptr & 0xc0) == 0x80);
4149            }            }
4150          break;          break;
# Line 3684  for (;;) Line 4155  for (;;)
4155            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4156              {              {
4157              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4158              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
4159              }              }
4160            if (*eptr >= 128 || (md->ctypes[*eptr++] & ctype_space) == 0)            if (*eptr >= 128 || (md->ctypes[*eptr++] & ctype_space) == 0)
4161              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
4162            /* No need to skip more bytes - we know it's a 1-byte character */            /* No need to skip more bytes - we know it's a 1-byte character */
4163            }            }
4164          break;          break;
# Line 3695  for (;;) Line 4166  for (;;)
4166          case OP_NOT_WORDCHAR:          case OP_NOT_WORDCHAR:
4167          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
4168            {            {
4169            if (eptr >= md->end_subject ||            if (eptr >= md->end_subject)
4170               (*eptr < 128 && (md->ctypes[*eptr] & ctype_word) != 0))              {
4171              RRETURN(MATCH_NOMATCH);              SCHECK_PARTIAL();
4172                MRRETURN(MATCH_NOMATCH);
4173                }
4174              if (*eptr < 128 && (md->ctypes[*eptr] & ctype_word) != 0)
4175                MRRETURN(MATCH_NOMATCH);
4176            while (++eptr < md->end_subject && (*eptr & 0xc0) == 0x80);            while (++eptr < md->end_subject && (*eptr & 0xc0) == 0x80);
4177            }            }
4178          break;          break;
# Line 3708  for (;;) Line 4183  for (;;)
4183            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4184              {              {
4185              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4186              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
4187              }              }
4188            if (*eptr >= 128 || (md->ctypes[*eptr++] & ctype_word) == 0)            if (*eptr >= 128 || (md->ctypes[*eptr++] & ctype_word) == 0)
4189              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
4190            /* No need to skip more bytes - we know it's a 1-byte character */            /* No need to skip more bytes - we know it's a 1-byte character */
4191            }            }
4192          break;          break;
# Line 3734  for (;;) Line 4209  for (;;)
4209            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4210              {              {
4211              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4212              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
4213              }              }
4214            if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);            if (IS_NEWLINE(eptr)) MRRETURN(MATCH_NOMATCH);
4215            eptr++;            eptr++;
4216            }            }
4217          break;          break;
# Line 3745  for (;;) Line 4220  for (;;)
4220          if (eptr > md->end_subject - min)          if (eptr > md->end_subject - min)
4221            {            {
4222            SCHECK_PARTIAL();            SCHECK_PARTIAL();
4223            RRETURN(MATCH_NOMATCH);            MRRETURN(MATCH_NOMATCH);
4224            }            }
4225          eptr += min;          eptr += min;
4226          break;          break;
# Line 3754  for (;;) Line 4229  for (;;)
4229          if (eptr > md->end_subject - min)          if (eptr > md->end_subject - min)
4230            {            {
4231            SCHECK_PARTIAL();            SCHECK_PARTIAL();
4232            RRETURN(MATCH_NOMATCH);            MRRETURN(MATCH_NOMATCH);
4233            }            }
4234          eptr += min;          eptr += min;
4235          break;          break;
# Line 3765  for (;;) Line 4240  for (;;)
4240            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4241              {              {
4242              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4243              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
4244              }              }
4245            switch(*eptr++)            switch(*eptr++)
4246              {              {
4247              default: RRETURN(MATCH_NOMATCH);              default: MRRETURN(MATCH_NOMATCH);
4248    
4249              case 0x000d:              case 0x000d:
4250              if (eptr < md->end_subject && *eptr == 0x0a) eptr++;              if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
4251              break;              break;
4252    
4253              case 0x000a:              case 0x000a:
4254              break;              break;
4255    
4256              case 0x000b:              case 0x000b:
4257              case 0x000c:              case 0x000c:
4258              case 0x0085:              case 0x0085:
4259              if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);              if (md->bsr_anycrlf) MRRETURN(MATCH_NOMATCH);
4260              break;              break;
4261              }              }
4262            }            }
# Line 3791  for (;;) Line 4268  for (;;)
4268            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4269              {              {
4270              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4271              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
4272              }              }
4273            switch(*eptr++)            switch(*eptr++)
4274              {              {
# Line 3799  for (;;) Line 4276  for (;;)
4276              case 0x09:      /* HT */              case 0x09:      /* HT */
4277              case 0x20:      /* SPACE */              case 0x20:      /* SPACE */
4278              case 0xa0:      /* NBSP */              case 0xa0:      /* NBSP */
4279              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
4280              }              }
4281            }            }
4282          break;          break;
# Line 3810  for (;;) Line 4287  for (;;)
4287            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4288              {              {
4289              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4290              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
4291              }              }
4292            switch(*eptr++)            switch(*eptr++)
4293              {              {
4294              default: RRETURN(MATCH_NOMATCH);              default: MRRETURN(MATCH_NOMATCH);
4295              case 0x09:      /* HT */              case 0x09:      /* HT */
4296              case 0x20:      /* SPACE */              case 0x20:      /* SPACE */
4297              case 0xa0:      /* NBSP */              case 0xa0:      /* NBSP */
# Line 3829  for (;;) Line 4306  for (;;)
4306            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4307              {              {
4308              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4309              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
4310              }              }
4311            switch(*eptr++)            switch(*eptr++)
4312              {              {
# Line 3839  for (;;) Line 4316  for (;;)
4316              case 0x0c:      /* FF */              case 0x0c:      /* FF */
4317              case 0x0d:      /* CR */              case 0x0d:      /* CR */
4318              case 0x85:      /* NEL */              case 0x85:      /* NEL */
4319              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
4320              }              }
4321            }            }
4322          break;          break;
# Line 3850  for (;;) Line 4327  for (;;)
4327            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4328              {              {
4329              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4330              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
4331              }              }
4332            switch(*eptr++)            switch(*eptr++)
4333              {              {
4334              default: RRETURN(MATCH_NOMATCH);              default: MRRETURN(MATCH_NOMATCH);
4335              case 0x0a:      /* LF */              case 0x0a:      /* LF */
4336              case 0x0b:      /* VT */              case 0x0b:      /* VT */
4337              case 0x0c:      /* FF */              case 0x0c:      /* FF */
# Line 3871  for (;;) Line 4348  for (;;)
4348            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4349              {              {
4350              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4351              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
4352              }              }
4353            if ((md->ctypes[*eptr++] & ctype_digit) != 0) RRETURN(MATCH_NOMATCH);            if ((md->ctypes[*eptr++] & ctype_digit) != 0) MRRETURN(MATCH_NOMATCH);
4354            }            }
4355          break;          break;
4356    
# Line 3883  for (;;) Line 4360  for (;;)
4360            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4361              {              {
4362              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4363              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
4364              }              }
4365            if ((md->ctypes[*eptr++] & ctype_digit) == 0) RRETURN(MATCH_NOMATCH);            if ((md->ctypes[*eptr++] & ctype_digit) == 0) MRRETURN(MATCH_NOMATCH);
4366            }            }
4367          break;          break;
4368    
# Line 3895  for (;;) Line 4372  for (;;)
4372            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4373              {              {
4374              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4375              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
4376              }              }
4377            if ((md->ctypes[*eptr++] & ctype_space) != 0) RRETURN(MATCH_NOMATCH);            if ((md->ctypes[*eptr++] & ctype_space) != 0) MRRETURN(MATCH_NOMATCH);
4378            }            }
4379          break;          break;
4380    
# Line 3907  for (;;) Line 4384  for (;;)
4384            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4385              {              {
4386              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4387              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
4388              }              }
4389            if ((md->ctypes[*eptr++] & ctype_space) == 0) RRETURN(MATCH_NOMATCH);            if ((md->ctypes[*eptr++] & ctype_space) == 0) MRRETURN(MATCH_NOMATCH);
4390            }            }
4391          break;          break;
4392    
# Line 3919  for (;;) Line 4396  for (;;)
4396            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4397              {              {
4398              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4399              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
4400              }              }
4401            if ((md->ctypes[*eptr++] & ctype_word) != 0)            if ((md->ctypes[*eptr++] & ctype_word) != 0)
4402              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
4403            }            }
4404          break;          break;
4405    
# Line 3932  for (;;) Line 4409  for (;;)
4409            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4410              {              {
4411              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4412              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
4413              }              }
4414            if ((md->ctypes[*eptr++] & ctype_word) == 0)            if ((md->ctypes[*eptr++] & ctype_word) == 0)
4415              RRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
4416            }            }
4417          break;          break;
4418    
# Line 3962  for (;;) Line 4439  for (;;)
4439            case PT_ANY:            case PT_ANY:
4440            for (fi = min;; fi++)            for (fi = min;; fi++)
4441              {              {
4442              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM36);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM36);
4443              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4444              if (fi >= max) RRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
4445              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4446                {                {
4447                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4448                RRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
4449                }                }
4450              GETCHARINC(c, eptr);              GETCHARINCTEST(c, eptr);
4451              if (prop_fail_result) RRETURN(MATCH_NOMATCH);              if (prop_fail_result) MRRETURN(MATCH_NOMATCH);
4452              }              }
4453            /* Control never gets here */            /* Control never gets here */
4454    
4455            case PT_LAMP:            case PT_LAMP:
4456            for (fi = min;; fi++)            for (fi = min;; fi++)
4457              {              {
4458              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM37);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM37);
4459              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4460              if (fi >= max) RRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
4461              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4462                {                {
4463                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4464                RRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
4465                }                }
4466              GETCHARINC(c, eptr);              GETCHARINCTEST(c, eptr);
4467              prop_chartype = UCD_CHARTYPE(c);              prop_chartype = UCD_CHARTYPE(c);
4468              if ((prop_chartype == ucp_Lu ||              if ((prop_chartype == ucp_Lu ||
4469                   prop_chartype == ucp_Ll ||                   prop_chartype == ucp_Ll ||
4470                   prop_chartype == ucp_Lt) == prop_fail_result)                   prop_chartype == ucp_Lt) == prop_fail_result)
4471                RRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
4472              }              }
4473            /* Control never gets here */            /* Control never gets here */
4474    
4475            case PT_GC:            case PT_GC:
4476            for (fi = min;; fi++)            for (fi = min;; fi++)
4477              {              {
4478              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM38);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM38);
4479              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4480              if (fi >= max) RRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
4481              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4482                {                {
4483                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4484                RRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
4485                }                }
4486              GETCHARINC(c, eptr);              GETCHARINCTEST(c, eptr);
4487              prop_category = UCD_CATEGORY(c);              prop_category = UCD_CATEGORY(c);
4488              if ((prop_category == prop_value) == prop_fail_result)              if ((prop_category == prop_value) == prop_fail_result)
4489                RRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
4490              }              }
4491            /* Control never gets here */            /* Control never gets here */
4492    
4493            case PT_PC:            case PT_PC:
4494            for (fi = min;; fi++)            for (fi = min;; fi++)
4495              {              {
4496              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM39);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM39);
4497              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4498              if (fi >= max) RRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
4499              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4500                {                {
4501                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4502                RRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
4503                }                }
4504              GETCHARINC(c, eptr);              GETCHARINCTEST(c, eptr);
4505              prop_chartype = UCD_CHARTYPE(c);              prop_chartype = UCD_CHARTYPE(c);
4506              if ((prop_chartype == prop_value) == prop_fail_result)              if ((prop_chartype == prop_value) == prop_fail_result)
4507                RRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
4508              }              }
4509            /* Control never gets here */            /* Control never gets here */
4510    
4511            case PT_SC:            case PT_SC:
4512            for (fi = min;; fi++)            for (fi = min;; fi++)
4513              {              {
4514              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM40);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM40);
4515              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4516              if (fi >= max) RRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
4517              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4518                {                {
4519                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4520                RRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
4521                }                }
4522              GETCHARINC(c, eptr);              GETCHARINCTEST(c, eptr);
4523              prop_script = UCD_SCRIPT(c);              prop_script = UCD_SCRIPT(c);
4524              if ((prop_script == prop_value) == prop_fail_result)              if ((prop_script == prop_value) == prop_fail_result)
4525                RRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
4526                }
4527              /* Control never gets here */
4528    
4529              case PT_ALNUM:
4530              for (fi = min;; fi++)
4531                {
4532                RMATCH(eptr, ecode, offset_top, md, eptrb, RM59);
4533                if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4534                if (fi >= max) MRRETURN(MATCH_NOMATCH);
4535                if (eptr >= md->end_subject)
4536                  {
4537                  SCHECK_PARTIAL();
4538                  MRRETURN(MATCH_NOMATCH);
4539                  }
4540                GETCHARINCTEST(c, eptr);
4541                prop_category = UCD_CATEGORY(c);
4542                if ((prop_category == ucp_L || prop_category == ucp_N)
4543                       == prop_fail_result)
4544                  MRRETURN(MATCH_NOMATCH);
4545                }
4546              /* Control never gets here */
4547    
4548              case PT_SPACE:    /* Perl space */
4549              for (fi = min;; fi++)
4550                {
4551                RMATCH(eptr, ecode, offset_top, md, eptrb, RM60);
4552                if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4553                if (fi >= max) MRRETURN(MATCH_NOMATCH);
4554                if (eptr >= md->end_subject)
4555                  {
4556                  SCHECK_PARTIAL();
4557                  MRRETURN(MATCH_NOMATCH);
4558                  }
4559                GETCHARINCTEST(c, eptr);
4560                prop_category = UCD_CATEGORY(c);
4561                if ((prop_category == ucp_Z || c == CHAR_HT || c == CHAR_NL ||
4562                     c == CHAR_FF || c == CHAR_CR)
4563                       == prop_fail_result)
4564                  MRRETURN(MATCH_NOMATCH);
4565                }
4566              /* Control never gets here */
4567    
4568              case PT_PXSPACE:  /* POSIX space */
4569              for (fi = min;; fi++)
4570                {
4571                RMATCH(eptr, ecode, offset_top, md, eptrb, RM61);
4572                if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4573                if (fi >= max) MRRETURN(MATCH_NOMATCH);
4574                if (eptr >= md->end_subject)
4575                  {
4576                  SCHECK_PARTIAL();
4577                  MRRETURN(MATCH_NOMATCH);
4578                  }
4579                GETCHARINCTEST(c, eptr);
4580                prop_category = UCD_CATEGORY(c);
4581                if ((prop_category == ucp_Z || c == CHAR_HT || c == CHAR_NL ||