/[pcre]/code/branches/pcre16/pcre_exec.c
ViewVC logotype

Diff of /code/branches/pcre16/pcre_exec.c

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

code/trunk/pcre_exec.c revision 597 by ph10, Mon May 2 17:08:52 2011 UTC code/branches/pcre16/pcre_exec.c revision 781 by zherczeg, Sat Dec 3 07:58:30 2011 UTC
# Line 6  Line 6 
6  and semantics are as close as possible to those of the Perl 5 language.  and semantics are as close as possible to those of the Perl 5 language.
7    
8                         Written by Philip Hazel                         Written by Philip Hazel
9             Copyright (c) 1997-2010 University of Cambridge             Copyright (c) 1997-2011 University of Cambridge
10    
11  -----------------------------------------------------------------------------  -----------------------------------------------------------------------------
12  Redistribution and use in source and binary forms, with or without  Redistribution and use in source and binary forms, with or without
# Line 57  possible. There are also some static sup Line 57  possible. There are also some static sup
57  #undef min  #undef min
58  #undef max  #undef max
59    
60  /* Flag bits for the match() function */  /* Values for setting in md->match_function_type to indicate two special types
61    of call to match(). We do it this way to save on using another stack variable,
62    as stack usage is to be discouraged. */
63    
64  #define match_condassert     0x01  /* Called to check a condition assertion */  #define MATCH_CONDASSERT     1  /* Called to check a condition assertion */
65  #define match_cbegroup       0x02  /* Could-be-empty unlimited repeat group */  #define MATCH_CBEGROUP       2  /* Could-be-empty unlimited repeat group */
66    
67  /* Non-error returns from the match() function. Error returns are externally  /* Non-error returns from the match() function. Error returns are externally
68  defined PCRE_ERROR_xxx codes, which are all negative. */  defined PCRE_ERROR_xxx codes, which are all negative. */
# Line 73  negative to avoid the external error cod Line 75  negative to avoid the external error cod
75    
76  #define MATCH_ACCEPT       (-999)  #define MATCH_ACCEPT       (-999)
77  #define MATCH_COMMIT       (-998)  #define MATCH_COMMIT       (-998)
78  #define MATCH_PRUNE        (-997)  #define MATCH_KETRPOS      (-997)
79  #define MATCH_SKIP         (-996)  #define MATCH_ONCE         (-996)
80  #define MATCH_SKIP_ARG     (-995)  #define MATCH_PRUNE        (-995)
81  #define MATCH_THEN         (-994)  #define MATCH_SKIP         (-994)
82    #define MATCH_SKIP_ARG     (-993)
83    #define MATCH_THEN         (-992)
84    
85  /* This is a convenience macro for code that occurs many times. */  /* This is a convenience macro for code that occurs many times. */
86    
# Line 117  Returns:     nothing Line 121  Returns:     nothing
121  */  */
122    
123  static void  static void
124  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)
125  {  {
126  unsigned int c;  unsigned int c;
127  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 134  while (length-- > 0) Line 138  while (length-- > 0)
138    
139  /* Normally, if a back reference hasn't been set, the length that is passed is  /* Normally, if a back reference hasn't been set, the length that is passed is
140  negative, so the match always fails. However, in JavaScript compatibility mode,  negative, so the match always fails. However, in JavaScript compatibility mode,
141  the length passed is zero. Note that in caseless UTF-8 mode, the number of  the length passed is zero. Note that in caseless UTF-8 mode, the number of
142  subject bytes matched may be different to the number of reference bytes.  subject bytes matched may be different to the number of reference bytes.
143    
144  Arguments:  Arguments:
# Line 142  Arguments: Line 146  Arguments:
146    eptr        pointer into the subject    eptr        pointer into the subject
147    length      length of reference to be matched (number of bytes)    length      length of reference to be matched (number of bytes)
148    md          points to match data block    md          points to match data block
149    ims         the ims flags    caseless    TRUE if caseless
150    
151  Returns:      < 0 if not matched, otherwise the number of subject bytes matched  Returns:      < 0 if not matched, otherwise the number of subject bytes matched
152  */  */
153    
154  static int  static int
155  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,
156    unsigned long int ims)    BOOL caseless)
157  {  {
158  USPTR eptr_start = eptr;  PCRE_PUCHAR eptr_start = eptr;
159  register USPTR p = md->start_subject + md->offset_vector[offset];  register PCRE_PUCHAR p = md->start_subject + md->offset_vector[offset];
160    
161  #ifdef PCRE_DEBUG  #ifdef PCRE_DEBUG
162  if (eptr >= md->end_subject)  if (eptr >= md->end_subject)
# Line 175  if (length < 0) return -1; Line 179  if (length < 0) return -1;
179  properly if Unicode properties are supported. Otherwise, we can check only  properly if Unicode properties are supported. Otherwise, we can check only
180  ASCII characters. */  ASCII characters. */
181    
182  if ((ims & PCRE_CASELESS) != 0)  if (caseless)
183    {    {
184  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
185  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
186    if (md->utf8)    if (md->utf)
187      {      {
188      /* 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
189      bytes matched may differ, because there are some characters whose upper and      bytes matched may differ, because there are some characters whose upper and
190      lower case versions code as different numbers of bytes. For example, U+023A      lower case versions code as different numbers of bytes. For example, U+023A
191      (2 bytes in UTF-8) is the upper case version of U+2C65 (3 bytes in UTF-8);      (2 bytes in UTF-8) is the upper case version of U+2C65 (3 bytes in UTF-8);
192      a sequence of 3 of the former uses 6 bytes, as does a sequence of two of      a sequence of 3 of the former uses 6 bytes, as does a sequence of two of
193      the latter. It is important, therefore, to check the length along the      the latter. It is important, therefore, to check the length along the
194      reference, not along the subject (earlier code did this wrong). */      reference, not along the subject (earlier code did this wrong). */
195    
196      USPTR endptr = p + length;      PCRE_PUCHAR endptr = p + length;
197      while (p < endptr)      while (p < endptr)
198        {        {
199        int c, d;        int c, d;
# Line 206  if ((ims & PCRE_CASELESS) != 0) Line 210  if ((ims & PCRE_CASELESS) != 0)
210    /* The same code works when not in UTF-8 mode and in UTF-8 mode when there    /* The same code works when not in UTF-8 mode and in UTF-8 mode when there
211    is no UCP support. */    is no UCP support. */
212      {      {
213      if (eptr + length > md->end_subject) return -1;      if (eptr + length > md->end_subject) return -1;
214      while (length-- > 0)      while (length-- > 0)
215        { if (md->lcc[*p++] != md->lcc[*eptr++]) return -1; }        { if (md->lcc[*p++] != md->lcc[*eptr++]) return -1; }
216      }      }
217    }    }
218    
219  /* In the caseful case, we can just compare the bytes, whether or not we  /* In the caseful case, we can just compare the bytes, whether or not we
220  are in UTF-8 mode. */  are in UTF-8 mode. */
221    
222  else  else
223    {    {
224    if (eptr + length > md->end_subject) return -1;    if (eptr + length > md->end_subject) return -1;
225    while (length-- > 0) if (*p++ != *eptr++) return -1;    while (length-- > 0) if (*p++ != *eptr++) return -1;
226    }    }
227    
228  return eptr - eptr_start;  return eptr - eptr_start;
# Line 273  enum { RM1=1, RM2,  RM3,  RM4,  RM5,  RM Line 277  enum { RM1=1, RM2,  RM3,  RM4,  RM5,  RM
277         RM31,  RM32, RM33, RM34, RM35, RM36, RM37, RM38, RM39, RM40,         RM31,  RM32, RM33, RM34, RM35, RM36, RM37, RM38, RM39, RM40,
278         RM41,  RM42, RM43, RM44, RM45, RM46, RM47, RM48, RM49, RM50,         RM41,  RM42, RM43, RM44, RM45, RM46, RM47, RM48, RM49, RM50,
279         RM51,  RM52, RM53, RM54, RM55, RM56, RM57, RM58, RM59, RM60,         RM51,  RM52, RM53, RM54, RM55, RM56, RM57, RM58, RM59, RM60,
280         RM61,  RM62 };         RM61,  RM62, RM63, RM64, RM65, RM66 };
281    
282  /* 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
283  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 283  actually used in this definition. */ Line 287  actually used in this definition. */
287  #define REGISTER register  #define REGISTER register
288    
289  #ifdef PCRE_DEBUG  #ifdef PCRE_DEBUG
290  #define RMATCH(ra,rb,rc,rd,re,rf,rg,rw) \  #define RMATCH(ra,rb,rc,rd,re,rw) \
291    { \    { \
292    printf("match() called in line %d\n", __LINE__); \    printf("match() called in line %d\n", __LINE__); \
293    rrc = match(ra,rb,mstart,markptr,rc,rd,re,rf,rg,rdepth+1); \    rrc = match(ra,rb,mstart,markptr,rc,rd,re,rdepth+1); \
294    printf("to line %d\n", __LINE__); \    printf("to line %d\n", __LINE__); \
295    }    }
296  #define RRETURN(ra) \  #define RRETURN(ra) \
# Line 295  actually used in this definition. */ Line 299  actually used in this definition. */
299    return ra; \    return ra; \
300    }    }
301  #else  #else
302  #define RMATCH(ra,rb,rc,rd,re,rf,rg,rw) \  #define RMATCH(ra,rb,rc,rd,re,rw) \
303    rrc = match(ra,rb,mstart,markptr,rc,rd,re,rf,rg,rdepth+1)    rrc = match(ra,rb,mstart,markptr,rc,rd,re,rdepth+1)
304  #define RRETURN(ra) return ra  #define RRETURN(ra) return ra
305  #endif  #endif
306    
# Line 309  argument of match(), which never changes Line 313  argument of match(), which never changes
313    
314  #define REGISTER  #define REGISTER
315    
316  #define RMATCH(ra,rb,rc,rd,re,rf,rg,rw)\  #define RMATCH(ra,rb,rc,rd,re,rw)\
317    {\    {\
318    heapframe *newframe = (heapframe *)(pcre_stack_malloc)(sizeof(heapframe));\    heapframe *newframe = (heapframe *)(pcre_stack_malloc)(sizeof(heapframe));\
319    if (newframe == NULL) RRETURN(PCRE_ERROR_NOMEMORY);\    if (newframe == NULL) RRETURN(PCRE_ERROR_NOMEMORY);\
# Line 319  argument of match(), which never changes Line 323  argument of match(), which never changes
323    newframe->Xmstart = mstart;\    newframe->Xmstart = mstart;\
324    newframe->Xmarkptr = markptr;\    newframe->Xmarkptr = markptr;\
325    newframe->Xoffset_top = rc;\    newframe->Xoffset_top = rc;\
326    newframe->Xims = re;\    newframe->Xeptrb = re;\
   newframe->Xeptrb = rf;\  
   newframe->Xflags = rg;\  
327    newframe->Xrdepth = frame->Xrdepth + 1;\    newframe->Xrdepth = frame->Xrdepth + 1;\
328    newframe->Xprevframe = frame;\    newframe->Xprevframe = frame;\
329    frame = newframe;\    frame = newframe;\
# Line 352  typedef struct heapframe { Line 354  typedef struct heapframe {
354    
355    /* Function arguments that may change */    /* Function arguments that may change */
356    
357    USPTR Xeptr;    PCRE_PUCHAR Xeptr;
358    const uschar *Xecode;    const pcre_uchar *Xecode;
359    USPTR Xmstart;    PCRE_PUCHAR Xmstart;
360    USPTR Xmarkptr;    PCRE_PUCHAR Xmarkptr;
361    int Xoffset_top;    int Xoffset_top;
   long int Xims;  
362    eptrblock *Xeptrb;    eptrblock *Xeptrb;
   int Xflags;  
363    unsigned int Xrdepth;    unsigned int Xrdepth;
364    
365    /* Function local variables */    /* Function local variables */
366    
367    USPTR Xcallpat;    PCRE_PUCHAR Xcallpat;
368  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
369    USPTR Xcharptr;    PCRE_PUCHAR Xcharptr;
370  #endif  #endif
371    USPTR Xdata;    PCRE_PUCHAR Xdata;
372    USPTR Xnext;    PCRE_PUCHAR Xnext;
373    USPTR Xpp;    PCRE_PUCHAR Xpp;
374    USPTR Xprev;    PCRE_PUCHAR Xprev;
375    USPTR Xsaved_eptr;    PCRE_PUCHAR Xsaved_eptr;
376    
377    recursion_info Xnew_recursive;    recursion_info Xnew_recursive;
378    
# Line 380  typedef struct heapframe { Line 380  typedef struct heapframe {
380    BOOL Xcondition;    BOOL Xcondition;
381    BOOL Xprev_is_word;    BOOL Xprev_is_word;
382    
   unsigned long int Xoriginal_ims;  
   
383  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
384    int Xprop_type;    int Xprop_type;
385    int Xprop_value;    int Xprop_value;
386    int Xprop_fail_result;    int Xprop_fail_result;
   int Xprop_category;  
   int Xprop_chartype;  
   int Xprop_script;  
387    int Xoclength;    int Xoclength;
388    uschar Xocchars[8];    pcre_uchar Xocchars[6];
389  #endif  #endif
390    
391    int Xcodelink;    int Xcodelink;
# Line 455  the subject. */ Line 450  the subject. */
450    
451    
452  /* Performance note: It might be tempting to extract commonly used fields from  /* Performance note: It might be tempting to extract commonly used fields from
453  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
454  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
455  made performance worse.  made performance worse.
456    
# Line 467  Arguments: Line 462  Arguments:
462     markptr     pointer to the most recent MARK name, or NULL     markptr     pointer to the most recent MARK name, or NULL
463     offset_top  current top pointer     offset_top  current top pointer
464     md          pointer to "static" info for the match     md          pointer to "static" info for the match
    ims         current /i, /m, and /s options  
465     eptrb       pointer to chain of blocks containing eptr at start of     eptrb       pointer to chain of blocks containing eptr at start of
466                   brackets - for testing for empty matches                   brackets - for testing for empty matches
    flags       can contain  
                  match_condassert - this is an assertion condition  
                  match_cbegroup - this is the start of an unlimited repeat  
                    group that can match an empty string  
467     rdepth      the recursion depth     rdepth      the recursion depth
468    
469  Returns:       MATCH_MATCH if matched            )  these values are >= 0  Returns:       MATCH_MATCH if matched            )  these values are >= 0
# Line 484  Returns:       MATCH_MATCH if matched Line 474  Returns:       MATCH_MATCH if matched
474  */  */
475    
476  static int  static int
477  match(REGISTER USPTR eptr, REGISTER const uschar *ecode, USPTR mstart,  match(REGISTER PCRE_PUCHAR eptr, REGISTER const pcre_uchar *ecode,
478    const uschar *markptr, int offset_top, match_data *md, unsigned long int ims,    PCRE_PUCHAR mstart, const pcre_uchar *markptr, int offset_top,
479    eptrblock *eptrb, int flags, unsigned int rdepth)    match_data *md, eptrblock *eptrb, unsigned int rdepth)
480  {  {
481  /* 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,
482  so they can be ordinary variables in all cases. Mark some of them with  so they can be ordinary variables in all cases. Mark some of them with
# Line 495  so they can be ordinary variables in all Line 485  so they can be ordinary variables in all
485  register int  rrc;         /* Returns from recursive calls */  register int  rrc;         /* Returns from recursive calls */
486  register int  i;           /* Used for loops not involving calls to RMATCH() */  register int  i;           /* Used for loops not involving calls to RMATCH() */
487  register unsigned int c;   /* Character values not kept over RMATCH() calls */  register unsigned int c;   /* Character values not kept over RMATCH() calls */
488  register BOOL utf8;        /* Local copy of UTF-8 flag for speed */  register BOOL utf;         /* Local copy of UTF flag for speed */
489    
490  BOOL minimize, possessive; /* Quantifier options */  BOOL minimize, possessive; /* Quantifier options */
491    BOOL caseless;
492  int condcode;  int condcode;
493    
494  /* When recursion is not being used, all "local" variables that have to be  /* When recursion is not being used, all "local" variables that have to be
# Line 517  frame->Xecode = ecode; Line 508  frame->Xecode = ecode;
508  frame->Xmstart = mstart;  frame->Xmstart = mstart;
509  frame->Xmarkptr = markptr;  frame->Xmarkptr = markptr;
510  frame->Xoffset_top = offset_top;  frame->Xoffset_top = offset_top;
 frame->Xims = ims;  
511  frame->Xeptrb = eptrb;  frame->Xeptrb = eptrb;
 frame->Xflags = flags;  
512  frame->Xrdepth = rdepth;  frame->Xrdepth = rdepth;
513    
514  /* This is where control jumps back to to effect "recursion" */  /* This is where control jumps back to to effect "recursion" */
# Line 533  HEAP_RECURSE: Line 522  HEAP_RECURSE:
522  #define mstart             frame->Xmstart  #define mstart             frame->Xmstart
523  #define markptr            frame->Xmarkptr  #define markptr            frame->Xmarkptr
524  #define offset_top         frame->Xoffset_top  #define offset_top         frame->Xoffset_top
 #define ims                frame->Xims  
525  #define eptrb              frame->Xeptrb  #define eptrb              frame->Xeptrb
 #define flags              frame->Xflags  
526  #define rdepth             frame->Xrdepth  #define rdepth             frame->Xrdepth
527    
528  /* Ditto for the local variables */  /* Ditto for the local variables */
# Line 557  HEAP_RECURSE: Line 544  HEAP_RECURSE:
544  #define condition          frame->Xcondition  #define condition          frame->Xcondition
545  #define prev_is_word       frame->Xprev_is_word  #define prev_is_word       frame->Xprev_is_word
546    
 #define original_ims       frame->Xoriginal_ims  
   
547  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
548  #define prop_type          frame->Xprop_type  #define prop_type          frame->Xprop_type
549  #define prop_value         frame->Xprop_value  #define prop_value         frame->Xprop_value
550  #define prop_fail_result   frame->Xprop_fail_result  #define prop_fail_result   frame->Xprop_fail_result
 #define prop_category      frame->Xprop_category  
 #define prop_chartype      frame->Xprop_chartype  
 #define prop_script        frame->Xprop_script  
551  #define oclength           frame->Xoclength  #define oclength           frame->Xoclength
552  #define occhars            frame->Xocchars  #define occhars            frame->Xocchars
553  #endif  #endif
# Line 595  i, and fc and c, can be the same variabl Line 577  i, and fc and c, can be the same variabl
577  #define fi i  #define fi i
578  #define fc c  #define fc c
579    
580    /* Many of the following variables are used only in small blocks of the code.
581    My normal style of coding would have declared them within each of those blocks.
582    However, in order to accommodate the version of this code that uses an external
583    "stack" implemented on the heap, it is easier to declare them all here, so the
584    declarations can be cut out in a block. The only declarations within blocks
585    below are for variables that do not have to be preserved over a recursive call
586    to RMATCH(). */
587    
588    #ifdef SUPPORT_UTF8
589    const pcre_uchar *charptr;
590    #endif
591    const pcre_uchar *callpat;
592    const pcre_uchar *data;
593    const pcre_uchar *next;
594    PCRE_PUCHAR       pp;
595    const pcre_uchar *prev;
596    PCRE_PUCHAR       saved_eptr;
597    
598  #ifdef SUPPORT_UTF8                /* Many of these variables are used only  */  recursion_info new_recursive;
599  const uschar *charptr;             /* in small blocks of the code. My normal */  
600  #endif                             /* style of coding would have declared    */  BOOL cur_is_word;
 const uschar *callpat;             /* them within each of those blocks.      */  
 const uschar *data;                /* However, in order to accommodate the   */  
 const uschar *next;                /* version of this code that uses an      */  
 USPTR         pp;                  /* external "stack" implemented on the    */  
 const uschar *prev;                /* heap, it is easier to declare them all */  
 USPTR         saved_eptr;          /* here, so the declarations can be cut   */  
                                    /* out in a block. The only declarations  */  
 recursion_info new_recursive;      /* within blocks below are for variables  */  
                                    /* that do not have to be preserved over  */  
 BOOL cur_is_word;                  /* a recursive call to RMATCH().          */  
601  BOOL condition;  BOOL condition;
602  BOOL prev_is_word;  BOOL prev_is_word;
603    
 unsigned long int original_ims;  
   
604  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
605  int prop_type;  int prop_type;
606  int prop_value;  int prop_value;
607  int prop_fail_result;  int prop_fail_result;
 int prop_category;  
 int prop_chartype;  
 int prop_script;  
608  int oclength;  int oclength;
609  uschar occhars[8];  pcre_uchar occhars[6];
610  #endif  #endif
611    
612  int codelink;  int codelink;
# Line 640  int stacksave[REC_STACK_SAVE_MAX]; Line 624  int stacksave[REC_STACK_SAVE_MAX];
624  eptrblock newptrb;  eptrblock newptrb;
625  #endif     /* NO_RECURSE */  #endif     /* NO_RECURSE */
626    
627    /* To save space on the stack and in the heap frame, I have doubled up on some
628    of the local variables that are used only in localised parts of the code, but
629    still need to be preserved over recursive calls of match(). These macros define
630    the alternative names that are used. */
631    
632    #define allow_zero    cur_is_word
633    #define cbegroup      condition
634    #define code_offset   codelink
635    #define condassert    condition
636    #define matched_once  prev_is_word
637    
638  /* These statements are here to stop the compiler complaining about unitialized  /* These statements are here to stop the compiler complaining about unitialized
639  variables. */  variables. */
640    
# Line 665  complicated macro. It has to be used in Line 660  complicated macro. It has to be used in
660  however, impact performance when true recursion is being used. */  however, impact performance when true recursion is being used. */
661    
662  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
663  utf8 = md->utf8;       /* Local copy of the flag */  utf = md->utf;       /* Local copy of the flag */
664  #else  #else
665  utf8 = FALSE;  utf = FALSE;
666  #endif  #endif
667    
668  /* 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 676  haven't exceeded the recursive call limi Line 671  haven't exceeded the recursive call limi
671  if (md->match_call_count++ >= md->match_limit) RRETURN(PCRE_ERROR_MATCHLIMIT);  if (md->match_call_count++ >= md->match_limit) RRETURN(PCRE_ERROR_MATCHLIMIT);
672  if (rdepth >= md->match_limit_recursion) RRETURN(PCRE_ERROR_RECURSIONLIMIT);  if (rdepth >= md->match_limit_recursion) RRETURN(PCRE_ERROR_RECURSIONLIMIT);
673    
 original_ims = ims;    /* Save for resetting on ')' */  
   
674  /* At the start of a group with an unlimited repeat that may match an empty  /* At the start of a group with an unlimited repeat that may match an empty
675  string, the match_cbegroup flag is set. When this is the case, add the current  string, the variable md->match_function_type is set to MATCH_CBEGROUP. It is
676  subject pointer to the chain of such remembered pointers, to be checked when we  done this way to save having to use another function argument, which would take
677  hit the closing ket, in order to break infinite loops that match no characters.  up space on the stack. See also MATCH_CONDASSERT below.
678  When match() is called in other circumstances, don't add to the chain. The  
679  match_cbegroup flag must NOT be used with tail recursion, because the memory  When MATCH_CBEGROUP is set, add the current subject pointer to the chain of
680  block that is used is on the stack, so a new one may be required for each  such remembered pointers, to be checked when we hit the closing ket, in order
681  match(). */  to break infinite loops that match no characters. When match() is called in
682    other circumstances, don't add to the chain. The MATCH_CBEGROUP feature must
683    NOT be used with tail recursion, because the memory block that is used is on
684    the stack, so a new one may be required for each match(). */
685    
686  if ((flags & match_cbegroup) != 0)  if (md->match_function_type == MATCH_CBEGROUP)
687    {    {
688    newptrb.epb_saved_eptr = eptr;    newptrb.epb_saved_eptr = eptr;
689    newptrb.epb_prev = eptrb;    newptrb.epb_prev = eptrb;
690    eptrb = &newptrb;    eptrb = &newptrb;
691      md->match_function_type = 0;
692    }    }
693    
694  /* Now start processing the opcodes. */  /* Now start processing the opcodes. */
# Line 705  for (;;) Line 702  for (;;)
702      {      {
703      case OP_MARK:      case OP_MARK:
704      markptr = ecode + 2;      markptr = ecode + 2;
705      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top, md,
706        ims, eptrb, flags, RM55);        eptrb, RM55);
707    
708      /* 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
709      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 716  for (;;) Line 713  for (;;)
713      unaltered. */      unaltered. */
714    
715      if (rrc == MATCH_SKIP_ARG &&      if (rrc == MATCH_SKIP_ARG &&
716          strcmp((char *)markptr, (char *)(md->start_match_ptr)) == 0)          STRCMP_UC_UC(markptr, md->start_match_ptr) == 0)
717        {        {
718        md->start_match_ptr = eptr;        md->start_match_ptr = eptr;
719        RRETURN(MATCH_SKIP);        RRETURN(MATCH_SKIP);
# Line 731  for (;;) Line 728  for (;;)
728      /* COMMIT overrides PRUNE, SKIP, and THEN */      /* COMMIT overrides PRUNE, SKIP, and THEN */
729    
730      case OP_COMMIT:      case OP_COMMIT:
731      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
732        ims, eptrb, flags, RM52);        eptrb, RM52);
733      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE &&      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE &&
734          rrc != MATCH_SKIP && rrc != MATCH_SKIP_ARG &&          rrc != MATCH_SKIP && rrc != MATCH_SKIP_ARG &&
735          rrc != MATCH_THEN)          rrc != MATCH_THEN)
# Line 742  for (;;) Line 739  for (;;)
739      /* PRUNE overrides THEN */      /* PRUNE overrides THEN */
740    
741      case OP_PRUNE:      case OP_PRUNE:
742      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
743        ims, eptrb, flags, RM51);        eptrb, RM51);
744      if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);      if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
745      MRRETURN(MATCH_PRUNE);      MRRETURN(MATCH_PRUNE);
746    
747      case OP_PRUNE_ARG:      case OP_PRUNE_ARG:
748      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top, md,
749        ims, eptrb, flags, RM56);        eptrb, RM56);
750      if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);      if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
751      md->mark = ecode + 2;      md->mark = ecode + 2;
752      RRETURN(MATCH_PRUNE);      RRETURN(MATCH_PRUNE);
# Line 757  for (;;) Line 754  for (;;)
754      /* SKIP overrides PRUNE and THEN */      /* SKIP overrides PRUNE and THEN */
755    
756      case OP_SKIP:      case OP_SKIP:
757      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
758        ims, eptrb, flags, RM53);        eptrb, RM53);
759      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE && rrc != MATCH_THEN)      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE && rrc != MATCH_THEN)
760        RRETURN(rrc);        RRETURN(rrc);
761      md->start_match_ptr = eptr;   /* Pass back current position */      md->start_match_ptr = eptr;   /* Pass back current position */
762      MRRETURN(MATCH_SKIP);      MRRETURN(MATCH_SKIP);
763    
764      case OP_SKIP_ARG:      case OP_SKIP_ARG:
765      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top, md,
766        ims, eptrb, flags, RM57);        eptrb, RM57);
767      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE && rrc != MATCH_THEN)      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE && rrc != MATCH_THEN)
768        RRETURN(rrc);        RRETURN(rrc);
769    
# Line 778  for (;;) Line 775  for (;;)
775      md->start_match_ptr = ecode + 2;      md->start_match_ptr = ecode + 2;
776      RRETURN(MATCH_SKIP_ARG);      RRETURN(MATCH_SKIP_ARG);
777    
778      /* 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
779      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
780      to skip back past alternatives that precede the THEN within the current      match pointer to do this. */
     branch. */  
