/[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 231 by ph10, Tue Sep 11 11:15:33 2007 UTC revision 400 by ph10, Sat Mar 21 16:59:40 2009 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-2007 University of Cambridge             Copyright (c) 1997-2009 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 43  pattern matching using an NFA algorithm, Line 43  pattern matching using an NFA algorithm,
43  possible. There are also some static supporting functions. */  possible. There are also some static supporting functions. */
44    
45  #ifdef HAVE_CONFIG_H  #ifdef HAVE_CONFIG_H
46  #include <config.h>  #include "config.h"
47  #endif  #endif
48    
49  #define NLBLOCK md             /* Block containing newline information */  #define NLBLOCK md             /* Block containing newline information */
# Line 158  printf("\n"); Line 158  printf("\n");
158    
159  if (length > md->end_subject - eptr) return FALSE;  if (length > md->end_subject - eptr) return FALSE;
160    
161  /* Separate the caselesss case for speed */  /* Separate the caseless case for speed. In UTF-8 mode we can only do this
162    properly if Unicode properties are supported. Otherwise, we can check only
163    ASCII characters. */
164    
165  if ((ims & PCRE_CASELESS) != 0)  if ((ims & PCRE_CASELESS) != 0)
166    {    {
167    #ifdef SUPPORT_UTF8
168    #ifdef SUPPORT_UCP
169      if (md->utf8)
170        {
171        USPTR endptr = eptr + length;
172        while (eptr < endptr)
173          {
174          int c, d;
175          GETCHARINC(c, eptr);
176          GETCHARINC(d, p);
177          if (c != d && c != UCD_OTHERCASE(d)) return FALSE;
178          }
179        }
180      else
181    #endif
182    #endif
183    
184      /* The same code works when not in UTF-8 mode and in UTF-8 mode when there
185      is no UCP support. */
186    
187    while (length-- > 0)    while (length-- > 0)
188      if (md->lcc[*p++] != md->lcc[*eptr++]) return FALSE;      { if (md->lcc[*p++] != md->lcc[*eptr++]) return FALSE; }
189    }    }
190    
191    /* In the caseful case, we can just compare the bytes, whether or not we
192    are in UTF-8 mode. */
193    
194  else  else
195    { while (length-- > 0) if (*p++ != *eptr++) return FALSE; }    { while (length-- > 0) if (*p++ != *eptr++) return FALSE; }
196    
# Line 535  int oclength; Line 561  int oclength;
561  uschar occhars[8];  uschar occhars[8];
562  #endif  #endif
563    
564    int codelink;
565    int condcode;
566  int ctype;  int ctype;
567  int length;  int length;
568  int max;  int max;
# Line 609  for (;;) Line 637  for (;;)
637    {    {
638    minimize = possessive = FALSE;    minimize = possessive = FALSE;
639    op = *ecode;    op = *ecode;
640    
641    /* For partial matching, remember if we ever hit the end of the subject after    /* For partial matching, remember if we ever hit the end of the subject after
642    matching at least one subject character. */    matching at least one subject character. */
643    
# Line 761  for (;;) Line 789  for (;;)
789    
790      case OP_COND:      case OP_COND:
791      case OP_SCOND:      case OP_SCOND:
792      if (ecode[LINK_SIZE+1] == OP_RREF)         /* Recursion test */      codelink= GET(ecode, 1);
793    
794        /* Because of the way auto-callout works during compile, a callout item is
795        inserted between OP_COND and an assertion condition. */
796    
797        if (ecode[LINK_SIZE+1] == OP_CALLOUT)
798          {
799          if (pcre_callout != NULL)
800            {
801            pcre_callout_block cb;
802            cb.version          = 1;   /* Version 1 of the callout block */
803            cb.callout_number   = ecode[LINK_SIZE+2];
804            cb.offset_vector    = md->offset_vector;
805            cb.subject          = (PCRE_SPTR)md->start_subject;
806            cb.subject_length   = md->end_subject - md->start_subject;
807            cb.start_match      = mstart - md->start_subject;
808            cb.current_position = eptr - md->start_subject;
809            cb.pattern_position = GET(ecode, LINK_SIZE + 3);
810            cb.next_item_length = GET(ecode, 3 + 2*LINK_SIZE);
811            cb.capture_top      = offset_top/2;
812            cb.capture_last     = md->capture_last;
813            cb.callout_data     = md->callout_data;
814            if ((rrc = (*pcre_callout)(&cb)) > 0) RRETURN(MATCH_NOMATCH);
815            if (rrc < 0) RRETURN(rrc);
816            }
817          ecode += _pcre_OP_lengths[OP_CALLOUT];
818          }
819    
820        condcode = ecode[LINK_SIZE+1];
821    
822        /* Now see what the actual condition is */
823    
824        if (condcode == OP_RREF)         /* Recursion test */
825        {        {
826        offset = GET2(ecode, LINK_SIZE + 2);     /* Recursion group number*/        offset = GET2(ecode, LINK_SIZE + 2);     /* Recursion group number*/
827        condition = md->recursive != NULL &&        condition = md->recursive != NULL &&
# Line 769  for (;;) Line 829  for (;;)
829        ecode += condition? 3 : GET(ecode, 1);        ecode += condition? 3 : GET(ecode, 1);
830        }        }
831    
832      else if (ecode[LINK_SIZE+1] == OP_CREF)    /* Group used test */      else if (condcode == OP_CREF)    /* Group used test */
833        {        {
834        offset = GET2(ecode, LINK_SIZE+2) << 1;  /* Doubled ref number */        offset = GET2(ecode, LINK_SIZE+2) << 1;  /* Doubled ref number */
835        condition = offset < offset_top && md->offset_vector[offset] >= 0;        condition = offset < offset_top && md->offset_vector[offset] >= 0;
836        ecode += condition? 3 : GET(ecode, 1);        ecode += condition? 3 : GET(ecode, 1);
837        }        }
838    
839      else if (ecode[LINK_SIZE+1] == OP_DEF)     /* DEFINE - always false */      else if (condcode == OP_DEF)     /* DEFINE - always false */
840        {        {
841        condition = FALSE;        condition = FALSE;
842        ecode += GET(ecode, 1);        ecode += GET(ecode, 1);
# Line 803  for (;;) Line 863  for (;;)
863        else        else
864          {          {
865          condition = FALSE;          condition = FALSE;
866          ecode += GET(ecode, 1);          ecode += codelink;
867          }          }
868        }        }
869    
# Line 826  for (;;) Line 886  for (;;)
886          goto TAIL_RECURSE;          goto TAIL_RECURSE;
887          }          }
888        }        }
889      else                         /* Condition false & no 2nd alternative */      else                         /* Condition false & no alternative */
890        {        {
891        ecode += 1 + LINK_SIZE;        ecode += 1 + LINK_SIZE;
892        }        }
# Line 1049  for (;;) Line 1109  for (;;)
1109          else if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN)          else if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN)
1110            {            {
1111            DPRINTF(("Recursion gave error %d\n", rrc));            DPRINTF(("Recursion gave error %d\n", rrc));
1112              if (new_recursive.offset_save != stacksave)
1113                (pcre_free)(new_recursive.offset_save);
1114            RRETURN(rrc);            RRETURN(rrc);
1115            }            }
1116    
# Line 1148  for (;;) Line 1210  for (;;)
1210      do ecode += GET(ecode,1); while (*ecode == OP_ALT);      do ecode += GET(ecode,1); while (*ecode == OP_ALT);
1211      break;      break;
1212    
1213      /* BRAZERO and BRAMINZERO occur just before a bracket group, indicating      /* BRAZERO, BRAMINZERO and SKIPZERO occur just before a bracket group,
1214      that it may occur zero times. It may repeat infinitely, or not at all -      indicating that it may occur zero times. It may repeat infinitely, or not
1215      i.e. it could be ()* or ()? in the pattern. Brackets with fixed upper      at all - i.e. it could be ()* or ()? or even (){0} in the pattern. Brackets
1216      repeat limits are compiled as a number of copies, with the optional ones      with fixed upper repeat limits are compiled as a number of copies, with the
1217      preceded by BRAZERO or BRAMINZERO. */      optional ones preceded by BRAZERO or BRAMINZERO. */
1218    
1219      case OP_BRAZERO:      case OP_BRAZERO:
1220        {        {
# Line 1174  for (;;) Line 1236  for (;;)
1236        }        }
1237      break;      break;
1238    
1239        case OP_SKIPZERO:
1240          {
1241          next = ecode+1;
1242          do next += GET(next,1); while (*next == OP_ALT);
1243          ecode = next + 1 + LINK_SIZE;
1244          }
1245        break;
1246    
1247      /* End of a group, repeated or non-repeating. */      /* End of a group, repeated or non-repeating. */
1248    
1249      case OP_KET:      case OP_KET:
# Line 1421  for (;;) Line 1491  for (;;)
1491      /* Match a single character type; inline for speed */      /* Match a single character type; inline for speed */
1492    
1493      case OP_ANY:      case OP_ANY:
1494      if ((ims & PCRE_DOTALL) == 0)      if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);
1495        {      /* Fall through */
1496        if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);  
1497        }      case OP_ALLANY:
1498      if (eptr++ >= md->end_subject) RRETURN(MATCH_NOMATCH);      if (eptr++ >= md->end_subject) RRETURN(MATCH_NOMATCH);
1499      if (utf8)      if (utf8) while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
       while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;  
