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

Diff of /code/trunk/pcre_exec.c

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

revision 602 by ph10, Wed May 25 08:29:03 2011 UTC revision 609 by ph10, Wed Jun 15 18:09:23 2011 UTC
# 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_PRUNE        (-996)
80  #define MATCH_SKIP_ARG     (-995)  #define MATCH_SKIP         (-995)
81  #define MATCH_THEN         (-994)  #define MATCH_SKIP_ARG     (-994)
82    #define MATCH_THEN         (-993)
83    
84  /* This is a convenience macro for code that occurs many times. */  /* This is a convenience macro for code that occurs many times. */
85    
# Line 273  enum { RM1=1, RM2,  RM3,  RM4,  RM5,  RM Line 276  enum { RM1=1, RM2,  RM3,  RM4,  RM5,  RM
276         RM31,  RM32, RM33, RM34, RM35, RM36, RM37, RM38, RM39, RM40,         RM31,  RM32, RM33, RM34, RM35, RM36, RM37, RM38, RM39, RM40,
277         RM41,  RM42, RM43, RM44, RM45, RM46, RM47, RM48, RM49, RM50,         RM41,  RM42, RM43, RM44, RM45, RM46, RM47, RM48, RM49, RM50,
278         RM51,  RM52, RM53, RM54, RM55, RM56, RM57, RM58, RM59, RM60,         RM51,  RM52, RM53, RM54, RM55, RM56, RM57, RM58, RM59, RM60,
279         RM61,  RM62 };         RM61,  RM62, RM63};
280    
281  /* These versions of the macros use the stack, as normal. There are debugging  /* These versions of the macros use the stack, as normal. There are debugging
282  versions and production versions. Note that the "rw" argument of RMATCH isn't  versions and production versions. Note that the "rw" argument of RMATCH isn't
# Line 283  actually used in this definition. */ Line 286  actually used in this definition. */
286  #define REGISTER register  #define REGISTER register
287    
288  #ifdef PCRE_DEBUG  #ifdef PCRE_DEBUG
289  #define RMATCH(ra,rb,rc,rd,re,rf,rw) \  #define RMATCH(ra,rb,rc,rd,re,rw) \
290    { \    { \
291    printf("match() called in line %d\n", __LINE__); \    printf("match() called in line %d\n", __LINE__); \
292    rrc = match(ra,rb,mstart,markptr,rc,rd,re,rf,rdepth+1); \    rrc = match(ra,rb,mstart,markptr,rc,rd,re,rdepth+1); \
293    printf("to line %d\n", __LINE__); \    printf("to line %d\n", __LINE__); \
294    }    }
295  #define RRETURN(ra) \  #define RRETURN(ra) \
# Line 295  actually used in this definition. */ Line 298  actually used in this definition. */
298    return ra; \    return ra; \
299    }    }
300  #else  #else
301  #define RMATCH(ra,rb,rc,rd,re,rf,rw) \  #define RMATCH(ra,rb,rc,rd,re,rw) \
302    rrc = match(ra,rb,mstart,markptr,rc,rd,re,rf,rdepth+1)    rrc = match(ra,rb,mstart,markptr,rc,rd,re,rdepth+1)
303  #define RRETURN(ra) return ra  #define RRETURN(ra) return ra
304  #endif  #endif
305    
# Line 309  argument of match(), which never changes Line 312  argument of match(), which never changes
312    
313  #define REGISTER  #define REGISTER
314    
315  #define RMATCH(ra,rb,rc,rd,re,rf,rw)\  #define RMATCH(ra,rb,rc,rd,re,rw)\
316    {\    {\
317    heapframe *newframe = (heapframe *)(pcre_stack_malloc)(sizeof(heapframe));\    heapframe *newframe = (heapframe *)(pcre_stack_malloc)(sizeof(heapframe));\
318    if (newframe == NULL) RRETURN(PCRE_ERROR_NOMEMORY);\    if (newframe == NULL) RRETURN(PCRE_ERROR_NOMEMORY);\
# Line 320  argument of match(), which never changes Line 323  argument of match(), which never changes
323    newframe->Xmarkptr = markptr;\    newframe->Xmarkptr = markptr;\
324    newframe->Xoffset_top = rc;\    newframe->Xoffset_top = rc;\
325    newframe->Xeptrb = re;\    newframe->Xeptrb = re;\
   newframe->Xflags = rf;\  
326    newframe->Xrdepth = frame->Xrdepth + 1;\    newframe->Xrdepth = frame->Xrdepth + 1;\
327    newframe->Xprevframe = frame;\    newframe->Xprevframe = frame;\
328    frame = newframe;\    frame = newframe;\
# Line 357  typedef struct heapframe { Line 359  typedef struct heapframe {
359    USPTR Xmarkptr;    USPTR Xmarkptr;
360    int Xoffset_top;    int Xoffset_top;
361    eptrblock *Xeptrb;    eptrblock *Xeptrb;
   int Xflags;  
362    unsigned int Xrdepth;    unsigned int Xrdepth;
363    
364    /* Function local variables */    /* Function local variables */
# Line 465  Arguments: Line 466  Arguments:
466     md          pointer to "static" info for the match     md          pointer to "static" info for the match
467     eptrb       pointer to chain of blocks containing eptr at start of     eptrb       pointer to chain of blocks containing eptr at start of
468                   brackets - for testing for empty matches                   brackets - for testing for empty matches
    flags       can contain  
                  match_condassert - this is an assertion condition  
                  match_cbegroup - this is the start of an unlimited repeat  
                    group that can match an empty string  
469     rdepth      the recursion depth     rdepth      the recursion depth
470    
471  Returns:       MATCH_MATCH if matched            )  these values are >= 0  Returns:       MATCH_MATCH if matched            )  these values are >= 0
# Line 481  Returns:       MATCH_MATCH if matched Line 478  Returns:       MATCH_MATCH if matched
478  static int  static int
479  match(REGISTER USPTR eptr, REGISTER const uschar *ecode, USPTR mstart,  match(REGISTER USPTR eptr, REGISTER const uschar *ecode, USPTR mstart,
480    const uschar *markptr, int offset_top, match_data *md, eptrblock *eptrb,    const uschar *markptr, int offset_top, match_data *md, eptrblock *eptrb,
481    int flags, unsigned int rdepth)    unsigned int rdepth)
482  {  {
483  /* These variables do not need to be preserved over recursion in this function,  /* These variables do not need to be preserved over recursion in this function,
484  so they can be ordinary variables in all cases. Mark some of them with  so they can be ordinary variables in all cases. Mark some of them with
# Line 514  frame->Xmstart = mstart; Line 511  frame->Xmstart = mstart;
511  frame->Xmarkptr = markptr;  frame->Xmarkptr = markptr;
512  frame->Xoffset_top = offset_top;  frame->Xoffset_top = offset_top;
513  frame->Xeptrb = eptrb;  frame->Xeptrb = eptrb;
 frame->Xflags = flags;  
514  frame->Xrdepth = rdepth;  frame->Xrdepth = rdepth;
515    
516  /* This is where control jumps back to to effect "recursion" */  /* This is where control jumps back to to effect "recursion" */
# Line 529  HEAP_RECURSE: Line 525  HEAP_RECURSE:
525  #define markptr            frame->Xmarkptr  #define markptr            frame->Xmarkptr
526  #define offset_top         frame->Xoffset_top  #define offset_top         frame->Xoffset_top
527  #define eptrb              frame->Xeptrb  #define eptrb              frame->Xeptrb
 #define flags              frame->Xflags  
528  #define rdepth             frame->Xrdepth  #define rdepth             frame->Xrdepth
529    
530  /* Ditto for the local variables */  /* Ditto for the local variables */
# Line 587  i, and fc and c, can be the same variabl Line 582  i, and fc and c, can be the same variabl
582  #define fi i  #define fi i
583  #define fc c  #define fc c
584    
585    /* Many of the following variables are used only in small blocks of the code.
586  #ifdef SUPPORT_UTF8                /* Many of these variables are used only  */  My normal style of coding would have declared them within each of those blocks.
587  const uschar *charptr;             /* in small blocks of the code. My normal */  However, in order to accommodate the version of this code that uses an external
588  #endif                             /* style of coding would have declared    */  "stack" implemented on the heap, it is easier to declare them all here, so the
589  const uschar *callpat;             /* them within each of those blocks.      */  declarations can be cut out in a block. The only declarations within blocks
590  const uschar *data;                /* However, in order to accommodate the   */  below are for variables that do not have to be preserved over a recursive call
591  const uschar *next;                /* version of this code that uses an      */  to RMATCH(). */
592  USPTR         pp;                  /* external "stack" implemented on the    */  
593  const uschar *prev;                /* heap, it is easier to declare them all */  #ifdef SUPPORT_UTF8
594  USPTR         saved_eptr;          /* here, so the declarations can be cut   */  const uschar *charptr;
595                                     /* out in a block. The only declarations  */  #endif
596  recursion_info new_recursive;      /* within blocks below are for variables  */  const uschar *callpat;
597                                     /* that do not have to be preserved over  */  const uschar *data;
598  BOOL cur_is_word;                  /* a recursive call to RMATCH().          */  const uschar *next;
599    USPTR         pp;
600    const uschar *prev;
601    USPTR         saved_eptr;
602    
603    recursion_info new_recursive;
604    
605    BOOL cur_is_word;
606  BOOL condition;  BOOL condition;
607  BOOL prev_is_word;  BOOL prev_is_word;
608    
# Line 630  int stacksave[REC_STACK_SAVE_MAX]; Line 632  int stacksave[REC_STACK_SAVE_MAX];
632  eptrblock newptrb;  eptrblock newptrb;
633  #endif     /* NO_RECURSE */  #endif     /* NO_RECURSE */
634    
635    /* To save space on the stack and in the heap frame, I have doubled up on some
636    of the local variables that are used only in localised parts of the code, but
637    still need to be preserved over recursive calls of match(). These macros define
638    the alternative names that are used. */
639    
640    #define allow_zero    cur_is_word
641    #define cbegroup      condition
642    #define code_offset   codelink
643    #define condassert    condition
644    #define matched_once  prev_is_word
645    
646  /* These statements are here to stop the compiler complaining about unitialized  /* These statements are here to stop the compiler complaining about unitialized
647  variables. */  variables. */
648    
# Line 667  if (md->match_call_count++ >= md->match_ Line 680  if (md->match_call_count++ >= md->match_
680  if (rdepth >= md->match_limit_recursion) RRETURN(PCRE_ERROR_RECURSIONLIMIT);  if (rdepth >= md->match_limit_recursion) RRETURN(PCRE_ERROR_RECURSIONLIMIT);
681    
682  /* At the start of a group with an unlimited repeat that may match an empty  /* At the start of a group with an unlimited repeat that may match an empty
683  string, the match_cbegroup flag is set. When this is the case, add the current  string, the variable md->match_function_type is set to MATCH_CBEGROUP. It is
684  subject pointer to the chain of such remembered pointers, to be checked when we  done this way to save having to use another function argument, which would take
685  hit the closing ket, in order to break infinite loops that match no characters.  up space on the stack. See also MATCH_CONDASSERT below.
686  When match() is called in other circumstances, don't add to the chain. The  
687  match_cbegroup flag must NOT be used with tail recursion, because the memory  When MATCH_CBEGROUP is set, add the current subject pointer to the chain of
688  block that is used is on the stack, so a new one may be required for each  such remembered pointers, to be checked when we hit the closing ket, in order
689  match(). */  to break infinite loops that match no characters. When match() is called in
690    other circumstances, don't add to the chain. The MATCH_CBEGROUP feature must
691    NOT be used with tail recursion, because the memory block that is used is on
692    the stack, so a new one may be required for each match(). */
693    
694  if ((flags & match_cbegroup) != 0)  if (md->match_function_type == MATCH_CBEGROUP)
695    {    {
696    newptrb.epb_saved_eptr = eptr;    newptrb.epb_saved_eptr = eptr;
697    newptrb.epb_prev = eptrb;    newptrb.epb_prev = eptrb;
698    eptrb = &newptrb;    eptrb = &newptrb;
699      md->match_function_type = 0;
700    }    }
701    
702  /* Now start processing the opcodes. */  /* Now start processing the opcodes. */
# Line 688  for (;;) Line 705  for (;;)
705    {    {
706    minimize = possessive = FALSE;    minimize = possessive = FALSE;
707    op = *ecode;    op = *ecode;
708    
709    switch(op)    switch(op)
710      {      {
711      case OP_MARK:      case OP_MARK:
712      markptr = ecode + 2;      markptr = ecode + 2;
713      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,
714        eptrb, flags, RM55);        eptrb, RM55);
715    
716      /* 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
717      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 720  for (;;) Line 737  for (;;)
737    
738      case OP_COMMIT:      case OP_COMMIT:
739      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
740        eptrb, flags, RM52);        eptrb, RM52);
741      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE &&      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE &&
742          rrc != MATCH_SKIP && rrc != MATCH_SKIP_ARG &&          rrc != MATCH_SKIP && rrc != MATCH_SKIP_ARG &&
743          rrc != MATCH_THEN)          rrc != MATCH_THEN)
# Line 731  for (;;) Line 748  for (;;)
748    
749      case OP_PRUNE:      case OP_PRUNE:
750      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
751        eptrb, flags, RM51);        eptrb, RM51);
752      if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);      if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
753      MRRETURN(MATCH_PRUNE);      MRRETURN(MATCH_PRUNE);
754    
755      case OP_PRUNE_ARG:      case OP_PRUNE_ARG:
756      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,
757        eptrb, flags, RM56);        eptrb, RM56);
758      if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);      if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
759      md->mark = ecode + 2;      md->mark = ecode + 2;
760      RRETURN(MATCH_PRUNE);      RRETURN(MATCH_PRUNE);
# Line 746  for (;;) Line 763  for (;;)
763    
764      case OP_SKIP:      case OP_SKIP:
765      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
766        eptrb, flags, RM53);        eptrb, RM53);
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      md->start_match_ptr = eptr;   /* Pass back current position */      md->start_match_ptr = eptr;   /* Pass back current position */
# Line 754  for (;;) Line 771  for (;;)
771    
772      case OP_SKIP_ARG:      case OP_SKIP_ARG:
773      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1], offset_top, md,
774        eptrb, flags, RM57);        eptrb, RM57);
775      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE && rrc != MATCH_THEN)      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE && rrc != MATCH_THEN)
776        RRETURN(rrc);        RRETURN(rrc);
777    
# Line 773  for (;;) Line 790  for (;;)
790    
791      case OP_THEN:      case OP_THEN:
792      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
793        eptrb, flags, RM54);        eptrb, RM54);
794      if (rrc != MATCH_NOMATCH) RRETURN(rrc);      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
795      md->start_match_ptr = ecode - GET(ecode, 1);      md->start_match_ptr = ecode - GET(ecode, 1);
796      MRRETURN(MATCH_THEN);      MRRETURN(MATCH_THEN);
797    
798      case OP_THEN_ARG:      case OP_THEN_ARG:
799      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1+LINK_SIZE],      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode] + ecode[1+LINK_SIZE],
800        offset_top, md, eptrb, flags, RM58);        offset_top, md, eptrb, RM58);
801      if (rrc != MATCH_NOMATCH) RRETURN(rrc);      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
802      md->start_match_ptr = ecode - GET(ecode, 1);      md->start_match_ptr = ecode - GET(ecode, 1);
803      md->mark = ecode + LINK_SIZE + 2;      md->mark = ecode + LINK_SIZE + 2;
804      RRETURN(MATCH_THEN);      RRETURN(MATCH_THEN);
805    
806      /* Handle a capturing bracket. If there is space in the offset vector, save      /* Handle a capturing bracket, other than those that are possessive with an
807      the current subject position in the working slot at the top of the vector.      unlimited repeat. If there is space in the offset vector, save the current
808      We mustn't change the current values of the data slot, because they may be      subject position in the working slot at the top of the vector. We mustn't
809      set from a previous iteration of this group, and be referred to by a      change the current values of the data slot, because they may be set from a
810      reference inside the group.      previous iteration of this group, and be referred to by a reference inside
811        the group. If we fail to match, we need to restore this value and also the
     If the bracket fails to match, we need to restore this value and also the  
812      values of the final offsets, in case they were set by a previous iteration      values of the final offsets, in case they were set by a previous iteration
813      of the same bracket.      of the same bracket.
814    
# Line 804  for (;;) Line 820  for (;;)
820      case OP_SCBRA:      case OP_SCBRA:
821      number = GET2(ecode, 1+LINK_SIZE);      number = GET2(ecode, 1+LINK_SIZE);
822      offset = number << 1;      offset = number << 1;
823    
824  #ifdef PCRE_DEBUG  #ifdef PCRE_DEBUG
825      printf("start bracket %d\n", number);      printf("start bracket %d\n", number);
826      printf("subject=");      printf("subject=");
# Line 823  for (;;) Line 839  for (;;)
839        md->offset_vector[md->offset_end - number] =        md->offset_vector[md->offset_end - number] =
840          (int)(eptr - md->start_subject);          (int)(eptr - md->start_subject);
841    
842        flags = (op == OP_SCBRA)? match_cbegroup : 0;        for (;;)
       do  
843          {          {
844          RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,          if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
845            eptrb, flags, RM1);          RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
846              eptrb, RM1);
847          if (rrc != MATCH_NOMATCH &&          if (rrc != MATCH_NOMATCH &&
848              (rrc != MATCH_THEN || md->start_match_ptr != ecode))              (rrc != MATCH_THEN || md->start_match_ptr != ecode))
849            RRETURN(rrc);            RRETURN(rrc);
850          md->capture_last = save_capture_last;          md->capture_last = save_capture_last;
851          ecode += GET(ecode, 1);          ecode += GET(ecode, 1);
852            if (*ecode != OP_ALT) break;
853          }          }
       while (*ecode == OP_ALT);  
854    
855        DPRINTF(("bracket %d failed\n", number));        DPRINTF(("bracket %d failed\n", number));
856    
# Line 842  for (;;) Line 858  for (;;)
858        md->offset_vector[offset+1] = save_offset2;        md->offset_vector[offset+1] = save_offset2;
859        md->offset_vector[md->offset_end - number] = save_offset3;        md->offset_vector[md->offset_end - number] = save_offset3;
860    
861        if (rrc != MATCH_THEN) md->mark = markptr;        if (rrc != MATCH_THEN && md->mark == NULL) md->mark = markptr;
862        RRETURN(MATCH_NOMATCH);        RRETURN(MATCH_NOMATCH);
863        }        }
864    
# Line 857  for (;;) Line 873  for (;;)
873      /* VVVVVVVVVVVVVVVVVVVVVVVVV */      /* VVVVVVVVVVVVVVVVVVVVVVVVV */
874      /* VVVVVVVVVVVVVVVVVVVVVVVVV */      /* VVVVVVVVVVVVVVVVVVVVVVVVV */
875    
876      /* Non-capturing bracket. Loop for all the alternatives. When we get to the      /* Non-capturing bracket, except for possessive with unlimited repeat. Loop
877      final alternative within the brackets, we would return the result of a      for all the alternatives. When we get to the final alternative within the
878      recursive call to match() whatever happened. We can reduce stack usage by      brackets, we used to return the result of a recursive call to match()
879      turning this into a tail recursion, except in the case when match_cbegroup      whatever happened so it was possible to reduce stack usage by turning this
880      is set.*/      into a tail recursion, except in the case of a possibly empty group.
881        However, now that there is the possiblity of (*THEN) occurring in the final
882        alternative, this optimization is no longer possible. */
883    
884      case OP_BRA:      case OP_BRA:
885      case OP_SBRA:      case OP_SBRA:
886      DPRINTF(("start non-capturing bracket\n"));      DPRINTF(("start non-capturing bracket\n"));
     flags = (op >= OP_SBRA)? match_cbegroup : 0;  
