/[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 475 by ph10, Sat Jan 2 18:21:30 2010 UTC revision 771 by ph10, Tue Nov 29 15:34:12 2011 UTC
# Line 7  Line 7 
7  and semantics are as close as possible to those of the Perl 5 language.  and semantics are as close as possible to those of the Perl 5 language.
8    
9                         Written by Philip Hazel                         Written by Philip Hazel
10             Copyright (c) 1997-2010 University of Cambridge             Copyright (c) 1997-2011 University of Cambridge
11    
12  -----------------------------------------------------------------------------  -----------------------------------------------------------------------------
13  Redistribution and use in source and binary forms, with or without  Redistribution and use in source and binary forms, with or without
# Line 184  preprocessor time in standard C environm Line 184  preprocessor time in standard C environm
184    #error Cannot determine a type for 32-bit unsigned integers    #error Cannot determine a type for 32-bit unsigned integers
185  #endif  #endif
186    
187  /* When checking for integer overflow in pcre_compile(), we need to handle  /* When checking for integer overflow in pcre_compile(), we need to handle
188  large integers. If a 64-bit integer type is available, we can use that.  large integers. If a 64-bit integer type is available, we can use that.
189  Otherwise we have to cast to double, which of course requires floating point  Otherwise we have to cast to double, which of course requires floating point
190  arithmetic. Handle this by defining a macro for the appropriate type. If  arithmetic. Handle this by defining a macro for the appropriate type. If
191  stdint.h is available, include it; it may define INT64_MAX. The macro int64_t  stdint.h is available, include it; it may define INT64_MAX. Systems that do not
192  may be set by "configure". */  have stdint.h (e.g. Solaris) may have inttypes.h. The macro int64_t may be set
193    by "configure". */
194    
195  #if HAVE_STDINT_H  #if HAVE_STDINT_H
196  #include <stdint.h>  #include <stdint.h>
197    #elif HAVE_INTTYPES_H
198    #include <inttypes.h>
199  #endif  #endif
200    
201  #if defined INT64_MAX || defined int64_t  #if defined INT64_MAX || defined int64_t
# Line 405  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 415  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          c = ((c & 0x07) << 18) | ((*eptr & 0x3f) << 12) | \
483              ((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        gcss -= 6; \        c = ((c & 0x01) << 30) | ((*eptr & 0x3f) << 24) | \
496        c |= (eptr[gcii] & 0x3f) << gcss; \            ((eptr[1] & 0x3f) << 18) | ((eptr[2] & 0x3f) << 12) | \
497              ((eptr[3] & 0x3f) << 6) | (eptr[4] & 0x3f); \
498          eptr += 5; \
499        } \        } \
500      }      }
501    
# Line 460  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 493  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 533  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 544  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 560  compatibility. */ Line 594  compatibility. */
594  #define PCRE_STARTLINE     0x0008  /* start after \n for multiline */  #define PCRE_STARTLINE     0x0008  /* start after \n for multiline */
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    #define PCRE_HASTHEN       0x0040  /* pattern contains (*THEN) */
598    
599  /* Options for the "extra" block produced by pcre_study(). */  /* Flags for the "extra" block produced by pcre_study(). */
600    
601  #define PCRE_STUDY_MAPPED   0x01     /* a map of starting chars exists */  #define PCRE_STUDY_MAPPED  0x0001  /* a map of starting chars exists */
602  #define PCRE_STUDY_MINLEN   0x02     /* a minimum length field exists */  #define PCRE_STUDY_MINLEN  0x0002  /* a minimum length field exists */
603    
604  /* Masks for identifying the public options that are permitted at compile  /* Masks for identifying the public options that are permitted at compile
605  time, run time, or study time, respectively. */  time, run time, or study time, respectively. */
# Line 577  time, run time, or study time, respectiv Line 612  time, run time, or study time, respectiv
612     PCRE_DOTALL|PCRE_DOLLAR_ENDONLY|PCRE_EXTRA|PCRE_UNGREEDY|PCRE_UTF8| \     PCRE_DOTALL|PCRE_DOLLAR_ENDONLY|PCRE_EXTRA|PCRE_UNGREEDY|PCRE_UTF8| \
613     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| \
614     PCRE_DUPNAMES|PCRE_NEWLINE_BITS|PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE| \     PCRE_DUPNAMES|PCRE_NEWLINE_BITS|PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE| \
615     PCRE_JAVASCRIPT_COMPAT)     PCRE_JAVASCRIPT_COMPAT|PCRE_UCP|PCRE_NO_START_OPTIMIZE)
616    
617  #define PUBLIC_EXEC_OPTIONS \  #define PUBLIC_EXEC_OPTIONS \
618    (PCRE_ANCHORED|PCRE_NOTBOL|PCRE_NOTEOL|PCRE_NOTEMPTY|PCRE_NOTEMPTY_ATSTART| \    (PCRE_ANCHORED|PCRE_NOTBOL|PCRE_NOTEOL|PCRE_NOTEMPTY|PCRE_NOTEMPTY_ATSTART| \
# Line 590  time, run time, or study time, respectiv Line 625  time, run time, or study time, respectiv
625     PCRE_DFA_RESTART|PCRE_NEWLINE_BITS|PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE| \     PCRE_DFA_RESTART|PCRE_NEWLINE_BITS|PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE| \
626     PCRE_NO_START_OPTIMIZE)     PCRE_NO_START_OPTIMIZE)
627    
628  #define PUBLIC_STUDY_OPTIONS 0   /* None defined */  #define PUBLIC_STUDY_OPTIONS \
629       PCRE_STUDY_JIT_COMPILE
630    
631  /* Magic number to provide a small check against being handed junk. Also used  /* Magic number to provide a small check against being handed junk. Also used
632  to detect whether a pattern was compiled on a host of different endianness. */  to detect whether a pattern was compiled on a host of different endianness. */
# Line 872  so that PCRE works on both ASCII and EBC Line 908  so that PCRE works on both ASCII and EBC
908  #define STRING_COMMIT0              "COMMIT\0"  #define STRING_COMMIT0              "COMMIT\0"
909  #define STRING_F0                   "F\0"  #define STRING_F0                   "F\0"
910  #define STRING_FAIL0                "FAIL\0"  #define STRING_FAIL0                "FAIL\0"
911    #define STRING_MARK0                "MARK\0"
912  #define STRING_PRUNE0               "PRUNE\0"  #define STRING_PRUNE0               "PRUNE\0"
913  #define STRING_SKIP0                "SKIP\0"  #define STRING_SKIP0                "SKIP\0"
914  #define STRING_THEN                 "THEN"  #define STRING_THEN                 "THEN"
# Line 893  so that PCRE works on both ASCII and EBC Line 930  so that PCRE works on both ASCII and EBC
930    
931  #define STRING_DEFINE               "DEFINE"  #define STRING_DEFINE               "DEFINE"
932    
933  #define STRING_CR_RIGHTPAR          "CR)"  #define STRING_CR_RIGHTPAR             "CR)"
934  #define STRING_LF_RIGHTPAR          "LF)"  #define STRING_LF_RIGHTPAR             "LF)"
935  #define STRING_CRLF_RIGHTPAR        "CRLF)"  #define STRING_CRLF_RIGHTPAR           "CRLF)"
936  #define STRING_ANY_RIGHTPAR         "ANY)"  #define STRING_ANY_RIGHTPAR            "ANY)"
937  #define STRING_ANYCRLF_RIGHTPAR     "ANYCRLF)"  #define STRING_ANYCRLF_RIGHTPAR        "ANYCRLF)"
938  #define STRING_BSR_ANYCRLF_RIGHTPAR "BSR_ANYCRLF)"  #define STRING_BSR_ANYCRLF_RIGHTPAR    "BSR_ANYCRLF)"
939  #define STRING_BSR_UNICODE_RIGHTPAR "BSR_UNICODE)"  #define STRING_BSR_UNICODE_RIGHTPAR    "BSR_UNICODE)"
940  #define STRING_UTF8_RIGHTPAR        "UTF8)"  #define STRING_UTF8_RIGHTPAR           "UTF8)"
941    #define STRING_UCP_RIGHTPAR            "UCP)"
942    #define STRING_NO_START_OPT_RIGHTPAR   "NO_START_OPT)"
943    
944  #else  /* SUPPORT_UTF8 */  #else  /* SUPPORT_UTF8 */
945    
# Line 1124  only. */ Line 1163  only. */
1163  #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"
1164  #define STRING_F0                   STR_F "\0"  #define STRING_F0                   STR_F "\0"
1165  #define STRING_FAIL0                STR_F STR_A STR_I STR_L "\0"  #define STRING_FAIL0                STR_F STR_A STR_I STR_L "\0"
1166    #define STRING_MARK0                STR_M STR_A STR_R STR_K "\0"
1167  #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"
1168  #define STRING_SKIP0                STR_S STR_K STR_I STR_P "\0"  #define STRING_SKIP0                STR_S STR_K STR_I STR_P "\0"
1169  #define STRING_THEN                 STR_T STR_H STR_E STR_N  #define STRING_THEN                 STR_T STR_H STR_E STR_N
# Line 1145  only. */ Line 1185  only. */
1185    
1186  #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
1187    
1188  #define STRING_CR_RIGHTPAR          STR_C STR_R STR_RIGHT_PARENTHESIS  #define STRING_CR_RIGHTPAR             STR_C STR_R STR_RIGHT_PARENTHESIS
1189  #define STRING_LF_RIGHTPAR          STR_L STR_F STR_RIGHT_PARENTHESIS  #define STRING_LF_RIGHTPAR             STR_L STR_F STR_RIGHT_PARENTHESIS
1190  #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
1191  #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
1192  #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
1193  #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
1194  #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
1195  #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
1196    #define STRING_UCP_RIGHTPAR            STR_U STR_C STR_P STR_RIGHT_PARENTHESIS
1197    #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
1198    
1199  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF8 */
1200    
# Line 1185  only. */ Line 1227  only. */
1227    
1228  #define PT_ANY        0    /* Any property - matches all chars */  #define PT_ANY        0    /* Any property - matches all chars */
1229  #define PT_LAMP       1    /* L& - the union of Lu, Ll, Lt */  #define PT_LAMP       1    /* L& - the union of Lu, Ll, Lt */
1230  #define PT_GC         2    /* General characteristic (e.g. L) */  #define PT_GC         2    /* Specified general characteristic (e.g. L) */
1231  #define PT_PC         3    /* Particular characteristic (e.g. Lu) */  #define PT_PC         3    /* Specified particular characteristic (e.g. Lu) */
1232  #define PT_SC         4    /* Script (e.g. Han) */  #define PT_SC         4    /* Script (e.g. Han) */
1233    #define PT_ALNUM      5    /* Alphanumeric - the union of L and N */
1234    #define PT_SPACE      6    /* Perl space - Z plus 9,10,12,13 */
1235    #define PT_PXSPACE    7    /* POSIX space - Z plus 9,10,11,12,13 */
1236    #define PT_WORD       8    /* Word - L plus N plus underscore */
1237    
1238  /* 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
1239  contain UTF-8 characters with values greater than 255. */  contain UTF-8 characters with values greater than 255. */
# Line 1204  contain UTF-8 characters with values gre Line 1250  contain UTF-8 characters with values gre
1250  /* 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
1251  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
1252  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
1253  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
1254  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
1255  (which is used for [^] in JavaScript compatibility mode).  used for [^] in JavaScript compatibility mode, and for \C in non-utf8 mode. In
1256    non-DOTALL mode, "." behaves like \N.
1257    
1258    The special values ESC_DU, ESC_du, etc. are used instead of ESC_D, ESC_d, etc.
1259    when PCRE_UCP is set, when replacement of \d etc by \p sequences is required.
1260    They must be contiguous, and remain in order so that the replacements can be
1261    looked up from a table.
1262    
1263  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
1264  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 1216  put in between that don't consume a char Line 1268  put in between that don't consume a char
1268  */  */
1269    
1270  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,
1271         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,
1272         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,
1273           ESC_E, ESC_Q, ESC_g, ESC_k,
1274           ESC_DU, ESC_du, ESC_SU, ESC_su, ESC_WU, ESC_wu,
1275         ESC_REF };         ESC_REF };
1276    
   
