/[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 941 by zherczeg, Tue Feb 28 11:33:34 2012 UTC revision 1199 by chpe, Sat Nov 3 19:21:37 2012 UTC
# 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_" or "_pcre16_" depending on  functions whose names all begin with "_pcre_", "_pcre16_" or "_pcre32_"
44  the PRIV macro. */  depending on the PRIV macro. */
45    
46  #ifndef PCRE_INTERNAL_H  #ifndef PCRE_INTERNAL_H
47  #define PCRE_INTERNAL_H  #define PCRE_INTERNAL_H
# Line 53  the PRIV macro. */ Line 53  the PRIV macro. */
53  #endif  #endif
54    
55  /* PCRE is compiled as an 8 bit library if it is not requested otherwise. */  /* PCRE is compiled as an 8 bit library if it is not requested otherwise. */
56  #ifndef COMPILE_PCRE16  
57    #if !defined COMPILE_PCRE16 && !defined COMPILE_PCRE32
58  #define COMPILE_PCRE8  #define COMPILE_PCRE8
59  #endif  #endif
60    
# Line 78  Until then we define it if SUPPORT_UTF i Line 79  Until then we define it if SUPPORT_UTF i
79  #define SUPPORT_UTF8 1  #define SUPPORT_UTF8 1
80  #endif  #endif
81    
82  /* We do not support both EBCDIC and UTF-8/16 at the same time. The "configure"  /* We do not support both EBCDIC and UTF-8/16/32 at the same time. The "configure"
83  script prevents both being selected, but not everybody uses "configure". */  script prevents both being selected, but not everybody uses "configure". */
84    
85  #if defined EBCDIC && defined SUPPORT_UTF  #if defined EBCDIC && defined SUPPORT_UTF
86  #error The use of both EBCDIC and SUPPORT_UTF8/16 is not supported.  #error The use of both EBCDIC and SUPPORT_UTF is not supported.
87  #endif  #endif
88    
89  /* 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
# Line 111  setjmp and stdarg are used is when NO_RE Line 112  setjmp and stdarg are used is when NO_RE
112  #include <stdlib.h>  #include <stdlib.h>
113  #include <string.h>  #include <string.h>
114    
115    /* Valgrind (memcheck) support */
116    
117    #ifdef SUPPORT_VALGRIND
118    #include <valgrind/memcheck.h>
119    #endif
120    
121  /* When compiling a DLL for Windows, the exported symbols have to be declared  /* When compiling a DLL for Windows, the exported symbols have to be declared
122  using some MS magic. I found some useful information on this web page:  using some MS magic. I found some useful information on this web page:
123  http://msdn2.microsoft.com/en-us/library/y4h7bcy6(VS.80).aspx. According to the  http://msdn2.microsoft.com/en-us/library/y4h7bcy6(VS.80).aspx. According to the
# Line 214  stdint.h is available, include it; it ma Line 221  stdint.h is available, include it; it ma
221  have stdint.h (e.g. Solaris) may have inttypes.h. The macro int64_t may be set  have stdint.h (e.g. Solaris) may have inttypes.h. The macro int64_t may be set
222  by "configure". */  by "configure". */
223    
224  #if HAVE_STDINT_H  #if defined HAVE_STDINT_H
225  #include <stdint.h>  #include <stdint.h>
226  #elif HAVE_INTTYPES_H  #elif defined HAVE_INTTYPES_H
227  #include <inttypes.h>  #include <inttypes.h>
228  #endif  #endif
229    
# Line 243  exactly 256 items. When the character is Line 250  exactly 256 items. When the character is
250  items, some check is needed before accessing these tables.  items, some check is needed before accessing these tables.
251  */  */
252    
253  #ifdef COMPILE_PCRE8  #if defined COMPILE_PCRE8
254    
255  typedef unsigned char pcre_uchar;  typedef unsigned char pcre_uchar;
256  #define IN_UCHARS(x) (x)  #define IN_UCHARS(x) (x)
257  #define MAX_255(c) 1  #define MAX_255(c) 1
258  #define TABLE_GET(c, table, default) ((table)[c])  #define TABLE_GET(c, table, default) ((table)[c])
259    
260  #else  #elif defined COMPILE_PCRE16
261    
 #ifdef COMPILE_PCRE16  
262  #if USHRT_MAX != 65535  #if USHRT_MAX != 65535
263  /* This is a warning message. Change PCRE_UCHAR16 to a 16 bit data type in  /* This is a warning message. Change PCRE_UCHAR16 to a 16 bit data type in
264  pcre.h(.in) and disable (comment out) this message. */  pcre.h(.in) and disable (comment out) this message. */
# Line 260  pcre.h(.in) and disable (comment out) th Line 266  pcre.h(.in) and disable (comment out) th
266  #endif  #endif
267    
268  typedef pcre_uint16 pcre_uchar;  typedef pcre_uint16 pcre_uchar;
269  #define IN_UCHARS(x) ((x) << 1)  #define UCHAR_SHIFT (1)
270    #define IN_UCHARS(x) ((x) << UCHAR_SHIFT)
271    #define MAX_255(c) ((c) <= 255u)
272    #define TABLE_GET(c, table, default) (MAX_255(c)? ((table)[c]):(default))
273    
274    #elif defined COMPILE_PCRE32
275    
276    typedef pcre_uint32 pcre_uchar;
277    #define UCHAR_SHIFT (2)
278    #define IN_UCHARS(x) ((x) << UCHAR_SHIFT)
279  #define MAX_255(c) ((c) <= 255u)  #define MAX_255(c) ((c) <= 255u)
280  #define TABLE_GET(c, table, default) (MAX_255(c)? ((table)[c]):(default))  #define TABLE_GET(c, table, default) (MAX_255(c)? ((table)[c]):(default))
281    
282  #else  #else
283  #error Unsupported compiling mode  #error Unsupported compiling mode
284  #endif /* COMPILE_PCRE16 */  #endif /* COMPILE_PCRE[8|16|32] */
   
 #endif /* COMPILE_PCRE8 */  
285    
286  /* 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
287  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 295  start/end of string field names are. */ Line 308  start/end of string field names are. */
308         &(NLBLOCK->nllen), utf)) \         &(NLBLOCK->nllen), utf)) \
309      : \      : \
310      ((p) <= NLBLOCK->PSEND - NLBLOCK->nllen && \      ((p) <= NLBLOCK->PSEND - NLBLOCK->nllen && \
311       (p)[0] == NLBLOCK->nl[0] && \       RAWUCHARTEST(p) == NLBLOCK->nl[0] && \
312       (NLBLOCK->nllen == 1 || (p)[1] == NLBLOCK->nl[1]) \       (NLBLOCK->nllen == 1 || RAWUCHARTEST(p+1) == NLBLOCK->nl[1])       \
313      ) \      ) \
314    )    )
315    
# Line 309  start/end of string field names are. */ Line 322  start/end of string field names are. */
322         &(NLBLOCK->nllen), utf)) \         &(NLBLOCK->nllen), utf)) \
323      : \      : \
324      ((p) >= NLBLOCK->PSSTART + NLBLOCK->nllen && \      ((p) >= NLBLOCK->PSSTART + NLBLOCK->nllen && \
325       (p)[-NLBLOCK->nllen] == NLBLOCK->nl[0] && \       RAWUCHARTEST(p - NLBLOCK->nllen) == NLBLOCK->nl[0] &&              \
326       (NLBLOCK->nllen == 1 || (p)[-NLBLOCK->nllen+1] == NLBLOCK->nl[1]) \       (NLBLOCK->nllen == 1 || RAWUCHARTEST(p - NLBLOCK->nllen + 1) == NLBLOCK->nl[1]) \
327      ) \      ) \
328    )    )
329    
# Line 335  values. */ Line 348  values. */
348  #include "pcre.h"  #include "pcre.h"
349  #include "ucp.h"  #include "ucp.h"
350    
351    #ifdef COMPILE_PCRE32
352    /* Assert that the public PCRE_UCHAR32 is a 32-bit type */
353    typedef int __assert_pcre_uchar32_size[sizeof(PCRE_UCHAR32) == 4 ? 1 : -1];
354    #endif
355    
356  /* When compiling for use with the Virtual Pascal compiler, these functions  /* When compiling for use with the Virtual Pascal compiler, these functions
357  need to have their names changed. PCRE must be compiled with the -DVPCOMPAT  need to have their names changed. PCRE must be compiled with the -DVPCOMPAT
358  option on the command line. */  option on the command line. */
# Line 396  The macros are controlled by the value o Line 414  The macros are controlled by the value o
414  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
415  is automated on Unix systems via the "configure" command. */  is automated on Unix systems via the "configure" command. */
416    
417  #ifdef COMPILE_PCRE8  #if defined COMPILE_PCRE8
418    
419  #if LINK_SIZE == 2  #if LINK_SIZE == 2
420    
# Line 441  is automated on Unix systems via the "co Line 459  is automated on Unix systems via the "co
459  #error LINK_SIZE must be either 2, 3, or 4  #error LINK_SIZE must be either 2, 3, or 4
460  #endif  #endif
461    
462  #else /* COMPILE_PCRE8 */  #elif defined COMPILE_PCRE16
   
 #ifdef COMPILE_PCRE16  
