/[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 172 by ph10, Tue Jun 5 10:40:13 2007 UTC revision 270 by ph10, Fri Nov 16 19:55:16 2007 UTC
# Line 67  be absolutely sure we get our version. * Line 67  be absolutely sure we get our version. *
67  #endif  #endif
68    
69    
 /* Get the definitions provided by running "configure" */  
   
 #include "config.h"  
   
70  /* Standard C headers plus the external interface definition. The only time  /* Standard C headers plus the external interface definition. The only time
71  setjmp and stdarg are used is when NO_RECURSE is set. */  setjmp and stdarg are used is when NO_RECURSE is set. */
72    
# Line 112  PCRE_EXP_DATA_DEFN only if they are not Line 108  PCRE_EXP_DATA_DEFN only if they are not
108    
109  #ifndef PCRE_EXP_DECL  #ifndef PCRE_EXP_DECL
110  #  ifdef _WIN32  #  ifdef _WIN32
111  #    ifdef DLL_EXPORT  #    ifndef PCRE_STATIC
112  #      define PCRE_EXP_DECL       extern __declspec(dllexport)  #      define PCRE_EXP_DECL       extern __declspec(dllexport)
113  #      define PCRE_EXP_DEFN       __declspec(dllexport)  #      define PCRE_EXP_DEFN       __declspec(dllexport)
114  #      define PCRE_EXP_DATA_DEFN  __declspec(dllexport)  #      define PCRE_EXP_DATA_DEFN  __declspec(dllexport)
# Line 121  PCRE_EXP_DATA_DEFN only if they are not Line 117  PCRE_EXP_DATA_DEFN only if they are not
117  #      define PCRE_EXP_DEFN  #      define PCRE_EXP_DEFN
118  #      define PCRE_EXP_DATA_DEFN  #      define PCRE_EXP_DATA_DEFN
119  #    endif  #    endif
 #  
120  #  else  #  else
121  #    ifdef __cplusplus  #    ifdef __cplusplus
122  #      define PCRE_EXP_DECL       extern "C"  #      define PCRE_EXP_DECL       extern "C"
# Line 234  must begin with PCRE_. */ Line 229  must begin with PCRE_. */
229  /* Include the public PCRE header and the definitions of UCP character property  /* Include the public PCRE header and the definitions of UCP character property
230  values. */  values. */
231    
232  #include <pcre.h>  #include "pcre.h"
233  #include "ucp.h"  #include "ucp.h"
234    
235  /* When compiling for use with the Virtual Pascal compiler, these functions  /* When compiling for use with the Virtual Pascal compiler, these functions
# Line 363  capturing parenthesis numbers in back re Line 358  capturing parenthesis numbers in back re
358    
359  /* 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
360  byte. The macros for character handling generate simple sequences when used in  byte. The macros for character handling generate simple sequences when used in
361  byte-mode, and more complicated ones for UTF-8 characters. */  byte-mode, and more complicated ones for UTF-8 characters. BACKCHAR should
362    never be called in byte mode. To make sure it can never even appear when UTF-8
363    support is omitted, we don't even define it. */
364    
365  #ifndef SUPPORT_UTF8  #ifndef SUPPORT_UTF8
366  #define GETCHAR(c, eptr) c = *eptr;  #define GETCHAR(c, eptr) c = *eptr;
# Line 371  byte-mode, and more complicated ones for Line 368  byte-mode, and more complicated ones for
368  #define GETCHARINC(c, eptr) c = *eptr++;  #define GETCHARINC(c, eptr) c = *eptr++;
369  #define GETCHARINCTEST(c, eptr) c = *eptr++;  #define GETCHARINCTEST(c, eptr) c = *eptr++;
370  #define GETCHARLEN(c, eptr, len) c = *eptr;  #define GETCHARLEN(c, eptr, len) c = *eptr;
371  #define BACKCHAR(eptr)  /* #define BACKCHAR(eptr) */
372    
373  #else   /* SUPPORT_UTF8 */  #else   /* SUPPORT_UTF8 */
374    
# Line 464  if there are extra bytes. This is called Line 461  if there are extra bytes. This is called
461      }      }
462    
463  /* 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
464  it is. Called only in UTF-8 mode. */  it is. This is called only in UTF-8 mode - we don't put a test within the macro
465    because almost all calls are already within a block of UTF-8 only code. */
466    
467  #define BACKCHAR(eptr) while((*eptr & 0xc0) == 0x80) eptr--;  #define BACKCHAR(eptr) while((*eptr & 0xc0) == 0x80) eptr--
468    
469  #endif  #endif
470    
# Line 483  Standard C system should have one. */ Line 481  Standard C system should have one. */
481    
482  #define PCRE_IMS (PCRE_CASELESS|PCRE_MULTILINE|PCRE_DOTALL)  #define PCRE_IMS (PCRE_CASELESS|PCRE_MULTILINE|PCRE_DOTALL)
483    
484  /* Private options flags start at the most significant end of the four bytes.  /* Private flags containing information about the compiled regex. They used to
485  The public options defined in pcre.h start at the least significant end. Make  live at the top end of the options word, but that got almost full, so now they
486  sure they don't overlap! The bits are getting a bit scarce now -- when we run  are in a 16-bit flags word. */
487  out, there is a dummy word in the structure that could be used for the private  
488  bits. */  #define PCRE_NOPARTIAL     0x0001  /* can't use partial with this regex */
489    #define PCRE_FIRSTSET      0x0002  /* first_byte is set */
490  #define PCRE_NOPARTIAL     0x80000000  /* can't use partial with this regex */  #define PCRE_REQCHSET      0x0004  /* req_byte is set */
491  #define PCRE_FIRSTSET      0x40000000  /* first_byte is set */  #define PCRE_STARTLINE     0x0008  /* start after \n for multiline */
492  #define PCRE_REQCHSET      0x20000000  /* req_byte is set */  #define PCRE_JCHANGED      0x0010  /* j option used in regex */
493  #define PCRE_STARTLINE     0x10000000  /* start after \n for multiline */  #define PCRE_HASCRORLF     0x0020  /* explicit \r or \n in pattern */
 #define PCRE_JCHANGED      0x08000000  /* j option changes within regex */  
