/[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 625 by ph10, Wed Jul 20 16:46:19 2011 UTC revision 901 by ph10, Sat Jan 21 15:47:59 2012 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-2011 University of Cambridge             Copyright (c) 1997-2012 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 82  negative to avoid the external error cod Line 82  negative to avoid the external error cod
82  #define MATCH_SKIP_ARG     (-993)  #define MATCH_SKIP_ARG     (-993)
83  #define MATCH_THEN         (-992)  #define MATCH_THEN         (-992)
84    
 /* This is a convenience macro for code that occurs many times. */  
   
 #define MRRETURN(ra) \  
   { \  
   md->mark = markptr; \  
   RRETURN(ra); \  
   }  
   
85  /* 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.
86  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,
87  because the offset vector is always a multiple of 3 long. */  because the offset vector is always a multiple of 3 long. */
# Line 121  Returns: nothing Line 113  Returns: nothing
113  */  */
114    
115  static void  static void
116  pchars(const uschar *p, int length, BOOL is_subject, match_data *md)  pchars(const pcre_uchar *p, int length, BOOL is_subject, match_data *md)
117  {  {
118  unsigned int c;  unsigned int c;
119  if (is_subject && length > md->end_subject - p) length = md->end_subject - p;  if (is_subject && length > md->end_subject - p) length = md->end_subject - p;
# Line 152  Returns: < 0 if not matched, otherw Line 144  Returns: < 0 if not matched, otherw
144  */  */
145    
146  static int  static int
147  match_ref(int offset, register USPTR eptr, int length, match_data *md,  match_ref(int offset, register PCRE_PUCHAR eptr, int length, match_data *md,
148    BOOL caseless)    BOOL caseless)
149  {  {
150  USPTR eptr_start = eptr;  PCRE_PUCHAR eptr_start = eptr;
151  register USPTR p = md->start_subject + md->offset_vector[offset];  register PCRE_PUCHAR p = md->start_subject + md->offset_vector[offset];
152    
153  #ifdef PCRE_DEBUG  #ifdef PCRE_DEBUG
154  if (eptr >= md->end_subject)  if (eptr >= md->end_subject)
# Line 181  ASCII characters. */ Line 173  ASCII characters. */
173    
174  if (caseless)  if (caseless)
175    {    {
176  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
177  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
178    if (md->utf8)    if (md->utf)
179      {      {
180      /* Match characters up to the end of the reference. NOTE: the number of      /* Match characters up to the end of the reference. NOTE: the number of
181      bytes matched may differ, because there are some characters whose upper and      bytes matched may differ, because there are some characters whose upper and
# Line 193  if (caseless) Line 185  if (caseless)
185      the latter. It is important, therefore, to check the length along the      the latter. It is important, therefore, to check the length along the
186      reference, not along the subject (earlier code did this wrong). */      reference, not along the subject (earlier code did this wrong). */
187    
188      USPTR endptr = p + length;      PCRE_PUCHAR endptr = p + length;
189      while (p < endptr)      while (p < endptr)
190        {        {
191        int c, d;        int c, d;
# Line 212  if (caseless) Line 204  if (caseless)
204      {      {
205      if (eptr + length > md->end_subject) return -1;      if (eptr + length > md->end_subject) return -1;
206      while (length-- > 0)      while (length-- > 0)
207        { if (md->lcc[*p++] != md->lcc[*eptr++]) return -1; }        {
208          if (TABLE_GET(*p, md->lcc, *p) != TABLE_GET(*eptr, md->lcc, *eptr)) return -1;
209          p++;
210          eptr++;
211          }
212      }      }
213    }    }
214    
# Line 225  else Line 221  else
221    while (length-- > 0) if (*p++ != *eptr++) return -1;    while (length-- > 0) if (*p++ != *eptr++) return -1;
222    }    }
223    
224  return eptr - eptr_start;  return (int)(eptr - eptr_start);
225  }  }
226    
227    
# Line 277  enum { RM1=1, RM2, RM3, RM4, RM5, RM Line 273  enum { RM1=1, RM2, RM3, RM4, RM5, RM
273         RM31,  RM32, RM33, RM34, RM35, RM36, RM37, RM38, RM39, RM40,         RM31,  RM32, RM33, RM34, RM35, RM36, RM37, RM38, RM39, RM40,
274         RM41,  RM42, RM43, RM44, RM45, RM46, RM47, RM48, RM49, RM50,         RM41,  RM42, RM43, RM44, RM45, RM46, RM47, RM48, RM49, RM50,
275         RM51,  RM52, RM53, RM54, RM55, RM56, RM57, RM58, RM59, RM60,         RM51,  RM52, RM53, RM54, RM55, RM56, RM57, RM58, RM59, RM60,
276         RM61,  RM62, RM63 };         RM61,  RM62, RM63, RM64, RM65, RM66 };
277    
278  /* 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
279  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
# Line 290  actually used in this definition. */ Line 286  actually used in this definition. */
286  #define RMATCH(ra,rb,rc,rd,re,rw) \  #define RMATCH(ra,rb,rc,rd,re,rw) \
287    { \    { \
288    printf("match() called in line %d\n", __LINE__); \    printf("match() called in line %d\n", __LINE__); \
289    rrc = match(ra,rb,mstart,markptr,rc,rd,re,rdepth+1); \    rrc = match(ra,rb,mstart,rc,rd,re,rdepth+1); \
290    printf("to line %d\n", __LINE__); \    printf("to line %d\n", __LINE__); \
291    }    }
292  #define RRETURN(ra) \  #define RRETURN(ra) \
# Line 300  actually used in this definition. */ Line 296  actually used in this definition. */
296    }    }
297  #else  #else
298  #define RMATCH(ra,rb,rc,rd,re,rw) \  #define RMATCH(ra,rb,rc,rd,re,rw) \
299    rrc = match(ra,rb,mstart,markptr,rc,rd,re,rdepth+1)    rrc = match(ra,rb,mstart,rc,rd,re,rdepth+1)
300  #define RRETURN(ra) return ra  #define RRETURN(ra) return ra
301  #endif  #endif
302    
# Line 315  argument of match(), which never changes Line 311  argument of match(), which never changes
311    
312  #define RMATCH(ra,rb,rc,rd,re,rw)\  #define RMATCH(ra,rb,rc,rd,re,rw)\
313    {\    {\
314    heapframe *newframe = (heapframe *)(pcre_stack_malloc)(sizeof(heapframe));\    heapframe *newframe = (heapframe *)(PUBL(stack_malloc))(sizeof(heapframe));\
315    if (newframe == NULL) RRETURN(PCRE_ERROR_NOMEMORY);\    if (newframe == NULL) RRETURN(PCRE_ERROR_NOMEMORY);\
316    frame->Xwhere = rw; \    frame->Xwhere = rw; \
317    newframe->Xeptr = ra;\    newframe->Xeptr = ra;\
318    newframe->Xecode = rb;\    newframe->Xecode = rb;\
319    newframe->Xmstart = mstart;\    newframe->Xmstart = mstart;\
   newframe->Xmarkptr = markptr;\  
320    newframe->Xoffset_top = rc;\    newframe->Xoffset_top = rc;\
321    newframe->Xeptrb = re;\    newframe->Xeptrb = re;\
322    newframe->Xrdepth = frame->Xrdepth + 1;\    newframe->Xrdepth = frame->Xrdepth + 1;\
# Line 337  argument of match(), which never changes Line 332  argument of match(), which never changes
332    {\    {\
333    heapframe *oldframe = frame;\    heapframe *oldframe = frame;\
334    frame = oldframe->Xprevframe;\    frame = oldframe->Xprevframe;\
335    (pcre_stack_free)(oldframe);\    if (oldframe != &frame_zero) (PUBL(stack_free))(oldframe);\
336    if (frame != NULL)\    if (frame != NULL)\
337      {\      {\
338      rrc = ra;\      rrc = ra;\
# Line 354  typedef struct heapframe { Line 349  typedef struct heapframe {
349    
350    /* Function arguments that may change */    /* Function arguments that may change */
351    
352    USPTR Xeptr;    PCRE_PUCHAR Xeptr;
353    const uschar *Xecode;    const pcre_uchar *Xecode;
354    USPTR Xmstart;    PCRE_PUCHAR Xmstart;
   USPTR Xmarkptr;  
355    int Xoffset_top;    int Xoffset_top;
356    eptrblock *Xeptrb;    eptrblock *Xeptrb;
357    unsigned int Xrdepth;    unsigned int Xrdepth;
358    
359    /* Function local variables */    /* Function local variables */
360    
361    USPTR Xcallpat;    PCRE_PUCHAR Xcallpat;
362  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
363    USPTR Xcharptr;    PCRE_PUCHAR Xcharptr;
364  #endif  #endif
365    USPTR Xdata;    PCRE_PUCHAR Xdata;
366    USPTR Xnext;    PCRE_PUCHAR Xnext;
367    USPTR Xpp;    PCRE_PUCHAR Xpp;
368    USPTR Xprev;    PCRE_PUCHAR Xprev;
369    USPTR Xsaved_eptr;    PCRE_PUCHAR Xsaved_eptr;
370    
371    recursion_info Xnew_recursive;    recursion_info Xnew_recursive;
372    
# Line 385  typedef struct heapframe { Line 379  typedef struct heapframe {
379    int Xprop_value;    int Xprop_value;
380    int Xprop_fail_result;    int Xprop_fail_result;
381    int Xoclength;    int Xoclength;
382    uschar Xocchars[8];    pcre_uchar Xocchars[6];
383  #endif  #endif
384    
385    int Xcodelink;    int Xcodelink;
# Line 427  returns a negative (error) response, the Line 421  returns a negative (error) response, the
421  same response. */  same response. */
422    
423  /* These macros pack up tests that are used for partial matching, and which  /* These macros pack up tests that are used for partial matching, and which
424  appears several times in the code. We set the "hit end" flag if the pointer is  appear several times in the code. We set the "hit end" flag if the pointer is
425  at the end of the subject and also past the start of the subject (i.e.  at the end of the subject and also past the start of the subject (i.e.
426  something has been matched). For hard partial matching, we then return  something has been matched). For hard partial matching, we then return
427  immediately. The second one is used when we already know we are past the end of  immediately. The second one is used when we already know we are past the end of
# Line 438  the subject. */ Line 432  the subject. */
432        eptr > md->start_used_ptr) \        eptr > md->start_used_ptr) \
433      { \      { \
434      md->hitend = TRUE; \      md->hitend = TRUE; \
435      if (md->partial > 1) MRRETURN(PCRE_ERROR_PARTIAL); \      if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL); \
436      }      }
437    
438  #define SCHECK_PARTIAL()\  #define SCHECK_PARTIAL()\
439    if (md->partial != 0 && eptr > md->start_used_ptr) \    if (md->partial != 0 && eptr > md->start_used_ptr) \
440      { \      { \
441      md->hitend = TRUE; \      md->hitend = TRUE; \
442      if (md->partial > 1) MRRETURN(PCRE_ERROR_PARTIAL); \      if (md->partial > 1) RRETURN(PCRE_ERROR_PARTIAL); \
443      }      }
444    
445    
446  /* Performance note: It might be tempting to extract commonly used fields from  /* Performance note: It might be tempting to extract commonly used fields from
447  the md structure (e.g. utf8, end_subject) into individual variables to improve  the md structure (e.g. utf, end_subject) into individual variables to improve
448  performance. Tests using gcc on a SPARC disproved this; in the first case, it  performance. Tests using gcc on a SPARC disproved this; in the first case, it
449  made performance worse.  made performance worse.
450    
# Line 459  Arguments: Line 453  Arguments:
453     ecode       pointer to current position in compiled code     ecode       pointer to current position in compiled code
454     mstart      pointer to the current match start position (can be modified     mstart      pointer to the current match start position (can be modified
455                   by encountering \K)                   by encountering \K)
    markptr     pointer to the most recent MARK name, or NULL  
456     offset_top  current top pointer     offset_top  current top pointer
457     md          pointer to "static" info for the match     md          pointer to "static" info for the match
458     eptrb       pointer to chain of blocks containing eptr at start of     eptrb       pointer to chain of blocks containing eptr at start of
# Line 474  Returns: MATCH_MATCH if matched Line 467  Returns: MATCH_MATCH if matched
467  */  */
468    
469  static int  static int
470  match(REGISTER USPTR eptr, REGISTER const uschar *ecode, USPTR mstart,  match(REGISTER PCRE_PUCHAR eptr, REGISTER const pcre_uchar *ecode,
471    const uschar *markptr, int offset_top, match_data *md, eptrblock *eptrb,    PCRE_PUCHAR mstart, int offset_top, match_data *md, eptrblock *eptrb,
472    unsigned int rdepth)    unsigned int rdepth)
473  {  {
474  /* 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,
# Line 485  so they can be ordinary variables in all Line 478  so they can be ordinary variables in all
478  register int  rrc;         /* Returns from recursive calls */  register int  rrc;         /* Returns from recursive calls */
479  register int  i;           /* Used for loops not involving calls to RMATCH() */  register int  i;           /* Used for loops not involving calls to RMATCH() */
480  register unsigned int c;   /* Character values not kept over RMATCH() calls */  register unsigned int c;   /* Character values not kept over RMATCH() calls */
481  register BOOL utf8;        /* Local copy of UTF-8 flag for speed */  register BOOL utf;         /* Local copy of UTF flag for speed */
482    
483  BOOL minimize, possessive; /* Quantifier options */  BOOL minimize, possessive; /* Quantifier options */
484  BOOL caseless;  BOOL caseless;
485  int condcode;  int condcode;
486    
487  /* 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
488  preserved over calls to RMATCH() are part of a "frame" which is obtained from  preserved over calls to RMATCH() are part of a "frame". We set up the top-level
489  heap storage. Set up the top-level frame here; others are obtained from the  frame on the stack here; subsequent instantiations are obtained from the heap
490  heap whenever RMATCH() does a "recursion". See the macro definitions above. */  whenever RMATCH() does a "recursion". See the macro definitions above. Putting
491    the top-level on the stack rather than malloc-ing them all gives a performance
492    boost in many cases where there is not much "recursion". */
493    
494  #ifdef NO_RECURSE  #ifdef NO_RECURSE
495  heapframe *frame = (heapframe *)(pcre_stack_malloc)(sizeof(heapframe));  heapframe frame_zero;
496  if (frame == NULL) RRETURN(PCRE_ERROR_NOMEMORY);  heapframe *frame = &frame_zero;
497  frame->Xprevframe = NULL;            /* Marks the top level */  frame->Xprevframe = NULL;            /* Marks the top level */
498    
499  /* Copy in the original argument variables */  /* Copy in the original argument variables */
# Line 506  frame->Xprevframe = NULL; /* Line 501  frame->Xprevframe = NULL; /*
501  frame->Xeptr = eptr;  frame->Xeptr = eptr;
502  frame->Xecode = ecode;  frame->Xecode = ecode;
503  frame->Xmstart = mstart;  frame->Xmstart = mstart;
 frame->Xmarkptr = markptr;  
504  frame->Xoffset_top = offset_top;  frame->Xoffset_top = offset_top;
505  frame->Xeptrb = eptrb;  frame->Xeptrb = eptrb;
506  frame->Xrdepth = rdepth;  frame->Xrdepth = rdepth;
# Line 520  HEAP_RECURSE: Line 514  HEAP_RECURSE:
514  #define eptr               frame->Xeptr  #define eptr               frame->Xeptr
515  #define ecode              frame->Xecode  #define ecode              frame->Xecode
516  #define mstart             frame->Xmstart  #define mstart             frame->Xmstart
 #define markptr            frame->Xmarkptr  
517  #define offset_top         frame->Xoffset_top  #define offset_top         frame->Xoffset_top
518  #define eptrb              frame->Xeptrb  #define eptrb              frame->Xeptrb
519  #define rdepth             frame->Xrdepth  #define rdepth             frame->Xrdepth
520    
521  /* Ditto for the local variables */  /* Ditto for the local variables */
522    
523  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
524  #define charptr            frame->Xcharptr  #define charptr            frame->Xcharptr
525  #endif  #endif
526  #define callpat            frame->Xcallpat  #define callpat            frame->Xcallpat
# Line 585  declarations can be cut out in a block. Line 578  declarations can be cut out in a block.
578  below are for variables that do not have to be preserved over a recursive call  below are for variables that do not have to be preserved over a recursive call
579  to RMATCH(). */  to RMATCH(). */
580    
581  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
582  const uschar *charptr;  const pcre_uchar *charptr;
583  #endif  #endif
584  const uschar *callpat;  const pcre_uchar *callpat;
585  const uschar *data;  const pcre_uchar *data;
586  const uschar *next;  const pcre_uchar *next;
587  USPTR         pp;  PCRE_PUCHAR       pp;
588  const uschar *prev;  const pcre_uchar *prev;
589  USPTR         saved_eptr;  PCRE_PUCHAR       saved_eptr;
590    
591  recursion_info new_recursive;  recursion_info new_recursive;
592    
# Line 606  int prop_type; Line 599  int prop_type;
599  int prop_value;  int prop_value;
600  int prop_fail_result;  int prop_fail_result;
601  int oclength;  int oclength;
602  uschar occhars[8];  pcre_uchar occhars[6];
603  #endif  #endif
604    
605  int codelink;  int codelink;
# Line 622  int save_offset1, save_offset2, save_off Line 615  int save_offset1, save_offset2, save_off
615  int stacksave[REC_STACK_SAVE_MAX];  int stacksave[REC_STACK_SAVE_MAX];
616    
617  eptrblock newptrb;  eptrblock newptrb;
618    
619    /* There is a special fudge for calling match() in a way that causes it to
620    measure the size of its basic stack frame when the stack is being used for
621    recursion. The second argument (ecode) being NULL triggers this behaviour. It
622    cannot normally ever be NULL. The return is the negated value of the frame
623    size. */
624    
625    if (ecode == NULL)
626      {
627      if (rdepth == 0)
628        return match((PCRE_PUCHAR)&rdepth, NULL, NULL, 0, NULL, NULL, 1);
629      else
630        {
631        int len = (char *)&rdepth - (char *)eptr;
632        return (len > 0)? -len : len;
633        }
634      }
635  #endif     /* NO_RECURSE */  #endif     /* NO_RECURSE */
636    
637  /* To save space on the stack and in the heap frame, I have doubled up on some  /* To save space on the stack and in the heap frame, I have doubled up on some
# Line 634  the alternative names that are used. */ Line 644  the alternative names that are used. */
644  #define code_offset   codelink  #define code_offset   codelink
645  #define condassert    condition  #define condassert    condition
646  #define matched_once  prev_is_word  #define matched_once  prev_is_word
647    #define foc           number
648    #define save_mark     data
649    
650  /* These statements are here to stop the compiler complaining about unitialized  /* These statements are here to stop the compiler complaining about unitialized
651  variables. */  variables. */
# Line 659  defined). However, RMATCH isn't like a f Line 671  defined). However, RMATCH isn't like a f
671  complicated macro. It has to be used in one particular way. This shouldn't,  complicated macro. It has to be used in one particular way. This shouldn't,
672  however, impact performance when true recursion is being used. */  however, impact performance when true recursion is being used. */
673    
674  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
675  utf8 = md->utf8;       /* Local copy of the flag */  utf = md->utf;       /* Local copy of the flag */
676  #else  #else
677  utf8 = FALSE;  utf = FALSE;
678  #endif  #endif
679    
680  /* First check that we haven't called match() too many times, or that we  /* First check that we haven't called match() too many times, or that we
# Line 701  for (;;) Line 713  for (;;)
713    switch(op)    switch(op)
714      {      {
715      case OP_MARK:      case OP_MARK:
716      markptr = ecode + 2;      md->nomatch_mark = ecode + 2;
717      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,      md->mark = NULL;    /* In case previously set by assertion */
718        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top, md,
719        eptrb, RM55);        eptrb, RM55);
720        if ((rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) &&
721             md->mark == NULL) md->mark = ecode + 2;
722    
723      /* A return of MATCH_SKIP_ARG means that matching failed at SKIP with an      /* A return of MATCH_SKIP_ARG means that matching failed at SKIP with an
724      argument, and we must check whether that argument matches this MARK's      argument, and we must check whether that argument matches this MARK's
# Line 712  for (;;) Line 727  for (;;)
727      position and return MATCH_SKIP. Otherwise, pass back the return code      position and return MATCH_SKIP. Otherwise, pass back the return code
728      unaltered. */      unaltered. */
729    
730      if (rrc == MATCH_SKIP_ARG &&      else if (rrc == MATCH_SKIP_ARG &&
731          strcmp((char *)markptr, (char *)(md->start_match_ptr)) == 0)          STRCMP_UC_UC(ecode + 2, md->start_match_ptr) == 0)
732        {        {
733        md->start_match_ptr = eptr;        md->start_match_ptr = eptr;
734        RRETURN(MATCH_SKIP);        RRETURN(MATCH_SKIP);
735        }        }
   
     if (md->mark == NULL) md->mark = markptr;  
736      RRETURN(rrc);      RRETURN(rrc);
737    
738      case OP_FAIL:      case OP_FAIL:
739      MRRETURN(MATCH_NOMATCH);      RRETURN(MATCH_NOMATCH);
740    
741      /* COMMIT overrides PRUNE, SKIP, and THEN */      /* COMMIT overrides PRUNE, SKIP, and THEN */
742    
743      case OP_COMMIT:      case OP_COMMIT:
744      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
745        eptrb, RM52);        eptrb, RM52);
746      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE &&      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE &&
747          rrc != MATCH_SKIP && rrc != MATCH_SKIP_ARG &&          rrc != MATCH_SKIP && rrc != MATCH_SKIP_ARG &&
748          rrc != MATCH_THEN)          rrc != MATCH_THEN)
749        RRETURN(rrc);        RRETURN(rrc);
750      MRRETURN(MATCH_COMMIT);      RRETURN(MATCH_COMMIT);
751    
752      /* PRUNE overrides THEN */      /* PRUNE overrides THEN */
753    
754      case OP_PRUNE:      case OP_PRUNE:
755      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
756        eptrb, RM51);        eptrb, RM51);
757      if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);      if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
758      MRRETURN(MATCH_PRUNE);      RRETURN(MATCH_PRUNE);
759    
760      case OP_PRUNE_ARG:      case OP_PRUNE_ARG:
761      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,      md->nomatch_mark = ecode + 2;
762        md->mark = NULL;    /* In case previously set by assertion */
763        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top, md,
764        eptrb, RM56);        eptrb, RM56);
765        if ((rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) &&
766             md->mark == NULL) md->mark = ecode + 2;
767      if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);      if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
     md->mark = ecode + 2;  