1500      ecode++;      ecode++;
1501      break;      break;
1502    
# Line 1646  for (;;) Line 1715  for (;;)
1715      if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);      if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
1716      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
1717        {        {
1718        int chartype, script;        const ucd_record *prop = GET_UCD(c);
       int category = _pcre_ucp_findprop(c, &chartype, &script);  
1719    
1720        switch(ecode[1])        switch(ecode[1])
1721          {          {
# Line 1656  for (;;) Line 1724  for (;;)
1724          break;          break;
1725    
1726          case PT_LAMP:          case PT_LAMP:
1727          if ((chartype == ucp_Lu ||          if ((prop->chartype == ucp_Lu ||
1728               chartype == ucp_Ll ||               prop->chartype == ucp_Ll ||
1729               chartype == ucp_Lt) == (op == OP_NOTPROP))               prop->chartype == ucp_Lt) == (op == OP_NOTPROP))
1730            RRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
1731           break;           break;
1732    
1733          case PT_GC:          case PT_GC:
1734          if ((ecode[2] != category) == (op == OP_PROP))          if ((ecode[2] != _pcre_ucp_gentype[prop->chartype]) == (op == OP_PROP))
1735            RRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
1736          break;          break;
1737    
1738          case PT_PC:          case PT_PC:
1739          if ((ecode[2] != chartype) == (op == OP_PROP))          if ((ecode[2] != prop->chartype) == (op == OP_PROP))
1740            RRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
1741          break;          break;
1742    
1743          case PT_SC:          case PT_SC:
1744          if ((ecode[2] != script) == (op == OP_PROP))          if ((ecode[2] != prop->script) == (op == OP_PROP))
1745            RRETURN(MATCH_NOMATCH);            RRETURN(MATCH_NOMATCH);
1746          break;          break;
1747    
# Line 1692  for (;;) Line 1760  for (;;)
1760      if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);      if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
1761      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
1762        {        {
1763        int chartype, script;        int category = UCD_CATEGORY(c);
       int category = _pcre_ucp_findprop(c, &chartype, &script);  
1764        if (category == ucp_M) RRETURN(MATCH_NOMATCH);        if (category == ucp_M) RRETURN(MATCH_NOMATCH);
1765        while (eptr < md->end_subject)        while (eptr < md->end_subject)
1766          {          {
# Line 1702  for (;;) Line 1769  for (;;)
1769            {            {
1770            GETCHARLEN(c, eptr, len);            GETCHARLEN(c, eptr, len);
1771            }            }
1772          category = _pcre_ucp_findprop(c, &chartype, &script);          category = UCD_CATEGORY(c);
1773          if (category != ucp_M) break;          if (category != ucp_M) break;
1774          eptr += len;          eptr += len;
1775          }          }
# Line 1723  for (;;) Line 1790  for (;;)
1790      case OP_REF:      case OP_REF:
1791        {        {
1792        offset = GET2(ecode, 1) << 1;               /* Doubled ref number */        offset = GET2(ecode, 1) << 1;               /* Doubled ref number */
1793        ecode += 3;                                 /* Advance past item */        ecode += 3;
1794    
1795          /* If the reference is unset, there are two possibilities:
1796    
1797        /* If the reference is unset, set the length to be longer than the amount        (a) In the default, Perl-compatible state, set the length to be longer
1798        of subject left; this ensures that every attempt at a match fails. We        than the amount of subject left; this ensures that every attempt at a
1799        can't just fail here, because of the possibility of quantifiers with zero        match fails. We can't just fail here, because of the possibility of
1800        minima. */        quantifiers with zero minima.
1801    
1802        length = (offset >= offset_top || md->offset_vector[offset] < 0)?        (b) If the JavaScript compatibility flag is set, set the length to zero
1803          md->end_subject - eptr + 1 :        so that the back reference matches an empty string.
1804          md->offset_vector[offset+1] - md->offset_vector[offset];  
1805          Otherwise, set the length to the length of what was matched by the
1806          referenced subpattern. */
1807    
1808          if (offset >= offset_top || md->offset_vector[offset] < 0)
1809            length = (md->jscript_compat)? 0 : md->end_subject - eptr + 1;
1810          else
1811            length = md->offset_vector[offset+1] - md->offset_vector[offset];
1812    
1813        /* Set up for repetition, or handle the non-repeated case */        /* Set up for repetition, or handle the non-repeated case */
1814    
# Line 2007  for (;;) Line 2083  for (;;)
2083    
2084    
2085      /* Match an extended character class. This opcode is encountered only      /* Match an extended character class. This opcode is encountered only
2086      in UTF-8 mode, because that's the only time it is compiled. */      when UTF-8 mode mode is supported. Nevertheless, we may not be in UTF-8
2087        mode, because Unicode properties are supported in non-UTF-8 mode. */
2088    
2089  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
2090      case OP_XCLASS:      case OP_XCLASS:
# Line 2049  for (;;) Line 2126  for (;;)
2126        for (i = 1; i <= min; i++)        for (i = 1; i <= min; i++)
2127          {          {
2128          if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);          if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
2129          GETCHARINC(c, eptr);          GETCHARINCTEST(c, eptr);
2130          if (!_pcre_xclass(c, data)) RRETURN(MATCH_NOMATCH);          if (!_pcre_xclass(c, data)) RRETURN(MATCH_NOMATCH);
2131          }          }
2132    
# Line 2068  for (;;) Line 2145  for (;;)
2145            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM20);            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM20);
2146            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2147            if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);            if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
2148            GETCHARINC(c, eptr);            GETCHARINCTEST(c, eptr);
2149            if (!_pcre_xclass(c, data)) RRETURN(MATCH_NOMATCH);            if (!_pcre_xclass(c, data)) RRETURN(MATCH_NOMATCH);
2150            }            }
2151          /* Control never gets here */          /* Control never gets here */
# Line 2083  for (;;) Line 2160  for (;;)
2160            {            {
2161            int len = 1;            int len = 1;
2162            if (eptr >= md->end_subject) break;            if (eptr >= md->end_subject) break;
2163            GETCHARLEN(c, eptr, len);            GETCHARLENTEST(c, eptr, len);
2164            if (!_pcre_xclass(c, data)) break;            if (!_pcre_xclass(c, data)) break;
2165            eptr += len;            eptr += len;
2166            }            }
# Line 2158  for (;;) Line 2235  for (;;)
2235          if (fc != dc)          if (fc != dc)
2236            {            {
2237  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2238            if (dc != _pcre_ucp_othercase(fc))            if (dc != UCD_OTHERCASE(fc))
2239  #endif  #endif
2240              RRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
2241            }            }
# Line 2249  for (;;) Line 2326  for (;;)
2326  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2327          unsigned int othercase;          unsigned int othercase;
2328          if ((ims & PCRE_CASELESS) != 0 &&          if ((ims & PCRE_CASELESS) != 0 &&
2329              (othercase = _pcre_ucp_othercase(fc)) != NOTACHAR)              (othercase = UCD_OTHERCASE(fc)) != fc)
2330            oclength = _pcre_ord2utf8(othercase, occhars);            oclength = _pcre_ord2utf8(othercase, occhars);
2331          else oclength = 0;          else oclength = 0;
2332  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
# Line 2569  for (;;) Line 2646  for (;;)
2646              {              {
2647              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM28);              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM28);
2648              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2649                if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
2650              GETCHARINC(d, eptr);              GETCHARINC(d, eptr);
2651              if (d < 256) d = md->lcc[d];              if (d < 256) d = md->lcc[d];
2652              if (fi >= max || eptr >= md->end_subject || fc == d)              if (fc == d) RRETURN(MATCH_NOMATCH);
2653                RRETURN(MATCH_NOMATCH);  
2654              }              }
2655            }            }
2656          else          else
# Line 2678  for (;;) Line 2756  for (;;)
2756              {              {
2757              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM32);              RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM32);
2758              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2759                if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
2760              GETCHARINC(d, eptr);              GETCHARINC(d, eptr);
2761              if (fi >= max || eptr >= md->end_subject || fc == d)              if (fc == d) RRETURN(MATCH_NOMATCH);
               RRETURN(MATCH_NOMATCH);  
