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

Diff of /code/trunk/pcre_dfa_exec.c

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

revision 152 by ph10, Tue Apr 17 15:55:53 2007 UTC revision 463 by ph10, Sun Oct 18 10:02:46 2009 UTC
# Line 3  Line 3 
3  *************************************************/  *************************************************/
4    
5  /* PCRE is a library of functions to support regular expressions whose syntax  /* PCRE is a library of functions to support regular expressions whose syntax
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 (but see
7    below for why this module is different).
8    
9                         Written by Philip Hazel                         Written by Philip Hazel
10             Copyright (c) 1997-2007 University of Cambridge             Copyright (c) 1997-2009 University of Cambridge
11    
12  -----------------------------------------------------------------------------  -----------------------------------------------------------------------------
13  Redistribution and use in source and binary forms, with or without  Redistribution and use in source and binary forms, with or without
# Line 44  FSM). This is NOT Perl- compatible, but Line 45  FSM). This is NOT Perl- compatible, but
45  applications. */  applications. */
46    
47    
48    /* NOTE ABOUT PERFORMANCE: A user of this function sent some code that improved
49    the performance of his patterns greatly. I could not use it as it stood, as it
50    was not thread safe, and made assumptions about pattern sizes. Also, it caused
51    test 7 to loop, and test 9 to crash with a segfault.
52    
53    The issue is the check for duplicate states, which is done by a simple linear
54    search up the state list. (Grep for "duplicate" below to find the code.) For
55    many patterns, there will never be many states active at one time, so a simple
56    linear search is fine. In patterns that have many active states, it might be a
57    bottleneck. The suggested code used an indexing scheme to remember which states
58    had previously been used for each character, and avoided the linear search when
59    it knew there was no chance of a duplicate. This was implemented when adding
60    states to the state lists.
61    
62    I wrote some thread-safe, not-limited code to try something similar at the time
63    of checking for duplicates (instead of when adding states), using index vectors
64    on the stack. It did give a 13% improvement with one specially constructed
65    pattern for certain subject strings, but on other strings and on many of the
66    simpler patterns in the test suite it did worse. The major problem, I think,
67    was the extra time to initialize the index. This had to be done for each call
68    of internal_dfa_exec(). (The supplied patch used a static vector, initialized
69    only once - I suspect this was the cause of the problems with the tests.)
70    
71    Overall, I concluded that the gains in some cases did not outweigh the losses
72    in others, so I abandoned this code. */
73    
74    
75    
76    #ifdef HAVE_CONFIG_H
77    #include "config.h"
78    #endif
79    
80  #define NLBLOCK md             /* Block containing newline information */  #define NLBLOCK md             /* Block containing newline information */
81  #define PSSTART start_subject  /* Field containing processed string start */  #define PSSTART start_subject  /* Field containing processed string start */
82  #define PSEND   end_subject    /* Field containing processed string end */  #define PSEND   end_subject    /* Field containing processed string end */
# Line 56  applications. */ Line 89  applications. */
89  #define SP "                   "  #define SP "                   "
90    
91    
   
92  /*************************************************  /*************************************************
93  *      Code parameters and static tables         *  *      Code parameters and static tables         *
94  *************************************************/  *************************************************/
95    
96  /* These are offsets that are used to turn the OP_TYPESTAR and friends opcodes  /* These are offsets that are used to turn the OP_TYPESTAR and friends opcodes
97  into others, under special conditions. A gap of 20 between the blocks should be  into others, under special conditions. A gap of 20 between the blocks should be
98  enough. */  enough. The resulting opcodes don't have to be less than 256 because they are
99    never stored, so we push them well clear of the normal opcodes. */
100    
101  #define OP_PROP_EXTRA 100  #define OP_PROP_EXTRA       300
102  #define OP_EXTUNI_EXTRA 120  #define OP_EXTUNI_EXTRA     320
103  #define OP_ANYNL_EXTRA 140  #define OP_ANYNL_EXTRA      340
104    #define OP_HSPACE_EXTRA     360
105    #define OP_VSPACE_EXTRA     380
106    
107    
108  /* This table identifies those opcodes that are followed immediately by a  /* This table identifies those opcodes that are followed immediately by a
109  character that is to be tested in some way. This makes is possible to  character that is to be tested in some way. This makes is possible to
110  centralize the loading of these characters. In the case of Type * etc, the  centralize the loading of these characters. In the case of Type * etc, the
111  "character" is the opcode for \D, \d, \S, \s, \W, or \w, which will always be a  "character" is the opcode for \D, \d, \S, \s, \W, or \w, which will always be a
112  small value. */  small value. Non-zero values in the table are the offsets from the opcode where
113    the character is to be found. ***NOTE*** If the start of this table is
114    modified, the three tables that follow must also be modified. */
115    
116  static uschar coptable[] = {  static const uschar coptable[] = {
117    0,                             /* End                                    */    0,                             /* End                                    */
118    0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  /* \A, \G, \B, \b, \D, \d, \S, \s, \W, \w */    0, 0, 0, 0, 0,                 /* \A, \G, \K, \B, \b                     */
119    0, 0,                          /* Any, Anybyte                           */    0, 0, 0, 0, 0, 0,              /* \D, \d, \S, \s, \W, \w                 */
120    0, 0, 0, 0,                    /* NOTPROP, PROP, EXTUNI, ANYNL           */    0, 0, 0,                       /* Any, AllAny, Anybyte                   */
121      0, 0, 0,                       /* NOTPROP, PROP, EXTUNI                  */
122      0, 0, 0, 0, 0,                 /* \R, \H, \h, \V, \v                     */
123    0, 0, 0, 0, 0,                 /* \Z, \z, Opt, ^, $                      */    0, 0, 0, 0, 0,                 /* \Z, \z, Opt, ^, $                      */
124    1,                             /* Char                                   */    1,                             /* Char                                   */
125    1,                             /* Charnc                                 */    1,                             /* Charnc                                 */
# Line 120  static uschar coptable[] = { Line 159  static uschar coptable[] = {
159    0,                             /* CREF                                   */    0,                             /* CREF                                   */
160    0,                             /* RREF                                   */    0,                             /* RREF                                   */
161    0,                             /* DEF                                    */    0,                             /* DEF                                    */
162    0, 0                           /* BRAZERO, BRAMINZERO                    */    0, 0,                          /* BRAZERO, BRAMINZERO                    */
163      0, 0, 0, 0,                    /* PRUNE, SKIP, THEN, COMMIT              */
164      0, 0, 0, 0                     /* FAIL, ACCEPT, CLOSE, SKIPZERO          */
165    };
166    
167    /* This table identifies those opcodes that inspect a character. It is used to
168    remember the fact that a character could have been inspected when the end of
169    the subject is reached. ***NOTE*** If the start of this table is modified, the
170    two tables that follow must also be modified. */
171    
172    static const uschar poptable[] = {
173      0,                             /* End                                    */
174      0, 0, 0, 1, 1,                 /* \A, \G, \K, \B, \b                     */
175      1, 1, 1, 1, 1, 1,              /* \D, \d, \S, \s, \W, \w                 */
176      1, 1, 1,                       /* Any, AllAny, Anybyte                   */
177      1, 1, 1,                       /* NOTPROP, PROP, EXTUNI                  */
178      1, 1, 1, 1, 1,                 /* \R, \H, \h, \V, \v                     */
179      0, 0, 0, 0, 0,                 /* \Z, \z, Opt, ^, $                      */
180      1,                             /* Char                                   */
181      1,                             /* Charnc                                 */
182      1,                             /* not                                    */
183      /* Positive single-char repeats                                          */
184      1, 1, 1, 1, 1, 1,              /* *, *?, +, +?, ?, ??                    */
185      1, 1, 1,                       /* upto, minupto, exact                   */
186      1, 1, 1, 1,                    /* *+, ++, ?+, upto+                      */
187      /* Negative single-char repeats - only for chars < 256                   */
188      1, 1, 1, 1, 1, 1,              /* NOT *, *?, +, +?, ?, ??                */
189      1, 1, 1,                       /* NOT upto, minupto, exact               */
190      1, 1, 1, 1,                    /* NOT *+, ++, ?+, upto+                  */
191      /* Positive type repeats                                                 */
192      1, 1, 1, 1, 1, 1,              /* Type *, *?, +, +?, ?, ??               */
193      1, 1, 1,                       /* Type upto, minupto, exact              */
194      1, 1, 1, 1,                    /* Type *+, ++, ?+, upto+                 */
195      /* Character class & ref repeats                                         */
196      1, 1, 1, 1, 1, 1,              /* *, *?, +, +?, ?, ??                    */
197      1, 1,                          /* CRRANGE, CRMINRANGE                    */
198      1,                             /* CLASS                                  */
199      1,                             /* NCLASS                                 */
200      1,                             /* XCLASS - variable length               */
201      0,                             /* REF                                    */
202      0,                             /* RECURSE                                */
203      0,                             /* CALLOUT                                */
204      0,                             /* Alt                                    */
205      0,                             /* Ket                                    */
206      0,                             /* KetRmax                                */
207      0,                             /* KetRmin                                */
208      0,                             /* Assert                                 */
209      0,                             /* Assert not                             */
210      0,                             /* Assert behind                          */
211      0,                             /* Assert behind not                      */
212      0,                             /* Reverse                                */
213      0, 0, 0, 0,                    /* ONCE, BRA, CBRA, COND                  */
214      0, 0, 0,                       /* SBRA, SCBRA, SCOND                     */
215      0,                             /* CREF                                   */
216      0,                             /* RREF                                   */
217      0,                             /* DEF                                    */
218      0, 0,                          /* BRAZERO, BRAMINZERO                    */
219      0, 0, 0, 0,                    /* PRUNE, SKIP, THEN, COMMIT              */
220      0, 0, 0, 0                     /* FAIL, ACCEPT, CLOSE, SKIPZERO          */
221  };  };
222    
223  /* These 2 tables allow for compact code for testing for \D, \d, \S, \s, \W,  /* These 2 tables allow for compact code for testing for \D, \d, \S, \s, \W,
224  and \w */  and \w */
225    
226  static uschar toptable1[] = {  static const uschar toptable1[] = {
227    0, 0, 0, 0, 0,    0, 0, 0, 0, 0, 0,
228    ctype_digit, ctype_digit,    ctype_digit, ctype_digit,
229    ctype_space, ctype_space,    ctype_space, ctype_space,
230    ctype_word,  ctype_word,    ctype_word,  ctype_word,
231    0                               /* OP_ANY */    0, 0                            /* OP_ANY, OP_ALLANY */
232  };  };
233    
234  static uschar toptable2[] = {  static const uschar toptable2[] = {
235    0, 0, 0, 0, 0,    0, 0, 0, 0, 0, 0,
236    ctype_digit, 0,    ctype_digit, 0,
237    ctype_space, 0,    ctype_space, 0,
238    ctype_word,  0,    ctype_word,  0,
239    1                               /* OP_ANY */    1, 1                            /* OP_ANY, OP_ALLANY */
240  };  };
241    
242    
# Line 211  Arguments: Line 308  Arguments:
308    rlevel            function call recursion level    rlevel            function call recursion level
309    recursing         regex recursive call level    recursing         regex recursive call level
310    
311  Returns:            > 0 =>  Returns:            > 0 => number of match offset pairs placed in offsets
312                      = 0 =>                      = 0 => offsets overflowed; longest matches are present
313                       -1 => failed to match                       -1 => failed to match
314                     < -1 => some kind of unexpected problem                     < -1 => some kind of unexpected problem
315    
# Line 378  if (*first_op == OP_REVERSE) Line 475  if (*first_op == OP_REVERSE)
475      current_subject -= gone_back;      current_subject -= gone_back;
476      }      }
477    
478      /* Save the earliest consulted character */
479    
480      if (current_subject < md->start_used_ptr)
481        md->start_used_ptr = current_subject;
482    
483    /* Now we can process the individual branches. */    /* Now we can process the individual branches. */
484    
485    end_code = this_start_code;    end_code = this_start_code;
# Line 442  for (;;) Line 544  for (;;)
544    int i, j;    int i, j;
545    int clen, dlen;    int clen, dlen;
546    unsigned int c, d;    unsigned int c, d;
547      int forced_fail = 0;
548      BOOL could_continue = FALSE;
549    
550    /* Make the new state list into the active state list and empty the    /* Make the new state list into the active state list and empty the
551    new state list. */    new state list. */
# Line 499  for (;;) Line 603  for (;;)
603      stateblock *current_state = active_states + i;      stateblock *current_state = active_states + i;
604      const uschar *code;      const uschar *code;
605      int state_offset = current_state->offset;      int state_offset = current_state->offset;
606      int count, codevalue;      int count, codevalue, rrc;
 #ifdef SUPPORT_UCP  
     int chartype, script;  
 #endif  