781    
782      case OP_THEN:      case OP_THEN:
783      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
784        ims, eptrb, flags, RM54);        eptrb, RM54);
785      if (rrc != MATCH_NOMATCH) RRETURN(rrc);      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
786      md->start_match_ptr = ecode - GET(ecode, 1);      md->start_match_ptr = ecode;
787      MRRETURN(MATCH_THEN);      MRRETURN(MATCH_THEN);
788    
789      case OP_THEN_ARG:      case OP_THEN_ARG:
790      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1+LINK_SIZE],      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top,
791        offset_top, md, ims, eptrb, flags, RM58);        md, eptrb, RM58);
792      if (rrc != MATCH_NOMATCH) RRETURN(rrc);      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
793      md->start_match_ptr = ecode - GET(ecode, 1);      md->start_match_ptr = ecode;
794      md->mark = ecode + LINK_SIZE + 2;      md->mark = ecode + 2;
795      RRETURN(MATCH_THEN);      RRETURN(MATCH_THEN);
796    
797      /* Handle a capturing bracket. If there is space in the offset vector, save      /* Handle an atomic group that does not contain any capturing parentheses.
798      the current subject position in the working slot at the top of the vector.      This can be handled like an assertion. Prior to 8.13, all atomic groups
799      We mustn't change the current values of the data slot, because they may be      were handled this way. In 8.13, the code was changed as below for ONCE, so
800      set from a previous iteration of this group, and be referred to by a      that backups pass through the group and thereby reset captured values.
801      reference inside the group.      However, this uses a lot more stack, so in 8.20, atomic groups that do not
802        contain any captures generate OP_ONCE_NC, which can be handled in the old,
803      If the bracket fails to match, we need to restore this value and also the      less stack intensive way.
804      values of the final offsets, in case they were set by a previous iteration  
805      of the same bracket.      Check the alternative branches in turn - the matching won't pass the KET
806        for this kind of subpattern. If any one branch matches, we carry on as at
807        the end of a normal bracket, leaving the subject pointer, but resetting
808        the start-of-match value in case it was changed by \K. */
809    
810        case OP_ONCE_NC:
811        prev = ecode;
812        saved_eptr = eptr;
813        do
814          {
815          RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM64);
816          if (rrc == MATCH_MATCH)  /* Note: _not_ MATCH_ACCEPT */
817            {
818            mstart = md->start_match_ptr;
819            markptr = md->mark;
820            break;
821            }
822          if (rrc == MATCH_THEN)
823            {
824            next = ecode + GET(ecode,1);
825            if (md->start_match_ptr < next &&
826                (*ecode == OP_ALT || *next == OP_ALT))
827              rrc = MATCH_NOMATCH;
828            }
829    
830          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
831          ecode += GET(ecode,1);
832          }
833        while (*ecode == OP_ALT);
834    
835        /* If hit the end of the group (which could be repeated), fail */
836    
837        if (*ecode != OP_ONCE_NC && *ecode != OP_ALT) RRETURN(MATCH_NOMATCH);
838    
839        /* Continue as from after the group, updating the offsets high water
840        mark, since extracts may have been taken. */
841    
842        do ecode += GET(ecode, 1); while (*ecode == OP_ALT);
843    
844        offset_top = md->end_offset_top;
845        eptr = md->end_match_ptr;
846    
847        /* For a non-repeating ket, just continue at this level. This also
848        happens for a repeating ket if no characters were matched in the group.
849        This is the forcible breaking of infinite loops as implemented in Perl
850        5.005. */
851    
852        if (*ecode == OP_KET || eptr == saved_eptr)
853          {
854          ecode += 1+LINK_SIZE;
855          break;
856          }
857    
858        /* The repeating kets try the rest of the pattern or restart from the
859        preceding bracket, in the appropriate order. The second "call" of match()
860        uses tail recursion, to avoid using another stack frame. */
861    
862        if (*ecode == OP_KETRMIN)
863          {
864          RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM65);
865          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
866          ecode = prev;
867          goto TAIL_RECURSE;
868          }
869        else  /* OP_KETRMAX */
870          {
871          md->match_function_type = MATCH_CBEGROUP;
872          RMATCH(eptr, prev, offset_top, md, eptrb, RM66);
873          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
874          ecode += 1 + LINK_SIZE;
875          goto TAIL_RECURSE;
876          }
877        /* Control never gets here */
878    
879        /* Handle a capturing bracket, other than those that are possessive with an
880        unlimited repeat. If there is space in the offset vector, save the current
881        subject position in the working slot at the top of the vector. We mustn't
882        change the current values of the data slot, because they may be set from a
883        previous iteration of this group, and be referred to by a reference inside
884        the group. A failure to match might occur after the group has succeeded,
885        if something later on doesn't match. For this reason, we need to restore
886        the working value and also the values of the final offsets, in case they
887        were set by a previous iteration of the same bracket.
888    
889      If there isn't enough space in the offset vector, treat this as if it were      If there isn't enough space in the offset vector, treat this as if it were
890      a non-capturing bracket. Don't worry about setting the flag for the error      a non-capturing bracket. Don't worry about setting the flag for the error
# Line 835  for (;;) Line 913  for (;;)
913        md->offset_vector[md->offset_end - number] =        md->offset_vector[md->offset_end - number] =
914          (int)(eptr - md->start_subject);          (int)(eptr - md->start_subject);
915    
916        flags = (op == OP_SCBRA)? match_cbegroup : 0;        for (;;)
       do  
917          {          {
918          RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,          if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
919            ims, eptrb, flags, RM1);          RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
920          if (rrc != MATCH_NOMATCH &&            eptrb, RM1);
921              (rrc != MATCH_THEN || md->start_match_ptr != ecode))          if (rrc == MATCH_ONCE) break;  /* Backing up through an atomic group */
922            RRETURN(rrc);  
923            /* If we backed up to a THEN, check whether it is within the current
924            branch by comparing the address of the THEN that is passed back with
925            the end of the branch. If it is within the current branch, and the
926            branch is one of two or more alternatives (it either starts or ends
927            with OP_ALT), we have reached the limit of THEN's action, so convert
928            the return code to NOMATCH, which will cause normal backtracking to
929            happen from now on. Otherwise, THEN is passed back to an outer
930            alternative. This implements Perl's treatment of parenthesized groups,
931            where a group not containing | does not affect the current alternative,
932            that is, (X) is NOT the same as (X|(*F)). */
933    
934            if (rrc == MATCH_THEN)
935              {
936              next = ecode + GET(ecode,1);
937              if (md->start_match_ptr < next &&
938                  (*ecode == OP_ALT || *next == OP_ALT))
939                rrc = MATCH_NOMATCH;
940              }
941    
942            /* Anything other than NOMATCH is passed back. */
943    
944            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
945          md->capture_last = save_capture_last;          md->capture_last = save_capture_last;
946          ecode += GET(ecode, 1);          ecode += GET(ecode, 1);
947            if (*ecode != OP_ALT) break;
948          }          }
       while (*ecode == OP_ALT);  
949    
950        DPRINTF(("bracket %d failed\n", number));        DPRINTF(("bracket %d failed\n", number));
   
951        md->offset_vector[offset] = save_offset1;        md->offset_vector[offset] = save_offset1;
952        md->offset_vector[offset+1] = save_offset2;        md->offset_vector[offset+1] = save_offset2;
953        md->offset_vector[md->offset_end - number] = save_offset3;        md->offset_vector[md->offset_end - number] = save_offset3;
954    
955        if (rrc != MATCH_THEN) md->mark = markptr;        /* At this point, rrc will be one of MATCH_ONCE or MATCH_NOMATCH. */
956        RRETURN(MATCH_NOMATCH);  
957          if (md->mark == NULL) md->mark = markptr;
958          RRETURN(rrc);
959        }        }
960    
961      /* FALL THROUGH ... Insufficient room for saving captured contents. Treat      /* FALL THROUGH ... Insufficient room for saving captured contents. Treat
# Line 869  for (;;) Line 969  for (;;)
969      /* VVVVVVVVVVVVVVVVVVVVVVVVV */      /* VVVVVVVVVVVVVVVVVVVVVVVVV */
970      /* VVVVVVVVVVVVVVVVVVVVVVVVV */      /* VVVVVVVVVVVVVVVVVVVVVVVVV */
971    
972      /* Non-capturing bracket. Loop for all the alternatives. When we get to the      /* Non-capturing or atomic group, except for possessive with unlimited
973      final alternative within the brackets, we would return the result of a      repeat and ONCE group with no captures. Loop for all the alternatives.
974      recursive call to match() whatever happened. We can reduce stack usage by  
975      turning this into a tail recursion, except in the case when match_cbegroup      When we get to the final alternative within the brackets, we used to return
976      is set.*/      the result of a recursive call to match() whatever happened so it was
977        possible to reduce stack usage by turning this into a tail recursion,
978        except in the case of a possibly empty group. However, now that there is
979        the possiblity of (*THEN) occurring in the final alternative, this
980        optimization is no longer always possible.
981    
982        We can optimize if we know there are no (*THEN)s in the pattern; at present
983        this is the best that can be done.
984    
985        MATCH_ONCE is returned when the end of an atomic group is successfully
986        reached, but subsequent matching fails. It passes back up the tree (causing
987        captured values to be reset) until the original atomic group level is
988        reached. This is tested by comparing md->once_target with the start of the
989        group. At this point, the return is converted into MATCH_NOMATCH so that
990        previous backup points can be taken. */
991    
992        case OP_ONCE:
993      case OP_BRA:      case OP_BRA:
994      case OP_SBRA:      case OP_SBRA:
995      DPRINTF(("start non-capturing bracket\n"));      DPRINTF(("start non-capturing bracket\n"));
996      flags = (op >= OP_SBRA)? match_cbegroup : 0;  
997      for (;;)      for (;;)
998        {        {
999        if (ecode[GET(ecode, 1)] != OP_ALT)   /* Final alternative */        if (op >= OP_SBRA || op == OP_ONCE) md->match_function_type = MATCH_CBEGROUP;
1000    
1001          /* If this is not a possibly empty group, and there are no (*THEN)s in
1002          the pattern, and this is the final alternative, optimize as described
1003          above. */
1004    
1005          else if (!md->hasthen && ecode[GET(ecode, 1)] != OP_ALT)
1006            {
1007            ecode += PRIV(OP_lengths)[*ecode];
1008            goto TAIL_RECURSE;
1009            }
1010    
1011          /* In all other cases, we have to make another call to match(). */
1012    
1013          RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md, eptrb,
1014            RM2);
1015    
1016          /* See comment in the code for capturing groups above about handling
1017          THEN. */
1018    
1019          if (rrc == MATCH_THEN)
1020          {          {
1021          if (flags == 0)    /* Not a possibly empty group */          next = ecode + GET(ecode,1);
1022            if (md->start_match_ptr < next &&
1023                (*ecode == OP_ALT || *next == OP_ALT))
1024              rrc = MATCH_NOMATCH;
1025            }
1026    
1027          if (rrc != MATCH_NOMATCH)
1028            {
1029            if (rrc == MATCH_ONCE)
1030            {            {
1031            ecode += _pcre_OP_lengths[*ecode];            const pcre_uchar *scode = ecode;
1032            DPRINTF(("bracket 0 tail recursion\n"));            if (*scode != OP_ONCE)           /* If not at start, find it */
1033            goto TAIL_RECURSE;              {
1034                while (*scode == OP_ALT) scode += GET(scode, 1);
1035                scode -= GET(scode, 1);
1036                }
1037              if (md->once_target == scode) rrc = MATCH_NOMATCH;
1038            }            }
1039            RRETURN(rrc);
1040            }
1041          ecode += GET(ecode, 1);
1042          if (*ecode != OP_ALT) break;
1043          }
1044    
1045          /* Possibly empty group; can't use tail recursion. */      if (md->mark == NULL) md->mark = markptr;
1046        RRETURN(MATCH_NOMATCH);
1047    
1048          RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md, ims,      /* Handle possessive capturing brackets with an unlimited repeat. We come
1049            eptrb, flags, RM48);      here from BRAZERO with allow_zero set TRUE. The offset_vector values are
1050          if (rrc == MATCH_NOMATCH) md->mark = markptr;      handled similarly to the normal case above. However, the matching is
1051          RRETURN(rrc);      different. The end of these brackets will always be OP_KETRPOS, which
1052        returns MATCH_KETRPOS without going further in the pattern. By this means
1053        we can handle the group by iteration rather than recursion, thereby
1054        reducing the amount of stack needed. */
1055    
1056        case OP_CBRAPOS:
1057        case OP_SCBRAPOS:
1058        allow_zero = FALSE;
1059    
1060        POSSESSIVE_CAPTURE:
1061        number = GET2(ecode, 1+LINK_SIZE);
1062        offset = number << 1;
1063    
1064    #ifdef PCRE_DEBUG
1065        printf("start possessive bracket %d\n", number);
1066        printf("subject=");
1067        pchars(eptr, 16, TRUE, md);
1068        printf("\n");
1069    #endif
1070    
1071        if (offset < md->offset_max)
1072          {
1073          matched_once = FALSE;
1074          code_offset = ecode - md->start_code;
1075    
1076          save_offset1 = md->offset_vector[offset];
1077          save_offset2 = md->offset_vector[offset+1];
1078          save_offset3 = md->offset_vector[md->offset_end - number];
1079          save_capture_last = md->capture_last;
1080    
1081          DPRINTF(("saving %d %d %d\n", save_offset1, save_offset2, save_offset3));
1082    
1083          /* Each time round the loop, save the current subject position for use
1084          when the group matches. For MATCH_MATCH, the group has matched, so we
1085          restart it with a new subject starting position, remembering that we had
1086          at least one match. For MATCH_NOMATCH, carry on with the alternatives, as
1087          usual. If we haven't matched any alternatives in any iteration, check to
1088          see if a previous iteration matched. If so, the group has matched;
1089          continue from afterwards. Otherwise it has failed; restore the previous
1090          capture values before returning NOMATCH. */
1091    
1092          for (;;)
1093            {
1094            md->offset_vector[md->offset_end - number] =
1095              (int)(eptr - md->start_subject);
1096            if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
1097            RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
1098              eptrb, RM63);
1099            if (rrc == MATCH_KETRPOS)
1100              {
1101              offset_top = md->end_offset_top;
1102              eptr = md->end_match_ptr;
1103              ecode = md->start_code + code_offset;
1104              save_capture_last = md->capture_last;
1105              matched_once = TRUE;
1106              continue;
1107              }
1108    
1109            /* See comment in the code for capturing groups above about handling
1110            THEN. */
1111    
1112            if (rrc == MATCH_THEN)
1113              {
1114              next = ecode + GET(ecode,1);
1115              if (md->start_match_ptr < next &&
1116                  (*ecode == OP_ALT || *next == OP_ALT))
1117                rrc = MATCH_NOMATCH;
1118              }
1119    
1120            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1121            md->capture_last = save_capture_last;
1122            ecode += GET(ecode, 1);
1123            if (*ecode != OP_ALT) break;
1124          }          }
1125    
1126        /* For non-final alternatives, continue the loop for a NOMATCH result;        if (!matched_once)
1127        otherwise return. */          {
1128            md->offset_vector[offset] = save_offset1;
1129            md->offset_vector[offset+1] = save_offset2;
1130            md->offset_vector[md->offset_end - number] = save_offset3;
1131            }
1132    
1133        RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md, ims,        if (md->mark == NULL) md->mark = markptr;
1134          eptrb, flags, RM2);        if (allow_zero || matched_once)
1135        if (rrc != MATCH_NOMATCH &&          {
1136            (rrc != MATCH_THEN || md->start_match_ptr != ecode))          ecode += 1 + LINK_SIZE;
1137          RRETURN(rrc);          break;
1138            }
1139    
1140          RRETURN(MATCH_NOMATCH);
1141          }
1142    
1143        /* FALL THROUGH ... Insufficient room for saving captured contents. Treat
1144        as a non-capturing bracket. */
1145    
1146        /* VVVVVVVVVVVVVVVVVVVVVVVVV */
1147        /* VVVVVVVVVVVVVVVVVVVVVVVVV */
1148    
1149        DPRINTF(("insufficient capture room: treat as non-capturing\n"));
1150    
1151        /* VVVVVVVVVVVVVVVVVVVVVVVVV */
1152        /* VVVVVVVVVVVVVVVVVVVVVVVVV */
1153    
1154        /* Non-capturing possessive bracket with unlimited repeat. We come here
1155        from BRAZERO with allow_zero = TRUE. The code is similar to the above,
1156        without the capturing complication. It is written out separately for speed
1157        and cleanliness. */
1158    
1159        case OP_BRAPOS:
1160        case OP_SBRAPOS:
1161        allow_zero = FALSE;
1162    
1163        POSSESSIVE_NON_CAPTURE:
1164        matched_once = FALSE;
1165        code_offset = ecode - md->start_code;
1166    
1167        for (;;)
1168          {
1169          if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
1170          RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
1171            eptrb, RM48);
1172          if (rrc == MATCH_KETRPOS)
1173            {
1174            offset_top = md->end_offset_top;
1175            eptr = md->end_match_ptr;
1176            ecode = md->start_code + code_offset;
1177            matched_once = TRUE;
1178            continue;
1179            }
1180    
1181          /* See comment in the code for capturing groups above about handling
1182          THEN. */
1183    
1184          if (rrc == MATCH_THEN)
1185            {
1186            next = ecode + GET(ecode,1);
1187            if (md->start_match_ptr < next &&
1188                (*ecode == OP_ALT || *next == OP_ALT))
1189              rrc = MATCH_NOMATCH;
1190            }
1191    
1192          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1193        ecode += GET(ecode, 1);        ecode += GET(ecode, 1);
1194          if (*ecode != OP_ALT) break;
1195        }        }
1196    
1197        if (matched_once || allow_zero)
1198          {
1199          ecode += 1 + LINK_SIZE;
1200          break;
1201          }
1202        RRETURN(MATCH_NOMATCH);
1203    
1204      /* Control never reaches here. */      /* Control never reaches here. */
1205    
1206      /* Conditional group: compilation checked that there are no more than      /* Conditional group: compilation checked that there are no more than
1207      two branches. If the condition is false, skipping the first branch takes us      two branches. If the condition is false, skipping the first branch takes us
1208      past the end if there is only one branch, but that's OK because that is      past the end if there is only one branch, but that's OK because that is
1209      exactly what going to the ket would do. As there is only one branch to be      exactly what going to the ket would do. */
     obeyed, we can use tail recursion to avoid using another stack frame. */  
