/[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 462 by ph10, Sat Oct 17 19:55:02 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, in order to support PCRE_PARTIAL_HARD behaviour.
170    ***NOTE*** If the start of this table is modified, the two tables that follow
171    must also be modified. */
172    
173    static const uschar poptable[] = {
174      0,                             /* End                                    */
175      0, 0, 0, 0, 0,                 /* \A, \G, \K, \B, \b                     */
176      1, 1, 1, 1, 1, 1,              /* \D, \d, \S, \s, \W, \w                 */
177      1, 1, 1,                       /* Any, AllAny, Anybyte                   */
178      1, 1, 1,                       /* NOTPROP, PROP, EXTUNI                  */
179      1, 1, 1, 1, 1,                 /* \R, \H, \h, \V, \v                     */
180      0, 0, 0, 0, 0,                 /* \Z, \z, Opt, ^, $                      */
181      1,                             /* Char                                   */
182      1,                             /* Charnc                                 */
183      1,                             /* not                                    */
184      /* Positive single-char repeats                                          */
185      1, 1, 1, 1, 1, 1,              /* *, *?, +, +?, ?, ??                    */
186      1, 1, 1,                       /* upto, minupto, exact                   */
187      1, 1, 1, 1,                    /* *+, ++, ?+, upto+                      */
188      /* Negative single-char repeats - only for chars < 256                   */
189      1, 1, 1, 1, 1, 1,              /* NOT *, *?, +, +?, ?, ??                */
190      1, 1, 1,                       /* NOT upto, minupto, exact               */
191      1, 1, 1, 1,                    /* NOT *+, ++, ?+, upto+                  */
192      /* Positive type repeats                                                 */
193      1, 1, 1, 1, 1, 1,              /* Type *, *?, +, +?, ?, ??               */
194      1, 1, 1,                       /* Type upto, minupto, exact              */
195      1, 1, 1, 1,                    /* Type *+, ++, ?+, upto+                 */
196      /* Character class & ref repeats                                         */
197      1, 1, 1, 1, 1, 1,              /* *, *?, +, +?, ?, ??                    */
198      1, 1,                          /* CRRANGE, CRMINRANGE                    */
199      1,                             /* CLASS                                  */
200      1,                             /* NCLASS                                 */
201      1,                             /* XCLASS - variable length               */
202      0,                             /* REF                                    */
203      0,                             /* RECURSE                                */
204      0,                             /* CALLOUT                                */
205      0,                             /* Alt                                    */
206      0,                             /* Ket                                    */
207      0,                             /* KetRmax                                */
208      0,                             /* KetRmin                                */
209      0,                             /* Assert                                 */
210      0,                             /* Assert not                             */
211      0,                             /* Assert behind                          */
212      0,                             /* Assert behind not                      */
213      0,                             /* Reverse                                */
214      0, 0, 0, 0,                    /* ONCE, BRA, CBRA, COND                  */
215      0, 0, 0,                       /* SBRA, SCBRA, SCOND                     */
216      0,                             /* CREF                                   */
217      0,                             /* RREF                                   */
218      0,                             /* DEF                                    */
219      0, 0,                          /* BRAZERO, BRAMINZERO                    */
220      0, 0, 0, 0,                    /* PRUNE, SKIP, THEN, COMMIT              */
221      0, 0, 0, 0                     /* FAIL, ACCEPT, CLOSE, SKIPZERO          */
222  };  };
223    
224  /* 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,
225  and \w */  and \w */
226    
227  static uschar toptable1[] = {  static const uschar toptable1[] = {
228    0, 0, 0, 0, 0,    0, 0, 0, 0, 0, 0,
229    ctype_digit, ctype_digit,    ctype_digit, ctype_digit,
230    ctype_space, ctype_space,    ctype_space, ctype_space,
231    ctype_word,  ctype_word,    ctype_word,  ctype_word,
232    0                               /* OP_ANY */    0, 0                            /* OP_ANY, OP_ALLANY */
233  };  };
234    
235  static uschar toptable2[] = {  static const uschar toptable2[] = {
236    0, 0, 0, 0, 0,    0, 0, 0, 0, 0, 0,
237    ctype_digit, 0,    ctype_digit, 0,
238    ctype_space, 0,    ctype_space, 0,
239    ctype_word,  0,    ctype_word,  0,
240    1                               /* OP_ANY */    1, 1                            /* OP_ANY, OP_ALLANY */
241  };  };
242    
243    
# Line 211  Arguments: Line 309  Arguments:
309    rlevel            function call recursion level    rlevel            function call recursion level
310    recursing         regex recursive call level    recursing         regex recursive call level
311    
312  Returns:            > 0 =>  Returns:            > 0 => number of match offset pairs placed in offsets
313                      = 0 =>                      = 0 => offsets overflowed; longest matches are present
314                       -1 => failed to match                       -1 => failed to match
315                     < -1 => some kind of unexpected problem                     < -1 => some kind of unexpected problem
316    
# Line 378  if (*first_op == OP_REVERSE) Line 476  if (*first_op == OP_REVERSE)
476      current_subject -= gone_back;      current_subject -= gone_back;
477      }      }
478    
479      /* Save the earliest consulted character */
480    
481      if (current_subject < md->start_used_ptr)
482        md->start_used_ptr = current_subject;
483    
484    /* Now we can process the individual branches. */    /* Now we can process the individual branches. */
485    
486    end_code = this_start_code;    end_code = this_start_code;
# Line 442  for (;;) Line 545  for (;;)
545    int i, j;    int i, j;
546    int clen, dlen;    int clen, dlen;
547    unsigned int c, d;    unsigned int c, d;
548      int forced_fail = 0;
549      int reached_end = 0;
550      BOOL could_continue = FALSE;
551    
552    /* 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
553    new state list. */    new state list. */
# Line 499  for (;;) Line 605  for (;;)
605      stateblock *current_state = active_states + i;      stateblock *current_state = active_states + i;
606      const uschar *code;      const uschar *code;
607      int state_offset = current_state->offset;      int state_offset = current_state->offset;
608      int count, codevalue;      int count, codevalue, rrc;
 #ifdef SUPPORT_UCP  
     int chartype, script;  
 #endif  
