/[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 1312 by ph10, Fri Apr 5 15:35:59 2013 UTC revision 1313 by ph10, Wed Apr 24 12:07:09 2013 UTC
# 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 1121  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    
1153  #if defined COMPILE_PCRE8  #if defined COMPILE_PCRE8
1154  #define PCRE_MODE          PCRE_MODE8  #define PCRE_MODE          PCRE_MODE8
# Line 1534  a positive value. */ Line 1545  a positive value. */
1545  #define STRING_UTF_RIGHTPAR            "UTF)"  #define STRING_UTF_RIGHTPAR            "UTF)"
1546  #define STRING_UCP_RIGHTPAR            "UCP)"  #define STRING_UCP_RIGHTPAR            "UCP)"
1547  #define STRING_NO_START_OPT_RIGHTPAR   "NO_START_OPT)"  #define STRING_NO_START_OPT_RIGHTPAR   "NO_START_OPT)"
1548    #define STRING_LIMIT_MATCH_EQ          "LIMIT_MATCH="
1549    #define STRING_LIMIT_RECURSION_EQ      "LIMIT_RECURSION="
1550    
1551  #else  /* SUPPORT_UTF */  #else  /* SUPPORT_UTF */
1552    
# Line 1795  only. */ Line 1808  only. */
1808  #define STRING_UTF_RIGHTPAR            STR_U STR_T STR_F STR_RIGHT_PARENTHESIS  #define STRING_UTF_RIGHTPAR            STR_U STR_T STR_F STR_RIGHT_PARENTHESIS
1809  #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
1810  #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
1811    #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
1812    #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
1813    
1814  #endif  /* SUPPORT_UTF */  #endif  /* SUPPORT_UTF */
1815    
# Line 2281  enum { JIT_COMPILE, JIT_PARTIAL_SOFT_COM Line 2296  enum { JIT_COMPILE, JIT_PARTIAL_SOFT_COM
2296  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
2297  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
2298  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
2299  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  
2300    
2301  /* 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
2302   * 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
2303   * 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
2304   * and 32-bit variants. */  bytes.
2305    
2306    It is necessary to fork the struct for the 32 bit library, since it needs to
2307    use pcre_uint32 for first_char and req_char. We can't put an ifdef inside the
2308    typedef because pcretest needs access to the struct of the 8-, 16- and 32-bit
2309    variants.
2310    
2311    *** WARNING ***
2312    When new fields are added to these structures, remember to adjust the code in
2313    pcre_byte_order.c that is concerned with swapping the byte order of the fields
2314    when a compiled regex is reloaded on a host with different endianness.
2315    *** WARNING ***
2316    There is also similar byte-flipping code in pcretest.c, which is used for
2317    testing the byte-flipping features. It must also be kept in step.
2318    *** WARNING ***
2319    */
2320    
2321  typedef struct real_pcre8_or_16 {  typedef struct real_pcre8_or_16 {
2322    pcre_uint32 magic_number;    pcre_uint32 magic_number;
2323    pcre_uint32 size;               /* Total that was malloced */    pcre_uint32 size;               /* Total that was malloced */
2324    pcre_uint32 options;            /* Public options */    pcre_uint32 options;            /* Public options */
2325    pcre_uint16 flags;              /* Private flags */    pcre_uint32 flags;              /* Private flags */
2326      pcre_uint32 limit_match;        /* Limit set from regex */
2327      pcre_uint32 limit_recursion;    /* Limit set from regex */
2328      pcre_uint16 first_char;         /* Starting character */
2329      pcre_uint16 req_char;           /* This character must be seen */
2330    pcre_uint16 max_lookbehind;     /* Longest lookbehind (characters) */    pcre_uint16 max_lookbehind;     /* Longest lookbehind (characters) */
2331    pcre_uint16 top_bracket;        /* Highest numbered group */    pcre_uint16 top_bracket;        /* Highest numbered group */
2332    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 */  
2333    pcre_uint16 name_table_offset;  /* Offset to name table that follows */    pcre_uint16 name_table_offset;  /* Offset to name table that follows */
2334    pcre_uint16 name_entry_size;    /* Size of any name items */    pcre_uint16 name_entry_size;    /* Size of any name items */
2335    pcre_uint16 name_count;         /* Number of name items */    pcre_uint16 name_count;         /* Number of name items */
2336    pcre_uint16 ref_count;          /* Reference count */    pcre_uint16 ref_count;          /* Reference count */
2337      pcre_uint16 dummy1;             /* To ensure size is a multiple of 8 */
2338      pcre_uint16 dummy2;             /* To ensure size is a multiple of 8 */
2339      pcre_uint16 dummy3;             /* To ensure size is a multiple of 8 */
2340    const pcre_uint8 *tables;       /* Pointer to tables or NULL for std */    const pcre_uint8 *tables;       /* Pointer to tables or NULL for std */
2341    const pcre_uint8 *nullpad;      /* NULL padding */    void             *nullpad;      /* NULL padding */
2342  } real_pcre8_or_16;  } real_pcre8_or_16;
2343    
2344  typedef struct real_pcre8_or_16 real_pcre;  typedef struct real_pcre8_or_16 real_pcre;
# Line 2332  typedef struct real_pcre32 { Line 2348  typedef struct real_pcre32 {
2348    pcre_uint32 magic_number;    pcre_uint32 magic_number;
2349    pcre_uint32 size;               /* Total that was malloced */    pcre_uint32 size;               /* Total that was malloced */
2350    pcre_uint32 options;            /* Public options */    pcre_uint32 options;            /* Public options */
2351    pcre_uint16 flags;              /* Private flags */    pcre_uint32 flags;              /* Private flags */
2352      pcre_uint32 limit_match;        /* Limit set from regex */
2353      pcre_uint32 limit_recursion;    /* Limit set from regex */
2354      pcre_uint32 first_char;         /* Starting character */
2355      pcre_uint32 req_char;           /* This character must be seen */
2356    pcre_uint16 max_lookbehind;     /* Longest lookbehind (characters) */    pcre_uint16 max_lookbehind;     /* Longest lookbehind (characters) */
2357    pcre_uint16 top_bracket;        /* Highest numbered group */    pcre_uint16 top_bracket;        /* Highest numbered group */
2358    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 */  
2359    pcre_uint16 name_table_offset;  /* Offset to name table that follows */    pcre_uint16 name_table_offset;  /* Offset to name table that follows */
2360    pcre_uint16 name_entry_size;    /* Size of any name items */    pcre_uint16 name_entry_size;    /* Size of any name items */
2361    pcre_uint16 name_count;         /* Number of name items */    pcre_uint16 name_count;         /* Number of name items */
2362    pcre_uint16 ref_count;          /* Reference count */    pcre_uint16 ref_count;          /* Reference count */
2363    pcre_uint16 dummy1;             /* for later expansion */    pcre_uint16 dummy;              /* To ensure size is a multiple of 8 */
   pcre_uint16 dummy2;             /* for later expansion */  
2364    const pcre_uint8 *tables;       /* Pointer to tables or NULL for std */    const pcre_uint8 *tables;       /* Pointer to tables or NULL for std */
2365    void *nullpad;                  /* for later expansion */    void             *nullpad;      /* NULL padding */
2366  } real_pcre32;  } real_pcre32;
2367    
2368    #if defined COMPILE_PCRE8
2369    #define REAL_PCRE real_pcre
2370    #elif defined COMPILE_PCRE16
2371    #define REAL_PCRE real_pcre16
2372    #elif defined COMPILE_PCRE32
2373    #define REAL_PCRE real_pcre32
2374    #endif
2375    
2376  /* Assert that the size of REAL_PCRE is divisible by 8 */  /* Assert that the size of REAL_PCRE is divisible by 8 */
2377  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];
2378    
# Line 2399  typedef struct compile_data { Line 2424  typedef struct compile_data {
2424    int  names_found;                 /* Number of entries so far */    int  names_found;                 /* Number of entries so far */
2425    int  name_entry_size;             /* Size of each entry */    int  name_entry_size;             /* Size of each entry */
2426    int  workspace_size;              /* Size of workspace */    int  workspace_size;              /* Size of workspace */
2427    unsigned int  bracount;           /* Count of capturing parens as we compile */    unsigned int bracount;            /* Count of capturing parens as we compile */
2428    int  final_bracount;              /* Saved value after first pass */    int  final_bracount;              /* Saved value after first pass */
2429    int  max_lookbehind;              /* Maximum lookbehind (characters) */    int  max_lookbehind;              /* Maximum lookbehind (characters) */
2430    int  top_backref;                 /* Maximum back reference */    int  top_backref;                 /* Maximum back reference */
2431    unsigned int backref_map;         /* Bitmap of low back refs */    unsigned int backref_map;         /* Bitmap of low back refs */
2432    int  assert_depth;                /* Depth of nested assertions */    int  assert_depth;                /* Depth of nested assertions */
2433    int  external_options;            /* External (initial) options */    pcre_uint32 external_options;     /* External (initial) options */
2434    int  external_flags;              /* External flag bits to be set */    pcre_uint32 external_flags;       /* External flag bits to be set */
2435    int  req_varyopt;                 /* "After variable item" flag for reqbyte */    int  req_varyopt;                 /* "After variable item" flag for reqbyte */
2436    BOOL had_accept;                  /* (*ACCEPT) encountered */    BOOL had_accept;                  /* (*ACCEPT) encountered */
2437    BOOL had_pruneorskip;             /* (*PRUNE) or (*SKIP) encountered */    BOOL had_pruneorskip;             /* (*PRUNE) or (*SKIP) encountered */

Legend:
Removed from v.1312  
changed lines
  Added in v.1313

  ViewVC Help
Powered by ViewVC 1.1.5