1210    
1211      case OP_COND:      case OP_COND:
1212      case OP_SCOND:      case OP_SCOND:
1213      codelink= GET(ecode, 1);      codelink = GET(ecode, 1);
1214    
1215      /* Because of the way auto-callout works during compile, a callout item is      /* Because of the way auto-callout works during compile, a callout item is
1216      inserted between OP_COND and an assertion condition. */      inserted between OP_COND and an assertion condition. */
# Line 928  for (;;) Line 1220  for (;;)
1220        if (pcre_callout != NULL)        if (pcre_callout != NULL)
1221          {          {
1222          pcre_callout_block cb;          pcre_callout_block cb;
1223          cb.version          = 1;   /* Version 1 of the callout block */          cb.version          = 2;   /* Version 1 of the callout block */
1224          cb.callout_number   = ecode[LINK_SIZE+2];          cb.callout_number   = ecode[LINK_SIZE+2];
1225          cb.offset_vector    = md->offset_vector;          cb.offset_vector    = md->offset_vector;
1226          cb.subject          = (PCRE_SPTR)md->start_subject;          cb.subject          = (PCRE_SPTR)md->start_subject;
# Line 940  for (;;) Line 1232  for (;;)
1232          cb.capture_top      = offset_top/2;          cb.capture_top      = offset_top/2;
1233          cb.capture_last     = md->capture_last;          cb.capture_last     = md->capture_last;
1234          cb.callout_data     = md->callout_data;          cb.callout_data     = md->callout_data;
1235            cb.mark             = (unsigned char *)markptr;
1236          if ((rrc = (*pcre_callout)(&cb)) > 0) MRRETURN(MATCH_NOMATCH);          if ((rrc = (*pcre_callout)(&cb)) > 0) MRRETURN(MATCH_NOMATCH);
1237          if (rrc < 0) RRETURN(rrc);          if (rrc < 0) RRETURN(rrc);
1238          }          }
1239        ecode += _pcre_OP_lengths[OP_CALLOUT];        ecode += PRIV(OP_lengths)[OP_CALLOUT];
1240        }        }
1241    
1242      condcode = ecode[LINK_SIZE+1];      condcode = ecode[LINK_SIZE+1];
# Line 960  for (;;) Line 1253  for (;;)
1253        else        else
1254          {          {
1255          int recno = GET2(ecode, LINK_SIZE + 2);   /* Recursion group number*/          int recno = GET2(ecode, LINK_SIZE + 2);   /* Recursion group number*/
1256          condition =  (recno == RREF_ANY || recno == md->recursive->group_num);          condition = (recno == RREF_ANY || recno == md->recursive->group_num);
1257    
1258          /* 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
1259          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
1260          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
1261          if any one is set. */          if any one is set. */
1262    
1263          if (!condition && condcode == OP_NRREF && recno != RREF_ANY)          if (!condition && condcode == OP_NRREF)
1264            {            {
1265            uschar *slotA = md->name_table;            pcre_uchar *slotA = md->name_table;
1266            for (i = 0; i < md->name_count; i++)            for (i = 0; i < md->name_count; i++)
1267              {              {
1268              if (GET2(slotA, 0) == recno) break;              if (GET2(slotA, 0) == recno) break;
# Line 982  for (;;) Line 1275  for (;;)
1275    
1276            if (i < md->name_count)            if (i < md->name_count)
1277              {              {
1278              uschar *slotB = slotA;              pcre_uchar *slotB = slotA;
1279              while (slotB > md->name_table)              while (slotB > md->name_table)
1280                {                {
1281                slotB -= md->name_entry_size;                slotB -= md->name_entry_size;
1282                if (strcmp((char *)slotA + 2, (char *)slotB + 2) == 0)                if (STRCMP_UC_UC(slotA + IMM2_SIZE, slotB + IMM2_SIZE) == 0)
1283                  {                  {
1284                  condition = GET2(slotB, 0) == md->recursive->group_num;                  condition = GET2(slotB, 0) == md->recursive->group_num;
1285                  if (condition) break;                  if (condition) break;
# Line 1002  for (;;) Line 1295  for (;;)
1295                for (i++; i < md->name_count; i++)                for (i++; i < md->name_count; i++)
1296                  {                  {
1297                  slotB += md->name_entry_size;                  slotB += md->name_entry_size;
1298                  if (strcmp((char *)slotA + 2, (char *)slotB + 2) == 0)                  if (STRCMP_UC_UC(slotA + IMM2_SIZE, slotB + IMM2_SIZE) == 0)
1299                    {                    {
1300                    condition = GET2(slotB, 0) == md->recursive->group_num;                    condition = GET2(slotB, 0) == md->recursive->group_num;
1301                    if (condition) break;                    if (condition) break;
# Line 1015  for (;;) Line 1308  for (;;)
1308    
1309          /* Chose branch according to the condition */          /* Chose branch according to the condition */
1310    
1311          ecode += condition? 3 : GET(ecode, 1);          ecode += condition? 1 + IMM2_SIZE : GET(ecode, 1);
1312          }          }
1313        }        }
1314    
# Line 1032  for (;;) Line 1325  for (;;)
1325        if (!condition && condcode == OP_NCREF)        if (!condition && condcode == OP_NCREF)
1326          {          {
1327          int refno = offset >> 1;          int refno = offset >> 1;
1328          uschar *slotA = md->name_table;          pcre_uchar *slotA = md->name_table;
1329    
1330          for (i = 0; i < md->name_count; i++)          for (i = 0; i < md->name_count; i++)
1331            {            {
# Line 1046  for (;;) Line 1339  for (;;)
1339    
1340          if (i < md->name_count)          if (i < md->name_count)
1341            {            {
1342            uschar *slotB = slotA;            pcre_uchar *slotB = slotA;
1343            while (slotB > md->name_table)            while (slotB > md->name_table)
1344              {              {
1345              slotB -= md->name_entry_size;              slotB -= md->name_entry_size;
1346              if (strcmp((char *)slotA + 2, (char *)slotB + 2) == 0)              if (STRCMP_UC_UC(slotA + IMM2_SIZE, slotB + IMM2_SIZE) == 0)
1347                {                {
1348                offset = GET2(slotB, 0) << 1;                offset = GET2(slotB, 0) << 1;
1349                condition = offset < offset_top &&                condition = offset < offset_top &&
# Line 1068  for (;;) Line 1361  for (;;)
1361              for (i++; i < md->name_count; i++)              for (i++; i < md->name_count; i++)
1362                {                {
1363                slotB += md->name_entry_size;                slotB += md->name_entry_size;
1364                if (strcmp((char *)slotA + 2, (char *)slotB + 2) == 0)                if (STRCMP_UC_UC(slotA + IMM2_SIZE, slotB + IMM2_SIZE) == 0)
1365                  {                  {
1366                  offset = GET2(slotB, 0) << 1;                  offset = GET2(slotB, 0) << 1;
1367                  condition = offset < offset_top &&                  condition = offset < offset_top &&
# Line 1083  for (;;) Line 1376  for (;;)
1376    
1377        /* Chose branch according to the condition */        /* Chose branch according to the condition */
1378    
1379        ecode += condition? 3 : GET(ecode, 1);        ecode += condition? 1 + IMM2_SIZE : GET(ecode, 1);
1380        }        }
1381    
1382      else if (condcode == OP_DEF)     /* DEFINE - always false */      else if (condcode == OP_DEF)     /* DEFINE - always false */
# Line 1093  for (;;) Line 1386  for (;;)
1386        }        }
1387    
1388      /* The condition is an assertion. Call match() to evaluate it - setting      /* The condition is an assertion. Call match() to evaluate it - setting
1389      the final argument match_condassert causes it to stop at the end of an      md->match_function_type to MATCH_CONDASSERT causes it to stop at the end of
1390      assertion. */      an assertion. */
1391    
1392      else      else
1393        {        {
1394        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, NULL,        md->match_function_type = MATCH_CONDASSERT;
1395            match_condassert, RM3);        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM3);
1396        if (rrc == MATCH_MATCH)        if (rrc == MATCH_MATCH)
1397          {          {
1398            if (md->end_offset_top > offset_top)
1399              offset_top = md->end_offset_top;  /* Captures may have happened */
1400          condition = TRUE;          condition = TRUE;
1401          ecode += 1 + LINK_SIZE + GET(ecode, LINK_SIZE + 2);          ecode += 1 + LINK_SIZE + GET(ecode, LINK_SIZE + 2);
1402          while (*ecode == OP_ALT) ecode += GET(ecode, 1);          while (*ecode == OP_ALT) ecode += GET(ecode, 1);
1403          }          }
1404        else if (rrc != MATCH_NOMATCH &&  
1405                (rrc != MATCH_THEN || md->start_match_ptr != ecode))        /* PCRE doesn't allow the effect of (*THEN) to escape beyond an
1406          assertion; it is therefore treated as NOMATCH. */
1407    
1408          else if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN)
1409          {          {
1410          RRETURN(rrc);         /* Need braces because of following else */          RRETURN(rrc);         /* Need braces because of following else */
1411          }          }
# Line 1118  for (;;) Line 1416  for (;;)
1416          }          }
1417        }        }
1418    
1419      /* 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
1420      we can use tail recursion to avoid using another stack frame, except when      use tail recursion to avoid using another stack frame, except when there is
1421      match_cbegroup is required for an unlimited repeat of a possibly empty      unlimited repeat of a possibly empty group. In the latter case, a recursive
1422      group. If the second alternative doesn't exist, we can just plough on. */      call to match() is always required, unless the second alternative doesn't
1423        exist, in which case we can just plough on. Note that, for compatibility
1424        with Perl, the | in a conditional group is NOT treated as creating two
1425        alternatives. If a THEN is encountered in the branch, it propagates out to
1426        the enclosing alternative (unless nested in a deeper set of alternatives,
1427        of course). */
1428    
1429      if (condition || *ecode == OP_ALT)      if (condition || *ecode == OP_ALT)
1430        {        {
1431        ecode += 1 + LINK_SIZE;        if (op != OP_SCOND)
       if (op == OP_SCOND)        /* Possibly empty group */  
1432          {          {
1433          RMATCH(eptr, ecode, offset_top, md, ims, eptrb, match_cbegroup, RM49);          ecode += 1 + LINK_SIZE;
         RRETURN(rrc);  
         }  
       else                       /* Group must match something */  
         {  
         flags = 0;  
1434          goto TAIL_RECURSE;          goto TAIL_RECURSE;
1435          }          }
1436    
1437          md->match_function_type = MATCH_CBEGROUP;
1438          RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM49);
1439          RRETURN(rrc);
1440        }        }
1441      else                         /* Condition false & no alternative */  
1442         /* Condition false & no alternative; continue after the group. */
1443    
1444        else
1445        {        {
1446        ecode += 1 + LINK_SIZE;        ecode += 1 + LINK_SIZE;
1447        }        }
# Line 1164  for (;;) Line 1468  for (;;)
1468        md->offset_vector[offset+1] = (int)(eptr - md->start_subject);        md->offset_vector[offset+1] = (int)(eptr - md->start_subject);
1469        if (offset_top <= offset) offset_top = offset + 2;        if (offset_top <= offset) offset_top = offset + 2;
1470        }        }
1471      ecode += 3;      ecode += 1 + IMM2_SIZE;
1472      break;      break;
1473    
1474    
1475      /* End of the pattern, either real or forced. If we are in a top-level      /* End of the pattern, either real or forced. */
     recursion, we should restore the offsets appropriately and continue from  
     after the call. */  
1476    
     case OP_ACCEPT:  
1477      case OP_END:      case OP_END:
1478      if (md->recursive != NULL && md->recursive->group_num == 0)      case OP_ACCEPT:
1479        {      case OP_ASSERT_ACCEPT:
       recursion_info *rec = md->recursive;  
       DPRINTF(("End of pattern in a (?0) recursion\n"));  
       md->recursive = rec->prevrec;  
       memmove(md->offset_vector, rec->offset_save,  
         rec->saved_max * sizeof(int));  
       offset_top = rec->save_offset_top;  
       ims = original_ims;  
       ecode = rec->after_call;  
       break;  
       }  
1480    
1481      /* Otherwise, if we have matched an empty string, fail if PCRE_NOTEMPTY is      /* If we have matched an empty string, fail if not in an assertion and not
1482      set, or if PCRE_NOTEMPTY_ATSTART is set and we have matched at the start of      in a recursion if either PCRE_NOTEMPTY is set, or if PCRE_NOTEMPTY_ATSTART
1483      the subject. In both cases, backtracking will then try other alternatives,      is set and we have matched at the start of the subject. In both cases,
1484      if any. */      backtracking will then try other alternatives, if any. */
1485    
1486      if (eptr == mstart &&      if (eptr == mstart && op != OP_ASSERT_ACCEPT &&
1487          (md->notempty ||           md->recursive == NULL &&
1488            (md->notempty_atstart &&           (md->notempty ||
1489              mstart == md->start_subject + md->start_offset)))             (md->notempty_atstart &&
1490                 mstart == md->start_subject + md->start_offset)))
1491        MRRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
1492    
1493      /* Otherwise, we have a match. */      /* Otherwise, we have a match. */
# Line 1210  for (;;) Line 1502  for (;;)
1502      rrc = (op == OP_END)? MATCH_MATCH : MATCH_ACCEPT;      rrc = (op == OP_END)? MATCH_MATCH : MATCH_ACCEPT;
1503      MRRETURN(rrc);      MRRETURN(rrc);
1504    
     /* Change option settings */  
   
     case OP_OPT:  
     ims = ecode[1];  
     ecode += 2;  
     DPRINTF(("ims set to %02lx\n", ims));  
     break;  
   
1505      /* Assertion brackets. Check the alternative branches in turn - the      /* Assertion brackets. Check the alternative branches in turn - the
1506      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,
1507      the assertion is true. Lookbehind assertions have an OP_REVERSE item at the      the assertion is true. Lookbehind assertions have an OP_REVERSE item at the
1508      start of each branch to move the current point backwards, so the code at      start of each branch to move the current point backwards, so the code at
1509      this level is identical to the lookahead case. */      this level is identical to the lookahead case. When the assertion is part
1510        of a condition, we want to return immediately afterwards. The caller of
1511        this incarnation of the match() function will have set MATCH_CONDASSERT in
1512        md->match_function type, and one of these opcodes will be the first opcode
1513        that is processed. We use a local variable that is preserved over calls to
1514        match() to remember this case. */
1515    
1516      case OP_ASSERT:      case OP_ASSERT:
1517      case OP_ASSERTBACK:      case OP_ASSERTBACK:
1518        if (md->match_function_type == MATCH_CONDASSERT)
1519          {
1520          condassert = TRUE;
1521          md->match_function_type = 0;
1522          }
1523        else condassert = FALSE;
1524    
1525      do      do
1526        {        {
1527        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, NULL, 0,        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM4);
         RM4);  
1528        if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)        if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)
1529          {          {
1530          mstart = md->start_match_ptr;   /* In case \K reset it */          mstart = md->start_match_ptr;   /* In case \K reset it */
1531            markptr = md->mark;
1532          break;          break;
1533          }          }
1534        if (rrc != MATCH_NOMATCH &&  
1535            (rrc != MATCH_THEN || md->start_match_ptr != ecode))        /* PCRE does not allow THEN to escape beyond an assertion; it is treated
1536          RRETURN(rrc);        as NOMATCH. */
1537    
1538          if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
1539        ecode += GET(ecode, 1);        ecode += GET(ecode, 1);
1540        }        }
1541      while (*ecode == OP_ALT);      while (*ecode == OP_ALT);
1542    
1543      if (*ecode == OP_KET) MRRETURN(MATCH_NOMATCH);      if (*ecode == OP_KET) MRRETURN(MATCH_NOMATCH);
1544    
1545      /* If checking an assertion for a condition, return MATCH_MATCH. */      /* If checking an assertion for a condition, return MATCH_MATCH. */
1546    
1547      if ((flags & match_condassert) != 0) RRETURN(MATCH_MATCH);      if (condassert) RRETURN(MATCH_MATCH);
1548    
1549      /* Continue from after the assertion, updating the offsets high water      /* Continue from after the assertion, updating the offsets high water
1550      mark, since extracts may have been taken during the assertion. */      mark, since extracts may have been taken during the assertion. */
# Line 1261  for (;;) Line 1560  for (;;)
1560    
1561      case OP_ASSERT_NOT:      case OP_ASSERT_NOT:
1562      case OP_ASSERTBACK_NOT:      case OP_ASSERTBACK_NOT:
1563        if (md->match_function_type == MATCH_CONDASSERT)
1564          {
1565          condassert = TRUE;
1566          md->match_function_type = 0;
1567          }
1568        else condassert = FALSE;
1569    
1570      do      do
1571        {        {
1572        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, NULL, 0,        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM5);
         RM5);  
1573        if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) MRRETURN(MATCH_NOMATCH);        if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) MRRETURN(MATCH_NOMATCH);
1574        if (rrc == MATCH_SKIP || rrc == MATCH_PRUNE || rrc == MATCH_COMMIT)        if (rrc == MATCH_SKIP || rrc == MATCH_PRUNE || rrc == MATCH_COMMIT)
1575          {          {
1576          do ecode += GET(ecode,1); while (*ecode == OP_ALT);          do ecode += GET(ecode,1); while (*ecode == OP_ALT);
1577          break;          break;
1578          }          }
1579        if (rrc != MATCH_NOMATCH &&  
1580            (rrc != MATCH_THEN || md->start_match_ptr != ecode))        /* PCRE does not allow THEN to escape beyond an assertion; it is treated
1581          RRETURN(rrc);        as NOMATCH. */
1582    
1583          if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
1584        ecode += GET(ecode,1);        ecode += GET(ecode,1);
1585        }        }
1586      while (*ecode == OP_ALT);      while (*ecode == OP_ALT);
1587    
1588      if ((flags & match_condassert) != 0) RRETURN(MATCH_MATCH);      if (condassert) RRETURN(MATCH_MATCH);  /* Condition assertion */
1589    
1590      ecode += 1 + LINK_SIZE;      ecode += 1 + LINK_SIZE;
1591      continue;      continue;
# Line 1290  for (;;) Line 1597  for (;;)
1597    
1598      case OP_REVERSE:      case OP_REVERSE:
1599  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
1600      if (utf8)      if (utf)
1601        {        {
1602        i = GET(ecode, 1);        i = GET(ecode, 1);
1603        while (i-- > 0)        while (i-- > 0)
# Line 1324  for (;;) Line 1631  for (;;)
1631      if (pcre_callout != NULL)      if (pcre_callout != NULL)
1632        {        {
1633        pcre_callout_block cb;        pcre_callout_block cb;
1634        cb.version          = 1;   /* Version 1 of the callout block */        cb.version          = 2;   /* Version 1 of the callout block */
1635        cb.callout_number   = ecode[1];        cb.callout_number   = ecode[1];
1636        cb.offset_vector    = md->offset_vector;        cb.offset_vector    = md->offset_vector;
1637        cb.subject          = (PCRE_SPTR)md->start_subject;        cb.subject          = (PCRE_SPTR)md->start_subject;
# Line 1336  for (;;) Line 1643  for (;;)
1643        cb.capture_top      = offset_top/2;        cb.capture_top      = offset_top/2;
1644        cb.capture_last     = md->capture_last;        cb.capture_last     = md->capture_last;
1645        cb.callout_data     = md->callout_data;        cb.callout_data     = md->callout_data;
1646          cb.mark             = (unsigned char *)markptr;
1647        if ((rrc = (*pcre_callout)(&cb)) > 0) MRRETURN(MATCH_NOMATCH);        if ((rrc = (*pcre_callout)(&cb)) > 0) MRRETURN(MATCH_NOMATCH);
1648        if (rrc < 0) RRETURN(rrc);        if (rrc < 0) RRETURN(rrc);
1649        }        }
# Line 1346  for (;;) Line 1654  for (;;)
1654      offset data is the offset to the starting bracket from the start of the      offset data is the offset to the starting bracket from the start of the
1655      whole pattern. (This is so that it works from duplicated subpatterns.)      whole pattern. (This is so that it works from duplicated subpatterns.)
1656    
1657      If there are any capturing brackets started but not finished, we have to      The state of the capturing groups is preserved over recursion, and
1658      save their starting points and reinstate them after the recursion. However,      re-instated afterwards. We don't know how many are started and not yet
1659      we don't know how many such there are (offset_top records the completed      finished (offset_top records the completed total) so we just have to save
1660      total) so we just have to save all the potential data. There may be up to      all the potential data. There may be up to 65535 such values, which is too
1661      65535 such values, which is too large to put on the stack, but using malloc      large to put on the stack, but using malloc for small numbers seems
1662      for small numbers seems expensive. As a compromise, the stack is used when      expensive. As a compromise, the stack is used when there are no more than
1663      there are no more than REC_STACK_SAVE_MAX values to store; otherwise malloc      REC_STACK_SAVE_MAX values to store; otherwise malloc is used.
     is used. A problem is what to do if the malloc fails ... there is no way of  
     returning to the top level with an error. Save the top REC_STACK_SAVE_MAX  
     values on the stack, and accept that the rest may be wrong.  
1664    
1665      There are also other values that have to be saved. We use a chained      There are also other values that have to be saved. We use a chained
1666      sequence of blocks that actually live on the stack. Thanks to Robin Houston      sequence of blocks that actually live on the stack. Thanks to Robin Houston
1667      for the original version of this logic. */      for the original version of this logic. It has, however, been hacked around
1668        a lot, so he is not to blame for the current way it works. */
1669    
1670      case OP_RECURSE:      case OP_RECURSE:
1671        {        {
1672          recursion_info *ri;
1673          int recno;
1674    
1675        callpat = md->start_code + GET(ecode, 1);        callpat = md->start_code + GET(ecode, 1);
1676        new_recursive.group_num = (callpat == md->start_code)? 0 :        recno = (callpat == md->start_code)? 0 :
1677          GET2(callpat, 1 + LINK_SIZE);          GET2(callpat, 1 + LINK_SIZE);
1678    
1679          /* Check for repeating a recursion without advancing the subject pointer.
1680          This should catch convoluted mutual recursions. (Some simple cases are
1681          caught at compile time.) */
1682    
1683          for (ri = md->recursive; ri != NULL; ri = ri->prevrec)
1684            if (recno == ri->group_num && eptr == ri->subject_position)
1685              RRETURN(PCRE_ERROR_RECURSELOOP);
1686    
1687        /* Add to "recursing stack" */        /* Add to "recursing stack" */
1688    
1689          new_recursive.group_num = recno;
1690          new_recursive.subject_position = eptr;
1691        new_recursive.prevrec = md->recursive;        new_recursive.prevrec = md->recursive;
1692        md->recursive = &new_recursive;        md->recursive = &new_recursive;
1693    
1694        /* Find where to continue from afterwards */        /* Where to continue from afterwards */
1695    
1696        ecode += 1 + LINK_SIZE;        ecode += 1 + LINK_SIZE;
       new_recursive.after_call = ecode;  
1697    
1698        /* Now save the offset data. */        /* Now save the offset data */
1699    
1700        new_recursive.saved_max = md->offset_end;        new_recursive.saved_max = md->offset_end;
1701        if (new_recursive.saved_max <= REC_STACK_SAVE_MAX)        if (new_recursive.saved_max <= REC_STACK_SAVE_MAX)
# Line 1388  for (;;) Line 1706  for (;;)
1706            (int *)(pcre_malloc)(new_recursive.saved_max * sizeof(int));            (int *)(pcre_malloc)(new_recursive.saved_max * sizeof(int));
1707          if (new_recursive.offset_save == NULL) RRETURN(PCRE_ERROR_NOMEMORY);          if (new_recursive.offset_save == NULL) RRETURN(PCRE_ERROR_NOMEMORY);
1708          }          }
   
1709        memcpy(new_recursive.offset_save, md->offset_vector,        memcpy(new_recursive.offset_save, md->offset_vector,
1710              new_recursive.saved_max * sizeof(int));              new_recursive.saved_max * sizeof(int));
       new_recursive.save_offset_top = offset_top;  
1711    
1712        /* OK, now we can do the recursion. For each top-level alternative we        /* OK, now we can do the recursion. After processing each alternative,
1713        restore the offset and recursion data. */        restore the offset data. If there were nested recursions, md->recursive
1714          might be changed, so reset it before looping. */
1715    
1716        DPRINTF(("Recursing into group %d\n", new_recursive.group_num));        DPRINTF(("Recursing into group %d\n", new_recursive.group_num));
1717        flags = (*callpat >= OP_SBRA)? match_cbegroup : 0;        cbegroup = (*callpat >= OP_SBRA);
1718        do        do
1719          {          {
1720          RMATCH(eptr, callpat + _pcre_OP_lengths[*callpat], offset_top,          if (cbegroup) md->match_function_type = MATCH_CBEGROUP;
1721            md, ims, eptrb, flags, RM6);          RMATCH(eptr, callpat + PRIV(OP_lengths)[*callpat], offset_top,
1722              md, eptrb, RM6);
1723            memcpy(md->offset_vector, new_recursive.offset_save,
1724                new_recursive.saved_max * sizeof(int));
1725            md->recursive = new_recursive.prevrec;
1726          if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)          if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)
1727            {            {
1728            DPRINTF(("Recursion matched\n"));            DPRINTF(("Recursion matched\n"));
           md->recursive = new_recursive.prevrec;  
1729            if (new_recursive.offset_save != stacksave)            if (new_recursive.offset_save != stacksave)
1730              (pcre_free)(new_recursive.offset_save);              (pcre_free)(new_recursive.offset_save);
1731            MRRETURN(MATCH_MATCH);  
1732              /* Set where we got to in the subject, and reset the start in case
1733              it was changed by \K. This *is* propagated back out of a recursion,
1734              for Perl compatibility. */
1735    
1736              eptr = md->end_match_ptr;
1737              mstart = md->start_match_ptr;
1738              goto RECURSION_MATCHED;        /* Exit loop; end processing */
1739            }            }
1740          else if (rrc != MATCH_NOMATCH &&  
1741                  (rrc != MATCH_THEN || md->start_match_ptr != ecode))          /* PCRE does not allow THEN to escape beyond a recursion; it is treated
1742            as NOMATCH. */
1743    
1744            else if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN)
1745            {            {
1746            DPRINTF(("Recursion gave error %d\n", rrc));            DPRINTF(("Recursion gave error %d\n", rrc));
1747            if (new_recursive.offset_save != stacksave)            if (new_recursive.offset_save != stacksave)
# Line 1420  for (;;) Line 1750  for (;;)
1750            }            }
1751    
1752          md->recursive = &new_recursive;          md->recursive = &new_recursive;
         memcpy(md->offset_vector, new_recursive.offset_save,  
             new_recursive.saved_max * sizeof(int));  
1753          callpat += GET(callpat, 1);          callpat += GET(callpat, 1);
1754          }          }
1755        while (*callpat == OP_ALT);        while (*callpat == OP_ALT);
# Line 1432  for (;;) Line 1760  for (;;)
1760          (pcre_free)(new_recursive.offset_save);          (pcre_free)(new_recursive.offset_save);
1761        MRRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
1762        }        }
     /* Control never reaches here */  
   
     /* "Once" brackets are like assertion brackets except that after a match,  
     the point in the subject string is not moved back. Thus there can never be  
     a move back into the brackets. Friedl calls these "atomic" subpatterns.  
     Check the alternative branches in turn - the matching won't pass the KET  
     for this kind of subpattern. If any one branch matches, we carry on as at  
     the end of a normal bracket, leaving the subject pointer, but resetting  
     the start-of-match value in case it was changed by \K. */  
   
     case OP_ONCE:  
     prev = ecode;  
     saved_eptr = eptr;  
   
     do  
       {  
       RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, eptrb, 0, RM7);  
       if (rrc == MATCH_MATCH)  /* Note: _not_ MATCH_ACCEPT */  
         {  
         mstart = md->start_match_ptr;  
         break;  
         }  
       if (rrc != MATCH_NOMATCH &&  
           (rrc != MATCH_THEN || md->start_match_ptr != ecode))  
         RRETURN(rrc);  
       ecode += GET(ecode,1);  
       }  
     while (*ecode == OP_ALT);  
   
     /* If hit the end of the group (which could be repeated), fail */  
   
     if (*ecode != OP_ONCE && *ecode != OP_ALT) RRETURN(MATCH_NOMATCH);  
   
     /* Continue as from after the assertion, updating the offsets high water  
     mark, since extracts may have been taken. */  
   
     do ecode += GET(ecode, 1); while (*ecode == OP_ALT);  
   
     offset_top = md->end_offset_top;  
     eptr = md->end_match_ptr;  
   
     /* For a non-repeating ket, just continue at this level. This also  
     happens for a repeating ket if no characters were matched in the group.  
     This is the forcible breaking of infinite loops as implemented in Perl  
     5.005. If there is an options reset, it will get obeyed in the normal  
     course of events. */  
   
     if (*ecode == OP_KET || eptr == saved_eptr)  
       {  
       ecode += 1+LINK_SIZE;  
       break;  
       }  
   
     /* The repeating kets try the rest of the pattern or restart from the  
     preceding bracket, in the appropriate order. The second "call" of match()  
     uses tail recursion, to avoid using another stack frame. We need to reset  
     any options that changed within the bracket before re-running it, so  
     check the next opcode. */  
   
     if (ecode[1+LINK_SIZE] == OP_OPT)  
       {  
       ims = (ims & ~PCRE_IMS) | ecode[4];  
       DPRINTF(("ims set to %02lx at group repeat\n", ims));  
       }  
1763    
1764      if (*ecode == OP_KETRMIN)      RECURSION_MATCHED:
1765        {      break;
       RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, eptrb, 0, RM8);  
       if (rrc != MATCH_NOMATCH) RRETURN(rrc);  
       ecode = prev;  
       flags = 0;  
       goto TAIL_RECURSE;  
       }  
     else  /* OP_KETRMAX */  
       {  
       RMATCH(eptr, prev, offset_top, md, ims, eptrb, match_cbegroup, RM9);  
       if (rrc != MATCH_NOMATCH) RRETURN(rrc);  
       ecode += 1 + LINK_SIZE;  
       flags = 0;  
       goto TAIL_RECURSE;  
       }  
     /* Control never gets here */  