2762              }              }
2763            }            }
2764          else          else
# Line 2854  for (;;) Line 2932  for (;;)
2932              {              {
2933              if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);              if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
2934              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
2935              prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);              prop_chartype = UCD_CHARTYPE(c);
2936              if ((prop_chartype == ucp_Lu ||              if ((prop_chartype == ucp_Lu ||
2937                   prop_chartype == ucp_Ll ||                   prop_chartype == ucp_Ll ||
2938                   prop_chartype == ucp_Lt) == prop_fail_result)                   prop_chartype == ucp_Lt) == prop_fail_result)
# Line 2867  for (;;) Line 2945  for (;;)
2945              {              {
2946              if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);              if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
2947              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
2948              prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);              prop_category = UCD_CATEGORY(c);
2949              if ((prop_category == prop_value) == prop_fail_result)              if ((prop_category == prop_value) == prop_fail_result)
2950                RRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
2951              }              }
# Line 2878  for (;;) Line 2956  for (;;)
2956              {              {
2957              if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);              if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
2958              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
2959              prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);              prop_chartype = UCD_CHARTYPE(c);
2960              if ((prop_chartype == prop_value) == prop_fail_result)              if ((prop_chartype == prop_value) == prop_fail_result)
2961                RRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
2962              }              }
# Line 2889  for (;;) Line 2967  for (;;)
2967              {              {
2968              if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);              if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
2969              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
2970              prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);              prop_script = UCD_SCRIPT(c);
2971              if ((prop_script == prop_value) == prop_fail_result)              if ((prop_script == prop_value) == prop_fail_result)
2972                RRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
2973              }              }
# Line 2908  for (;;) Line 2986  for (;;)
2986          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
2987            {            {
2988            GETCHARINCTEST(c, eptr);            GETCHARINCTEST(c, eptr);
2989            prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);            prop_category = UCD_CATEGORY(c);
2990            if (prop_category == ucp_M) RRETURN(MATCH_NOMATCH);            if (prop_category == ucp_M) RRETURN(MATCH_NOMATCH);
2991            while (eptr < md->end_subject)            while (eptr < md->end_subject)
2992              {              {
# Line 2917  for (;;) Line 2995  for (;;)
2995                {                {
2996                GETCHARLEN(c, eptr, len);                GETCHARLEN(c, eptr, len);
2997                }                }
2998              prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);              prop_category = UCD_CATEGORY(c);
2999              if (prop_category != ucp_M) break;              if (prop_category != ucp_M) break;
3000              eptr += len;              eptr += len;
3001              }              }
# Line 2935  for (;;) Line 3013  for (;;)
3013          case OP_ANY:          case OP_ANY:
3014          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
3015            {            {
3016            if (eptr >= md->end_subject ||            if (eptr >= md->end_subject || IS_NEWLINE(eptr))
                ((ims & PCRE_DOTALL) == 0 && IS_NEWLINE(eptr)))  
3017              RRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3018            eptr++;            eptr++;
3019            while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;            while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
3020            }            }
3021          break;          break;
3022    
3023            case OP_ALLANY:
3024            for (i = 1; i <= min; i++)
3025              {
3026              if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
3027              eptr++;
3028              while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
3029              }
3030            break;
3031    
3032          case OP_ANYBYTE:          case OP_ANYBYTE:
3033          eptr += min;          eptr += min;
3034          break;          break;
# Line 3151  for (;;) Line 3237  for (;;)
3237        switch(ctype)        switch(ctype)
3238          {          {
3239          case OP_ANY:          case OP_ANY:
3240          if ((ims & PCRE_DOTALL) == 0)          for (i = 1; i <= min; i++)
3241            {            {
3242            for (i = 1; i <= min; i++)            if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);
3243              {            eptr++;
             if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);  
             eptr++;  
             }  
3244            }            }
3245          else eptr += min;          break;
3246    
3247            case OP_ALLANY:
3248            eptr += min;
3249          break;          break;
3250    
3251          case OP_ANYBYTE:          case OP_ANYBYTE:
# Line 3325  for (;;) Line 3411  for (;;)
3411              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3412              if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);              if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
3413              GETCHARINC(c, eptr);              GETCHARINC(c, eptr);
3414              prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);              prop_chartype = UCD_CHARTYPE(c);
3415              if ((prop_chartype == ucp_Lu ||              if ((prop_chartype == ucp_Lu ||
3416                   prop_chartype == ucp_Ll ||                   prop_chartype == ucp_Ll ||
3417                   prop_chartype == ucp_Lt) == prop_fail_result)                   prop_chartype == ucp_Lt) == prop_fail_result)
# Line 3340  for (;;) Line 3426  for (;;)
3426              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3427              if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);              if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
3428              GETCHARINC(c, eptr);              GETCHARINC(c, eptr);
3429              prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);              prop_category = UCD_CATEGORY(c);
3430              if ((prop_category == prop_value) == prop_fail_result)              if ((prop_category == prop_value) == prop_fail_result)
3431                RRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3432              }              }
# Line 3353  for (;;) Line 3439  for (;;)
3439              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3440              if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);              if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
3441              GETCHARINC(c, eptr);              GETCHARINC(c, eptr);
3442              prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);              prop_chartype = UCD_CHARTYPE(c);
3443              if ((prop_chartype == prop_value) == prop_fail_result)              if ((prop_chartype == prop_value) == prop_fail_result)
3444                RRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3445              }              }
# Line 3366  for (;;) Line 3452  for (;;)
3452              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3453              if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);              if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
3454              GETCHARINC(c, eptr);              GETCHARINC(c, eptr);
3455              prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);              prop_script = UCD_SCRIPT(c);
3456              if ((prop_script == prop_value) == prop_fail_result)              if ((prop_script == prop_value) == prop_fail_result)
3457                RRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
3458              }              }
# Line 3388  for (;;) Line 3474  for (;;)
3474            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3475            if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);            if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
3476            GETCHARINCTEST(c, eptr);            GETCHARINCTEST(c, eptr);
3477            prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);            prop_category = UCD_CATEGORY(c);
3478            if (prop_category == ucp_M) RRETURN(MATCH_NOMATCH);            if (prop_category == ucp_M) RRETURN(MATCH_NOMATCH);
3479            while (eptr < md->end_subject)            while (eptr < md->end_subject)
3480              {              {
# Line 3397  for (;;) Line 3483  for (;;)
3483                {                {
3484                GETCHARLEN(c, eptr, len);                GETCHARLEN(c, eptr, len);
3485                }                }
3486              prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);              prop_category = UCD_CATEGORY(c);
3487              if (prop_category != ucp_M) break;              if (prop_category != ucp_M) break;
3488              eptr += len;              eptr += len;
3489              }              }
# Line 3416  for (;;) Line 3502  for (;;)
3502            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM42);            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM42);
3503            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3504            if (fi >= max || eptr >= md->end_subject ||            if (fi >= max || eptr >= md->end_subject ||
3505                 (ctype == OP_ANY && (ims & PCRE_DOTALL) == 0 &&                 (ctype == OP_ANY && IS_NEWLINE(eptr)))
                 IS_NEWLINE(eptr)))  