463    
464  #if LINK_SIZE == 2  #if LINK_SIZE == 2
465    
466    /* Redefine LINK_SIZE as a multiple of sizeof(pcre_uchar) */
467  #undef LINK_SIZE  #undef LINK_SIZE
468  #define LINK_SIZE 1  #define LINK_SIZE 1
469    
# Line 460  is automated on Unix systems via the "co Line 477  is automated on Unix systems via the "co
477    
478  #elif LINK_SIZE == 3 || LINK_SIZE == 4  #elif LINK_SIZE == 3 || LINK_SIZE == 4
479    
480    /* Redefine LINK_SIZE as a multiple of sizeof(pcre_uchar) */
481  #undef LINK_SIZE  #undef LINK_SIZE
482  #define LINK_SIZE 2  #define LINK_SIZE 2
483    
# Line 477  is automated on Unix systems via the "co Line 495  is automated on Unix systems via the "co
495  #error LINK_SIZE must be either 2, 3, or 4  #error LINK_SIZE must be either 2, 3, or 4
496  #endif  #endif
497    
498    #elif defined COMPILE_PCRE32
499    
500    /* Only supported LINK_SIZE is 4 */
501    /* Redefine LINK_SIZE as a multiple of sizeof(pcre_uchar) */
502    #undef LINK_SIZE
503    #define LINK_SIZE 1
504    
505    #define PUT(a,n,d)   \
506      (a[n] = (d))
507    
508    #define GET(a,n) \
509      (a[n])
510    
511    /* Keep it positive */
512    #define MAX_PATTERN_SIZE (1 << 30)
513    
514  #else  #else
515  #error Unsupported compiling mode  #error Unsupported compiling mode
516  #endif /* COMPILE_PCRE16 */  #endif /* COMPILE_PCRE[8|16|32] */
   
 #endif /* COMPILE_PCRE8 */  
517    
518  /* Convenience macro defined in terms of the others */  /* Convenience macro defined in terms of the others */
519    
# Line 492  is automated on Unix systems via the "co Line 524  is automated on Unix systems via the "co
524  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
525  capturing parenthesis numbers in back references. */  capturing parenthesis numbers in back references. */
526    
527  #ifdef COMPILE_PCRE8  #if defined COMPILE_PCRE8
528    
529  #define IMM2_SIZE 2  #define IMM2_SIZE 2
530    
531  #define PUT2(a,n,d)   \  #define PUT2(a,n,d)   \
532    a[n] = (d) >> 8; \    a[n] = (d) >> 8; \
533    a[(n)+1] = (d) & 255    a[(n)+1] = (d) & 255
534    
535    /* For reasons that I do not understand, the expression in this GET2 macro is
536    treated by gcc as a signed expression, even when a is declared as unsigned. It
537    seems that any kind of arithmetic results in a signed value. */
538    
539  #define GET2(a,n) \  #define GET2(a,n) \
540    (((a)[n] << 8) | (a)[(n)+1])    (unsigned int)(((a)[n] << 8) | (a)[(n)+1])
541    
542  #else /* COMPILE_PCRE8 */  #elif defined COMPILE_PCRE16
543    
544  #ifdef COMPILE_PCRE16  #define IMM2_SIZE 1
545    
546    #define PUT2(a,n,d)   \
547       a[n] = d
548    
549    #define GET2(a,n) \
550       a[n]
551    
552    #elif defined COMPILE_PCRE32
553    
554  #define IMM2_SIZE 1  #define IMM2_SIZE 1
555    
# Line 517  capturing parenthesis numbers in back re Line 561  capturing parenthesis numbers in back re
561    
562  #else  #else
563  #error Unsupported compiling mode  #error Unsupported compiling mode
564  #endif /* COMPILE_PCRE16 */  #endif /* COMPILE_PCRE[8|16|32] */
   
 #endif /* COMPILE_PCRE8 */  
565    
566  #define PUT2INC(a,n,d)  PUT2(a,n,d), a += IMM2_SIZE  #define PUT2INC(a,n,d)  PUT2(a,n,d), a += IMM2_SIZE
567    
568    /* The maximum length of a MARK name is currently one data unit; it may be
569    changed in future to be a fixed number of bytes or to depend on LINK_SIZE. */
570    
571    #if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
572    #define MAX_MARK ((1u << 16) - 1)
573    #else
574    #define MAX_MARK ((1u << 8) - 1)
575    #endif
576    
577  /* When UTF encoding is being used, a character is no longer just a single  /* When UTF encoding is being used, a character is no longer just a single
578  character. The macros for character handling generate simple sequences when  byte. The macros for character handling generate simple sequences when used in
579  used in character-mode, and more complicated ones for UTF characters.  character-mode, and more complicated ones for UTF characters. GETCHARLENTEST
580  GETCHARLENTEST and other macros are not used when UTF is not supported,  and other macros are not used when UTF is not supported, so they are not
581  so they are not defined. To make sure they can never even appear when  defined. To make sure they can never even appear when UTF support is omitted,
582  UTF support is omitted, we don't even define them. */  we don't even define them. */
583    
584  #ifndef SUPPORT_UTF  #ifndef SUPPORT_UTF
585    
# Line 541  UTF support is omitted, we don't even de Line 592  UTF support is omitted, we don't even de
592  #define GETCHARINC(c, eptr) c = *eptr++;  #define GETCHARINC(c, eptr) c = *eptr++;
593  #define GETCHARINCTEST(c, eptr) c = *eptr++;  #define GETCHARINCTEST(c, eptr) c = *eptr++;
594  #define GETCHARLEN(c, eptr, len) c = *eptr;  #define GETCHARLEN(c, eptr, len) c = *eptr;
595    #define RAWUCHAR(eptr) (*(eptr))
596    #define RAWUCHARINC(eptr) (*(eptr)++)
597    #define RAWUCHARTEST(eptr) (*(eptr))
598    #define RAWUCHARINCTEST(eptr) (*(eptr)++)
599  /* #define GETCHARLENTEST(c, eptr, len) */  /* #define GETCHARLENTEST(c, eptr, len) */
600  /* #define BACKCHAR(eptr) */  /* #define BACKCHAR(eptr) */
601  /* #define FORWARDCHAR(eptr) */  /* #define FORWARDCHAR(eptr) */
# Line 548  UTF support is omitted, we don't even de Line 603  UTF support is omitted, we don't even de
603    
604  #else   /* SUPPORT_UTF */  #else   /* SUPPORT_UTF */
605    
 #ifdef COMPILE_PCRE8  
   
 /* These macros were originally written in the form of loops that used data  
 from the tables whose names start with PRIV(utf8_table). They were rewritten by  
 a user so as not to use loops, because in some environments this gives a  
 significant performance advantage, and it seems never to do any harm. */  
   
 /* Tells the biggest code point which can be encoded as a single character. */  
   
 #define MAX_VALUE_FOR_SINGLE_CHAR 127  
   
606  /* Tests whether the code point needs extra characters to decode. */  /* Tests whether the code point needs extra characters to decode. */
607    
608  #define HAS_EXTRALEN(c) ((c) >= 0xc0)  #define HASUTF8EXTRALEN(c) ((c) >= 0xc0)
   
 /* Returns with the additional number of characters if IS_MULTICHAR(c) is TRUE.  
 Otherwise it has an undefined behaviour. */  
   
 #define GET_EXTRALEN(c) (PRIV(utf8_table4)[(c) & 0x3f])  
   
 /* Returns TRUE, if the given character is not the first character  
 of a UTF sequence. */  
   
 #define NOT_FIRSTCHAR(c) (((c) & 0xc0) == 0x80)  
609    
610  /* 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
611  advancing the pointer. */  advancing the pointer. */
# Line 595  advancing the pointer. */ Line 629  advancing the pointer. */
629            ((eptr[4] & 0x3f) << 6) | (eptr[5] & 0x3f); \            ((eptr[4] & 0x3f) << 6) | (eptr[5] & 0x3f); \
630      }      }
631    
 /* Get the next UTF-8 character, not advancing the pointer. This is called when  
 we know we are in UTF-8 mode. */  
   
 #define GETCHAR(c, eptr) \  
   c = *eptr; \  
   if (c >= 0xc0) GETUTF8(c, eptr);  
   
 /* Get the next UTF-8 character, testing for UTF-8 mode, and not advancing the  
 pointer. */  
   
 #define GETCHARTEST(c, eptr) \  
   c = *eptr; \  
   if (utf && c >= 0xc0) GETUTF8(c, eptr);  
   