887      for (;;)      for (;;)
888        {        {
889        if (ecode[GET(ecode, 1)] != OP_ALT)   /* Final alternative */        if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
890          RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md, eptrb,
891            RM2);
892          if (rrc != MATCH_NOMATCH &&
893              (rrc != MATCH_THEN || md->start_match_ptr != ecode))
894            RRETURN(rrc);
895          ecode += GET(ecode, 1);
896          if (*ecode != OP_ALT) break;
897          }
898    
899        if (rrc != MATCH_THEN && md->mark == NULL) md->mark = markptr;
900        RRETURN(MATCH_NOMATCH);
901    
902        /* Handle possessive capturing brackets with an unlimited repeat. We come
903        here from BRAZERO with allow_zero set TRUE. The offset_vector values are
904        handled similarly to the normal case above. However, the matching is
905        different. The end of these brackets will always be OP_KETRPOS, which
906        returns MATCH_KETRPOS without going further in the pattern. By this means
907        we can handle the group by iteration rather than recursion, thereby
908        reducing the amount of stack needed. */
909    
910        case OP_CBRAPOS:
911        case OP_SCBRAPOS:
912        allow_zero = FALSE;
913    
914        POSSESSIVE_CAPTURE:
915        number = GET2(ecode, 1+LINK_SIZE);
916        offset = number << 1;
917    
918    #ifdef PCRE_DEBUG
919        printf("start possessive bracket %d\n", number);
920        printf("subject=");
921        pchars(eptr, 16, TRUE, md);
922        printf("\n");
923    #endif
924    
925        if (offset < md->offset_max)
926          {
927          matched_once = FALSE;
928          code_offset = ecode - md->start_code;
929    
930          save_offset1 = md->offset_vector[offset];
931          save_offset2 = md->offset_vector[offset+1];
932          save_offset3 = md->offset_vector[md->offset_end - number];
933          save_capture_last = md->capture_last;
934    
935          DPRINTF(("saving %d %d %d\n", save_offset1, save_offset2, save_offset3));
936    
937          /* Each time round the loop, save the current subject position for use
938          when the group matches. For MATCH_MATCH, the group has matched, so we
939          restart it with a new subject starting position, remembering that we had
940          at least one match. For MATCH_NOMATCH, carry on with the alternatives, as
941          usual. If we haven't matched any alternatives in any iteration, check to
942          see if a previous iteration matched. If so, the group has matched;
943          continue from afterwards. Otherwise it has failed; restore the previous
944          capture values before returning NOMATCH. */
945    
946          for (;;)
947          {          {
948          if (flags == 0)    /* Not a possibly empty group */          md->offset_vector[md->offset_end - number] =
949              (int)(eptr - md->start_subject);
950            if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
951            RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
952              eptrb, RM63);
953            if (rrc == MATCH_KETRPOS)
954            {            {
955            ecode += _pcre_OP_lengths[*ecode];            offset_top = md->end_offset_top;
956            DPRINTF(("bracket 0 tail recursion\n"));            eptr = md->end_match_ptr;
957            goto TAIL_RECURSE;            ecode = md->start_code + code_offset;
958            }            save_capture_last = md->capture_last;
959              matched_once = TRUE;
960              continue;
961              }
962            if (rrc != MATCH_NOMATCH &&
963                (rrc != MATCH_THEN || md->start_match_ptr != ecode))
964              RRETURN(rrc);
965            md->capture_last = save_capture_last;
966            ecode += GET(ecode, 1);
967            if (*ecode != OP_ALT) break;
968            }
969    
970          if (!matched_once)
971            {
972            md->offset_vector[offset] = save_offset1;
973            md->offset_vector[offset+1] = save_offset2;
974            md->offset_vector[md->offset_end - number] = save_offset3;
975            }
976    
977          if (rrc != MATCH_THEN && md->mark == NULL) md->mark = markptr;
978          if (allow_zero || matched_once)
979            {
980            ecode += 1 + LINK_SIZE;
981            break;
982            }
983    
984          RRETURN(MATCH_NOMATCH);
985          }
986    
987        /* FALL THROUGH ... Insufficient room for saving captured contents. Treat
988        as a non-capturing bracket. */
989    
990          /* Possibly empty group; can't use tail recursion. */      /* VVVVVVVVVVVVVVVVVVVVVVVVV */
991        /* VVVVVVVVVVVVVVVVVVVVVVVVV */
992    
993          RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md, eptrb,      DPRINTF(("insufficient capture room: treat as non-capturing\n"));
           flags, RM48);  
         if (rrc == MATCH_NOMATCH) md->mark = markptr;  
         RRETURN(rrc);  
         }  
