/[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 499 by ph10, Wed Mar 3 20:09:39 2010 UTC revision 612 by ph10, Sat Jul 2 15:20:59 2011 UTC
# Line 408  capturing parenthesis numbers in back re Line 408  capturing parenthesis numbers in back re
408    
409  /* When UTF-8 encoding is being used, a character is no longer just a single  /* When UTF-8 encoding is being used, a character is no longer just a single
410  byte. The macros for character handling generate simple sequences when used in  byte. The macros for character handling generate simple sequences when used in
411  byte-mode, and more complicated ones for UTF-8 characters. BACKCHAR should  byte-mode, and more complicated ones for UTF-8 characters. GETCHARLENTEST is
412  never be called in byte mode. To make sure it can never even appear when UTF-8  not used when UTF-8 is not supported, so it is not defined, and BACKCHAR should
413  support is omitted, we don't even define it. */  never be called in byte mode. To make sure they can never even appear when
414    UTF-8 support is omitted, we don't even define them. */
415    
416  #ifndef SUPPORT_UTF8  #ifndef SUPPORT_UTF8
417  #define GETCHAR(c, eptr) c = *eptr;  #define GETCHAR(c, eptr) c = *eptr;
# Line 418  support is omitted, we don't even define Line 419  support is omitted, we don't even define
419  #define GETCHARINC(c, eptr) c = *eptr++;  #define GETCHARINC(c, eptr) c = *eptr++;
420  #define GETCHARINCTEST(c, eptr) c = *eptr++;  #define GETCHARINCTEST(c, eptr) c = *eptr++;
421  #define GETCHARLEN(c, eptr, len) c = *eptr;  #define GETCHARLEN(c, eptr, len) c = *eptr;
422    /* #define GETCHARLENTEST(c, eptr, len) */
423  /* #define BACKCHAR(eptr) */  /* #define BACKCHAR(eptr) */
424    
425  #else   /* SUPPORT_UTF8 */  #else   /* SUPPORT_UTF8 */
426    
427    /* These macros were originally written in the form of loops that used data
428    from the tables whose names start with _pcre_utf8_table. They were rewritten by
429    a user so as not to use loops, because in some environments this gives a
430    significant performance advantage, and it seems never to do any harm. */
431    
432    /* Base macro to pick up the remaining bytes of a UTF-8 character, not
433    advancing the pointer. */
434    
435    #define GETUTF8(c, eptr) \
436        { \
437        if ((c & 0x20) == 0) \
438          c = ((c & 0x1f) << 6) | (eptr[1] & 0x3f); \
439        else if ((c & 0x10) == 0) \
440          c = ((c & 0x0f) << 12) | ((eptr[1] & 0x3f) << 6) | (eptr[2] & 0x3f); \
441        else if ((c & 0x08) == 0) \
442          c = ((c & 0x07) << 18) | ((eptr[1] & 0x3f) << 12) | \
443          ((eptr[2] & 0x3f) << 6) | (eptr[3] & 0x3f); \
444        else if ((c & 0x04) == 0) \
445          c = ((c & 0x03) << 24) | ((eptr[1] & 0x3f) << 18) | \
446              ((eptr[2] & 0x3f) << 12) | ((eptr[3] & 0x3f) << 6) | \
447              (eptr[4] & 0x3f); \
448        else \
449          c = ((c & 0x01) << 30) | ((eptr[1] & 0x3f) << 24) | \
450              ((eptr[2] & 0x3f) << 18) | ((eptr[3] & 0x3f) << 12) | \
451              ((eptr[4] & 0x3f) << 6) | (eptr[5] & 0x3f); \
452        }
453    
454  /* Get the next UTF-8 character, not advancing the pointer. This is called when  /* Get the next UTF-8 character, not advancing the pointer. This is called when
455  we know we are in UTF-8 mode. */  we know we are in UTF-8 mode. */
456    
457  #define GETCHAR(c, eptr) \  #define GETCHAR(c, eptr) \
458    c = *eptr; \    c = *eptr; \
459    if (c >= 0xc0) \    if (c >= 0xc0) GETUTF8(c, eptr);
     { \  
     int gcii; \  
     int gcaa = _pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */ \  
     int gcss = 6*gcaa; \  
     c = (c & _pcre_utf8_table3[gcaa]) << gcss; \  
     for (gcii = 1; gcii <= gcaa; gcii++) \  
       { \  
       gcss -= 6; \  
       c |= (eptr[gcii] & 0x3f) << gcss; \  
       } \  
     }  
460    
461  /* Get the next UTF-8 character, testing for UTF-8 mode, and not advancing the  /* Get the next UTF-8 character, testing for UTF-8 mode, and not advancing the
462  pointer. */  pointer. */
463    
464  #define GETCHARTEST(c, eptr) \  #define GETCHARTEST(c, eptr) \
465    c = *eptr; \    c = *eptr; \
466    if (utf8 && c >= 0xc0) \    if (utf8 && c >= 0xc0) GETUTF8(c, eptr);
467    
468    /* Base macro to pick up the remaining bytes of a UTF-8 character, advancing
469    the pointer. */
470    
471    #define GETUTF8INC(c, eptr) \
472      { \      { \
473      int gcii; \      if ((c & 0x20) == 0) \
474      int gcaa = _pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */ \        c = ((c & 0x1f) << 6) | (*eptr++ & 0x3f); \
475      int gcss = 6*gcaa; \      else if ((c & 0x10) == 0) \
476      c = (c & _pcre_utf8_table3[gcaa]) << gcss; \        { \
477      for (gcii = 1; gcii <= gcaa; gcii++) \        c = ((c & 0x0f) << 12) | ((*eptr & 0x3f) << 6) | (eptr[1] & 0x3f); \
478          eptr += 2; \
479          } \
480        else if ((c & 0x08) == 0) \
481        { \        { \
482        gcss -= 6; \        c = ((c & 0x07) << 18) | ((*eptr & 0x3f) << 12) | \
483        c |= (eptr[gcii] & 0x3f) << gcss; \            ((eptr[1] & 0x3f) << 6) | (eptr[2] & 0x3f); \
484          eptr += 3; \
485          } \
486        else if ((c & 0x04) == 0) \
487          { \
488          c = ((c & 0x03) << 24) | ((*eptr & 0x3f) << 18) | \
489              ((eptr[1] & 0x3f) << 12) | ((eptr[2] & 0x3f) << 6) | \
490              (eptr[3] & 0x3f); \
491          eptr += 4; \
492          } \
493        else \
494          { \
495          c = ((c & 0x01) << 30) | ((*eptr & 0x3f) << 24) | \
496              ((eptr[1] & 0x3f) << 18) | ((eptr[2] & 0x3f) << 12) | \
497              ((eptr[3] & 0x3f) << 6) | (eptr[4] & 0x3f); \
498          eptr += 5; \
499        } \        } \
500      }      }
501    
# Line 463  know we are in UTF-8 mode. */ Line 504  know we are in UTF-8 mode. */
504    
505  #define GETCHARINC(c, eptr) \  #define GETCHARINC(c, eptr) \
506    c = *eptr++; \    c = *eptr++; \
507    if (c >= 0xc0) \    if (c >= 0xc0) GETUTF8INC(c, eptr);
     { \  
     int gcaa = _pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */ \  
     int gcss = 6*gcaa; \  
     c = (c & _pcre_utf8_table3[gcaa]) << gcss; \  
     while (gcaa-- > 0) \  
       { \  
       gcss -= 6; \  
       c |= (*eptr++ & 0x3f) << gcss; \  
       } \  
     }  
508    
509  /* Get the next character, testing for UTF-8 mode, and advancing the pointer */  /* Get the next character, testing for UTF-8 mode, and advancing the pointer.
510    This is called when we don't know if we are in UTF-8 mode. */
511    
512  #define GETCHARINCTEST(c, eptr) \  #define GETCHARINCTEST(c, eptr) \
513    c = *eptr++; \    c = *eptr++; \
514    if (utf8 && c >= 0xc0) \    if (utf8 && c >= 0xc0) GETUTF8INC(c, eptr);
515    
516    /* Base macro to pick up the remaining bytes of a UTF-8 character, not
517    advancing the pointer, incrementing the length. */
518    
519    #define GETUTF8LEN(c, eptr, len) \
520      { \      { \
521      int gcaa = _pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */ \      if ((c & 0x20) == 0) \
522      int gcss = 6*gcaa; \        { \
523      c = (c & _pcre_utf8_table3[gcaa]) << gcss; \        c = ((c & 0x1f) << 6) | (eptr[1] & 0x3f); \
524      while (gcaa-- > 0) \        len++; \
525          } \
526        else if ((c & 0x10)  == 0) \
527        { \        { \
528        gcss -= 6; \        c = ((c & 0x0f) << 12) | ((eptr[1] & 0x3f) << 6) | (eptr[2] & 0x3f); \
529        c |= (*eptr++ & 0x3f) << gcss; \        len += 2; \
530          } \
531        else if ((c & 0x08)  == 0) \
532          {\
533          c = ((c & 0x07) << 18) | ((eptr[1] & 0x3f) << 12) | \
534              ((eptr[2] & 0x3f) << 6) | (eptr[3] & 0x3f); \
535          len += 3; \
536          } \
537        else if ((c & 0x04)  == 0) \
538          { \
539          c = ((c & 0x03) << 24) | ((eptr[1] & 0x3f) << 18) | \
540              ((eptr[2] & 0x3f) << 12) | ((eptr[3] & 0x3f) << 6) | \
541              (eptr[4] & 0x3f); \
542          len += 4; \
543          } \
544        else \
545          {\
546          c = ((c & 0x01) << 30) | ((eptr[1] & 0x3f) << 24) | \
547              ((eptr[2] & 0x3f) << 18) | ((eptr[3] & 0x3f) << 12) | \
548              ((eptr[4] & 0x3f) << 6) | (eptr[5] & 0x3f); \
549          len += 5; \
550        } \        } \
551      }      }
552    
# Line 496  if there are extra bytes. This is called Line 555  if there are extra bytes. This is called
555    
556  #define GETCHARLEN(c, eptr, len) \  #define GETCHARLEN(c, eptr, len) \
557    c = *eptr; \    c = *eptr; \
558    if (c >= 0xc0) \    if (c >= 0xc0) GETUTF8LEN(c, eptr, len);
     { \  
     int gcii; \  
     int gcaa = _pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */ \  
     int gcss = 6*gcaa; \  
     c = (c & _pcre_utf8_table3[gcaa]) << gcss; \  
     for (gcii = 1; gcii <= gcaa; gcii++) \  
       { \  
       gcss -= 6; \  
       c |= (eptr[gcii] & 0x3f) << gcss; \  
       } \  
     len += gcaa; \  
     }  
559    
560  /* Get the next UTF-8 character, testing for UTF-8 mode, not advancing the  /* Get the next UTF-8 character, testing for UTF-8 mode, not advancing the
561  pointer, incrementing length if there are extra bytes. This is called when we  pointer, incrementing length if there are extra bytes. This is called when we
562  know we are in UTF-8 mode. */  do not know if we are in UTF-8 mode. */
563    
564  #define GETCHARLENTEST(c, eptr, len) \  #define GETCHARLENTEST(c, eptr, len) \
565    c = *eptr; \    c = *eptr; \
566    if (utf8 && c >= 0xc0) \    if (utf8 && c >= 0xc0) GETUTF8LEN(c, eptr, len);
     { \  
     int gcii; \  
     int gcaa = _pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */ \  
     int gcss = 6*gcaa; \  
     c = (c & _pcre_utf8_table3[gcaa]) << gcss; \  
     for (gcii = 1; gcii <= gcaa; gcii++) \  
       { \  
       gcss -= 6; \  
       c |= (eptr[gcii] & 0x3f) << gcss; \  
       } \  
     len += gcaa; \  
     }  
567    
568  /* 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
569  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
# Line 536  because almost all calls are already wit Line 571  because almost all calls are already wit
571    
572  #define BACKCHAR(eptr) while((*eptr & 0xc0) == 0x80) eptr--  #define BACKCHAR(eptr) while((*eptr & 0xc0) == 0x80) eptr--
573    
574  #endif  #endif  /* SUPPORT_UTF8 */
575    
576    
577  /* In case there is no definition of offsetof() provided - though any proper  /* In case there is no definition of offsetof() provided - though any proper
# Line 547  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 564  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 580  time, run time, or study time, respectiv Line 611  time, run time, or study time, respectiv
611     PCRE_DOTALL|PCRE_DOLLAR_ENDONLY|PCRE_EXTRA|PCRE_UNGREEDY|PCRE_UTF8| \     PCRE_DOTALL|PCRE_DOLLAR_ENDONLY|PCRE_EXTRA|PCRE_UNGREEDY|PCRE_UTF8| \
612     PCRE_NO_AUTO_CAPTURE|PCRE_NO_UTF8_CHECK|PCRE_AUTO_CALLOUT|PCRE_FIRSTLINE| \     PCRE_NO_AUTO_CAPTURE|PCRE_NO_UTF8_CHECK|PCRE_AUTO_CALLOUT|PCRE_FIRSTLINE| \
613     PCRE_DUPNAMES|PCRE_NEWLINE_BITS|PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE| \     PCRE_DUPNAMES|PCRE_NEWLINE_BITS|PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE| \
614     PCRE_JAVASCRIPT_COMPAT)     PCRE_JAVASCRIPT_COMPAT|PCRE_UCP|PCRE_NO_START_OPTIMIZE)
615    
616  #define PUBLIC_EXEC_OPTIONS \  #define PUBLIC_EXEC_OPTIONS \
617    (PCRE_ANCHORED|PCRE_NOTBOL|PCRE_NOTEOL|PCRE_NOTEMPTY|PCRE_NOTEMPTY_ATSTART| \    (PCRE_ANCHORED|PCRE_NOTBOL|PCRE_NOTEOL|PCRE_NOTEMPTY|PCRE_NOTEMPTY_ATSTART| \
# Line 875  so that PCRE works on both ASCII and EBC Line 906  so that PCRE works on both ASCII and EBC
906  #define STRING_COMMIT0              "COMMIT\0"  #define STRING_COMMIT0              "COMMIT\0"
907  #define STRING_F0                   "F\0"  #define STRING_F0                   "F\0"
908  #define STRING_FAIL0                "FAIL\0"  #define STRING_FAIL0                "FAIL\0"
909    #define STRING_MARK0                "MARK\0"
910  #define STRING_PRUNE0               "PRUNE\0"  #define STRING_PRUNE0               "PRUNE\0"
911  #define STRING_SKIP0                "SKIP\0"  #define STRING_SKIP0                "SKIP\0"
912  #define STRING_THEN                 "THEN"  #define STRING_THEN                 "THEN"
# Line 896  so that PCRE works on both ASCII and EBC Line 928  so that PCRE works on both ASCII and EBC
928    
929  #define STRING_DEFINE               "DEFINE"  #define STRING_DEFINE               "DEFINE"
930    
931  #define STRING_CR_RIGHTPAR          "CR)"  #define STRING_CR_RIGHTPAR             "CR)"
932  #define STRING_LF_RIGHTPAR          "LF)"  #define STRING_LF_RIGHTPAR             "LF)"
933  #define STRING_CRLF_RIGHTPAR        "CRLF)"  #define STRING_CRLF_RIGHTPAR           "CRLF)"
934  #define STRING_ANY_RIGHTPAR         "ANY)"  #define STRING_ANY_RIGHTPAR            "ANY)"
935  #define STRING_ANYCRLF_RIGHTPAR     "ANYCRLF)"  #define STRING_ANYCRLF_RIGHTPAR        "ANYCRLF)"
936  #define STRING_BSR_ANYCRLF_RIGHTPAR "BSR_ANYCRLF)"  #define STRING_BSR_ANYCRLF_RIGHTPAR    "BSR_ANYCRLF)"
937  #define STRING_BSR_UNICODE_RIGHTPAR "BSR_UNICODE)"  #define STRING_BSR_UNICODE_RIGHTPAR    "BSR_UNICODE)"
938  #define STRING_UTF8_RIGHTPAR        "UTF8)"  #define STRING_UTF8_RIGHTPAR           "UTF8)"
939    #define STRING_UCP_RIGHTPAR            "UCP)"
940    #define STRING_NO_START_OPT_RIGHTPAR   "NO_START_OPT)"
941    
942  #else  /* SUPPORT_UTF8 */  #else  /* SUPPORT_UTF8 */
943    
# Line 1127  only. */ Line 1161  only. */
1161  #define STRING_COMMIT0              STR_C STR_O STR_M STR_M STR_I STR_T "\0"  #define STRING_COMMIT0              STR_C STR_O STR_M STR_M STR_I STR_T "\0"
1162  #define STRING_F0                   STR_F "\0"  #define STRING_F0                   STR_F "\0"
1163  #define STRING_FAIL0                STR_F STR_A STR_I STR_L "\0"  #define STRING_FAIL0                STR_F STR_A STR_I STR_L "\0"
1164    #define STRING_MARK0                STR_M STR_A STR_R STR_K "\0"
1165  #define STRING_PRUNE0               STR_P STR_R STR_U STR_N STR_E "\0"  #define STRING_PRUNE0               STR_P STR_R STR_U STR_N STR_E "\0"
1166  #define STRING_SKIP0                STR_S STR_K STR_I STR_P "\0"  #define STRING_SKIP0                STR_S STR_K STR_I STR_P "\0"
1167  #define STRING_THEN                 STR_T STR_H STR_E STR_N  #define STRING_THEN                 STR_T STR_H STR_E STR_N
# Line 1148  only. */ Line 1183  only. */
1183    
1184  #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
1185    
1186  #define STRING_CR_RIGHTPAR          STR_C STR_R STR_RIGHT_PARENTHESIS  #define STRING_CR_RIGHTPAR             STR_C STR_R STR_RIGHT_PARENTHESIS
1187  #define STRING_LF_RIGHTPAR          STR_L STR_F STR_RIGHT_PARENTHESIS  #define STRING_LF_RIGHTPAR             STR_L STR_F STR_RIGHT_PARENTHESIS
1188  #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
1189  #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
1190  #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
1191  #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
1192  #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
1193  #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
1194    #define STRING_UCP_RIGHTPAR            STR_U STR_C STR_P STR_RIGHT_PARENTHESIS
1195    #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
1196    
1197  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF8 */
1198    
# Line 1188  only. */ Line 1225  only. */
1225    
1226  #define PT_ANY        0    /* Any property - matches all chars */  #define PT_ANY        0    /* Any property - matches all chars */
1227  #define PT_LAMP       1    /* L& - the union of Lu, Ll, Lt */  #define PT_LAMP       1    /* L& - the union of Lu, Ll, Lt */
1228  #define PT_GC         2    /* General characteristic (e.g. L) */  #define PT_GC         2    /* Specified general characteristic (e.g. L) */
1229  #define PT_PC         3    /* Particular characteristic (e.g. Lu) */  #define PT_PC         3    /* Specified particular characteristic (e.g. Lu) */
1230  #define PT_SC         4    /* Script (e.g. Han) */  #define PT_SC         4    /* Script (e.g. Han) */
1231    #define PT_ALNUM      5    /* Alphanumeric - the union of L and N */
1232    #define PT_SPACE      6    /* Perl space - Z plus 9,10,12,13 */
1233    #define PT_PXSPACE    7    /* POSIX space - Z plus 9,10,11,12,13 */
1234    #define PT_WORD       8    /* Word - L plus N plus underscore */
1235    
1236  /* 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
1237  contain UTF-8 characters with values greater than 255. */  contain UTF-8 characters with values greater than 255. */
# Line 1207  contain UTF-8 characters with values gre Line 1248  contain UTF-8 characters with values gre
1248  /* 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
1249  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
1250  their negation. Also, they must appear in the same order as in the opcode  their negation. Also, they must appear in the same order as in the opcode
1251  definitions below, up to ESC_z. There's a dummy for OP_ANY because it  definitions below, up to ESC_z. There's a dummy for OP_ALLANY because it
1252  corresponds to "." rather than an escape sequence, and another for OP_ALLANY  corresponds to "." in DOTALL mode rather than an escape sequence. It is also
1253  (which is used for [^] in JavaScript compatibility mode).  used for [^] in JavaScript compatibility mode. In non-DOTALL mode, "." behaves
1254    like \N.
1255    
1256    The special values ESC_DU, ESC_du, etc. are used instead of ESC_D, ESC_d, etc.
1257    when PCRE_UCP is set, when replacement of \d etc by \p sequences is required.
1258    They must be contiguous, and remain in order so that the replacements can be
1259    looked up from a table.
1260    
1261  The final escape must be ESC_REF as subsequent values are used for  The final escape must be ESC_REF as subsequent values are used for
1262  backreferences (\1, \2, \3, etc). There are two tests in the code for an escape  backreferences (\1, \2, \3, etc). There are two tests in the code for an escape
# Line 1219  put in between that don't consume a char Line 1266  put in between that don't consume a char
1266  */  */
1267    
1268  enum { ESC_A = 1, ESC_G, ESC_K, ESC_B, ESC_b, ESC_D, ESC_d, ESC_S, ESC_s,  enum { ESC_A = 1, ESC_G, ESC_K, ESC_B, ESC_b, ESC_D, ESC_d, ESC_S, ESC_s,
1269         ESC_W, ESC_w, ESC_dum1, ESC_dum2, ESC_C, ESC_P, ESC_p, ESC_R, ESC_H,         ESC_W, ESC_w, ESC_N, ESC_dum, ESC_C, ESC_P, ESC_p, ESC_R, ESC_H,
1270         ESC_h, ESC_V, ESC_v, ESC_X, ESC_Z, ESC_z, ESC_E, ESC_Q, ESC_g, ESC_k,         ESC_h, ESC_V, ESC_v, ESC_X, ESC_Z, ESC_z,
1271           ESC_E, ESC_Q, ESC_g, ESC_k,
1272           ESC_DU, ESC_du, ESC_SU, ESC_su, ESC_WU, ESC_wu,
1273         ESC_REF };         ESC_REF };
1274    
   
1275  /* Opcode table: Starting from 1 (i.e. after OP_END), the values up to  /* Opcode table: Starting from 1 (i.e. after OP_END), the values up to
1276  OP_EOD must correspond in order to the list of escapes immediately above.  OP_EOD must correspond in order to the list of escapes immediately above.
1277    
# Line 1247  enum { Line 1295  enum {
1295    OP_WHITESPACE,         /*  9 \s */    OP_WHITESPACE,         /*  9 \s */
1296    OP_NOT_WORDCHAR,       /* 10 \W */    OP_NOT_WORDCHAR,       /* 10 \W */
1297    OP_WORDCHAR,           /* 11 \w */    OP_WORDCHAR,           /* 11 \w */
1298    OP_ANY,            /* 12 Match any character (subject to DOTALL) */  
1299    OP_ALLANY,         /* 13 Match any character (not subject to DOTALL) */    OP_ANY,            /* 12 Match any character except newline */
1300      OP_ALLANY,         /* 13 Match any character */
1301    OP_ANYBYTE,        /* 14 Match any byte (\C); different to OP_ANY for UTF-8 */    OP_ANYBYTE,        /* 14 Match any byte (\C); different to OP_ANY for UTF-8 */
1302    OP_NOTPROP,        /* 15 \P (not Unicode property) */    OP_NOTPROP,        /* 15 \P (not Unicode property) */
1303    OP_PROP,           /* 16 \p (Unicode property) */    OP_PROP,           /* 16 \p (Unicode property) */
# Line 1261  enum { Line 1310  enum {
1310    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. */
1311    OP_EOD,            /* 24 End of data: \z */    OP_EOD,            /* 24 End of data: \z */
1312    
1313    OP_OPT,            /* 25 Set runtime options */    OP_CIRC,           /* 25 Start of line - not multiline */
1314    OP_CIRC,           /* 26 Start of line - varies with multiline switch */    OP_CIRCM,          /* 26 Start of line - multiline */
1315    OP_DOLL,           /* 27 End of line - varies with multiline switch */    OP_DOLL,           /* 27 End of line - not multiline */
1316    OP_CHAR,           /* 28 Match one character, casefully */    OP_DOLLM,          /* 28 End of line - multiline */
1317    OP_CHARNC,         /* 29 Match one character, caselessly */    OP_CHAR,           /* 29 Match one character, casefully */
1318    OP_NOT,            /* 30 Match one character, not the following one */    OP_CHARI,          /* 30 Match one character, caselessly */
1319      OP_NOT,            /* 31 Match one character, not the given one, casefully */
1320    OP_STAR,           /* 31 The maximizing and minimizing versions of */    OP_NOTI,           /* 32 Match one character, not the given one, caselessly */
1321    OP_MINSTAR,        /* 32 these six opcodes must come in pairs, with */  
1322    OP_PLUS,           /* 33 the minimizing one second. */    /* The following sets of 13 opcodes must always be kept in step because
1323    OP_MINPLUS,        /* 34 This first set applies to single characters.*/    the offset from the first one is used to generate the others. */
1324    OP_QUERY,          /* 35 */  
1325    OP_MINQUERY,       /* 36 */    /**** Single characters, caseful, must precede the caseless ones ****/
1326    
1327    OP_UPTO,           /* 37 From 0 to n matches */    OP_STAR,           /* 33 The maximizing and minimizing versions of */
1328    OP_MINUPTO,        /* 38 */    OP_MINSTAR,        /* 34 these six opcodes must come in pairs, with */
1329    OP_EXACT,          /* 39 Exactly n matches */    OP_PLUS,           /* 35 the minimizing one second. */
1330      OP_MINPLUS,        /* 36 */
1331    OP_POSSTAR,        /* 40 Possessified star */    OP_QUERY,          /* 37 */
1332    OP_POSPLUS,        /* 41 Possessified plus */    OP_MINQUERY,       /* 38 */
1333    OP_POSQUERY,       /* 42 Posesssified query */  
1334    OP_POSUPTO,        /* 43 Possessified upto */    OP_UPTO,           /* 39 From 0 to n matches of one character, caseful*/
1335      OP_MINUPTO,        /* 40 */
1336    OP_NOTSTAR,        /* 44 The maximizing and minimizing versions of */    OP_EXACT,          /* 41 Exactly n matches */
1337    OP_NOTMINSTAR,     /* 45 these six opcodes must come in pairs, with */  
1338    OP_NOTPLUS,        /* 46 the minimizing one second. They must be in */    OP_POSSTAR,        /* 42 Possessified star, caseful */
1339    OP_NOTMINPLUS,     /* 47 exactly the same order as those above. */    OP_POSPLUS,        /* 43 Possessified plus, caseful */
1340    OP_NOTQUERY,       /* 48 This set applies to "not" single characters. */    OP_POSQUERY,       /* 44 Posesssified query, caseful */
1341    OP_NOTMINQUERY,    /* 49 */    OP_POSUPTO,        /* 45 Possessified upto, caseful */
1342    
1343    OP_NOTUPTO,        /* 50 From 0 to n matches */    /**** Single characters, caseless, must follow the caseful ones */
1344    OP_NOTMINUPTO,     /* 51 */  
1345    OP_NOTEXACT,       /* 52 Exactly n matches */    OP_STARI,          /* 46 */
1346      OP_MINSTARI,       /* 47 */
1347    OP_NOTPOSSTAR,     /* 53 Possessified versions */    OP_PLUSI,          /* 48 */
1348    OP_NOTPOSPLUS,     /* 54 */    OP_MINPLUSI,       /* 49 */
1349    OP_NOTPOSQUERY,    /* 55 */    OP_QUERYI,         /* 50 */
1350    OP_NOTPOSUPTO,     /* 56 */    OP_MINQUERYI,      /* 51 */
1351    
1352    OP_TYPESTAR,       /* 57 The maximizing and minimizing versions of */    OP_UPTOI,          /* 52 From 0 to n matches of one character, caseless */
1353    OP_TYPEMINSTAR,    /* 58 these six opcodes must come in pairs, with */    OP_MINUPTOI,       /* 53 */
1354    OP_TYPEPLUS,       /* 59 the minimizing one second. These codes must */    OP_EXACTI,         /* 54 */
1355    OP_TYPEMINPLUS,    /* 60 be in exactly the same order as those above. */  
1356    OP_TYPEQUERY,      /* 61 This set applies to character types such as \d */    OP_POSSTARI,       /* 55 Possessified star, caseless */
1357    OP_TYPEMINQUERY,   /* 62 */    OP_POSPLUSI,       /* 56 Possessified plus, caseless */
1358      OP_POSQUERYI,      /* 57 Posesssified query, caseless */
1359    OP_TYPEUPTO,       /* 63 From 0 to n matches */    OP_POSUPTOI,       /* 58 Possessified upto, caseless */
1360    OP_TYPEMINUPTO,    /* 64 */  
1361    OP_TYPEEXACT,      /* 65 Exactly n matches */    /**** The negated ones must follow the non-negated ones, and match them ****/
1362      /**** Negated single character, caseful; must precede the caseless ones ****/
1363    OP_TYPEPOSSTAR,    /* 66 Possessified versions */  
1364    OP_TYPEPOSPLUS,    /* 67 */    OP_NOTSTAR,        /* 59 The maximizing and minimizing versions of */
1365    OP_TYPEPOSQUERY,   /* 68 */    OP_NOTMINSTAR,     /* 60 these six opcodes must come in pairs, with */
1366    OP_TYPEPOSUPTO,    /* 69 */    OP_NOTPLUS,        /* 61 the minimizing one second. They must be in */
1367      OP_NOTMINPLUS,     /* 62 exactly the same order as those above. */
1368    OP_CRSTAR,         /* 70 The maximizing and minimizing versions of */    OP_NOTQUERY,       /* 63 */
1369    OP_CRMINSTAR,      /* 71 all these opcodes must come in pairs, with */    OP_NOTMINQUERY,    /* 64 */
1370    OP_CRPLUS,         /* 72 the minimizing one second. These codes must */  
1371    OP_CRMINPLUS,      /* 73 be in exactly the same order as those above. */    OP_NOTUPTO,        /* 65 From 0 to n matches, caseful */
1372    OP_CRQUERY,        /* 74 These are for character classes and back refs */    OP_NOTMINUPTO,     /* 66 */
1373    OP_CRMINQUERY,     /* 75 */    OP_NOTEXACT,       /* 67 Exactly n matches */
1374    OP_CRRANGE,        /* 76 These are different to the three sets above. */  
1375    OP_CRMINRANGE,     /* 77 */    OP_NOTPOSSTAR,     /* 68 Possessified versions, caseful */
1376      OP_NOTPOSPLUS,     /* 69 */
1377    OP_CLASS,          /* 78 Match a character class, chars < 256 only */    OP_NOTPOSQUERY,    /* 70 */
1378    OP_NCLASS,         /* 79 Same, but the bitmap was created from a negative    OP_NOTPOSUPTO,     /* 71 */
1379                             class - the difference is relevant only when a UTF-8  
1380                             character > 255 is encountered. */    /**** Negated single character, caseless; must follow the caseful ones ****/
1381    
1382    OP_XCLASS,         /* 80 Extended class for handling UTF-8 chars within the    OP_NOTSTARI,       /* 72 */
1383                             class. This does both positive and negative. */    OP_NOTMINSTARI,    /* 73 */
1384      OP_NOTPLUSI,       /* 74 */
1385    OP_REF,            /* 81 Match a back reference */    OP_NOTMINPLUSI,    /* 75 */
1386    OP_RECURSE,        /* 82 Match a numbered subpattern (possibly recursive) */    OP_NOTQUERYI,      /* 76 */
1387    OP_CALLOUT,        /* 83 Call out to external function if provided */    OP_NOTMINQUERYI,   /* 77 */
1388    
1389    OP_ALT,            /* 84 Start of alternation */    OP_NOTUPTOI,       /* 78 From 0 to n matches, caseless */
1390    OP_KET,            /* 85 End of group that doesn't have an unbounded repeat */    OP_NOTMINUPTOI,    /* 79 */
1391    OP_KETRMAX,        /* 86 These two must remain together and in this */    OP_NOTEXACTI,      /* 80 Exactly n matches */
1392    OP_KETRMIN,        /* 87 order. They are for groups the repeat for ever. */  
1393      OP_NOTPOSSTARI,    /* 81 Possessified versions, caseless */
1394      OP_NOTPOSPLUSI,    /* 82 */
1395      OP_NOTPOSQUERYI,   /* 83 */
1396      OP_NOTPOSUPTOI,    /* 84 */
1397    
1398      /**** Character types ****/
1399    
1400      OP_TYPESTAR,       /* 85 The maximizing and minimizing versions of */
1401      OP_TYPEMINSTAR,    /* 86 these six opcodes must come in pairs, with */
1402      OP_TYPEPLUS,       /* 87 the minimizing one second. These codes must */
1403      OP_TYPEMINPLUS,    /* 88 be in exactly the same order as those above. */
1404      OP_TYPEQUERY,      /* 89 */
1405      OP_TYPEMINQUERY,   /* 90 */
1406    
1407      OP_TYPEUPTO,       /* 91 From 0 to n matches */
1408      OP_TYPEMINUPTO,    /* 92 */
1409      OP_TYPEEXACT,      /* 93 Exactly n matches */
1410    
1411      OP_TYPEPOSSTAR,    /* 94 Possessified versions */
1412      OP_TYPEPOSPLUS,    /* 95 */
1413      OP_TYPEPOSQUERY,   /* 96 */
1414      OP_TYPEPOSUPTO,    /* 97 */
1415    
1416      /* These are used for character classes and back references; only the
1417      first six are the same as the sets above. */
1418    
1419      OP_CRSTAR,         /* 98 The maximizing and minimizing versions of */
1420      OP_CRMINSTAR,      /* 99 all these opcodes must come in pairs, with */
1421      OP_CRPLUS,         /* 100 the minimizing one second. These codes must */
1422      OP_CRMINPLUS,      /* 101 be in exactly the same order as those above. */
1423      OP_CRQUERY,        /* 102 */
1424      OP_CRMINQUERY,     /* 103 */
1425    
1426      OP_CRRANGE,        /* 104 These are different to the three sets above. */
1427      OP_CRMINRANGE,     /* 105 */
1428    
1429      /* End of quantifier opcodes */
1430    
1431      OP_CLASS,          /* 106 Match a character class, chars < 256 only */
1432      OP_NCLASS,         /* 107 Same, but the bitmap was created from a negative
1433                                  class - the difference is relevant only when a
1434                                  UTF-8 character > 255 is encountered. */
1435      OP_XCLASS,         /* 108 Extended class for handling UTF-8 chars within the
1436                                  class. This does both positive and negative. */
1437      OP_REF,            /* 109 Match a back reference, casefully */
1438      OP_REFI,           /* 110 Match a back reference, caselessly */
1439      OP_RECURSE,        /* 111 Match a numbered subpattern (possibly recursive) */
1440      OP_CALLOUT,        /* 112 Call out to external function if provided */
1441    
1442      OP_ALT,            /* 113 Start of alternation */
1443      OP_KET,            /* 114 End of group that doesn't have an unbounded repeat */
1444      OP_KETRMAX,        /* 115 These two must remain together and in this */
1445      OP_KETRMIN,        /* 116 order. They are for groups the repeat for ever. */
1446      OP_KETRPOS,        /* 117 Possessive unlimited repeat. */
1447    
1448    /* The assertions must come before BRA, CBRA, ONCE, and COND.*/    /* The assertions must come before BRA, CBRA, ONCE, and COND.*/
1449    
1450    OP_ASSERT,         /* 88 Positive lookahead */    OP_ASSERT,         /* 118 Positive lookahead */
1451    OP_ASSERT_NOT,     /* 89 Negative lookahead */    OP_ASSERT_NOT,     /* 119 Negative lookahead */
1452    OP_ASSERTBACK,     /* 90 Positive lookbehind */    OP_ASSERTBACK,     /* 120 Positive lookbehind */
1453    OP_ASSERTBACK_NOT, /* 91 Negative lookbehind */    OP_ASSERTBACK_NOT, /* 121 Negative lookbehind */
1454    OP_REVERSE,        /* 92 Move pointer back - used in lookbehind assertions */    OP_REVERSE,        /* 122 Move pointer back - used in lookbehind assertions */
1455    
1456    /* ONCE, BRA, CBRA, and COND must come after the assertions, with ONCE first,    /* ONCE, BRA, BRAPOS, CBRA, CBRAPOS, and COND must come after the assertions,
1457    as there's a test for >= ONCE for a subpattern that isn't an assertion. */    with ONCE first, as there's a test for >= ONCE for a subpattern that isn't an
1458      assertion. The POS versions must immediately follow the non-POS versions in
1459    OP_ONCE,           /* 93 Atomic group */    each case. */
1460    OP_BRA,            /* 94 Start of non-capturing bracket */  
1461    OP_CBRA,           /* 95 Start of capturing bracket */    OP_ONCE,           /* 123 Atomic group */
1462    OP_COND,           /* 96 Conditional group */    OP_BRA,            /* 124 Start of non-capturing bracket */
1463      OP_BRAPOS,         /* 125 Ditto, with unlimited, possessive repeat */
1464      OP_CBRA,           /* 126 Start of capturing bracket */
1465      OP_CBRAPOS,        /* 127 Ditto, with unlimited, possessive repeat */
1466      OP_COND,           /* 128 Conditional group */
1467    
1468    /* 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
1469    check for >= SBRA to distinguish the two sets. */    check for >= SBRA to distinguish the two sets. */
1470    
1471    OP_SBRA,           /* 97 Start of non-capturing bracket, check empty  */    OP_SBRA,           /* 129 Start of non-capturing bracket, check empty  */
1472    OP_SCBRA,          /* 98 Start of capturing bracket, check empty */    OP_SBRAPOS,        /* 130 Ditto, with unlimited, possessive repeat */
1473    OP_SCOND,          /* 99 Conditional group, check empty */    OP_SCBRA,          /* 131 Start of capturing bracket, check empty */
1474      OP_SCBRAPOS,       /* 132 Ditto, with unlimited, possessive repeat */
1475      OP_SCOND,          /* 133 Conditional group, check empty */
1476    
1477    /* The next two pairs must (respectively) be kept together. */    /* The next two pairs must (respectively) be kept together. */
1478    
1479    OP_CREF,           /* 100 Used to hold a capture number as condition */    OP_CREF,           /* 134 Used to hold a capture number as condition */
1480    OP_NCREF,          /* 101 Same, but generaged by a name reference*/    OP_NCREF,          /* 135 Same, but generated by a name reference*/
1481    OP_RREF,           /* 102 Used to hold a recursion number as condition */    OP_RREF,           /* 136 Used to hold a recursion number as condition */
1482    OP_NRREF,          /* 103 Same, but generaged by a name reference*/    OP_NRREF,          /* 137 Same, but generated by a name reference*/
1483    OP_DEF,            /* 104 The DEFINE condition */    OP_DEF,            /* 138 The DEFINE condition */
1484    
1485    OP_BRAZERO,        /* 105 These two must remain together and in this */    OP_BRAZERO,        /* 139 These two must remain together and in this */
1486    OP_BRAMINZERO,     /* 106 order. */    OP_BRAMINZERO,     /* 140 order. */
1487      OP_BRAPOSZERO,     /* 141 */
1488    
1489    /* These are backtracking control verbs */    /* These are backtracking control verbs */
1490    
1491    OP_PRUNE,          /* 107 */    OP_MARK,           /* 142 always has an argument */
1492    OP_SKIP,           /* 108 */    OP_PRUNE,          /* 143 */
1493    OP_THEN,           /* 109 */    OP_PRUNE_ARG,      /* 144 same, but with argument */
1494    OP_COMMIT,         /* 110 */    OP_SKIP,           /* 145 */
1495      OP_SKIP_ARG,       /* 146 same, but with argument */
1496      OP_THEN,           /* 147 */
1497      OP_THEN_ARG,       /* 148 same, but with argument */
1498      OP_COMMIT,         /* 149 */
1499    
1500    /* These are forced failure and success verbs */    /* These are forced failure and success verbs */
1501    
1502    OP_FAIL,           /* 111 */    OP_FAIL,           /* 150 */
1503    OP_ACCEPT,         /* 112 */    OP_ACCEPT,         /* 151 */
1504    OP_CLOSE,          /* 113 Used before OP_ACCEPT to close open captures */    OP_CLOSE,          /* 152 Used before OP_ACCEPT to close open captures */
1505    
1506    /* This is used to skip a subpattern with a {0} quantifier */    /* This is used to skip a subpattern with a {0} quantifier */
1507    
1508    OP_SKIPZERO,       /* 114 */    OP_SKIPZERO,       /* 153 */
1509    
1510    /* 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
1511    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 1402  enum { Line 1516  enum {
1516    
1517  /* *** NOTE NOTE NOTE *** Whenever the list above is updated, the two macro  /* *** NOTE NOTE NOTE *** Whenever the list above is updated, the two macro
1518  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
1519  called "coptable" cna "poptable" in pcre_dfa_exec.c that must be updated. */  called "coptable" and "poptable" in pcre_dfa_exec.c that must be updated. */
1520    
1521    
1522  /* 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
1523  for debugging. The macro is referenced only in pcre_printint.c. */  for debugging, and some of them are only partial names. The macro is referenced
1524    only in pcre_printint.c, which fills out the full names in many cases (and in
1525    some cases doesn't actually use these names at all). */
1526    
1527  #define OP_NAME_LIST \  #define OP_NAME_LIST \
1528    "End", "\\A", "\\G", "\\K", "\\B", "\\b", "\\D", "\\d",         \    "End", "\\A", "\\G", "\\K", "\\B", "\\b", "\\D", "\\d",         \
1529    "\\S", "\\s", "\\W", "\\w", "Any", "AllAny", "Anybyte",         \    "\\S", "\\s", "\\W", "\\w", "Any", "AllAny", "Anybyte",         \
1530    "notprop", "prop", "\\R", "\\H", "\\h", "\\V", "\\v",           \    "notprop", "prop", "\\R", "\\H", "\\h", "\\V", "\\v",           \
1531    "extuni",  "\\Z", "\\z",                                        \    "extuni",  "\\Z", "\\z",                                        \
1532    "Opt", "^", "$", "char", "charnc", "not",                       \    "^", "^", "$", "$", "char", "chari", "not", "noti",             \
1533    "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \    "*", "*?", "+", "+?", "?", "??",                                \
1534      "{", "{", "{",                                                  \
1535    "*+","++", "?+", "{",                                           \    "*+","++", "?+", "{",                                           \
1536    "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \    "*", "*?", "+", "+?", "?", "??",                                \
1537      "{", "{", "{",                                                  \
1538      "*+","++", "?+", "{",                                           \
1539      "*", "*?", "+", "+?", "?", "??",                                \
1540      "{", "{", "{",                                                  \
1541      "*+","++", "?+", "{",                                           \
1542      "*", "*?", "+", "+?", "?", "??",                                \
1543      "{", "{", "{",                                                  \
1544    "*+","++", "?+", "{",                                           \    "*+","++", "?+", "{",                                           \
1545    "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \    "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \
1546    "*+","++", "?+", "{",                                           \    "*+","++", "?+", "{",                                           \
1547    "*", "*?", "+", "+?", "?", "??", "{", "{",                      \    "*", "*?", "+", "+?", "?", "??", "{", "{",                      \
1548    "class", "nclass", "xclass", "Ref", "Recurse", "Callout",       \    "class", "nclass", "xclass", "Ref", "Refi",                     \
1549    "Alt", "Ket", "KetRmax", "KetRmin", "Assert", "Assert not",     \    "Recurse", "Callout",                                           \
1550    "AssertB", "AssertB not", "Reverse",                            \    "Alt", "Ket", "KetRmax", "KetRmin", "KetRpos",                  \
1551    "Once", "Bra", "CBra", "Cond", "SBra", "SCBra", "SCond",        \    "Assert", "Assert not", "AssertB", "AssertB not", "Reverse",    \
1552      "Once",                                                         \
1553      "Bra", "BraPos", "CBra", "CBraPos",                             \
1554      "Cond",                                                         \
1555      "SBra", "SBraPos", "SCBra", "SCBraPos",                         \
1556      "SCond",                                                        \
1557    "Cond ref", "Cond nref", "Cond rec", "Cond nrec", "Cond def",   \    "Cond ref", "Cond nref", "Cond rec", "Cond nrec", "Cond def",   \
1558    "Brazero", "Braminzero",                                        \    "Brazero", "Braminzero", "Braposzero",                          \
1559    "*PRUNE", "*SKIP", "*THEN", "*COMMIT", "*FAIL", "*ACCEPT",      \    "*MARK", "*PRUNE", "*PRUNE", "*SKIP", "*SKIP",                  \
1560      "*THEN", "*THEN", "*COMMIT", "*FAIL", "*ACCEPT",                \
1561    "Close", "Skip zero"    "Close", "Skip zero"
1562    
1563    
# Line 1448  in UTF-8 mode. The code that uses this t Line 1578  in UTF-8 mode. The code that uses this t
1578    3, 3,                          /* \P, \p                                 */ \    3, 3,                          /* \P, \p                                 */ \
1579    1, 1, 1, 1, 1,                 /* \R, \H, \h, \V, \v                     */ \    1, 1, 1, 1, 1,                 /* \R, \H, \h, \V, \v                     */ \
1580    1,                             /* \X                                     */ \    1,                             /* \X                                     */ \
1581    1, 1, 2, 1, 1,                 /* \Z, \z, Opt, ^, $                      */ \    1, 1, 1, 1, 1, 1,              /* \Z, \z, ^, ^M, $, $M                   */ \
1582    2,                             /* Char  - the minimum length             */ \    2,                             /* Char  - the minimum length             */ \
1583    2,                             /* Charnc  - the minimum length           */ \    2,                             /* Chari  - the minimum length            */ \
1584    2,                             /* not                                    */ \    2,                             /* not                                    */ \
1585    /* Positive single-char repeats                            ** These are  */ \    2,                             /* noti                                   */ \
1586    2, 2, 2, 2, 2, 2,              /* *, *?, +, +?, ?, ??      ** minima in  */ \    /* Positive single-char repeats                             ** These are */ \
1587    4, 4, 4,                       /* upto, minupto, exact     ** UTF-8 mode */ \    2, 2, 2, 2, 2, 2,              /* *, *?, +, +?, ?, ??       ** minima in */ \
1588      4, 4, 4,                       /* upto, minupto, exact      ** mode      */ \
1589    2, 2, 2, 4,                    /* *+, ++, ?+, upto+                      */ \    2, 2, 2, 4,                    /* *+, ++, ?+, upto+                      */ \
1590      2, 2, 2, 2, 2, 2,              /* *I, *?I, +I, +?I, ?I, ??I ** UTF-8     */ \
1591      4, 4, 4,                       /* upto I, minupto I, exact I             */ \
1592      2, 2, 2, 4,                    /* *+I, ++I, ?+I, upto+I                  */ \
1593    /* Negative single-char repeats - only for chars < 256                   */ \    /* Negative single-char repeats - only for chars < 256                   */ \
1594    2, 2, 2, 2, 2, 2,              /* NOT *, *?, +, +?, ?, ??                */ \    2, 2, 2, 2, 2, 2,              /* NOT *, *?, +, +?, ?, ??                */ \
1595    4, 4, 4,                       /* NOT upto, minupto, exact               */ \    4, 4, 4,                       /* NOT upto, minupto, exact               */ \
1596    2, 2, 2, 4,                    /* Possessive *, +, ?, upto               */ \    2, 2, 2, 4,                    /* Possessive NOT *, +, ?, upto           */ \
1597      2, 2, 2, 2, 2, 2,              /* NOT *I, *?I, +I, +?I, ?I, ??I          */ \
1598      4, 4, 4,                       /* NOT upto I, minupto I, exact I         */ \
1599      2, 2, 2, 4,                    /* Possessive NOT *I, +I, ?I, upto I      */ \
1600    /* Positive type repeats                                                 */ \    /* Positive type repeats                                                 */ \
1601    2, 2, 2, 2, 2, 2,              /* Type *, *?, +, +?, ?, ??               */ \    2, 2, 2, 2, 2, 2,              /* Type *, *?, +, +?, ?, ??               */ \
1602    4, 4, 4,                       /* Type upto, minupto, exact              */ \    4, 4, 4,                       /* Type upto, minupto, exact              */ \
# Line 1471  in UTF-8 mode. The code that uses this t Line 1608  in UTF-8 mode. The code that uses this t
1608   33,                             /* NCLASS                                 */ \   33,                             /* NCLASS                                 */ \
1609    0,                             /* XCLASS - variable length               */ \    0,                             /* XCLASS - variable length               */ \
1610    3,                             /* REF                                    */ \    3,                             /* REF                                    */ \
1611      3,                             /* REFI                                   */ \
1612    1+LINK_SIZE,                   /* RECURSE                                */ \    1+LINK_SIZE,                   /* RECURSE                                */ \
1613    2+2*LINK_SIZE,                 /* CALLOUT                                */ \    2+2*LINK_SIZE,                 /* CALLOUT                                */ \
1614    1+LINK_SIZE,                   /* Alt                                    */ \    1+LINK_SIZE,                   /* Alt                                    */ \
1615    1+LINK_SIZE,                   /* Ket                                    */ \    1+LINK_SIZE,                   /* Ket                                    */ \
1616    1+LINK_SIZE,                   /* KetRmax                                */ \    1+LINK_SIZE,                   /* KetRmax                                */ \
1617    1+LINK_SIZE,                   /* KetRmin                                */ \    1+LINK_SIZE,                   /* KetRmin                                */ \
1618      1+LINK_SIZE,                   /* KetRpos                                */ \
1619    1+LINK_SIZE,                   /* Assert                                 */ \    1+LINK_SIZE,                   /* Assert                                 */ \
1620    1+LINK_SIZE,                   /* Assert not                             */ \    1+LINK_SIZE,                   /* Assert not                             */ \
1621    1+LINK_SIZE,                   /* Assert behind                          */ \    1+LINK_SIZE,                   /* Assert behind                          */ \
# Line 1484  in UTF-8 mode. The code that uses this t Line 1623  in UTF-8 mode. The code that uses this t
1623    1+LINK_SIZE,                   /* Reverse                                */ \    1+LINK_SIZE,                   /* Reverse                                */ \
1624    1+LINK_SIZE,                   /* ONCE                                   */ \    1+LINK_SIZE,                   /* ONCE                                   */ \
1625    1+LINK_SIZE,                   /* BRA                                    */ \    1+LINK_SIZE,                   /* BRA                                    */ \
1626      1+LINK_SIZE,                   /* BRAPOS                                 */ \
1627    3+LINK_SIZE,                   /* CBRA                                   */ \    3+LINK_SIZE,                   /* CBRA                                   */ \
1628      3+LINK_SIZE,                   /* CBRAPOS                                */ \
1629    1+LINK_SIZE,                   /* COND                                   */ \    1+LINK_SIZE,                   /* COND                                   */ \
1630    1+LINK_SIZE,                   /* SBRA                                   */ \    1+LINK_SIZE,                   /* SBRA                                   */ \
1631      1+LINK_SIZE,                   /* SBRAPOS                                */ \
1632    3+LINK_SIZE,                   /* SCBRA                                  */ \    3+LINK_SIZE,                   /* SCBRA                                  */ \
1633      3+LINK_SIZE,                   /* SCBRAPOS                               */ \
1634    1+LINK_SIZE,                   /* SCOND                                  */ \    1+LINK_SIZE,                   /* SCOND                                  */ \
1635    3, 3,                          /* CREF, NCREF                            */ \    3, 3,                          /* CREF, NCREF                            */ \
1636    3, 3,                          /* RREF, NRREF                            */ \    3, 3,                          /* RREF, NRREF                            */ \
1637    1,                             /* DEF                                    */ \    1,                             /* DEF                                    */ \
1638    1, 1,                          /* BRAZERO, BRAMINZERO                    */ \    1, 1, 1,                       /* BRAZERO, BRAMINZERO, BRAPOSZERO        */ \
1639    1, 1, 1, 1,                    /* PRUNE, SKIP, THEN, COMMIT,             */ \    3, 1, 3,                       /* MARK, PRUNE, PRUNE_ARG                 */ \
1640    1, 1, 3, 1                     /* FAIL, ACCEPT, CLOSE, SKIPZERO          */    1, 3,                          /* SKIP, SKIP_ARG                         */ \
1641      1+LINK_SIZE, 3+LINK_SIZE,      /* THEN, THEN_ARG                         */ \
1642      1, 1, 1, 3, 1                  /* COMMIT, FAIL, ACCEPT, CLOSE, SKIPZERO  */ \
1643    
1644  /* 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"
1645  condition. */  condition. */
# Line 1503  condition. */ Line 1647  condition. */
1647  #define RREF_ANY  0xffff  #define RREF_ANY  0xffff
1648    
1649  /* Compile time error code numbers. They are given names so that they can more  /* Compile time error code numbers. They are given names so that they can more
1650  easily be tracked. When a new number is added, the table called eint in  easily be tracked. When a new number is added, the table called eint in
1651  pcreposix.c must be updated. */  pcreposix.c must be updated. */
1652    
1653  enum { ERR0,  ERR1,  ERR2,  ERR3,  ERR4,  ERR5,  ERR6,  ERR7,  ERR8,  ERR9,  enum { ERR0,  ERR1,  ERR2,  ERR3,  ERR4,  ERR5,  ERR6,  ERR7,  ERR8,  ERR9,
# Line 1512  enum { ERR0, ERR1, ERR2, ERR3, ERR4, Line 1656  enum { ERR0, ERR1, ERR2, ERR3, ERR4,
1656         ERR30, ERR31, ERR32, ERR33, ERR34, ERR35, ERR36, ERR37, ERR38, ERR39,         ERR30, ERR31, ERR32, ERR33, ERR34, ERR35, ERR36, ERR37, ERR38, ERR39,
1657         ERR40, ERR41, ERR42, ERR43, ERR44, ERR45, ERR46, ERR47, ERR48, ERR49,         ERR40, ERR41, ERR42, ERR43, ERR44, ERR45, ERR46, ERR47, ERR48, ERR49,
1658         ERR50, ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58, ERR59,         ERR50, ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58, ERR59,
1659         ERR60, ERR61, ERR62, ERR63, ERR64, ERR65, ERRCOUNT };         ERR60, ERR61, ERR62, ERR63, ERR64, ERR65, ERR66, ERR67, ERR68,
1660           ERRCOUNT };
1661    
1662  /* 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
1663  code vector run on as long as necessary after the end. We store an explicit  code vector run on as long as necessary after the end. We store an explicit
# Line 1617  typedef struct recursion_info { Line 1762  typedef struct recursion_info {
1762    struct recursion_info *prevrec; /* Previous recursion record (or NULL) */    struct recursion_info *prevrec; /* Previous recursion record (or NULL) */
1763    int group_num;                /* Number of group that was called */    int group_num;                /* Number of group that was called */
1764    const uschar *after_call;     /* "Return value": points after the call in the expr */    const uschar *after_call;     /* "Return value": points after the call in the expr */
   USPTR save_start;             /* Old value of mstart */  
1765    int *offset_save;             /* Pointer to start of saved offsets */    int *offset_save;             /* Pointer to start of saved offsets */
1766    int saved_max;                /* Number of saved offsets */    int saved_max;                /* Number of saved offsets */
1767    int save_offset_top;          /* Current value of offset_top */    int save_offset_top;          /* Current value of offset_top */
# Line 1656  typedef struct match_data { Line 1800  typedef struct match_data {
1800    BOOL   noteol;                /* NOTEOL flag */    BOOL   noteol;                /* NOTEOL flag */
1801    BOOL   utf8;                  /* UTF8 flag */    BOOL   utf8;                  /* UTF8 flag */
1802    BOOL   jscript_compat;        /* JAVASCRIPT_COMPAT flag */    BOOL   jscript_compat;        /* JAVASCRIPT_COMPAT flag */
1803      BOOL   use_ucp;               /* PCRE_UCP flag */
1804    BOOL   endonly;               /* Dollar not before final \n */    BOOL   endonly;               /* Dollar not before final \n */
1805    BOOL   notempty;              /* Empty string match not wanted */    BOOL   notempty;              /* Empty string match not wanted */
1806    BOOL   notempty_atstart;      /* Empty string match at start not wanted */    BOOL   notempty_atstart;      /* Empty string match at start not wanted */
# Line 1671  typedef struct match_data { Line 1816  typedef struct match_data {
1816    int    end_offset_top;        /* Highwater mark at end of match */    int    end_offset_top;        /* Highwater mark at end of match */
1817    int    capture_last;          /* Most recent capture number */    int    capture_last;          /* Most recent capture number */
1818    int    start_offset;          /* The start offset value */    int    start_offset;          /* The start offset value */
1819      int    match_function_type;   /* Set for certain special calls of MATCH() */
1820    eptrblock *eptrchain;         /* Chain of eptrblocks for tail recursions */    eptrblock *eptrchain;         /* Chain of eptrblocks for tail recursions */
1821    int    eptrn;                 /* Next free eptrblock */    int    eptrn;                 /* Next free eptrblock */
1822    recursion_info *recursive;    /* Linked list of recursion data */    recursion_info *recursive;    /* Linked list of recursion data */
1823    void  *callout_data;          /* To pass back to callouts */    void  *callout_data;          /* To pass back to callouts */
1824      const uschar *mark;           /* Mark pointer to pass back */
1825  } match_data;  } match_data;
1826    
1827  /* 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
# Line 1770  extern BOOL _pcre_is_newline(US Line 1917  extern BOOL _pcre_is_newline(US
1917  extern int           _pcre_ord2utf8(int, uschar *);  extern int           _pcre_ord2utf8(int, uschar *);
1918  extern real_pcre    *_pcre_try_flipped(const real_pcre *, real_pcre *,  extern real_pcre    *_pcre_try_flipped(const real_pcre *, real_pcre *,
1919                         const pcre_study_data *, pcre_study_data *);                         const pcre_study_data *, pcre_study_data *);
1920  extern int           _pcre_valid_utf8(USPTR, int);  extern int           _pcre_valid_utf8(USPTR, int, int *);
1921  extern BOOL          _pcre_was_newline(USPTR, int, USPTR, int *, BOOL);  extern BOOL          _pcre_was_newline(USPTR, int, USPTR, int *, BOOL);
1922  extern BOOL          _pcre_xclass(int, const uschar *);  extern BOOL          _pcre_xclass(int, const uschar *);
1923    
# Line 1794  extern const int _pcre_ucp_genty Line 1941  extern const int _pcre_ucp_genty
1941  #define UCD_BLOCK_SIZE 128  #define UCD_BLOCK_SIZE 128
1942  #define GET_UCD(ch) (_pcre_ucd_records + \  #define GET_UCD(ch) (_pcre_ucd_records + \
1943          _pcre_ucd_stage2[_pcre_ucd_stage1[(ch) / UCD_BLOCK_SIZE] * \          _pcre_ucd_stage2[_pcre_ucd_stage1[(ch) / UCD_BLOCK_SIZE] * \
1944          UCD_BLOCK_SIZE + ch % UCD_BLOCK_SIZE])          UCD_BLOCK_SIZE + (ch) % UCD_BLOCK_SIZE])
1945    
1946  #define UCD_CHARTYPE(ch)  GET_UCD(ch)->chartype  #define UCD_CHARTYPE(ch)  GET_UCD(ch)->chartype
1947  #define UCD_SCRIPT(ch)    GET_UCD(ch)->script  #define UCD_SCRIPT(ch)    GET_UCD(ch)->script

Legend:
Removed from v.499  
changed lines
  Added in v.612

webmaster@exim.org
ViewVC Help
Powered by ViewVC 1.1.12