768      RRETURN(MATCH_PRUNE);      RRETURN(MATCH_PRUNE);
769    
770      /* SKIP overrides PRUNE and THEN */      /* SKIP overrides PRUNE and THEN */
771    
772      case OP_SKIP:      case OP_SKIP:
773      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
774        eptrb, RM53);        eptrb, RM53);
775      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE && rrc != MATCH_THEN)      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE && rrc != MATCH_THEN)
776        RRETURN(rrc);        RRETURN(rrc);
777      md->start_match_ptr = eptr;   /* Pass back current position */      md->start_match_ptr = eptr;   /* Pass back current position */
778      MRRETURN(MATCH_SKIP);      RRETURN(MATCH_SKIP);
779    
780        /* Note that, for Perl compatibility, SKIP with an argument does NOT set
781        nomatch_mark. There is a flag that disables this opcode when re-matching a
782        pattern that ended with a SKIP for which there was not a matching MARK. */
783    
784      case OP_SKIP_ARG:      case OP_SKIP_ARG:
785      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,      if (md->ignore_skip_arg)
786          {
787          ecode += PRIV(OP_lengths)[*ecode] + ecode[1];
788          break;
789          }
790        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top, md,
791        eptrb, RM57);        eptrb, RM57);
792      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE && rrc != MATCH_THEN)      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE && rrc != MATCH_THEN)
793        RRETURN(rrc);        RRETURN(rrc);
794    
795      /* Pass back the current skip name by overloading md->start_match_ptr and      /* Pass back the current skip name by overloading md->start_match_ptr and
796      returning the special MATCH_SKIP_ARG return code. This will either be      returning the special MATCH_SKIP_ARG return code. This will either be
797      caught by a matching MARK, or get to the top, where it is treated the same      caught by a matching MARK, or get to the top, where it causes a rematch
798      as PRUNE. */      with the md->ignore_skip_arg flag set. */
799    
800      md->start_match_ptr = ecode + 2;      md->start_match_ptr = ecode + 2;
801      RRETURN(MATCH_SKIP_ARG);      RRETURN(MATCH_SKIP_ARG);
802    
803      /* For THEN (and THEN_ARG) we pass back the address of the bracket or      /* For THEN (and THEN_ARG) we pass back the address of the opcode, so that
804      the alt that is at the start of the current branch. This makes it possible      the branch in which it occurs can be determined. Overload the start of
805      to skip back past alternatives that precede the THEN within the current      match pointer to do this. */
     branch. */  
806    
807      case OP_THEN:      case OP_THEN:
808      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
809        eptrb, RM54);        eptrb, RM54);
810      if (rrc != MATCH_NOMATCH) RRETURN(rrc);      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
811      md->start_match_ptr = ecode - GET(ecode, 1);      md->start_match_ptr = ecode;
812      MRRETURN(MATCH_THEN);      RRETURN(MATCH_THEN);
813    
814      case OP_THEN_ARG:      case OP_THEN_ARG:
815      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1+LINK_SIZE],      md->nomatch_mark = ecode + 2;
816        offset_top, md, eptrb, RM58);      md->mark = NULL;    /* In case previously set by assertion */
817        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top,
818          md, eptrb, RM58);
819        if ((rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) &&
820             md->mark == NULL) md->mark = ecode + 2;
821      if (rrc != MATCH_NOMATCH) RRETURN(rrc);      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
822      md->start_match_ptr = ecode - GET(ecode, 1);      md->start_match_ptr = ecode;
     md->mark = ecode + LINK_SIZE + 2;  
823      RRETURN(MATCH_THEN);      RRETURN(MATCH_THEN);
824    
825        /* Handle an atomic group that does not contain any capturing parentheses.
826        This can be handled like an assertion. Prior to 8.13, all atomic groups
827        were handled this way. In 8.13, the code was changed as below for ONCE, so
828        that backups pass through the group and thereby reset captured values.
829        However, this uses a lot more stack, so in 8.20, atomic groups that do not
830        contain any captures generate OP_ONCE_NC, which can be handled in the old,
831        less stack intensive way.
832    
833        Check the alternative branches in turn - the matching won't pass the KET
834        for this kind of subpattern. If any one branch matches, we carry on as at
835        the end of a normal bracket, leaving the subject pointer, but resetting
836        the start-of-match value in case it was changed by \K. */
837    
838        case OP_ONCE_NC:
839        prev = ecode;
840        saved_eptr = eptr;
841        save_mark = md->mark;
842        do
843          {
844          RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM64);
845          if (rrc == MATCH_MATCH)  /* Note: _not_ MATCH_ACCEPT */
846            {
847            mstart = md->start_match_ptr;
848            break;
849            }
850          if (rrc == MATCH_THEN)
851            {
852            next = ecode + GET(ecode,1);
853            if (md->start_match_ptr < next &&
854                (*ecode == OP_ALT || *next == OP_ALT))
855              rrc = MATCH_NOMATCH;
856            }
857    
858          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
859          ecode += GET(ecode,1);
860          md->mark = save_mark;
861          }
862        while (*ecode == OP_ALT);
863    
864        /* If hit the end of the group (which could be repeated), fail */
865    
866        if (*ecode != OP_ONCE_NC && *ecode != OP_ALT) RRETURN(MATCH_NOMATCH);
867    
868        /* Continue as from after the group, updating the offsets high water
869        mark, since extracts may have been taken. */
870    
871        do ecode += GET(ecode, 1); while (*ecode == OP_ALT);
872    
873        offset_top = md->end_offset_top;
874        eptr = md->end_match_ptr;
875    
876        /* For a non-repeating ket, just continue at this level. This also
877        happens for a repeating ket if no characters were matched in the group.
878        This is the forcible breaking of infinite loops as implemented in Perl
879        5.005. */
880    
881        if (*ecode == OP_KET || eptr == saved_eptr)
882          {
883          ecode += 1+LINK_SIZE;
884          break;
885          }
886    
887        /* The repeating kets try the rest of the pattern or restart from the
888        preceding bracket, in the appropriate order. The second "call" of match()
889        uses tail recursion, to avoid using another stack frame. */
890    
891        if (*ecode == OP_KETRMIN)
892          {
893          RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM65);
894          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
895          ecode = prev;
896          goto TAIL_RECURSE;
897          }
898        else  /* OP_KETRMAX */
899          {
900          md->match_function_type = MATCH_CBEGROUP;
901          RMATCH(eptr, prev, offset_top, md, eptrb, RM66);
902          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
903          ecode += 1 + LINK_SIZE;
904          goto TAIL_RECURSE;
905          }
906        /* Control never gets here */
907    
908      /* Handle a capturing bracket, other than those that are possessive with an      /* Handle a capturing bracket, other than those that are possessive with an
909      unlimited repeat. If there is space in the offset vector, save the current      unlimited repeat. If there is space in the offset vector, save the current
910      subject position in the working slot at the top of the vector. We mustn't      subject position in the working slot at the top of the vector. We mustn't
# Line 827  for (;;) Line 937  for (;;)
937        save_offset2 = md->offset_vector[offset+1];        save_offset2 = md->offset_vector[offset+1];
938        save_offset3 = md->offset_vector[md->offset_end - number];        save_offset3 = md->offset_vector[md->offset_end - number];
939        save_capture_last = md->capture_last;        save_capture_last = md->capture_last;
940          save_mark = md->mark;
941    
942        DPRINTF(("saving %d %d %d\n", save_offset1, save_offset2, save_offset3));        DPRINTF(("saving %d %d %d\n", save_offset1, save_offset2, save_offset3));
943        md->offset_vector[md->offset_end - number] =        md->offset_vector[md->offset_end - number] =
# Line 835  for (;;) Line 946  for (;;)
946        for (;;)        for (;;)
947          {          {
948          if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;          if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
949          RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,          RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
950            eptrb, RM1);            eptrb, RM1);
951          if (rrc == MATCH_ONCE) break;  /* Backing up through an atomic group */          if (rrc == MATCH_ONCE) break;  /* Backing up through an atomic group */
952          if (rrc != MATCH_NOMATCH &&  
953              (rrc != MATCH_THEN || md->start_match_ptr != ecode))          /* If we backed up to a THEN, check whether it is within the current
954            RRETURN(rrc);          branch by comparing the address of the THEN that is passed back with
955            the end of the branch. If it is within the current branch, and the
956            branch is one of two or more alternatives (it either starts or ends
957            with OP_ALT), we have reached the limit of THEN's action, so convert
958            the return code to NOMATCH, which will cause normal backtracking to
959            happen from now on. Otherwise, THEN is passed back to an outer
960            alternative. This implements Perl's treatment of parenthesized groups,
961            where a group not containing | does not affect the current alternative,
962            that is, (X) is NOT the same as (X|(*F)). */
963    
964            if (rrc == MATCH_THEN)
965              {
966              next = ecode + GET(ecode,1);
967              if (md->start_match_ptr < next &&
968                  (*ecode == OP_ALT || *next == OP_ALT))
969                rrc = MATCH_NOMATCH;
970              }
971    
972            /* Anything other than NOMATCH is passed back. */
973    
974            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
975          md->capture_last = save_capture_last;          md->capture_last = save_capture_last;
976          ecode += GET(ecode, 1);          ecode += GET(ecode, 1);
977            md->mark = save_mark;
978          if (*ecode != OP_ALT) break;          if (*ecode != OP_ALT) break;
979          }          }
980    
# Line 851  for (;;) Line 983  for (;;)
983        md->offset_vector[offset+1] = save_offset2;        md->offset_vector[offset+1] = save_offset2;
984        md->offset_vector[md->offset_end - number] = save_offset3;        md->offset_vector[md->offset_end - number] = save_offset3;
985    
986        /* At this point, rrc will be one of MATCH_ONCE, MATCH_NOMATCH, or        /* At this point, rrc will be one of MATCH_ONCE or MATCH_NOMATCH. */
       MATCH_THEN. */  
987    
988        if (rrc != MATCH_THEN && md->mark == NULL) md->mark = markptr;        RRETURN(rrc);
       RRETURN(((rrc == MATCH_ONCE)? MATCH_ONCE:MATCH_NOMATCH));  
989        }        }
990    
991      /* FALL THROUGH ... Insufficient room for saving captured contents. Treat      /* FALL THROUGH ... Insufficient room for saving captured contents. Treat
# Line 870  for (;;) Line 1000  for (;;)
1000      /* VVVVVVVVVVVVVVVVVVVVVVVVV */      /* VVVVVVVVVVVVVVVVVVVVVVVVV */
1001    
1002      /* Non-capturing or atomic group, except for possessive with unlimited      /* Non-capturing or atomic group, except for possessive with unlimited
1003      repeat. Loop for all the alternatives. When we get to the final alternative      repeat and ONCE group with no captures. Loop for all the alternatives.
1004      within the brackets, we used to return the result of a recursive call to  
1005      match() whatever happened so it was possible to reduce stack usage by      When we get to the final alternative within the brackets, we used to return
1006      turning this into a tail recursion, except in the case of a possibly empty      the result of a recursive call to match() whatever happened so it was
1007      group. However, now that there is the possiblity of (*THEN) occurring in      possible to reduce stack usage by turning this into a tail recursion,
1008      the final alternative, this optimization is no longer possible.      except in the case of a possibly empty group. However, now that there is
1009        the possiblity of (*THEN) occurring in the final alternative, this
1010        optimization is no longer always possible.
1011    
1012        We can optimize if we know there are no (*THEN)s in the pattern; at present
1013        this is the best that can be done.
1014    
1015      MATCH_ONCE is returned when the end of an atomic group is successfully      MATCH_ONCE is returned when the end of an atomic group is successfully
1016      reached, but subsequent matching fails. It passes back up the tree (causing      reached, but subsequent matching fails. It passes back up the tree (causing
# Line 892  for (;;) Line 1027  for (;;)
1027      for (;;)      for (;;)
1028        {        {
1029        if (op >= OP_SBRA || op == OP_ONCE) md->match_function_type = MATCH_CBEGROUP;        if (op >= OP_SBRA || op == OP_ONCE) md->match_function_type = MATCH_CBEGROUP;
1030        RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md, eptrb,  
1031          /* If this is not a possibly empty group, and there are no (*THEN)s in
1032          the pattern, and this is the final alternative, optimize as described
1033          above. */
1034    
1035          else if (!md->hasthen && ecode[GET(ecode, 1)] != OP_ALT)
1036            {
1037            ecode += PRIV(OP_lengths)[*ecode];
1038            goto TAIL_RECURSE;
1039            }
1040    
1041          /* In all other cases, we have to make another call to match(). */
1042    
1043          save_mark = md->mark;
1044          RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md, eptrb,
1045          RM2);          RM2);
1046        if (rrc != MATCH_NOMATCH &&  
1047            (rrc != MATCH_THEN || md->start_match_ptr != ecode))        /* See comment in the code for capturing groups above about handling
1048          THEN. */
1049    
1050          if (rrc == MATCH_THEN)
1051            {
1052            next = ecode + GET(ecode,1);
1053            if (md->start_match_ptr < next &&
1054                (*ecode == OP_ALT || *next == OP_ALT))
1055              rrc = MATCH_NOMATCH;
1056            }
1057    
1058          if (rrc != MATCH_NOMATCH)
1059          {          {
1060          if (rrc == MATCH_ONCE)          if (rrc == MATCH_ONCE)
1061            {            {
1062            const uschar *scode = ecode;            const pcre_uchar *scode = ecode;
1063            if (*scode != OP_ONCE)           /* If not at start, find it */            if (*scode != OP_ONCE)           /* If not at start, find it */
1064              {              {
1065              while (*scode == OP_ALT) scode += GET(scode, 1);              while (*scode == OP_ALT) scode += GET(scode, 1);
# Line 910  for (;;) Line 1070  for (;;)
1070          RRETURN(rrc);          RRETURN(rrc);
1071          }          }
1072        ecode += GET(ecode, 1);        ecode += GET(ecode, 1);
1073          md->mark = save_mark;
1074        if (*ecode != OP_ALT) break;        if (*ecode != OP_ALT) break;
1075        }        }
1076      if (rrc != MATCH_THEN && md->mark == NULL) md->mark = markptr;  
1077      RRETURN(MATCH_NOMATCH);      RRETURN(MATCH_NOMATCH);
1078    
1079      /* Handle possessive capturing brackets with an unlimited repeat. We come      /* Handle possessive capturing brackets with an unlimited repeat. We come
# Line 941  for (;;) Line 1102  for (;;)
1102      if (offset < md->offset_max)      if (offset < md->offset_max)
1103        {        {
1104        matched_once = FALSE;        matched_once = FALSE;
1105        code_offset = ecode - md->start_code;        code_offset = (int)(ecode - md->start_code);
1106    
1107        save_offset1 = md->offset_vector[offset];        save_offset1 = md->offset_vector[offset];
1108        save_offset2 = md->offset_vector[offset+1];        save_offset2 = md->offset_vector[offset+1];
# Line 964  for (;;) Line 1125  for (;;)
1125          md->offset_vector[md->offset_end - number] =          md->offset_vector[md->offset_end - number] =
1126            (int)(eptr - md->start_subject);            (int)(eptr - md->start_subject);
1127          if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;          if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
1128          RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,          RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
1129            eptrb, RM63);            eptrb, RM63);
1130          if (rrc == MATCH_KETRPOS)          if (rrc == MATCH_KETRPOS)
1131            {            {
# Line 975  for (;;) Line 1136  for (;;)
1136            matched_once = TRUE;            matched_once = TRUE;
1137            continue;            continue;
1138            }            }
1139          if (rrc != MATCH_NOMATCH &&  
1140              (rrc != MATCH_THEN || md->start_match_ptr != ecode))          /* See comment in the code for capturing groups above about handling
1141            RRETURN(rrc);          THEN. */
1142    
1143            if (rrc == MATCH_THEN)
1144              {
1145              next = ecode + GET(ecode,1);
1146              if (md->start_match_ptr < next &&
1147                  (*ecode == OP_ALT || *next == OP_ALT))
1148                rrc = MATCH_NOMATCH;
1149              }
1150    
1151            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1152          md->capture_last = save_capture_last;          md->capture_last = save_capture_last;
1153          ecode += GET(ecode, 1);          ecode += GET(ecode, 1);
1154          if (*ecode != OP_ALT) break;          if (*ecode != OP_ALT) break;
# Line 990  for (;;) Line 1161  for (;;)
1161          md->offset_vector[md->offset_end - number] = save_offset3;          md->offset_vector[md->offset_end - number] = save_offset3;
1162          }          }
1163    
       if (rrc != MATCH_THEN && md->mark == NULL) md->mark = markptr;  
