/[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 1359 by ph10, Tue Sep 3 10:10:59 2013 UTC revision 1425 by ph10, Tue Dec 31 17:44:40 2013 UTC
# Line 316  start/end of string field names are. */ Line 316  start/end of string field names are. */
316         &(NLBLOCK->nllen), utf)) \         &(NLBLOCK->nllen), utf)) \
317      : \      : \
318      ((p) <= NLBLOCK->PSEND - NLBLOCK->nllen && \      ((p) <= NLBLOCK->PSEND - NLBLOCK->nllen && \
319       RAWUCHARTEST(p) == NLBLOCK->nl[0] && \       *p == NLBLOCK->nl[0] && (NLBLOCK->nllen == 1 || p[1] == NLBLOCK->nl[1]) \
      (NLBLOCK->nllen == 1 || RAWUCHARTEST(p+1) == NLBLOCK->nl[1])       \  
320      ) \      ) \
321    )    )
322    
# Line 330  start/end of string field names are. */ Line 329  start/end of string field names are. */
329         &(NLBLOCK->nllen), utf)) \         &(NLBLOCK->nllen), utf)) \
330      : \      : \
331      ((p) >= NLBLOCK->PSSTART + NLBLOCK->nllen && \      ((p) >= NLBLOCK->PSSTART + NLBLOCK->nllen && \
332       RAWUCHARTEST(p - NLBLOCK->nllen) == NLBLOCK->nl[0] &&              \       *(p - NLBLOCK->nllen) == NLBLOCK->nl[0] &&              \
333       (NLBLOCK->nllen == 1 || RAWUCHARTEST(p - NLBLOCK->nllen + 1) == NLBLOCK->nl[1]) \       (NLBLOCK->nllen == 1 || *(p - NLBLOCK->nllen + 1) == NLBLOCK->nl[1]) \
334      ) \      ) \
335    )    )
336    
# Line 600  we don't even define them. */ Line 599  we don't even define them. */
599  #define GETCHARINC(c, eptr) c = *eptr++;  #define GETCHARINC(c, eptr) c = *eptr++;
600  #define GETCHARINCTEST(c, eptr) c = *eptr++;  #define GETCHARINCTEST(c, eptr) c = *eptr++;
601  #define GETCHARLEN(c, eptr, len) c = *eptr;  #define GETCHARLEN(c, eptr, len) c = *eptr;
 #define RAWUCHAR(eptr) (*(eptr))  
 #define RAWUCHARINC(eptr) (*(eptr)++)  
 #define RAWUCHARTEST(eptr) (*(eptr))  
 #define RAWUCHARINCTEST(eptr) (*(eptr)++)  
602  /* #define GETCHARLENTEST(c, eptr, len) */  /* #define GETCHARLENTEST(c, eptr, len) */
603  /* #define BACKCHAR(eptr) */  /* #define BACKCHAR(eptr) */
604  /* #define FORWARDCHAR(eptr) */  /* #define FORWARDCHAR(eptr) */
# Line 776  do not know if we are in UTF-8 mode. */ Line 771  do not know if we are in UTF-8 mode. */
771    c = *eptr; \    c = *eptr; \
772    if (utf && c >= 0xc0) GETUTF8LEN(c, eptr, len);    if (utf && c >= 0xc0) GETUTF8LEN(c, eptr, len);
773    
 /* Returns the next uchar, not advancing the pointer. This is called when  
 we know we are in UTF mode. */  
   
 #define RAWUCHAR(eptr) \  
   (*(eptr))  
   
 /* Returns the next uchar, advancing the pointer. This is called when  
 we know we are in UTF mode. */  
   
 #define RAWUCHARINC(eptr) \  
   (*((eptr)++))  
   
 /* Returns the next uchar, testing for UTF mode, and not advancing the  
 pointer. */  
   
 #define RAWUCHARTEST(eptr) \  
   (*(eptr))  
   
 /* Returns the next uchar, testing for UTF mode, advancing the  
 pointer. */  
   
 #define RAWUCHARINCTEST(eptr) \  
   (*((eptr)++))  
   
774  /* If the pointer is not at the start of a character, move it back until  /* If the pointer is not at the start of a character, move it back until
775  it is. This is called only in UTF-8 mode - we don't put a test within the macro  it is. This is called only in UTF-8 mode - we don't put a test within the macro
776  because almost all calls are already within a block of UTF-8 only code. */  because almost all calls are already within a block of UTF-8 only code. */
# Line 895  we do not know if we are in UTF-16 mode. Line 866  we do not know if we are in UTF-16 mode.
866    c = *eptr; \    c = *eptr; \
867    if (utf && (c & 0xfc00) == 0xd800) GETUTF16LEN(c, eptr, len);    if (utf && (c & 0xfc00) == 0xd800) GETUTF16LEN(c, eptr, len);
868    
 /* Returns the next uchar, not advancing the pointer. This is called when  
 we know we are in UTF mode. */  
   
 #define RAWUCHAR(eptr) \  
   (*(eptr))  
   
 /* Returns the next uchar, advancing the pointer. This is called when  
 we know we are in UTF mode. */  
   
 #define RAWUCHARINC(eptr) \  
   (*((eptr)++))  
   
 /* Returns the next uchar, testing for UTF mode, and not advancing the  
 pointer. */  
   
 #define RAWUCHARTEST(eptr) \  
   (*(eptr))  
   
 /* Returns the next uchar, testing for UTF mode, advancing the  
 pointer. */  
   
 #define RAWUCHARINCTEST(eptr) \  
   (*((eptr)++))  
   
869  /* If the pointer is not at the start of a character, move it back until  /* If the pointer is not at the start of a character, move it back until
870  it is. This is called only in UTF-16 mode - we don't put a test within the  it is. This is called only in UTF-16 mode - we don't put a test within the
871  macro because almost all calls are already within a block of UTF-16 only  macro because almost all calls are already within a block of UTF-16 only
# Line 980  This is called when we do not know if we Line 927  This is called when we do not know if we
927  #define GETCHARLENTEST(c, eptr, len) \  #define GETCHARLENTEST(c, eptr, len) \
928    GETCHARTEST(c, eptr)    GETCHARTEST(c, eptr)
929    
 /* Returns the next uchar, not advancing the pointer. This is called when  
 we know we are in UTF mode. */  
   
 #define RAWUCHAR(eptr) \  
   (*(eptr))  
   
 /* Returns the next uchar, advancing the pointer. This is called when  
 we know we are in UTF mode. */  
   
 #define RAWUCHARINC(eptr) \  
   (*((eptr)++))  
   
 /* Returns the next uchar, testing for UTF mode, and not advancing the  
 pointer. */  
   
 #define RAWUCHARTEST(eptr) \  
   (*(eptr))  
   
 /* Returns the next uchar, testing for UTF mode, advancing the  
 pointer. */  
   
 #define RAWUCHARINCTEST(eptr) \  
   (*((eptr)++))  
   