1766    
1767      /* An alternation is the end of a branch; scan along to find the end of the      /* An alternation is the end of a branch; scan along to find the end of the
1768      bracketed group and go to there. */      bracketed group and go to there. */
# Line 1529  for (;;) Line 1778  for (;;)
1778      optional ones preceded by BRAZERO or BRAMINZERO. */      optional ones preceded by BRAZERO or BRAMINZERO. */
1779    
1780      case OP_BRAZERO:      case OP_BRAZERO:
1781        {      next = ecode + 1;
1782        next = ecode+1;      RMATCH(eptr, next, offset_top, md, eptrb, RM10);
1783        RMATCH(eptr, next, offset_top, md, ims, eptrb, 0, RM10);      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1784        if (rrc != MATCH_NOMATCH) RRETURN(rrc);      do next += GET(next, 1); while (*next == OP_ALT);
1785        do next += GET(next,1); while (*next == OP_ALT);      ecode = next + 1 + LINK_SIZE;
       ecode = next + 1 + LINK_SIZE;  
       }  
1786      break;      break;
1787    
1788      case OP_BRAMINZERO:      case OP_BRAMINZERO:
1789        {      next = ecode + 1;
1790        next = ecode+1;      do next += GET(next, 1); while (*next == OP_ALT);
1791        do next += GET(next, 1); while (*next == OP_ALT);      RMATCH(eptr, next + 1+LINK_SIZE, offset_top, md, eptrb, RM11);
1792        RMATCH(eptr, next + 1+LINK_SIZE, offset_top, md, ims, eptrb, 0, RM11);      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1793        if (rrc != MATCH_NOMATCH) RRETURN(rrc);      ecode++;
       ecode++;  
       }  
1794      break;      break;
1795    
1796      case OP_SKIPZERO:      case OP_SKIPZERO:
1797        {      next = ecode+1;
1798        next = ecode+1;      do next += GET(next,1); while (*next == OP_ALT);
1799        do next += GET(next,1); while (*next == OP_ALT);      ecode = next + 1 + LINK_SIZE;
       ecode = next + 1 + LINK_SIZE;  
       }  
1800      break;      break;
1801    
1802        /* BRAPOSZERO occurs before a possessive bracket group. Don't do anything
1803        here; just jump to the group, with allow_zero set TRUE. */
1804    
1805        case OP_BRAPOSZERO:
1806        op = *(++ecode);
1807        allow_zero = TRUE;
1808        if (op == OP_CBRAPOS || op == OP_SCBRAPOS) goto POSSESSIVE_CAPTURE;
1809          goto POSSESSIVE_NON_CAPTURE;
1810    
1811      /* End of a group, repeated or non-repeating. */      /* End of a group, repeated or non-repeating. */
1812    
1813      case OP_KET:      case OP_KET:
1814      case OP_KETRMIN:      case OP_KETRMIN:
1815      case OP_KETRMAX:      case OP_KETRMAX:
1816        case OP_KETRPOS:
1817      prev = ecode - GET(ecode, 1);      prev = ecode - GET(ecode, 1);
1818    
1819      /* If this was a group that remembered the subject start, in order to break      /* If this was a group that remembered the subject start, in order to break
1820      infinite repeats of empty string matches, retrieve the subject start from      infinite repeats of empty string matches, retrieve the subject start from
1821      the chain. Otherwise, set it NULL. */      the chain. Otherwise, set it NULL. */
1822    
1823      if (*prev >= OP_SBRA)      if (*prev >= OP_SBRA || *prev == OP_ONCE)
1824        {        {
1825        saved_eptr = eptrb->epb_saved_eptr;   /* Value at start of group */        saved_eptr = eptrb->epb_saved_eptr;   /* Value at start of group */
1826        eptrb = eptrb->epb_prev;              /* Backup to previous group */        eptrb = eptrb->epb_prev;              /* Backup to previous group */
1827        }        }
1828      else saved_eptr = NULL;      else saved_eptr = NULL;
1829    
1830      /* If we are at the end of an assertion group or an atomic group, stop      /* If we are at the end of an assertion group or a non-capturing atomic
1831      matching and return MATCH_MATCH, but record the current high water mark for      group, stop matching and return MATCH_MATCH, but record the current high
1832      use by positive assertions. We also need to record the match start in case      water mark for use by positive assertions. We also need to record the match
1833      it was changed by \K. */      start in case it was changed by \K. */
1834    
1835      if (*prev == OP_ASSERT || *prev == OP_ASSERT_NOT ||      if ((*prev >= OP_ASSERT && *prev <= OP_ASSERTBACK_NOT) ||
1836          *prev == OP_ASSERTBACK || *prev == OP_ASSERTBACK_NOT ||           *prev == OP_ONCE_NC)
         *prev == OP_ONCE)  