1164        if (allow_zero || matched_once)        if (allow_zero || matched_once)
1165          {          {
1166          ecode += 1 + LINK_SIZE;          ecode += 1 + LINK_SIZE;
# Line 1022  for (;;) Line 1192  for (;;)
1192    
1193      POSSESSIVE_NON_CAPTURE:      POSSESSIVE_NON_CAPTURE:
1194      matched_once = FALSE;      matched_once = FALSE;
1195      code_offset = ecode - md->start_code;      code_offset = (int)(ecode - md->start_code);
1196    
1197      for (;;)      for (;;)
1198        {        {
1199        if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;        if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
1200        RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
1201          eptrb, RM48);          eptrb, RM48);
1202        if (rrc == MATCH_KETRPOS)        if (rrc == MATCH_KETRPOS)
1203          {          {
# Line 1037  for (;;) Line 1207  for (;;)
1207          matched_once = TRUE;          matched_once = TRUE;
1208          continue;          continue;
1209          }          }
1210        if (rrc != MATCH_NOMATCH &&  
1211            (rrc != MATCH_THEN || md->start_match_ptr != ecode))        /* See comment in the code for capturing groups above about handling
1212          RRETURN(rrc);        THEN. */
1213    
1214          if (rrc == MATCH_THEN)
1215            {
1216            next = ecode + GET(ecode,1);
1217            if (md->start_match_ptr < next &&
1218                (*ecode == OP_ALT || *next == OP_ALT))
1219              rrc = MATCH_NOMATCH;
1220            }
1221    
1222          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1223        ecode += GET(ecode, 1);        ecode += GET(ecode, 1);
1224        if (*ecode != OP_ALT) break;        if (*ecode != OP_ALT) break;
1225        }        }
# Line 1067  for (;;) Line 1247  for (;;)
1247    
1248      if (ecode[LINK_SIZE+1] == OP_CALLOUT)      if (ecode[LINK_SIZE+1] == OP_CALLOUT)
1249        {        {
1250        if (pcre_callout != NULL)        if (PUBL(callout) != NULL)
1251          {          {
1252          pcre_callout_block cb;          PUBL(callout_block) cb;
1253          cb.version          = 1;   /* Version 1 of the callout block */          cb.version          = 2;   /* Version 1 of the callout block */
1254          cb.callout_number   = ecode[LINK_SIZE+2];          cb.callout_number   = ecode[LINK_SIZE+2];
1255          cb.offset_vector    = md->offset_vector;          cb.offset_vector    = md->offset_vector;
1256    #ifdef COMPILE_PCRE8
1257          cb.subject          = (PCRE_SPTR)md->start_subject;          cb.subject          = (PCRE_SPTR)md->start_subject;
1258    #else
1259            cb.subject          = (PCRE_SPTR16)md->start_subject;
1260    #endif
1261          cb.subject_length   = (int)(md->end_subject - md->start_subject);          cb.subject_length   = (int)(md->end_subject - md->start_subject);
1262          cb.start_match      = (int)(mstart - md->start_subject);          cb.start_match      = (int)(mstart - md->start_subject);
1263          cb.current_position = (int)(eptr - md->start_subject);          cb.current_position = (int)(eptr - md->start_subject);
# Line 1082  for (;;) Line 1266  for (;;)
1266          cb.capture_top      = offset_top/2;          cb.capture_top      = offset_top/2;
1267          cb.capture_last     = md->capture_last;          cb.capture_last     = md->capture_last;
1268          cb.callout_data     = md->callout_data;          cb.callout_data     = md->callout_data;
1269          if ((rrc = (*pcre_callout)(&cb)) > 0) MRRETURN(MATCH_NOMATCH);          cb.mark             = md->nomatch_mark;
1270            if ((rrc = (*PUBL(callout))(&cb)) > 0) RRETURN(MATCH_NOMATCH);
1271          if (rrc < 0) RRETURN(rrc);          if (rrc < 0) RRETURN(rrc);
1272          }          }
1273        ecode += _pcre_OP_lengths[OP_CALLOUT];        ecode += PRIV(OP_lengths)[OP_CALLOUT];
1274        }        }
1275    
1276      condcode = ecode[LINK_SIZE+1];      condcode = ecode[LINK_SIZE+1];
# Line 1102  for (;;) Line 1287  for (;;)
1287        else        else
1288          {          {
1289          int recno = GET2(ecode, LINK_SIZE + 2);   /* Recursion group number*/          int recno = GET2(ecode, LINK_SIZE + 2);   /* Recursion group number*/
1290          condition =  (recno == RREF_ANY || recno == md->recursive->group_num);          condition = (recno == RREF_ANY || recno == md->recursive->group_num);
1291    
1292          /* If the test is for recursion into a specific subpattern, and it is          /* If the test is for recursion into a specific subpattern, and it is
1293          false, but the test was set up by name, scan the table to see if the          false, but the test was set up by name, scan the table to see if the
1294          name refers to any other numbers, and test them. The condition is true          name refers to any other numbers, and test them. The condition is true
1295          if any one is set. */          if any one is set. */
1296    
1297          if (!condition && condcode == OP_NRREF && recno != RREF_ANY)          if (!condition && condcode == OP_NRREF)
1298            {            {
1299            uschar *slotA = md->name_table;            pcre_uchar *slotA = md->name_table;
1300            for (i = 0; i < md->name_count; i++)            for (i = 0; i < md->name_count; i++)
1301              {              {
1302              if (GET2(slotA, 0) == recno) break;              if (GET2(slotA, 0) == recno) break;
# Line 1124  for (;;) Line 1309  for (;;)
1309    
1310            if (i < md->name_count)            if (i < md->name_count)
1311              {              {
1312              uschar *slotB = slotA;              pcre_uchar *slotB = slotA;
1313              while (slotB > md->name_table)              while (slotB > md->name_table)
1314                {                {
1315                slotB -= md->name_entry_size;                slotB -= md->name_entry_size;
1316                if (strcmp((char *)slotA + 2, (char *)slotB + 2) == 0)                if (STRCMP_UC_UC(slotA + IMM2_SIZE, slotB + IMM2_SIZE) == 0)
1317                  {                  {
1318                  condition = GET2(slotB, 0) == md->recursive->group_num;                  condition = GET2(slotB, 0) == md->recursive->group_num;
1319                  if (condition) break;                  if (condition) break;
# Line 1144  for (;;) Line 1329  for (;;)
1329                for (i++; i < md->name_count; i++)                for (i++; i < md->name_count; i++)
1330                  {                  {
1331                  slotB += md->name_entry_size;                  slotB += md->name_entry_size;
1332                  if (strcmp((char *)slotA + 2, (char *)slotB + 2) == 0)                  if (STRCMP_UC_UC(slotA + IMM2_SIZE, slotB + IMM2_SIZE) == 0)
1333                    {                    {
1334                    condition = GET2(slotB, 0) == md->recursive->group_num;                    condition = GET2(slotB, 0) == md->recursive->group_num;
1335                    if (condition) break;                    if (condition) break;
# Line 1157  for (;;) Line 1342  for (;;)
1342    
1343          /* Chose branch according to the condition */          /* Chose branch according to the condition */
1344    
1345          ecode += condition? 3 : GET(ecode, 1);          ecode += condition? 1 + IMM2_SIZE : GET(ecode, 1);
1346          }          }
1347        }        }
1348    
# Line 1174  for (;;) Line 1359  for (;;)
1359        if (!condition && condcode == OP_NCREF)        if (!condition && condcode == OP_NCREF)
1360          {          {
1361          int refno = offset >> 1;          int refno = offset >> 1;
1362          uschar *slotA = md->name_table;          pcre_uchar *slotA = md->name_table;
1363    
1364          for (i = 0; i < md->name_count; i++)          for (i = 0; i < md->name_count; i++)
1365            {            {
# Line 1188  for (;;) Line 1373  for (;;)
1373    
1374          if (i < md->name_count)          if (i < md->name_count)
1375            {            {
1376            uschar *slotB = slotA;            pcre_uchar *slotB = slotA;
1377            while (slotB > md->name_table)            while (slotB > md->name_table)
1378              {              {
1379              slotB -= md->name_entry_size;              slotB -= md->name_entry_size;
1380              if (strcmp((char *)slotA + 2, (char *)slotB + 2) == 0)              if (STRCMP_UC_UC(slotA + IMM2_SIZE, slotB + IMM2_SIZE) == 0)
1381                {                {
1382                offset = GET2(slotB, 0) << 1;                offset = GET2(slotB, 0) << 1;
1383                condition = offset < offset_top &&                condition = offset < offset_top &&
# Line 1210  for (;;) Line 1395  for (;;)
1395              for (i++; i < md->name_count; i++)              for (i++; i < md->name_count; i++)
1396                {                {
1397                slotB += md->name_entry_size;                slotB += md->name_entry_size;
1398                if (strcmp((char *)slotA + 2, (char *)slotB + 2) == 0)                if (STRCMP_UC_UC(slotA + IMM2_SIZE, slotB + IMM2_SIZE) == 0)
1399                  {                  {
1400                  offset = GET2(slotB, 0) << 1;                  offset = GET2(slotB, 0) << 1;
1401                  condition = offset < offset_top &&                  condition = offset < offset_top &&
# Line 1225  for (;;) Line 1410  for (;;)
1410    
1411        /* Chose branch according to the condition */        /* Chose branch according to the condition */
1412    
1413        ecode += condition? 3 : GET(ecode, 1);        ecode += condition? 1 + IMM2_SIZE : GET(ecode, 1);
1414        }        }
1415    
1416      else if (condcode == OP_DEF)     /* DEFINE - always false */      else if (condcode == OP_DEF)     /* DEFINE - always false */
# Line 1250  for (;;) Line 1435  for (;;)
1435          ecode += 1 + LINK_SIZE + GET(ecode, LINK_SIZE + 2);          ecode += 1 + LINK_SIZE + GET(ecode, LINK_SIZE + 2);
1436          while (*ecode == OP_ALT) ecode += GET(ecode, 1);          while (*ecode == OP_ALT) ecode += GET(ecode, 1);
1437          }          }
1438        else if (rrc != MATCH_NOMATCH &&  
1439                (rrc != MATCH_THEN || md->start_match_ptr != ecode))        /* PCRE doesn't allow the effect of (*THEN) to escape beyond an
1440          assertion; it is therefore treated as NOMATCH. */
1441    
1442          else if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN)
1443          {          {
1444          RRETURN(rrc);         /* Need braces because of following else */          RRETURN(rrc);         /* Need braces because of following else */
1445          }          }
# Line 1262  for (;;) Line 1450  for (;;)
1450          }          }
1451        }        }
1452    
1453      /* We are now at the branch that is to be obeyed. As there is only one,      /* We are now at the branch that is to be obeyed. As there is only one, can
1454      we used to use tail recursion to avoid using another stack frame, except      use tail recursion to avoid using another stack frame, except when there is
1455      when there was unlimited repeat of a possibly empty group. However, that      unlimited repeat of a possibly empty group. In the latter case, a recursive
1456      strategy no longer works because of the possibilty of (*THEN) being      call to match() is always required, unless the second alternative doesn't
1457      encountered in the branch. A recursive call to match() is always required,      exist, in which case we can just plough on. Note that, for compatibility
1458      unless the second alternative doesn't exist, in which case we can just      with Perl, the | in a conditional group is NOT treated as creating two
1459      plough on. */      alternatives. If a THEN is encountered in the branch, it propagates out to
1460        the enclosing alternative (unless nested in a deeper set of alternatives,
1461        of course). */
1462    
1463      if (condition || *ecode == OP_ALT)      if (condition || *ecode == OP_ALT)
1464        {        {
1465        if (op == OP_SCOND) md->match_function_type = MATCH_CBEGROUP;        if (op != OP_SCOND)
1466            {
1467            ecode += 1 + LINK_SIZE;
1468            goto TAIL_RECURSE;
1469            }
1470    
1471          md->match_function_type = MATCH_CBEGROUP;
1472        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM49);        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM49);
       if (rrc == MATCH_THEN && md->start_match_ptr == ecode)  
         rrc = MATCH_NOMATCH;  
1473        RRETURN(rrc);        RRETURN(rrc);
1474        }        }
1475      else                         /* Condition false & no alternative */  
1476         /* Condition false & no alternative; continue after the group. */
1477    
1478        else
1479        {        {
1480        ecode += 1 + LINK_SIZE;        ecode += 1 + LINK_SIZE;
1481        }        }
# Line 1305  for (;;) Line 1502  for (;;)
1502        md->offset_vector[offset+1] = (int)(eptr - md->start_subject);        md->offset_vector[offset+1] = (int)(eptr - md->start_subject);
1503        if (offset_top <= offset) offset_top = offset + 2;        if (offset_top <= offset) offset_top = offset + 2;
1504        }        }
1505      ecode += 3;      ecode += 1 + IMM2_SIZE;
1506      break;      break;
1507    
1508    
# Line 1325  for (;;) Line 1522  for (;;)
1522           (md->notempty ||           (md->notempty ||
1523             (md->notempty_atstart &&             (md->notempty_atstart &&
1524               mstart == md->start_subject + md->start_offset)))               mstart == md->start_subject + md->start_offset)))
1525        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
1526    
1527      /* Otherwise, we have a match. */      /* Otherwise, we have a match. */
1528    
# Line 1334  for (;;) Line 1531  for (;;)
1531      md->start_match_ptr = mstart;       /* and the start (\K can modify) */      md->start_match_ptr = mstart;       /* and the start (\K can modify) */
1532    
1533      /* For some reason, the macros don't work properly if an expression is      /* For some reason, the macros don't work properly if an expression is
1534      given as the argument to MRRETURN when the heap is in use. */      given as the argument to RRETURN when the heap is in use. */
1535    
1536      rrc = (op == OP_END)? MATCH_MATCH : MATCH_ACCEPT;      rrc = (op == OP_END)? MATCH_MATCH : MATCH_ACCEPT;
1537      MRRETURN(rrc);      RRETURN(rrc);
1538    
1539      /* Assertion brackets. Check the alternative branches in turn - the      /* Assertion brackets. Check the alternative branches in turn - the
1540      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,
# Line 1352  for (;;) Line 1549  for (;;)
1549    
1550      case OP_ASSERT:      case OP_ASSERT:
1551      case OP_ASSERTBACK:      case OP_ASSERTBACK:
1552        save_mark = md->mark;
1553      if (md->match_function_type == MATCH_CONDASSERT)      if (md->match_function_type == MATCH_CONDASSERT)
1554        {        {
1555        condassert = TRUE;        condassert = TRUE;
# Line 1367  for (;;) Line 1565  for (;;)
1565          mstart = md->start_match_ptr;   /* In case \K reset it */          mstart = md->start_match_ptr;   /* In case \K reset it */
1566          break;          break;
1567          }          }
1568        if (rrc != MATCH_NOMATCH &&  
1569            (rrc != MATCH_THEN || md->start_match_ptr != ecode))        /* PCRE does not allow THEN to escape beyond an assertion; it is treated
1570          RRETURN(rrc);        as NOMATCH. */
1571    
1572          if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
1573        ecode += GET(ecode, 1);        ecode += GET(ecode, 1);
1574          md->mark = save_mark;
1575        }        }
1576      while (*ecode == OP_ALT);      while (*ecode == OP_ALT);
1577    
1578      if (*ecode == OP_KET) MRRETURN(MATCH_NOMATCH);      if (*ecode == OP_KET) RRETURN(MATCH_NOMATCH);
1579    
1580      /* If checking an assertion for a condition, return MATCH_MATCH. */      /* If checking an assertion for a condition, return MATCH_MATCH. */
1581    
# Line 1394  for (;;) Line 1595  for (;;)
1595    
1596      case OP_ASSERT_NOT:      case OP_ASSERT_NOT:
1597      case OP_ASSERTBACK_NOT:      case OP_ASSERTBACK_NOT:
1598        save_mark = md->mark;
1599      if (md->match_function_type == MATCH_CONDASSERT)      if (md->match_function_type == MATCH_CONDASSERT)
1600        {        {
1601        condassert = TRUE;        condassert = TRUE;
# Line 1404  for (;;) Line 1606  for (;;)
1606      do      do
1607        {        {
1608        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM5);        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM5);
1609        if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) MRRETURN(MATCH_NOMATCH);        md->mark = save_mark;
1610          if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) RRETURN(MATCH_NOMATCH);
1611        if (rrc == MATCH_SKIP || rrc == MATCH_PRUNE || rrc == MATCH_COMMIT)        if (rrc == MATCH_SKIP || rrc == MATCH_PRUNE || rrc == MATCH_COMMIT)
1612          {          {
1613          do ecode += GET(ecode,1); while (*ecode == OP_ALT);          do ecode += GET(ecode,1); while (*ecode == OP_ALT);
1614          break;          break;
1615          }          }
1616        if (rrc != MATCH_NOMATCH &&  
1617            (rrc != MATCH_THEN || md->start_match_ptr != ecode))        /* PCRE does not allow THEN to escape beyond an assertion; it is treated
1618          RRETURN(rrc);        as NOMATCH. */
1619    
1620          if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
1621        ecode += GET(ecode,1);        ecode += GET(ecode,1);
1622        }        }
1623      while (*ecode == OP_ALT);      while (*ecode == OP_ALT);
# Line 1428  for (;;) Line 1633  for (;;)
1633      back a number of characters, not bytes. */      back a number of characters, not bytes. */
1634    
1635      case OP_REVERSE:      case OP_REVERSE:
1636  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
1637      if (utf8)      if (utf)
1638        {        {
1639        i = GET(ecode, 1);        i = GET(ecode, 1);
1640        while (i-- > 0)        while (i-- > 0)
1641          {          {
1642          eptr--;          eptr--;
1643          if (eptr < md->start_subject) MRRETURN(MATCH_NOMATCH);          if (eptr < md->start_subject) RRETURN(MATCH_NOMATCH);
1644          BACKCHAR(eptr);          BACKCHAR(eptr);
1645          }          }
1646        }        }
# Line 1446  for (;;) Line 1651  for (;;)
1651    
1652        {        {
1653        eptr -= GET(ecode, 1);        eptr -= GET(ecode, 1);
1654        if (eptr < md->start_subject) MRRETURN(MATCH_NOMATCH);        if (eptr < md->start_subject) RRETURN(MATCH_NOMATCH);
1655        }        }
1656    
1657      /* Save the earliest consulted character, then skip to next op code */      /* Save the earliest consulted character, then skip to next op code */
# Line 1460  for (;;) Line 1665  for (;;)
1665      function is able to force a failure. */      function is able to force a failure. */
1666    
1667      case OP_CALLOUT:      case OP_CALLOUT:
1668      if (pcre_callout != NULL)      if (PUBL(callout) != NULL)
1669        {        {
1670        pcre_callout_block cb;        PUBL(callout_block) cb;
1671        cb.version          = 1;   /* Version 1 of the callout block */        cb.version          = 2;   /* Version 1 of the callout block */
1672        cb.callout_number   = ecode[1];        cb.callout_number   = ecode[1];
1673        cb.offset_vector    = md->offset_vector;        cb.offset_vector    = md->offset_vector;
1674    #ifdef COMPILE_PCRE8
1675        cb.subject          = (PCRE_SPTR)md->start_subject;        cb.subject          = (PCRE_SPTR)md->start_subject;
1676    #else
1677          cb.subject          = (PCRE_SPTR16)md->start_subject;
1678    #endif
1679        cb.subject_length   = (int)(md->end_subject - md->start_subject);        cb.subject_length   = (int)(md->end_subject - md->start_subject);
1680        cb.start_match      = (int)(mstart - md->start_subject);        cb.start_match      = (int)(mstart - md->start_subject);
1681        cb.current_position = (int)(eptr - md->start_subject);        cb.current_position = (int)(eptr - md->start_subject);
# Line 1475  for (;;) Line 1684  for (;;)
1684        cb.capture_top      = offset_top/2;        cb.capture_top      = offset_top/2;
1685        cb.capture_last     = md->capture_last;        cb.capture_last     = md->capture_last;
1686        cb.callout_data     = md->callout_data;        cb.callout_data     = md->callout_data;
1687        if ((rrc = (*pcre_callout)(&cb)) > 0) MRRETURN(MATCH_NOMATCH);        cb.mark             = md->nomatch_mark;
1688          if ((rrc = (*PUBL(callout))(&cb)) > 0) RRETURN(MATCH_NOMATCH);
1689        if (rrc < 0) RRETURN(rrc);        if (rrc < 0) RRETURN(rrc);
1690        }        }
1691      ecode += 2 + 2*LINK_SIZE;      ecode += 2 + 2*LINK_SIZE;
# Line 1500  for (;;) Line 1710  for (;;)
1710    
1711      case OP_RECURSE:      case OP_RECURSE:
1712        {        {
1713          recursion_info *ri;
1714          int recno;
1715    
1716        callpat = md->start_code + GET(ecode, 1);        callpat = md->start_code + GET(ecode, 1);
1717        new_recursive.group_num = (callpat == md->start_code)? 0 :        recno = (callpat == md->start_code)? 0 :
1718          GET2(callpat, 1 + LINK_SIZE);          GET2(callpat, 1 + LINK_SIZE);
1719    
1720          /* Check for repeating a recursion without advancing the subject pointer.
1721          This should catch convoluted mutual recursions. (Some simple cases are
1722          caught at compile time.) */
1723    
1724          for (ri = md->recursive; ri != NULL; ri = ri->prevrec)
1725            if (recno == ri->group_num && eptr == ri->subject_position)
1726              RRETURN(PCRE_ERROR_RECURSELOOP);
1727    
1728        /* Add to "recursing stack" */        /* Add to "recursing stack" */
1729    
1730          new_recursive.group_num = recno;
1731          new_recursive.subject_position = eptr;
1732        new_recursive.prevrec = md->recursive;        new_recursive.prevrec = md->recursive;
1733        md->recursive = &new_recursive;        md->recursive = &new_recursive;
1734    
# Line 1521  for (;;) Line 1744  for (;;)
1744        else        else
1745          {          {
1746          new_recursive.offset_save =          new_recursive.offset_save =
1747            (int *)(pcre_malloc)(new_recursive.saved_max * sizeof(int));            (int *)(PUBL(malloc))(new_recursive.saved_max * sizeof(int));
1748          if (new_recursive.offset_save == NULL) RRETURN(PCRE_ERROR_NOMEMORY);          if (new_recursive.offset_save == NULL) RRETURN(PCRE_ERROR_NOMEMORY);
1749          }          }
1750        memcpy(new_recursive.offset_save, md->offset_vector,        memcpy(new_recursive.offset_save, md->offset_vector,
# Line 1536  for (;;) Line 1759  for (;;)
1759        do        do
1760          {          {
1761          if (cbegroup) md->match_function_type = MATCH_CBEGROUP;          if (cbegroup) md->match_function_type = MATCH_CBEGROUP;
1762          RMATCH(eptr, callpat + _pcre_OP_lengths[*callpat], offset_top,          RMATCH(eptr, callpat + PRIV(OP_lengths)[*callpat], offset_top,
1763            md, eptrb, RM6);            md, eptrb, RM6);
1764          memcpy(md->offset_vector, new_recursive.offset_save,          memcpy(md->offset_vector, new_recursive.offset_save,
1765              new_recursive.saved_max * sizeof(int));              new_recursive.saved_max * sizeof(int));
1766            md->recursive = new_recursive.prevrec;
1767          if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)          if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)
1768            {            {
1769            DPRINTF(("Recursion matched\n"));            DPRINTF(("Recursion matched\n"));
           md->recursive = new_recursive.prevrec;  
1770            if (new_recursive.offset_save != stacksave)            if (new_recursive.offset_save != stacksave)
1771              (pcre_free)(new_recursive.offset_save);              (PUBL(free))(new_recursive.offset_save);
1772    
1773            /* Set where we got to in the subject, and reset the start in case            /* Set where we got to in the subject, and reset the start in case
1774            it was changed by \K. This *is* propagated back out of a recursion,            it was changed by \K. This *is* propagated back out of a recursion,
# Line 1555  for (;;) Line 1778  for (;;)
1778            mstart = md->start_match_ptr;            mstart = md->start_match_ptr;
1779            goto RECURSION_MATCHED;        /* Exit loop; end processing */            goto RECURSION_MATCHED;        /* Exit loop; end processing */
1780            }            }
1781          else if (rrc != MATCH_NOMATCH &&  
1782                  (rrc != MATCH_THEN || md->start_match_ptr != ecode))          /* PCRE does not allow THEN to escape beyond a recursion; it is treated
1783            as NOMATCH. */
1784    
1785            else if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN)
1786            {            {
1787            DPRINTF(("Recursion gave error %d\n", rrc));            DPRINTF(("Recursion gave error %d\n", rrc));
1788            if (new_recursive.offset_save != stacksave)            if (new_recursive.offset_save != stacksave)
1789              (pcre_free)(new_recursive.offset_save);              (PUBL(free))(new_recursive.offset_save);
1790            RRETURN(rrc);            RRETURN(rrc);
1791            }            }
1792    
# Line 1572  for (;;) Line 1798  for (;;)
1798        DPRINTF(("Recursion didn't match\n"));        DPRINTF(("Recursion didn't match\n"));
1799        md->recursive = new_recursive.prevrec;        md->recursive = new_recursive.prevrec;
1800        if (new_recursive.offset_save != stacksave)        if (new_recursive.offset_save != stacksave)
1801          (pcre_free)(new_recursive.offset_save);          (PUBL(free))(new_recursive.offset_save);
1802        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
1803        }        }
1804    
1805      RECURSION_MATCHED:      RECURSION_MATCHED:
# Line 1642  for (;;) Line 1868  for (;;)
1868        }        }
1869      else saved_eptr = NULL;      else saved_eptr = NULL;
1870    
1871      /* If we are at the end of an assertion group, stop matching and return      /* If we are at the end of an assertion group or a non-capturing atomic
1872      MATCH_MATCH, but record the current high water mark for use by positive      group, stop matching and return MATCH_MATCH, but record the current high
1873      assertions. We also need to record the match start in case it was changed      water mark for use by positive assertions. We also need to record the match
1874      by \K. */      start in case it was changed by \K. */
1875    
1876      if (*prev == OP_ASSERT || *prev == OP_ASSERT_NOT ||      if ((*prev >= OP_ASSERT && *prev <= OP_ASSERTBACK_NOT) ||
1877          *prev == OP_ASSERTBACK || *prev == OP_ASSERTBACK_NOT)           *prev == OP_ONCE_NC)
1878        {        {
1879        md->end_match_ptr = eptr;      /* For ONCE */        md->end_match_ptr = eptr;      /* For ONCE_NC */
1880        md->end_offset_top = offset_top;        md->end_offset_top = offset_top;
1881        md->start_match_ptr = mstart;        md->start_match_ptr = mstart;
1882        MRRETURN(MATCH_MATCH);        RRETURN(MATCH_MATCH);         /* Sets md->mark */
1883        }        }
1884    
1885      /* 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 1718  for (;;) Line 1944  for (;;)
1944      /* For an ordinary non-repeating ket, just continue at this level. This      /* For an ordinary non-repeating ket, just continue at this level. This
1945      also happens for a repeating ket if no characters were matched in the      also happens for a repeating ket if no characters were matched in the
1946      group. This is the forcible breaking of infinite loops as implemented in      group. This is the forcible breaking of infinite loops as implemented in
1947      Perl 5.005. For a non-repeating atomic group, establish a backup point by      Perl 5.005. For a non-repeating atomic group that includes captures,
1948      processing the rest of the pattern at a lower level. If this results in a      establish a backup point by processing the rest of the pattern at a lower
1949      NOMATCH return, pass MATCH_ONCE back to the original OP_ONCE level, thereby      level. If this results in a NOMATCH return, pass MATCH_ONCE back to the
1950      bypassing intermediate backup points, but resetting any captures that      original OP_ONCE level, thereby bypassing intermediate backup points, but
1951      happened along the way. */      resetting any captures that happened along the way. */
1952    
1953      if (*ecode == OP_KET || eptr == saved_eptr)      if (*ecode == OP_KET || eptr == saved_eptr)
1954        {        {
# Line 1795  for (;;) Line 2021  for (;;)
2021      /* Not multiline mode: start of subject assertion, unless notbol. */      /* Not multiline mode: start of subject assertion, unless notbol. */
2022    
2023      case OP_CIRC:      case OP_CIRC:
2024      if (md->notbol && eptr == md->start_subject) MRRETURN(MATCH_NOMATCH);      if (md->notbol && eptr == md->start_subject) RRETURN(MATCH_NOMATCH);
2025    
2026      /* Start of subject assertion */      /* Start of subject assertion */
2027    
2028      case OP_SOD:      case OP_SOD:
2029      if (eptr != md->start_subject) MRRETURN(MATCH_NOMATCH);      if (eptr != md->start_subject) RRETURN(MATCH_NOMATCH);
2030      ecode++;      ecode++;
2031      break;      break;
2032    
2033      /* Multiline mode: start of subject unless notbol, or after any newline. */      /* Multiline mode: start of subject unless notbol, or after any newline. */
2034    
2035      case OP_CIRCM:      case OP_CIRCM:
2036      if (md->notbol && eptr == md->start_subject) MRRETURN(MATCH_NOMATCH);      if (md->notbol && eptr == md->start_subject) RRETURN(MATCH_NOMATCH);
2037      if (eptr != md->start_subject &&      if (eptr != md->start_subject &&
2038          (eptr == md->end_subject || !WAS_NEWLINE(eptr)))          (eptr == md->end_subject || !WAS_NEWLINE(eptr)))
2039        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2040      ecode++;      ecode++;
2041      break;      break;
2042    
2043      /* Start of match assertion */      /* Start of match assertion */
2044    
2045      case OP_SOM:      case OP_SOM:
2046      if (eptr != md->start_subject + md->start_offset) MRRETURN(MATCH_NOMATCH);      if (eptr != md->start_subject + md->start_offset) RRETURN(MATCH_NOMATCH);
2047      ecode++;      ecode++;
2048      break;      break;
2049    
# Line 1833  for (;;) Line 2059  for (;;)
2059    
2060      case OP_DOLLM:      case OP_DOLLM:
2061      if (eptr < md->end_subject)      if (eptr < md->end_subject)
2062        { if (!IS_NEWLINE(eptr)) MRRETURN(MATCH_NOMATCH); }        { if (!IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH); }
2063      else      else
2064        {        {
2065        if (md->noteol) MRRETURN(MATCH_NOMATCH);        if (md->noteol) RRETURN(MATCH_NOMATCH);
2066        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2067        }        }
2068      ecode++;      ecode++;
# Line 1846  for (;;) Line 2072  for (;;)
2072      subject unless noteol is set. */      subject unless noteol is set. */
2073    
2074      case OP_DOLL:      case OP_DOLL:
2075      if (md->noteol) MRRETURN(MATCH_NOMATCH);      if (md->noteol) RRETURN(MATCH_NOMATCH);
2076      if (!md->endonly) goto ASSERT_NL_OR_EOS;      if (!md->endonly) goto ASSERT_NL_OR_EOS;
2077    
2078      /* ... else fall through for endonly */      /* ... else fall through for endonly */
# Line 1854  for (;;) Line 2080  for (;;)
2080      /* End of subject assertion (\z) */      /* End of subject assertion (\z) */
2081    
2082      case OP_EOD:      case OP_EOD:
2083      if (eptr < md->end_subject) MRRETURN(MATCH_NOMATCH);      if (eptr < md->end_subject) RRETURN(MATCH_NOMATCH);
2084      SCHECK_PARTIAL();      SCHECK_PARTIAL();
2085      ecode++;      ecode++;
2086      break;      break;
# Line 1865  for (;;) Line 2091  for (;;)
2091      ASSERT_NL_OR_EOS:      ASSERT_NL_OR_EOS:
2092      if (eptr < md->end_subject &&      if (eptr < md->end_subject &&
2093          (!IS_NEWLINE(eptr) || eptr != md->end_subject - md->nllen))          (!IS_NEWLINE(eptr) || eptr != md->end_subject - md->nllen))
2094        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2095    
2096      /* Either at end of string or \n before end. */      /* Either at end of string or \n before end. */
2097    
# Line 1884  for (;;) Line 2110  for (;;)
2110        be "non-word" characters. Remember the earliest consulted character for        be "non-word" characters. Remember the earliest consulted character for
2111        partial matching. */        partial matching. */
2112    
2113  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2114        if (utf8)        if (utf)
2115          {          {
2116          /* Get status of previous character */          /* Get status of previous character */
2117    
2118          if (eptr == md->start_subject) prev_is_word = FALSE; else          if (eptr == md->start_subject) prev_is_word = FALSE; else
2119            {            {
2120            USPTR lastptr = eptr - 1;            PCRE_PUCHAR lastptr = eptr - 1;
2121            while((*lastptr & 0xc0) == 0x80) lastptr--;            BACKCHAR(lastptr);
2122            if (lastptr < md->start_used_ptr) md->start_used_ptr = lastptr;            if (lastptr < md->start_used_ptr) md->start_used_ptr = lastptr;
2123            GETCHAR(c, lastptr);            GETCHAR(c, lastptr);
2124  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
# Line 1957  for (;;) Line 2183  for (;;)
2183              }              }
2184            else            else
2185  #endif  #endif
2186            prev_is_word = ((md->ctypes[eptr[-1]] & ctype_word) != 0);            prev_is_word = MAX_255(eptr[-1])
2187                && ((md->ctypes[eptr[-1]] & ctype_word) != 0);
2188            }            }
2189    
2190          /* Get status of next character */          /* Get status of next character */
# Line 1980  for (;;) Line 2207  for (;;)
2207            }            }
2208          else          else
2209  #endif  #endif
2210          cur_is_word = ((md->ctypes[*eptr] & ctype_word) != 0);          cur_is_word = MAX_255(*eptr)
2211              && ((md->ctypes[*eptr] & ctype_word) != 0);
2212          }          }
2213    
2214        /* Now see if the situation is what we want */        /* Now see if the situation is what we want */
2215    
2216        if ((*ecode++ == OP_WORD_BOUNDARY)?        if ((*ecode++ == OP_WORD_BOUNDARY)?
2217             cur_is_word == prev_is_word : cur_is_word != prev_is_word)             cur_is_word == prev_is_word : cur_is_word != prev_is_word)
2218          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
2219        }        }
2220      break;      break;
2221    
2222      /* Match a single character type; inline for speed */      /* Match a single character type; inline for speed */
2223    
2224      case OP_ANY:      case OP_ANY:
2225      if (IS_NEWLINE(eptr)) MRRETURN(MATCH_NOMATCH);      if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);
2226      /* Fall through */      /* Fall through */
2227    
2228      case OP_ALLANY:      case OP_ALLANY:
2229      if (eptr++ >= md->end_subject)      if (eptr >= md->end_subject)   /* DO NOT merge the eptr++ here; it must */
2230        {        {                            /* not be updated before SCHECK_PARTIAL. */
2231        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2232        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2233        }        }
2234      if (utf8) while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;      eptr++;
2235    #ifdef SUPPORT_UTF
2236        if (utf) ACROSSCHAR(eptr < md->end_subject, *eptr, eptr++);
2237    #endif
2238      ecode++;      ecode++;
2239      break;      break;
2240    
# Line 2011  for (;;) Line 2242  for (;;)
2242      any byte, even newline, independent of the setting of PCRE_DOTALL. */      any byte, even newline, independent of the setting of PCRE_DOTALL. */
2243    
2244      case OP_ANYBYTE:      case OP_ANYBYTE:
2245      if (eptr++ >= md->end_subject)      if (eptr >= md->end_subject)   /* DO NOT merge the eptr++ here; it must */
2246        {        {                            /* not be updated before SCHECK_PARTIAL. */
2247        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2248        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2249        }        }
2250        eptr++;
2251      ecode++;      ecode++;
2252      break;      break;
2253    
# Line 2023  for (;;) Line 2255  for (;;)
2255      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2256        {        {
2257        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2258        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2259        }        }
2260      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2261      if (      if (
2262  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2263         c < 256 &&         c < 256 &&
2264  #endif  #endif
2265         (md->ctypes[c] & ctype_digit) != 0         (md->ctypes[c] & ctype_digit) != 0
2266         )         )
2267        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2268      ecode++;      ecode++;
2269      break;      break;
2270    
# Line 2040  for (;;) Line 2272  for (;;)
2272      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2273        {        {
2274        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2275        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2276        }        }
2277      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2278      if (      if (
2279  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2280         c >= 256 ||         c > 255 ||
2281  #endif  #endif
2282         (md->ctypes[c] & ctype_digit) == 0         (md->ctypes[c] & ctype_digit) == 0
2283         )         )
2284        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2285      ecode++;      ecode++;
2286      break;      break;
2287    
# Line 2057  for (;;) Line 2289  for (;;)
2289      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2290        {        {
2291        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2292        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2293        }        }
2294      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2295      if (      if (
2296  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2297         c < 256 &&         c < 256 &&
2298  #endif  #endif
2299         (md->ctypes[c] & ctype_space) != 0         (md->ctypes[c] & ctype_space) != 0
2300         )         )
2301        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2302      ecode++;      ecode++;
2303      break;      break;
2304    
# Line 2074  for (;;) Line 2306  for (;;)
2306      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2307        {        {
2308        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2309        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2310        }        }
2311      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2312      if (      if (
2313  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2314         c >= 256 ||         c > 255 ||
2315  #endif  #endif
2316         (md->ctypes[c] & ctype_space) == 0         (md->ctypes[c] & ctype_space) == 0
2317         )         )
2318        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2319      ecode++;      ecode++;
2320      break;      break;
2321    
# Line 2091  for (;;) Line 2323  for (;;)
2323      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2324        {        {
2325        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2326        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2327        }        }
2328      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2329      if (      if (
2330  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2331         c < 256 &&         c < 256 &&
2332  #endif  #endif
2333         (md->ctypes[c] & ctype_word) != 0         (md->ctypes[c] & ctype_word) != 0
2334         )         )
2335        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2336      ecode++;      ecode++;
2337      break;      break;
2338    
# Line 2108  for (;;) Line 2340  for (;;)
2340      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2341        {        {
2342        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2343        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2344        }        }
2345      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2346      if (      if (
2347  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !(defined COMPILE_PCRE8)
2348         c >= 256 ||         c > 255 ||
2349  #endif  #endif
2350         (md->ctypes[c] & ctype_word) == 0         (md->ctypes[c] & ctype_word) == 0
2351         )         )
2352        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2353      ecode++;      ecode++;
2354      break;      break;
2355    
# Line 2125  for (;;) Line 2357  for (;;)
2357      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2358        {        {
2359        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2360        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2361        }        }
2362      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2363      switch(c)      switch(c)
2364        {        {
2365        default: MRRETURN(MATCH_NOMATCH);        default: RRETURN(MATCH_NOMATCH);
2366    
2367        case 0x000d:        case 0x000d:
2368        if (eptr < md->end_subject && *eptr == 0x0a) eptr++;        if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
# Line 2144  for (;;) Line 2376  for (;;)
2376        case 0x0085:        case 0x0085:
2377        case 0x2028:        case 0x2028:
2378        case 0x2029:        case 0x2029:
2379        if (md->bsr_anycrlf) MRRETURN(MATCH_NOMATCH);        if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
2380        break;        break;
2381        }        }
2382      ecode++;      ecode++;
# Line 2154  for (;;) Line 2386  for (;;)
2386      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2387        {        {
2388        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2389        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2390        }        }
2391      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2392      switch(c)      switch(c)
# Line 2179  for (;;) Line 2411  for (;;)
2411        case 0x202f:    /* NARROW NO-BREAK SPACE */        case 0x202f:    /* NARROW NO-BREAK SPACE */
2412        case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */        case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
2413        case 0x3000:    /* IDEOGRAPHIC SPACE */        case 0x3000:    /* IDEOGRAPHIC SPACE */
2414        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2415        }        }
2416      ecode++;      ecode++;
2417      break;      break;
# Line 2188  for (;;) Line 2420  for (;;)
2420      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2421        {        {
2422        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2423        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2424        }        }
2425      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2426      switch(c)      switch(c)
2427        {        {
2428        default: MRRETURN(MATCH_NOMATCH);        default: RRETURN(MATCH_NOMATCH);
2429        case 0x09:      /* HT */        case 0x09:      /* HT */
2430        case 0x20:      /* SPACE */        case 0x20:      /* SPACE */
2431        case 0xa0:      /* NBSP */        case 0xa0:      /* NBSP */
# Line 2222  for (;;) Line 2454  for (;;)
2454      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2455        {        {
2456        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2457        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2458        }        }
2459      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2460      switch(c)      switch(c)
# Line 2235  for (;;) Line 2467  for (;;)
2467        case 0x85:      /* NEL */        case 0x85:      /* NEL */
2468        case 0x2028:    /* LINE SEPARATOR */        case 0x2028:    /* LINE SEPARATOR */
2469        case 0x2029:    /* PARAGRAPH SEPARATOR */        case 0x2029:    /* PARAGRAPH SEPARATOR */
2470        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2471        }        }
2472      ecode++;      ecode++;
2473      break;      break;
# Line 2244  for (;;) Line 2476  for (;;)
2476      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2477        {        {
2478        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2479        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2480        }        }
2481      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2482      switch(c)      switch(c)
2483        {        {
2484        default: MRRETURN(MATCH_NOMATCH);        default: RRETURN(MATCH_NOMATCH);
2485        case 0x0a:      /* LF */        case 0x0a:      /* LF */
2486        case 0x0b:      /* VT */        case 0x0b:      /* VT */
2487        case 0x0c:      /* FF */        case 0x0c:      /* FF */
# Line 2271  for (;;) Line 2503  for (;;)
2503      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2504        {        {
2505        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2506        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2507        }        }
2508      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2509        {        {
# Line 2280  for (;;) Line 2512  for (;;)
2512        switch(ecode[1])        switch(ecode[1])
2513          {          {
2514          case PT_ANY:          case PT_ANY:
2515          if (op == OP_NOTPROP) MRRETURN(MATCH_NOMATCH);          if (op == OP_NOTPROP) RRETURN(MATCH_NOMATCH);
2516          break;          break;
2517    
2518          case PT_LAMP:          case PT_LAMP:
2519          if ((prop->chartype == ucp_Lu ||          if ((prop->chartype == ucp_Lu ||
2520               prop->chartype == ucp_Ll ||               prop->chartype == ucp_Ll ||
2521               prop->chartype == ucp_Lt) == (op == OP_NOTPROP))               prop->chartype == ucp_Lt) == (op == OP_NOTPROP))
2522            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2523          break;          break;
2524    
2525          case PT_GC:          case PT_GC:
2526          if ((ecode[2] != _pcre_ucp_gentype[prop->chartype]) == (op == OP_PROP))          if ((ecode[2] != PRIV(ucp_gentype)[prop->chartype]) == (op == OP_PROP))
2527            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2528          break;          break;
2529    
2530          case PT_PC:          case PT_PC:
2531          if ((ecode[2] != prop->chartype) == (op == OP_PROP))          if ((ecode[2] != prop->chartype) == (op == OP_PROP))
2532            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2533          break;          break;
2534    
2535          case PT_SC:          case PT_SC:
2536          if ((ecode[2] != prop->script) == (op == OP_PROP))          if ((ecode[2] != prop->script) == (op == OP_PROP))
2537            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2538          break;          break;
2539    
2540          /* These are specials */          /* These are specials */
2541    
2542          case PT_ALNUM:          case PT_ALNUM:
2543          if ((_pcre_ucp_gentype[prop->chartype] == ucp_L ||          if ((PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
2544               _pcre_ucp_gentype[prop->chartype] == ucp_N) == (op == OP_NOTPROP))               PRIV(ucp_gentype)[prop->chartype] == ucp_N) == (op == OP_NOTPROP))
2545            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2546          break;          break;
2547    
2548          case PT_SPACE:    /* Perl space */          case PT_SPACE:    /* Perl space */
2549          if ((_pcre_ucp_gentype[prop->chartype] == ucp_Z ||          if ((PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
2550               c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR)               c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR)
2551                 == (op == OP_NOTPROP))                 == (op == OP_NOTPROP))
2552            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2553          break;          break;
2554    
2555          case PT_PXSPACE:  /* POSIX space */          case PT_PXSPACE:  /* POSIX space */
2556          if ((_pcre_ucp_gentype[prop->chartype] == ucp_Z ||          if ((PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
2557               c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||               c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||
2558               c == CHAR_FF || c == CHAR_CR)               c == CHAR_FF || c == CHAR_CR)
2559                 == (op == OP_NOTPROP))                 == (op == OP_NOTPROP))
2560            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2561          break;          break;
2562    
2563          case PT_WORD:          case PT_WORD:
2564          if ((_pcre_ucp_gentype[prop->chartype] == ucp_L ||          if ((PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
2565               _pcre_ucp_gentype[prop->chartype] == ucp_N ||               PRIV(ucp_gentype)[prop->chartype] == ucp_N ||
2566               c == CHAR_UNDERSCORE) == (op == OP_NOTPROP))               c == CHAR_UNDERSCORE) == (op == OP_NOTPROP))
2567            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2568          break;          break;
2569    
2570          /* This should never occur */          /* This should never occur */
# Line 2352  for (;;) Line 2584  for (;;)
2584      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
2585        {        {
2586        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2587        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2588        }        }
2589      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2590      if (UCD_CATEGORY(c) == ucp_M) MRRETURN(MATCH_NOMATCH);      if (UCD_CATEGORY(c) == ucp_M) RRETURN(MATCH_NOMATCH);
2591      while (eptr < md->end_subject)      while (eptr < md->end_subject)
2592        {        {
2593        int len = 1;        int len = 1;
2594        if (!utf8) c = *eptr; else { GETCHARLEN(c, eptr, len); }        if (!utf) c = *eptr; else { GETCHARLEN(c, eptr, len); }
2595        if (UCD_CATEGORY(c) != ucp_M) break;        if (UCD_CATEGORY(c) != ucp_M) break;
2596        eptr += len;        eptr += len;
2597        }        }
# Line 2380  for (;;) Line 2612  for (;;)
2612      case OP_REFI:      case OP_REFI:
2613      caseless = op == OP_REFI;      caseless = op == OP_REFI;
2614      offset = GET2(ecode, 1) << 1;               /* Doubled ref number */      offset = GET2(ecode, 1) << 1;               /* Doubled ref number */
2615      ecode += 3;      ecode += 1 + IMM2_SIZE;
2616    
2617      /* If the reference is unset, there are two possibilities:      /* If the reference is unset, there are two possibilities:
2618    
# Line 2420  for (;;) Line 2652  for (;;)
2652        case OP_CRMINRANGE:        case OP_CRMINRANGE:
2653        minimize = (*ecode == OP_CRMINRANGE);        minimize = (*ecode == OP_CRMINRANGE);
2654        min = GET2(ecode, 1);        min = GET2(ecode, 1);
2655        max = GET2(ecode, 3);        max = GET2(ecode, 1 + IMM2_SIZE);
2656        if (max == 0) max = INT_MAX;        if (max == 0) max = INT_MAX;
2657        ecode += 5;        ecode += 1 + 2 * IMM2_SIZE;
2658        break;        break;
2659    
2660        default:               /* No repeat follows */        default:               /* No repeat follows */
2661        if ((length = match_ref(offset, eptr, length, md, caseless)) < 0)        if ((length = match_ref(offset, eptr, length, md, caseless)) < 0)
2662          {          {
2663          CHECK_PARTIAL();          CHECK_PARTIAL();
2664          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
2665          }          }
2666        eptr += length;        eptr += length;
2667        continue;              /* With the main loop */        continue;              /* With the main loop */
2668        }        }
2669    
2670      /* Handle repeated back references. If the length of the reference is      /* Handle repeated back references. If the length of the reference is
2671      zero, just continue with the main loop. */      zero, just continue with the main loop. If the length is negative, it
2672        means the reference is unset in non-Java-compatible mode. If the minimum is
2673        zero, we can continue at the same level without recursion. For any other
2674        minimum, carrying on will result in NOMATCH. */
2675    
2676      if (length == 0) continue;      if (length == 0) continue;
2677        if (length < 0 && min == 0) continue;
2678    
2679      /* First, ensure the minimum number of matches are present. We get back      /* First, ensure the minimum number of matches are present. We get back
2680      the length of the reference string explicitly rather than passing the      the length of the reference string explicitly rather than passing the
# Line 2450  for (;;) Line 2686  for (;;)
2686        if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)        if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
2687          {          {
2688          CHECK_PARTIAL();          CHECK_PARTIAL();
2689          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
2690          }          }
2691        eptr += slength;        eptr += slength;
2692        }        }
# Line 2469  for (;;) Line 2705  for (;;)
2705          int slength;          int slength;
2706          RMATCH(eptr, ecode, offset_top, md, eptrb, RM14);          RMATCH(eptr, ecode, offset_top, md, eptrb, RM14);
2707          if (rrc != MATCH_NOMATCH) RRETURN(rrc);          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2708          if (fi >= max) MRRETURN(MATCH_NOMATCH);          if (fi >= max) RRETURN(MATCH_NOMATCH);
2709          if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)          if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
2710            {            {
2711            CHECK_PARTIAL();            CHECK_PARTIAL();
2712            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
2713            }            }
2714          eptr += slength;          eptr += slength;
2715          }          }
# Line 2501  for (;;) Line 2737  for (;;)
2737          if (rrc != MATCH_NOMATCH) RRETURN(rrc);          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2738          eptr -= length;          eptr -= length;
2739          }          }
2740        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
2741        }        }
2742      /* Control never gets here */      /* Control never gets here */
2743    
# Line 2519  for (;;) Line 2755  for (;;)
2755      case OP_NCLASS:      case OP_NCLASS:
2756      case OP_CLASS:      case OP_CLASS:
2757        {        {
2758          /* The data variable is saved across frames, so the byte map needs to
2759          be stored there. */
2760    #define BYTE_MAP ((pcre_uint8 *)data)
2761        data = ecode + 1;                /* Save for matching */        data = ecode + 1;                /* Save for matching */
2762        ecode += 33;                     /* Advance past the item */        ecode += 1 + (32 / sizeof(pcre_uchar)); /* Advance past the item */
2763    
2764        switch (*ecode)        switch (*ecode)
2765          {          {
# Line 2541  for (;;) Line 2780  for (;;)
2780          case OP_CRMINRANGE:          case OP_CRMINRANGE:
2781          minimize = (*ecode == OP_CRMINRANGE);          minimize = (*ecode == OP_CRMINRANGE);
2782          min = GET2(ecode, 1);          min = GET2(ecode, 1);
2783          max = GET2(ecode, 3);          max = GET2(ecode, 1 + IMM2_SIZE);
2784          if (max == 0) max = INT_MAX;          if (max == 0) max = INT_MAX;
2785          ecode += 5;          ecode += 1 + 2 * IMM2_SIZE;
2786          break;          break;
2787    
2788          default:               /* No repeat follows */          default:               /* No repeat follows */
# Line 2553  for (;;) Line 2792  for (;;)
2792    
2793        /* First, ensure the minimum number of matches are present. */        /* First, ensure the minimum number of matches are present. */
2794    
2795  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2796        /* UTF-8 mode */        if (utf)
       if (utf8)  
2797          {          {
2798          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
2799            {            {
2800            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
2801              {              {
2802              SCHECK_PARTIAL();              SCHECK_PARTIAL();
2803              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
2804              }              }
2805            GETCHARINC(c, eptr);            GETCHARINC(c, eptr);
2806            if (c > 255)            if (c > 255)
2807              {              {
2808              if (op == OP_CLASS) MRRETURN(MATCH_NOMATCH);              if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
2809              }              }
2810            else            else
2811              {              if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
             if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);  
             }  
2812            }            }
2813          }          }
2814        else        else
2815  #endif  #endif
2816        /* Not UTF-8 mode */        /* Not UTF mode */
2817          {          {
2818          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
2819            {            {
2820            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
2821              {              {
2822              SCHECK_PARTIAL();              SCHECK_PARTIAL();
2823              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
2824              }              }
2825            c = *eptr++;            c = *eptr++;
2826            if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);  #ifndef COMPILE_PCRE8
2827              if (c > 255)
2828                {
2829                if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
2830                }
2831              else
2832    #endif
2833                if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
2834            }            }
2835          }          }
2836    
# Line 2601  for (;;) Line 2844  for (;;)
2844    
2845        if (minimize)        if (minimize)
2846          {          {
2847  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2848          /* UTF-8 mode */          if (utf)
         if (utf8)  
2849            {            {
2850            for (fi = min;; fi++)            for (fi = min;; fi++)
2851              {              {
2852              RMATCH(eptr, ecode, offset_top, md, eptrb, RM16);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM16);
2853              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2854              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
2855              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
2856                {                {
2857                SCHECK_PARTIAL();                SCHECK_PARTIAL();
2858                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
2859                }                }
2860              GETCHARINC(c, eptr);              GETCHARINC(c, eptr);
2861              if (c > 255)              if (c > 255)
2862                {                {
2863                if (op == OP_CLASS) MRRETURN(MATCH_NOMATCH);                if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
2864                }                }
2865              else              else
2866                {                if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
               if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);  
               }  
2867              }              }
2868            }            }
2869          else          else
2870  #endif  #endif
2871          /* Not UTF-8 mode */          /* Not UTF mode */
2872            {            {
2873            for (fi = min;; fi++)            for (fi = min;; fi++)
2874              {              {
2875              RMATCH(eptr, ecode, offset_top, md, eptrb, RM17);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM17);
2876              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2877              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
2878              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
2879                {                {
2880                SCHECK_PARTIAL();                SCHECK_PARTIAL();
2881                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
2882                }                }
2883              c = *eptr++;              c = *eptr++;
2884              if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);  #ifndef COMPILE_PCRE8
2885                if (c > 255)
2886                  {
2887                  if (op == OP_CLASS) RRETURN(MATCH_NOMATCH);
2888                  }
2889                else
2890    #endif
2891                  if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) RRETURN(MATCH_NOMATCH);
2892              }              }
2893            }            }
2894          /* Control never gets here */          /* Control never gets here */
# Line 2653  for (;;) Line 2900  for (;;)
2900          {          {
2901          pp = eptr;          pp = eptr;
2902    
2903  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2904          /* UTF-8 mode */          if (utf)
         if (utf8)  
2905            {            {
2906            for (i = min; i < max; i++)            for (i = min; i < max; i++)
2907              {              {
# Line 2671  for (;;) Line 2917  for (;;)
2917                if (op == OP_CLASS) break;                if (op == OP_CLASS) break;
2918                }                }
2919              else              else
2920                {                if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) break;
               if ((data[c/8] & (1 << (c&7))) == 0) break;  
               }  
2921              eptr += len;              eptr += len;
2922              }              }
2923            for (;;)            for (;;)
# Line 2686  for (;;) Line 2930  for (;;)
2930            }            }
2931          else          else
2932  #endif  #endif
2933            /* Not UTF-8 mode */            /* Not UTF mode */
2934            {            {
2935            for (i = min; i < max; i++)            for (i = min; i < max; i++)
2936              {              {
# Line 2696  for (;;) Line 2940  for (;;)
2940                break;                break;
2941                }                }
2942              c = *eptr;              c = *eptr;
2943              if ((data[c/8] & (1 << (c&7))) == 0) break;  #ifndef COMPILE_PCRE8
2944                if (c > 255)
2945                  {
2946                  if (op == OP_CLASS) break;
2947                  }
2948                else
2949    #endif
2950                  if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) break;
2951              eptr++;              eptr++;
2952              }              }
2953            while (eptr >= pp)            while (eptr >= pp)
# Line 2707  for (;;) Line 2958  for (;;)
2958              }              }
2959            }            }
2960    
2961          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
2962          }          }
2963    #undef BYTE_MAP
2964        }        }
2965      /* Control never gets here */      /* Control never gets here */
2966    
# Line 2717  for (;;) Line 2969  for (;;)
2969      when UTF-8 mode mode is supported. Nevertheless, we may not be in UTF-8      when UTF-8 mode mode is supported. Nevertheless, we may not be in UTF-8
2970      mode, because Unicode properties are supported in non-UTF-8 mode. */      mode, because Unicode properties are supported in non-UTF-8 mode. */
2971    
2972  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
2973      case OP_XCLASS:      case OP_XCLASS:
2974        {        {
2975        data = ecode + 1 + LINK_SIZE;                /* Save for matching */        data = ecode + 1 + LINK_SIZE;                /* Save for matching */
# Line 2742  for (;;) Line 2994  for (;;)
2994          case OP_CRMINRANGE:          case OP_CRMINRANGE:
2995          minimize = (*ecode == OP_CRMINRANGE);          minimize = (*ecode == OP_CRMINRANGE);
2996          min = GET2(ecode, 1);          min = GET2(ecode, 1);
2997          max = GET2(ecode, 3);          max = GET2(ecode, 1 + IMM2_SIZE);
2998          if (max == 0) max = INT_MAX;          if (max == 0) max = INT_MAX;
2999          ecode += 5;          ecode += 1 + 2 * IMM2_SIZE;
3000          break;          break;
3001    
3002          default:               /* No repeat follows */          default:               /* No repeat follows */
# Line 2759  for (;;) Line 3011  for (;;)
3011          if (eptr >= md->end_subject)          if (eptr >= md->end_subject)
3012            {            {
3013            SCHECK_PARTIAL();            SCHECK_PARTIAL();
3014            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
3015            }            }
3016          GETCHARINCTEST(c, eptr);          GETCHARINCTEST(c, eptr);
3017          if (!_pcre_xclass(c, data)) MRRETURN(MATCH_NOMATCH);          if (!PRIV(xclass)(c, data, utf)) RRETURN(MATCH_NOMATCH);
3018          }          }
3019    
3020        /* 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 2779  for (;;) Line 3031  for (;;)
3031            {            {
3032            RMATCH(eptr, ecode, offset_top, md, eptrb, RM20);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM20);
3033            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3034            if (fi >= max) MRRETURN(MATCH_NOMATCH);            if (fi >= max) RRETURN(MATCH_NOMATCH);
3035            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3036              {              {
3037              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3038              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3039              }              }
3040            GETCHARINCTEST(c, eptr);            GETCHARINCTEST(c, eptr);
3041            if (!_pcre_xclass(c, data)) MRRETURN(MATCH_NOMATCH);            if (!PRIV(xclass)(c, data, utf)) RRETURN(MATCH_NOMATCH);
3042            }            }
3043          /* Control never gets here */          /* Control never gets here */
3044          }          }
# Line 2804  for (;;) Line 3056  for (;;)
3056              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3057              break;              break;
3058              }              }
3059    #ifdef SUPPORT_UTF
3060            GETCHARLENTEST(c, eptr, len);            GETCHARLENTEST(c, eptr, len);
3061            if (!_pcre_xclass(c, data)) break;  #else
3062              c = *eptr;
3063    #endif
3064              if (!PRIV(xclass)(c, data, utf)) break;
3065            eptr += len;            eptr += len;
3066            }            }
3067          for(;;)          for(;;)
# Line 2813  for (;;) Line 3069  for (;;)
3069            RMATCH(eptr, ecode, offset_top, md, eptrb, RM21);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM21);
3070            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3071            if (eptr-- == pp) break;        /* Stop if tried at original pos */            if (eptr-- == pp) break;        /* Stop if tried at original pos */
3072            if (utf8) BACKCHAR(eptr);  #ifdef SUPPORT_UTF
3073              if (utf) BACKCHAR(eptr);
3074    #endif
3075            }            }
3076          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3077          }          }
3078    
3079        /* Control never gets here */        /* Control never gets here */
# Line 2825  for (;;) Line 3083  for (;;)
3083      /* Match a single character, casefully */      /* Match a single character, casefully */
3084    
3085      case OP_CHAR:      case OP_CHAR:
3086  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3087      if (utf8)      if (utf)
3088        {        {
3089        length = 1;        length = 1;
3090        ecode++;        ecode++;
# Line 2834  for (;;) Line 3092  for (;;)
3092        if (length > md->end_subject - eptr)        if (length > md->end_subject - eptr)
3093          {          {
3094          CHECK_PARTIAL();             /* Not SCHECK_PARTIAL() */          CHECK_PARTIAL();             /* Not SCHECK_PARTIAL() */
3095          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3096          }          }
3097        while (length-- > 0) if (*ecode++ != *eptr++) MRRETURN(MATCH_NOMATCH);        while (length-- > 0) if (*ecode++ != *eptr++) RRETURN(MATCH_NOMATCH);
3098        }        }
3099      else      else
3100  #endif  #endif
3101        /* Not UTF mode */
     /* Non-UTF-8 mode */  
