/[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 87 by nigel, Sat Feb 24 21:41:21 2007 UTC revision 145 by ph10, Wed Apr 4 14:06:52 2007 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-2006 University of Cambridge             Copyright (c) 1997-2007 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 54  functions whose names all begin with "_p Line 54  functions whose names all begin with "_p
54  /* Use a macro for debugging printing, 'cause that eliminates the use of #ifdef  /* Use a macro for debugging printing, 'cause that eliminates the use of #ifdef
55  inline, and there are *still* stupid compilers about that don't like indented  inline, and there are *still* stupid compilers about that don't like indented
56  pre-processor statements, or at least there were when I first wrote this. After  pre-processor statements, or at least there were when I first wrote this. After
57  all, it had only been about 10 years then... */  all, it had only been about 10 years then...
58    
59    It turns out that the Mac Debugging.h header also defines the macro DPRINTF, so
60    be absolutely sure we get our version. */
61    
62    #undef DPRINTF
63  #ifdef DEBUG  #ifdef DEBUG
64  #define DPRINTF(p) printf p  #define DPRINTF(p) printf p
65  #else  #else
66  #define DPRINTF(p) /*nothing*/  #define DPRINTF(p) /* Nothing */
67  #endif  #endif
68    
69    
# Line 79  setjmp and stdarg are used is when NO_RE Line 83  setjmp and stdarg are used is when NO_RE
83  #include <stdlib.h>  #include <stdlib.h>
84  #include <string.h>  #include <string.h>
85    
86  #ifndef PCRE_SPY  /* When compiling a DLL for Windows, the exported symbols have to be declared
87  #define PCRE_DEFINITION       /* Win32 __declspec(export) trigger for .dll */  using some MS magic. I found some useful information on this web page:
88    http://msdn2.microsoft.com/en-us/library/y4h7bcy6(VS.80).aspx. According to the
89    information there, using __declspec(dllesport) without "extern" we have a
90    definition; with "extern" we have a declaration. The settings here override the
91    setting in pcre.h (which is included below); it defines only PCRE_EXP_DECL,
92    which is all that is needed for applications, which import the symbols. We use:
93    
94      PCRE_EXP_DECL       for declarations
95      PCRE_EXP_DEFN       for definitions of exported functions
96      PCRE_EXP_DATA_DEFN  for definitions of exported variables
97    
98    The reason for the two DEFN macros is that in non-Windows environments, one
99    does not want to have "extern" before variable definitions because it leads to
100    compiler warnings. So we distinguish between functions and variables. In
101    Windows, the two should always be the same.
102    
103    The reason for wrapping this in #ifndef PCRE_EXP_DECL is so that pcretest,
104    which is an application, but needs to import this file in order to "peek" at
105    internals, can #include pcre.h first, can get an application's-eye view.
106    
107    In principle, people compiling for non-Windows, non-Unix-like (i.e. uncommon,
108    special-purpose environments) might want to stick other stuff in front of
109    exported symbols. That's why, in the non-Windows case, we set PCRE_EXP_DEFN and
110    PCRE_EXP_DATA_DEFN only if they are not already set. */
111    
112    #ifndef PCRE_EXP_DECL
113    #  ifdef _WIN32
114    #    ifdef DLL_EXPORT
115    #      define PCRE_EXP_DECL       extern __declspec(dllexport)
116    #      define PCRE_EXP_DEFN       __declspec(dllexport)
117    #      define PCRE_EXP_DATA_DEFN  __declspec(dllexport)
118    #    else
119    #      define PCRE_EXP_DECL       extern
120    #      define PCRE_EXP_DEFN
121    #      define PCRE_EXP_DATA_DEFN
122    #    endif
123    #
124    #  else
125    #    ifdef __cplusplus
126    #      define PCRE_EXP_DECL       extern "C"
127    #    else
128    #      define PCRE_EXP_DECL       extern
129    #    endif
130    #    ifndef PCRE_EXP_DEFN
131    #      define PCRE_EXP_DEFN       PCRE_EXP_DECL
132    #    endif
133    #    ifndef PCRE_EXP_DATA_DEFN
134    #      define PCRE_EXP_DATA_DEFN
135    #    endif
136    #  endif
137  #endif  #endif
138    
139  /* We need to have types that specify unsigned 16-bit and 32-bit integers. We  /* We need to have types that specify unsigned 16-bit and 32-bit integers. We
# Line 114  Unix, where it is defined in sys/types, Line 167  Unix, where it is defined in sys/types,
167    
168  typedef unsigned char uschar;  typedef unsigned char uschar;
169    
170    /* This is an unsigned int value that no character can ever have. UTF-8
171    characters only go up to 0x7fffffff (though Unicode doesn't go beyond
172    0x0010ffff). */
173    
174    #define NOTACHAR 0xffffffff
175    
176    /* PCRE is able to support several different kinds of newline (CR, LF, CRLF,
177    and "all" at present). The following macros are used to package up testing for
178    newlines. NLBLOCK, PSSTART, and PSEND are defined in the various modules to
179    indicate in which datablock the parameters exist, and what the start/end of
180    string field names are. */
181    
182    #define NLTYPE_FIXED   0     /* Newline is a fixed length string */
183    #define NLTYPE_ANY     1     /* Newline is any Unicode line ending */
184    
185    /* This macro checks for a newline at the given position */
186    
187    #define IS_NEWLINE(p) \
188      ((NLBLOCK->nltype != NLTYPE_FIXED)? \
189        ((p) < NLBLOCK->PSEND && \
190         _pcre_is_newline((p), NLBLOCK->PSEND, &(NLBLOCK->nllen), utf8) \
191        ) \
192        : \
193        ((p) <= NLBLOCK->PSEND - NLBLOCK->nllen && \
194         (p)[0] == NLBLOCK->nl[0] && \
195         (NLBLOCK->nllen == 1 || (p)[1] == NLBLOCK->nl[1]) \
196        ) \
197      )
198    
199    /* This macro checks for a newline immediately preceding the given position */
200    
201    #define WAS_NEWLINE(p) \
202      ((NLBLOCK->nltype != NLTYPE_FIXED)? \
203        ((p) > NLBLOCK->PSSTART && \
204         _pcre_was_newline((p), NLBLOCK->PSSTART, &(NLBLOCK->nllen), utf8) \
205        ) \
206        : \
207        ((p) >= NLBLOCK->PSSTART + NLBLOCK->nllen && \
208         (p)[-NLBLOCK->nllen] == NLBLOCK->nl[0] && \
209         (NLBLOCK->nllen == 1 || (p)[-NLBLOCK->nllen+1] == NLBLOCK->nl[1]) \
210        ) \
211      )
212    
213  /* When PCRE is compiled as a C++ library, the subject pointer can be replaced  /* When PCRE is compiled as a C++ library, the subject pointer can be replaced
214  with a custom type. This makes it possible, for example, to allow pcre_exec()  with a custom type. This makes it possible, for example, to allow pcre_exec()
215  to process subject strings that are discontinuous by using a smart pointer  to process subject strings that are discontinuous by using a smart pointer
# Line 131  must begin with PCRE_. */ Line 227  must begin with PCRE_. */
227  #define USPTR const unsigned char *  #define USPTR const unsigned char *
228  #endif  #endif
229    
230    
231    
232  /* Include the public PCRE header and the definitions of UCP character property  /* Include the public PCRE header and the definitions of UCP character property
233  values. */  values. */
234    
235  #include "pcre.h"  #include <pcre.h>
236  #include "ucp.h"  #include "ucp.h"
237    
238  /* When compiling for use with the Virtual Pascal compiler, these functions  /* When compiling for use with the Virtual Pascal compiler, these functions
# Line 142  need to have their names changed. PCRE m Line 240  need to have their names changed. PCRE m
240  option on the command line. */  option on the command line. */
241    
242  #ifdef VPCOMPAT  #ifdef VPCOMPAT
243    #define strlen(s)        _strlen(s)
244  #define strncmp(s1,s2,m) _strncmp(s1,s2,m)  #define strncmp(s1,s2,m) _strncmp(s1,s2,m)
245    #define memcmp(s,c,n)    _memcmp(s,c,n)
246  #define memcpy(d,s,n)    _memcpy(d,s,n)  #define memcpy(d,s,n)    _memcpy(d,s,n)
247  #define memmove(d,s,n)   _memmove(d,s,n)  #define memmove(d,s,n)   _memmove(d,s,n)
248  #define memset(s,c,n)    _memset(s,c,n)  #define memset(s,c,n)    _memset(s,c,n)
# Line 151  option on the command line. */ Line 251  option on the command line. */
251  /* To cope with SunOS4 and other systems that lack memmove() but have bcopy(),  /* To cope with SunOS4 and other systems that lack memmove() but have bcopy(),
252  define a macro for memmove() if HAVE_MEMMOVE is false, provided that HAVE_BCOPY  define a macro for memmove() if HAVE_MEMMOVE is false, provided that HAVE_BCOPY
253  is set. Otherwise, include an emulating function for those systems that have  is set. Otherwise, include an emulating function for those systems that have
254  neither (there some non-Unix environments where this is the case). This assumes  neither (there some non-Unix environments where this is the case). */
 that all calls to memmove are moving strings upwards in store, which is the  
 case in PCRE. */  
255    
256  #if ! HAVE_MEMMOVE  #ifndef HAVE_MEMMOVE
257  #undef  memmove        /* some systems may have a macro */  #undef  memmove        /* some systems may have a macro */
258  #if HAVE_BCOPY  #ifdef HAVE_BCOPY
259  #define memmove(a, b, c) bcopy(b, a, c)  #define memmove(a, b, c) bcopy(b, a, c)
260  #else  /* HAVE_BCOPY */  #else  /* HAVE_BCOPY */
261  void *  static void *
262  pcre_memmove(unsigned char *dest, const unsigned char *src, size_t n)  pcre_memmove(void *d, const void *s, size_t n)
263  {  {
264  size_t i;  size_t i;
265  dest += n;  unsigned char *dest = (unsigned char *)d;
266  src += n;  const unsigned char *src = (const unsigned char *)s;
267  for (i = 0; i < n; ++i) *(--dest) =  *(--src);  if (dest > src)
268  return dest;    {
269      dest += n;
270      src += n;
271      for (i = 0; i < n; ++i) *(--dest) = *(--src);
272      return (void *)dest;
273      }
274    else
275      {
276      for (i = 0; i < n; ++i) *dest++ = *src++;
277      return (void *)(dest - n);
278      }
279  }  }
280  #define memmove(a, b, c) pcre_memmove(a, b, c)  #define memmove(a, b, c) pcre_memmove(a, b, c)
281  #endif   /* not HAVE_BCOPY */  #endif   /* not HAVE_BCOPY */
# Line 270  we know we are in UTF-8 mode. */ Line 378  we know we are in UTF-8 mode. */
378    
379  #define GETCHAR(c, eptr) \  #define GETCHAR(c, eptr) \
380    c = *eptr; \    c = *eptr; \
381    if ((c & 0xc0) == 0xc0) \    if (c >= 0xc0) \
382      { \      { \
383      int gcii; \      int gcii; \
384      int gcaa = _pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */ \      int gcaa = _pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */ \
# Line 288  pointer. */ Line 396  pointer. */
396    
397  #define GETCHARTEST(c, eptr) \  #define GETCHARTEST(c, eptr) \
398    c = *eptr; \    c = *eptr; \
399    if (utf8 && (c & 0xc0) == 0xc0) \    if (utf8 && c >= 0xc0) \
400      { \      { \
401      int gcii; \      int gcii; \
402      int gcaa = _pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */ \      int gcaa = _pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */ \
# Line 306  know we are in UTF-8 mode. */ Line 414  know we are in UTF-8 mode. */
414    
415  #define GETCHARINC(c, eptr) \  #define GETCHARINC(c, eptr) \
416    c = *eptr++; \    c = *eptr++; \
417    if ((c & 0xc0) == 0xc0) \    if (c >= 0xc0) \
418      { \      { \
419      int gcaa = _pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */ \      int gcaa = _pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */ \
420      int gcss = 6*gcaa; \      int gcss = 6*gcaa; \
# Line 322  know we are in UTF-8 mode. */ Line 430  know we are in UTF-8 mode. */
430    
431  #define GETCHARINCTEST(c, eptr) \  #define GETCHARINCTEST(c, eptr) \
432    c = *eptr++; \    c = *eptr++; \
433    if (utf8 && (c & 0xc0) == 0xc0) \    if (utf8 && c >= 0xc0) \
434      { \      { \
435      int gcaa = _pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */ \      int gcaa = _pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */ \
436      int gcss = 6*gcaa; \      int gcss = 6*gcaa; \
# Line 339  if there are extra bytes. This is called Line 447  if there are extra bytes. This is called
447    
448  #define GETCHARLEN(c, eptr, len) \  #define GETCHARLEN(c, eptr, len) \
449    c = *eptr; \    c = *eptr; \
450    if ((c & 0xc0) == 0xc0) \    if (c >= 0xc0) \
451      { \      { \
452      int gcii; \      int gcii; \
453      int gcaa = _pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */ \      int gcaa = _pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */ \
# Line 373  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 options flags start at the most significant end of the four bytes.
485  but skip the top bit so we can use ints for convenience without getting tangled  The public options defined in pcre.h start at the least significant end. Make
486  with negative values. The public options defined in pcre.h start at the least  sure they don't overlap! The bits are getting a bit scarce now -- when we run
487  significant end. Make sure they don't overlap! */  out, there is a dummy word in the structure that could be used for the private
488    bits. */
489    
490    #define PCRE_NOPARTIAL     0x80000000  /* can't use partial with this regex */
491  #define PCRE_FIRSTSET      0x40000000  /* first_byte is set */  #define PCRE_FIRSTSET      0x40000000  /* first_byte is set */
492  #define PCRE_REQCHSET      0x20000000  /* req_byte is set */  #define PCRE_REQCHSET      0x20000000  /* req_byte is set */
493  #define PCRE_STARTLINE     0x10000000  /* start after \n for multiline */  #define PCRE_STARTLINE     0x10000000  /* start after \n for multiline */
494  #define PCRE_ICHANGED      0x08000000  /* i option changes within regex */  #define PCRE_JCHANGED      0x08000000  /* j option changes within regex */
 #define PCRE_NOPARTIAL     0x04000000  /* can't use partial with this regex */  
495    
496  /* Options for the "extra" block produced by pcre_study(). */  /* Options for the "extra" block produced by pcre_study(). */
497    
# Line 391  significant end. Make sure they don't ov Line 500  significant end. Make sure they don't ov
500  /* Masks for identifying the public options that are permitted at compile  /* Masks for identifying the public options that are permitted at compile
501  time, run time, or study time, respectively. */  time, run time, or study time, respectively. */
502    
503    #define PCRE_NEWLINE_BITS (PCRE_NEWLINE_CR|PCRE_NEWLINE_LF|PCRE_NEWLINE_ANY)
504    
505  #define PUBLIC_OPTIONS \  #define PUBLIC_OPTIONS \
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)
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_PARTIAL|PCRE_NEWLINE_BITS)
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_PARTIAL|PCRE_DFA_SHORTEST|PCRE_DFA_RESTART|PCRE_NEWLINE_BITS)
518    
519  #define PUBLIC_STUDY_OPTIONS 0   /* None defined */  #define PUBLIC_STUDY_OPTIONS 0   /* None defined */
520    
# Line 434  typedef int BOOL; Line 546  typedef int BOOL;
546  #define FALSE   0  #define FALSE   0
547  #define TRUE    1  #define TRUE    1
548    
549  /* Escape items that are just an encoding of a particular data value. Note that  /* Escape items that are just an encoding of a particular data value. */
 ESC_n is defined as yet another macro, which is set in config.h to either \n  
 (the default) or \r (which some people want). */  
550    
551  #ifndef ESC_e  #ifndef ESC_e
552  #define ESC_e 27  #define ESC_e 27
# Line 447  ESC_n is defined as yet another macro, w Line 557  ESC_n is defined as yet another macro, w
557  #endif  #endif
558    
559  #ifndef ESC_n  #ifndef ESC_n
560  #define ESC_n NEWLINE  #define ESC_n '\n'
561  #endif  #endif
562    
563  #ifndef ESC_r  #ifndef ESC_r
# Line 486  value such as \n. They must have non-zer Line 596  value such as \n. They must have non-zer
596  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
597  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_ANY because it
598  corresponds to "." rather than an escape sequence. The final one must be  corresponds to "." rather than an escape sequence. The final one must be
599  ESC_REF as subsequent values are used for \1, \2, \3, etc. There is are two  ESC_REF as subsequent values are used for backreferences (\1, \2, \3, etc).
600  tests in the code for an escape greater than ESC_b and less than ESC_Z to  There are two tests in the code for an escape greater than ESC_b and less than
601  detect the types that may be repeated. These are the types that consume  ESC_Z to detect the types that may be repeated. These are the types that
602  characters. If any new escapes are put in between that don't consume a  consume characters. If any new escapes are put in between that don't consume a
603  character, that code will have to change. */  character, that code will have to change. */
604    
605  enum { ESC_A = 1, ESC_G, ESC_B, ESC_b, ESC_D, ESC_d, ESC_S, ESC_s, ESC_W,  enum { ESC_A = 1, ESC_G, ESC_B, ESC_b, ESC_D, ESC_d, ESC_S, ESC_s, ESC_W,
606         ESC_w, ESC_dum1, ESC_C, ESC_P, ESC_p, ESC_X, ESC_Z, ESC_z, ESC_E,         ESC_w, ESC_dum1, ESC_C, ESC_P, ESC_p, ESC_R, ESC_X, ESC_Z, ESC_z,
607         ESC_Q, ESC_REF };         ESC_E, ESC_Q, ESC_k, ESC_REF };
608    
609    
610  /* Opcode table: OP_BRA must be last, as all values >= it are used for brackets  /* Opcode table: OP_BRA must be last, as all values >= it are used for brackets
611  that extract substrings. 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  Note that whenever this list is updated, the two macro definitions that follow  
614  must also be updated to match. */  To keep stored, compiled patterns compatible, new opcodes should be added
615    immediately before OP_BRA, where (since release 7.0) a gap is left for this
616    purpose.
617    
618    *** NOTE NOTE NOTE *** Whenever this list is updated, the two macro definitions
619    that follow must also be updated to match. There is also a table called
620    "coptable" in pcre_dfa_exec.c that must be updated. */
621    
622  enum {  enum {
623    OP_END,            /* 0 End of pattern */    OP_END,            /* 0 End of pattern */
# Line 521  enum { Line 638  enum {
638    OP_ANYBYTE,        /* 12 Match any byte (\C); different to OP_ANY for UTF-8 */    OP_ANYBYTE,        /* 12 Match any byte (\C); different to OP_ANY for UTF-8 */
639    OP_NOTPROP,        /* 13 \P (not Unicode property) */    OP_NOTPROP,        /* 13 \P (not Unicode property) */
640    OP_PROP,           /* 14 \p (Unicode property) */    OP_PROP,           /* 14 \p (Unicode property) */
641    OP_EXTUNI,         /* 15 \X (extended Unicode sequence */    OP_ANYNL,          /* 15 \R (any newline sequence) */
642    OP_EODN,           /* 16 End of data or \n at end of data: \Z. */    OP_EXTUNI,         /* 16 \X (extended Unicode sequence */
643    OP_EOD,            /* 17 End of data: \z */    OP_EODN,           /* 17 End of data or \n at end of data: \Z. */
644      OP_EOD,            /* 18 End of data: \z */
645    OP_OPT,            /* 18 Set runtime options */  
646    OP_CIRC,           /* 19 Start of line - varies with multiline switch */    OP_OPT,            /* 19 Set runtime options */
647    OP_DOLL,           /* 20 End of line - varies with multiline switch */    OP_CIRC,           /* 20 Start of line - varies with multiline switch */
648    OP_CHAR,           /* 21 Match one character, casefully */    OP_DOLL,           /* 21 End of line - varies with multiline switch */
649    OP_CHARNC,         /* 22 Match one character, caselessly */    OP_CHAR,           /* 22 Match one character, casefully */
650    OP_NOT,            /* 23 Match anything but the following char */    OP_CHARNC,         /* 23 Match one character, caselessly */
651      OP_NOT,            /* 24 Match one character, not the following one */
652    OP_STAR,           /* 24 The maximizing and minimizing versions of */  
653    OP_MINSTAR,        /* 25 all these opcodes must come in pairs, with */    OP_STAR,           /* 25 The maximizing and minimizing versions of */
654    OP_PLUS,           /* 26 the minimizing one second. */    OP_MINSTAR,        /* 26 these six opcodes must come in pairs, with */
655    OP_MINPLUS,        /* 27 This first set applies to single characters */    OP_PLUS,           /* 27 the minimizing one second. */
656    OP_QUERY,          /* 28 */    OP_MINPLUS,        /* 28 This first set applies to single characters.*/
657    OP_MINQUERY,       /* 29 */    OP_QUERY,          /* 29 */
658    OP_UPTO,           /* 30 From 0 to n matches */    OP_MINQUERY,       /* 30 */
659    OP_MINUPTO,        /* 31 */  
660    OP_EXACT,          /* 32 Exactly n matches */    OP_UPTO,           /* 31 From 0 to n matches */
661      OP_MINUPTO,        /* 32 */
662    OP_NOTSTAR,        /* 33 The maximizing and minimizing versions of */    OP_EXACT,          /* 33 Exactly n matches */
663    OP_NOTMINSTAR,     /* 34 all these opcodes must come in pairs, with */  
664    OP_NOTPLUS,        /* 35 the minimizing one second. */    OP_POSSTAR,        /* 34 Possessified star */
665    OP_NOTMINPLUS,     /* 36 This set applies to "not" single characters */    OP_POSPLUS,        /* 35 Possessified plus */
666    OP_NOTQUERY,       /* 37 */    OP_POSQUERY,       /* 36 Posesssified query */
667    OP_NOTMINQUERY,    /* 38 */    OP_POSUPTO,        /* 37 Possessified upto */
668    OP_NOTUPTO,        /* 39 From 0 to n matches */  
669    OP_NOTMINUPTO,     /* 40 */    OP_NOTSTAR,        /* 38 The maximizing and minimizing versions of */
670    OP_NOTEXACT,       /* 41 Exactly n matches */    OP_NOTMINSTAR,     /* 39 these six opcodes must come in pairs, with */
671      OP_NOTPLUS,        /* 40 the minimizing one second. They must be in */
672    OP_TYPESTAR,       /* 42 The maximizing and minimizing versions of */    OP_NOTMINPLUS,     /* 41 exactly the same order as those above. */
673    OP_TYPEMINSTAR,    /* 43 all these opcodes must come in pairs, with */    OP_NOTQUERY,       /* 42 This set applies to "not" single characters. */
674    OP_TYPEPLUS,       /* 44 the minimizing one second. These codes must */    OP_NOTMINQUERY,    /* 43 */
675    OP_TYPEMINPLUS,    /* 45 be in exactly the same order as those above. */  
676    OP_TYPEQUERY,      /* 46 This set applies to character types such as \d */    OP_NOTUPTO,        /* 44 From 0 to n matches */
677    OP_TYPEMINQUERY,   /* 47 */    OP_NOTMINUPTO,     /* 45 */
678    OP_TYPEUPTO,       /* 48 From 0 to n matches */    OP_NOTEXACT,       /* 46 Exactly n matches */
679    OP_TYPEMINUPTO,    /* 49 */  
680    OP_TYPEEXACT,      /* 50 Exactly n matches */    OP_NOTPOSSTAR,     /* 47 Possessified versions */
681      OP_NOTPOSPLUS,     /* 48 */
682    OP_CRSTAR,         /* 51 The maximizing and minimizing versions of */    OP_NOTPOSQUERY,    /* 49 */
683    OP_CRMINSTAR,      /* 52 all these opcodes must come in pairs, with */    OP_NOTPOSUPTO,     /* 50 */
684    OP_CRPLUS,         /* 53 the minimizing one second. These codes must */  
685    OP_CRMINPLUS,      /* 54 be in exactly the same order as those above. */    OP_TYPESTAR,       /* 51 The maximizing and minimizing versions of */
686    OP_CRQUERY,        /* 55 These are for character classes and back refs */    OP_TYPEMINSTAR,    /* 52 these six opcodes must come in pairs, with */
687    OP_CRMINQUERY,     /* 56 */    OP_TYPEPLUS,       /* 53 the minimizing one second. These codes must */
688    OP_CRRANGE,        /* 57 These are different to the three sets above. */    OP_TYPEMINPLUS,    /* 54 be in exactly the same order as those above. */
689    OP_CRMINRANGE,     /* 58 */    OP_TYPEQUERY,      /* 55 This set applies to character types such as \d */
690      OP_TYPEMINQUERY,   /* 56 */
691    
692      OP_TYPEUPTO,       /* 57 From 0 to n matches */
693      OP_TYPEMINUPTO,    /* 58 */
694      OP_TYPEEXACT,      /* 59 Exactly n matches */
695    
696      OP_TYPEPOSSTAR,    /* 60 Possessified versions */
697      OP_TYPEPOSPLUS,    /* 61 */
698      OP_TYPEPOSQUERY,   /* 62 */
699      OP_TYPEPOSUPTO,    /* 63 */
700    
701      OP_CRSTAR,         /* 64 The maximizing and minimizing versions of */
702      OP_CRMINSTAR,      /* 65 all these opcodes must come in pairs, with */
703      OP_CRPLUS,         /* 66 the minimizing one second. These codes must */
704      OP_CRMINPLUS,      /* 67 be in exactly the same order as those above. */
705      OP_CRQUERY,        /* 68 These are for character classes and back refs */
706      OP_CRMINQUERY,     /* 69 */
707      OP_CRRANGE,        /* 70 These are different to the three sets above. */
708      OP_CRMINRANGE,     /* 71 */
709    
710    OP_CLASS,          /* 59 Match a character class, chars < 256 only */    OP_CLASS,          /* 72 Match a character class, chars < 256 only */
711    OP_NCLASS,         /* 60 Same, but the bitmap was created from a negative    OP_NCLASS,         /* 73 Same, but the bitmap was created from a negative
712                             class - the difference is relevant only when a UTF-8                             class - the difference is relevant only when a UTF-8
713                             character > 255 is encountered. */                             character > 255 is encountered. */
714    
715    OP_XCLASS,         /* 61 Extended class for handling UTF-8 chars within the    OP_XCLASS,         /* 74 Extended class for handling UTF-8 chars within the
716                             class. This does both positive and negative. */                             class. This does both positive and negative. */
717    
718    OP_REF,            /* 62 Match a back reference */    OP_REF,            /* 75 Match a back reference */
719    OP_RECURSE,        /* 63 Match a numbered subpattern (possibly recursive) */    OP_RECURSE,        /* 76 Match a numbered subpattern (possibly recursive) */
720    OP_CALLOUT,        /* 64 Call out to external function if provided */    OP_CALLOUT,        /* 77 Call out to external function if provided */
721    
722    OP_ALT,            /* 65 Start of alternation */    OP_ALT,            /* 78 Start of alternation */
723    OP_KET,            /* 66 End of group that doesn't have an unbounded repeat */    OP_KET,            /* 79 End of group that doesn't have an unbounded repeat */
724    OP_KETRMAX,        /* 67 These two must remain together and in this */    OP_KETRMAX,        /* 80 These two must remain together and in this */
725    OP_KETRMIN,        /* 68 order. They are for groups the repeat for ever. */    OP_KETRMIN,        /* 81 order. They are for groups the repeat for ever. */
726    
727    /* The assertions must come before ONCE and COND */    /* The assertions must come before BRA, CBRA, ONCE, and COND.*/
728    
729    OP_ASSERT,         /* 69 Positive lookahead */    OP_ASSERT,         /* 82 Positive lookahead */
730    OP_ASSERT_NOT,     /* 70 Negative lookahead */    OP_ASSERT_NOT,     /* 83 Negative lookahead */
731    OP_ASSERTBACK,     /* 71 Positive lookbehind */    OP_ASSERTBACK,     /* 84 Positive lookbehind */
732    OP_ASSERTBACK_NOT, /* 72 Negative lookbehind */    OP_ASSERTBACK_NOT, /* 85 Negative lookbehind */
733    OP_REVERSE,        /* 73 Move pointer back - used in lookbehind assertions */    OP_REVERSE,        /* 86 Move pointer back - used in lookbehind assertions */
734    
735    /* ONCE and COND must come after the assertions, with ONCE first, as there's    /* ONCE, BRA, CBRA, and COND must come after the assertions, with ONCE first,
736    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. */
737    
738    OP_ONCE,           /* 74 Once matched, don't back up into the subpattern */    OP_ONCE,           /* 87 Atomic group */
739    OP_COND,           /* 75 Conditional group */    OP_BRA,            /* 88 Start of non-capturing bracket */
740    OP_CREF,           /* 76 Used to hold an extraction string number (cond ref) */    OP_CBRA,           /* 89 Start of capturing bracket */
741      OP_COND,           /* 90 Conditional group */
742    OP_BRAZERO,        /* 77 These two must remain together and in this */  
743    OP_BRAMINZERO,     /* 78 order. */    /* These three must follow the previous three, in the same order. There's a
744      check for >= SBRA to distinguish the two sets. */
745    OP_BRANUMBER,      /* 79 Used for extracting brackets whose number is greater  
746                             than can fit into an opcode. */    OP_SBRA,           /* 91 Start of non-capturing bracket, check empty  */
747      OP_SCBRA,          /* 92 Start of capturing bracket, check empty */
748    OP_BRA             /* 80 This and greater values are used for brackets that    OP_SCOND,          /* 93 Conditional group, check empty */
749                             extract substrings up to EXTRACT_BASIC_MAX. After  
750                             that, use is made of OP_BRANUMBER. */    OP_CREF,           /* 94 Used to hold a capture number as condition */
751  };    OP_RREF,           /* 95 Used to hold a recursion number as condition */
752      OP_DEF,            /* 96 The DEFINE condition */
 /* WARNING WARNING WARNING: There is an implicit assumption in pcre.c and  
 study.c that all opcodes are less than 128 in value. This makes handling UTF-8  
 character sequences easier. */  
   
 /* The highest extraction number before we have to start using additional  
 bytes. (Originally PCRE didn't have support for extraction counts highter than  
 this number.) The value is limited by the number of opcodes left after OP_BRA,  
 i.e. 255 - OP_BRA. We actually set it a bit lower to leave room for additional  
 opcodes. */  
753    
754  #define EXTRACT_BASIC_MAX  100    OP_BRAZERO,        /* 97 These two must remain together and in this */
755      OP_BRAMINZERO      /* 98 order. */
756    };
757    
758    
759  /* This macro defines textual names for all the opcodes. These are used only  /* This macro defines textual names for all the opcodes. These are used only
# Line 633  for debugging. The macro is referenced o Line 762  for debugging. The macro is referenced o
762  #define OP_NAME_LIST \  #define OP_NAME_LIST \
763    "End", "\\A", "\\G", "\\B", "\\b", "\\D", "\\d",                \    "End", "\\A", "\\G", "\\B", "\\b", "\\D", "\\d",                \
764    "\\S", "\\s", "\\W", "\\w", "Any", "Anybyte",                   \    "\\S", "\\s", "\\W", "\\w", "Any", "Anybyte",                   \
765    "notprop", "prop", "extuni",                                    \    "notprop", "prop", "anynl", "extuni",                           \
766    "\\Z", "\\z",                                                   \    "\\Z", "\\z",                                                   \
767    "Opt", "^", "$", "char", "charnc", "not",                       \    "Opt", "^", "$", "char", "charnc", "not",                       \
768    "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \    "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \
769      "*+","++", "?+", "{",                                           \
770    "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \    "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \
771      "*+","++", "?+", "{",                                           \
772    "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \    "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \
773      "*+","++", "?+", "{",                                           \
774    "*", "*?", "+", "+?", "?", "??", "{", "{",                      \    "*", "*?", "+", "+?", "?", "??", "{", "{",                      \
775    "class", "nclass", "xclass", "Ref", "Recurse", "Callout",       \    "class", "nclass", "xclass", "Ref", "Recurse", "Callout",       \
776    "Alt", "Ket", "KetRmax", "KetRmin", "Assert", "Assert not",     \    "Alt", "Ket", "KetRmax", "KetRmin", "Assert", "Assert not",     \
777    "AssertB", "AssertB not", "Reverse", "Once", "Cond", "Cond ref",\    "AssertB", "AssertB not", "Reverse",                            \
778    "Brazero", "Braminzero", "Branumber", "Bra"    "Once", "Bra 0", "Bra", "Cond", "SBra 0", "SBra", "SCond",      \
779      "Cond ref", "Cond rec", "Cond def", "Brazero", "Braminzero"
780    
781    
782  /* 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 659  in UTF-8 mode. The code that uses this t Line 792  in UTF-8 mode. The code that uses this t
792    1,                             /* End                                    */ \    1,                             /* End                                    */ \
793    1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  /* \A, \G, \B, \B, \D, \d, \S, \s, \W, \w */ \    1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  /* \A, \G, \B, \B, \D, \d, \S, \s, \W, \w */ \
794    1, 1,                          /* Any, Anybyte                           */ \    1, 1,                          /* Any, Anybyte                           */ \
795    3, 3, 1,                       /* NOTPROP, PROP, EXTUNI                  */ \    3, 3, 1, 1,                    /* NOTPROP, PROP, EXTUNI, ANYNL           */ \
796    1, 1, 2, 1, 1,                 /* \Z, \z, Opt, ^, $                      */ \    1, 1, 2, 1, 1,                 /* \Z, \z, Opt, ^, $                      */ \
797    2,                             /* Char  - the minimum length             */ \    2,                             /* Char  - the minimum length             */ \
798    2,                             /* Charnc  - the minimum length           */ \    2,                             /* Charnc  - the minimum length           */ \
# Line 667  in UTF-8 mode. The code that uses this t Line 800  in UTF-8 mode. The code that uses this t
800    /* Positive single-char repeats                            ** These are  */ \    /* Positive single-char repeats                            ** These are  */ \
801    2, 2, 2, 2, 2, 2,              /* *, *?, +, +?, ?, ??      ** minima in  */ \    2, 2, 2, 2, 2, 2,              /* *, *?, +, +?, ?, ??      ** minima in  */ \
802    4, 4, 4,                       /* upto, minupto, exact     ** UTF-8 mode */ \    4, 4, 4,                       /* upto, minupto, exact     ** UTF-8 mode */ \
803      2, 2, 2, 4,                    /* *+, ++, ?+, upto+                      */ \
804    /* Negative single-char repeats - only for chars < 256                   */ \    /* Negative single-char repeats - only for chars < 256                   */ \
805    2, 2, 2, 2, 2, 2,              /* NOT *, *?, +, +?, ?, ??                */ \    2, 2, 2, 2, 2, 2,              /* NOT *, *?, +, +?, ?, ??                */ \
806    4, 4, 4,                       /* NOT upto, minupto, exact               */ \    4, 4, 4,                       /* NOT upto, minupto, exact               */ \
807      2, 2, 2, 4,                    /* Possessive *, +, ?, upto               */ \
808    /* Positive type repeats                                                 */ \    /* Positive type repeats                                                 */ \
809    2, 2, 2, 2, 2, 2,              /* Type *, *?, +, +?, ?, ??               */ \    2, 2, 2, 2, 2, 2,              /* Type *, *?, +, +?, ?, ??               */ \
810    4, 4, 4,                       /* Type upto, minupto, exact              */ \    4, 4, 4,                       /* Type upto, minupto, exact              */ \
811      2, 2, 2, 4,                    /* Possessive *+, ++, ?+, upto+           */ \
812    /* Character class & ref repeats                                         */ \    /* Character class & ref repeats                                         */ \
813    1, 1, 1, 1, 1, 1,              /* *, *?, +, +?, ?, ??                    */ \    1, 1, 1, 1, 1, 1,              /* *, *?, +, +?, ?, ??                    */ \
814    5, 5,                          /* CRRANGE, CRMINRANGE                    */ \    5, 5,                          /* CRRANGE, CRMINRANGE                    */ \
# Line 691  in UTF-8 mode. The code that uses this t Line 827  in UTF-8 mode. The code that uses this t
827    1+LINK_SIZE,                   /* Assert behind                          */ \    1+LINK_SIZE,                   /* Assert behind                          */ \
828    1+LINK_SIZE,                   /* Assert behind not                      */ \    1+LINK_SIZE,                   /* Assert behind not                      */ \
829    1+LINK_SIZE,                   /* Reverse                                */ \    1+LINK_SIZE,                   /* Reverse                                */ \
830    1+LINK_SIZE,                   /* Once                                   */ \    1+LINK_SIZE,                   /* ONCE                                   */ \
831      1+LINK_SIZE,                   /* BRA                                    */ \
832      3+LINK_SIZE,                   /* CBRA                                   */ \
833    1+LINK_SIZE,                   /* COND                                   */ \    1+LINK_SIZE,                   /* COND                                   */ \
834      1+LINK_SIZE,                   /* SBRA                                   */ \
835      3+LINK_SIZE,                   /* SCBRA                                  */ \
836      1+LINK_SIZE,                   /* SCOND                                  */ \
837    3,                             /* CREF                                   */ \    3,                             /* CREF                                   */ \
838      3,                             /* RREF                                   */ \
839      1,                             /* DEF                                    */ \
840    1, 1,                          /* BRAZERO, BRAMINZERO                    */ \    1, 1,                          /* BRAZERO, BRAMINZERO                    */ \
   3,                             /* BRANUMBER                              */ \  
   1+LINK_SIZE                    /* BRA                                    */ \  
841    
842    
843  /* A magic value for OP_CREF to indicate the "in recursion" condition. */  /* A magic value for OP_RREF to indicate the "any recursion" condition. */
844    
845  #define CREF_RECURSE  0xffff  #define RREF_ANY  0xffff
846    
847  /* Error code numbers. They are given names so that they can more easily be  /* Error code numbers. They are given names so that they can more easily be
848  tracked. */  tracked. */
# Line 710  enum { ERR0,  ERR1,  ERR2,  ERR3,  ERR4, Line 851  enum { ERR0,  ERR1,  ERR2,  ERR3,  ERR4,
851         ERR10, ERR11, ERR12, ERR13, ERR14, ERR15, ERR16, ERR17, ERR18, ERR19,         ERR10, ERR11, ERR12, ERR13, ERR14, ERR15, ERR16, ERR17, ERR18, ERR19,
852         ERR20, ERR21, ERR22, ERR23, ERR24, ERR25, ERR26, ERR27, ERR28, ERR29,         ERR20, ERR21, ERR22, ERR23, ERR24, ERR25, ERR26, ERR27, ERR28, ERR29,
853         ERR30, ERR31, ERR32, ERR33, ERR34, ERR35, ERR36, ERR37, ERR38, ERR39,         ERR30, ERR31, ERR32, ERR33, ERR34, ERR35, ERR36, ERR37, ERR38, ERR39,
854         ERR40, ERR41, ERR42, ERR43, ERR44, ERR45, ERR46, ERR47 };         ERR40, ERR41, ERR42, ERR43, ERR44, ERR45, ERR46, ERR47, ERR48, ERR49,
855           ERR50, ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57 };
856    
857  /* 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
858  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 765  typedef struct compile_data { Line 907  typedef struct compile_data {
907    const uschar *fcc;            /* Points to case-flipping table */    const uschar *fcc;            /* Points to case-flipping table */
908    const uschar *cbits;          /* Points to character type table */    const uschar *cbits;          /* Points to character type table */
909    const uschar *ctypes;         /* Points to table of type maps */    const uschar *ctypes;         /* Points to table of type maps */
910      const uschar *start_workspace;/* The start of working space */
911    const uschar *start_code;     /* The start of the compiled code */    const uschar *start_code;     /* The start of the compiled code */
912    const uschar *start_pattern;  /* The start of the pattern */    const uschar *start_pattern;  /* The start of the pattern */
913      const uschar *end_pattern;    /* The end of the pattern */
914      uschar *hwm;                  /* High watermark of workspace */
915    uschar *name_table;           /* The name/number table */    uschar *name_table;           /* The name/number table */
916    int  names_found;             /* Number of entries so far */    int  names_found;             /* Number of entries so far */
917    int  name_entry_size;         /* Size of each entry */    int  name_entry_size;         /* Size of each entry */
918      int  bracount;                /* Count of capturing parens */
919    int  top_backref;             /* Maximum back reference */    int  top_backref;             /* Maximum back reference */
920    unsigned int backref_map;     /* Bitmap of low back refs */    unsigned int backref_map;     /* Bitmap of low back refs */
921      int  external_options;        /* External (initial) options */
922    int  req_varyopt;             /* "After variable item" flag for reqbyte */    int  req_varyopt;             /* "After variable item" flag for reqbyte */
923    BOOL nopartial;               /* Set TRUE if partial won't work */    BOOL nopartial;               /* Set TRUE if partial won't work */
924      int  nltype;                  /* Newline type */
925      int  nllen;                   /* Newline string length */
926      uschar nl[4];                 /* Newline string when fixed length */
927  } compile_data;  } compile_data;
928    
929  /* Structure for maintaining a chain of pointers to the currently incomplete  /* Structure for maintaining a chain of pointers to the currently incomplete
# Line 798  typedef struct recursion_info { Line 948  typedef struct recursion_info {
948    
949  /* When compiling in a mode that doesn't use recursive calls to match(),  /* When compiling in a mode that doesn't use recursive calls to match(),
950  a structure is used to remember local variables on the heap. It is defined in  a structure is used to remember local variables on the heap. It is defined in
951  pcre.c, close to the match() function, so that it is easy to keep it in step  pcre_exec.c, close to the match() function, so that it is easy to keep it in
952  with any changes of local variable. However, the pointer to the current frame  step with any changes of local variable. However, the pointer to the current
953  must be saved in some "static" place over a longjmp(). We declare the  frame must be saved in some "static" place over a longjmp(). We declare the
954  structure here so that we can put a pointer in the match_data structure.  structure here so that we can put a pointer in the match_data structure. NOTE:
955  NOTE: This isn't used for a "normal" compilation of pcre. */  This isn't used for a "normal" compilation of pcre. */
956    
957  struct heapframe;  struct heapframe;
958    
959    /* Structure for building a chain of data for holding the values of the subject
960    pointer at the start of each subpattern, so as to detect when an empty string
961    has been matched by a subpattern - to break infinite loops. */
962    
963    typedef struct eptrblock {
964      struct eptrblock *epb_prev;
965      USPTR epb_saved_eptr;
966    } eptrblock;
967    
968    
969  /* Structure for passing "static" information around between the functions  /* Structure for passing "static" information around between the functions
970  doing traditional NFA matching, so that they are thread-safe. */  doing traditional NFA matching, so that they are thread-safe. */
971    
# Line 816  typedef struct match_data { Line 976  typedef struct match_data {
976    int   *offset_vector;         /* Offset vector */    int   *offset_vector;         /* Offset vector */
977    int    offset_end;            /* One past the end */    int    offset_end;            /* One past the end */
978    int    offset_max;            /* The maximum usable for return data */    int    offset_max;            /* The maximum usable for return data */
979      int    nltype;                /* Newline type */
980      int    nllen;                 /* Newline string length */
981      uschar nl[4];                 /* Newline string when fixed */
982    const uschar *lcc;            /* Points to lower casing table */    const uschar *lcc;            /* Points to lower casing table */
983    const uschar *ctypes;         /* Points to table of type maps */    const uschar *ctypes;         /* Points to table of type maps */
984    BOOL   offset_overflow;       /* Set if too many extractions */    BOOL   offset_overflow;       /* Set if too many extractions */
# Line 834  typedef struct match_data { Line 997  typedef struct match_data {
997    int    end_offset_top;        /* Highwater mark at end of match */    int    end_offset_top;        /* Highwater mark at end of match */
998    int    capture_last;          /* Most recent capture number */    int    capture_last;          /* Most recent capture number */
999    int    start_offset;          /* The start offset value */    int    start_offset;          /* The start offset value */
1000      eptrblock *eptrchain;         /* Chain of eptrblocks for tail recursions */
1001      int    eptrn;                 /* Next free eptrblock */
1002    recursion_info *recursive;    /* Linked list of recursion data */    recursion_info *recursive;    /* Linked list of recursion data */
1003    void  *callout_data;          /* To pass back to callouts */    void  *callout_data;          /* To pass back to callouts */
1004    struct heapframe *thisframe;  /* Used only when compiling for no recursion */    struct heapframe *thisframe;  /* Used only when compiling for no recursion */
# Line 849  typedef struct dfa_match_data { Line 1014  typedef struct dfa_match_data {
1014    const uschar *tables;         /* Character tables */    const uschar *tables;         /* Character tables */
1015    int   moptions;               /* Match options */    int   moptions;               /* Match options */
1016    int   poptions;               /* Pattern options */    int   poptions;               /* Pattern options */
1017      int    nltype;                /* Newline type */
1018      int    nllen;                 /* Newline string length */
1019      uschar nl[4];                 /* Newline string when fixed */
1020    void  *callout_data;          /* To pass back to callouts */    void  *callout_data;          /* To pass back to callouts */
1021  } dfa_match_data;  } dfa_match_data;
1022    
# Line 919  extern const uschar _pcre_OP_lengths[]; Line 1087  extern const uschar _pcre_OP_lengths[];
1087  one of the exported public functions. They have to be "external" in the C  one of the exported public functions. They have to be "external" in the C
1088  sense, but are not part of the PCRE public API. */  sense, but are not part of the PCRE public API. */
1089    
1090  extern int         _pcre_ord2utf8(int, uschar *);  extern BOOL         _pcre_is_newline(const uschar *, const uschar *, int *,
1091  extern real_pcre * _pcre_try_flipped(const real_pcre *, real_pcre *,                        BOOL);
1092                       const pcre_study_data *, pcre_study_data *);  extern int          _pcre_ord2utf8(int, uschar *);
1093  extern int         _pcre_ucp_findprop(const int, int *, int *);  extern real_pcre   *_pcre_try_flipped(const real_pcre *, real_pcre *,
1094  extern int         _pcre_ucp_othercase(const int);                        const pcre_study_data *, pcre_study_data *);
1095  extern int         _pcre_valid_utf8(const uschar *, int);  extern int          _pcre_ucp_findprop(const unsigned int, int *, int *);
1096  extern BOOL        _pcre_xclass(int, const uschar *);  extern unsigned int _pcre_ucp_othercase(const unsigned int);
1097    extern int          _pcre_valid_utf8(const uschar *, int);
1098    extern BOOL         _pcre_was_newline(const uschar *, const uschar *, int *,
1099                          BOOL);
1100    extern BOOL         _pcre_xclass(int, const uschar *);
1101    
1102  #endif  #endif
1103    

Legend:
Removed from v.87  
changed lines
  Added in v.145

  ViewVC Help
Powered by ViewVC 1.1.5