994    
995        /* For non-final alternatives, continue the loop for a NOMATCH result;      /* VVVVVVVVVVVVVVVVVVVVVVVVV */
996        otherwise return. */      /* VVVVVVVVVVVVVVVVVVVVVVVVV */
997    
998        RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md, eptrb,      /* Non-capturing possessive bracket with unlimited repeat. We come here
999          flags, RM2);      from BRAZERO with allow_zero = TRUE. The code is similar to the above,
1000        without the capturing complication. It is written out separately for speed
1001        and cleanliness. */
1002    
1003        case OP_BRAPOS:
1004        case OP_SBRAPOS:
1005        allow_zero = FALSE;
1006    
1007        POSSESSIVE_NON_CAPTURE:
1008        matched_once = FALSE;
1009        code_offset = ecode - md->start_code;
1010    
1011        for (;;)
1012          {
1013          if (op >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
1014          RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
1015            eptrb, RM48);
1016          if (rrc == MATCH_KETRPOS)
1017            {
1018            eptr = md->end_match_ptr;
1019            ecode = md->start_code + code_offset;
1020            matched_once = TRUE;
1021            continue;
1022            }
1023        if (rrc != MATCH_NOMATCH &&        if (rrc != MATCH_NOMATCH &&
1024            (rrc != MATCH_THEN || md->start_match_ptr != ecode))            (rrc != MATCH_THEN || md->start_match_ptr != ecode))
1025          RRETURN(rrc);          RRETURN(rrc);
1026        ecode += GET(ecode, 1);        ecode += GET(ecode, 1);
1027          if (*ecode != OP_ALT) break;
1028        }        }
1029    
1030        if (matched_once || allow_zero)
1031          {
1032          ecode += 1 + LINK_SIZE;
1033          break;
1034          }
1035        RRETURN(MATCH_NOMATCH);
1036    
1037      /* Control never reaches here. */      /* Control never reaches here. */
1038    
1039      /* Conditional group: compilation checked that there are no more than      /* Conditional group: compilation checked that there are no more than
1040      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
1041      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
1042      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. */  
1043    
1044      case OP_COND:      case OP_COND:
1045      case OP_SCOND:      case OP_SCOND:
1046      codelink= GET(ecode, 1);      codelink = GET(ecode, 1);
1047    
1048      /* 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
1049      inserted between OP_COND and an assertion condition. */      inserted between OP_COND and an assertion condition. */
# Line 1081  for (;;) Line 1218  for (;;)
1218        }        }
1219    
1220      /* The condition is an assertion. Call match() to evaluate it - setting      /* The condition is an assertion. Call match() to evaluate it - setting
1221      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
1222      assertion. */      an assertion. */
1223    
1224      else      else
1225        {        {
1226        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL,        md->match_function_type = MATCH_CONDASSERT;
1227            match_condassert, RM3);        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM3);
1228        if (rrc == MATCH_MATCH)        if (rrc == MATCH_MATCH)
1229          {          {
1230          condition = TRUE;          condition = TRUE;
# Line 1107  for (;;) Line 1244  for (;;)
1244        }        }
1245    
1246      /* 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,
1247      we can use tail recursion to avoid using another stack frame, except when      we used to use tail recursion to avoid using another stack frame, except
1248      match_cbegroup is required for an unlimited repeat of a possibly empty      when there was unlimited repeat of a possibly empty group. However, that
1249      group. If the second alternative doesn't exist, we can just plough on. */      strategy no longer works because of the possibilty of (*THEN) being
1250        encountered in the branch. A recursive call to match() is always required,
1251        unless the second alternative doesn't exist, in which case we can just
1252        plough on. */
1253    
1254      if (condition || *ecode == OP_ALT)      if (condition || *ecode == OP_ALT)
1255        {        {
1256        ecode += 1 + LINK_SIZE;        if (op == OP_SCOND) md->match_function_type = MATCH_CBEGROUP;
1257        if (op == OP_SCOND)        /* Possibly empty group */        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM49);
1258          {        if (rrc == MATCH_THEN && md->start_match_ptr == ecode)
1259          RMATCH(eptr, ecode, offset_top, md, eptrb, match_cbegroup, RM49);          rrc = MATCH_NOMATCH;
1260          RRETURN(rrc);        RRETURN(rrc);
         }  
       else                       /* Group must match something */  
         {  
         flags = 0;  
         goto TAIL_RECURSE;  
         }  
1261        }        }
1262      else                         /* Condition false & no alternative */      else                         /* Condition false & no alternative */
1263        {        {
# Line 1156  for (;;) Line 1290  for (;;)
1290      break;      break;
1291    
1292    
1293      /* End of the pattern, either real or forced. If we are in a top-level      /* End of the pattern, either real or forced. If we are in a recursion, we
1294      recursion, we should restore the offsets appropriately and continue from      should restore the offsets appropriately, and if it's a top-level
1295      after the call. */      recursion, continue from after the call. */
1296    
1297      case OP_ACCEPT:      case OP_ACCEPT:
1298      case OP_END:      case OP_END:
1299      if (md->recursive != NULL && md->recursive->group_num == 0)      if (md->recursive != NULL)
1300        {        {
1301        recursion_info *rec = md->recursive;        recursion_info *rec = md->recursive;
       DPRINTF(("End of pattern in a (?0) recursion\n"));  
1302        md->recursive = rec->prevrec;        md->recursive = rec->prevrec;
1303        memmove(md->offset_vector, rec->offset_save,        memmove(md->offset_vector, rec->offset_save,
1304          rec->saved_max * sizeof(int));          rec->saved_max * sizeof(int));
1305        offset_top = rec->save_offset_top;        offset_top = rec->save_offset_top;
1306        ecode = rec->after_call;        if (rec->group_num == 0)
1307        break;          {
1308            ecode = rec->after_call;
1309            break;
1310            }
1311        }        }
1312    
1313      /* Otherwise, if we have matched an empty string, fail if PCRE_NOTEMPTY is      /* Otherwise, if we have matched an empty string, fail if PCRE_NOTEMPTY is
# Line 1179  for (;;) Line 1315  for (;;)
1315      the subject. In both cases, backtracking will then try other alternatives,      the subject. In both cases, backtracking will then try other alternatives,
1316      if any. */      if any. */
1317    
1318      if (eptr == mstart &&      else if (eptr == mstart &&
1319          (md->notempty ||          (md->notempty ||
1320            (md->notempty_atstart &&            (md->notempty_atstart &&
1321              mstart == md->start_subject + md->start_offset)))              mstart == md->start_subject + md->start_offset)))
1322        MRRETURN(MATCH_NOMATCH);        MRRETURN(MATCH_NOMATCH);
1323    
1324      /* Otherwise, we have a match. */      /* Otherwise, we have a match. */
1325    
1326      md->end_match_ptr = eptr;           /* Record where we ended */      md->end_match_ptr = eptr;           /* Record where we ended */
1327      md->end_offset_top = offset_top;    /* and how many extracts were taken */      md->end_offset_top = offset_top;    /* and how many extracts were taken */
1328      md->start_match_ptr = mstart;       /* and the start (\K can modify) */      md->start_match_ptr = mstart;       /* and the start (\K can modify) */
# Line 1201  for (;;) Line 1337  for (;;)
1337      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,
1338      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
1339      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
1340      this level is identical to the lookahead case. */      this level is identical to the lookahead case. When the assertion is part
1341        of a condition, we want to return immediately afterwards. The caller of
1342        this incarnation of the match() function will have set MATCH_CONDASSERT in
1343        md->match_function type, and one of these opcodes will be the first opcode
1344        that is processed. We use a local variable that is preserved over calls to
1345        match() to remember this case. */
1346    
1347      case OP_ASSERT:      case OP_ASSERT:
1348      case OP_ASSERTBACK:      case OP_ASSERTBACK:
1349        if (md->match_function_type == MATCH_CONDASSERT)
1350          {
1351          condassert = TRUE;
1352          md->match_function_type = 0;
1353          }
1354        else condassert = FALSE;
1355    
1356      do      do
1357        {        {
1358        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, 0,        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM4);
         RM4);  
1359        if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)        if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)
1360          {          {
1361          mstart = md->start_match_ptr;   /* In case \K reset it */          mstart = md->start_match_ptr;   /* In case \K reset it */
# Line 1220  for (;;) Line 1367  for (;;)
1367        ecode += GET(ecode, 1);        ecode += GET(ecode, 1);
1368        }        }
1369      while (*ecode == OP_ALT);      while (*ecode == OP_ALT);
1370    
1371      if (*ecode == OP_KET) MRRETURN(MATCH_NOMATCH);      if (*ecode == OP_KET) MRRETURN(MATCH_NOMATCH);
1372    
1373      /* If checking an assertion for a condition, return MATCH_MATCH. */      /* If checking an assertion for a condition, return MATCH_MATCH. */
1374    
1375      if ((flags & match_condassert) != 0) RRETURN(MATCH_MATCH);      if (condassert) RRETURN(MATCH_MATCH);
1376    
1377      /* Continue from after the assertion, updating the offsets high water      /* Continue from after the assertion, updating the offsets high water
1378      mark, since extracts may have been taken during the assertion. */      mark, since extracts may have been taken during the assertion. */
# Line 1240  for (;;) Line 1388  for (;;)
1388    
1389      case OP_ASSERT_NOT:      case OP_ASSERT_NOT:
1390      case OP_ASSERTBACK_NOT:      case OP_ASSERTBACK_NOT:
1391        if (md->match_function_type == MATCH_CONDASSERT)
1392          {
1393          condassert = TRUE;
1394          md->match_function_type = 0;
1395          }
1396        else condassert = FALSE;
1397    
1398      do      do
1399        {        {
1400        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, 0,        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM5);
         RM5);  