494    
495  /* Options for the "extra" block produced by pcre_study(). */  /* Options for the "extra" block produced by pcre_study(). */
496    
# Line 509  time, run time, or study time, respectiv Line 506  time, run time, or study time, respectiv
506    (PCRE_CASELESS|PCRE_EXTENDED|PCRE_ANCHORED|PCRE_MULTILINE| \    (PCRE_CASELESS|PCRE_EXTENDED|PCRE_ANCHORED|PCRE_MULTILINE| \
507     PCRE_DOTALL|PCRE_DOLLAR_ENDONLY|PCRE_EXTRA|PCRE_UNGREEDY|PCRE_UTF8| \     PCRE_DOTALL|PCRE_DOLLAR_ENDONLY|PCRE_EXTRA|PCRE_UNGREEDY|PCRE_UTF8| \
508     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| \
509     PCRE_DUPNAMES|PCRE_NEWLINE_BITS)     PCRE_DUPNAMES|PCRE_NEWLINE_BITS|PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE)
510    
511  #define PUBLIC_EXEC_OPTIONS \  #define PUBLIC_EXEC_OPTIONS \
512    (PCRE_ANCHORED|PCRE_NOTBOL|PCRE_NOTEOL|PCRE_NOTEMPTY|PCRE_NO_UTF8_CHECK| \    (PCRE_ANCHORED|PCRE_NOTBOL|PCRE_NOTEOL|PCRE_NOTEMPTY|PCRE_NO_UTF8_CHECK| \
513     PCRE_PARTIAL|PCRE_NEWLINE_BITS)     PCRE_PARTIAL|PCRE_NEWLINE_BITS|PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE)
514    
515  #define PUBLIC_DFA_EXEC_OPTIONS \  #define PUBLIC_DFA_EXEC_OPTIONS \
516    (PCRE_ANCHORED|PCRE_NOTBOL|PCRE_NOTEOL|PCRE_NOTEMPTY|PCRE_NO_UTF8_CHECK| \    (PCRE_ANCHORED|PCRE_NOTBOL|PCRE_NOTEOL|PCRE_NOTEMPTY|PCRE_NO_UTF8_CHECK| \
517     PCRE_PARTIAL|PCRE_DFA_SHORTEST|PCRE_DFA_RESTART|PCRE_NEWLINE_BITS)     PCRE_PARTIAL|PCRE_DFA_SHORTEST|PCRE_DFA_RESTART|PCRE_NEWLINE_BITS| \
518       PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE)
519    
520  #define PUBLIC_STUDY_OPTIONS 0   /* None defined */  #define PUBLIC_STUDY_OPTIONS 0   /* None defined */
521    
# Line 606  consume characters. If any new escapes a Line 604  consume characters. If any new escapes a
604  character, that code will have to change. */  character, that code will have to change. */
605    
606  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,
607         ESC_W, ESC_w, ESC_dum1, ESC_C, ESC_P, ESC_p, ESC_R, ESC_X, ESC_Z, ESC_z,         ESC_W, ESC_w, ESC_dum1, ESC_C, ESC_P, ESC_p, ESC_R, ESC_H, ESC_h,
608         ESC_E, ESC_Q, ESC_k, ESC_REF };         ESC_V, ESC_v, ESC_X, ESC_Z, ESC_z, ESC_E, ESC_Q, ESC_k, ESC_REF };
609    
610    
611  /* Opcode table: OP_BRA must be last, as all values >= it are used for brackets  /* Opcode table: Starting from 1 (i.e. after OP_END), the values up to
 that extract substrings. Starting from 1 (i.e. after OP_END), the values up to  
612  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.
613    
 To keep stored, compiled patterns compatible, new opcodes should be added  
 immediately before OP_BRA, where (since release 7.0) a gap is left for this  
 purpose.  
   
614  *** NOTE NOTE NOTE *** Whenever this list is updated, the two macro definitions  *** NOTE NOTE NOTE *** Whenever this list is updated, the two macro definitions
615  that follow must also be updated to match. There is also a table called  that follow must also be updated to match. There is also a table called
616  "coptable" in pcre_dfa_exec.c that must be updated. */  "coptable" in pcre_dfa_exec.c that must be updated. */
# Line 643  enum { Line 636  enum {
636    OP_NOTPROP,        /* 14 \P (not Unicode property) */    OP_NOTPROP,        /* 14 \P (not Unicode property) */
637    OP_PROP,           /* 15 \p (Unicode property) */    OP_PROP,           /* 15 \p (Unicode property) */
638    OP_ANYNL,          /* 16 \R (any newline sequence) */    OP_ANYNL,          /* 16 \R (any newline sequence) */
639    OP_EXTUNI,         /* 17 \X (extended Unicode sequence */    OP_NOT_HSPACE,     /* 17 \H (not horizontal whitespace) */
640    OP_EODN,           /* 18 End of data or \n at end of data: \Z. */    OP_HSPACE,         /* 18 \h (horizontal whitespace) */
641    OP_EOD,            /* 19 End of data: \z */    OP_NOT_VSPACE,     /* 19 \V (not vertical whitespace) */
642      OP_VSPACE,         /* 20 \v (vertical whitespace) */
643    OP_OPT,            /* 20 Set runtime options */    OP_EXTUNI,         /* 21 \X (extended Unicode sequence */
644    OP_CIRC,           /* 21 Start of line - varies with multiline switch */    OP_EODN,           /* 22 End of data or \n at end of data: \Z. */
645    OP_DOLL,           /* 22 End of line - varies with multiline switch */    OP_EOD,            /* 23 End of data: \z */
646    OP_CHAR,           /* 23 Match one character, casefully */  
647    OP_CHARNC,         /* 24 Match one character, caselessly */    OP_OPT,            /* 24 Set runtime options */
648    OP_NOT,            /* 25 Match one character, not the following one */    OP_CIRC,           /* 25 Start of line - varies with multiline switch */
649      OP_DOLL,           /* 26 End of line - varies with multiline switch */
650    OP_STAR,           /* 26 The maximizing and minimizing versions of */    OP_CHAR,           /* 27 Match one character, casefully */
651    OP_MINSTAR,        /* 27 these six opcodes must come in pairs, with */    OP_CHARNC,         /* 28 Match one character, caselessly */
652    OP_PLUS,           /* 28 the minimizing one second. */    OP_NOT,            /* 29 Match one character, not the following one */
653    OP_MINPLUS,        /* 29 This first set applies to single characters.*/  
654    OP_QUERY,          /* 30 */    OP_STAR,           /* 30 The maximizing and minimizing versions of */
655    OP_MINQUERY,       /* 31 */    OP_MINSTAR,        /* 31 these six opcodes must come in pairs, with */
656      OP_PLUS,           /* 32 the minimizing one second. */
657    OP_UPTO,           /* 32 From 0 to n matches */    OP_MINPLUS,        /* 33 This first set applies to single characters.*/
658    OP_MINUPTO,        /* 33 */    OP_QUERY,          /* 34 */
659    OP_EXACT,          /* 34 Exactly n matches */    OP_MINQUERY,       /* 35 */
660    
661    OP_POSSTAR,        /* 35 Possessified star */    OP_UPTO,           /* 36 From 0 to n matches */
662    OP_POSPLUS,        /* 36 Possessified plus */    OP_MINUPTO,        /* 37 */
663    OP_POSQUERY,       /* 37 Posesssified query */    OP_EXACT,          /* 38 Exactly n matches */
664    OP_POSUPTO,        /* 38 Possessified upto */  
665      OP_POSSTAR,        /* 39 Possessified star */
666    OP_NOTSTAR,        /* 39 The maximizing and minimizing versions of */    OP_POSPLUS,        /* 40 Possessified plus */
667    OP_NOTMINSTAR,     /* 40 these six opcodes must come in pairs, with */    OP_POSQUERY,       /* 41 Posesssified query */
668    OP_NOTPLUS,        /* 41 the minimizing one second. They must be in */    OP_POSUPTO,        /* 42 Possessified upto */
669    OP_NOTMINPLUS,     /* 42 exactly the same order as those above. */  
670    OP_NOTQUERY,       /* 43 This set applies to "not" single characters. */    OP_NOTSTAR,        /* 43 The maximizing and minimizing versions of */
671    OP_NOTMINQUERY,    /* 44 */    OP_NOTMINSTAR,     /* 44 these six opcodes must come in pairs, with */
672      OP_NOTPLUS,        /* 45 the minimizing one second. They must be in */
673    OP_NOTUPTO,        /* 45 From 0 to n matches */    OP_NOTMINPLUS,     /* 46 exactly the same order as those above. */
674    OP_NOTMINUPTO,     /* 46 */    OP_NOTQUERY,       /* 47 This set applies to "not" single characters. */
675    OP_NOTEXACT,       /* 47 Exactly n matches */    OP_NOTMINQUERY,    /* 48 */
676    
677    OP_NOTPOSSTAR,     /* 48 Possessified versions */    OP_NOTUPTO,        /* 49 From 0 to n matches */
678    OP_NOTPOSPLUS,     /* 49 */    OP_NOTMINUPTO,     /* 50 */
679    OP_NOTPOSQUERY,    /* 50 */    OP_NOTEXACT,       /* 51 Exactly n matches */
680    OP_NOTPOSUPTO,     /* 51 */  
681      OP_NOTPOSSTAR,     /* 52 Possessified versions */
682    OP_TYPESTAR,       /* 52 The maximizing and minimizing versions of */    OP_NOTPOSPLUS,     /* 53 */
683    OP_TYPEMINSTAR,    /* 53 these six opcodes must come in pairs, with */    OP_NOTPOSQUERY,    /* 54 */
684    OP_TYPEPLUS,       /* 54 the minimizing one second. These codes must */    OP_NOTPOSUPTO,     /* 55 */
685    OP_TYPEMINPLUS,    /* 55 be in exactly the same order as those above. */  
686    OP_TYPEQUERY,      /* 56 This set applies to character types such as \d */    OP_TYPESTAR,       /* 56 The maximizing and minimizing versions of */
687    OP_TYPEMINQUERY,   /* 57 */    OP_TYPEMINSTAR,    /* 57 these six opcodes must come in pairs, with */
688      OP_TYPEPLUS,       /* 58 the minimizing one second. These codes must */
689    OP_TYPEUPTO,       /* 58 From 0 to n matches */    OP_TYPEMINPLUS,    /* 59 be in exactly the same order as those above. */
690    OP_TYPEMINUPTO,    /* 59 */    OP_TYPEQUERY,      /* 60 This set applies to character types such as \d */
691    OP_TYPEEXACT,      /* 60 Exactly n matches */    OP_TYPEMINQUERY,   /* 61 */
692    
693    OP_TYPEPOSSTAR,    /* 61 Possessified versions */    OP_TYPEUPTO,       /* 62 From 0 to n matches */
694    OP_TYPEPOSPLUS,    /* 62 */    OP_TYPEMINUPTO,    /* 63 */
695    OP_TYPEPOSQUERY,   /* 63 */    OP_TYPEEXACT,      /* 64 Exactly n matches */
696    OP_TYPEPOSUPTO,    /* 64 */  
697      OP_TYPEPOSSTAR,    /* 65 Possessified versions */
698    OP_CRSTAR,         /* 65 The maximizing and minimizing versions of */    OP_TYPEPOSPLUS,    /* 66 */
699    OP_CRMINSTAR,      /* 66 all these opcodes must come in pairs, with */    OP_TYPEPOSQUERY,   /* 67 */
700    OP_CRPLUS,         /* 67 the minimizing one second. These codes must */    OP_TYPEPOSUPTO,    /* 68 */
701    OP_CRMINPLUS,      /* 68 be in exactly the same order as those above. */  
702    OP_CRQUERY,        /* 69 These are for character classes and back refs */    OP_CRSTAR,         /* 69 The maximizing and minimizing versions of */
703    OP_CRMINQUERY,     /* 70 */    OP_CRMINSTAR,      /* 70 all these opcodes must come in pairs, with */
704    OP_CRRANGE,        /* 71 These are different to the three sets above. */    OP_CRPLUS,         /* 71 the minimizing one second. These codes must */
705    OP_CRMINRANGE,     /* 72 */    OP_CRMINPLUS,      /* 72 be in exactly the same order as those above. */
706      OP_CRQUERY,        /* 73 These are for character classes and back refs */
707      OP_CRMINQUERY,     /* 74 */
708      OP_CRRANGE,        /* 75 These are different to the three sets above. */
709      OP_CRMINRANGE,     /* 76 */
710    
711    OP_CLASS,          /* 73 Match a character class, chars < 256 only */    OP_CLASS,          /* 77 Match a character class, chars < 256 only */
712    OP_NCLASS,         /* 74 Same, but the bitmap was created from a negative    OP_NCLASS,         /* 78 Same, but the bitmap was created from a negative
713                             class - the difference is relevant only when a UTF-8                             class - the difference is relevant only when a UTF-8
714                             character > 255 is encountered. */                             character > 255 is encountered. */
715    
716    OP_XCLASS,         /* 75 Extended class for handling UTF-8 chars within the    OP_XCLASS,         /* 79 Extended class for handling UTF-8 chars within the
717                             class. This does both positive and negative. */                             class. This does both positive and negative. */
718    
719    OP_REF,            /* 76 Match a back reference */    OP_REF,            /* 80 Match a back reference */
720    OP_RECURSE,        /* 77 Match a numbered subpattern (possibly recursive) */    OP_RECURSE,        /* 81 Match a numbered subpattern (possibly recursive) */
721    OP_CALLOUT,        /* 78 Call out to external function if provided */    OP_CALLOUT,        /* 82 Call out to external function if provided */
722    
723    OP_ALT,            /* 79 Start of alternation */    OP_ALT,            /* 83 Start of alternation */
724    OP_KET,            /* 80 End of group that doesn't have an unbounded repeat */    OP_KET,            /* 84 End of group that doesn't have an unbounded repeat */
725    OP_KETRMAX,        /* 81 These two must remain together and in this */    OP_KETRMAX,        /* 85 These two must remain together and in this */
726    OP_KETRMIN,        /* 82 order. They are for groups the repeat for ever. */    OP_KETRMIN,        /* 86 order. They are for groups the repeat for ever. */
727    
728    /* The assertions must come before BRA, CBRA, ONCE, and COND.*/    /* The assertions must come before BRA, CBRA, ONCE, and COND.*/
729    
730    OP_ASSERT,         /* 83 Positive lookahead */    OP_ASSERT,         /* 87 Positive lookahead */
731    OP_ASSERT_NOT,     /* 84 Negative lookahead */    OP_ASSERT_NOT,     /* 88 Negative lookahead */
732    OP_ASSERTBACK,     /* 85 Positive lookbehind */    OP_ASSERTBACK,     /* 89 Positive lookbehind */
733    OP_ASSERTBACK_NOT, /* 86 Negative lookbehind */    OP_ASSERTBACK_NOT, /* 90 Negative lookbehind */
734    OP_REVERSE,        /* 87 Move pointer back - used in lookbehind assertions */    OP_REVERSE,        /* 91 Move pointer back - used in lookbehind assertions */
735    
736    /* ONCE, BRA, CBRA, and COND must come after the assertions, with ONCE first,    /* ONCE, BRA, CBRA, and COND must come after the assertions, with ONCE first,
737    as there's a test for >= ONCE for a subpattern that isn't an assertion. */    as there's a test for >= ONCE for a subpattern that isn't an assertion. */
738    
739    OP_ONCE,           /* 88 Atomic group */    OP_ONCE,           /* 92 Atomic group */
740    OP_BRA,            /* 89 Start of non-capturing bracket */    OP_BRA,            /* 93 Start of non-capturing bracket */
741    OP_CBRA,           /* 90 Start of capturing bracket */    OP_CBRA,           /* 94 Start of capturing bracket */
742    OP_COND,           /* 91 Conditional group */    OP_COND,           /* 95 Conditional group */
743    
744    /* These three must follow the previous three, in the same order. There's a    /* These three must follow the previous three, in the same order. There's a
745    check for >= SBRA to distinguish the two sets. */    check for >= SBRA to distinguish the two sets. */
746    
747    OP_SBRA,           /* 92 Start of non-capturing bracket, check empty  */    OP_SBRA,           /* 96 Start of non-capturing bracket, check empty  */
748    OP_SCBRA,          /* 93 Start of capturing bracket, check empty */    OP_SCBRA,          /* 97 Start of capturing bracket, check empty */
749    OP_SCOND,          /* 94 Conditional group, check empty */    OP_SCOND,          /* 98 Conditional group, check empty */
750    
751    OP_CREF,           /* 95 Used to hold a capture number as condition */    OP_CREF,           /* 99 Used to hold a capture number as condition */
752    OP_RREF,           /* 96 Used to hold a recursion number as condition */    OP_RREF,           /* 100 Used to hold a recursion number as condition */
753    OP_DEF,            /* 97 The DEFINE condition */    OP_DEF,            /* 101 The DEFINE condition */
754    
755      OP_BRAZERO,        /* 102 These two must remain together and in this */
756      OP_BRAMINZERO,     /* 103 order. */
757    
758    OP_BRAZERO,        /* 98 These two must remain together and in this */    /* These are backtracking control verbs */
759    OP_BRAMINZERO      /* 99 order. */  
760      OP_PRUNE,          /* 104 */
761      OP_SKIP,           /* 105 */
762      OP_THEN,           /* 106 */
763      OP_COMMIT,         /* 107 */
764    
765      /* These are forced failure and success verbs */
766    
767      OP_FAIL,           /* 108 */
768      OP_ACCEPT          /* 109 */
769  };  };
770    
771    
# Line 766  for debugging. The macro is referenced o Line 775  for debugging. The macro is referenced o
775  #define OP_NAME_LIST \  #define OP_NAME_LIST \
776    "End", "\\A", "\\G", "\\K", "\\B", "\\b", "\\D", "\\d",         \    "End", "\\A", "\\G", "\\K", "\\B", "\\b", "\\D", "\\d",         \
777    "\\S", "\\s", "\\W", "\\w", "Any", "Anybyte",                   \    "\\S", "\\s", "\\W", "\\w", "Any", "Anybyte",                   \
778    "notprop", "prop", "anynl", "extuni",                           \    "notprop", "prop", "\\R", "\\H", "\\h", "\\V", "\\v",           \
779    "\\Z", "\\z",                                                   \    "extuni",  "\\Z", "\\z",                                        \
780    "Opt", "^", "$", "char", "charnc", "not",                       \    "Opt", "^", "$", "char", "charnc", "not",                       \
781    "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \    "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \
782    "*+","++", "?+", "{",                                           \    "*+","++", "?+", "{",                                           \
# Line 779  for debugging. The macro is referenced o Line 788  for debugging. The macro is referenced o
788    "class", "nclass", "xclass", "Ref", "Recurse", "Callout",       \    "class", "nclass", "xclass", "Ref", "Recurse", "Callout",       \
789    "Alt", "Ket", "KetRmax", "KetRmin", "Assert", "Assert not",     \    "Alt", "Ket", "KetRmax", "KetRmin", "Assert", "Assert not",     \
790    "AssertB", "AssertB not", "Reverse",                            \    "AssertB", "AssertB not", "Reverse",                            \
791    "Once", "Bra 0", "Bra", "Cond", "SBra 0", "SBra", "SCond",      \    "Once", "Bra", "CBra", "Cond", "SBra", "SCBra", "SCond",        \
792    "Cond ref", "Cond rec", "Cond def", "Brazero", "Braminzero"    "Cond ref", "Cond rec", "Cond def", "Brazero", "Braminzero",    \
793      "*PRUNE", "*SKIP", "*THEN", "*COMMIT", "*FAIL", "*ACCEPT"
794    
795    
796  /* This macro defines the length of fixed length operations in the compiled  /* This macro defines the length of fixed length operations in the compiled
# Line 797  in UTF-8 mode. The code that uses this t Line 807  in UTF-8 mode. The code that uses this t
807    1, 1, 1, 1, 1,                 /* \A, \G, \K, \B, \b                     */ \    1, 1, 1, 1, 1,                 /* \A, \G, \K, \B, \b                     */ \
808    1, 1, 1, 1, 1, 1,              /* \D, \d, \S, \s, \W, \w                 */ \    1, 1, 1, 1, 1, 1,              /* \D, \d, \S, \s, \W, \w                 */ \
809    1, 1,                          /* Any, Anybyte                           */ \    1, 1,                          /* Any, Anybyte                           */ \
810    3, 3, 1, 1,                    /* NOTPROP, PROP, EXTUNI, ANYNL           */ \    3, 3, 1,                       /* NOTPROP, PROP, EXTUNI                  */ \
811      1, 1, 1, 1, 1,                 /* \R, \H, \h, \V, \v                     */ \
812    1, 1, 2, 1, 1,                 /* \Z, \z, Opt, ^, $                      */ \    1, 1, 2, 1, 1,                 /* \Z, \z, Opt, ^, $                      */ \
813    2,                             /* Char  - the minimum length             */ \    2,                             /* Char  - the minimum length             */ \
814    2,                             /* Charnc  - the minimum length           */ \    2,                             /* Charnc  - the minimum length           */ \
# Line 843  in UTF-8 mode. The code that uses this t Line 854  in UTF-8 mode. The code that uses this t
854    3,                             /* RREF                                   */ \    3,                             /* RREF                                   */ \
855    1,                             /* DEF                                    */ \    1,                             /* DEF                                    */ \
856    1, 1,                          /* BRAZERO, BRAMINZERO                    */ \    1, 1,                          /* BRAZERO, BRAMINZERO                    */ \
857      1, 1, 1, 1,                    /* PRUNE, SKIP, THEN, COMMIT,             */ \
858      1, 1                           /* FAIL, ACCEPT                           */
859    
860    
861  /* A magic value for OP_RREF to indicate the "any recursion" condition. */  /* A magic value for OP_RREF to indicate the "any recursion" condition. */
# Line 857  enum { ERR0,  ERR1,  ERR2,  ERR3,  ERR4, Line 870  enum { ERR0,  ERR1,  ERR2,  ERR3,  ERR4,
870         ERR20, ERR21, ERR22, ERR23, ERR24, ERR25, ERR26, ERR27, ERR28, ERR29,         ERR20, ERR21, ERR22, ERR23, ERR24, ERR25, ERR26, ERR27, ERR28, ERR29,
871         ERR30, ERR31, ERR32, ERR33, ERR34, ERR35, ERR36, ERR37, ERR38, ERR39,         ERR30, ERR31, ERR32, ERR33, ERR34, ERR35, ERR36, ERR37, ERR38, ERR39,
872         ERR40, ERR41, ERR42, ERR43, ERR44, ERR45, ERR46, ERR47, ERR48, ERR49,         ERR40, ERR41, ERR42, ERR43, ERR44, ERR45, ERR46, ERR47, ERR48, ERR49,
873         ERR50, ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58 };         ERR50, ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58, ERR59,
874           ERR60, ERR61, ERR62, ERR63 };
875    
876  /* 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
877  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 879  NOTE NOTE NOTE: Line 893  NOTE NOTE NOTE:
893  typedef struct real_pcre {  typedef struct real_pcre {
894    pcre_uint32 magic_number;    pcre_uint32 magic_number;
895    pcre_uint32 size;               /* Total that was malloced */    pcre_uint32 size;               /* Total that was malloced */
896    pcre_uint32 options;    pcre_uint32 options;            /* Public options */
897    pcre_uint32 dummy1;             /* For future use, maybe */    pcre_uint16 flags;              /* Private flags */
898      pcre_uint16 dummy1;             /* For future use */
899    pcre_uint16 top_bracket;    pcre_uint16 top_bracket;
900    pcre_uint16 top_backref;    pcre_uint16 top_backref;
901    pcre_uint16 first_byte;    pcre_uint16 first_byte;
# Line 920  typedef struct compile_data { Line 934  typedef struct compile_data {
934    uschar *name_table;           /* The name/number table */    uschar *name_table;           /* The name/number table */
935    int  names_found;             /* Number of entries so far */    int  names_found;             /* Number of entries so far */
936    int  name_entry_size;         /* Size of each entry */    int  name_entry_size;         /* Size of each entry */
937    int  bracount;                /* Count of capturing parens */    int  bracount;                /* Count of capturing parens as we compile */
938      int  final_bracount;          /* Saved value after first pass */
939    int  top_backref;             /* Maximum back reference */    int  top_backref;             /* Maximum back reference */
940    unsigned int backref_map;     /* Bitmap of low back refs */    unsigned int backref_map;     /* Bitmap of low back refs */
941    int  external_options;        /* External (initial) options */    int  external_options;        /* External (initial) options */
942      int  external_flags;          /* External flag bits to be set */
943    int  req_varyopt;             /* "After variable item" flag for reqbyte */    int  req_varyopt;             /* "After variable item" flag for reqbyte */
944    BOOL nopartial;               /* Set TRUE if partial won't work */    BOOL had_accept;              /* (*ACCEPT) encountered */
945    int  nltype;                  /* Newline type */    int  nltype;                  /* Newline type */
946    int  nllen;                   /* Newline string length */    int  nllen;                   /* Newline string length */
947    uschar nl[4];                 /* Newline string when fixed length */    uschar nl[4];                 /* Newline string when fixed length */
# Line 984  typedef struct match_data { Line 1000  typedef struct match_data {
1000    BOOL   notempty;              /* Empty string match not wanted */    BOOL   notempty;              /* Empty string match not wanted */
1001    BOOL   partial;               /* PARTIAL flag */    BOOL   partial;               /* PARTIAL flag */
1002    BOOL   hitend;                /* Hit the end of the subject at some point */    BOOL   hitend;                /* Hit the end of the subject at some point */
1003      BOOL   bsr_anycrlf;           /* \R is just any CRLF, not full Unicode */
1004    const uschar *start_code;     /* For use when recursing */    const uschar *start_code;     /* For use when recursing */
1005    USPTR  start_subject;         /* Start of the subject string */    USPTR  start_subject;         /* Start of the subject string */
1006    USPTR  end_subject;           /* End of the subject string */    USPTR  end_subject;           /* End of the subject string */
# Line 1048  total length. */ Line 1065  total length. */
1065  #define tables_length (ctypes_offset + 256)  #define tables_length (ctypes_offset + 256)
1066    
1067  /* Layout of the UCP type table that translates property names into types and  /* Layout of the UCP type table that translates property names into types and
1068  codes. */  codes. Each entry used to point directly to a name, but to reduce the number of
1069    relocations in shared libraries, it now has an offset into a single string
1070    instead. */
1071    
1072  typedef struct {  typedef struct {
1073    const char *name;    pcre_uint16 name_offset;
1074    pcre_uint16 type;    pcre_uint16 type;
1075    pcre_uint16 value;    pcre_uint16 value;
1076  } ucp_type_table;  } ucp_type_table;
# Line 1069  extern const uschar _pcre_utf8_table4[]; Line 1088  extern const uschar _pcre_utf8_table4[];
1088    
1089  extern const int    _pcre_utf8_table1_size;  extern const int    _pcre_utf8_table1_size;
1090    
1091    extern const char   _pcre_utt_names[];
1092  extern const ucp_type_table _pcre_utt[];  extern const ucp_type_table _pcre_utt[];
1093  extern const int _pcre_utt_size;  extern const int _pcre_utt_size;
1094    

Legend:
Removed from v.172  
changed lines
  Added in v.270

  ViewVC Help
Powered by ViewVC 1.1.5