/[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 475 by ph10, Sat Jan 2 18:21:30 2010 UTC revision 507 by ph10, Wed Mar 10 16:08:01 2010 UTC
# Line 184  preprocessor time in standard C environm Line 184  preprocessor time in standard C environm
184    #error Cannot determine a type for 32-bit unsigned integers    #error Cannot determine a type for 32-bit unsigned integers
185  #endif  #endif
186    
187  /* When checking for integer overflow in pcre_compile(), we need to handle  /* When checking for integer overflow in pcre_compile(), we need to handle
188  large integers. If a 64-bit integer type is available, we can use that.  large integers. If a 64-bit integer type is available, we can use that.
189  Otherwise we have to cast to double, which of course requires floating point  Otherwise we have to cast to double, which of course requires floating point
190  arithmetic. Handle this by defining a macro for the appropriate type. If  arithmetic. Handle this by defining a macro for the appropriate type. If
191  stdint.h is available, include it; it may define INT64_MAX. The macro int64_t  stdint.h is available, include it; it may define INT64_MAX. Systems that do not
192  may be set by "configure". */  have stdint.h (e.g. Solaris) may have inttypes.h. The macro int64_t may be set
193    by "configure". */
194    
195  #if HAVE_STDINT_H  #if HAVE_STDINT_H
196  #include <stdint.h>  #include <stdint.h>
197    #elif HAVE_INTTYPES_H
198    #include <inttypes.h>
199  #endif  #endif
200    
201  #if defined INT64_MAX || defined int64_t  #if defined INT64_MAX || defined int64_t
# Line 1388  enum { Line 1391  enum {
1391    
1392    /* This is used to skip a subpattern with a {0} quantifier */    /* This is used to skip a subpattern with a {0} quantifier */
1393    
1394    OP_SKIPZERO        /* 114 */    OP_SKIPZERO,       /* 114 */
1395    
1396      /* This is not an opcode, but is used to check that tables indexed by opcode
1397      are the correct length, in order to catch updating errors - there have been
1398      some in the past. */
1399    
1400      OP_TABLE_LENGTH
1401  };  };
1402    
1403  /* *** NOTE NOTE NOTE *** Whenever the list above is updated, the two macro  /* *** NOTE NOTE NOTE *** Whenever the list above is updated, the two macro
# Line 1436  in UTF-8 mode. The code that uses this t Line 1445  in UTF-8 mode. The code that uses this t
1445    1, 1, 1, 1, 1,                 /* \A, \G, \K, \B, \b                     */ \    1, 1, 1, 1, 1,                 /* \A, \G, \K, \B, \b                     */ \
1446    1, 1, 1, 1, 1, 1,              /* \D, \d, \S, \s, \W, \w                 */ \    1, 1, 1, 1, 1, 1,              /* \D, \d, \S, \s, \W, \w                 */ \
1447    1, 1, 1,                       /* Any, AllAny, Anybyte                   */ \    1, 1, 1,                       /* Any, AllAny, Anybyte                   */ \
1448    3, 3, 1,                       /* NOTPROP, PROP, EXTUNI                  */ \    3, 3,                          /* \P, \p                                 */ \
1449    1, 1, 1, 1, 1,                 /* \R, \H, \h, \V, \v                     */ \    1, 1, 1, 1, 1,                 /* \R, \H, \h, \V, \v                     */ \
1450      1,                             /* \X                                     */ \
1451    1, 1, 2, 1, 1,                 /* \Z, \z, Opt, ^, $                      */ \    1, 1, 2, 1, 1,                 /* \Z, \z, Opt, ^, $                      */ \
1452    2,                             /* Char  - the minimum length             */ \    2,                             /* Char  - the minimum length             */ \
1453    2,                             /* Charnc  - the minimum length           */ \    2,                             /* Charnc  - the minimum length           */ \
# Line 1492  condition. */ Line 1502  condition. */
1502    
1503  #define RREF_ANY  0xffff  #define RREF_ANY  0xffff
1504    
1505  /* Error code numbers. They are given names so that they can more easily be  /* Compile time error code numbers. They are given names so that they can more
1506  tracked. */  easily be tracked. When a new number is added, the table called eint in
1507    pcreposix.c must be updated. */
1508    
1509  enum { ERR0,  ERR1,  ERR2,  ERR3,  ERR4,  ERR5,  ERR6,  ERR7,  ERR8,  ERR9,  enum { ERR0,  ERR1,  ERR2,  ERR3,  ERR4,  ERR5,  ERR6,  ERR7,  ERR8,  ERR9,
1510         ERR10, ERR11, ERR12, ERR13, ERR14, ERR15, ERR16, ERR17, ERR18, ERR19,         ERR10, ERR11, ERR12, ERR13, ERR14, ERR15, ERR16, ERR17, ERR18, ERR19,
# Line 1501  enum { ERR0,  ERR1,  ERR2,  ERR3,  ERR4, Line 1512  enum { ERR0,  ERR1,  ERR2,  ERR3,  ERR4,
1512         ERR30, ERR31, ERR32, ERR33, ERR34, ERR35, ERR36, ERR37, ERR38, ERR39,         ERR30, ERR31, ERR32, ERR33, ERR34, ERR35, ERR36, ERR37, ERR38, ERR39,
1513         ERR40, ERR41, ERR42, ERR43, ERR44, ERR45, ERR46, ERR47, ERR48, ERR49,         ERR40, ERR41, ERR42, ERR43, ERR44, ERR45, ERR46, ERR47, ERR48, ERR49,
1514         ERR50, ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58, ERR59,         ERR50, ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58, ERR59,
1515         ERR60, ERR61, ERR62, ERR63, ERR64, ERR65 };         ERR60, ERR61, ERR62, ERR63, ERR64, ERR65, ERRCOUNT };
1516    
1517  /* The real format of the start of the pcre block; the index of names and the  /* The real format of the start of the pcre block; the index of names and the
1518  code vector run on as long as necessary after the end. We store an explicit  code vector run on as long as necessary after the end. We store an explicit
# Line 1551  typedef struct pcre_study_data { Line 1562  typedef struct pcre_study_data {
1562    
1563  /* Structure for building a chain of open capturing subpatterns during  /* Structure for building a chain of open capturing subpatterns during
1564  compiling, so that instructions to close them can be compiled when (*ACCEPT) is  compiling, so that instructions to close them can be compiled when (*ACCEPT) is
1565  encountered. */  encountered. This is also used to identify subpatterns that contain recursive
1566    back references to themselves, so that they can be made atomic. */
1567    
1568  typedef struct open_capitem {  typedef struct open_capitem {
1569    struct open_capitem *next;    /* Chain link */    struct open_capitem *next;    /* Chain link */
1570    pcre_uint16 number;           /* Capture number */    pcre_uint16 number;           /* Capture number */
1571      pcre_uint16 flag;             /* Set TRUE if recursive back ref */
1572  } open_capitem;  } open_capitem;
1573    
1574  /* Structure for passing "static" information around between the functions  /* Structure for passing "static" information around between the functions
# Line 1604  typedef struct recursion_info { Line 1617  typedef struct recursion_info {
1617    struct recursion_info *prevrec; /* Previous recursion record (or NULL) */    struct recursion_info *prevrec; /* Previous recursion record (or NULL) */
1618    int group_num;                /* Number of group that was called */    int group_num;                /* Number of group that was called */
1619    const uschar *after_call;     /* "Return value": points after the call in the expr */    const uschar *after_call;     /* "Return value": points after the call in the expr */
   USPTR save_start;             /* Old value of mstart */  