632  /* 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
633  the pointer. */  the pointer. */
634    
# Line 643  the pointer. */ Line 663  the pointer. */
663        } \        } \
664      }      }
665    
666    #if defined COMPILE_PCRE8
667    
668    /* These macros were originally written in the form of loops that used data
669    from the tables whose names start with PRIV(utf8_table). They were rewritten by
670    a user so as not to use loops, because in some environments this gives a
671    significant performance advantage, and it seems never to do any harm. */
672    
673    /* Tells the biggest code point which can be encoded as a single character. */
674    
675    #define MAX_VALUE_FOR_SINGLE_CHAR 127
676    
677    /* Tests whether the code point needs extra characters to decode. */
678    
679    #define HAS_EXTRALEN(c) ((c) >= 0xc0)
680    
681    /* Returns with the additional number of characters if IS_MULTICHAR(c) is TRUE.
682    Otherwise it has an undefined behaviour. */
683    
684    #define GET_EXTRALEN(c) (PRIV(utf8_table4)[(c) & 0x3f])
685    
686    /* Returns TRUE, if the given character is not the first character
687    of a UTF sequence. */
688    
689    #define NOT_FIRSTCHAR(c) (((c) & 0xc0) == 0x80)
690    
691    /* Get the next UTF-8 character, not advancing the pointer. This is called when
692    we know we are in UTF-8 mode. */
693    
694    #define GETCHAR(c, eptr) \
695      c = *eptr; \
696      if (c >= 0xc0) GETUTF8(c, eptr);
697    
698    /* Get the next UTF-8 character, testing for UTF-8 mode, and not advancing the
699    pointer. */
700    
701    #define GETCHARTEST(c, eptr) \
702      c = *eptr; \
703      if (utf && c >= 0xc0) GETUTF8(c, eptr);
704    
705  /* Get the next UTF-8 character, advancing the pointer. This is called when we  /* Get the next UTF-8 character, advancing the pointer. This is called when we
706  know we are in UTF-8 mode. */  know we are in UTF-8 mode. */
707    
# Line 709  do not know if we are in UTF-8 mode. */ Line 768  do not know if we are in UTF-8 mode. */
768    c = *eptr; \    c = *eptr; \
769    if (utf && c >= 0xc0) GETUTF8LEN(c, eptr, len);    if (utf && c >= 0xc0) GETUTF8LEN(c, eptr, len);
770    
771    /* Returns the next uchar, not advancing the pointer. This is called when
772    we know we are in UTF mode. */
773    
774    #define RAWUCHAR(eptr) \
775      (*(eptr))
776    
777    /* Returns the next uchar, advancing the pointer. This is called when
778    we know we are in UTF mode. */
779    
780    #define RAWUCHARINC(eptr) \
781      (*((eptr)++))
782    
783    /* Returns the next uchar, testing for UTF mode, and not advancing the
784    pointer. */
785    
786    #define RAWUCHARTEST(eptr) \
787      (*(eptr))
788    
789    /* Returns the next uchar, testing for UTF mode, advancing the
790    pointer. */
791    
792    #define RAWUCHARINCTEST(eptr) \
793      (*((eptr)++))
794    
795  /* 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
796  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
797  because almost all calls are already within a block of UTF-8 only code. */  because almost all calls are already within a block of UTF-8 only code. */
# Line 722  because almost all calls are already wit Line 805  because almost all calls are already wit
805  #define ACROSSCHAR(condition, eptr, action) \  #define ACROSSCHAR(condition, eptr, action) \
806    while((condition) && ((eptr) & 0xc0) == 0x80) action    while((condition) && ((eptr) & 0xc0) == 0x80) action
807    
808  #else /* COMPILE_PCRE8 */  #elif defined COMPILE_PCRE16
   
 #ifdef COMPILE_PCRE16  
