/[pcre]/code/branches/pcre16/pcre_internal.h
ViewVC logotype

Diff of /code/branches/pcre16/pcre_internal.h

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

code/trunk/pcre_internal.h revision 393 by ph10, Tue Mar 17 21:47:54 2009 UTC code/branches/pcre16/pcre_internal.h revision 769 by zherczeg, Sun Nov 27 17:40:33 2011 UTC
# Line 7  Line 7 
7  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.
8    
9                         Written by Philip Hazel                         Written by Philip Hazel
10             Copyright (c) 1997-2009 University of Cambridge             Copyright (c) 1997-2011 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 40  POSSIBILITY OF SUCH DAMAGE. Line 40  POSSIBILITY OF SUCH DAMAGE.
40    
41  /* This header contains definitions that are shared between the different  /* This header contains definitions that are shared between the different
42  modules, but which are not relevant to the exported API. This includes some  modules, but which are not relevant to the exported API. This includes some
43  functions whose names all begin with "_pcre_". */  functions whose names all begin with "_pcre_" or "_pcre16_" depending on
44    the PRIV macro. */
45    
46  #ifndef PCRE_INTERNAL_H  #ifndef PCRE_INTERNAL_H
47  #define PCRE_INTERNAL_H  #define PCRE_INTERNAL_H
48    
49  /* Define DEBUG to get debugging output on stdout. */  /* Define PCRE_DEBUG to get debugging output on stdout. */
50    
51  #if 0  #if 0
52  #define DEBUG  #define PCRE_DEBUG
53  #endif  #endif
54    
55  /* We do not support both EBCDIC and UTF-8 at the same time. The "configure"  /* PCRE is compiled as an 8 bit library if it is not requested otherwise. */
56    #ifndef COMPILE_PCRE16
57    #define COMPILE_PCRE8
58    #endif
59    
60    /* We do not support both EBCDIC and UTF-8/16 at the same time. The "configure"
61  script prevents both being selected, but not everybody uses "configure". */  script prevents both being selected, but not everybody uses "configure". */
62    
63  #if defined EBCDIC && defined SUPPORT_UTF8  #if defined EBCDIC && (defined SUPPORT_UTF8 || defined SUPPORT_UTF16)
64  #error The use of both EBCDIC and SUPPORT_UTF8 is not supported.  #error The use of both EBCDIC and SUPPORT_UTF8/16 is not supported.
65  #endif  #endif
66    
67  /* If SUPPORT_UCP is defined, SUPPORT_UTF8 must also be defined. The  /* If SUPPORT_UCP is defined, SUPPORT_UTF8 must also be defined. The
68  "configure" script ensures this, but not everybody uses "configure". */  "configure" script ensures this, but not everybody uses "configure". */
69    
70  #if defined SUPPORT_UCP && !defined SUPPORT_UTF8  #if defined SUPPORT_UCP && !defined SUPPORT_UTF8
# Line 74  It turns out that the Mac Debugging.h he Line 80  It turns out that the Mac Debugging.h he
80  be absolutely sure we get our version. */  be absolutely sure we get our version. */
81    
82  #undef DPRINTF  #undef DPRINTF
83  #ifdef DEBUG  #ifdef PCRE_DEBUG
84  #define DPRINTF(p) printf p  #define DPRINTF(p) printf p
85  #else  #else
86  #define DPRINTF(p) /* Nothing */  #define DPRINTF(p) /* Nothing */
# Line 86  setjmp and stdarg are used is when NO_RE Line 92  setjmp and stdarg are used is when NO_RE
92    
93  #include <ctype.h>  #include <ctype.h>
94  #include <limits.h>  #include <limits.h>
 #include <setjmp.h>  
 #include <stdarg.h>  
