/[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 1370 by ph10, Wed Oct 9 10:18:26 2013 UTC revision 1380 by ph10, Tue Oct 15 16:49:12 2013 UTC
# Line 1893  enum { ESC_A = 1, ESC_G, ESC_K, ESC_B, E Line 1893  enum { ESC_A = 1, ESC_G, ESC_K, ESC_B, E
1893         ESC_E, ESC_Q, ESC_g, ESC_k,         ESC_E, ESC_Q, ESC_g, ESC_k,
1894         ESC_DU, ESC_du, ESC_SU, ESC_su, ESC_WU, ESC_wu };         ESC_DU, ESC_du, ESC_SU, ESC_su, ESC_WU, ESC_wu };
1895    
 /* Opcode table */  
1896    
1897    /********************** Opcode definitions ******************/
1898    
1899  /****** NOTE NOTE NOTE ******  /****** NOTE NOTE NOTE ******
1900    
# Line 1903  order to the list of escapes immediately Line 1903  order to the list of escapes immediately
1903  OP_DOLLM must not be changed without adjusting the table called autoposstab in  OP_DOLLM must not be changed without adjusting the table called autoposstab in
1904  pcre_compile.c  pcre_compile.c
1905    
1906  Whenever this list is updated, the two macro definitions that follow must also  Whenever this list is updated, the two macro definitions that follow must be
1907  be updated to match. There are also tables called "coptable" and "poptable" in  updated to match. The possessification table called "opcode_possessify" in
1908  pcre_dfa_exec.c that must be updated.  pcre_compile.c must also be updated, and also the tables called "coptable"
1909    and "poptable" in pcre_dfa_exec.c.
1910    
1911  ****** NOTE NOTE NOTE ******/  ****** NOTE NOTE NOTE ******/
1912    
# Line 2070  enum { Line 2071  enum {
2071    OP_CRRANGE,        /* 104 These are different to the three sets above. */    OP_CRRANGE,        /* 104 These are different to the three sets above. */
2072    OP_CRMINRANGE,     /* 105 */    OP_CRMINRANGE,     /* 105 */
2073    
2074      OP_CRPOSSTAR,      /* 106 Possessified versions */
2075      OP_CRPOSPLUS,      /* 107 */
2076      OP_CRPOSQUERY,     /* 108 */
2077      OP_CRPOSRANGE,     /* 109 */
2078    
2079    /* End of quantifier opcodes */    /* End of quantifier opcodes */
2080    
2081    OP_CLASS,          /* 106 Match a character class, chars < 256 only */    OP_CLASS,          /* 110 Match a character class, chars < 256 only */
2082    OP_NCLASS,         /* 107 Same, but the bitmap was created from a negative    OP_NCLASS,         /* 111 Same, but the bitmap was created from a negative
2083                                class - the difference is relevant only when a                                class - the difference is relevant only when a
2084                                character > 255 is encountered. */                                character > 255 is encountered. */
2085    OP_XCLASS,         /* 108 Extended class for handling > 255 chars within the    OP_XCLASS,         /* 112 Extended class for handling > 255 chars within the
2086                                class. This does both positive and negative. */                                class. This does both positive and negative. */
2087    OP_REF,            /* 109 Match a back reference, casefully */    OP_REF,            /* 113 Match a back reference, casefully */
2088    OP_REFI,           /* 110 Match a back reference, caselessly */    OP_REFI,           /* 114 Match a back reference, caselessly */
2089    OP_DNREF,          /* 111 Match a duplicate name backref, casefully */    OP_DNREF,          /* 115 Match a duplicate name backref, casefully */
2090    OP_DNREFI,         /* 112 Match a duplicate name backref, caselessly */    OP_DNREFI,         /* 116 Match a duplicate name backref, caselessly */
2091    OP_RECURSE,        /* 113 Match a numbered subpattern (possibly recursive) */    OP_RECURSE,        /* 117 Match a numbered subpattern (possibly recursive) */
2092    OP_CALLOUT,        /* 114 Call out to external function if provided */    OP_CALLOUT,        /* 118 Call out to external function if provided */
2093    
2094    OP_ALT,            /* 115 Start of alternation */    OP_ALT,            /* 119 Start of alternation */
2095    OP_KET,            /* 116 End of group that doesn't have an unbounded repeat */    OP_KET,            /* 120 End of group that doesn't have an unbounded repeat */
2096    OP_KETRMAX,        /* 117 These two must remain together and in this */    OP_KETRMAX,        /* 121 These two must remain together and in this */
2097    OP_KETRMIN,        /* 118 order. They are for groups the repeat for ever. */    OP_KETRMIN,        /* 122 order. They are for groups the repeat for ever. */
2098    OP_KETRPOS,        /* 119 Possessive unlimited repeat. */    OP_KETRPOS,        /* 123 Possessive unlimited repeat. */
2099    
2100    /* The assertions must come before BRA, CBRA, ONCE, and COND, and the four    /* The assertions must come before BRA, CBRA, ONCE, and COND, and the four
2101    asserts must remain in order. */    asserts must remain in order. */
2102    
2103    OP_REVERSE,        /* 129 Move pointer back - used in lookbehind assertions */    OP_REVERSE,        /* 124 Move pointer back - used in lookbehind assertions */
2104    OP_ASSERT,         /* 121 Positive lookahead */    OP_ASSERT,         /* 125 Positive lookahead */
2105    OP_ASSERT_NOT,     /* 122 Negative lookahead */    OP_ASSERT_NOT,     /* 126 Negative lookahead */
2106    OP_ASSERTBACK,     /* 123 Positive lookbehind */    OP_ASSERTBACK,     /* 127 Positive lookbehind */
2107    OP_ASSERTBACK_NOT, /* 124 Negative lookbehind */    OP_ASSERTBACK_NOT, /* 128 Negative lookbehind */
2108    
2109    /* ONCE, ONCE_NC, BRA, BRAPOS, CBRA, CBRAPOS, and COND must come immediately    /* ONCE, ONCE_NC, BRA, BRAPOS, CBRA, CBRAPOS, and COND must come immediately
2110    after the assertions, with ONCE first, as there's a test for >= ONCE for a    after the assertions, with ONCE first, as there's a test for >= ONCE for a
2111    subpattern that isn't an assertion. The POS versions must immediately follow    subpattern that isn't an assertion. The POS versions must immediately follow
2112    the non-POS versions in each case. */    the non-POS versions in each case. */
2113    
2114    OP_ONCE,           /* 125 Atomic group, contains captures */    OP_ONCE,           /* 129 Atomic group, contains captures */
2115    OP_ONCE_NC,        /* 126 Atomic group containing no captures */    OP_ONCE_NC,        /* 130 Atomic group containing no captures */
2116    OP_BRA,            /* 127 Start of non-capturing bracket */    OP_BRA,            /* 131 Start of non-capturing bracket */
2117    OP_BRAPOS,         /* 128 Ditto, with unlimited, possessive repeat */    OP_BRAPOS,         /* 132 Ditto, with unlimited, possessive repeat */
2118    OP_CBRA,           /* 129 Start of capturing bracket */    OP_CBRA,           /* 133 Start of capturing bracket */
2119    OP_CBRAPOS,        /* 130 Ditto, with unlimited, possessive repeat */    OP_CBRAPOS,        /* 134 Ditto, with unlimited, possessive repeat */
2120    OP_COND,           /* 131 Conditional group */    OP_COND,           /* 135 Conditional group */
2121    
2122    /* These five must follow the previous five, in the same order. There's a    /* These five must follow the previous five, in the same order. There's a
2123    check for >= SBRA to distinguish the two sets. */    check for >= SBRA to distinguish the two sets. */
2124    
2125    OP_SBRA,           /* 132 Start of non-capturing bracket, check empty  */    OP_SBRA,           /* 136 Start of non-capturing bracket, check empty  */
2126    OP_SBRAPOS,        /* 133 Ditto, with unlimited, possessive repeat */    OP_SBRAPOS,        /* 137 Ditto, with unlimited, possessive repeat */
2127    OP_SCBRA,          /* 134 Start of capturing bracket, check empty */    OP_SCBRA,          /* 138 Start of capturing bracket, check empty */
2128    OP_SCBRAPOS,       /* 135 Ditto, with unlimited, possessive repeat */    OP_SCBRAPOS,       /* 139 Ditto, with unlimited, possessive repeat */
2129    OP_SCOND,          /* 136 Conditional group, check empty */    OP_SCOND,          /* 140 Conditional group, check empty */
2130    
2131    /* The next two pairs must (respectively) be kept together. */    /* The next two pairs must (respectively) be kept together. */
2132    
2133    OP_CREF,           /* 137 Used to hold a capture number as condition */    OP_CREF,           /* 141 Used to hold a capture number as condition */
2134    OP_DNCREF,         /* 138 Used to point to duplicate names as a condition */    OP_DNCREF,         /* 142 Used to point to duplicate names as a condition */
2135    OP_RREF,           /* 139 Used to hold a recursion number as condition */    OP_RREF,           /* 143 Used to hold a recursion number as condition */
2136    OP_DNRREF,         /* 140 Used to point to duplicate names as a condition */    OP_DNRREF,         /* 144 Used to point to duplicate names as a condition */
2137    OP_DEF,            /* 141 The DEFINE condition */    OP_DEF,            /* 145 The DEFINE condition */
2138    
2139    OP_BRAZERO,        /* 142 These two must remain together and in this */    OP_BRAZERO,        /* 146 These two must remain together and in this */
2140    OP_BRAMINZERO,     /* 143 order. */    OP_BRAMINZERO,     /* 147 order. */
2141    OP_BRAPOSZERO,     /* 144 */    OP_BRAPOSZERO,     /* 148 */
2142    
2143    /* These are backtracking control verbs */    /* These are backtracking control verbs */
2144    
2145    OP_MARK,           /* 145 always has an argument */    OP_MARK,           /* 149 always has an argument */
2146    OP_PRUNE,          /* 146 */    OP_PRUNE,          /* 150 */
2147    OP_PRUNE_ARG,      /* 147 same, but with argument */    OP_PRUNE_ARG,      /* 151 same, but with argument */
2148    OP_SKIP,           /* 148 */    OP_SKIP,           /* 152 */
2149    OP_SKIP_ARG,       /* 149 same, but with argument */    OP_SKIP_ARG,       /* 153 same, but with argument */
2150    OP_THEN,           /* 150 */    OP_THEN,           /* 154 */
2151    OP_THEN_ARG,       /* 151 same, but with argument */    OP_THEN_ARG,       /* 155 same, but with argument */
2152    OP_COMMIT,         /* 152 */    OP_COMMIT,         /* 156 */
2153    
2154    /* These are forced failure and success verbs */    /* These are forced failure and success verbs */
2155    
2156    OP_FAIL,           /* 153 */    OP_FAIL,           /* 157 */
2157    OP_ACCEPT,         /* 154 */    OP_ACCEPT,         /* 158 */
2158    OP_ASSERT_ACCEPT,  /* 155 Used inside assertions */    OP_ASSERT_ACCEPT,  /* 159 Used inside assertions */
2159    OP_CLOSE,          /* 156 Used before OP_ACCEPT to close open captures */    OP_CLOSE,          /* 160 Used before OP_ACCEPT to close open captures */
2160    
2161    /* This is used to skip a subpattern with a {0} quantifier */    /* This is used to skip a subpattern with a {0} quantifier */
2162    
2163    OP_SKIPZERO,       /* 157 */    OP_SKIPZERO,       /* 161 */
2164    
2165    /* 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
2166    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 2165  enum { Line 2171  enum {
2171    
2172  /* *** NOTE NOTE NOTE *** Whenever the list above is updated, the two macro  /* *** NOTE NOTE NOTE *** Whenever the list above is updated, the two macro
2173  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
2174  called "coptable" and "poptable" in pcre_dfa_exec.c that must be updated. */  called "opcode_possessify" in pcre_compile.c and "coptable" and "poptable" in
2175    pcre_dfa_exec.c that must be updated. */
2176    
2177    
2178  /* 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 2194  some cases doesn't actually use these na Line 2201  some cases doesn't actually use these na
2201    "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \    "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \
2202    "*+","++", "?+", "{",                                           \    "*+","++", "?+", "{",                                           \
2203    "*", "*?", "+", "+?", "?", "??", "{", "{",                      \    "*", "*?", "+", "+?", "?", "??", "{", "{",                      \
2204      "*+","++", "?+", "{",                                           \
2205    "class", "nclass", "xclass", "Ref", "Refi", "DnRef", "DnRefi",  \    "class", "nclass", "xclass", "Ref", "Refi", "DnRef", "DnRefi",  \
2206    "Recurse", "Callout",                                           \    "Recurse", "Callout",                                           \
2207    "Alt", "Ket", "KetRmax", "KetRmin", "KetRpos",                  \    "Alt", "Ket", "KetRmax", "KetRmin", "KetRpos",                  \
# Line 2259  in UTF-8 mode. The code that uses this t Line 2267  in UTF-8 mode. The code that uses this t
2267    /* Character class & ref repeats                                         */ \    /* Character class & ref repeats                                         */ \
2268    1, 1, 1, 1, 1, 1,              /* *, *?, +, +?, ?, ??                    */ \    1, 1, 1, 1, 1, 1,              /* *, *?, +, +?, ?, ??                    */ \
2269    1+2*IMM2_SIZE, 1+2*IMM2_SIZE,  /* CRRANGE, CRMINRANGE                    */ \    1+2*IMM2_SIZE, 1+2*IMM2_SIZE,  /* CRRANGE, CRMINRANGE                    */ \
2270      1, 1, 1, 1+2*IMM2_SIZE,        /* Possessive *+, ++, ?+, CRPOSRANGE      */ \
2271    1+(32/sizeof(pcre_uchar)),     /* CLASS                                  */ \    1+(32/sizeof(pcre_uchar)),     /* CLASS                                  */ \
2272    1+(32/sizeof(pcre_uchar)),     /* NCLASS                                 */ \    1+(32/sizeof(pcre_uchar)),     /* NCLASS                                 */ \
2273    0,                             /* XCLASS - variable length               */ \    0,                             /* XCLASS - variable length               */ \

Legend:
Removed from v.1370  
changed lines
  Added in v.1380

  ViewVC Help
Powered by ViewVC 1.1.5