/[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 1248 by ph10, Wed Feb 13 17:36:38 2013 UTC revision 1359 by ph10, Tue Sep 3 10:10:59 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 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    #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 1164  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 1534  a positive value. */ Line 1546  a positive value. */
1546  #define STRING_UTF_RIGHTPAR            "UTF)"  #define STRING_UTF_RIGHTPAR            "UTF)"
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 1795  only. */ Line 1809  only. */
1809  #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
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 1835  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 2270  enum { ERR0,  ERR1,  ERR2,  ERR3,  ERR4, Line 2287  enum { ERR0,  ERR1,  ERR2,  ERR3,  ERR4,
2287         ERR40, ERR41, ERR42, ERR43, ERR44, ERR45, ERR46, ERR47, ERR48, ERR49,         ERR40, ERR41, ERR42, ERR43, ERR44, ERR45, ERR46, ERR47, ERR48, ERR49,
2288         ERR50, ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58, ERR59,         ERR50, ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58, ERR59,
2289         ERR60, ERR61, ERR62, ERR63, ERR64, ERR65, ERR66, ERR67, ERR68, ERR69,         ERR60, ERR61, ERR62, ERR63, ERR64, ERR65, ERR66, ERR67, ERR68, ERR69,
2290         ERR70, ERR71, ERR72, ERR73, ERR74, ERR75, ERR76, ERR77, ERRCOUNT };         ERR70, ERR71, ERR72, ERR73, ERR74, ERR75, ERR76, ERR77, ERR78, ERRCOUNT };
2291    
2292  /* JIT compiling modes. The function list is indexed by them. */  /* JIT compiling modes. The function list is indexed by them. */
2293  enum { JIT_COMPILE, JIT_PARTIAL_SOFT_COMPILE, JIT_PARTIAL_HARD_COMPILE,  enum { JIT_COMPILE, JIT_PARTIAL_SOFT_COMPILE, JIT_PARTIAL_HARD_COMPILE,
# Line 2280  enum { JIT_COMPILE, JIT_PARTIAL_SOFT_COM Line 2297  enum { JIT_COMPILE, JIT_PARTIAL_SOFT_COM
2297  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
2298  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
2299  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
2300  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  
2301    
2302  /* 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
2303   * 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
2304   * 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
2305   * and 32-bit variants. */  bytes.
2306    
2307    It is necessary to fork the struct for the 32 bit library, since it needs to
2308    use pcre_uint32 for first_char and req_char. We can't put an ifdef inside the
2309    typedef because pcretest needs access to the struct of the 8-, 16- and 32-bit
2310    variants.
2311    
2312    *** WARNING ***
2313    When new fields are added to these structures, remember to adjust the code in
2314    pcre_byte_order.c that is concerned with swapping the byte order of the fields
2315    when a compiled regex is reloaded on a host with different endianness.
2316    *** WARNING ***
2317    There is also similar byte-flipping code in pcretest.c, which is used for
2318    testing the byte-flipping features. It must also be kept in step.
2319    *** WARNING ***
2320    */
2321    
2322  typedef struct real_pcre8_or_16 {  typedef struct real_pcre8_or_16 {
2323    pcre_uint32 magic_number;    pcre_uint32 magic_number;
2324    pcre_uint32 size;               /* Total that was malloced */    pcre_uint32 size;               /* Total that was malloced */
2325    pcre_uint32 options;            /* Public options */    pcre_uint32 options;            /* Public options */
2326    pcre_uint16 flags;              /* Private flags */    pcre_uint32 flags;              /* Private flags */
2327      pcre_uint32 limit_match;        /* Limit set from regex */
2328      pcre_uint32 limit_recursion;    /* Limit set from regex */
2329      pcre_uint16 first_char;         /* Starting character */
2330      pcre_uint16 req_char;           /* This character must be seen */
2331    pcre_uint16 max_lookbehind;     /* Longest lookbehind (characters) */    pcre_uint16 max_lookbehind;     /* Longest lookbehind (characters) */
2332    pcre_uint16 top_bracket;        /* Highest numbered group */    pcre_uint16 top_bracket;        /* Highest numbered group */
2333    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 */  
2334    pcre_uint16 name_table_offset;  /* Offset to name table that follows */    pcre_uint16 name_table_offset;  /* Offset to name table that follows */
2335    pcre_uint16 name_entry_size;    /* Size of any name items */    pcre_uint16 name_entry_size;    /* Size of any name items */
2336    pcre_uint16 name_count;         /* Number of name items */    pcre_uint16 name_count;         /* Number of name items */
2337    pcre_uint16 ref_count;          /* Reference count */    pcre_uint16 ref_count;          /* Reference count */
2338      pcre_uint16 dummy1;             /* To ensure size is a multiple of 8 */
2339      pcre_uint16 dummy2;             /* To ensure size is a multiple of 8 */
2340      pcre_uint16 dummy3;             /* To ensure size is a multiple of 8 */
2341    const pcre_uint8 *tables;       /* Pointer to tables or NULL for std */    const pcre_uint8 *tables;       /* Pointer to tables or NULL for std */
2342    const pcre_uint8 *nullpad;      /* NULL padding */    void             *nullpad;      /* NULL padding */
2343  } real_pcre8_or_16;  } real_pcre8_or_16;
2344    
2345  typedef struct real_pcre8_or_16 real_pcre;  typedef struct real_pcre8_or_16 real_pcre;
# Line 2331  typedef struct real_pcre32 { Line 2349  typedef struct real_pcre32 {
2349    pcre_uint32 magic_number;    pcre_uint32 magic_number;
2350    pcre_uint32 size;               /* Total that was malloced */    pcre_uint32 size;               /* Total that was malloced */
2351    pcre_uint32 options;            /* Public options */    pcre_uint32 options;            /* Public options */
2352    pcre_uint16 flags;              /* Private flags */    pcre_uint32 flags;              /* Private flags */
2353      pcre_uint32 limit_match;        /* Limit set from regex */
2354      pcre_uint32 limit_recursion;    /* Limit set from regex */
2355      pcre_uint32 first_char;         /* Starting character */
2356      pcre_uint32 req_char;           /* This character must be seen */
2357    pcre_uint16 max_lookbehind;     /* Longest lookbehind (characters) */    pcre_uint16 max_lookbehind;     /* Longest lookbehind (characters) */
2358    pcre_uint16 top_bracket;        /* Highest numbered group */    pcre_uint16 top_bracket;        /* Highest numbered group */
2359    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 */  
2360    pcre_uint16 name_table_offset;  /* Offset to name table that follows */    pcre_uint16 name_table_offset;  /* Offset to name table that follows */
2361    pcre_uint16 name_entry_size;    /* Size of any name items */    pcre_uint16 name_entry_size;    /* Size of any name items */
2362    pcre_uint16 name_count;         /* Number of name items */    pcre_uint16 name_count;         /* Number of name items */
2363    pcre_uint16 ref_count;          /* Reference count */    pcre_uint16 ref_count;          /* Reference count */
2364    pcre_uint16 dummy1;             /* for later expansion */    pcre_uint16 dummy;              /* To ensure size is a multiple of 8 */
   pcre_uint16 dummy2;             /* for later expansion */  
2365    const pcre_uint8 *tables;       /* Pointer to tables or NULL for std */    const pcre_uint8 *tables;       /* Pointer to tables or NULL for std */
2366    void *nullpad;                  /* for later expansion */    void             *nullpad;      /* NULL padding */
2367  } real_pcre32;  } real_pcre32;
2368    
2369    #if defined COMPILE_PCRE8
2370    #define REAL_PCRE real_pcre
2371    #elif defined COMPILE_PCRE16
2372    #define REAL_PCRE real_pcre16
2373    #elif defined COMPILE_PCRE32
2374    #define REAL_PCRE real_pcre32
2375    #endif
2376    
2377  /* Assert that the size of REAL_PCRE is divisible by 8 */  /* Assert that the size of REAL_PCRE is divisible by 8 */
2378  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];
2379    
# Line 2380  typedef struct open_capitem { Line 2407  typedef struct open_capitem {
2407    pcre_uint16 flag;             /* Set TRUE if recursive back ref */    pcre_uint16 flag;             /* Set TRUE if recursive back ref */
2408  } open_capitem;  } open_capitem;
2409    
2410    /* Structure for building a list of named groups during the first pass of
2411    compiling. */
2412    
2413    typedef struct named_group {
2414      const pcre_uchar  *name;          /* Points to the name in the pattern */
2415      int                length;        /* Length of the name */
2416      pcre_uint32        number;        /* Group number */
2417    } named_group;
2418    
2419  /* Structure for passing "static" information around between the functions  /* Structure for passing "static" information around between the functions
2420  doing the compiling, so that they are thread-safe. */  doing the compiling, so that they are thread-safe. */
2421    
# Line 2392  typedef struct compile_data { Line 2428  typedef struct compile_data {
2428    const pcre_uchar *start_code;     /* The start of the compiled code */    const pcre_uchar *start_code;     /* The start of the compiled code */
2429    const pcre_uchar *start_pattern;  /* The start of the pattern */    const pcre_uchar *start_pattern;  /* The start of the pattern */
2430    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 */  
2431    pcre_uchar *hwm;                  /* High watermark of workspace */    pcre_uchar *hwm;                  /* High watermark of workspace */
2432      open_capitem *open_caps;          /* Chain of open capture items */
2433      named_group *named_groups;        /* Points to vector in pre-compile */
2434    pcre_uchar *name_table;           /* The name/number table */    pcre_uchar *name_table;           /* The name/number table */
2435    int  names_found;                 /* Number of entries so far */    int  names_found;                 /* Number of entries so far */
2436    int  name_entry_size;             /* Size of each entry */    int  name_entry_size;             /* Size of each entry */
2437      int  named_group_list_size;       /* Number of entries in the list */
2438    int  workspace_size;              /* Size of workspace */    int  workspace_size;              /* Size of workspace */
2439    unsigned int  bracount;           /* Count of capturing parens as we compile */    unsigned int bracount;            /* Count of capturing parens as we compile */
2440    int  final_bracount;              /* Saved value after first pass */    int  final_bracount;              /* Saved value after first pass */
2441    int  max_lookbehind;              /* Maximum lookbehind (characters) */    int  max_lookbehind;              /* Maximum lookbehind (characters) */
2442    int  top_backref;                 /* Maximum back reference */    int  top_backref;                 /* Maximum back reference */
2443    unsigned int backref_map;         /* Bitmap of low back refs */    unsigned int backref_map;         /* Bitmap of low back refs */
2444    int  assert_depth;                /* Depth of nested assertions */    int  assert_depth;                /* Depth of nested assertions */
2445    int  external_options;            /* External (initial) options */    pcre_uint32 external_options;     /* External (initial) options */
2446    int  external_flags;              /* External flag bits to be set */    pcre_uint32 external_flags;       /* External flag bits to be set */
2447    int  req_varyopt;                 /* "After variable item" flag for reqbyte */    int  req_varyopt;                 /* "After variable item" flag for reqbyte */
2448    BOOL had_accept;                  /* (*ACCEPT) encountered */    BOOL had_accept;                  /* (*ACCEPT) encountered */
2449    BOOL had_pruneorskip;             /* (*PRUNE) or (*SKIP) encountered */    BOOL had_pruneorskip;             /* (*PRUNE) or (*SKIP) encountered */
# Line 2431  typedef struct recursion_info { Line 2469  typedef struct recursion_info {
2469    unsigned int group_num;         /* Number of group that was called */    unsigned int group_num;         /* Number of group that was called */
2470    int *offset_save;               /* Pointer to start of saved offsets */    int *offset_save;               /* Pointer to start of saved offsets */
2471    int saved_max;                  /* Number of saved offsets */    int saved_max;                  /* Number of saved offsets */
2472    int saved_capture_last;         /* Last capture number */    int saved_capture_last;         /* Last capture number */
2473    PCRE_PUCHAR subject_position;   /* Position at start of recursion */    PCRE_PUCHAR subject_position;   /* Position at start of recursion */
2474  } recursion_info;  } recursion_info;
2475    
# Line 2468  typedef struct match_data { Line 2506  typedef struct match_data {
2506    int    nllen;                   /* Newline string length */    int    nllen;                   /* Newline string length */
2507    int    name_count;              /* Number of names in name table */    int    name_count;              /* Number of names in name table */
2508    int    name_entry_size;         /* Size of entry in names table */    int    name_entry_size;         /* Size of entry in names table */
2509      unsigned int skip_arg_count;    /* For counting SKIP_ARGs */
2510      unsigned int ignore_skip_arg;   /* For re-run when SKIP arg name not found */
2511    pcre_uchar *name_table;         /* Table of names */    pcre_uchar *name_table;         /* Table of names */
2512    pcre_uchar nl[4];               /* Newline string when fixed */    pcre_uchar nl[4];               /* Newline string when fixed */
2513    const  pcre_uint8 *lcc;         /* Points to lower casing table */    const  pcre_uint8 *lcc;         /* Points to lower casing table */
# Line 2484  typedef struct match_data { Line 2524  typedef struct match_data {
2524    BOOL   hitend;                  /* Hit the end of the subject at some point */    BOOL   hitend;                  /* Hit the end of the subject at some point */
2525    BOOL   bsr_anycrlf;             /* \R is just any CRLF, not full Unicode */    BOOL   bsr_anycrlf;             /* \R is just any CRLF, not full Unicode */
2526    BOOL   hasthen;                 /* Pattern contains (*THEN) */    BOOL   hasthen;                 /* Pattern contains (*THEN) */
   BOOL   ignore_skip_arg;         /* For re-run when SKIP name not found */  
2527    const  pcre_uchar *start_code;  /* For use when recursing */    const  pcre_uchar *start_code;  /* For use when recursing */
2528    PCRE_PUCHAR start_subject;      /* Start of the subject string */    PCRE_PUCHAR start_subject;      /* Start of the subject string */
2529    PCRE_PUCHAR end_subject;        /* End of the subject string */    PCRE_PUCHAR end_subject;        /* End of the subject string */

Legend:
Removed from v.1248  
changed lines
  Added in v.1359

  ViewVC Help
Powered by ViewVC 1.1.5