/[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 145 by ph10, Wed Apr 4 14:06:52 2007 UTC revision 507 by ph10, Wed Mar 10 16:08:01 2010 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-2010 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,                          /* \P, \p                                 */
122      0, 0, 0, 0, 0,                 /* \R, \H, \h, \V, \v                     */
123      0,                             /* \X                                     */
124    0, 0, 0, 0, 0,                 /* \Z, \z, Opt, ^, $                      */    0, 0, 0, 0, 0,                 /* \Z, \z, Opt, ^, $                      */
125    1,                             /* Char                                   */    1,                             /* Char                                   */
126    1,                             /* Charnc                                 */    1,                             /* Charnc                                 */
# Line 117  static uschar coptable[] = { Line 157  static uschar coptable[] = {
157    0,                             /* Reverse                                */    0,                             /* Reverse                                */
158    0, 0, 0, 0,                    /* ONCE, BRA, CBRA, COND                  */    0, 0, 0, 0,                    /* ONCE, BRA, CBRA, COND                  */
159    0, 0, 0,                       /* SBRA, SCBRA, SCOND                     */    0, 0, 0,                       /* SBRA, SCBRA, SCOND                     */
160    0,                             /* CREF                                   */    0, 0,                          /* CREF, NCREF                            */
161    0,                             /* RREF                                   */    0, 0,                          /* RREF, NRREF                            */
162      0,                             /* DEF                                    */
163      0, 0,                          /* BRAZERO, BRAMINZERO                    */
164      0, 0, 0, 0,                    /* PRUNE, SKIP, THEN, COMMIT              */
165      0, 0, 0, 0                     /* FAIL, ACCEPT, CLOSE, SKIPZERO          */
166    };
167    
168    /* This table identifies those opcodes that inspect a character. It is used to
169    remember the fact that a character could have been inspected when the end of
170    the subject is reached. ***NOTE*** If the start of this table is modified, the
171    two tables that follow must also be modified. */
172    
173    static const uschar poptable[] = {
174      0,                             /* End                                    */
175      0, 0, 0, 1, 1,                 /* \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,                          /* \P, \p                                 */
179      1, 1, 1, 1, 1,                 /* \R, \H, \h, \V, \v                     */
180      1,                             /* \X                                     */
181      0, 0, 0, 0, 0,                 /* \Z, \z, Opt, ^, $                      */
182      1,                             /* Char                                   */
183      1,                             /* Charnc                                 */
184      1,                             /* not                                    */
185      /* Positive single-char repeats                                          */
186      1, 1, 1, 1, 1, 1,              /* *, *?, +, +?, ?, ??                    */
187      1, 1, 1,                       /* upto, minupto, exact                   */
188      1, 1, 1, 1,                    /* *+, ++, ?+, upto+                      */
189      /* Negative single-char repeats - only for chars < 256                   */
190      1, 1, 1, 1, 1, 1,              /* NOT *, *?, +, +?, ?, ??                */
191      1, 1, 1,                       /* NOT upto, minupto, exact               */
192      1, 1, 1, 1,                    /* NOT *+, ++, ?+, upto+                  */
193      /* Positive type repeats                                                 */
194      1, 1, 1, 1, 1, 1,              /* Type *, *?, +, +?, ?, ??               */
195      1, 1, 1,                       /* Type upto, minupto, exact              */
196      1, 1, 1, 1,                    /* Type *+, ++, ?+, upto+                 */
197      /* Character class & ref repeats                                         */
198      1, 1, 1, 1, 1, 1,              /* *, *?, +, +?, ?, ??                    */
199      1, 1,                          /* CRRANGE, CRMINRANGE                    */
200      1,                             /* CLASS                                  */
201      1,                             /* NCLASS                                 */
202      1,                             /* XCLASS - variable length               */
203      0,                             /* REF                                    */
204      0,                             /* RECURSE                                */
205      0,                             /* CALLOUT                                */
206      0,                             /* Alt                                    */
207      0,                             /* Ket                                    */
208      0,                             /* KetRmax                                */
209      0,                             /* KetRmin                                */
210      0,                             /* Assert                                 */
211      0,                             /* Assert not                             */
212      0,                             /* Assert behind                          */
213      0,                             /* Assert behind not                      */
214      0,                             /* Reverse                                */
215      0, 0, 0, 0,                    /* ONCE, BRA, CBRA, COND                  */
216      0, 0, 0,                       /* SBRA, SCBRA, SCOND                     */
217      0, 0,                          /* CREF, NCREF                            */
218      0, 0,                          /* RREF, NRREF                            */
219    0,                             /* DEF                                    */    0,                             /* DEF                                    */
220    0, 0                           /* BRAZERO, BRAMINZERO                    */    0, 0,                          /* BRAZERO, BRAMINZERO                    */
221      0, 0, 0, 0,                    /* PRUNE, SKIP, THEN, COMMIT              */
222      0, 0, 0, 0                     /* FAIL, ACCEPT, CLOSE, SKIPZERO          */
223  };  };
224    
225  /* 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,
226  and \w */  and \w */
227    
228  static uschar toptable1[] = {  static const uschar toptable1[] = {
229    0, 0, 0, 0, 0,    0, 0, 0, 0, 0, 0,
230    ctype_digit, ctype_digit,    ctype_digit, ctype_digit,
231    ctype_space, ctype_space,    ctype_space, ctype_space,
232    ctype_word,  ctype_word,    ctype_word,  ctype_word,
233    0                               /* OP_ANY */    0, 0                            /* OP_ANY, OP_ALLANY */
234  };  };
235    
236  static uschar toptable2[] = {  static const uschar toptable2[] = {
237    0, 0, 0, 0, 0,    0, 0, 0, 0, 0, 0,
238    ctype_digit, 0,    ctype_digit, 0,
239    ctype_space, 0,    ctype_space, 0,
240    ctype_word,  0,    ctype_word,  0,
241    1                               /* OP_ANY */    1, 1                            /* OP_ANY, OP_ALLANY */
242  };  };
243    
244    
# Line 158  typedef struct stateblock { Line 257  typedef struct stateblock {
257  #define INTS_PER_STATEBLOCK  (sizeof(stateblock)/sizeof(int))  #define INTS_PER_STATEBLOCK  (sizeof(stateblock)/sizeof(int))
258    
259    
260  #ifdef DEBUG  #ifdef PCRE_DEBUG
261  /*************************************************  /*************************************************
262  *             Print character string             *  *             Print character string             *
263  *************************************************/  *************************************************/
# Line 211  Arguments: Line 310  Arguments:
310    rlevel            function call recursion level    rlevel            function call recursion level
311    recursing         regex recursive call level    recursing         regex recursive call level
312    
313  Returns:            > 0 =>  Returns:            > 0 => number of match offset pairs placed in offsets
314                      = 0 =>                      = 0 => offsets overflowed; longest matches are present
315                       -1 => failed to match                       -1 => failed to match
316                     < -1 => some kind of unexpected problem                     < -1 => some kind of unexpected problem
317    
# Line 378  if (*first_op == OP_REVERSE) Line 477  if (*first_op == OP_REVERSE)
477      current_subject -= gone_back;      current_subject -= gone_back;
478      }      }
479    
480      /* Save the earliest consulted character */
481    
482      if (current_subject < md->start_used_ptr)
483        md->start_used_ptr = current_subject;
484    
485    /* Now we can process the individual branches. */    /* Now we can process the individual branches. */
486    
487    end_code = this_start_code;    end_code = this_start_code;
# Line 442  for (;;) Line 546  for (;;)
546    int i, j;    int i, j;
547    int clen, dlen;    int clen, dlen;
548    unsigned int c, d;    unsigned int c, d;
549      int forced_fail = 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 455  for (;;) Line 561  for (;;)
561    workspace[0] ^= 1;              /* Remember for the restarting feature */    workspace[0] ^= 1;              /* Remember for the restarting feature */
562    workspace[1] = active_count;    workspace[1] = active_count;
563    
564  #ifdef DEBUG  #ifdef PCRE_DEBUG
565    printf("%.*sNext character: rest of subject = \"", rlevel*2-2, SP);    printf("%.*sNext character: rest of subject = \"", rlevel*2-2, SP);
566    pchars((uschar *)ptr, strlen((char *)ptr), stdout);    pchars((uschar *)ptr, strlen((char *)ptr), stdout);
567    printf("\"\n");    printf("\"\n");
# 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;
     int chartype, script;  