609    
610  #ifdef DEBUG  #ifdef DEBUG
611      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 637  for (;;)
637          }          }
638        }        }
639    
640      /* 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.
641        See the note at the head of this module about the possibility of improving
642        performance here. */
643    
644      for (j = 0; j < i; j++)      for (j = 0; j < i; j++)
645        {        {
# Line 550  for (;;) Line 655  for (;;)
655    
656      code = start_code + state_offset;      code = start_code + state_offset;
657      codevalue = *code;      codevalue = *code;
658    
659        /* If this opcode inspects a character, but we are at the end of the
660        subject, remember the fact so that we can support PCRE_PARTIAL_HARD. */
661    
662        if (clen == 0 && poptable[codevalue] != 0)
663          could_continue = TRUE;
664    
665      /* 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
666      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
# Line 557  for (;;) Line 668  for (;;)
668      permitted.      permitted.
669    
670      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
671      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
672      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
673      \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.
674      opcodes. */      */
675    
676      if (coptable[codevalue] > 0)      if (coptable[codevalue] > 0)
677        {        {
# Line 578  for (;;) Line 689  for (;;)
689            case OP_PROP: codevalue += OP_PROP_EXTRA; break;            case OP_PROP: codevalue += OP_PROP_EXTRA; break;
690            case OP_ANYNL: codevalue += OP_ANYNL_EXTRA; break;            case OP_ANYNL: codevalue += OP_ANYNL_EXTRA; break;
691            case OP_EXTUNI: codevalue += OP_EXTUNI_EXTRA; break;            case OP_EXTUNI: codevalue += OP_EXTUNI_EXTRA; break;
692              case OP_NOT_HSPACE:
693              case OP_HSPACE: codevalue += OP_HSPACE_EXTRA; break;
694              case OP_NOT_VSPACE:
695              case OP_VSPACE: codevalue += OP_VSPACE_EXTRA; break;
696            default: break;            default: break;
697            }            }
698          }          }
# Line 597  for (;;) Line 712  for (;;)
712  /* ========================================================================== */  /* ========================================================================== */
713        /* 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
714        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
715        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
716          start of the subject, save the match data, shifting up all previous
717        matches so we always have the longest first. */        matches so we always have the longest first. */
718    
719        case OP_KET:        case OP_KET:
# Line 611  for (;;) Line 727  for (;;)
727            ADD_ACTIVE(state_offset - GET(code, 1), 0);            ADD_ACTIVE(state_offset - GET(code, 1), 0);
728            }            }
729          }          }
730        else if (ptr > current_subject || (md->moptions & PCRE_NOTEMPTY) == 0)        else
731          {          {
732          if (match_count < 0) match_count = (offsetcount >= 2)? 1 : 0;          reached_end++;    /* Count branches that reach the end */
733            else if (match_count > 0 && ++match_count * 2 >= offsetcount)          if (ptr > current_subject ||
734              match_count = 0;              ((md->moptions & PCRE_NOTEMPTY) == 0 &&
735          count = ((match_count == 0)? offsetcount : match_count * 2) - 2;                ((md->moptions & PCRE_NOTEMPTY_ATSTART) == 0 ||
736          if (count > 0) memmove(offsets + 2, offsets, count * sizeof(int));                  current_subject > start_subject + md->start_offset)))
737          if (offsetcount >= 2)            {
738            {            if (match_count < 0) match_count = (offsetcount >= 2)? 1 : 0;
739            offsets[0] = current_subject - start_subject;              else if (match_count > 0 && ++match_count * 2 >= offsetcount)
740            offsets[1] = ptr - start_subject;                match_count = 0;
741            DPRINTF(("%.*sSet matched string = \"%.*s\"\n", rlevel*2-2, SP,            count = ((match_count == 0)? offsetcount : match_count * 2) - 2;
742              offsets[1] - offsets[0], current_subject));            if (count > 0) memmove(offsets + 2, offsets, count * sizeof(int));
743            }            if (offsetcount >= 2)
744          if ((md->moptions & PCRE_DFA_SHORTEST) != 0)              {
745            {              offsets[0] = current_subject - start_subject;
746            DPRINTF(("%.*sEnd of internal_dfa_exec %d: returning %d\n"              offsets[1] = ptr - start_subject;
747              "%.*s---------------------\n\n", rlevel*2-2, SP, rlevel,              DPRINTF(("%.*sSet matched string = \"%.*s\"\n", rlevel*2-2, SP,
748              match_count, rlevel*2-2, SP));                offsets[1] - offsets[0], current_subject));
749            return match_count;              }
750              if ((md->moptions & PCRE_DFA_SHORTEST) != 0)
751                {
752                DPRINTF(("%.*sEnd of internal_dfa_exec %d: returning %d\n"
753                  "%.*s---------------------\n\n", rlevel*2-2, SP, rlevel,
754                  match_count, rlevel*2-2, SP));
755                return match_count;
756                }
757            }            }
758          }          }
759        break;        break;
# Line 678  for (;;) Line 801  for (;;)
801        break;        break;
802    
803        /*-----------------------------------------------------------------*/        /*-----------------------------------------------------------------*/
804          case OP_SKIPZERO:
805          code += 1 + GET(code, 2);
806          while (*code == OP_ALT) code += GET(code, 1);
807          ADD_ACTIVE(code - start_code + 1 + LINK_SIZE, 0);
808          break;
809    
810          /*-----------------------------------------------------------------*/
811        case OP_CIRC:        case OP_CIRC:
812        if ((ptr == start_subject && (md->moptions & PCRE_NOTBOL) == 0) ||        if ((ptr == start_subject && (md->moptions & PCRE_NOTBOL) == 0) ||
813            ((ims & PCRE_MULTILINE) != 0 &&            ((ims & PCRE_MULTILINE) != 0 &&
# Line 716  for (;;) Line 846  for (;;)
846    
847        /*-----------------------------------------------------------------*/        /*-----------------------------------------------------------------*/
848        case OP_ANY:        case OP_ANY:
849        if (clen > 0 && ((ims & PCRE_DOTALL) != 0 || !IS_NEWLINE(ptr)))        if (clen > 0 && !IS_NEWLINE(ptr))
850            { ADD_NEW(state_offset + 1, 0); }
851          break;
852    
853          /*-----------------------------------------------------------------*/
854          case OP_ALLANY:
855          if (clen > 0)
856          { ADD_NEW(state_offset + 1, 0); }          { ADD_NEW(state_offset + 1, 0); }
857        break;        break;
858    
# Line 731  for (;;) Line 867  for (;;)
867        if ((md->moptions & PCRE_NOTEOL) == 0)        if ((md->moptions & PCRE_NOTEOL) == 0)
868          {          {
869          if (clen == 0 ||          if (clen == 0 ||
870              (IS_NEWLINE(ptr) &&              ((md->poptions & PCRE_DOLLAR_ENDONLY) == 0 && IS_NEWLINE(ptr) &&
871                 ((ims & PCRE_MULTILINE) != 0 || ptr == end_subject - md->nllen)                 ((ims & PCRE_MULTILINE) != 0 || ptr == end_subject - md->nllen)
872              ))              ))
873            { ADD_ACTIVE(state_offset + 1, 0); }            { ADD_ACTIVE(state_offset + 1, 0); }
# Line 768  for (;;) Line 904  for (;;)
904          if (ptr > start_subject)          if (ptr > start_subject)
905            {            {
906            const uschar *temp = ptr - 1;            const uschar *temp = ptr - 1;
907              if (temp < md->start_used_ptr) md->start_used_ptr = temp;
908  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
909            if (utf8) BACKCHAR(temp);            if (utf8) BACKCHAR(temp);
910  #endif  #endif
# Line 776  for (;;) Line 913  for (;;)
913            }            }
914          else left_word = 0;          else left_word = 0;
915    
916          if (clen > 0) right_word = c < 256 && (ctypes[c] & ctype_word) != 0;          if (clen > 0)
917            else right_word = 0;            right_word = c < 256 && (ctypes[c] & ctype_word) != 0;
918            else              /* This is a fudge to ensure that if this is the */
919              {               /* last item in the pattern, we don't count it as */
920              reached_end--;  /* reached, thus disabling a partial match. */
921              right_word = 0;
922              }
923    
924          if ((left_word == right_word) == (codevalue == OP_NOT_WORD_BOUNDARY))          if ((left_word == right_word) == (codevalue == OP_NOT_WORD_BOUNDARY))
925            { ADD_ACTIVE(state_offset + 1, 0); }            { ADD_ACTIVE(state_offset + 1, 0); }
# Line 796  for (;;) Line 938  for (;;)
938        if (clen > 0)        if (clen > 0)
939          {          {
940          BOOL OK;          BOOL OK;
941          int category = _pcre_ucp_findprop(c, &chartype, &script);          const ucd_record * prop = GET_UCD(c);
942          switch(code[1])          switch(code[1])
943            {            {
944            case PT_ANY:            case PT_ANY:
# Line 804  for (;;) Line 946  for (;;)
946            break;            break;
947    
948            case PT_LAMP:            case PT_LAMP:
949            OK = chartype == ucp_Lu || chartype == ucp_Ll || chartype == ucp_Lt;            OK = prop->chartype == ucp_Lu || prop->chartype == ucp_Ll || prop->chartype == ucp_Lt;
950            break;            break;
951    
952            case PT_GC:            case PT_GC:
953            OK = category == code[2];            OK = _pcre_ucp_gentype[prop->chartype] == code[2];
954            break;            break;
955    
956            case PT_PC:            case PT_PC:
957            OK = chartype == code[2];            OK = prop->chartype == code[2];
958            break;            break;
959    
960            case PT_SC:            case PT_SC:
961            OK = script == code[2];            OK = prop->script == code[2];
962            break;            break;
963    
964            /* Should never occur, but keep compilers from grumbling. */            /* Should never occur, but keep compilers from grumbling. */
# Line 836  for (;;) Line 978  for (;;)
978  /* ========================================================================== */  /* ========================================================================== */
979        /* These opcodes likewise inspect the subject character, but have an        /* These opcodes likewise inspect the subject character, but have an
980        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:
981        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,
982        OP_NOT_WORDCHAR. The value is loaded into d. */        OP_WORDCHAR, OP_NOT_WORDCHAR. The value is loaded into d. */
983    
984        case OP_TYPEPLUS:        case OP_TYPEPLUS:
985        case OP_TYPEMINPLUS:        case OP_TYPEMINPLUS:
# Line 848  for (;;) Line 990  for (;;)
990          {          {
991          if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||          if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||
992              (c < 256 &&              (c < 256 &&
993                (d != OP_ANY ||                (d != OP_ANY || !IS_NEWLINE(ptr)) &&
                (ims & PCRE_DOTALL) != 0 ||  
                !IS_NEWLINE(ptr)  
               ) &&  
994                ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))                ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))
995            {            {
996            if (count > 0 && codevalue == OP_TYPEPOSPLUS)            if (count > 0 && codevalue == OP_TYPEPOSPLUS)
# Line 874  for (;;) Line 1013  for (;;)
1013          {          {
1014          if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||          if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||
1015              (c < 256 &&              (c < 256 &&
1016                (d != OP_ANY ||                (d != OP_ANY || !IS_NEWLINE(ptr)) &&
                (ims & PCRE_DOTALL) != 0 ||  
                !IS_NEWLINE(ptr)  
               ) &&  
1017                ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))                ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))
1018            {            {
1019            if (codevalue == OP_TYPEPOSQUERY)            if (codevalue == OP_TYPEPOSQUERY)
# Line 899  for (;;) Line 1035  for (;;)
1035          {          {
1036          if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||          if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||
1037              (c < 256 &&              (c < 256 &&
1038                (d != OP_ANY ||                (d != OP_ANY || !IS_NEWLINE(ptr)) &&
                (ims & PCRE_DOTALL) != 0 ||  
                !IS_NEWLINE(ptr)  
               ) &&  
1039                ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))                ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))
1040            {            {
1041            if (codevalue == OP_TYPEPOSSTAR)            if (codevalue == OP_TYPEPOSSTAR)
# Line 922  for (;;) Line 1055  for (;;)
1055          {          {
1056          if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||          if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||
1057              (c < 256 &&              (c < 256 &&
1058                (d != OP_ANY ||                (d != OP_ANY || !IS_NEWLINE(ptr)) &&
                (ims & PCRE_DOTALL) != 0 ||  
                !IS_NEWLINE(ptr)  
               ) &&  
1059                ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))                ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))
1060            {            {
1061            if (++count >= GET2(code, 1))            if (++count >= GET2(code, 1))
# Line 946  for (;;) Line 1076  for (;;)
1076          {          {
1077          if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||          if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||
1078              (c < 256 &&              (c < 256 &&
1079                (d != OP_ANY ||                (d != OP_ANY || !IS_NEWLINE(ptr)) &&
                (ims & PCRE_DOTALL) != 0 ||  
                !IS_NEWLINE(ptr)  
               ) &&  
1080                ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))                ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))
1081            {            {
1082            if (codevalue == OP_TYPEPOSUPTO)            if (codevalue == OP_TYPEPOSUPTO)
# Line 980  for (;;) Line 1107  for (;;)
1107        if (clen > 0)        if (clen > 0)
1108          {          {
1109          BOOL OK;          BOOL OK;
1110          int category = _pcre_ucp_findprop(c, &chartype, &script);          const ucd_record * prop = GET_UCD(c);
1111          switch(code[2])          switch(code[2])
1112            {            {
1113            case PT_ANY:            case PT_ANY:
# Line 988  for (;;) Line 1115  for (;;)
1115            break;            break;
1116    
1117            case PT_LAMP:            case PT_LAMP:
1118            OK = chartype == ucp_Lu || chartype == ucp_Ll || chartype == ucp_Lt;            OK = prop->chartype == ucp_Lu || prop->chartype == ucp_Ll || prop->chartype == ucp_Lt;
1119            break;            break;
1120    
1121            case PT_GC:            case PT_GC:
1122            OK = category == code[3];            OK = _pcre_ucp_gentype[prop->chartype] == code[3];
1123            break;            break;
1124    
1125            case PT_PC:            case PT_PC:
1126            OK = chartype == code[3];            OK = prop->chartype == code[3];
1127            break;            break;
1128    
1129            case PT_SC:            case PT_SC:
1130            OK = script == code[3];            OK = prop->script == code[3];
1131            break;            break;
1132    
1133            /* Should never occur, but keep compilers from grumbling. */            /* Should never occur, but keep compilers from grumbling. */
# Line 1029  for (;;) Line 1156  for (;;)
1156        case OP_EXTUNI_EXTRA + OP_TYPEPOSPLUS:        case OP_EXTUNI_EXTRA + OP_TYPEPOSPLUS:
1157        count = current_state->count;  /* Already matched */        count = current_state->count;  /* Already matched */
1158        if (count > 0) { ADD_ACTIVE(state_offset + 2, 0); }        if (count > 0) { ADD_ACTIVE(state_offset + 2, 0); }
1159        if (clen > 0 && _pcre_ucp_findprop(c, &chartype, &script) != ucp_M)        if (clen > 0 && UCD_CATEGORY(c) != ucp_M)
1160          {          {
1161          const uschar *nptr = ptr + clen;          const uschar *nptr = ptr + clen;
1162          int ncount = 0;          int ncount = 0;
# Line 1043  for (;;) Line 1170  for (;;)
1170            int nd;            int nd;
1171            int ndlen = 1;            int ndlen = 1;
1172            GETCHARLEN(nd, nptr, ndlen);            GETCHARLEN(nd, nptr, ndlen);
1173            if (_pcre_ucp_findprop(nd, &chartype, &script) != ucp_M) break;            if (UCD_CATEGORY(nd) != ucp_M) break;
1174            ncount++;            ncount++;
1175            nptr += ndlen;            nptr += ndlen;
1176            }            }
# Line 1064  for (;;) Line 1191  for (;;)
1191          int ncount = 0;          int ncount = 0;
1192          switch (c)          switch (c)
1193            {            {
1194              case 0x000b:
1195              case 0x000c:
1196              case 0x0085:
1197              case 0x2028:
1198              case 0x2029:
1199              if ((md->moptions & PCRE_BSR_ANYCRLF) != 0) break;
1200              goto ANYNL01;
1201    
1202            case 0x000d:            case 0x000d:
1203            if (ptr + 1 < end_subject && ptr[1] == 0x0a) ncount = 1;            if (ptr + 1 < end_subject && ptr[1] == 0x0a) ncount = 1;
1204            /* Fall through */            /* Fall through */
1205    
1206              ANYNL01:
1207              case 0x000a:
1208              if (count > 0 && codevalue == OP_ANYNL_EXTRA + OP_TYPEPOSPLUS)
1209                {
1210                active_count--;           /* Remove non-match possibility */
1211                next_active_state--;
1212                }
1213              count++;
1214              ADD_NEW_DATA(-state_offset, count, ncount);
1215              break;
1216    
1217              default:
1218              break;
1219              }
1220            }
1221          break;
1222    
1223          /*-----------------------------------------------------------------*/
1224          case OP_VSPACE_EXTRA + OP_TYPEPLUS:
1225          case OP_VSPACE_EXTRA + OP_TYPEMINPLUS:
1226          case OP_VSPACE_EXTRA + OP_TYPEPOSPLUS:
1227          count = current_state->count;  /* Already matched */
1228          if (count > 0) { ADD_ACTIVE(state_offset + 2, 0); }
1229          if (clen > 0)
1230            {
1231            BOOL OK;
1232            switch (c)
1233              {
1234            case 0x000a:            case 0x000a:
1235            case 0x000b:            case 0x000b:
1236            case 0x000c:            case 0x000c:
1237              case 0x000d:
1238            case 0x0085:            case 0x0085:
1239            case 0x2028:            case 0x2028:
1240            case 0x2029:            case 0x2029:
1241            if (count > 0 && codevalue == OP_ANYNL_EXTRA + OP_TYPEPOSPLUS)            OK = TRUE;
1242              break;
1243    
1244              default:
1245              OK = FALSE;
1246              break;
1247              }
1248    
1249            if (OK == (d == OP_VSPACE))
1250              {
1251              if (count > 0 && codevalue == OP_VSPACE_EXTRA + OP_TYPEPOSPLUS)
1252              {              {
1253              active_count--;           /* Remove non-match possibility */              active_count--;           /* Remove non-match possibility */
1254              next_active_state--;              next_active_state--;
1255              }              }
1256            count++;            count++;
1257            ADD_NEW_DATA(-state_offset, count, ncount);            ADD_NEW_DATA(-state_offset, count, 0);
1258              }
1259            }
1260          break;
1261    
1262          /*-----------------------------------------------------------------*/
1263          case OP_HSPACE_EXTRA + OP_TYPEPLUS:
1264          case OP_HSPACE_EXTRA + OP_TYPEMINPLUS:
1265          case OP_HSPACE_EXTRA + OP_TYPEPOSPLUS:
1266          count = current_state->count;  /* Already matched */
1267          if (count > 0) { ADD_ACTIVE(state_offset + 2, 0); }
1268          if (clen > 0)
1269            {
1270            BOOL OK;
1271            switch (c)
1272              {
1273              case 0x09:      /* HT */
1274              case 0x20:      /* SPACE */
1275              case 0xa0:      /* NBSP */
1276              case 0x1680:    /* OGHAM SPACE MARK */
1277              case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
1278              case 0x2000:    /* EN QUAD */
1279              case 0x2001:    /* EM QUAD */
1280              case 0x2002:    /* EN SPACE */
1281              case 0x2003:    /* EM SPACE */
1282              case 0x2004:    /* THREE-PER-EM SPACE */
1283              case 0x2005:    /* FOUR-PER-EM SPACE */
1284              case 0x2006:    /* SIX-PER-EM SPACE */
1285              case 0x2007:    /* FIGURE SPACE */
1286              case 0x2008:    /* PUNCTUATION SPACE */
1287              case 0x2009:    /* THIN SPACE */
1288              case 0x200A:    /* HAIR SPACE */
1289              case 0x202f:    /* NARROW NO-BREAK SPACE */
1290              case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
1291              case 0x3000:    /* IDEOGRAPHIC SPACE */
1292              OK = TRUE;
1293            break;            break;
1294    
1295            default:            default:
1296              OK = FALSE;
1297            break;            break;
1298            }            }
1299    
1300            if (OK == (d == OP_HSPACE))
1301              {
1302              if (count > 0 && codevalue == OP_HSPACE_EXTRA + OP_TYPEPOSPLUS)
1303                {
1304                active_count--;           /* Remove non-match possibility */
1305                next_active_state--;
1306                }
1307              count++;
1308              ADD_NEW_DATA(-state_offset, count, 0);
1309              }
1310          }          }
1311        break;        break;
1312    
# Line 1106  for (;;) Line 1329  for (;;)
1329        if (clen > 0)        if (clen > 0)
1330          {          {
1331          BOOL OK;          BOOL OK;
1332          int category = _pcre_ucp_findprop(c, &chartype, &script);          const ucd_record * prop = GET_UCD(c);
1333          switch(code[2])          switch(code[2])
1334            {            {
1335            case PT_ANY:            case PT_ANY:
# Line 1114  for (;;) Line 1337  for (;;)
1337            break;            break;
1338    
1339            case PT_LAMP:            case PT_LAMP:
1340            OK = chartype == ucp_Lu || chartype == ucp_Ll || chartype == ucp_Lt;            OK = prop->chartype == ucp_Lu || prop->chartype == ucp_Ll || prop->chartype == ucp_Lt;
1341            break;            break;
1342    
1343            case PT_GC:            case PT_GC:
1344            OK = category == code[3];            OK = _pcre_ucp_gentype[prop->chartype] == code[3];
1345            break;            break;
1346    
1347            case PT_PC:            case PT_PC:
1348            OK = chartype == code[3];            OK = prop->chartype == code[3];
1349            break;            break;
1350    
1351            case PT_SC:            case PT_SC:
1352            OK = script == code[3];            OK = prop->script == code[3];
1353            break;            break;
1354    
1355            /* Should never occur, but keep compilers from grumbling. */            /* Should never occur, but keep compilers from grumbling. */
# Line 1164  for (;;) Line 1387  for (;;)
1387        QS2:        QS2:
1388    
1389        ADD_ACTIVE(state_offset + 2, 0);        ADD_ACTIVE(state_offset + 2, 0);
1390        if (clen > 0 && _pcre_ucp_findprop(c, &chartype, &script) != ucp_M)        if (clen > 0 && UCD_CATEGORY(c) != ucp_M)
1391          {          {
1392          const uschar *nptr = ptr + clen;          const uschar *nptr = ptr + clen;
1393          int ncount = 0;          int ncount = 0;
# Line 1179  for (;;) Line 1402  for (;;)
1402            int nd;            int nd;
1403            int ndlen = 1;            int ndlen = 1;
1404            GETCHARLEN(nd, nptr, ndlen);            GETCHARLEN(nd, nptr, ndlen);
1405            if (_pcre_ucp_findprop(nd, &chartype, &script) != ucp_M) break;            if (UCD_CATEGORY(nd) != ucp_M) break;
1406            ncount++;            ncount++;
1407            nptr += ndlen;            nptr += ndlen;
1408            }            }
# Line 1207  for (;;) Line 1430  for (;;)
1430          int ncount = 0;          int ncount = 0;
1431          switch (c)          switch (c)
1432            {            {
1433              case 0x000b:
1434              case 0x000c:
1435              case 0x0085:
1436              case 0x2028:
1437              case 0x2029:
1438              if ((md->moptions & PCRE_BSR_ANYCRLF) != 0) break;
1439              goto ANYNL02;
1440    
1441            case 0x000d:            case 0x000d:
1442            if (ptr + 1 < end_subject && ptr[1] == 0x0a) ncount = 1;            if (ptr + 1 < end_subject && ptr[1] == 0x0a) ncount = 1;
1443            /* Fall through */            /* Fall through */
1444    
1445              ANYNL02:
1446              case 0x000a:
1447              if (codevalue == OP_ANYNL_EXTRA + OP_TYPEPOSSTAR ||
1448                  codevalue == OP_ANYNL_EXTRA + OP_TYPEPOSQUERY)
1449                {
1450                active_count--;           /* Remove non-match possibility */
1451                next_active_state--;
1452                }
1453              ADD_NEW_DATA(-(state_offset + count), 0, ncount);
1454              break;
1455    
1456              default:
1457              break;
1458              }
1459            }
1460          break;
1461    
1462          /*-----------------------------------------------------------------*/
1463          case OP_VSPACE_EXTRA + OP_TYPEQUERY:
1464          case OP_VSPACE_EXTRA + OP_TYPEMINQUERY:
1465          case OP_VSPACE_EXTRA + OP_TYPEPOSQUERY:
1466          count = 2;
1467          goto QS4;
1468    
1469          case OP_VSPACE_EXTRA + OP_TYPESTAR:
1470          case OP_VSPACE_EXTRA + OP_TYPEMINSTAR:
1471          case OP_VSPACE_EXTRA + OP_TYPEPOSSTAR:
1472          count = 0;
1473    
1474          QS4:
1475          ADD_ACTIVE(state_offset + 2, 0);
1476          if (clen > 0)
1477            {
1478            BOOL OK;
1479            switch (c)
1480              {
1481            case 0x000a:            case 0x000a:
1482            case 0x000b:            case 0x000b:
1483            case 0x000c:            case 0x000c:
1484              case 0x000d:
1485            case 0x0085:            case 0x0085:
1486            case 0x2028:            case 0x2028:
1487            case 0x2029:            case 0x2029:
1488            if (codevalue == OP_ANYNL_EXTRA + OP_TYPEPOSSTAR ||            OK = TRUE;
1489                codevalue == OP_ANYNL_EXTRA + OP_TYPEPOSQUERY)            break;
1490    
1491              default:
1492              OK = FALSE;
1493              break;
1494              }
1495            if (OK == (d == OP_VSPACE))
1496              {
1497              if (codevalue == OP_VSPACE_EXTRA + OP_TYPEPOSSTAR ||
1498                  codevalue == OP_VSPACE_EXTRA + OP_TYPEPOSQUERY)
1499              {              {
1500              active_count--;           /* Remove non-match possibility */              active_count--;           /* Remove non-match possibility */
1501              next_active_state--;              next_active_state--;
1502              }              }
1503            ADD_NEW_DATA(-(state_offset + count), 0, ncount);            ADD_NEW_DATA(-(state_offset + count), 0, 0);
1504              }
1505            }
1506          break;
1507    
1508          /*-----------------------------------------------------------------*/
1509          case OP_HSPACE_EXTRA + OP_TYPEQUERY:
1510          case OP_HSPACE_EXTRA + OP_TYPEMINQUERY:
1511          case OP_HSPACE_EXTRA + OP_TYPEPOSQUERY:
1512          count = 2;
1513          goto QS5;
1514    
1515          case OP_HSPACE_EXTRA + OP_TYPESTAR:
1516          case OP_HSPACE_EXTRA + OP_TYPEMINSTAR:
1517          case OP_HSPACE_EXTRA + OP_TYPEPOSSTAR:
1518          count = 0;
1519    
1520          QS5:
1521          ADD_ACTIVE(state_offset + 2, 0);
1522          if (clen > 0)
1523            {
1524            BOOL OK;
1525            switch (c)
1526              {
1527              case 0x09:      /* HT */
1528              case 0x20:      /* SPACE */
1529              case 0xa0:      /* NBSP */
1530              case 0x1680:    /* OGHAM SPACE MARK */
1531              case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
1532              case 0x2000:    /* EN QUAD */
1533              case 0x2001:    /* EM QUAD */
1534              case 0x2002:    /* EN SPACE */
1535              case 0x2003:    /* EM SPACE */
1536              case 0x2004:    /* THREE-PER-EM SPACE */
1537              case 0x2005:    /* FOUR-PER-EM SPACE */
1538              case 0x2006:    /* SIX-PER-EM SPACE */
1539              case 0x2007:    /* FIGURE SPACE */
1540              case 0x2008:    /* PUNCTUATION SPACE */
1541              case 0x2009:    /* THIN SPACE */
1542              case 0x200A:    /* HAIR SPACE */
1543              case 0x202f:    /* NARROW NO-BREAK SPACE */
1544              case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
1545              case 0x3000:    /* IDEOGRAPHIC SPACE */
1546              OK = TRUE;
1547            break;            break;
1548    
1549            default:            default:
1550              OK = FALSE;
1551            break;            break;
1552            }            }
1553    
1554            if (OK == (d == OP_HSPACE))
1555              {
1556              if (codevalue == OP_HSPACE_EXTRA + OP_TYPEPOSSTAR ||
1557                  codevalue == OP_HSPACE_EXTRA + OP_TYPEPOSQUERY)
1558                {
1559                active_count--;           /* Remove non-match possibility */
1560                next_active_state--;
1561                }
1562              ADD_NEW_DATA(-(state_offset + count), 0, 0);
1563              }
1564          }          }
1565        break;        break;
1566    
# Line 1242  for (;;) Line 1576  for (;;)
1576        if (clen > 0)        if (clen > 0)
1577          {          {
1578          BOOL OK;          BOOL OK;
1579          int category = _pcre_ucp_findprop(c, &chartype, &script);          const ucd_record * prop = GET_UCD(c);
1580          switch(code[4])          switch(code[4])
1581            {            {
1582            case PT_ANY:            case PT_ANY:
# Line 1250  for (;;) Line 1584  for (;;)
1584            break;            break;
1585    
1586            case PT_LAMP:            case PT_LAMP:
1587            OK = chartype == ucp_Lu || chartype == ucp_Ll || chartype == ucp_Lt;            OK = prop->chartype == ucp_Lu || prop->chartype == ucp_Ll || prop->chartype == ucp_Lt;
1588            break;            break;
1589    
1590            case PT_GC:            case PT_GC:
1591            OK = category == code[5];            OK = _pcre_ucp_gentype[prop->chartype] == code[5];
1592            break;            break;
1593    
1594            case PT_PC:            case PT_PC:
1595            OK = chartype == code[5];            OK = prop->chartype == code[5];
1596            break;            break;
1597    
1598            case PT_SC:            case PT_SC:
1599            OK = script == code[5];            OK = prop->script == code[5];
1600            break;            break;
1601    
1602            /* Should never occur, but keep compilers from grumbling. */            /* Should never occur, but keep compilers from grumbling. */
# Line 1295  for (;;) Line 1629  for (;;)
1629        if (codevalue != OP_EXTUNI_EXTRA + OP_TYPEEXACT)        if (codevalue != OP_EXTUNI_EXTRA + OP_TYPEEXACT)
1630          { ADD_ACTIVE(state_offset + 4, 0); }          { ADD_ACTIVE(state_offset + 4, 0); }
1631        count = current_state->count;  /* Number already matched */        count = current_state->count;  /* Number already matched */
1632        if (clen > 0 && _pcre_ucp_findprop(c, &chartype, &script) != ucp_M)        if (clen > 0 && UCD_CATEGORY(c) != ucp_M)
1633          {          {
1634          const uschar *nptr = ptr + clen;          const uschar *nptr = ptr + clen;
1635          int ncount = 0;          int ncount = 0;
# Line 1309  for (;;) Line 1643  for (;;)
1643            int nd;            int nd;
1644            int ndlen = 1;            int ndlen = 1;
1645            GETCHARLEN(nd, nptr, ndlen);            GETCHARLEN(nd, nptr, ndlen);
1646            if (_pcre_ucp_findprop(nd, &chartype, &script) != ucp_M) break;            if (UCD_CATEGORY(nd) != ucp_M) break;
1647            ncount++;            ncount++;
1648            nptr += ndlen;            nptr += ndlen;
1649            }            }
# Line 1334  for (;;) Line 1668  for (;;)
1668          int ncount = 0;          int ncount = 0;
1669          switch (c)          switch (c)
1670            {            {
1671              case 0x000b:
1672              case 0x000c:
1673              case 0x0085:
1674              case 0x2028:
1675              case 0x2029:
1676              if ((md->moptions & PCRE_BSR_ANYCRLF) != 0) break;
1677              goto ANYNL03;
1678    
1679            case 0x000d:            case 0x000d:
1680            if (ptr + 1 < end_subject && ptr[1] == 0x0a) ncount = 1;            if (ptr + 1 < end_subject && ptr[1] == 0x0a) ncount = 1;
1681            /* Fall through */            /* Fall through */
1682    
1683              ANYNL03:
1684              case 0x000a:
1685              if (codevalue == OP_ANYNL_EXTRA + OP_TYPEPOSUPTO)
1686                {
1687                active_count--;           /* Remove non-match possibility */
1688                next_active_state--;
1689                }
1690              if (++count >= GET2(code, 1))
1691                { ADD_NEW_DATA(-(state_offset + 4), 0, ncount); }
1692              else
1693                { ADD_NEW_DATA(-state_offset, count, ncount); }
1694              break;
1695    
1696              default:
1697              break;
1698              }
1699            }
1700          break;
1701    
1702          /*-----------------------------------------------------------------*/
1703          case OP_VSPACE_EXTRA + OP_TYPEEXACT:
1704          case OP_VSPACE_EXTRA + OP_TYPEUPTO:
1705          case OP_VSPACE_EXTRA + OP_TYPEMINUPTO:
1706          case OP_VSPACE_EXTRA + OP_TYPEPOSUPTO:
1707          if (codevalue != OP_VSPACE_EXTRA + OP_TYPEEXACT)
1708            { ADD_ACTIVE(state_offset + 4, 0); }
1709          count = current_state->count;  /* Number already matched */
1710          if (clen > 0)
1711            {
1712            BOOL OK;
1713            switch (c)
1714              {
1715            case 0x000a:            case 0x000a:
1716            case 0x000b:            case 0x000b:
1717            case 0x000c:            case 0x000c:
1718              case 0x000d:
1719            case 0x0085:            case 0x0085:
1720            case 0x2028:            case 0x2028:
1721            case 0x2029:            case 0x2029:
1722            if (codevalue == OP_ANYNL_EXTRA + OP_TYPEPOSUPTO)            OK = TRUE;
1723              break;
1724    
1725              default:
1726              OK = FALSE;
1727              }
1728    
1729            if (OK == (d == OP_VSPACE))
1730              {
1731              if (codevalue == OP_VSPACE_EXTRA + OP_TYPEPOSUPTO)
1732              {              {
1733              active_count--;           /* Remove non-match possibility */              active_count--;           /* Remove non-match possibility */
1734              next_active_state--;              next_active_state--;
1735              }              }
1736            if (++count >= GET2(code, 1))            if (++count >= GET2(code, 1))
1737              { ADD_NEW_DATA(-(state_offset + 4), 0, ncount); }              { ADD_NEW_DATA(-(state_offset + 4), 0, 0); }
1738            else            else
1739              { ADD_NEW_DATA(-state_offset, count, ncount); }              { ADD_NEW_DATA(-state_offset, count, 0); }
1740              }
1741            }
1742          break;
1743    
1744          /*-----------------------------------------------------------------*/
1745          case OP_HSPACE_EXTRA + OP_TYPEEXACT:
1746          case OP_HSPACE_EXTRA + OP_TYPEUPTO:
1747          case OP_HSPACE_EXTRA + OP_TYPEMINUPTO:
1748          case OP_HSPACE_EXTRA + OP_TYPEPOSUPTO:
1749          if (codevalue != OP_HSPACE_EXTRA + OP_TYPEEXACT)
1750            { ADD_ACTIVE(state_offset + 4, 0); }
1751          count = current_state->count;  /* Number already matched */
1752          if (clen > 0)
1753            {
1754            BOOL OK;
1755            switch (c)
1756              {
1757              case 0x09:      /* HT */
1758              case 0x20:      /* SPACE */
1759              case 0xa0:      /* NBSP */
1760              case 0x1680:    /* OGHAM SPACE MARK */
1761              case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
1762              case 0x2000:    /* EN QUAD */
1763              case 0x2001:    /* EM QUAD */
1764              case 0x2002:    /* EN SPACE */
1765              case 0x2003:    /* EM SPACE */
1766              case 0x2004:    /* THREE-PER-EM SPACE */
1767              case 0x2005:    /* FOUR-PER-EM SPACE */
1768              case 0x2006:    /* SIX-PER-EM SPACE */
1769              case 0x2007:    /* FIGURE SPACE */
1770              case 0x2008:    /* PUNCTUATION SPACE */
1771              case 0x2009:    /* THIN SPACE */
1772              case 0x200A:    /* HAIR SPACE */
1773              case 0x202f:    /* NARROW NO-BREAK SPACE */
1774              case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
1775              case 0x3000:    /* IDEOGRAPHIC SPACE */
1776              OK = TRUE;
1777            break;            break;
1778    
1779            default:            default:
1780              OK = FALSE;
1781            break;            break;
1782            }            }
1783    
1784            if (OK == (d == OP_HSPACE))
1785              {
1786              if (codevalue == OP_HSPACE_EXTRA + OP_TYPEPOSUPTO)
1787                {
1788                active_count--;           /* Remove non-match possibility */
1789                next_active_state--;
1790                }
1791              if (++count >= GET2(code, 1))
1792                { ADD_NEW_DATA(-(state_offset + 4), 0, 0); }
1793              else
1794                { ADD_NEW_DATA(-state_offset, count, 0); }
1795              }
1796          }          }
1797        break;        break;
1798    
# Line 1386  for (;;) Line 1823  for (;;)
1823            other case of the character. */            other case of the character. */
1824    
1825  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
1826            othercase = _pcre_ucp_othercase(c);            othercase = UCD_OTHERCASE(c);
1827  #else  #else
1828            othercase = NOTACHAR;            othercase = NOTACHAR;
1829  #endif  #endif
# Line 1411  for (;;) Line 1848  for (;;)
1848        to wait for them to pass before continuing. */        to wait for them to pass before continuing. */
1849    
1850        case OP_EXTUNI:        case OP_EXTUNI:
1851        if (clen > 0 && _pcre_ucp_findprop(c, &chartype, &script) != ucp_M)        if (clen > 0 && UCD_CATEGORY(c) != ucp_M)
1852          {          {
1853          const uschar *nptr = ptr + clen;          const uschar *nptr = ptr + clen;
1854          int ncount = 0;          int ncount = 0;
# Line 1419  for (;;) Line 1856  for (;;)
1856            {            {
1857            int nclen = 1;            int nclen = 1;
1858            GETCHARLEN(c, nptr, nclen);            GETCHARLEN(c, nptr, nclen);
1859            if (_pcre_ucp_findprop(c, &chartype, &script) != ucp_M) break;            if (UCD_CATEGORY(c) != ucp_M) break;
1860            ncount++;            ncount++;
1861            nptr += nclen;            nptr += nclen;
1862            }            }
# Line 1436  for (;;) Line 1873  for (;;)
1873        case OP_ANYNL:        case OP_ANYNL:
1874        if (clen > 0) switch(c)        if (clen > 0) switch(c)
1875          {          {
         case 0x000a:  
1876          case 0x000b:          case 0x000b:
1877          case 0x000c:          case 0x000c:
1878          case 0x0085:          case 0x0085:
1879          case 0x2028:          case 0x2028:
1880          case 0x2029:          case 0x2029:
1881            if ((md->moptions & PCRE_BSR_ANYCRLF) != 0) break;
1882    
1883            case 0x000a:
1884          ADD_NEW(state_offset + 1, 0);          ADD_NEW(state_offset + 1, 0);
1885          break;          break;
1886    
1887          case 0x000d:          case 0x000d:
1888          if (ptr + 1 < end_subject && ptr[1] == 0x0a)          if (ptr + 1 < end_subject && ptr[1] == 0x0a)
1889            {            {
# Line 1458  for (;;) Line 1898  for (;;)
1898        break;        break;
1899    
1900        /*-----------------------------------------------------------------*/        /*-----------------------------------------------------------------*/
1901          case OP_NOT_VSPACE:
1902          if (clen > 0) switch(c)
1903            {
1904            case 0x000a:
1905            case 0x000b:
1906            case 0x000c:
1907            case 0x000d:
1908            case 0x0085:
1909            case 0x2028:
1910            case 0x2029:
1911            break;
1912    
1913            default:
1914            ADD_NEW(state_offset + 1, 0);
1915            break;
1916            }
1917          break;
1918    
1919          /*-----------------------------------------------------------------*/
1920          case OP_VSPACE:
1921          if (clen > 0) switch(c)
1922            {
1923            case 0x000a:
1924            case 0x000b:
1925            case 0x000c:
1926            case 0x000d:
1927            case 0x0085:
1928            case 0x2028:
1929            case 0x2029:
1930            ADD_NEW(state_offset + 1, 0);
1931            break;
1932    
1933            default: break;
1934            }
1935          break;
1936    
1937          /*-----------------------------------------------------------------*/
1938          case OP_NOT_HSPACE:
1939          if (clen > 0) switch(c)
1940            {
1941            case 0x09:      /* HT */
1942            case 0x20:      /* SPACE */
1943            case 0xa0:      /* NBSP */
1944            case 0x1680:    /* OGHAM SPACE MARK */
1945            case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
1946            case 0x2000:    /* EN QUAD */
1947            case 0x2001:    /* EM QUAD */
1948            case 0x2002:    /* EN SPACE */
1949            case 0x2003:    /* EM SPACE */
1950            case 0x2004:    /* THREE-PER-EM SPACE */
1951            case 0x2005:    /* FOUR-PER-EM SPACE */
1952            case 0x2006:    /* SIX-PER-EM SPACE */
1953            case 0x2007:    /* FIGURE SPACE */
1954            case 0x2008:    /* PUNCTUATION SPACE */
1955            case 0x2009:    /* THIN SPACE */
1956            case 0x200A:    /* HAIR SPACE */
1957            case 0x202f:    /* NARROW NO-BREAK SPACE */
1958            case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
1959            case 0x3000:    /* IDEOGRAPHIC SPACE */
1960            break;
1961    
1962            default:
1963            ADD_NEW(state_offset + 1, 0);
1964            break;
1965            }
1966          break;
1967    
1968          /*-----------------------------------------------------------------*/
1969          case OP_HSPACE:
1970          if (clen > 0) switch(c)
1971            {
1972            case 0x09:      /* HT */
1973            case 0x20:      /* SPACE */
1974            case 0xa0:      /* NBSP */
1975            case 0x1680:    /* OGHAM SPACE MARK */
1976            case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
1977            case 0x2000:    /* EN QUAD */
1978            case 0x2001:    /* EM QUAD */
1979            case 0x2002:    /* EN SPACE */
1980            case 0x2003:    /* EM SPACE */
1981            case 0x2004:    /* THREE-PER-EM SPACE */
1982            case 0x2005:    /* FOUR-PER-EM SPACE */
1983            case 0x2006:    /* SIX-PER-EM SPACE */
1984            case 0x2007:    /* FIGURE SPACE */
1985            case 0x2008:    /* PUNCTUATION SPACE */
1986            case 0x2009:    /* THIN SPACE */
1987            case 0x200A:    /* HAIR SPACE */
1988            case 0x202f:    /* NARROW NO-BREAK SPACE */
1989            case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
1990            case 0x3000:    /* IDEOGRAPHIC SPACE */
1991            ADD_NEW(state_offset + 1, 0);
1992            break;
1993            }
1994          break;
1995    
1996          /*-----------------------------------------------------------------*/
1997        /* Match a negated single character. This is only used for one-byte        /* Match a negated single character. This is only used for one-byte
1998        characters, that is, we know that d < 256. The character we are        characters, that is, we know that d < 256. The character we are
1999        checking (c) can be multibyte. */        checking (c) can be multibyte. */
# Line 1488  for (;;) Line 2024  for (;;)
2024            if (utf8 && d >= 128)            if (utf8 && d >= 128)
2025              {              {
2026  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2027              otherd = _pcre_ucp_othercase(d);              otherd = UCD_OTHERCASE(d);
2028  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
2029              }              }
2030            else            else
# Line 1526  for (;;) Line 2062  for (;;)
2062            if (utf8 && d >= 128)            if (utf8 && d >= 128)
2063              {              {
2064  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2065              otherd = _pcre_ucp_othercase(d);              otherd = UCD_OTHERCASE(d);
2066  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
2067              }              }
2068            else            else
# Line 1562  for (;;) Line 2098  for (;;)
2098            if (utf8 && d >= 128)            if (utf8 && d >= 128)
2099              {              {
2100  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2101              otherd = _pcre_ucp_othercase(d);              otherd = UCD_OTHERCASE(d);
2102  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
2103              }              }
2104            else            else
# Line 1594  for (;;) Line 2130  for (;;)
2130            if (utf8 && d >= 128)            if (utf8 && d >= 128)
2131              {              {
2132  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2133              otherd = _pcre_ucp_othercase(d);              otherd = UCD_OTHERCASE(d);
2134  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
2135              }              }
2136            else            else
# Line 1629  for (;;) Line 2165  for (;;)
2165            if (utf8 && d >= 128)            if (utf8 && d >= 128)
2166              {              {
2167  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2168              otherd = _pcre_ucp_othercase(d);              otherd = UCD_OTHERCASE(d);
2169  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
2170              }              }
2171            else            else
# Line 1737  for (;;) Line 2273  for (;;)
2273    
2274  /* ========================================================================== */  /* ========================================================================== */
2275        /* These are the opcodes for fancy brackets of various kinds. We have        /* These are the opcodes for fancy brackets of various kinds. We have
2276        to use recursion in order to handle them. */        to use recursion in order to handle them. The "always failing" assertion
2277          (?!) is optimised to OP_FAIL when compiling, so we have to support that,
2278          though the other "backtracking verbs" are not supported. */
2279    
2280          case OP_FAIL:
2281          forced_fail++;    /* Count FAILs for multiple states */
2282          break;
2283    
2284        case OP_ASSERT:        case OP_ASSERT:
2285        case OP_ASSERT_NOT:        case OP_ASSERT_NOT:
# Line 1775  for (;;) Line 2317  for (;;)
2317          {          {
2318          int local_offsets[1000];          int local_offsets[1000];
2319          int local_workspace[1000];          int local_workspace[1000];
2320          int condcode = code[LINK_SIZE+1];          int codelink = GET(code, 1);
2321            int condcode;
2322    
2323            /* Because of the way auto-callout works during compile, a callout item
2324            is inserted between OP_COND and an assertion condition. This does not
2325            happen for the other conditions. */
2326    
2327            if (code[LINK_SIZE+1] == OP_CALLOUT)
2328              {
2329              rrc = 0;
2330              if (pcre_callout != NULL)
2331                {
2332                pcre_callout_block cb;
2333                cb.version          = 1;   /* Version 1 of the callout block */
2334                cb.callout_number   = code[LINK_SIZE+2];
2335                cb.offset_vector    = offsets;
2336                cb.subject          = (PCRE_SPTR)start_subject;
2337                cb.subject_length   = end_subject - start_subject;
2338                cb.start_match      = current_subject - start_subject;
2339                cb.current_position = ptr - start_subject;
2340                cb.pattern_position = GET(code, LINK_SIZE + 3);
2341                cb.next_item_length = GET(code, 3 + 2*LINK_SIZE);
2342                cb.capture_top      = 1;
2343                cb.capture_last     = -1;
2344                cb.callout_data     = md->callout_data;
2345                if ((rrc = (*pcre_callout)(&cb)) < 0) return rrc;   /* Abandon */
2346                }
2347              if (rrc > 0) break;                      /* Fail this thread */
2348              code += _pcre_OP_lengths[OP_CALLOUT];    /* Skip callout data */
2349              }
2350    
2351            condcode = code[LINK_SIZE+1];
2352    
2353          /* Back reference conditions are not supported */          /* Back reference conditions are not supported */
2354    
2355          if (condcode == OP_CREF) return PCRE_ERROR_DFA_UCOND;          if (condcode == OP_CREF || condcode == OP_NCREF)
2356              return PCRE_ERROR_DFA_UCOND;
2357    
2358          /* The DEFINE condition is always false */          /* The DEFINE condition is always false */
2359    
2360          if (condcode == OP_DEF)          if (condcode == OP_DEF)
2361            {            { ADD_ACTIVE(state_offset + codelink + LINK_SIZE + 1, 0); }
           ADD_ACTIVE(state_offset + GET(code, 1) + LINK_SIZE + 1, 0);  
           }  
2362    
2363          /* 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,
2364          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
2365          recursed groups. */          recursed groups. */
2366    
2367          else if (condcode == OP_RREF)          else if (condcode == OP_RREF || condcode == OP_NRREF)
2368            {            {
2369            int value = GET2(code, LINK_SIZE+2);            int value = GET2(code, LINK_SIZE+2);
2370            if (value != RREF_ANY) return PCRE_ERROR_DFA_UCOND;            if (value != RREF_ANY) return PCRE_ERROR_DFA_UCOND;
2371            if (recursing > 0) { ADD_ACTIVE(state_offset + LINK_SIZE + 4, 0); }            if (recursing > 0)
2372              else { ADD_ACTIVE(state_offset + GET(code, 1) + LINK_SIZE + 1, 0); }              { ADD_ACTIVE(state_offset + LINK_SIZE + 4, 0); }
2373              else { ADD_ACTIVE(state_offset + codelink + LINK_SIZE + 1, 0); }
2374            }            }
2375    
2376          /* Otherwise, the condition is an assertion */          /* Otherwise, the condition is an assertion */
# Line 1827  for (;;) Line 2400  for (;;)
2400                  (condcode == OP_ASSERT || condcode == OP_ASSERTBACK))                  (condcode == OP_ASSERT || condcode == OP_ASSERTBACK))
2401              { ADD_ACTIVE(endasscode + LINK_SIZE + 1 - start_code, 0); }              { ADD_ACTIVE(endasscode + LINK_SIZE + 1 - start_code, 0); }
2402            else            else
2403              { ADD_ACTIVE(state_offset + GET(code, 1) + LINK_SIZE + 1, 0); }              { ADD_ACTIVE(state_offset + codelink + LINK_SIZE + 1, 0); }
2404            }            }
2405          }          }
2406        break;        break;
# Line 1979  for (;;) Line 2552  for (;;)
2552        /* Handle callouts */        /* Handle callouts */
2553    
2554        case OP_CALLOUT:        case OP_CALLOUT:
2555          rrc = 0;
2556        if (pcre_callout != NULL)        if (pcre_callout != NULL)
2557          {          {
         int rrc;  
2558          pcre_callout_block cb;          pcre_callout_block cb;
2559          cb.version          = 1;   /* Version 1 of the callout block */          cb.version          = 1;   /* Version 1 of the callout block */
2560          cb.callout_number   = code[1];          cb.callout_number   = code[1];
# Line 1996  for (;;) Line 2569  for (;;)
2569          cb.capture_last     = -1;          cb.capture_last     = -1;
2570          cb.callout_data     = md->callout_data;          cb.callout_data     = md->callout_data;
2571          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); }  
2572          }          }
2573          if (rrc == 0)
2574            { ADD_ACTIVE(state_offset + _pcre_OP_lengths[OP_CALLOUT], 0); }
2575        break;        break;
2576    
2577    
# Line 2013  for (;;) Line 2587  for (;;)
2587    /* We have finished the processing at the current subject character. If no    /* We have finished the processing at the current subject character. If no
2588    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
2589    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
2590    matching has been requested, check for appropriate conditions. */    matching has been requested, check for appropriate conditions.
2591    
2592      The "forced_ fail" variable counts the number of (*F) encountered for the
2593      character. If it is equal to the original active_count (saved in
2594      workspace[1]) it means that (*F) was found on every active state. In this
2595      case we don't want to give a partial match.
2596    
2597      The "reached_end" variable counts the number of threads that have reached the
2598      end of the pattern. The "could_continue" variable is true if a thread could
2599      have continued but for the fact that the end of the subject was reached. */
2600    
2601    if (new_count <= 0)    if (new_count <= 0)
2602      {      {
2603      if (match_count < 0 &&                     /* No matches found */      if (rlevel == 1 &&                               /* Top level, and */
2604          rlevel == 1 &&                         /* Top level match function */          (                                            /* either... */
2605          (md->moptions & PCRE_PARTIAL) != 0 &&  /* Want partial matching */          reached_end != workspace[1] ||               /* Not all reached end */
2606          ptr >= end_subject &&                  /* Reached end of subject */            could_continue                             /* or some could go on */
2607          ptr > current_subject)                 /* Matched non-empty string */          ) &&                                         /* and... */
2608            forced_fail != workspace[1] &&               /* Not all forced fail & */
2609            (                                            /* either... */
2610            (md->moptions & PCRE_PARTIAL_HARD) != 0      /* Hard partial */
2611            ||                                           /* or... */
2612            ((md->moptions & PCRE_PARTIAL_SOFT) != 0 &&  /* Soft partial and */
2613             match_count < 0)                            /* no matches */
2614            ) &&                                         /* And... */
2615            ptr >= end_subject &&                     /* Reached end of subject */
2616            ptr > current_subject)                    /* Matched non-empty string */
2617        {        {
2618        if (offsetcount >= 2)        if (offsetcount >= 2)
2619          {          {
2620          offsets[0] = current_subject - start_subject;          offsets[0] = md->start_used_ptr - start_subject;
2621          offsets[1] = end_subject - start_subject;          offsets[1] = end_subject - start_subject;
2622          }          }
2623        match_count = PCRE_ERROR_PARTIAL;        match_count = PCRE_ERROR_PARTIAL;
# Line 2080  Returns:          > 0 => number of match Line 2672  Returns:          > 0 => number of match
2672                   < -1 => some kind of unexpected problem                   < -1 => some kind of unexpected problem
2673  */  */
2674    
2675  PCRE_EXP_DEFN int  PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
2676  pcre_dfa_exec(const pcre *argument_re, const pcre_extra *extra_data,  pcre_dfa_exec(const pcre *argument_re, const pcre_extra *extra_data,
2677    const char *subject, int length, int start_offset, int options, int *offsets,    const char *subject, int length, int start_offset, int options, int *offsets,
2678    int offsetcount, int *workspace, int wscount)    int offsetcount, int *workspace, int wscount)
# Line 2167  md->start_code = (const uschar *)argumen Line 2759  md->start_code = (const uschar *)argumen
2759      re->name_table_offset + re->name_count * re->name_entry_size;      re->name_table_offset + re->name_count * re->name_entry_size;
2760  md->start_subject = (const unsigned char *)subject;  md->start_subject = (const unsigned char *)subject;
2761  md->end_subject = end_subject;  md->end_subject = end_subject;
2762    md->start_offset = start_offset;
2763  md->moptions = options;  md->moptions = options;
2764  md->poptions = re->options;  md->poptions = re->options;
2765    
2766    /* If the BSR option is not set at match time, copy what was set
2767    at compile time. */
2768    
2769    if ((md->moptions & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE)) == 0)
2770      {
2771      if ((re->options & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE)) != 0)
2772        md->moptions |= re->options & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE);
2773    #ifdef BSR_ANYCRLF
2774      else md->moptions |= PCRE_BSR_ANYCRLF;
2775    #endif
2776      }
2777    
2778  /* Handle different types of newline. The three bits give eight cases. If  /* Handle different types of newline. The three bits give eight cases. If
2779  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. */
2780    
# Line 2177  switch ((((options & PCRE_NEWLINE_BITS) Line 2782  switch ((((options & PCRE_NEWLINE_BITS)
2782           PCRE_NEWLINE_BITS)           PCRE_NEWLINE_BITS)
2783    {    {
2784    case 0: newline = NEWLINE; break;   /* Compile-time default */    case 0: newline = NEWLINE; break;   /* Compile-time default */
2785    case PCRE_NEWLINE_CR: newline = '\r'; break;    case PCRE_NEWLINE_CR: newline = CHAR_CR; break;
2786    case PCRE_NEWLINE_LF: newline = '\n'; break;    case PCRE_NEWLINE_LF: newline = CHAR_NL; break;
2787    case PCRE_NEWLINE_CR+    case PCRE_NEWLINE_CR+
2788         PCRE_NEWLINE_LF: newline = ('\r' << 8) | '\n'; break;         PCRE_NEWLINE_LF: newline = (CHAR_CR << 8) | CHAR_NL; break;
2789    case PCRE_NEWLINE_ANY: newline = -1; break;    case PCRE_NEWLINE_ANY: newline = -1; break;
2790    case PCRE_NEWLINE_ANYCRLF: newline = -2; break;    case PCRE_NEWLINE_ANYCRLF: newline = -2; break;
2791    default: return PCRE_ERROR_BADNEWLINE;    default: return PCRE_ERROR_BADNEWLINE;
# Line 2240  if (md->tables == NULL) md->tables = _pc Line 2845  if (md->tables == NULL) md->tables = _pc
2845  used in a loop when finding where to start. */  used in a loop when finding where to start. */
2846    
2847  lcc = md->tables + lcc_offset;  lcc = md->tables + lcc_offset;
2848  startline = (re->options & PCRE_STARTLINE) != 0;  startline = (re->flags & PCRE_STARTLINE) != 0;
2849  firstline = (re->options & PCRE_FIRSTLINE) != 0;  firstline = (re->options & PCRE_FIRSTLINE) != 0;
2850    
2851  /* 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 2856  studied, there may be a bitmap of possib
2856    
2857  if (!anchored)  if (!anchored)
2858    {    {
2859    if ((re->options & PCRE_FIRSTSET) != 0)    if ((re->flags & PCRE_FIRSTSET) != 0)
2860      {      {
2861      first_byte = re->first_byte & 255;      first_byte = re->first_byte & 255;
2862      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 2864  if (!anchored)
2864      }      }
2865    else    else
2866      {      {
2867      if (startline && study != NULL &&      if (!startline && study != NULL &&
2868           (study->options & PCRE_STUDY_MAPPED) != 0)           (study->flags & PCRE_STUDY_MAPPED) != 0)
2869        start_bits = study->start_bits;        start_bits = study->start_bits;
2870      }      }
2871    }    }
# Line 2268  if (!anchored) Line 2873  if (!anchored)
2873  /* For anchored or unanchored matches, there may be a "last known required  /* For anchored or unanchored matches, there may be a "last known required
2874  character" set. */  character" set. */
2875    
2876  if ((re->options & PCRE_REQCHSET) != 0)  if ((re->flags & PCRE_REQCHSET) != 0)
2877    {    {
2878    req_byte = re->req_byte & 255;    req_byte = re->req_byte & 255;
2879    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 2881  if ((re->options & PCRE_REQCHSET) != 0)
2881    }    }
2882    
2883  /* 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
2884  failed match. Unless restarting, optimize by moving to the first match  failed match. If not restarting, perform certain optimizations at the start of
2885  character if possible, when not anchored. Then unless wanting a partial match,  a match. */
 check for a required later character. */  
2886    
2887  for (;;)  for (;;)
2888    {    {
# Line 2288  for (;;) Line 2892  for (;;)
2892      {      {
2893      const uschar *save_end_subject = end_subject;      const uschar *save_end_subject = end_subject;
2894    
2895      /* 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
2896      start of the match is constrained to the first line of a multiline string.      line of a multiline string. Implement this by temporarily adjusting
2897      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
2898      scanning at a newline. If the match fails at the newline, later code breaks      the newline, later code breaks this loop. */
     this loop. */  
2899    
2900      if (firstline)      if (firstline)
2901        {        {
2902        const uschar *t = current_subject;        USPTR t = current_subject;
2903    #ifdef SUPPORT_UTF8
2904          if (utf8)
2905            {
2906            while (t < md->end_subject && !IS_NEWLINE(t))
2907              {
2908              t++;
2909              while (t < end_subject && (*t & 0xc0) == 0x80) t++;
2910              }
2911            }
2912          else
2913    #endif
2914        while (t < md->end_subject && !IS_NEWLINE(t)) t++;        while (t < md->end_subject && !IS_NEWLINE(t)) t++;
2915        end_subject = t;        end_subject = t;
2916        }        }
2917    
2918      if (first_byte >= 0)      /* There are some optimizations that avoid running the match if a known
2919        starting point is not found. However, there is an option that disables
2920        these, for testing and for ensuring that all callouts do actually occur. */
2921    
2922        if ((options & PCRE_NO_START_OPTIMIZE) == 0)
2923        {        {
2924        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++;  
       }  
2925    
2926      /* Or to just after a linebreak for a multiline match if possible */        if (first_byte >= 0)
2927            {
2928            if (first_byte_caseless)
2929              while (current_subject < end_subject &&
2930                     lcc[*current_subject] != first_byte)
2931                current_subject++;
2932            else
2933              while (current_subject < end_subject &&
2934                     *current_subject != first_byte)
2935                current_subject++;
2936            }
2937    
2938      else if (startline)        /* Or to just after a linebreak for a multiline match if possible */
2939        {  
2940        if (current_subject > md->start_subject + start_offset)        else if (startline)
2941          {          {
2942          while (current_subject <= end_subject && !WAS_NEWLINE(current_subject))          if (current_subject > md->start_subject + start_offset)
2943            current_subject++;            {
2944    #ifdef SUPPORT_UTF8
2945              if (utf8)
2946                {
2947                while (current_subject < end_subject &&
2948                       !WAS_NEWLINE(current_subject))
2949                  {
2950                  current_subject++;
2951                  while(current_subject < end_subject &&
2952                        (*current_subject & 0xc0) == 0x80)
2953                    current_subject++;
2954                  }
2955                }
2956              else
2957    #endif
2958              while (current_subject < end_subject && !WAS_NEWLINE(current_subject))
2959                current_subject++;
2960    
2961              /* If we have just passed a CR and the newline option is ANY or
2962              ANYCRLF, and we are now at a LF, advance the match position by one
2963              more character. */
2964    
2965          /* If we have just passed a CR and the newline option is ANY or            if (current_subject[-1] == CHAR_CR &&
2966          ANYCRLF, and we are now at a LF, advance the match position by one more                 (md->nltype == NLTYPE_ANY || md->nltype == NLTYPE_ANYCRLF) &&
2967          character. */                 current_subject < end_subject &&
2968                   *current_subject == CHAR_NL)
2969          if (current_subject[-1] == '\r' &&              current_subject++;
2970               (md->nltype == NLTYPE_ANY || md->nltype == NLTYPE_ANYCRLF) &&            }
              current_subject < end_subject &&  
              *current_subject == '\n')  
           current_subject++;  
2971          }          }
       }  
2972    
2973      /* Or to a non-unique first char after study */        /* Or to a non-unique first char after study */
2974    
2975      else if (start_bits != NULL)        else if (start_bits != NULL)
       {  
       while (current_subject < end_subject)  
2976          {          {
2977          register unsigned int c = *current_subject;          while (current_subject < end_subject)
2978          if ((start_bits[c/8] & (1 << (c&7))) == 0) current_subject++;            {
2979            else break;            register unsigned int c = *current_subject;
2980              if ((start_bits[c/8] & (1 << (c&7))) == 0) current_subject++;
2981                else break;
2982              }
2983          }          }
2984        }        }
2985    
2986      /* Restore fudged end_subject */      /* Restore fudged end_subject */
2987    
2988      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);  
2989    
2990      /* 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
2991      place we found it at last time. */      disabling is explicitly requested (and of course, by the test above, this
2992        code is not obeyed when restarting after a partial match). */
2993    
2994      if (p > req_byte_ptr)      if ((options & PCRE_NO_START_OPTIMIZE) == 0 &&
2995            (options & (PCRE_PARTIAL_HARD|PCRE_PARTIAL_SOFT)) == 0)
2996        {        {
2997        if (req_byte_caseless)        /* If the pattern was studied, a minimum subject length may be set. This
2998          {        is a lower bound; no actual string of that length may actually match the
2999          while (p < end_subject)        pattern. Although the value is, strictly, in characters, we treat it as
3000            {        bytes to avoid spending too much time in this optimization. */
3001            register int pp = *p++;  
3002            if (pp == req_byte || pp == req_byte2) { p--; break; }        if (study != NULL && (study->flags & PCRE_STUDY_MINLEN) != 0 &&
3003            }            end_subject - current_subject < study->minlength)
3004          }          return PCRE_ERROR_NOMATCH;
3005        else  
3006          /* If req_byte is set, we know that that character must appear in the
3007          subject for the match to succeed. If the first character is set, req_byte
3008          must be later in the subject; otherwise the test starts at the match
3009          point. This optimization can save a huge amount of work in patterns with
3010          nested unlimited repeats that aren't going to match. Writing separate
3011          code for cased/caseless versions makes it go faster, as does using an
3012          autoincrement and backing off on a match.
3013    
3014          HOWEVER: when the subject string is very, very long, searching to its end
3015          can take a long time, and give bad performance on quite ordinary
3016          patterns. This showed up when somebody was matching /^C/ on a 32-megabyte
3017          string... so we don't do this when the string is sufficiently long. */
3018    
3019          if (req_byte >= 0 && end_subject - current_subject < REQ_BYTE_MAX)
3020          {          {
3021          while (p < end_subject)          register const uschar *p = current_subject + ((first_byte >= 0)? 1 : 0);
3022    
3023            /* We don't need to repeat the search if we haven't yet reached the
3024            place we found it at last time. */
3025    
3026            if (p > req_byte_ptr)
3027            {            {
3028            if (*p++ == req_byte) { p--; break; }            if (req_byte_caseless)
3029            }              {
3030          }              while (p < end_subject)
3031                  {
3032                  register int pp = *p++;
3033                  if (pp == req_byte || pp == req_byte2) { p--; break; }
3034                  }
3035                }
3036              else
3037                {
3038                while (p < end_subject)
3039                  {
3040                  if (*p++ == req_byte) { p--; break; }
3041                  }
3042                }
3043    
3044        /* If we can't find the required character, break the matching loop,            /* If we can't find the required character, break the matching loop,
3045        which will cause a return or PCRE_ERROR_NOMATCH. */            which will cause a return or PCRE_ERROR_NOMATCH. */
3046    
3047        if (p >= end_subject) break;            if (p >= end_subject) break;
3048    
3049        /* If we have found the required character, save the point where we            /* If we have found the required character, save the point where we
3050        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
3051        the start hasn't passed this character yet. */            the start hasn't passed this character yet. */
3052    
3053        req_byte_ptr = p;            req_byte_ptr = p;
3054              }
3055            }
3056        }        }
3057      }      }   /* End of optimizations that are done when not restarting */
3058    
3059    /* OK, now we can do the business */    /* OK, now we can do the business */
3060    
3061      md->start_used_ptr = current_subject;
3062    
3063    rc = internal_dfa_exec(    rc = internal_dfa_exec(
3064      md,                                /* fixed match data */      md,                                /* fixed match data */
3065      md->start_code,                    /* this subexpression's code */      md->start_code,                    /* this subexpression's code */
# Line 2438  for (;;) Line 3090  for (;;)
3090      }      }
3091    if (current_subject > end_subject) break;    if (current_subject > end_subject) break;
3092    
3093    /* 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
3094    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
3095    character. */    or ANY or ANYCRLF, advance the match position by one more character. */
3096    
3097    if (current_subject[-1] == '\r' &&    if (current_subject[-1] == CHAR_CR &&
3098         (md->nltype == NLTYPE_ANY ||        current_subject < end_subject &&
3099          md->nltype == NLTYPE_ANYCRLF ||        *current_subject == CHAR_NL &&
3100          md->nllen == 2) &&        (re->flags & PCRE_HASCRORLF) == 0 &&
3101         current_subject < end_subject &&          (md->nltype == NLTYPE_ANY ||
3102         *current_subject == '\n')           md->nltype == NLTYPE_ANYCRLF ||
3103             md->nllen == 2))
3104      current_subject++;      current_subject++;
3105    
3106    }   /* "Bumpalong" loop */    }   /* "Bumpalong" loop */

Legend:
Removed from v.152  
changed lines
  Added in v.462

  ViewVC Help
Powered by ViewVC 1.1.5