/[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 602 by ph10, Wed May 25 08:29:03 2011 UTC revision 691 by ph10, Sun Sep 11 14:31:21 2011 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-2010 University of Cambridge             Copyright (c) 1997-2011 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 582  Standard C system should have one. */ Line 582  Standard C system should have one. */
582  #endif  #endif
583    
584    
 /* These are the public options that can change during matching. */  
   
 #define PCRE_IMS (PCRE_CASELESS|PCRE_MULTILINE|PCRE_DOTALL)  
   
585  /* Private flags containing information about the compiled regex. They used to  /* Private flags containing information about the compiled regex. They used to
586  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 now they
587  are in a 16-bit flags word. From release 8.00, PCRE_NOPARTIAL is unused, as  are in a 16-bit flags word. From release 8.00, PCRE_NOPARTIAL is unused, as
# Line 599  compatibility. */ Line 595  compatibility. */
595  #define PCRE_JCHANGED      0x0010  /* j option used in regex */  #define PCRE_JCHANGED      0x0010  /* j option used in regex */
596  #define PCRE_HASCRORLF     0x0020  /* explicit \r or \n in pattern */  #define PCRE_HASCRORLF     0x0020  /* explicit \r or \n in pattern */
597    
598  /* Options for the "extra" block produced by pcre_study(). */  /* Flags for the "extra" block produced by pcre_study(). */
599    
600  #define PCRE_STUDY_MAPPED   0x01     /* a map of starting chars exists */  #define PCRE_STUDY_MAPPED  0x0001  /* a map of starting chars exists */
601  #define PCRE_STUDY_MINLEN   0x02     /* a minimum length field exists */  #define PCRE_STUDY_MINLEN  0x0002  /* a minimum length field exists */
602    
603  /* Masks for identifying the public options that are permitted at compile  /* Masks for identifying the public options that are permitted at compile
604  time, run time, or study time, respectively. */  time, run time, or study time, respectively. */
# Line 628  time, run time, or study time, respectiv Line 624  time, run time, or study time, respectiv
624     PCRE_DFA_RESTART|PCRE_NEWLINE_BITS|PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE| \     PCRE_DFA_RESTART|PCRE_NEWLINE_BITS|PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE| \
625     PCRE_NO_START_OPTIMIZE)     PCRE_NO_START_OPTIMIZE)
626    
627  #define PUBLIC_STUDY_OPTIONS 0   /* None defined */  #define PUBLIC_STUDY_OPTIONS \
628       PCRE_STUDY_JIT_COMPILE
629    
630  /* Magic number to provide a small check against being handed junk. Also used  /* Magic number to provide a small check against being handed junk. Also used
631  to detect whether a pattern was compiled on a host of different endianness. */  to detect whether a pattern was compiled on a host of different endianness. */
# Line 1325  enum { Line 1322  enum {
1322    
1323    /* The following sets of 13 opcodes must always be kept in step because    /* The following sets of 13 opcodes must always be kept in step because
1324    the offset from the first one is used to generate the others. */    the offset from the first one is used to generate the others. */
1325    
1326    /**** Single characters, caseful, must precede the caseless ones ****/    /**** Single characters, caseful, must precede the caseless ones ****/
1327    
1328    OP_STAR,           /* 33 The maximizing and minimizing versions of */    OP_STAR,           /* 33 The maximizing and minimizing versions of */
# Line 1345  enum { Line 1342  enum {
1342    OP_POSUPTO,        /* 45 Possessified upto, caseful */    OP_POSUPTO,        /* 45 Possessified upto, caseful */
1343    
1344    /**** Single characters, caseless, must follow the caseful ones */    /**** Single characters, caseless, must follow the caseful ones */
1345    
1346    OP_STARI,          /* 46 */    OP_STARI,          /* 46 */
1347    OP_MINSTARI,       /* 47 */    OP_MINSTARI,       /* 47 */
1348    OP_PLUSI,          /* 48 */    OP_PLUSI,          /* 48 */
# Line 1382  enum { Line 1379  enum {
1379    OP_NOTPOSUPTO,     /* 71 */    OP_NOTPOSUPTO,     /* 71 */
1380    
1381    /**** Negated single character, caseless; must follow the caseful ones ****/    /**** Negated single character, caseless; must follow the caseful ones ****/
1382    
1383    OP_NOTSTARI,       /* 72 */    OP_NOTSTARI,       /* 72 */
1384    OP_NOTMINSTARI,    /* 73 */    OP_NOTMINSTARI,    /* 73 */
1385    OP_NOTPLUSI,       /* 74 */    OP_NOTPLUSI,       /* 74 */
# Line 1400  enum { Line 1397  enum {
1397    OP_NOTPOSUPTOI,    /* 84 */    OP_NOTPOSUPTOI,    /* 84 */
1398    
1399    /**** Character types ****/    /**** Character types ****/
1400    
1401    OP_TYPESTAR,       /* 85 The maximizing and minimizing versions of */    OP_TYPESTAR,       /* 85 The maximizing and minimizing versions of */
1402    OP_TYPEMINSTAR,    /* 86 these six opcodes must come in pairs, with */    OP_TYPEMINSTAR,    /* 86 these six opcodes must come in pairs, with */
1403    OP_TYPEPLUS,       /* 87 the minimizing one second. These codes must */    OP_TYPEPLUS,       /* 87 the minimizing one second. These codes must */
# Line 1418  enum { Line 1415  enum {
1415    OP_TYPEPOSUPTO,    /* 97 */    OP_TYPEPOSUPTO,    /* 97 */
1416    
1417    /* These are used for character classes and back references; only the    /* These are used for character classes and back references; only the
1418    first six are the same as the sets above. */    first six are the same as the sets above. */
1419    
1420    OP_CRSTAR,         /* 98 The maximizing and minimizing versions of */    OP_CRSTAR,         /* 98 The maximizing and minimizing versions of */
1421    OP_CRMINSTAR,      /* 99 all these opcodes must come in pairs, with */    OP_CRMINSTAR,      /* 99 all these opcodes must come in pairs, with */
# Line 1447  enum { Line 1444  enum {
1444    OP_KET,            /* 114 End of group that doesn't have an unbounded repeat */    OP_KET,            /* 114 End of group that doesn't have an unbounded repeat */
1445    OP_KETRMAX,        /* 115 These two must remain together and in this */    OP_KETRMAX,        /* 115 These two must remain together and in this */
1446    OP_KETRMIN,        /* 116 order. They are for groups the repeat for ever. */    OP_KETRMIN,        /* 116 order. They are for groups the repeat for ever. */
1447      OP_KETRPOS,        /* 117 Possessive unlimited repeat. */
1448    
1449    /* The assertions must come before BRA, CBRA, ONCE, and COND.*/    /* The assertions must come before BRA, CBRA, ONCE, and COND, and the four
1450      asserts must remain in order. */
1451    
1452    OP_ASSERT,         /* 117 Positive lookahead */    OP_REVERSE,        /* 118 Move pointer back - used in lookbehind assertions */
1453    OP_ASSERT_NOT,     /* 118 Negative lookahead */    OP_ASSERT,         /* 119 Positive lookahead */
1454    OP_ASSERTBACK,     /* 119 Positive lookbehind */    OP_ASSERT_NOT,     /* 120 Negative lookahead */
1455    OP_ASSERTBACK_NOT, /* 120 Negative lookbehind */    OP_ASSERTBACK,     /* 121 Positive lookbehind */
1456    OP_REVERSE,        /* 121 Move pointer back - used in lookbehind assertions */    OP_ASSERTBACK_NOT, /* 122 Negative lookbehind */
1457    
1458    /* ONCE, BRA, CBRA, and COND must come after the assertions, with ONCE first,    /* ONCE, BRA, BRAPOS, CBRA, CBRAPOS, and COND must come immediately after the
1459    as there's a test for >= ONCE for a subpattern that isn't an assertion. */    assertions, with ONCE first, as there's a test for >= ONCE for a subpattern
1460      that isn't an assertion. The POS versions must immediately follow the non-POS
1461    OP_ONCE,           /* 122 Atomic group */    versions in each case. */
1462    OP_BRA,            /* 123 Start of non-capturing bracket */  
1463    OP_CBRA,           /* 124 Start of capturing bracket */    OP_ONCE,           /* 123 Atomic group */
1464    OP_COND,           /* 125 Conditional group */    OP_BRA,            /* 124 Start of non-capturing bracket */
1465      OP_BRAPOS,         /* 125 Ditto, with unlimited, possessive repeat */
1466      OP_CBRA,           /* 126 Start of capturing bracket */
1467      OP_CBRAPOS,        /* 127 Ditto, with unlimited, possessive repeat */
1468      OP_COND,           /* 128 Conditional group */
1469    
1470    /* These three must follow the previous three, in the same order. There's a    /* These five must follow the previous five, in the same order. There's a
1471    check for >= SBRA to distinguish the two sets. */    check for >= SBRA to distinguish the two sets. */
1472    
1473    OP_SBRA,           /* 126 Start of non-capturing bracket, check empty  */    OP_SBRA,           /* 129 Start of non-capturing bracket, check empty  */
1474    OP_SCBRA,          /* 127 Start of capturing bracket, check empty */    OP_SBRAPOS,        /* 130 Ditto, with unlimited, possessive repeat */
1475    OP_SCOND,          /* 128 Conditional group, check empty */    OP_SCBRA,          /* 131 Start of capturing bracket, check empty */
1476      OP_SCBRAPOS,       /* 132 Ditto, with unlimited, possessive repeat */
1477      OP_SCOND,          /* 133 Conditional group, check empty */
1478    
1479    /* The next two pairs must (respectively) be kept together. */    /* The next two pairs must (respectively) be kept together. */
1480    
1481    OP_CREF,           /* 129 Used to hold a capture number as condition */    OP_CREF,           /* 134 Used to hold a capture number as condition */
1482    OP_NCREF,          /* 130 Same, but generated by a name reference*/    OP_NCREF,          /* 135 Same, but generated by a name reference*/
1483    OP_RREF,           /* 131 Used to hold a recursion number as condition */    OP_RREF,           /* 136 Used to hold a recursion number as condition */
1484    OP_NRREF,          /* 132 Same, but generated by a name reference*/    OP_NRREF,          /* 137 Same, but generated by a name reference*/
1485    OP_DEF,            /* 133 The DEFINE condition */    OP_DEF,            /* 138 The DEFINE condition */
1486    
1487    OP_BRAZERO,        /* 134 These two must remain together and in this */    OP_BRAZERO,        /* 139 These two must remain together and in this */
1488    OP_BRAMINZERO,     /* 135 order. */    OP_BRAMINZERO,     /* 140 order. */
1489      OP_BRAPOSZERO,     /* 141 */
1490    
1491    /* These are backtracking control verbs */    /* These are backtracking control verbs */
1492    
1493    OP_MARK,           /* 136 always has an argument */    OP_MARK,           /* 142 always has an argument */
1494    OP_PRUNE,          /* 137 */    OP_PRUNE,          /* 143 */
1495    OP_PRUNE_ARG,      /* 138 same, but with argument */    OP_PRUNE_ARG,      /* 144 same, but with argument */
1496    OP_SKIP,           /* 139 */    OP_SKIP,           /* 145 */
1497    OP_SKIP_ARG,       /* 140 same, but with argument */    OP_SKIP_ARG,       /* 146 same, but with argument */
1498    OP_THEN,           /* 141 */    OP_THEN,           /* 147 */
1499    OP_THEN_ARG,       /* 142 same, but with argument */    OP_THEN_ARG,       /* 148 same, but with argument */
1500    OP_COMMIT,         /* 143 */    OP_COMMIT,         /* 149 */
1501    
1502    /* These are forced failure and success verbs */    /* These are forced failure and success verbs */
1503    
1504    OP_FAIL,           /* 144 */    OP_FAIL,           /* 150 */
1505    OP_ACCEPT,         /* 145 */    OP_ACCEPT,         /* 151 */
1506    OP_CLOSE,          /* 146 Used before OP_ACCEPT to close open captures */    OP_ASSERT_ACCEPT,  /* 152 Used inside assertions */
1507      OP_CLOSE,          /* 153 Used before OP_ACCEPT to close open captures */
1508    
1509    /* This is used to skip a subpattern with a {0} quantifier */    /* This is used to skip a subpattern with a {0} quantifier */
1510    
1511    OP_SKIPZERO,       /* 147 */    OP_SKIPZERO,       /* 154 */
1512    
1513    /* 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
1514    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 1517  called "coptable" and "poptable" in pcre Line 1524  called "coptable" and "poptable" in pcre
1524    
1525  /* 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
1526  for debugging, and some of them are only partial names. The macro is referenced  for debugging, and some of them are only partial names. The macro is referenced
1527  only in pcre_printint.c, which fills out the full names in many cases (and in  only in pcre_printint.c, which fills out the full names in many cases (and in
1528  some cases doesn't actually use these names at all). */  some cases doesn't actually use these names at all). */
1529    
1530  #define OP_NAME_LIST \  #define OP_NAME_LIST \
# Line 1543  some cases doesn't actually use these na Line 1550  some cases doesn't actually use these na
1550    "*", "*?", "+", "+?", "?", "??", "{", "{",                      \    "*", "*?", "+", "+?", "?", "??", "{", "{",                      \
1551    "class", "nclass", "xclass", "Ref", "Refi",                     \    "class", "nclass", "xclass", "Ref", "Refi",                     \
1552    "Recurse", "Callout",                                           \    "Recurse", "Callout",                                           \
1553    "Alt", "Ket", "KetRmax", "KetRmin", "Assert", "Assert not",     \    "Alt", "Ket", "KetRmax", "KetRmin", "KetRpos",                  \
1554    "AssertB", "AssertB not", "Reverse",                            \    "Reverse", "Assert", "Assert not", "AssertB", "AssertB not",    \
1555    "Once", "Bra", "CBra", "Cond", "SBra", "SCBra", "SCond",        \    "Once",                                                         \
1556      "Bra", "BraPos", "CBra", "CBraPos",                             \
1557      "Cond",                                                         \
1558      "SBra", "SBraPos", "SCBra", "SCBraPos",                         \
1559      "SCond",                                                        \
1560    "Cond ref", "Cond nref", "Cond rec", "Cond nrec", "Cond def",   \    "Cond ref", "Cond nref", "Cond rec", "Cond nrec", "Cond def",   \
1561    "Brazero", "Braminzero",                                        \    "Brazero", "Braminzero", "Braposzero",                          \
1562    "*MARK", "*PRUNE", "*PRUNE", "*SKIP", "*SKIP",                  \    "*MARK", "*PRUNE", "*PRUNE", "*SKIP", "*SKIP",                  \
1563    "*THEN", "*THEN", "*COMMIT", "*FAIL", "*ACCEPT",                \    "*THEN", "*THEN", "*COMMIT", "*FAIL",                           \
1564      "*ACCEPT", "*ASSERT_ACCEPT",                                    \
1565    "Close", "Skip zero"    "Close", "Skip zero"
1566    
1567    
# Line 1607  in UTF-8 mode. The code that uses this t Line 1619  in UTF-8 mode. The code that uses this t
1619    1+LINK_SIZE,                   /* Ket                                    */ \    1+LINK_SIZE,                   /* Ket                                    */ \
1620    1+LINK_SIZE,                   /* KetRmax                                */ \    1+LINK_SIZE,                   /* KetRmax                                */ \
1621    1+LINK_SIZE,                   /* KetRmin                                */ \    1+LINK_SIZE,                   /* KetRmin                                */ \
1622      1+LINK_SIZE,                   /* KetRpos                                */ \
1623      1+LINK_SIZE,                   /* Reverse                                */ \
1624    1+LINK_SIZE,                   /* Assert                                 */ \    1+LINK_SIZE,                   /* Assert                                 */ \
1625    1+LINK_SIZE,                   /* Assert not                             */ \    1+LINK_SIZE,                   /* Assert not                             */ \
1626    1+LINK_SIZE,                   /* Assert behind                          */ \    1+LINK_SIZE,                   /* Assert behind                          */ \
1627    1+LINK_SIZE,                   /* Assert behind not                      */ \    1+LINK_SIZE,                   /* Assert behind not                      */ \
   1+LINK_SIZE,                   /* Reverse                                */ \  