609    
610  #ifdef DEBUG  #ifdef PCRE_DEBUG
611      printf ("%.*sProcessing state %d c=", rlevel*2-2, SP, state_offset);      printf ("%.*sProcessing state %d c=", rlevel*2-2, SP, state_offset);
612      if (clen == 0) printf("EOL\n");      if (clen == 0) printf("EOL\n");
613        else if (c > 32 && c < 127) printf("'%c'\n", c);        else if (c > 32 && c < 127) printf("'%c'\n", c);
# Line 532  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 549  for (;;) Line 656  for (;;)
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 for use when testing for a partial match. */
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
667      is wrong, because sometimes zero repetitions of the subject are      is wrong, because sometimes zero repetitions of the subject are
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 576  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 591  for (;;) Line 708  for (;;)
708    
709      switch (codevalue)      switch (codevalue)
710        {        {
711    /* ========================================================================== */
712          /* These cases are never obeyed. This is a fudge that causes a compile-
713          time error if the vectors coptable or poptable, which are indexed by
714          opcode, are not the correct length. It seems to be the only way to do
715          such a check at compile time, as the sizeof() operator does not work
716          in the C preprocessor. */
717    
718          case OP_TABLE_LENGTH:
719          case OP_TABLE_LENGTH +
720            ((sizeof(coptable) == OP_TABLE_LENGTH) &&
721             (sizeof(poptable) == OP_TABLE_LENGTH)):
722          break;
723    
724  /* ========================================================================== */  /* ========================================================================== */
725        /* 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
726        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
727        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
728          start of the subject, save the match data, shifting up all previous
729        matches so we always have the longest first. */        matches so we always have the longest first. */
730    
731        case OP_KET:        case OP_KET:
# Line 609  for (;;) Line 739  for (;;)
739            ADD_ACTIVE(state_offset - GET(code, 1), 0);            ADD_ACTIVE(state_offset - GET(code, 1), 0);
740            }            }
741          }          }
742        else if (ptr > current_subject || (md->moptions & PCRE_NOTEMPTY) == 0)        else
743          {          {
744          if (match_count < 0) match_count = (offsetcount >= 2)? 1 : 0;          if (ptr > current_subject ||
745            else if (match_count > 0 && ++match_count * 2 >= offsetcount)              ((md->moptions & PCRE_NOTEMPTY) == 0 &&
746              match_count = 0;                ((md->moptions & PCRE_NOTEMPTY_ATSTART) == 0 ||
747          count = ((match_count == 0)? offsetcount : match_count * 2) - 2;                  current_subject > start_subject + md->start_offset)))
748          if (count > 0) memmove(offsets + 2, offsets, count * sizeof(int));            {
749          if (offsetcount >= 2)            if (match_count < 0) match_count = (offsetcount >= 2)? 1 : 0;
750            {              else if (match_count > 0 && ++match_count * 2 >= offsetcount)
751            offsets[0] = current_subject - start_subject;                match_count = 0;
752            offsets[1] = ptr - start_subject;            count = ((match_count == 0)? offsetcount : match_count * 2) - 2;
753            DPRINTF(("%.*sSet matched string = \"%.*s\"\n", rlevel*2-2, SP,            if (count > 0) memmove(offsets + 2, offsets, count * sizeof(int));
754              offsets[1] - offsets[0], current_subject));            if (offsetcount >= 2)
755            }              {
756          if ((md->moptions & PCRE_DFA_SHORTEST) != 0)              offsets[0] = current_subject - start_subject;
757            {              offsets[1] = ptr - start_subject;
758            DPRINTF(("%.*sEnd of internal_dfa_exec %d: returning %d\n"              DPRINTF(("%.*sSet matched string = \"%.*s\"\n", rlevel*2-2, SP,
759              "%.*s---------------------\n\n", rlevel*2-2, SP, rlevel,                offsets[1] - offsets[0], current_subject));
760              match_count, rlevel*2-2, SP));              }
761            return match_count;            if ((md->moptions & PCRE_DFA_SHORTEST) != 0)
762                {
763                DPRINTF(("%.*sEnd of internal_dfa_exec %d: returning %d\n"
764                  "%.*s---------------------\n\n", rlevel*2-2, SP, rlevel,
765                  match_count, rlevel*2-2, SP));
766                return match_count;
767                }
768            }            }
769          }          }
770        break;        break;
# Line 676  for (;;) Line 812  for (;;)
812        break;        break;
813    
814        /*-----------------------------------------------------------------*/        /*-----------------------------------------------------------------*/
815          case OP_SKIPZERO:
816          code += 1 + GET(code, 2);
817          while (*code == OP_ALT) code += GET(code, 1);
818          ADD_ACTIVE(code - start_code + 1 + LINK_SIZE, 0);
819          break;
820    
821          /*-----------------------------------------------------------------*/
822        case OP_CIRC:        case OP_CIRC:
823        if ((ptr == start_subject && (md->moptions & PCRE_NOTBOL) == 0) ||        if ((ptr == start_subject && (md->moptions & PCRE_NOTBOL) == 0) ||
824            ((ims & PCRE_MULTILINE) != 0 &&            ((ims & PCRE_MULTILINE) != 0 &&
# Line 714  for (;;) Line 857  for (;;)
857    
858        /*-----------------------------------------------------------------*/        /*-----------------------------------------------------------------*/
859        case OP_ANY:        case OP_ANY:
860        if (clen > 0 && ((ims & PCRE_DOTALL) != 0 || !IS_NEWLINE(ptr)))        if (clen > 0 && !IS_NEWLINE(ptr))
861            { ADD_NEW(state_offset + 1, 0); }
862          break;
863    
864          /*-----------------------------------------------------------------*/
865          case OP_ALLANY:
866          if (clen > 0)
867          { ADD_NEW(state_offset + 1, 0); }          { ADD_NEW(state_offset + 1, 0); }
868        break;        break;
869    
# Line 729  for (;;) Line 878  for (;;)
878        if ((md->moptions & PCRE_NOTEOL) == 0)        if ((md->moptions & PCRE_NOTEOL) == 0)
879          {          {
880          if (clen == 0 ||          if (clen == 0 ||
881              (IS_NEWLINE(ptr) &&              ((md->poptions & PCRE_DOLLAR_ENDONLY) == 0 && IS_NEWLINE(ptr) &&
882                 ((ims & PCRE_MULTILINE) != 0 || ptr == end_subject - md->nllen)                 ((ims & PCRE_MULTILINE) != 0 || ptr == end_subject - md->nllen)
883              ))              ))
884            { ADD_ACTIVE(state_offset + 1, 0); }            { ADD_ACTIVE(state_offset + 1, 0); }
# Line 766  for (;;) Line 915  for (;;)
915          if (ptr > start_subject)          if (ptr > start_subject)
916            {            {
917            const uschar *temp = ptr - 1;            const uschar *temp = ptr - 1;
918              if (temp < md->start_used_ptr) md->start_used_ptr = temp;
919  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
920            if (utf8) BACKCHAR(temp);            if (utf8) BACKCHAR(temp);
921  #endif  #endif
# Line 774  for (;;) Line 924  for (;;)
924            }            }
925          else left_word = 0;          else left_word = 0;
926    
927          if (clen > 0) right_word = c < 256 && (ctypes[c] & ctype_word) != 0;          if (clen > 0)
928            else right_word = 0;            right_word = c < 256 && (ctypes[c] & ctype_word) != 0;
929            else right_word = 0;
930    
931          if ((left_word == right_word) == (codevalue == OP_NOT_WORD_BOUNDARY))          if ((left_word == right_word) == (codevalue == OP_NOT_WORD_BOUNDARY))
932            { ADD_ACTIVE(state_offset + 1, 0); }            { ADD_ACTIVE(state_offset + 1, 0); }
# Line 783  for (;;) Line 934  for (;;)
934        break;        break;
935    
936    
 #ifdef SUPPORT_UCP  
   
937        /*-----------------------------------------------------------------*/        /*-----------------------------------------------------------------*/
938        /* Check the next character by Unicode property. We will get here only        /* Check the next character by Unicode property. We will get here only
939        if the support is in the binary; otherwise a compile-time error occurs.        if the support is in the binary; otherwise a compile-time error occurs.
940        */        */
941    
942    #ifdef SUPPORT_UCP
943        case OP_PROP:        case OP_PROP:
944        case OP_NOTPROP:        case OP_NOTPROP:
945        if (clen > 0)        if (clen > 0)
946          {          {
947          BOOL OK;          BOOL OK;
948          int category = _pcre_ucp_findprop(c, &chartype, &script);          const ucd_record * prop = GET_UCD(c);
949          switch(code[1])          switch(code[1])
950            {            {
951            case PT_ANY:            case PT_ANY:
# Line 803  for (;;) Line 953  for (;;)
953            break;            break;
954    
955            case PT_LAMP:            case PT_LAMP:
956            OK = chartype == ucp_Lu || chartype == ucp_Ll || chartype == ucp_Lt;            OK = prop->chartype == ucp_Lu || prop->chartype == ucp_Ll || prop->chartype == ucp_Lt;
957            break;            break;
958    
959            case PT_GC:            case PT_GC:
960            OK = category == code[2];            OK = _pcre_ucp_gentype[prop->chartype] == code[2];
961            break;            break;
962    
963            case PT_PC:            case PT_PC:
964            OK = chartype == code[2];            OK = prop->chartype == code[2];
965            break;            break;
966    
967            case PT_SC:            case PT_SC:
968            OK = script == code[2];            OK = prop->script == code[2];
969            break;            break;
970    
971            /* Should never occur, but keep compilers from grumbling. */            /* Should never occur, but keep compilers from grumbling. */
# Line 835  for (;;) Line 985  for (;;)
985  /* ========================================================================== */  /* ========================================================================== */
986        /* These opcodes likewise inspect the subject character, but have an        /* These opcodes likewise inspect the subject character, but have an
987        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:
988        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,
989        OP_NOT_WORDCHAR. The value is loaded into d. */        OP_WORDCHAR, OP_NOT_WORDCHAR. The value is loaded into d. */
990    
991        case OP_TYPEPLUS:        case OP_TYPEPLUS:
992        case OP_TYPEMINPLUS:        case OP_TYPEMINPLUS:
# Line 847  for (;;) Line 997  for (;;)
997          {          {
998          if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||          if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||
999              (c < 256 &&              (c < 256 &&
1000                (d != OP_ANY ||                (d != OP_ANY || !IS_NEWLINE(ptr)) &&
                (ims & PCRE_DOTALL) != 0 ||  
                !IS_NEWLINE(ptr)  
               ) &&  
1001                ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))                ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))
1002            {            {
1003            if (count > 0 && codevalue == OP_TYPEPOSPLUS)            if (count > 0 && codevalue == OP_TYPEPOSPLUS)
# Line 873  for (;;) Line 1020  for (;;)
1020          {          {
1021          if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||          if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||
1022              (c < 256 &&              (c < 256 &&
1023                (d != OP_ANY ||                (d != OP_ANY || !IS_NEWLINE(ptr)) &&
                (ims & PCRE_DOTALL) != 0 ||  
                !IS_NEWLINE(ptr)  
               ) &&  
1024                ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))                ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))
1025            {            {
1026            if (codevalue == OP_TYPEPOSQUERY)            if (codevalue == OP_TYPEPOSQUERY)
# Line 898  for (;;) Line 1042  for (;;)
1042          {          {
1043          if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||          if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||
1044              (c < 256 &&              (c < 256 &&
1045                (d != OP_ANY ||                (d != OP_ANY || !IS_NEWLINE(ptr)) &&
                (ims & PCRE_DOTALL) != 0 ||  
                !IS_NEWLINE(ptr)  
               ) &&  
1046                ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))                ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))
1047            {            {
1048            if (codevalue == OP_TYPEPOSSTAR)            if (codevalue == OP_TYPEPOSSTAR)
# Line 921  for (;;) Line 1062  for (;;)
1062          {          {
1063          if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||          if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||
1064              (c < 256 &&              (c < 256 &&
1065                (d != OP_ANY ||                (d != OP_ANY || !IS_NEWLINE(ptr)) &&
                (ims & PCRE_DOTALL) != 0 ||  
                !IS_NEWLINE(ptr)  
               ) &&  
1066                ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))                ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))
1067            {            {
1068            if (++count >= GET2(code, 1))            if (++count >= GET2(code, 1))
# Line 945  for (;;) Line 1083  for (;;)
1083          {          {
1084          if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||          if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||
1085              (c < 256 &&              (c < 256 &&
1086                (d != OP_ANY ||                (d != OP_ANY || !IS_NEWLINE(ptr)) &&
                (ims & PCRE_DOTALL) != 0 ||  
                !IS_NEWLINE(ptr)  
               ) &&  
1087                ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))                ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))
1088            {            {
1089            if (codevalue == OP_TYPEPOSUPTO)            if (codevalue == OP_TYPEPOSUPTO)
# Line 970  for (;;) Line 1105  for (;;)
1105        argument. It keeps the code above fast for the other cases. The argument        argument. It keeps the code above fast for the other cases. The argument
1106        is in the d variable. */        is in the d variable. */
1107    
1108    #ifdef SUPPORT_UCP
1109        case OP_PROP_EXTRA + OP_TYPEPLUS:        case OP_PROP_EXTRA + OP_TYPEPLUS:
1110        case OP_PROP_EXTRA + OP_TYPEMINPLUS:        case OP_PROP_EXTRA + OP_TYPEMINPLUS:
1111        case OP_PROP_EXTRA + OP_TYPEPOSPLUS:        case OP_PROP_EXTRA + OP_TYPEPOSPLUS:
# Line 978  for (;;) Line 1114  for (;;)
1114        if (clen > 0)        if (clen > 0)
1115          {          {
1116          BOOL OK;          BOOL OK;
1117          int category = _pcre_ucp_findprop(c, &chartype, &script);          const ucd_record * prop = GET_UCD(c);
1118          switch(code[2])          switch(code[2])
1119            {            {
1120            case PT_ANY:            case PT_ANY:
# Line 986  for (;;) Line 1122  for (;;)
1122            break;            break;
1123    
1124            case PT_LAMP:            case PT_LAMP:
1125            OK = chartype == ucp_Lu || chartype == ucp_Ll || chartype == ucp_Lt;            OK = prop->chartype == ucp_Lu || prop->chartype == ucp_Ll || prop->chartype == ucp_Lt;
1126            break;            break;
1127    
1128            case PT_GC:            case PT_GC:
1129            OK = category == code[3];            OK = _pcre_ucp_gentype[prop->chartype] == code[3];
1130            break;            break;
1131    
1132            case PT_PC:            case PT_PC:
1133            OK = chartype == code[3];            OK = prop->chartype == code[3];
1134            break;            break;
1135    
1136            case PT_SC:            case PT_SC:
1137            OK = script == code[3];            OK = prop->script == code[3];
1138            break;            break;
1139    
1140            /* Should never occur, but keep compilers from grumbling. */            /* Should never occur, but keep compilers from grumbling. */
# Line 1027  for (;;) Line 1163  for (;;)
1163        case OP_EXTUNI_EXTRA + OP_TYPEPOSPLUS:        case OP_EXTUNI_EXTRA + OP_TYPEPOSPLUS:
1164        count = current_state->count;  /* Already matched */        count = current_state->count;  /* Already matched */
1165        if (count > 0) { ADD_ACTIVE(state_offset + 2, 0); }        if (count > 0) { ADD_ACTIVE(state_offset + 2, 0); }
1166        if (clen > 0 && _pcre_ucp_findprop(c, &chartype, &script) != ucp_M)        if (clen > 0 && UCD_CATEGORY(c) != ucp_M)
1167          {          {
1168          const uschar *nptr = ptr + clen;          const uschar *nptr = ptr + clen;
1169          int ncount = 0;          int ncount = 0;
# Line 1041  for (;;) Line 1177  for (;;)
1177            int nd;            int nd;
1178            int ndlen = 1;            int ndlen = 1;
1179            GETCHARLEN(nd, nptr, ndlen);            GETCHARLEN(nd, nptr, ndlen);
1180            if (_pcre_ucp_findprop(nd, &chartype, &script) != ucp_M) break;            if (UCD_CATEGORY(nd) != ucp_M) break;
1181            ncount++;            ncount++;
1182            nptr += ndlen;            nptr += ndlen;
1183            }            }
# Line 1049  for (;;) Line 1185  for (;;)
1185          ADD_NEW_DATA(-state_offset, count, ncount);          ADD_NEW_DATA(-state_offset, count, ncount);
1186          }          }
1187        break;        break;
1188    #endif
1189    
1190        /*-----------------------------------------------------------------*/        /*-----------------------------------------------------------------*/
1191        case OP_ANYNL_EXTRA + OP_TYPEPLUS:        case OP_ANYNL_EXTRA + OP_TYPEPLUS:
# Line 1061  for (;;) Line 1198  for (;;)
1198          int ncount = 0;          int ncount = 0;
1199          switch (c)          switch (c)
1200            {            {
1201              case 0x000b:
1202              case 0x000c:
1203              case 0x0085:
1204              case 0x2028:
1205              case 0x2029:
1206              if ((md->moptions & PCRE_BSR_ANYCRLF) != 0) break;
1207              goto ANYNL01;
1208    
1209            case 0x000d:            case 0x000d:
1210            if (ptr + 1 < end_subject && ptr[1] == 0x0a) ncount = 1;            if (ptr + 1 < end_subject && ptr[1] == 0x0a) ncount = 1;
1211            /* Fall through */            /* Fall through */
1212    
1213              ANYNL01:
1214              case 0x000a:
1215              if (count > 0 && codevalue == OP_ANYNL_EXTRA + OP_TYPEPOSPLUS)
1216                {
1217                active_count--;           /* Remove non-match possibility */
1218                next_active_state--;
1219                }
1220              count++;
1221              ADD_NEW_DATA(-state_offset, count, ncount);
1222              break;
1223    
1224              default:
1225              break;
1226              }
1227            }
1228          break;
1229    
1230          /*-----------------------------------------------------------------*/
1231          case OP_VSPACE_EXTRA + OP_TYPEPLUS:
1232          case OP_VSPACE_EXTRA + OP_TYPEMINPLUS:
1233          case OP_VSPACE_EXTRA + OP_TYPEPOSPLUS:
1234          count = current_state->count;  /* Already matched */
1235          if (count > 0) { ADD_ACTIVE(state_offset + 2, 0); }
1236          if (clen > 0)
1237            {
1238            BOOL OK;
1239            switch (c)
1240              {
1241            case 0x000a:            case 0x000a:
1242            case 0x000b:            case 0x000b:
1243            case 0x000c:            case 0x000c:
1244              case 0x000d:
1245            case 0x0085:            case 0x0085:
1246            case 0x2028:            case 0x2028:
1247            case 0x2029:            case 0x2029:
1248            if (count > 0 && codevalue == OP_ANYNL_EXTRA + OP_TYPEPOSPLUS)            OK = TRUE;
1249              break;
1250    
1251              default:
1252              OK = FALSE;
1253              break;
1254              }
1255    
1256            if (OK == (d == OP_VSPACE))
1257              {
1258              if (count > 0 && codevalue == OP_VSPACE_EXTRA + OP_TYPEPOSPLUS)
1259              {              {
1260              active_count--;           /* Remove non-match possibility */              active_count--;           /* Remove non-match possibility */
1261              next_active_state--;              next_active_state--;
1262              }              }
1263            count++;            count++;
1264            ADD_NEW_DATA(-state_offset, count, ncount);            ADD_NEW_DATA(-state_offset, count, 0);
1265              }
1266            }
1267          break;
1268    
1269          /*-----------------------------------------------------------------*/
1270          case OP_HSPACE_EXTRA + OP_TYPEPLUS:
1271          case OP_HSPACE_EXTRA + OP_TYPEMINPLUS:
1272          case OP_HSPACE_EXTRA + OP_TYPEPOSPLUS:
1273          count = current_state->count;  /* Already matched */
1274          if (count > 0) { ADD_ACTIVE(state_offset + 2, 0); }
1275          if (clen > 0)
1276            {
1277            BOOL OK;
1278            switch (c)
1279              {
1280              case 0x09:      /* HT */
1281              case 0x20:      /* SPACE */
1282              case 0xa0:      /* NBSP */
1283              case 0x1680:    /* OGHAM SPACE MARK */
1284              case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
1285              case 0x2000:    /* EN QUAD */
1286              case 0x2001:    /* EM QUAD */
1287              case 0x2002:    /* EN SPACE */
1288              case 0x2003:    /* EM SPACE */
1289              case 0x2004:    /* THREE-PER-EM SPACE */
1290              case 0x2005:    /* FOUR-PER-EM SPACE */
1291              case 0x2006:    /* SIX-PER-EM SPACE */
1292              case 0x2007:    /* FIGURE SPACE */
1293              case 0x2008:    /* PUNCTUATION SPACE */
1294              case 0x2009:    /* THIN SPACE */
1295              case 0x200A:    /* HAIR SPACE */
1296              case 0x202f:    /* NARROW NO-BREAK SPACE */
1297              case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
1298              case 0x3000:    /* IDEOGRAPHIC SPACE */
1299              OK = TRUE;
1300            break;            break;
1301    
1302            default:            default:
1303              OK = FALSE;
1304            break;            break;
1305            }            }
1306    
1307            if (OK == (d == OP_HSPACE))
1308              {
1309              if (count > 0 && codevalue == OP_HSPACE_EXTRA + OP_TYPEPOSPLUS)
1310                {
1311                active_count--;           /* Remove non-match possibility */
1312                next_active_state--;
1313                }
1314              count++;
1315              ADD_NEW_DATA(-state_offset, count, 0);
1316              }
1317          }          }
1318        break;        break;
1319    
1320        /*-----------------------------------------------------------------*/        /*-----------------------------------------------------------------*/
1321    #ifdef SUPPORT_UCP
1322        case OP_PROP_EXTRA + OP_TYPEQUERY:        case OP_PROP_EXTRA + OP_TYPEQUERY:
1323        case OP_PROP_EXTRA + OP_TYPEMINQUERY:        case OP_PROP_EXTRA + OP_TYPEMINQUERY:
1324        case OP_PROP_EXTRA + OP_TYPEPOSQUERY:        case OP_PROP_EXTRA + OP_TYPEPOSQUERY:
# Line 1102  for (;;) Line 1336  for (;;)
1336        if (clen > 0)        if (clen > 0)
1337          {          {
1338          BOOL OK;          BOOL OK;
1339          int category = _pcre_ucp_findprop(c, &chartype, &script);          const ucd_record * prop = GET_UCD(c);
1340          switch(code[2])          switch(code[2])
1341            {            {
1342            case PT_ANY:            case PT_ANY:
# Line 1110  for (;;) Line 1344  for (;;)
1344            break;            break;
1345    
1346            case PT_LAMP:            case PT_LAMP:
1347            OK = chartype == ucp_Lu || chartype == ucp_Ll || chartype == ucp_Lt;            OK = prop->chartype == ucp_Lu || prop->chartype == ucp_Ll || prop->chartype == ucp_Lt;
1348            break;            break;
1349    
1350            case PT_GC:            case PT_GC:
1351            OK = category == code[3];            OK = _pcre_ucp_gentype[prop->chartype] == code[3];
1352            break;            break;
1353    
1354            case PT_PC:            case PT_PC:
1355            OK = chartype == code[3];            OK = prop->chartype == code[3];
1356            break;            break;
1357    
1358            case PT_SC:            case PT_SC:
1359            OK = script == code[3];            OK = prop->script == code[3];
1360            break;            break;
1361    
1362            /* Should never occur, but keep compilers from grumbling. */            /* Should never occur, but keep compilers from grumbling. */
# Line 1160  for (;;) Line 1394  for (;;)
1394        QS2:        QS2:
1395    
1396        ADD_ACTIVE(state_offset + 2, 0);        ADD_ACTIVE(state_offset + 2, 0);
1397        if (clen > 0 && _pcre_ucp_findprop(c, &chartype, &script) != ucp_M)        if (clen > 0 && UCD_CATEGORY(c) != ucp_M)
1398          {          {
1399          const uschar *nptr = ptr + clen;          const uschar *nptr = ptr + clen;
1400          int ncount = 0;          int ncount = 0;
# Line 1175  for (;;) Line 1409  for (;;)
1409            int nd;            int nd;
1410            int ndlen = 1;            int ndlen = 1;
1411            GETCHARLEN(nd, nptr, ndlen);            GETCHARLEN(nd, nptr, ndlen);
1412            if (_pcre_ucp_findprop(nd, &chartype, &script) != ucp_M) break;            if (UCD_CATEGORY(nd) != ucp_M) break;
1413            ncount++;            ncount++;
1414            nptr += ndlen;            nptr += ndlen;
1415            }            }
1416          ADD_NEW_DATA(-(state_offset + count), 0, ncount);          ADD_NEW_DATA(-(state_offset + count), 0, ncount);
1417          }          }
1418        break;        break;
1419    #endif
1420    
1421        /*-----------------------------------------------------------------*/        /*-----------------------------------------------------------------*/
1422        case OP_ANYNL_EXTRA + OP_TYPEQUERY:        case OP_ANYNL_EXTRA + OP_TYPEQUERY:
# Line 1202  for (;;) Line 1437  for (;;)
1437          int ncount = 0;          int ncount = 0;
1438          switch (c)          switch (c)
1439            {            {
1440              case 0x000b:
1441              case 0x000c:
1442              case 0x0085:
1443              case 0x2028:
1444              case 0x2029:
1445              if ((md->moptions & PCRE_BSR_ANYCRLF) != 0) break;
1446              goto ANYNL02;
1447    
1448            case 0x000d:            case 0x000d:
1449            if (ptr + 1 < end_subject && ptr[1] == 0x0a) ncount = 1;            if (ptr + 1 < end_subject && ptr[1] == 0x0a) ncount = 1;
1450            /* Fall through */            /* Fall through */
1451    
1452              ANYNL02:
1453              case 0x000a:
1454              if (codevalue == OP_ANYNL_EXTRA + OP_TYPEPOSSTAR ||
1455                  codevalue == OP_ANYNL_EXTRA + OP_TYPEPOSQUERY)
1456                {
1457                active_count--;           /* Remove non-match possibility */
1458                next_active_state--;
1459                }
1460              ADD_NEW_DATA(-(state_offset + count), 0, ncount);
1461              break;
1462    
1463              default:
1464              break;
1465              }
1466            }
1467          break;
1468    
1469          /*-----------------------------------------------------------------*/
1470          case OP_VSPACE_EXTRA + OP_TYPEQUERY:
1471          case OP_VSPACE_EXTRA + OP_TYPEMINQUERY:
1472          case OP_VSPACE_EXTRA + OP_TYPEPOSQUERY:
1473          count = 2;
1474          goto QS4;
1475    
1476          case OP_VSPACE_EXTRA + OP_TYPESTAR:
1477          case OP_VSPACE_EXTRA + OP_TYPEMINSTAR:
1478          case OP_VSPACE_EXTRA + OP_TYPEPOSSTAR:
1479          count = 0;
1480    
1481          QS4:
1482          ADD_ACTIVE(state_offset + 2, 0);
1483          if (clen > 0)
1484            {
1485            BOOL OK;
1486            switch (c)
1487              {
1488            case 0x000a:            case 0x000a:
1489            case 0x000b:            case 0x000b:
1490            case 0x000c:            case 0x000c:
1491              case 0x000d:
1492            case 0x0085:            case 0x0085:
1493            case 0x2028:            case 0x2028:
1494            case 0x2029:            case 0x2029:
1495            if (codevalue == OP_ANYNL_EXTRA + OP_TYPEPOSSTAR ||            OK = TRUE;
1496                codevalue == OP_ANYNL_EXTRA + OP_TYPEPOSQUERY)            break;
1497    
1498              default:
1499              OK = FALSE;
1500              break;
1501              }
1502            if (OK == (d == OP_VSPACE))
1503              {
1504              if (codevalue == OP_VSPACE_EXTRA + OP_TYPEPOSSTAR ||
1505                  codevalue == OP_VSPACE_EXTRA + OP_TYPEPOSQUERY)
1506              {              {
1507              active_count--;           /* Remove non-match possibility */              active_count--;           /* Remove non-match possibility */
1508              next_active_state--;              next_active_state--;
1509              }              }
1510            ADD_NEW_DATA(-(state_offset + count), 0, ncount);            ADD_NEW_DATA(-(state_offset + count), 0, 0);
1511              }
1512            }
1513          break;
1514    
1515          /*-----------------------------------------------------------------*/
1516          case OP_HSPACE_EXTRA + OP_TYPEQUERY:
1517          case OP_HSPACE_EXTRA + OP_TYPEMINQUERY:
1518          case OP_HSPACE_EXTRA + OP_TYPEPOSQUERY:
1519          count = 2;
1520          goto QS5;
1521    
1522          case OP_HSPACE_EXTRA + OP_TYPESTAR:
1523          case OP_HSPACE_EXTRA + OP_TYPEMINSTAR:
1524          case OP_HSPACE_EXTRA + OP_TYPEPOSSTAR:
1525          count = 0;
1526    
1527          QS5:
1528          ADD_ACTIVE(state_offset + 2, 0);
1529          if (clen > 0)
1530            {
1531            BOOL OK;
1532            switch (c)
1533              {
1534              case 0x09:      /* HT */
1535              case 0x20:      /* SPACE */
1536              case 0xa0:      /* NBSP */
1537              case 0x1680:    /* OGHAM SPACE MARK */
1538              case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
1539              case 0x2000:    /* EN QUAD */
1540              case 0x2001:    /* EM QUAD */
1541              case 0x2002:    /* EN SPACE */
1542              case 0x2003:    /* EM SPACE */
1543              case 0x2004:    /* THREE-PER-EM SPACE */
1544              case 0x2005:    /* FOUR-PER-EM SPACE */
1545              case 0x2006:    /* SIX-PER-EM SPACE */
1546              case 0x2007:    /* FIGURE SPACE */
1547              case 0x2008:    /* PUNCTUATION SPACE */
1548              case 0x2009:    /* THIN SPACE */
1549              case 0x200A:    /* HAIR SPACE */
1550              case 0x202f:    /* NARROW NO-BREAK SPACE */
1551              case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
1552              case 0x3000:    /* IDEOGRAPHIC SPACE */
1553              OK = TRUE;
1554            break;            break;
1555    
1556            default:            default:
1557              OK = FALSE;
1558            break;            break;
1559            }            }
1560    
1561            if (OK == (d == OP_HSPACE))
1562              {
1563              if (codevalue == OP_HSPACE_EXTRA + OP_TYPEPOSSTAR ||
1564                  codevalue == OP_HSPACE_EXTRA + OP_TYPEPOSQUERY)
1565                {
1566                active_count--;           /* Remove non-match possibility */
1567                next_active_state--;
1568                }
1569              ADD_NEW_DATA(-(state_offset + count), 0, 0);
1570              }
1571          }          }
1572        break;        break;
1573    
1574        /*-----------------------------------------------------------------*/        /*-----------------------------------------------------------------*/
1575    #ifdef SUPPORT_UCP
1576        case OP_PROP_EXTRA + OP_TYPEEXACT:        case OP_PROP_EXTRA + OP_TYPEEXACT:
1577        case OP_PROP_EXTRA + OP_TYPEUPTO:        case OP_PROP_EXTRA + OP_TYPEUPTO:
1578        case OP_PROP_EXTRA + OP_TYPEMINUPTO:        case OP_PROP_EXTRA + OP_TYPEMINUPTO:
# Line 1236  for (;;) Line 1583  for (;;)
1583        if (clen > 0)        if (clen > 0)
1584          {          {
1585          BOOL OK;          BOOL OK;
1586          int category = _pcre_ucp_findprop(c, &chartype, &script);          const ucd_record * prop = GET_UCD(c);
1587          switch(code[4])          switch(code[4])
1588            {            {
1589            case PT_ANY:            case PT_ANY:
# Line 1244  for (;;) Line 1591  for (;;)
1591            break;            break;
1592    
1593            case PT_LAMP:            case PT_LAMP:
1594            OK = chartype == ucp_Lu || chartype == ucp_Ll || chartype == ucp_Lt;            OK = prop->chartype == ucp_Lu || prop->chartype == ucp_Ll || prop->chartype == ucp_Lt;
1595            break;            break;
1596    
1597            case PT_GC:            case PT_GC:
1598            OK = category == code[5];            OK = _pcre_ucp_gentype[prop->chartype] == code[5];
1599            break;            break;
1600    
1601            case PT_PC:            case PT_PC:
1602            OK = chartype == code[5];            OK = prop->chartype == code[5];
1603            break;            break;
1604    
1605            case PT_SC:            case PT_SC:
1606            OK = script == code[5];            OK = prop->script == code[5];
1607            break;            break;
1608    
1609            /* Should never occur, but keep compilers from grumbling. */            /* Should never occur, but keep compilers from grumbling. */
# Line 1289  for (;;) Line 1636  for (;;)
1636        if (codevalue != OP_EXTUNI_EXTRA + OP_TYPEEXACT)        if (codevalue != OP_EXTUNI_EXTRA + OP_TYPEEXACT)
1637          { ADD_ACTIVE(state_offset + 4, 0); }          { ADD_ACTIVE(state_offset + 4, 0); }
1638        count = current_state->count;  /* Number already matched */        count = current_state->count;  /* Number already matched */
1639        if (clen > 0 && _pcre_ucp_findprop(c, &chartype, &script) != ucp_M)        if (clen > 0 && UCD_CATEGORY(c) != ucp_M)
1640          {          {
1641          const uschar *nptr = ptr + clen;          const uschar *nptr = ptr + clen;
1642          int ncount = 0;          int ncount = 0;
# Line 1303  for (;;) Line 1650  for (;;)
1650            int nd;            int nd;
1651            int ndlen = 1;            int ndlen = 1;
1652            GETCHARLEN(nd, nptr, ndlen);            GETCHARLEN(nd, nptr, ndlen);
1653            if (_pcre_ucp_findprop(nd, &chartype, &script) != ucp_M) break;            if (UCD_CATEGORY(nd) != ucp_M) break;
1654            ncount++;            ncount++;
1655            nptr += ndlen;            nptr += ndlen;
1656            }            }
# Line 1313  for (;;) Line 1660  for (;;)
1660            { ADD_NEW_DATA(-state_offset, count, ncount); }            { ADD_NEW_DATA(-state_offset, count, ncount); }
1661          }          }
1662        break;        break;
1663    #endif
1664    
1665        /*-----------------------------------------------------------------*/        /*-----------------------------------------------------------------*/
1666        case OP_ANYNL_EXTRA + OP_TYPEEXACT:        case OP_ANYNL_EXTRA + OP_TYPEEXACT:
# Line 1327  for (;;) Line 1675  for (;;)
1675          int ncount = 0;          int ncount = 0;
1676          switch (c)          switch (c)
1677            {            {
1678              case 0x000b:
1679              case 0x000c:
1680              case 0x0085:
1681              case 0x2028:
1682              case 0x2029:
1683              if ((md->moptions & PCRE_BSR_ANYCRLF) != 0) break;
1684              goto ANYNL03;
1685    
1686            case 0x000d:            case 0x000d:
1687            if (ptr + 1 < end_subject && ptr[1] == 0x0a) ncount = 1;            if (ptr + 1 < end_subject && ptr[1] == 0x0a) ncount = 1;
1688            /* Fall through */            /* Fall through */
1689    
1690              ANYNL03:
1691              case 0x000a:
1692              if (codevalue == OP_ANYNL_EXTRA + OP_TYPEPOSUPTO)
1693                {
1694                active_count--;           /* Remove non-match possibility */
1695                next_active_state--;
1696                }
1697              if (++count >= GET2(code, 1))
1698                { ADD_NEW_DATA(-(state_offset + 4), 0, ncount); }
1699              else
1700                { ADD_NEW_DATA(-state_offset, count, ncount); }
1701              break;
1702    
1703              default:
1704              break;
1705              }
1706            }
1707          break;
1708    
1709          /*-----------------------------------------------------------------*/
1710          case OP_VSPACE_EXTRA + OP_TYPEEXACT:
1711          case OP_VSPACE_EXTRA + OP_TYPEUPTO:
1712          case OP_VSPACE_EXTRA + OP_TYPEMINUPTO:
1713          case OP_VSPACE_EXTRA + OP_TYPEPOSUPTO:
1714          if (codevalue != OP_VSPACE_EXTRA + OP_TYPEEXACT)
1715            { ADD_ACTIVE(state_offset + 4, 0); }
1716          count = current_state->count;  /* Number already matched */
1717          if (clen > 0)
1718            {
1719            BOOL OK;
1720            switch (c)
1721              {
1722            case 0x000a:            case 0x000a:
1723            case 0x000b:            case 0x000b:
1724            case 0x000c:            case 0x000c:
1725              case 0x000d:
1726            case 0x0085:            case 0x0085:
1727            case 0x2028:            case 0x2028:
1728            case 0x2029:            case 0x2029:
1729            if (codevalue == OP_ANYNL_EXTRA + OP_TYPEPOSUPTO)            OK = TRUE;
1730              break;
1731    
1732              default:
1733              OK = FALSE;
1734              }
1735    
1736            if (OK == (d == OP_VSPACE))
1737              {
1738              if (codevalue == OP_VSPACE_EXTRA + OP_TYPEPOSUPTO)
1739              {              {
1740              active_count--;           /* Remove non-match possibility */              active_count--;           /* Remove non-match possibility */
1741              next_active_state--;              next_active_state--;
1742              }              }
1743            if (++count >= GET2(code, 1))            if (++count >= GET2(code, 1))
1744              { ADD_NEW_DATA(-(state_offset + 4), 0, ncount); }              { ADD_NEW_DATA(-(state_offset + 4), 0, 0); }
1745            else            else
1746              { ADD_NEW_DATA(-state_offset, count, ncount); }              { ADD_NEW_DATA(-state_offset, count, 0); }
1747              }
1748            }
1749          break;
1750    
1751          /*-----------------------------------------------------------------*/
1752          case OP_HSPACE_EXTRA + OP_TYPEEXACT:
1753          case OP_HSPACE_EXTRA + OP_TYPEUPTO:
1754          case OP_HSPACE_EXTRA + OP_TYPEMINUPTO:
1755          case OP_HSPACE_EXTRA + OP_TYPEPOSUPTO:
1756          if (codevalue != OP_HSPACE_EXTRA + OP_TYPEEXACT)
1757            { ADD_ACTIVE(state_offset + 4, 0); }
1758          count = current_state->count;  /* Number already matched */
1759          if (clen > 0)
1760            {
1761            BOOL OK;
1762            switch (c)
1763              {
1764              case 0x09:      /* HT */
1765              case 0x20:      /* SPACE */
1766              case 0xa0:      /* NBSP */
1767              case 0x1680:    /* OGHAM SPACE MARK */
1768              case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
1769              case 0x2000:    /* EN QUAD */
1770              case 0x2001:    /* EM QUAD */
1771              case 0x2002:    /* EN SPACE */
1772              case 0x2003:    /* EM SPACE */
1773              case 0x2004:    /* THREE-PER-EM SPACE */
1774              case 0x2005:    /* FOUR-PER-EM SPACE */
1775              case 0x2006:    /* SIX-PER-EM SPACE */
1776              case 0x2007:    /* FIGURE SPACE */
1777              case 0x2008:    /* PUNCTUATION SPACE */
1778              case 0x2009:    /* THIN SPACE */
1779              case 0x200A:    /* HAIR SPACE */
1780              case 0x202f:    /* NARROW NO-BREAK SPACE */
1781              case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
1782              case 0x3000:    /* IDEOGRAPHIC SPACE */
1783              OK = TRUE;
1784            break;            break;
1785    
1786            default:            default:
1787              OK = FALSE;
1788            break;            break;
1789            }            }
1790    
1791            if (OK == (d == OP_HSPACE))
1792              {
1793              if (codevalue == OP_HSPACE_EXTRA + OP_TYPEPOSUPTO)
1794                {
1795                active_count--;           /* Remove non-match possibility */
1796                next_active_state--;
1797                }
1798              if (++count >= GET2(code, 1))
1799                { ADD_NEW_DATA(-(state_offset + 4), 0, 0); }
1800              else
1801                { ADD_NEW_DATA(-state_offset, count, 0); }
1802              }
1803          }          }
1804        break;        break;
1805    
# Line 1379  for (;;) Line 1830  for (;;)
1830            other case of the character. */            other case of the character. */
1831    
1832  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
1833            othercase = _pcre_ucp_othercase(c);            othercase = UCD_OTHERCASE(c);
1834  #else  #else
1835            othercase = NOTACHAR;            othercase = NOTACHAR;
1836  #endif  #endif
# Line 1404  for (;;) Line 1855  for (;;)
1855        to wait for them to pass before continuing. */        to wait for them to pass before continuing. */
1856    
1857        case OP_EXTUNI:        case OP_EXTUNI:
1858        if (clen > 0 && _pcre_ucp_findprop(c, &chartype, &script) != ucp_M)        if (clen > 0 && UCD_CATEGORY(c) != ucp_M)
1859          {          {
1860          const uschar *nptr = ptr + clen;          const uschar *nptr = ptr + clen;
1861          int ncount = 0;          int ncount = 0;
# Line 1412  for (;;) Line 1863  for (;;)
1863            {            {
1864            int nclen = 1;            int nclen = 1;
1865            GETCHARLEN(c, nptr, nclen);            GETCHARLEN(c, nptr, nclen);
1866            if (_pcre_ucp_findprop(c, &chartype, &script) != ucp_M) break;            if (UCD_CATEGORY(c) != ucp_M) break;
1867            ncount++;            ncount++;
1868            nptr += nclen;            nptr += nclen;
1869            }            }
# Line 1429  for (;;) Line 1880  for (;;)
1880        case OP_ANYNL:        case OP_ANYNL:
1881        if (clen > 0) switch(c)        if (clen > 0) switch(c)
1882          {          {
         case 0x000a:  
1883          case 0x000b:          case 0x000b:
1884          case 0x000c:          case 0x000c:
1885          case 0x0085:          case 0x0085:
1886          case 0x2028:          case 0x2028:
1887          case 0x2029:          case 0x2029:
1888            if ((md->moptions & PCRE_BSR_ANYCRLF) != 0) break;
1889    
1890            case 0x000a:
1891          ADD_NEW(state_offset + 1, 0);          ADD_NEW(state_offset + 1, 0);
1892          break;          break;
1893    
1894          case 0x000d:          case 0x000d:
1895          if (ptr + 1 < end_subject && ptr[1] == 0x0a)          if (ptr + 1 < end_subject && ptr[1] == 0x0a)
1896            {            {
# Line 1451  for (;;) Line 1905  for (;;)
1905        break;        break;
1906    
1907        /*-----------------------------------------------------------------*/        /*-----------------------------------------------------------------*/
1908          case OP_NOT_VSPACE:
1909          if (clen > 0) switch(c)
1910            {
1911            case 0x000a:
1912            case 0x000b:
1913            case 0x000c:
1914            case 0x000d:
1915            case 0x0085:
1916            case 0x2028:
1917            case 0x2029:
1918            break;
1919    
1920            default:
1921            ADD_NEW(state_offset + 1, 0);
1922            break;
1923            }
1924          break;
1925    
1926          /*-----------------------------------------------------------------*/
1927          case OP_VSPACE:
1928          if (clen > 0) switch(c)
1929            {
1930            case 0x000a:
1931            case 0x000b:
1932            case 0x000c:
1933            case 0x000d:
1934            case 0x0085:
1935            case 0x2028:
1936            case 0x2029:
1937            ADD_NEW(state_offset + 1, 0);
1938            break;
1939    
1940            default: break;
1941            }
1942          break;
1943    
1944          /*-----------------------------------------------------------------*/
1945          case OP_NOT_HSPACE:
1946          if (clen > 0) switch(c)
1947            {
1948            case 0x09:      /* HT */
1949            case 0x20:      /* SPACE */
1950            case 0xa0:      /* NBSP */
1951            case 0x1680:    /* OGHAM SPACE MARK */
1952            case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
1953            case 0x2000:    /* EN QUAD */
1954            case 0x2001:    /* EM QUAD */
1955            case 0x2002:    /* EN SPACE */
1956            case 0x2003:    /* EM SPACE */
1957            case 0x2004:    /* THREE-PER-EM SPACE */
1958            case 0x2005:    /* FOUR-PER-EM SPACE */
1959            case 0x2006:    /* SIX-PER-EM SPACE */
1960            case 0x2007:    /* FIGURE SPACE */
1961            case 0x2008:    /* PUNCTUATION SPACE */
1962            case 0x2009:    /* THIN SPACE */
1963            case 0x200A:    /* HAIR SPACE */
1964            case 0x202f:    /* NARROW NO-BREAK SPACE */
1965            case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
1966            case 0x3000:    /* IDEOGRAPHIC SPACE */
1967            break;
1968    
1969            default:
1970            ADD_NEW(state_offset + 1, 0);
1971            break;
1972            }
1973          break;
1974    
1975          /*-----------------------------------------------------------------*/
1976          case OP_HSPACE:
1977          if (clen > 0) switch(c)
1978            {
1979            case 0x09:      /* HT */
1980            case 0x20:      /* SPACE */
1981            case 0xa0:      /* NBSP */
1982            case 0x1680:    /* OGHAM SPACE MARK */
1983            case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
1984            case 0x2000:    /* EN QUAD */
1985            case 0x2001:    /* EM QUAD */
1986            case 0x2002:    /* EN SPACE */
1987            case 0x2003:    /* EM SPACE */
1988            case 0x2004:    /* THREE-PER-EM SPACE */
1989            case 0x2005:    /* FOUR-PER-EM SPACE */
1990            case 0x2006:    /* SIX-PER-EM SPACE */
1991            case 0x2007:    /* FIGURE SPACE */
1992            case 0x2008:    /* PUNCTUATION SPACE */
1993            case 0x2009:    /* THIN SPACE */
1994            case 0x200A:    /* HAIR SPACE */
1995            case 0x202f:    /* NARROW NO-BREAK SPACE */
1996            case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
1997            case 0x3000:    /* IDEOGRAPHIC SPACE */
1998            ADD_NEW(state_offset + 1, 0);
1999            break;
2000            }
2001          break;
2002    
2003          /*-----------------------------------------------------------------*/
2004        /* Match a negated single character. This is only used for one-byte        /* Match a negated single character. This is only used for one-byte
2005        characters, that is, we know that d < 256. The character we are        characters, that is, we know that d < 256. The character we are
2006        checking (c) can be multibyte. */        checking (c) can be multibyte. */
# Line 1481  for (;;) Line 2031  for (;;)
2031            if (utf8 && d >= 128)            if (utf8 && d >= 128)
2032              {              {
2033  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2034              otherd = _pcre_ucp_othercase(d);              otherd = UCD_OTHERCASE(d);
2035  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
2036              }              }
2037            else            else
# Line 1519  for (;;) Line 2069  for (;;)
2069            if (utf8 && d >= 128)            if (utf8 && d >= 128)
2070              {              {
2071  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2072              otherd = _pcre_ucp_othercase(d);              otherd = UCD_OTHERCASE(d);
2073  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
2074              }              }
2075            else            else
# Line 1555  for (;;) Line 2105  for (;;)
2105            if (utf8 && d >= 128)            if (utf8 && d >= 128)
2106              {              {
2107  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2108              otherd = _pcre_ucp_othercase(d);              otherd = UCD_OTHERCASE(d);
2109  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
2110              }              }
2111            else            else
# Line 1587  for (;;) Line 2137  for (;;)
2137            if (utf8 && d >= 128)            if (utf8 && d >= 128)
2138              {              {
2139  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2140              otherd = _pcre_ucp_othercase(d);              otherd = UCD_OTHERCASE(d);
2141  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
2142              }              }
2143            else            else
# Line 1622  for (;;) Line 2172  for (;;)
2172            if (utf8 && d >= 128)            if (utf8 && d >= 128)
2173              {              {
2174  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2175              otherd = _pcre_ucp_othercase(d);              otherd = UCD_OTHERCASE(d);
2176  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
2177              }              }
2178            else            else
# Line 1730  for (;;) Line 2280  for (;;)
2280    
2281  /* ========================================================================== */  /* ========================================================================== */
2282        /* These are the opcodes for fancy brackets of various kinds. We have        /* These are the opcodes for fancy brackets of various kinds. We have
2283        to use recursion in order to handle them. */        to use recursion in order to handle them. The "always failing" assertion
2284          (?!) is optimised to OP_FAIL when compiling, so we have to support that,
2285          though the other "backtracking verbs" are not supported. */
2286    
2287          case OP_FAIL:
2288          forced_fail++;    /* Count FAILs for multiple states */
2289          break;
2290    
2291        case OP_ASSERT:        case OP_ASSERT:
2292        case OP_ASSERT_NOT:        case OP_ASSERT_NOT:
# Line 1757  for (;;) Line 2313  for (;;)
2313            rlevel,                               /* function recursion level */            rlevel,                               /* function recursion level */
2314            recursing);                           /* pass on regex recursion */            recursing);                           /* pass on regex recursion */
2315    
2316            if (rc == PCRE_ERROR_DFA_UITEM) return rc;
2317          if ((rc >= 0) == (codevalue == OP_ASSERT || codevalue == OP_ASSERTBACK))          if ((rc >= 0) == (codevalue == OP_ASSERT || codevalue == OP_ASSERTBACK))
2318              { ADD_ACTIVE(endasscode + LINK_SIZE + 1 - start_code, 0); }              { ADD_ACTIVE(endasscode + LINK_SIZE + 1 - start_code, 0); }
2319          }          }
# Line 1768  for (;;) Line 2325  for (;;)
2325          {          {
2326          int local_offsets[1000];          int local_offsets[1000];
2327          int local_workspace[1000];          int local_workspace[1000];
2328          int condcode = code[LINK_SIZE+1];          int codelink = GET(code, 1);
2329            int condcode;
2330    
2331            /* Because of the way auto-callout works during compile, a callout item
2332            is inserted between OP_COND and an assertion condition. This does not
2333            happen for the other conditions. */
2334    
2335            if (code[LINK_SIZE+1] == OP_CALLOUT)
2336              {
2337              rrc = 0;
2338              if (pcre_callout != NULL)
2339                {
2340                pcre_callout_block cb;
2341                cb.version          = 1;   /* Version 1 of the callout block */
2342                cb.callout_number   = code[LINK_SIZE+2];
2343                cb.offset_vector    = offsets;
2344                cb.subject          = (PCRE_SPTR)start_subject;
2345                cb.subject_length   = end_subject - start_subject;
2346                cb.start_match      = current_subject - start_subject;
2347                cb.current_position = ptr - start_subject;
2348                cb.pattern_position = GET(code, LINK_SIZE + 3);
2349                cb.next_item_length = GET(code, 3 + 2*LINK_SIZE);
2350                cb.capture_top      = 1;
2351                cb.capture_last     = -1;
2352                cb.callout_data     = md->callout_data;
2353                if ((rrc = (*pcre_callout)(&cb)) < 0) return rrc;   /* Abandon */
2354                }
2355              if (rrc > 0) break;                      /* Fail this thread */
2356              code += _pcre_OP_lengths[OP_CALLOUT];    /* Skip callout data */
2357              }
2358    
2359            condcode = code[LINK_SIZE+1];
2360    
2361          /* Back reference conditions are not supported */          /* Back reference conditions are not supported */
2362    
2363          if (condcode == OP_CREF) return PCRE_ERROR_DFA_UCOND;          if (condcode == OP_CREF || condcode == OP_NCREF)
2364              return PCRE_ERROR_DFA_UCOND;
2365    
2366          /* The DEFINE condition is always false */          /* The DEFINE condition is always false */
2367    
2368          if (condcode == OP_DEF)          if (condcode == OP_DEF)
2369            {            { ADD_ACTIVE(state_offset + codelink + LINK_SIZE + 1, 0); }
           ADD_ACTIVE(state_offset + GET(code, 1) + LINK_SIZE + 1, 0);  
           }  
2370    
2371          /* 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,
2372          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
2373          recursed groups. */          recursed groups. */
2374    
2375          else if (condcode == OP_RREF)          else if (condcode == OP_RREF || condcode == OP_NRREF)
2376            {            {
2377            int value = GET2(code, LINK_SIZE+2);            int value = GET2(code, LINK_SIZE+2);
2378            if (value != RREF_ANY) return PCRE_ERROR_DFA_UCOND;            if (value != RREF_ANY) return PCRE_ERROR_DFA_UCOND;
2379            if (recursing > 0) { ADD_ACTIVE(state_offset + LINK_SIZE + 4, 0); }            if (recursing > 0)
2380              else { ADD_ACTIVE(state_offset + GET(code, 1) + LINK_SIZE + 1, 0); }              { ADD_ACTIVE(state_offset + LINK_SIZE + 4, 0); }
2381              else { ADD_ACTIVE(state_offset + codelink + LINK_SIZE + 1, 0); }
2382            }            }
2383    
2384          /* Otherwise, the condition is an assertion */          /* Otherwise, the condition is an assertion */
# Line 1816  for (;;) Line 2404  for (;;)
2404              rlevel,                               /* function recursion level */              rlevel,                               /* function recursion level */
2405              recursing);                           /* pass on regex recursion */              recursing);                           /* pass on regex recursion */
2406    
2407              if (rc == PCRE_ERROR_DFA_UITEM) return rc;
2408            if ((rc >= 0) ==            if ((rc >= 0) ==
2409                  (condcode == OP_ASSERT || condcode == OP_ASSERTBACK))                  (condcode == OP_ASSERT || condcode == OP_ASSERTBACK))
2410              { ADD_ACTIVE(endasscode + LINK_SIZE + 1 - start_code, 0); }              { ADD_ACTIVE(endasscode + LINK_SIZE + 1 - start_code, 0); }
2411            else            else
2412              { ADD_ACTIVE(state_offset + GET(code, 1) + LINK_SIZE + 1, 0); }              { ADD_ACTIVE(state_offset + codelink + LINK_SIZE + 1, 0); }
2413            }            }
2414          }          }
2415        break;        break;
# Line 1972  for (;;) Line 2561  for (;;)
2561        /* Handle callouts */        /* Handle callouts */
2562    
2563        case OP_CALLOUT:        case OP_CALLOUT:
2564          rrc = 0;
2565        if (pcre_callout != NULL)        if (pcre_callout != NULL)
2566          {          {
         int rrc;  
2567          pcre_callout_block cb;          pcre_callout_block cb;
2568          cb.version          = 1;   /* Version 1 of the callout block */          cb.version          = 1;   /* Version 1 of the callout block */
2569          cb.callout_number   = code[1];          cb.callout_number   = code[1];
# Line 1989  for (;;) Line 2578  for (;;)
2578          cb.capture_last     = -1;          cb.capture_last     = -1;
2579          cb.callout_data     = md->callout_data;          cb.callout_data     = md->callout_data;
2580          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); }  
2581          }          }
2582          if (rrc == 0)
2583            { ADD_ACTIVE(state_offset + _pcre_OP_lengths[OP_CALLOUT], 0); }
2584        break;        break;
2585    
2586    
# Line 2006  for (;;) Line 2596  for (;;)
2596    /* We have finished the processing at the current subject character. If no    /* We have finished the processing at the current subject character. If no
2597    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
2598    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
2599    matching has been requested, check for appropriate conditions. */    matching has been requested, check for appropriate conditions.
2600    
2601      The "forced_ fail" variable counts the number of (*F) encountered for the
2602      character. If it is equal to the original active_count (saved in
2603      workspace[1]) it means that (*F) was found on every active state. In this
2604      case we don't want to give a partial match.
2605    
2606      The "could_continue" variable is true if a state could have continued but
2607      for the fact that the end of the subject was reached. */
2608    
2609    if (new_count <= 0)    if (new_count <= 0)
2610      {      {
2611      if (match_count < 0 &&                     /* No matches found */      if (rlevel == 1 &&                               /* Top level, and */
2612          rlevel == 1 &&                         /* Top level match function */          could_continue &&                            /* Some could go on */
2613          (md->moptions & PCRE_PARTIAL) != 0 &&  /* Want partial matching */          forced_fail != workspace[1] &&               /* Not all forced fail & */
2614          ptr >= end_subject &&                  /* Reached end of subject */          (                                            /* either... */
2615          ptr > current_subject)                 /* Matched non-empty string */          (md->moptions & PCRE_PARTIAL_HARD) != 0      /* Hard partial */
2616            ||                                           /* or... */
2617            ((md->moptions & PCRE_PARTIAL_SOFT) != 0 &&  /* Soft partial and */
2618             match_count < 0)                            /* no matches */
2619            ) &&                                         /* And... */
2620            ptr >= end_subject &&                     /* Reached end of subject */
2621            ptr > current_subject)                    /* Matched non-empty string */
2622        {        {
2623        if (offsetcount >= 2)        if (offsetcount >= 2)
2624          {          {
2625          offsets[0] = current_subject - start_subject;          offsets[0] = md->start_used_ptr - start_subject;
2626          offsets[1] = end_subject - start_subject;          offsets[1] = end_subject - start_subject;
2627          }          }
2628        match_count = PCRE_ERROR_PARTIAL;        match_count = PCRE_ERROR_PARTIAL;
# Line 2073  Returns:          > 0 => number of match Line 2677  Returns:          > 0 => number of match
2677                   < -1 => some kind of unexpected problem                   < -1 => some kind of unexpected problem
2678  */  */
2679    
2680  PCRE_EXP_DEFN int  PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
2681  pcre_dfa_exec(const pcre *argument_re, const pcre_extra *extra_data,  pcre_dfa_exec(const pcre *argument_re, const pcre_extra *extra_data,
2682    const char *subject, int length, int start_offset, int options, int *offsets,    const char *subject, int length, int start_offset, int options, int *offsets,
2683    int offsetcount, int *workspace, int wscount)    int offsetcount, int *workspace, int wscount)
# Line 2160  md->start_code = (const uschar *)argumen Line 2764  md->start_code = (const uschar *)argumen
2764      re->name_table_offset + re->name_count * re->name_entry_size;      re->name_table_offset + re->name_count * re->name_entry_size;
2765  md->start_subject = (const unsigned char *)subject;  md->start_subject = (const unsigned char *)subject;
2766  md->end_subject = end_subject;  md->end_subject = end_subject;
2767    md->start_offset = start_offset;
2768  md->moptions = options;  md->moptions = options;
2769  md->poptions = re->options;  md->poptions = re->options;
2770    
2771    /* If the BSR option is not set at match time, copy what was set
2772    at compile time. */
2773    
2774    if ((md->moptions & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE)) == 0)
2775      {
2776      if ((re->options & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE)) != 0)
2777        md->moptions |= re->options & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE);
2778    #ifdef BSR_ANYCRLF
2779      else md->moptions |= PCRE_BSR_ANYCRLF;
2780    #endif
2781      }
2782    
2783  /* Handle different types of newline. The three bits give eight cases. If  /* Handle different types of newline. The three bits give eight cases. If
2784  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. */
2785    
# Line 2170  switch ((((options & PCRE_NEWLINE_BITS) Line 2787  switch ((((options & PCRE_NEWLINE_BITS)
2787           PCRE_NEWLINE_BITS)           PCRE_NEWLINE_BITS)
2788    {    {
2789    case 0: newline = NEWLINE; break;   /* Compile-time default */    case 0: newline = NEWLINE; break;   /* Compile-time default */
2790    case PCRE_NEWLINE_CR: newline = '\r'; break;    case PCRE_NEWLINE_CR: newline = CHAR_CR; break;
2791    case PCRE_NEWLINE_LF: newline = '\n'; break;    case PCRE_NEWLINE_LF: newline = CHAR_NL; break;
2792    case PCRE_NEWLINE_CR+    case PCRE_NEWLINE_CR+
2793         PCRE_NEWLINE_LF: newline = ('\r' << 8) | '\n'; break;         PCRE_NEWLINE_LF: newline = (CHAR_CR << 8) | CHAR_NL; break;
2794    case PCRE_NEWLINE_ANY: newline = -1; break;    case PCRE_NEWLINE_ANY: newline = -1; break;
2795      case PCRE_NEWLINE_ANYCRLF: newline = -2; break;
2796    default: return PCRE_ERROR_BADNEWLINE;    default: return PCRE_ERROR_BADNEWLINE;
2797    }    }
2798    
2799  if (newline < 0)  if (newline == -2)
2800      {
2801      md->nltype = NLTYPE_ANYCRLF;
2802      }
2803    else if (newline < 0)
2804    {    {
2805    md->nltype = NLTYPE_ANY;    md->nltype = NLTYPE_ANY;
2806    }    }
# Line 2228  if (md->tables == NULL) md->tables = _pc Line 2850  if (md->tables == NULL) md->tables = _pc
2850  used in a loop when finding where to start. */  used in a loop when finding where to start. */
2851    
2852  lcc = md->tables + lcc_offset;  lcc = md->tables + lcc_offset;
2853  startline = (re->options & PCRE_STARTLINE) != 0;  startline = (re->flags & PCRE_STARTLINE) != 0;
2854  firstline = (re->options & PCRE_FIRSTLINE) != 0;  firstline = (re->options & PCRE_FIRSTLINE) != 0;
2855    
2856  /* 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 2239  studied, there may be a bitmap of possib Line 2861  studied, there may be a bitmap of possib
2861    
2862  if (!anchored)  if (!anchored)
2863    {    {
2864    if ((re->options & PCRE_FIRSTSET) != 0)    if ((re->flags & PCRE_FIRSTSET) != 0)
2865      {      {
2866      first_byte = re->first_byte & 255;      first_byte = re->first_byte & 255;
2867      if ((first_byte_caseless = ((re->first_byte & REQ_CASELESS) != 0)) == TRUE)      if ((first_byte_caseless = ((re->first_byte & REQ_CASELESS) != 0)) == TRUE)
# Line 2247  if (!anchored) Line 2869  if (!anchored)
2869      }      }
2870    else    else
2871      {      {
2872      if (startline && study != NULL &&      if (!startline && study != NULL &&
2873           (study->options & PCRE_STUDY_MAPPED) != 0)           (study->flags & PCRE_STUDY_MAPPED) != 0)
2874        start_bits = study->start_bits;        start_bits = study->start_bits;
2875      }      }
2876    }    }
# Line 2256  if (!anchored) Line 2878  if (!anchored)
2878  /* For anchored or unanchored matches, there may be a "last known required  /* For anchored or unanchored matches, there may be a "last known required
2879  character" set. */  character" set. */
2880    
2881  if ((re->options & PCRE_REQCHSET) != 0)  if ((re->flags & PCRE_REQCHSET) != 0)
2882    {    {
2883    req_byte = re->req_byte & 255;    req_byte = re->req_byte & 255;
2884    req_byte_caseless = (re->req_byte & REQ_CASELESS) != 0;    req_byte_caseless = (re->req_byte & REQ_CASELESS) != 0;
# Line 2264  if ((re->options & PCRE_REQCHSET) != 0) Line 2886  if ((re->options & PCRE_REQCHSET) != 0)
2886    }    }
2887    
2888  /* 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
2889  failed match. Unless restarting, optimize by moving to the first match  failed match. If not restarting, perform certain optimizations at the start of
2890  character if possible, when not anchored. Then unless wanting a partial match,  a match. */
 check for a required later character. */  
2891    
2892  for (;;)  for (;;)
2893    {    {
# Line 2276  for (;;) Line 2897  for (;;)
2897      {      {
2898      const uschar *save_end_subject = end_subject;      const uschar *save_end_subject = end_subject;
2899    
2900      /* 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
2901      start of the match is constrained to the first line of a multiline string.      line of a multiline string. Implement this by temporarily adjusting
2902      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
2903      scanning at a newline. If the match fails at the newline, later code breaks      the newline, later code breaks this loop. */
     this loop. */  
2904    
2905      if (firstline)      if (firstline)
2906        {        {
2907        const uschar *t = current_subject;        USPTR t = current_subject;
2908    #ifdef SUPPORT_UTF8
2909          if (utf8)
2910            {
2911            while (t < md->end_subject && !IS_NEWLINE(t))
2912              {
2913              t++;
2914              while (t < end_subject && (*t & 0xc0) == 0x80) t++;
2915              }
2916            }
2917          else
2918    #endif
2919        while (t < md->end_subject && !IS_NEWLINE(t)) t++;        while (t < md->end_subject && !IS_NEWLINE(t)) t++;
2920        end_subject = t;        end_subject = t;
2921        }        }
2922    
2923      if (first_byte >= 0)      /* There are some optimizations that avoid running the match if a known
2924        starting point is not found. However, there is an option that disables
2925        these, for testing and for ensuring that all callouts do actually occur. */
2926    
2927        if ((options & PCRE_NO_START_OPTIMIZE) == 0)
2928        {        {
2929        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++;  
       }  
2930    
2931      /* Or to just after a linebreak for a multiline match if possible */        if (first_byte >= 0)
2932            {
2933            if (first_byte_caseless)
2934              while (current_subject < end_subject &&
2935                     lcc[*current_subject] != first_byte)
2936                current_subject++;
2937            else
2938              while (current_subject < end_subject &&
2939                     *current_subject != first_byte)
2940                current_subject++;
2941            }
2942    
2943      else if (startline)        /* Or to just after a linebreak for a multiline match if possible */
2944        {  
2945        if (current_subject > md->start_subject + start_offset)        else if (startline)
2946          {          {
2947          while (current_subject <= end_subject && !WAS_NEWLINE(current_subject))          if (current_subject > md->start_subject + start_offset)
2948            current_subject++;            {
2949    #ifdef SUPPORT_UTF8
2950              if (utf8)
2951                {
2952                while (current_subject < end_subject &&
2953                       !WAS_NEWLINE(current_subject))
2954                  {
2955                  current_subject++;
2956                  while(current_subject < end_subject &&
2957                        (*current_subject & 0xc0) == 0x80)
2958                    current_subject++;
2959                  }
2960                }
2961              else
2962    #endif
2963              while (current_subject < end_subject && !WAS_NEWLINE(current_subject))
2964                current_subject++;
2965    
2966          /* If we have just passed a CR and the newline option is ANY, and we            /* If we have just passed a CR and the newline option is ANY or
2967          are now at a LF, advance the match position by one more character. */            ANYCRLF, and we are now at a LF, advance the match position by one
2968              more character. */
2969    
2970          if (current_subject[-1] == '\r' &&            if (current_subject[-1] == CHAR_CR &&
2971               md->nltype == NLTYPE_ANY &&                 (md->nltype == NLTYPE_ANY || md->nltype == NLTYPE_ANYCRLF) &&
2972               current_subject < end_subject &&                 current_subject < end_subject &&
2973               *current_subject == '\n')                 *current_subject == CHAR_NL)
2974            current_subject++;              current_subject++;
2975              }
2976          }          }
       }  
2977    
2978      /* Or to a non-unique first char after study */        /* Or to a non-unique first char after study */
2979    
2980      else if (start_bits != NULL)        else if (start_bits != NULL)
       {  
       while (current_subject < end_subject)  
2981          {          {
2982          register unsigned int c = *current_subject;          while (current_subject < end_subject)
2983          if ((start_bits[c/8] & (1 << (c&7))) == 0) current_subject++;            {
2984            else break;            register unsigned int c = *current_subject;
2985              if ((start_bits[c/8] & (1 << (c&7))) == 0) current_subject++;
2986                else break;
2987              }
2988          }          }
2989        }        }
2990    
2991      /* Restore fudged end_subject */      /* Restore fudged end_subject */
2992    
2993      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);  
2994    
2995      /* 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
2996      place we found it at last time. */      disabling is explicitly requested (and of course, by the test above, this
2997        code is not obeyed when restarting after a partial match). */
2998    
2999      if (p > req_byte_ptr)      if ((options & PCRE_NO_START_OPTIMIZE) == 0 &&
3000            (options & (PCRE_PARTIAL_HARD|PCRE_PARTIAL_SOFT)) == 0)
3001        {        {
3002        if (req_byte_caseless)        /* If the pattern was studied, a minimum subject length may be set. This
3003          {        is a lower bound; no actual string of that length may actually match the
3004          while (p < end_subject)        pattern. Although the value is, strictly, in characters, we treat it as
3005            {        bytes to avoid spending too much time in this optimization. */
3006            register int pp = *p++;  
3007            if (pp == req_byte || pp == req_byte2) { p--; break; }        if (study != NULL && (study->flags & PCRE_STUDY_MINLEN) != 0 &&
3008            }            (pcre_uint32)(end_subject - current_subject) < study->minlength)
3009          }          return PCRE_ERROR_NOMATCH;
3010        else  
3011          /* If req_byte is set, we know that that character must appear in the
3012          subject for the match to succeed. If the first character is set, req_byte
3013          must be later in the subject; otherwise the test starts at the match
3014          point. This optimization can save a huge amount of work in patterns with
3015          nested unlimited repeats that aren't going to match. Writing separate
3016          code for cased/caseless versions makes it go faster, as does using an
3017          autoincrement and backing off on a match.
3018    
3019          HOWEVER: when the subject string is very, very long, searching to its end
3020          can take a long time, and give bad performance on quite ordinary
3021          patterns. This showed up when somebody was matching /^C/ on a 32-megabyte
3022          string... so we don't do this when the string is sufficiently long. */
3023    
3024          if (req_byte >= 0 && end_subject - current_subject < REQ_BYTE_MAX)
3025          {          {
3026          while (p < end_subject)          register const uschar *p = current_subject + ((first_byte >= 0)? 1 : 0);
3027    
3028            /* We don't need to repeat the search if we haven't yet reached the
3029            place we found it at last time. */
3030    
3031            if (p > req_byte_ptr)
3032            {            {
3033            if (*p++ == req_byte) { p--; break; }            if (req_byte_caseless)
3034            }              {
3035          }              while (p < end_subject)
3036                  {
3037                  register int pp = *p++;
3038                  if (pp == req_byte || pp == req_byte2) { p--; break; }
3039                  }
3040                }
3041              else
3042                {
3043                while (p < end_subject)
3044                  {
3045                  if (*p++ == req_byte) { p--; break; }
3046                  }
3047                }
3048    
3049        /* If we can't find the required character, break the matching loop,            /* If we can't find the required character, break the matching loop,
3050        which will cause a return or PCRE_ERROR_NOMATCH. */            which will cause a return or PCRE_ERROR_NOMATCH. */
3051    
3052        if (p >= end_subject) break;            if (p >= end_subject) break;
3053    
3054        /* If we have found the required character, save the point where we            /* If we have found the required character, save the point where we
3055        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
3056        the start hasn't passed this character yet. */            the start hasn't passed this character yet. */
3057    
3058        req_byte_ptr = p;            req_byte_ptr = p;
3059              }
3060            }
3061        }        }
3062      }      }   /* End of optimizations that are done when not restarting */
3063    
3064    /* OK, now we can do the business */    /* OK, now we can do the business */
3065    
3066      md->start_used_ptr = current_subject;
3067    
3068    rc = internal_dfa_exec(    rc = internal_dfa_exec(
3069      md,                                /* fixed match data */      md,                                /* fixed match data */
3070      md->start_code,                    /* this subexpression's code */      md->start_code,                    /* this subexpression's code */
# Line 2425  for (;;) Line 3095  for (;;)
3095      }      }
3096    if (current_subject > end_subject) break;    if (current_subject > end_subject) break;
3097    
3098    /* If we have just passed a CR and the newline option is CRLF or ANY, and we    /* If we have just passed a CR and we are now at a LF, and the pattern does
3099    are now at a LF, advance the match position by one more character. */    not contain any explicit matches for \r or \n, and the newline option is CRLF
3100      or ANY or ANYCRLF, advance the match position by one more character. */
3101    if (current_subject[-1] == '\r' &&  
3102         (md->nltype == NLTYPE_ANY || md->nllen == 2) &&    if (current_subject[-1] == CHAR_CR &&
3103         current_subject < end_subject &&        current_subject < end_subject &&
3104         *current_subject == '\n')        *current_subject == CHAR_NL &&
3105          (re->flags & PCRE_HASCRORLF) == 0 &&
3106            (md->nltype == NLTYPE_ANY ||
3107             md->nltype == NLTYPE_ANYCRLF ||
3108             md->nllen == 2))
3109      current_subject++;      current_subject++;
3110    
3111    }   /* "Bumpalong" loop */    }   /* "Bumpalong" loop */

Legend:
Removed from v.145  
changed lines
  Added in v.507

  ViewVC Help
Powered by ViewVC 1.1.5