809    
810  /* Tells the biggest code point which can be encoded as a single character. */  /* Tells the biggest code point which can be encoded as a single character. */
811    
# Line 806  we do not know if we are in UTF-16 mode. Line 887  we do not know if we are in UTF-16 mode.
887    c = *eptr; \    c = *eptr; \
888    if (utf && (c & 0xfc00) == 0xd800) GETUTF16LEN(c, eptr, len);    if (utf && (c & 0xfc00) == 0xd800) GETUTF16LEN(c, eptr, len);
889    
890    /* Returns the next uchar, not advancing the pointer. This is called when
891    we know we are in UTF mode. */
892    
893    #define RAWUCHAR(eptr) \
894      (*(eptr))
895    
896    /* Returns the next uchar, advancing the pointer. This is called when
897    we know we are in UTF mode. */
898    
899    #define RAWUCHARINC(eptr) \
900      (*((eptr)++))
901    
902    /* Returns the next uchar, testing for UTF mode, and not advancing the
903    pointer. */
904    
905    #define RAWUCHARTEST(eptr) \
906      (*(eptr))
907    
908    /* Returns the next uchar, testing for UTF mode, advancing the
909    pointer. */
910    
911    #define RAWUCHARINCTEST(eptr) \
912      (*((eptr)++))
913    
914  /* 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
915  it is. This is called only in UTF-16 mode - we don't put a test within the  it is. This is called only in UTF-16 mode - we don't put a test within the
916  macro because almost all calls are already within a block of UTF-16 only  macro because almost all calls are already within a block of UTF-16 only
# Line 820  code. */ Line 925  code. */
925  #define ACROSSCHAR(condition, eptr, action) \  #define ACROSSCHAR(condition, eptr, action) \
926    if ((condition) && ((eptr) & 0xfc00) == 0xdc00) action    if ((condition) && ((eptr) & 0xfc00) == 0xdc00) action
927    
928  #endif  #elif defined COMPILE_PCRE32
929    
930  #endif /* COMPILE_PCRE8 */  /* These are trivial for the 32-bit library, since all UTF-32 characters fit
931    into one pcre_uchar unit. */
932    #define MAX_VALUE_FOR_SINGLE_CHAR (0x10ffffu)
933    #define HAS_EXTRALEN(c) (0)
934    #define GET_EXTRALEN(c) (0)
935    #define NOT_FIRSTCHAR(c) (0)
936    
937    #define UTF32_MASK (0x1fffffu)
938    
939    /* Base macro to pick up an UTF-32 character out of a uint32 */
940    
941    #define MASKHIGHBITS(c) ((c) & UTF32_MASK)
942    
943    /* Base macro to pick up an UTF-32 character, not advancing the pointer */
944    
945    #define GETUTF32(eptr) (MASKHIGHBITS(*(eptr)))
946    
947    /* Base macro to pick up an UTF-32 character, advancing the pointer */
948    
949    #define GETUTF32INC(eptr) (MASKHIGHBITS(*((eptr)++)))
950    
951    /* Get the next UTF-32 character, not advancing the pointer. This is called when
952    we know we are in UTF-32 mode. */
953    
954    #define GETCHAR(c, eptr) \
955      c = GETUTF32(eptr);
956    
957    /* Get the next UTF-32 character, testing for UTF-32 mode, and not advancing the
958    pointer. */
959    
960    #define GETCHARTEST(c, eptr) \
961      c = (utf ? GETUTF32(eptr) : *(eptr));
962    
963    /* Get the next UTF-32 character, advancing the pointer. This is called when we
964    know we are in UTF-32 mode. */
965    
966    #define GETCHARINC(c, eptr) \
967      c = GETUTF32INC(eptr);
968    
969    /* Get the next character, testing for UTF-32 mode, and advancing the pointer.
970    This is called when we don't know if we are in UTF-32 mode. */
971    
972    #define GETCHARINCTEST(c, eptr) \
973      c = (utf ? GETUTF32INC(eptr) : *((eptr)++));
974    
975    /* Get the next UTF-32 character, not advancing the pointer, not incrementing
976    length (since all UTF-32 is of length 1). This is called when we know we are in
977    UTF-32 mode. */
978    
979    #define GETCHARLEN(c, eptr, len) \
980      GETCHAR(c, eptr)
981    
982    /* Get the next UTF-32character, testing for UTF-32 mode, not advancing the
983    pointer, not incrementing the length (since all UTF-32 is of length 1).
984    This is called when we do not know if we are in UTF-32 mode. */
985    
986    #define GETCHARLENTEST(c, eptr, len) \
987      GETCHARTEST(c, eptr)
988    
989    /* Returns the next uchar, not advancing the pointer. This is called when
990    we know we are in UTF mode. */
991    
992    #define RAWUCHAR(eptr) \
993      (MASKHIGHBITS(*(eptr)))
994    
995    /* Returns the next uchar, advancing the pointer. This is called when
996    we know we are in UTF mode. */
997    
998    #define RAWUCHARINC(eptr) \
999      (MASKHIGHBITS(*((eptr)++)))
1000    
1001    /* Returns the next uchar, testing for UTF mode, and not advancing the
1002    pointer. */
1003    
1004    #define RAWUCHARTEST(eptr) \
1005      (utf ? (MASKHIGHBITS(*(eptr))) : *(eptr))
1006    
1007    /* Returns the next uchar, testing for UTF mode, advancing the
1008    pointer. */
1009    
1010    #define RAWUCHARINCTEST(eptr) \
1011      (utf ? (MASKHIGHBITS(*((eptr)++))) : *((eptr)++))
1012    
1013    /* If the pointer is not at the start of a character, move it back until
1014    it is. This is called only in UTF-32 mode - we don't put a test within the
1015    macro because almost all calls are already within a block of UTF-32 only
1016    code.
1017    These are all no-ops since all UTF-32 characters fit into one pcre_uchar. */
1018    
1019    #define BACKCHAR(eptr) do { } while (0)
1020    
1021    /* Same as above, just in the other direction. */
1022    #define FORWARDCHAR(eptr) do { } while (0)
1023    
1024    /* Same as above, but it allows a fully customizable form. */
1025    #define ACROSSCHAR(condition, eptr, action) do { } while (0)
1026    
1027    #else
1028    #error Unsupported compiling mode
1029    #endif /* COMPILE_PCRE[8|16|32] */
1030    
1031  #endif  /* SUPPORT_UTF */  #endif  /* SUPPORT_UTF */
1032    
1033    /* Tests for Unicode horizontal and vertical whitespace characters must check a
1034    number of different values. Using a switch statement for this generates the
1035    fastest code (no loop, no memory access), and there are several places in the
1036    interpreter code where this happens. In order to ensure that all the case lists
1037    remain in step, we use macros so that there is only one place where the lists
1038    are defined.
1039    
1040    These values are also required as lists in pcre_compile.c when processing \h,
1041    \H, \v and \V in a character class. The lists are defined in pcre_tables.c, but
1042    macros that define the values are here so that all the definitions are
1043    together. The lists must be in ascending character order, terminated by
1044    NOTACHAR (which is 0xffffffff).
1045    
1046    Any changes should ensure that the various macros are kept in step with each
1047    other. NOTE: The values also appear in pcre_jit_compile.c. */
1048    
1049    /* ------ ASCII/Unicode environments ------ */
1050    
1051    #ifndef EBCDIC
1052    
1053    #define HSPACE_LIST \
1054      CHAR_HT, CHAR_SPACE, 0xa0, \
1055      0x1680, 0x180e, 0x2000, 0x2001, 0x2002, 0x2003, 0x2004, 0x2005, \
1056      0x2006, 0x2007, 0x2008, 0x2009, 0x200A, 0x202f, 0x205f, 0x3000, \
1057      NOTACHAR
1058    
1059    #define HSPACE_MULTIBYTE_CASES \
1060      case 0x1680:  /* OGHAM SPACE MARK */ \
1061      case 0x180e:  /* MONGOLIAN VOWEL SEPARATOR */ \
1062      case 0x2000:  /* EN QUAD */ \
1063      case 0x2001:  /* EM QUAD */ \
1064      case 0x2002:  /* EN SPACE */ \
1065      case 0x2003:  /* EM SPACE */ \
1066      case 0x2004:  /* THREE-PER-EM SPACE */ \
1067      case 0x2005:  /* FOUR-PER-EM SPACE */ \
1068      case 0x2006:  /* SIX-PER-EM SPACE */ \
1069      case 0x2007:  /* FIGURE SPACE */ \
1070      case 0x2008:  /* PUNCTUATION SPACE */ \
1071      case 0x2009:  /* THIN SPACE */ \
1072      case 0x200A:  /* HAIR SPACE */ \
1073      case 0x202f:  /* NARROW NO-BREAK SPACE */ \
1074      case 0x205f:  /* MEDIUM MATHEMATICAL SPACE */ \
1075      case 0x3000   /* IDEOGRAPHIC SPACE */
1076    
1077    #define HSPACE_BYTE_CASES \
1078      case CHAR_HT: \
1079      case CHAR_SPACE: \
1080      case 0xa0     /* NBSP */
1081    
1082    #define HSPACE_CASES \
1083      HSPACE_BYTE_CASES: \
1084      HSPACE_MULTIBYTE_CASES
1085    
1086    #define VSPACE_LIST \
1087      CHAR_LF, CHAR_VT, CHAR_FF, CHAR_CR, CHAR_NEL, 0x2028, 0x2029, NOTACHAR
1088    
1089    #define VSPACE_MULTIBYTE_CASES \
1090      case 0x2028:    /* LINE SEPARATOR */ \
1091      case 0x2029     /* PARAGRAPH SEPARATOR */
1092    
1093    #define VSPACE_BYTE_CASES \
1094      case CHAR_LF: \
1095      case CHAR_VT: \
1096      case CHAR_FF: \
1097      case CHAR_CR: \
1098      case CHAR_NEL
1099    
1100    #define VSPACE_CASES \
1101      VSPACE_BYTE_CASES: \
1102      VSPACE_MULTIBYTE_CASES
1103    
1104  /* In case there is no definition of offsetof() provided - though any proper  /* ------ EBCDIC environments ------ */
1105  Standard C system should have one. */  
1106    #else
1107    #define HSPACE_LIST CHAR_HT, CHAR_SPACE
1108    
1109    #define HSPACE_BYTE_CASES \
1110      case CHAR_HT: \
1111      case CHAR_SPACE
1112    
1113    #define HSPACE_CASES HSPACE_BYTE_CASES
1114    
1115    #ifdef EBCDIC_NL25
1116    #define VSPACE_LIST \
1117      CHAR_VT, CHAR_FF, CHAR_CR, CHAR_NEL, CHAR_LF, NOTACHAR
1118    #else
1119    #define VSPACE_LIST \
1120      CHAR_VT, CHAR_FF, CHAR_CR, CHAR_LF, CHAR_NEL, NOTACHAR
1121    #endif
1122    
1123    #define VSPACE_BYTE_CASES \
1124      case CHAR_LF: \
1125      case CHAR_VT: \
1126      case CHAR_FF: \
1127      case CHAR_CR: \
1128      case CHAR_NEL
1129    
1130    #define VSPACE_CASES VSPACE_BYTE_CASES
1131    #endif  /* EBCDIC */
1132    
1133    /* ------ End of whitespace macros ------ */
1134    
 #ifndef offsetof  
 #define offsetof(p_type,field) ((size_t)&(((p_type *)0)->field))  
 #endif  
1135    
1136    
1137  /* Private flags containing information about the compiled regex. They used to  /* Private flags containing information about the compiled regex. They used to
# Line 841  are in a 16-bit flags word. From release Line 1140  are in a 16-bit flags word. From release
1140  the restrictions on partial matching have been lifted. It remains for backwards  the restrictions on partial matching have been lifted. It remains for backwards
1141  compatibility. */  compatibility. */
1142    
1143  #ifdef COMPILE_PCRE8  #define PCRE_MODE8         0x0001  /* compiled in 8 bit mode */
1144  #define PCRE_MODE          0x0001  /* compiled in 8 bit mode */  #define PCRE_MODE16        0x0002  /* compiled in 16 bit mode */
1145  #endif  #define PCRE_MODE32        0x0004  /* compiled in 32 bit mode */
 #ifdef COMPILE_PCRE16  
 #define PCRE_MODE          0x0002  /* compiled in 16 bit mode */  
 #endif  
1146  #define PCRE_FIRSTSET      0x0010  /* first_char is set */  #define PCRE_FIRSTSET      0x0010  /* first_char is set */
1147  #define PCRE_FCH_CASELESS  0x0020  /* caseless first char */  #define PCRE_FCH_CASELESS  0x0020  /* caseless first char */
1148  #define PCRE_REQCHSET      0x0040  /* req_byte is set */  #define PCRE_REQCHSET      0x0040  /* req_byte is set */
# Line 857  compatibility. */ Line 1153  compatibility. */
1153  #define PCRE_HASCRORLF     0x0800  /* explicit \r or \n in pattern */  #define PCRE_HASCRORLF     0x0800  /* explicit \r or \n in pattern */
1154  #define PCRE_HASTHEN       0x1000  /* pattern contains (*THEN) */  #define PCRE_HASTHEN       0x1000  /* pattern contains (*THEN) */
1155    
1156    #if defined COMPILE_PCRE8
1157    #define PCRE_MODE          PCRE_MODE8
1158    #elif defined COMPILE_PCRE16
1159    #define PCRE_MODE          PCRE_MODE16
1160    #elif defined COMPILE_PCRE32
1161    #define PCRE_MODE          PCRE_MODE32
1162    #endif
1163    #define PCRE_MODE_MASK     (PCRE_MODE8 | PCRE_MODE16 | PCRE_MODE32)
1164    
1165  /* Flags for the "extra" block produced by pcre_study(). */  /* Flags for the "extra" block produced by pcre_study(). */
1166    
1167  #define PCRE_STUDY_MAPPED  0x0001  /* a map of starting chars exists */  #define PCRE_STUDY_MAPPED  0x0001  /* a map of starting chars exists */
# Line 888  time, run time, or study time, respectiv Line 1193  time, run time, or study time, respectiv
1193    
1194  #define PUBLIC_STUDY_OPTIONS \  #define PUBLIC_STUDY_OPTIONS \
1195     (PCRE_STUDY_JIT_COMPILE|PCRE_STUDY_JIT_PARTIAL_SOFT_COMPILE| \     (PCRE_STUDY_JIT_COMPILE|PCRE_STUDY_JIT_PARTIAL_SOFT_COMPILE| \
1196      PCRE_STUDY_JIT_PARTIAL_HARD_COMPILE)      PCRE_STUDY_JIT_PARTIAL_HARD_COMPILE|PCRE_STUDY_EXTRA_NEEDED)
1197    
1198    #define PUBLIC_JIT_EXEC_OPTIONS \
1199       (PCRE_NO_UTF8_CHECK|PCRE_NOTBOL|PCRE_NOTEOL|PCRE_NOTEMPTY|\
1200        PCRE_NOTEMPTY_ATSTART|PCRE_PARTIAL_SOFT|PCRE_PARTIAL_HARD)
1201    
1202  /* Magic number to provide a small check against being handed junk. */  /* Magic number to provide a small check against being handed junk. */
1203    
# Line 899  in different endianness. */ Line 1208  in different endianness. */
1208    
1209  #define REVERSED_MAGIC_NUMBER  0x45524350UL   /* 'ERCP' */  #define REVERSED_MAGIC_NUMBER  0x45524350UL   /* 'ERCP' */
1210    
 /* Negative values for the firstchar and reqchar variables */  
   
 #define REQ_UNSET (-2)  
 #define REQ_NONE  (-1)  
   