1837        {        {
1838        md->end_match_ptr = eptr;      /* For ONCE */        md->end_match_ptr = eptr;      /* For ONCE_NC */
1839        md->end_offset_top = offset_top;        md->end_offset_top = offset_top;
1840        md->start_match_ptr = mstart;        md->start_match_ptr = mstart;
1841        MRRETURN(MATCH_MATCH);        MRRETURN(MATCH_MATCH);         /* Sets md->mark */
1842        }        }
1843    
1844      /* 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
1845      and if necessary complete handling an extraction by setting the offsets and      and if necessary complete handling an extraction by setting the offsets and
1846      bumping the high water mark. Note that whole-pattern recursion is coded as      bumping the high water mark. Whole-pattern recursion is coded as a recurse
1847      a recurse into group 0, so it won't be picked up here. Instead, we catch it      into group 0, so it won't be picked up here. Instead, we catch it when the
1848      when the OP_END is reached. Other recursion is handled here. */      OP_END is reached. Other recursion is handled here. We just have to record
1849        the current subject position and start match pointer and give a MATCH
1850        return. */
1851    
1852      if (*prev == OP_CBRA || *prev == OP_SCBRA)      if (*prev == OP_CBRA || *prev == OP_SCBRA ||
1853            *prev == OP_CBRAPOS || *prev == OP_SCBRAPOS)
1854        {        {
1855        number = GET2(prev, 1+LINK_SIZE);        number = GET2(prev, 1+LINK_SIZE);
1856        offset = number << 1;        offset = number << 1;
# Line 1605  for (;;) Line 1860  for (;;)
1860        printf("\n");        printf("\n");
1861  #endif  #endif
1862    
1863          /* Handle a recursively called group. */
1864    
1865          if (md->recursive != NULL && md->recursive->group_num == number)
1866            {
1867            md->end_match_ptr = eptr;
1868            md->start_match_ptr = mstart;
1869            RRETURN(MATCH_MATCH);
1870            }
1871    
1872          /* Deal with capturing */
1873    
1874        md->capture_last = number;        md->capture_last = number;
1875        if (offset >= md->offset_max) md->offset_overflow = TRUE; else        if (offset >= md->offset_max) md->offset_overflow = TRUE; else
1876          {          {
1877            /* If offset is greater than offset_top, it means that we are
1878            "skipping" a capturing group, and that group's offsets must be marked
1879            unset. In earlier versions of PCRE, all the offsets were unset at the
1880            start of matching, but this doesn't work because atomic groups and
1881            assertions can cause a value to be set that should later be unset.
1882            Example: matching /(?>(a))b|(a)c/ against "ac". This sets group 1 as
1883            part of the atomic group, but this is not on the final matching path,
1884            so must be unset when 2 is set. (If there is no group 2, there is no
1885            problem, because offset_top will then be 2, indicating no capture.) */
1886    
1887            if (offset > offset_top)
1888              {
1889              register int *iptr = md->offset_vector + offset_top;
1890              register int *iend = md->offset_vector + offset;
1891              while (iptr < iend) *iptr++ = -1;
1892              }
1893    
1894            /* Now make the extraction */
1895    
1896          md->offset_vector[offset] =          md->offset_vector[offset] =
1897            md->offset_vector[md->offset_end - number];            md->offset_vector[md->offset_end - number];
1898          md->offset_vector[offset+1] = (int)(eptr - md->start_subject);          md->offset_vector[offset+1] = (int)(eptr - md->start_subject);
1899          if (offset_top <= offset) offset_top = offset + 2;          if (offset_top <= offset) offset_top = offset + 2;
1900          }          }
1901          }
1902    
1903        /* Handle a recursively called group. Restore the offsets      /* For an ordinary non-repeating ket, just continue at this level. This
1904        appropriately and continue from after the call. */      also happens for a repeating ket if no characters were matched in the
1905        group. This is the forcible breaking of infinite loops as implemented in
1906        Perl 5.005. For a non-repeating atomic group that includes captures,
1907        establish a backup point by processing the rest of the pattern at a lower
1908        level. If this results in a NOMATCH return, pass MATCH_ONCE back to the
1909        original OP_ONCE level, thereby bypassing intermediate backup points, but
1910        resetting any captures that happened along the way. */
1911    
1912        if (md->recursive != NULL && md->recursive->group_num == number)      if (*ecode == OP_KET || eptr == saved_eptr)
1913          {
1914          if (*prev == OP_ONCE)
1915          {          {
1916          recursion_info *rec = md->recursive;          RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM12);
1917          DPRINTF(("Recursion (%d) succeeded - continuing\n", number));          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1918          md->recursive = rec->prevrec;          md->once_target = prev;  /* Level at which to change to MATCH_NOMATCH */
1919          memcpy(md->offset_vector, rec->offset_save,          RRETURN(MATCH_ONCE);
           rec->saved_max * sizeof(int));  
         offset_top = rec->save_offset_top;  
         ecode = rec->after_call;  
         ims = original_ims;  
         break;  
1920          }          }
1921          ecode += 1 + LINK_SIZE;    /* Carry on at this level */
1922          break;
1923        }        }
1924    
1925      /* For both capturing and non-capturing groups, reset the value of the ims      /* OP_KETRPOS is a possessive repeating ket. Remember the current position,
1926      flags, in case they got changed during the group. */      and return the MATCH_KETRPOS. This makes it possible to do the repeats one
1927        at a time from the outer level, thus saving stack. */
     ims = original_ims;  
     DPRINTF(("ims reset to %02lx\n", ims));  
   
     /* For a non-repeating ket, just continue at this level. This also  
     happens for a repeating ket if no characters were matched in the group.  
     This is the forcible breaking of infinite loops as implemented in Perl  
     5.005. If there is an options reset, it will get obeyed in the normal  
     course of events. */  
1928    
1929      if (*ecode == OP_KET || eptr == saved_eptr)      if (*ecode == OP_KETRPOS)
1930        {        {
1931        ecode += 1 + LINK_SIZE;        md->end_match_ptr = eptr;
1932        break;        md->end_offset_top = offset_top;
1933          RRETURN(MATCH_KETRPOS);
1934        }        }
1935    
1936      /* The repeating kets try the rest of the pattern or restart from the      /* The normal repeating kets try the rest of the pattern or restart from
1937      preceding bracket, in the appropriate order. In the second case, we can use      the preceding bracket, in the appropriate order. In the second case, we can
1938      tail recursion to avoid using another stack frame, unless we have an      use tail recursion to avoid using another stack frame, unless we have an
1939      unlimited repeat of a group that can match an empty string. */      an atomic group or an unlimited repeat of a group that can match an empty
1940        string. */
     flags = (*prev >= OP_SBRA)? match_cbegroup : 0;  
1941    
1942      if (*ecode == OP_KETRMIN)      if (*ecode == OP_KETRMIN)
1943        {        {
1944        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, eptrb, 0, RM12);        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM7);
1945        if (rrc != MATCH_NOMATCH) RRETURN(rrc);        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1946        if (flags != 0)    /* Could match an empty string */        if (*prev == OP_ONCE)
1947            {
1948            RMATCH(eptr, prev, offset_top, md, eptrb, RM8);
1949            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1950            md->once_target = prev;  /* Level at which to change to MATCH_NOMATCH */
1951            RRETURN(MATCH_ONCE);
1952            }
1953          if (*prev >= OP_SBRA)    /* Could match an empty string */
1954          {          {
1955          RMATCH(eptr, prev, offset_top, md, ims, eptrb, flags, RM50);          md->match_function_type = MATCH_CBEGROUP;
1956            RMATCH(eptr, prev, offset_top, md, eptrb, RM50);
1957          RRETURN(rrc);          RRETURN(rrc);
1958          }          }
1959        ecode = prev;        ecode = prev;
# Line 1670  for (;;) Line 1961  for (;;)
1961        }        }
1962      else  /* OP_KETRMAX */      else  /* OP_KETRMAX */
1963        {        {
1964        RMATCH(eptr, prev, offset_top, md, ims, eptrb, flags, RM13);        if (*prev >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
1965          RMATCH(eptr, prev, offset_top, md, eptrb, RM13);
1966          if (rrc == MATCH_ONCE && md->once_target == prev) rrc = MATCH_NOMATCH;
1967        if (rrc != MATCH_NOMATCH) RRETURN(rrc);        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1968          if (*prev == OP_ONCE)
1969            {
1970            RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM9);
1971            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1972            md->once_target = prev;
1973            RRETURN(MATCH_ONCE);
1974            }
1975        ecode += 1 + LINK_SIZE;        ecode += 1 + LINK_SIZE;
       flags = 0;  
1976        goto TAIL_RECURSE;        goto TAIL_RECURSE;
1977        }        }
1978      /* Control never gets here */      /* Control never gets here */
1979    
1980      /* Start of subject unless notbol, or after internal newline if multiline */      /* Not multiline mode: start of subject assertion, unless notbol. */
1981    
1982      case OP_CIRC:      case OP_CIRC:
1983      if (md->notbol && eptr == md->start_subject) MRRETURN(MATCH_NOMATCH);      if (md->notbol && eptr == md->start_subject) MRRETURN(MATCH_NOMATCH);
     if ((ims & PCRE_MULTILINE) != 0)  
       {  
       if (eptr != md->start_subject &&  
           (eptr == md->end_subject || !WAS_NEWLINE(eptr)))  
         MRRETURN(MATCH_NOMATCH);  
       ecode++;  
       break;  
       }  
     /* ... else fall through */  
1984    
1985      /* Start of subject assertion */      /* Start of subject assertion */
1986    
# Line 1699  for (;;) Line 1989  for (;;)
1989      ecode++;      ecode++;
1990      break;      break;
1991    
1992        /* Multiline mode: start of subject unless notbol, or after any newline. */
1993    
1994        case OP_CIRCM:
1995        if (md->notbol && eptr == md->start_subject) MRRETURN(MATCH_NOMATCH);
1996        if (eptr != md->start_subject &&
1997            (eptr == md->end_subject || !WAS_NEWLINE(eptr)))
1998          MRRETURN(MATCH_NOMATCH);
1999        ecode++;
2000        break;
2001    
2002      /* Start of match assertion */      /* Start of match assertion */
2003    
2004      case OP_SOM:      case OP_SOM:
# Line 1713  for (;;) Line 2013  for (;;)
2013      ecode++;      ecode++;
2014      break;      break;
2015    
2016      /* Assert before internal newline if multiline, or before a terminating      /* Multiline mode: assert before any newline, or before end of subject
2017      newline unless endonly is set, else end of subject unless noteol is set. */      unless noteol is set. */
2018    
2019      case OP_DOLL:      case OP_DOLLM:
2020      if ((ims & PCRE_MULTILINE) != 0)      if (eptr < md->end_subject)
2021        {        { if (!IS_NEWLINE(eptr)) MRRETURN(MATCH_NOMATCH); }
2022        if (eptr < md->end_subject)      else
         { if (!IS_NEWLINE(eptr)) MRRETURN(MATCH_NOMATCH); }  
       else  
         {  
         if (md->noteol) MRRETURN(MATCH_NOMATCH);  
         SCHECK_PARTIAL();  
         }  
       ecode++;  
       break;  
       }  
     else  /* Not multiline */  