930  /* If the pointer is not at the start of a character, move it back until  /* If the pointer is not at the start of a character, move it back until
931  it is. This is called only in UTF-32 mode - we don't put a test within the  it is. This is called only in UTF-32 mode - we don't put a test within the
932  macro because almost all calls are already within a block of UTF-32 only  macro because almost all calls are already within a block of UTF-32 only
# Line 1174  time, run time, or study time, respectiv Line 1097  time, run time, or study time, respectiv
1097  #define PUBLIC_COMPILE_OPTIONS \  #define PUBLIC_COMPILE_OPTIONS \
1098    (PCRE_CASELESS|PCRE_EXTENDED|PCRE_ANCHORED|PCRE_MULTILINE| \    (PCRE_CASELESS|PCRE_EXTENDED|PCRE_ANCHORED|PCRE_MULTILINE| \
1099     PCRE_DOTALL|PCRE_DOLLAR_ENDONLY|PCRE_EXTRA|PCRE_UNGREEDY|PCRE_UTF8| \     PCRE_DOTALL|PCRE_DOLLAR_ENDONLY|PCRE_EXTRA|PCRE_UNGREEDY|PCRE_UTF8| \
1100     PCRE_NO_AUTO_CAPTURE|PCRE_NO_UTF8_CHECK|PCRE_AUTO_CALLOUT|PCRE_FIRSTLINE| \     PCRE_NO_AUTO_CAPTURE|PCRE_NO_AUTO_POSSESS| \
1101       PCRE_NO_UTF8_CHECK|PCRE_AUTO_CALLOUT|PCRE_FIRSTLINE| \
1102     PCRE_DUPNAMES|PCRE_NEWLINE_BITS|PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE| \     PCRE_DUPNAMES|PCRE_NEWLINE_BITS|PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE| \
1103     PCRE_JAVASCRIPT_COMPAT|PCRE_UCP|PCRE_NO_START_OPTIMIZE|PCRE_NEVER_UTF)     PCRE_JAVASCRIPT_COMPAT|PCRE_UCP|PCRE_NO_START_OPTIMIZE|PCRE_NEVER_UTF)
1104    
# Line 1532  a positive value. */ Line 1456  a positive value. */
1456  #define STRING_xdigit               "xdigit"  #define STRING_xdigit               "xdigit"
1457    
1458  #define STRING_DEFINE               "DEFINE"  #define STRING_DEFINE               "DEFINE"
1459    #define STRING_WEIRD_STARTWORD      "[:<:]]"
1460    #define STRING_WEIRD_ENDWORD        "[:>:]]"
1461    
1462  #define STRING_CR_RIGHTPAR             "CR)"  #define STRING_CR_RIGHTPAR              "CR)"
1463  #define STRING_LF_RIGHTPAR             "LF)"  #define STRING_LF_RIGHTPAR              "LF)"
1464  #define STRING_CRLF_RIGHTPAR           "CRLF)"  #define STRING_CRLF_RIGHTPAR            "CRLF)"
1465  #define STRING_ANY_RIGHTPAR            "ANY)"  #define STRING_ANY_RIGHTPAR             "ANY)"
1466  #define STRING_ANYCRLF_RIGHTPAR        "ANYCRLF)"  #define STRING_ANYCRLF_RIGHTPAR         "ANYCRLF)"
1467  #define STRING_BSR_ANYCRLF_RIGHTPAR    "BSR_ANYCRLF)"  #define STRING_BSR_ANYCRLF_RIGHTPAR     "BSR_ANYCRLF)"
1468  #define STRING_BSR_UNICODE_RIGHTPAR    "BSR_UNICODE)"  #define STRING_BSR_UNICODE_RIGHTPAR     "BSR_UNICODE)"
1469  #define STRING_UTF8_RIGHTPAR           "UTF8)"  #define STRING_UTF8_RIGHTPAR            "UTF8)"
1470  #define STRING_UTF16_RIGHTPAR          "UTF16)"  #define STRING_UTF16_RIGHTPAR           "UTF16)"
1471  #define STRING_UTF32_RIGHTPAR          "UTF32)"  #define STRING_UTF32_RIGHTPAR           "UTF32)"
1472  #define STRING_UTF_RIGHTPAR            "UTF)"  #define STRING_UTF_RIGHTPAR             "UTF)"
1473  #define STRING_UCP_RIGHTPAR            "UCP)"  #define STRING_UCP_RIGHTPAR             "UCP)"
1474  #define STRING_NO_START_OPT_RIGHTPAR   "NO_START_OPT)"  #define STRING_NO_AUTO_POSSESS_RIGHTPAR "NO_AUTO_POSSESS)"
1475  #define STRING_LIMIT_MATCH_EQ          "LIMIT_MATCH="  #define STRING_NO_START_OPT_RIGHTPAR    "NO_START_OPT)"
1476  #define STRING_LIMIT_RECURSION_EQ      "LIMIT_RECURSION="  #define STRING_LIMIT_MATCH_EQ           "LIMIT_MATCH="
1477    #define STRING_LIMIT_RECURSION_EQ       "LIMIT_RECURSION="
1478    
1479  #else  /* SUPPORT_UTF */  #else  /* SUPPORT_UTF */
1480    
# Line 1795  only. */ Line 1722  only. */
1722  #define STRING_xdigit               STR_x STR_d STR_i STR_g STR_i STR_t  #define STRING_xdigit               STR_x STR_d STR_i STR_g STR_i STR_t
1723    
1724  #define STRING_DEFINE               STR_D STR_E STR_F STR_I STR_N STR_E  #define STRING_DEFINE               STR_D STR_E STR_F STR_I STR_N STR_E
1725    #define STRING_WEIRD_STARTWORD      STR_LEFT_SQUARE_BRACKET STR_COLON STR_LESS_THAN_SIGN STR_COLON STR_RIGHT_SQUARE_BRACKET STR_RIGHT_SQUARE_BRACKET
1726    #define STRING_WEIRD_ENDWORD        STR_LEFT_SQUARE_BRACKET STR_COLON STR_GREATER_THAN_SIGN STR_COLON STR_RIGHT_SQUARE_BRACKET STR_RIGHT_SQUARE_BRACKET
1727    
1728  #define STRING_CR_RIGHTPAR             STR_C STR_R STR_RIGHT_PARENTHESIS  #define STRING_CR_RIGHTPAR              STR_C STR_R STR_RIGHT_PARENTHESIS
1729  #define STRING_LF_RIGHTPAR             STR_L STR_F STR_RIGHT_PARENTHESIS  #define STRING_LF_RIGHTPAR              STR_L STR_F STR_RIGHT_PARENTHESIS
1730  #define STRING_CRLF_RIGHTPAR           STR_C STR_R STR_L STR_F STR_RIGHT_PARENTHESIS  #define STRING_CRLF_RIGHTPAR            STR_C STR_R STR_L STR_F STR_RIGHT_PARENTHESIS
1731  #define STRING_ANY_RIGHTPAR            STR_A STR_N STR_Y STR_RIGHT_PARENTHESIS  #define STRING_ANY_RIGHTPAR             STR_A STR_N STR_Y STR_RIGHT_PARENTHESIS
1732  #define STRING_ANYCRLF_RIGHTPAR        STR_A STR_N STR_Y STR_C STR_R STR_L STR_F STR_RIGHT_PARENTHESIS  #define STRING_ANYCRLF_RIGHTPAR         STR_A STR_N STR_Y STR_C STR_R STR_L STR_F STR_RIGHT_PARENTHESIS
1733  #define STRING_BSR_ANYCRLF_RIGHTPAR    STR_B STR_S STR_R STR_UNDERSCORE STR_A STR_N STR_Y STR_C STR_R STR_L STR_F STR_RIGHT_PARENTHESIS  #define STRING_BSR_ANYCRLF_RIGHTPAR     STR_B STR_S STR_R STR_UNDERSCORE STR_A STR_N STR_Y STR_C STR_R STR_L STR_F STR_RIGHT_PARENTHESIS
1734  #define STRING_BSR_UNICODE_RIGHTPAR    STR_B STR_S STR_R STR_UNDERSCORE STR_U STR_N STR_I STR_C STR_O STR_D STR_E STR_RIGHT_PARENTHESIS  #define STRING_BSR_UNICODE_RIGHTPAR     STR_B STR_S STR_R STR_UNDERSCORE STR_U STR_N STR_I STR_C STR_O STR_D STR_E STR_RIGHT_PARENTHESIS
1735  #define STRING_UTF8_RIGHTPAR           STR_U STR_T STR_F STR_8 STR_RIGHT_PARENTHESIS  #define STRING_UTF8_RIGHTPAR            STR_U STR_T STR_F STR_8 STR_RIGHT_PARENTHESIS
1736  #define STRING_UTF16_RIGHTPAR          STR_U STR_T STR_F STR_1 STR_6 STR_RIGHT_PARENTHESIS  #define STRING_UTF16_RIGHTPAR           STR_U STR_T STR_F STR_1 STR_6 STR_RIGHT_PARENTHESIS
1737  #define STRING_UTF32_RIGHTPAR          STR_U STR_T STR_F STR_3 STR_2 STR_RIGHT_PARENTHESIS  #define STRING_UTF32_RIGHTPAR           STR_U STR_T STR_F STR_3 STR_2 STR_RIGHT_PARENTHESIS
1738  #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
1739  #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
1740  #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_AUTO_POSSESS_RIGHTPAR STR_N STR_O STR_UNDERSCORE STR_A STR_U STR_T STR_O STR_UNDERSCORE STR_P STR_O STR_S STR_S STR_E STR_S STR_S STR_RIGHT_PARENTHESIS
1741  #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  #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
1742  #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  #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
1743    #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
1744    
1745  #endif  /* SUPPORT_UTF */  #endif  /* SUPPORT_UTF */
1746    
# Line 1852  only. */ Line 1782  only. */
1782  #define PT_WORD       8    /* Word - L plus N plus underscore */  #define PT_WORD       8    /* Word - L plus N plus underscore */
1783  #define PT_CLIST      9    /* Pseudo-property: match character list */  #define PT_CLIST      9    /* Pseudo-property: match character list */
1784  #define PT_UCNC      10    /* Universal Character nameable character */  #define PT_UCNC      10    /* Universal Character nameable character */
1785    #define PT_TABSIZE   11    /* Size of square table for autopossessify tests */
1786    
1787    /* The following special properties are used only in XCLASS items, when POSIX
1788    classes are specified and PCRE_UCP is set - in other words, for Unicode
1789    handling of these classes. They are not available via the \p or \P escapes like
1790    those in the above list, and so they do not take part in the autopossessifying
1791    table. */
1792    
1793    #define PT_PXGRAPH   11    /* [:graph:] - characters that mark the paper */
1794    #define PT_PXPRINT   12    /* [:print:] - [:graph:] plus non-control spaces */
1795    #define PT_PXPUNCT   13    /* [:punct:] - punctuation characters */
1796    
1797  /* 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
1798  contain characters with values greater than 255. */  contain characters with values greater than 255. */
1799    
1800  #define XCL_NOT    0x01    /* Flag: this is a negative class */  #define XCL_NOT       0x01    /* Flag: this is a negative class */
1801  #define XCL_MAP    0x02    /* Flag: a 32-byte map is present */  #define XCL_MAP       0x02    /* Flag: a 32-byte map is present */
1802    #define XCL_HASPROP   0x04    /* Flag: property checks are present. */
1803    
1804  #define XCL_END       0    /* Marks end of individual items */  #define XCL_END       0    /* Marks end of individual items */
1805  #define XCL_SINGLE    1    /* Single item (one multibyte char) follows */  #define XCL_SINGLE    1    /* Single item (one multibyte char) follows */
# Line 1866  contain characters with values greater t Line 1808  contain characters with values greater t
1808  #define XCL_NOTPROP   4    /* Unicode inverted property (ditto) */  #define XCL_NOTPROP   4    /* Unicode inverted property (ditto) */
1809    
1810  /* These are escaped items that aren't just an encoding of a particular data  /* These are escaped items that aren't just an encoding of a particular data
1811  value such as \n. They must have non-zero values, as check_escape() returns  value such as \n. They must have non-zero values, as check_escape() returns 0
1812  0 for a data character.  Also, they must appear in the same order as in the opcode  for a data character.  Also, they must appear in the same order as in the
1813  definitions below, up to ESC_z. There's a dummy for OP_ALLANY because it  opcode definitions below, up to ESC_z. There's a dummy for OP_ALLANY because it
1814  corresponds to "." in DOTALL mode rather than an escape sequence. It is also  corresponds to "." in DOTALL mode rather than an escape sequence. It is also
1815  used for [^] in JavaScript compatibility mode, and for \C in non-utf mode. In  used for [^] in JavaScript compatibility mode, and for \C in non-utf mode. In
1816  non-DOTALL mode, "." behaves like \N.  non-DOTALL mode, "." behaves like \N.
# Line 1891  enum { ESC_A = 1, ESC_G, ESC_K, ESC_B, E Line 1833  enum { ESC_A = 1, ESC_G, ESC_K, ESC_B, E
1833         ESC_E, ESC_Q, ESC_g, ESC_k,         ESC_E, ESC_Q, ESC_g, ESC_k,
1834         ESC_DU, ESC_du, ESC_SU, ESC_su, ESC_WU, ESC_wu };         ESC_DU, ESC_du, ESC_SU, ESC_su, ESC_WU, ESC_wu };
1835    
 /* Opcode table: Starting from 1 (i.e. after OP_END), the values up to  
 OP_EOD must correspond in order to the list of escapes immediately above.  
1836    
1837  *** NOTE NOTE NOTE *** Whenever this list is updated, the two macro definitions  /********************** Opcode definitions ******************/
1838  that follow must also be updated to match. There are also tables called  
1839  "coptable" and "poptable" in pcre_dfa_exec.c that must be updated. */  /****** NOTE NOTE NOTE ******
1840    
1841    Starting from 1 (i.e. after OP_END), the values up to OP_EOD must correspond in
1842    order to the list of escapes immediately above. Furthermore, values up to
1843    OP_DOLLM must not be changed without adjusting the table called autoposstab in
1844    pcre_compile.c
1845    
1846    Whenever this list is updated, the two macro definitions that follow must be
1847    updated to match. The possessification table called "opcode_possessify" in
1848    pcre_compile.c must also be updated, and also the tables called "coptable"
1849    and "poptable" in pcre_dfa_exec.c.
1850    
1851    ****** NOTE NOTE NOTE ******/
1852    
1853    
1854    /* The values between FIRST_AUTOTAB_OP and LAST_AUTOTAB_RIGHT_OP, inclusive,
1855    are used in a table for deciding whether a repeated character type can be
1856    auto-possessified. */
1857    
1858    #define FIRST_AUTOTAB_OP       OP_NOT_DIGIT
1859    #define LAST_AUTOTAB_LEFT_OP   OP_EXTUNI
1860    #define LAST_AUTOTAB_RIGHT_OP  OP_DOLLM
1861    
1862  enum {  enum {
1863    OP_END,            /* 0 End of pattern */    OP_END,            /* 0 End of pattern */
# Line 1929  enum { Line 1890  enum {
1890    OP_EODN,           /* 23 End of data or \n at end of data (\Z) */    OP_EODN,           /* 23 End of data or \n at end of data (\Z) */
1891    OP_EOD,            /* 24 End of data (\z) */    OP_EOD,            /* 24 End of data (\z) */
1892    
1893    OP_CIRC,           /* 25 Start of line - not multiline */    /* Line end assertions */
1894    OP_CIRCM,          /* 26 Start of line - multiline */  
1895    OP_DOLL,           /* 27 End of line - not multiline */    OP_DOLL,           /* 25 End of line - not multiline */
1896    OP_DOLLM,          /* 28 End of line - multiline */    OP_DOLLM,          /* 26 End of line - multiline */
1897      OP_CIRC,           /* 27 Start of line - not multiline */
1898      OP_CIRCM,          /* 28 Start of line - multiline */
1899    
1900      /* Single characters; caseful must precede the caseless ones */
1901    
1902    OP_CHAR,           /* 29 Match one character, casefully */    OP_CHAR,           /* 29 Match one character, casefully */
1903    OP_CHARI,          /* 30 Match one character, caselessly */    OP_CHARI,          /* 30 Match one character, caselessly */
1904    OP_NOT,            /* 31 Match one character, not the given one, casefully */    OP_NOT,            /* 31 Match one character, not the given one, casefully */
# Line 1941  enum { Line 1907  enum {
1907    /* 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
1908    the offset from the first one is used to generate the others. */    the offset from the first one is used to generate the others. */
1909    
1910    /**** Single characters, caseful, must precede the caseless ones ****/    /* Repeated characters; caseful must precede the caseless ones */
1911    
1912    OP_STAR,           /* 33 The maximizing and minimizing versions of */    OP_STAR,           /* 33 The maximizing and minimizing versions of */
1913    OP_MINSTAR,        /* 34 these six opcodes must come in pairs, with */    OP_MINSTAR,        /* 34 these six opcodes must come in pairs, with */
# Line 1959  enum { Line 1925  enum {
1925    OP_POSQUERY,       /* 44 Posesssified query, caseful */    OP_POSQUERY,       /* 44 Posesssified query, caseful */
1926    OP_POSUPTO,        /* 45 Possessified upto, caseful */    OP_POSUPTO,        /* 45 Possessified upto, caseful */
1927    
1928    /**** Single characters, caseless, must follow the caseful ones */    /* Repeated characters; caseless must follow the caseful ones */
1929    
1930    OP_STARI,          /* 46 */    OP_STARI,          /* 46 */
1931    OP_MINSTARI,       /* 47 */    OP_MINSTARI,       /* 47 */
# Line 1977  enum { Line 1943  enum {
1943    OP_POSQUERYI,      /* 57 Posesssified query, caseless */    OP_POSQUERYI,      /* 57 Posesssified query, caseless */
1944    OP_POSUPTOI,       /* 58 Possessified upto, caseless */    OP_POSUPTOI,       /* 58 Possessified upto, caseless */
1945    
1946    /**** The negated ones must follow the non-negated ones, and match them ****/    /* The negated ones must follow the non-negated ones, and match them */
1947    /**** Negated single character, caseful; must precede the caseless ones ****/    /* Negated repeated character, caseful; must precede the caseless ones */
1948    
1949    OP_NOTSTAR,        /* 59 The maximizing and minimizing versions of */    OP_NOTSTAR,        /* 59 The maximizing and minimizing versions of */
1950    OP_NOTMINSTAR,     /* 60 these six opcodes must come in pairs, with */    OP_NOTMINSTAR,     /* 60 these six opcodes must come in pairs, with */
# Line 1996  enum { Line 1962  enum {
1962    OP_NOTPOSQUERY,    /* 70 */    OP_NOTPOSQUERY,    /* 70 */
1963    OP_NOTPOSUPTO,     /* 71 */    OP_NOTPOSUPTO,     /* 71 */
1964    
1965    /**** Negated single character, caseless; must follow the caseful ones ****/    /* Negated repeated character, caseless; must follow the caseful ones */
1966    
1967    OP_NOTSTARI,       /* 72 */    OP_NOTSTARI,       /* 72 */
1968    OP_NOTMINSTARI,    /* 73 */    OP_NOTMINSTARI,    /* 73 */
# Line 2014  enum { Line 1980  enum {
1980    OP_NOTPOSQUERYI,   /* 83 */    OP_NOTPOSQUERYI,   /* 83 */
1981    OP_NOTPOSUPTOI,    /* 84 */    OP_NOTPOSUPTOI,    /* 84 */
1982    
1983    /**** Character types ****/    /* Character types */
1984    
1985    OP_TYPESTAR,       /* 85 The maximizing and minimizing versions of */    OP_TYPESTAR,       /* 85 The maximizing and minimizing versions of */
1986    OP_TYPEMINSTAR,    /* 86 these six opcodes must come in pairs, with */    OP_TYPEMINSTAR,    /* 86 these six opcodes must come in pairs, with */
# Line 2045  enum { Line 2011  enum {
2011    OP_CRRANGE,        /* 104 These are different to the three sets above. */    OP_CRRANGE,        /* 104 These are different to the three sets above. */
2012    OP_CRMINRANGE,     /* 105 */    OP_CRMINRANGE,     /* 105 */
2013    
2014      OP_CRPOSSTAR,      /* 106 Possessified versions */
2015      OP_CRPOSPLUS,      /* 107 */
2016      OP_CRPOSQUERY,     /* 108 */
2017      OP_CRPOSRANGE,     /* 109 */
2018    
2019    /* End of quantifier opcodes */    /* End of quantifier opcodes */
2020    
2021    OP_CLASS,          /* 106 Match a character class, chars < 256 only */    OP_CLASS,          /* 110 Match a character class, chars < 256 only */
2022    OP_NCLASS,         /* 107 Same, but the bitmap was created from a negative    OP_NCLASS,         /* 111 Same, but the bitmap was created from a negative
2023                                class - the difference is relevant only when a                                class - the difference is relevant only when a
2024                                character > 255 is encountered. */                                character > 255 is encountered. */
2025    OP_XCLASS,         /* 108 Extended class for handling > 255 chars within the    OP_XCLASS,         /* 112 Extended class for handling > 255 chars within the
2026                                class. This does both positive and negative. */                                class. This does both positive and negative. */
2027    OP_REF,            /* 109 Match a back reference, casefully */    OP_REF,            /* 113 Match a back reference, casefully */
2028    OP_REFI,           /* 110 Match a back reference, caselessly */    OP_REFI,           /* 114 Match a back reference, caselessly */
2029    OP_RECURSE,        /* 111 Match a numbered subpattern (possibly recursive) */    OP_DNREF,          /* 115 Match a duplicate name backref, casefully */
2030    OP_CALLOUT,        /* 112 Call out to external function if provided */    OP_DNREFI,         /* 116 Match a duplicate name backref, caselessly */
2031      OP_RECURSE,        /* 117 Match a numbered subpattern (possibly recursive) */
2032    OP_ALT,            /* 113 Start of alternation */    OP_CALLOUT,        /* 118 Call out to external function if provided */
2033    OP_KET,            /* 114 End of group that doesn't have an unbounded repeat */  
2034    OP_KETRMAX,        /* 115 These two must remain together and in this */    OP_ALT,            /* 119 Start of alternation */
2035    OP_KETRMIN,        /* 116 order. They are for groups the repeat for ever. */    OP_KET,            /* 120 End of group that doesn't have an unbounded repeat */
2036    OP_KETRPOS,        /* 117 Possessive unlimited repeat. */    OP_KETRMAX,        /* 121 These two must remain together and in this */
2037      OP_KETRMIN,        /* 122 order. They are for groups the repeat for ever. */
2038      OP_KETRPOS,        /* 123 Possessive unlimited repeat. */
2039    
2040    /* 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
2041    asserts must remain in order. */    asserts must remain in order. */
2042    
2043    OP_REVERSE,        /* 118 Move pointer back - used in lookbehind assertions */    OP_REVERSE,        /* 124 Move pointer back - used in lookbehind assertions */
2044    OP_ASSERT,         /* 119 Positive lookahead */    OP_ASSERT,         /* 125 Positive lookahead */
2045    OP_ASSERT_NOT,     /* 120 Negative lookahead */    OP_ASSERT_NOT,     /* 126 Negative lookahead */
2046    OP_ASSERTBACK,     /* 121 Positive lookbehind */    OP_ASSERTBACK,     /* 127 Positive lookbehind */
2047    OP_ASSERTBACK_NOT, /* 122 Negative lookbehind */    OP_ASSERTBACK_NOT, /* 128 Negative lookbehind */
2048    
2049    /* ONCE, ONCE_NC, BRA, BRAPOS, CBRA, CBRAPOS, and COND must come immediately    /* ONCE, ONCE_NC, BRA, BRAPOS, CBRA, CBRAPOS, and COND must come immediately
2050    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
2051    subpattern that isn't an assertion. The POS versions must immediately follow    subpattern that isn't an assertion. The POS versions must immediately follow
2052    the non-POS versions in each case. */    the non-POS versions in each case. */
2053    
2054    OP_ONCE,           /* 123 Atomic group, contains captures */    OP_ONCE,           /* 129 Atomic group, contains captures */
2055    OP_ONCE_NC,        /* 124 Atomic group containing no captures */    OP_ONCE_NC,        /* 130 Atomic group containing no captures */
2056    OP_BRA,            /* 125 Start of non-capturing bracket */    OP_BRA,            /* 131 Start of non-capturing bracket */
2057    OP_BRAPOS,         /* 126 Ditto, with unlimited, possessive repeat */    OP_BRAPOS,         /* 132 Ditto, with unlimited, possessive repeat */
2058    OP_CBRA,           /* 127 Start of capturing bracket */    OP_CBRA,           /* 133 Start of capturing bracket */
2059    OP_CBRAPOS,        /* 128 Ditto, with unlimited, possessive repeat */    OP_CBRAPOS,        /* 134 Ditto, with unlimited, possessive repeat */
2060    OP_COND,           /* 129 Conditional group */    OP_COND,           /* 135 Conditional group */
2061    
2062    /* 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
2063    check for >= SBRA to distinguish the two sets. */    check for >= SBRA to distinguish the two sets. */
2064    
2065    OP_SBRA,           /* 130 Start of non-capturing bracket, check empty  */    OP_SBRA,           /* 136 Start of non-capturing bracket, check empty  */
2066    OP_SBRAPOS,        /* 131 Ditto, with unlimited, possessive repeat */    OP_SBRAPOS,        /* 137 Ditto, with unlimited, possessive repeat */
2067    OP_SCBRA,          /* 132 Start of capturing bracket, check empty */    OP_SCBRA,          /* 138 Start of capturing bracket, check empty */
2068    OP_SCBRAPOS,       /* 133 Ditto, with unlimited, possessive repeat */    OP_SCBRAPOS,       /* 139 Ditto, with unlimited, possessive repeat */
2069    OP_SCOND,          /* 134 Conditional group, check empty */    OP_SCOND,          /* 140 Conditional group, check empty */
2070    
2071    /* The next two pairs must (respectively) be kept together. */    /* The next two pairs must (respectively) be kept together. */
2072    
2073    OP_CREF,           /* 135 Used to hold a capture number as condition */    OP_CREF,           /* 141 Used to hold a capture number as condition */
2074    OP_NCREF,          /* 136 Same, but generated by a name reference*/    OP_DNCREF,         /* 142 Used to point to duplicate names as a condition */
2075    OP_RREF,           /* 137 Used to hold a recursion number as condition */    OP_RREF,           /* 143 Used to hold a recursion number as condition */
2076    OP_NRREF,          /* 138 Same, but generated by a name reference*/    OP_DNRREF,         /* 144 Used to point to duplicate names as a condition */
2077    OP_DEF,            /* 139 The DEFINE condition */    OP_DEF,            /* 145 The DEFINE condition */
2078    
2079    OP_BRAZERO,        /* 140 These two must remain together and in this */    OP_BRAZERO,        /* 146 These two must remain together and in this */
2080    OP_BRAMINZERO,     /* 141 order. */    OP_BRAMINZERO,     /* 147 order. */
2081    OP_BRAPOSZERO,     /* 142 */    OP_BRAPOSZERO,     /* 148 */
2082    
2083    /* These are backtracking control verbs */    /* These are backtracking control verbs */
2084    
2085    OP_MARK,           /* 143 always has an argument */    OP_MARK,           /* 149 always has an argument */
2086    OP_PRUNE,          /* 144 */    OP_PRUNE,          /* 150 */
2087    OP_PRUNE_ARG,      /* 145 same, but with argument */    OP_PRUNE_ARG,      /* 151 same, but with argument */
2088    OP_SKIP,           /* 146 */    OP_SKIP,           /* 152 */
2089    OP_SKIP_ARG,       /* 147 same, but with argument */    OP_SKIP_ARG,       /* 153 same, but with argument */
2090    OP_THEN,           /* 148 */    OP_THEN,           /* 154 */
2091    OP_THEN_ARG,       /* 149 same, but with argument */    OP_THEN_ARG,       /* 155 same, but with argument */
2092    OP_COMMIT,         /* 150 */    OP_COMMIT,         /* 156 */
2093    
2094    /* These are forced failure and success verbs */    /* These are forced failure and success verbs */
2095    
2096    OP_FAIL,           /* 151 */    OP_FAIL,           /* 157 */
2097    OP_ACCEPT,         /* 152 */    OP_ACCEPT,         /* 158 */
2098    OP_ASSERT_ACCEPT,  /* 153 Used inside assertions */    OP_ASSERT_ACCEPT,  /* 159 Used inside assertions */
2099    OP_CLOSE,          /* 154 Used before OP_ACCEPT to close open captures */    OP_CLOSE,          /* 160 Used before OP_ACCEPT to close open captures */
2100    
2101    /* This is used to skip a subpattern with a {0} quantifier */    /* This is used to skip a subpattern with a {0} quantifier */
2102    
2103    OP_SKIPZERO,       /* 155 */    OP_SKIPZERO,       /* 161 */
2104    
2105    /* 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
2106    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 2138  enum { Line 2111  enum {
2111    
2112  /* *** NOTE NOTE NOTE *** Whenever the list above is updated, the two macro  /* *** NOTE NOTE NOTE *** Whenever the list above is updated, the two macro
2113  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
2114  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
2115    pcre_dfa_exec.c that must be updated. */
2116    
2117    
2118  /* 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 2151  some cases doesn't actually use these na Line 2125  some cases doesn't actually use these na
2125    "\\S", "\\s", "\\W", "\\w", "Any", "AllAny", "Anybyte",         \    "\\S", "\\s", "\\W", "\\w", "Any", "AllAny", "Anybyte",         \
2126    "notprop", "prop", "\\R", "\\H", "\\h", "\\V", "\\v",           \    "notprop", "prop", "\\R", "\\H", "\\h", "\\V", "\\v",           \
2127    "extuni",  "\\Z", "\\z",                                        \    "extuni",  "\\Z", "\\z",                                        \
2128    "^", "^", "$", "$", "char", "chari", "not", "noti",             \    "$", "$", "^", "^", "char", "chari", "not", "noti",             \
2129    "*", "*?", "+", "+?", "?", "??",                                \    "*", "*?", "+", "+?", "?", "??",                                \
2130    "{", "{", "{",                                                  \    "{", "{", "{",                                                  \
2131    "*+","++", "?+", "{",                                           \    "*+","++", "?+", "{",                                           \
# Line 2167  some cases doesn't actually use these na Line 2141  some cases doesn't actually use these na
2141    "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \    "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \
2142    "*+","++", "?+", "{",                                           \    "*+","++", "?+", "{",                                           \
2143    "*", "*?", "+", "+?", "?", "??", "{", "{",                      \    "*", "*?", "+", "+?", "?", "??", "{", "{",                      \
2144    "class", "nclass", "xclass", "Ref", "Refi",                     \    "*+","++", "?+", "{",                                           \
2145      "class", "nclass", "xclass", "Ref", "Refi", "DnRef", "DnRefi",  \
2146    "Recurse", "Callout",                                           \    "Recurse", "Callout",                                           \
2147    "Alt", "Ket", "KetRmax", "KetRmin", "KetRpos",                  \    "Alt", "Ket", "KetRmax", "KetRmin", "KetRpos",                  \
2148    "Reverse", "Assert", "Assert not", "AssertB", "AssertB not",    \    "Reverse", "Assert", "Assert not", "AssertB", "AssertB not",    \
# Line 2176  some cases doesn't actually use these na Line 2151  some cases doesn't actually use these na
2151    "Cond",                                                         \    "Cond",                                                         \
2152    "SBra", "SBraPos", "SCBra", "SCBraPos",                         \    "SBra", "SBraPos", "SCBra", "SCBraPos",                         \
2153    "SCond",                                                        \    "SCond",                                                        \
2154    "Cond ref", "Cond nref", "Cond rec", "Cond nrec", "Cond def",   \    "Cond ref", "Cond dnref", "Cond rec", "Cond dnrec", "Cond def", \
2155    "Brazero", "Braminzero", "Braposzero",                          \    "Brazero", "Braminzero", "Braposzero",                          \
2156    "*MARK", "*PRUNE", "*PRUNE", "*SKIP", "*SKIP",                  \    "*MARK", "*PRUNE", "*PRUNE", "*SKIP", "*SKIP",                  \
2157    "*THEN", "*THEN", "*COMMIT", "*FAIL",                           \    "*THEN", "*THEN", "*COMMIT", "*FAIL",                           \
# Line 2201  in UTF-8 mode. The code that uses this t Line 2176  in UTF-8 mode. The code that uses this t
2176    3, 3,                          /* \P, \p                                 */ \    3, 3,                          /* \P, \p                                 */ \
2177    1, 1, 1, 1, 1,                 /* \R, \H, \h, \V, \v                     */ \    1, 1, 1, 1, 1,                 /* \R, \H, \h, \V, \v                     */ \
2178    1,                             /* \X                                     */ \    1,                             /* \X                                     */ \
2179    1, 1, 1, 1, 1, 1,              /* \Z, \z, ^, ^M, $, $M                   */ \    1, 1, 1, 1, 1, 1,              /* \Z, \z, $, $M ^, ^M                    */ \
2180    2,                             /* Char  - the minimum length             */ \    2,                             /* Char  - the minimum length             */ \
2181    2,                             /* Chari  - the minimum length            */ \    2,                             /* Chari  - the minimum length            */ \
2182    2,                             /* not                                    */ \    2,                             /* not                                    */ \
# Line 2232  in UTF-8 mode. The code that uses this t Line 2207  in UTF-8 mode. The code that uses this t
2207    /* Character class & ref repeats                                         */ \    /* Character class & ref repeats                                         */ \
2208    1, 1, 1, 1, 1, 1,              /* *, *?, +, +?, ?, ??                    */ \    1, 1, 1, 1, 1, 1,              /* *, *?, +, +?, ?, ??                    */ \
2209    1+2*IMM2_SIZE, 1+2*IMM2_SIZE,  /* CRRANGE, CRMINRANGE                    */ \    1+2*IMM2_SIZE, 1+2*IMM2_SIZE,  /* CRRANGE, CRMINRANGE                    */ \
2210      1, 1, 1, 1+2*IMM2_SIZE,        /* Possessive *+, ++, ?+, CRPOSRANGE      */ \
2211    1+(32/sizeof(pcre_uchar)),     /* CLASS                                  */ \    1+(32/sizeof(pcre_uchar)),     /* CLASS                                  */ \
2212    1+(32/sizeof(pcre_uchar)),     /* NCLASS                                 */ \    1+(32/sizeof(pcre_uchar)),     /* NCLASS                                 */ \
2213    0,                             /* XCLASS - variable length               */ \    0,                             /* XCLASS - variable length               */ \
2214    1+IMM2_SIZE,                   /* REF                                    */ \    1+IMM2_SIZE,                   /* REF                                    */ \
2215    1+IMM2_SIZE,                   /* REFI                                   */ \    1+IMM2_SIZE,                   /* REFI                                   */ \
2216      1+2*IMM2_SIZE,                 /* DNREF                                  */ \
2217      1+2*IMM2_SIZE,                 /* DNREFI                                 */ \
2218    1+LINK_SIZE,                   /* RECURSE                                */ \    1+LINK_SIZE,                   /* RECURSE                                */ \
2219    2+2*LINK_SIZE,                 /* CALLOUT                                */ \    2+2*LINK_SIZE,                 /* CALLOUT                                */ \
2220    1+LINK_SIZE,                   /* Alt                                    */ \    1+LINK_SIZE,                   /* Alt                                    */ \
# Line 2261  in UTF-8 mode. The code that uses this t Line 2239  in UTF-8 mode. The code that uses this t
2239    1+LINK_SIZE+IMM2_SIZE,         /* SCBRA                                  */ \    1+LINK_SIZE+IMM2_SIZE,         /* SCBRA                                  */ \
2240    1+LINK_SIZE+IMM2_SIZE,         /* SCBRAPOS                               */ \    1+LINK_SIZE+IMM2_SIZE,         /* SCBRAPOS                               */ \
2241    1+LINK_SIZE,                   /* SCOND                                  */ \    1+LINK_SIZE,                   /* SCOND                                  */ \
2242    1+IMM2_SIZE, 1+IMM2_SIZE,      /* CREF, NCREF                            */ \    1+IMM2_SIZE, 1+2*IMM2_SIZE,    /* CREF, DNCREF                           */ \
2243    1+IMM2_SIZE, 1+IMM2_SIZE,      /* RREF, NRREF                            */ \    1+IMM2_SIZE, 1+2*IMM2_SIZE,    /* RREF, DNRREF                           */ \
2244    1,                             /* DEF                                    */ \    1,                             /* DEF                                    */ \
2245    1, 1, 1,                       /* BRAZERO, BRAMINZERO, BRAPOSZERO        */ \    1, 1, 1,                       /* BRAZERO, BRAMINZERO, BRAPOSZERO        */ \
2246    3, 1, 3,                       /* MARK, PRUNE, PRUNE_ARG                 */ \    3, 1, 3,                       /* MARK, PRUNE, PRUNE_ARG                 */ \
# Line 2271  in UTF-8 mode. The code that uses this t Line 2249  in UTF-8 mode. The code that uses this t
2249    1, 1, 1, 1,                    /* COMMIT, FAIL, ACCEPT, ASSERT_ACCEPT    */ \    1, 1, 1, 1,                    /* COMMIT, FAIL, ACCEPT, ASSERT_ACCEPT    */ \
2250    1+IMM2_SIZE, 1                 /* CLOSE, SKIPZERO                        */    1+IMM2_SIZE, 1                 /* CLOSE, SKIPZERO                        */
2251    
2252  /* A magic value for OP_RREF and OP_NRREF to indicate the "any recursion"  /* A magic value for OP_RREF to indicate the "any recursion" condition. */
 condition. */  
2253    
2254  #define RREF_ANY  0xffff  #define RREF_ANY  0xffff
2255    
# Line 2287  enum { ERR0,  ERR1,  ERR2,  ERR3,  ERR4, Line 2264  enum { ERR0,  ERR1,  ERR2,  ERR3,  ERR4,
2264         ERR40, ERR41, ERR42, ERR43, ERR44, ERR45, ERR46, ERR47, ERR48, ERR49,         ERR40, ERR41, ERR42, ERR43, ERR44, ERR45, ERR46, ERR47, ERR48, ERR49,
2265         ERR50, ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58, ERR59,         ERR50, ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58, ERR59,
2266         ERR60, ERR61, ERR62, ERR63, ERR64, ERR65, ERR66, ERR67, ERR68, ERR69,         ERR60, ERR61, ERR62, ERR63, ERR64, ERR65, ERR66, ERR67, ERR68, ERR69,
2267         ERR70, ERR71, ERR72, ERR73, ERR74, ERR75, ERR76, ERR77, ERR78, ERRCOUNT };         ERR70, ERR71, ERR72, ERR73, ERR74, ERR75, ERR76, ERR77, ERR78, ERR79,
2268           ERR80, ERR81, ERR82, ERR83, ERR84, ERRCOUNT };
2269    
2270  /* JIT compiling modes. The function list is indexed by them. */  /* JIT compiling modes. The function list is indexed by them. */
2271    
2272  enum { JIT_COMPILE, JIT_PARTIAL_SOFT_COMPILE, JIT_PARTIAL_HARD_COMPILE,  enum { JIT_COMPILE, JIT_PARTIAL_SOFT_COMPILE, JIT_PARTIAL_HARD_COMPILE,
2273         JIT_NUMBER_OF_COMPILE_MODES };         JIT_NUMBER_OF_COMPILE_MODES };
2274    
# Line 2407  typedef struct open_capitem { Line 2386  typedef struct open_capitem {
2386    pcre_uint16 flag;             /* Set TRUE if recursive back ref */    pcre_uint16 flag;             /* Set TRUE if recursive back ref */
2387  } open_capitem;  } open_capitem;
2388    
2389  /* Structure for building a list of named groups during the first pass of  /* Structure for building a list of named groups during the first pass of
2390  compiling. */  compiling. */
2391    
2392  typedef struct named_group {  typedef struct named_group {
2393    const pcre_uchar  *name;          /* Points to the name in the pattern */    const pcre_uchar  *name;          /* Points to the name in the pattern */
2394    int                length;        /* Length of the name */    int                length;        /* Length of the name */
2395    pcre_uint32        number;        /* Group number */    pcre_uint32        number;        /* Group number */
2396  } named_group;  } named_group;
2397    
2398  /* Structure for passing "static" information around between the functions  /* Structure for passing "static" information around between the functions
2399  doing the compiling, so that they are thread-safe. */  doing the compiling, so that they are thread-safe. */
# Line 2434  typedef struct compile_data { Line 2413  typedef struct compile_data {
2413    pcre_uchar *name_table;           /* The name/number table */    pcre_uchar *name_table;           /* The name/number table */
2414    int  names_found;                 /* Number of entries so far */    int  names_found;                 /* Number of entries so far */
2415    int  name_entry_size;             /* Size of each entry */    int  name_entry_size;             /* Size of each entry */
2416    int  named_group_list_size;       /* Number of entries in the list */    int  named_group_list_size;       /* Number of entries in the list */
2417    int  workspace_size;              /* Size of workspace */    int  workspace_size;              /* Size of workspace */
2418    unsigned int bracount;            /* Count of capturing parens as we compile */    unsigned int bracount;            /* Count of capturing parens as we compile */
2419    int  final_bracount;              /* Saved value after first pass */    int  final_bracount;              /* Saved value after first pass */
2420    int  max_lookbehind;              /* Maximum lookbehind (characters) */    int  max_lookbehind;              /* Maximum lookbehind (characters) */
2421    int  top_backref;                 /* Maximum back reference */    int  top_backref;                 /* Maximum back reference */
2422    unsigned int backref_map;         /* Bitmap of low back refs */    unsigned int backref_map;         /* Bitmap of low back refs */
2423      unsigned int namedrefcount;       /* Number of backreferences by name */
2424      int  parens_depth;                /* Depth of nested parentheses */
2425    int  assert_depth;                /* Depth of nested assertions */    int  assert_depth;                /* Depth of nested assertions */
2426    pcre_uint32 external_options;     /* External (initial) options */    pcre_uint32 external_options;     /* External (initial) options */
2427    pcre_uint32 external_flags;       /* External flag bits to be set */    pcre_uint32 external_flags;       /* External flag bits to be set */
# Line 2448  typedef struct compile_data { Line 2429  typedef struct compile_data {
2429    BOOL had_accept;                  /* (*ACCEPT) encountered */    BOOL had_accept;                  /* (*ACCEPT) encountered */
2430    BOOL had_pruneorskip;             /* (*PRUNE) or (*SKIP) encountered */    BOOL had_pruneorskip;             /* (*PRUNE) or (*SKIP) encountered */
2431    BOOL check_lookbehind;            /* Lookbehinds need later checking */    BOOL check_lookbehind;            /* Lookbehinds need later checking */
2432      BOOL dupnames;                    /* Duplicate names exist */
2433    int  nltype;                      /* Newline type */    int  nltype;                      /* Newline type */
2434    int  nllen;                       /* Newline string length */    int  nllen;                       /* Newline string length */
2435    pcre_uchar nl[4];                 /* Newline string when fixed length */    pcre_uchar nl[4];                 /* Newline string when fixed length */

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

  ViewVC Help
Powered by ViewVC 1.1.5