1211  /* The maximum remaining length of subject we are prepared to search for a  /* The maximum remaining length of subject we are prepared to search for a
1212  req_byte match. */  req_byte match. */
1213    
# Line 940  macros to give the functions distinct na Line 1244  macros to give the functions distinct na
1244  #ifndef SUPPORT_UTF  #ifndef SUPPORT_UTF
1245    
1246  /* UTF-8 support is not enabled; use the platform-dependent character literals  /* UTF-8 support is not enabled; use the platform-dependent character literals
1247  so that PCRE works on both ASCII and EBCDIC platforms, in non-UTF-mode only. */  so that PCRE works in both ASCII and EBCDIC environments, but only in non-UTF
1248    mode. Newline characters are problematic in EBCDIC. Though it has CR and LF
1249    characters, a common practice has been to use its NL (0x15) character as the
1250    line terminator in C-like processing environments. However, sometimes the LF
1251    (0x25) character is used instead, according to this Unicode document:
1252    
1253    http://unicode.org/standard/reports/tr13/tr13-5.html
1254    
1255    PCRE defaults EBCDIC NL to 0x15, but has a build-time option to select 0x25
1256    instead. Whichever is *not* chosen is defined as NEL.
1257    
1258    In both ASCII and EBCDIC environments, CHAR_NL and CHAR_LF are synonyms for the
1259    same code point. */
1260    
1261    #ifdef EBCDIC
1262    
1263    #ifndef EBCDIC_NL25
1264    #define CHAR_NL                     '\x15'
1265    #define CHAR_NEL                    '\x25'
1266    #define STR_NL                      "\x15"
1267    #define STR_NEL                     "\x25"
1268    #else
1269    #define CHAR_NL                     '\x25'
1270    #define CHAR_NEL                    '\x15'
1271    #define STR_NL                      "\x25"
1272    #define STR_NEL                     "\x15"
1273    #endif
1274    
1275    #define CHAR_LF                     CHAR_NL
1276    #define STR_LF                      STR_NL
1277    
1278    #define CHAR_ESC                    '\047'
1279    #define CHAR_DEL                    '\007'
1280    #define STR_ESC                     "\047"
1281    #define STR_DEL                     "\007"
1282    
1283    #else  /* Not EBCDIC */
1284    
1285    /* In ASCII/Unicode, linefeed is '\n' and we equate this to NL for
1286    compatibility. NEL is the Unicode newline character; make sure it is
1287    a positive value. */
1288    
1289    #define CHAR_LF                     '\n'
1290    #define CHAR_NL                     CHAR_LF
1291    #define CHAR_NEL                    ((unsigned char)'\x85')
1292    #define CHAR_ESC                    '\033'
1293    #define CHAR_DEL                    '\177'
1294    
1295    #define STR_LF                      "\n"
1296    #define STR_NL                      STR_LF
1297    #define STR_NEL                     "\x85"
1298    #define STR_ESC                     "\033"
1299    #define STR_DEL                     "\177"
1300    
1301    #endif  /* EBCDIC */
1302    
1303    /* The remaining definitions work in both environments. */
1304    
1305    #define CHAR_NULL                   '\0'
1306  #define CHAR_HT                     '\t'  #define CHAR_HT                     '\t'
1307  #define CHAR_VT                     '\v'  #define CHAR_VT                     '\v'
1308  #define CHAR_FF                     '\f'  #define CHAR_FF                     '\f'
1309  #define CHAR_CR                     '\r'  #define CHAR_CR                     '\r'
 #define CHAR_NL                     '\n'  
1310  #define CHAR_BS                     '\b'  #define CHAR_BS                     '\b'
1311  #define CHAR_BEL                    '\a'  #define CHAR_BEL                    '\a'
 #ifdef EBCDIC  
 #define CHAR_ESC                    '\047'  
 #define CHAR_DEL                    '\007'  
 #else  
 #define CHAR_ESC                    '\033'  
 #define CHAR_DEL                    '\177'  
 #endif  
1312    
1313  #define CHAR_SPACE                  ' '  #define CHAR_SPACE                  ' '
1314  #define CHAR_EXCLAMATION_MARK       '!'  #define CHAR_EXCLAMATION_MARK       '!'
# Line 1057  so that PCRE works on both ASCII and EBC Line 1410  so that PCRE works on both ASCII and EBC
1410  #define STR_VT                      "\v"  #define STR_VT                      "\v"
1411  #define STR_FF                      "\f"  #define STR_FF                      "\f"
1412  #define STR_CR                      "\r"  #define STR_CR                      "\r"
 #define STR_NL                      "\n"  
1413  #define STR_BS                      "\b"  #define STR_BS                      "\b"
1414  #define STR_BEL                     "\a"  #define STR_BEL                     "\a"
 #ifdef EBCDIC  
 #define STR_ESC                     "\047"  
 #define STR_DEL                     "\007"  
 #else  
 #define STR_ESC                     "\033"  
 #define STR_DEL                     "\177"  
 #endif  