1401        if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) MRRETURN(MATCH_NOMATCH);        if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) MRRETURN(MATCH_NOMATCH);
1402        if (rrc == MATCH_SKIP || rrc == MATCH_PRUNE || rrc == MATCH_COMMIT)        if (rrc == MATCH_SKIP || rrc == MATCH_PRUNE || rrc == MATCH_COMMIT)
1403          {          {
# Line 1257  for (;;) Line 1411  for (;;)
1411        }        }
1412      while (*ecode == OP_ALT);      while (*ecode == OP_ALT);
1413    
1414      if ((flags & match_condassert) != 0) RRETURN(MATCH_MATCH);      if (condassert) RRETURN(MATCH_MATCH);  /* Condition assertion */
1415    
1416      ecode += 1 + LINK_SIZE;      ecode += 1 + LINK_SIZE;
1417      continue;      continue;
1418    
# Line 1371  for (;;) Line 1525  for (;;)
1525        memcpy(new_recursive.offset_save, md->offset_vector,        memcpy(new_recursive.offset_save, md->offset_vector,
1526              new_recursive.saved_max * sizeof(int));              new_recursive.saved_max * sizeof(int));
1527        new_recursive.save_offset_top = offset_top;        new_recursive.save_offset_top = offset_top;
1528    
1529        /* OK, now we can do the recursion. For each top-level alternative we        /* OK, now we can do the recursion. For each top-level alternative we
1530        restore the offset and recursion data. */        restore the offset and recursion data. */
1531    
1532        DPRINTF(("Recursing into group %d\n", new_recursive.group_num));        DPRINTF(("Recursing into group %d\n", new_recursive.group_num));
1533        flags = (*callpat >= OP_SBRA)? match_cbegroup : 0;        cbegroup = (*callpat >= OP_SBRA);
1534        do        do
1535          {          {
1536            if (cbegroup) md->match_function_type = MATCH_CBEGROUP;
1537          RMATCH(eptr, callpat + _pcre_OP_lengths[*callpat], offset_top,          RMATCH(eptr, callpat + _pcre_OP_lengths[*callpat], offset_top,
1538            md, eptrb, flags, RM6);            md, eptrb, RM6);
1539          if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)          if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)
1540            {            {
1541            DPRINTF(("Recursion matched\n"));            DPRINTF(("Recursion matched\n"));
# Line 1427  for (;;) Line 1582  for (;;)
1582    
1583      do      do
1584        {        {
1585        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, 0, RM7);        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM7);
1586        if (rrc == MATCH_MATCH)  /* Note: _not_ MATCH_ACCEPT */        if (rrc == MATCH_MATCH)  /* Note: _not_ MATCH_ACCEPT */
1587          {          {
1588          mstart = md->start_match_ptr;          mstart = md->start_match_ptr;
# Line 1470  for (;;) Line 1625  for (;;)
1625    
1626      if (*ecode == OP_KETRMIN)      if (*ecode == OP_KETRMIN)
1627        {        {
1628        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, 0, RM8);        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM8);
1629        if (rrc != MATCH_NOMATCH) RRETURN(rrc);        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1630        ecode = prev;        ecode = prev;
       flags = 0;  
1631        goto TAIL_RECURSE;        goto TAIL_RECURSE;
1632        }        }
1633      else  /* OP_KETRMAX */      else  /* OP_KETRMAX */
1634        {        {
1635        RMATCH(eptr, prev, offset_top, md, eptrb, match_cbegroup, RM9);        md->match_function_type = MATCH_CBEGROUP;
1636          RMATCH(eptr, prev, offset_top, md, eptrb, RM9);
1637        if (rrc != MATCH_NOMATCH) RRETURN(rrc);        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1638        ecode += 1 + LINK_SIZE;        ecode += 1 + LINK_SIZE;
       flags = 0;  
1639        goto TAIL_RECURSE;        goto TAIL_RECURSE;
1640        }        }
1641      /* Control never gets here */      /* Control never gets here */
# Line 1498  for (;;) Line 1652  for (;;)
1652      at all - i.e. it could be ()* or ()? or even (){0} in the pattern. Brackets      at all - i.e. it could be ()* or ()? or even (){0} in the pattern. Brackets
1653      with fixed upper repeat limits are compiled as a number of copies, with the      with fixed upper repeat limits are compiled as a number of copies, with the
1654      optional ones preceded by BRAZERO or BRAMINZERO. */      optional ones preceded by BRAZERO or BRAMINZERO. */
1655    
1656      case OP_BRAZERO:      case OP_BRAZERO:
1657        {      next = ecode + 1;
1658        next = ecode+1;      RMATCH(eptr, next, offset_top, md, eptrb, RM10);
1659        RMATCH(eptr, next, offset_top, md, eptrb, 0, RM10);      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1660        if (rrc != MATCH_NOMATCH) RRETURN(rrc);      do next += GET(next, 1); while (*next == OP_ALT);
1661        do next += GET(next,1); while (*next == OP_ALT);      ecode = next + 1 + LINK_SIZE;
       ecode = next + 1 + LINK_SIZE;  
       }  
1662      break;      break;
1663    
1664      case OP_BRAMINZERO:      case OP_BRAMINZERO:
1665        {      next = ecode + 1;
1666        next = ecode+1;      do next += GET(next, 1); while (*next == OP_ALT);
1667        do next += GET(next, 1); while (*next == OP_ALT);      RMATCH(eptr, next + 1+LINK_SIZE, offset_top, md, eptrb, RM11);
1668        RMATCH(eptr, next + 1+LINK_SIZE, offset_top, md, eptrb, 0, RM11);      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1669        if (rrc != MATCH_NOMATCH) RRETURN(rrc);      ecode++;
       ecode++;  
       }  
1670      break;      break;
1671    
1672      case OP_SKIPZERO:      case OP_SKIPZERO:
1673        {      next = ecode+1;
1674        next = ecode+1;      do next += GET(next,1); while (*next == OP_ALT);
1675        do next += GET(next,1); while (*next == OP_ALT);      ecode = next + 1 + LINK_SIZE;
       ecode = next + 1 + LINK_SIZE;  
       }  
1676      break;      break;
1677    
1678        /* BRAPOSZERO occurs before a possessive bracket group. Don't do anything
1679        here; just jump to the group, with allow_zero set TRUE. */
1680    
1681        case OP_BRAPOSZERO:
1682        op = *(++ecode);
1683        allow_zero = TRUE;
1684        if (op == OP_CBRAPOS || op == OP_SCBRAPOS) goto POSSESSIVE_CAPTURE;
1685          goto POSSESSIVE_NON_CAPTURE;
1686    
1687      /* End of a group, repeated or non-repeating. */      /* End of a group, repeated or non-repeating. */
1688    
1689      case OP_KET:      case OP_KET:
1690      case OP_KETRMIN:      case OP_KETRMIN:
1691      case OP_KETRMAX:      case OP_KETRMAX:
1692        case OP_KETRPOS:
1693      prev = ecode - GET(ecode, 1);      prev = ecode - GET(ecode, 1);
1694    
1695      /* If this was a group that remembered the subject start, in order to break      /* If this was a group that remembered the subject start, in order to break
# Line 1566  for (;;) Line 1724  for (;;)
1724      a recurse into group 0, so it won't be picked up here. Instead, we catch it      a recurse into group 0, so it won't be picked up here. Instead, we catch it
1725      when the OP_END is reached. Other recursion is handled here. */      when the OP_END is reached. Other recursion is handled here. */
1726    
1727      if (*prev == OP_CBRA || *prev == OP_SCBRA)      if (*prev == OP_CBRA || *prev == OP_SCBRA ||
1728            *prev == OP_CBRAPOS || *prev == OP_SCBRAPOS)
1729        {        {
1730        number = GET2(prev, 1+LINK_SIZE);        number = GET2(prev, 1+LINK_SIZE);
1731        offset = number << 1;        offset = number << 1;
# Line 1612  for (;;) Line 1771  for (;;)
1771        ecode += 1 + LINK_SIZE;        ecode += 1 + LINK_SIZE;
1772        break;        break;
1773        }        }
1774    
1775      /* The repeating kets try the rest of the pattern or restart from the      /* OP_KETRPOS is a possessive repeating ket. Remember the current position,
1776      preceding bracket, in the appropriate order. In the second case, we can use      and return the MATCH_KETRPOS. This makes it possible to do the repeats one
1777      tail recursion to avoid using another stack frame, unless we have an      at a time from the outer level, thus saving stack. */
1778    
1779        if (*ecode == OP_KETRPOS)
1780          {
1781          md->end_match_ptr = eptr;
1782          md->end_offset_top = offset_top;
1783          RRETURN(MATCH_KETRPOS);
1784          }
1785    
1786        /* The normal repeating kets try the rest of the pattern or restart from
1787        the preceding bracket, in the appropriate order. In the second case, we can
1788        use tail recursion to avoid using another stack frame, unless we have an
1789      unlimited repeat of a group that can match an empty string. */      unlimited repeat of a group that can match an empty string. */
1790    
     flags = (*prev >= OP_SBRA)? match_cbegroup : 0;  
   
1791      if (*ecode == OP_KETRMIN)      if (*ecode == OP_KETRMIN)
1792        {        {
1793        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, 0, RM12);        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM12);
1794        if (rrc != MATCH_NOMATCH) RRETURN(rrc);        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1795        if (flags != 0)    /* Could match an empty string */        if (*prev >= OP_SBRA)    /* Could match an empty string */
1796          {          {
1797          RMATCH(eptr, prev, offset_top, md, eptrb, flags, RM50);          md->match_function_type = MATCH_CBEGROUP;
1798            RMATCH(eptr, prev, offset_top, md, eptrb, RM50);
1799          RRETURN(rrc);          RRETURN(rrc);
1800          }          }
1801        ecode = prev;        ecode = prev;
# Line 1634  for (;;) Line 1803  for (;;)
1803        }        }
1804      else  /* OP_KETRMAX */      else  /* OP_KETRMAX */
1805        {        {
1806        RMATCH(eptr, prev, offset_top, md, eptrb, flags, RM13);        if (*prev >= OP_SBRA) md->match_function_type = MATCH_CBEGROUP;
1807          RMATCH(eptr, prev, offset_top, md, eptrb, RM13);
1808        if (rrc != MATCH_NOMATCH) RRETURN(rrc);        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1809        ecode += 1 + LINK_SIZE;        ecode += 1 + LINK_SIZE;
       flags = 0;  
1810        goto TAIL_RECURSE;        goto TAIL_RECURSE;
1811        }        }
1812      /* Control never gets here */      /* Control never gets here */
# Line 2324  for (;;) Line 2493  for (;;)
2493        for (fi = min;; fi++)        for (fi = min;; fi++)
2494          {          {
2495          int slength;          int slength;
2496          RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM14);          RMATCH(eptr, ecode, offset_top, md, eptrb, RM14);
2497          if (rrc != MATCH_NOMATCH) RRETURN(rrc);          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2498          if (fi >= max) MRRETURN(MATCH_NOMATCH);          if (fi >= max) MRRETURN(MATCH_NOMATCH);
2499          if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)          if ((slength = match_ref(offset, eptr, length, md, caseless)) < 0)
# Line 2354  for (;;) Line 2523  for (;;)
2523          }          }
2524        while (eptr >= pp)        while (eptr >= pp)
2525          {          {
2526          RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM15);          RMATCH(eptr, ecode, offset_top, md, eptrb, RM15);
2527          if (rrc != MATCH_NOMATCH) RRETURN(rrc);          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2528          eptr -= length;          eptr -= length;
2529          }          }
# Line 2464  for (;;) Line 2633  for (;;)
2633            {            {
2634            for (fi = min;; fi++)            for (fi = min;; fi++)
2635              {              {
2636              RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM16);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM16);
2637              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2638              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
2639              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 2489  for (;;) Line 2658  for (;;)
2658            {            {
2659            for (fi = min;; fi++)            for (fi = min;; fi++)
2660              {              {
2661              RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM17);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM17);
2662              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2663              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
2664              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 2535  for (;;) Line 2704  for (;;)
2704              }              }
2705            for (;;)            for (;;)
2706              {              {
2707              RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM18);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM18);
2708              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2709              if (eptr-- == pp) break;        /* Stop if tried at original pos */              if (eptr-- == pp) break;        /* Stop if tried at original pos */
2710              BACKCHAR(eptr);              BACKCHAR(eptr);
# Line 2558  for (;;) Line 2727  for (;;)
2727              }              }
2728            while (eptr >= pp)            while (eptr >= pp)
2729              {              {
2730              RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM19);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM19);
2731              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2732              eptr--;              eptr--;
2733              }              }
# Line 2634  for (;;) Line 2803  for (;;)
2803          {          {
2804          for (fi = min;; fi++)          for (fi = min;; fi++)
2805            {            {
2806            RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM20);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM20);
2807            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2808            if (fi >= max) MRRETURN(MATCH_NOMATCH);            if (fi >= max) MRRETURN(MATCH_NOMATCH);
2809            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
# Line 2667  for (;;) Line 2836  for (;;)
2836            }            }
2837          for(;;)          for(;;)
2838            {            {
2839            RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM21);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM21);
2840            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2841            if (eptr-- == pp) break;        /* Stop if tried at original pos */            if (eptr-- == pp) break;        /* Stop if tried at original pos */
2842            if (utf8) BACKCHAR(eptr);            if (utf8) BACKCHAR(eptr);
# Line 2880  for (;;) Line 3049  for (;;)
3049            {            {
3050            for (fi = min;; fi++)            for (fi = min;; fi++)
3051              {              {
3052              RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM22);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM22);
3053              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3054              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
3055              if (eptr <= md->end_subject - length &&              if (eptr <= md->end_subject - length &&
# Line 2922  for (;;) Line 3091  for (;;)
3091    
3092            for(;;)            for(;;)
3093              {              {
3094              RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM23);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM23);
3095              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3096              if (eptr == pp) { MRRETURN(MATCH_NOMATCH); }              if (eptr == pp) { MRRETURN(MATCH_NOMATCH); }
3097  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
# Line 2976  for (;;) Line 3145  for (;;)
3145          {          {
3146          for (fi = min;; fi++)          for (fi = min;; fi++)
3147            {            {
3148            RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM24);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM24);
3149            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3150            if (fi >= max) MRRETURN(MATCH_NOMATCH);            if (fi >= max) MRRETURN(MATCH_NOMATCH);
3151            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
# Line 3006  for (;;) Line 3175  for (;;)
3175    
3176          while (eptr >= pp)          while (eptr >= pp)
3177            {            {
3178            RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM25);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM25);
3179            eptr--;            eptr--;
3180            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3181            }            }
# Line 3035  for (;;) Line 3204  for (;;)
3204          {          {
3205          for (fi = min;; fi++)          for (fi = min;; fi++)
3206            {            {
3207            RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM26);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM26);
3208            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3209            if (fi >= max) MRRETURN(MATCH_NOMATCH);            if (fi >= max) MRRETURN(MATCH_NOMATCH);
3210            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
# Line 3064  for (;;) Line 3233  for (;;)
3233    
3234          while (eptr >= pp)          while (eptr >= pp)
3235            {            {
3236            RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM27);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM27);
3237            eptr--;            eptr--;
3238            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3239            }            }
# Line 3236  for (;;) Line 3405  for (;;)
3405            register unsigned int d;            register unsigned int d;
3406            for (fi = min;; fi++)            for (fi = min;; fi++)
3407              {              {
3408              RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM28);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM28);
3409              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3410              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
3411              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 3255  for (;;) Line 3424  for (;;)
3424            {            {
3425            for (fi = min;; fi++)            for (fi = min;; fi++)
3426              {              {
3427              RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM29);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM29);
3428              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3429              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
3430              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 3296  for (;;) Line 3465  for (;;)
3465          if (possessive) continue;          if (possessive) continue;
3466          for(;;)          for(;;)
3467              {              {
3468              RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM30);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM30);
3469              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3470              if (eptr-- == pp) break;        /* Stop if tried at original pos */              if (eptr-- == pp) break;        /* Stop if tried at original pos */
3471              BACKCHAR(eptr);              BACKCHAR(eptr);
# Line 3319  for (;;) Line 3488  for (;;)
3488            if (possessive) continue;            if (possessive) continue;
3489            while (eptr >= pp)            while (eptr >= pp)
3490              {              {
3491              RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM31);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM31);
3492              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3493              eptr--;              eptr--;
3494              }              }
# Line 3376  for (;;) Line 3545  for (;;)
3545            register unsigned int d;            register unsigned int d;
3546            for (fi = min;; fi++)            for (fi = min;; fi++)
3547              {              {
3548              RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM32);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM32);
3549              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3550              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
3551              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 3394  for (;;) Line 3563  for (;;)
3563            {            {
3564            for (fi = min;; fi++)            for (fi = min;; fi++)
3565              {              {
3566              RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM33);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM33);
3567              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3568              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
3569              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 3434  for (;;) Line 3603  for (;;)
3603            if (possessive) continue;            if (possessive) continue;
3604            for(;;)            for(;;)
3605              {              {
3606              RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM34);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM34);
3607              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3608              if (eptr-- == pp) break;        /* Stop if tried at original pos */              if (eptr-- == pp) break;        /* Stop if tried at original pos */
3609              BACKCHAR(eptr);              BACKCHAR(eptr);
# Line 3457  for (;;) Line 3626  for (;;)
3626            if (possessive) continue;            if (possessive) continue;
3627            while (eptr >= pp)            while (eptr >= pp)
3628              {              {
3629              RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM35);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM35);
3630              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3631              eptr--;              eptr--;
3632              }              }
# Line 4255  for (;;) Line 4424  for (;;)
4424            case PT_ANY:            case PT_ANY:
4425            for (fi = min;; fi++)            for (fi = min;; fi++)
4426              {              {
4427              RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM36);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM36);
4428              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4429              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
4430              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 4271  for (;;) Line 4440  for (;;)
4440            case PT_LAMP:            case PT_LAMP:
4441            for (fi = min;; fi++)            for (fi = min;; fi++)
4442              {              {
4443              RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM37);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM37);
4444              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4445              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
4446              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 4291  for (;;) Line 4460  for (;;)
4460            case PT_GC:            case PT_GC:
4461            for (fi = min;; fi++)            for (fi = min;; fi++)
4462              {              {
4463              RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM38);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM38);
4464              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4465              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
4466              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 4309  for (;;) Line 4478  for (;;)
4478            case PT_PC:            case PT_PC:
4479            for (fi = min;; fi++)            for (fi = min;; fi++)
4480              {              {
4481              RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM39);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM39);
4482              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4483              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
4484              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 4327  for (;;) Line 4496  for (;;)
4496            case PT_SC:            case PT_SC:
4497            for (fi = min;; fi++)            for (fi = min;; fi++)
4498              {              {
4499              RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM40);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM40);
4500              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4501              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
4502              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 4345  for (;;) Line 4514  for (;;)
4514            case PT_ALNUM:            case PT_ALNUM:
4515            for (fi = min;; fi++)            for (fi = min;; fi++)
4516              {              {
4517              RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM59);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM59);
4518              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4519              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
4520              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 4364  for (;;) Line 4533  for (;;)
4533            case PT_SPACE:    /* Perl space */            case PT_SPACE:    /* Perl space */
4534            for (fi = min;; fi++)            for (fi = min;; fi++)
4535              {              {
4536              RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM60);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM60);
4537              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4538              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
4539              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 4384  for (;;) Line 4553  for (;;)
4553            case PT_PXSPACE:  /* POSIX space */            case PT_PXSPACE:  /* POSIX space */
4554            for (fi = min;; fi++)            for (fi = min;; fi++)
4555              {              {
4556              RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM61);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM61);
4557              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4558              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
4559              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 4404  for (;;) Line 4573  for (;;)
4573            case PT_WORD:            case PT_WORD:
4574            for (fi = min;; fi++)            for (fi = min;; fi++)
4575              {              {
4576              RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM62);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM62);
4577              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4578              if (fi >= max) MRRETURN(MATCH_NOMATCH);              if (fi >= max) MRRETURN(MATCH_NOMATCH);
4579              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 4436  for (;;) Line 4605  for (;;)
4605          {          {
4606          for (fi = min;; fi++)          for (fi = min;; fi++)
4607            {            {
4608            RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM41);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM41);
4609            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4610            if (fi >= max) MRRETURN(MATCH_NOMATCH);            if (fi >= max) MRRETURN(MATCH_NOMATCH);
4611            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
# Line 4468  for (;;) Line 4637  for (;;)
4637          {          {
4638          for (fi = min;; fi++)          for (fi = min;; fi++)
4639            {            {
4640            RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM42);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM42);
4641            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4642            if (fi >= max) MRRETURN(MATCH_NOMATCH);            if (fi >= max) MRRETURN(MATCH_NOMATCH);
4643            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
# Line 4631  for (;;) Line 4800  for (;;)
4800          {          {
4801          for (fi = min;; fi++)          for (fi = min;; fi++)
4802            {            {
4803            RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM43);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM43);
4804            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
4805            if (fi >= max) MRRETURN(MATCH_NOMATCH);            if (fi >= max) MRRETURN(MATCH_NOMATCH);
4806            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
# Line 4929  for (;;) Line 5098  for (;;)
5098          if (possessive) continue;          if (possessive) continue;
5099          for(;;)          for(;;)
5100            {            {
5101            RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM44);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM44);
5102            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
5103            if (eptr-- == pp) break;        /* Stop if tried at original pos */            if (eptr-- == pp) break;        /* Stop if tried at original pos */
5104            if (utf8) BACKCHAR(eptr);            if (utf8) BACKCHAR(eptr);
# Line 4970  for (;;) Line 5139  for (;;)
5139    
5140          for(;;)          for(;;)
5141            {            {
5142            RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM45);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM45);
5143            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
5144            if (eptr-- == pp) break;        /* Stop if tried at original pos */            if (eptr-- == pp) break;        /* Stop if tried at original pos */
5145            for (;;)                        /* Move back over one extended */            for (;;)                        /* Move back over one extended */
# Line 5263  for (;;) Line 5432  for (;;)
5432          if (possessive) continue;          if (possessive) continue;
5433          for(;;)          for(;;)
5434            {            {
5435            RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM46);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM46);
5436            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
5437            if (eptr-- == pp) break;        /* Stop if tried at original pos */            if (eptr-- == pp) break;        /* Stop if tried at original pos */
5438            BACKCHAR(eptr);            BACKCHAR(eptr);
# Line 5476  for (;;) Line 5645  for (;;)
5645          if (possessive) continue;          if (possessive) continue;
5646          while (eptr >= pp)          while (eptr >= pp)
5647            {            {
5648            RMATCH(eptr, ecode, offset_top, md, eptrb, 0, RM47);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM47);
5649            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
5650            eptr--;            eptr--;
5651            if (ctype == OP_ANYNL && eptr > pp  && *eptr == '\n' &&            if (ctype == OP_ANYNL && eptr > pp  && *eptr == '\n' &&
# Line 5519  switch (frame->Xwhere) Line 5688  switch (frame->Xwhere)
5688    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)
5689    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)
5690    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)
5691    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)
5692  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
5693    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)
5694    LBL(32) LBL(34) LBL(42) LBL(46)    LBL(32) LBL(34) LBL(42) LBL(46)
# Line 5817  if (md->partial && (re->flags & PCRE_NOP Line 5986  if (md->partial && (re->flags & PCRE_NOP
5986    return PCRE_ERROR_BADPARTIAL;    return PCRE_ERROR_BADPARTIAL;
5987    
5988  /* Check a UTF-8 string if required. Pass back the character offset and error  /* Check a UTF-8 string if required. Pass back the character offset and error
5989  code if a results vector is available. */  code for an invalid string if a results vector is available. */
5990    
5991  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
5992  if (utf8 && (options & PCRE_NO_UTF8_CHECK) == 0)  if (utf8 && (options & PCRE_NO_UTF8_CHECK) == 0)
5993    {    {
5994    int errorcode;    int erroroffset;
5995    int tb = _pcre_valid_utf8((USPTR)subject, length, &errorcode);    int errorcode = _pcre_valid_utf8((USPTR)subject, length, &erroroffset);
5996    if (tb >= 0)    if (errorcode != 0)
5997      {      {
5998      if (offsetcount >= 2)      if (offsetcount >= 2)
5999        {        {
6000        offsets[0] = tb;        offsets[0] = erroroffset;
6001        offsets[1] = errorcode;        offsets[1] = errorcode;
6002        }        }
6003      return (errorcode <= PCRE_UTF8_ERR5 && md->partial > 1)?      return (errorcode <= PCRE_UTF8_ERR5 && md->partial > 1)?
6004        PCRE_ERROR_SHORTUTF8 : PCRE_ERROR_BADUTF8;        PCRE_ERROR_SHORTUTF8 : PCRE_ERROR_BADUTF8;
6005      }      }
6006    if (start_offset > 0 && start_offset < length)  
6007      {    /* Check that a start_offset points to the start of a UTF-8 character. */
6008      tb = ((USPTR)subject)[start_offset] & 0xc0;  
6009      if (tb == 0x80) return PCRE_ERROR_BADUTF8_OFFSET;    if (start_offset > 0 && start_offset < length &&
6010      }        (((USPTR)subject)[start_offset] & 0xc0) == 0x80)
6011        return PCRE_ERROR_BADUTF8_OFFSET;
6012    }    }
6013  #endif  #endif
6014    
# Line 6120  for(;;) Line 6290  for(;;)
6290    md->start_match_ptr = start_match;    md->start_match_ptr = start_match;
6291    md->start_used_ptr = start_match;    md->start_used_ptr = start_match;
6292    md->match_call_count = 0;    md->match_call_count = 0;
6293    rc = match(start_match, md->start_code, start_match, NULL, 2, md, NULL,    md->match_function_type = 0;
6294      0, 0);    rc = match(start_match, md->start_code, start_match, NULL, 2, md, NULL, 0);
6295    if (md->hitend && start_partial == NULL) start_partial = md->start_used_ptr;    if (md->hitend && start_partial == NULL) start_partial = md->start_used_ptr;
6296    
6297    switch(rc)    switch(rc)
# Line 6244  if (rc == MATCH_MATCH || rc == MATCH_ACC Line 6414  if (rc == MATCH_MATCH || rc == MATCH_ACC
6414    
6415    /* Set the return code to the number of captured strings, or 0 if there are    /* Set the return code to the number of captured strings, or 0 if there are
6416    too many to fit into the vector. */    too many to fit into the vector. */
6417    
6418    rc = md->offset_overflow? 0 : md->end_offset_top/2;    rc = md->offset_overflow? 0 : md->end_offset_top/2;
6419    
6420    /* If there is space, set up the whole thing as substring 0. The value of    /* If there is space, set up the whole thing as substring 0. The value of

Legend:
Removed from v.602  
changed lines
  Added in v.609

  ViewVC Help
Powered by ViewVC 1.1.5