/[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 166 by ph10, Wed May 9 14:48:28 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(dllexport) 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 (they just import the symbols). We
93    use:
94    
95      PCRE_EXP_DECL       for declarations
96      PCRE_EXP_DEFN       for definitions of exported functions
97      PCRE_EXP_DATA_DEFN  for definitions of exported variables
98    
99    The reason for the two DEFN macros is that in non-Windows environments, one
100    does not want to have "extern" before variable definitions because it leads to
101    compiler warnings. So we distinguish between functions and variables. In
102    Windows, the two should always be the same.
103    
104    The reason for wrapping this in #ifndef PCRE_EXP_DECL is so that pcretest,
105    which is an application, but needs to import this file in order to "peek" at
106    internals, can #include pcre.h first to get an application's-eye view.
107    
108    In principle, people compiling for non-Windows, non-Unix-like (i.e. uncommon,
109    special-purpose environments) might want to stick other stuff in front of
110    exported symbols. That's why, in the non-Windows case, we set PCRE_EXP_DEFN and
111    PCRE_EXP_DATA_DEFN only if they are not already set. */
112    
113    #ifndef PCRE_EXP_DECL
114    #  ifdef _WIN32
115    #    ifdef DLL_EXPORT
116    #      define PCRE_EXP_DECL       extern __declspec(dllexport)
117    #      define PCRE_EXP_DEFN       __declspec(dllexport)
118    #      define PCRE_EXP_DATA_DEFN  __declspec(dllexport)
119    #    else
120    #      define PCRE_EXP_DECL       extern
121    #      define PCRE_EXP_DEFN
122    #      define PCRE_EXP_DATA_DEFN
123    #    endif
124    #
125    #  else
126    #    ifdef __cplusplus
127    #      define PCRE_EXP_DECL       extern "C"
128    #    else
129    #      define PCRE_EXP_DECL       extern
130    #    endif
131    #    ifndef PCRE_EXP_DEFN
132    #      define PCRE_EXP_DEFN       PCRE_EXP_DECL
133    #    endif
134    #    ifndef PCRE_EXP_DATA_DEFN
135    #      define PCRE_EXP_DATA_DEFN
136    #    endif
137    #  endif
138  #endif  #endif
139    
140  /* 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 168  Unix, where it is defined in sys/types,
168    
169  typedef unsigned char uschar;  typedef unsigned char uschar;
170    
171    /* This is an unsigned int value that no character can ever have. UTF-8
172    characters only go up to 0x7fffffff (though Unicode doesn't go beyond
173    0x0010ffff). */
174    
175    #define NOTACHAR 0xffffffff
176    
177    /* PCRE is able to support several different kinds of newline (CR, LF, CRLF,
178    "any" and "anycrlf" at present). The following macros are used to package up
179    testing for newlines. NLBLOCK, PSSTART, and PSEND are defined in the various
180    modules to indicate in which datablock the parameters exist, and what the
181    start/end of string field names are. */
182    
183    #define NLTYPE_FIXED    0     /* Newline is a fixed length string */
184    #define NLTYPE_ANY      1     /* Newline is any Unicode line ending */
185    #define NLTYPE_ANYCRLF  2     /* Newline is CR, LF, or CRLF */
186    
187    /* This macro checks for a newline at the given position */
188    
189    #define IS_NEWLINE(p) \
190      ((NLBLOCK->nltype != NLTYPE_FIXED)? \
191        ((p) < NLBLOCK->PSEND && \
192         _pcre_is_newline((p), NLBLOCK->nltype, NLBLOCK->PSEND, &(NLBLOCK->nllen),\
193           utf8)) \
194        : \
195        ((p) <= NLBLOCK->PSEND - NLBLOCK->nllen && \
196         (p)[0] == NLBLOCK->nl[0] && \
197         (NLBLOCK->nllen == 1 || (p)[1] == NLBLOCK->nl[1]) \
198        ) \
199      )
200    
201    /* This macro checks for a newline immediately preceding the given position */
202    
203    #define WAS_NEWLINE(p) \
204      ((NLBLOCK->nltype != NLTYPE_FIXED)? \
205        ((p) > NLBLOCK->PSSTART && \
206         _pcre_was_newline((p), NLBLOCK->nltype, NLBLOCK->PSSTART, \
207           &(NLBLOCK->nllen), utf8)) \
208        : \
209        ((p) >= NLBLOCK->PSSTART + NLBLOCK->nllen && \
210         (p)[-NLBLOCK->nllen] == NLBLOCK->nl[0] && \
211         (NLBLOCK->nllen == 1 || (p)[-NLBLOCK->nllen+1] == NLBLOCK->nl[1]) \
212        ) \
213      )
214    
215  /* 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
216  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()
217  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 229  must begin with PCRE_. */
229  #define USPTR const unsigned char *  #define USPTR const unsigned char *
230  #endif  #endif
231    
232    
233    
234  /* Include the public PCRE header and the definitions of UCP character property  /* Include the public PCRE header and the definitions of UCP character property
235  values. */  values. */
236    
237  #include "pcre.h"  #include <pcre.h>
238  #include "ucp.h"  #include "ucp.h"
239    
240  /* 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 242  need to have their names changed. PCRE m
242  option on the command line. */  option on the command line. */
243    
244  #ifdef VPCOMPAT  #ifdef VPCOMPAT
245    #define strlen(s)        _strlen(s)
246  #define strncmp(s1,s2,m) _strncmp(s1,s2,m)  #define strncmp(s1,s2,m) _strncmp(s1,s2,m)
247    #define memcmp(s,c,n)    _memcmp(s,c,n)
248  #define memcpy(d,s,n)    _memcpy(d,s,n)  #define memcpy(d,s,n)    _memcpy(d,s,n)
249  #define memmove(d,s,n)   _memmove(d,s,n)  #define memmove(d,s,n)   _memmove(d,s,n)
250  #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 253  option on the command line. */
253  /* 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(),
254  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
255  is set. Otherwise, include an emulating function for those systems that have  is set. Otherwise, include an emulating function for those systems that have
256  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. */  
257    
258  #if ! HAVE_MEMMOVE  #ifndef HAVE_MEMMOVE
259  #undef  memmove        /* some systems may have a macro */  #undef  memmove        /* some systems may have a macro */
260  #if HAVE_BCOPY  #ifdef HAVE_BCOPY
261  #define memmove(a, b, c) bcopy(b, a, c)  #define memmove(a, b, c) bcopy(b, a, c)
262  #else  /* HAVE_BCOPY */  #else  /* HAVE_BCOPY */
263  void *  static void *
264  pcre_memmove(unsigned char *dest, const unsigned char *src, size_t n)  pcre_memmove(void *d, const void *s, size_t n)
265  {  {
266  size_t i;  size_t i;
267  dest += n;  unsigned char *dest = (unsigned char *)d;
268  src += n;  const unsigned char *src = (const unsigned char *)s;
269  for (i = 0; i < n; ++i) *(--dest) =  *(--src);  if (dest > src)
270  return dest;    {
271      dest += n;
272      src += n;
273      for (i = 0; i < n; ++i) *(--dest) = *(--src);
274      return (void *)dest;
275      }
276    else
277      {
278      for (i = 0; i < n; ++i) *dest++ = *src++;
279      return (void *)(dest - n);
280      }
281  }  }
282  #define memmove(a, b, c) pcre_memmove(a, b, c)  #define memmove(a, b, c) pcre_memmove(a, b, c)
283  #endif   /* not HAVE_BCOPY */  #endif   /* not HAVE_BCOPY */
# Line 270  we know we are in UTF-8 mode. */ Line 380  we know we are in UTF-8 mode. */
380    
381  #define GETCHAR(c, eptr) \  #define GETCHAR(c, eptr) \
382    c = *eptr; \    c = *eptr; \
383    if ((c & 0xc0) == 0xc0) \    if (c >= 0xc0) \
384      { \      { \
385      int gcii; \      int gcii; \
386      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 398  pointer. */
398    
399  #define GETCHARTEST(c, eptr) \  #define GETCHARTEST(c, eptr) \
400    c = *eptr; \    c = *eptr; \
401    if (utf8 && (c & 0xc0) == 0xc0) \    if (utf8 && c >= 0xc0) \
402      { \      { \
403      int gcii; \      int gcii; \
404      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 416  know we are in UTF-8 mode. */
416    
417  #define GETCHARINC(c, eptr) \  #define GETCHARINC(c, eptr) \
418    c = *eptr++; \    c = *eptr++; \
419    if ((c & 0xc0) == 0xc0) \    if (c >= 0xc0) \
420      { \      { \
421      int gcaa = _pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */ \      int gcaa = _pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */ \
422      int gcss = 6*gcaa; \      int gcss = 6*gcaa; \
# Line 322  know we are in UTF-8 mode. */ Line 432  know we are in UTF-8 mode. */
432    
433  #define GETCHARINCTEST(c, eptr) \  #define GETCHARINCTEST(c, eptr) \
434    c = *eptr++; \    c = *eptr++; \
435    if (utf8 && (c & 0xc0) == 0xc0) \    if (utf8 && c >= 0xc0) \
436      { \      { \
437      int gcaa = _pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */ \      int gcaa = _pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */ \
438      int gcss = 6*gcaa; \      int gcss = 6*gcaa; \
# Line 339  if there are extra bytes. This is called Line 449  if there are extra bytes. This is called
449    
450  #define GETCHARLEN(c, eptr, len) \  #define GETCHARLEN(c, eptr, len) \
451    c = *eptr; \    c = *eptr; \
452    if ((c & 0xc0) == 0xc0) \    if (c >= 0xc0) \
453      { \      { \
454      int gcii; \      int gcii; \
455      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 483  Standard C system should have one. */
483    
484  #define PCRE_IMS (PCRE_CASELESS|PCRE_MULTILINE|PCRE_DOTALL)  #define PCRE_IMS (PCRE_CASELESS|PCRE_MULTILINE|PCRE_DOTALL)
485    
486  /* 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.
487  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
488  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
489  significant end. Make sure they don't overlap! */  out, there is a dummy word in the structure that could be used for the private
490    bits. */
491    
492    #define PCRE_NOPARTIAL     0x80000000  /* can't use partial with this regex */
493  #define PCRE_FIRSTSET      0x40000000  /* first_byte is set */  #define PCRE_FIRSTSET      0x40000000  /* first_byte is set */
494  #define PCRE_REQCHSET      0x20000000  /* req_byte is set */  #define PCRE_REQCHSET      0x20000000  /* req_byte is set */
495  #define PCRE_STARTLINE     0x10000000  /* start after \n for multiline */  #define PCRE_STARTLINE     0x10000000  /* start after \n for multiline */
496  #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 */  
497    
498  /* Options for the "extra" block produced by pcre_study(). */  /* Options for the "extra" block produced by pcre_study(). */
499    
# Line 391  significant end. Make sure they don't ov Line 502  significant end. Make sure they don't ov
502  /* Masks for identifying the public options that are permitted at compile  /* Masks for identifying the public options that are permitted at compile
503  time, run time, or study time, respectively. */  time, run time, or study time, respectively. */
504    
505    #define PCRE_NEWLINE_BITS (PCRE_NEWLINE_CR|PCRE_NEWLINE_LF|PCRE_NEWLINE_ANY| \
506                               PCRE_NEWLINE_ANYCRLF)
507    
508  #define PUBLIC_OPTIONS \  #define PUBLIC_OPTIONS \
509    (PCRE_CASELESS|PCRE_EXTENDED|PCRE_ANCHORED|PCRE_MULTILINE| \    (PCRE_CASELESS|PCRE_EXTENDED|PCRE_ANCHORED|PCRE_MULTILINE| \
510     PCRE_DOTALL|PCRE_DOLLAR_ENDONLY|PCRE_EXTRA|PCRE_UNGREEDY|PCRE_UTF8| \     PCRE_DOTALL|PCRE_DOLLAR_ENDONLY|PCRE_EXTRA|PCRE_UNGREEDY|PCRE_UTF8| \
511     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| \
512       PCRE_DUPNAMES|PCRE_NEWLINE_BITS)
513    
514  #define PUBLIC_EXEC_OPTIONS \  #define PUBLIC_EXEC_OPTIONS \
515    (PCRE_ANCHORED|PCRE_NOTBOL|PCRE_NOTEOL|PCRE_NOTEMPTY|PCRE_NO_UTF8_CHECK| \    (PCRE_ANCHORED|PCRE_NOTBOL|PCRE_NOTEOL|PCRE_NOTEMPTY|PCRE_NO_UTF8_CHECK| \
516     PCRE_PARTIAL)     PCRE_PARTIAL|PCRE_NEWLINE_BITS)
517    
518  #define PUBLIC_DFA_EXEC_OPTIONS \  #define PUBLIC_DFA_EXEC_OPTIONS \
519    (PCRE_ANCHORED|PCRE_NOTBOL|PCRE_NOTEOL|PCRE_NOTEMPTY|PCRE_NO_UTF8_CHECK| \    (PCRE_ANCHORED|PCRE_NOTBOL|PCRE_NOTEOL|PCRE_NOTEMPTY|PCRE_NO_UTF8_CHECK| \
520     PCRE_PARTIAL|PCRE_DFA_SHORTEST|PCRE_DFA_RESTART)     PCRE_PARTIAL|PCRE_DFA_SHORTEST|PCRE_DFA_RESTART|PCRE_NEWLINE_BITS)
521    
522  #define PUBLIC_STUDY_OPTIONS 0   /* None defined */  #define PUBLIC_STUDY_OPTIONS 0   /* None defined */
523    
# Line 434  typedef int BOOL; Line 549  typedef int BOOL;
549  #define FALSE   0  #define FALSE   0
550  #define TRUE    1  #define TRUE    1
551    
552  /* 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). */  
553    
554  #ifndef ESC_e  #ifndef ESC_e
555  #define ESC_e 27  #define ESC_e 27
# Line 447  ESC_n is defined as yet another macro, w Line 560  ESC_n is defined as yet another macro, w
560  #endif  #endif
561    
562  #ifndef ESC_n  #ifndef ESC_n
563  #define ESC_n NEWLINE  #define ESC_n '\n'
564  #endif  #endif
565    
566  #ifndef ESC_r  #ifndef ESC_r
# Line 486  value such as \n. They must have non-zer Line 599  value such as \n. They must have non-zer
599  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
600  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
601  corresponds to "." rather than an escape sequence. The final one must be  corresponds to "." rather than an escape sequence. The final one must be
602  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).
603  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
604  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
605  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
606  character, that code will have to change. */  character, that code will have to change. */
607    
608  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,
609         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,
610         ESC_Q, ESC_REF };         ESC_E, ESC_Q, ESC_k, ESC_REF };
611    
612    
613  /* 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
614  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
615  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.
616  Note that whenever this list is updated, the two macro definitions that follow  
617  must also be updated to match. */  To keep stored, compiled patterns compatible, new opcodes should be added
618    immediately before OP_BRA, where (since release 7.0) a gap is left for this
619    purpose.
620    
621    *** NOTE NOTE NOTE *** Whenever this list is updated, the two macro definitions
622    that follow must also be updated to match. There is also a table called
623    "coptable" in pcre_dfa_exec.c that must be updated. */
624    
625  enum {  enum {
626    OP_END,            /* 0 End of pattern */    OP_END,            /* 0 End of pattern */
# Line 521  enum { Line 641  enum {
641    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 */
642    OP_NOTPROP,        /* 13 \P (not Unicode property) */    OP_NOTPROP,        /* 13 \P (not Unicode property) */
643    OP_PROP,           /* 14 \p (Unicode property) */    OP_PROP,           /* 14 \p (Unicode property) */
644    OP_EXTUNI,         /* 15 \X (extended Unicode sequence */    OP_ANYNL,          /* 15 \R (any newline sequence) */
645    OP_EODN,           /* 16 End of data or \n at end of data: \Z. */    OP_EXTUNI,         /* 16 \X (extended Unicode sequence */
646    OP_EOD,            /* 17 End of data: \z */    OP_EODN,           /* 17 End of data or \n at end of data: \Z. */
647      OP_EOD,            /* 18 End of data: \z */
648    OP_OPT,            /* 18 Set runtime options */  
649    OP_CIRC,           /* 19 Start of line - varies with multiline switch */    OP_OPT,            /* 19 Set runtime options */
650    OP_DOLL,           /* 20 End of line - varies with multiline switch */    OP_CIRC,           /* 20 Start of line - varies with multiline switch */
651    OP_CHAR,           /* 21 Match one character, casefully */    OP_DOLL,           /* 21 End of line - varies with multiline switch */
652    OP_CHARNC,         /* 22 Match one character, caselessly */    OP_CHAR,           /* 22 Match one character, casefully */
653    OP_NOT,            /* 23 Match anything but the following char */    OP_CHARNC,         /* 23 Match one character, caselessly */
654      OP_NOT,            /* 24 Match one character, not the following one */
655    OP_STAR,           /* 24 The maximizing and minimizing versions of */  
656    OP_MINSTAR,        /* 25 all these opcodes must come in pairs, with */    OP_STAR,           /* 25 The maximizing and minimizing versions of */
657    OP_PLUS,           /* 26 the minimizing one second. */    OP_MINSTAR,        /* 26 these six opcodes must come in pairs, with */
658    OP_MINPLUS,        /* 27 This first set applies to single characters */    OP_PLUS,           /* 27 the minimizing one second. */
659    OP_QUERY,          /* 28 */    OP_MINPLUS,        /* 28 This first set applies to single characters.*/
660    OP_MINQUERY,       /* 29 */    OP_QUERY,          /* 29 */
661    OP_UPTO,           /* 30 From 0 to n matches */    OP_MINQUERY,       /* 30 */
662    OP_MINUPTO,        /* 31 */  
663    OP_EXACT,          /* 32 Exactly n matches */    OP_UPTO,           /* 31 From 0 to n matches */
664      OP_MINUPTO,        /* 32 */
665    OP_NOTSTAR,        /* 33 The maximizing and minimizing versions of */    OP_EXACT,          /* 33 Exactly n matches */
666    OP_NOTMINSTAR,     /* 34 all these opcodes must come in pairs, with */  
667    OP_NOTPLUS,        /* 35 the minimizing one second. */    OP_POSSTAR,        /* 34 Possessified star */
668    OP_NOTMINPLUS,     /* 36 This set applies to "not" single characters */    OP_POSPLUS,        /* 35 Possessified plus */
669    OP_NOTQUERY,       /* 37 */    OP_POSQUERY,       /* 36 Posesssified query */
670    OP_NOTMINQUERY,    /* 38 */    OP_POSUPTO,        /* 37 Possessified upto */
671    OP_NOTUPTO,        /* 39 From 0 to n matches */  
672    OP_NOTMINUPTO,     /* 40 */    OP_NOTSTAR,        /* 38 The maximizing and minimizing versions of */
673    OP_NOTEXACT,       /* 41 Exactly n matches */    OP_NOTMINSTAR,     /* 39 these six opcodes must come in pairs, with */
674      OP_NOTPLUS,        /* 40 the minimizing one second. They must be in */
675    OP_TYPESTAR,       /* 42 The maximizing and minimizing versions of */    OP_NOTMINPLUS,     /* 41 exactly the same order as those above. */
676    OP_TYPEMINSTAR,    /* 43 all these opcodes must come in pairs, with */    OP_NOTQUERY,       /* 42 This set applies to "not" single characters. */
677    OP_TYPEPLUS,       /* 44 the minimizing one second. These codes must */    OP_NOTMINQUERY,    /* 43 */
678    OP_TYPEMINPLUS,    /* 45 be in exactly the same order as those above. */  
679    OP_TYPEQUERY,      /* 46 This set applies to character types such as \d */    OP_NOTUPTO,        /* 44 From 0 to n matches */
680    OP_TYPEMINQUERY,   /* 47 */    OP_NOTMINUPTO,     /* 45 */
681    OP_TYPEUPTO,       /* 48 From 0 to n matches */    OP_NOTEXACT,       /* 46 Exactly n matches */
682    OP_TYPEMINUPTO,    /* 49 */  
683    OP_TYPEEXACT,      /* 50 Exactly n matches */    OP_NOTPOSSTAR,     /* 47 Possessified versions */
684      OP_NOTPOSPLUS,     /* 48 */
685    OP_CRSTAR,         /* 51 The maximizing and minimizing versions of */    OP_NOTPOSQUERY,    /* 49 */
686    OP_CRMINSTAR,      /* 52 all these opcodes must come in pairs, with */    OP_NOTPOSUPTO,     /* 50 */
687    OP_CRPLUS,         /* 53 the minimizing one second. These codes must */  
688    OP_CRMINPLUS,      /* 54 be in exactly the same order as those above. */    OP_TYPESTAR,       /* 51 The maximizing and minimizing versions of */
689    OP_CRQUERY,        /* 55 These are for character classes and back refs */    OP_TYPEMINSTAR,    /* 52 these six opcodes must come in pairs, with */
690    OP_CRMINQUERY,     /* 56 */    OP_TYPEPLUS,       /* 53 the minimizing one second. These codes must */
691    OP_CRRANGE,        /* 57 These are different to the three sets above. */    OP_TYPEMINPLUS,    /* 54 be in exactly the same order as those above. */
692    OP_CRMINRANGE,     /* 58 */    OP_TYPEQUERY,      /* 55 This set applies to character types such as \d */
693      OP_TYPEMINQUERY,   /* 56 */
694    
695      OP_TYPEUPTO,       /* 57 From 0 to n matches */
696      OP_TYPEMINUPTO,    /* 58 */
697      OP_TYPEEXACT,      /* 59 Exactly n matches */
698    
699      OP_TYPEPOSSTAR,    /* 60 Possessified versions */
700      OP_TYPEPOSPLUS,    /* 61 */
701      OP_TYPEPOSQUERY,   /* 62 */
702      OP_TYPEPOSUPTO,    /* 63 */
703    
704      OP_CRSTAR,         /* 64 The maximizing and minimizing versions of */
705      OP_CRMINSTAR,      /* 65 all these opcodes must come in pairs, with */
706      OP_CRPLUS,         /* 66 the minimizing one second. These codes must */
707      OP_CRMINPLUS,      /* 67 be in exactly the same order as those above. */
708      OP_CRQUERY,        /* 68 These are for character classes and back refs */
709      OP_CRMINQUERY,     /* 69 */
710      OP_CRRANGE,        /* 70 These are different to the three sets above. */
711      OP_CRMINRANGE,     /* 71 */
712    
713    OP_CLASS,          /* 59 Match a character class, chars < 256 only */    OP_CLASS,          /* 72 Match a character class, chars < 256 only */
714    OP_NCLASS,         /* 60 Same, but the bitmap was created from a negative    OP_NCLASS,         /* 73 Same, but the bitmap was created from a negative
715                             class - the difference is relevant only when a UTF-8                             class - the difference is relevant only when a UTF-8
716                             character > 255 is encountered. */                             character > 255 is encountered. */
717    
718    OP_XCLASS,         /* 61 Extended class for handling UTF-8 chars within the    OP_XCLASS,         /* 74 Extended class for handling UTF-8 chars within the
719                             class. This does both positive and negative. */                             class. This does both positive and negative. */
720    
721    OP_REF,            /* 62 Match a back reference */    OP_REF,            /* 75 Match a back reference */
722    OP_RECURSE,        /* 63 Match a numbered subpattern (possibly recursive) */    OP_RECURSE,        /* 76 Match a numbered subpattern (possibly recursive) */
723    OP_CALLOUT,        /* 64 Call out to external function if provided */    OP_CALLOUT,        /* 77 Call out to external function if provided */
724    
725    OP_ALT,            /* 65 Start of alternation */    OP_ALT,            /* 78 Start of alternation */
726    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 */
727    OP_KETRMAX,        /* 67 These two must remain together and in this */    OP_KETRMAX,        /* 80 These two must remain together and in this */
728    OP_KETRMIN,        /* 68 order. They are for groups the repeat for ever. */    OP_KETRMIN,        /* 81 order. They are for groups the repeat for ever. */
729    
730    /* The assertions must come before ONCE and COND */    /* The assertions must come before BRA, CBRA, ONCE, and COND.*/
731    
732    OP_ASSERT,         /* 69 Positive lookahead */    OP_ASSERT,         /* 82 Positive lookahead */
733    OP_ASSERT_NOT,     /* 70 Negative lookahead */    OP_ASSERT_NOT,     /* 83 Negative lookahead */
734    OP_ASSERTBACK,     /* 71 Positive lookbehind */    OP_ASSERTBACK,     /* 84 Positive lookbehind */
735    OP_ASSERTBACK_NOT, /* 72 Negative lookbehind */    OP_ASSERTBACK_NOT, /* 85 Negative lookbehind */
736    OP_REVERSE,        /* 73 Move pointer back - used in lookbehind assertions */    OP_REVERSE,        /* 86 Move pointer back - used in lookbehind assertions */
737    
738    /* 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,
739    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. */
740    
741    OP_ONCE,           /* 74 Once matched, don't back up into the subpattern */    OP_ONCE,           /* 87 Atomic group */
742    OP_COND,           /* 75 Conditional group */    OP_BRA,            /* 88 Start of non-capturing bracket */
743    OP_CREF,           /* 76 Used to hold an extraction string number (cond ref) */    OP_CBRA,           /* 89 Start of capturing bracket */
744      OP_COND,           /* 90 Conditional group */
745    OP_BRAZERO,        /* 77 These two must remain together and in this */  
746    OP_BRAMINZERO,     /* 78 order. */    /* These three must follow the previous three, in the same order. There's a
747      check for >= SBRA to distinguish the two sets. */
748    OP_BRANUMBER,      /* 79 Used for extracting brackets whose number is greater  
749                             than can fit into an opcode. */    OP_SBRA,           /* 91 Start of non-capturing bracket, check empty  */
750      OP_SCBRA,          /* 92 Start of capturing bracket, check empty */
751    OP_BRA             /* 80 This and greater values are used for brackets that    OP_SCOND,          /* 93 Conditional group, check empty */
752                             extract substrings up to EXTRACT_BASIC_MAX. After  
753                             that, use is made of OP_BRANUMBER. */    OP_CREF,           /* 94 Used to hold a capture number as condition */
754  };    OP_RREF,           /* 95 Used to hold a recursion number as condition */
755      OP_DEF,            /* 96 The DEFINE condition */
756    
757  /* WARNING WARNING WARNING: There is an implicit assumption in pcre.c and    OP_BRAZERO,        /* 97 These two must remain together and in this */
758  study.c that all opcodes are less than 128 in value. This makes handling UTF-8    OP_BRAMINZERO      /* 98 order. */
759  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. */  
   
 #define EXTRACT_BASIC_MAX  100  
760    
761    
762  /* 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 765  for debugging. The macro is referenced o
765  #define OP_NAME_LIST \  #define OP_NAME_LIST \
766    "End", "\\A", "\\G", "\\B", "\\b", "\\D", "\\d",                \    "End", "\\A", "\\G", "\\B", "\\b", "\\D", "\\d",                \
767    "\\S", "\\s", "\\W", "\\w", "Any", "Anybyte",                   \    "\\S", "\\s", "\\W", "\\w", "Any", "Anybyte",                   \
768    "notprop", "prop", "extuni",                                    \    "notprop", "prop", "anynl", "extuni",                           \
769    "\\Z", "\\z",                                                   \    "\\Z", "\\z",                                                   \
770    "Opt", "^", "$", "char", "charnc", "not",                       \    "Opt", "^", "$", "char", "charnc", "not",                       \
771    "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \    "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \
772      "*+","++", "?+", "{",                                           \
773    "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \    "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \
774      "*+","++", "?+", "{",                                           \
775    "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \    "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \
776      "*+","++", "?+", "{",                                           \
777    "*", "*?", "+", "+?", "?", "??", "{", "{",                      \    "*", "*?", "+", "+?", "?", "??", "{", "{",                      \
778    "class", "nclass", "xclass", "Ref", "Recurse", "Callout",       \    "class", "nclass", "xclass", "Ref", "Recurse", "Callout",       \
779    "Alt", "Ket", "KetRmax", "KetRmin", "Assert", "Assert not",     \    "Alt", "Ket", "KetRmax", "KetRmin", "Assert", "Assert not",     \
780    "AssertB", "AssertB not", "Reverse", "Once", "Cond", "Cond ref",\    "AssertB", "AssertB not", "Reverse",                            \
781    "Brazero", "Braminzero", "Branumber", "Bra"    "Once", "Bra 0", "Bra", "Cond", "SBra 0", "SBra", "SCond",      \
782      "Cond ref", "Cond rec", "Cond def", "Brazero", "Braminzero"
783    
784    
785  /* 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 795  in UTF-8 mode. The code that uses this t
795    1,                             /* End                                    */ \    1,                             /* End                                    */ \
796    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 */ \
797    1, 1,                          /* Any, Anybyte                           */ \    1, 1,                          /* Any, Anybyte                           */ \
798    3, 3, 1,                       /* NOTPROP, PROP, EXTUNI                  */ \    3, 3, 1, 1,                    /* NOTPROP, PROP, EXTUNI, ANYNL           */ \
799    1, 1, 2, 1, 1,                 /* \Z, \z, Opt, ^, $                      */ \    1, 1, 2, 1, 1,                 /* \Z, \z, Opt, ^, $                      */ \
800    2,                             /* Char  - the minimum length             */ \    2,                             /* Char  - the minimum length             */ \
801    2,                             /* Charnc  - the minimum length           */ \    2,                             /* Charnc  - the minimum length           */ \
# Line 667  in UTF-8 mode. The code that uses this t Line 803  in UTF-8 mode. The code that uses this t
803    /* Positive single-char repeats                            ** These are  */ \    /* Positive single-char repeats                            ** These are  */ \
804    2, 2, 2, 2, 2, 2,              /* *, *?, +, +?, ?, ??      ** minima in  */ \    2, 2, 2, 2, 2, 2,              /* *, *?, +, +?, ?, ??      ** minima in  */ \
805    4, 4, 4,                       /* upto, minupto, exact     ** UTF-8 mode */ \    4, 4, 4,                       /* upto, minupto, exact     ** UTF-8 mode */ \
806      2, 2, 2, 4,                    /* *+, ++, ?+, upto+                      */ \
807    /* Negative single-char repeats - only for chars < 256                   */ \    /* Negative single-char repeats - only for chars < 256                   */ \
808    2, 2, 2, 2, 2, 2,              /* NOT *, *?, +, +?, ?, ??                */ \    2, 2, 2, 2, 2, 2,              /* NOT *, *?, +, +?, ?, ??                */ \
809    4, 4, 4,                       /* NOT upto, minupto, exact               */ \    4, 4, 4,                       /* NOT upto, minupto, exact               */ \
810      2, 2, 2, 4,                    /* Possessive *, +, ?, upto               */ \
811    /* Positive type repeats                                                 */ \    /* Positive type repeats                                                 */ \
812    2, 2, 2, 2, 2, 2,              /* Type *, *?, +, +?, ?, ??               */ \    2, 2, 2, 2, 2, 2,              /* Type *, *?, +, +?, ?, ??               */ \
813    4, 4, 4,                       /* Type upto, minupto, exact              */ \    4, 4, 4,                       /* Type upto, minupto, exact              */ \
814      2, 2, 2, 4,                    /* Possessive *+, ++, ?+, upto+           */ \
815    /* Character class & ref repeats                                         */ \    /* Character class & ref repeats                                         */ \
816    1, 1, 1, 1, 1, 1,              /* *, *?, +, +?, ?, ??                    */ \    1, 1, 1, 1, 1, 1,              /* *, *?, +, +?, ?, ??                    */ \
817    5, 5,                          /* CRRANGE, CRMINRANGE                    */ \    5, 5,                          /* CRRANGE, CRMINRANGE                    */ \
# Line 691  in UTF-8 mode. The code that uses this t Line 830  in UTF-8 mode. The code that uses this t
830    1+LINK_SIZE,                   /* Assert behind                          */ \    1+LINK_SIZE,                   /* Assert behind                          */ \
831    1+LINK_SIZE,                   /* Assert behind not                      */ \    1+LINK_SIZE,                   /* Assert behind not                      */ \
832    1+LINK_SIZE,                   /* Reverse                                */ \    1+LINK_SIZE,                   /* Reverse                                */ \
833    1+LINK_SIZE,                   /* Once                                   */ \    1+LINK_SIZE,                   /* ONCE                                   */ \
834      1+LINK_SIZE,                   /* BRA                                    */ \
835      3+LINK_SIZE,                   /* CBRA                                   */ \
836    1+LINK_SIZE,                   /* COND                                   */ \    1+LINK_SIZE,                   /* COND                                   */ \
837      1+LINK_SIZE,                   /* SBRA                                   */ \
838      3+LINK_SIZE,                   /* SCBRA                                  */ \
839      1+LINK_SIZE,                   /* SCOND                                  */ \
840    3,                             /* CREF                                   */ \    3,                             /* CREF                                   */ \
841      3,                             /* RREF                                   */ \
842      1,                             /* DEF                                    */ \
843    1, 1,                          /* BRAZERO, BRAMINZERO                    */ \    1, 1,                          /* BRAZERO, BRAMINZERO                    */ \
   3,                             /* BRANUMBER                              */ \  
   1+LINK_SIZE                    /* BRA                                    */ \  
844    
845    
846  /* A magic value for OP_CREF to indicate the "in recursion" condition. */  /* A magic value for OP_RREF to indicate the "any recursion" condition. */
847    
848  #define CREF_RECURSE  0xffff  #define RREF_ANY  0xffff
849    
850  /* 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
851  tracked. */  tracked. */
# Line 710  enum { ERR0,  ERR1,  ERR2,  ERR3,  ERR4, Line 854  enum { ERR0,  ERR1,  ERR2,  ERR3,  ERR4,
854         ERR10, ERR11, ERR12, ERR13, ERR14, ERR15, ERR16, ERR17, ERR18, ERR19,         ERR10, ERR11, ERR12, ERR13, ERR14, ERR15, ERR16, ERR17, ERR18, ERR19,
855         ERR20, ERR21, ERR22, ERR23, ERR24, ERR25, ERR26, ERR27, ERR28, ERR29,         ERR20, ERR21, ERR22, ERR23, ERR24, ERR25, ERR26, ERR27, ERR28, ERR29,
856         ERR30, ERR31, ERR32, ERR33, ERR34, ERR35, ERR36, ERR37, ERR38, ERR39,         ERR30, ERR31, ERR32, ERR33, ERR34, ERR35, ERR36, ERR37, ERR38, ERR39,
857         ERR40, ERR41, ERR42, ERR43, ERR44, ERR45, ERR46, ERR47 };         ERR40, ERR41, ERR42, ERR43, ERR44, ERR45, ERR46, ERR47, ERR48, ERR49,
858           ERR50, ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58 };
859    
860  /* 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
861  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 910  typedef struct compile_data {
910    const uschar *fcc;            /* Points to case-flipping table */    const uschar *fcc;            /* Points to case-flipping table */
911    const uschar *cbits;          /* Points to character type table */    const uschar *cbits;          /* Points to character type table */
912    const uschar *ctypes;         /* Points to table of type maps */    const uschar *ctypes;         /* Points to table of type maps */
913      const uschar *start_workspace;/* The start of working space */
914    const uschar *start_code;     /* The start of the compiled code */    const uschar *start_code;     /* The start of the compiled code */
915    const uschar *start_pattern;  /* The start of the pattern */    const uschar *start_pattern;  /* The start of the pattern */
916      const uschar *end_pattern;    /* The end of the pattern */
917      uschar *hwm;                  /* High watermark of workspace */
918    uschar *name_table;           /* The name/number table */    uschar *name_table;           /* The name/number table */
919    int  names_found;             /* Number of entries so far */    int  names_found;             /* Number of entries so far */
920    int  name_entry_size;         /* Size of each entry */    int  name_entry_size;         /* Size of each entry */
921      int  bracount;                /* Count of capturing parens */
922    int  top_backref;             /* Maximum back reference */    int  top_backref;             /* Maximum back reference */
923    unsigned int backref_map;     /* Bitmap of low back refs */    unsigned int backref_map;     /* Bitmap of low back refs */
924      int  external_options;        /* External (initial) options */
925    int  req_varyopt;             /* "After variable item" flag for reqbyte */    int  req_varyopt;             /* "After variable item" flag for reqbyte */
926    BOOL nopartial;               /* Set TRUE if partial won't work */    BOOL nopartial;               /* Set TRUE if partial won't work */
927      int  nltype;                  /* Newline type */
928      int  nllen;                   /* Newline string length */
929      uschar nl[4];                 /* Newline string when fixed length */
930  } compile_data;  } compile_data;
931    
932  /* Structure for maintaining a chain of pointers to the currently incomplete  /* Structure for maintaining a chain of pointers to the currently incomplete
# Line 796  typedef struct recursion_info { Line 949  typedef struct recursion_info {
949    int saved_max;                /* Number of saved offsets */    int saved_max;                /* Number of saved offsets */
950  } recursion_info;  } recursion_info;
951    
952  /* When compiling in a mode that doesn't use recursive calls to match(),  /* Structure for building a chain of data for holding the values of the subject
953  a structure is used to remember local variables on the heap. It is defined in  pointer at the start of each subpattern, so as to detect when an empty string
954  pcre.c, close to the match() function, so that it is easy to keep it in step  has been matched by a subpattern - to break infinite loops. */
955  with any changes of local variable. However, the pointer to the current frame  
956  must be saved in some "static" place over a longjmp(). We declare the  typedef struct eptrblock {
957  structure here so that we can put a pointer in the match_data structure.    struct eptrblock *epb_prev;
958  NOTE: This isn't used for a "normal" compilation of pcre. */    USPTR epb_saved_eptr;
959    } eptrblock;
960    
 struct heapframe;  
961    
962  /* Structure for passing "static" information around between the functions  /* Structure for passing "static" information around between the functions
963  doing traditional NFA matching, so that they are thread-safe. */  doing traditional NFA matching, so that they are thread-safe. */
# Line 816  typedef struct match_data { Line 969  typedef struct match_data {
969    int   *offset_vector;         /* Offset vector */    int   *offset_vector;         /* Offset vector */
970    int    offset_end;            /* One past the end */    int    offset_end;            /* One past the end */
971    int    offset_max;            /* The maximum usable for return data */    int    offset_max;            /* The maximum usable for return data */
972      int    nltype;                /* Newline type */
973      int    nllen;                 /* Newline string length */
974      uschar nl[4];                 /* Newline string when fixed */
975    const uschar *lcc;            /* Points to lower casing table */    const uschar *lcc;            /* Points to lower casing table */
976    const uschar *ctypes;         /* Points to table of type maps */    const uschar *ctypes;         /* Points to table of type maps */
977    BOOL   offset_overflow;       /* Set if too many extractions */    BOOL   offset_overflow;       /* Set if too many extractions */
# Line 834  typedef struct match_data { Line 990  typedef struct match_data {
990    int    end_offset_top;        /* Highwater mark at end of match */    int    end_offset_top;        /* Highwater mark at end of match */
991    int    capture_last;          /* Most recent capture number */    int    capture_last;          /* Most recent capture number */
992    int    start_offset;          /* The start offset value */    int    start_offset;          /* The start offset value */
993      eptrblock *eptrchain;         /* Chain of eptrblocks for tail recursions */
994      int    eptrn;                 /* Next free eptrblock */
995    recursion_info *recursive;    /* Linked list of recursion data */    recursion_info *recursive;    /* Linked list of recursion data */
996    void  *callout_data;          /* To pass back to callouts */    void  *callout_data;          /* To pass back to callouts */
   struct heapframe *thisframe;  /* Used only when compiling for no recursion */  
997  } match_data;  } match_data;
998    
999  /* A similar structure is used for the same purpose by the DFA matching  /* A similar structure is used for the same purpose by the DFA matching
# Line 849  typedef struct dfa_match_data { Line 1006  typedef struct dfa_match_data {
1006    const uschar *tables;         /* Character tables */    const uschar *tables;         /* Character tables */
1007    int   moptions;               /* Match options */    int   moptions;               /* Match options */
1008    int   poptions;               /* Pattern options */    int   poptions;               /* Pattern options */
1009      int    nltype;                /* Newline type */
1010      int    nllen;                 /* Newline string length */
1011      uschar nl[4];                 /* Newline string when fixed */
1012    void  *callout_data;          /* To pass back to callouts */    void  *callout_data;          /* To pass back to callouts */
1013  } dfa_match_data;  } dfa_match_data;
1014    
# Line 919  extern const uschar _pcre_OP_lengths[]; Line 1079  extern const uschar _pcre_OP_lengths[];
1079  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
1080  sense, but are not part of the PCRE public API. */  sense, but are not part of the PCRE public API. */
1081    
1082  extern int         _pcre_ord2utf8(int, uschar *);  extern BOOL         _pcre_is_newline(const uschar *, int, const uschar *,
1083  extern real_pcre * _pcre_try_flipped(const real_pcre *, real_pcre *,                        int *, BOOL);
1084                       const pcre_study_data *, pcre_study_data *);  extern int          _pcre_ord2utf8(int, uschar *);
1085  extern int         _pcre_ucp_findprop(const int, int *, int *);  extern real_pcre   *_pcre_try_flipped(const real_pcre *, real_pcre *,
1086  extern int         _pcre_ucp_othercase(const int);                        const pcre_study_data *, pcre_study_data *);
1087  extern int         _pcre_valid_utf8(const uschar *, int);  extern int          _pcre_ucp_findprop(const unsigned int, int *, int *);
1088  extern BOOL        _pcre_xclass(int, const uschar *);  extern unsigned int _pcre_ucp_othercase(const unsigned int);
1089    extern int          _pcre_valid_utf8(const uschar *, int);
1090    extern BOOL         _pcre_was_newline(const uschar *, int, const uschar *,
1091                          int *, BOOL);
1092    extern BOOL         _pcre_xclass(int, const uschar *);
1093    
1094  #endif  #endif
1095    

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

  ViewVC Help
Powered by ViewVC 1.1.5