1415    
1416  #define STR_SPACE                   " "  #define STR_SPACE                   " "
1417  #define STR_EXCLAMATION_MARK        "!"  #define STR_EXCLAMATION_MARK        "!"
# Line 1203  so that PCRE works on both ASCII and EBC Line 1548  so that PCRE works on both ASCII and EBC
1548  #ifdef COMPILE_PCRE16  #ifdef COMPILE_PCRE16
1549  #define STRING_UTF_RIGHTPAR            "UTF16)"  #define STRING_UTF_RIGHTPAR            "UTF16)"
1550  #endif  #endif
1551    #ifdef COMPILE_PCRE32
1552    #define STRING_UTF_RIGHTPAR            "UTF32)"
1553    #endif
1554  #define STRING_UCP_RIGHTPAR            "UCP)"  #define STRING_UCP_RIGHTPAR            "UCP)"
1555  #define STRING_NO_START_OPT_RIGHTPAR   "NO_START_OPT)"  #define STRING_NO_START_OPT_RIGHTPAR   "NO_START_OPT)"
1556    
# Line 1216  only. */ Line 1564  only. */
1564  #define CHAR_VT                     '\013'  #define CHAR_VT                     '\013'
1565  #define CHAR_FF                     '\014'  #define CHAR_FF                     '\014'
1566  #define CHAR_CR                     '\015'  #define CHAR_CR                     '\015'
1567  #define CHAR_NL                     '\012'  #define CHAR_LF                     '\012'
1568    #define CHAR_NL                     CHAR_LF
1569    #define CHAR_NEL                    ((unsigned char)'\x85')
1570  #define CHAR_BS                     '\010'  #define CHAR_BS                     '\010'
1571  #define CHAR_BEL                    '\007'  #define CHAR_BEL                    '\007'
1572  #define CHAR_ESC                    '\033'  #define CHAR_ESC                    '\033'
1573  #define CHAR_DEL                    '\177'  #define CHAR_DEL                    '\177'
1574    
1575    #define CHAR_NULL                   '\0'
1576  #define CHAR_SPACE                  '\040'  #define CHAR_SPACE                  '\040'
1577  #define CHAR_EXCLAMATION_MARK       '\041'  #define CHAR_EXCLAMATION_MARK       '\041'
1578  #define CHAR_QUOTATION_MARK         '\042'  #define CHAR_QUOTATION_MARK         '\042'
# Line 1463  only. */ Line 1814  only. */
1814  #ifdef COMPILE_PCRE16  #ifdef COMPILE_PCRE16
1815  #define STRING_UTF_RIGHTPAR            STR_U STR_T STR_F STR_1 STR_6 STR_RIGHT_PARENTHESIS  #define STRING_UTF_RIGHTPAR            STR_U STR_T STR_F STR_1 STR_6 STR_RIGHT_PARENTHESIS
1816  #endif  #endif
1817    #ifdef COMPILE_PCRE32
1818    #define STRING_UTF_RIGHTPAR            STR_U STR_T STR_F STR_3 STR_2 STR_RIGHT_PARENTHESIS
1819    #endif
1820  #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
1821  #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
1822    
# Line 1479  only. */ Line 1833  only. */
1833  #endif  #endif
1834    
1835  #ifndef ESC_n  #ifndef ESC_n
1836  #define ESC_n CHAR_NL  #define ESC_n CHAR_LF
1837  #endif  #endif
1838    
1839  #ifndef ESC_r  #ifndef ESC_r
# Line 1504  only. */ Line 1858  only. */
1858  #define PT_SPACE      6    /* Perl space - Z plus 9,10,12,13 */  #define PT_SPACE      6    /* Perl space - Z plus 9,10,12,13 */
1859  #define PT_PXSPACE    7    /* POSIX space - Z plus 9,10,11,12,13 */  #define PT_PXSPACE    7    /* POSIX space - Z plus 9,10,11,12,13 */
1860  #define PT_WORD       8    /* Word - L plus N plus underscore */  #define PT_WORD       8    /* Word - L plus N plus underscore */
1861    #define PT_CLIST      9    /* Pseudo-property: match character list */
1862    
1863  /* 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
1864  contain characters with values greater than 255. */  contain characters with values greater than 255. */
# Line 1519  contain characters with values greater t Line 1874  contain characters with values greater t
1874    
1875  /* 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
1876  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
1877  their negation. Also, they must appear in the same order as in the opcode  0 for a data character.  Also, they must appear in the same order as in the opcode
1878  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
1879  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
1880  used for [^] in JavaScript compatibility mode, and for \C in non-utf mode. In  used for [^] in JavaScript compatibility mode, and for \C in non-utf mode. In
1881  non-DOTALL mode, "." behaves like \N.  non-DOTALL mode, "." behaves like \N.
1882    
1883  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.
1884  when PCRE_UCP is set, when replacement of \d etc by \p sequences is required.  when PCRE_UCP is set and replacement of \d etc by \p sequences is required.
1885  They must be contiguous, and remain in order so that the replacements can be  They must be contiguous, and remain in order so that the replacements can be
1886  looked up from a table.  looked up from a table.
1887    
1888  The final escape must be ESC_REF as subsequent values are used for  Negative numbers are used to encode a backreference (\1, \2, \3, etc.) in
1889  backreferences (\1, \2, \3, etc). There are two tests in the code for an escape  check_escape(). There are two tests in the code for an escape
1890  greater than ESC_b and less than ESC_Z to detect the types that may be  greater than ESC_b and less than ESC_Z to detect the types that may be
1891  repeated. These are the types that consume characters. If any new escapes are  repeated. These are the types that consume characters. If any new escapes are
1892  put in between that don't consume a character, that code will have to change.  put in between that don't consume a character, that code will have to change.
# Line 1541  enum { ESC_A = 1, ESC_G, ESC_K, ESC_B, E Line 1896  enum { ESC_A = 1, ESC_G, ESC_K, ESC_B, E
1896         ESC_W, ESC_w, ESC_N, ESC_dum, 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,
1897         ESC_h, ESC_V, ESC_v, ESC_X, ESC_Z, ESC_z,         ESC_h, ESC_V, ESC_v, ESC_X, ESC_Z, ESC_z,
1898         ESC_E, ESC_Q, ESC_g, ESC_k,         ESC_E, ESC_Q, ESC_g, ESC_k,
1899         ESC_DU, ESC_du, ESC_SU, ESC_su, ESC_WU, ESC_wu,         ESC_DU, ESC_du, ESC_SU, ESC_su, ESC_WU, ESC_wu };
        ESC_REF };  
1900    
1901  /* 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
1902  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.
# Line 1568  enum { Line 1922  enum {
1922    OP_NOT_WORDCHAR,       /* 10 \W */    OP_NOT_WORDCHAR,       /* 10 \W */
1923    OP_WORDCHAR,           /* 11 \w */    OP_WORDCHAR,           /* 11 \w */
1924    
1925    OP_ANY,            /* 12 Match any character except newline */    OP_ANY,            /* 12 Match any character except newline (\N) */
1926    OP_ALLANY,         /* 13 Match any character */    OP_ALLANY,         /* 13 Match any character */
1927    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 */
1928    OP_NOTPROP,        /* 15 \P (not Unicode property) */    OP_NOTPROP,        /* 15 \P (not Unicode property) */
# Line 1579  enum { Line 1933  enum {
1933    OP_NOT_VSPACE,     /* 20 \V (not vertical whitespace) */    OP_NOT_VSPACE,     /* 20 \V (not vertical whitespace) */
1934    OP_VSPACE,         /* 21 \v (vertical whitespace) */    OP_VSPACE,         /* 21 \v (vertical whitespace) */
1935    OP_EXTUNI,         /* 22 \X (extended Unicode sequence */    OP_EXTUNI,         /* 22 \X (extended Unicode sequence */
1936    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) */
1937    OP_EOD,            /* 24 End of data: \z */    OP_EOD,            /* 24 End of data (\z) */
1938    
1939    OP_CIRC,           /* 25 Start of line - not multiline */    OP_CIRC,           /* 25 Start of line - not multiline */
1940    OP_CIRCM,          /* 26 Start of line - multiline */    OP_CIRCM,          /* 26 Start of line - multiline */
# Line 1940  enum { ERR0,  ERR1,  ERR2,  ERR3,  ERR4, Line 2294  enum { ERR0,  ERR1,  ERR2,  ERR3,  ERR4,
2294         ERR40, ERR41, ERR42, ERR43, ERR44, ERR45, ERR46, ERR47, ERR48, ERR49,         ERR40, ERR41, ERR42, ERR43, ERR44, ERR45, ERR46, ERR47, ERR48, ERR49,
2295         ERR50, ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58, ERR59,         ERR50, ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58, ERR59,
2296         ERR60, ERR61, ERR62, ERR63, ERR64, ERR65, ERR66, ERR67, ERR68, ERR69,         ERR60, ERR61, ERR62, ERR63, ERR64, ERR65, ERR66, ERR67, ERR68, ERR69,
2297         ERR70, ERR71, ERR72, ERR73, ERR74, ERRCOUNT };         ERR70, ERR71, ERR72, ERR73, ERR74, ERR75, ERR76, ERR77, ERRCOUNT };
2298    
2299  /* JIT compiling modes. The function list is indexed by them. */  /* JIT compiling modes. The function list is indexed by them. */
2300  enum { JIT_COMPILE, JIT_PARTIAL_SOFT_COMPILE, JIT_PARTIAL_HARD_COMPILE,  enum { JIT_COMPILE, JIT_PARTIAL_SOFT_COMPILE, JIT_PARTIAL_HARD_COMPILE,
# Line 1963  fields are present. Currently PCRE alway Line 2317  fields are present. Currently PCRE alway
2317  NOTE NOTE NOTE  NOTE NOTE NOTE
2318  */  */
2319    
2320  #ifdef COMPILE_PCRE8  #if defined COMPILE_PCRE8
2321  #define REAL_PCRE real_pcre  #define REAL_PCRE real_pcre
2322  #else  #elif defined COMPILE_PCRE16
2323  #define REAL_PCRE real_pcre16  #define REAL_PCRE real_pcre16
2324    #elif defined COMPILE_PCRE32
2325    #define REAL_PCRE real_pcre32
2326  #endif  #endif
2327    
2328  typedef struct REAL_PCRE {  /* It is necessary to fork the struct for 32 bit, since it needs to use
2329     * pcre_uchar for first_char and req_char. Can't put an ifdef inside the
2330     * typedef since pcretest needs access to  the struct of the 8-, 16-
2331     * and 32-bit variants. */
2332    
2333    typedef struct real_pcre8_or_16 {
2334    pcre_uint32 magic_number;    pcre_uint32 magic_number;
2335    pcre_uint32 size;               /* Total that was malloced */    pcre_uint32 size;               /* Total that was malloced */
2336    pcre_uint32 options;            /* Public options */    pcre_uint32 options;            /* Public options */
# Line 1985  typedef struct REAL_PCRE { Line 2346  typedef struct REAL_PCRE {
2346    pcre_uint16 ref_count;          /* Reference count */    pcre_uint16 ref_count;          /* Reference count */
2347    const pcre_uint8 *tables;       /* Pointer to tables or NULL for std */    const pcre_uint8 *tables;       /* Pointer to tables or NULL for std */
2348    const pcre_uint8 *nullpad;      /* NULL padding */    const pcre_uint8 *nullpad;      /* NULL padding */
2349  } REAL_PCRE;  } real_pcre8_or_16;
2350    
2351    typedef struct real_pcre8_or_16 real_pcre;
2352    typedef struct real_pcre8_or_16 real_pcre16;
2353    
2354    typedef struct real_pcre32 {
2355      pcre_uint32 magic_number;
2356      pcre_uint32 size;               /* Total that was malloced */
2357      pcre_uint32 options;            /* Public options */
2358      pcre_uint16 flags;              /* Private flags */
2359      pcre_uint16 max_lookbehind;     /* Longest lookbehind (characters) */
2360      pcre_uint16 top_bracket;        /* Highest numbered group */
2361      pcre_uint16 top_backref;        /* Highest numbered back reference */
2362      pcre_uint32 first_char;         /* Starting character */
2363      pcre_uint32 req_char;           /* This character must be seen */
2364      pcre_uint16 name_table_offset;  /* Offset to name table that follows */
2365      pcre_uint16 name_entry_size;    /* Size of any name items */
2366      pcre_uint16 name_count;         /* Number of name items */
2367      pcre_uint16 ref_count;          /* Reference count */
2368      pcre_uint16 dummy1;             /* for later expansion */
2369      pcre_uint16 dummy2;             /* for later expansion */
2370      const pcre_uint8 *tables;       /* Pointer to tables or NULL for std */
2371      void *nullpad;                  /* for later expansion */
2372    } real_pcre32;
2373    
2374    /* Assert that the size of REAL_PCRE is divisible by 8 */
2375    typedef int __assert_real_pcre_size_divisible_8[(sizeof(REAL_PCRE) % 8) == 0 ? 1 : -1];
2376    
2377    /* Needed in pcretest to access some fields in the real_pcre* structures
2378     * directly. They're unified for 8/16/32 bits since the structs only differ
2379     * after these fields; if that ever changes, need to fork those defines into
2380     * 8/16 and 32 bit versions. */
2381    #define REAL_PCRE_MAGIC(re)     (((REAL_PCRE*)re)->magic_number)
2382    #define REAL_PCRE_SIZE(re)      (((REAL_PCRE*)re)->size)
2383    #define REAL_PCRE_OPTIONS(re)   (((REAL_PCRE*)re)->options)
2384    #define REAL_PCRE_FLAGS(re)     (((REAL_PCRE*)re)->flags)
2385    
2386  /* 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
2387  remark (see NOTE above) about extending this structure applies. */  remark (see NOTE above) about extending this structure applies. */
# Line 2026  typedef struct compile_data { Line 2422  typedef struct compile_data {
2422    int  names_found;                 /* Number of entries so far */    int  names_found;                 /* Number of entries so far */
2423    int  name_entry_size;             /* Size of each entry */    int  name_entry_size;             /* Size of each entry */
2424    int  workspace_size;              /* Size of workspace */    int  workspace_size;              /* Size of workspace */
2425    int  bracount;                    /* Count of capturing parens as we compile */    unsigned int  bracount;           /* Count of capturing parens as we compile */
2426    int  final_bracount;              /* Saved value after first pass */    int  final_bracount;              /* Saved value after first pass */
2427    int  max_lookbehind;              /* Maximum lookbehind (characters) */    int  max_lookbehind;              /* Maximum lookbehind (characters) */
2428    int  top_backref;                 /* Maximum back reference */    int  top_backref;                 /* Maximum back reference */
# Line 2036  typedef struct compile_data { Line 2432  typedef struct compile_data {
2432    int  external_flags;              /* External flag bits to be set */    int  external_flags;              /* External flag bits to be set */
2433    int  req_varyopt;                 /* "After variable item" flag for reqbyte */    int  req_varyopt;                 /* "After variable item" flag for reqbyte */
2434    BOOL had_accept;                  /* (*ACCEPT) encountered */    BOOL had_accept;                  /* (*ACCEPT) encountered */
2435      BOOL had_pruneorskip;             /* (*PRUNE) or (*SKIP) encountered */
2436    BOOL check_lookbehind;            /* Lookbehinds need later checking */    BOOL check_lookbehind;            /* Lookbehinds need later checking */
2437    int  nltype;                      /* Newline type */    int  nltype;                      /* Newline type */
2438    int  nllen;                       /* Newline string length */    int  nllen;                       /* Newline string length */
# Line 2055  call within the pattern; used by pcre_ex Line 2452  call within the pattern; used by pcre_ex
2452    
2453  typedef struct recursion_info {  typedef struct recursion_info {
2454    struct recursion_info *prevrec; /* Previous recursion record (or NULL) */    struct recursion_info *prevrec; /* Previous recursion record (or NULL) */
2455    int group_num;                  /* Number of group that was called */    unsigned int group_num;         /* Number of group that was called */
2456    int *offset_save;               /* Pointer to start of saved offsets */    int *offset_save;               /* Pointer to start of saved offsets */
2457    int saved_max;                  /* Number of saved offsets */    int saved_max;                  /* Number of saved offsets */
2458    PCRE_PUCHAR subject_position;   /* Position at start of recursion */    PCRE_PUCHAR subject_position;   /* Position at start of recursion */
# Line 2132  typedef struct match_data { Line 2529  typedef struct match_data {
2529    const  pcre_uchar *once_target; /* Where to back up to for atomic groups */    const  pcre_uchar *once_target; /* Where to back up to for atomic groups */
2530  #ifdef NO_RECURSE  #ifdef NO_RECURSE
2531    void  *match_frames_base;       /* For remembering malloc'd frames */    void  *match_frames_base;       /* For remembering malloc'd frames */
2532  #endif  #endif
2533  } match_data;  } match_data;
2534    
2535  /* 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
# Line 2189  total length. */ Line 2586  total length. */
2586    
2587  /* Internal function and data prefixes. */  /* Internal function and data prefixes. */
2588    
2589  #ifdef COMPILE_PCRE8  #if defined COMPILE_PCRE8
2590  #ifndef PUBL  #ifndef PUBL
2591  #define PUBL(name) pcre_##name  #define PUBL(name) pcre_##name
2592  #endif  #endif
2593  #ifndef PRIV  #ifndef PRIV
2594  #define PRIV(name) _pcre_##name  #define PRIV(name) _pcre_##name
2595  #endif  #endif
2596  #else /* COMPILE_PCRE8 */  #elif defined COMPILE_PCRE16
 #ifdef COMPILE_PCRE16  
2597  #ifndef PUBL  #ifndef PUBL
2598  #define PUBL(name) pcre16_##name  #define PUBL(name) pcre16_##name
2599  #endif  #endif
2600  #ifndef PRIV  #ifndef PRIV
2601  #define PRIV(name) _pcre16_##name  #define PRIV(name) _pcre16_##name
2602  #endif  #endif
2603    #elif defined COMPILE_PCRE32
2604    #ifndef PUBL
2605    #define PUBL(name) pcre32_##name
2606    #endif
2607    #ifndef PRIV
2608    #define PRIV(name) _pcre32_##name
2609    #endif
2610  #else  #else
2611  #error Unsupported compiling mode  #error Unsupported compiling mode
2612  #endif /* COMPILE_PCRE16 */  #endif /* COMPILE_PCRE[8|16|32] */
 #endif /* COMPILE_PCRE8 */  
2613    
2614  /* 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
2615  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
# Line 2227  but are not part of the PCRE public API. Line 2629  but are not part of the PCRE public API.
2629  pcre_tables.c module. */  pcre_tables.c module. */
2630    
2631  #ifdef COMPILE_PCRE8  #ifdef COMPILE_PCRE8
   
2632  extern const int            PRIV(utf8_table1)[];  extern const int            PRIV(utf8_table1)[];
2633  extern const int            PRIV(utf8_table1_size);  extern const int            PRIV(utf8_table1_size);
2634  extern const int            PRIV(utf8_table2)[];  extern const int            PRIV(utf8_table2)[];
2635  extern const int            PRIV(utf8_table3)[];  extern const int            PRIV(utf8_table3)[];
2636  extern const pcre_uint8     PRIV(utf8_table4)[];  extern const pcre_uint8     PRIV(utf8_table4)[];
   
2637  #endif /* COMPILE_PCRE8 */  #endif /* COMPILE_PCRE8 */
2638    
2639  extern const char           PRIV(utt_names)[];  extern const char           PRIV(utt_names)[];
2640  extern const ucp_type_table PRIV(utt)[];  extern const ucp_type_table PRIV(utt)[];
2641  extern const int            PRIV(utt_size);  extern const int            PRIV(utt_size);
2642    
2643    extern const pcre_uint8     PRIV(OP_lengths)[];
2644  extern const pcre_uint8     PRIV(default_tables)[];  extern const pcre_uint8     PRIV(default_tables)[];
2645    
2646  extern const pcre_uint8     PRIV(OP_lengths)[];  extern const pcre_uint32    PRIV(hspace_list)[];
2647    extern const pcre_uint32    PRIV(vspace_list)[];
2648    
2649    
2650  /* Internal shared functions. These are functions that are used by more than  /* Internal shared functions. These are functions that are used by more than
# Line 2250  one of the exported public functions. Th Line 2652  one of the exported public functions. Th
2652  sense, but are not part of the PCRE public API. */  sense, but are not part of the PCRE public API. */
2653    
2654  /* String comparison functions. */  /* String comparison functions. */
2655  #ifdef COMPILE_PCRE8  #if defined COMPILE_PCRE8
2656    
2657  #define STRCMP_UC_UC(str1, str2) \  #define STRCMP_UC_UC(str1, str2) \
2658    strcmp((char *)(str1), (char *)(str2))    strcmp((char *)(str1), (char *)(str2))
# Line 2262  sense, but are not part of the PCRE publ Line 2664  sense, but are not part of the PCRE publ
2664    strncmp((char *)(str1), (str2), (num))    strncmp((char *)(str1), (str2), (num))
2665  #define STRLEN_UC(str) strlen((const char *)str)  #define STRLEN_UC(str) strlen((const char *)str)
2666    
2667  #else  #elif defined COMPILE_PCRE16 || defined COMPILE_PCRE32
2668    
2669  extern int               PRIV(strcmp_uc_uc)(const pcre_uchar *,  extern int               PRIV(strcmp_uc_uc)(const pcre_uchar *,
2670                             const pcre_uchar *);                             const pcre_uchar *);
# Line 2284  extern unsigned int      PRIV(strlen_uc) Line 2686  extern unsigned int      PRIV(strlen_uc)
2686    PRIV(strncmp_uc_c8)((str1), (str2), (num))    PRIV(strncmp_uc_c8)((str1), (str2), (num))
2687  #define STRLEN_UC(str) PRIV(strlen_uc)(str)  #define STRLEN_UC(str) PRIV(strlen_uc)(str)
2688    
2689  #endif /* COMPILE_PCRE8 */  #endif /* COMPILE_PCRE[8|16|32] */
2690    
2691    #if defined COMPILE_PCRE8 || defined COMPILE_PCRE16
2692    
2693    #define STRCMP_UC_UC_TEST(str1, str2) STRCMP_UC_UC(str1, str2)
2694    #define STRCMP_UC_C8_TEST(str1, str2) STRCMP_UC_C8(str1, str2)
2695    
2696    #elif defined COMPILE_PCRE32
2697    
2698    extern int               PRIV(strcmp_uc_uc_utf)(const pcre_uchar *,
2699                               const pcre_uchar *);
2700    extern int               PRIV(strcmp_uc_c8_utf)(const pcre_uchar *,
2701                               const char *);
2702    
2703    #define STRCMP_UC_UC_TEST(str1, str2) \
2704      (utf ? PRIV(strcmp_uc_uc_utf)((str1), (str2)) : PRIV(strcmp_uc_uc)((str1), (str2)))
2705    #define STRCMP_UC_C8_TEST(str1, str2) \
2706      (utf ? PRIV(strcmp_uc_c8_utf)((str1), (str2)) : PRIV(strcmp_uc_c8)((str1), (str2)))
2707    
2708    #endif /* COMPILE_PCRE[8|16|32] */
2709    
2710  extern const pcre_uchar *PRIV(find_bracket)(const pcre_uchar *, BOOL, int);  extern const pcre_uchar *PRIV(find_bracket)(const pcre_uchar *, BOOL, int);
2711  extern BOOL              PRIV(is_newline)(PCRE_PUCHAR, int, PCRE_PUCHAR,  extern BOOL              PRIV(is_newline)(PCRE_PUCHAR, int, PCRE_PUCHAR,
2712                             int *, BOOL);                             int *, BOOL);
2713  extern int               PRIV(ord2utf)(pcre_uint32, pcre_uchar *);  extern unsigned int      PRIV(ord2utf)(pcre_uint32, pcre_uchar *);
2714  extern int               PRIV(valid_utf)(PCRE_PUCHAR, int, int *);  extern int               PRIV(valid_utf)(PCRE_PUCHAR, int, int *);
2715  extern BOOL              PRIV(was_newline)(PCRE_PUCHAR, int, PCRE_PUCHAR,  extern BOOL              PRIV(was_newline)(PCRE_PUCHAR, int, PCRE_PUCHAR,
2716                             int *, BOOL);                             int *, BOOL);
2717  extern BOOL              PRIV(xclass)(int, const pcre_uchar *, BOOL);  extern BOOL              PRIV(xclass)(pcre_uint32, const pcre_uchar *, BOOL);
2718    
2719  #ifdef SUPPORT_JIT  #ifdef SUPPORT_JIT
2720  extern void              PRIV(jit_compile)(const REAL_PCRE *,  extern void              PRIV(jit_compile)(const REAL_PCRE *,
2721                             PUBL(extra) *, int);                             PUBL(extra) *, int);
2722  extern int               PRIV(jit_exec)(const REAL_PCRE *, const PUBL(extra) *,  extern int               PRIV(jit_exec)(const PUBL(extra) *,
2723                             const pcre_uchar *, int, int, int, int *, int);                             const pcre_uchar *, int, int, int, int *, int);
2724  extern void              PRIV(jit_free)(void *);  extern void              PRIV(jit_free)(void *);
2725  extern int               PRIV(jit_get_size)(void *);  extern int               PRIV(jit_get_size)(void *);
# Line 2308  extern const char*       PRIV(jit_get_ta Line 2729  extern const char*       PRIV(jit_get_ta
2729  /* Unicode character database (UCD) */  /* Unicode character database (UCD) */
2730    
2731  typedef struct {  typedef struct {
2732    pcre_uint8 script;    pcre_uint8 script;     /* ucp_Arabic, etc. */
2733    pcre_uint8 chartype;    pcre_uint8 chartype;   /* ucp_Cc, etc. (general categories) */
2734    pcre_int32 other_case;    pcre_uint8 gbprop;     /* ucp_gbControl, etc. (grapheme break property) */
2735      pcre_uint8 caseset;    /* offset to multichar other cases or zero */
2736      pcre_int32 other_case; /* offset to other case, or zero if none */
2737  } ucd_record;  } ucd_record;
2738    
2739    extern const pcre_uint32 PRIV(ucd_caseless_sets)[];
2740  extern const ucd_record  PRIV(ucd_records)[];  extern const ucd_record  PRIV(ucd_records)[];
2741  extern const pcre_uint8  PRIV(ucd_stage1)[];  extern const pcre_uint8  PRIV(ucd_stage1)[];
2742  extern const pcre_uint16 PRIV(ucd_stage2)[];  extern const pcre_uint16 PRIV(ucd_stage2)[];
2743  extern const int         PRIV(ucp_gentype)[];  extern const pcre_uint32 PRIV(ucp_gentype)[];
2744    extern const pcre_uint32 PRIV(ucp_gbtable)[];
2745  #ifdef SUPPORT_JIT  #ifdef SUPPORT_JIT
2746  extern const int         PRIV(ucp_typerange)[];  extern const int         PRIV(ucp_typerange)[];
2747  #endif  #endif
# Line 2326  extern const int         PRIV(ucp_typera Line 2751  extern const int         PRIV(ucp_typera
2751    
2752  #define UCD_BLOCK_SIZE 128  #define UCD_BLOCK_SIZE 128
2753  #define GET_UCD(ch) (PRIV(ucd_records) + \  #define GET_UCD(ch) (PRIV(ucd_records) + \
2754          PRIV(ucd_stage2)[PRIV(ucd_stage1)[(ch) / UCD_BLOCK_SIZE] * \          PRIV(ucd_stage2)[PRIV(ucd_stage1)[(int)(ch) / UCD_BLOCK_SIZE] * \
2755          UCD_BLOCK_SIZE + (ch) % UCD_BLOCK_SIZE])          UCD_BLOCK_SIZE + (int)(ch) % UCD_BLOCK_SIZE])
2756    
2757  #define UCD_CHARTYPE(ch)  GET_UCD(ch)->chartype  #define UCD_CHARTYPE(ch)    GET_UCD(ch)->chartype
2758  #define UCD_SCRIPT(ch)    GET_UCD(ch)->script  #define UCD_SCRIPT(ch)      GET_UCD(ch)->script
2759  #define UCD_CATEGORY(ch)  PRIV(ucp_gentype)[UCD_CHARTYPE(ch)]  #define UCD_CATEGORY(ch)    PRIV(ucp_gentype)[UCD_CHARTYPE(ch)]
2760  #define UCD_OTHERCASE(ch) (ch + GET_UCD(ch)->other_case)  #define UCD_GRAPHBREAK(ch)  GET_UCD(ch)->gbprop
2761    #define UCD_CASESET(ch)     GET_UCD(ch)->caseset
2762    #define UCD_OTHERCASE(ch)   ((pcre_uint32)((int)ch + (int)(GET_UCD(ch)->other_case)))
2763    
2764  #endif /* SUPPORT_UCP */  #endif /* SUPPORT_UCP */
2765    

Legend:
Removed from v.941  
changed lines
  Added in v.1199

  ViewVC Help
Powered by ViewVC 1.1.5