3102        {        {
3103        if (md->end_subject - eptr < 1)        if (md->end_subject - eptr < 1)
3104          {          {
3105          SCHECK_PARTIAL();            /* This one can use SCHECK_PARTIAL() */          SCHECK_PARTIAL();            /* This one can use SCHECK_PARTIAL() */
3106          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3107          }          }
3108        if (ecode[1] != *eptr++) MRRETURN(MATCH_NOMATCH);        if (ecode[1] != *eptr++) RRETURN(MATCH_NOMATCH);
3109        ecode += 2;        ecode += 2;
3110        }        }
3111      break;      break;
3112    
3113      /* Match a single character, caselessly */      /* Match a single character, caselessly. If we are at the end of the
3114        subject, give up immediately. */
3115    
3116      case OP_CHARI:      case OP_CHARI:
3117  #ifdef SUPPORT_UTF8      if (eptr >= md->end_subject)
3118      if (utf8)        {
3119          SCHECK_PARTIAL();
3120          RRETURN(MATCH_NOMATCH);
3121          }
3122    
3123    #ifdef SUPPORT_UTF
3124        if (utf)
3125        {        {
3126        length = 1;        length = 1;
3127        ecode++;        ecode++;
3128        GETCHARLEN(fc, ecode, length);        GETCHARLEN(fc, ecode, length);
3129    
       if (length > md->end_subject - eptr)  
         {  
         CHECK_PARTIAL();             /* Not SCHECK_PARTIAL() */  
         MRRETURN(MATCH_NOMATCH);  
         }  
   
3130        /* 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
3131        can use the fast lookup table. */        we know that its other case must also be one byte long, so we can use the
3132          fast lookup table. We know that there is at least one byte left in the
3133          subject. */
3134    
3135        if (fc < 128)        if (fc < 128)
3136          {          {
3137          if (md->lcc[*ecode++] != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);          if (md->lcc[fc]
3138                != TABLE_GET(*eptr, md->lcc, *eptr)) RRETURN(MATCH_NOMATCH);
3139            ecode++;
3140            eptr++;
3141          }          }
3142    
3143        /* Otherwise we must pick up the subject character */        /* Otherwise we must pick up the subject character. Note that we cannot
3144          use the value of "length" to check for sufficient bytes left, because the
3145          other case of the character may have more or fewer bytes.  */
3146    
3147        else        else
3148          {          {
# Line 2893  for (;;) Line 3158  for (;;)
3158  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3159            if (dc != UCD_OTHERCASE(fc))            if (dc != UCD_OTHERCASE(fc))
3160  #endif  #endif
3161              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3162            }            }
3163          }          }
3164        }        }
3165      else      else
3166  #endif   /* SUPPORT_UTF8 */  #endif   /* SUPPORT_UTF */
3167    
3168      /* Non-UTF-8 mode */      /* Not UTF mode */
3169        {        {
3170        if (md->end_subject - eptr < 1)        if (TABLE_GET(ecode[1], md->lcc, ecode[1])
3171          {            != TABLE_GET(*eptr, md->lcc, *eptr)) RRETURN(MATCH_NOMATCH);
3172          SCHECK_PARTIAL();            /* This one can use SCHECK_PARTIAL() */        eptr++;
         MRRETURN(MATCH_NOMATCH);  
         }  
       if (md->lcc[ecode[1]] != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);  
3173        ecode += 2;        ecode += 2;
3174        }        }
3175      break;      break;
# Line 2917  for (;;) Line 3179  for (;;)
3179      case OP_EXACT:      case OP_EXACT:
3180      case OP_EXACTI:      case OP_EXACTI:
3181      min = max = GET2(ecode, 1);      min = max = GET2(ecode, 1);
3182      ecode += 3;      ecode += 1 + IMM2_SIZE;
3183      goto REPEATCHAR;      goto REPEATCHAR;
3184    
3185      case OP_POSUPTO:      case OP_POSUPTO:
# Line 2932  for (;;) Line 3194  for (;;)
3194      min = 0;      min = 0;
3195      max = GET2(ecode, 1);      max = GET2(ecode, 1);
3196      minimize = *ecode == OP_MINUPTO || *ecode == OP_MINUPTOI;      minimize = *ecode == OP_MINUPTO || *ecode == OP_MINUPTOI;
3197      ecode += 3;      ecode += 1 + IMM2_SIZE;
3198      goto REPEATCHAR;      goto REPEATCHAR;
3199    
3200      case OP_POSSTAR:      case OP_POSSTAR:
# Line 2980  for (;;) Line 3242  for (;;)
3242      /* Common code for all repeated single-character matches. */      /* Common code for all repeated single-character matches. */
3243    
3244      REPEATCHAR:      REPEATCHAR:
3245  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3246      if (utf8)      if (utf)
3247        {        {
3248        length = 1;        length = 1;
3249        charptr = ecode;        charptr = ecode;
# Line 2997  for (;;) Line 3259  for (;;)
3259          unsigned int othercase;          unsigned int othercase;
3260          if (op >= OP_STARI &&     /* Caseless */          if (op >= OP_STARI &&     /* Caseless */
3261              (othercase = UCD_OTHERCASE(fc)) != fc)              (othercase = UCD_OTHERCASE(fc)) != fc)
3262            oclength = _pcre_ord2utf8(othercase, occhars);            oclength = PRIV(ord2utf)(othercase, occhars);
3263          else oclength = 0;          else oclength = 0;
3264  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
3265    
3266          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
3267            {            {
3268            if (eptr <= md->end_subject - length &&            if (eptr <= md->end_subject - length &&
3269              memcmp(eptr, charptr, length) == 0) eptr += length;              memcmp(eptr, charptr, IN_UCHARS(length)) == 0) eptr += length;
3270  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3271            else if (oclength > 0 &&            else if (oclength > 0 &&
3272                     eptr <= md->end_subject - oclength &&                     eptr <= md->end_subject - oclength &&
3273                     memcmp(eptr, occhars, oclength) == 0) eptr += oclength;                     memcmp(eptr, occhars, IN_UCHARS(oclength)) == 0) eptr += oclength;
3274  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
3275            else            else
3276              {              {
3277              CHECK_PARTIAL();              CHECK_PARTIAL();
3278              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3279              }              }
3280            }            }
3281    
# Line 3025  for (;;) Line 3287  for (;;)
3287              {              {
3288              RMATCH(eptr, ecode, offset_top, md, eptrb, RM22);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM22);
3289              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3290              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
3291              if (eptr <= md->end_subject - length &&              if (eptr <= md->end_subject - length &&
3292                memcmp(eptr, charptr, length) == 0) eptr += length;                memcmp(eptr, charptr, IN_UCHARS(length)) == 0) eptr += length;
3293  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3294              else if (oclength > 0 &&              else if (oclength > 0 &&
3295                       eptr <= md->end_subject - oclength &&                       eptr <= md->end_subject - oclength &&
3296                       memcmp(eptr, occhars, oclength) == 0) eptr += oclength;                       memcmp(eptr, occhars, IN_UCHARS(oclength)) == 0) eptr += oclength;
3297  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
3298              else              else
3299                {                {
3300                CHECK_PARTIAL();                CHECK_PARTIAL();
3301                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3302                }                }
3303              }              }
3304            /* Control never gets here */            /* Control never gets here */
# Line 3048  for (;;) Line 3310  for (;;)
3310            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3311              {              {
3312              if (eptr <= md->end_subject - length &&              if (eptr <= md->end_subject - length &&
3313                  memcmp(eptr, charptr, length) == 0) eptr += length;                  memcmp(eptr, charptr, IN_UCHARS(length)) == 0) eptr += length;
3314  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3315              else if (oclength > 0 &&              else if (oclength > 0 &&
3316                       eptr <= md->end_subject - oclength &&                       eptr <= md->end_subject - oclength &&
3317                       memcmp(eptr, occhars, oclength) == 0) eptr += oclength;                       memcmp(eptr, occhars, IN_UCHARS(oclength)) == 0) eptr += oclength;
3318  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
3319              else              else
3320                {                {
# Line 3067  for (;;) Line 3329  for (;;)
3329              {              {
3330              RMATCH(eptr, ecode, offset_top, md, eptrb, RM23);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM23);
3331              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3332              if (eptr == pp) { MRRETURN(MATCH_NOMATCH); }              if (eptr == pp) { RRETURN(MATCH_NOMATCH); }
3333  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3334              eptr--;              eptr--;
3335              BACKCHAR(eptr);              BACKCHAR(eptr);
# Line 3084  for (;;) Line 3346  for (;;)
3346        value of fc will always be < 128. */        value of fc will always be < 128. */
3347        }        }
3348      else      else
3349  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF */
3350          /* When not in UTF-8 mode, load a single-byte character. */
3351      /* When not in UTF-8 mode, load a single-byte character. */        fc = *ecode++;
   
     fc = *ecode++;  
3352    
3353      /* The value of fc at this point is always less than 256, though we may or      /* The value of fc at this point is always one character, though we may
3354      may not be in UTF-8 mode. The code is duplicated for the caseless and      or may not be in UTF mode. The code is duplicated for the caseless and
3355      caseful cases, for speed, since matching characters is likely to be quite      caseful cases, for speed, since matching characters is likely to be quite
3356      common. First, ensure the minimum number of matches are present. If min =      common. First, ensure the minimum number of matches are present. If min =
3357      max, continue at the same level without recursing. Otherwise, if      max, continue at the same level without recursing. Otherwise, if
# Line 3104  for (;;) Line 3364  for (;;)
3364    
3365      if (op >= OP_STARI)  /* Caseless */      if (op >= OP_STARI)  /* Caseless */
3366        {        {
3367        fc = md->lcc[fc];  #ifdef COMPILE_PCRE8
3368          /* fc must be < 128 if UTF is enabled. */
3369          foc = md->fcc[fc];
3370    #else
3371    #ifdef SUPPORT_UTF
3372    #ifdef SUPPORT_UCP
3373          if (utf && fc > 127)
3374            foc = UCD_OTHERCASE(fc);
3375    #else
3376          if (utf && fc > 127)
3377            foc = fc;
3378    #endif /* SUPPORT_UCP */
3379          else
3380    #endif /* SUPPORT_UTF */
3381            foc = TABLE_GET(fc, md->fcc, fc);
3382    #endif /* COMPILE_PCRE8 */
3383    
3384        for (i = 1; i <= min; i++)        for (i = 1; i <= min; i++)
3385          {          {
3386          if (eptr >= md->end_subject)          if (eptr >= md->end_subject)
3387            {            {
3388            SCHECK_PARTIAL();            SCHECK_PARTIAL();
3389            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
3390            }            }
3391          if (fc != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);          if (fc != *eptr && foc != *eptr) RRETURN(MATCH_NOMATCH);
3392            eptr++;
3393          }          }
3394        if (min == max) continue;        if (min == max) continue;
3395        if (minimize)        if (minimize)
# Line 3121  for (;;) Line 3398  for (;;)
3398            {            {
3399            RMATCH(eptr, ecode, offset_top, md, eptrb, RM24);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM24);
3400            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3401            if (fi >= max) MRRETURN(MATCH_NOMATCH);            if (fi >= max) RRETURN(MATCH_NOMATCH);
3402            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3403              {              {
3404              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3405              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3406              }              }
3407            if (fc != md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);            if (fc != *eptr && foc != *eptr) RRETURN(MATCH_NOMATCH);
3408              eptr++;
3409            }            }
3410          /* Control never gets here */          /* Control never gets here */
3411          }          }
# Line 3141  for (;;) Line 3419  for (;;)
3419              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3420              break;              break;
3421              }              }
3422            if (fc != md->lcc[*eptr]) break;            if (fc != *eptr && foc != *eptr) break;
3423            eptr++;            eptr++;
3424            }            }
3425    
# Line 3153  for (;;) Line 3431  for (;;)
3431            eptr--;            eptr--;
3432            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3433            }            }
3434          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3435          }          }
3436        /* Control never gets here */        /* Control never gets here */
3437        }        }
# Line 3167  for (;;) Line 3445  for (;;)
3445          if (eptr >= md->end_subject)          if (eptr >= md->end_subject)
3446            {            {
3447            SCHECK_PARTIAL();            SCHECK_PARTIAL();
3448            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
3449            }            }
3450          if (fc != *eptr++) MRRETURN(MATCH_NOMATCH);          if (fc != *eptr++) RRETURN(MATCH_NOMATCH);
3451          }          }
3452    
3453        if (min == max) continue;        if (min == max) continue;
# Line 3180  for (;;) Line 3458  for (;;)
3458            {            {
3459            RMATCH(eptr, ecode, offset_top, md, eptrb, RM26);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM26);
3460            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3461            if (fi >= max) MRRETURN(MATCH_NOMATCH);            if (fi >= max) RRETURN(MATCH_NOMATCH);
3462            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3463              {              {
3464              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3465              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3466              }              }
3467            if (fc != *eptr++) MRRETURN(MATCH_NOMATCH);            if (fc != *eptr++) RRETURN(MATCH_NOMATCH);
3468            }            }
3469          /* Control never gets here */          /* Control never gets here */
3470          }          }
# Line 3211  for (;;) Line 3489  for (;;)
3489            eptr--;            eptr--;
3490            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3491            }            }
3492          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3493          }          }
3494        }        }
3495      /* Control never gets here */      /* Control never gets here */
# Line 3224  for (;;) Line 3502  for (;;)
3502      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
3503        {        {
3504        SCHECK_PARTIAL();        SCHECK_PARTIAL();
3505        MRRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
3506        }        }
3507      ecode++;      ecode++;
3508      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
3509      if (op == OP_NOTI)         /* The caseless case */      if (op == OP_NOTI)         /* The caseless case */
3510        {        {
3511  #ifdef SUPPORT_UTF8        register int ch, och;
3512        if (c < 256)        ch = *ecode++;
3513  #endif  #ifdef COMPILE_PCRE8
3514        c = md->lcc[c];        /* ch must be < 128 if UTF is enabled. */
3515        if (md->lcc[*ecode++] == c) MRRETURN(MATCH_NOMATCH);        och = md->fcc[ch];
3516    #else
3517    #ifdef SUPPORT_UTF
3518    #ifdef SUPPORT_UCP
3519          if (utf && ch > 127)
3520            och = UCD_OTHERCASE(ch);
3521    #else
3522          if (utf && ch > 127)
3523            och = ch;
3524    #endif /* SUPPORT_UCP */
3525          else
3526    #endif /* SUPPORT_UTF */
3527            och = TABLE_GET(ch, md->fcc, ch);
3528    #endif /* COMPILE_PCRE8 */
3529          if (ch == c || och == c) RRETURN(MATCH_NOMATCH);
3530        }        }
3531      else    /* Caseful */      else    /* Caseful */
3532        {        {
3533        if (*ecode++ == c) MRRETURN(MATCH_NOMATCH);        if (*ecode++ == c) RRETURN(MATCH_NOMATCH);
3534        }        }
3535      break;      break;
3536    
# Line 3252  for (;;) Line 3544  for (;;)
3544      case OP_NOTEXACT:      case OP_NOTEXACT:
3545      case OP_NOTEXACTI:      case OP_NOTEXACTI:
3546      min = max = GET2(ecode, 1);      min = max = GET2(ecode, 1);
3547      ecode += 3;      ecode += 1 + IMM2_SIZE;
3548      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3549    
3550      case OP_NOTUPTO:      case OP_NOTUPTO:
# Line 3262  for (;;) Line 3554  for (;;)
3554      min = 0;      min = 0;
3555      max = GET2(ecode, 1);      max = GET2(ecode, 1);
3556      minimize = *ecode == OP_NOTMINUPTO || *ecode == OP_NOTMINUPTOI;      minimize = *ecode == OP_NOTMINUPTO || *ecode == OP_NOTMINUPTOI;
3557      ecode += 3;      ecode += 1 + IMM2_SIZE;
3558      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3559    
3560      case OP_NOTPOSSTAR:      case OP_NOTPOSSTAR:
# Line 3294  for (;;) Line 3586  for (;;)
3586      possessive = TRUE;      possessive = TRUE;
3587      min = 0;      min = 0;
3588      max = GET2(ecode, 1);      max = GET2(ecode, 1);
3589      ecode += 3;      ecode += 1 + IMM2_SIZE;
3590      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3591    
3592      case OP_NOTSTAR:      case OP_NOTSTAR:
# Line 3333  for (;;) Line 3625  for (;;)
3625    
3626      if (op >= OP_NOTSTARI)     /* Caseless */      if (op >= OP_NOTSTARI)     /* Caseless */
3627        {        {
3628        fc = md->lcc[fc];  #ifdef COMPILE_PCRE8
3629          /* fc must be < 128 if UTF is enabled. */
3630          foc = md->fcc[fc];
3631    #else
3632    #ifdef SUPPORT_UTF
3633    #ifdef SUPPORT_UCP
3634          if (utf && fc > 127)
3635            foc = UCD_OTHERCASE(fc);
3636    #else
3637          if (utf && fc > 127)
3638            foc = fc;
3639    #endif /* SUPPORT_UCP */
3640          else
3641    #endif /* SUPPORT_UTF */
3642            foc = TABLE_GET(fc, md->fcc, fc);
3643    #endif /* COMPILE_PCRE8 */
3644    
3645  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3646        /* UTF-8 mode */        if (utf)
       if (utf8)  
3647          {          {
3648          register unsigned int d;          register unsigned int d;
3649          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
# Line 3345  for (;;) Line 3651  for (;;)
3651            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3652              {              {
3653              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3654              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3655              }              }
3656            GETCHARINC(d, eptr);            GETCHARINC(d, eptr);
3657            if (d < 256) d = md->lcc[d];            if (fc == d || foc == d) RRETURN(MATCH_NOMATCH);
           if (fc == d) MRRETURN(MATCH_NOMATCH);  
3658            }            }
3659          }          }
3660        else        else
3661  #endif  #endif
3662          /* Not UTF mode */
       /* Not UTF-8 mode */  