2023        {        {
2024        if (md->noteol) MRRETURN(MATCH_NOMATCH);        if (md->noteol) MRRETURN(MATCH_NOMATCH);
2025        if (!md->endonly) goto ASSERT_NL_OR_EOS;        SCHECK_PARTIAL();
2026        }        }
2027        ecode++;
2028        break;
2029    
2030        /* Not multiline mode: assert before a terminating newline or before end of
2031        subject unless noteol is set. */
2032    
2033        case OP_DOLL:
2034        if (md->noteol) MRRETURN(MATCH_NOMATCH);
2035        if (!md->endonly) goto ASSERT_NL_OR_EOS;
2036    
2037      /* ... else fall through for endonly */      /* ... else fall through for endonly */
2038    
# Line 1771  for (;;) Line 2070  for (;;)
2070        partial matching. */        partial matching. */
2071    
2072  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
2073        if (utf8)        if (utf)
2074          {          {
2075          /* Get status of previous character */          /* Get status of previous character */
2076    
2077          if (eptr == md->start_subject) prev_is_word = FALSE; else          if (eptr == md->start_subject) prev_is_word = FALSE; else
2078            {            {
2079            USPTR lastptr = eptr - 1;            PCRE_PUCHAR lastptr = eptr - 1;
2080            while((*lastptr & 0xc0) == 0x80) lastptr--;            while((*lastptr & 0xc0) == 0x80) lastptr--;
2081            if (lastptr < md->start_used_ptr) md->start_used_ptr = lastptr;            if (lastptr < md->start_used_ptr) md->start_used_ptr = lastptr;
2082            GETCHAR(c, lastptr);            GETCHAR(c, lastptr);
# Line 1884  for (;;) Line 2183  for (;;)
2183      /* Fall through */      /* Fall through */
2184    
2185      case OP_ALLANY:      case OP_ALLANY:
2186      if (eptr++ >= md->end_subject)      if (eptr >= md->end_subject)   /* DO NOT merge the eptr++ here; it must */
2187        {        {                            /* not be updated before SCHECK_PARTIAL. */
2188        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2189        MRRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2190        }        }
2191      if (utf8) while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;      eptr++;
2192        if (utf) while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
2193      ecode++;      ecode++;
2194      break;      break;
2195    
# Line 1897  for (;;) Line 2197  for (;;)
2197      any byte, even newline, independent of the setting of PCRE_DOTALL. */      any byte, even newline, independent of the setting of PCRE_DOTALL. */
2198    
2199      case OP_ANYBYTE:      case OP_ANYBYTE:
2200      if (eptr++ >= md->end_subject)      if (eptr >= md->end_subject)   /* DO NOT merge the eptr++ here; it must */
2201        {        {                            /* not be updated before SCHECK_PARTIAL. */
2202        SCHECK_PARTIAL();        SCHECK_PARTIAL();
2203        MRRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2204        }        }
2205        eptr++;
2206      ecode++;      ecode++;
2207      break;      break;
2208    
# Line 2017  for (;;) Line 2318  for (;;)
2318      switch(c)      switch(c)
2319        {        {
2320        default: MRRETURN(MATCH_NOMATCH);        default: MRRETURN(MATCH_NOMATCH);
2321    
2322        case 0x000d:        case 0x000d:
2323        if (eptr < md->end_subject && *eptr == 0x0a) eptr++;        if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
2324        break;        break;
# Line 2176  for (;;) Line 2478  for (;;)
2478          break;          break;
2479    
2480          case PT_GC:          case PT_GC:
2481          if ((ecode[2] != _pcre_ucp_gentype[prop->chartype]) == (op == OP_PROP))          if ((ecode[2] != PRIV(ucp_gentype)[prop->chartype]) == (op == OP_PROP))
2482            MRRETURN(MATCH_NOMATCH);            MRRETURN(MATCH_NOMATCH);
2483          break;          break;
2484    
# Line 2193  for (;;) Line 2495  for (;;)
2495          /* These are specials */          /* These are specials */
2496    
2497          case PT_ALNUM:          case PT_ALNUM:
2498          if ((_pcre_ucp_gentype[prop->chartype] == ucp_L ||          if ((PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
2499               _pcre_ucp_gentype[prop->chartype] == ucp_N) == (op == OP_NOTPROP))               PRIV(ucp_gentype)[prop->chartype] == ucp_N) == (op == OP_NOTPROP))
2500            MRRETURN(MATCH_NOMATCH);            MRRETURN(MATCH_NOMATCH);
2501          break;          break;
2502    
2503          case PT_SPACE:    /* Perl space */          case PT_SPACE:    /* Perl space */
2504          if ((_pcre_ucp_gentype[prop->chartype] == ucp_Z ||          if ((PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
2505               c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR)               c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR)
2506                 == (op == OP_NOTPROP))                 == (op == OP_NOTPROP))
2507            MRRETURN(MATCH_NOMATCH);            MRRETURN(MATCH_NOMATCH);
2508          break;          break;
2509    
2510          case PT_PXSPACE:  /* POSIX space */          case PT_PXSPACE:  /* POSIX space */
2511          if ((_pcre_ucp_gentype[prop->chartype] == ucp_Z ||          if ((PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||
2512               c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||               c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||
2513               c == CHAR_FF || c == CHAR_CR)               c == CHAR_FF || c == CHAR_CR)
2514                 == (op == OP_NOTPROP))                 == (op == OP_NOTPROP))
# Line 2214  for (;;) Line 2516  for (;;)
2516          break;          break;
2517    
2518          case PT_WORD:          case PT_WORD:
2519          if ((_pcre_ucp_gentype[prop->chartype] == ucp_L ||          if ((PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
2520               _pcre_ucp_gentype[prop->chartype] == ucp_N ||               PRIV(ucp_gentype)[prop->chartype] == ucp_N ||
2521               c == CHAR_UNDERSCORE) == (op == OP_NOTPROP))               c == CHAR_UNDERSCORE) == (op == OP_NOTPROP))
2522            MRRETURN(MATCH_NOMATCH);            MRRETURN(MATCH_NOMATCH);
2523          break;          break;
# Line 2240  for (;;) Line 2542  for (;;)
2542        MRRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
2543        }        }
2544      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2545        if (UCD_CATEGORY(c) == ucp_M) MRRETURN(MATCH_NOMATCH);
2546        while (eptr < md->end_subject)
2547        {        {
2548        int category = UCD_CATEGORY(c);        int len = 1;
2549        if (category == ucp_M) MRRETURN(MATCH_NOMATCH);        if (!utf) c = *eptr; else { GETCHARLEN(c, eptr, len); }
2550        while (eptr < md->end_subject)        if (UCD_CATEGORY(c) != ucp_M) break;
2551          {        eptr += len;
         int len = 1;  
         if (!utf8) c = *eptr; else  
           {  
           GETCHARLEN(c, eptr, len);  
           }  
         category = UCD_CATEGORY(c);  
         if (category != ucp_M) break;  
         eptr += len;  
         }  
2552        }        }
2553      ecode++;      ecode++;
2554      break;      break;
# Line 2269  for (;;) Line 2564  for (;;)
2564      loops). */      loops). */
2565    
2566      case OP_REF:      case OP_REF:
2567        case OP_REFI:
2568        caseless = op == OP_REFI;
2569      offset = GET2(ecode, 1) << 1;               /* Doubled ref number */      offset = GET2(ecode, 1) << 1;               /* Doubled ref number */
2570      ecode += 3;      ecode += 1 + IMM2_SIZE;
2571    
2572      /* If the reference is unset, there are two possibilities:      /* If the reference is unset, there are two possibilities:
2573    
# Line 2310  for (;;) Line 2607  for (;;)
2607        case OP_CRMINRANGE:        case OP_CRMINRANGE:
2608        minimize = (*ecode == OP_CRMINRANGE);        minimize = (*ecode == OP_CRMINRANGE);
2609        min = GET2(ecode, 1);        min = GET2(ecode, 1);
2610        max = GET2(ecode, 3);        max = GET2(ecode, 1 + IMM2_SIZE);
2611        if (max == 0) max = INT_MAX;        if (max == 0) max = INT_MAX;
2612        ecode += 5;        ecode += 1 + 2 * IMM2_SIZE;
2613        break;        break;
2614    
2615        default:               /* No repeat follows */        default:               /* No repeat follows */
2616        if ((length = match_ref(offset, eptr, length, md, ims)) < 0)        if ((length = match_ref(offset, eptr, length, md, caseless)) < 0)
2617          {          {
2618          CHECK_PARTIAL();          CHECK_PARTIAL();
2619          MRRETURN(MATCH_NOMATCH);          MRRETURN(MATCH_NOMATCH);
# Line 2336  for (;;) Line 2633  for (;;)
2633    
2634      for (i = 1; i <= min; i++)      for (i = 1; i <= min; i++)
2635        {        {
2636        int slength;        int slength;
2637        if ((slength = match_ref(offset, eptr, length, md, ims)) < 0)        if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
2638          {          {
2639          CHECK_PARTIAL();          CHECK_PARTIAL();
2640          MRRETURN(MATCH_NOMATCH);          MRRETURN(MATCH_NOMATCH);
# Line 2356  for (;;) Line 2653  for (;;)
2653        {        {
2654        for (fi = min;; fi++)        for (fi = min;; fi++)
2655          {          {
2656          int slength;          int slength;
2657          RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM14);          RMATCH(eptr, ecode, offset_top, md, eptrb, RM14);
2658          if (rrc != MATCH_NOMATCH) RRETURN(rrc);          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2659          if (fi >= max) MRRETURN(MATCH_NOMATCH);          if (fi >= max) MRRETURN(MATCH_NOMATCH);
2660          if ((slength = match_ref(offset, eptr, length, md, ims)) < 0)          if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
2661            {            {
2662            CHECK_PARTIAL();            CHECK_PARTIAL();
2663            MRRETURN(MATCH_NOMATCH);            MRRETURN(MATCH_NOMATCH);
# Line 2377  for (;;) Line 2674  for (;;)
2674        pp = eptr;        pp = eptr;
2675        for (i = min; i < max; i++)        for (i = min; i < max; i++)
2676          {          {
2677          int slength;          int slength;
2678          if ((slength = match_ref(offset, eptr, length, md, ims)) < 0)          if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
2679            {            {
2680            CHECK_PARTIAL();            CHECK_PARTIAL();
2681            break;            break;
# Line 2387  for (;;) Line 2684  for (;;)
2684          }          }
2685        while (eptr >= pp)        while (eptr >= pp)
2686          {          {
2687          RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM15);          RMATCH(eptr, ecode, offset_top, md, eptrb, RM15);
2688          if (rrc != MATCH_NOMATCH) RRETURN(rrc);          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2689          eptr -= length;          eptr -= length;
2690          }          }
# Line 2409  for (;;) Line 2706  for (;;)
2706      case OP_NCLASS:      case OP_NCLASS:
2707      case OP_CLASS:      case OP_CLASS:
2708        {        {
2709          /* The data variable is saved across frames, so the byte map needs to
2710          be stored there. */
2711    #define BYTE_MAP ((pcre_uint8 *)data)
2712        data = ecode + 1;                /* Save for matching */        data = ecode + 1;                /* Save for matching */
2713        ecode += 33;                     /* Advance past the item */        ecode += 1 + (32 / sizeof(pcre_uchar)); /* Advance past the item */
2714    
2715        switch (*ecode)        switch (*ecode)
2716          {          {
# Line 2431  for (;;) Line 2731  for (;;)
2731          case OP_CRMINRANGE:          case OP_CRMINRANGE:
2732          minimize = (*ecode == OP_CRMINRANGE);          minimize = (*ecode == OP_CRMINRANGE);
2733          min = GET2(ecode, 1);          min = GET2(ecode, 1);
2734          max = GET2(ecode, 3);          max = GET2(ecode, 1 + IMM2_SIZE);
2735          if (max == 0) max = INT_MAX;          if (max == 0) max = INT_MAX;
2736          ecode += 5;          ecode += 1 + 2 * IMM2_SIZE;
2737          break;          break;
2738    
2739          default:               /* No repeat follows */          default:               /* No repeat follows */
# Line 2443  for (;;) Line 2743  for (;;)
2743    
2744        /* First, ensure the minimum number of matches are present. */        /* First, ensure the minimum number of matches are present. */
2745    
2746  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2747        /* UTF-8 mode */        if (utf)
       if (utf8)  
2748          {          {
2749          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
2750            {            {
# Line 2460  for (;;) Line 2759  for (;;)
2759              if (op == OP_CLASS) MRRETURN(MATCH_NOMATCH);              if (op == OP_CLASS) MRRETURN(MATCH_NOMATCH);
2760              }              }
2761            else            else
2762              {              if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);
             if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);  
             }  
2763            }            }
2764          }          }
2765        else        else
2766  #endif  #endif
2767        /* Not UTF-8 mode */        /* Not UTF mode */
2768          {          {
2769          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
2770            {            {
# Line 2477  for (;;) Line 2774  for (;;)
2774              MRRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
2775              }              }
2776            c = *eptr++;            c = *eptr++;
2777            if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);  #ifndef COMPILE_PCRE8
2778              if (c > 255)
2779                {
2780                if (op == OP_CLASS) MRRETURN(MATCH_NOMATCH);
2781                }
2782              else
2783    #endif
2784                if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);
2785            }            }
2786          }          }
2787    
# Line 2491  for (;;) Line 2795  for (;;)
2795    
2796        if (minimize)        if (minimize)
2797          {          {
2798  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2799          /* UTF-8 mode */          if (utf)
         if (utf8)  
2800            {            {
2801            for (fi = min;; fi++)            for (fi = min;; fi++)
2802              {              {
2803              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM16);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM16);
2804              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2805              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
2806              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 2511  for (;;) Line 2814  for (;;)
2814                if (op == OP_CLASS) MRRETURN(MATCH_NOMATCH);                if (op == OP_CLASS) MRRETURN(MATCH_NOMATCH);
2815                }                }
2816              else              else
2817                {                if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);
               if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);  
               }  
2818              }              }
2819            }            }
2820          else          else
2821  #endif  #endif
2822          /* Not UTF-8 mode */          /* Not UTF mode */
2823            {            {
2824            for (fi = min;; fi++)            for (fi = min;; fi++)
2825              {              {
2826              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM17);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM17);
2827              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2828              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
2829              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 2531  for (;;) Line 2832  for (;;)
2832                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
2833                }                }
2834              c = *eptr++;              c = *eptr++;
2835              if ((data[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);  #ifndef COMPILE_PCRE8
2836                if (c > 255)
2837                  {
2838                  if (op == OP_CLASS) MRRETURN(MATCH_NOMATCH);
2839                  }
2840                else
2841    #endif
2842                  if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) MRRETURN(MATCH_NOMATCH);
2843              }              }
2844            }            }
2845          /* Control never gets here */          /* Control never gets here */
# Line 2543  for (;;) Line 2851  for (;;)
2851          {          {
2852          pp = eptr;          pp = eptr;
2853    
2854  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF
2855          /* UTF-8 mode */          if (utf)
         if (utf8)  
2856            {            {
2857            for (i = min; i < max; i++)            for (i = min; i < max; i++)
2858              {              {
# Line 2561  for (;;) Line 2868  for (;;)
2868                if (op == OP_CLASS) break;                if (op == OP_CLASS) break;
2869                }                }
2870              else              else
2871                {                if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) break;
               if ((data[c/8] & (1 << (c&7))) == 0) break;  
               }  
2872              eptr += len;              eptr += len;
2873              }              }
2874            for (;;)            for (;;)
2875              {              {
2876              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM18);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM18);
2877              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2878              if (eptr-- == pp) break;        /* Stop if tried at original pos */              if (eptr-- == pp) break;        /* Stop if tried at original pos */
2879              BACKCHAR(eptr);              BACKCHAR(eptr);
# Line 2576  for (;;) Line 2881  for (;;)
2881            }            }
2882          else          else
2883  #endif  #endif
2884            /* Not UTF-8 mode */            /* Not UTF mode */
2885            {            {
2886            for (i = min; i < max; i++)            for (i = min; i < max; i++)
2887              {              {
# Line 2586  for (;;) Line 2891  for (;;)
2891                break;                break;
2892                }                }
2893              c = *eptr;              c = *eptr;
2894              if ((data[c/8] & (1 << (c&7))) == 0) break;  #ifndef COMPILE_PCRE8
2895                if (c > 255)
2896                  {
2897                  if (op == OP_CLASS) break;
2898                  }
2899                else
2900    #endif
2901                  if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) break;
2902              eptr++;              eptr++;
2903              }              }
2904            while (eptr >= pp)            while (eptr >= pp)
2905              {              {
2906              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM19);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM19);
2907              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2908              eptr--;              eptr--;
2909              }              }
# Line 2599  for (;;) Line 2911  for (;;)
2911    
2912          MRRETURN(MATCH_NOMATCH);          MRRETURN(MATCH_NOMATCH);
2913          }          }
2914    #undef BYTE_MAP
2915        }        }
2916      /* Control never gets here */      /* Control never gets here */
2917    
# Line 2607  for (;;) Line 2920  for (;;)
2920      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
2921      mode, because Unicode properties are supported in non-UTF-8 mode. */      mode, because Unicode properties are supported in non-UTF-8 mode. */
2922    
2923  #ifdef SUPPORT_UTF8  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
2924      case OP_XCLASS:      case OP_XCLASS:
2925        {        {
2926        data = ecode + 1 + LINK_SIZE;                /* Save for matching */        data = ecode + 1 + LINK_SIZE;                /* Save for matching */
# Line 2632  for (;;) Line 2945  for (;;)
2945          case OP_CRMINRANGE:          case OP_CRMINRANGE:
2946          minimize = (*ecode == OP_CRMINRANGE);          minimize = (*ecode == OP_CRMINRANGE);
2947          min = GET2(ecode, 1);          min = GET2(ecode, 1);
2948          max = GET2(ecode, 3);          max = GET2(ecode, 1 + IMM2_SIZE);
2949          if (max == 0) max = INT_MAX;          if (max == 0) max = INT_MAX;
2950          ecode += 5;          ecode += 1 + 2 * IMM2_SIZE;
2951          break;          break;
2952    
2953          default:               /* No repeat follows */          default:               /* No repeat follows */
# Line 2652  for (;;) Line 2965  for (;;)
2965            MRRETURN(MATCH_NOMATCH);            MRRETURN(MATCH_NOMATCH);
2966            }            }
2967          GETCHARINCTEST(c, eptr);          GETCHARINCTEST(c, eptr);
2968          if (!_pcre_xclass(c, data)) MRRETURN(MATCH_NOMATCH);          if (!PRIV(xclass)(c, data)) MRRETURN(MATCH_NOMATCH);
2969          }          }
2970    
2971        /* 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 2667  for (;;) Line 2980  for (;;)
2980          {          {
2981          for (fi = min;; fi++)          for (fi = min;; fi++)
2982            {            {
2983            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM20);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM20);
2984            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2985            if (fi >= max) MRRETURN(MATCH_NOMATCH);            if (fi >= max) MRRETURN(MATCH_NOMATCH);
2986            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
# Line 2676  for (;;) Line 2989  for (;;)
2989              MRRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
2990              }              }
2991            GETCHARINCTEST(c, eptr);            GETCHARINCTEST(c, eptr);
2992            if (!_pcre_xclass(c, data)) MRRETURN(MATCH_NOMATCH);            if (!PRIV(xclass)(c, data)) MRRETURN(MATCH_NOMATCH);
2993            }            }
2994          /* Control never gets here */          /* Control never gets here */
2995          }          }
# Line 2694  for (;;) Line 3007  for (;;)
3007              SCHECK_PARTIAL();              SCHECK_PARTIAL();
3008              break;              break;
3009              }              }
3010    #ifdef SUPPORT_UTF
3011            GETCHARLENTEST(c, eptr, len);            GETCHARLENTEST(c, eptr, len);
3012            if (!_pcre_xclass(c, data)) break;  #else
3013              c = *eptr;
3014    #endif
3015              if (!PRIV(xclass)(c, data)) break;
3016            eptr += len;            eptr += len;
3017            }            }
3018          for(;;)          for(;;)
3019            {            {
3020            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM21);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM21);
3021            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3022            if (eptr-- == pp) break;        /* Stop if tried at original pos */            if (eptr-- == pp) break;        /* Stop if tried at original pos */
3023            if (utf8) BACKCHAR(eptr);  #ifdef SUPPORT_UTF
3024              if (utf) BACKCHAR(eptr);
3025    #endif
3026            }            }
3027          MRRETURN(MATCH_NOMATCH);          MRRETURN(MATCH_NOMATCH);
3028          }          }
# Line 2716  for (;;) Line 3035  for (;;)
3035    
3036      case OP_CHAR:      case OP_CHAR:
3037  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
3038      if (utf8)      if (utf)
3039        {        {
3040        length = 1;        length = 1;
3041        ecode++;        ecode++;
# Line 2730  for (;;) Line 3049  for (;;)
3049        }        }
3050      else      else
3051  #endif  #endif
3052        /* Not UTF mode */
     /* Non-UTF-8 mode */  