3506              RRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3507    
3508            GETCHARINC(c, eptr);            GETCHARINC(c, eptr);
3509            switch(ctype)            switch(ctype)
3510              {              {
3511              case OP_ANY:        /* This is the DOTALL case */              case OP_ANY:        /* This is the non-NL case */
3512              break;              case OP_ALLANY:
   
3513              case OP_ANYBYTE:              case OP_ANYBYTE:
3514              break;              break;
3515    
# Line 3577  for (;;) Line 3661  for (;;)
3661            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM43);            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM43);
3662            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3663            if (fi >= max || eptr >= md->end_subject ||            if (fi >= max || eptr >= md->end_subject ||
3664                 ((ims & PCRE_DOTALL) == 0 && IS_NEWLINE(eptr)))                 (ctype == OP_ANY && IS_NEWLINE(eptr)))
3665              RRETURN(MATCH_NOMATCH);              RRETURN(MATCH_NOMATCH);
3666    
3667            c = *eptr++;            c = *eptr++;
3668            switch(ctype)            switch(ctype)
3669              {              {
3670              case OP_ANY:   /* This is the DOTALL case */              case OP_ANY:     /* This is the non-NL case */
3671              break;              case OP_ALLANY:
   
3672              case OP_ANYBYTE:              case OP_ANYBYTE:
3673              break;              break;
3674    
# Line 3718  for (;;) Line 3801  for (;;)
3801              int len = 1;              int len = 1;
3802              if (eptr >= md->end_subject) break;              if (eptr >= md->end_subject) break;
3803              GETCHARLEN(c, eptr, len);              GETCHARLEN(c, eptr, len);
3804              prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);              prop_chartype = UCD_CHARTYPE(c);
3805              if ((prop_chartype == ucp_Lu ||              if ((prop_chartype == ucp_Lu ||
3806                   prop_chartype == ucp_Ll ||                   prop_chartype == ucp_Ll ||
3807                   prop_chartype == ucp_Lt) == prop_fail_result)                   prop_chartype == ucp_Lt) == prop_fail_result)
# Line 3733  for (;;) Line 3816  for (;;)
3816              int len = 1;              int len = 1;
3817              if (eptr >= md->end_subject) break;              if (eptr >= md->end_subject) break;
3818              GETCHARLEN(c, eptr, len);              GETCHARLEN(c, eptr, len);
3819              prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);              prop_category = UCD_CATEGORY(c);
3820              if ((prop_category == prop_value) == prop_fail_result)              if ((prop_category == prop_value) == prop_fail_result)
3821                break;                break;
3822              eptr+= len;              eptr+= len;
# Line 3746  for (;;) Line 3829  for (;;)
3829              int len = 1;              int len = 1;
3830              if (eptr >= md->end_subject) break;              if (eptr >= md->end_subject) break;
3831              GETCHARLEN(c, eptr, len);              GETCHARLEN(c, eptr, len);
3832              prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);              prop_chartype = UCD_CHARTYPE(c);
3833              if ((prop_chartype == prop_value) == prop_fail_result)              if ((prop_chartype == prop_value) == prop_fail_result)
3834                break;                break;
3835              eptr+= len;              eptr+= len;
# Line 3759  for (;;) Line 3842  for (;;)
3842              int len = 1;              int len = 1;
3843              if (eptr >= md->end_subject) break;              if (eptr >= md->end_subject) break;
3844              GETCHARLEN(c, eptr, len);              GETCHARLEN(c, eptr, len);
3845              prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);              prop_script = UCD_SCRIPT(c);
3846              if ((prop_script == prop_value) == prop_fail_result)              if ((prop_script == prop_value) == prop_fail_result)
3847                break;                break;
3848              eptr+= len;              eptr+= len;
# Line 3788  for (;;) Line 3871  for (;;)
3871            {            {
3872            if (eptr >= md->end_subject) break;            if (eptr >= md->end_subject) break;
3873            GETCHARINCTEST(c, eptr);            GETCHARINCTEST(c, eptr);
3874            prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);            prop_category = UCD_CATEGORY(c);
3875            if (prop_category == ucp_M) break;            if (prop_category == ucp_M) break;
3876            while (eptr < md->end_subject)            while (eptr < md->end_subject)
3877              {              {
# Line 3797  for (;;) Line 3880  for (;;)
3880                {                {
3881                GETCHARLEN(c, eptr, len);                GETCHARLEN(c, eptr, len);
3882                }                }
3883              prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);              prop_category = UCD_CATEGORY(c);
3884              if (prop_category != ucp_M) break;              if (prop_category != ucp_M) break;
3885              eptr += len;              eptr += len;
3886              }              }
# Line 3819  for (;;) Line 3902  for (;;)
3902                BACKCHAR(eptr);                BACKCHAR(eptr);
3903                GETCHARLEN(c, eptr, len);                GETCHARLEN(c, eptr, len);
3904                }                }
3905              prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);              prop_category = UCD_CATEGORY(c);
3906              if (prop_category != ucp_M) break;              if (prop_category != ucp_M) break;
3907              eptr--;              eptr--;
3908              }              }
# Line 3839  for (;;) Line 3922  for (;;)
3922            case OP_ANY:            case OP_ANY:
3923            if (max < INT_MAX)            if (max < INT_MAX)
3924              {              {
3925              if ((ims & PCRE_DOTALL) == 0)              for (i = min; i < max; i++)
               {  
               for (i = min; i < max; i++)  
                 {  
                 if (eptr >= md->end_subject || IS_NEWLINE(eptr)) break;  
                 eptr++;  
                 while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;  
                 }  
               }  
             else  
3926                {                {
3927                for (i = min; i < max; i++)                if (eptr >= md->end_subject || IS_NEWLINE(eptr)) break;
3928                  {                eptr++;
3929                  if (eptr >= md->end_subject) break;                while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
                 eptr++;  
                 while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;  
                 }  
3930                }                }
3931              }              }
3932    
# Line 3863  for (;;) Line 3934  for (;;)
3934    
3935            else            else
3936              {              {
3937              if ((ims & PCRE_DOTALL) == 0)              for (i = min; i < max; i++)
3938                {                {
3939                for (i = min; i < max; i++)                if (eptr >= md->end_subject || IS_NEWLINE(eptr)) break;
3940                  {                eptr++;
3941                  if (eptr >= md->end_subject || IS_NEWLINE(eptr)) break;                while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
                 eptr++;  
                 while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;  
                 }  
3942                }                }
3943              else              }
3944              break;
3945    
3946              case OP_ALLANY:
3947              if (max < INT_MAX)
3948                {
3949                for (i = min; i < max; i++)
3950                {                {
3951                eptr = md->end_subject;                if (eptr >= md->end_subject) break;
3952                  eptr++;
3953                  while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
3954                }                }
3955              }              }
3956              else eptr = md->end_subject;   /* Unlimited UTF-8 repeat */
3957            break;            break;
3958    
3959            /* The byte case is the same as non-UTF8 */            /* The byte case is the same as non-UTF8 */
# Line 4064  for (;;) Line 4141  for (;;)
4141          switch(ctype)          switch(ctype)
4142            {            {
4143            case OP_ANY:            case OP_ANY:
4144            if ((ims & PCRE_DOTALL) == 0)            for (i = min; i < max; i++)
4145              {              {
4146              for (i = min; i < max; i++)              if (eptr >= md->end_subject || IS_NEWLINE(eptr)) break;
4147                {              eptr++;
               if (eptr >= md->end_subject || IS_NEWLINE(eptr)) break;  
               eptr++;  
               }  
             break;  
4148              }              }
4149            /* For DOTALL case, fall through and treat as \C */            break;
4150    
4151              case OP_ALLANY:
4152            case OP_ANYBYTE:            case OP_ANYBYTE:
4153            c = max - min;            c = max - min;
4154            if (c > (unsigned int)(md->end_subject - eptr))            if (c > (unsigned int)(md->end_subject - eptr))
# Line 4246  HEAP_RETURN: Line 4320  HEAP_RETURN:
4320  switch (frame->Xwhere)  switch (frame->Xwhere)
4321    {    {
4322    LBL( 1) LBL( 2) LBL( 3) LBL( 4) LBL( 5) LBL( 6) LBL( 7) LBL( 8)    LBL( 1) LBL( 2) LBL( 3) LBL( 4) LBL( 5) LBL( 6) LBL( 7) LBL( 8)
4323    LBL( 9) LBL(10) LBL(11) LBL(12) LBL(13) LBL(14) LBL(15) LBL(16)    LBL( 9) LBL(10) LBL(11) LBL(12) LBL(13) LBL(14) LBL(15) LBL(17)
4324    LBL(17) LBL(18) LBL(19) LBL(20) LBL(21) LBL(22) LBL(23) LBL(24)    LBL(19) LBL(24) LBL(25) LBL(26) LBL(27) LBL(29) LBL(31) LBL(33)
4325    LBL(25) LBL(26) LBL(27) LBL(28) LBL(29) LBL(30) LBL(31) LBL(32)    LBL(35) LBL(43) LBL(47) LBL(48) LBL(49) LBL(50) LBL(51) LBL(52)
4326    LBL(33) LBL(34) LBL(35) LBL(36) LBL(37) LBL(38) LBL(39) LBL(40)    LBL(53) LBL(54)
4327    LBL(41) LBL(42) LBL(43) LBL(44) LBL(45) LBL(46) LBL(47) LBL(48)  #ifdef SUPPORT_UTF8
4328    LBL(49) LBL(50) LBL(51) LBL(52) LBL(53) LBL(54)    LBL(16) LBL(18) LBL(20) LBL(21) LBL(22) LBL(23) LBL(28) LBL(30)
4329      LBL(32) LBL(34) LBL(42) LBL(46)
4330    #ifdef SUPPORT_UCP
4331      LBL(36) LBL(37) LBL(38) LBL(39) LBL(40) LBL(41) LBL(44) LBL(45)
4332    #endif  /* SUPPORT_UCP */
4333    #endif  /* SUPPORT_UTF8 */
4334    default:    default:
4335    DPRINTF(("jump error in pcre match: label %d non-existent\n", frame->Xwhere));    DPRINTF(("jump error in pcre match: label %d non-existent\n", frame->Xwhere));
4336    return PCRE_ERROR_INTERNAL;    return PCRE_ERROR_INTERNAL;
# Line 4343  Returns:          > 0 => success; value Line 4422  Returns:          > 0 => success; value
4422                   < -1 => some kind of unexpected problem                   < -1 => some kind of unexpected problem
4423  */  */
4424    
4425  PCRE_EXP_DEFN int  PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
4426  pcre_exec(const pcre *argument_re, const pcre_extra *extra_data,  pcre_exec(const pcre *argument_re, const pcre_extra *extra_data,
4427    PCRE_SPTR subject, int length, int start_offset, int options, int *offsets,    PCRE_SPTR subject, int length, int start_offset, int options, int *offsets,
4428    int offsetcount)    int offsetcount)
# Line 4445  end_subject = md->end_subject; Line 4524  end_subject = md->end_subject;
4524    
4525  md->endonly = (re->options & PCRE_DOLLAR_ENDONLY) != 0;  md->endonly = (re->options & PCRE_DOLLAR_ENDONLY) != 0;
4526  utf8 = md->utf8 = (re->options & PCRE_UTF8) != 0;  utf8 = md->utf8 = (re->options & PCRE_UTF8) != 0;
4527    md->jscript_compat = (re->options & PCRE_JAVASCRIPT_COMPAT) != 0;
4528    
4529  md->notbol = (options & PCRE_NOTBOL) != 0;  md->notbol = (options & PCRE_NOTBOL) != 0;
4530  md->noteol = (options & PCRE_NOTEOL) != 0;  md->noteol = (options & PCRE_NOTEOL) != 0;
# Line 4469  switch (options & (PCRE_BSR_ANYCRLF|PCRE Line 4549  switch (options & (PCRE_BSR_ANYCRLF|PCRE
4549    md->bsr_anycrlf = TRUE;    md->bsr_anycrlf = TRUE;
4550  #else  #else
4551    md->bsr_anycrlf = FALSE;    md->bsr_anycrlf = FALSE;
4552  #endif  #endif
4553    break;    break;
4554    
4555    case PCRE_BSR_ANYCRLF:    case PCRE_BSR_ANYCRLF:
# Line 4490  switch ((((options & PCRE_NEWLINE_BITS) Line 4570  switch ((((options & PCRE_NEWLINE_BITS)
4570          (pcre_uint32)options) & PCRE_NEWLINE_BITS)          (pcre_uint32)options) & PCRE_NEWLINE_BITS)
4571    {    {
4572    case 0: newline = NEWLINE; break;   /* Compile-time default */    case 0: newline = NEWLINE; break;   /* Compile-time default */
4573    case PCRE_NEWLINE_CR: newline = '\r'; break;    case PCRE_NEWLINE_CR: newline = CHAR_CR; break;
4574    case PCRE_NEWLINE_LF: newline = '\n'; break;    case PCRE_NEWLINE_LF: newline = CHAR_NL; break;
4575    case PCRE_NEWLINE_CR+    case PCRE_NEWLINE_CR+
4576         PCRE_NEWLINE_LF: newline = ('\r' << 8) | '\n'; break;         PCRE_NEWLINE_LF: newline = (CHAR_CR << 8) | CHAR_NL; break;
4577    case PCRE_NEWLINE_ANY: newline = -1; break;    case PCRE_NEWLINE_ANY: newline = -1; break;
4578    case PCRE_NEWLINE_ANYCRLF: newline = -2; break;    case PCRE_NEWLINE_ANYCRLF: newline = -2; break;
4579    default: return PCRE_ERROR_BADNEWLINE;    default: return PCRE_ERROR_BADNEWLINE;
# Line 4645  for(;;) Line 4725  for(;;)
4725      while (iptr < iend) *iptr++ = -1;      while (iptr < iend) *iptr++ = -1;
4726      }      }
4727    
4728    /* Advance to a unique first char if possible. If firstline is TRUE, the    /* If firstline is TRUE, the start of the match is constrained to the first
4729    start of the match is constrained to the first line of a multiline string.    line of a multiline string. That is, the match must be before or at the first
4730    That is, the match must be before or at the first newline. Implement this by    newline. Implement this by temporarily adjusting end_subject so that we stop
4731    temporarily adjusting end_subject so that we stop scanning at a newline. If    scanning at a newline. If the match fails at the newline, later code breaks
4732    the match fails at the newline, later code breaks this loop. */    this loop. */
4733    
4734    if (firstline)    if (firstline)
4735      {      {
4736      USPTR t = start_match;      USPTR t = start_match;
4737    #ifdef SUPPORT_UTF8
4738        if (utf8)
4739          {
4740          while (t < md->end_subject && !IS_NEWLINE(t))
4741            {
4742            t++;
4743            while (t < end_subject && (*t & 0xc0) == 0x80) t++;
4744            }
4745          }
4746        else
4747    #endif
4748      while (t < md->end_subject && !IS_NEWLINE(t)) t++;      while (t < md->end_subject && !IS_NEWLINE(t)) t++;
4749      end_subject = t;      end_subject = t;
4750      }      }
4751    
4752    /* Now test for a unique first byte */    /* There are some optimizations that avoid running the match if a known
4753      starting point is not found, or if a known later character is not present.
4754      However, there is an option that disables these, for testing and for ensuring
4755      that all callouts do actually occur. */
4756    
4757    if (first_byte >= 0)    if ((options & PCRE_NO_START_OPTIMIZE) == 0)
4758      {      {
4759      if (first_byte_caseless)      /* Advance to a unique first byte if there is one. */
4760        while (start_match < end_subject &&  
4761               md->lcc[*start_match] != first_byte)      if (first_byte >= 0)
4762          start_match++;        {
4763      else        if (first_byte_caseless)
4764        while (start_match < end_subject && *start_match != first_byte)          while (start_match < end_subject && md->lcc[*start_match] != first_byte)
4765          start_match++;            start_match++;
4766      }        else
4767            while (start_match < end_subject && *start_match != first_byte)
4768              start_match++;
4769          }
4770    
4771    /* Or to just after a linebreak for a multiline match if possible */      /* Or to just after a linebreak for a multiline match */
4772    
4773    else if (startline)      else if (startline)
     {  
     if (start_match > md->start_subject + start_offset)  
4774        {        {
4775        while (start_match <= end_subject && !WAS_NEWLINE(start_match))        if (start_match > md->start_subject + start_offset)
4776          start_match++;          {
4777    #ifdef SUPPORT_UTF8
4778            if (utf8)
4779              {
4780              while (start_match < end_subject && !WAS_NEWLINE(start_match))
4781                {
4782                start_match++;
4783                while(start_match < end_subject && (*start_match & 0xc0) == 0x80)
4784                  start_match++;
4785                }
4786              }
4787            else
4788    #endif
4789            while (start_match < end_subject && !WAS_NEWLINE(start_match))
4790              start_match++;
4791    
4792            /* If we have just passed a CR and the newline option is ANY or ANYCRLF,
4793            and we are now at a LF, advance the match position by one more character.
4794            */
4795    
4796        /* If we have just passed a CR and the newline option is ANY or ANYCRLF,          if (start_match[-1] == CHAR_CR &&
4797        and we are now at a LF, advance the match position by one more character.               (md->nltype == NLTYPE_ANY || md->nltype == NLTYPE_ANYCRLF) &&
4798        */               start_match < end_subject &&
4799                 *start_match == CHAR_NL)
4800        if (start_match[-1] == '\r' &&            start_match++;
4801             (md->nltype == NLTYPE_ANY || md->nltype == NLTYPE_ANYCRLF) &&          }
            start_match < end_subject &&  
            *start_match == '\n')  
         start_match++;  
4802        }        }
     }  