3663          {          {
3664          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
3665            {            {
3666            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3667              {              {
3668              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3669              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3670              }              }
3671            if (fc == md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);            if (fc == *eptr || foc == *eptr) RRETURN(MATCH_NOMATCH);
3672              eptr++;
3673            }            }
3674          }          }
3675    
# Line 3372  for (;;) Line 3677  for (;;)
3677    
3678        if (minimize)        if (minimize)
3679          {          {
3680  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3681          /* UTF-8 mode */          if (utf)
         if (utf8)  
3682            {            {
3683            register unsigned int d;            register unsigned int d;
3684            for (fi = min;; fi++)            for (fi = min;; fi++)
3685              {              {
3686              RMATCH(eptr, ecode, offset_top, md, eptrb, RM28);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM28);
3687              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3688              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
3689              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3690                {                {
3691                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3692                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3693                }                }
3694              GETCHARINC(d, eptr);              GETCHARINC(d, eptr);
3695              if (d < 256) d = md->lcc[d];              if (fc == d || foc == d) RRETURN(MATCH_NOMATCH);
             if (fc == d) MRRETURN(MATCH_NOMATCH);  
3696              }              }
3697            }            }
3698          else          else
3699  #endif  #endif
3700          /* Not UTF-8 mode */          /* Not UTF mode */
3701            {            {
3702            for (fi = min;; fi++)            for (fi = min;; fi++)
3703              {              {
3704              RMATCH(eptr, ecode, offset_top, md, eptrb, RM29);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM29);
3705              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3706              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
3707              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3708                {                {
3709                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3710                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3711                }                }
3712              if (fc == md->lcc[*eptr++]) MRRETURN(MATCH_NOMATCH);              if (fc == *eptr || foc == *eptr) RRETURN(MATCH_NOMATCH);
3713                eptr++;
3714              }              }
3715            }            }
3716          /* Control never gets here */          /* Control never gets here */
# Line 3418  for (;;) Line 3722  for (;;)
3722          {          {
3723          pp = eptr;          pp = eptr;
3724    
3725  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3726          /* UTF-8 mode */          if (utf)
         if (utf8)  
3727            {            {
3728            register unsigned int d;            register unsigned int d;
3729            for (i = min; i < max; i++)            for (i = min; i < max; i++)
# Line 3432  for (;;) Line 3735  for (;;)
3735                break;                break;
3736                }                }
3737              GETCHARLEN(d, eptr, len);              GETCHARLEN(d, eptr, len);
3738              if (d < 256) d = md->lcc[d];              if (fc == d || foc == d) break;
             if (fc == d) break;  
3739              eptr += len;              eptr += len;
3740              }              }
3741          if (possessive) continue;            if (possessive) continue;
3742          for(;;)            for(;;)
3743              {              {
3744              RMATCH(eptr, ecode, offset_top, md, eptrb, RM30);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM30);
3745              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
# Line 3447  for (;;) Line 3749  for (;;)
3749            }            }
3750          else          else
3751  #endif  #endif
3752          /* Not UTF-8 mode */          /* Not UTF mode */
3753            {            {
3754            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3755              {              {
# Line 3456  for (;;) Line 3758  for (;;)
3758                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3759                break;                break;
3760                }                }
3761              if (fc == md->lcc[*eptr]) break;              if (fc == *eptr || foc == *eptr) break;
3762              eptr++;              eptr++;
3763              }              }
3764            if (possessive) continue;            if (possessive) continue;
# Line 3468  for (;;) Line 3770  for (;;)
3770              }              }
3771            }            }
3772    
3773          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3774          }          }
3775        /* Control never gets here */        /* Control never gets here */
3776        }        }
# Line 3477  for (;;) Line 3779  for (;;)
3779    
3780      else      else
3781        {        {
3782  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3783        /* UTF-8 mode */        if (utf)
       if (utf8)  
3784          {          {
3785          register unsigned int d;          register unsigned int d;
3786          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
# Line 3487  for (;;) Line 3788  for (;;)
3788            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3789              {              {
3790              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3791              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3792              }              }
3793            GETCHARINC(d, eptr);            GETCHARINC(d, eptr);
3794            if (fc == d) MRRETURN(MATCH_NOMATCH);            if (fc == d) RRETURN(MATCH_NOMATCH);
3795            }            }
3796          }          }
3797        else        else
3798  #endif  #endif
3799        /* Not UTF-8 mode */        /* Not UTF mode */
3800          {          {
3801          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
3802            {            {
3803            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3804              {              {
3805              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3806              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3807              }              }
3808            if (fc == *eptr++) MRRETURN(MATCH_NOMATCH);            if (fc == *eptr++) RRETURN(MATCH_NOMATCH);
3809            }            }
3810          }          }
3811    
# Line 3512  for (;;) Line 3813  for (;;)
3813    
3814        if (minimize)        if (minimize)
3815          {          {
3816  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3817          /* UTF-8 mode */          if (utf)
         if (utf8)  
3818            {            {
3819            register unsigned int d;            register unsigned int d;
3820            for (fi = min;; fi++)            for (fi = min;; fi++)
3821              {              {
3822              RMATCH(eptr, ecode, offset_top, md, eptrb, RM32);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM32);
3823              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3824              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
3825              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3826                {                {
3827                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3828                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3829                }                }
3830              GETCHARINC(d, eptr);              GETCHARINC(d, eptr);
3831              if (fc == d) MRRETURN(MATCH_NOMATCH);              if (fc == d) RRETURN(MATCH_NOMATCH);
3832              }              }
3833            }            }
3834          else          else
3835  #endif  #endif
3836          /* Not UTF-8 mode */          /* Not UTF mode */
3837            {            {
3838            for (fi = min;; fi++)            for (fi = min;; fi++)
3839              {              {
3840              RMATCH(eptr, ecode, offset_top, md, eptrb, RM33);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM33);
3841              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3842              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
3843              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3844                {                {
3845                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3846                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3847                }                }
3848              if (fc == *eptr++) MRRETURN(MATCH_NOMATCH);              if (fc == *eptr++) RRETURN(MATCH_NOMATCH);
3849              }              }
3850            }            }
3851          /* Control never gets here */          /* Control never gets here */
# Line 3557  for (;;) Line 3857  for (;;)
3857          {          {
3858          pp = eptr;          pp = eptr;
3859    
3860  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
3861          /* UTF-8 mode */          if (utf)
         if (utf8)  
3862            {            {
3863            register unsigned int d;            register unsigned int d;
3864            for (i = min; i < max; i++)            for (i = min; i < max; i++)
# Line 3585  for (;;) Line 3884  for (;;)
3884            }            }
3885          else          else
3886  #endif  #endif
3887          /* Not UTF-8 mode */          /* Not UTF mode */
3888            {            {
3889            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3890              {              {
# Line 3606  for (;;) Line 3905  for (;;)
3905              }              }
3906            }            }
3907    
3908          MRRETURN(MATCH_NOMATCH);          RRETURN(MATCH_NOMATCH);
3909          }          }
3910        }        }
3911      /* Control never gets here */      /* Control never gets here */
# Line 3618  for (;;) Line 3917  for (;;)
3917      case OP_TYPEEXACT:      case OP_TYPEEXACT:
3918      min = max = GET2(ecode, 1);      min = max = GET2(ecode, 1);
3919      minimize = TRUE;      minimize = TRUE;
3920      ecode += 3;      ecode += 1 + IMM2_SIZE;
3921      goto REPEATTYPE;      goto REPEATTYPE;
3922    
3923      case OP_TYPEUPTO:      case OP_TYPEUPTO:
# Line 3626  for (;;) Line 3925  for (;;)
3925      min = 0;      min = 0;
3926      max = GET2(ecode, 1);      max = GET2(ecode, 1);
3927      minimize = *ecode == OP_TYPEMINUPTO;      minimize = *ecode == OP_TYPEMINUPTO;
3928      ecode += 3;      ecode += 1 + IMM2_SIZE;
3929      goto REPEATTYPE;      goto REPEATTYPE;
3930    
3931      case OP_TYPEPOSSTAR:      case OP_TYPEPOSSTAR:
# Line 3654  for (;;) Line 3953  for (;;)
3953      possessive = TRUE;      possessive = TRUE;
3954      min = 0;      min = 0;
3955      max = GET2(ecode, 1);      max = GET2(ecode, 1);
3956      ecode += 3;      ecode += 1 + IMM2_SIZE;
3957      goto REPEATTYPE;      goto REPEATTYPE;
3958    
3959      case OP_TYPESTAR:      case OP_TYPESTAR:
# Line 3700  for (;;) Line 3999  for (;;)
3999          switch(prop_type)          switch(prop_type)
4000            {            {
4001            case PT_ANY:            case PT_ANY:
4002            if (prop_fail_result) MRRETURN(MATCH_NOMATCH);            if (prop_fail_result) RRETURN(MATCH_NOMATCH);
4003            for (i = 1; i <= min; i++)            for (i = 1; i <= min; i++)
4004              {              {
4005              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4006                {                {
4007                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4008                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4009                }                }
4010              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4011              }              }
# Line 3719  for (;;) Line 4018  for (;;)
4018              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4019                {                {
4020                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4021                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4022                }                }
4023              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4024              chartype = UCD_CHARTYPE(c);              chartype = UCD_CHARTYPE(c);
4025              if ((chartype == ucp_Lu ||              if ((chartype == ucp_Lu ||
4026                   chartype == ucp_Ll ||                   chartype == ucp_Ll ||
4027                   chartype == ucp_Lt) == prop_fail_result)                   chartype == ucp_Lt) == prop_fail_result)
4028                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4029              }              }
4030            break;            break;
4031    
# Line 3736  for (;;) Line 4035  for (;;)
4035              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4036                {                {
4037                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4038                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4039                }                }
4040              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4041              if ((UCD_CATEGORY(c) == prop_value) == prop_fail_result)              if ((UCD_CATEGORY(c) == prop_value) == prop_fail_result)
4042                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4043              }              }
4044            break;            break;
4045    
# Line 3750  for (;;) Line 4049  for (;;)
4049              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4050                {                {
4051                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4052                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4053                }                }
4054              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4055              if ((UCD_CHARTYPE(c) == prop_value) == prop_fail_result)              if ((UCD_CHARTYPE(c) == prop_value) == prop_fail_result)
4056                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4057              }              }
4058            break;            break;
4059    
# Line 3764  for (;;) Line 4063  for (;;)
4063              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4064                {                {
4065                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4066                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4067                }                }
4068              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4069              if ((UCD_SCRIPT(c) == prop_value) == prop_fail_result)              if ((UCD_SCRIPT(c) == prop_value) == prop_fail_result)
4070                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4071              }              }
4072            break;            break;
4073    
# Line 3779  for (;;) Line 4078  for (;;)
4078              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4079                {                {
4080                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4081                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4082                }                }
4083              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4084              category = UCD_CATEGORY(c);              category = UCD_CATEGORY(c);
4085              if ((category == ucp_L || category == ucp_N) == prop_fail_result)              if ((category == ucp_L || category == ucp_N) == prop_fail_result)
4086                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4087              }              }
4088            break;            break;
4089    
# Line 3794  for (;;) Line 4093  for (;;)
4093              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4094                {                {
4095                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4096                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4097                }                }
4098              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4099              if ((UCD_CATEGORY(c) == ucp_Z || c == CHAR_HT || c == CHAR_NL ||              if ((UCD_CATEGORY(c) == ucp_Z || c == CHAR_HT || c == CHAR_NL ||
4100                   c == CHAR_FF || c == CHAR_CR)                   c == CHAR_FF || c == CHAR_CR)
4101                     == prop_fail_result)                     == prop_fail_result)
4102                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4103              }              }
4104            break;            break;
4105    
# Line 3810  for (;;) Line 4109  for (;;)
4109              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4110                {                {
4111                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4112                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4113                }                }
4114              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4115              if ((UCD_CATEGORY(c) == ucp_Z || c == CHAR_HT || c == CHAR_NL ||              if ((UCD_CATEGORY(c) == ucp_Z || c == CHAR_HT || c == CHAR_NL ||
4116                   c == CHAR_VT || c == CHAR_FF || c == CHAR_CR)                   c == CHAR_VT || c == CHAR_FF || c == CHAR_CR)
4117                     == prop_fail_result)                     == prop_fail_result)
4118                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4119              }              }
4120            break;            break;
4121    
# Line 3827  for (;;) Line 4126  for (;;)
4126              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4127                {                {
4128                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4129                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4130                }                }
4131              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4132              category = UCD_CATEGORY(c);              category = UCD_CATEGORY(c);
4133              if ((category == ucp_L || category == ucp_N || c == CHAR_UNDERSCORE)              if ((category == ucp_L || category == ucp_N || c == CHAR_UNDERSCORE)
4134                     == prop_fail_result)                     == prop_fail_result)
4135                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4136              }              }
4137            break;            break;
4138    
# Line 3854  for (;;) Line 4153  for (;;)
4153            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4154              {              {
4155              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4156              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4157              }              }
4158            GETCHARINCTEST(c, eptr);            GETCHARINCTEST(c, eptr);
4159            if (UCD_CATEGORY(c) == ucp_M) MRRETURN(MATCH_NOMATCH);            if (UCD_CATEGORY(c) == ucp_M) RRETURN(MATCH_NOMATCH);
4160            while (eptr < md->end_subject)            while (eptr < md->end_subject)
4161              {              {
4162              int len = 1;              int len = 1;
4163              if (!utf8) c = *eptr; else { GETCHARLEN(c, eptr, len); }              if (!utf) c = *eptr; else { GETCHARLEN(c, eptr, len); }
4164              if (UCD_CATEGORY(c) != ucp_M) break;              if (UCD_CATEGORY(c) != ucp_M) break;
4165              eptr += len;              eptr += len;
4166              }              }
# Line 3873  for (;;) Line 4172  for (;;)
4172    
4173  /* Handle all other cases when the coding is UTF-8 */  /* Handle all other cases when the coding is UTF-8 */
4174    
4175  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
4176        if (utf8) switch(ctype)        if (utf) switch(ctype)
4177          {          {
4178          case OP_ANY:          case OP_ANY:
4179          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
# Line 3882  for (;;) Line 4181  for (;;)
4181            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4182              {              {
4183              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4184              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4185              }              }
4186            if (IS_NEWLINE(eptr)) MRRETURN(MATCH_NOMATCH);            if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);
4187            eptr++;            eptr++;
4188            while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;            ACROSSCHAR(eptr < md->end_subject, *eptr, eptr++);
4189            }            }
4190          break;          break;
4191    
# Line 3896  for (;;) Line 4195  for (;;)
4195            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4196              {              {
4197              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4198              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4199              }              }
4200            eptr++;            eptr++;
4201            while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;            ACROSSCHAR(eptr < md->end_subject, *eptr, eptr++);
4202            }            }
4203          break;          break;
4204    
4205          case OP_ANYBYTE:          case OP_ANYBYTE:
4206          if (eptr > md->end_subject - min) MRRETURN(MATCH_NOMATCH);          if (eptr > md->end_subject - min) RRETURN(MATCH_NOMATCH);
4207          eptr += min;          eptr += min;
4208          break;          break;
4209    
# Line 3914  for (;;) Line 4213  for (;;)
4213            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4214              {              {
4215              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4216              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4217              }              }
4218            GETCHARINC(c, eptr);            GETCHARINC(c, eptr);
4219            switch(c)            switch(c)
4220              {              {
4221              default: MRRETURN(MATCH_NOMATCH);              default: RRETURN(MATCH_NOMATCH);
4222    
4223              case 0x000d:              case 0x000d:
4224              if (eptr < md->end_subject && *eptr == 0x0a) eptr++;              if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
# Line 3933  for (;;) Line 4232  for (;;)
4232              case 0x0085:              case 0x0085:
4233              case 0x2028:              case 0x2028:
4234              case 0x2029:              case 0x2029:
4235              if (md->bsr_anycrlf) MRRETURN(MATCH_NOMATCH);              if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
4236              break;              break;
4237              }              }
4238            }            }
# Line 3945  for (;;) Line 4244  for (;;)
4244            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4245              {              {
4246              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4247              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4248              }              }
4249            GETCHARINC(c, eptr);            GETCHARINC(c, eptr);
4250            switch(c)            switch(c)
# Line 3970  for (;;) Line 4269  for (;;)
4269              case 0x202f:    /* NARROW NO-BREAK SPACE */              case 0x202f:    /* NARROW NO-BREAK SPACE */
4270              case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */              case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
4271              case 0x3000:    /* IDEOGRAPHIC SPACE */              case 0x3000:    /* IDEOGRAPHIC SPACE */
4272              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4273              }              }
4274            }            }
4275          break;          break;
# Line 3981  for (;;) Line 4280  for (;;)
4280            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4281              {              {
4282              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4283              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4284              }              }
4285            GETCHARINC(c, eptr);            GETCHARINC(c, eptr);
4286            switch(c)            switch(c)
4287              {              {
4288              default: MRRETURN(MATCH_NOMATCH);              default: RRETURN(MATCH_NOMATCH);
4289              case 0x09:      /* HT */              case 0x09:      /* HT */
4290              case 0x20:      /* SPACE */              case 0x20:      /* SPACE */
4291              case 0xa0:      /* NBSP */              case 0xa0:      /* NBSP */
# Line 4017  for (;;) Line 4316  for (;;)
4316            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4317              {              {
4318              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4319              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4320              }              }
4321            GETCHARINC(c, eptr);            GETCHARINC(c, eptr);
4322            switch(c)            switch(c)
# Line 4030  for (;;) Line 4329  for (;;)
4329              case 0x85:      /* NEL */              case 0x85:      /* NEL */
4330              case 0x2028:    /* LINE SEPARATOR */              case 0x2028:    /* LINE SEPARATOR */
4331              case 0x2029:    /* PARAGRAPH SEPARATOR */              case 0x2029:    /* PARAGRAPH SEPARATOR */
4332              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4333              }              }
4334            }            }
4335          break;          break;
# Line 4041  for (;;) Line 4340  for (;;)
4340            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4341              {              {
4342              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4343              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4344              }              }
4345            GETCHARINC(c, eptr);            GETCHARINC(c, eptr);
4346            switch(c)            switch(c)
4347              {              {
4348              default: MRRETURN(MATCH_NOMATCH);              default: RRETURN(MATCH_NOMATCH);
4349              case 0x0a:      /* LF */              case 0x0a:      /* LF */
4350              case 0x0b:      /* VT */              case 0x0b:      /* VT */
4351              case 0x0c:      /* FF */              case 0x0c:      /* FF */
# Line 4065  for (;;) Line 4364  for (;;)
4364            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4365              {              {
4366              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4367              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4368              }              }
4369            GETCHARINC(c, eptr);            GETCHARINC(c, eptr);
4370            if (c < 128 && (md->ctypes[c] & ctype_digit) != 0)            if (c < 128 && (md->ctypes[c] & ctype_digit) != 0)
4371              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4372            }            }
4373          break;          break;
4374    
# Line 4079  for (;;) Line 4378  for (;;)
4378            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4379              {              {
4380              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4381              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4382              }              }
4383            if (*eptr >= 128 || (md->ctypes[*eptr++] & ctype_digit) == 0)            if (*eptr >= 128 || (md->ctypes[*eptr] & ctype_digit) == 0)
4384              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4385              eptr++;
4386            /* 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 */
4387            }            }
4388          break;          break;
# Line 4093  for (;;) Line 4393  for (;;)
4393            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4394              {              {
4395              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4396              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4397              }              }
4398            if (*eptr < 128 && (md->ctypes[*eptr] & ctype_space) != 0)            if (*eptr < 128 && (md->ctypes[*eptr] & ctype_space) != 0)
4399              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4400            while (++eptr < md->end_subject && (*eptr & 0xc0) == 0x80);            eptr++;
4401              ACROSSCHAR(eptr < md->end_subject, *eptr, eptr++);
4402            }            }
4403          break;          break;
4404    
# Line 4107  for (;;) Line 4408  for (;;)
4408            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4409              {              {
4410              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4411              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4412              }              }
4413            if (*eptr >= 128 || (md->ctypes[*eptr++] & ctype_space) == 0)            if (*eptr >= 128 || (md->ctypes[*eptr] & ctype_space) == 0)
4414              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4415              eptr++;
4416            /* 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 */
4417            }            }
4418          break;          break;
# Line 4121  for (;;) Line 4423  for (;;)
4423            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4424              {              {
4425              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4426              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4427              }              }
4428            if (*eptr < 128 && (md->ctypes[*eptr] & ctype_word) != 0)            if (*eptr < 128 && (md->ctypes[*eptr] & ctype_word) != 0)
4429              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4430            while (++eptr < md->end_subject && (*eptr & 0xc0) == 0x80);            eptr++;
4431              ACROSSCHAR(eptr < md->end_subject, *eptr, eptr++);
4432            }            }
4433          break;          break;
4434    
# Line 4135  for (;;) Line 4438  for (;;)
4438            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4439              {              {
4440              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4441              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4442              }              }
4443            if (*eptr >= 128 || (md->ctypes[*eptr++] & ctype_word) == 0)            if (*eptr >= 128 || (md->ctypes[*eptr] & ctype_word) == 0)
4444              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4445              eptr++;
4446            /* 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 */
4447            }            }
4448          break;          break;
# Line 4148  for (;;) Line 4452  for (;;)
4452          }  /* End switch(ctype) */          }  /* End switch(ctype) */
4453    
4454        else        else
4455  #endif     /* SUPPORT_UTF8 */  #endif     /* SUPPORT_UTF */
4456    
4457        /* Code for the non-UTF-8 case for minimum matching of operators other        /* Code for the non-UTF-8 case for minimum matching of operators other
4458        than OP_PROP and OP_NOTPROP. */        than OP_PROP and OP_NOTPROP. */
# Line 4161  for (;;) Line 4465  for (;;)
4465            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4466              {              {
4467              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4468              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4469              }              }
4470            if (IS_NEWLINE(eptr)) MRRETURN(MATCH_NOMATCH);            if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);
4471            eptr++;            eptr++;
4472            }            }
4473          break;          break;
# Line 4172  for (;;) Line 4476  for (;;)
4476          if (eptr > md->end_subject - min)          if (eptr > md->end_subject - min)
4477            {            {
4478            SCHECK_PARTIAL();            SCHECK_PARTIAL();
4479            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
4480            }            }
4481          eptr += min;          eptr += min;
4482          break;          break;
# Line 4181  for (;;) Line 4485  for (;;)
4485          if (eptr > md->end_subject - min)          if (eptr > md->end_subject - min)
4486            {            {
4487            SCHECK_PARTIAL();            SCHECK_PARTIAL();
4488            MRRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
4489            }            }
4490          eptr += min;          eptr += min;
4491          break;          break;
# Line 4192  for (;;) Line 4496  for (;;)
4496            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4497              {              {
4498              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4499              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4500              }              }
4501            switch(*eptr++)            switch(*eptr++)
4502              {              {
4503              default: MRRETURN(MATCH_NOMATCH);              default: RRETURN(MATCH_NOMATCH);
4504    
4505              case 0x000d:              case 0x000d:
4506              if (eptr < md->end_subject && *eptr == 0x0a) eptr++;              if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
# Line 4208  for (;;) Line 4512  for (;;)
4512              case 0x000b:              case 0x000b:
4513              case 0x000c:              case 0x000c:
4514              case 0x0085:              case 0x0085:
4515              if (md->bsr_anycrlf) MRRETURN(MATCH_NOMATCH);  #ifdef COMPILE_PCRE16
4516                case 0x2028:
4517                case 0x2029:
4518    #endif
4519                if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
4520              break;              break;
4521              }              }
4522            }            }
# Line 4220  for (;;) Line 4528  for (;;)
4528            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4529              {              {
4530              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4531              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4532              }              }
4533            switch(*eptr++)            switch(*eptr++)
4534              {              {
# Line 4228  for (;;) Line 4536  for (;;)
4536              case 0x09:      /* HT */              case 0x09:      /* HT */
4537              case 0x20:      /* SPACE */              case 0x20:      /* SPACE */
4538              case 0xa0:      /* NBSP */              case 0xa0:      /* NBSP */
4539              MRRETURN(MATCH_NOMATCH);  #ifdef COMPILE_PCRE16
4540                case 0x1680:    /* OGHAM SPACE MARK */
4541                case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
4542                case 0x2000:    /* EN QUAD */
4543                case 0x2001:    /* EM QUAD */
4544                case 0x2002:    /* EN SPACE */
4545                case 0x2003:    /* EM SPACE */
4546                case 0x2004:    /* THREE-PER-EM SPACE */
4547                case 0x2005:    /* FOUR-PER-EM SPACE */
4548                case 0x2006:    /* SIX-PER-EM SPACE */
4549                case 0x2007:    /* FIGURE SPACE */
4550                case 0x2008:    /* PUNCTUATION SPACE */
4551                case 0x2009:    /* THIN SPACE */
4552                case 0x200A:    /* HAIR SPACE */
4553                case 0x202f:    /* NARROW NO-BREAK SPACE */
4554                case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
4555                case 0x3000:    /* IDEOGRAPHIC SPACE */
4556    #endif
4557                RRETURN(MATCH_NOMATCH);
4558              }              }
4559            }            }
4560          break;          break;
# Line 4239  for (;;) Line 4565  for (;;)
4565            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4566              {              {
4567              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4568              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4569              }              }
4570            switch(*eptr++)            switch(*eptr++)
4571              {              {
4572              default: MRRETURN(MATCH_NOMATCH);              default: RRETURN(MATCH_NOMATCH);
4573              case 0x09:      /* HT */              case 0x09:      /* HT */
4574              case 0x20:      /* SPACE */              case 0x20:      /* SPACE */
4575              case 0xa0:      /* NBSP */              case 0xa0:      /* NBSP */
4576    #ifdef COMPILE_PCRE16
4577                case 0x1680:    /* OGHAM SPACE MARK */
4578                case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
4579                case 0x2000:    /* EN QUAD */
4580                case 0x2001:    /* EM QUAD */
4581                case 0x2002:    /* EN SPACE */
4582                case 0x2003:    /* EM SPACE */
4583                case 0x2004:    /* THREE-PER-EM SPACE */
4584                case 0x2005:    /* FOUR-PER-EM SPACE */
4585                case 0x2006:    /* SIX-PER-EM SPACE */
4586                case 0x2007:    /* FIGURE SPACE */
4587                case 0x2008:    /* PUNCTUATION SPACE */
4588                case 0x2009:    /* THIN SPACE */
4589                case 0x200A:    /* HAIR SPACE */
4590                case 0x202f:    /* NARROW NO-BREAK SPACE */
4591                case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
4592                case 0x3000:    /* IDEOGRAPHIC SPACE */
4593    #endif
4594              break;              break;
4595              }              }
4596            }            }
# Line 4258  for (;;) Line 4602  for (;;)
4602            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4603              {              {
4604              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4605              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4606              }              }
4607            switch(*eptr++)            switch(*eptr++)
4608              {              {
# Line 4268  for (;;) Line 4612  for (;;)
4612              case 0x0c:      /* FF */              case 0x0c:      /* FF */
4613              case 0x0d:      /* CR */              case 0x0d:      /* CR */
4614              case 0x85:      /* NEL */              case 0x85:      /* NEL */
4615              MRRETURN(MATCH_NOMATCH);  #ifdef COMPILE_PCRE16
4616                case 0x2028:    /* LINE SEPARATOR */
4617                case 0x2029:    /* PARAGRAPH SEPARATOR */
4618    #endif
4619                RRETURN(MATCH_NOMATCH);
4620              }              }
4621            }            }
4622          break;          break;
# Line 4279  for (;;) Line 4627  for (;;)
4627            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4628              {              {
4629              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4630              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4631              }              }
4632            switch(*eptr++)            switch(*eptr++)
4633              {              {
4634              default: MRRETURN(MATCH_NOMATCH);              default: RRETURN(MATCH_NOMATCH);
4635              case 0x0a:      /* LF */              case 0x0a:      /* LF */
4636              case 0x0b:      /* VT */              case 0x0b:      /* VT */
4637              case 0x0c:      /* FF */              case 0x0c:      /* FF */
4638              case 0x0d:      /* CR */              case 0x0d:      /* CR */
4639              case 0x85:      /* NEL */              case 0x85:      /* NEL */
4640    #ifdef COMPILE_PCRE16
4641                case 0x2028:    /* LINE SEPARATOR */
4642                case 0x2029:    /* PARAGRAPH SEPARATOR */
4643    #endif
4644              break;              break;
4645              }              }
4646            }            }
# Line 4300  for (;;) Line 4652  for (;;)
4652            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4653              {              {
4654              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4655              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4656              }              }
4657            if ((md->ctypes[*eptr++] & ctype_digit) != 0) MRRETURN(MATCH_NOMATCH);            if (MAX_255(*eptr) && (md->ctypes[*eptr] & ctype_digit) != 0)
4658                RRETURN(MATCH_NOMATCH);
4659              eptr++;
4660            }            }
4661          break;          break;
4662    
# Line 4312  for (;;) Line 4666  for (;;)
4666            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4667              {              {
4668              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4669              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4670              }              }
4671            if ((md->ctypes[*eptr++] & ctype_digit) == 0) MRRETURN(MATCH_NOMATCH);            if (!MAX_255(*eptr) || (md->ctypes[*eptr] & ctype_digit) == 0)
4672                RRETURN(MATCH_NOMATCH);
4673              eptr++;
4674            }            }
4675          break;          break;
4676    
# Line 4324  for (;;) Line 4680  for (;;)
4680            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4681              {              {
4682              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4683              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4684              }              }
4685            if ((md->ctypes[*eptr++] & ctype_space) != 0) MRRETURN(MATCH_NOMATCH);            if (MAX_255(*eptr) && (md->ctypes[*eptr] & ctype_space) != 0)
4686                RRETURN(MATCH_NOMATCH);
4687              eptr++;
4688            }            }
4689          break;          break;
4690    
# Line 4336  for (;;) Line 4694  for (;;)
4694            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4695              {              {
4696              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4697              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4698              }              }
4699            if ((md->ctypes[*eptr++] & ctype_space) == 0) MRRETURN(MATCH_NOMATCH);            if (!MAX_255(*eptr) || (md->ctypes[*eptr] & ctype_space) == 0)
4700                RRETURN(MATCH_NOMATCH);
4701              eptr++;
4702            }            }
4703          break;          break;
4704    
# Line 4348  for (;;) Line 4708  for (;;)
4708            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4709              {              {
4710              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4711              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4712              }              }
4713            if ((md->ctypes[*eptr++] & ctype_word) != 0)            if (MAX_255(*eptr) && (md->ctypes[*eptr] & ctype_word) != 0)
4714              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4715              eptr++;
4716            }            }
4717          break;          break;
4718    
# Line 4361  for (;;) Line 4722  for (;;)
4722            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4723              {              {
4724              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4725              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4726              }              }
4727            if ((md->ctypes[*eptr++] & ctype_word) == 0)            if (!MAX_255(*eptr) || (md->ctypes[*eptr] & ctype_word) == 0)
4728              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4729              eptr++;
4730            }            }
4731          break;          break;
4732    
# Line 4393  for (;;) Line 4755  for (;;)
4755              {              {
4756              RMATCH(eptr, ecode, offset_top, md, eptrb, RM36);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM36);
4757              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4758              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
4759              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4760                {                {
4761                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4762                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4763                }                }
4764              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4765              if (prop_fail_result) MRRETURN(MATCH_NOMATCH);              if (prop_fail_result) RRETURN(MATCH_NOMATCH);
4766              }              }
4767            /* Control never gets here */            /* Control never gets here */
4768    
# Line 4410  for (;;) Line 4772  for (;;)
4772              int chartype;              int chartype;
4773              RMATCH(eptr, ecode, offset_top, md, eptrb, RM37);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM37);
4774              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4775              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
4776              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4777                {                {
4778                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4779                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4780                }                }
4781              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4782              chartype = UCD_CHARTYPE(c);              chartype = UCD_CHARTYPE(c);
4783              if ((chartype == ucp_Lu ||              if ((chartype == ucp_Lu ||
4784                   chartype == ucp_Ll ||                   chartype == ucp_Ll ||
4785                   chartype == ucp_Lt) == prop_fail_result)                   chartype == ucp_Lt) == prop_fail_result)
4786                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4787              }              }
4788            /* Control never gets here */            /* Control never gets here */
4789    
# Line 4430  for (;;) Line 4792  for (;;)
4792              {              {
4793              RMATCH(eptr, ecode, offset_top, md, eptrb, RM38);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM38);
4794              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4795              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
4796              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4797                {                {
4798                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4799                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4800                }                }
4801              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4802              if ((UCD_CATEGORY(c) == prop_value) == prop_fail_result)              if ((UCD_CATEGORY(c) == prop_value) == prop_fail_result)
4803                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4804              }              }
4805            /* Control never gets here */            /* Control never gets here */
4806    
# Line 4447  for (;;) Line 4809  for (;;)
4809              {              {
4810              RMATCH(eptr, ecode, offset_top, md, eptrb, RM39);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM39);
4811              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4812              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
4813              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4814                {                {
4815                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4816                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4817                }                }
4818              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4819              if ((UCD_CHARTYPE(c) == prop_value) == prop_fail_result)              if ((UCD_CHARTYPE(c) == prop_value) == prop_fail_result)
4820                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4821              }              }
4822            /* Control never gets here */            /* Control never gets here */
4823    
# Line 4464  for (;;) Line 4826  for (;;)
4826              {              {
4827              RMATCH(eptr, ecode, offset_top, md, eptrb, RM40);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM40);
4828              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4829              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
4830              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4831                {                {
4832                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4833                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4834                }                }
4835              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4836              if ((UCD_SCRIPT(c) == prop_value) == prop_fail_result)              if ((UCD_SCRIPT(c) == prop_value) == prop_fail_result)
4837                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4838              }              }
4839            /* Control never gets here */            /* Control never gets here */
4840    
# Line 4482  for (;;) Line 4844  for (;;)
4844              int category;              int category;
4845              RMATCH(eptr, ecode, offset_top, md, eptrb, RM59);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM59);
4846              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4847              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
4848              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4849                {                {
4850                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4851                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4852                }                }
4853              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4854              category = UCD_CATEGORY(c);              category = UCD_CATEGORY(c);
4855              if ((category == ucp_L || category == ucp_N) == prop_fail_result)              if ((category == ucp_L || category == ucp_N) == prop_fail_result)
4856                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4857              }              }
4858            /* Control never gets here */            /* Control never gets here */
4859    
# Line 4500  for (;;) Line 4862  for (;;)
4862              {              {
4863              RMATCH(eptr, ecode, offset_top, md, eptrb, RM60);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM60);
4864              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4865              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
4866              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4867                {                {
4868                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4869                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4870                }                }
4871              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4872              if ((UCD_CATEGORY(c) == ucp_Z || c == CHAR_HT || c == CHAR_NL ||              if ((UCD_CATEGORY(c) == ucp_Z || c == CHAR_HT || c == CHAR_NL ||
4873                   c == CHAR_FF || c == CHAR_CR)                   c == CHAR_FF || c == CHAR_CR)
4874                     == prop_fail_result)                     == prop_fail_result)
4875                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4876              }              }
4877            /* Control never gets here */            /* Control never gets here */
4878    
# Line 4519  for (;;) Line 4881  for (;;)
4881              {              {
4882              RMATCH(eptr, ecode, offset_top, md, eptrb, RM61);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM61);
4883              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4884              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
4885              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4886                {                {
4887                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4888                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4889                }                }
4890              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4891              if ((UCD_CATEGORY(c) == ucp_Z || c == CHAR_HT || c == CHAR_NL ||              if ((UCD_CATEGORY(c) == ucp_Z || c == CHAR_HT || c == CHAR_NL ||
4892                   c == CHAR_VT || c == CHAR_FF || c == CHAR_CR)                   c == CHAR_VT || c == CHAR_FF || c == CHAR_CR)
4893                     == prop_fail_result)                     == prop_fail_result)
4894                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4895              }              }
4896            /* Control never gets here */            /* Control never gets here */
4897    
# Line 4539  for (;;) Line 4901  for (;;)
4901              int category;              int category;
4902              RMATCH(eptr, ecode, offset_top, md, eptrb, RM62);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM62);
4903              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4904              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
4905              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4906                {                {
4907                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4908                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4909                }                }
4910              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4911              category = UCD_CATEGORY(c);              category = UCD_CATEGORY(c);
# Line 4551  for (;;) Line 4913  for (;;)
4913                   category == ucp_N ||                   category == ucp_N ||
4914                   c == CHAR_UNDERSCORE)                   c == CHAR_UNDERSCORE)
4915                     == prop_fail_result)                     == prop_fail_result)
4916                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4917              }              }
4918            /* Control never gets here */            /* Control never gets here */
4919    
# Line 4571  for (;;) Line 4933  for (;;)
4933            {            {
4934            RMATCH(eptr, ecode, offset_top, md, eptrb, RM41);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM41);
4935            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4936            if (fi >= max) MRRETURN(MATCH_NOMATCH);            if (fi >= max) RRETURN(MATCH_NOMATCH);
4937            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4938              {              {
4939              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4940              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4941              }              }
4942            GETCHARINCTEST(c, eptr);            GETCHARINCTEST(c, eptr);
4943            if (UCD_CATEGORY(c) == ucp_M) MRRETURN(MATCH_NOMATCH);            if (UCD_CATEGORY(c) == ucp_M) RRETURN(MATCH_NOMATCH);
4944            while (eptr < md->end_subject)            while (eptr < md->end_subject)
4945              {              {
4946              int len = 1;              int len = 1;
4947              if (!utf8) c = *eptr; else { GETCHARLEN(c, eptr, len); }              if (!utf) c = *eptr; else { GETCHARLEN(c, eptr, len); }
4948              if (UCD_CATEGORY(c) != ucp_M) break;              if (UCD_CATEGORY(c) != ucp_M) break;
4949              eptr += len;              eptr += len;
4950              }              }
# Line 4591  for (;;) Line 4953  for (;;)
4953        else        else
4954  #endif     /* SUPPORT_UCP */  #endif     /* SUPPORT_UCP */
4955    
4956  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
4957        /* UTF-8 mode */        if (utf)
       if (utf8)  
4958          {          {
4959          for (fi = min;; fi++)          for (fi = min;; fi++)
4960            {            {
4961            RMATCH(eptr, ecode, offset_top, md, eptrb, RM42);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM42);
4962            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4963            if (fi >= max) MRRETURN(MATCH_NOMATCH);            if (fi >= max) RRETURN(MATCH_NOMATCH);
4964            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4965              {              {
4966              SCHECK_PARTIAL();              SCHECK_PARTIAL();
4967              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4968              }              }
4969            if (ctype == OP_ANY && IS_NEWLINE(eptr))            if (ctype == OP_ANY && IS_NEWLINE(eptr))
4970              MRRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
4971            GETCHARINC(c, eptr);            GETCHARINC(c, eptr);
4972            switch(ctype)            switch(ctype)
4973              {              {
# Line 4618  for (;;) Line 4979  for (;;)
4979              case OP_ANYNL:              case OP_ANYNL:
4980              switch(c)              switch(c)
4981                {                {
4982                default: MRRETURN(MATCH_NOMATCH);                default: RRETURN(MATCH_NOMATCH);
4983                case 0x000d:                case 0x000d:
4984                if (eptr < md->end_subject && *eptr == 0x0a) eptr++;                if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
4985                break;                break;
# Line 4630  for (;;) Line 4991  for (;;)
4991                case 0x0085:                case 0x0085:
4992                case 0x2028:                case 0x2028:
4993                case 0x2029:                case 0x2029:
4994                if (md->bsr_anycrlf) MRRETURN(MATCH_NOMATCH);                if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
4995                break;                break;
4996                }                }
4997              break;              break;
# Line 4658  for (;;) Line 5019  for (;;)
5019                case 0x202f:    /* NARROW NO-BREAK SPACE */                case 0x202f:    /* NARROW NO-BREAK SPACE */
5020                case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */                case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
5021                case 0x3000:    /* IDEOGRAPHIC SPACE */                case 0x3000:    /* IDEOGRAPHIC SPACE */
5022                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
5023                }                }
5024              break;              break;
5025    
5026              case OP_HSPACE:              case OP_HSPACE:
5027              switch(c)              switch(c)
5028                {                {
5029                default: MRRETURN(MATCH_NOMATCH);                default: RRETURN(MATCH_NOMATCH);
5030                case 0x09:      /* HT */                case 0x09:      /* HT */
5031                case 0x20:      /* SPACE */                case 0x20:      /* SPACE */
5032                case 0xa0:      /* NBSP */                case 0xa0:      /* NBSP */
# Line 4700  for (;;) Line 5061  for (;;)
5061                case 0x85:      /* NEL */                case 0x85:      /* NEL */
5062                case 0x2028:    /* LINE SEPARATOR */                case 0x2028:    /* LINE SEPARATOR */
5063                case 0x2029:    /* PARAGRAPH SEPARATOR */                case 0x2029:    /* PARAGRAPH SEPARATOR */
5064                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
5065                }                }
5066              break;              break;
5067    
5068              case OP_VSPACE:              case OP_VSPACE:
5069              switch(c)              switch(c)
5070                {                {
5071                default: MRRETURN(MATCH_NOMATCH);                default: RRETURN(MATCH_NOMATCH);
5072                case 0x0a:      /* LF */                case 0x0a:      /* LF */
5073                case 0x0b:      /* VT */                case 0x0b:      /* VT */
5074                case 0x0c:      /* FF */                case 0x0c:      /* FF */
# Line 4721  for (;;) Line 5082  for (;;)
5082    
5083              case OP_NOT_DIGIT:              case OP_NOT_DIGIT:
5084              if (c < 256 && (md->ctypes[c] & ctype_digit) != 0)              if (c < 256 && (md->ctypes[c] & ctype_digit) != 0)
5085                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
5086              break;              break;
5087    
5088              case OP_DIGIT:              case OP_DIGIT:
5089              if (c >= 256 || (md->ctypes[c] & ctype_digit) == 0)              if (c >= 256 || (md->ctypes[c] & ctype_digit) == 0)
5090                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
5091              break;              break;
5092    
5093              case OP_NOT_WHITESPACE:              case OP_NOT_WHITESPACE:
5094              if (c < 256 && (md->ctypes[c] & ctype_space) != 0)              if (c < 256 && (md->ctypes[c] & ctype_space) != 0)
5095                MRRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
5096              break;              break;
5097    
5098              case OP_WHITESPACE:              case OP_WHITESPACE:
5099