3053        {        {
3054        if (md->end_subject - eptr < 1)        if (md->end_subject - eptr < 1)
3055          {          {
# Line 2745  for (;;) Line 3063  for (;;)
3063    
3064      /* Match a single character, caselessly */      /* Match a single character, caselessly */
3065    
3066      case OP_CHARNC:      case OP_CHARI:
3067  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
3068      if (utf8)      if (utf)
3069        {        {
3070        length = 1;        length = 1;
3071        ecode++;        ecode++;
# Line 2790  for (;;) Line 3108  for (;;)
3108      else      else
3109  #endif   /* SUPPORT_UTF8 */  #endif   /* SUPPORT_UTF8 */
3110    
3111      /* Non-UTF-8 mode */      /* Not UTF mode */
3112        {        {
3113        if (md->end_subject - eptr < 1)        if (md->end_subject - eptr < 1)
3114          {          {
# Line 2805  for (;;) Line 3123  for (;;)
3123      /* Match a single character repeatedly. */      /* Match a single character repeatedly. */
3124    
3125      case OP_EXACT:      case OP_EXACT:
3126        case OP_EXACTI:
3127      min = max = GET2(ecode, 1);      min = max = GET2(ecode, 1);
3128      ecode += 3;      ecode += 1 + IMM2_SIZE;
3129      goto REPEATCHAR;      goto REPEATCHAR;
3130    
3131      case OP_POSUPTO:      case OP_POSUPTO:
3132        case OP_POSUPTOI:
3133      possessive = TRUE;      possessive = TRUE;
3134      /* Fall through */      /* Fall through */
3135    
3136      case OP_UPTO:      case OP_UPTO:
3137        case OP_UPTOI:
3138      case OP_MINUPTO:      case OP_MINUPTO:
3139        case OP_MINUPTOI:
3140      min = 0;      min = 0;
3141      max = GET2(ecode, 1);      max = GET2(ecode, 1);
3142      minimize = *ecode == OP_MINUPTO;      minimize = *ecode == OP_MINUPTO || *ecode == OP_MINUPTOI;
3143      ecode += 3;      ecode += 1 + IMM2_SIZE;
3144      goto REPEATCHAR;      goto REPEATCHAR;
3145    
3146      case OP_POSSTAR:      case OP_POSSTAR:
3147        case OP_POSSTARI:
3148      possessive = TRUE;      possessive = TRUE;
3149      min = 0;      min = 0;
3150      max = INT_MAX;      max = INT_MAX;
# Line 2829  for (;;) Line 3152  for (;;)
3152      goto REPEATCHAR;      goto REPEATCHAR;
3153    
3154      case OP_POSPLUS:      case OP_POSPLUS:
3155        case OP_POSPLUSI:
3156      possessive = TRUE;      possessive = TRUE;
3157      min = 1;      min = 1;
3158      max = INT_MAX;      max = INT_MAX;
# Line 2836  for (;;) Line 3160  for (;;)
3160      goto REPEATCHAR;      goto REPEATCHAR;
3161    
3162      case OP_POSQUERY:      case OP_POSQUERY:
3163        case OP_POSQUERYI:
3164      possessive = TRUE;      possessive = TRUE;
3165      min = 0;      min = 0;
3166      max = 1;      max = 1;
# Line 2843  for (;;) Line 3168  for (;;)
3168      goto REPEATCHAR;      goto REPEATCHAR;
3169    
3170      case OP_STAR:      case OP_STAR:
3171        case OP_STARI:
3172      case OP_MINSTAR:      case OP_MINSTAR:
3173        case OP_MINSTARI:
3174      case OP_PLUS:      case OP_PLUS:
3175        case OP_PLUSI:
3176      case OP_MINPLUS:      case OP_MINPLUS:
3177        case OP_MINPLUSI:
3178      case OP_QUERY:      case OP_QUERY:
3179        case OP_QUERYI:
3180      case OP_MINQUERY:      case OP_MINQUERY:
3181      c = *ecode++ - OP_STAR;      case OP_MINQUERYI:
3182        c = *ecode++ - ((op < OP_STARI)? OP_STAR : OP_STARI);
3183      minimize = (c & 1) != 0;      minimize = (c & 1) != 0;
   
3184      min = rep_min[c];                 /* Pick up values from tables; */      min = rep_min[c];                 /* Pick up values from tables; */
3185      max = rep_max[c];                 /* zero for max => infinity */      max = rep_max[c];                 /* zero for max => infinity */
3186      if (max == 0) max = INT_MAX;      if (max == 0) max = INT_MAX;
# Line 2859  for (;;) Line 3189  for (;;)
3189    
3190      REPEATCHAR:      REPEATCHAR:
3191  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
3192      if (utf8)      if (utf)
3193        {        {
3194        length = 1;        length = 1;
3195        charptr = ecode;        charptr = ecode;
# Line 2873  for (;;) Line 3203  for (;;)
3203          {          {
3204  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3205          unsigned int othercase;          unsigned int othercase;
3206          if ((ims & PCRE_CASELESS) != 0 &&          if (op >= OP_STARI &&     /* Caseless */
3207              (othercase = UCD_OTHERCASE(fc)) != fc)              (othercase = UCD_OTHERCASE(fc)) != fc)
3208            oclength = _pcre_ord2utf8(othercase, occhars);            oclength = PRIV(ord2utf)(othercase, occhars);
3209          else oclength = 0;          else oclength = 0;
3210  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
3211    
# Line 2886  for (;;) Line 3216  for (;;)
3216  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3217            else if (oclength > 0 &&            else if (oclength > 0 &&
3218                     eptr <= md->end_subject - oclength &&                     eptr <= md->end_subject - oclength &&
3219                     memcmp(eptr, occhars, oclength) == 0) eptr += oclength;                     memcmp(eptr, occhars, IN_UCHARS(oclength)) == 0) eptr += oclength;
3220  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
3221            else            else
3222              {              {
# Line 2901  for (;;) Line 3231  for (;;)
3231            {            {
3232            for (fi = min;; fi++)            for (fi = min;; fi++)
3233              {              {
3234              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM22);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM22);
3235              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3236              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
3237              if (eptr <= md->end_subject - length &&              if (eptr <= md->end_subject - length &&
# Line 2909  for (;;) Line 3239  for (;;)
3239  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3240              else if (oclength > 0 &&              else if (oclength > 0 &&
3241                       eptr <= md->end_subject - oclength &&                       eptr <= md->end_subject - oclength &&
3242                       memcmp(eptr, occhars, oclength) == 0) eptr += oclength;                       memcmp(eptr, occhars, IN_UCHARS(oclength)) == 0) eptr += oclength;
3243  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
3244              else              else
3245                {                {
# Line 2930  for (;;) Line 3260  for (;;)
3260  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3261              else if (oclength > 0 &&              else if (oclength > 0 &&
3262                       eptr <= md->end_subject - oclength &&                       eptr <= md->end_subject - oclength &&
3263                       memcmp(eptr, occhars, oclength) == 0) eptr += oclength;                       memcmp(eptr, occhars, IN_UCHARS(oclength)) == 0) eptr += oclength;
3264  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
3265              else              else
3266                {                {
# Line 2943  for (;;) Line 3273  for (;;)
3273    
3274            for(;;)            for(;;)
3275              {              {
3276              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM23);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM23);
3277              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3278              if (eptr == pp) { MRRETURN(MATCH_NOMATCH); }              if (eptr == pp) { MRRETURN(MATCH_NOMATCH); }
3279  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
# Line 2980  for (;;) Line 3310  for (;;)
3310      DPRINTF(("matching %c{%d,%d} against subject %.*s\n", fc, min, max,      DPRINTF(("matching %c{%d,%d} against subject %.*s\n", fc, min, max,
3311        max, eptr));        max, eptr));
3312    
3313      if ((ims & PCRE_CASELESS) != 0)      if (op >= OP_STARI)  /* Caseless */
3314        {        {
3315        fc = md->lcc[fc];        fc = md->lcc[fc];
3316        for (i = 1; i <= min; i++)        for (i = 1; i <= min; i++)
# Line 2997  for (;;) Line 3327  for (;;)
3327          {          {
3328          for (fi = min;; fi++)          for (fi = min;; fi++)
3329            {            {
3330            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM24);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM24);
3331            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3332            if (fi >= max) MRRETURN(MATCH_NOMATCH);            if (fi >= max) MRRETURN(MATCH_NOMATCH);
3333            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
# Line 3027  for (;;) Line 3357  for (;;)
3357    
3358          while (eptr >= pp)          while (eptr >= pp)
3359            {            {
3360            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM25);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM25);
3361            eptr--;            eptr--;
3362            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3363            }            }
# Line 3056  for (;;) Line 3386  for (;;)
3386          {          {
3387          for (fi = min;; fi++)          for (fi = min;; fi++)
3388            {            {
3389            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM26);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM26);
3390            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3391            if (fi >= max) MRRETURN(MATCH_NOMATCH);            if (fi >= max) MRRETURN(MATCH_NOMATCH);
3392            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
# Line 3085  for (;;) Line 3415  for (;;)
3415    
3416          while (eptr >= pp)          while (eptr >= pp)
3417            {            {
3418            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM27);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM27);
3419            eptr--;            eptr--;
3420            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3421            }            }
# Line 3098  for (;;) Line 3428  for (;;)
3428      checking can be multibyte. */      checking can be multibyte. */
3429    
3430      case OP_NOT:      case OP_NOT:
3431        case OP_NOTI:
3432      if (eptr >= md->end_subject)      if (eptr >= md->end_subject)
3433        {        {
3434        SCHECK_PARTIAL();        SCHECK_PARTIAL();
# Line 3105  for (;;) Line 3436  for (;;)
3436        }        }
3437      ecode++;      ecode++;
3438      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
3439      if ((ims & PCRE_CASELESS) != 0)      if (op == OP_NOTI)         /* The caseless case */
3440        {        {
3441  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
3442        if (c < 256)        if (c < 256)
# Line 3113  for (;;) Line 3444  for (;;)
3444        c = md->lcc[c];        c = md->lcc[c];
3445        if (md->lcc[*ecode++] == c) MRRETURN(MATCH_NOMATCH);        if (md->lcc[*ecode++] == c) MRRETURN(MATCH_NOMATCH);
3446        }        }
3447      else      else    /* Caseful */
3448        {        {
3449        if (*ecode++ == c) MRRETURN(MATCH_NOMATCH);        if (*ecode++ == c) MRRETURN(MATCH_NOMATCH);
3450        }        }
# Line 3127  for (;;) Line 3458  for (;;)
3458      about... */      about... */
3459    
3460      case OP_NOTEXACT:      case OP_NOTEXACT:
3461        case OP_NOTEXACTI:
3462      min = max = GET2(ecode, 1);      min = max = GET2(ecode, 1);
3463      ecode += 3;      ecode += 1 + IMM2_SIZE;
3464      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3465    
3466      case OP_NOTUPTO:      case OP_NOTUPTO:
3467        case OP_NOTUPTOI:
3468      case OP_NOTMINUPTO:      case OP_NOTMINUPTO:
3469        case OP_NOTMINUPTOI:
3470      min = 0;      min = 0;
3471      max = GET2(ecode, 1);      max = GET2(ecode, 1);
3472      minimize = *ecode == OP_NOTMINUPTO;      minimize = *ecode == OP_NOTMINUPTO || *ecode == OP_NOTMINUPTOI;
3473      ecode += 3;      ecode += 1 + IMM2_SIZE;
3474      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3475    
3476      case OP_NOTPOSSTAR:      case OP_NOTPOSSTAR:
3477        case OP_NOTPOSSTARI:
3478      possessive = TRUE;      possessive = TRUE;
3479      min = 0;      min = 0;
3480      max = INT_MAX;      max = INT_MAX;
# Line 3147  for (;;) Line 3482  for (;;)
3482      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3483    
3484      case OP_NOTPOSPLUS:      case OP_NOTPOSPLUS:
3485        case OP_NOTPOSPLUSI:
3486      possessive = TRUE;      possessive = TRUE;
3487      min = 1;      min = 1;
3488      max = INT_MAX;      max = INT_MAX;
# Line 3154  for (;;) Line 3490  for (;;)
3490      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3491    
3492      case OP_NOTPOSQUERY:      case OP_NOTPOSQUERY:
3493        case OP_NOTPOSQUERYI:
3494      possessive = TRUE;      possessive = TRUE;
3495      min = 0;      min = 0;
3496      max = 1;      max = 1;
# Line 3161  for (;;) Line 3498  for (;;)
3498      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3499    
3500      case OP_NOTPOSUPTO:      case OP_NOTPOSUPTO:
3501        case OP_NOTPOSUPTOI:
3502      possessive = TRUE;      possessive = TRUE;
3503      min = 0;      min = 0;
3504      max = GET2(ecode, 1);      max = GET2(ecode, 1);
3505      ecode += 3;      ecode += 1 + IMM2_SIZE;
3506      goto REPEATNOTCHAR;      goto REPEATNOTCHAR;
3507    
3508      case OP_NOTSTAR:      case OP_NOTSTAR:
3509        case OP_NOTSTARI:
3510      case OP_NOTMINSTAR:      case OP_NOTMINSTAR:
3511        case OP_NOTMINSTARI:
3512      case OP_NOTPLUS:      case OP_NOTPLUS:
3513        case OP_NOTPLUSI:
3514      case OP_NOTMINPLUS:      case OP_NOTMINPLUS:
3515        case OP_NOTMINPLUSI:
3516      case OP_NOTQUERY:      case OP_NOTQUERY:
3517        case OP_NOTQUERYI:
3518      case OP_NOTMINQUERY:      case OP_NOTMINQUERY:
3519      c = *ecode++ - OP_NOTSTAR;      case OP_NOTMINQUERYI:
3520        c = *ecode++ - ((op >= OP_NOTSTARI)? OP_NOTSTARI: OP_NOTSTAR);
3521      minimize = (c & 1) != 0;      minimize = (c & 1) != 0;
3522      min = rep_min[c];                 /* Pick up values from tables; */      min = rep_min[c];                 /* Pick up values from tables; */
3523      max = rep_max[c];                 /* zero for max => infinity */      max = rep_max[c];                 /* zero for max => infinity */
# Line 3195  for (;;) Line 3539  for (;;)
3539      DPRINTF(("negative matching %c{%d,%d} against subject %.*s\n", fc, min, max,      DPRINTF(("negative matching %c{%d,%d} against subject %.*s\n", fc, min, max,
3540        max, eptr));        max, eptr));
3541    
3542      if ((ims & PCRE_CASELESS) != 0)      if (op >= OP_NOTSTARI)     /* Caseless */
3543        {        {
3544        fc = md->lcc[fc];        fc = md->lcc[fc];
3545    
3546  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
3547        /* UTF-8 mode */        if (utf)
       if (utf8)  
3548          {          {
3549          register unsigned int d;          register unsigned int d;
3550          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
# Line 3218  for (;;) Line 3561  for (;;)
3561          }          }
3562        else        else
3563  #endif  #endif
3564          /* Not UTF mode */
       /* Not UTF-8 mode */  
3565          {          {
3566          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
3567            {            {
# Line 3237  for (;;) Line 3579  for (;;)
3579        if (minimize)        if (minimize)
3580          {          {
3581  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
3582          /* UTF-8 mode */          if (utf)
         if (utf8)  
3583            {            {
3584            register unsigned int d;            register unsigned int d;
3585            for (fi = min;; fi++)            for (fi = min;; fi++)
3586              {              {
3587              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM28);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM28);
3588              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3589              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
3590              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 3258  for (;;) Line 3599  for (;;)
3599            }            }
3600          else          else
3601  #endif  #endif
3602          /* Not UTF-8 mode */          /* Not UTF mode */
3603            {            {
3604            for (fi = min;; fi++)            for (fi = min;; fi++)
3605              {              {
3606              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM29);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM29);
3607              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3608              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
3609              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 3283  for (;;) Line 3624  for (;;)
3624          pp = eptr;          pp = eptr;
3625    
3626  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
3627          /* UTF-8 mode */          if (utf)
         if (utf8)  
3628            {            {
3629            register unsigned int d;            register unsigned int d;
3630            for (i = min; i < max; i++)            for (i = min; i < max; i++)
# Line 3303  for (;;) Line 3643  for (;;)
3643          if (possessive) continue;          if (possessive) continue;
3644          for(;;)          for(;;)
3645              {              {
3646              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM30);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM30);
3647              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3648              if (eptr-- == pp) break;        /* Stop if tried at original pos */              if (eptr-- == pp) break;        /* Stop if tried at original pos */
3649              BACKCHAR(eptr);              BACKCHAR(eptr);
# Line 3311  for (;;) Line 3651  for (;;)
3651            }            }
3652          else          else
3653  #endif  #endif
3654          /* Not UTF-8 mode */          /* Not UTF mode */
3655            {            {
3656            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3657              {              {
# Line 3326  for (;;) Line 3666  for (;;)
3666            if (possessive) continue;            if (possessive) continue;
3667            while (eptr >= pp)            while (eptr >= pp)
3668              {              {
3669              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM31);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM31);
3670              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3671              eptr--;              eptr--;
3672              }              }
# Line 3342  for (;;) Line 3682  for (;;)
3682      else      else
3683        {        {
3684  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
3685        /* UTF-8 mode */        if (utf)
       if (utf8)  
3686          {          {
3687          register unsigned int d;          register unsigned int d;
3688          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
# Line 3359  for (;;) Line 3698  for (;;)
3698          }          }
3699        else        else
3700  #endif  #endif
3701        /* Not UTF-8 mode */        /* Not UTF mode */
3702          {          {
3703          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
3704            {            {
# Line 3377  for (;;) Line 3716  for (;;)
3716        if (minimize)        if (minimize)
3717          {          {
3718  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
3719          /* UTF-8 mode */          if (utf)
         if (utf8)  
3720            {            {
3721            register unsigned int d;            register unsigned int d;
3722            for (fi = min;; fi++)            for (fi = min;; fi++)
3723              {              {
3724              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM32);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM32);
3725              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3726              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
3727              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 3397  for (;;) Line 3735  for (;;)
3735            }            }
3736          else          else
3737  #endif  #endif
3738          /* Not UTF-8 mode */          /* Not UTF mode */
3739            {            {
3740            for (fi = min;; fi++)            for (fi = min;; fi++)
3741              {              {
3742              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM33);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM33);
3743              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3744              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
3745              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 3422  for (;;) Line 3760  for (;;)
3760          pp = eptr;          pp = eptr;
3761    
3762  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
3763          /* UTF-8 mode */          if (utf)
         if (utf8)  
3764            {            {
3765            register unsigned int d;            register unsigned int d;
3766            for (i = min; i < max; i++)            for (i = min; i < max; i++)
# Line 3441  for (;;) Line 3778  for (;;)
3778            if (possessive) continue;            if (possessive) continue;
3779            for(;;)            for(;;)
3780              {              {
3781              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM34);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM34);
3782              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3783              if (eptr-- == pp) break;        /* Stop if tried at original pos */              if (eptr-- == pp) break;        /* Stop if tried at original pos */
3784              BACKCHAR(eptr);              BACKCHAR(eptr);
# Line 3449  for (;;) Line 3786  for (;;)
3786            }            }
3787          else          else
3788  #endif  #endif
3789          /* Not UTF-8 mode */          /* Not UTF mode */
3790            {            {
3791            for (i = min; i < max; i++)            for (i = min; i < max; i++)
3792              {              {
# Line 3464  for (;;) Line 3801  for (;;)
3801            if (possessive) continue;            if (possessive) continue;
3802            while (eptr >= pp)            while (eptr >= pp)
3803              {              {
3804              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM35);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM35);
3805              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3806              eptr--;              eptr--;
3807              }              }
# Line 3482  for (;;) Line 3819  for (;;)
3819      case OP_TYPEEXACT:      case OP_TYPEEXACT:
3820      min = max = GET2(ecode, 1);      min = max = GET2(ecode, 1);
3821      minimize = TRUE;      minimize = TRUE;
3822      ecode += 3;      ecode += 1 + IMM2_SIZE;
3823      goto REPEATTYPE;      goto REPEATTYPE;
3824    
3825      case OP_TYPEUPTO:      case OP_TYPEUPTO:
# Line 3490  for (;;) Line 3827  for (;;)
3827      min = 0;      min = 0;
3828      max = GET2(ecode, 1);      max = GET2(ecode, 1);
3829      minimize = *ecode == OP_TYPEMINUPTO;      minimize = *ecode == OP_TYPEMINUPTO;
3830      ecode += 3;      ecode += 1 + IMM2_SIZE;
3831      goto REPEATTYPE;      goto REPEATTYPE;
3832    
3833      case OP_TYPEPOSSTAR:      case OP_TYPEPOSSTAR:
# Line 3518  for (;;) Line 3855  for (;;)
3855      possessive = TRUE;      possessive = TRUE;
3856      min = 0;      min = 0;
3857      max = GET2(ecode, 1);      max = GET2(ecode, 1);
3858      ecode += 3;      ecode += 1 + IMM2_SIZE;
3859      goto REPEATTYPE;      goto REPEATTYPE;
3860    
3861      case OP_TYPESTAR:      case OP_TYPESTAR:
# Line 3579  for (;;) Line 3916  for (;;)
3916            case PT_LAMP:            case PT_LAMP:
3917            for (i = 1; i <= min; i++)            for (i = 1; i <= min; i++)
3918              {              {
3919                int chartype;
3920              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3921                {                {
3922                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3923                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3924                }                }
3925              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
3926              prop_chartype = UCD_CHARTYPE(c);              chartype = UCD_CHARTYPE(c);
3927              if ((prop_chartype == ucp_Lu ||              if ((chartype == ucp_Lu ||
3928                   prop_chartype == ucp_Ll ||                   chartype == ucp_Ll ||
3929                   prop_chartype == ucp_Lt) == prop_fail_result)                   chartype == ucp_Lt) == prop_fail_result)
3930                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3931              }              }
3932            break;            break;
# Line 3602  for (;;) Line 3940  for (;;)
3940                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3941                }                }
3942              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
3943              prop_category = UCD_CATEGORY(c);              if ((UCD_CATEGORY(c) == prop_value) == prop_fail_result)
             if ((prop_category == prop_value) == prop_fail_result)  
3944                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3945              }              }
3946            break;            break;
# Line 3617  for (;;) Line 3954  for (;;)
3954                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3955                }                }
3956              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
3957              prop_chartype = UCD_CHARTYPE(c);              if ((UCD_CHARTYPE(c) == prop_value) == prop_fail_result)
             if ((prop_chartype == prop_value) == prop_fail_result)  
3958                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3959              }              }
3960            break;            break;
# Line 3632  for (;;) Line 3968  for (;;)
3968                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3969                }                }
3970              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
3971              prop_script = UCD_SCRIPT(c);              if ((UCD_SCRIPT(c) == prop_value) == prop_fail_result)
             if ((prop_script == prop_value) == prop_fail_result)  
3972                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3973              }              }
3974            break;            break;
# Line 3641  for (;;) Line 3976  for (;;)
3976            case PT_ALNUM:            case PT_ALNUM:
3977            for (i = 1; i <= min; i++)            for (i = 1; i <= min; i++)
3978              {              {
3979                int category;
3980              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
3981                {                {
3982                SCHECK_PARTIAL();                SCHECK_PARTIAL();
3983                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3984                }                }
3985              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
3986              prop_category = UCD_CATEGORY(c);              category = UCD_CATEGORY(c);
3987              if ((prop_category == ucp_L || prop_category == ucp_N)              if ((category == ucp_L || category == ucp_N) == prop_fail_result)
                    == prop_fail_result)  
3988                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3989              }              }
3990            break;            break;
# Line 3663  for (;;) Line 3998  for (;;)
3998                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
3999                }                }
4000              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4001              prop_category = UCD_CATEGORY(c);              if ((UCD_CATEGORY(c) == ucp_Z || c == CHAR_HT || c == CHAR_NL ||
             if ((prop_category == ucp_Z || c == CHAR_HT || c == CHAR_NL ||  
4002                   c == CHAR_FF || c == CHAR_CR)                   c == CHAR_FF || c == CHAR_CR)
4003                     == prop_fail_result)                     == prop_fail_result)
4004                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
# Line 3680  for (;;) Line 4014  for (;;)
4014                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
4015                }                }
4016              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4017              prop_category = UCD_CATEGORY(c);              if ((UCD_CATEGORY(c) == ucp_Z || c == CHAR_HT || c == CHAR_NL ||
             if ((prop_category == ucp_Z || c == CHAR_HT || c == CHAR_NL ||  
4018                   c == CHAR_VT || c == CHAR_FF || c == CHAR_CR)                   c == CHAR_VT || c == CHAR_FF || c == CHAR_CR)
4019                     == prop_fail_result)                     == prop_fail_result)
4020                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
# Line 3691  for (;;) Line 4024  for (;;)
4024            case PT_WORD:            case PT_WORD:
4025            for (i = 1; i <= min; i++)            for (i = 1; i <= min; i++)
4026              {              {
4027                int category;
4028              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4029                {                {
4030                SCHECK_PARTIAL();                SCHECK_PARTIAL();
4031                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
4032                }                }
4033              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4034              prop_category = UCD_CATEGORY(c);              category = UCD_CATEGORY(c);
4035              if ((prop_category == ucp_L || prop_category == ucp_N ||              if ((category == ucp_L || category == ucp_N || c == CHAR_UNDERSCORE)
                  c == CHAR_UNDERSCORE)  
4036                     == prop_fail_result)                     == prop_fail_result)
4037                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
4038              }              }
# Line 3725  for (;;) Line 4058  for (;;)
4058              MRRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
4059              }              }
4060            GETCHARINCTEST(c, eptr);            GETCHARINCTEST(c, eptr);
4061            prop_category = UCD_CATEGORY(c);            if (UCD_CATEGORY(c) == ucp_M) MRRETURN(MATCH_NOMATCH);
           if (prop_category == ucp_M) MRRETURN(MATCH_NOMATCH);  
4062            while (eptr < md->end_subject)            while (eptr < md->end_subject)
4063              {              {
4064              int len = 1;              int len = 1;
4065              if (!utf8) c = *eptr;              if (!utf) c = *eptr; else { GETCHARLEN(c, eptr, len); }
4066                else { GETCHARLEN(c, eptr, len); }              if (UCD_CATEGORY(c) != ucp_M) break;
             prop_category = UCD_CATEGORY(c);  
             if (prop_category != ucp_M) break;  
4067              eptr += len;              eptr += len;
4068              }              }
4069            }            }
# Line 3745  for (;;) Line 4075  for (;;)
4075  /* Handle all other cases when the coding is UTF-8 */  /* Handle all other cases when the coding is UTF-8 */
4076    
4077  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
4078        if (utf8) switch(ctype)        if (utf) switch(ctype)
4079          {          {
4080          case OP_ANY:          case OP_ANY:
4081          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
# Line 3791  for (;;) Line 4121  for (;;)
4121            switch(c)            switch(c)
4122              {              {
4123              default: MRRETURN(MATCH_NOMATCH);              default: MRRETURN(MATCH_NOMATCH);
4124    
4125              case 0x000d:              case 0x000d:
4126              if (eptr < md->end_subject && *eptr == 0x0a) eptr++;              if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
4127              break;              break;
# Line 4067  for (;;) Line 4398  for (;;)
4398            switch(*eptr++)            switch(*eptr++)
4399              {              {
4400              default: MRRETURN(MATCH_NOMATCH);              default: MRRETURN(MATCH_NOMATCH);
4401    
4402              case 0x000d:              case 0x000d:
4403              if (eptr < md->end_subject && *eptr == 0x0a) eptr++;              if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
4404              break;              break;
4405    
4406              case 0x000a:              case 0x000a:
4407              break;              break;
4408    
# Line 4259  for (;;) Line 4592  for (;;)
4592            case PT_ANY:            case PT_ANY:
4593            for (fi = min;; fi++)            for (fi = min;; fi++)
4594              {              {
4595              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM36);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM36);
4596              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4597              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
4598              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 4275  for (;;) Line 4608  for (;;)
4608            case PT_LAMP:            case PT_LAMP:
4609            for (fi = min;; fi++)            for (fi = min;; fi++)
4610              {              {
4611              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM37);              int chartype;
4612                RMATCH(eptr, ecode, offset_top, md, eptrb, RM37);
4613              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4614              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
4615              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 4284  for (;;) Line 4618  for (;;)
4618                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
4619                }                }
4620              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4621              prop_chartype = UCD_CHARTYPE(c);              chartype = UCD_CHARTYPE(c);
4622              if ((prop_chartype == ucp_Lu ||              if ((chartype == ucp_Lu ||
4623                   prop_chartype == ucp_Ll ||                   chartype == ucp_Ll ||
4624                   prop_chartype == ucp_Lt) == prop_fail_result)                   chartype == ucp_Lt) == prop_fail_result)
4625                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
4626              }              }
4627            /* Control never gets here */            /* Control never gets here */
# Line 4295  for (;;) Line 4629  for (;;)
4629            case PT_GC:            case PT_GC:
4630            for (fi = min;; fi++)            for (fi = min;; fi++)
4631              {              {
4632              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM38);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM38);
4633              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4634              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
4635              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 4304  for (;;) Line 4638  for (;;)
4638                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
4639                }                }
4640              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4641              prop_category = UCD_CATEGORY(c);              if ((UCD_CATEGORY(c) == prop_value) == prop_fail_result)
             if ((prop_category == prop_value) == prop_fail_result)  
4642                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
4643              }              }
4644            /* Control never gets here */            /* Control never gets here */
# Line 4313  for (;;) Line 4646  for (;;)
4646            case PT_PC:            case PT_PC:
4647            for (fi = min;; fi++)            for (fi = min;; fi++)
4648              {              {
4649              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM39);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM39);
4650              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4651              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
4652              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 4322  for (;;) Line 4655  for (;;)
4655                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
4656                }                }
4657              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4658              prop_chartype = UCD_CHARTYPE(c);              if ((UCD_CHARTYPE(c) == prop_value) == prop_fail_result)
             if ((prop_chartype == prop_value) == prop_fail_result)  
4659                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
4660              }              }
4661            /* Control never gets here */            /* Control never gets here */
# Line 4331  for (;;) Line 4663  for (;;)
4663            case PT_SC:            case PT_SC:
4664            for (fi = min;; fi++)            for (fi = min;; fi++)
4665              {              {
4666              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM40);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM40);
4667              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4668              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
4669              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 4340  for (;;) Line 4672  for (;;)
4672                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
4673                }                }
4674              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4675              prop_script = UCD_SCRIPT(c);              if ((UCD_SCRIPT(c) == prop_value) == prop_fail_result)
             if ((prop_script == prop_value) == prop_fail_result)  
4676                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
4677              }              }
4678            /* Control never gets here */            /* Control never gets here */
# Line 4349  for (;;) Line 4680  for (;;)
4680            case PT_ALNUM:            case PT_ALNUM:
4681            for (fi = min;; fi++)            for (fi = min;; fi++)
4682              {              {
4683              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM59);              int category;
4684                RMATCH(eptr, ecode, offset_top, md, eptrb, RM59);
4685              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4686              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
4687              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 4358  for (;;) Line 4690  for (;;)
4690                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
4691                }                }
4692              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4693              prop_category = UCD_CATEGORY(c);              category = UCD_CATEGORY(c);
4694              if ((prop_category == ucp_L || prop_category == ucp_N)              if ((category == ucp_L || category == ucp_N) == prop_fail_result)
                    == prop_fail_result)  
4695                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
4696              }              }
4697            /* Control never gets here */            /* Control never gets here */
# Line 4368  for (;;) Line 4699  for (;;)
4699            case PT_SPACE:    /* Perl space */            case PT_SPACE:    /* Perl space */
4700            for (fi = min;; fi++)            for (fi = min;; fi++)
4701              {              {
4702              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM60);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM60);
4703              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4704              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
4705              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 4377  for (;;) Line 4708  for (;;)
4708                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
4709                }                }
4710              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4711              prop_category = UCD_CATEGORY(c);              if ((UCD_CATEGORY(c) == ucp_Z || c == CHAR_HT || c == CHAR_NL ||
             if ((prop_category == ucp_Z || c == CHAR_HT || c == CHAR_NL ||  
4712                   c == CHAR_FF || c == CHAR_CR)                   c == CHAR_FF || c == CHAR_CR)
4713                     == prop_fail_result)                     == prop_fail_result)
4714                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
# Line 4388  for (;;) Line 4718  for (;;)
4718            case PT_PXSPACE:  /* POSIX space */            case PT_PXSPACE:  /* POSIX space */
4719            for (fi = min;; fi++)            for (fi = min;; fi++)
4720              {              {
4721              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM61);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM61);
4722              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4723              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
4724              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 4397  for (;;) Line 4727  for (;;)
4727                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
4728                }                }
4729              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4730              prop_category = UCD_CATEGORY(c);              if ((UCD_CATEGORY(c) == ucp_Z || c == CHAR_HT || c == CHAR_NL ||
             if ((prop_category == ucp_Z || c == CHAR_HT || c == CHAR_NL ||  
4731                   c == CHAR_VT || c == CHAR_FF || c == CHAR_CR)                   c == CHAR_VT || c == CHAR_FF || c == CHAR_CR)
4732                     == prop_fail_result)                     == prop_fail_result)
4733                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
# Line 4408  for (;;) Line 4737  for (;;)
4737            case PT_WORD:            case PT_WORD:
4738            for (fi = min;; fi++)            for (fi = min;; fi++)
4739              {              {
4740              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM62);              int category;
4741                RMATCH(eptr, ecode, offset_top, md, eptrb, RM62);
4742              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4743              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
4744              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 4417  for (;;) Line 4747  for (;;)
4747                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
4748                }                }
4749              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4750              prop_category = UCD_CATEGORY(c);              category = UCD_CATEGORY(c);
4751              if ((prop_category == ucp_L ||              if ((category == ucp_L ||
4752                   prop_category == ucp_N ||                   category == ucp_N ||
4753                   c == CHAR_UNDERSCORE)                   c == CHAR_UNDERSCORE)
4754                     == prop_fail_result)                     == prop_fail_result)
4755                MRRETURN(MATCH_NOMATCH);                MRRETURN(MATCH_NOMATCH);
# Line 4440  for (;;) Line 4770  for (;;)
4770          {          {
4771          for (fi = min;; fi++)          for (fi = min;; fi++)
4772            {            {
4773            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM41);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM41);
4774            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4775            if (fi >= max) MRRETURN(MATCH_NOMATCH);            if (fi >= max) MRRETURN(MATCH_NOMATCH);
4776            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
# Line 4449  for (;;) Line 4779  for (;;)
4779              MRRETURN(MATCH_NOMATCH);              MRRETURN(MATCH_NOMATCH);
4780              }              }
4781            GETCHARINCTEST(c, eptr);            GETCHARINCTEST(c, eptr);
4782            prop_category = UCD_CATEGORY(c);            if (UCD_CATEGORY(c) == ucp_M) MRRETURN(MATCH_NOMATCH);
           if (prop_category == ucp_M) MRRETURN(MATCH_NOMATCH);  
4783            while (eptr < md->end_subject)            while (eptr < md->end_subject)
4784              {              {
4785              int len = 1;              int len = 1;
4786              if (!utf8) c = *eptr;              if (!utf) c = *eptr; else { GETCHARLEN(c, eptr, len); }
4787                else { GETCHARLEN(c, eptr, len); }              if (UCD_CATEGORY(c) != ucp_M) break;
             prop_category = UCD_CATEGORY(c);  
             if (prop_category != ucp_M) break;  
4788              eptr += len;              eptr += len;
4789              }              }
4790            }            }
4791          }          }
   
4792        else        else
4793  #endif     /* SUPPORT_UCP */  #endif     /* SUPPORT_UCP */
4794    
4795  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
4796        /* UTF-8 mode */        if (utf)
       if (utf8)  
4797          {          {
4798          for (fi = min;; fi++)          for (fi = min;; fi++)
4799            {            {
4800            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM42);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM42);
4801            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4802            if (fi >= max) MRRETURN(MATCH_NOMATCH);            if (fi >= max) MRRETURN(MATCH_NOMATCH);
4803            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
# Line 4631  for (;;) Line 4956  for (;;)
4956          }          }
4957        else        else
4958  #endif  #endif
4959        /* Not UTF-8 mode */        /* Not UTF mode */
4960          {          {
4961          for (fi = min;; fi++)          for (fi = min;; fi++)
4962            {            {
4963            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM43);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM43);
4964            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4965            if (fi >= max) MRRETURN(MATCH_NOMATCH);            if (fi >= max) MRRETURN(MATCH_NOMATCH);
4966            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
# Line 4783  for (;;) Line 5108  for (;;)
5108            case PT_LAMP:            case PT_LAMP:
5109            for (i = min; i < max; i++)            for (i = min; i < max; i++)
5110              {              {
5111                int chartype;
5112              int len = 1;              int len = 1;
5113              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
5114                {                {
# Line 4790  for (;;) Line 5116  for (;;)
5116                break;                break;
5117                }                }
5118              GETCHARLENTEST(c, eptr, len);              GETCHARLENTEST(c, eptr, len);
5119              prop_chartype = UCD_CHARTYPE(c);              chartype = UCD_CHARTYPE(c);
5120              if ((prop_chartype == ucp_Lu ||              if ((chartype == ucp_Lu ||
5121                   prop_chartype == ucp_Ll ||                   chartype == ucp_Ll ||
5122                   prop_chartype == ucp_Lt) == prop_fail_result)                   chartype == ucp_Lt) == prop_fail_result)
5123                break;                break;
5124              eptr+= len;              eptr+= len;
5125              }              }
# Line 4809  for (;;) Line 5135  for (;;)
5135                break;                break;
5136                }                }
5137              GETCHARLENTEST(c, eptr, len);              GETCHARLENTEST(c, eptr, len);
5138              prop_category = UCD_CATEGORY(c);              if ((UCD_CATEGORY(c) == prop_value) == prop_fail_result) break;
             if ((prop_category == prop_value) == prop_fail_result)  
               break;  
5139              eptr+= len;              eptr+= len;
5140              }              }
5141            break;            break;
# Line 4826  for (;;) Line 5150  for (;;)
5150                break;                break;
5151                }                }
5152              GETCHARLENTEST(c, eptr, len);              GETCHARLENTEST(c, eptr, len);
5153              prop_chartype = UCD_CHARTYPE(c);              if ((UCD_CHARTYPE(c) == prop_value) == prop_fail_result) break;
             if ((prop_chartype == prop_value) == prop_fail_result)  
               break;  
5154              eptr+= len;              eptr+= len;
5155              }              }
5156            break;            break;
# Line 4843  for (;;) Line 5165  for (;;)
5165                break;                break;
5166                }                }
5167              GETCHARLENTEST(c, eptr, len);              GETCHARLENTEST(c, eptr, len);
5168              prop_script = UCD_SCRIPT(c);              if ((UCD_SCRIPT(c) == prop_value) == prop_fail_result) break;
             if ((prop_script == prop_value) == prop_fail_result)  
               break;  
5169              eptr+= len;              eptr+= len;
5170              }              }
5171            break;            break;
# Line 4853  for (;;) Line 5173  for (;;)
5173            case PT_ALNUM:            case PT_ALNUM:
5174            for (i = min; i < max; i++)            for (i = min; i < max; i++)
5175              {              {
5176                int category;
5177              int len = 1;              int len = 1;
5178              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
5179                {                {
# Line 4860  for (;;) Line 5181  for (;;)
5181                break;                break;
5182                }                }
5183              GETCHARLENTEST(c, eptr, len);              GETCHARLENTEST(c, eptr, len);
5184              prop_category = UCD_CATEGORY(c);              category = UCD_CATEGORY(c);
5185              if ((prop_category == ucp_L || prop_category == ucp_N)              if ((category == ucp_L || category == ucp_N) == prop_fail_result)
                  == prop_fail_result)  
5186                break;                break;
5187              eptr+= len;              eptr+= len;
5188              }              }
# Line 4878  for (;;) Line 5198  for (;;)
5198                break;                break;
5199                }                }
5200              GETCHARLENTEST(c, eptr, len);              GETCHARLENTEST(c, eptr, len);
5201              prop_category = UCD_CATEGORY(c);              if ((UCD_CATEGORY(c) == ucp_Z || c == CHAR_HT || c == CHAR_NL ||
             if ((prop_category == ucp_Z || c == CHAR_HT || c == CHAR_NL ||  
5202                   c == CHAR_FF || c == CHAR_CR)                   c == CHAR_FF || c == CHAR_CR)
5203                   == prop_fail_result)                   == prop_fail_result)
5204                break;                break;
# Line 4897  for (;;) Line 5216  for (;;)
5216                break;                break;
5217                }                }
5218              GETCHARLENTEST(c, eptr, len);              GETCHARLENTEST(c, eptr, len);
5219              prop_category = UCD_CATEGORY(c);              if ((UCD_CATEGORY(c) == ucp_Z || c == CHAR_HT || c == CHAR_NL ||
             if ((prop_category == ucp_Z || c == CHAR_HT || c == CHAR_NL ||  
5220                   c == CHAR_VT || c == CHAR_FF || c == CHAR_CR)                   c == CHAR_VT || c == CHAR_FF || c == CHAR_CR)
5221                   == prop_fail_result)                   == prop_fail_result)
5222                break;                break;
# Line 4909  for (;;) Line 5227  for (;;)
5227            case PT_WORD:            case PT_WORD:
5228            for (i = min; i < max; i++)            for (i = min; i < max; i++)
5229              {              {
5230                int category;
5231              int len = 1;              int len = 1;
5232              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
5233                {                {
# Line 4916  for (;;) Line 5235  for (;;)
5235                break;                break;
5236                }                }
5237              GETCHARLENTEST(c, eptr, len);              GETCHARLENTEST(c, eptr, len);
5238              prop_category = UCD_CATEGORY(c);              category = UCD_CATEGORY(c);
5239              if ((prop_category == ucp_L || prop_category == ucp_N ||              if ((category == ucp_L || category == ucp_N ||
5240                   c == CHAR_UNDERSCORE) == prop_fail_result)                   c == CHAR_UNDERSCORE) == prop_fail_result)
5241                break;                break;
5242              eptr+= len;              eptr+= len;
# Line 4933  for (;;) Line 5252  for (;;)
5252          if (possessive) continue;          if (possessive) continue;
5253          for(;;)          for(;;)
5254            {            {
5255            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM44);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM44);
5256            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
5257            if (eptr-- == pp) break;        /* Stop if tried at original pos */            if (eptr-- == pp) break;        /* Stop if tried at original pos */
5258            if (utf8) BACKCHAR(eptr);            if (utf) BACKCHAR(eptr);
5259            }            }
5260          }          }
5261    
# Line 4947  for (;;) Line 5266  for (;;)
5266          {          {
5267          for (i = min; i < max; i++)          for (i = min; i < max; i++)
5268            {            {
5269              int len = 1;
5270            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
5271              {              {
5272              SCHECK_PARTIAL();              SCHECK_PARTIAL();
5273              break;              break;
5274              }              }
5275            GETCHARINCTEST(c, eptr);            if (!utf) c = *eptr; else { GETCHARLEN(c, eptr, len); }
5276            prop_category = UCD_CATEGORY(c);            if (UCD_CATEGORY(c) == ucp_M) break;
5277            if (prop_category == ucp_M) break;            eptr += len;
5278            while (eptr < md->end_subject)            while (eptr < md->end_subject)
5279              {              {
5280              int len = 1;              len = 1;
5281              if (!utf8) c = *eptr; else              if (!utf) c = *eptr; else { GETCHARLEN(c, eptr, len); }
5282                {              if (UCD_CATEGORY(c) != ucp_M) break;
               GETCHARLEN(c, eptr, len);  
               }  
             prop_category = UCD_CATEGORY(c);  
             if (prop_category != ucp_M) break;  
5283              eptr += len;              eptr += len;
5284              }              }
5285            }            }
# Line 4974  for (;;) Line 5290  for (;;)
5290    
5291          for(;;)          for(;;)
5292            {            {
5293            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM45);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM45);
5294            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
5295            if (eptr-- == pp) break;        /* Stop if tried at original pos */            if (eptr-- == pp) break;        /* Stop if tried at original pos */
5296            for (;;)                        /* Move back over one extended */            for (;;)                        /* Move back over one extended */
5297              {              {
5298              int len = 1;              if (!utf) c = *eptr; else
             if (!utf8) c = *eptr; else  
5299                {                {
5300                BACKCHAR(eptr);                BACKCHAR(eptr);
5301                GETCHARLEN(c, eptr, len);                GETCHAR(c, eptr);
5302                }                }
5303              prop_category = UCD_CATEGORY(c);              if (UCD_CATEGORY(c) != ucp_M) break;
             if (prop_category != ucp_M) break;  
5304              eptr--;              eptr--;
5305              }              }
5306            }            }
# Line 4996  for (;;) Line 5310  for (;;)
5310  #endif   /* SUPPORT_UCP */  #endif   /* SUPPORT_UCP */
5311    
5312  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
5313        /* UTF-8 mode */        if (utf)
   
       if (utf8)  
