/[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 1160 by chpe, Mon Oct 22 22:05:03 2012 UTC revision 1361 by ph10, Fri Sep 6 17:47:32 2013 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-2012 University of Cambridge             Copyright (c) 1997-2013 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 194  preprocessor time in standard C environm Line 194  preprocessor time in standard C environm
194  typedef unsigned char pcre_uint8;  typedef unsigned char pcre_uint8;
195    
196  #if USHRT_MAX == 65535  #if USHRT_MAX == 65535
197    typedef unsigned short pcre_uint16;  typedef unsigned short pcre_uint16;
198    typedef short pcre_int16;  typedef short pcre_int16;
199    #define PCRE_UINT16_MAX USHRT_MAX
200    #define PCRE_INT16_MAX SHRT_MAX
201  #elif UINT_MAX == 65535  #elif UINT_MAX == 65535
202    typedef unsigned int pcre_uint16;  typedef unsigned int pcre_uint16;
203    typedef int pcre_int16;  typedef int pcre_int16;
204    #define PCRE_UINT16_MAX UINT_MAX
205    #define PCRE_INT16_MAX INT_MAX
206  #else  #else
207    #error Cannot determine a type for 16-bit unsigned integers  #error Cannot determine a type for 16-bit integers
208  #endif  #endif
209    
210  #if UINT_MAX == 4294967295  #if UINT_MAX == 4294967295U
211    typedef unsigned int pcre_uint32;  typedef unsigned int pcre_uint32;
212    typedef int pcre_int32;  typedef int pcre_int32;
213  #elif ULONG_MAX == 4294967295  #define PCRE_UINT32_MAX UINT_MAX
214    typedef unsigned long int pcre_uint32;  #define PCRE_INT32_MAX INT_MAX
215    typedef long int pcre_int32;  #elif ULONG_MAX == 4294967295UL
216    typedef unsigned long int pcre_uint32;
217    typedef long int pcre_int32;
218    #define PCRE_UINT32_MAX ULONG_MAX
219    #define PCRE_INT32_MAX LONG_MAX
220  #else  #else
221    #error Cannot determine a type for 32-bit unsigned integers  #error Cannot determine a type for 32-bit integers
222  #endif  #endif
223    
224  /* When checking for integer overflow in pcre_compile(), we need to handle  /* When checking for integer overflow in pcre_compile(), we need to handle
# Line 279  typedef pcre_uint32 pcre_uchar; Line 287  typedef pcre_uint32 pcre_uchar;
287  #define MAX_255(c) ((c) <= 255u)  #define MAX_255(c) ((c) <= 255u)
288  #define TABLE_GET(c, table, default) (MAX_255(c)? ((table)[c]):(default))  #define TABLE_GET(c, table, default) (MAX_255(c)? ((table)[c]):(default))
289    
 /* Assert that pcre_uchar32 is a 32-bit type */  
 typedef int __assert_pcre_uchar32_size[sizeof(pcre_uchar) == 4 ? 1 : -1];  
   
290  #else  #else
291  #error Unsupported compiling mode  #error Unsupported compiling mode
292  #endif /* COMPILE_PCRE[8|16|32] */  #endif /* COMPILE_PCRE[8|16|32] */
# Line 351  values. */ Line 356  values. */
356  #include "pcre.h"  #include "pcre.h"
357  #include "ucp.h"  #include "ucp.h"
358    
359    #ifdef COMPILE_PCRE32
360    /* Assert that the public PCRE_UCHAR32 is a 32-bit type */
361    typedef int __assert_pcre_uchar32_size[sizeof(PCRE_UCHAR32) == 4 ? 1 : -1];
362    #endif
363    
364  /* When compiling for use with the Virtual Pascal compiler, these functions  /* When compiling for use with the Virtual Pascal compiler, these functions
365  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
366  option on the command line. */  option on the command line. */
# Line 529  capturing parenthesis numbers in back re Line 539  capturing parenthesis numbers in back re
539  #define PUT2(a,n,d)   \  #define PUT2(a,n,d)   \
540    a[n] = (d) >> 8; \    a[n] = (d) >> 8; \
541    a[(n)+1] = (d) & 255    a[(n)+1] = (d) & 255
542    
543  /* For reasons that I do not understand, the expression in this GET2 macro is  /* For reasons that I do not understand, the expression in this GET2 macro is
544  treated by gcc as a signed expression, even when a is declared as unsigned. It  treated by gcc as a signed expression, even when a is declared as unsigned. It
545  seems that any kind of arithmetic results in a signed value. */  seems that any kind of arithmetic results in a signed value. */
546    
547  #define GET2(a,n) \  #define GET2(a,n) \
# Line 776  we know we are in UTF mode. */ Line 786  we know we are in UTF mode. */
786  we know we are in UTF mode. */  we know we are in UTF mode. */
787    
788  #define RAWUCHARINC(eptr) \  #define RAWUCHARINC(eptr) \
789    (*(eptr)++)    (*((eptr)++))
790    
791  /* Returns the next uchar, testing for UTF mode, and not advancing the  /* Returns the next uchar, testing for UTF mode, and not advancing the
792  pointer. */  pointer. */
# Line 788  pointer. */ Line 798  pointer. */
798  pointer. */  pointer. */
799    
800  #define RAWUCHARINCTEST(eptr) \  #define RAWUCHARINCTEST(eptr) \
801    (*(eptr)++)    (*((eptr)++))
802    
803  /* 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
804  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 895  we know we are in UTF mode. */ Line 905  we know we are in UTF mode. */
905  we know we are in UTF mode. */  we know we are in UTF mode. */
906    
907  #define RAWUCHARINC(eptr) \  #define RAWUCHARINC(eptr) \
908    (*(eptr)++)    (*((eptr)++))
909    
910  /* Returns the next uchar, testing for UTF mode, and not advancing the  /* Returns the next uchar, testing for UTF mode, and not advancing the
911  pointer. */  pointer. */
# Line 907  pointer. */ Line 917  pointer. */
917  pointer. */  pointer. */
918    
919  #define RAWUCHARINCTEST(eptr) \  #define RAWUCHARINCTEST(eptr) \
920    (*(eptr)++)    (*((eptr)++))
921    
922  /* 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
923  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
# Line 932  into one pcre_uchar unit. */ Line 942  into one pcre_uchar unit. */
942  #define GET_EXTRALEN(c) (0)  #define GET_EXTRALEN(c) (0)
943  #define NOT_FIRSTCHAR(c) (0)  #define NOT_FIRSTCHAR(c) (0)
944    
 #define UTF32_MASK (0x1fffffu)  
   
945  /* Get the next UTF-32 character, not advancing the pointer. This is called when  /* Get the next UTF-32 character, not advancing the pointer. This is called when
946  we know we are in UTF-32 mode. */  we know we are in UTF-32 mode. */
947    
948  #define GETCHAR(c, eptr) \  #define GETCHAR(c, eptr) \
949    c = (*eptr) & UTF32_MASK;    c = *(eptr);
950    
951  /* Get the next UTF-32 character, testing for UTF-32 mode, and not advancing the  /* Get the next UTF-32 character, testing for UTF-32 mode, and not advancing the
952  pointer. */  pointer. */
953    
954  #define GETCHARTEST(c, eptr) \  #define GETCHARTEST(c, eptr) \
955    c = *eptr; \    c = *(eptr);
   if (utf) c &= UTF32_MASK;  
956    
957  /* Get the next UTF-32 character, advancing the pointer. This is called when we  /* Get the next UTF-32 character, advancing the pointer. This is called when we
958  know we are in UTF-32 mode. */  know we are in UTF-32 mode. */
959    
960  #define GETCHARINC(c, eptr) \  #define GETCHARINC(c, eptr) \
961    c = (*eptr++) & UTF32_MASK;    c = *((eptr)++);
962    
963  /* Get the next character, testing for UTF-32 mode, and advancing the pointer.  /* Get the next character, testing for UTF-32 mode, and advancing the pointer.
964  This is called when we don't know if we are in UTF-32 mode. */  This is called when we don't know if we are in UTF-32 mode. */
965    
966  #define GETCHARINCTEST(c, eptr) \  #define GETCHARINCTEST(c, eptr) \
967    c = *eptr++; \    c = *((eptr)++);
   if (utf) c &= UTF32_MASK;  
968    
969  /* Get the next UTF-32 character, not advancing the pointer, not incrementing  /* Get the next UTF-32 character, not advancing the pointer, not incrementing
970  length (since all UTF-32 is of length 1). This is called when we know we are in  length (since all UTF-32 is of length 1). This is called when we know we are in
# Line 978  This is called when we do not know if we Line 984  This is called when we do not know if we
984  we know we are in UTF mode. */  we know we are in UTF mode. */
985    
986  #define RAWUCHAR(eptr) \  #define RAWUCHAR(eptr) \
987    (*(eptr) & UTF32_MASK)    (*(eptr))
988    
989  /* Returns the next uchar, advancing the pointer. This is called when  /* Returns the next uchar, advancing the pointer. This is called when
990  we know we are in UTF mode. */  we know we are in UTF mode. */
991    
992  #define RAWUCHARINC(eptr) \  #define RAWUCHARINC(eptr) \
993    (*(eptr)++ & UTF32_MASK)    (*((eptr)++))
994    
995  /* Returns the next uchar, testing for UTF mode, and not advancing the  /* Returns the next uchar, testing for UTF mode, and not advancing the
996  pointer. */  pointer. */
997    
998  #define RAWUCHARTEST(eptr) \  #define RAWUCHARTEST(eptr) \
999    (utf ? (*(eptr) & UTF32_MASK) : *(eptr))    (*(eptr))
1000    
1001  /* Returns the next uchar, testing for UTF mode, advancing the  /* Returns the next uchar, testing for UTF mode, advancing the
1002  pointer. */  pointer. */
1003    
1004  #define RAWUCHARINCTEST(eptr) \  #define RAWUCHARINCTEST(eptr) \
1005    (utf ? (*(eptr)++ & UTF32_MASK) : *(eptr)++)    (*((eptr)++))
1006    
1007  /* 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
1008  it is. This is called only in UTF-32 mode - we don't put a test within the  it is. This is called only in UTF-32 mode - we don't put a test within the
1009  macro because almost all calls are already within a block of UTF-32 only  macro because almost all calls are already within a block of UTF-32 only
1010  code.  code.
1011  These are all no-ops since all UTF-32 characters fit into one pcre_uchar. */  These are all no-ops since all UTF-32 characters fit into one pcre_uchar. */
1012    
1013  #define BACKCHAR(eptr) do { } while (0)  #define BACKCHAR(eptr) do { } while (0)
# Line 1028  are defined. Line 1034  are defined.
1034  These values are also required as lists in pcre_compile.c when processing \h,  These values are also required as lists in pcre_compile.c when processing \h,
1035  \H, \v and \V in a character class. The lists are defined in pcre_tables.c, but  \H, \v and \V in a character class. The lists are defined in pcre_tables.c, but
1036  macros that define the values are here so that all the definitions are  macros that define the values are here so that all the definitions are
1037  together. The lists must be in ascending character order, terminated by  together. The lists must be in ascending character order, terminated by
1038  NOTACHAR (which is 0xffffffff).  NOTACHAR (which is 0xffffffff).
1039    
1040  Any changes should ensure that the various macros are kept in step with each  Any changes should ensure that the various macros are kept in step with each
# Line 1042  other. NOTE: The values also appear in p Line 1048  other. NOTE: The values also appear in p
1048    CHAR_HT, CHAR_SPACE, 0xa0, \    CHAR_HT, CHAR_SPACE, 0xa0, \
1049    0x1680, 0x180e, 0x2000, 0x2001, 0x2002, 0x2003, 0x2004, 0x2005, \    0x1680, 0x180e, 0x2000, 0x2001, 0x2002, 0x2003, 0x2004, 0x2005, \
1050    0x2006, 0x2007, 0x2008, 0x2009, 0x200A, 0x202f, 0x205f, 0x3000, \    0x2006, 0x2007, 0x2008, 0x2009, 0x200A, 0x202f, 0x205f, 0x3000, \
1051    NOTACHAR    NOTACHAR
1052    
1053  #define HSPACE_MULTIBYTE_CASES \  #define HSPACE_MULTIBYTE_CASES \
1054    case 0x1680:  /* OGHAM SPACE MARK */ \    case 0x1680:  /* OGHAM SPACE MARK */ \
# Line 1066  other. NOTE: The values also appear in p Line 1072  other. NOTE: The values also appear in p
1072    case CHAR_HT: \    case CHAR_HT: \
1073    case CHAR_SPACE: \    case CHAR_SPACE: \
1074    case 0xa0     /* NBSP */    case 0xa0     /* NBSP */
1075    
1076  #define HSPACE_CASES \  #define HSPACE_CASES \
1077    HSPACE_BYTE_CASES: \    HSPACE_BYTE_CASES: \
1078    HSPACE_MULTIBYTE_CASES    HSPACE_MULTIBYTE_CASES
1079    
1080  #define VSPACE_LIST \  #define VSPACE_LIST \
1081    CHAR_LF, CHAR_VT, CHAR_FF, CHAR_CR, CHAR_NEL, 0x2028, 0x2029, NOTACHAR    CHAR_LF, CHAR_VT, CHAR_FF, CHAR_CR, CHAR_NEL, 0x2028, 0x2029, NOTACHAR
1082    
1083  #define VSPACE_MULTIBYTE_CASES \  #define VSPACE_MULTIBYTE_CASES \
1084    case 0x2028:    /* LINE SEPARATOR */ \    case 0x2028:    /* LINE SEPARATOR */ \
# Line 1102  other. NOTE: The values also appear in p Line 1108  other. NOTE: The values also appear in p
1108    
1109  #ifdef EBCDIC_NL25  #ifdef EBCDIC_NL25
1110  #define VSPACE_LIST \  #define VSPACE_LIST \
1111    CHAR_VT, CHAR_FF, CHAR_CR, CHAR_NEL, CHAR_LF, NOTACHAR    CHAR_VT, CHAR_FF, CHAR_CR, CHAR_NEL, CHAR_LF, NOTACHAR
1112  #else  #else
1113  #define VSPACE_LIST \  #define VSPACE_LIST \
1114    CHAR_VT, CHAR_FF, CHAR_CR, CHAR_LF, CHAR_NEL, NOTACHAR    CHAR_VT, CHAR_FF, CHAR_CR, CHAR_LF, CHAR_NEL, NOTACHAR
1115  #endif  #endif
1116    
1117  #define VSPACE_BYTE_CASES \  #define VSPACE_BYTE_CASES \
1118    case CHAR_LF: \    case CHAR_LF: \
# Line 1123  other. NOTE: The values also appear in p Line 1129  other. NOTE: The values also appear in p
1129    
1130    
1131  /* Private flags containing information about the compiled regex. They used to  /* Private flags containing information about the compiled regex. They used to
1132  live at the top end of the options word, but that got almost full, so now they  live at the top end of the options word, but that got almost full, so they were
1133  are in a 16-bit flags word. From release 8.00, PCRE_NOPARTIAL is unused, as  moved to a 16-bit flags word - which got almost full, so now they are in a
1134  the restrictions on partial matching have been lifted. It remains for backwards  32-bit flags word. From release 8.00, PCRE_NOPARTIAL is unused, as the
1135    restrictions on partial matching have been lifted. It remains for backwards
1136  compatibility. */  compatibility. */
1137    
1138  #define PCRE_MODE8         0x0001  /* compiled in 8 bit mode */  #define PCRE_MODE8         0x00000001  /* compiled in 8 bit mode */
1139  #define PCRE_MODE16        0x0002  /* compiled in 16 bit mode */  #define PCRE_MODE16        0x00000002  /* compiled in 16 bit mode */
1140  #define PCRE_MODE32        0x0004  /* compiled in 32 bit mode */  #define PCRE_MODE32        0x00000004  /* compiled in 32 bit mode */
1141  #define PCRE_FIRSTSET      0x0010  /* first_char is set */  #define PCRE_FIRSTSET      0x00000010  /* first_char is set */
1142  #define PCRE_FCH_CASELESS  0x0020  /* caseless first char */  #define PCRE_FCH_CASELESS  0x00000020  /* caseless first char */
1143  #define PCRE_REQCHSET      0x0040  /* req_byte is set */  #define PCRE_REQCHSET      0x00000040  /* req_byte is set */
1144  #define PCRE_RCH_CASELESS  0x0080  /* caseless requested char */  #define PCRE_RCH_CASELESS  0x00000080  /* caseless requested char */
1145  #define PCRE_STARTLINE     0x0100  /* start after \n for multiline */  #define PCRE_STARTLINE     0x00000100  /* start after \n for multiline */
1146  #define PCRE_NOPARTIAL     0x0200  /* can't use partial with this regex */  #define PCRE_NOPARTIAL     0x00000200  /* can't use partial with this regex */
1147  #define PCRE_JCHANGED      0x0400  /* j option used in regex */  #define PCRE_JCHANGED      0x00000400  /* j option used in regex */
1148  #define PCRE_HASCRORLF     0x0800  /* explicit \r or \n in pattern */  #define PCRE_HASCRORLF     0x00000800  /* explicit \r or \n in pattern */
1149  #define PCRE_HASTHEN       0x1000  /* pattern contains (*THEN) */  #define PCRE_HASTHEN       0x00001000  /* pattern contains (*THEN) */
1150    #define PCRE_MLSET         0x00002000  /* match limit set by regex */
1151    #define PCRE_RLSET         0x00004000  /* recursion limit set by regex */
1152    #define PCRE_MATCH_EMPTY   0x00008000  /* pattern can match empty string */
1153    
1154  #if defined COMPILE_PCRE8  #if defined COMPILE_PCRE8
1155  #define PCRE_MODE          PCRE_MODE8  #define PCRE_MODE          PCRE_MODE8
# Line 1166  time, run time, or study time, respectiv Line 1176  time, run time, or study time, respectiv
1176     PCRE_DOTALL|PCRE_DOLLAR_ENDONLY|PCRE_EXTRA|PCRE_UNGREEDY|PCRE_UTF8| \     PCRE_DOTALL|PCRE_DOLLAR_ENDONLY|PCRE_EXTRA|PCRE_UNGREEDY|PCRE_UTF8| \
1177     PCRE_NO_AUTO_CAPTURE|PCRE_NO_UTF8_CHECK|PCRE_AUTO_CALLOUT|PCRE_FIRSTLINE| \     PCRE_NO_AUTO_CAPTURE|PCRE_NO_UTF8_CHECK|PCRE_AUTO_CALLOUT|PCRE_FIRSTLINE| \
1178     PCRE_DUPNAMES|PCRE_NEWLINE_BITS|PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE| \     PCRE_DUPNAMES|PCRE_NEWLINE_BITS|PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE| \
1179     PCRE_JAVASCRIPT_COMPAT|PCRE_UCP|PCRE_NO_START_OPTIMIZE)     PCRE_JAVASCRIPT_COMPAT|PCRE_UCP|PCRE_NO_START_OPTIMIZE|PCRE_NEVER_UTF)
1180    
1181  #define PUBLIC_EXEC_OPTIONS \  #define PUBLIC_EXEC_OPTIONS \
1182    (PCRE_ANCHORED|PCRE_NOTBOL|PCRE_NOTEOL|PCRE_NOTEMPTY|PCRE_NOTEMPTY_ATSTART| \    (PCRE_ANCHORED|PCRE_NOTBOL|PCRE_NOTEOL|PCRE_NOTEMPTY|PCRE_NOTEMPTY_ATSTART| \
# Line 1183  time, run time, or study time, respectiv Line 1193  time, run time, or study time, respectiv
1193     (PCRE_STUDY_JIT_COMPILE|PCRE_STUDY_JIT_PARTIAL_SOFT_COMPILE| \     (PCRE_STUDY_JIT_COMPILE|PCRE_STUDY_JIT_PARTIAL_SOFT_COMPILE| \
1194      PCRE_STUDY_JIT_PARTIAL_HARD_COMPILE|PCRE_STUDY_EXTRA_NEEDED)      PCRE_STUDY_JIT_PARTIAL_HARD_COMPILE|PCRE_STUDY_EXTRA_NEEDED)
1195    
1196    #define PUBLIC_JIT_EXEC_OPTIONS \
1197       (PCRE_NO_UTF8_CHECK|PCRE_NOTBOL|PCRE_NOTEOL|PCRE_NOTEMPTY|\
1198        PCRE_NOTEMPTY_ATSTART|PCRE_PARTIAL_SOFT|PCRE_PARTIAL_HARD)
1199    
1200  /* Magic number to provide a small check against being handed junk. */  /* Magic number to provide a small check against being handed junk. */
1201    
1202  #define MAGIC_NUMBER  0x50435245UL   /* 'PCRE' */  #define MAGIC_NUMBER  0x50435245UL   /* 'PCRE' */
# Line 1286  a positive value. */ Line 1300  a positive value. */
1300    
1301  /* The remaining definitions work in both environments. */  /* The remaining definitions work in both environments. */
1302    
1303    #define CHAR_NULL                   '\0'
1304  #define CHAR_HT                     '\t'  #define CHAR_HT                     '\t'
1305  #define CHAR_VT                     '\v'  #define CHAR_VT                     '\v'
1306  #define CHAR_FF                     '\f'  #define CHAR_FF                     '\f'
# Line 1525  a positive value. */ Line 1540  a positive value. */
1540  #define STRING_ANYCRLF_RIGHTPAR        "ANYCRLF)"  #define STRING_ANYCRLF_RIGHTPAR        "ANYCRLF)"
1541  #define STRING_BSR_ANYCRLF_RIGHTPAR    "BSR_ANYCRLF)"  #define STRING_BSR_ANYCRLF_RIGHTPAR    "BSR_ANYCRLF)"
1542  #define STRING_BSR_UNICODE_RIGHTPAR    "BSR_UNICODE)"  #define STRING_BSR_UNICODE_RIGHTPAR    "BSR_UNICODE)"
1543  #ifdef COMPILE_PCRE8  #define STRING_UTF8_RIGHTPAR           "UTF8)"
1544  #define STRING_UTF_RIGHTPAR            "UTF8)"  #define STRING_UTF16_RIGHTPAR          "UTF16)"
1545  #endif  #define STRING_UTF32_RIGHTPAR          "UTF32)"
1546  #ifdef COMPILE_PCRE16  #define STRING_UTF_RIGHTPAR            "UTF)"
 #define STRING_UTF_RIGHTPAR            "UTF16)"  
 #endif  
 #ifdef COMPILE_PCRE32  
 #define STRING_UTF_RIGHTPAR            "UTF32)"  
 #endif  
1547  #define STRING_UCP_RIGHTPAR            "UCP)"  #define STRING_UCP_RIGHTPAR            "UCP)"
1548  #define STRING_NO_START_OPT_RIGHTPAR   "NO_START_OPT)"  #define STRING_NO_START_OPT_RIGHTPAR   "NO_START_OPT)"
1549    #define STRING_LIMIT_MATCH_EQ          "LIMIT_MATCH="
1550    #define STRING_LIMIT_RECURSION_EQ      "LIMIT_RECURSION="
1551    
1552  #else  /* SUPPORT_UTF */  #else  /* SUPPORT_UTF */
1553    
# Line 1555  only. */ Line 1567  only. */
1567  #define CHAR_ESC                    '\033'  #define CHAR_ESC                    '\033'
1568  #define CHAR_DEL                    '\177'  #define CHAR_DEL                    '\177'
1569    
1570    #define CHAR_NULL                   '\0'
1571  #define CHAR_SPACE                  '\040'  #define CHAR_SPACE                  '\040'
1572  #define CHAR_EXCLAMATION_MARK       '\041'  #define CHAR_EXCLAMATION_MARK       '\041'
1573  #define CHAR_QUOTATION_MARK         '\042'  #define CHAR_QUOTATION_MARK         '\042'
# Line 1790  only. */ Line 1803  only. */
1803  #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
1804  #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
1805  #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
1806  #ifdef COMPILE_PCRE8  #define STRING_UTF8_RIGHTPAR           STR_U STR_T STR_F STR_8 STR_RIGHT_PARENTHESIS
1807  #define STRING_UTF_RIGHTPAR            STR_U STR_T STR_F STR_8 STR_RIGHT_PARENTHESIS  #define STRING_UTF16_RIGHTPAR          STR_U STR_T STR_F STR_1 STR_6 STR_RIGHT_PARENTHESIS
1808  #endif  #define STRING_UTF32_RIGHTPAR          STR_U STR_T STR_F STR_3 STR_2 STR_RIGHT_PARENTHESIS
1809  #ifdef COMPILE_PCRE16  #define STRING_UTF_RIGHTPAR            STR_U STR_T STR_F STR_RIGHT_PARENTHESIS
 #define STRING_UTF_RIGHTPAR            STR_U STR_T STR_F STR_1 STR_6 STR_RIGHT_PARENTHESIS  
 #endif  
 #ifdef COMPILE_PCRE32  
 #define STRING_UTF_RIGHTPAR            STR_U STR_T STR_F STR_3 STR_2 STR_RIGHT_PARENTHESIS  
 #endif  
1810  #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
1811  #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
1812    #define STRING_LIMIT_MATCH_EQ          STR_L STR_I STR_M STR_I STR_T STR_UNDERSCORE STR_M STR_A STR_T STR_C STR_H STR_EQUALS_SIGN
1813    #define STRING_LIMIT_RECURSION_EQ      STR_L STR_I STR_M STR_I STR_T STR_UNDERSCORE STR_R STR_E STR_C STR_U STR_R STR_S STR_I STR_O STR_N STR_EQUALS_SIGN
1814    
1815  #endif  /* SUPPORT_UTF */  #endif  /* SUPPORT_UTF */
1816    
# Line 1841  only. */ Line 1851  only. */
1851  #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 */
1852  #define PT_WORD       8    /* Word - L plus N plus underscore */  #define PT_WORD       8    /* Word - L plus N plus underscore */
1853  #define PT_CLIST      9    /* Pseudo-property: match character list */  #define PT_CLIST      9    /* Pseudo-property: match character list */
1854    #define PT_UCNC      10    /* Universal Character nameable character */
1855    
1856  /* 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
1857  contain characters with values greater than 255. */  contain characters with values greater than 255. */
# Line 2044  enum { Line 2055  enum {
2055                                class. This does both positive and negative. */                                class. This does both positive and negative. */
2056    OP_REF,            /* 109 Match a back reference, casefully */    OP_REF,            /* 109 Match a back reference, casefully */
2057    OP_REFI,           /* 110 Match a back reference, caselessly */    OP_REFI,           /* 110 Match a back reference, caselessly */
2058    OP_RECURSE,        /* 111 Match a numbered subpattern (possibly recursive) */    OP_DNREF,          /* 111 Match a duplicate name backref, casefully */
2059    OP_CALLOUT,        /* 112 Call out to external function if provided */    OP_DNREFI,         /* 112 Match a duplicate name backref, caselessly */
2060      OP_RECURSE,        /* 113 Match a numbered subpattern (possibly recursive) */
2061    OP_ALT,            /* 113 Start of alternation */    OP_CALLOUT,        /* 114 Call out to external function if provided */
2062    OP_KET,            /* 114 End of group that doesn't have an unbounded repeat */  
2063    OP_KETRMAX,        /* 115 These two must remain together and in this */    OP_ALT,            /* 115 Start of alternation */
2064    OP_KETRMIN,        /* 116 order. They are for groups the repeat for ever. */    OP_KET,            /* 116 End of group that doesn't have an unbounded repeat */
2065    OP_KETRPOS,        /* 117 Possessive unlimited repeat. */    OP_KETRMAX,        /* 117 These two must remain together and in this */
2066      OP_KETRMIN,        /* 118 order. They are for groups the repeat for ever. */
2067      OP_KETRPOS,        /* 119 Possessive unlimited repeat. */
2068    
2069    /* The assertions must come before BRA, CBRA, ONCE, and COND, and the four    /* The assertions must come before BRA, CBRA, ONCE, and COND, and the four
2070    asserts must remain in order. */    asserts must remain in order. */
2071    
2072    OP_REVERSE,        /* 118 Move pointer back - used in lookbehind assertions */    OP_REVERSE,        /* 129 Move pointer back - used in lookbehind assertions */
2073    OP_ASSERT,         /* 119 Positive lookahead */    OP_ASSERT,         /* 121 Positive lookahead */
2074    OP_ASSERT_NOT,     /* 120 Negative lookahead */    OP_ASSERT_NOT,     /* 122 Negative lookahead */
2075    OP_ASSERTBACK,     /* 121 Positive lookbehind */    OP_ASSERTBACK,     /* 123 Positive lookbehind */
2076    OP_ASSERTBACK_NOT, /* 122 Negative lookbehind */    OP_ASSERTBACK_NOT, /* 124 Negative lookbehind */
2077    
2078    /* ONCE, ONCE_NC, BRA, BRAPOS, CBRA, CBRAPOS, and COND must come immediately    /* ONCE, ONCE_NC, BRA, BRAPOS, CBRA, CBRAPOS, and COND must come immediately
2079    after the assertions, with ONCE first, as there's a test for >= ONCE for a    after the assertions, with ONCE first, as there's a test for >= ONCE for a
2080    subpattern that isn't an assertion. The POS versions must immediately follow    subpattern that isn't an assertion. The POS versions must immediately follow
2081    the non-POS versions in each case. */    the non-POS versions in each case. */
2082    
2083    OP_ONCE,           /* 123 Atomic group, contains captures */    OP_ONCE,           /* 125 Atomic group, contains captures */
2084    OP_ONCE_NC,        /* 124 Atomic group containing no captures */    OP_ONCE_NC,        /* 126 Atomic group containing no captures */
2085    OP_BRA,            /* 125 Start of non-capturing bracket */    OP_BRA,            /* 127 Start of non-capturing bracket */
2086    OP_BRAPOS,         /* 126 Ditto, with unlimited, possessive repeat */    OP_BRAPOS,         /* 128 Ditto, with unlimited, possessive repeat */
2087    OP_CBRA,           /* 127 Start of capturing bracket */    OP_CBRA,           /* 129 Start of capturing bracket */
2088    OP_CBRAPOS,        /* 128 Ditto, with unlimited, possessive repeat */    OP_CBRAPOS,        /* 130 Ditto, with unlimited, possessive repeat */
2089    OP_COND,           /* 129 Conditional group */    OP_COND,           /* 131 Conditional group */
2090    
2091    /* These five must follow the previous five, in the same order. There's a    /* These five must follow the previous five, in the same order. There's a
2092    check for >= SBRA to distinguish the two sets. */    check for >= SBRA to distinguish the two sets. */
2093    
2094    OP_SBRA,           /* 130 Start of non-capturing bracket, check empty  */    OP_SBRA,           /* 132 Start of non-capturing bracket, check empty  */
2095    OP_SBRAPOS,        /* 131 Ditto, with unlimited, possessive repeat */    OP_SBRAPOS,        /* 133 Ditto, with unlimited, possessive repeat */
2096    OP_SCBRA,          /* 132 Start of capturing bracket, check empty */    OP_SCBRA,          /* 134 Start of capturing bracket, check empty */
2097    OP_SCBRAPOS,       /* 133 Ditto, with unlimited, possessive repeat */    OP_SCBRAPOS,       /* 135 Ditto, with unlimited, possessive repeat */
2098    OP_SCOND,          /* 134 Conditional group, check empty */    OP_SCOND,          /* 136 Conditional group, check empty */
2099    
2100    /* The next two pairs must (respectively) be kept together. */    /* The next two pairs must (respectively) be kept together. */
2101    
2102    OP_CREF,           /* 135 Used to hold a capture number as condition */    OP_CREF,           /* 137 Used to hold a capture number as condition */
2103    OP_NCREF,          /* 136 Same, but generated by a name reference*/    OP_NCREF,          /* 138 Same, but generated by a name reference*/
2104    OP_RREF,           /* 137 Used to hold a recursion number as condition */    OP_RREF,           /* 139 Used to hold a recursion number as condition */
2105    OP_NRREF,          /* 138 Same, but generated by a name reference*/    OP_NRREF,          /* 140 Same, but generated by a name reference*/
2106    OP_DEF,            /* 139 The DEFINE condition */    OP_DEF,            /* 141 The DEFINE condition */
2107    
2108    OP_BRAZERO,        /* 140 These two must remain together and in this */    OP_BRAZERO,        /* 142 These two must remain together and in this */
2109    OP_BRAMINZERO,     /* 141 order. */    OP_BRAMINZERO,     /* 143 order. */
2110    OP_BRAPOSZERO,     /* 142 */    OP_BRAPOSZERO,     /* 144 */
2111    
2112    /* These are backtracking control verbs */    /* These are backtracking control verbs */
2113    
2114    OP_MARK,           /* 143 always has an argument */    OP_MARK,           /* 145 always has an argument */
2115    OP_PRUNE,          /* 144 */    OP_PRUNE,          /* 146 */
2116    OP_PRUNE_ARG,      /* 145 same, but with argument */    OP_PRUNE_ARG,      /* 147 same, but with argument */
2117    OP_SKIP,           /* 146 */    OP_SKIP,           /* 148 */
2118    OP_SKIP_ARG,       /* 147 same, but with argument */    OP_SKIP_ARG,       /* 149 same, but with argument */
2119    OP_THEN,           /* 148 */    OP_THEN,           /* 150 */
2120    OP_THEN_ARG,       /* 149 same, but with argument */    OP_THEN_ARG,       /* 151 same, but with argument */
2121    OP_COMMIT,         /* 150 */    OP_COMMIT,         /* 152 */
2122    
2123    /* These are forced failure and success verbs */    /* These are forced failure and success verbs */
2124    
2125    OP_FAIL,           /* 151 */    OP_FAIL,           /* 153 */
2126    OP_ACCEPT,         /* 152 */    OP_ACCEPT,         /* 154 */
2127    OP_ASSERT_ACCEPT,  /* 153 Used inside assertions */    OP_ASSERT_ACCEPT,  /* 155 Used inside assertions */
2128    OP_CLOSE,          /* 154 Used before OP_ACCEPT to close open captures */    OP_CLOSE,          /* 156 Used before OP_ACCEPT to close open captures */
2129    
2130    /* This is used to skip a subpattern with a {0} quantifier */    /* This is used to skip a subpattern with a {0} quantifier */
2131    
2132    OP_SKIPZERO,       /* 155 */    OP_SKIPZERO,       /* 157 */
2133    
2134    /* This is not an opcode, but is used to check that tables indexed by opcode    /* This is not an opcode, but is used to check that tables indexed by opcode
2135    are the correct length, in order to catch updating errors - there have been    are the correct length, in order to catch updating errors - there have been
# Line 2156  some cases doesn't actually use these na Line 2169  some cases doesn't actually use these na
2169    "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \    "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \
2170    "*+","++", "?+", "{",                                           \    "*+","++", "?+", "{",                                           \
2171    "*", "*?", "+", "+?", "?", "??", "{", "{",                      \    "*", "*?", "+", "+?", "?", "??", "{", "{",                      \
2172    "class", "nclass", "xclass", "Ref", "Refi",                     \    "class", "nclass", "xclass", "Ref", "Refi", "DnRef", "DnRefi",  \
2173    "Recurse", "Callout",                                           \    "Recurse", "Callout",                                           \
2174    "Alt", "Ket", "KetRmax", "KetRmin", "KetRpos",                  \    "Alt", "Ket", "KetRmax", "KetRmin", "KetRpos",                  \
2175    "Reverse", "Assert", "Assert not", "AssertB", "AssertB not",    \    "Reverse", "Assert", "Assert not", "AssertB", "AssertB not",    \
# Line 2226  in UTF-8 mode. The code that uses this t Line 2239  in UTF-8 mode. The code that uses this t
2239    0,                             /* XCLASS - variable length               */ \    0,                             /* XCLASS - variable length               */ \
2240    1+IMM2_SIZE,                   /* REF                                    */ \    1+IMM2_SIZE,                   /* REF                                    */ \
2241    1+IMM2_SIZE,                   /* REFI                                   */ \    1+IMM2_SIZE,                   /* REFI                                   */ \
2242      1+2*IMM2_SIZE,                 /* DNREF                                  */ \
2243      1+2*IMM2_SIZE,                 /* DNREFI                                 */ \
2244    1+LINK_SIZE,                   /* RECURSE                                */ \    1+LINK_SIZE,                   /* RECURSE                                */ \
2245    2+2*LINK_SIZE,                 /* CALLOUT                                */ \    2+2*LINK_SIZE,                 /* CALLOUT                                */ \
2246    1+LINK_SIZE,                   /* Alt                                    */ \    1+LINK_SIZE,                   /* Alt                                    */ \
# Line 2276  enum { ERR0,  ERR1,  ERR2,  ERR3,  ERR4, Line 2291  enum { ERR0,  ERR1,  ERR2,  ERR3,  ERR4,
2291         ERR40, ERR41, ERR42, ERR43, ERR44, ERR45, ERR46, ERR47, ERR48, ERR49,         ERR40, ERR41, ERR42, ERR43, ERR44, ERR45, ERR46, ERR47, ERR48, ERR49,
2292         ERR50, ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58, ERR59,         ERR50, ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58, ERR59,
2293         ERR60, ERR61, ERR62, ERR63, ERR64, ERR65, ERR66, ERR67, ERR68, ERR69,         ERR60, ERR61, ERR62, ERR63, ERR64, ERR65, ERR66, ERR67, ERR68, ERR69,
2294         ERR70, ERR71, ERR72, ERR73, ERR74, ERR75, ERR76, ERR77, ERRCOUNT };         ERR70, ERR71, ERR72, ERR73, ERR74, ERR75, ERR76, ERR77, ERR78, ERRCOUNT };
2295    
2296  /* JIT compiling modes. The function list is indexed by them. */  /* JIT compiling modes. The function list is indexed by them. */
2297  enum { JIT_COMPILE, JIT_PARTIAL_SOFT_COMPILE, JIT_PARTIAL_HARD_COMPILE,  enum { JIT_COMPILE, JIT_PARTIAL_SOFT_COMPILE, JIT_PARTIAL_HARD_COMPILE,
# Line 2286  enum { JIT_COMPILE, JIT_PARTIAL_SOFT_COM Line 2301  enum { JIT_COMPILE, JIT_PARTIAL_SOFT_COM
2301  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
2302  offset to the name table so that if a regex is compiled on one host, saved, and  offset to the name table so that if a regex is compiled on one host, saved, and
2303  then run on another where the size of pointers is different, all might still  then run on another where the size of pointers is different, all might still
2304  be well. For the case of compiled-on-4 and run-on-8, we include an extra  be well.
 pointer that is always NULL. For future-proofing, a few dummy fields were  
 originally included - even though you can never get this planning right - but  
 there is only one left now.  
   
 NOTE NOTE NOTE:  
 Because people can now save and re-use compiled patterns, any additions to this  
 structure should be made at the end, and something earlier (e.g. a new  
 flag in the options or one of the dummy fields) should indicate that the new  
 fields are present. Currently PCRE always sets the dummy fields to zero.  
 NOTE NOTE NOTE  
 */  
   
 #if defined COMPILE_PCRE8  
 #define REAL_PCRE real_pcre  
 #elif defined COMPILE_PCRE16  
 #define REAL_PCRE real_pcre16  
 #elif defined COMPILE_PCRE32  
 #define REAL_PCRE real_pcre32  
 #endif  
2305    
2306  /* It is necessary to fork the struct for 32 bit, since it needs to use  The size of the structure must be a multiple of 8 bytes. For the case of
2307   * pcre_uchar for first_char and req_char. Can't put an ifdef inside the  compiled-on-4 and run-on-8, we include an extra pointer that is always NULL so
2308   * typedef since pcretest needs access to  the struct of the 8-, 16-  that there are an even number of pointers which therefore are a multiple of 8
2309   * and 32-bit variants. */  bytes.
2310    
2311    It is necessary to fork the struct for the 32 bit library, since it needs to
2312    use pcre_uint32 for first_char and req_char. We can't put an ifdef inside the
2313    typedef because pcretest needs access to the struct of the 8-, 16- and 32-bit
2314    variants.
2315    
2316    *** WARNING ***
2317    When new fields are added to these structures, remember to adjust the code in
2318    pcre_byte_order.c that is concerned with swapping the byte order of the fields
2319    when a compiled regex is reloaded on a host with different endianness.
2320    *** WARNING ***
2321    There is also similar byte-flipping code in pcretest.c, which is used for
2322    testing the byte-flipping features. It must also be kept in step.
2323    *** WARNING ***
2324    */
2325    
2326  typedef struct real_pcre8_or_16 {  typedef struct real_pcre8_or_16 {
2327    pcre_uint32 magic_number;    pcre_uint32 magic_number;
2328    pcre_uint32 size;               /* Total that was malloced */    pcre_uint32 size;               /* Total that was malloced */
2329    pcre_uint32 options;            /* Public options */    pcre_uint32 options;            /* Public options */
2330    pcre_uint16 flags;              /* Private flags */    pcre_uint32 flags;              /* Private flags */
2331      pcre_uint32 limit_match;        /* Limit set from regex */
2332      pcre_uint32 limit_recursion;    /* Limit set from regex */
2333      pcre_uint16 first_char;         /* Starting character */
2334      pcre_uint16 req_char;           /* This character must be seen */
2335    pcre_uint16 max_lookbehind;     /* Longest lookbehind (characters) */    pcre_uint16 max_lookbehind;     /* Longest lookbehind (characters) */
2336    pcre_uint16 top_bracket;        /* Highest numbered group */    pcre_uint16 top_bracket;        /* Highest numbered group */
2337    pcre_uint16 top_backref;        /* Highest numbered back reference */    pcre_uint16 top_backref;        /* Highest numbered back reference */
   pcre_uint16 first_char;         /* Starting character */  
   pcre_uint16 req_char;           /* This character must be seen */  
2338    pcre_uint16 name_table_offset;  /* Offset to name table that follows */    pcre_uint16 name_table_offset;  /* Offset to name table that follows */
2339    pcre_uint16 name_entry_size;    /* Size of any name items */    pcre_uint16 name_entry_size;    /* Size of any name items */
2340    pcre_uint16 name_count;         /* Number of name items */    pcre_uint16 name_count;         /* Number of name items */
2341    pcre_uint16 ref_count;          /* Reference count */    pcre_uint16 ref_count;          /* Reference count */
2342      pcre_uint16 dummy1;             /* To ensure size is a multiple of 8 */
2343      pcre_uint16 dummy2;             /* To ensure size is a multiple of 8 */
2344      pcre_uint16 dummy3;             /* To ensure size is a multiple of 8 */
2345    const pcre_uint8 *tables;       /* Pointer to tables or NULL for std */    const pcre_uint8 *tables;       /* Pointer to tables or NULL for std */
2346    const pcre_uint8 *nullpad;      /* NULL padding */    void             *nullpad;      /* NULL padding */
2347  } real_pcre8_or_16;  } real_pcre8_or_16;
2348    
2349  typedef struct real_pcre8_or_16 real_pcre;  typedef struct real_pcre8_or_16 real_pcre;
# Line 2337  typedef struct real_pcre32 { Line 2353  typedef struct real_pcre32 {
2353    pcre_uint32 magic_number;    pcre_uint32 magic_number;
2354    pcre_uint32 size;               /* Total that was malloced */    pcre_uint32 size;               /* Total that was malloced */
2355    pcre_uint32 options;            /* Public options */    pcre_uint32 options;            /* Public options */
2356    pcre_uint16 flags;              /* Private flags */    pcre_uint32 flags;              /* Private flags */
2357      pcre_uint32 limit_match;        /* Limit set from regex */
2358      pcre_uint32 limit_recursion;    /* Limit set from regex */
2359      pcre_uint32 first_char;         /* Starting character */
2360      pcre_uint32 req_char;           /* This character must be seen */
2361    pcre_uint16 max_lookbehind;     /* Longest lookbehind (characters) */    pcre_uint16 max_lookbehind;     /* Longest lookbehind (characters) */
2362    pcre_uint16 top_bracket;        /* Highest numbered group */    pcre_uint16 top_bracket;        /* Highest numbered group */
2363    pcre_uint16 top_backref;        /* Highest numbered back reference */    pcre_uint16 top_backref;        /* Highest numbered back reference */
   pcre_uint32 first_char;         /* Starting character */  
   pcre_uint32 req_char;           /* This character must be seen */  
2364    pcre_uint16 name_table_offset;  /* Offset to name table that follows */    pcre_uint16 name_table_offset;  /* Offset to name table that follows */
2365    pcre_uint16 name_entry_size;    /* Size of any name items */    pcre_uint16 name_entry_size;    /* Size of any name items */
2366    pcre_uint16 name_count;         /* Number of name items */    pcre_uint16 name_count;         /* Number of name items */
2367    pcre_uint16 ref_count;          /* Reference count */    pcre_uint16 ref_count;          /* Reference count */
2368    pcre_uint16 dummy1;             /* for later expansion */    pcre_uint16 dummy;              /* To ensure size is a multiple of 8 */
   pcre_uint16 dummy2;             /* for later expansion */  
2369    const pcre_uint8 *tables;       /* Pointer to tables or NULL for std */    const pcre_uint8 *tables;       /* Pointer to tables or NULL for std */
2370    void *nullpad;                  /* for later expansion */    void             *nullpad;      /* NULL padding */
2371  } real_pcre32;  } real_pcre32;
2372    
2373    #if defined COMPILE_PCRE8
2374    #define REAL_PCRE real_pcre
2375    #elif defined COMPILE_PCRE16
2376    #define REAL_PCRE real_pcre16
2377    #elif defined COMPILE_PCRE32
2378    #define REAL_PCRE real_pcre32
2379    #endif
2380    
2381  /* Assert that the size of REAL_PCRE is divisible by 8 */  /* Assert that the size of REAL_PCRE is divisible by 8 */
2382  typedef int __assert_real_pcre_size_divisible_8[(sizeof(REAL_PCRE) % 8) == 0 ? 1 : -1];  typedef int __assert_real_pcre_size_divisible_8[(sizeof(REAL_PCRE) % 8) == 0 ? 1 : -1];
2383    
# Line 2386  typedef struct open_capitem { Line 2411  typedef struct open_capitem {
2411    pcre_uint16 flag;             /* Set TRUE if recursive back ref */    pcre_uint16 flag;             /* Set TRUE if recursive back ref */
2412  } open_capitem;  } open_capitem;
2413    
2414    /* Structure for building a list of named groups during the first pass of
2415    compiling. */
2416    
2417    typedef struct named_group {
2418      const pcre_uchar  *name;          /* Points to the name in the pattern */
2419      int                length;        /* Length of the name */
2420      pcre_uint32        number;        /* Group number */
2421    } named_group;
2422    
2423  /* Structure for passing "static" information around between the functions  /* Structure for passing "static" information around between the functions
2424  doing the compiling, so that they are thread-safe. */  doing the compiling, so that they are thread-safe. */
2425    
# Line 2398  typedef struct compile_data { Line 2432  typedef struct compile_data {
2432    const pcre_uchar *start_code;     /* The start of the compiled code */    const pcre_uchar *start_code;     /* The start of the compiled code */
2433    const pcre_uchar *start_pattern;  /* The start of the pattern */    const pcre_uchar *start_pattern;  /* The start of the pattern */
2434    const pcre_uchar *end_pattern;    /* The end of the pattern */    const pcre_uchar *end_pattern;    /* The end of the pattern */
   open_capitem *open_caps;          /* Chain of open capture items */  