607    
608  #ifdef DEBUG  #ifdef DEBUG
609      printf ("%.*sProcessing state %d c=", rlevel*2-2, SP, state_offset);      printf ("%.*sProcessing state %d c=", rlevel*2-2, SP, state_offset);
# Line 534  for (;;) Line 635  for (;;)
635          }          }
636        }        }
637    
638      /* Check for a duplicate state with the same count, and skip if found. */      /* Check for a duplicate state with the same count, and skip if found.
639        See the note at the head of this module about the possibility of improving
640        performance here. */
641    
642      for (j = 0; j < i; j++)      for (j = 0; j < i; j++)
643        {        {
# Line 551  for (;;) Line 654  for (;;)
654      code = start_code + state_offset;      code = start_code + state_offset;
655      codevalue = *code;      codevalue = *code;
656    
657        /* If this opcode inspects a character, but we are at the end of the
658        subject, remember the fact for use when testing for a partial match. */
659    
660        if (clen == 0 && poptable[codevalue] != 0)
661          could_continue = TRUE;
662    
663      /* If this opcode is followed by an inline character, load it. It is      /* If this opcode is followed by an inline character, load it. It is
664      tempting to test for the presence of a subject character here, but that      tempting to test for the presence of a subject character here, but that
665      is wrong, because sometimes zero repetitions of the subject are      is wrong, because sometimes zero repetitions of the subject are
666      permitted.      permitted.
667    
668      We also use this mechanism for opcodes such as OP_TYPEPLUS that take an      We also use this mechanism for opcodes such as OP_TYPEPLUS that take an
669      argument that is not a data character - but is always one byte long.      argument that is not a data character - but is always one byte long. We
670      Unfortunately, we have to take special action to deal with  \P, \p, and      have to take special action to deal with  \P, \p, \H, \h, \V, \v and \X in
671      \X in this case. To keep the other cases fast, convert these ones to new      this case. To keep the other cases fast, convert these ones to new opcodes.
672      opcodes. */      */
673    
674      if (coptable[codevalue] > 0)      if (coptable[codevalue] > 0)
675        {        {
# Line 578  for (;;) Line 687  for (;;)
687            case OP_PROP: codevalue += OP_PROP_EXTRA; break;            case OP_PROP: codevalue += OP_PROP_EXTRA; break;
688            case OP_ANYNL: codevalue += OP_ANYNL_EXTRA; break;            case OP_ANYNL: codevalue += OP_ANYNL_EXTRA; break;
689            case OP_EXTUNI: codevalue += OP_EXTUNI_EXTRA; break;            case OP_EXTUNI: codevalue += OP_EXTUNI_EXTRA; break;
690              case OP_NOT_HSPACE:
691              case OP_HSPACE: codevalue += OP_HSPACE_EXTRA; break;
692              case OP_NOT_VSPACE:
693              case OP_VSPACE: codevalue += OP_VSPACE_EXTRA; break;
694            default: break;            default: break;
695            }            }
696          }          }
# Line 597  for (;;) Line 710  for (;;)
710  /* ========================================================================== */  /* ========================================================================== */
711        /* Reached a closing bracket. If not at the end of the pattern, carry        /* Reached a closing bracket. If not at the end of the pattern, carry
712        on with the next opcode. Otherwise, unless we have an empty string and        on with the next opcode. Otherwise, unless we have an empty string and
713        PCRE_NOTEMPTY is set, save the match data, shifting up all previous        PCRE_NOTEMPTY is set, or PCRE_NOTEMPTY_ATSTART is set and we are at the
714          start of the subject, save the match data, shifting up all previous
715        matches so we always have the longest first. */        matches so we always have the longest first. */
716    
717        case OP_KET:        case OP_KET:
# Line 611  for (;;) Line 725  for (;;)
725            ADD_ACTIVE(state_offset - GET(code, 1), 0);            ADD_ACTIVE(state_offset - GET(code, 1), 0);
726            }            }
727          }          }
728        else if (ptr > current_subject || (md->moptions & PCRE_NOTEMPTY) == 0)        else
729          {          {
730          if (match_count < 0) match_count = (offsetcount >= 2)? 1 : 0;          if (ptr > current_subject ||
731            else if (match_count > 0 && ++match_count * 2 >= offsetcount)              ((md->moptions & PCRE_NOTEMPTY) == 0 &&
732              match_count = 0;                ((md->moptions & PCRE_NOTEMPTY_ATSTART) == 0 ||
733          count = ((match_count == 0)? offsetcount : match_count * 2) - 2;                  current_subject > start_subject + md->start_offset)))
734          if (count > 0) memmove(offsets + 2, offsets, count * sizeof(int));            {
735          if (offsetcount >= 2)            if (match_count < 0) match_count = (offsetcount >= 2)? 1 : 0;
736            {              else if (match_count > 0 && ++match_count * 2 >= offsetcount)
737            offsets[0] = current_subject - start_subject;                match_count = 0;
738            offsets[1] = ptr - start_subject;            count = ((match_count == 0)? offsetcount : match_count * 2) - 2;
739            DPRINTF(("%.*sSet matched string = \"%.*s\"\n", rlevel*2-2, SP,            if (count > 0) memmove(offsets + 2, offsets, count * sizeof(int));
740              offsets[1] - offsets[0], current_subject));            if (offsetcount >= 2)
741            }              {
742          if ((md->moptions & PCRE_DFA_SHORTEST) != 0)              offsets[0] = current_subject - start_subject;
743            {              offsets[1] = ptr - start_subject;
744            DPRINTF(("%.*sEnd of internal_dfa_exec %d: returning %d\n"              DPRINTF(("%.*sSet matched string = \"%.*s\"\n", rlevel*2-2, SP,
745              "%.*s---------------------\n\n", rlevel*2-2, SP, rlevel,                offsets[1] - offsets[0], current_subject));
746              match_count, rlevel*2-2, SP));              }
747            return match_count;            if ((md->moptions & PCRE_DFA_SHORTEST) != 0)
748                {
749                DPRINTF(("%.*sEnd of internal_dfa_exec %d: returning %d\n"
750                  "%.*s---------------------\n\n", rlevel*2-2, SP, rlevel,
751                  match_count, rlevel*2-2, SP));
752                return match_count;
753                }
754            }            }
755          }          }
756        break;        break;
# Line 678  for (;;) Line 798  for (;;)
798        break;        break;
799    
800        /*-----------------------------------------------------------------*/        /*-----------------------------------------------------------------*/
801          case OP_SKIPZERO:
802          code += 1 + GET(code, 2);
803          while (*code == OP_ALT) code += GET(code, 1);
804          ADD_ACTIVE(code - start_code + 1 + LINK_SIZE, 0);
805          break;
806    
807          /*-----------------------------------------------------------------*/
808        case OP_CIRC:        case OP_CIRC:
809        if ((ptr == start_subject && (md->moptions & PCRE_NOTBOL) == 0) ||        if ((ptr == start_subject && (md->moptions & PCRE_NOTBOL) == 0) ||
810            ((ims & PCRE_MULTILINE) != 0 &&            ((ims & PCRE_MULTILINE) != 0 &&
# Line 716  for (;;) Line 843  for (;;)
843    
844        /*-----------------------------------------------------------------*/        /*-----------------------------------------------------------------*/
845        case OP_ANY:        case OP_ANY:
846        if (clen > 0 && ((ims & PCRE_DOTALL) != 0 || !IS_NEWLINE(ptr)))        if (clen > 0 && !IS_NEWLINE(ptr))
847            { ADD_NEW(state_offset + 1, 0); }
848          break;
849    
850          /*-----------------------------------------------------------------*/
851          case OP_ALLANY:
852          if (clen > 0)
853          { ADD_NEW(state_offset + 1, 0); }          { ADD_NEW(state_offset + 1, 0); }
854        break;        break;
855    
# Line 731  for (;;) Line 864  for (;;)
864        if ((md->moptions & PCRE_NOTEOL) == 0)        if ((md->moptions & PCRE_NOTEOL) == 0)
865          {          {
866          if (clen == 0 ||          if (clen == 0 ||
867              (IS_NEWLINE(ptr) &&              ((md->poptions & PCRE_DOLLAR_ENDONLY) == 0 && IS_NEWLINE(ptr) &&
868                 ((ims & PCRE_MULTILINE) != 0 || ptr == end_subject - md->nllen)                 ((ims & PCRE_MULTILINE) != 0 || ptr == end_subject - md->nllen)
869              ))              ))
870            { ADD_ACTIVE(state_offset + 1, 0); }            { ADD_ACTIVE(state_offset + 1, 0); }
# Line 768  for (;;) Line 901  for (;;)
901          if (ptr > start_subject)          if (ptr > start_subject)
902            {            {
903            const uschar *temp = ptr - 1;            const uschar *temp = ptr - 1;
904              if (temp < md->start_used_ptr) md->start_used_ptr = temp;
905  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
906            if (utf8) BACKCHAR(temp);            if (utf8) BACKCHAR(temp);
907  #endif  #endif
# Line 776  for (;;) Line 910  for (;;)
910            }            }
911          else left_word = 0;          else left_word = 0;
912    
913          if (clen > 0) right_word = c < 256 && (ctypes[c] & ctype_word) != 0;          if (clen > 0)
914            else right_word = 0;            right_word = c < 256 && (ctypes[c] & ctype_word) != 0;
915            else right_word = 0;
916    
917          if ((left_word == right_word) == (codevalue == OP_NOT_WORD_BOUNDARY))          if ((left_word == right_word) == (codevalue == OP_NOT_WORD_BOUNDARY))
918            { ADD_ACTIVE(state_offset + 1, 0); }            { ADD_ACTIVE(state_offset + 1, 0); }
# Line 796  for (;;) Line 931  for (;;)
931        if (clen > 0)        if (clen > 0)
932          {          {
933          BOOL OK;          BOOL OK;
934          int category = _pcre_ucp_findprop(c, &chartype, &script);          const ucd_record * prop = GET_UCD(c);
935          switch(code[1])          switch(code[1])
936            {            {
937            case PT_ANY:            case PT_ANY:
# Line 804  for (;;) Line 939  for (;;)
939            break;            break;
940    
941            case PT_LAMP:            case PT_LAMP:
942            OK = chartype == ucp_Lu || chartype == ucp_Ll || chartype == ucp_Lt;            OK = prop->chartype == ucp_Lu || prop->chartype == ucp_Ll || prop->chartype == ucp_Lt;
943            break;            break;
944    
945            case PT_GC:            case PT_GC:
946            OK = category == code[2];            OK = _pcre_ucp_gentype[prop->chartype] == code[2];
947            break;            break;
948    
949            case PT_PC:            case PT_PC:
950            OK = chartype == code[2];            OK = prop->chartype == code[2];
951            break;            break;
952    
953            case PT_SC:            case PT_SC:
954            OK = script == code[2];            OK = prop->script == code[2];
955            break;            break;
956    
957            /* Should never occur, but keep compilers from grumbling. */            /* Should never occur, but keep compilers from grumbling. */
# Line 836  for (;;) Line 971  for (;;)
971  /* ========================================================================== */  /* ========================================================================== */
972        /* These opcodes likewise inspect the subject character, but have an        /* These opcodes likewise inspect the subject character, but have an
973        argument that is not a data character. It is one of these opcodes:        argument that is not a data character. It is one of these opcodes:
974        OP_ANY, OP_DIGIT, OP_NOT_DIGIT, OP_WHITESPACE, OP_NOT_SPACE, OP_WORDCHAR,        OP_ANY, OP_ALLANY, OP_DIGIT, OP_NOT_DIGIT, OP_WHITESPACE, OP_NOT_SPACE,
975        OP_NOT_WORDCHAR. The value is loaded into d. */        OP_WORDCHAR, OP_NOT_WORDCHAR. The value is loaded into d. */
976    
977        case OP_TYPEPLUS:        case OP_TYPEPLUS:
978        case OP_TYPEMINPLUS:        case OP_TYPEMINPLUS:
# Line 848  for (;;) Line 983  for (;;)
983          {          {
984          if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||          if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||
985              (c < 256 &&              (c < 256 &&
986                (d != OP_ANY ||                (d != OP_ANY || !IS_NEWLINE(ptr)) &&
                (ims & PCRE_DOTALL) != 0 ||  
                !IS_NEWLINE(ptr)  
               ) &&  
987                ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))                ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))
988            {            {
989            if (count > 0 && codevalue == OP_TYPEPOSPLUS)            if (count > 0 && codevalue == OP_TYPEPOSPLUS)
# Line 874  for (;;) Line 1006  for (;;)
1006          {          {
1007          if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||          if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||
1008              (c < 256 &&              (c < 256 &&
1009                (d != OP_ANY ||                (d != OP_ANY || !IS_NEWLINE(ptr)) &&
                (ims & PCRE_DOTALL) != 0 ||  
                !IS_NEWLINE(ptr)  
               ) &&  
1010                ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))                ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))
1011            {            {
1012            if (codevalue == OP_TYPEPOSQUERY)            if (codevalue == OP_TYPEPOSQUERY)
# Line 899  for (;;) Line 1028  for (;;)
1028          {          {
1029          if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||          if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||
1030              (c < 256 &&              (c < 256 &&
1031                (d != OP_ANY ||                (d != OP_ANY || !IS_NEWLINE(ptr)) &&
                (ims & PCRE_DOTALL) != 0 ||  
                !IS_NEWLINE(ptr)  
               ) &&  
1032                ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))                ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))
1033            {            {
1034            if (codevalue == OP_TYPEPOSSTAR)            if (codevalue == OP_TYPEPOSSTAR)
# Line 922  for (;;) Line 1048  for (;;)
1048          {          {
1049          if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||          if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||
1050              (c < 256 &&              (c < 256 &&
1051                (d != OP_ANY ||                (d != OP_ANY || !IS_NEWLINE(ptr)) &&
                (ims & PCRE_DOTALL) != 0 ||  
                !IS_NEWLINE(ptr)  
               ) &&  
1052                ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))                ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))
1053            {            {
1054            if (++count >= GET2(code, 1))            if (++count >= GET2(code, 1))
# Line 946  for (;;) Line 1069  for (;;)
1069          {          {
1070          if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||          if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||
1071              (c < 256 &&              (c < 256 &&
1072                (d != OP_ANY ||                (d != OP_ANY || !IS_NEWLINE(ptr)) &&
                (ims & PCRE_DOTALL) != 0 ||  
                !IS_NEWLINE(ptr)  
               ) &&  
1073                ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))                ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))
1074            {            {
1075            if (codevalue == OP_TYPEPOSUPTO)            if (codevalue == OP_TYPEPOSUPTO)
# Line 980  for (;;) Line 1100  for (;;)
1100        if (clen > 0)        if (clen > 0)
1101          {          {
1102          BOOL OK;          BOOL OK;
1103          int category = _pcre_ucp_findprop(c, &chartype, &script);          const ucd_record * prop = GET_UCD(c);
1104          switch(code[2])          switch(code[2])
1105            {            {
1106            case PT_ANY:            case PT_ANY:
# Line 988  for (;;) Line 1108  for (;;)
1108            break;            break;
1109    
1110            case PT_LAMP:            case PT_LAMP:
1111            OK = chartype == ucp_Lu || chartype == ucp_Ll || chartype == ucp_Lt;            OK = prop->chartype == ucp_Lu || prop->chartype == ucp_Ll || prop->chartype == ucp_Lt;
1112            break;            break;
1113    
1114            case PT_GC:            case PT_GC:
1115            OK = category == code[3];            OK = _pcre_ucp_gentype[prop->chartype] == code[3];
1116            break;            break;
1117    
1118            case PT_PC:            case PT_PC:
1119            OK = chartype == code[3];            OK = prop->chartype == code[3];
1120            break;            break;
1121    
1122            case PT_SC:            case PT_SC:
1123            OK = script == code[3];            OK = prop->script == code[3];
1124            break;            break;
1125    
1126            /* Should never occur, but keep compilers from grumbling. */            /* Should never occur, but keep compilers from grumbling. */
# Line 1029  for (;;) Line 1149  for (;;)
1149        case OP_EXTUNI_EXTRA + OP_TYPEPOSPLUS:        case OP_EXTUNI_EXTRA + OP_TYPEPOSPLUS:
1150        count = current_state->count;  /* Already matched */        count = current_state->count;  /* Already matched */
1151        if (count > 0) { ADD_ACTIVE(state_offset + 2, 0); }        if (count > 0) { ADD_ACTIVE(state_offset + 2, 0); }
1152        if (clen > 0 && _pcre_ucp_findprop(c, &chartype, &script) != ucp_M)        if (clen > 0 && UCD_CATEGORY(c) != ucp_M)
1153          {          {
1154          const uschar *nptr = ptr + clen;          const uschar *nptr = ptr + clen;
1155          int ncount = 0;          int ncount = 0;
# Line 1043  for (;;) Line 1163  for (;;)
1163            int nd;            int nd;
1164            int ndlen = 1;            int ndlen = 1;
1165            GETCHARLEN(nd, nptr, ndlen);            GETCHARLEN(nd, nptr, ndlen);
1166            if (_pcre_ucp_findprop(nd, &chartype, &script) != ucp_M) break;            if (UCD_CATEGORY(nd) != ucp_M) break;
1167            ncount++;            ncount++;
1168            nptr += ndlen;            nptr += ndlen;
1169            }            }
# Line 1064  for (;;) Line 1184  for (;;)
1184          int ncount = 0;          int ncount = 0;
1185          switch (c)          switch (c)
1186            {            {
1187              case 0x000b:
1188              case 0x000c:
1189              case 0x0085:
1190              case 0x2028:
1191              case 0x2029:
1192              if ((md->moptions & PCRE_BSR_ANYCRLF) != 0) break;
1193              goto ANYNL01;
1194    
1195            case 0x000d:            case 0x000d:
1196            if (ptr + 1 < end_subject && ptr[1] == 0x0a) ncount = 1;            if (ptr + 1 < end_subject && ptr[1] == 0x0a) ncount = 1;
1197            /* Fall through */            /* Fall through */
1198    
1199              ANYNL01:
1200              case 0x000a:
1201              if (count > 0 && codevalue == OP_ANYNL_EXTRA + OP_TYPEPOSPLUS)
1202                {
1203                active_count--;           /* Remove non-match possibility */
1204                next_active_state--;
1205                }
1206              count++;
1207              ADD_NEW_DATA(-state_offset, count, ncount);
1208              break;
1209    
1210              default:
1211              break;
1212              }
1213            }
1214          break;
1215    
1216          /*-----------------------------------------------------------------*/
1217          case OP_VSPACE_EXTRA + OP_TYPEPLUS:
1218          case OP_VSPACE_EXTRA + OP_TYPEMINPLUS:
1219          case OP_VSPACE_EXTRA + OP_TYPEPOSPLUS:
1220          count = current_state->count;  /* Already matched */
1221          if (count > 0) { ADD_ACTIVE(state_offset + 2, 0); }
1222          if (clen > 0)
1223            {
1224            BOOL OK;
1225            switch (c)
1226              {
1227            case 0x000a:            case 0x000a:
1228            case 0x000b:            case 0x000b:
1229            case 0x000c:            case 0x000c:
1230              case 0x000d:
1231            case 0x0085:            case 0x0085:
1232            case 0x2028:            case 0x2028:
1233            case 0x2029:            case 0x2029:
1234            if (count > 0 && codevalue == OP_ANYNL_EXTRA + OP_TYPEPOSPLUS)            OK = TRUE;
1235              break;
1236    
1237              default:
1238              OK = FALSE;
1239              break;
1240              }
1241    
1242            if (OK == (d == OP_VSPACE))
1243              {
1244              if (count > 0 && codevalue == OP_VSPACE_EXTRA + OP_TYPEPOSPLUS)
1245              {              {
1246              active_count--;           /* Remove non-match possibility */              active_count--;           /* Remove non-match possibility */
1247              next_active_state--;              next_active_state--;
1248              }              }
1249            count++;            count++;
1250            ADD_NEW_DATA(-state_offset, count, ncount);            ADD_NEW_DATA(-state_offset, count, 0);
1251              }
1252            }
1253          break;
1254    
1255          /*-----------------------------------------------------------------*/
1256          case OP_HSPACE_EXTRA + OP_TYPEPLUS:
1257          case OP_HSPACE_EXTRA + OP_TYPEMINPLUS:
1258          case OP_HSPACE_EXTRA + OP_TYPEPOSPLUS:
1259          count = current_state->count;  /* Already matched */
1260          if (count > 0) { ADD_ACTIVE(state_offset + 2, 0); }
1261          if (clen > 0)
1262            {
1263            BOOL OK;
1264            switch (c)
1265              {
1266              case 0x09:      /* HT */
1267              case 0x20:      /* SPACE */
1268              case 0xa0:      /* NBSP */
1269              case 0x1680:    /* OGHAM SPACE MARK */
1270              case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
1271              case 0x2000:    /* EN QUAD */
1272              case 0x2001:    /* EM QUAD */
1273              case 0x2002:    /* EN SPACE */
1274              case 0x2003:    /* EM SPACE */
1275              case 0x2004:    /* THREE-PER-EM SPACE */
1276              case 0x2005:    /* FOUR-PER-EM SPACE */
1277              case 0x2006:    /* SIX-PER-EM SPACE */
1278              case 0x2007:    /* FIGURE SPACE */
1279              case 0x2008:    /* PUNCTUATION SPACE */
1280              case 0x2009:    /* THIN SPACE */
1281              case 0x200A:    /* HAIR SPACE */
1282              case 0x202f:    /* NARROW NO-BREAK SPACE */
1283              case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
1284              case 0x3000:    /* IDEOGRAPHIC SPACE */
1285              OK = TRUE;
1286            break;            break;
1287    
1288            default:            default:
1289              OK = FALSE;
1290            break;            break;
1291            }            }
1292    
1293            if (OK == (d == OP_HSPACE))
1294              {
1295              if (count > 0 && codevalue == OP_HSPACE_EXTRA + OP_TYPEPOSPLUS)
1296                {
1297                active_count--;           /* Remove non-match possibility */
1298                next_active_state--;
1299                }
1300              count++;
1301              ADD_NEW_DATA(-state_offset, count, 0);
1302              }
1303          }          }
1304        break;        break;
1305    
# Line 1106  for (;;) Line 1322  for (;;)
1322        if (clen > 0)        if (clen > 0)
1323          {          {
1324          BOOL OK;          BOOL OK;
1325          int category = _pcre_ucp_findprop(c, &chartype, &script);          const ucd_record * prop = GET_UCD(c);
1326          switch(code[2])          switch(code[2])
1327            {            {
1328            case PT_ANY:            case PT_ANY:
# Line 1114  for (;;) Line 1330  for (;;)
1330            break;            break;
1331    
1332            case PT_LAMP:            case PT_LAMP:
1333            OK = chartype == ucp_Lu || chartype == ucp_Ll || chartype == ucp_Lt;            OK = prop->chartype == ucp_Lu || prop->chartype == ucp_Ll || prop->chartype == ucp_Lt;
1334            break;            break;
1335    
1336            case PT_GC:            case PT_GC:
1337            OK = category == code[3];            OK = _pcre_ucp_gentype[prop->chartype] == code[3];
1338            break;            break;
1339    
1340            case PT_PC:            case PT_PC:
1341            OK = chartype == code[3];            OK = prop->chartype == code[3];
1342            break;            break;
1343    
1344            case PT_SC:            case PT_SC:
1345            OK = script == code[3];            OK = prop->script == code[3];
1346            break;            break;
1347    
1348            /* Should never occur, but keep compilers from grumbling. */            /* Should never occur, but keep compilers from grumbling. */
# Line 1164  for (;;) Line 1380  for (;;)
1380        QS2:        QS2:
1381    
1382        ADD_ACTIVE(state_offset + 2, 0);        ADD_ACTIVE(state_offset + 2, 0);
1383        if (clen > 0 && _pcre_ucp_findprop(c, &chartype, &script) != ucp_M)        if (clen > 0 && UCD_CATEGORY(c) != ucp_M)
1384          {          {
1385          const uschar *nptr = ptr + clen;          const uschar *nptr = ptr + clen;
1386          int ncount = 0;          int ncount = 0;
# Line 1179  for (;;) Line 1395  for (;;)
1395            int nd;            int nd;
1396            int ndlen = 1;            int ndlen = 1;
1397            GETCHARLEN(nd, nptr, ndlen);            GETCHARLEN(nd, nptr, ndlen);
1398            if (_pcre_ucp_findprop(nd, &chartype, &script) != ucp_M) break;            if (UCD_CATEGORY(nd) != ucp_M) break;
1399            ncount++;            ncount++;
1400            nptr += ndlen;            nptr += ndlen;
1401            }            }
# Line 1207  for (;;) Line 1423  for (;;)
1423          int ncount = 0;          int ncount = 0;
1424          switch (c)          switch (c)
1425            {            {
1426              case 0x000b:
1427              case 0x000c:
1428              case 0x0085:
1429              case 0x2028:
1430              case 0x2029:
1431              if ((md->moptions & PCRE_BSR_ANYCRLF) != 0) break;
1432              goto ANYNL02;
1433    
1434            case 0x000d:            case 0x000d:
1435            if (ptr + 1 < end_subject && ptr[1] == 0x0a) ncount = 1;            if (ptr + 1 < end_subject && ptr[1] == 0x0a) ncount = 1;
1436            /* Fall through */            /* Fall through */
1437    
1438              ANYNL02:
1439              case 0x000a:
1440              if (codevalue == OP_ANYNL_EXTRA + OP_TYPEPOSSTAR ||
1441                  codevalue == OP_ANYNL_EXTRA + OP_TYPEPOSQUERY)
1442                {
1443                active_count--;           /* Remove non-match possibility */
1444                next_active_state--;
1445                }
1446              ADD_NEW_DATA(-(state_offset + count), 0, ncount);
1447              break;
1448    
1449              default:
1450              break;
1451              }
1452            }
1453          break;
1454    
1455          /*-----------------------------------------------------------------*/
1456          case OP_VSPACE_EXTRA + OP_TYPEQUERY:
1457          case OP_VSPACE_EXTRA + OP_TYPEMINQUERY:
1458          case OP_VSPACE_EXTRA + OP_TYPEPOSQUERY:
1459          count = 2;
1460          goto QS4;
1461    
1462          case OP_VSPACE_EXTRA + OP_TYPESTAR:
1463          case OP_VSPACE_EXTRA + OP_TYPEMINSTAR:
1464          case OP_VSPACE_EXTRA + OP_TYPEPOSSTAR:
1465          count = 0;
1466    
1467          QS4:
1468          ADD_ACTIVE(state_offset + 2, 0);
1469          if (clen > 0)
1470            {
1471            BOOL OK;
1472            switch (c)
1473              {
1474            case 0x000a:            case 0x000a:
1475            case 0x000b:            case 0x000b:
1476            case 0x000c:            case 0x000c:
1477              case 0x000d:
1478            case 0x0085:            case 0x0085:
1479            case 0x2028:            case 0x2028:
1480            case 0x2029:            case 0x2029:
1481            if (codevalue == OP_ANYNL_EXTRA + OP_TYPEPOSSTAR ||            OK = TRUE;
1482                codevalue == OP_ANYNL_EXTRA + OP_TYPEPOSQUERY)            break;
1483    
1484              default:
1485              OK = FALSE;
1486              break;
1487              }
1488            if (OK == (d == OP_VSPACE))
1489              {
1490              if (codevalue == OP_VSPACE_EXTRA + OP_TYPEPOSSTAR ||
1491                  codevalue == OP_VSPACE_EXTRA + OP_TYPEPOSQUERY)
1492              {              {
1493              active_count--;           /* Remove non-match possibility */              active_count--;           /* Remove non-match possibility */
1494              next_active_state--;              next_active_state--;
1495              }              }
1496            ADD_NEW_DATA(-(state_offset + count), 0, ncount);            ADD_NEW_DATA(-(state_offset + count), 0, 0);
1497              }
1498            }
1499          break;
1500    
1501          /*-----------------------------------------------------------------*/
1502          case OP_HSPACE_EXTRA + OP_TYPEQUERY:
1503          case OP_HSPACE_EXTRA + OP_TYPEMINQUERY:
1504          case OP_HSPACE_EXTRA + OP_TYPEPOSQUERY:
1505          count = 2;
1506          goto QS5;
1507    
1508          case OP_HSPACE_EXTRA + OP_TYPESTAR:
1509          case OP_HSPACE_EXTRA + OP_TYPEMINSTAR:
1510          case OP_HSPACE_EXTRA + OP_TYPEPOSSTAR:
1511          count = 0;
1512    
1513          QS5:
1514          ADD_ACTIVE(state_offset + 2, 0);
1515          if (clen > 0)
1516            {
1517            BOOL OK;
1518            switch (c)
1519              {
1520              case 0x09:      /* HT */
1521              case 0x20:      /* SPACE */
1522              case 0xa0:      /* NBSP */
1523              case 0x1680:    /* OGHAM SPACE MARK */
1524              case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
1525              case 0x2000:    /* EN QUAD */
1526              case 0x2001:    /* EM QUAD */
1527              case 0x2002:    /* EN SPACE */
1528              case 0x2003:    /* EM SPACE */
1529              case 0x2004:    /* THREE-PER-EM SPACE */
1530              case 0x2005:    /* FOUR-PER-EM SPACE */
1531              case 0x2006:    /* SIX-PER-EM SPACE */
1532              case 0x2007:    /* FIGURE SPACE */
1533              case 0x2008:    /* PUNCTUATION SPACE */
1534              case 0x2009:    /* THIN SPACE */
1535              case 0x200A:    /* HAIR SPACE */
1536              case 0x202f:    /* NARROW NO-BREAK SPACE */
1537              case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
1538              case 0x3000:    /* IDEOGRAPHIC SPACE */
1539              OK = TRUE;
1540            break;            break;
1541    
1542            default:            default:
1543              OK = FALSE;
1544            break;            break;
1545            }            }
1546    
1547            if (OK == (d == OP_HSPACE))
1548              {
1549              if (codevalue == OP_HSPACE_EXTRA + OP_TYPEPOSSTAR ||
1550                  codevalue == OP_HSPACE_EXTRA + OP_TYPEPOSQUERY)
1551                {
1552                active_count--;           /* Remove non-match possibility */
1553                next_active_state--;
1554                }
1555              ADD_NEW_DATA(-(state_offset + count), 0, 0);
1556              }
1557          }          }
1558        break;        break;
1559    
# Line 1242  for (;;) Line 1569  for (;;)
1569        if (clen > 0)        if (clen > 0)
1570          {          {
1571          BOOL OK;          BOOL OK;
1572          int category = _pcre_ucp_findprop(c, &chartype, &script);          const ucd_record * prop = GET_UCD(c);
1573          switch(code[4])          switch(code[4])
1574            {            {
1575            case PT_ANY:            case PT_ANY:
# Line 1250  for (;;) Line 1577  for (;;)
1577            break;            break;
1578    
1579            case PT_LAMP:            case PT_LAMP:
1580            OK = chartype == ucp_Lu || chartype == ucp_Ll || chartype == ucp_Lt;            OK = prop->chartype == ucp_Lu || prop->chartype == ucp_Ll || prop->chartype == ucp_Lt;
1581            break;            break;
1582    
1583            case PT_GC:            case PT_GC:
1584            OK = category == code[5];            OK = _pcre_ucp_gentype[prop->chartype] == code[5];
1585            break;            break;
1586    
1587            case PT_PC:            case PT_PC:
1588            OK = chartype == code[5];            OK = prop->chartype == code[5];
1589            break;            break;
1590    
1591            case PT_SC:            case PT_SC:
1592            OK = script == code[5];            OK = prop->script == code[5];
1593            break;            break;
1594    
1595            /* Should never occur, but keep compilers from grumbling. */            /* Should never occur, but keep compilers from grumbling. */
# Line 1295  for (;;) Line 1622  for (;;)
1622        if (codevalue != OP_EXTUNI_EXTRA + OP_TYPEEXACT)        if (codevalue != OP_EXTUNI_EXTRA + OP_TYPEEXACT)
1623          { ADD_ACTIVE(state_offset + 4, 0); }          { ADD_ACTIVE(state_offset + 4, 0); }
1624        count = current_state->count;  /* Number already matched */        count = current_state->count;  /* Number already matched */
1625        if (clen > 0 && _pcre_ucp_findprop(c, &chartype, &script) != ucp_M)        if (clen > 0 && UCD_CATEGORY(c) != ucp_M)
1626          {          {
1627          const uschar *nptr = ptr + clen;          const uschar *nptr = ptr + clen;
1628          int ncount = 0;          int ncount = 0;
# Line 1309  for (;;) Line 1636  for (;;)
1636            int nd;            int nd;
1637            int ndlen = 1;            int ndlen = 1;
1638            GETCHARLEN(nd, nptr, ndlen);            GETCHARLEN(nd, nptr, ndlen);
1639            if (_pcre_ucp_findprop(nd, &chartype, &script) != ucp_M) break;            if (UCD_CATEGORY(nd) != ucp_M) break;
1640            ncount++;            ncount++;
1641            nptr += ndlen;            nptr += ndlen;
1642            }            }
# Line 1334  for (;;) Line 1661  for (;;)
1661          int ncount = 0;          int ncount = 0;
1662          switch (c)          switch (c)
1663            {            {
1664              case 0x000b:
1665              case 0x000c:
1666              case 0x0085:
1667              case 0x2028:
1668              case 0x2029:
1669              if ((md->moptions & PCRE_BSR_ANYCRLF) != 0) break;
1670              goto ANYNL03;
1671    
1672            case 0x000d:            case 0x000d:
1673            if (ptr + 1 < end_subject && ptr[1] == 0x0a) ncount = 1;            if (ptr + 1 < end_subject && ptr[1] == 0x0a) ncount = 1;
1674            /* Fall through */            /* Fall through */
1675    
1676              ANYNL03:
1677              case 0x000a:
1678              if (codevalue == OP_ANYNL_EXTRA + OP_TYPEPOSUPTO)
1679                {
1680                active_count--;           /* Remove non-match possibility */
1681                next_active_state--;
1682                }
1683              if (++count >= GET2(code, 1))
1684                { ADD_NEW_DATA(-(state_offset + 4), 0, ncount); }
1685              else
1686                { ADD_NEW_DATA(-state_offset, count, ncount); }
1687              break;
1688    
1689              default:
1690              break;
1691              }
1692            }
1693          break;
1694    
1695          /*-----------------------------------------------------------------*/
1696          case OP_VSPACE_EXTRA + OP_TYPEEXACT:
1697          case OP_VSPACE_EXTRA + OP_TYPEUPTO:
1698          case OP_VSPACE_EXTRA + OP_TYPEMINUPTO:
1699          case OP_VSPACE_EXTRA + OP_TYPEPOSUPTO:
1700          if (codevalue != OP_VSPACE_EXTRA + OP_TYPEEXACT)
1701            { ADD_ACTIVE(state_offset + 4, 0); }
1702          count = current_state->count;  /* Number already matched */
1703          if (clen > 0)
1704            {
1705            BOOL OK;
1706            switch (c)
1707              {
1708            case 0x000a:            case 0x000a:
1709            case 0x000b:            case 0x000b:
1710            case 0x000c:            case 0x000c:
1711              case 0x000d:
1712            case 0x0085:            case 0x0085:
1713            case 0x2028:            case 0x2028:
1714            case 0x2029:            case 0x2029:
1715            if (codevalue == OP_ANYNL_EXTRA + OP_TYPEPOSUPTO)            OK = TRUE;
1716              break;
1717    
1718              default:
1719              OK = FALSE;
1720              }
1721    
1722            if (OK == (d == OP_VSPACE))
1723              {
1724              if (codevalue == OP_VSPACE_EXTRA + OP_TYPEPOSUPTO)
1725              {              {
1726              active_count--;           /* Remove non-match possibility */              active_count--;           /* Remove non-match possibility */
1727              next_active_state--;              next_active_state--;
1728              }              }
1729            if (++count >= GET2(code, 1))            if (++count >= GET2(code, 1))
1730              { ADD_NEW_DATA(-(state_offset + 4), 0, ncount); }              { ADD_NEW_DATA(-(state_offset + 4), 0, 0); }
1731            else            else
1732              { ADD_NEW_DATA(-state_offset, count, ncount); }              { ADD_NEW_DATA(-state_offset, count, 0); }
1733              }
1734            }
1735          break;
1736    
1737          /*-----------------------------------------------------------------*/
1738          case OP_HSPACE_EXTRA + OP_TYPEEXACT:
1739          case OP_HSPACE_EXTRA + OP_TYPEUPTO:
1740          case OP_HSPACE_EXTRA + OP_TYPEMINUPTO:
1741          case OP_HSPACE_EXTRA + OP_TYPEPOSUPTO:
1742          if (codevalue != OP_HSPACE_EXTRA + OP_TYPEEXACT)
1743            { ADD_ACTIVE(state_offset + 4, 0); }
1744          count = current_state->count;  /* Number already matched */
1745          if (clen > 0)
1746            {
1747            BOOL OK;
1748            switch (c)
1749              {
1750              case 0x09:      /* HT */
1751              case 0x20:      /* SPACE */
1752              case 0xa0:      /* NBSP */
1753              case 0x1680:    /* OGHAM SPACE MARK */
1754              case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
1755              case 0x2000:    /* EN QUAD */
1756              case 0x2001:    /* EM QUAD */
1757              case 0x2002:    /* EN SPACE */
1758              case 0x2003:    /* EM SPACE */
1759              case 0x2004:    /* THREE-PER-EM SPACE */
1760              case 0x2005:    /* FOUR-PER-EM SPACE */
1761              case 0x2006:    /* SIX-PER-EM SPACE */
1762              case 0x2007:    /* FIGURE SPACE */
1763              case 0x2008:    /* PUNCTUATION SPACE */
1764              case 0x2009:    /* THIN SPACE */
1765              case 0x200A:    /* HAIR SPACE */
1766              case 0x202f:    /* NARROW NO-BREAK SPACE */
1767              case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
1768              case 0x3000:    /* IDEOGRAPHIC SPACE */
1769              OK = TRUE;
1770            break;            break;
1771    
1772            default:            default:
1773              OK = FALSE;
1774            break;            break;
1775            }            }
1776    
1777            if (OK == (d == OP_HSPACE))
1778              {
1779              if (codevalue == OP_HSPACE_EXTRA + OP_TYPEPOSUPTO)
1780                {
1781                active_count--;           /* Remove non-match possibility */
1782                next_active_state--;
1783                }
1784              if (++count >= GET2(code, 1))
1785                { ADD_NEW_DATA(-(state_offset + 4), 0, 0); }
1786              else
1787                { ADD_NEW_DATA(-state_offset, count, 0); }
1788              }
1789          }          }
1790        break;        break;
1791    
# Line 1386  for (;;) Line 1816  for (;;)
1816            other case of the character. */            other case of the character. */
1817    
1818  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
1819            othercase = _pcre_ucp_othercase(c);            othercase = UCD_OTHERCASE(c);
1820  #else  #else
1821            othercase = NOTACHAR;            othercase = NOTACHAR;
1822  #endif  #endif
# Line 1411  for (;;) Line 1841  for (;;)
1841        to wait for them to pass before continuing. */        to wait for them to pass before continuing. */
1842    
1843        case OP_EXTUNI:        case OP_EXTUNI:
1844        if (clen > 0 && _pcre_ucp_findprop(c, &chartype, &script) != ucp_M)        if (clen > 0 && UCD_CATEGORY(c) != ucp_M)
1845          {          {
1846          const uschar *nptr = ptr + clen;          const uschar *nptr = ptr + clen;
1847          int ncount = 0;          int ncount = 0;
# Line 1419  for (;;) Line 1849  for (;;)
1849            {            {
1850            int nclen = 1;            int nclen = 1;
1851            GETCHARLEN(c, nptr, nclen);            GETCHARLEN(c, nptr, nclen);
1852            if (_pcre_ucp_findprop(c, &chartype, &script) != ucp_M) break;            if (UCD_CATEGORY(c) != ucp_M) break;
1853            ncount++;            ncount++;
1854            nptr += nclen;            nptr += nclen;
1855            }            }
# Line 1436  for (;;) Line 1866  for (;;)
1866        case OP_ANYNL:        case OP_ANYNL:
1867        if (clen > 0) switch(c)        if (clen > 0) switch(c)
1868          {          {
         case 0x000a:  
1869          case 0x000b:          case 0x000b:
1870          case 0x000c:          case 0x000c:
1871          case 0x0085:          case 0x0085:
1872          case 0x2028:          case 0x2028:
1873          case 0x2029:          case 0x2029:
1874            if ((md->moptions & PCRE_BSR_ANYCRLF) != 0) break;
1875    
1876            case 0x000a:
1877          ADD_NEW(state_offset + 1, 0);          ADD_NEW(state_offset + 1, 0);
1878          break;          break;
1879    
1880          case 0x000d:          case 0x000d:
1881          if (ptr + 1 < end_subject && ptr[1] == 0x0a)          if (ptr + 1 < end_subject && ptr[1] == 0x0a)
1882            {            {
# Line 1458  for (;;) Line 1891  for (;;)
1891        break;        break;
1892    
1893        /*-----------------------------------------------------------------*/        /*-----------------------------------------------------------------*/
1894          case OP_NOT_VSPACE:
1895          if (clen > 0) switch(c)
1896            {
1897            case 0x000a:
1898            case 0x000b:
1899            case 0x000c:
1900            case 0x000d:
1901            case 0x0085:
1902            case 0x2028:
1903            case 0x2029:
1904            break;
1905    
1906            default:
1907            ADD_NEW(state_offset + 1, 0);
1908            break;
1909            }
1910          break;
1911    
1912          /*-----------------------------------------------------------------*/
1913          case OP_VSPACE:
1914          if (clen > 0) switch(c)
1915            {
1916            case 0x000a:
1917            case 0x000b:
1918            case 0x000c:
1919            case 0x000d:
1920            case 0x0085:
1921            case 0x2028:
1922            case 0x2029:
1923            ADD_NEW(state_offset + 1, 0);
1924            break;
1925    
1926            default: break;
1927            }
1928          break;
1929    
1930          /*-----------------------------------------------------------------*/
1931          case OP_NOT_HSPACE:
1932          if (clen > 0) switch(c)
1933            {
1934            case 0x09:      /* HT */
1935            case 0x20:      /* SPACE */
1936            case 0xa0:      /* NBSP */
1937            case 0x1680:    /* OGHAM SPACE MARK */
1938            case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
1939            case 0x2000:    /* EN QUAD */
1940            case 0x2001:    /* EM QUAD */
1941            case 0x2002:    /* EN SPACE */
1942            case 0x2003:    /* EM SPACE */
1943            case 0x2004:    /* THREE-PER-EM SPACE */
1944            case 0x2005:    /* FOUR-PER-EM SPACE */
1945            case 0x2006:    /* SIX-PER-EM SPACE */
1946            case 0x2007:    /* FIGURE SPACE */
1947            case 0x2008:    /* PUNCTUATION SPACE */
1948            case 0x2009:    /* THIN SPACE */
1949            case 0x200A:    /* HAIR SPACE */
1950            case 0x202f:    /* NARROW NO-BREAK SPACE */
1951            case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
1952            case 0x3000:    /* IDEOGRAPHIC SPACE */
1953            break;
1954    
1955            default:
1956            ADD_NEW(state_offset + 1, 0);
1957            break;
1958            }
1959          break;
1960    
1961          /*-----------------------------------------------------------------*/
1962          case OP_HSPACE:
1963          if (clen > 0) switch(c)
1964            {
1965            case 0x09:      /* HT */
1966            case 0x20:      /* SPACE */
1967            case 0xa0:      /* NBSP */
1968            case 0x1680:    /* OGHAM SPACE MARK */
1969            case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
1970            case 0x2000:    /* EN QUAD */
1971            case 0x2001:    /* EM QUAD */
1972            case 0x2002:    /* EN SPACE */
1973            case 0x2003:    /* EM SPACE */
1974            case 0x2004:    /* THREE-PER-EM SPACE */
1975            case 0x2005:    /* FOUR-PER-EM SPACE */
1976            case 0x2006:    /* SIX-PER-EM SPACE */
1977            case 0x2007:    /* FIGURE SPACE */
1978            case 0x2008:    /* PUNCTUATION SPACE */
1979            case 0x2009:    /* THIN SPACE */
1980            case 0x200A:    /* HAIR SPACE */
1981            case 0x202f:    /* NARROW NO-BREAK SPACE */
1982            case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
1983            case 0x3000:    /* IDEOGRAPHIC SPACE */
1984            ADD_NEW(state_offset + 1, 0);
1985            break;
1986            }
1987          break;
1988    
1989          /*-----------------------------------------------------------------*/
1990        /* Match a negated single character. This is only used for one-byte        /* Match a negated single character. This is only used for one-byte
1991        characters, that is, we know that d < 256. The character we are        characters, that is, we know that d < 256. The character we are
1992        checking (c) can be multibyte. */        checking (c) can be multibyte. */
# Line 1488  for (;;) Line 2017  for (;;)
2017            if (utf8 && d >= 128)            if (utf8 && d >= 128)
2018              {              {
2019  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2020              otherd = _pcre_ucp_othercase(d);              otherd = UCD_OTHERCASE(d);
2021  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
2022              }              }
2023            else            else
# Line 1526  for (;;) Line 2055  for (;;)
2055            if (utf8 && d >= 128)            if (utf8 && d >= 128)
2056              {              {
2057  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2058              otherd = _pcre_ucp_othercase(d);              otherd = UCD_OTHERCASE(d);
2059  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
2060              }              }
2061            else            else
# Line 1562  for (;;) Line 2091  for (;;)
2091            if (utf8 && d >= 128)            if (utf8 && d >= 128)
2092              {              {
2093  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2094              otherd = _pcre_ucp_othercase(d);              otherd = UCD_OTHERCASE(d);
2095  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
2096              }              }
2097            else            else
# Line 1594  for (;;) Line 2123  for (;;)
2123            if (utf8 && d >= 128)            if (utf8 && d >= 128)
2124              {              {
2125  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2126              otherd = _pcre_ucp_othercase(d);              otherd = UCD_OTHERCASE(d);
2127  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
2128              }              }
2129            else            else
# Line 1629  for (;;) Line 2158  for (;;)
2158            if (utf8 && d >= 128)            if (utf8 && d >= 128)
2159              {              {
2160  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2161              otherd = _pcre_ucp_othercase(d);              otherd = UCD_OTHERCASE(d);
2162  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
2163              }              }
2164            else            else
# Line 1737  for (;;) Line 2266  for (;;)
2266    
2267  /* ========================================================================== */  /* ========================================================================== */
2268        /* These are the opcodes for fancy brackets of various kinds. We have        /* These are the opcodes for fancy brackets of various kinds. We have
2269        to use recursion in order to handle them. */        to use recursion in order to handle them. The "always failing" assertion
2270          (?!) is optimised to OP_FAIL when compiling, so we have to support that,
2271          though the other "backtracking verbs" are not supported. */
2272    
2273          case OP_FAIL:
2274          forced_fail++;    /* Count FAILs for multiple states */
2275          break;
2276    
2277        case OP_ASSERT:        case OP_ASSERT:
2278        case OP_ASSERT_NOT:        case OP_ASSERT_NOT:
# Line 1775  for (;;) Line 2310  for (;;)
2310          {          {
2311          int local_offsets[1000];          int local_offsets[1000];
2312          int local_workspace[1000];          int local_workspace[1000];
2313          int condcode = code[LINK_SIZE+1];          int codelink = GET(code, 1);
2314            int condcode;
2315    
2316            /* Because of the way auto-callout works during compile, a callout item
2317            is inserted between OP_COND and an assertion condition. This does not
2318            happen for the other conditions. */
2319    
2320            if (code[LINK_SIZE+1] == OP_CALLOUT)
2321              {
2322              rrc = 0;
2323              if (pcre_callout != NULL)
2324                {
2325                pcre_callout_block cb;
2326                cb.version          = 1;   /* Version 1 of the callout block */
2327                cb.callout_number   = code[LINK_SIZE+2];
2328                cb.offset_vector    = offsets;
2329                cb.subject          = (PCRE_SPTR)start_subject;
2330                cb.subject_length   = end_subject - start_subject;
2331                cb.start_match      = current_subject - start_subject;
2332                cb.current_position = ptr - start_subject;
2333                cb.pattern_position = GET(code, LINK_SIZE + 3);
2334                cb.next_item_length = GET(code, 3 + 2*LINK_SIZE);
2335                cb.capture_top      = 1;
2336                cb.capture_last     = -1;
2337                cb.callout_data     = md->callout_data;
2338                if ((rrc = (*pcre_callout)(&cb)) < 0) return rrc;   /* Abandon */
2339                }
2340              if (rrc > 0) break;                      /* Fail this thread */
2341              code += _pcre_OP_lengths[OP_CALLOUT];    /* Skip callout data */
2342              }
2343    
2344            condcode = code[LINK_SIZE+1];
2345    
2346          /* Back reference conditions are not supported */          /* Back reference conditions are not supported */
2347    
2348          if (condcode == OP_CREF) return PCRE_ERROR_DFA_UCOND;          if (condcode == OP_CREF || condcode == OP_NCREF)
2349              return PCRE_ERROR_DFA_UCOND;
2350    
2351          /* The DEFINE condition is always false */          /* The DEFINE condition is always false */
2352    
2353          if (condcode == OP_DEF)          if (condcode == OP_DEF)
2354            {            { ADD_ACTIVE(state_offset + codelink + LINK_SIZE + 1, 0); }
           ADD_ACTIVE(state_offset + GET(code, 1) + LINK_SIZE + 1, 0);  
           }  
2355    
2356          /* The only supported version of OP_RREF is for the value RREF_ANY,          /* The only supported version of OP_RREF is for the value RREF_ANY,
2357          which means "test if in any recursion". We can't test for specifically          which means "test if in any recursion". We can't test for specifically
2358          recursed groups. */          recursed groups. */
2359    
2360          else if (condcode == OP_RREF)          else if (condcode == OP_RREF || condcode == OP_NRREF)
2361            {            {
2362            int value = GET2(code, LINK_SIZE+2);            int value = GET2(code, LINK_SIZE+2);
2363            if (value != RREF_ANY) return PCRE_ERROR_DFA_UCOND;            if (value != RREF_ANY) return PCRE_ERROR_DFA_UCOND;
2364            if (recursing > 0) { ADD_ACTIVE(state_offset + LINK_SIZE + 4, 0); }            if (recursing > 0)
2365              else { ADD_ACTIVE(state_offset + GET(code, 1) + LINK_SIZE + 1, 0); }              { ADD_ACTIVE(state_offset + LINK_SIZE + 4, 0); }
2366              else { ADD_ACTIVE(state_offset + codelink + LINK_SIZE + 1, 0); }
2367            }            }
2368    
2369          /* Otherwise, the condition is an assertion */          /* Otherwise, the condition is an assertion */
# Line 1827  for (;;) Line 2393  for (;;)
2393                  (condcode == OP_ASSERT || condcode == OP_ASSERTBACK))                  (condcode == OP_ASSERT || condcode == OP_ASSERTBACK))
2394              { ADD_ACTIVE(endasscode + LINK_SIZE + 1 - start_code, 0); }              { ADD_ACTIVE(endasscode + LINK_SIZE + 1 - start_code, 0); }
2395            else            else
2396              { ADD_ACTIVE(state_offset + GET(code, 1) + LINK_SIZE + 1, 0); }              { ADD_ACTIVE(state_offset + codelink + LINK_SIZE + 1, 0); }
2397            }            }
2398          }          }
2399        break;        break;
# Line 1979  for (;;) Line 2545  for (;;)
2545        /* Handle callouts */        /* Handle callouts */
2546    
2547        case OP_CALLOUT:        case OP_CALLOUT:
2548          rrc = 0;
2549        if (pcre_callout != NULL)        if (pcre_callout != NULL)
2550          {          {
         int rrc;  
2551          pcre_callout_block cb;          pcre_callout_block cb;
2552          cb.version          = 1;   /* Version 1 of the callout block */          cb.version          = 1;   /* Version 1 of the callout block */
2553          cb.callout_number   = code[1];          cb.callout_number   = code[1];
# Line 1996  for (;;) Line 2562  for (;;)
2562          cb.capture_last     = -1;          cb.capture_last     = -1;
2563          cb.callout_data     = md->callout_data;          cb.callout_data     = md->callout_data;
2564          if ((rrc = (*pcre_callout)(&cb)) < 0) return rrc;   /* Abandon */          if ((rrc = (*pcre_callout)(&cb)) < 0) return rrc;   /* Abandon */
         if (rrc == 0) { ADD_ACTIVE(state_offset + 2 + 2*LINK_SIZE, 0); }  
2565          }          }
2566          if (rrc == 0)
2567            { ADD_ACTIVE(state_offset + _pcre_OP_lengths[OP_CALLOUT], 0); }
2568        break;        break;
2569    
2570    
# Line 2013  for (;;) Line 2580  for (;;)
2580    /* We have finished the processing at the current subject character. If no    /* We have finished the processing at the current subject character. If no
2581    new states have been set for the next character, we have found all the    new states have been set for the next character, we have found all the
2582    matches that we are going to find. If we are at the top level and partial    matches that we are going to find. If we are at the top level and partial
2583    matching has been requested, check for appropriate conditions. */    matching has been requested, check for appropriate conditions.
2584    
2585      The "forced_ fail" variable counts the number of (*F) encountered for the
2586      character. If it is equal to the original active_count (saved in
2587      workspace[1]) it means that (*F) was found on every active state. In this
2588      case we don't want to give a partial match.
2589    
2590      The "could_continue" variable is true if a state could have continued but
2591      for the fact that the end of the subject was reached. */
2592    
2593    if (new_count <= 0)    if (new_count <= 0)
2594      {      {
2595      if (match_count < 0 &&                     /* No matches found */      if (rlevel == 1 &&                               /* Top level, and */
2596          rlevel == 1 &&                         /* Top level match function */          could_continue &&                            /* Some could go on */
2597          (md->moptions & PCRE_PARTIAL) != 0 &&  /* Want partial matching */          forced_fail != workspace[1] &&               /* Not all forced fail & */
2598          ptr >= end_subject &&                  /* Reached end of subject */          (                                            /* either... */
2599          ptr > current_subject)                 /* Matched non-empty string */          (md->moptions & PCRE_PARTIAL_HARD) != 0      /* Hard partial */
2600            ||                                           /* or... */
2601            ((md->moptions & PCRE_PARTIAL_SOFT) != 0 &&  /* Soft partial and */
2602             match_count < 0)                            /* no matches */
2603            ) &&                                         /* And... */
2604            ptr >= end_subject &&                     /* Reached end of subject */
2605            ptr > current_subject)                    /* Matched non-empty string */
2606        {        {
2607        if (offsetcount >= 2)        if (offsetcount >= 2)
2608          {          {
2609          offsets[0] = current_subject - start_subject;          offsets[0] = md->start_used_ptr - start_subject;
2610          offsets[1] = end_subject - start_subject;          offsets[1] = end_subject - start_subject;
2611          }          }
2612        match_count = PCRE_ERROR_PARTIAL;        match_count = PCRE_ERROR_PARTIAL;
# Line 2080  Returns: > 0 => number of match Line 2661  Returns: > 0 => number of match
2661                   < -1 => some kind of unexpected problem                   < -1 => some kind of unexpected problem
2662  */  */
2663    
2664  PCRE_EXP_DEFN int  PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
2665  pcre_dfa_exec(const pcre *argument_re, const pcre_extra *extra_data,  pcre_dfa_exec(const pcre *argument_re, const pcre_extra *extra_data,
2666    const char *subject, int length, int start_offset, int options, int *offsets,    const char *subject, int length, int start_offset, int options, int *offsets,
2667    int offsetcount, int *workspace, int wscount)    int offsetcount, int *workspace, int wscount)
# Line 2167  md->start_code = (const uschar *)argumen Line 2748  md->start_code = (const uschar *)argumen
2748      re->name_table_offset + re->name_count * re->name_entry_size;      re->name_table_offset + re->name_count * re->name_entry_size;
2749  md->start_subject = (const unsigned char *)subject;  md->start_subject = (const unsigned char *)subject;
2750  md->end_subject = end_subject;  md->end_subject = end_subject;
2751    md->start_offset = start_offset;
2752  md->moptions = options;  md->moptions = options;
2753  md->poptions = re->options;  md->poptions = re->options;
2754    
2755    /* If the BSR option is not set at match time, copy what was set
2756    at compile time. */
2757    
2758    if ((md->moptions & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE)) == 0)
2759      {
2760      if ((re->options & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE)) != 0)
2761        md->moptions |= re->options & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE);
2762    #ifdef BSR_ANYCRLF
2763      else md->moptions |= PCRE_BSR_ANYCRLF;
2764    #endif
2765      }
2766    
2767  /* Handle different types of newline. The three bits give eight cases. If  /* Handle different types of newline. The three bits give eight cases. If
2768  nothing is set at run time, whatever was used at compile time applies. */  nothing is set at run time, whatever was used at compile time applies. */
2769    
# Line 2177  switch ((((options & PCRE_NEWLINE_BITS) Line 2771  switch ((((options & PCRE_NEWLINE_BITS)
2771           PCRE_NEWLINE_BITS)           PCRE_NEWLINE_BITS)
2772    {    {
2773    case 0: newline = NEWLINE; break;   /* Compile-time default */    case 0: newline = NEWLINE; break;   /* Compile-time default */
2774    case PCRE_NEWLINE_CR: newline = '\r'; break;    case PCRE_NEWLINE_CR: newline = CHAR_CR; break;
2775    case PCRE_NEWLINE_LF: newline = '\n'; break;    case PCRE_NEWLINE_LF: newline = CHAR_NL; break;
2776    case PCRE_NEWLINE_CR+    case PCRE_NEWLINE_CR+
2777         PCRE_NEWLINE_LF: newline = ('\r' << 8) | '\n'; break;         PCRE_NEWLINE_LF: newline = (CHAR_CR << 8) | CHAR_NL; break;
2778    case PCRE_NEWLINE_ANY: newline = -1; break;    case PCRE_NEWLINE_ANY: newline = -1; break;
2779    case PCRE_NEWLINE_ANYCRLF: newline = -2; break;    case PCRE_NEWLINE_ANYCRLF: newline = -2; break;
2780    default: return PCRE_ERROR_BADNEWLINE;    default: return PCRE_ERROR_BADNEWLINE;
# Line 2240  if (md->tables == NULL) md->tables = _pc Line 2834  if (md->tables == NULL) md->tables = _pc
2834  used in a loop when finding where to start. */  used in a loop when finding where to start. */
2835    
2836  lcc = md->tables + lcc_offset;  lcc = md->tables + lcc_offset;
2837  startline = (re->options & PCRE_STARTLINE) != 0;  startline = (re->flags & PCRE_STARTLINE) != 0;
2838  firstline = (re->options & PCRE_FIRSTLINE) != 0;  firstline = (re->options & PCRE_FIRSTLINE) != 0;
2839    
2840  /* Set up the first character to match, if available. The first_byte value is  /* Set up the first character to match, if available. The first_byte value is
# Line 2251  studied, there may be a bitmap of possib Line 2845  studied, there may be a bitmap of possib
2845    
2846  if (!anchored)  if (!anchored)
2847    {    {
2848    if ((re->options & PCRE_FIRSTSET) != 0)    if ((re->flags & PCRE_FIRSTSET) != 0)
2849      {      {
2850      first_byte = re->first_byte & 255;      first_byte = re->first_byte & 255;
2851      if ((first_byte_caseless = ((re->first_byte & REQ_CASELESS) != 0)) == TRUE)      if ((first_byte_caseless = ((re->first_byte & REQ_CASELESS) != 0)) == TRUE)
# Line 2259  if (!anchored) Line 2853  if (!anchored)
2853      }      }
2854    else    else
2855      {      {
2856      if (startline && study != NULL &&      if (!startline && study != NULL &&
2857           (study->options & PCRE_STUDY_MAPPED) != 0)           (study->flags & PCRE_STUDY_MAPPED) != 0)
2858        start_bits = study->start_bits;        start_bits = study->start_bits;
2859      }      }
2860    }    }
# Line 2268  if (!anchored) Line 2862  if (!anchored)
2862  /* For anchored or unanchored matches, there may be a "last known required  /* For anchored or unanchored matches, there may be a "last known required
2863  character" set. */  character" set. */
2864    
2865  if ((re->options & PCRE_REQCHSET) != 0)  if ((re->flags & PCRE_REQCHSET) != 0)
2866    {    {
2867    req_byte = re->req_byte & 255;    req_byte = re->req_byte & 255;
2868    req_byte_caseless = (re->req_byte & REQ_CASELESS) != 0;    req_byte_caseless = (re->req_byte & REQ_CASELESS) != 0;
# Line 2276  if ((re->options & PCRE_REQCHSET) != 0) Line 2870  if ((re->options & PCRE_REQCHSET) != 0)
2870    }    }
2871    
2872  /* Call the main matching function, looping for a non-anchored regex after a  /* Call the main matching function, looping for a non-anchored regex after a
2873  failed match. Unless restarting, optimize by moving to the first match  failed match. If not restarting, perform certain optimizations at the start of
2874  character if possible, when not anchored. Then unless wanting a partial match,  a match. */
 check for a required later character. */  
2875    
2876  for (;;)  for (;;)
2877    {    {
# Line 2288  for (;;) Line 2881  for (;;)
2881      {      {
2882      const uschar *save_end_subject = end_subject;      const uschar *save_end_subject = end_subject;
2883    
2884      /* 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
2885      start of the match is constrained to the first line of a multiline string.      line of a multiline string. Implement this by temporarily adjusting
2886      Implement this by temporarily adjusting end_subject so that we stop      end_subject so that we stop scanning at a newline. If the match fails at
2887      scanning at a newline. If the match fails at the newline, later code breaks      the newline, later code breaks this loop. */
     this loop. */  
2888    
2889      if (firstline)      if (firstline)
2890        {        {
2891        const uschar *t = current_subject;        USPTR t = current_subject;
2892    #ifdef SUPPORT_UTF8
2893          if (utf8)
2894            {
2895            while (t < md->end_subject && !IS_NEWLINE(t))
2896              {
2897              t++;
2898              while (t < end_subject && (*t & 0xc0) == 0x80) t++;
2899              }
2900            }
2901          else
2902    #endif
2903        while (t < md->end_subject && !IS_NEWLINE(t)) t++;        while (t < md->end_subject && !IS_NEWLINE(t)) t++;
2904        end_subject = t;        end_subject = t;
2905        }        }
2906    
2907      if (first_byte >= 0)      /* There are some optimizations that avoid running the match if a known
2908        starting point is not found. However, there is an option that disables
2909        these, for testing and for ensuring that all callouts do actually occur. */
2910    
2911        if ((options & PCRE_NO_START_OPTIMIZE) == 0)
2912        {        {
2913        if (first_byte_caseless)        /* Advance to a known first byte. */
         while (current_subject < end_subject &&  
                lcc[*current_subject] != first_byte)  
           current_subject++;  
       else  
         while (current_subject < end_subject && *current_subject != first_byte)  
           current_subject++;  
       }  
2914    
2915      /* Or to just after a linebreak for a multiline match if possible */        if (first_byte >= 0)
2916            {
2917            if (first_byte_caseless)
2918              while (current_subject < end_subject &&
2919                     lcc[*current_subject] != first_byte)
2920                current_subject++;
2921            else
2922              while (current_subject < end_subject &&
2923                     *current_subject != first_byte)
2924                current_subject++;
2925            }
2926    
2927      else if (startline)        /* Or to just after a linebreak for a multiline match if possible */
2928        {  
2929        if (current_subject > md->start_subject + start_offset)        else if (startline)
2930          {          {
2931          while (current_subject <= end_subject && !WAS_NEWLINE(current_subject))          if (current_subject > md->start_subject + start_offset)
2932            current_subject++;            {
2933    #ifdef SUPPORT_UTF8
2934              if (utf8)
2935                {
2936                while (current_subject < end_subject &&
2937                       !WAS_NEWLINE(current_subject))
2938                  {
2939                  current_subject++;
2940                  while(current_subject < end_subject &&
2941                        (*current_subject & 0xc0) == 0x80)
2942                    current_subject++;
2943                  }
2944                }
2945              else
2946    #endif
2947              while (current_subject < end_subject && !WAS_NEWLINE(current_subject))
2948                current_subject++;
2949    
2950              /* If we have just passed a CR and the newline option is ANY or
2951              ANYCRLF, and we are now at a LF, advance the match position by one
2952              more character. */
2953    
2954          /* If we have just passed a CR and the newline option is ANY or            if (current_subject[-1] == CHAR_CR &&
2955          ANYCRLF, and we are now at a LF, advance the match position by one more                 (md->nltype == NLTYPE_ANY || md->nltype == NLTYPE_ANYCRLF) &&
2956          character. */                 current_subject < end_subject &&
2957                   *current_subject == CHAR_NL)
2958          if (current_subject[-1] == '\r' &&              current_subject++;
2959               (md->nltype == NLTYPE_ANY || md->nltype == NLTYPE_ANYCRLF) &&            }
              current_subject < end_subject &&  
              *current_subject == '\n')  
           current_subject++;  
2960          }          }
       }  
2961    
2962      /* Or to a non-unique first char after study */        /* Or to a non-unique first char after study */
2963    
2964      else if (start_bits != NULL)        else if (start_bits != NULL)
       {  
       while (current_subject < end_subject)  
2965          {          {
2966          register unsigned int c = *current_subject;          while (current_subject < end_subject)
2967          if ((start_bits[c/8] & (1 << (c&7))) == 0) current_subject++;            {
2968            else break;            register unsigned int c = *current_subject;
2969              if ((start_bits[c/8] & (1 << (c&7))) == 0) current_subject++;
2970                else break;
2971              }
2972          }          }
2973        }        }
2974    
2975      /* Restore fudged end_subject */      /* Restore fudged end_subject */
2976    
2977      end_subject = save_end_subject;      end_subject = save_end_subject;
     }  
   
   /* If req_byte is set, we know that that character must appear in the subject  
   for the match to succeed. If the first character is set, req_byte must be  
   later in the subject; otherwise the test starts at the match point. This  
   optimization can save a huge amount of work in patterns with nested unlimited  
   repeats that aren't going to match. Writing separate code for cased/caseless  
   versions makes it go faster, as does using an autoincrement and backing off  
   on a match.  
   
   HOWEVER: when the subject string is very, very long, searching to its end can  
   take a long time, and give bad performance on quite ordinary patterns. This  
   showed up when somebody was matching /^C/ on a 32-megabyte string... so we  
   don't do this when the string is sufficiently long.  
   
   ALSO: this processing is disabled when partial matching is requested.  
   */  
   
   if (req_byte >= 0 &&  
       end_subject - current_subject < REQ_BYTE_MAX &&  
       (options & PCRE_PARTIAL) == 0)  
     {  
     register const uschar *p = current_subject + ((first_byte >= 0)? 1 : 0);  
2978    
2979      /* We don't need to repeat the search if we haven't yet reached the      /* The following two optimizations are disabled for partial matching or if
2980      place we found it at last time. */      disabling is explicitly requested (and of course, by the test above, this
2981        code is not obeyed when restarting after a partial match). */
2982    
2983      if (p > req_byte_ptr)      if ((options & PCRE_NO_START_OPTIMIZE) == 0 &&
2984            (options & (PCRE_PARTIAL_HARD|PCRE_PARTIAL_SOFT)) == 0)
2985        {        {
2986        if (req_byte_caseless)        /* If the pattern was studied, a minimum subject length may be set. This
2987          {        is a lower bound; no actual string of that length may actually match the
2988          while (p < end_subject)        pattern. Although the value is, strictly, in characters, we treat it as
2989            {        bytes to avoid spending too much time in this optimization. */
2990            register int pp = *p++;  
2991            if (pp == req_byte || pp == req_byte2) { p--; break; }        if (study != NULL && (study->flags & PCRE_STUDY_MINLEN) != 0 &&
2992            }            end_subject - current_subject < study->minlength)
2993          }          return PCRE_ERROR_NOMATCH;
2994        else  
2995          /* If req_byte is set, we know that that character must appear in the
2996          subject for the match to succeed. If the first character is set, req_byte
2997          must be later in the subject; otherwise the test starts at the match
2998          point. This optimization can save a huge amount of work in patterns with
2999          nested unlimited repeats that aren't going to match. Writing separate
3000          code for cased/caseless versions makes it go faster, as does using an
3001          autoincrement and backing off on a match.
3002    
3003          HOWEVER: when the subject string is very, very long, searching to its end
3004          can take a long time, and give bad performance on quite ordinary
3005          patterns. This showed up when somebody was matching /^C/ on a 32-megabyte
3006          string... so we don't do this when the string is sufficiently long. */
3007    
3008          if (req_byte >= 0 && end_subject - current_subject < REQ_BYTE_MAX)
3009          {          {
3010          while (p < end_subject)          register const uschar *p = current_subject + ((first_byte >= 0)? 1 : 0);
3011    
3012            /* We don't need to repeat the search if we haven't yet reached the
3013            place we found it at last time. */
3014    
3015            if (p > req_byte_ptr)
3016            {            {
3017            if (*p++ == req_byte) { p--; break; }            if (req_byte_caseless)
3018            }              {
3019          }              while (p < end_subject)
3020                  {
3021                  register int pp = *p++;
3022                  if (pp == req_byte || pp == req_byte2) { p--; break; }
3023                  }
3024                }
3025              else
3026                {
3027                while (p < end_subject)
3028                  {
3029                  if (*p++ == req_byte) { p--; break; }
3030                  }
3031                }
3032    
3033        /* If we can't find the required character, break the matching loop,            /* If we can't find the required character, break the matching loop,
3034        which will cause a return or PCRE_ERROR_NOMATCH. */            which will cause a return or PCRE_ERROR_NOMATCH. */
3035    
3036        if (p >= end_subject) break;            if (p >= end_subject) break;
3037    
3038        /* If we have found the required character, save the point where we            /* If we have found the required character, save the point where we
3039        found it, so that we don't search again next time round the loop if            found it, so that we don't search again next time round the loop if
3040        the start hasn't passed this character yet. */            the start hasn't passed this character yet. */
3041    
3042        req_byte_ptr = p;            req_byte_ptr = p;
3043              }
3044            }
3045        }        }
3046      }      }   /* End of optimizations that are done when not restarting */
3047    
3048    /* OK, now we can do the business */    /* OK, now we can do the business */
3049    
3050      md->start_used_ptr = current_subject;
3051    
3052    rc = internal_dfa_exec(    rc = internal_dfa_exec(
3053      md,                                /* fixed match data */      md,                                /* fixed match data */
3054      md->start_code,                    /* this subexpression's code */      md->start_code,                    /* this subexpression's code */
# Line 2438  for (;;) Line 3079  for (;;)
3079      }      }
3080    if (current_subject > end_subject) break;    if (current_subject > end_subject) break;
3081    
3082    /* If we have just passed a CR and the newline option is CRLF or ANY or    /* If we have just passed a CR and we are now at a LF, and the pattern does
3083    ANYCRLF, and we are now at a LF, advance the match position by one more    not contain any explicit matches for \r or \n, and the newline option is CRLF
3084    character. */    or ANY or ANYCRLF, advance the match position by one more character. */
3085    
3086    if (current_subject[-1] == '\r' &&    if (current_subject[-1] == CHAR_CR &&
3087         (md->nltype == NLTYPE_ANY ||        current_subject < end_subject &&
3088          md->nltype == NLTYPE_ANYCRLF ||        *current_subject == CHAR_NL &&
3089          md->nllen == 2) &&        (re->flags & PCRE_HASCRORLF) == 0 &&
3090         current_subject < end_subject &&          (md->nltype == NLTYPE_ANY ||
3091         *current_subject == '\n')           md->nltype == NLTYPE_ANYCRLF ||
3092             md->nllen == 2))
3093      current_subject++;      current_subject++;
3094    
3095    }   /* "Bumpalong" loop */    }   /* "Bumpalong" loop */
Legend:
Removed from v.152  
changed lines
  Added in v.463
webmaster@exim.org
 ViewVC Help
Powered by ViewVC 1.1.12