1628    1+LINK_SIZE,                   /* ONCE                                   */ \    1+LINK_SIZE,                   /* ONCE                                   */ \
1629    1+LINK_SIZE,                   /* BRA                                    */ \    1+LINK_SIZE,                   /* BRA                                    */ \
1630      1+LINK_SIZE,                   /* BRAPOS                                 */ \
1631    3+LINK_SIZE,                   /* CBRA                                   */ \    3+LINK_SIZE,                   /* CBRA                                   */ \
1632      3+LINK_SIZE,                   /* CBRAPOS                                */ \
1633    1+LINK_SIZE,                   /* COND                                   */ \    1+LINK_SIZE,                   /* COND                                   */ \
1634    1+LINK_SIZE,                   /* SBRA                                   */ \    1+LINK_SIZE,                   /* SBRA                                   */ \
1635      1+LINK_SIZE,                   /* SBRAPOS                                */ \
1636    3+LINK_SIZE,                   /* SCBRA                                  */ \    3+LINK_SIZE,                   /* SCBRA                                  */ \
1637      3+LINK_SIZE,                   /* SCBRAPOS                               */ \
1638    1+LINK_SIZE,                   /* SCOND                                  */ \    1+LINK_SIZE,                   /* SCOND                                  */ \
1639    3, 3,                          /* CREF, NCREF                            */ \    3, 3,                          /* CREF, NCREF                            */ \
1640    3, 3,                          /* RREF, NRREF                            */ \    3, 3,                          /* RREF, NRREF                            */ \
1641    1,                             /* DEF                                    */ \    1,                             /* DEF                                    */ \
1642    1, 1,                          /* BRAZERO, BRAMINZERO                    */ \    1, 1, 1,                       /* BRAZERO, BRAMINZERO, BRAPOSZERO        */ \
1643    3, 1, 3,                       /* MARK, PRUNE, PRUNE_ARG                 */ \    3, 1, 3,                       /* MARK, PRUNE, PRUNE_ARG                 */ \
1644    1, 3,                          /* SKIP, SKIP_ARG                         */ \    1, 3,                          /* SKIP, SKIP_ARG                         */ \
1645    1+LINK_SIZE, 3+LINK_SIZE,      /* THEN, THEN_ARG                         */ \    1+LINK_SIZE, 3+LINK_SIZE,      /* THEN, THEN_ARG                         */ \
1646    1, 1, 1, 3, 1                  /* COMMIT, FAIL, ACCEPT, CLOSE, SKIPZERO  */ \    1, 1, 1, 1,                    /* COMMIT, FAIL, ACCEPT, ASSERT_ACCEPT    */ \
1647      3, 1                           /* CLOSE, SKIPZERO  */
1648    
1649  /* 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"
1650  condition. */  condition. */
# Line 1643  enum { ERR0,  ERR1,  ERR2,  ERR3,  ERR4, Line 1661  enum { ERR0,  ERR1,  ERR2,  ERR3,  ERR4,
1661         ERR30, ERR31, ERR32, ERR33, ERR34, ERR35, ERR36, ERR37, ERR38, ERR39,         ERR30, ERR31, ERR32, ERR33, ERR34, ERR35, ERR36, ERR37, ERR38, ERR39,
1662         ERR40, ERR41, ERR42, ERR43, ERR44, ERR45, ERR46, ERR47, ERR48, ERR49,         ERR40, ERR41, ERR42, ERR43, ERR44, ERR45, ERR46, ERR47, ERR48, ERR49,
1663         ERR50, ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58, ERR59,         ERR50, ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58, ERR59,
1664         ERR60, ERR61, ERR62, ERR63, ERR64, ERR65, ERR66, ERR67, ERR68,         ERR60, ERR61, ERR62, ERR63, ERR64, ERR65, ERR66, ERR67, ERR68, ERR69,
1665         ERRCOUNT };         ERRCOUNT };
1666    
1667  /* 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
# Line 1724  typedef struct compile_data { Line 1742  typedef struct compile_data {
1742    int  final_bracount;          /* Saved value after first pass */    int  final_bracount;          /* Saved value after first pass */
1743    int  top_backref;             /* Maximum back reference */    int  top_backref;             /* Maximum back reference */
1744    unsigned int backref_map;     /* Bitmap of low back refs */    unsigned int backref_map;     /* Bitmap of low back refs */
1745      int  assert_depth;            /* Depth of nested assertions */
1746    int  external_options;        /* External (initial) options */    int  external_options;        /* External (initial) options */
1747    int  external_flags;          /* External flag bits to be set */    int  external_flags;          /* External flag bits to be set */
1748    int  req_varyopt;             /* "After variable item" flag for reqbyte */    int  req_varyopt;             /* "After variable item" flag for reqbyte */
# Line 1735  typedef struct compile_data { Line 1754  typedef struct compile_data {
1754  } compile_data;  } compile_data;
1755    
1756  /* Structure for maintaining a chain of pointers to the currently incomplete  /* Structure for maintaining a chain of pointers to the currently incomplete
1757  branches, for testing for left recursion. */  branches, for testing for left recursion while compiling. */
1758    
1759  typedef struct branch_chain {  typedef struct branch_chain {
1760    struct branch_chain *outer;    struct branch_chain *outer;
# Line 1743  typedef struct branch_chain { Line 1762  typedef struct branch_chain {
1762  } branch_chain;  } branch_chain;
1763    
1764  /* Structure for items in a linked list that represents an explicit recursive  /* Structure for items in a linked list that represents an explicit recursive
1765  call within the pattern. */  call within the pattern; used by pcre_exec(). */
1766    
1767  typedef struct recursion_info {  typedef struct recursion_info {
1768    struct recursion_info *prevrec; /* Previous recursion record (or NULL) */    struct recursion_info *prevrec; /* Previous recursion record (or NULL) */
1769    int group_num;                /* Number of group that was called */    int group_num;                  /* Number of group that was called */
1770    const uschar *after_call;     /* "Return value": points after the call in the expr */    int *offset_save;               /* Pointer to start of saved offsets */
1771    int *offset_save;             /* Pointer to start of saved offsets */    int saved_max;                  /* Number of saved offsets */
1772    int saved_max;                /* Number of saved offsets */    USPTR subject_position;         /* Position at start of recursion */
   int save_offset_top;          /* Current value of offset_top */  
1773  } recursion_info;  } recursion_info;
1774    
1775    /* A similar structure for pcre_dfa_exec(). */
1776    
1777    typedef struct dfa_recursion_info {
1778      struct dfa_recursion_info *prevrec;
1779      int group_num;
1780      USPTR subject_position;
1781    } dfa_recursion_info;
1782    
1783  /* Structure for building a chain of data for holding the values of the subject  /* Structure for building a chain of data for holding the values of the subject
1784  pointer at the start of each subpattern, so as to detect when an empty string  pointer at the start of each subpattern, so as to detect when an empty string
1785  has been matched by a subpattern - to break infinite loops. */  has been matched by a subpattern - to break infinite loops; used by
1786    pcre_exec(). */
1787    
1788  typedef struct eptrblock {  typedef struct eptrblock {
1789    struct eptrblock *epb_prev;    struct eptrblock *epb_prev;
# Line 1780  typedef struct match_data { Line 1807  typedef struct match_data {
1807    int    name_entry_size;       /* Size of entry in names table */    int    name_entry_size;       /* Size of entry in names table */
1808    uschar *name_table;           /* Table of names */    uschar *name_table;           /* Table of names */
1809    uschar nl[4];                 /* Newline string when fixed */    uschar nl[4];                 /* Newline string when fixed */
1810    const uschar *lcc;            /* Points to lower casing table */    const  uschar *lcc;           /* Points to lower casing table */
1811    const uschar *ctypes;         /* Points to table of type maps */    const  uschar *ctypes;        /* Points to table of type maps */
1812    BOOL   offset_overflow;       /* Set if too many extractions */    BOOL   offset_overflow;       /* Set if too many extractions */
1813    BOOL   notbol;                /* NOTBOL flag */    BOOL   notbol;                /* NOTBOL flag */
1814    BOOL   noteol;                /* NOTEOL flag */    BOOL   noteol;                /* NOTEOL flag */
# Line 1793  typedef struct match_data { Line 1820  typedef struct match_data {
1820    BOOL   notempty_atstart;      /* Empty string match at start not wanted */    BOOL   notempty_atstart;      /* Empty string match at start not wanted */
1821    BOOL   hitend;                /* Hit the end of the subject at some point */    BOOL   hitend;                /* Hit the end of the subject at some point */
1822    BOOL   bsr_anycrlf;           /* \R is just any CRLF, not full Unicode */    BOOL   bsr_anycrlf;           /* \R is just any CRLF, not full Unicode */
1823    const uschar *start_code;     /* For use when recursing */    const  uschar *start_code;    /* For use when recursing */
1824    USPTR  start_subject;         /* Start of the subject string */    USPTR  start_subject;         /* Start of the subject string */
1825    USPTR  end_subject;           /* End of the subject string */    USPTR  end_subject;           /* End of the subject string */
1826    USPTR  start_match_ptr;       /* Start of matched string */    USPTR  start_match_ptr;       /* Start of matched string */
# Line 1803  typedef struct match_data { Line 1830  typedef struct match_data {
1830    int    end_offset_top;        /* Highwater mark at end of match */    int    end_offset_top;        /* Highwater mark at end of match */
1831    int    capture_last;          /* Most recent capture number */    int    capture_last;          /* Most recent capture number */
1832    int    start_offset;          /* The start offset value */    int    start_offset;          /* The start offset value */
1833      int    match_function_type;   /* Set for certain special calls of MATCH() */
1834    eptrblock *eptrchain;         /* Chain of eptrblocks for tail recursions */    eptrblock *eptrchain;         /* Chain of eptrblocks for tail recursions */
1835    int    eptrn;                 /* Next free eptrblock */    int    eptrn;                 /* Next free eptrblock */
1836    recursion_info *recursive;    /* Linked list of recursion data */    recursion_info *recursive;    /* Linked list of recursion data */
1837    void  *callout_data;          /* To pass back to callouts */    void  *callout_data;          /* To pass back to callouts */
1838    const uschar *mark;           /* Mark pointer to pass back */    const  uschar *mark;          /* Mark pointer to pass back */
1839      const  uschar *once_target;   /* Where to back up to for atomic groups */
1840  } match_data;  } match_data;
1841    
1842  /* 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
1843  functions. */  functions. */
1844    
1845  typedef struct dfa_match_data {  typedef struct dfa_match_data {
1846    const uschar *start_code;     /* Start of the compiled pattern */    const uschar *start_code;      /* Start of the compiled pattern */
1847    const uschar *start_subject;  /* Start of the subject string */    const uschar *start_subject;   /* Start of the subject string */
1848    const uschar *end_subject;    /* End of subject string */    const uschar *end_subject;     /* End of subject string */
1849    const uschar *start_used_ptr; /* Earliest consulted character */    const uschar *start_used_ptr;  /* Earliest consulted character */
1850    const uschar *tables;         /* Character tables */    const uschar *tables;          /* Character tables */
1851    int   start_offset;           /* The start offset value */    int   start_offset;            /* The start offset value */
1852    int   moptions;               /* Match options */    int   moptions;                /* Match options */
1853    int   poptions;               /* Pattern options */    int   poptions;                /* Pattern options */
1854    int    nltype;                /* Newline type */    int    nltype;                 /* Newline type */
1855    int    nllen;                 /* Newline string length */    int    nllen;                  /* Newline string length */
1856    uschar nl[4];                 /* Newline string when fixed */    uschar nl[4];                  /* Newline string when fixed */
1857    void  *callout_data;          /* To pass back to callouts */    void  *callout_data;           /* To pass back to callouts */
1858      dfa_recursion_info *recursive; /* Linked list of recursion data */
1859  } dfa_match_data;  } dfa_match_data;
1860    
1861  /* Bit definitions for entries in the pcre_ctypes table. */  /* Bit definitions for entries in the pcre_ctypes table. */
# Line 1883  extern const int    _pcre_utf8_table2[]; Line 1913  extern const int    _pcre_utf8_table2[];
1913  extern const int    _pcre_utf8_table3[];  extern const int    _pcre_utf8_table3[];
1914  extern const uschar _pcre_utf8_table4[];  extern const uschar _pcre_utf8_table4[];
1915    
1916    #ifdef SUPPORT_JIT
1917    extern const uschar _pcre_utf8_char_sizes[];
1918    #endif
1919    
1920  extern const int    _pcre_utf8_table1_size;  extern const int    _pcre_utf8_table1_size;
1921    
1922  extern const char   _pcre_utt_names[];  extern const char   _pcre_utt_names[];
# Line 1907  extern int           _pcre_valid_utf8(US Line 1941  extern int           _pcre_valid_utf8(US
1941  extern BOOL          _pcre_was_newline(USPTR, int, USPTR, int *, BOOL);  extern BOOL          _pcre_was_newline(USPTR, int, USPTR, int *, BOOL);
1942  extern BOOL          _pcre_xclass(int, const uschar *);  extern BOOL          _pcre_xclass(int, const uschar *);
1943    
1944    #ifdef SUPPORT_JIT
1945    extern void          _pcre_jit_compile(const real_pcre *, pcre_extra *);
1946    extern int           _pcre_jit_exec(const real_pcre *, void *, PCRE_SPTR,
1947                            int, int, int, int, int *, int);
1948    extern void          _pcre_jit_free(void *);
1949    #endif
1950    
1951  /* Unicode character database (UCD) */  /* Unicode character database (UCD) */
1952    
# Line 1920  extern const ucd_record  _pcre_ucd_recor Line 1960  extern const ucd_record  _pcre_ucd_recor
1960  extern const uschar      _pcre_ucd_stage1[];  extern const uschar      _pcre_ucd_stage1[];
1961  extern const pcre_uint16 _pcre_ucd_stage2[];  extern const pcre_uint16 _pcre_ucd_stage2[];
1962  extern const int         _pcre_ucp_gentype[];  extern const int         _pcre_ucp_gentype[];
1963    #ifdef SUPPORT_JIT
1964    extern const int         _pcre_ucp_typerange[];
1965    #endif
1966    
1967  /* UCD access macros */  /* UCD access macros */
1968    

Legend:
Removed from v.602  
changed lines
  Added in v.691

  ViewVC Help
Powered by ViewVC 1.1.5