/[pcre]/code/trunk/pcre_internal.h
ViewVC logotype

Diff of /code/trunk/pcre_internal.h

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

revision 758 by ph10, Mon Nov 21 12:05:36 2011 UTC revision 964 by ph10, Fri May 4 13:03:39 2012 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-2011 University of Cambridge             Copyright (c) 1997-2012 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
# Line 51  functions whose names all begin with "_p Line 52  functions whose names all begin with "_p
52  #define PCRE_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  script prevents both being selected, but not everybody uses "configure". */  #ifndef COMPILE_PCRE16
57    #define COMPILE_PCRE8
 #if defined EBCDIC && defined SUPPORT_UTF8  
 #error The use of both EBCDIC and SUPPORT_UTF8 is not supported.  
58  #endif  #endif
59    
60  /* If SUPPORT_UCP is defined, SUPPORT_UTF8 must also be defined. The  /* If SUPPORT_UCP is defined, SUPPORT_UTF must also be defined. The
61  "configure" script ensures this, but not everybody uses "configure". */  "configure" script ensures this, but not everybody uses "configure". */
62    
63  #if defined SUPPORT_UCP && !defined SUPPORT_UTF8  #if defined SUPPORT_UCP && !(defined SUPPORT_UTF)
64    #define SUPPORT_UTF 1
65    #endif
66    
67    /* We define SUPPORT_UTF if SUPPORT_UTF8 is enabled for compatibility
68    reasons with existing code. */
69    
70    #if defined SUPPORT_UTF8 && !(defined SUPPORT_UTF)
71    #define SUPPORT_UTF 1
72    #endif
73    
74    /* Fixme: SUPPORT_UTF8 should be eventually disappear from the code.
75    Until then we define it if SUPPORT_UTF is defined. */
76    
77    #if defined SUPPORT_UTF && !(defined SUPPORT_UTF8)
78  #define SUPPORT_UTF8 1  #define SUPPORT_UTF8 1
79  #endif  #endif
80    
81    /* We do not support both EBCDIC and UTF-8/16 at the same time. The "configure"
82    script prevents both being selected, but not everybody uses "configure". */
83    
84    #if defined EBCDIC && defined SUPPORT_UTF
85    #error The use of both EBCDIC and SUPPORT_UTF8/16 is not supported.
86    #endif
87    
88  /* Use a macro for debugging printing, 'cause that eliminates the use of #ifdef  /* Use a macro for debugging printing, 'cause that eliminates the use of #ifdef
89  inline, and there are *still* stupid compilers about that don't like indented  inline, and there are *still* stupid compilers about that don't like indented
90  pre-processor statements, or at least there were when I first wrote this. After  pre-processor statements, or at least there were when I first wrote this. After
# Line 158  set, we ensure here that it has no effec Line 178  set, we ensure here that it has no effec
178  #define PCRE_CALL_CONVENTION  #define PCRE_CALL_CONVENTION
179  #endif  #endif
180    
181  /* 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
182  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
183  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
184  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
185  preprocessor time in standard C environments. */  preprocessor time in standard C environments. */
186    
187    typedef unsigned char pcre_uint8;
188    
189  #if USHRT_MAX == 65535  #if USHRT_MAX == 65535
190    typedef unsigned short pcre_uint16;    typedef unsigned short pcre_uint16;
191    typedef short pcre_int16;    typedef short pcre_int16;
# Line 206  by "configure". */ Line 228  by "configure". */
228    
229  /* All character handling must be done as unsigned characters. Otherwise there  /* All character handling must be done as unsigned characters. Otherwise there
230  are problems with top-bit-set characters and functions such as isspace().  are problems with top-bit-set characters and functions such as isspace().
231  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 *,
232  should make things easier for callers. We define a short type for unsigned char  because that should make things easier for callers. This character type is
233  to save lots of typing. I tried "uchar", but it causes problems on Digital  called pcre_uchar.
234  Unix, where it is defined in sys/types, so use "uschar" instead. */  
235    The IN_UCHARS macro multiply its argument with the byte size of the current
236    pcre_uchar type. Useful for memcpy and such operations, whose require the
237    byte size of their input/output buffers.
238    
239    The MAX_255 macro checks whether its pcre_uchar input is less than 256.
240    
241    The TABLE_GET macro is designed for accessing elements of tables whose contain
242    exactly 256 items. When the character is able to contain more than 256
243    items, some check is needed before accessing these tables.
244    */
245    
246    #ifdef COMPILE_PCRE8
247    
248    typedef unsigned char pcre_uchar;
249    #define IN_UCHARS(x) (x)
250    #define MAX_255(c) 1
251    #define TABLE_GET(c, table, default) ((table)[c])
252    
253    #else
254    
255    #ifdef COMPILE_PCRE16
256    #if USHRT_MAX != 65535
257    /* This is a warning message. Change PCRE_UCHAR16 to a 16 bit data type in
258    pcre.h(.in) and disable (comment out) this message. */
259    #error Warning: PCRE_UCHAR16 is not a 16 bit data type.
260    #endif
261    
262  typedef unsigned char uschar;  typedef pcre_uint16 pcre_uchar;
263    #define IN_UCHARS(x) ((x) << 1)
264    #define MAX_255(c) ((c) <= 255u)
265    #define TABLE_GET(c, table, default) (MAX_255(c)? ((table)[c]):(default))
266    
267    #else
268    #error Unsupported compiling mode
269    #endif /* COMPILE_PCRE16 */
270    
271    #endif /* COMPILE_PCRE8 */
272    
273  /* 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
274  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 234  start/end of string field names are. */ Line 291  start/end of string field names are. */
291  #define IS_NEWLINE(p) \  #define IS_NEWLINE(p) \
292    ((NLBLOCK->nltype != NLTYPE_FIXED)? \    ((NLBLOCK->nltype != NLTYPE_FIXED)? \
293      ((p) < NLBLOCK->PSEND && \      ((p) < NLBLOCK->PSEND && \
294       _pcre_is_newline((p), NLBLOCK->nltype, NLBLOCK->PSEND, &(NLBLOCK->nllen),\       PRIV(is_newline)((p), NLBLOCK->nltype, NLBLOCK->PSEND, \
295         utf8)) \         &(NLBLOCK->nllen), utf)) \
296      : \      : \
297      ((p) <= NLBLOCK->PSEND - NLBLOCK->nllen && \      ((p) <= NLBLOCK->PSEND - NLBLOCK->nllen && \
298       (p)[0] == NLBLOCK->nl[0] && \       (p)[0] == NLBLOCK->nl[0] && \
# Line 248  start/end of string field names are. */ Line 305  start/end of string field names are. */
305  #define WAS_NEWLINE(p) \  #define WAS_NEWLINE(p) \
306    ((NLBLOCK->nltype != NLTYPE_FIXED)? \    ((NLBLOCK->nltype != NLTYPE_FIXED)? \
307      ((p) > NLBLOCK->PSSTART && \      ((p) > NLBLOCK->PSSTART && \
308       _pcre_was_newline((p), NLBLOCK->nltype, NLBLOCK->PSSTART, \       PRIV(was_newline)((p), NLBLOCK->nltype, NLBLOCK->PSSTART, \
309         &(NLBLOCK->nllen), utf8)) \         &(NLBLOCK->nllen), utf)) \
310      : \      : \
311      ((p) >= NLBLOCK->PSSTART + NLBLOCK->nllen && \      ((p) >= NLBLOCK->PSSTART + NLBLOCK->nllen && \
312       (p)[-NLBLOCK->nllen] == NLBLOCK->nl[0] && \       (p)[-NLBLOCK->nllen] == NLBLOCK->nl[0] && \
# Line 267  used for the external interface and appe Line 324  used for the external interface and appe
324  must begin with PCRE_. */  must begin with PCRE_. */
325    
326  #ifdef CUSTOM_SUBJECT_PTR  #ifdef CUSTOM_SUBJECT_PTR
327  #define PCRE_SPTR CUSTOM_SUBJECT_PTR  #define PCRE_PUCHAR CUSTOM_SUBJECT_PTR
 #define USPTR CUSTOM_SUBJECT_PTR  
328  #else  #else
329  #define PCRE_SPTR const char *  #define PCRE_PUCHAR const pcre_uchar *
 #define USPTR const unsigned char *  
330  #endif  #endif
331    
   
   
332  /* Include the public PCRE header and the definitions of UCP character property  /* Include the public PCRE header and the definitions of UCP character property
333  values. */  values. */
334    
# Line 343  The macros are controlled by the value o Line 396  The macros are controlled by the value o
396  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
397  is automated on Unix systems via the "configure" command. */  is automated on Unix systems via the "configure" command. */
398    
399    #ifdef COMPILE_PCRE8
400    
401  #if LINK_SIZE == 2  #if LINK_SIZE == 2
402    
403  #define PUT(a,n,d)   \  #define PUT(a,n,d)   \
# Line 379  is automated on Unix systems via the "co Line 434  is automated on Unix systems via the "co
434  #define GET(a,n) \  #define GET(a,n) \
435    (((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])
436    
437  #define MAX_PATTERN_SIZE (1 << 30)   /* Keep it positive */  /* Keep it positive */
438    #define MAX_PATTERN_SIZE (1 << 30)
439    
440    #else
441    #error LINK_SIZE must be either 2, 3, or 4
442    #endif
443    
444    #else /* COMPILE_PCRE8 */
445    
446    #ifdef COMPILE_PCRE16
447    
448    #if LINK_SIZE == 2
449    
450    #undef LINK_SIZE
451    #define LINK_SIZE 1
452    
453    #define PUT(a,n,d)   \
454      (a[n] = (d))
455    
456    #define GET(a,n) \
457      (a[n])
458    
459    #define MAX_PATTERN_SIZE (1 << 16)
460    
461    #elif LINK_SIZE == 3 || LINK_SIZE == 4
462    
463    #undef LINK_SIZE
464    #define LINK_SIZE 2
465    
466    #define PUT(a,n,d)   \
467      (a[n] = (d) >> 16), \
468      (a[(n)+1] = (d) & 65535)
469    
470    #define GET(a,n) \
471      (((a)[n] << 16) | (a)[(n)+1])
472    
473    /* Keep it positive */
474    #define MAX_PATTERN_SIZE (1 << 30)
475    
476  #else  #else
477  #error LINK_SIZE must be either 2, 3, or 4  #error LINK_SIZE must be either 2, 3, or 4
478  #endif  #endif
479    
480    #else
481    #error Unsupported compiling mode
482    #endif /* COMPILE_PCRE16 */
483    
484    #endif /* COMPILE_PCRE8 */
485    
486  /* Convenience macro defined in terms of the others */  /* Convenience macro defined in terms of the others */
487    
# Line 396  is automated on Unix systems via the "co Line 492  is automated on Unix systems via the "co
492  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
493  capturing parenthesis numbers in back references. */  capturing parenthesis numbers in back references. */
494    
495    #ifdef COMPILE_PCRE8
496    
497    #define IMM2_SIZE 2
498    
499  #define PUT2(a,n,d)   \  #define PUT2(a,n,d)   \
500    a[n] = (d) >> 8; \    a[n] = (d) >> 8; \
501    a[(n)+1] = (d) & 255    a[(n)+1] = (d) & 255
# Line 403  capturing parenthesis numbers in back re Line 503  capturing parenthesis numbers in back re
503  #define GET2(a,n) \  #define GET2(a,n) \
504    (((a)[n] << 8) | (a)[(n)+1])    (((a)[n] << 8) | (a)[(n)+1])
505    
506  #define PUT2INC(a,n,d)  PUT2(a,n,d), a += 2  #else /* COMPILE_PCRE8 */
507    
508    #ifdef COMPILE_PCRE16
509    
510    #define IMM2_SIZE 1
511    
512    #define PUT2(a,n,d)   \
513       a[n] = d
514    
515    #define GET2(a,n) \
516       a[n]
517    
518    #else
519    #error Unsupported compiling mode
520    #endif /* COMPILE_PCRE16 */
521    
522    #endif /* COMPILE_PCRE8 */
523    
524    #define PUT2INC(a,n,d)  PUT2(a,n,d), a += IMM2_SIZE
525    
526    /* The maximum length of a MARK name is currently one data unit; it may be
527    changed in future to be a fixed number of bytes or to depend on LINK_SIZE. */
528    
529    #define MAX_MARK ((1 << (sizeof(pcre_uchar)*8)) - 1)
530    
531    /* When UTF encoding is being used, a character is no longer just a single
532    character. The macros for character handling generate simple sequences when
533    used in character-mode, and more complicated ones for UTF characters.
534    GETCHARLENTEST and other macros are not used when UTF is not supported,
535    so they are not defined. To make sure they can never even appear when
536    UTF support is omitted, we don't even define them. */
537    
538  /* When UTF-8 encoding is being used, a character is no longer just a single  #ifndef SUPPORT_UTF
 byte. The macros for character handling generate simple sequences when used in  
 byte-mode, and more complicated ones for UTF-8 characters. GETCHARLENTEST is  
 not used when UTF-8 is not supported, so it is not defined, and BACKCHAR should  
 never be called in byte mode. To make sure they can never even appear when  
 UTF-8 support is omitted, we don't even define them. */  
539    
540  #ifndef SUPPORT_UTF8  /* #define MAX_VALUE_FOR_SINGLE_CHAR */
541    /* #define HAS_EXTRALEN(c) */
542    /* #define GET_EXTRALEN(c) */
543    /* #define NOT_FIRSTCHAR(c) */
544  #define GETCHAR(c, eptr) c = *eptr;  #define GETCHAR(c, eptr) c = *eptr;
545  #define GETCHARTEST(c, eptr) c = *eptr;  #define GETCHARTEST(c, eptr) c = *eptr;
546  #define GETCHARINC(c, eptr) c = *eptr++;  #define GETCHARINC(c, eptr) c = *eptr++;
# Line 421  UTF-8 support is omitted, we don't even Line 548  UTF-8 support is omitted, we don't even
548  #define GETCHARLEN(c, eptr, len) c = *eptr;  #define GETCHARLEN(c, eptr, len) c = *eptr;
549  /* #define GETCHARLENTEST(c, eptr, len) */  /* #define GETCHARLENTEST(c, eptr, len) */
550  /* #define BACKCHAR(eptr) */  /* #define BACKCHAR(eptr) */
551    /* #define FORWARDCHAR(eptr) */
552    /* #define ACROSSCHAR(condition, eptr, action) */
553    
554  #else   /* SUPPORT_UTF8 */  #else   /* SUPPORT_UTF */
555    
556    #ifdef COMPILE_PCRE8
557    
558  /* These macros were originally written in the form of loops that used data  /* These macros were originally written in the form of loops that used data
559  from the tables whose names start with _pcre_utf8_table. They were rewritten by  from the tables whose names start with PRIV(utf8_table). They were rewritten by
560  a user so as not to use loops, because in some environments this gives a  a user so as not to use loops, because in some environments this gives a
561  significant performance advantage, and it seems never to do any harm. */  significant performance advantage, and it seems never to do any harm. */
562    
563    /* Tells the biggest code point which can be encoded as a single character. */
564    
565    #define MAX_VALUE_FOR_SINGLE_CHAR 127
566    
567    /* Tests whether the code point needs extra characters to decode. */
568    
569    #define HAS_EXTRALEN(c) ((c) >= 0xc0)
570    
571    /* Returns with the additional number of characters if IS_MULTICHAR(c) is TRUE.
572    Otherwise it has an undefined behaviour. */
573    
574    #define GET_EXTRALEN(c) (PRIV(utf8_table4)[(c) & 0x3f])
575    
576    /* Returns TRUE, if the given character is not the first character
577    of a UTF sequence. */
578    
579    #define NOT_FIRSTCHAR(c) (((c) & 0xc0) == 0x80)
580    
581  /* Base macro to pick up the remaining bytes of a UTF-8 character, not  /* Base macro to pick up the remaining bytes of a UTF-8 character, not
582  advancing the pointer. */  advancing the pointer. */
583    
# Line 463  pointer. */ Line 612  pointer. */
612    
613  #define GETCHARTEST(c, eptr) \  #define GETCHARTEST(c, eptr) \
614    c = *eptr; \    c = *eptr; \
615    if (utf8 && c >= 0xc0) GETUTF8(c, eptr);    if (utf && c >= 0xc0) GETUTF8(c, eptr);
616    
617  /* Base macro to pick up the remaining bytes of a UTF-8 character, advancing  /* Base macro to pick up the remaining bytes of a UTF-8 character, advancing
618  the pointer. */  the pointer. */
# Line 511  This is called when we don't know if we Line 660  This is called when we don't know if we
660    
661  #define GETCHARINCTEST(c, eptr) \  #define GETCHARINCTEST(c, eptr) \
662    c = *eptr++; \    c = *eptr++; \
663    if (utf8 && c >= 0xc0) GETUTF8INC(c, eptr);    if (utf && c >= 0xc0) GETUTF8INC(c, eptr);
664    
665  /* Base macro to pick up the remaining bytes of a UTF-8 character, not  /* Base macro to pick up the remaining bytes of a UTF-8 character, not
666  advancing the pointer, incrementing the length. */  advancing the pointer, incrementing the length. */
# Line 563  do not know if we are in UTF-8 mode. */ Line 712  do not know if we are in UTF-8 mode. */
712    
713  #define GETCHARLENTEST(c, eptr, len) \  #define GETCHARLENTEST(c, eptr, len) \
714    c = *eptr; \    c = *eptr; \
715    if (utf8 && c >= 0xc0) GETUTF8LEN(c, eptr, len);    if (utf && c >= 0xc0) GETUTF8LEN(c, eptr, len);
716    
717  /* 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
718  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 571  because almost all calls are already wit Line 720  because almost all calls are already wit
720    
721  #define BACKCHAR(eptr) while((*eptr & 0xc0) == 0x80) eptr--  #define BACKCHAR(eptr) while((*eptr & 0xc0) == 0x80) eptr--
722    
723  #endif  /* SUPPORT_UTF8 */  /* Same as above, just in the other direction. */
724    #define FORWARDCHAR(eptr) while((*eptr & 0xc0) == 0x80) eptr++
725    
726    /* Same as above, but it allows a fully customizable form. */
727    #define ACROSSCHAR(condition, eptr, action) \
728      while((condition) && ((eptr) & 0xc0) == 0x80) action
729    
730    #else /* COMPILE_PCRE8 */
731    
732    #ifdef COMPILE_PCRE16
733    
734    /* Tells the biggest code point which can be encoded as a single character. */
735    
736    #define MAX_VALUE_FOR_SINGLE_CHAR 65535
737    
738    /* Tests whether the code point needs extra characters to decode. */
739    
740    #define HAS_EXTRALEN(c) (((c) & 0xfc00) == 0xd800)
741    
742    /* Returns with the additional number of characters if IS_MULTICHAR(c) is TRUE.
743    Otherwise it has an undefined behaviour. */
744    
745    #define GET_EXTRALEN(c) 1
746    
747    /* Returns TRUE, if the given character is not the first character
748    of a UTF sequence. */
749    
750    #define NOT_FIRSTCHAR(c) (((c) & 0xfc00) == 0xdc00)
751    
752    /* Base macro to pick up the low surrogate of a UTF-16 character, not
753    advancing the pointer. */
754    
755    #define GETUTF16(c, eptr) \
756       { c = (((c & 0x3ff) << 10) | (eptr[1] & 0x3ff)) + 0x10000; }
757    
758    /* Get the next UTF-16 character, not advancing the pointer. This is called when
759    we know we are in UTF-16 mode. */
760    
761    #define GETCHAR(c, eptr) \
762      c = *eptr; \
763      if ((c & 0xfc00) == 0xd800) GETUTF16(c, eptr);
764    
765    /* Get the next UTF-16 character, testing for UTF-16 mode, and not advancing the
766    pointer. */
767    
768    #define GETCHARTEST(c, eptr) \
769      c = *eptr; \
770      if (utf && (c & 0xfc00) == 0xd800) GETUTF16(c, eptr);
771    
772    /* Base macro to pick up the low surrogate of a UTF-16 character, advancing
773    the pointer. */
774    
775    #define GETUTF16INC(c, eptr) \
776       { c = (((c & 0x3ff) << 10) | (*eptr++ & 0x3ff)) + 0x10000; }
777    
778    /* Get the next UTF-16 character, advancing the pointer. This is called when we
779    know we are in UTF-16 mode. */
780    
781    #define GETCHARINC(c, eptr) \
782      c = *eptr++; \
783      if ((c & 0xfc00) == 0xd800) GETUTF16INC(c, eptr);
784    
785    /* Get the next character, testing for UTF-16 mode, and advancing the pointer.
786    This is called when we don't know if we are in UTF-16 mode. */
787    
788    #define GETCHARINCTEST(c, eptr) \
789      c = *eptr++; \
790      if (utf && (c & 0xfc00) == 0xd800) GETUTF16INC(c, eptr);
791    
792    /* Base macro to pick up the low surrogate of a UTF-16 character, not
793    advancing the pointer, incrementing the length. */
794    
795    #define GETUTF16LEN(c, eptr, len) \
796       { c = (((c & 0x3ff) << 10) | (eptr[1] & 0x3ff)) + 0x10000; len++; }
797    
798    /* Get the next UTF-16 character, not advancing the pointer, incrementing
799    length if there is a low surrogate. This is called when we know we are in
800    UTF-16 mode. */
801    
802    #define GETCHARLEN(c, eptr, len) \
803      c = *eptr; \
804      if ((c & 0xfc00) == 0xd800) GETUTF16LEN(c, eptr, len);
805    
806    /* Get the next UTF-816character, testing for UTF-16 mode, not advancing the
807    pointer, incrementing length if there is a low surrogate. This is called when
808    we do not know if we are in UTF-16 mode. */
809    
810    #define GETCHARLENTEST(c, eptr, len) \
811      c = *eptr; \
812      if (utf && (c & 0xfc00) == 0xd800) GETUTF16LEN(c, eptr, len);
813    
814    /* If the pointer is not at the start of a character, move it back until
815    it is. This is called only in UTF-16 mode - we don't put a test within the
816    macro because almost all calls are already within a block of UTF-16 only
817    code. */
818    
819    #define BACKCHAR(eptr) if ((*eptr & 0xfc00) == 0xdc00) eptr--
820    
821    /* Same as above, just in the other direction. */
822    #define FORWARDCHAR(eptr) if ((*eptr & 0xfc00) == 0xdc00) eptr++
823    
824    /* Same as above, but it allows a fully customizable form. */
825    #define ACROSSCHAR(condition, eptr, action) \
826      if ((condition) && ((eptr) & 0xfc00) == 0xdc00) action
827    
828    #endif
829    
830    #endif /* COMPILE_PCRE8 */
831    
832    #endif  /* SUPPORT_UTF */
833    
834    
835  /* 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 588  are in a 16-bit flags word. From release Line 846  are in a 16-bit flags word. From release
846  the restrictions on partial matching have been lifted. It remains for backwards  the restrictions on partial matching have been lifted. It remains for backwards
847  compatibility. */  compatibility. */
848    
849  #define PCRE_NOPARTIAL     0x0001  /* can't use partial with this regex */  #ifdef COMPILE_PCRE8
850  #define PCRE_FIRSTSET      0x0002  /* first_byte is set */  #define PCRE_MODE          0x0001  /* compiled in 8 bit mode */
851  #define PCRE_REQCHSET      0x0004  /* req_byte is set */  #endif
852  #define PCRE_STARTLINE     0x0008  /* start after \n for multiline */  #ifdef COMPILE_PCRE16
853  #define PCRE_JCHANGED      0x0010  /* j option used in regex */  #define PCRE_MODE          0x0002  /* compiled in 16 bit mode */
854  #define PCRE_HASCRORLF     0x0020  /* explicit \r or \n in pattern */  #endif
855  #define PCRE_HASTHEN       0x0040  /* pattern contains (*THEN) */  #define PCRE_FIRSTSET      0x0010  /* first_char is set */
856    #define PCRE_FCH_CASELESS  0x0020  /* caseless first char */
857    #define PCRE_REQCHSET      0x0040  /* req_byte is set */
858    #define PCRE_RCH_CASELESS  0x0080  /* caseless requested char */
859    #define PCRE_STARTLINE     0x0100  /* start after \n for multiline */
860    #define PCRE_NOPARTIAL     0x0200  /* can't use partial with this regex */
861    #define PCRE_JCHANGED      0x0400  /* j option used in regex */
862    #define PCRE_HASCRORLF     0x0800  /* explicit \r or \n in pattern */
863    #define PCRE_HASTHEN       0x1000  /* pattern contains (*THEN) */
864    
865  /* Flags for the "extra" block produced by pcre_study(). */  /* Flags for the "extra" block produced by pcre_study(). */
866    
# Line 626  time, run time, or study time, respectiv Line 892  time, run time, or study time, respectiv
892     PCRE_NO_START_OPTIMIZE)     PCRE_NO_START_OPTIMIZE)
893    
894  #define PUBLIC_STUDY_OPTIONS \  #define PUBLIC_STUDY_OPTIONS \
895     PCRE_STUDY_JIT_COMPILE     (PCRE_STUDY_JIT_COMPILE|PCRE_STUDY_JIT_PARTIAL_SOFT_COMPILE| \
896        PCRE_STUDY_JIT_PARTIAL_HARD_COMPILE)
897    
898  /* Magic number to provide a small check against being handed junk. Also used  /* Magic number to provide a small check against being handed junk. */
 to detect whether a pattern was compiled on a host of different endianness. */  
899    
900  #define MAGIC_NUMBER  0x50435245UL   /* 'PCRE' */  #define MAGIC_NUMBER  0x50435245UL   /* 'PCRE' */
901    
902    /* This variable is used to detect a loaded regular expression
903    in different endianness. */
904    
905    #define REVERSED_MAGIC_NUMBER  0x45524350UL   /* 'ERCP' */
906    
907  /* Negative values for the firstchar and reqchar variables */  /* Negative values for the firstchar and reqchar variables */
908    
909  #define REQ_UNSET (-2)  #define REQ_UNSET (-2)
# Line 643  req_byte match. */ Line 914  req_byte match. */
914    
915  #define REQ_BYTE_MAX 1000  #define REQ_BYTE_MAX 1000
916    
 /* Flags added to firstbyte or reqbyte; a "non-literal" item is either a  
 variable-length repeat, or a anything other than literal characters. */  
   
 #define REQ_CASELESS 0x0100    /* indicates caselessness */  
 #define REQ_VARY     0x0200    /* reqbyte followed non-literal item */  
   
917  /* Miscellaneous definitions. The #ifndef is to pacify compiler warnings in  /* Miscellaneous definitions. The #ifndef is to pacify compiler warnings in
918  environments where these macros are defined elsewhere. Unfortunately, there  environments where these macros are defined elsewhere. Unfortunately, there
919  is no way to do the same for the typedef. */  is no way to do the same for the typedef. */
# Line 677  for) in a minority area (EBCDIC platform Line 942  for) in a minority area (EBCDIC platform
942  application that did need both could compile two versions of the library, using  application that did need both could compile two versions of the library, using
943  macros to give the functions distinct names. */  macros to give the functions distinct names. */
944    
945  #ifndef SUPPORT_UTF8  #ifndef SUPPORT_UTF
946    
947  /* UTF-8 support is not enabled; use the platform-dependent character literals  /* UTF-8 support is not enabled; use the platform-dependent character literals
948  so that PCRE works on both ASCII and EBCDIC platforms, in non-UTF-mode only. */  so that PCRE works on both ASCII and EBCDIC platforms, in non-UTF-mode only. */
# Line 937  so that PCRE works on both ASCII and EBC Line 1202  so that PCRE works on both ASCII and EBC
1202  #define STRING_ANYCRLF_RIGHTPAR        "ANYCRLF)"  #define STRING_ANYCRLF_RIGHTPAR        "ANYCRLF)"
1203  #define STRING_BSR_ANYCRLF_RIGHTPAR    "BSR_ANYCRLF)"  #define STRING_BSR_ANYCRLF_RIGHTPAR    "BSR_ANYCRLF)"
1204  #define STRING_BSR_UNICODE_RIGHTPAR    "BSR_UNICODE)"  #define STRING_BSR_UNICODE_RIGHTPAR    "BSR_UNICODE)"
1205  #define STRING_UTF8_RIGHTPAR           "UTF8)"  #ifdef COMPILE_PCRE8
1206    #define STRING_UTF_RIGHTPAR            "UTF8)"
1207    #endif
1208    #ifdef COMPILE_PCRE16
1209    #define STRING_UTF_RIGHTPAR            "UTF16)"
1210    #endif
1211  #define STRING_UCP_RIGHTPAR            "UCP)"  #define STRING_UCP_RIGHTPAR            "UCP)"
1212  #define STRING_NO_START_OPT_RIGHTPAR   "NO_START_OPT)"  #define STRING_NO_START_OPT_RIGHTPAR   "NO_START_OPT)"
1213    
1214  #else  /* SUPPORT_UTF8 */  #else  /* SUPPORT_UTF */
1215    
1216  /* UTF-8 support is enabled; always use UTF-8 (=ASCII) character codes. This  /* UTF-8 support is enabled; always use UTF-8 (=ASCII) character codes. This
1217  works in both modes non-EBCDIC platforms, and on EBCDIC platforms in UTF-8 mode  works in both modes non-EBCDIC platforms, and on EBCDIC platforms in UTF-8 mode
# Line 1192  only. */ Line 1462  only. */
1462  #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
1463  #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
1464  #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
1465  #define STRING_UTF8_RIGHTPAR           STR_U STR_T STR_F STR_8 STR_RIGHT_PARENTHESIS  #ifdef COMPILE_PCRE8
1466    #define STRING_UTF_RIGHTPAR            STR_U STR_T STR_F STR_8 STR_RIGHT_PARENTHESIS
1467    #endif
1468    #ifdef COMPILE_PCRE16
1469    #define STRING_UTF_RIGHTPAR            STR_U STR_T STR_F STR_1 STR_6 STR_RIGHT_PARENTHESIS
1470    #endif
1471  #define STRING_UCP_RIGHTPAR            STR_U STR_C STR_P STR_RIGHT_PARENTHESIS  #define STRING_UCP_RIGHTPAR            STR_U STR_C STR_P STR_RIGHT_PARENTHESIS
1472  #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  #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
1473    
1474  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF */
1475    
1476  /* Escape items that are just an encoding of a particular data value. */  /* Escape items that are just an encoding of a particular data value. */
1477    
# Line 1236  only. */ Line 1511  only. */
1511  #define PT_WORD       8    /* Word - L plus N plus underscore */  #define PT_WORD       8    /* Word - L plus N plus underscore */
1512    
1513  /* 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
1514  contain UTF-8 characters with values greater than 255. */  contain characters with values greater than 255. */
1515    
1516  #define XCL_NOT    0x01    /* Flag: this is a negative class */  #define XCL_NOT    0x01    /* Flag: this is a negative class */
1517  #define XCL_MAP    0x02    /* Flag: a 32-byte map is present */  #define XCL_MAP    0x02    /* Flag: a 32-byte map is present */
# Line 1252  value such as \n. They must have non-zer Line 1527  value such as \n. They must have non-zer
1527  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
1528  definitions below, up to ESC_z. There's a dummy for OP_ALLANY because it  definitions below, up to ESC_z. There's a dummy for OP_ALLANY because it
1529  corresponds to "." in DOTALL mode rather than an escape sequence. It is also  corresponds to "." in DOTALL mode rather than an escape sequence. It is also
1530  used for [^] in JavaScript compatibility mode, and for \C in non-utf8 mode. In  used for [^] in JavaScript compatibility mode, and for \C in non-utf mode. In
1531  non-DOTALL mode, "." behaves like \N.  non-DOTALL mode, "." behaves like \N.
1532    
1533  The special values ESC_DU, ESC_du, etc. are used instead of ESC_D, ESC_d, etc.  The special values ESC_DU, ESC_du, etc. are used instead of ESC_D, ESC_d, etc.
# Line 1433  enum { Line 1708  enum {
1708    OP_CLASS,          /* 106 Match a character class, chars < 256 only */    OP_CLASS,          /* 106 Match a character class, chars < 256 only */
1709    OP_NCLASS,         /* 107 Same, but the bitmap was created from a negative    OP_NCLASS,         /* 107 Same, but the bitmap was created from a negative
1710                                class - the difference is relevant only when a                                class - the difference is relevant only when a
1711                                UTF-8 character > 255 is encountered. */                                character > 255 is encountered. */
1712    OP_XCLASS,         /* 108 Extended class for handling UTF-8 chars within the    OP_XCLASS,         /* 108 Extended class for handling > 255 chars within the
1713                                class. This does both positive and negative. */                                class. This does both positive and negative. */
1714    OP_REF,            /* 109 Match a back reference, casefully */    OP_REF,            /* 109 Match a back reference, casefully */
1715    OP_REFI,           /* 110 Match a back reference, caselessly */    OP_REFI,           /* 110 Match a back reference, caselessly */
# Line 1591  in UTF-8 mode. The code that uses this t Line 1866  in UTF-8 mode. The code that uses this t
1866    2,                             /* noti                                   */ \    2,                             /* noti                                   */ \
1867    /* Positive single-char repeats                             ** These are */ \    /* Positive single-char repeats                             ** These are */ \
1868    2, 2, 2, 2, 2, 2,              /* *, *?, +, +?, ?, ??       ** minima in */ \    2, 2, 2, 2, 2, 2,              /* *, *?, +, +?, ?, ??       ** minima in */ \
1869    4, 4, 4,                       /* upto, minupto, exact      ** mode      */ \    2+IMM2_SIZE, 2+IMM2_SIZE,      /* upto, minupto             ** mode      */ \
1870    2, 2, 2, 4,                    /* *+, ++, ?+, upto+                      */ \    2+IMM2_SIZE,                   /* exact                                  */ \
1871      2, 2, 2, 2+IMM2_SIZE,          /* *+, ++, ?+, upto+                      */ \
1872    2, 2, 2, 2, 2, 2,              /* *I, *?I, +I, +?I, ?I, ??I ** UTF-8     */ \    2, 2, 2, 2, 2, 2,              /* *I, *?I, +I, +?I, ?I, ??I ** UTF-8     */ \
1873    4, 4, 4,                       /* upto I, minupto I, exact I             */ \    2+IMM2_SIZE, 2+IMM2_SIZE,      /* upto I, minupto I                      */ \
1874    2, 2, 2, 4,                    /* *+I, ++I, ?+I, upto+I                  */ \    2+IMM2_SIZE,                   /* exact I                                */ \
1875      2, 2, 2, 2+IMM2_SIZE,          /* *+I, ++I, ?+I, upto+I                  */ \
1876    /* Negative single-char repeats - only for chars < 256                   */ \    /* Negative single-char repeats - only for chars < 256                   */ \
1877    2, 2, 2, 2, 2, 2,              /* NOT *, *?, +, +?, ?, ??                */ \    2, 2, 2, 2, 2, 2,              /* NOT *, *?, +, +?, ?, ??                */ \
1878    4, 4, 4,                       /* NOT upto, minupto, exact               */ \    2+IMM2_SIZE, 2+IMM2_SIZE,      /* NOT upto, minupto                      */ \
1879    2, 2, 2, 4,                    /* Possessive NOT *, +, ?, upto           */ \    2+IMM2_SIZE,                   /* NOT exact                              */ \
1880      2, 2, 2, 2+IMM2_SIZE,          /* Possessive NOT *, +, ?, upto           */ \
1881    2, 2, 2, 2, 2, 2,              /* NOT *I, *?I, +I, +?I, ?I, ??I          */ \    2, 2, 2, 2, 2, 2,              /* NOT *I, *?I, +I, +?I, ?I, ??I          */ \
1882    4, 4, 4,                       /* NOT upto I, minupto I, exact I         */ \    2+IMM2_SIZE, 2+IMM2_SIZE,      /* NOT upto I, minupto I                  */ \
1883    2, 2, 2, 4,                    /* Possessive NOT *I, +I, ?I, upto I      */ \    2+IMM2_SIZE,                   /* NOT exact I                            */ \
1884      2, 2, 2, 2+IMM2_SIZE,          /* Possessive NOT *I, +I, ?I, upto I      */ \
1885    /* Positive type repeats                                                 */ \    /* Positive type repeats                                                 */ \
1886    2, 2, 2, 2, 2, 2,              /* Type *, *?, +, +?, ?, ??               */ \    2, 2, 2, 2, 2, 2,              /* Type *, *?, +, +?, ?, ??               */ \
1887    4, 4, 4,                       /* Type upto, minupto, exact              */ \    2+IMM2_SIZE, 2+IMM2_SIZE,      /* Type upto, minupto                     */ \
1888    2, 2, 2, 4,                    /* Possessive *+, ++, ?+, upto+           */ \    2+IMM2_SIZE,                   /* Type exact                             */ \
1889      2, 2, 2, 2+IMM2_SIZE,          /* Possessive *+, ++, ?+, upto+           */ \
1890    /* Character class & ref repeats                                         */ \    /* Character class & ref repeats                                         */ \
1891    1, 1, 1, 1, 1, 1,              /* *, *?, +, +?, ?, ??                    */ \    1, 1, 1, 1, 1, 1,              /* *, *?, +, +?, ?, ??                    */ \
1892    5, 5,                          /* CRRANGE, CRMINRANGE                    */ \    1+2*IMM2_SIZE, 1+2*IMM2_SIZE,  /* CRRANGE, CRMINRANGE                    */ \
1893   33,                             /* CLASS                                  */ \    1+(32/sizeof(pcre_uchar)),     /* CLASS                                  */ \
1894   33,                             /* NCLASS                                 */ \    1+(32/sizeof(pcre_uchar)),     /* NCLASS                                 */ \
1895    0,                             /* XCLASS - variable length               */ \    0,                             /* XCLASS - variable length               */ \
1896    3,                             /* REF                                    */ \    1+IMM2_SIZE,                   /* REF                                    */ \
1897    3,                             /* REFI                                   */ \    1+IMM2_SIZE,                   /* REFI                                   */ \
1898    1+LINK_SIZE,                   /* RECURSE                                */ \    1+LINK_SIZE,                   /* RECURSE                                */ \
1899    2+2*LINK_SIZE,                 /* CALLOUT                                */ \    2+2*LINK_SIZE,                 /* CALLOUT                                */ \
1900    1+LINK_SIZE,                   /* Alt                                    */ \    1+LINK_SIZE,                   /* Alt                                    */ \
# Line 1631  in UTF-8 mode. The code that uses this t Line 1911  in UTF-8 mode. The code that uses this t
1911    1+LINK_SIZE,                   /* ONCE_NC                                */ \    1+LINK_SIZE,                   /* ONCE_NC                                */ \
1912    1+LINK_SIZE,                   /* BRA                                    */ \    1+LINK_SIZE,                   /* BRA                                    */ \
1913    1+LINK_SIZE,                   /* BRAPOS                                 */ \    1+LINK_SIZE,                   /* BRAPOS                                 */ \
1914    3+LINK_SIZE,                   /* CBRA                                   */ \    1+LINK_SIZE+IMM2_SIZE,         /* CBRA                                   */ \
1915    3+LINK_SIZE,                   /* CBRAPOS                                */ \    1+LINK_SIZE+IMM2_SIZE,         /* CBRAPOS                                */ \
1916    1+LINK_SIZE,                   /* COND                                   */ \    1+LINK_SIZE,                   /* COND                                   */ \
1917    1+LINK_SIZE,                   /* SBRA                                   */ \    1+LINK_SIZE,                   /* SBRA                                   */ \
1918    1+LINK_SIZE,                   /* SBRAPOS                                */ \    1+LINK_SIZE,                   /* SBRAPOS                                */ \
1919    3+LINK_SIZE,                   /* SCBRA                                  */ \    1+LINK_SIZE+IMM2_SIZE,         /* SCBRA                                  */ \
1920    3+LINK_SIZE,                   /* SCBRAPOS                               */ \    1+LINK_SIZE+IMM2_SIZE,         /* SCBRAPOS                               */ \
1921    1+LINK_SIZE,                   /* SCOND                                  */ \    1+LINK_SIZE,                   /* SCOND                                  */ \
1922    3, 3,                          /* CREF, NCREF                            */ \    1+IMM2_SIZE, 1+IMM2_SIZE,      /* CREF, NCREF                            */ \
1923    3, 3,                          /* RREF, NRREF                            */ \    1+IMM2_SIZE, 1+IMM2_SIZE,      /* RREF, NRREF                            */ \
1924    1,                             /* DEF                                    */ \    1,                             /* DEF                                    */ \
1925    1, 1, 1,                       /* BRAZERO, BRAMINZERO, BRAPOSZERO        */ \    1, 1, 1,                       /* BRAZERO, BRAMINZERO, BRAPOSZERO        */ \
1926    3, 1, 3,                       /* MARK, PRUNE, PRUNE_ARG                 */ \    3, 1, 3,                       /* MARK, PRUNE, PRUNE_ARG                 */ \
1927    1, 3,                          /* SKIP, SKIP_ARG                         */ \    1, 3,                          /* SKIP, SKIP_ARG                         */ \
1928    1, 3,                          /* THEN, THEN_ARG                         */ \    1, 3,                          /* THEN, THEN_ARG                         */ \
1929    1, 1, 1, 1,                    /* COMMIT, FAIL, ACCEPT, ASSERT_ACCEPT    */ \    1, 1, 1, 1,                    /* COMMIT, FAIL, ACCEPT, ASSERT_ACCEPT    */ \
1930    3, 1                           /* CLOSE, SKIPZERO  */    1+IMM2_SIZE, 1                 /* CLOSE, SKIPZERO                        */
1931    
1932  /* A magic value for OP_RREF and OP_NRREF to indicate the "any recursion"  /* A magic value for OP_RREF and OP_NRREF to indicate the "any recursion"
1933  condition. */  condition. */
# Line 1665  enum { ERR0,  ERR1,  ERR2,  ERR3,  ERR4, Line 1945  enum { ERR0,  ERR1,  ERR2,  ERR3,  ERR4,
1945         ERR40, ERR41, ERR42, ERR43, ERR44, ERR45, ERR46, ERR47, ERR48, ERR49,         ERR40, ERR41, ERR42, ERR43, ERR44, ERR45, ERR46, ERR47, ERR48, ERR49,
1946         ERR50, ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58, ERR59,         ERR50, ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58, ERR59,
1947         ERR60, ERR61, ERR62, ERR63, ERR64, ERR65, ERR66, ERR67, ERR68, ERR69,         ERR60, ERR61, ERR62, ERR63, ERR64, ERR65, ERR66, ERR67, ERR68, ERR69,
1948         ERR70, ERR71, ERRCOUNT };         ERR70, ERR71, ERR72, ERR73, ERR74, ERR75, ERRCOUNT };
1949    
1950    /* JIT compiling modes. The function list is indexed by them. */
1951    enum { JIT_COMPILE, JIT_PARTIAL_SOFT_COMPILE, JIT_PARTIAL_HARD_COMPILE,
1952           JIT_NUMBER_OF_COMPILE_MODES };
1953    
1954  /* 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
1955  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 1684  fields are present. Currently PCRE alway Line 1968  fields are present. Currently PCRE alway
1968  NOTE NOTE NOTE  NOTE NOTE NOTE
1969  */  */
1970    
1971  typedef struct real_pcre {  #ifdef COMPILE_PCRE8
1972    #define REAL_PCRE real_pcre
1973    #else
1974    #define REAL_PCRE real_pcre16
1975    #endif
1976    
1977    typedef struct REAL_PCRE {
1978    pcre_uint32 magic_number;    pcre_uint32 magic_number;
1979    pcre_uint32 size;               /* Total that was malloced */    pcre_uint32 size;               /* Total that was malloced */
1980    pcre_uint32 options;            /* Public options */    pcre_uint32 options;            /* Public options */
1981    pcre_uint16 flags;              /* Private flags */    pcre_uint16 flags;              /* Private flags */
1982    pcre_uint16 dummy1;             /* For future use */    pcre_uint16 max_lookbehind;     /* Longest lookbehind (characters) */
1983    pcre_uint16 top_bracket;    pcre_uint16 top_bracket;        /* Highest numbered group */
1984    pcre_uint16 top_backref;    pcre_uint16 top_backref;        /* Highest numbered back reference */
1985    pcre_uint16 first_byte;    pcre_uint16 first_char;         /* Starting character */
1986    pcre_uint16 req_byte;    pcre_uint16 req_char;           /* This character must be seen */
1987    pcre_uint16 name_table_offset;  /* Offset to name table that follows */    pcre_uint16 name_table_offset;  /* Offset to name table that follows */
1988    pcre_uint16 name_entry_size;    /* Size of any name items */    pcre_uint16 name_entry_size;    /* Size of any name items */
1989    pcre_uint16 name_count;         /* Number of name items */    pcre_uint16 name_count;         /* Number of name items */
1990    pcre_uint16 ref_count;          /* Reference count */    pcre_uint16 ref_count;          /* Reference count */
1991      const pcre_uint8 *tables;       /* Pointer to tables or NULL for std */
1992    const unsigned char *tables;    /* Pointer to tables or NULL for std */    const pcre_uint8 *nullpad;      /* NULL padding */
1993    const unsigned char *nullpad;   /* NULL padding */  } REAL_PCRE;
 } real_pcre;  
1994    
1995  /* 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
1996  remark (see NOTE above) about extending this structure applies. */  remark (see NOTE above) about extending this structure applies. */
# Line 1709  remark (see NOTE above) about extending Line 1998  remark (see NOTE above) about extending
1998  typedef struct pcre_study_data {  typedef struct pcre_study_data {
1999    pcre_uint32 size;               /* Total that was malloced */    pcre_uint32 size;               /* Total that was malloced */
2000    pcre_uint32 flags;              /* Private flags */    pcre_uint32 flags;              /* Private flags */
2001    uschar start_bits[32];          /* Starting char bits */    pcre_uint8 start_bits[32];      /* Starting char bits */
2002    pcre_uint32 minlength;          /* Minimum subject length */    pcre_uint32 minlength;          /* Minimum subject length */
2003  } pcre_study_data;  } pcre_study_data;
2004    
# Line 1728  typedef struct open_capitem { Line 2017  typedef struct open_capitem {
2017  doing the compiling, so that they are thread-safe. */  doing the compiling, so that they are thread-safe. */
2018    
2019  typedef struct compile_data {  typedef struct compile_data {
2020    const uschar *lcc;            /* Points to lower casing table */    const pcre_uint8 *lcc;            /* Points to lower casing table */
2021    const uschar *fcc;            /* Points to case-flipping table */    const pcre_uint8 *fcc;            /* Points to case-flipping table */
2022    const uschar *cbits;          /* Points to character type table */    const pcre_uint8 *cbits;          /* Points to character type table */
2023    const uschar *ctypes;         /* Points to table of type maps */    const pcre_uint8 *ctypes;         /* Points to table of type maps */
2024    const uschar *start_workspace;/* The start of working space */    const pcre_uchar *start_workspace;/* The start of working space */
2025    const uschar *start_code;     /* The start of the compiled code */    const pcre_uchar *start_code;     /* The start of the compiled code */
2026    const uschar *start_pattern;  /* The start of the pattern */    const pcre_uchar *start_pattern;  /* The start of the pattern */
2027    const uschar *end_pattern;    /* The end of the pattern */    const pcre_uchar *end_pattern;    /* The end of the pattern */
2028    open_capitem *open_caps;      /* Chain of open capture items */    open_capitem *open_caps;          /* Chain of open capture items */
2029    uschar *hwm;                  /* High watermark of workspace */    pcre_uchar *hwm;                  /* High watermark of workspace */
2030    uschar *name_table;           /* The name/number table */    pcre_uchar *name_table;           /* The name/number table */
2031    int  names_found;             /* Number of entries so far */    int  names_found;                 /* Number of entries so far */
2032    int  name_entry_size;         /* Size of each entry */    int  name_entry_size;             /* Size of each entry */
2033    int  bracount;                /* Count of capturing parens as we compile */    int  workspace_size;              /* Size of workspace */
2034    int  final_bracount;          /* Saved value after first pass */    int  bracount;                    /* Count of capturing parens as we compile */
2035    int  top_backref;             /* Maximum back reference */    int  final_bracount;              /* Saved value after first pass */
2036    unsigned int backref_map;     /* Bitmap of low back refs */    int  max_lookbehind;              /* Maximum lookbehind (characters) */
2037    int  assert_depth;            /* Depth of nested assertions */    int  top_backref;                 /* Maximum back reference */
2038    int  external_options;        /* External (initial) options */    unsigned int backref_map;         /* Bitmap of low back refs */
2039    int  external_flags;          /* External flag bits to be set */    int  assert_depth;                /* Depth of nested assertions */
2040    int  req_varyopt;             /* "After variable item" flag for reqbyte */    int  external_options;            /* External (initial) options */
2041    BOOL had_accept;              /* (*ACCEPT) encountered */    int  external_flags;              /* External flag bits to be set */
2042    BOOL check_lookbehind;        /* Lookbehinds need later checking */    int  req_varyopt;                 /* "After variable item" flag for reqbyte */
2043    int  nltype;                  /* Newline type */    BOOL had_accept;                  /* (*ACCEPT) encountered */
2044    int  nllen;                   /* Newline string length */    BOOL check_lookbehind;            /* Lookbehinds need later checking */
2045    uschar nl[4];                 /* Newline string when fixed length */    int  nltype;                      /* Newline type */
2046      int  nllen;                       /* Newline string length */
2047      pcre_uchar nl[4];                 /* Newline string when fixed length */
2048  } compile_data;  } compile_data;
2049    
2050  /* Structure for maintaining a chain of pointers to the currently incomplete  /* Structure for maintaining a chain of pointers to the currently incomplete
# Line 1761  branches, for testing for left recursion Line 2052  branches, for testing for left recursion
2052    
2053  typedef struct branch_chain {  typedef struct branch_chain {
2054    struct branch_chain *outer;    struct branch_chain *outer;
2055    uschar *current_branch;    pcre_uchar *current_branch;
2056  } branch_chain;  } branch_chain;
2057    
2058  /* Structure for items in a linked list that represents an explicit recursive  /* Structure for items in a linked list that represents an explicit recursive
# Line 1772  typedef struct recursion_info { Line 2063  typedef struct recursion_info {
2063    int group_num;                  /* Number of group that was called */    int group_num;                  /* Number of group that was called */
2064    int *offset_save;               /* Pointer to start of saved offsets */    int *offset_save;               /* Pointer to start of saved offsets */
2065    int saved_max;                  /* Number of saved offsets */    int saved_max;                  /* Number of saved offsets */
2066    USPTR subject_position;         /* Position at start of recursion */    PCRE_PUCHAR subject_position;   /* Position at start of recursion */
2067  } recursion_info;  } recursion_info;
2068    
2069  /* A similar structure for pcre_dfa_exec(). */  /* A similar structure for pcre_dfa_exec(). */
# Line 1780  typedef struct recursion_info { Line 2071  typedef struct recursion_info {
2071  typedef struct dfa_recursion_info {  typedef struct dfa_recursion_info {
2072    struct dfa_recursion_info *prevrec;    struct dfa_recursion_info *prevrec;
2073    int group_num;    int group_num;
2074    USPTR subject_position;    PCRE_PUCHAR subject_position;
2075  } dfa_recursion_info;  } dfa_recursion_info;
2076    
2077  /* 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
# Line 1790  pcre_exec(). */ Line 2081  pcre_exec(). */
2081    
2082  typedef struct eptrblock {  typedef struct eptrblock {
2083    struct eptrblock *epb_prev;    struct eptrblock *epb_prev;
2084    USPTR epb_saved_eptr;    PCRE_PUCHAR epb_saved_eptr;
2085  } eptrblock;  } eptrblock;
2086    
2087    
# Line 1801  typedef struct match_data { Line 2092  typedef struct match_data {
2092    unsigned long int match_call_count;      /* As it says */    unsigned long int match_call_count;      /* As it says */
2093    unsigned long int match_limit;           /* As it says */    unsigned long int match_limit;           /* As it says */
2094    unsigned long int match_limit_recursion; /* As it says */    unsigned long int match_limit_recursion; /* As it says */
2095    int   *offset_vector;         /* Offset vector */    int   *offset_vector;           /* Offset vector */
2096    int    offset_end;            /* One past the end */    int    offset_end;              /* One past the end */
2097    int    offset_max;            /* The maximum usable for return data */    int    offset_max;              /* The maximum usable for return data */
2098    int    nltype;                /* Newline type */    int    nltype;                  /* Newline type */
2099    int    nllen;                 /* Newline string length */    int    nllen;                   /* Newline string length */
2100    int    name_count;            /* Number of names in name table */    int    name_count;              /* Number of names in name table */
2101    int    name_entry_size;       /* Size of entry in names table */    int    name_entry_size;         /* Size of entry in names table */
2102    uschar *name_table;           /* Table of names */    pcre_uchar *name_table;         /* Table of names */
2103    uschar nl[4];                 /* Newline string when fixed */    pcre_uchar nl[4];               /* Newline string when fixed */
2104    const  uschar *lcc;           /* Points to lower casing table */    const  pcre_uint8 *lcc;         /* Points to lower casing table */
2105    const  uschar *ctypes;        /* Points to table of type maps */    const  pcre_uint8 *fcc;         /* Points to case-flipping table */
2106    BOOL   offset_overflow;       /* Set if too many extractions */    const  pcre_uint8 *ctypes;      /* Points to table of type maps */
2107    BOOL   notbol;                /* NOTBOL flag */    BOOL   offset_overflow;         /* Set if too many extractions */
2108    BOOL   noteol;                /* NOTEOL flag */    BOOL   notbol;                  /* NOTBOL flag */
2109    BOOL   utf8;                  /* UTF8 flag */    BOOL   noteol;                  /* NOTEOL flag */
2110    BOOL   jscript_compat;        /* JAVASCRIPT_COMPAT flag */    BOOL   utf;                     /* UTF-8 / UTF-16 flag */
2111    BOOL   use_ucp;               /* PCRE_UCP flag */    BOOL   jscript_compat;          /* JAVASCRIPT_COMPAT flag */
2112    BOOL   endonly;               /* Dollar not before final \n */    BOOL   use_ucp;                 /* PCRE_UCP flag */
2113    BOOL   notempty;              /* Empty string match not wanted */    BOOL   endonly;                 /* Dollar not before final \n */
2114    BOOL   notempty_atstart;      /* Empty string match at start not wanted */    BOOL   notempty;                /* Empty string match not wanted */
2115    BOOL   hitend;                /* Hit the end of the subject at some point */    BOOL   notempty_atstart;        /* Empty string match at start not wanted */
2116    BOOL   bsr_anycrlf;           /* \R is just any CRLF, not full Unicode */    BOOL   hitend;                  /* Hit the end of the subject at some point */
2117    BOOL   hasthen;               /* Pattern contains (*THEN) */    BOOL   bsr_anycrlf;             /* \R is just any CRLF, not full Unicode */
2118    const  uschar *start_code;    /* For use when recursing */    BOOL   hasthen;                 /* Pattern contains (*THEN) */
2119    USPTR  start_subject;         /* Start of the subject string */    BOOL   ignore_skip_arg;         /* For re-run when SKIP name not found */
2120    USPTR  end_subject;           /* End of the subject string */    const  pcre_uchar *start_code;  /* For use when recursing */
2121    USPTR  start_match_ptr;       /* Start of matched string */    PCRE_PUCHAR start_subject;      /* Start of the subject string */
2122    USPTR  end_match_ptr;         /* Subject position at end match */    PCRE_PUCHAR end_subject;        /* End of the subject string */
2123    USPTR  start_used_ptr;        /* Earliest consulted character */    PCRE_PUCHAR start_match_ptr;    /* Start of matched string */
2124    int    partial;               /* PARTIAL options */    PCRE_PUCHAR end_match_ptr;      /* Subject position at end match */
2125    int    end_offset_top;        /* Highwater mark at end of match */    PCRE_PUCHAR start_used_ptr;     /* Earliest consulted character */
2126    int    capture_last;          /* Most recent capture number */    int    partial;                 /* PARTIAL options */
2127    int    start_offset;          /* The start offset value */    int    end_offset_top;          /* Highwater mark at end of match */
2128    int    match_function_type;   /* Set for certain special calls of MATCH() */    int    capture_last;            /* Most recent capture number */
2129    eptrblock *eptrchain;         /* Chain of eptrblocks for tail recursions */    int    start_offset;            /* The start offset value */
2130    int    eptrn;                 /* Next free eptrblock */    int    match_function_type;     /* Set for certain special calls of MATCH() */
2131    recursion_info *recursive;    /* Linked list of recursion data */    eptrblock *eptrchain;           /* Chain of eptrblocks for tail recursions */
2132    void  *callout_data;          /* To pass back to callouts */    int    eptrn;                   /* Next free eptrblock */
2133    const  uschar *mark;          /* Mark pointer to pass back */    recursion_info *recursive;      /* Linked list of recursion data */
2134    const  uschar *once_target;   /* Where to back up to for atomic groups */    void  *callout_data;            /* To pass back to callouts */
2135      const  pcre_uchar *mark;        /* Mark pointer to pass back on success */
2136      const  pcre_uchar *nomatch_mark;/* Mark pointer to pass back on failure */
2137      const  pcre_uchar *once_target; /* Where to back up to for atomic groups */
2138    #ifdef NO_RECURSE
2139      void  *match_frames_base;       /* For remembering malloc'd frames */
2140    #endif
2141  } match_data;  } match_data;
2142    
2143  /* 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
2144  functions. */  functions. */
2145    
2146  typedef struct dfa_match_data {  typedef struct dfa_match_data {
2147    const uschar *start_code;      /* Start of the compiled pattern */    const pcre_uchar *start_code;     /* Start of the compiled pattern */
2148    const uschar *start_subject;   /* Start of the subject string */    const pcre_uchar *start_subject ; /* Start of the subject string */
2149    const uschar *end_subject;     /* End of subject string */    const pcre_uchar *end_subject;    /* End of subject string */
2150    const uschar *start_used_ptr;  /* Earliest consulted character */    const pcre_uchar *start_used_ptr; /* Earliest consulted character */
2151    const uschar *tables;          /* Character tables */    const pcre_uint8 *tables;         /* Character tables */
2152    int   start_offset;            /* The start offset value */    int   start_offset;               /* The start offset value */
2153    int   moptions;                /* Match options */    int   moptions;                   /* Match options */
2154    int   poptions;                /* Pattern options */    int   poptions;                   /* Pattern options */
2155    int    nltype;                 /* Newline type */    int   nltype;                     /* Newline type */
2156    int    nllen;                  /* Newline string length */    int   nllen;                      /* Newline string length */
2157    uschar nl[4];                  /* Newline string when fixed */    pcre_uchar nl[4];                 /* Newline string when fixed */
2158    void  *callout_data;           /* To pass back to callouts */    void *callout_data;               /* To pass back to callouts */
2159    dfa_recursion_info *recursive; /* Linked list of recursion data */    dfa_recursion_info *recursive;    /* Linked list of recursion data */
2160  } dfa_match_data;  } dfa_match_data;
2161    
2162  /* Bit definitions for entries in the pcre_ctypes table. */  /* Bit definitions for entries in the pcre_ctypes table. */
# Line 1895  total length. */ Line 2192  total length. */
2192  #define ctypes_offset (cbits_offset + cbit_length)  #define ctypes_offset (cbits_offset + cbit_length)
2193  #define tables_length (ctypes_offset + 256)  #define tables_length (ctypes_offset + 256)
2194    
2195    /* Internal function and data prefixes. */
2196    
2197    #ifdef COMPILE_PCRE8
2198    #ifndef PUBL
2199    #define PUBL(name) pcre_##name
2200    #endif
2201    #ifndef PRIV
2202    #define PRIV(name) _pcre_##name
2203    #endif
2204    #else /* COMPILE_PCRE8 */
2205    #ifdef COMPILE_PCRE16
2206    #ifndef PUBL
2207    #define PUBL(name) pcre16_##name
2208    #endif
2209    #ifndef PRIV
2210    #define PRIV(name) _pcre16_##name
2211    #endif
2212    #else
2213    #error Unsupported compiling mode
2214    #endif /* COMPILE_PCRE16 */
2215    #endif /* COMPILE_PCRE8 */
2216    
2217  /* 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
2218  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
2219  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 1912  of the exported public functions. They h Line 2231  of the exported public functions. They h
2231  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
2232  pcre_tables.c module. */  pcre_tables.c module. */
2233    
2234  extern const int    _pcre_utf8_table1[];  #ifdef COMPILE_PCRE8
 extern const int    _pcre_utf8_table2[];  
 extern const int    _pcre_utf8_table3[];  
 extern const uschar _pcre_utf8_table4[];  
2235    
2236  #ifdef SUPPORT_JIT  extern const int            PRIV(utf8_table1)[];
2237  extern const uschar _pcre_utf8_char_sizes[];  extern const int            PRIV(utf8_table1_size);
2238  #endif  extern const int            PRIV(utf8_table2)[];
2239    extern const int            PRIV(utf8_table3)[];
2240    extern const pcre_uint8     PRIV(utf8_table4)[];
2241    
2242  extern const int    _pcre_utf8_table1_size;  #endif /* COMPILE_PCRE8 */
2243    
2244  extern const char   _pcre_utt_names[];  extern const char           PRIV(utt_names)[];
2245  extern const ucp_type_table _pcre_utt[];  extern const ucp_type_table PRIV(utt)[];
2246  extern const int _pcre_utt_size;  extern const int            PRIV(utt_size);
2247    
2248  extern const uschar _pcre_default_tables[];  extern const pcre_uint8     PRIV(default_tables)[];
2249    
2250  extern const uschar _pcre_OP_lengths[];  extern const pcre_uint8     PRIV(OP_lengths)[];
2251    
2252    
2253  /* Internal shared functions. These are functions that are used by more than  /* Internal shared functions. These are functions that are used by more than
2254  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
2255  sense, but are not part of the PCRE public API. */  sense, but are not part of the PCRE public API. */
2256    
2257  extern const uschar *_pcre_find_bracket(const uschar *, BOOL, int);  /* String comparison functions. */
2258  extern BOOL          _pcre_is_newline(USPTR, int, USPTR, int *, BOOL);  #ifdef COMPILE_PCRE8
2259  extern int           _pcre_ord2utf8(int, uschar *);  
2260  extern real_pcre    *_pcre_try_flipped(const real_pcre *, real_pcre *,  #define STRCMP_UC_UC(str1, str2) \
2261                         const pcre_study_data *, pcre_study_data *);    strcmp((char *)(str1), (char *)(str2))
2262  extern int           _pcre_valid_utf8(USPTR, int, int *);  #define STRCMP_UC_C8(str1, str2) \
2263  extern BOOL          _pcre_was_newline(USPTR, int, USPTR, int *, BOOL);    strcmp((char *)(str1), (str2))
2264  extern BOOL          _pcre_xclass(int, const uschar *);  #define STRNCMP_UC_UC(str1, str2, num) \
2265      strncmp((char *)(str1), (char *)(str2), (num))
2266    #define STRNCMP_UC_C8(str1, str2, num) \
2267      strncmp((char *)(str1), (str2), (num))
2268    #define STRLEN_UC(str) strlen((const char *)str)
2269    
2270    #else
2271    
2272    extern int               PRIV(strcmp_uc_uc)(const pcre_uchar *,
2273                               const pcre_uchar *);
2274    extern int               PRIV(strcmp_uc_c8)(const pcre_uchar *,
2275                               const char *);
2276    extern int               PRIV(strncmp_uc_uc)(const pcre_uchar *,
2277                               const pcre_uchar *, unsigned int num);
2278    extern int               PRIV(strncmp_uc_c8)(const pcre_uchar *,
2279                               const char *, unsigned int num);
2280    extern unsigned int      PRIV(strlen_uc)(const pcre_uchar *str);
2281    
2282    #define STRCMP_UC_UC(str1, str2) \
2283      PRIV(strcmp_uc_uc)((str1), (str2))
2284    #define STRCMP_UC_C8(str1, str2) \
2285      PRIV(strcmp_uc_c8)((str1), (str2))
2286    #define STRNCMP_UC_UC(str1, str2, num) \
2287      PRIV(strncmp_uc_uc)((str1), (str2), (num))
2288    #define STRNCMP_UC_C8(str1, str2, num) \
2289      PRIV(strncmp_uc_c8)((str1), (str2), (num))
2290    #define STRLEN_UC(str) PRIV(strlen_uc)(str)
2291    
2292    #endif /* COMPILE_PCRE8 */
2293    
2294    extern const pcre_uchar *PRIV(find_bracket)(const pcre_uchar *, BOOL, int);
2295    extern BOOL              PRIV(is_newline)(PCRE_PUCHAR, int, PCRE_PUCHAR,
2296                               int *, BOOL);
2297    extern int               PRIV(ord2utf)(pcre_uint32, pcre_uchar *);
2298    extern int               PRIV(valid_utf)(PCRE_PUCHAR, int, int *);
2299    extern BOOL              PRIV(was_newline)(PCRE_PUCHAR, int, PCRE_PUCHAR,
2300                               int *, BOOL);
2301    extern BOOL              PRIV(xclass)(int, const pcre_uchar *, BOOL);
2302    
2303  #ifdef SUPPORT_JIT  #ifdef SUPPORT_JIT
2304  extern void          _pcre_jit_compile(const real_pcre *, pcre_extra *);  extern void              PRIV(jit_compile)(const REAL_PCRE *,
2305  extern int           _pcre_jit_exec(const real_pcre *, void *, PCRE_SPTR,                             PUBL(extra) *, int);
2306                          int, int, int, int, int *, int);  extern int               PRIV(jit_exec)(const REAL_PCRE *, const PUBL(extra) *,
2307  extern void          _pcre_jit_free(void *);                             const pcre_uchar *, int, int, int, int *, int);
2308    extern void              PRIV(jit_free)(void *);
2309    extern int               PRIV(jit_get_size)(void *);
2310    extern const char*       PRIV(jit_get_target)(void);
2311  #endif  #endif
2312    
2313  /* Unicode character database (UCD) */  /* Unicode character database (UCD) */
2314    
2315  typedef struct {  typedef struct {
2316    uschar script;    pcre_uint8 script;
2317    uschar chartype;    pcre_uint8 chartype;
2318    pcre_int32 other_case;    pcre_int32 other_case;
2319  } ucd_record;  } ucd_record;
2320    
2321  extern const ucd_record  _pcre_ucd_records[];  extern const ucd_record  PRIV(ucd_records)[];
2322  extern const uschar      _pcre_ucd_stage1[];  extern const pcre_uint8  PRIV(ucd_stage1)[];
2323  extern const pcre_uint16 _pcre_ucd_stage2[];  extern const pcre_uint16 PRIV(ucd_stage2)[];
2324  extern const int         _pcre_ucp_gentype[];  extern const int         PRIV(ucp_gentype)[];
2325  #ifdef SUPPORT_JIT  #ifdef SUPPORT_JIT
2326  extern const int         _pcre_ucp_typerange[];  extern const int         PRIV(ucp_typerange)[];
2327  #endif  #endif
2328    
2329    #ifdef SUPPORT_UCP
2330  /* UCD access macros */  /* UCD access macros */
2331    
2332  #define UCD_BLOCK_SIZE 128  #define UCD_BLOCK_SIZE 128
2333  #define GET_UCD(ch) (_pcre_ucd_records + \  #define GET_UCD(ch) (PRIV(ucd_records) + \
2334          _pcre_ucd_stage2[_pcre_ucd_stage1[(ch) / UCD_BLOCK_SIZE] * \          PRIV(ucd_stage2)[PRIV(ucd_stage1)[(ch) / UCD_BLOCK_SIZE] * \
2335          UCD_BLOCK_SIZE + (ch) % UCD_BLOCK_SIZE])          UCD_BLOCK_SIZE + (ch) % UCD_BLOCK_SIZE])
2336    
2337  #define UCD_CHARTYPE(ch)  GET_UCD(ch)->chartype  #define UCD_CHARTYPE(ch)  GET_UCD(ch)->chartype
2338  #define UCD_SCRIPT(ch)    GET_UCD(ch)->script  #define UCD_SCRIPT(ch)    GET_UCD(ch)->script
2339  #define UCD_CATEGORY(ch)  _pcre_ucp_gentype[UCD_CHARTYPE(ch)]  #define UCD_CATEGORY(ch)  PRIV(ucp_gentype)[UCD_CHARTYPE(ch)]
2340  #define UCD_OTHERCASE(ch) (ch + GET_UCD(ch)->other_case)  #define UCD_OTHERCASE(ch) (ch + GET_UCD(ch)->other_case)
2341    
2342    #endif /* SUPPORT_UCP */
2343    
2344  #endif  #endif
2345    
2346  /* End of pcre_internal.h */  /* End of pcre_internal.h */

Legend:
Removed from v.758  
changed lines
  Added in v.964

  ViewVC Help
Powered by ViewVC 1.1.5