95  #include <stddef.h>  #include <stddef.h>
96  #include <stdio.h>  #include <stdio.h>
97  #include <stdlib.h>  #include <stdlib.h>
# Line 160  set, we ensure here that it has no effec Line 164  set, we ensure here that it has no effec
164  #define PCRE_CALL_CONVENTION  #define PCRE_CALL_CONVENTION
165  #endif  #endif
166    
167  /* We need to have types that specify unsigned 16-bit and 32-bit integers. We  /* We need to have types that specify unsigned 8, 16 and 32-bit integers. We
168  cannot determine these outside the compilation (e.g. by running a program as  cannot determine these outside the compilation (e.g. by running a program as
169  part of "configure") because PCRE is often cross-compiled for use on other  part of "configure") because PCRE is often cross-compiled for use on other
170  systems. Instead we make use of the maximum sizes that are available at  systems. Instead we make use of the maximum sizes that are available at
171  preprocessor time in standard C environments. */  preprocessor time in standard C environments. */
172    
173    typedef unsigned char pcre_uint8;
174    
175  #if USHRT_MAX == 65535  #if USHRT_MAX == 65535
176    typedef unsigned short pcre_uint16;    typedef unsigned short pcre_uint16;
177    typedef short pcre_int16;    typedef short pcre_int16;
# Line 186  preprocessor time in standard C environm Line 192  preprocessor time in standard C environm
192    #error Cannot determine a type for 32-bit unsigned integers    #error Cannot determine a type for 32-bit unsigned integers
193  #endif  #endif
194    
195    /* When checking for integer overflow in pcre_compile(), we need to handle
196    large integers. If a 64-bit integer type is available, we can use that.
197    Otherwise we have to cast to double, which of course requires floating point
198    arithmetic. Handle this by defining a macro for the appropriate type. If
199    stdint.h is available, include it; it may define INT64_MAX. Systems that do not
200    have stdint.h (e.g. Solaris) may have inttypes.h. The macro int64_t may be set
201    by "configure". */
202    
203    #if HAVE_STDINT_H
204    #include <stdint.h>
205    #elif HAVE_INTTYPES_H
206    #include <inttypes.h>
207    #endif
208    
209    #if defined INT64_MAX || defined int64_t
210    #define INT64_OR_DOUBLE int64_t
211    #else
212    #define INT64_OR_DOUBLE double
213    #endif
214    
215  /* All character handling must be done as unsigned characters. Otherwise there  /* All character handling must be done as unsigned characters. Otherwise there
216  are problems with top-bit-set characters and functions such as isspace().  are problems with top-bit-set characters and functions such as isspace().
217  However, we leave the interface to the outside world as char *, because that  However, we leave the interface to the outside world as char * or short *,
218  should make things easier for callers. We define a short type for unsigned char  because that should make things easier for callers. We define a short type
219  to save lots of typing. I tried "uchar", but it causes problems on Digital  for the current character representation (either 8 or 16 bit) to save lots
220  Unix, where it is defined in sys/types, so use "uschar" instead. */  of typing. I tried "uchar", but it causes problems on Digital Unix, where
221    it is defined in sys/types, so use "uschar" instead. */
222    
223    #ifdef COMPILE_PCRE8
224    
225    typedef unsigned char pcre_uchar;
226    #define IN_UCHARS(x) (x)
227    
228    #else
229    
230    #ifdef COMPILE_PCRE16
231    #if USHRT_MAX != 65535
232    /* This is a warning message. Change PCRE_SCHAR16 to a 16 bit data type in
233    pcre.h(.in) and disable (comment out) this message. */
234    #error Warning: PCRE_SCHAR16 is not a 16 bit data type.
235    #endif
236    typedef pcre_uint16 pcre_uchar;
237    #define IN_UCHARS(x) ((x) << 1)
238    
239    #else
240    #error Unsupported compiling mode
241    #endif /* COMPILE_PCRE16 */
242    
243  typedef unsigned char uschar;  #endif /* COMPILE_PCRE8 */
244    
245  /* This is an unsigned int value that no character can ever have. UTF-8  /* This is an unsigned int value that no character can ever have. UTF-8
246  characters only go up to 0x7fffffff (though Unicode doesn't go beyond  characters only go up to 0x7fffffff (though Unicode doesn't go beyond
# Line 216  start/end of string field names are. */ Line 263  start/end of string field names are. */
263  #define IS_NEWLINE(p) \  #define IS_NEWLINE(p) \
264    ((NLBLOCK->nltype != NLTYPE_FIXED)? \    ((NLBLOCK->nltype != NLTYPE_FIXED)? \
265      ((p) < NLBLOCK->PSEND && \      ((p) < NLBLOCK->PSEND && \
266       _pcre_is_newline((p), NLBLOCK->nltype, NLBLOCK->PSEND, &(NLBLOCK->nllen),\       PRIV(is_newline)((p), NLBLOCK->nltype, NLBLOCK->PSEND, &(NLBLOCK->nllen),\
267         utf8)) \         utf8)) \
268      : \      : \
269      ((p) <= NLBLOCK->PSEND - NLBLOCK->nllen && \      ((p) <= NLBLOCK->PSEND - NLBLOCK->nllen && \
# Line 230  start/end of string field names are. */ Line 277  start/end of string field names are. */
277  #define WAS_NEWLINE(p) \  #define WAS_NEWLINE(p) \
278    ((NLBLOCK->nltype != NLTYPE_FIXED)? \    ((NLBLOCK->nltype != NLTYPE_FIXED)? \
279      ((p) > NLBLOCK->PSSTART && \      ((p) > NLBLOCK->PSSTART && \
280       _pcre_was_newline((p), NLBLOCK->nltype, NLBLOCK->PSSTART, \       PRIV(was_newline)((p), NLBLOCK->nltype, NLBLOCK->PSSTART, \
281         &(NLBLOCK->nllen), utf8)) \         &(NLBLOCK->nllen), utf8)) \
282      : \      : \
283      ((p) >= NLBLOCK->PSSTART + NLBLOCK->nllen && \      ((p) >= NLBLOCK->PSSTART + NLBLOCK->nllen && \
# Line 249  used for the external interface and appe Line 296  used for the external interface and appe
296  must begin with PCRE_. */  must begin with PCRE_. */
297    
298  #ifdef CUSTOM_SUBJECT_PTR  #ifdef CUSTOM_SUBJECT_PTR
299  #define PCRE_SPTR CUSTOM_SUBJECT_PTR  #define PCRE_PUCHAR CUSTOM_SUBJECT_PTR
 #define USPTR CUSTOM_SUBJECT_PTR  
300  #else  #else
301  #define PCRE_SPTR const char *  #define PCRE_PUCHAR const pcre_uchar *
 #define USPTR const unsigned char *  
302  #endif  #endif
303    
   
   
304  /* Include the public PCRE header and the definitions of UCP character property  /* Include the public PCRE header and the definitions of UCP character property
305  values. */  values. */
306    
# Line 325  The macros are controlled by the value o Line 368  The macros are controlled by the value o
368  the config.h file, but can be overridden by using -D on the command line. This  the config.h file, but can be overridden by using -D on the command line. This
369  is automated on Unix systems via the "configure" command. */  is automated on Unix systems via the "configure" command. */
370    
371    #ifdef COMPILE_PCRE8
372    
373  #if LINK_SIZE == 2  #if LINK_SIZE == 2
374    
375  #define PUT(a,n,d)   \  #define PUT(a,n,d)   \
# Line 361  is automated on Unix systems via the "co Line 406  is automated on Unix systems via the "co
406  #define GET(a,n) \  #define GET(a,n) \
407    (((a)[n] << 24) | ((a)[(n)+1] << 16) | ((a)[(n)+2] << 8) | (a)[(n)+3])    (((a)[n] << 24) | ((a)[(n)+1] << 16) | ((a)[(n)+2] << 8) | (a)[(n)+3])
408    
409  #define MAX_PATTERN_SIZE (1 << 30)   /* Keep it positive */  /* Keep it positive */
410    #define MAX_PATTERN_SIZE (1 << 30)
411    
412    #else
413    #error LINK_SIZE must be either 2, 3, or 4
414    #endif
415    
416    #else /* COMPILE_PCRE8 */
417    
418    #ifdef COMPILE_PCRE16
419    
420    #if LINK_SIZE == 2
421    
422    #undef LINK_SIZE
423    #define LINK_SIZE 1
424    
425    #define PUT(a,n,d)   \
426      (a[n] = (d))
427    
428    #define GET(a,n) \
429      (a[n])
430    
431    #define MAX_PATTERN_SIZE (1 << 16)
432    
433    #elif LINK_SIZE == 3 || LINK_SIZE == 4
434    
435    #undef LINK_SIZE
436    #define LINK_SIZE 2
437    
438    #define PUT(a,n,d)   \
439      (a[n] = (d) >> 16), \
440      (a[(n)+1] = (d) & 65536)
441    
442    #define GET(a,n) \
443      (((a)[n] << 16) | (a)[(n)+1])
444    
445    /* Keep it positive */
446    #define MAX_PATTERN_SIZE (1 << 30)
447    
448  #else  #else
449  #error LINK_SIZE must be either 2, 3, or 4  #error LINK_SIZE must be either 2, 3, or 4
450  #endif  #endif
451    
452    #else
453    #error Unsupported compiling mode
454    #endif /* COMPILE_PCRE16 */
455    
456    #endif /* COMPILE_PCRE8 */
457    
458  /* Convenience macro defined in terms of the others */  /* Convenience macro defined in terms of the others */
459    
# Line 378  is automated on Unix systems via the "co Line 464  is automated on Unix systems via the "co
464  offsets changes. There are used for repeat counts and for other things such as  offsets changes. There are used for repeat counts and for other things such as
465  capturing parenthesis numbers in back references. */  capturing parenthesis numbers in back references. */
466    
467    #ifdef COMPILE_PCRE8
468    
469    #define IMM2_SIZE 2
470    
471  #define PUT2(a,n,d)   \  #define PUT2(a,n,d)   \
472    a[n] = (d) >> 8; \    a[n] = (d) >> 8; \
473    a[(n)+1] = (d) & 255    a[(n)+1] = (d) & 255
# Line 385  capturing parenthesis numbers in back re Line 475  capturing parenthesis numbers in back re
475  #define GET2(a,n) \  #define GET2(a,n) \
476    (((a)[n] << 8) | (a)[(n)+1])    (((a)[n] << 8) | (a)[(n)+1])
477    
478  #define PUT2INC(a,n,d)  PUT2(a,n,d), a += 2  #else /* COMPILE_PCRE8 */
479    
480    #ifdef COMPILE_PCRE16
481    
482    #define IMM2_SIZE 1
483    
484    #define PUT2(a,n,d)   \
485       a[n] = d
486    
487    #define GET2(a,n) \
488       a[n]
489    
490    #else
491    #error Unsupported compiling mode
492    #endif /* COMPILE_PCRE16 */
493    
494    #endif /* COMPILE_PCRE8 */
495    
496    #define PUT2INC(a,n,d)  PUT2(a,n,d), a += IMM2_SIZE
497    
498  /* When UTF-8 encoding is being used, a character is no longer just a single  /* When UTF-8 encoding is being used, a character is no longer just a single
499  byte. The macros for character handling generate simple sequences when used in  byte. The macros for character handling generate simple sequences when used in
500  byte-mode, and more complicated ones for UTF-8 characters. BACKCHAR should  byte-mode, and more complicated ones for UTF-8 characters. GETCHARLENTEST is
501  never be called in byte mode. To make sure it can never even appear when UTF-8  not used when UTF-8 is not supported, so it is not defined, and BACKCHAR should
502  support is omitted, we don't even define it. */  never be called in byte mode. To make sure they can never even appear when
503    UTF-8 support is omitted, we don't even define them. */
504    
505  #ifndef SUPPORT_UTF8  #ifndef SUPPORT_UTF8
506  #define GETCHAR(c, eptr) c = *eptr;  #define GETCHAR(c, eptr) c = *eptr;
# Line 400  support is omitted, we don't even define Line 508  support is omitted, we don't even define
508  #define GETCHARINC(c, eptr) c = *eptr++;  #define GETCHARINC(c, eptr) c = *eptr++;
509  #define GETCHARINCTEST(c, eptr) c = *eptr++;  #define GETCHARINCTEST(c, eptr) c = *eptr++;
510  #define GETCHARLEN(c, eptr, len) c = *eptr;  #define GETCHARLEN(c, eptr, len) c = *eptr;
511    /* #define GETCHARLENTEST(c, eptr, len) */
512  /* #define BACKCHAR(eptr) */  /* #define BACKCHAR(eptr) */
513    
514  #else   /* SUPPORT_UTF8 */  #else   /* SUPPORT_UTF8 */
515    
516    /* These macros were originally written in the form of loops that used data
517    from the tables whose names start with PRIV(utf8_table). They were rewritten by
518    a user so as not to use loops, because in some environments this gives a
519    significant performance advantage, and it seems never to do any harm. */
520    
521    /* Base macro to pick up the remaining bytes of a UTF-8 character, not
522    advancing the pointer. */
523    
524    #define GETUTF8(c, eptr) \
525        { \
526        if ((c & 0x20) == 0) \
527          c = ((c & 0x1f) << 6) | (eptr[1] & 0x3f); \
528        else if ((c & 0x10) == 0) \
529          c = ((c & 0x0f) << 12) | ((eptr[1] & 0x3f) << 6) | (eptr[2] & 0x3f); \
530        else if ((c & 0x08) == 0) \
531          c = ((c & 0x07) << 18) | ((eptr[1] & 0x3f) << 12) | \
532          ((eptr[2] & 0x3f) << 6) | (eptr[3] & 0x3f); \
533        else if ((c & 0x04) == 0) \
534          c = ((c & 0x03) << 24) | ((eptr[1] & 0x3f) << 18) | \
535              ((eptr[2] & 0x3f) << 12) | ((eptr[3] & 0x3f) << 6) | \
536              (eptr[4] & 0x3f); \
537        else \
538          c = ((c & 0x01) << 30) | ((eptr[1] & 0x3f) << 24) | \
539              ((eptr[2] & 0x3f) << 18) | ((eptr[3] & 0x3f) << 12) | \
540              ((eptr[4] & 0x3f) << 6) | (eptr[5] & 0x3f); \
541        }
542    
543  /* Get the next UTF-8 character, not advancing the pointer. This is called when  /* Get the next UTF-8 character, not advancing the pointer. This is called when
544  we know we are in UTF-8 mode. */  we know we are in UTF-8 mode. */
545    
546  #define GETCHAR(c, eptr) \  #define GETCHAR(c, eptr) \
547    c = *eptr; \    c = *eptr; \
548    if (c >= 0xc0) \    if (c >= 0xc0) GETUTF8(c, eptr);
     { \  
     int gcii; \  
     int gcaa = _pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */ \  
     int gcss = 6*gcaa; \  
     c = (c & _pcre_utf8_table3[gcaa]) << gcss; \  
     for (gcii = 1; gcii <= gcaa; gcii++) \  
       { \  
       gcss -= 6; \  
       c |= (eptr[gcii] & 0x3f) << gcss; \  
       } \  
     }  
549    
550  /* Get the next UTF-8 character, testing for UTF-8 mode, and not advancing the  /* Get the next UTF-8 character, testing for UTF-8 mode, and not advancing the
551  pointer. */  pointer. */
552    
553  #define GETCHARTEST(c, eptr) \  #define GETCHARTEST(c, eptr) \
554    c = *eptr; \    c = *eptr; \
555    if (utf8 && c >= 0xc0) \    if (utf8 && c >= 0xc0) GETUTF8(c, eptr);
556    
557    /* Base macro to pick up the remaining bytes of a UTF-8 character, advancing
558    the pointer. */
559    
560    #define GETUTF8INC(c, eptr) \
561      { \      { \
562      int gcii; \      if ((c & 0x20) == 0) \
563      int gcaa = _pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */ \        c = ((c & 0x1f) << 6) | (*eptr++ & 0x3f); \
564      int gcss = 6*gcaa; \      else if ((c & 0x10) == 0) \
     c = (c & _pcre_utf8_table3[gcaa]) << gcss; \  
     for (gcii = 1; gcii <= gcaa; gcii++) \  
565        { \        { \
566        gcss -= 6; \        c = ((c & 0x0f) << 12) | ((*eptr & 0x3f) << 6) | (eptr[1] & 0x3f); \
567        c |= (eptr[gcii] & 0x3f) << gcss; \        eptr += 2; \
568          } \
569        else if ((c & 0x08) == 0) \
570          { \
571          c = ((c & 0x07) << 18) | ((*eptr & 0x3f) << 12) | \
572              ((eptr[1] & 0x3f) << 6) | (eptr[2] & 0x3f); \
573          eptr += 3; \
574          } \
575        else if ((c & 0x04) == 0) \
576          { \
577          c = ((c & 0x03) << 24) | ((*eptr & 0x3f) << 18) | \
578              ((eptr[1] & 0x3f) << 12) | ((eptr[2] & 0x3f) << 6) | \
579              (eptr[3] & 0x3f); \
580          eptr += 4; \
581          } \
582        else \
583          { \
584          c = ((c & 0x01) << 30) | ((*eptr & 0x3f) << 24) | \
585              ((eptr[1] & 0x3f) << 18) | ((eptr[2] & 0x3f) << 12) | \
586              ((eptr[3] & 0x3f) << 6) | (eptr[4] & 0x3f); \
587          eptr += 5; \
588        } \        } \
589      }      }
590    
# Line 445  know we are in UTF-8 mode. */ Line 593  know we are in UTF-8 mode. */
593    
594  #define GETCHARINC(c, eptr) \  #define GETCHARINC(c, eptr) \
595    c = *eptr++; \    c = *eptr++; \
596    if (c >= 0xc0) \    if (c >= 0xc0) GETUTF8INC(c, eptr);
     { \  
     int gcaa = _pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */ \  
     int gcss = 6*gcaa; \  
     c = (c & _pcre_utf8_table3[gcaa]) << gcss; \  
     while (gcaa-- > 0) \  
       { \  
       gcss -= 6; \  
       c |= (*eptr++ & 0x3f) << gcss; \  
       } \  
     }  
597    
598  /* Get the next character, testing for UTF-8 mode, and advancing the pointer */  /* Get the next character, testing for UTF-8 mode, and advancing the pointer.
599    This is called when we don't know if we are in UTF-8 mode. */
600    
601  #define GETCHARINCTEST(c, eptr) \  #define GETCHARINCTEST(c, eptr) \
602    c = *eptr++; \    c = *eptr++; \
603    if (utf8 && c >= 0xc0) \    if (utf8 && c >= 0xc0) GETUTF8INC(c, eptr);
604    
605    /* Base macro to pick up the remaining bytes of a UTF-8 character, not
606    advancing the pointer, incrementing the length. */
607    
608    #define GETUTF8LEN(c, eptr, len) \
609      { \      { \
610      int gcaa = _pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */ \      if ((c & 0x20) == 0) \
611      int gcss = 6*gcaa; \        { \
612      c = (c & _pcre_utf8_table3[gcaa]) << gcss; \        c = ((c & 0x1f) << 6) | (eptr[1] & 0x3f); \
613      while (gcaa-- > 0) \        len++; \
614          } \
615        else if ((c & 0x10)  == 0) \
616          { \
617          c = ((c & 0x0f) << 12) | ((eptr[1] & 0x3f) << 6) | (eptr[2] & 0x3f); \
618          len += 2; \
619          } \
620        else if ((c & 0x08)  == 0) \
621          {\
622          c = ((c & 0x07) << 18) | ((eptr[1] & 0x3f) << 12) | \
623              ((eptr[2] & 0x3f) << 6) | (eptr[3] & 0x3f); \
624          len += 3; \
625          } \
626        else if ((c & 0x04)  == 0) \
627        { \        { \
628        gcss -= 6; \        c = ((c & 0x03) << 24) | ((eptr[1] & 0x3f) << 18) | \
629        c |= (*eptr++ & 0x3f) << gcss; \            ((eptr[2] & 0x3f) << 12) | ((eptr[3] & 0x3f) << 6) | \
630              (eptr[4] & 0x3f); \
631          len += 4; \
632          } \
633        else \
634          {\
635          c = ((c & 0x01) << 30) | ((eptr[1] & 0x3f) << 24) | \
636              ((eptr[2] & 0x3f) << 18) | ((eptr[3] & 0x3f) << 12) | \
637              ((eptr[4] & 0x3f) << 6) | (eptr[5] & 0x3f); \
638          len += 5; \
639        } \        } \
640      }      }
641    
# Line 478  if there are extra bytes. This is called Line 644  if there are extra bytes. This is called
644    
645  #define GETCHARLEN(c, eptr, len) \  #define GETCHARLEN(c, eptr, len) \
646    c = *eptr; \    c = *eptr; \
647    if (c >= 0xc0) \    if (c >= 0xc0) GETUTF8LEN(c, eptr, len);
     { \  
     int gcii; \  
     int gcaa = _pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */ \  
     int gcss = 6*gcaa; \  
     c = (c & _pcre_utf8_table3[gcaa]) << gcss; \  
     for (gcii = 1; gcii <= gcaa; gcii++) \  
       { \  
       gcss -= 6; \  
       c |= (eptr[gcii] & 0x3f) << gcss; \  
       } \  
     len += gcaa; \  
     }  
648    
649  /* Get the next UTF-8 character, testing for UTF-8 mode, not advancing the  /* Get the next UTF-8 character, testing for UTF-8 mode, not advancing the
650  pointer, incrementing length if there are extra bytes. This is called when we  pointer, incrementing length if there are extra bytes. This is called when we
651  know we are in UTF-8 mode. */  do not know if we are in UTF-8 mode. */
652    
653  #define GETCHARLENTEST(c, eptr, len) \  #define GETCHARLENTEST(c, eptr, len) \
654    c = *eptr; \    c = *eptr; \
655    if (utf8 && c >= 0xc0) \    if (utf8 && c >= 0xc0) GETUTF8LEN(c, eptr, len);
     { \  
     int gcii; \  
     int gcaa = _pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */ \  
     int gcss = 6*gcaa; \  
     c = (c & _pcre_utf8_table3[gcaa]) << gcss; \  
     for (gcii = 1; gcii <= gcaa; gcii++) \  
       { \  
       gcss -= 6; \  
       c |= (eptr[gcii] & 0x3f) << gcss; \  
       } \  
     len += gcaa; \  
     }  
656    
657  /* If the pointer is not at the start of a character, move it back until  /* If the pointer is not at the start of a character, move it back until
658  it is. This is called only in UTF-8 mode - we don't put a test within the macro  it is. This is called only in UTF-8 mode - we don't put a test within the macro
# Line 518  because almost all calls are already wit Line 660  because almost all calls are already wit
660    
661  #define BACKCHAR(eptr) while((*eptr & 0xc0) == 0x80) eptr--  #define BACKCHAR(eptr) while((*eptr & 0xc0) == 0x80) eptr--
662    
663  #endif  #endif  /* SUPPORT_UTF8 */
664    
665    
666  /* In case there is no definition of offsetof() provided - though any proper  /* In case there is no definition of offsetof() provided - though any proper
# Line 529  Standard C system should have one. */ Line 671  Standard C system should have one. */
671  #endif  #endif
672    
673    
 /* These are the public options that can change during matching. */  
   
 #define PCRE_IMS (PCRE_CASELESS|PCRE_MULTILINE|PCRE_DOTALL)  
   
674  /* Private flags containing information about the compiled regex. They used to  /* Private flags containing information about the compiled regex. They used to
675  live at the top end of the options word, but that got almost full, so now they  live at the top end of the options word, but that got almost full, so now they
676  are in a 16-bit flags word. */  are in a 16-bit flags word. From release 8.00, PCRE_NOPARTIAL is unused, as
677    the restrictions on partial matching have been lifted. It remains for backwards
678    compatibility. */
679    
680  #define PCRE_NOPARTIAL     0x0001  /* can't use partial with this regex */  #define PCRE_NOPARTIAL     0x0001  /* can't use partial with this regex */
681  #define PCRE_FIRSTSET      0x0002  /* first_byte is set */  #define PCRE_FIRSTSET      0x0002  /* first_byte is set */
# Line 543  are in a 16-bit flags word. */ Line 683  are in a 16-bit flags word. */
683  #define PCRE_STARTLINE     0x0008  /* start after \n for multiline */  #define PCRE_STARTLINE     0x0008  /* start after \n for multiline */
684  #define PCRE_JCHANGED      0x0010  /* j option used in regex */  #define PCRE_JCHANGED      0x0010  /* j option used in regex */
685  #define PCRE_HASCRORLF     0x0020  /* explicit \r or \n in pattern */  #define PCRE_HASCRORLF     0x0020  /* explicit \r or \n in pattern */
686    #define PCRE_HASTHEN       0x0040  /* pattern contains (*THEN) */
687    
688  /* Options for the "extra" block produced by pcre_study(). */  /* Flags for the "extra" block produced by pcre_study(). */
689    
690  #define PCRE_STUDY_MAPPED   0x01     /* a map of starting chars exists */  #define PCRE_STUDY_MAPPED  0x0001  /* a map of starting chars exists */
691    #define PCRE_STUDY_MINLEN  0x0002  /* a minimum length field exists */
692    
693  /* Masks for identifying the public options that are permitted at compile  /* Masks for identifying the public options that are permitted at compile
694  time, run time, or study time, respectively. */  time, run time, or study time, respectively. */
# Line 559  time, run time, or study time, respectiv Line 701  time, run time, or study time, respectiv
701     PCRE_DOTALL|PCRE_DOLLAR_ENDONLY|PCRE_EXTRA|PCRE_UNGREEDY|PCRE_UTF8| \     PCRE_DOTALL|PCRE_DOLLAR_ENDONLY|PCRE_EXTRA|PCRE_UNGREEDY|PCRE_UTF8| \
702     PCRE_NO_AUTO_CAPTURE|PCRE_NO_UTF8_CHECK|PCRE_AUTO_CALLOUT|PCRE_FIRSTLINE| \     PCRE_NO_AUTO_CAPTURE|PCRE_NO_UTF8_CHECK|PCRE_AUTO_CALLOUT|PCRE_FIRSTLINE| \
703     PCRE_DUPNAMES|PCRE_NEWLINE_BITS|PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE| \     PCRE_DUPNAMES|PCRE_NEWLINE_BITS|PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE| \
704     PCRE_JAVASCRIPT_COMPAT)     PCRE_JAVASCRIPT_COMPAT|PCRE_UCP|PCRE_NO_START_OPTIMIZE)
705    
706  #define PUBLIC_EXEC_OPTIONS \  #define PUBLIC_EXEC_OPTIONS \
707    (PCRE_ANCHORED|PCRE_NOTBOL|PCRE_NOTEOL|PCRE_NOTEMPTY|PCRE_NO_UTF8_CHECK| \    (PCRE_ANCHORED|PCRE_NOTBOL|PCRE_NOTEOL|PCRE_NOTEMPTY|PCRE_NOTEMPTY_ATSTART| \
708     PCRE_PARTIAL|PCRE_NEWLINE_BITS|PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE| \     PCRE_NO_UTF8_CHECK|PCRE_PARTIAL_HARD|PCRE_PARTIAL_SOFT|PCRE_NEWLINE_BITS| \
709     PCRE_NO_START_OPTIMIZE)     PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE|PCRE_NO_START_OPTIMIZE)
710    
711  #define PUBLIC_DFA_EXEC_OPTIONS \  #define PUBLIC_DFA_EXEC_OPTIONS \
712    (PCRE_ANCHORED|PCRE_NOTBOL|PCRE_NOTEOL|PCRE_NOTEMPTY|PCRE_NO_UTF8_CHECK| \    (PCRE_ANCHORED|PCRE_NOTBOL|PCRE_NOTEOL|PCRE_NOTEMPTY|PCRE_NOTEMPTY_ATSTART| \
713     PCRE_PARTIAL|PCRE_DFA_SHORTEST|PCRE_DFA_RESTART|PCRE_NEWLINE_BITS| \     PCRE_NO_UTF8_CHECK|PCRE_PARTIAL_HARD|PCRE_PARTIAL_SOFT|PCRE_DFA_SHORTEST| \
714     PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE|PCRE_NO_START_OPTIMIZE)     PCRE_DFA_RESTART|PCRE_NEWLINE_BITS|PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE| \
715       PCRE_NO_START_OPTIMIZE)
716    
717  #define PUBLIC_STUDY_OPTIONS 0   /* None defined */  #define PUBLIC_STUDY_OPTIONS \
718       PCRE_STUDY_JIT_COMPILE
719    
720  /* Magic number to provide a small check against being handed junk. Also used  /* Magic number to provide a small check against being handed junk. Also used
721  to detect whether a pattern was compiled on a host of different endianness. */  to detect whether a pattern was compiled on a host of different endianness. */
# Line 853  so that PCRE works on both ASCII and EBC Line 997  so that PCRE works on both ASCII and EBC
997  #define STRING_COMMIT0              "COMMIT\0"  #define STRING_COMMIT0              "COMMIT\0"
998  #define STRING_F0                   "F\0"  #define STRING_F0                   "F\0"
999  #define STRING_FAIL0                "FAIL\0"  #define STRING_FAIL0                "FAIL\0"
1000    #define STRING_MARK0                "MARK\0"
1001  #define STRING_PRUNE0               "PRUNE\0"  #define STRING_PRUNE0               "PRUNE\0"
1002  #define STRING_SKIP0                "SKIP\0"  #define STRING_SKIP0                "SKIP\0"
1003  #define STRING_THEN                 "THEN"  #define STRING_THEN                 "THEN"
# Line 874  so that PCRE works on both ASCII and EBC Line 1019  so that PCRE works on both ASCII and EBC
1019    
1020  #define STRING_DEFINE               "DEFINE"  #define STRING_DEFINE               "DEFINE"
1021    
1022  #define STRING_CR_RIGHTPAR          "CR)"  #define STRING_CR_RIGHTPAR             "CR)"
1023  #define STRING_LF_RIGHTPAR          "LF)"  #define STRING_LF_RIGHTPAR             "LF)"
1024  #define STRING_CRLF_RIGHTPAR        "CRLF)"  #define STRING_CRLF_RIGHTPAR           "CRLF)"
1025  #define STRING_ANY_RIGHTPAR         "ANY)"  #define STRING_ANY_RIGHTPAR            "ANY)"
1026  #define STRING_ANYCRLF_RIGHTPAR     "ANYCRLF)"  #define STRING_ANYCRLF_RIGHTPAR        "ANYCRLF)"
1027  #define STRING_BSR_ANYCRLF_RIGHTPAR "BSR_ANYCRLF)"  #define STRING_BSR_ANYCRLF_RIGHTPAR    "BSR_ANYCRLF)"
1028  #define STRING_BSR_UNICODE_RIGHTPAR "BSR_UNICODE)"  #define STRING_BSR_UNICODE_RIGHTPAR    "BSR_UNICODE)"
1029    #define STRING_UTF8_RIGHTPAR           "UTF8)"
1030    #define STRING_UCP_RIGHTPAR            "UCP)"
1031    #define STRING_NO_START_OPT_RIGHTPAR   "NO_START_OPT)"
1032    
1033  #else  /* SUPPORT_UTF8 */  #else  /* SUPPORT_UTF8 */
1034    
# Line 1104  only. */ Line 1252  only. */
1252  #define STRING_COMMIT0              STR_C STR_O STR_M STR_M STR_I STR_T "\0"  #define STRING_COMMIT0              STR_C STR_O STR_M STR_M STR_I STR_T "\0"
1253  #define STRING_F0                   STR_F "\0"  #define STRING_F0                   STR_F "\0"
1254  #define STRING_FAIL0                STR_F STR_A STR_I STR_L "\0"  #define STRING_FAIL0                STR_F STR_A STR_I STR_L "\0"
1255    #define STRING_MARK0                STR_M STR_A STR_R STR_K "\0"
1256  #define STRING_PRUNE0               STR_P STR_R STR_U STR_N STR_E "\0"  #define STRING_PRUNE0               STR_P STR_R STR_U STR_N STR_E "\0"
1257  #define STRING_SKIP0                STR_S STR_K STR_I STR_P "\0"  #define STRING_SKIP0                STR_S STR_K STR_I STR_P "\0"
1258  #define STRING_THEN                 STR_T STR_H STR_E STR_N  #define STRING_THEN                 STR_T STR_H STR_E STR_N
# Line 1125  only. */ Line 1274  only. */
1274    
1275  #define STRING_DEFINE               STR_D STR_E STR_F STR_I STR_N STR_E  #define STRING_DEFINE               STR_D STR_E STR_F STR_I STR_N STR_E
1276    
1277  #define STRING_CR_RIGHTPAR          STR_C STR_R STR_RIGHT_PARENTHESIS  #define STRING_CR_RIGHTPAR             STR_C STR_R STR_RIGHT_PARENTHESIS
1278  #define STRING_LF_RIGHTPAR          STR_L STR_F STR_RIGHT_PARENTHESIS  #define STRING_LF_RIGHTPAR             STR_L STR_F STR_RIGHT_PARENTHESIS
1279  #define STRING_CRLF_RIGHTPAR        STR_C STR_R STR_L STR_F STR_RIGHT_PARENTHESIS  #define STRING_CRLF_RIGHTPAR           STR_C STR_R STR_L STR_F STR_RIGHT_PARENTHESIS
1280  #define STRING_ANY_RIGHTPAR         STR_A STR_N STR_Y STR_RIGHT_PARENTHESIS  #define STRING_ANY_RIGHTPAR            STR_A STR_N STR_Y STR_RIGHT_PARENTHESIS
1281  #define STRING_ANYCRLF_RIGHTPAR     STR_A STR_N STR_Y STR_C STR_R STR_L STR_F STR_RIGHT_PARENTHESIS  #define STRING_ANYCRLF_RIGHTPAR        STR_A STR_N STR_Y STR_C STR_R STR_L STR_F STR_RIGHT_PARENTHESIS
1282  #define STRING_BSR_ANYCRLF_RIGHTPAR STR_B STR_S STR_R STR_UNDERSCORE STR_A STR_N STR_Y STR_C STR_R STR_L STR_F STR_RIGHT_PARENTHESIS  #define STRING_BSR_ANYCRLF_RIGHTPAR    STR_B STR_S STR_R STR_UNDERSCORE STR_A STR_N STR_Y STR_C STR_R STR_L STR_F STR_RIGHT_PARENTHESIS
1283  #define STRING_BSR_UNICODE_RIGHTPAR STR_B STR_S STR_R STR_UNDERSCORE STR_U STR_N STR_I STR_C STR_O STR_D STR_E STR_RIGHT_PARENTHESIS  #define STRING_BSR_UNICODE_RIGHTPAR    STR_B STR_S STR_R STR_UNDERSCORE STR_U STR_N STR_I STR_C STR_O STR_D STR_E STR_RIGHT_PARENTHESIS
1284    #define STRING_UTF8_RIGHTPAR           STR_U STR_T STR_F STR_8 STR_RIGHT_PARENTHESIS
1285    #define STRING_UCP_RIGHTPAR            STR_U STR_C STR_P STR_RIGHT_PARENTHESIS
1286    #define STRING_NO_START_OPT_RIGHTPAR   STR_N STR_O STR_UNDERSCORE STR_S STR_T STR_A STR_R STR_T STR_UNDERSCORE STR_O STR_P STR_T STR_RIGHT_PARENTHESIS
1287    
1288  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF8 */
1289    
# Line 1164  only. */ Line 1316  only. */
1316    
1317  #define PT_ANY        0    /* Any property - matches all chars */  #define PT_ANY        0    /* Any property - matches all chars */
1318  #define PT_LAMP       1    /* L& - the union of Lu, Ll, Lt */  #define PT_LAMP       1    /* L& - the union of Lu, Ll, Lt */
1319  #define PT_GC         2    /* General characteristic (e.g. L) */  #define PT_GC         2    /* Specified general characteristic (e.g. L) */
1320  #define PT_PC         3    /* Particular characteristic (e.g. Lu) */  #define PT_PC         3    /* Specified particular characteristic (e.g. Lu) */
1321  #define PT_SC         4    /* Script (e.g. Han) */  #define PT_SC         4    /* Script (e.g. Han) */
1322    #define PT_ALNUM      5    /* Alphanumeric - the union of L and N */
1323    #define PT_SPACE      6    /* Perl space - Z plus 9,10,12,13 */
1324    #define PT_PXSPACE    7    /* POSIX space - Z plus 9,10,11,12,13 */
1325    #define PT_WORD       8    /* Word - L plus N plus underscore */
1326    
1327  /* Flag bits and data types for the extended class (OP_XCLASS) for classes that  /* Flag bits and data types for the extended class (OP_XCLASS) for classes that
1328  contain UTF-8 characters with values greater than 255. */  contain UTF-8 characters with values greater than 255. */
# Line 1183  contain UTF-8 characters with values gre Line 1339  contain UTF-8 characters with values gre
1339  /* These are escaped items that aren't just an encoding of a particular data  /* These are escaped items that aren't just an encoding of a particular data
1340  value such as \n. They must have non-zero values, as check_escape() returns  value such as \n. They must have non-zero values, as check_escape() returns
1341  their negation. Also, they must appear in the same order as in the opcode  their negation. Also, they must appear in the same order as in the opcode
1342  definitions below, up to ESC_z. There's a dummy for OP_ANY because it  definitions below, up to ESC_z. There's a dummy for OP_ALLANY because it
1343  corresponds to "." rather than an escape sequence, and another for OP_ALLANY  corresponds to "." in DOTALL mode rather than an escape sequence. It is also
1344  (which is used for [^] in JavaScript compatibility mode).  used for [^] in JavaScript compatibility mode, and for \C in non-utf8 mode. In
1345    non-DOTALL mode, "." behaves like \N.
1346    
1347    The special values ESC_DU, ESC_du, etc. are used instead of ESC_D, ESC_d, etc.
1348    when PCRE_UCP is set, when replacement of \d etc by \p sequences is required.
1349    They must be contiguous, and remain in order so that the replacements can be
1350    looked up from a table.
1351    
1352  The final escape must be ESC_REF as subsequent values are used for  The final escape must be ESC_REF as subsequent values are used for
1353  backreferences (\1, \2, \3, etc). There are two tests in the code for an escape  backreferences (\1, \2, \3, etc). There are two tests in the code for an escape
# Line 1195  put in between that don't consume a char Line 1357  put in between that don't consume a char
1357  */  */
1358    
1359  enum { ESC_A = 1, ESC_G, ESC_K, ESC_B, ESC_b, ESC_D, ESC_d, ESC_S, ESC_s,  enum { ESC_A = 1, ESC_G, ESC_K, ESC_B, ESC_b, ESC_D, ESC_d, ESC_S, ESC_s,
1360         ESC_W, ESC_w, ESC_dum1, ESC_dum2, ESC_C, ESC_P, ESC_p, ESC_R, ESC_H,         ESC_W, ESC_w, ESC_N, ESC_dum, ESC_C, ESC_P, ESC_p, ESC_R, ESC_H,
1361         ESC_h, ESC_V, ESC_v, ESC_X, ESC_Z, ESC_z, ESC_E, ESC_Q, ESC_g, ESC_k,         ESC_h, ESC_V, ESC_v, ESC_X, ESC_Z, ESC_z,
1362           ESC_E, ESC_Q, ESC_g, ESC_k,
1363           ESC_DU, ESC_du, ESC_SU, ESC_su, ESC_WU, ESC_wu,
1364         ESC_REF };         ESC_REF };
1365    
   
1366  /* Opcode table: Starting from 1 (i.e. after OP_END), the values up to  /* Opcode table: Starting from 1 (i.e. after OP_END), the values up to
1367  OP_EOD must correspond in order to the list of escapes immediately above.  OP_EOD must correspond in order to the list of escapes immediately above.
1368    
1369  *** NOTE NOTE NOTE *** Whenever this list is updated, the two macro definitions  *** NOTE NOTE NOTE *** Whenever this list is updated, the two macro definitions
1370  that follow must also be updated to match. There is also a table called  that follow must also be updated to match. There are also tables called
1371  "coptable" in pcre_dfa_exec.c that must be updated. */  "coptable" and "poptable" in pcre_dfa_exec.c that must be updated. */
1372    
1373  enum {  enum {
1374    OP_END,            /* 0 End of pattern */    OP_END,            /* 0 End of pattern */
# Line 1223  enum { Line 1386  enum {
1386    OP_WHITESPACE,         /*  9 \s */    OP_WHITESPACE,         /*  9 \s */
1387    OP_NOT_WORDCHAR,       /* 10 \W */    OP_NOT_WORDCHAR,       /* 10 \W */
1388    OP_WORDCHAR,           /* 11 \w */    OP_WORDCHAR,           /* 11 \w */
1389    OP_ANY,            /* 12 Match any character (subject to DOTALL) */  
1390    OP_ALLANY,         /* 13 Match any character (not subject to DOTALL) */    OP_ANY,            /* 12 Match any character except newline */
1391      OP_ALLANY,         /* 13 Match any character */
1392    OP_ANYBYTE,        /* 14 Match any byte (\C); different to OP_ANY for UTF-8 */    OP_ANYBYTE,        /* 14 Match any byte (\C); different to OP_ANY for UTF-8 */
1393    OP_NOTPROP,        /* 15 \P (not Unicode property) */    OP_NOTPROP,        /* 15 \P (not Unicode property) */
1394    OP_PROP,           /* 16 \p (Unicode property) */    OP_PROP,           /* 16 \p (Unicode property) */
# Line 1237  enum { Line 1401  enum {
1401    OP_EODN,           /* 23 End of data or \n at end of data: \Z. */    OP_EODN,           /* 23 End of data or \n at end of data: \Z. */
1402    OP_EOD,            /* 24 End of data: \z */    OP_EOD,            /* 24 End of data: \z */
1403    
1404    OP_OPT,            /* 25 Set runtime options */    OP_CIRC,           /* 25 Start of line - not multiline */
1405    OP_CIRC,           /* 26 Start of line - varies with multiline switch */    OP_CIRCM,          /* 26 Start of line - multiline */
1406    OP_DOLL,           /* 27 End of line - varies with multiline switch */    OP_DOLL,           /* 27 End of line - not multiline */
1407    OP_CHAR,           /* 28 Match one character, casefully */    OP_DOLLM,          /* 28 End of line - multiline */
1408    OP_CHARNC,         /* 29 Match one character, caselessly */    OP_CHAR,           /* 29 Match one character, casefully */
1409    OP_NOT,            /* 30 Match one character, not the following one */    OP_CHARI,          /* 30 Match one character, caselessly */
1410      OP_NOT,            /* 31 Match one character, not the given one, casefully */
1411    OP_STAR,           /* 31 The maximizing and minimizing versions of */    OP_NOTI,           /* 32 Match one character, not the given one, caselessly */
1412    OP_MINSTAR,        /* 32 these six opcodes must come in pairs, with */  
1413    OP_PLUS,           /* 33 the minimizing one second. */    /* The following sets of 13 opcodes must always be kept in step because
1414    OP_MINPLUS,        /* 34 This first set applies to single characters.*/    the offset from the first one is used to generate the others. */
1415    OP_QUERY,          /* 35 */  
1416    OP_MINQUERY,       /* 36 */    /**** Single characters, caseful, must precede the caseless ones ****/
1417    
1418    OP_UPTO,           /* 37 From 0 to n matches */    OP_STAR,           /* 33 The maximizing and minimizing versions of */
1419    OP_MINUPTO,        /* 38 */    OP_MINSTAR,        /* 34 these six opcodes must come in pairs, with */
1420    OP_EXACT,          /* 39 Exactly n matches */    OP_PLUS,           /* 35 the minimizing one second. */
1421      OP_MINPLUS,        /* 36 */
1422    OP_POSSTAR,        /* 40 Possessified star */    OP_QUERY,          /* 37 */
1423    OP_POSPLUS,        /* 41 Possessified plus */    OP_MINQUERY,       /* 38 */
1424    OP_POSQUERY,       /* 42 Posesssified query */  
1425    OP_POSUPTO,        /* 43 Possessified upto */    OP_UPTO,           /* 39 From 0 to n matches of one character, caseful*/
1426      OP_MINUPTO,        /* 40 */
1427    OP_NOTSTAR,        /* 44 The maximizing and minimizing versions of */    OP_EXACT,          /* 41 Exactly n matches */
1428    OP_NOTMINSTAR,     /* 45 these six opcodes must come in pairs, with */  
1429    OP_NOTPLUS,        /* 46 the minimizing one second. They must be in */    OP_POSSTAR,        /* 42 Possessified star, caseful */
1430    OP_NOTMINPLUS,     /* 47 exactly the same order as those above. */    OP_POSPLUS,        /* 43 Possessified plus, caseful */
1431    OP_NOTQUERY,       /* 48 This set applies to "not" single characters. */    OP_POSQUERY,       /* 44 Posesssified query, caseful */
1432    OP_NOTMINQUERY,    /* 49 */    OP_POSUPTO,        /* 45 Possessified upto, caseful */
1433    
1434    OP_NOTUPTO,        /* 50 From 0 to n matches */    /**** Single characters, caseless, must follow the caseful ones */
1435    OP_NOTMINUPTO,     /* 51 */  
1436    OP_NOTEXACT,       /* 52 Exactly n matches */    OP_STARI,          /* 46 */
1437      OP_MINSTARI,       /* 47 */
1438    OP_NOTPOSSTAR,     /* 53 Possessified versions */    OP_PLUSI,          /* 48 */
1439    OP_NOTPOSPLUS,     /* 54 */    OP_MINPLUSI,       /* 49 */
1440    OP_NOTPOSQUERY,    /* 55 */    OP_QUERYI,         /* 50 */
1441    OP_NOTPOSUPTO,     /* 56 */    OP_MINQUERYI,      /* 51 */
1442    
1443    OP_TYPESTAR,       /* 57 The maximizing and minimizing versions of */    OP_UPTOI,          /* 52 From 0 to n matches of one character, caseless */
1444    OP_TYPEMINSTAR,    /* 58 these six opcodes must come in pairs, with */    OP_MINUPTOI,       /* 53 */
1445    OP_TYPEPLUS,       /* 59 the minimizing one second. These codes must */    OP_EXACTI,         /* 54 */
1446    OP_TYPEMINPLUS,    /* 60 be in exactly the same order as those above. */  
1447    OP_TYPEQUERY,      /* 61 This set applies to character types such as \d */    OP_POSSTARI,       /* 55 Possessified star, caseless */
1448    OP_TYPEMINQUERY,   /* 62 */    OP_POSPLUSI,       /* 56 Possessified plus, caseless */
1449      OP_POSQUERYI,      /* 57 Posesssified query, caseless */
1450    OP_TYPEUPTO,       /* 63 From 0 to n matches */    OP_POSUPTOI,       /* 58 Possessified upto, caseless */
1451    OP_TYPEMINUPTO,    /* 64 */  
1452    OP_TYPEEXACT,      /* 65 Exactly n matches */    /**** The negated ones must follow the non-negated ones, and match them ****/
1453      /**** Negated single character, caseful; must precede the caseless ones ****/
1454    OP_TYPEPOSSTAR,    /* 66 Possessified versions */  
1455    OP_TYPEPOSPLUS,    /* 67 */    OP_NOTSTAR,        /* 59 The maximizing and minimizing versions of */
1456    OP_TYPEPOSQUERY,   /* 68 */    OP_NOTMINSTAR,     /* 60 these six opcodes must come in pairs, with */
1457    OP_TYPEPOSUPTO,    /* 69 */    OP_NOTPLUS,        /* 61 the minimizing one second. They must be in */
1458      OP_NOTMINPLUS,     /* 62 exactly the same order as those above. */
1459    OP_CRSTAR,         /* 70 The maximizing and minimizing versions of */    OP_NOTQUERY,       /* 63 */
1460    OP_CRMINSTAR,      /* 71 all these opcodes must come in pairs, with */    OP_NOTMINQUERY,    /* 64 */
1461    OP_CRPLUS,         /* 72 the minimizing one second. These codes must */  
1462    OP_CRMINPLUS,      /* 73 be in exactly the same order as those above. */    OP_NOTUPTO,        /* 65 From 0 to n matches, caseful */
1463    OP_CRQUERY,        /* 74 These are for character classes and back refs */    OP_NOTMINUPTO,     /* 66 */
1464    OP_CRMINQUERY,     /* 75 */    OP_NOTEXACT,       /* 67 Exactly n matches */
1465    OP_CRRANGE,        /* 76 These are different to the three sets above. */  
1466    OP_CRMINRANGE,     /* 77 */    OP_NOTPOSSTAR,     /* 68 Possessified versions, caseful */
1467      OP_NOTPOSPLUS,     /* 69 */
1468    OP_CLASS,          /* 78 Match a character class, chars < 256 only */    OP_NOTPOSQUERY,    /* 70 */
1469    OP_NCLASS,         /* 79 Same, but the bitmap was created from a negative    OP_NOTPOSUPTO,     /* 71 */
1470                             class - the difference is relevant only when a UTF-8  
1471                             character > 255 is encountered. */    /**** Negated single character, caseless; must follow the caseful ones ****/
1472    
1473    OP_XCLASS,         /* 80 Extended class for handling UTF-8 chars within the    OP_NOTSTARI,       /* 72 */
1474                             class. This does both positive and negative. */    OP_NOTMINSTARI,    /* 73 */
1475      OP_NOTPLUSI,       /* 74 */
1476    OP_REF,            /* 81 Match a back reference */    OP_NOTMINPLUSI,    /* 75 */
1477    OP_RECURSE,        /* 82 Match a numbered subpattern (possibly recursive) */    OP_NOTQUERYI,      /* 76 */
1478    OP_CALLOUT,        /* 83 Call out to external function if provided */    OP_NOTMINQUERYI,   /* 77 */
1479    
1480    OP_ALT,            /* 84 Start of alternation */    OP_NOTUPTOI,       /* 78 From 0 to n matches, caseless */
1481    OP_KET,            /* 85 End of group that doesn't have an unbounded repeat */    OP_NOTMINUPTOI,    /* 79 */
1482    OP_KETRMAX,        /* 86 These two must remain together and in this */    OP_NOTEXACTI,      /* 80 Exactly n matches */
1483    OP_KETRMIN,        /* 87 order. They are for groups the repeat for ever. */  
1484      OP_NOTPOSSTARI,    /* 81 Possessified versions, caseless */
1485    /* The assertions must come before BRA, CBRA, ONCE, and COND.*/    OP_NOTPOSPLUSI,    /* 82 */
1486      OP_NOTPOSQUERYI,   /* 83 */
1487    OP_ASSERT,         /* 88 Positive lookahead */    OP_NOTPOSUPTOI,    /* 84 */
1488    OP_ASSERT_NOT,     /* 89 Negative lookahead */  
1489    OP_ASSERTBACK,     /* 90 Positive lookbehind */    /**** Character types ****/
1490    OP_ASSERTBACK_NOT, /* 91 Negative lookbehind */  
1491    OP_REVERSE,        /* 92 Move pointer back - used in lookbehind assertions */    OP_TYPESTAR,       /* 85 The maximizing and minimizing versions of */
1492      OP_TYPEMINSTAR,    /* 86 these six opcodes must come in pairs, with */
1493    /* ONCE, BRA, CBRA, and COND must come after the assertions, with ONCE first,    OP_TYPEPLUS,       /* 87 the minimizing one second. These codes must */
1494    as there's a test for >= ONCE for a subpattern that isn't an assertion. */    OP_TYPEMINPLUS,    /* 88 be in exactly the same order as those above. */
1495      OP_TYPEQUERY,      /* 89 */
1496    OP_ONCE,           /* 93 Atomic group */    OP_TYPEMINQUERY,   /* 90 */
1497    OP_BRA,            /* 94 Start of non-capturing bracket */  
1498    OP_CBRA,           /* 95 Start of capturing bracket */    OP_TYPEUPTO,       /* 91 From 0 to n matches */
1499    OP_COND,           /* 96 Conditional group */    OP_TYPEMINUPTO,    /* 92 */
1500      OP_TYPEEXACT,      /* 93 Exactly n matches */
1501    
1502      OP_TYPEPOSSTAR,    /* 94 Possessified versions */
1503      OP_TYPEPOSPLUS,    /* 95 */
1504      OP_TYPEPOSQUERY,   /* 96 */
1505      OP_TYPEPOSUPTO,    /* 97 */
1506    
1507      /* These are used for character classes and back references; only the
1508      first six are the same as the sets above. */
1509    
1510      OP_CRSTAR,         /* 98 The maximizing and minimizing versions of */
1511      OP_CRMINSTAR,      /* 99 all these opcodes must come in pairs, with */
1512      OP_CRPLUS,         /* 100 the minimizing one second. These codes must */
1513      OP_CRMINPLUS,      /* 101 be in exactly the same order as those above. */
1514      OP_CRQUERY,        /* 102 */
1515      OP_CRMINQUERY,     /* 103 */
1516    
1517      OP_CRRANGE,        /* 104 These are different to the three sets above. */
1518      OP_CRMINRANGE,     /* 105 */
1519    
1520      /* End of quantifier opcodes */
1521    
1522      OP_CLASS,          /* 106 Match a character class, chars < 256 only */
1523      OP_NCLASS,         /* 107 Same, but the bitmap was created from a negative
1524                                  class - the difference is relevant only when a
1525                                  UTF-8 character > 255 is encountered. */
1526      OP_XCLASS,         /* 108 Extended class for handling UTF-8 chars within the
1527                                  class. This does both positive and negative. */
1528      OP_REF,            /* 109 Match a back reference, casefully */
1529      OP_REFI,           /* 110 Match a back reference, caselessly */
1530      OP_RECURSE,        /* 111 Match a numbered subpattern (possibly recursive) */
1531      OP_CALLOUT,        /* 112 Call out to external function if provided */
1532    
1533      OP_ALT,            /* 113 Start of alternation */
1534      OP_KET,            /* 114 End of group that doesn't have an unbounded repeat */
1535      OP_KETRMAX,        /* 115 These two must remain together and in this */
1536      OP_KETRMIN,        /* 116 order. They are for groups the repeat for ever. */
1537      OP_KETRPOS,        /* 117 Possessive unlimited repeat. */
1538    
1539      /* The assertions must come before BRA, CBRA, ONCE, and COND, and the four
1540      asserts must remain in order. */
1541    
1542      OP_REVERSE,        /* 118 Move pointer back - used in lookbehind assertions */
1543      OP_ASSERT,         /* 119 Positive lookahead */
1544      OP_ASSERT_NOT,     /* 120 Negative lookahead */
1545      OP_ASSERTBACK,     /* 121 Positive lookbehind */
1546      OP_ASSERTBACK_NOT, /* 122 Negative lookbehind */
1547    
1548      /* ONCE, ONCE_NC, BRA, BRAPOS, CBRA, CBRAPOS, and COND must come immediately
1549      after the assertions, with ONCE first, as there's a test for >= ONCE for a
1550      subpattern that isn't an assertion. The POS versions must immediately follow
1551      the non-POS versions in each case. */
1552    
1553      OP_ONCE,           /* 123 Atomic group, contains captures */
1554      OP_ONCE_NC,        /* 124 Atomic group containing no captures */
1555      OP_BRA,            /* 125 Start of non-capturing bracket */
1556      OP_BRAPOS,         /* 126 Ditto, with unlimited, possessive repeat */
1557      OP_CBRA,           /* 127 Start of capturing bracket */
1558      OP_CBRAPOS,        /* 128 Ditto, with unlimited, possessive repeat */
1559      OP_COND,           /* 129 Conditional group */
1560    
1561    /* These three must follow the previous three, in the same order. There's a    /* These five must follow the previous five, in the same order. There's a
1562    check for >= SBRA to distinguish the two sets. */    check for >= SBRA to distinguish the two sets. */
1563    
1564    OP_SBRA,           /* 97 Start of non-capturing bracket, check empty  */    OP_SBRA,           /* 130 Start of non-capturing bracket, check empty  */
1565    OP_SCBRA,          /* 98 Start of capturing bracket, check empty */    OP_SBRAPOS,        /* 131 Ditto, with unlimited, possessive repeat */
1566    OP_SCOND,          /* 99 Conditional group, check empty */    OP_SCBRA,          /* 132 Start of capturing bracket, check empty */
1567      OP_SCBRAPOS,       /* 133 Ditto, with unlimited, possessive repeat */
1568    OP_CREF,           /* 100 Used to hold a capture number as condition */    OP_SCOND,          /* 134 Conditional group, check empty */
1569    OP_RREF,           /* 101 Used to hold a recursion number as condition */  
1570    OP_DEF,            /* 102 The DEFINE condition */    /* The next two pairs must (respectively) be kept together. */
1571    
1572    OP_BRAZERO,        /* 103 These two must remain together and in this */    OP_CREF,           /* 135 Used to hold a capture number as condition */
1573    OP_BRAMINZERO,     /* 104 order. */    OP_NCREF,          /* 136 Same, but generated by a name reference*/
1574      OP_RREF,           /* 137 Used to hold a recursion number as condition */
1575      OP_NRREF,          /* 138 Same, but generated by a name reference*/
1576      OP_DEF,            /* 139 The DEFINE condition */
1577    
1578      OP_BRAZERO,        /* 140 These two must remain together and in this */
1579      OP_BRAMINZERO,     /* 141 order. */
1580      OP_BRAPOSZERO,     /* 142 */
1581    
1582    /* These are backtracking control verbs */    /* These are backtracking control verbs */
1583    
1584    OP_PRUNE,          /* 105 */    OP_MARK,           /* 143 always has an argument */
1585    OP_SKIP,           /* 106 */    OP_PRUNE,          /* 144 */
1586    OP_THEN,           /* 107 */    OP_PRUNE_ARG,      /* 145 same, but with argument */
1587    OP_COMMIT,         /* 108 */    OP_SKIP,           /* 146 */
1588      OP_SKIP_ARG,       /* 147 same, but with argument */
1589      OP_THEN,           /* 148 */
1590      OP_THEN_ARG,       /* 149 same, but with argument */
1591      OP_COMMIT,         /* 150 */
1592    
1593    /* These are forced failure and success verbs */    /* These are forced failure and success verbs */
1594    
1595    OP_FAIL,           /* 109 */    OP_FAIL,           /* 151 */
1596    OP_ACCEPT,         /* 110 */    OP_ACCEPT,         /* 152 */
1597      OP_ASSERT_ACCEPT,  /* 153 Used inside assertions */
1598      OP_CLOSE,          /* 154 Used before OP_ACCEPT to close open captures */
1599    
1600    /* This is used to skip a subpattern with a {0} quantifier */    /* This is used to skip a subpattern with a {0} quantifier */
1601    
1602    OP_SKIPZERO        /* 111 */    OP_SKIPZERO,       /* 155 */
1603    
1604      /* This is not an opcode, but is used to check that tables indexed by opcode
1605      are the correct length, in order to catch updating errors - there have been
1606      some in the past. */
1607    
1608      OP_TABLE_LENGTH
1609  };  };
1610    
1611    /* *** NOTE NOTE NOTE *** Whenever the list above is updated, the two macro
1612    definitions that follow must also be updated to match. There are also tables
1613    called "coptable" and "poptable" in pcre_dfa_exec.c that must be updated. */
1614    
1615    
1616  /* This macro defines textual names for all the opcodes. These are used only  /* This macro defines textual names for all the opcodes. These are used only
1617  for debugging. The macro is referenced only in pcre_printint.c. */  for debugging, and some of them are only partial names. The macro is referenced
1618    only in pcre_printint.c, which fills out the full names in many cases (and in
1619    some cases doesn't actually use these names at all). */
1620    
1621  #define OP_NAME_LIST \  #define OP_NAME_LIST \
1622    "End", "\\A", "\\G", "\\K", "\\B", "\\b", "\\D", "\\d",         \    "End", "\\A", "\\G", "\\K", "\\B", "\\b", "\\D", "\\d",         \
1623    "\\S", "\\s", "\\W", "\\w", "Any", "AllAny", "Anybyte",         \    "\\S", "\\s", "\\W", "\\w", "Any", "AllAny", "Anybyte",         \
1624    "notprop", "prop", "\\R", "\\H", "\\h", "\\V", "\\v",           \    "notprop", "prop", "\\R", "\\H", "\\h", "\\V", "\\v",           \
1625    "extuni",  "\\Z", "\\z",                                        \    "extuni",  "\\Z", "\\z",                                        \
1626    "Opt", "^", "$", "char", "charnc", "not",                       \    "^", "^", "$", "$", "char", "chari", "not", "noti",             \
1627    "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \    "*", "*?", "+", "+?", "?", "??",                                \
1628      "{", "{", "{",                                                  \
1629    "*+","++", "?+", "{",                                           \    "*+","++", "?+", "{",                                           \
1630    "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \    "*", "*?", "+", "+?", "?", "??",                                \
1631      "{", "{", "{",                                                  \
1632      "*+","++", "?+", "{",                                           \
1633      "*", "*?", "+", "+?", "?", "??",                                \
1634      "{", "{", "{",                                                  \
1635      "*+","++", "?+", "{",                                           \
1636      "*", "*?", "+", "+?", "?", "??",                                \
1637      "{", "{", "{",                                                  \
1638    "*+","++", "?+", "{",                                           \    "*+","++", "?+", "{",                                           \
1639    "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \    "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \
1640    "*+","++", "?+", "{",                                           \    "*+","++", "?+", "{",                                           \
1641    "*", "*?", "+", "+?", "?", "??", "{", "{",                      \    "*", "*?", "+", "+?", "?", "??", "{", "{",                      \
1642    "class", "nclass", "xclass", "Ref", "Recurse", "Callout",       \    "class", "nclass", "xclass", "Ref", "Refi",                     \
1643    "Alt", "Ket", "KetRmax", "KetRmin", "Assert", "Assert not",     \    "Recurse", "Callout",                                           \
1644    "AssertB", "AssertB not", "Reverse",                            \    "Alt", "Ket", "KetRmax", "KetRmin", "KetRpos",                  \
1645    "Once", "Bra", "CBra", "Cond", "SBra", "SCBra", "SCond",        \    "Reverse", "Assert", "Assert not", "AssertB", "AssertB not",    \
1646    "Cond ref", "Cond rec", "Cond def", "Brazero", "Braminzero",    \    "Once", "Once_NC",                                              \
1647    "*PRUNE", "*SKIP", "*THEN", "*COMMIT", "*FAIL", "*ACCEPT",      \    "Bra", "BraPos", "CBra", "CBraPos",                             \
1648    "Skip zero"    "Cond",                                                         \
1649      "SBra", "SBraPos", "SCBra", "SCBraPos",                         \
1650      "SCond",                                                        \
1651      "Cond ref", "Cond nref", "Cond rec", "Cond nrec", "Cond def",   \
1652      "Brazero", "Braminzero", "Braposzero",                          \
1653      "*MARK", "*PRUNE", "*PRUNE", "*SKIP", "*SKIP",                  \
1654      "*THEN", "*THEN", "*COMMIT", "*FAIL",                           \
1655      "*ACCEPT", "*ASSERT_ACCEPT",                                    \
1656      "Close", "Skip zero"
1657    
1658    
1659  /* This macro defines the length of fixed length operations in the compiled  /* This macro defines the length of fixed length operations in the compiled
# Line 1405  in UTF-8 mode. The code that uses this t Line 1670  in UTF-8 mode. The code that uses this t
1670    1, 1, 1, 1, 1,                 /* \A, \G, \K, \B, \b                     */ \    1, 1, 1, 1, 1,                 /* \A, \G, \K, \B, \b                     */ \
1671    1, 1, 1, 1, 1, 1,              /* \D, \d, \S, \s, \W, \w                 */ \    1, 1, 1, 1, 1, 1,              /* \D, \d, \S, \s, \W, \w                 */ \
1672    1, 1, 1,                       /* Any, AllAny, Anybyte                   */ \    1, 1, 1,                       /* Any, AllAny, Anybyte                   */ \
1673    3, 3, 1,                       /* NOTPROP, PROP, EXTUNI                  */ \    3, 3,                          /* \P, \p                                 */ \
1674    1, 1, 1, 1, 1,                 /* \R, \H, \h, \V, \v                     */ \    1, 1, 1, 1, 1,                 /* \R, \H, \h, \V, \v                     */ \
1675    1, 1, 2, 1, 1,                 /* \Z, \z, Opt, ^, $                      */ \    1,                             /* \X                                     */ \
1676      1, 1, 1, 1, 1, 1,              /* \Z, \z, ^, ^M, $, $M                   */ \
1677    2,                             /* Char  - the minimum length             */ \    2,                             /* Char  - the minimum length             */ \
1678    2,                             /* Charnc  - the minimum length           */ \    2,                             /* Chari  - the minimum length            */ \
1679    2,                             /* not                                    */ \    2,                             /* not                                    */ \
1680    /* Positive single-char repeats                            ** These are  */ \    2,                             /* noti                                   */ \
1681    2, 2, 2, 2, 2, 2,              /* *, *?, +, +?, ?, ??      ** minima in  */ \    /* Positive single-char repeats                             ** These are */ \
1682    4, 4, 4,                       /* upto, minupto, exact     ** UTF-8 mode */ \    2, 2, 2, 2, 2, 2,              /* *, *?, +, +?, ?, ??       ** minima in */ \
1683    2, 2, 2, 4,                    /* *+, ++, ?+, upto+                      */ \    2+IMM2_SIZE, 2+IMM2_SIZE,      /* upto, minupto             ** mode      */ \
1684      2+IMM2_SIZE,                   /* exact                                  */ \
1685      2, 2, 2, 2+IMM2_SIZE,          /* *+, ++, ?+, upto+                      */ \
1686      2, 2, 2, 2, 2, 2,              /* *I, *?I, +I, +?I, ?I, ??I ** UTF-8     */ \
1687      2+IMM2_SIZE, 2+IMM2_SIZE,      /* upto I, minupto I                      */ \
1688      2+IMM2_SIZE,                   /* exact I                                */ \
1689      2, 2, 2, 2+IMM2_SIZE,          /* *+I, ++I, ?+I, upto+I                  */ \
1690    /* Negative single-char repeats - only for chars < 256                   */ \    /* Negative single-char repeats - only for chars < 256                   */ \
1691    2, 2, 2, 2, 2, 2,              /* NOT *, *?, +, +?, ?, ??                */ \    2, 2, 2, 2, 2, 2,              /* NOT *, *?, +, +?, ?, ??                */ \
1692    4, 4, 4,                       /* NOT upto, minupto, exact               */ \    2+IMM2_SIZE, 2+IMM2_SIZE,      /* NOT upto, minupto                      */ \
1693    2, 2, 2, 4,                    /* Possessive *, +, ?, upto               */ \    2+IMM2_SIZE,                   /* NOT exact                              */ \
1694      2, 2, 2, 2+IMM2_SIZE,          /* Possessive NOT *, +, ?, upto           */ \
1695      2, 2, 2, 2, 2, 2,              /* NOT *I, *?I, +I, +?I, ?I, ??I          */ \
1696      2+IMM2_SIZE, 2+IMM2_SIZE,      /* NOT upto I, minupto I                  */ \
1697      2+IMM2_SIZE,                   /* NOT exact I                            */ \
1698      2, 2, 2, 2+IMM2_SIZE,          /* Possessive NOT *I, +I, ?I, upto I      */ \
1699    /* Positive type repeats                                                 */ \    /* Positive type repeats                                                 */ \
1700    2, 2, 2, 2, 2, 2,              /* Type *, *?, +, +?, ?, ??               */ \    2, 2, 2, 2, 2, 2,              /* Type *, *?, +, +?, ?, ??               */ \
1701    4, 4, 4,                       /* Type upto, minupto, exact              */ \    2+IMM2_SIZE, 2+IMM2_SIZE,      /* Type upto, minupto                     */ \
1702    2, 2, 2, 4,                    /* Possessive *+, ++, ?+, upto+           */ \    2+IMM2_SIZE,                   /* Type exact                             */ \
1703      2, 2, 2, 2+IMM2_SIZE,          /* Possessive *+, ++, ?+, upto+           */ \
1704    /* Character class & ref repeats                                         */ \    /* Character class & ref repeats                                         */ \
1705    1, 1, 1, 1, 1, 1,              /* *, *?, +, +?, ?, ??                    */ \    1, 1, 1, 1, 1, 1,              /* *, *?, +, +?, ?, ??                    */ \
1706    5, 5,                          /* CRRANGE, CRMINRANGE                    */ \    1+2*IMM2_SIZE, 1+2*IMM2_SIZE,  /* CRRANGE, CRMINRANGE                    */ \
1707   33,                             /* CLASS                                  */ \   33,                             /* CLASS                                  */ \
1708   33,                             /* NCLASS                                 */ \   33,                             /* NCLASS                                 */ \
1709    0,                             /* XCLASS - variable length               */ \    0,                             /* XCLASS - variable length               */ \
1710    3,                             /* REF                                    */ \    1+IMM2_SIZE,                   /* REF                                    */ \
1711      1+IMM2_SIZE,                   /* REFI                                   */ \
1712    1+LINK_SIZE,                   /* RECURSE                                */ \    1+LINK_SIZE,                   /* RECURSE                                */ \
1713    2+2*LINK_SIZE,                 /* CALLOUT                                */ \    2+2*LINK_SIZE,                 /* CALLOUT                                */ \
1714    1+LINK_SIZE,                   /* Alt                                    */ \    1+LINK_SIZE,                   /* Alt                                    */ \
1715    1+LINK_SIZE,                   /* Ket                                    */ \    1+LINK_SIZE,                   /* Ket                                    */ \
1716    1+LINK_SIZE,                   /* KetRmax                                */ \    1+LINK_SIZE,                   /* KetRmax                                */ \
1717    1+LINK_SIZE,                   /* KetRmin                                */ \    1+LINK_SIZE,                   /* KetRmin                                */ \
1718      1+LINK_SIZE,                   /* KetRpos                                */ \
1719      1+LINK_SIZE,                   /* Reverse                                */ \
1720    1+LINK_SIZE,                   /* Assert                                 */ \    1+LINK_SIZE,                   /* Assert                                 */ \
1721    1+LINK_SIZE,                   /* Assert not                             */ \    1+LINK_SIZE,                   /* Assert not                             */ \
1722    1+LINK_SIZE,                   /* Assert behind                          */ \    1+LINK_SIZE,                   /* Assert behind                          */ \
1723    1+LINK_SIZE,                   /* Assert behind not                      */ \    1+LINK_SIZE,                   /* Assert behind not                      */ \
   1+LINK_SIZE,                   /* Reverse                                */ \  
1724    1+LINK_SIZE,                   /* ONCE                                   */ \    1+LINK_SIZE,                   /* ONCE                                   */ \
1725      1+LINK_SIZE,                   /* ONCE_NC                                */ \
1726    1+LINK_SIZE,                   /* BRA                                    */ \    1+LINK_SIZE,                   /* BRA                                    */ \
1727    3+LINK_SIZE,                   /* CBRA                                   */ \    1+LINK_SIZE,                   /* BRAPOS                                 */ \
1728      1+LINK_SIZE+IMM2_SIZE,         /* CBRA                                   */ \
1729      1+LINK_SIZE+IMM2_SIZE,         /* CBRAPOS                                */ \
1730    1+LINK_SIZE,                   /* COND                                   */ \    1+LINK_SIZE,                   /* COND                                   */ \
1731    1+LINK_SIZE,                   /* SBRA                                   */ \    1+LINK_SIZE,                   /* SBRA                                   */ \
1732    3+LINK_SIZE,                   /* SCBRA                                  */ \    1+LINK_SIZE,                   /* SBRAPOS                                */ \
1733      1+LINK_SIZE+IMM2_SIZE,         /* SCBRA                                  */ \
1734      1+LINK_SIZE+IMM2_SIZE,         /* SCBRAPOS                               */ \
1735    1+LINK_SIZE,                   /* SCOND                                  */ \    1+LINK_SIZE,                   /* SCOND                                  */ \
1736    3,                             /* CREF                                   */ \    1+IMM2_SIZE, 1+IMM2_SIZE,      /* CREF, NCREF                            */ \
1737    3,                             /* RREF                                   */ \    1+IMM2_SIZE, 1+IMM2_SIZE,      /* RREF, NRREF                            */ \
1738    1,                             /* DEF                                    */ \    1,                             /* DEF                                    */ \
1739    1, 1,                          /* BRAZERO, BRAMINZERO                    */ \    1, 1, 1,                       /* BRAZERO, BRAMINZERO, BRAPOSZERO        */ \
1740    1, 1, 1, 1,                    /* PRUNE, SKIP, THEN, COMMIT,             */ \    3, 1, 3,                       /* MARK, PRUNE, PRUNE_ARG                 */ \
1741    1, 1, 1                        /* FAIL, ACCEPT, SKIPZERO                 */    1, 3,                          /* SKIP, SKIP_ARG                         */ \
1742      1, 3,                          /* THEN, THEN_ARG                         */ \
1743      1, 1, 1, 1,                    /* COMMIT, FAIL, ACCEPT, ASSERT_ACCEPT    */ \
1744      1+IMM2_SIZE, 1                 /* CLOSE, SKIPZERO                        */
1745    
1746  /* A magic value for OP_RREF to indicate the "any recursion" condition. */  /* A magic value for OP_RREF and OP_NRREF to indicate the "any recursion"
1747    condition. */
1748    
1749  #define RREF_ANY  0xffff  #define RREF_ANY  0xffff
1750    
1751  /* Error code numbers. They are given names so that they can more easily be  /* Compile time error code numbers. They are given names so that they can more
1752  tracked. */  easily be tracked. When a new number is added, the table called eint in
1753    pcreposix.c must be updated. */
1754    
1755  enum { ERR0,  ERR1,  ERR2,  ERR3,  ERR4,  ERR5,  ERR6,  ERR7,  ERR8,  ERR9,  enum { ERR0,  ERR1,  ERR2,  ERR3,  ERR4,  ERR5,  ERR6,  ERR7,  ERR8,  ERR9,
1756         ERR10, ERR11, ERR12, ERR13, ERR14, ERR15, ERR16, ERR17, ERR18, ERR19,         ERR10, ERR11, ERR12, ERR13, ERR14, ERR15, ERR16, ERR17, ERR18, ERR19,
# Line 1469  enum { ERR0, ERR1, ERR2, ERR3, ERR4, Line 1758  enum { ERR0, ERR1, ERR2, ERR3, ERR4,
1758         ERR30, ERR31, ERR32, ERR33, ERR34, ERR35, ERR36, ERR37, ERR38, ERR39,         ERR30, ERR31, ERR32, ERR33, ERR34, ERR35, ERR36, ERR37, ERR38, ERR39,
1759         ERR40, ERR41, ERR42, ERR43, ERR44, ERR45, ERR46, ERR47, ERR48, ERR49,         ERR40, ERR41, ERR42, ERR43, ERR44, ERR45, ERR46, ERR47, ERR48, ERR49,
1760         ERR50, ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58, ERR59,         ERR50, ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58, ERR59,
1761         ERR60, ERR61, ERR62, ERR63, ERR64 };         ERR60, ERR61, ERR62, ERR63, ERR64, ERR65, ERR66, ERR67, ERR68, ERR69,
1762           ERR70, ERRCOUNT };
1763    
1764  /* The real format of the start of the pcre block; the index of names and the  /* The real format of the start of the pcre block; the index of names and the
1765  code vector run on as long as necessary after the end. We store an explicit  code vector run on as long as necessary after the end. We store an explicit
# Line 1485  Because people can now save and re-use c Line 1775  Because people can now save and re-use c
1775  structure should be made at the end, and something earlier (e.g. a new  structure should be made at the end, and something earlier (e.g. a new
1776  flag in the options or one of the dummy fields) should indicate that the new  flag in the options or one of the dummy fields) should indicate that the new
1777  fields are present. Currently PCRE always sets the dummy fields to zero.  fields are present. Currently PCRE always sets the dummy fields to zero.
1778  NOTE NOTE NOTE:  NOTE NOTE NOTE
1779  */  */
1780    
1781  typedef struct real_pcre {  typedef struct real_pcre {
# Line 1503  typedef struct real_pcre { Line 1793  typedef struct real_pcre {
1793    pcre_uint16 name_count;         /* Number of name items */    pcre_uint16 name_count;         /* Number of name items */
1794    pcre_uint16 ref_count;          /* Reference count */    pcre_uint16 ref_count;          /* Reference count */
1795    
1796    const unsigned char *tables;    /* Pointer to tables or NULL for std */    const pcre_uint8 *tables;       /* Pointer to tables or NULL for std */
1797    const unsigned char *nullpad;   /* NULL padding */    const pcre_uint8 *nullpad;      /* NULL padding */
1798  } real_pcre;  } real_pcre;
1799    
1800  /* The format of the block used to store data from pcre_study(). The same  /* The format of the block used to store data from pcre_study(). The same
# Line 1512  remark (see NOTE above) about extending Line 1802  remark (see NOTE above) about extending
1802    
1803  typedef struct pcre_study_data {  typedef struct pcre_study_data {
1804    pcre_uint32 size;               /* Total that was malloced */    pcre_uint32 size;               /* Total that was malloced */
1805    pcre_uint32 options;    pcre_uint32 flags;              /* Private flags */
1806    uschar start_bits[32];    pcre_uint8 start_bits[32];      /* Starting char bits */
1807      pcre_uint32 minlength;          /* Minimum subject length */
1808  } pcre_study_data;  } pcre_study_data;
1809    
1810    /* Structure for building a chain of open capturing subpatterns during
1811    compiling, so that instructions to close them can be compiled when (*ACCEPT) is
1812    encountered. This is also used to identify subpatterns that contain recursive
1813    back references to themselves, so that they can be made atomic. */
1814    
1815    typedef struct open_capitem {
1816      struct open_capitem *next;    /* Chain link */
1817      pcre_uint16 number;           /* Capture number */
1818      pcre_uint16 flag;             /* Set TRUE if recursive back ref */
1819    } open_capitem;
1820    
1821  /* Structure for passing "static" information around between the functions  /* Structure for passing "static" information around between the functions
1822  doing the compiling, so that they are thread-safe. */  doing the compiling, so that they are thread-safe. */
1823    
1824  typedef struct compile_data {  typedef struct compile_data {
1825    const uschar *lcc;            /* Points to lower casing table */    const pcre_uint8 *lcc;            /* Points to lower casing table */
1826    const uschar *fcc;            /* Points to case-flipping table */    const pcre_uint8 *fcc;            /* Points to case-flipping table */
1827    const uschar *cbits;          /* Points to character type table */    const pcre_uint8 *cbits;          /* Points to character type table */
1828    const uschar *ctypes;         /* Points to table of type maps */    const pcre_uint8 *ctypes;         /* Points to table of type maps */
1829    const uschar *start_workspace;/* The start of working space */    const pcre_uchar *start_workspace;/* The start of working space */
1830    const uschar *start_code;     /* The start of the compiled code */    const pcre_uchar *start_code;     /* The start of the compiled code */
1831    const uschar *start_pattern;  /* The start of the pattern */    const pcre_uchar *start_pattern;  /* The start of the pattern */
1832    const uschar *end_pattern;    /* The end of the pattern */    const pcre_uchar *end_pattern;    /* The end of the pattern */
1833    uschar *hwm;                  /* High watermark of workspace */    open_capitem *open_caps;          /* Chain of open capture items */
1834    uschar *name_table;           /* The name/number table */    pcre_uchar *hwm;                  /* High watermark of workspace */
1835    int  names_found;             /* Number of entries so far */    pcre_uchar *name_table;           /* The name/number table */
1836    int  name_entry_size;         /* Size of each entry */    int  names_found;                 /* Number of entries so far */
1837    int  bracount;                /* Count of capturing parens as we compile */    int  name_entry_size;             /* Size of each entry */
1838    int  final_bracount;          /* Saved value after first pass */    int  bracount;                    /* Count of capturing parens as we compile */
1839    int  top_backref;             /* Maximum back reference */    int  final_bracount;              /* Saved value after first pass */
1840    unsigned int backref_map;     /* Bitmap of low back refs */    int  top_backref;                 /* Maximum back reference */
1841    int  external_options;        /* External (initial) options */    unsigned int backref_map;         /* Bitmap of low back refs */
1842    int  external_flags;          /* External flag bits to be set */    int  assert_depth;                /* Depth of nested assertions */
1843    int  req_varyopt;             /* "After variable item" flag for reqbyte */    int  external_options;            /* External (initial) options */
1844    BOOL had_accept;              /* (*ACCEPT) encountered */    int  external_flags;              /* External flag bits to be set */
1845    int  nltype;                  /* Newline type */    int  req_varyopt;                 /* "After variable item" flag for reqbyte */
1846    int  nllen;                   /* Newline string length */    BOOL had_accept;                  /* (*ACCEPT) encountered */
1847    uschar nl[4];                 /* Newline string when fixed length */    BOOL check_lookbehind;            /* Lookbehinds need later checking */
1848      int  nltype;                      /* Newline type */
1849      int  nllen;                       /* Newline string length */
1850      pcre_uchar nl[4];                 /* Newline string when fixed length */
1851  } compile_data;  } compile_data;
1852    
1853  /* Structure for maintaining a chain of pointers to the currently incomplete  /* Structure for maintaining a chain of pointers to the currently incomplete
1854  branches, for testing for left recursion. */  branches, for testing for left recursion while compiling. */
1855    
1856  typedef struct branch_chain {  typedef struct branch_chain {
1857    struct branch_chain *outer;    struct branch_chain *outer;
1858    uschar *current;    pcre_uchar *current_branch;
1859  } branch_chain;  } branch_chain;
1860    
1861  /* Structure for items in a linked list that represents an explicit recursive  /* Structure for items in a linked list that represents an explicit recursive
1862  call within the pattern. */  call within the pattern; used by pcre_exec(). */
1863    
1864  typedef struct recursion_info {  typedef struct recursion_info {
1865    struct recursion_info *prevrec; /* Previous recursion record (or NULL) */    struct recursion_info *prevrec; /* Previous recursion record (or NULL) */
1866    int group_num;                /* Number of group that was called */    int group_num;                  /* Number of group that was called */
1867    const uschar *after_call;     /* "Return value": points after the call in the expr */    int *offset_save;               /* Pointer to start of saved offsets */
1868    USPTR save_start;             /* Old value of mstart */    int saved_max;                  /* Number of saved offsets */
1869    int *offset_save;             /* Pointer to start of saved offsets */    PCRE_PUCHAR subject_position;   /* Position at start of recursion */
   int saved_max;                /* Number of saved offsets */  
1870  } recursion_info;  } recursion_info;
1871    
1872    /* A similar structure for pcre_dfa_exec(). */
1873    
1874    typedef struct dfa_recursion_info {
1875      struct dfa_recursion_info *prevrec;
1876      int group_num;
1877      PCRE_PUCHAR subject_position;
1878    } dfa_recursion_info;
1879    
1880  /* Structure for building a chain of data for holding the values of the subject  /* Structure for building a chain of data for holding the values of the subject
1881  pointer at the start of each subpattern, so as to detect when an empty string  pointer at the start of each subpattern, so as to detect when an empty string
1882  has been matched by a subpattern - to break infinite loops. */  has been matched by a subpattern - to break infinite loops; used by
1883    pcre_exec(). */
1884    
1885  typedef struct eptrblock {  typedef struct eptrblock {
1886    struct eptrblock *epb_prev;    struct eptrblock *epb_prev;
1887    USPTR epb_saved_eptr;    PCRE_PUCHAR epb_saved_eptr;
1888  } eptrblock;  } eptrblock;
1889    
1890    
# Line 1582  typedef struct match_data { Line 1895  typedef struct match_data {
1895    unsigned long int match_call_count;      /* As it says */    unsigned long int match_call_count;      /* As it says */
1896    unsigned long int match_limit;           /* As it says */    unsigned long int match_limit;           /* As it says */
1897    unsigned long int match_limit_recursion; /* As it says */    unsigned long int match_limit_recursion; /* As it says */
1898    int   *offset_vector;         /* Offset vector */    int   *offset_vector;           /* Offset vector */
1899    int    offset_end;            /* One past the end */    int    offset_end;              /* One past the end */
1900    int    offset_max;            /* The maximum usable for return data */    int    offset_max;              /* The maximum usable for return data */
1901    int    nltype;                /* Newline type */    int    nltype;                  /* Newline type */
1902    int    nllen;                 /* Newline string length */    int    nllen;                   /* Newline string length */
1903    uschar nl[4];                 /* Newline string when fixed */    int    name_count;              /* Number of names in name table */
1904    const uschar *lcc;            /* Points to lower casing table */    int    name_entry_size;         /* Size of entry in names table */
1905    const uschar *ctypes;         /* Points to table of type maps */    pcre_uchar *name_table;         /* Table of names */
1906    BOOL   offset_overflow;       /* Set if too many extractions */    pcre_uchar nl[4];               /* Newline string when fixed */
1907    BOOL   notbol;                /* NOTBOL flag */    const  pcre_uint8 *lcc;         /* Points to lower casing table */
1908    BOOL   noteol;                /* NOTEOL flag */    const  pcre_uint8 *ctypes;      /* Points to table of type maps */
1909    BOOL   utf8;                  /* UTF8 flag */    BOOL   offset_overflow;         /* Set if too many extractions */
1910    BOOL   jscript_compat;        /* JAVASCRIPT_COMPAT flag */    BOOL   notbol;                  /* NOTBOL flag */
1911    BOOL   endonly;               /* Dollar not before final \n */    BOOL   noteol;                  /* NOTEOL flag */
1912    BOOL   notempty;              /* Empty string match not wanted */    BOOL   utf8;                    /* UTF8 flag */
1913    BOOL   partial;               /* PARTIAL flag */    BOOL   jscript_compat;          /* JAVASCRIPT_COMPAT flag */
1914    BOOL   hitend;                /* Hit the end of the subject at some point */    BOOL   use_ucp;                 /* PCRE_UCP flag */
1915    BOOL   bsr_anycrlf;           /* \R is just any CRLF, not full Unicode */    BOOL   endonly;                 /* Dollar not before final \n */
1916    const uschar *start_code;     /* For use when recursing */    BOOL   notempty;                /* Empty string match not wanted */
1917    USPTR  start_subject;         /* Start of the subject string */    BOOL   notempty_atstart;        /* Empty string match at start not wanted */
1918    USPTR  end_subject;           /* End of the subject string */    BOOL   hitend;                  /* Hit the end of the subject at some point */
1919    USPTR  start_match_ptr;       /* Start of matched string */    BOOL   bsr_anycrlf;             /* \R is just any CRLF, not full Unicode */
1920    USPTR  end_match_ptr;         /* Subject position at end match */    BOOL   hasthen;                 /* Pattern contains (*THEN) */
1921    int    end_offset_top;        /* Highwater mark at end of match */    const  pcre_uchar *start_code;  /* For use when recursing */
1922    int    capture_last;          /* Most recent capture number */    PCRE_PUCHAR start_subject;      /* Start of the subject string */
1923    int    start_offset;          /* The start offset value */    PCRE_PUCHAR end_subject;        /* End of the subject string */
1924    eptrblock *eptrchain;         /* Chain of eptrblocks for tail recursions */    PCRE_PUCHAR start_match_ptr;    /* Start of matched string */
1925    int    eptrn;                 /* Next free eptrblock */    PCRE_PUCHAR end_match_ptr;      /* Subject position at end match */
1926    recursion_info *recursive;    /* Linked list of recursion data */    PCRE_PUCHAR start_used_ptr;     /* Earliest consulted character */
1927    void  *callout_data;          /* To pass back to callouts */    int    partial;                 /* PARTIAL options */
1928      int    end_offset_top;          /* Highwater mark at end of match */
1929      int    capture_last;            /* Most recent capture number */
1930      int    start_offset;            /* The start offset value */
1931      int    match_function_type;     /* Set for certain special calls of MATCH() */
1932      eptrblock *eptrchain;           /* Chain of eptrblocks for tail recursions */
1933      int    eptrn;                   /* Next free eptrblock */
1934      recursion_info *recursive;      /* Linked list of recursion data */
1935      void  *callout_data;            /* To pass back to callouts */
1936      const  pcre_uchar *mark;        /* Mark pointer to pass back */
1937      const  pcre_uchar *once_target; /* Where to back up to for atomic groups */
1938  } match_data;  } match_data;
1939    
1940  /* A similar structure is used for the same purpose by the DFA matching  /* A similar structure is used for the same purpose by the DFA matching
1941  functions. */  functions. */
1942    
1943  typedef struct dfa_match_data {  typedef struct dfa_match_data {
1944    const uschar *start_code;     /* Start of the compiled pattern */    const pcre_uchar *start_code;     /* Start of the compiled pattern */
1945    const uschar *start_subject;  /* Start of the subject string */    const pcre_uchar *start_subject ; /* Start of the subject string */
1946    const uschar *end_subject;    /* End of subject string */    const pcre_uchar *end_subject;    /* End of subject string */
1947    const uschar *tables;         /* Character tables */    const pcre_uchar *start_used_ptr; /* Earliest consulted character */
1948    int   moptions;               /* Match options */    const pcre_uint8 *tables;         /* Character tables */
1949    int   poptions;               /* Pattern options */    int   start_offset;               /* The start offset value */
1950    int    nltype;                /* Newline type */    int   moptions;                   /* Match options */
1951    int    nllen;                 /* Newline string length */    int   poptions;                   /* Pattern options */
1952    uschar nl[4];                 /* Newline string when fixed */    int   nltype;                     /* Newline type */
1953    void  *callout_data;          /* To pass back to callouts */    int   nllen;                      /* Newline string length */
1954      pcre_uchar nl[4];                 /* Newline string when fixed */
1955      void *callout_data;               /* To pass back to callouts */
1956      dfa_recursion_info *recursive;    /* Linked list of recursion data */
1957  } dfa_match_data;  } dfa_match_data;
1958    
1959  /* Bit definitions for entries in the pcre_ctypes table. */  /* Bit definitions for entries in the pcre_ctypes table. */
# Line 1663  total length. */ Line 1989  total length. */
1989  #define ctypes_offset (cbits_offset + cbit_length)  #define ctypes_offset (cbits_offset + cbit_length)
1990  #define tables_length (ctypes_offset + 256)  #define tables_length (ctypes_offset + 256)
1991    
1992    /* Internal function prefix */
1993    
1994    #ifdef COMPILE_PCRE8
1995    #define PRIV(name) _pcre_##name
1996    #else
1997    #ifdef COMPILE_PCRE16
1998    #define PRIV(name) _pcre16_##name
1999    #else
2000    #error Unsupported compiling mode
2001    #endif /* COMPILE_PCRE16 */
2002    #endif /* COMPILE_PCRE8 */
2003    
2004  /* Layout of the UCP type table that translates property names into types and  /* Layout of the UCP type table that translates property names into types and
2005  codes. Each entry used to point directly to a name, but to reduce the number of  codes. Each entry used to point directly to a name, but to reduce the number of
2006  relocations in shared libraries, it now has an offset into a single string  relocations in shared libraries, it now has an offset into a single string
# Line 1680  of the exported public functions. They h Line 2018  of the exported public functions. They h
2018  but are not part of the PCRE public API. The data for these tables is in the  but are not part of the PCRE public API. The data for these tables is in the
2019  pcre_tables.c module. */  pcre_tables.c module. */
2020    
2021  extern const int    _pcre_utf8_table1[];  extern const int            PRIV(utf8_table1)[];
2022  extern const int    _pcre_utf8_table2[];  extern const int            PRIV(utf8_table2)[];
2023  extern const int    _pcre_utf8_table3[];  extern const int            PRIV(utf8_table3)[];
2024  extern const uschar _pcre_utf8_table4[];  extern const pcre_uint8     PRIV(utf8_table4)[];
2025    
2026  extern const int    _pcre_utf8_table1_size;  extern const int            PRIV(utf8_table1_size);
2027    
2028  extern const char   _pcre_utt_names[];  extern const char           PRIV(utt_names)[];
2029  extern const ucp_type_table _pcre_utt[];  extern const ucp_type_table PRIV(utt)[];
2030  extern const int _pcre_utt_size;  extern const int            PRIV(utt_size);
2031    
2032  extern const uschar _pcre_default_tables[];  extern const pcre_uint8     PRIV(default_tables)[];
2033    
2034  extern const uschar _pcre_OP_lengths[];  extern const pcre_uint8     PRIV(OP_lengths)[];
2035    
2036    
2037  /* Internal shared functions. These are functions that are used by more than  /* Internal shared functions. These are functions that are used by more than
2038  one of the exported public functions. They have to be "external" in the C  one of the exported public functions. They have to be "external" in the C
2039  sense, but are not part of the PCRE public API. */  sense, but are not part of the PCRE public API. */
2040    
2041  extern BOOL         _pcre_is_newline(const uschar *, int, const uschar *,  /* String comparison functions. */
2042                        int *, BOOL);  #ifdef COMPILE_PCRE8
 extern int          _pcre_ord2utf8(int, uschar *);  
 extern real_pcre   *_pcre_try_flipped(const real_pcre *, real_pcre *,  
                       const pcre_study_data *, pcre_study_data *);  
 extern int          _pcre_valid_utf8(const uschar *, int);  
 extern BOOL         _pcre_was_newline(const uschar *, int, const uschar *,  
                       int *, BOOL);  
 extern BOOL         _pcre_xclass(int, const uschar *);  
2043    
2044    #define STRCMP_UC_UC(str1, str2) \
2045      strcmp((char *)(str1), (char *)(str2))
2046    #define STRCMP_UC_C8(str1, str2) \
2047      strcmp((char *)(str1), (str2))
2048    #define STRNCMP_UC_UC(str1, str2, num) \
2049      strncmp((char *)(str1), (char *)(str2), (num))
2050    #define STRNCMP_UC_C8(str1, str2, num) \
2051      strncmp((char *)(str1), (str2), (num))
2052    #define STRLEN_UC(str) strlen((const char *)str)
2053    
2054    #else
2055    
2056    extern int               PRIV(strcmp_uc_uc)(const pcre_uchar *,
2057                               const pcre_uchar *);
2058    extern int               PRIV(strcmp_uc_c8)(const pcre_uchar *,
2059                               const char *);
2060    extern int               PRIV(strncmp_uc_uc)(const pcre_uchar *,
2061                               const pcre_uchar *, unsigned int num);
2062    extern int               PRIV(strncmp_uc_c8)(const pcre_uchar *,
2063                               const char *, unsigned int num);
2064    extern unsigned int      PRIV(strlen_uc)(const pcre_uchar *str);
2065    
2066    #define STRCMP_UC_UC(str1, str2) \
2067      PRIV(strcmp_uc_uc)((str1), (str2))
2068    #define STRCMP_UC_C8(str1, str2) \
2069      PRIV(strcmp_uc_c8)((str1), (str2))
2070    #define STRNCMP_UC_UC(str1, str2, num) \
2071      PRIV(strncmp_uc_uc)((str1), (str2), (num))
2072    #define STRNCMP_UC_C8(str1, str2, num) \
2073      PRIV(strncmp_uc_c8)((str1), (str2), (num))
2074    #define STRLEN_UC(str) PRIV(strlen_uc)(str)
2075    
2076    #endif /* COMPILE_PCRE8 */
2077    
2078    extern const pcre_uchar *PRIV(find_bracket)(const pcre_uchar *, BOOL, int);
2079    extern BOOL              PRIV(is_newline)(PCRE_PUCHAR, int, PCRE_PUCHAR,
2080                               int *, BOOL);
2081    extern int               PRIV(ord2utf8)(int, pcre_uint8 *);
2082    extern real_pcre        *PRIV(try_flipped)(const real_pcre *, real_pcre *,
2083                               const pcre_study_data *, pcre_study_data *);
2084    #ifndef COMPILE_PCRE16
2085    extern int               PRIV(valid_utf8)(PCRE_PUCHAR, int, int *);
2086    #else
2087    extern int               PRIV(valid_utf16)(PCRE_PUCHAR, int, int *);
2088    #endif
2089    extern BOOL              PRIV(was_newline)(PCRE_PUCHAR, int, PCRE_PUCHAR,
2090                               int *, BOOL);
2091    extern BOOL              PRIV(xclass)(int, const pcre_uchar *);
2092    
2093    #ifdef SUPPORT_JIT
2094    extern void              PRIV(jit_compile)(const real_pcre *, pcre_extra *);
2095    extern int               PRIV(jit_exec)(const real_pcre *, void *,
2096                               const pcre_uchar *, int, int, int, int, int *, int);
2097    extern void              PRIV(jit_free)(void *);
2098    #endif
2099    
2100  /* Unicode character database (UCD) */  /* Unicode character database (UCD) */
2101    
2102  typedef struct {  typedef struct {
2103    uschar script;    pcre_uint8 script;
2104    uschar chartype;    pcre_uint8 chartype;
2105    pcre_int32 other_case;    pcre_int32 other_case;
2106  } ucd_record;  } ucd_record;
2107    
2108  extern const ucd_record  _pcre_ucd_records[];  extern const ucd_record  PRIV(ucd_records)[];
2109  extern const uschar      _pcre_ucd_stage1[];  extern const pcre_uint8  PRIV(ucd_stage1)[];
2110  extern const pcre_uint16 _pcre_ucd_stage2[];  extern const pcre_uint16 PRIV(ucd_stage2)[];
2111  extern const int         _pcre_ucp_gentype[];  extern const int         PRIV(ucp_gentype)[];
2112    #ifdef SUPPORT_JIT
2113    extern const int         PRIV(ucp_typerange)[];
2114    #endif
2115    
2116  /* UCD access macros */  /* UCD access macros */
2117    
2118  #define UCD_BLOCK_SIZE 128  #define UCD_BLOCK_SIZE 128
2119  #define GET_UCD(ch) (_pcre_ucd_records + \  #define GET_UCD(ch) (PRIV(ucd_records) + \
2120          _pcre_ucd_stage2[_pcre_ucd_stage1[(ch) / UCD_BLOCK_SIZE] * \          PRIV(ucd_stage2)[PRIV(ucd_stage1)[(ch) / UCD_BLOCK_SIZE] * \
2121          UCD_BLOCK_SIZE + ch % UCD_BLOCK_SIZE])          UCD_BLOCK_SIZE + (ch) % UCD_BLOCK_SIZE])
2122    
2123  #define UCD_CHARTYPE(ch)  GET_UCD(ch)->chartype  #define UCD_CHARTYPE(ch)  GET_UCD(ch)->chartype
2124  #define UCD_SCRIPT(ch)    GET_UCD(ch)->script  #define UCD_SCRIPT(ch)    GET_UCD(ch)->script
2125  #define UCD_CATEGORY(ch)  _pcre_ucp_gentype[UCD_CHARTYPE(ch)]  #define UCD_CATEGORY(ch)  PRIV(ucp_gentype)[UCD_CHARTYPE(ch)]
2126  #define UCD_OTHERCASE(ch) (ch + GET_UCD(ch)->other_case)  #define UCD_OTHERCASE(ch) (ch + GET_UCD(ch)->other_case)
2127    
2128  #endif  #endif

Legend:
Removed from v.393  
changed lines
  Added in v.769

webmaster@exim.org
ViewVC Help
Powered by ViewVC 1.1.12