4803    
4804    /* Or to a non-unique first char after study */      /* Or to a non-unique first byte after study */
4805    
4806    else if (start_bits != NULL)      else if (start_bits != NULL)
     {  
     while (start_match < end_subject)  
4807        {        {
4808        register unsigned int c = *start_match;        while (start_match < end_subject)
4809        if ((start_bits[c/8] & (1 << (c&7))) == 0) start_match++; else break;          {
4810            register unsigned int c = *start_match;
4811            if ((start_bits[c/8] & (1 << (c&7))) == 0) start_match++;
4812              else break;
4813            }
4814        }        }
4815      }      }   /* Starting optimizations */
4816    
4817    /* Restore fudged end_subject */    /* Restore fudged end_subject */
4818    
# Line 4713  for(;;) Line 4824  for(;;)
4824    printf("\n");    printf("\n");
4825  #endif  #endif
4826    
4827    /* If req_byte is set, we know that that character must appear in the subject    /* If req_byte is set, we know that that character must appear in the
4828    for the match to succeed. If the first character is set, req_byte must be    subject for the match to succeed. If the first character is set, req_byte
4829    later in the subject; otherwise the test starts at the match point. This    must be later in the subject; otherwise the test starts at the match point.
4830    optimization can save a huge amount of backtracking in patterns with nested    This optimization can save a huge amount of backtracking in patterns with
4831    unlimited repeats that aren't going to match. Writing separate code for    nested unlimited repeats that aren't going to match. Writing separate code
4832    cased/caseless versions makes it go faster, as does using an autoincrement    for cased/caseless versions makes it go faster, as does using an
4833    and backing off on a match.    autoincrement and backing off on a match.
4834    
4835    HOWEVER: when the subject string is very, very long, searching to its end can    HOWEVER: when the subject string is very, very long, searching to its end
4836    take a long time, and give bad performance on quite ordinary patterns. This    can take a long time, and give bad performance on quite ordinary patterns.
4837    showed up when somebody was matching something like /^\d+C/ on a 32-megabyte    This showed up when somebody was matching something like /^\d+C/ on a
4838    string... so we don't do this when the string is sufficiently long.    32-megabyte string... so we don't do this when the string is sufficiently
4839      long.
4840    
4841    ALSO: this processing is disabled when partial matching is requested.    ALSO: this processing is disabled when partial matching is requested, or if
4842    */    disabling is explicitly requested. */
4843    
4844    if (req_byte >= 0 &&    if ((options & PCRE_NO_START_OPTIMIZE) == 0 &&
4845          req_byte >= 0 &&
4846        end_subject - start_match < REQ_BYTE_MAX &&        end_subject - start_match < REQ_BYTE_MAX &&
4847        !md->partial)        !md->partial)
4848      {      {
# Line 4837  for(;;) Line 4950  for(;;)
4950    not contain any explicit matches for \r or \n, and the newline option is CRLF    not contain any explicit matches for \r or \n, and the newline option is CRLF
4951    or ANY or ANYCRLF, advance the match position by one more character. */    or ANY or ANYCRLF, advance the match position by one more character. */
4952    
4953    if (start_match[-1] == '\r' &&    if (start_match[-1] == CHAR_CR &&
4954        start_match < end_subject &&        start_match < end_subject &&
4955        *start_match == '\n' &&        *start_match == CHAR_NL &&
4956        (re->flags & PCRE_HASCRORLF) == 0 &&        (re->flags & PCRE_HASCRORLF) == 0 &&
4957          (md->nltype == NLTYPE_ANY ||          (md->nltype == NLTYPE_ANY ||
4958           md->nltype == NLTYPE_ANYCRLF ||           md->nltype == NLTYPE_ANYCRLF ||

Legend:
Removed from v.231  
changed lines
  Added in v.400

  ViewVC Help
Powered by ViewVC 1.1.5