1620    int *offset_save;             /* Pointer to start of saved offsets */    int *offset_save;             /* Pointer to start of saved offsets */
1621    int saved_max;                /* Number of saved offsets */    int saved_max;                /* Number of saved offsets */
1622    int save_offset_top;          /* Current value of offset_top */    int save_offset_top;          /* Current value of offset_top */
# Line 1753  one of the exported public functions. Th Line 1765  one of the exported public functions. Th
1765  sense, but are not part of the PCRE public API. */  sense, but are not part of the PCRE public API. */
1766    
1767  extern const uschar *_pcre_find_bracket(const uschar *, BOOL, int);  extern const uschar *_pcre_find_bracket(const uschar *, BOOL, int);
1768  extern BOOL          _pcre_is_newline(const uschar *, int, const uschar *,  extern BOOL          _pcre_is_newline(USPTR, int, USPTR, int *, BOOL);
                        int *, BOOL);  
1769  extern int           _pcre_ord2utf8(int, uschar *);  extern int           _pcre_ord2utf8(int, uschar *);
1770  extern real_pcre    *_pcre_try_flipped(const real_pcre *, real_pcre *,  extern real_pcre    *_pcre_try_flipped(const real_pcre *, real_pcre *,
1771                         const pcre_study_data *, pcre_study_data *);                         const pcre_study_data *, pcre_study_data *);
1772  extern int           _pcre_valid_utf8(const uschar *, int);  extern int           _pcre_valid_utf8(USPTR, int);
1773  extern BOOL          _pcre_was_newline(const uschar *, int, const uschar *,  extern BOOL          _pcre_was_newline(USPTR, int, USPTR, int *, BOOL);
                        int *, BOOL);  
1774  extern BOOL          _pcre_xclass(int, const uschar *);  extern BOOL          _pcre_xclass(int, const uschar *);
1775    
1776    

Legend:
Removed from v.475  
changed lines
  Added in v.507

  ViewVC Help
Powered by ViewVC 1.1.5