5314          {          {
5315          switch(ctype)          switch(ctype)
5316            {            {
# Line 5050  for (;;) Line 5362  for (;;)
5362                while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;                while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
5363                }                }
5364              }              }
5365            else eptr = md->end_subject;   /* Unlimited UTF-8 repeat */            else
5366                {
5367                eptr = md->end_subject;   /* Unlimited UTF-8 repeat */
5368                SCHECK_PARTIAL();
5369                }
5370            break;            break;
5371    
5372            /* The byte case is the same as non-UTF8 */            /* The byte case is the same as non-UTF8 */
# Line 5258  for (;;) Line 5574  for (;;)
5574            RRETURN(PCRE_ERROR_INTERNAL);            RRETURN(PCRE_ERROR_INTERNAL);
5575            }            }
5576    
5577          /* eptr is now past the end of the maximum run */          /* eptr is now past the end of the maximum run. If possessive, we are
5578            done (no backing up). Otherwise, match at this position; anything other
5579            than no match is immediately returned. For nomatch, back up one
5580            character, unless we are matching \R and the last thing matched was
5581            \r\n, in which case, back up two bytes. */
5582    
5583          if (possessive) continue;          if (possessive) continue;
5584          for(;;)          for(;;)
5585            {            {
5586            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM46);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM46);
5587            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
5588            if (eptr-- == pp) break;        /* Stop if tried at original pos */            if (eptr-- == pp) break;        /* Stop if tried at original pos */
5589            BACKCHAR(eptr);            BACKCHAR(eptr);
5590              if (ctype == OP_ANYNL && eptr > pp  && *eptr == '\n' &&
5591                  eptr[-1] == '\r') eptr--;
5592            }            }
5593          }          }
5594        else        else
5595  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF8 */
5596          /* Not UTF mode */
       /* Not UTF-8 mode */  
5597          {          {
5598          switch(ctype)          switch(ctype)
5599            {            {
# Line 5465  for (;;) Line 5786  for (;;)
5786            RRETURN(PCRE_ERROR_INTERNAL);            RRETURN(PCRE_ERROR_INTERNAL);
5787            }            }
5788    
5789          /* eptr is now past the end of the maximum run */          /* eptr is now past the end of the maximum run. If possessive, we are
5790            done (no backing up). Otherwise, match at this position; anything other
5791            than no match is immediately returned. For nomatch, back up one
5792            character (byte), unless we are matching \R and the last thing matched
5793            was \r\n, in which case, back up two bytes. */
5794    
5795          if (possessive) continue;          if (possessive) continue;
5796          while (eptr >= pp)          while (eptr >= pp)
5797            {            {
5798            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM47);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM47);
           eptr--;  
5799            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
5800              eptr--;
5801              if (ctype == OP_ANYNL && eptr > pp  && *eptr == '\n' &&
5802                  eptr[-1] == '\r') eptr--;
5803            }            }
5804          }          }
5805    
# Line 5511  switch (frame->Xwhere) Line 5838  switch (frame->Xwhere)
5838    LBL( 9) LBL(10) LBL(11) LBL(12) LBL(13) LBL(14) LBL(15) LBL(17)    LBL( 9) LBL(10) LBL(11) LBL(12) LBL(13) LBL(14) LBL(15) LBL(17)
5839    LBL(19) LBL(24) LBL(25) LBL(26) LBL(27) LBL(29) LBL(31) LBL(33)    LBL(19) LBL(24) LBL(25) LBL(26) LBL(27) LBL(29) LBL(31) LBL(33)
5840    LBL(35) LBL(43) LBL(47) LBL(48) LBL(49) LBL(50) LBL(51) LBL(52)    LBL(35) LBL(43) LBL(47) LBL(48) LBL(49) LBL(50) LBL(51) LBL(52)
5841    LBL(53) LBL(54) LBL(55) LBL(56) LBL(57) LBL(58)    LBL(53) LBL(54) LBL(55) LBL(56) LBL(57) LBL(58) LBL(63) LBL(64)
5842      LBL(65) LBL(66)
5843  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
5844    LBL(16) LBL(18) LBL(20) LBL(21) LBL(22) LBL(23) LBL(28) LBL(30)    LBL(16) LBL(18) LBL(20) LBL(21) LBL(22) LBL(23) LBL(28) LBL(30)
5845    LBL(32) LBL(34) LBL(42) LBL(46)    LBL(32) LBL(34) LBL(42) LBL(46)
# Line 5540  Undefine all the macros that were define Line 5868  Undefine all the macros that were define
5868  #undef ecode  #undef ecode
5869  #undef mstart  #undef mstart
5870  #undef offset_top  #undef offset_top
 #undef ims  
5871  #undef eptrb  #undef eptrb
5872  #undef flags  #undef flags