2435    pcre_uchar *hwm;                  /* High watermark of workspace */    pcre_uchar *hwm;                  /* High watermark of workspace */
2436      open_capitem *open_caps;          /* Chain of open capture items */
2437      named_group *named_groups;        /* Points to vector in pre-compile */
2438    pcre_uchar *name_table;           /* The name/number table */    pcre_uchar *name_table;           /* The name/number table */
2439    int  names_found;                 /* Number of entries so far */    int  names_found;                 /* Number of entries so far */
2440    int  name_entry_size;             /* Size of each entry */    int  name_entry_size;             /* Size of each entry */
2441      int  named_group_list_size;       /* Number of entries in the list */
2442    int  workspace_size;              /* Size of workspace */    int  workspace_size;              /* Size of workspace */
2443    unsigned int  bracount;           /* Count of capturing parens as we compile */    unsigned int bracount;            /* Count of capturing parens as we compile */
2444    int  final_bracount;              /* Saved value after first pass */    int  final_bracount;              /* Saved value after first pass */
2445    int  max_lookbehind;              /* Maximum lookbehind (characters) */    int  max_lookbehind;              /* Maximum lookbehind (characters) */
2446    int  top_backref;                 /* Maximum back reference */    int  top_backref;                 /* Maximum back reference */
2447    unsigned int backref_map;         /* Bitmap of low back refs */    unsigned int backref_map;         /* Bitmap of low back refs */
2448      unsigned int namedrefcount;       /* Number of backreferences by name */
2449    int  assert_depth;                /* Depth of nested assertions */    int  assert_depth;                /* Depth of nested assertions */
2450    int  external_options;            /* External (initial) options */    pcre_uint32 external_options;     /* External (initial) options */
2451    int  external_flags;              /* External flag bits to be set */    pcre_uint32 external_flags;       /* External flag bits to be set */
2452    int  req_varyopt;                 /* "After variable item" flag for reqbyte */    int  req_varyopt;                 /* "After variable item" flag for reqbyte */
2453    BOOL had_accept;                  /* (*ACCEPT) encountered */    BOOL had_accept;                  /* (*ACCEPT) encountered */
2454    BOOL had_pruneorskip;             /* (*PRUNE) or (*SKIP) encountered */    BOOL had_pruneorskip;             /* (*PRUNE) or (*SKIP) encountered */
2455    BOOL check_lookbehind;            /* Lookbehinds need later checking */    BOOL check_lookbehind;            /* Lookbehinds need later checking */
2456      BOOL dupnames;                    /* Duplicate names exist */
2457    int  nltype;                      /* Newline type */    int  nltype;                      /* Newline type */
2458    int  nllen;                       /* Newline string length */    int  nllen;                       /* Newline string length */
2459    pcre_uchar nl[4];                 /* Newline string when fixed length */    pcre_uchar nl[4];                 /* Newline string when fixed length */
# Line 2437  typedef struct recursion_info { Line 2475  typedef struct recursion_info {
2475    unsigned int group_num;         /* Number of group that was called */    unsigned int group_num;         /* Number of group that was called */
2476    int *offset_save;               /* Pointer to start of saved offsets */    int *offset_save;               /* Pointer to start of saved offsets */
2477    int saved_max;                  /* Number of saved offsets */    int saved_max;                  /* Number of saved offsets */
2478      int saved_capture_last;         /* Last capture number */
2479    PCRE_PUCHAR subject_position;   /* Position at start of recursion */    PCRE_PUCHAR subject_position;   /* Position at start of recursion */
2480  } recursion_info;  } recursion_info;
2481    
# Line 2473  typedef struct match_data { Line 2512  typedef struct match_data {
2512    int    nllen;                   /* Newline string length */    int    nllen;                   /* Newline string length */
2513    int    name_count;              /* Number of names in name table */    int    name_count;              /* Number of names in name table */
2514    int    name_entry_size;         /* Size of entry in names table */    int    name_entry_size;         /* Size of entry in names table */
2515      unsigned int skip_arg_count;    /* For counting SKIP_ARGs */
2516      unsigned int ignore_skip_arg;   /* For re-run when SKIP arg name not found */
2517    pcre_uchar *name_table;         /* Table of names */    pcre_uchar *name_table;         /* Table of names */
2518    pcre_uchar nl[4];               /* Newline string when fixed */    pcre_uchar nl[4];               /* Newline string when fixed */
2519    const  pcre_uint8 *lcc;         /* Points to lower casing table */    const  pcre_uint8 *lcc;         /* Points to lower casing table */
2520    const  pcre_uint8 *fcc;         /* Points to case-flipping table */    const  pcre_uint8 *fcc;         /* Points to case-flipping table */
2521    const  pcre_uint8 *ctypes;      /* Points to table of type maps */    const  pcre_uint8 *ctypes;      /* Points to table of type maps */
   BOOL   offset_overflow;         /* Set if too many extractions */  
