/[pcre]/code/branches/pcre16/pcre_internal.h
ViewVC logotype

Diff of /code/branches/pcre16/pcre_internal.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 483 by ph10, Mon Jan 4 16:19:17 2010 UTC revision 510 by ph10, Sat Mar 27 17:45:29 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 872  so that PCRE works on both ASCII and EBC Line 875  so that PCRE works on both ASCII and EBC
875  #define STRING_COMMIT0              "COMMIT\0"  #define STRING_COMMIT0              "COMMIT\0"
876  #define STRING_F0                   "F\0"  #define STRING_F0                   "F\0"
877  #define STRING_FAIL0                "FAIL\0"  #define STRING_FAIL0                "FAIL\0"
878    #define STRING_MARK0                "MARK\0"
879  #define STRING_PRUNE0               "PRUNE\0"  #define STRING_PRUNE0               "PRUNE\0"
880  #define STRING_SKIP0                "SKIP\0"  #define STRING_SKIP0                "SKIP\0"
881  #define STRING_THEN                 "THEN"  #define STRING_THEN                 "THEN"
# Line 1124  only. */ Line 1128  only. */
1128  #define STRING_COMMIT0              STR_C STR_O STR_M STR_M STR_I STR_T "\0"  #define STRING_COMMIT0              STR_C STR_O STR_M STR_M STR_I STR_T "\0"
1129  #define STRING_F0                   STR_F "\0"  #define STRING_F0                   STR_F "\0"
1130  #define STRING_FAIL0                STR_F STR_A STR_I STR_L "\0"  #define STRING_FAIL0                STR_F STR_A STR_I STR_L "\0"
1131    #define STRING_MARK0                STR_M STR_A STR_R STR_K "\0"
1132  #define STRING_PRUNE0               STR_P STR_R STR_U STR_N STR_E "\0"  #define STRING_PRUNE0               STR_P STR_R STR_U STR_N STR_E "\0"
1133  #define STRING_SKIP0                STR_S STR_K STR_I STR_P "\0"  #define STRING_SKIP0                STR_S STR_K STR_I STR_P "\0"
1134  #define STRING_THEN                 STR_T STR_H STR_E STR_N  #define STRING_THEN                 STR_T STR_H STR_E STR_N
# Line 1375  enum { Line 1380  enum {
1380    
1381    /* These are backtracking control verbs */    /* These are backtracking control verbs */
1382    
1383    OP_PRUNE,          /* 107 */    OP_MARK,           /* 107 always has an argument */
1384    OP_SKIP,           /* 108 */    OP_PRUNE,          /* 108 */
1385    OP_THEN,           /* 109 */    OP_PRUNE_ARG,      /* 109 same, but with argument */
1386    OP_COMMIT,         /* 110 */    OP_SKIP,           /* 110 */
1387      OP_SKIP_ARG,       /* 111 same, but with argument */
1388      OP_THEN,           /* 112 */
1389      OP_THEN_ARG,       /* 113 same, but with argument */
1390      OP_COMMIT,         /* 114 */
1391    
1392    /* These are forced failure and success verbs */    /* These are forced failure and success verbs */
1393    
1394    OP_FAIL,           /* 111 */    OP_FAIL,           /* 115 */
1395    OP_ACCEPT,         /* 112 */    OP_ACCEPT,         /* 116 */
1396    OP_CLOSE,          /* 113 Used before OP_ACCEPT to close open captures */    OP_CLOSE,          /* 117 Used before OP_ACCEPT to close open captures */
1397    
1398    /* This is used to skip a subpattern with a {0} quantifier */    /* This is used to skip a subpattern with a {0} quantifier */
1399    
1400    OP_SKIPZERO        /* 114 */    OP_SKIPZERO,       /* 118 */
1401    
1402      /* This is not an opcode, but is used to check that tables indexed by opcode
1403      are the correct length, in order to catch updating errors - there have been
1404      some in the past. */
1405    
1406      OP_TABLE_LENGTH
1407  };  };
1408    
1409  /* *** NOTE NOTE NOTE *** Whenever the list above is updated, the two macro  /* *** NOTE NOTE NOTE *** Whenever the list above is updated, the two macro
1410  definitions that follow must also be updated to match. There are also tables  definitions that follow must also be updated to match. There are also tables
1411  called "coptable" cna "poptable" in pcre_dfa_exec.c that must be updated. */  called "coptable" and "poptable" in pcre_dfa_exec.c that must be updated. */
1412    
1413    
1414  /* This macro defines textual names for all the opcodes. These are used only  /* This macro defines textual names for all the opcodes. These are used only
# Line 1418  for debugging. The macro is referenced o Line 1433  for debugging. The macro is referenced o
1433    "Once", "Bra", "CBra", "Cond", "SBra", "SCBra", "SCond",        \    "Once", "Bra", "CBra", "Cond", "SBra", "SCBra", "SCond",        \
1434    "Cond ref", "Cond nref", "Cond rec", "Cond nrec", "Cond def",   \    "Cond ref", "Cond nref", "Cond rec", "Cond nrec", "Cond def",   \
1435    "Brazero", "Braminzero",                                        \    "Brazero", "Braminzero",                                        \
1436    "*PRUNE", "*SKIP", "*THEN", "*COMMIT", "*FAIL", "*ACCEPT",      \    "*MARK", "*PRUNE", "*PRUNE", "*SKIP", "*SKIP",                  \
1437      "*THEN", "*THEN", "*COMMIT", "*FAIL", "*ACCEPT",                \
1438    "Close", "Skip zero"    "Close", "Skip zero"
1439    
1440    
# Line 1436  in UTF-8 mode. The code that uses this t Line 1452  in UTF-8 mode. The code that uses this t
1452    1, 1, 1, 1, 1,                 /* \A, \G, \K, \B, \b                     */ \    1, 1, 1, 1, 1,                 /* \A, \G, \K, \B, \b                     */ \
1453    1, 1, 1, 1, 1, 1,              /* \D, \d, \S, \s, \W, \w                 */ \    1, 1, 1, 1, 1, 1,              /* \D, \d, \S, \s, \W, \w                 */ \
1454    1, 1, 1,                       /* Any, AllAny, Anybyte                   */ \    1, 1, 1,                       /* Any, AllAny, Anybyte                   */ \
1455    3, 3, 1,                       /* NOTPROP, PROP, EXTUNI                  */ \    3, 3,                          /* \P, \p                                 */ \
1456    1, 1, 1, 1, 1,                 /* \R, \H, \h, \V, \v                     */ \    1, 1, 1, 1, 1,                 /* \R, \H, \h, \V, \v                     */ \
1457      1,                             /* \X                                     */ \
1458    1, 1, 2, 1, 1,                 /* \Z, \z, Opt, ^, $                      */ \    1, 1, 2, 1, 1,                 /* \Z, \z, Opt, ^, $                      */ \
1459    2,                             /* Char  - the minimum length             */ \    2,                             /* Char  - the minimum length             */ \
1460    2,                             /* Charnc  - the minimum length           */ \    2,                             /* Charnc  - the minimum length           */ \
# Line 1483  in UTF-8 mode. The code that uses this t Line 1500  in UTF-8 mode. The code that uses this t
1500    3, 3,                          /* RREF, NRREF                            */ \    3, 3,                          /* RREF, NRREF                            */ \
1501    1,                             /* DEF                                    */ \    1,                             /* DEF                                    */ \
1502    1, 1,                          /* BRAZERO, BRAMINZERO                    */ \    1, 1,                          /* BRAZERO, BRAMINZERO                    */ \
1503    1, 1, 1, 1,                    /* PRUNE, SKIP, THEN, COMMIT,             */ \    3, 1, 3,                       /* MARK, PRUNE, PRUNE_ARG,                */ \
1504    1, 1, 3, 1                     /* FAIL, ACCEPT, CLOSE, SKIPZERO          */    1, 3, 1, 3,                    /* SKIP, SKIP_ARG, THEN, THEN_ARG,        */ \
1505      1, 1, 1, 3, 1                  /* COMMIT, FAIL, ACCEPT, CLOSE, SKIPZERO  */
1506    
1507    
1508  /* A magic value for OP_RREF and OP_NRREF to indicate the "any recursion"  /* A magic value for OP_RREF and OP_NRREF to indicate the "any recursion"
# Line 1492  condition. */ Line 1510  condition. */
1510    
1511  #define RREF_ANY  0xffff  #define RREF_ANY  0xffff
1512    
1513  /* 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
1514  tracked. */  easily be tracked. When a new number is added, the table called eint in
1515    pcreposix.c must be updated. */
1516    
1517  enum { ERR0,  ERR1,  ERR2,  ERR3,  ERR4,  ERR5,  ERR6,  ERR7,  ERR8,  ERR9,  enum { ERR0,  ERR1,  ERR2,  ERR3,  ERR4,  ERR5,  ERR6,  ERR7,  ERR8,  ERR9,
1518         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 1520  enum { ERR0,  ERR1,  ERR2,  ERR3,  ERR4,
1520         ERR30, ERR31, ERR32, ERR33, ERR34, ERR35, ERR36, ERR37, ERR38, ERR39,         ERR30, ERR31, ERR32, ERR33, ERR34, ERR35, ERR36, ERR37, ERR38, ERR39,
1521         ERR40, ERR41, ERR42, ERR43, ERR44, ERR45, ERR46, ERR47, ERR48, ERR49,         ERR40, ERR41, ERR42, ERR43, ERR44, ERR45, ERR46, ERR47, ERR48, ERR49,
1522         ERR50, ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58, ERR59,         ERR50, ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58, ERR59,
1523         ERR60, ERR61, ERR62, ERR63, ERR64, ERR65 };         ERR60, ERR61, ERR62, ERR63, ERR64, ERR65, ERR66, ERRCOUNT };
1524    
1525  /* 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
1526  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 1570  typedef struct pcre_study_data {
1570    
1571  /* Structure for building a chain of open capturing subpatterns during  /* Structure for building a chain of open capturing subpatterns during
1572  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
1573  encountered. */  encountered. This is also used to identify subpatterns that contain recursive
1574    back references to themselves, so that they can be made atomic. */
1575    
1576  typedef struct open_capitem {  typedef struct open_capitem {
1577    struct open_capitem *next;    /* Chain link */    struct open_capitem *next;    /* Chain link */
1578    pcre_uint16 number;           /* Capture number */    pcre_uint16 number;           /* Capture number */
1579      pcre_uint16 flag;             /* Set TRUE if recursive back ref */
1580  } open_capitem;  } open_capitem;
1581    
1582  /* 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 1625  typedef struct recursion_info {
1625    struct recursion_info *prevrec; /* Previous recursion record (or NULL) */    struct recursion_info *prevrec; /* Previous recursion record (or NULL) */
1626    int group_num;                /* Number of group that was called */    int group_num;                /* Number of group that was called */
1627    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 */  
1628    int *offset_save;             /* Pointer to start of saved offsets */    int *offset_save;             /* Pointer to start of saved offsets */
1629    int saved_max;                /* Number of saved offsets */    int saved_max;                /* Number of saved offsets */
1630    int save_offset_top;          /* Current value of offset_top */    int save_offset_top;          /* Current value of offset_top */
# Line 1662  typedef struct match_data { Line 1682  typedef struct match_data {
1682    int    eptrn;                 /* Next free eptrblock */    int    eptrn;                 /* Next free eptrblock */
1683    recursion_info *recursive;    /* Linked list of recursion data */    recursion_info *recursive;    /* Linked list of recursion data */
1684    void  *callout_data;          /* To pass back to callouts */    void  *callout_data;          /* To pass back to callouts */
1685      const uschar *mark;           /* Mark pointer to pass back */
1686  } match_data;  } match_data;
1687    
1688  /* A similar structure is used for the same purpose by the DFA matching  /* A similar structure is used for the same purpose by the DFA matching

Legend:
Removed from v.483  
changed lines
  Added in v.510

  ViewVC Help
Powered by ViewVC 1.1.5