1277  /* 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
1278  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.
1279    
# Line 1244  enum { Line 1297  enum {
1297    OP_WHITESPACE,         /*  9 \s */    OP_WHITESPACE,         /*  9 \s */
1298    OP_NOT_WORDCHAR,       /* 10 \W */    OP_NOT_WORDCHAR,       /* 10 \W */
1299    OP_WORDCHAR,           /* 11 \w */    OP_WORDCHAR,           /* 11 \w */
1300    OP_ANY,            /* 12 Match any character (subject to DOTALL) */  
1301    OP_ALLANY,         /* 13 Match any character (not subject to DOTALL) */    OP_ANY,            /* 12 Match any character except newline */
1302      OP_ALLANY,         /* 13 Match any character */
1303    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 */
1304    OP_NOTPROP,        /* 15 \P (not Unicode property) */    OP_NOTPROP,        /* 15 \P (not Unicode property) */
1305    OP_PROP,           /* 16 \p (Unicode property) */    OP_PROP,           /* 16 \p (Unicode property) */
# Line 1258  enum { Line 1312  enum {
1312    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. */
1313    OP_EOD,            /* 24 End of data: \z */    OP_EOD,            /* 24 End of data: \z */
1314    
1315    OP_OPT,            /* 25 Set runtime options */    OP_CIRC,           /* 25 Start of line - not multiline */
1316    OP_CIRC,           /* 26 Start of line - varies with multiline switch */    OP_CIRCM,          /* 26 Start of line - multiline */
1317    OP_DOLL,           /* 27 End of line - varies with multiline switch */    OP_DOLL,           /* 27 End of line - not multiline */
1318    OP_CHAR,           /* 28 Match one character, casefully */    OP_DOLLM,          /* 28 End of line - multiline */
1319    OP_CHARNC,         /* 29 Match one character, caselessly */    OP_CHAR,           /* 29 Match one character, casefully */
1320    OP_NOT,            /* 30 Match one character, not the following one */    OP_CHARI,          /* 30 Match one character, caselessly */
1321      OP_NOT,            /* 31 Match one character, not the given one, casefully */
1322    OP_STAR,           /* 31 The maximizing and minimizing versions of */    OP_NOTI,           /* 32 Match one character, not the given one, caselessly */
1323    OP_MINSTAR,        /* 32 these six opcodes must come in pairs, with */  
1324    OP_PLUS,           /* 33 the minimizing one second. */    /* The following sets of 13 opcodes must always be kept in step because
1325    OP_MINPLUS,        /* 34 This first set applies to single characters.*/    the offset from the first one is used to generate the others. */
1326    OP_QUERY,          /* 35 */  
1327    OP_MINQUERY,       /* 36 */    /**** Single characters, caseful, must precede the caseless ones ****/
1328    
1329    OP_UPTO,           /* 37 From 0 to n matches */    OP_STAR,           /* 33 The maximizing and minimizing versions of */
1330    OP_MINUPTO,        /* 38 */    OP_MINSTAR,        /* 34 these six opcodes must come in pairs, with */
1331    OP_EXACT,          /* 39 Exactly n matches */    OP_PLUS,           /* 35 the minimizing one second. */
1332      OP_MINPLUS,        /* 36 */
1333    OP_POSSTAR,        /* 40 Possessified star */    OP_QUERY,          /* 37 */
1334    OP_POSPLUS,        /* 41 Possessified plus */    OP_MINQUERY,       /* 38 */
1335    OP_POSQUERY,       /* 42 Posesssified query */  
1336    OP_POSUPTO,        /* 43 Possessified upto */    OP_UPTO,           /* 39 From 0 to n matches of one character, caseful*/
1337      OP_MINUPTO,        /* 40 */
1338    OP_NOTSTAR,        /* 44 The maximizing and minimizing versions of */    OP_EXACT,          /* 41 Exactly n matches */
1339    OP_NOTMINSTAR,     /* 45 these six opcodes must come in pairs, with */  
1340    OP_NOTPLUS,        /* 46 the minimizing one second. They must be in */    OP_POSSTAR,        /* 42 Possessified star, caseful */
1341    OP_NOTMINPLUS,     /* 47 exactly the same order as those above. */    OP_POSPLUS,        /* 43 Possessified plus, caseful */
1342    OP_NOTQUERY,       /* 48 This set applies to "not" single characters. */    OP_POSQUERY,       /* 44 Posesssified query, caseful */
1343    OP_NOTMINQUERY,    /* 49 */    OP_POSUPTO,        /* 45 Possessified upto, caseful */
1344    
1345    OP_NOTUPTO,        /* 50 From 0 to n matches */    /**** Single characters, caseless, must follow the caseful ones */
1346    OP_NOTMINUPTO,     /* 51 */  
1347    OP_NOTEXACT,       /* 52 Exactly n matches */    OP_STARI,          /* 46 */
1348      OP_MINSTARI,       /* 47 */
1349    OP_NOTPOSSTAR,     /* 53 Possessified versions */    OP_PLUSI,          /* 48 */
1350    OP_NOTPOSPLUS,     /* 54 */    OP_MINPLUSI,       /* 49 */
1351    OP_NOTPOSQUERY,    /* 55 */    OP_QUERYI,         /* 50 */
1352    OP_NOTPOSUPTO,     /* 56 */    OP_MINQUERYI,      /* 51 */
1353    
1354    OP_TYPESTAR,       /* 57 The maximizing and minimizing versions of */    OP_UPTOI,          /* 52 From 0 to n matches of one character, caseless */
1355    OP_TYPEMINSTAR,    /* 58 these six opcodes must come in pairs, with */    OP_MINUPTOI,       /* 53 */
1356    OP_TYPEPLUS,       /* 59 the minimizing one second. These codes must */    OP_EXACTI,         /* 54 */
1357    OP_TYPEMINPLUS,    /* 60 be in exactly the same order as those above. */  
1358    OP_TYPEQUERY,      /* 61 This set applies to character types such as \d */    OP_POSSTARI,       /* 55 Possessified star, caseless */
1359    OP_TYPEMINQUERY,   /* 62 */    OP_POSPLUSI,       /* 56 Possessified plus, caseless */
1360      OP_POSQUERYI,      /* 57 Posesssified query, caseless */
1361    OP_TYPEUPTO,       /* 63 From 0 to n matches */    OP_POSUPTOI,       /* 58 Possessified upto, caseless */
1362    OP_TYPEMINUPTO,    /* 64 */  
1363    OP_TYPEEXACT,      /* 65 Exactly n matches */    /**** The negated ones must follow the non-negated ones, and match them ****/
1364      /**** Negated single character, caseful; must precede the caseless ones ****/
1365    OP_TYPEPOSSTAR,    /* 66 Possessified versions */  
1366    OP_TYPEPOSPLUS,    /* 67 */    OP_NOTSTAR,        /* 59 The maximizing and minimizing versions of */
1367    OP_TYPEPOSQUERY,   /* 68 */    OP_NOTMINSTAR,     /* 60 these six opcodes must come in pairs, with */
1368    OP_TYPEPOSUPTO,    /* 69 */    OP_NOTPLUS,        /* 61 the minimizing one second. They must be in */
1369      OP_NOTMINPLUS,     /* 62 exactly the same order as those above. */
1370    OP_CRSTAR,         /* 70 The maximizing and minimizing versions of */    OP_NOTQUERY,       /* 63 */
1371    OP_CRMINSTAR,      /* 71 all these opcodes must come in pairs, with */    OP_NOTMINQUERY,    /* 64 */
1372    OP_CRPLUS,         /* 72 the minimizing one second. These codes must */  
1373    OP_CRMINPLUS,      /* 73 be in exactly the same order as those above. */    OP_NOTUPTO,        /* 65 From 0 to n matches, caseful */
1374    OP_CRQUERY,        /* 74 These are for character classes and back refs */    OP_NOTMINUPTO,     /* 66 */
1375    OP_CRMINQUERY,     /* 75 */    OP_NOTEXACT,       /* 67 Exactly n matches */
1376    OP_CRRANGE,        /* 76 These are different to the three sets above. */  
1377    OP_CRMINRANGE,     /* 77 */    OP_NOTPOSSTAR,     /* 68 Possessified versions, caseful */
1378      OP_NOTPOSPLUS,     /* 69 */
1379    OP_CLASS,          /* 78 Match a character class, chars < 256 only */    OP_NOTPOSQUERY,    /* 70 */
1380    OP_NCLASS,         /* 79 Same, but the bitmap was created from a negative    OP_NOTPOSUPTO,     /* 71 */
1381                             class - the difference is relevant only when a UTF-8  
1382                             character > 255 is encountered. */    /**** Negated single character, caseless; must follow the caseful ones ****/
1383    
1384    OP_XCLASS,         /* 80 Extended class for handling UTF-8 chars within the    OP_NOTSTARI,       /* 72 */
1385                             class. This does both positive and negative. */    OP_NOTMINSTARI,    /* 73 */
1386      OP_NOTPLUSI,       /* 74 */
1387    OP_REF,            /* 81 Match a back reference */    OP_NOTMINPLUSI,    /* 75 */
1388    OP_RECURSE,        /* 82 Match a numbered subpattern (possibly recursive) */    OP_NOTQUERYI,      /* 76 */
1389    OP_CALLOUT,        /* 83 Call out to external function if provided */    OP_NOTMINQUERYI,   /* 77 */
1390    
1391    OP_ALT,            /* 84 Start of alternation */    OP_NOTUPTOI,       /* 78 From 0 to n matches, caseless */
1392    OP_KET,            /* 85 End of group that doesn't have an unbounded repeat */    OP_NOTMINUPTOI,    /* 79 */
1393    OP_KETRMAX,        /* 86 These two must remain together and in this */    OP_NOTEXACTI,      /* 80 Exactly n matches */
1394    OP_KETRMIN,        /* 87 order. They are for groups the repeat for ever. */  
1395      OP_NOTPOSSTARI,    /* 81 Possessified versions, caseless */
1396    /* The assertions must come before BRA, CBRA, ONCE, and COND.*/    OP_NOTPOSPLUSI,    /* 82 */
1397      OP_NOTPOSQUERYI,   /* 83 */
1398    OP_ASSERT,         /* 88 Positive lookahead */    OP_NOTPOSUPTOI,    /* 84 */
1399    OP_ASSERT_NOT,     /* 89 Negative lookahead */  
1400    OP_ASSERTBACK,     /* 90 Positive lookbehind */    /**** Character types ****/
1401    OP_ASSERTBACK_NOT, /* 91 Negative lookbehind */  
1402    OP_REVERSE,        /* 92 Move pointer back - used in lookbehind assertions */    OP_TYPESTAR,       /* 85 The maximizing and minimizing versions of */
1403      OP_TYPEMINSTAR,    /* 86 these six opcodes must come in pairs, with */
1404    /* ONCE, BRA, CBRA, and COND must come after the assertions, with ONCE first,    OP_TYPEPLUS,       /* 87 the minimizing one second. These codes must */
1405    as there's a test for >= ONCE for a subpattern that isn't an assertion. */    OP_TYPEMINPLUS,    /* 88 be in exactly the same order as those above. */
1406      OP_TYPEQUERY,      /* 89 */
1407    OP_ONCE,           /* 93 Atomic group */    OP_TYPEMINQUERY,   /* 90 */
1408    OP_BRA,            /* 94 Start of non-capturing bracket */  
1409    OP_CBRA,           /* 95 Start of capturing bracket */    OP_TYPEUPTO,       /* 91 From 0 to n matches */
1410    OP_COND,           /* 96 Conditional group */    OP_TYPEMINUPTO,    /* 92 */
1411      OP_TYPEEXACT,      /* 93 Exactly n matches */
1412    
1413      OP_TYPEPOSSTAR,    /* 94 Possessified versions */
1414      OP_TYPEPOSPLUS,    /* 95 */
1415      OP_TYPEPOSQUERY,   /* 96 */
1416      OP_TYPEPOSUPTO,    /* 97 */
1417    
1418      /* These are used for character classes and back references; only the
1419      first six are the same as the sets above. */
1420    
1421      OP_CRSTAR,         /* 98 The maximizing and minimizing versions of */
1422      OP_CRMINSTAR,      /* 99 all these opcodes must come in pairs, with */
1423      OP_CRPLUS,         /* 100 the minimizing one second. These codes must */
1424      OP_CRMINPLUS,      /* 101 be in exactly the same order as those above. */
1425      OP_CRQUERY,        /* 102 */
1426      OP_CRMINQUERY,     /* 103 */
1427    
1428      OP_CRRANGE,        /* 104 These are different to the three sets above. */
1429      OP_CRMINRANGE,     /* 105 */
1430    
1431      /* End of quantifier opcodes */
1432    
1433      OP_CLASS,          /* 106 Match a character class, chars < 256 only */
1434      OP_NCLASS,         /* 107 Same, but the bitmap was created from a negative
1435                                  class - the difference is relevant only when a
1436                                  UTF-8 character > 255 is encountered. */
1437      OP_XCLASS,         /* 108 Extended class for handling UTF-8 chars within the
1438                                  class. This does both positive and negative. */
1439      OP_REF,            /* 109 Match a back reference, casefully */
1440      OP_REFI,           /* 110 Match a back reference, caselessly */
1441      OP_RECURSE,        /* 111 Match a numbered subpattern (possibly recursive) */
1442      OP_CALLOUT,        /* 112 Call out to external function if provided */
1443    
1444      OP_ALT,            /* 113 Start of alternation */
1445      OP_KET,            /* 114 End of group that doesn't have an unbounded repeat */
1446      OP_KETRMAX,        /* 115 These two must remain together and in this */
1447      OP_KETRMIN,        /* 116 order. They are for groups the repeat for ever. */
1448      OP_KETRPOS,        /* 117 Possessive unlimited repeat. */
1449    
1450      /* The assertions must come before BRA, CBRA, ONCE, and COND, and the four
1451      asserts must remain in order. */
1452    
1453      OP_REVERSE,        /* 118 Move pointer back - used in lookbehind assertions */
1454      OP_ASSERT,         /* 119 Positive lookahead */
1455      OP_ASSERT_NOT,     /* 120 Negative lookahead */
1456      OP_ASSERTBACK,     /* 121 Positive lookbehind */
1457      OP_ASSERTBACK_NOT, /* 122 Negative lookbehind */
1458    
1459      /* ONCE, ONCE_NC, BRA, BRAPOS, CBRA, CBRAPOS, and COND must come immediately
1460      after the assertions, with ONCE first, as there's a test for >= ONCE for a
1461      subpattern that isn't an assertion. The POS versions must immediately follow
1462      the non-POS versions in each case. */
1463    
1464      OP_ONCE,           /* 123 Atomic group, contains captures */
1465      OP_ONCE_NC,        /* 124 Atomic group containing no captures */
1466      OP_BRA,            /* 125 Start of non-capturing bracket */
1467      OP_BRAPOS,         /* 126 Ditto, with unlimited, possessive repeat */
1468      OP_CBRA,           /* 127 Start of capturing bracket */
1469      OP_CBRAPOS,        /* 128 Ditto, with unlimited, possessive repeat */
1470      OP_COND,           /* 129 Conditional group */
1471    
1472    /* 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
1473    check for >= SBRA to distinguish the two sets. */    check for >= SBRA to distinguish the two sets. */
1474    
1475    OP_SBRA,           /* 97 Start of non-capturing bracket, check empty  */    OP_SBRA,           /* 130 Start of non-capturing bracket, check empty  */
1476    OP_SCBRA,          /* 98 Start of capturing bracket, check empty */    OP_SBRAPOS,        /* 131 Ditto, with unlimited, possessive repeat */
1477    OP_SCOND,          /* 99 Conditional group, check empty */    OP_SCBRA,          /* 132 Start of capturing bracket, check empty */
1478      OP_SCBRAPOS,       /* 133 Ditto, with unlimited, possessive repeat */
1479      OP_SCOND,          /* 134 Conditional group, check empty */
1480    
1481    /* The next two pairs must (respectively) be kept together. */    /* The next two pairs must (respectively) be kept together. */
1482    
1483    OP_CREF,           /* 100 Used to hold a capture number as condition */    OP_CREF,           /* 135 Used to hold a capture number as condition */
1484    OP_NCREF,          /* 101 Same, but generaged by a name reference*/    OP_NCREF,          /* 136 Same, but generated by a name reference*/
1485    OP_RREF,           /* 102 Used to hold a recursion number as condition */    OP_RREF,           /* 137 Used to hold a recursion number as condition */
1486    OP_NRREF,          /* 103 Same, but generaged by a name reference*/    OP_NRREF,          /* 138 Same, but generated by a name reference*/
1487    OP_DEF,            /* 104 The DEFINE condition */    OP_DEF,            /* 139 The DEFINE condition */
1488    
1489    OP_BRAZERO,        /* 105 These two must remain together and in this */    OP_BRAZERO,        /* 140 These two must remain together and in this */
1490    OP_BRAMINZERO,     /* 106 order. */    OP_BRAMINZERO,     /* 141 order. */
1491      OP_BRAPOSZERO,     /* 142 */
1492    
1493    /* These are backtracking control verbs */    /* These are backtracking control verbs */
1494    
1495    OP_PRUNE,          /* 107 */    OP_MARK,           /* 143 always has an argument */
1496    OP_SKIP,           /* 108 */    OP_PRUNE,          /* 144 */
1497    OP_THEN,           /* 109 */    OP_PRUNE_ARG,      /* 145 same, but with argument */
1498    OP_COMMIT,         /* 110 */    OP_SKIP,           /* 146 */
1499      OP_SKIP_ARG,       /* 147 same, but with argument */
1500      OP_THEN,           /* 148 */
1501      OP_THEN_ARG,       /* 149 same, but with argument */
1502      OP_COMMIT,         /* 150 */
1503    
1504    /* These are forced failure and success verbs */    /* These are forced failure and success verbs */
1505    
1506    OP_FAIL,           /* 111 */    OP_FAIL,           /* 151 */
1507    OP_ACCEPT,         /* 112 */    OP_ACCEPT,         /* 152 */
1508    OP_CLOSE,          /* 113 Used before OP_ACCEPT to close open captures */    OP_ASSERT_ACCEPT,  /* 153 Used inside assertions */
1509      OP_CLOSE,          /* 154 Used before OP_ACCEPT to close open captures */
1510    
1511    /* This is used to skip a subpattern with a {0} quantifier */    /* This is used to skip a subpattern with a {0} quantifier */
1512    
1513    OP_SKIPZERO        /* 114 */    OP_SKIPZERO,       /* 155 */
1514    
1515      /* This is not an opcode, but is used to check that tables indexed by opcode
1516      are the correct length, in order to catch updating errors - there have been
1517      some in the past. */
1518    
1519      OP_TABLE_LENGTH
1520  };  };
1521    
1522  /* *** NOTE NOTE NOTE *** Whenever the list above is updated, the two macro  /* *** NOTE NOTE NOTE *** Whenever the list above is updated, the two macro
1523  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
1524  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. */
1525    
1526    
1527  /* 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
1528  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
1529    only in pcre_printint.c, which fills out the full names in many cases (and in
1530    some cases doesn't actually use these names at all). */
1531    
1532  #define OP_NAME_LIST \  #define OP_NAME_LIST \
1533    "End", "\\A", "\\G", "\\K", "\\B", "\\b", "\\D", "\\d",         \    "End", "\\A", "\\G", "\\K", "\\B", "\\b", "\\D", "\\d",         \
1534    "\\S", "\\s", "\\W", "\\w", "Any", "AllAny", "Anybyte",         \    "\\S", "\\s", "\\W", "\\w", "Any", "AllAny", "Anybyte",         \
1535    "notprop", "prop", "\\R", "\\H", "\\h", "\\V", "\\v",           \    "notprop", "prop", "\\R", "\\H", "\\h", "\\V", "\\v",           \
1536    "extuni",  "\\Z", "\\z",                                        \    "extuni",  "\\Z", "\\z",                                        \
1537    "Opt", "^", "$", "char", "charnc", "not",                       \    "^", "^", "$", "$", "char", "chari", "not", "noti",             \
1538    "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \    "*", "*?", "+", "+?", "?", "??",                                \
1539      "{", "{", "{",                                                  \
1540    "*+","++", "?+", "{",                                           \    "*+","++", "?+", "{",                                           \
1541    "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \    "*", "*?", "+", "+?", "?", "??",                                \
1542      "{", "{", "{",                                                  \
1543      "*+","++", "?+", "{",                                           \
1544      "*", "*?", "+", "+?", "?", "??",                                \
1545      "{", "{", "{",                                                  \
1546      "*+","++", "?+", "{",                                           \
1547      "*", "*?", "+", "+?", "?", "??",                                \
1548      "{", "{", "{",                                                  \
1549    "*+","++", "?+", "{",                                           \    "*+","++", "?+", "{",                                           \
1550    "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \    "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \
1551    "*+","++", "?+", "{",                                           \    "*+","++", "?+", "{",                                           \
1552    "*", "*?", "+", "+?", "?", "??", "{", "{",                      \    "*", "*?", "+", "+?", "?", "??", "{", "{",                      \
1553    "class", "nclass", "xclass", "Ref", "Recurse", "Callout",       \    "class", "nclass", "xclass", "Ref", "Refi",                     \
1554    "Alt", "Ket", "KetRmax", "KetRmin", "Assert", "Assert not",     \    "Recurse", "Callout",                                           \
1555    "AssertB", "AssertB not", "Reverse",                            \    "Alt", "Ket", "KetRmax", "KetRmin", "KetRpos",                  \
1556    "Once", "Bra", "CBra", "Cond", "SBra", "SCBra", "SCond",        \    "Reverse", "Assert", "Assert not", "AssertB", "AssertB not",    \
1557      "Once", "Once_NC",                                              \
1558      "Bra", "BraPos", "CBra", "CBraPos",                             \
1559      "Cond",                                                         \
1560      "SBra", "SBraPos", "SCBra", "SCBraPos",                         \
1561      "SCond",                                                        \
1562    "Cond ref", "Cond nref", "Cond rec", "Cond nrec", "Cond def",   \    "Cond ref", "Cond nref", "Cond rec", "Cond nrec", "Cond def",   \
1563    "Brazero", "Braminzero",                                        \    "Brazero", "Braminzero", "Braposzero",                          \
1564    "*PRUNE", "*SKIP", "*THEN", "*COMMIT", "*FAIL", "*ACCEPT",      \    "*MARK", "*PRUNE", "*PRUNE", "*SKIP", "*SKIP",                  \
1565      "*THEN", "*THEN", "*COMMIT", "*FAIL",                           \
1566      "*ACCEPT", "*ASSERT_ACCEPT",                                    \
1567    "Close", "Skip zero"    "Close", "Skip zero"
1568    
1569    
# Line 1436  in UTF-8 mode. The code that uses this t Line 1581  in UTF-8 mode. The code that uses this t
1581    1, 1, 1, 1, 1,                 /* \A, \G, \K, \B, \b                     */ \    1, 1, 1, 1, 1,                 /* \A, \G, \K, \B, \b                     */ \
1582    1, 1, 1, 1, 1, 1,              /* \D, \d, \S, \s, \W, \w                 */ \    1, 1, 1, 1, 1, 1,              /* \D, \d, \S, \s, \W, \w                 */ \
1583    1, 1, 1,                       /* Any, AllAny, Anybyte                   */ \    1, 1, 1,                       /* Any, AllAny, Anybyte                   */ \
1584    3, 3, 1,                       /* NOTPROP, PROP, EXTUNI                  */ \    3, 3,                          /* \P, \p                                 */ \
1585    1, 1, 1, 1, 1,                 /* \R, \H, \h, \V, \v                     */ \    1, 1, 1, 1, 1,                 /* \R, \H, \h, \V, \v                     */ \
1586    1, 1, 2, 1, 1,                 /* \Z, \z, Opt, ^, $                      */ \    1,                             /* \X                                     */ \
1587      1, 1, 1, 1, 1, 1,              /* \Z, \z, ^, ^M, $, $M                   */ \
1588    2,                             /* Char  - the minimum length             */ \    2,                             /* Char  - the minimum length             */ \
1589    2,                             /* Charnc  - the minimum length           */ \    2,                             /* Chari  - the minimum length            */ \
1590    2,                             /* not                                    */ \    2,                             /* not                                    */ \
1591    /* Positive single-char repeats                            ** These are  */ \    2,                             /* noti                                   */ \
1592    2, 2, 2, 2, 2, 2,              /* *, *?, +, +?, ?, ??      ** minima in  */ \    /* Positive single-char repeats                             ** These are */ \
1593    4, 4, 4,                       /* upto, minupto, exact     ** UTF-8 mode */ \    2, 2, 2, 2, 2, 2,              /* *, *?, +, +?, ?, ??       ** minima in */ \
1594      4, 4, 4,                       /* upto, minupto, exact      ** mode      */ \
1595    2, 2, 2, 4,                    /* *+, ++, ?+, upto+                      */ \    2, 2, 2, 4,                    /* *+, ++, ?+, upto+                      */ \
1596      2, 2, 2, 2, 2, 2,              /* *I, *?I, +I, +?I, ?I, ??I ** UTF-8     */ \
1597      4, 4, 4,                       /* upto I, minupto I, exact I             */ \
1598      2, 2, 2, 4,                    /* *+I, ++I, ?+I, upto+I                  */ \
1599    /* Negative single-char repeats - only for chars < 256                   */ \    /* Negative single-char repeats - only for chars < 256                   */ \
1600    2, 2, 2, 2, 2, 2,              /* NOT *, *?, +, +?, ?, ??                */ \    2, 2, 2, 2, 2, 2,              /* NOT *, *?, +, +?, ?, ??                */ \
1601    4, 4, 4,                       /* NOT upto, minupto, exact               */ \    4, 4, 4,                       /* NOT upto, minupto, exact               */ \
1602    2, 2, 2, 4,                    /* Possessive *, +, ?, upto               */ \    2, 2, 2, 4,                    /* Possessive NOT *, +, ?, upto           */ \
1603      2, 2, 2, 2, 2, 2,              /* NOT *I, *?I, +I, +?I, ?I, ??I          */ \
1604      4, 4, 4,                       /* NOT upto I, minupto I, exact I         */ \
1605      2, 2, 2, 4,                    /* Possessive NOT *I, +I, ?I, upto I      */ \
1606    /* Positive type repeats                                                 */ \    /* Positive type repeats                                                 */ \
1607    2, 2, 2, 2, 2, 2,              /* Type *, *?, +, +?, ?, ??               */ \    2, 2, 2, 2, 2, 2,              /* Type *, *?, +, +?, ?, ??               */ \
1608    4, 4, 4,                       /* Type upto, minupto, exact              */ \    4, 4, 4,                       /* Type upto, minupto, exact              */ \
# Line 1461  in UTF-8 mode. The code that uses this t Line 1614  in UTF-8 mode. The code that uses this t
1614   33,                             /* NCLASS                                 */ \   33,                             /* NCLASS                                 */ \
1615    0,                             /* XCLASS - variable length               */ \    0,                             /* XCLASS - variable length               */ \
1616    3,                             /* REF                                    */ \    3,                             /* REF                                    */ \
1617      3,                             /* REFI                                   */ \
1618    1+LINK_SIZE,                   /* RECURSE                                */ \    1+LINK_SIZE,                   /* RECURSE                                */ \
1619    2+2*LINK_SIZE,                 /* CALLOUT                                */ \    2+2*LINK_SIZE,                 /* CALLOUT                                */ \
1620    1+LINK_SIZE,                   /* Alt                                    */ \    1+LINK_SIZE,                   /* Alt                                    */ \
1621    1+LINK_SIZE,                   /* Ket                                    */ \    1+LINK_SIZE,                   /* Ket                                    */ \
1622    1+LINK_SIZE,                   /* KetRmax                                */ \    1+LINK_SIZE,                   /* KetRmax                                */ \
1623    1+LINK_SIZE,                   /* KetRmin                                */ \    1+LINK_SIZE,                   /* KetRmin                                */ \
1624      1+LINK_SIZE,                   /* KetRpos                                */ \
1625      1+LINK_SIZE,                   /* Reverse                                */ \
1626    1+LINK_SIZE,                   /* Assert                                 */ \    1+LINK_SIZE,                   /* Assert                                 */ \
1627    1+LINK_SIZE,                   /* Assert not                             */ \    1+LINK_SIZE,                   /* Assert not                             */ \
1628    1+LINK_SIZE,                   /* Assert behind                          */ \    1+LINK_SIZE,                   /* Assert behind                          */ \
1629    1+LINK_SIZE,                   /* Assert behind not                      */ \    1+LINK_SIZE,                   /* Assert behind not                      */ \
   1+LINK_SIZE,                   /* Reverse                                */ \  
1630    1+LINK_SIZE,                   /* ONCE                                   */ \    1+LINK_SIZE,                   /* ONCE                                   */ \
1631      1+LINK_SIZE,                   /* ONCE_NC                                */ \
1632    1+LINK_SIZE,                   /* BRA                                    */ \    1+LINK_SIZE,                   /* BRA                                    */ \
1633      1+LINK_SIZE,                   /* BRAPOS                                 */ \
1634    3+LINK_SIZE,                   /* CBRA                                   */ \    3+LINK_SIZE,                   /* CBRA                                   */ \
1635      3+LINK_SIZE,                   /* CBRAPOS                                */ \
1636    1+LINK_SIZE,                   /* COND                                   */ \    1+LINK_SIZE,                   /* COND                                   */ \
1637    1+LINK_SIZE,                   /* SBRA                                   */ \    1+LINK_SIZE,                   /* SBRA                                   */ \
1638      1+LINK_SIZE,                   /* SBRAPOS                                */ \
1639    3+LINK_SIZE,                   /* SCBRA                                  */ \    3+LINK_SIZE,                   /* SCBRA                                  */ \
1640      3+LINK_SIZE,                   /* SCBRAPOS                               */ \
1641    1+LINK_SIZE,                   /* SCOND                                  */ \    1+LINK_SIZE,                   /* SCOND                                  */ \
1642    3, 3,                          /* CREF, NCREF                            */ \    3, 3,                          /* CREF, NCREF                            */ \
1643    3, 3,                          /* RREF, NRREF                            */ \    3, 3,                          /* RREF, NRREF                            */ \
1644    1,                             /* DEF                                    */ \    1,                             /* DEF                                    */ \
1645    1, 1,                          /* BRAZERO, BRAMINZERO                    */ \    1, 1, 1,                       /* BRAZERO, BRAMINZERO, BRAPOSZERO        */ \
1646    1, 1, 1, 1,                    /* PRUNE, SKIP, THEN, COMMIT,             */ \    3, 1, 3,                       /* MARK, PRUNE, PRUNE_ARG                 */ \
1647    1, 1, 3, 1                     /* FAIL, ACCEPT, CLOSE, SKIPZERO          */    1, 3,                          /* SKIP, SKIP_ARG                         */ \
1648      1, 3,                          /* THEN, THEN_ARG                         */ \
1649      1, 1, 1, 1,                    /* COMMIT, FAIL, ACCEPT, ASSERT_ACCEPT    */ \
1650      3, 1                           /* CLOSE, SKIPZERO  */
1651    
1652  /* 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"
1653  condition. */  condition. */
1654    
1655  #define RREF_ANY  0xffff  #define RREF_ANY  0xffff
1656    
1657  /* Error code numbers. They are given names so that they can more easily be  /* Compile time error code numbers. They are given names so that they can more
1658  tracked. */  easily be tracked. When a new number is added, the table called eint in
1659    pcreposix.c must be updated. */
1660    
1661  enum { ERR0,  ERR1,  ERR2,  ERR3,  ERR4,  ERR5,  ERR6,  ERR7,  ERR8,  ERR9,  enum { ERR0,  ERR1,  ERR2,  ERR3,  ERR4,  ERR5,  ERR6,  ERR7,  ERR8,  ERR9,
1662         ERR10, ERR11, ERR12, ERR13, ERR14, ERR15, ERR16, ERR17, ERR18, ERR19,         ERR10, ERR11, ERR12, ERR13, ERR14, ERR15, ERR16, ERR17, ERR18, ERR19,
# Line 1501  enum { ERR0, ERR1, ERR2, ERR3, ERR4, Line 1664  enum { ERR0, ERR1, ERR2, ERR3, ERR4,
1664         ERR30, ERR31, ERR32, ERR33, ERR34, ERR35, ERR36, ERR37, ERR38, ERR39,         ERR30, ERR31, ERR32, ERR33, ERR34, ERR35, ERR36, ERR37, ERR38, ERR39,
1665         ERR40, ERR41, ERR42, ERR43, ERR44, ERR45, ERR46, ERR47, ERR48, ERR49,         ERR40, ERR41, ERR42, ERR43, ERR44, ERR45, ERR46, ERR47, ERR48, ERR49,
1666         ERR50, ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58, ERR59,         ERR50, ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58, ERR59,
1667         ERR60, ERR61, ERR62, ERR63, ERR64, ERR65 };         ERR60, ERR61, ERR62, ERR63, ERR64, ERR65, ERR66, ERR67, ERR68, ERR69,
1668           ERR70, ERR71, ERR72, ERRCOUNT };
1669    
1670  /* 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
1671  code vector run on as long as necessary after the end. We store an explicit  code vector run on as long as necessary after the end. We store an explicit
# Line 1551  typedef struct pcre_study_data { Line 1715  typedef struct pcre_study_data {
1715    
1716  /* Structure for building a chain of open capturing subpatterns during  /* Structure for building a chain of open capturing subpatterns during
1717  compiling, so that instructions to close them can be compiled when (*ACCEPT) is  compiling, so that instructions to close them can be compiled when (*ACCEPT) is
1718  encountered. */  encountered. This is also used to identify subpatterns that contain recursive
1719    back references to themselves, so that they can be made atomic. */
1720    
1721  typedef struct open_capitem {  typedef struct open_capitem {
1722    struct open_capitem *next;    /* Chain link */    struct open_capitem *next;    /* Chain link */
1723    pcre_uint16 number;           /* Capture number */    pcre_uint16 number;           /* Capture number */
1724      pcre_uint16 flag;             /* Set TRUE if recursive back ref */
1725  } open_capitem;  } open_capitem;
1726    
1727  /* Structure for passing "static" information around between the functions  /* Structure for passing "static" information around between the functions
# Line 1579  typedef struct compile_data { Line 1745  typedef struct compile_data {
1745    int  final_bracount;          /* Saved value after first pass */    int  final_bracount;          /* Saved value after first pass */
1746    int  top_backref;             /* Maximum back reference */    int  top_backref;             /* Maximum back reference */
1747    unsigned int backref_map;     /* Bitmap of low back refs */    unsigned int backref_map;     /* Bitmap of low back refs */
1748      int  assert_depth;            /* Depth of nested assertions */
1749    int  external_options;        /* External (initial) options */    int  external_options;        /* External (initial) options */
1750    int  external_flags;          /* External flag bits to be set */    int  external_flags;          /* External flag bits to be set */
1751    int  req_varyopt;             /* "After variable item" flag for reqbyte */    int  req_varyopt;             /* "After variable item" flag for reqbyte */
# Line 1590  typedef struct compile_data { Line 1757  typedef struct compile_data {
1757  } compile_data;  } compile_data;
1758    
1759  /* Structure for maintaining a chain of pointers to the currently incomplete  /* Structure for maintaining a chain of pointers to the currently incomplete
1760  branches, for testing for left recursion. */  branches, for testing for left recursion while compiling. */
1761    
1762  typedef struct branch_chain {  typedef struct branch_chain {
1763    struct branch_chain *outer;    struct branch_chain *outer;
# Line 1598  typedef struct branch_chain { Line 1765  typedef struct branch_chain {
1765  } branch_chain;  } branch_chain;
1766    
1767  /* Structure for items in a linked list that represents an explicit recursive  /* Structure for items in a linked list that represents an explicit recursive
1768  call within the pattern. */  call within the pattern; used by pcre_exec(). */
1769    
1770  typedef struct recursion_info {  typedef struct recursion_info {
1771    struct recursion_info *prevrec; /* Previous recursion record (or NULL) */    struct recursion_info *prevrec; /* Previous recursion record (or NULL) */
1772    int group_num;                /* Number of group that was called */    int group_num;                  /* Number of group that was called */
1773    const uschar *after_call;     /* "Return value": points after the call in the expr */    int *offset_save;               /* Pointer to start of saved offsets */
1774    USPTR save_start;             /* Old value of mstart */    int saved_max;                  /* Number of saved offsets */
1775    int *offset_save;             /* Pointer to start of saved offsets */    USPTR subject_position;         /* Position at start of recursion */
   int saved_max;                /* Number of saved offsets */  
   int save_offset_top;          /* Current value of offset_top */  
1776  } recursion_info;  } recursion_info;
1777    
1778    /* A similar structure for pcre_dfa_exec(). */
1779    
1780    typedef struct dfa_recursion_info {
1781      struct dfa_recursion_info *prevrec;
1782      int group_num;
1783      USPTR subject_position;
1784    } dfa_recursion_info;
1785    
1786  /* Structure for building a chain of data for holding the values of the subject  /* Structure for building a chain of data for holding the values of the subject
1787  pointer at the start of each subpattern, so as to detect when an empty string  pointer at the start of each subpattern, so as to detect when an empty string
1788  has been matched by a subpattern - to break infinite loops. */  has been matched by a subpattern - to break infinite loops; used by
1789    pcre_exec(). */
1790    
1791  typedef struct eptrblock {  typedef struct eptrblock {
1792    struct eptrblock *epb_prev;    struct eptrblock *epb_prev;
# Line 1636  typedef struct match_data { Line 1810  typedef struct match_data {
1810    int    name_entry_size;       /* Size of entry in names table */    int    name_entry_size;       /* Size of entry in names table */
1811    uschar *name_table;           /* Table of names */    uschar *name_table;           /* Table of names */
1812    uschar nl[4];                 /* Newline string when fixed */    uschar nl[4];                 /* Newline string when fixed */
1813    const uschar *lcc;            /* Points to lower casing table */    const  uschar *lcc;           /* Points to lower casing table */
1814    const uschar *ctypes;         /* Points to table of type maps */    const  uschar *ctypes;        /* Points to table of type maps */
1815    BOOL   offset_overflow;       /* Set if too many extractions */    BOOL   offset_overflow;       /* Set if too many extractions */
1816    BOOL   notbol;                /* NOTBOL flag */    BOOL   notbol;                /* NOTBOL flag */
1817    BOOL   noteol;                /* NOTEOL flag */    BOOL   noteol;                /* NOTEOL flag */
1818    BOOL   utf8;                  /* UTF8 flag */    BOOL   utf8;                  /* UTF8 flag */
1819    BOOL   jscript_compat;        /* JAVASCRIPT_COMPAT flag */    BOOL   jscript_compat;        /* JAVASCRIPT_COMPAT flag */
1820      BOOL   use_ucp;               /* PCRE_UCP flag */
1821    BOOL   endonly;               /* Dollar not before final \n */    BOOL   endonly;               /* Dollar not before final \n */
1822    BOOL   notempty;              /* Empty string match not wanted */    BOOL   notempty;              /* Empty string match not wanted */
1823    BOOL   notempty_atstart;      /* Empty string match at start not wanted */    BOOL   notempty_atstart;      /* Empty string match at start not wanted */
1824    BOOL   hitend;                /* Hit the end of the subject at some point */    BOOL   hitend;                /* Hit the end of the subject at some point */
1825    BOOL   bsr_anycrlf;           /* \R is just any CRLF, not full Unicode */    BOOL   bsr_anycrlf;           /* \R is just any CRLF, not full Unicode */
1826    const uschar *start_code;     /* For use when recursing */    BOOL   hasthen;               /* Pattern contains (*THEN) */
1827      BOOL   ignore_skip_arg;       /* For re-run when SKIP name not found */
1828      const  uschar *start_code;    /* For use when recursing */
1829    USPTR  start_subject;         /* Start of the subject string */    USPTR  start_subject;         /* Start of the subject string */
1830    USPTR  end_subject;           /* End of the subject string */    USPTR  end_subject;           /* End of the subject string */
1831    USPTR  start_match_ptr;       /* Start of matched string */    USPTR  start_match_ptr;       /* Start of matched string */
# Line 1658  typedef struct match_data { Line 1835  typedef struct match_data {
1835    int    end_offset_top;        /* Highwater mark at end of match */    int    end_offset_top;        /* Highwater mark at end of match */
1836    int    capture_last;          /* Most recent capture number */    int    capture_last;          /* Most recent capture number */
1837    int    start_offset;          /* The start offset value */    int    start_offset;          /* The start offset value */
1838      int    match_function_type;   /* Set for certain special calls of MATCH() */
1839    eptrblock *eptrchain;         /* Chain of eptrblocks for tail recursions */    eptrblock *eptrchain;         /* Chain of eptrblocks for tail recursions */
1840    int    eptrn;                 /* Next free eptrblock */    int    eptrn;                 /* Next free eptrblock */
1841    recursion_info *recursive;    /* Linked list of recursion data */    recursion_info *recursive;    /* Linked list of recursion data */
1842    void  *callout_data;          /* To pass back to callouts */    void  *callout_data;          /* To pass back to callouts */
1843      const  uschar *mark;          /* Mark pointer to pass back on success */
1844      const  uschar *nomatch_mark;  /* Mark pointer to pass back on failure */
1845      const  uschar *once_target;   /* Where to back up to for atomic groups */
1846  } match_data;  } match_data;
1847    
1848  /* 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
1849  functions. */  functions. */
1850    
1851  typedef struct dfa_match_data {  typedef struct dfa_match_data {
1852    const uschar *start_code;     /* Start of the compiled pattern */    const uschar *start_code;      /* Start of the compiled pattern */
1853    const uschar *start_subject;  /* Start of the subject string */    const uschar *start_subject;   /* Start of the subject string */
1854    const uschar *end_subject;    /* End of subject string */    const uschar *end_subject;     /* End of subject string */
1855    const uschar *start_used_ptr; /* Earliest consulted character */    const uschar *start_used_ptr;  /* Earliest consulted character */
1856    const uschar *tables;         /* Character tables */    const uschar *tables;          /* Character tables */
1857    int   start_offset;           /* The start offset value */    int   start_offset;            /* The start offset value */
1858    int   moptions;               /* Match options */    int   moptions;                /* Match options */
1859    int   poptions;               /* Pattern options */    int   poptions;                /* Pattern options */
1860    int    nltype;                /* Newline type */    int    nltype;                 /* Newline type */
1861    int    nllen;                 /* Newline string length */    int    nllen;                  /* Newline string length */
1862    uschar nl[4];                 /* Newline string when fixed */    uschar nl[4];                  /* Newline string when fixed */
1863    void  *callout_data;          /* To pass back to callouts */    void  *callout_data;           /* To pass back to callouts */
1864      dfa_recursion_info *recursive; /* Linked list of recursion data */
1865  } dfa_match_data;  } dfa_match_data;
1866    
1867  /* Bit definitions for entries in the pcre_ctypes table. */  /* Bit definitions for entries in the pcre_ctypes table. */
# Line 1737  extern const int _pcre_utf8_table2[]; Line 1919  extern const int _pcre_utf8_table2[];
1919  extern const int    _pcre_utf8_table3[];  extern const int    _pcre_utf8_table3[];
1920  extern const uschar _pcre_utf8_table4[];  extern const uschar _pcre_utf8_table4[];
1921    
1922    #ifdef SUPPORT_JIT
1923    extern const uschar _pcre_utf8_char_sizes[];
1924    #endif
1925    
1926  extern const int    _pcre_utf8_table1_size;  extern const int    _pcre_utf8_table1_size;
1927    
1928  extern const char   _pcre_utt_names[];  extern const char   _pcre_utt_names[];
# Line 1753  one of the exported public functions. Th Line 1939  one of the exported public functions. Th
1939  sense, but are not part of the PCRE public API. */  sense, but are not part of the PCRE public API. */
1940    
1941  extern const uschar *_pcre_find_bracket(const uschar *, BOOL, int);  extern const uschar *_pcre_find_bracket(const uschar *, BOOL, int);
1942  extern BOOL          _pcre_is_newline(const uschar *, int, const uschar *,  extern BOOL          _pcre_is_newline(USPTR, int, USPTR, int *, BOOL);
                        int *, BOOL);  
1943  extern int           _pcre_ord2utf8(int, uschar *);  extern int           _pcre_ord2utf8(int, uschar *);
1944  extern real_pcre    *_pcre_try_flipped(const real_pcre *, real_pcre *,  extern real_pcre    *_pcre_try_flipped(const real_pcre *, real_pcre *,
1945                         const pcre_study_data *, pcre_study_data *);                         const pcre_study_data *, pcre_study_data *);
1946  extern int           _pcre_valid_utf8(const uschar *, int);  extern int           _pcre_valid_utf8(USPTR, int, int *);
1947  extern BOOL          _pcre_was_newline(const uschar *, int, const uschar *,  extern BOOL          _pcre_was_newline(USPTR, int, USPTR, int *, BOOL);
                        int *, BOOL);  
1948  extern BOOL          _pcre_xclass(int, const uschar *);  extern BOOL          _pcre_xclass(int, const uschar *);
1949    
1950    #ifdef SUPPORT_JIT
1951    extern void          _pcre_jit_compile(const real_pcre *, pcre_extra *);
1952    extern int           _pcre_jit_exec(const real_pcre *, void *, PCRE_SPTR,
1953                            int, int, int, int, int *, int);
1954    extern void          _pcre_jit_free(void *);
1955    #endif
1956    
1957  /* Unicode character database (UCD) */  /* Unicode character database (UCD) */
1958    
# Line 1776  extern const ucd_record _pcre_ucd_recor Line 1966  extern const ucd_record _pcre_ucd_recor
1966  extern const uschar      _pcre_ucd_stage1[];  extern const uschar      _pcre_ucd_stage1[];
1967  extern const pcre_uint16 _pcre_ucd_stage2[];  extern const pcre_uint16 _pcre_ucd_stage2[];
1968  extern const int         _pcre_ucp_gentype[];  extern const int         _pcre_ucp_gentype[];
1969    #ifdef SUPPORT_JIT
1970    extern const int         _pcre_ucp_typerange[];
1971    #endif
1972    
1973  /* UCD access macros */  /* UCD access macros */
1974    
1975  #define UCD_BLOCK_SIZE 128  #define UCD_BLOCK_SIZE 128
1976  #define GET_UCD(ch) (_pcre_ucd_records + \  #define GET_UCD(ch) (_pcre_ucd_records + \
1977          _pcre_ucd_stage2[_pcre_ucd_stage1[(ch) / UCD_BLOCK_SIZE] * \          _pcre_ucd_stage2[_pcre_ucd_stage1[(ch) / UCD_BLOCK_SIZE] * \
1978          UCD_BLOCK_SIZE + ch % UCD_BLOCK_SIZE])          UCD_BLOCK_SIZE + (ch) % UCD_BLOCK_SIZE])
1979    
1980  #define UCD_CHARTYPE(ch)  GET_UCD(ch)->chartype  #define UCD_CHARTYPE(ch)  GET_UCD(ch)->chartype
1981  #define UCD_SCRIPT(ch)    GET_UCD(ch)->script  #define UCD_SCRIPT(ch)    GET_UCD(ch)->script

Legend:
Removed from v.475  
changed lines
  Added in v.771

webmaster@exim.org
ViewVC Help
Powered by ViewVC 1.1.12