2522    BOOL   notbol;                  /* NOTBOL flag */    BOOL   notbol;                  /* NOTBOL flag */
2523    BOOL   noteol;                  /* NOTEOL flag */    BOOL   noteol;                  /* NOTEOL flag */
2524    BOOL   utf;                     /* UTF-8 / UTF-16 flag */    BOOL   utf;                     /* UTF-8 / UTF-16 flag */
# Line 2490  typedef struct match_data { Line 2530  typedef struct match_data {
2530    BOOL   hitend;                  /* Hit the end of the subject at some point */    BOOL   hitend;                  /* Hit the end of the subject at some point */
2531    BOOL   bsr_anycrlf;             /* \R is just any CRLF, not full Unicode */    BOOL   bsr_anycrlf;             /* \R is just any CRLF, not full Unicode */
2532    BOOL   hasthen;                 /* Pattern contains (*THEN) */    BOOL   hasthen;                 /* Pattern contains (*THEN) */
   BOOL   ignore_skip_arg;         /* For re-run when SKIP name not found */  
2533    const  pcre_uchar *start_code;  /* For use when recursing */    const  pcre_uchar *start_code;  /* For use when recursing */
2534    PCRE_PUCHAR start_subject;      /* Start of the subject string */    PCRE_PUCHAR start_subject;      /* Start of the subject string */
2535    PCRE_PUCHAR end_subject;        /* End of the subject string */    PCRE_PUCHAR end_subject;        /* End of the subject string */
# Line 2499  typedef struct match_data { Line 2538  typedef struct match_data {
2538    PCRE_PUCHAR start_used_ptr;     /* Earliest consulted character */    PCRE_PUCHAR start_used_ptr;     /* Earliest consulted character */
2539    int    partial;                 /* PARTIAL options */    int    partial;                 /* PARTIAL options */
2540    int    end_offset_top;          /* Highwater mark at end of match */    int    end_offset_top;          /* Highwater mark at end of match */
2541    int    capture_last;            /* Most recent capture number */    pcre_int32 capture_last;        /* Most recent capture number + overflow flag */
2542    int    start_offset;            /* The start offset value */    int    start_offset;            /* The start offset value */
2543    int    match_function_type;     /* Set for certain special calls of MATCH() */    int    match_function_type;     /* Set for certain special calls of MATCH() */
2544    eptrblock *eptrchain;           /* Chain of eptrblocks for tail recursions */    eptrblock *eptrchain;           /* Chain of eptrblocks for tail recursions */
# Line 2701  extern BOOL              PRIV(xclass)(pc Line 2740  extern BOOL              PRIV(xclass)(pc
2740  #ifdef SUPPORT_JIT  #ifdef SUPPORT_JIT
2741  extern void              PRIV(jit_compile)(const REAL_PCRE *,  extern void              PRIV(jit_compile)(const REAL_PCRE *,
2742                             PUBL(extra) *, int);                             PUBL(extra) *, int);
2743  extern int               PRIV(jit_exec)(const REAL_PCRE *, const PUBL(extra) *,  extern int               PRIV(jit_exec)(const PUBL(extra) *,
2744                             const pcre_uchar *, int, int, int, int *, int);                             const pcre_uchar *, int, int, int, int *, int);
2745  extern void              PRIV(jit_free)(void *);  extern void              PRIV(jit_free)(void *);
2746  extern int               PRIV(jit_get_size)(void *);  extern int               PRIV(jit_get_size)(void *);

Legend:
Removed from v.1160  
changed lines
  Added in v.1361

  ViewVC Help
Powered by ViewVC 1.1.5