/[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 576 by ph10, Sun Nov 21 18:45:10 2010 UTC revision 1199 by chpe, Sat Nov 3 19:21:37 2012 UTC
# Line 7  Line 7 
7  and semantics are as close as possible to those of the Perl 5 language.  and semantics are as close as possible to those of the Perl 5 language.
8    
9                         Written by Philip Hazel                         Written by Philip Hazel
10             Copyright (c) 1997-2010 University of Cambridge             Copyright (c) 1997-2012 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 40  POSSIBILITY OF SUCH DAMAGE. Line 40  POSSIBILITY OF SUCH DAMAGE.
40    
41  /* This header contains definitions that are shared between the different  /* This header contains definitions that are shared between the different
42  modules, but which are not relevant to the exported API. This includes some  modules, but which are not relevant to the exported API. This includes some
43  functions whose names all begin with "_pcre_". */  functions whose names all begin with "_pcre_", "_pcre16_" or "_pcre32_"
44    depending on the PRIV macro. */
45    
46  #ifndef PCRE_INTERNAL_H  #ifndef PCRE_INTERNAL_H
47  #define PCRE_INTERNAL_H  #define PCRE_INTERNAL_H
# Line 51  functions whose names all begin with "_p Line 52  functions whose names all begin with "_p
52  #define PCRE_DEBUG  #define PCRE_DEBUG
53  #endif  #endif
54    
55  /* We do not support both EBCDIC and UTF-8 at the same time. The "configure"  /* PCRE is compiled as an 8 bit library if it is not requested otherwise. */
 script prevents both being selected, but not everybody uses "configure". */  
56    
57  #if defined EBCDIC && defined SUPPORT_UTF8  #if !defined COMPILE_PCRE16 && !defined COMPILE_PCRE32
58  #error The use of both EBCDIC and SUPPORT_UTF8 is not supported.  #define COMPILE_PCRE8
59  #endif  #endif
60    
61  /* If SUPPORT_UCP is defined, SUPPORT_UTF8 must also be defined. The  /* If SUPPORT_UCP is defined, SUPPORT_UTF must also be defined. The
62  "configure" script ensures this, but not everybody uses "configure". */  "configure" script ensures this, but not everybody uses "configure". */
63    
64  #if defined SUPPORT_UCP && !defined SUPPORT_UTF8  #if defined SUPPORT_UCP && !(defined SUPPORT_UTF)
65    #define SUPPORT_UTF 1
66    #endif
67    
68    /* We define SUPPORT_UTF if SUPPORT_UTF8 is enabled for compatibility
69    reasons with existing code. */
70    
71    #if defined SUPPORT_UTF8 && !(defined SUPPORT_UTF)
72    #define SUPPORT_UTF 1
73    #endif
74    
75    /* Fixme: SUPPORT_UTF8 should be eventually disappear from the code.
76    Until then we define it if SUPPORT_UTF is defined. */
77    
78    #if defined SUPPORT_UTF && !(defined SUPPORT_UTF8)
79  #define SUPPORT_UTF8 1  #define SUPPORT_UTF8 1
80  #endif  #endif
81    
82    /* We do not support both EBCDIC and UTF-8/16/32 at the same time. The "configure"
83    script prevents both being selected, but not everybody uses "configure". */
84    
85    #if defined EBCDIC && defined SUPPORT_UTF
86    #error The use of both EBCDIC and SUPPORT_UTF is not supported.
87    #endif
88    
89  /* 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
90  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
91  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
# Line 91  setjmp and stdarg are used is when NO_RE Line 112  setjmp and stdarg are used is when NO_RE
112  #include <stdlib.h>  #include <stdlib.h>
113  #include <string.h>  #include <string.h>
114    
115    /* Valgrind (memcheck) support */
116    
117    #ifdef SUPPORT_VALGRIND
118    #include <valgrind/memcheck.h>
119    #endif
120    
121  /* When compiling a DLL for Windows, the exported symbols have to be declared  /* When compiling a DLL for Windows, the exported symbols have to be declared
122  using some MS magic. I found some useful information on this web page:  using some MS magic. I found some useful information on this web page:
123  http://msdn2.microsoft.com/en-us/library/y4h7bcy6(VS.80).aspx. According to the  http://msdn2.microsoft.com/en-us/library/y4h7bcy6(VS.80).aspx. According to the
# Line 158  set, we ensure here that it has no effec Line 185  set, we ensure here that it has no effec
185  #define PCRE_CALL_CONVENTION  #define PCRE_CALL_CONVENTION
186  #endif  #endif
187    
188  /* We need to have types that specify unsigned 16-bit and 32-bit integers. We  /* We need to have types that specify unsigned 8, 16 and 32-bit integers. We
189  cannot determine these outside the compilation (e.g. by running a program as  cannot determine these outside the compilation (e.g. by running a program as
190  part of "configure") because PCRE is often cross-compiled for use on other  part of "configure") because PCRE is often cross-compiled for use on other
191  systems. Instead we make use of the maximum sizes that are available at  systems. Instead we make use of the maximum sizes that are available at
192  preprocessor time in standard C environments. */  preprocessor time in standard C environments. */
193    
194    typedef unsigned char pcre_uint8;
195    
196  #if USHRT_MAX == 65535  #if USHRT_MAX == 65535
197    typedef unsigned short pcre_uint16;    typedef unsigned short pcre_uint16;
198    typedef short pcre_int16;    typedef short pcre_int16;
# Line 192  stdint.h is available, include it; it ma Line 221  stdint.h is available, include it; it ma
221  have stdint.h (e.g. Solaris) may have inttypes.h. The macro int64_t may be set  have stdint.h (e.g. Solaris) may have inttypes.h. The macro int64_t may be set
222  by "configure". */  by "configure". */
223    
224  #if HAVE_STDINT_H  #if defined HAVE_STDINT_H
225  #include <stdint.h>  #include <stdint.h>
226  #elif HAVE_INTTYPES_H  #elif defined HAVE_INTTYPES_H
227  #include <inttypes.h>  #include <inttypes.h>
228  #endif  #endif
229    
# Line 206  by "configure". */ Line 235  by "configure". */
235    
236  /* All character handling must be done as unsigned characters. Otherwise there  /* All character handling must be done as unsigned characters. Otherwise there
237  are problems with top-bit-set characters and functions such as isspace().  are problems with top-bit-set characters and functions such as isspace().
238  However, we leave the interface to the outside world as char *, because that  However, we leave the interface to the outside world as char * or short *,
239  should make things easier for callers. We define a short type for unsigned char  because that should make things easier for callers. This character type is
240  to save lots of typing. I tried "uchar", but it causes problems on Digital  called pcre_uchar.
241  Unix, where it is defined in sys/types, so use "uschar" instead. */  
242    The IN_UCHARS macro multiply its argument with the byte size of the current
243    pcre_uchar type. Useful for memcpy and such operations, whose require the
244    byte size of their input/output buffers.
245    
246    The MAX_255 macro checks whether its pcre_uchar input is less than 256.
247    
248    The TABLE_GET macro is designed for accessing elements of tables whose contain
249    exactly 256 items. When the character is able to contain more than 256
250    items, some check is needed before accessing these tables.
251    */
252    
253  typedef unsigned char uschar;  #if defined COMPILE_PCRE8
254    
255    typedef unsigned char pcre_uchar;
256    #define IN_UCHARS(x) (x)
257    #define MAX_255(c) 1
258    #define TABLE_GET(c, table, default) ((table)[c])
259    
260    #elif defined COMPILE_PCRE16
261    
262    #if USHRT_MAX != 65535
263    /* This is a warning message. Change PCRE_UCHAR16 to a 16 bit data type in
264    pcre.h(.in) and disable (comment out) this message. */
265    #error Warning: PCRE_UCHAR16 is not a 16 bit data type.
266    #endif
267    
268    typedef pcre_uint16 pcre_uchar;
269    #define UCHAR_SHIFT (1)
270    #define IN_UCHARS(x) ((x) << UCHAR_SHIFT)
271    #define MAX_255(c) ((c) <= 255u)
272    #define TABLE_GET(c, table, default) (MAX_255(c)? ((table)[c]):(default))
273    
274    #elif defined COMPILE_PCRE32
275    
276    typedef pcre_uint32 pcre_uchar;
277    #define UCHAR_SHIFT (2)
278    #define IN_UCHARS(x) ((x) << UCHAR_SHIFT)
279    #define MAX_255(c) ((c) <= 255u)
280    #define TABLE_GET(c, table, default) (MAX_255(c)? ((table)[c]):(default))
281    
282    #else
283    #error Unsupported compiling mode
284    #endif /* COMPILE_PCRE[8|16|32] */
285    
286  /* This is an unsigned int value that no character can ever have. UTF-8  /* This is an unsigned int value that no character can ever have. UTF-8
287  characters only go up to 0x7fffffff (though Unicode doesn't go beyond  characters only go up to 0x7fffffff (though Unicode doesn't go beyond
# Line 234  start/end of string field names are. */ Line 304  start/end of string field names are. */
304  #define IS_NEWLINE(p) \  #define IS_NEWLINE(p) \
305    ((NLBLOCK->nltype != NLTYPE_FIXED)? \    ((NLBLOCK->nltype != NLTYPE_FIXED)? \
306      ((p) < NLBLOCK->PSEND && \      ((p) < NLBLOCK->PSEND && \
307       _pcre_is_newline((p), NLBLOCK->nltype, NLBLOCK->PSEND, &(NLBLOCK->nllen),\       PRIV(is_newline)((p), NLBLOCK->nltype, NLBLOCK->PSEND, \
308         utf8)) \         &(NLBLOCK->nllen), utf)) \
309      : \      : \
310      ((p) <= NLBLOCK->PSEND - NLBLOCK->nllen && \      ((p) <= NLBLOCK->PSEND - NLBLOCK->nllen && \
311       (p)[0] == NLBLOCK->nl[0] && \       RAWUCHARTEST(p) == NLBLOCK->nl[0] && \
312       (NLBLOCK->nllen == 1 || (p)[1] == NLBLOCK->nl[1]) \       (NLBLOCK->nllen == 1 || RAWUCHARTEST(p+1) == NLBLOCK->nl[1])       \
313      ) \      ) \
314    )    )
315    
# Line 248  start/end of string field names are. */ Line 318  start/end of string field names are. */
318  #define WAS_NEWLINE(p) \  #define WAS_NEWLINE(p) \
319    ((NLBLOCK->nltype != NLTYPE_FIXED)? \    ((NLBLOCK->nltype != NLTYPE_FIXED)? \
320      ((p) > NLBLOCK->PSSTART && \      ((p) > NLBLOCK->PSSTART && \
321       _pcre_was_newline((p), NLBLOCK->nltype, NLBLOCK->PSSTART, \       PRIV(was_newline)((p), NLBLOCK->nltype, NLBLOCK->PSSTART, \
322         &(NLBLOCK->nllen), utf8)) \         &(NLBLOCK->nllen), utf)) \
323      : \      : \
324      ((p) >= NLBLOCK->PSSTART + NLBLOCK->nllen && \      ((p) >= NLBLOCK->PSSTART + NLBLOCK->nllen && \
325       (p)[-NLBLOCK->nllen] == NLBLOCK->nl[0] && \       RAWUCHARTEST(p - NLBLOCK->nllen) == NLBLOCK->nl[0] &&              \
326       (NLBLOCK->nllen == 1 || (p)[-NLBLOCK->nllen+1] == NLBLOCK->nl[1]) \       (NLBLOCK->nllen == 1 || RAWUCHARTEST(p - NLBLOCK->nllen + 1) == NLBLOCK->nl[1]) \
327      ) \      ) \
328    )    )
329    
# Line 267  used for the external interface and appe Line 337  used for the external interface and appe
337  must begin with PCRE_. */  must begin with PCRE_. */
338    
339  #ifdef CUSTOM_SUBJECT_PTR  #ifdef CUSTOM_SUBJECT_PTR
340  #define PCRE_SPTR CUSTOM_SUBJECT_PTR  #define PCRE_PUCHAR CUSTOM_SUBJECT_PTR
 #define USPTR CUSTOM_SUBJECT_PTR  
341  #else  #else
342  #define PCRE_SPTR const char *  #define PCRE_PUCHAR const pcre_uchar *
 #define USPTR const unsigned char *  
343  #endif  #endif
344    
   
   
345  /* Include the public PCRE header and the definitions of UCP character property  /* Include the public PCRE header and the definitions of UCP character property
346  values. */  values. */
347    
348  #include "pcre.h"  #include "pcre.h"
349  #include "ucp.h"  #include "ucp.h"
350    
351    #ifdef COMPILE_PCRE32
352    /* Assert that the public PCRE_UCHAR32 is a 32-bit type */
353    typedef int __assert_pcre_uchar32_size[sizeof(PCRE_UCHAR32) == 4 ? 1 : -1];
354    #endif
355    
356  /* When compiling for use with the Virtual Pascal compiler, these functions  /* When compiling for use with the Virtual Pascal compiler, these functions
357  need to have their names changed. PCRE must be compiled with the -DVPCOMPAT  need to have their names changed. PCRE must be compiled with the -DVPCOMPAT
358  option on the command line. */  option on the command line. */
# Line 343  The macros are controlled by the value o Line 414  The macros are controlled by the value o
414  the config.h file, but can be overridden by using -D on the command line. This  the config.h file, but can be overridden by using -D on the command line. This
415  is automated on Unix systems via the "configure" command. */  is automated on Unix systems via the "configure" command. */
416    
417    #if defined COMPILE_PCRE8
418    
419  #if LINK_SIZE == 2  #if LINK_SIZE == 2
420    
421  #define PUT(a,n,d)   \  #define PUT(a,n,d)   \
# Line 379  is automated on Unix systems via the "co Line 452  is automated on Unix systems via the "co
452  #define GET(a,n) \  #define GET(a,n) \
453    (((a)[n] << 24) | ((a)[(n)+1] << 16) | ((a)[(n)+2] << 8) | (a)[(n)+3])    (((a)[n] << 24) | ((a)[(n)+1] << 16) | ((a)[(n)+2] << 8) | (a)[(n)+3])
454    
455  #define MAX_PATTERN_SIZE (1 << 30)   /* Keep it positive */  /* Keep it positive */
456    #define MAX_PATTERN_SIZE (1 << 30)
457    
458    #else
459    #error LINK_SIZE must be either 2, 3, or 4
460    #endif
461    
462    #elif defined COMPILE_PCRE16
463    
464    #if LINK_SIZE == 2
465    
466    /* Redefine LINK_SIZE as a multiple of sizeof(pcre_uchar) */
467    #undef LINK_SIZE
468    #define LINK_SIZE 1
469    
470    #define PUT(a,n,d)   \
471      (a[n] = (d))
472    
473    #define GET(a,n) \
474      (a[n])
475    
476    #define MAX_PATTERN_SIZE (1 << 16)
477    
478    #elif LINK_SIZE == 3 || LINK_SIZE == 4
479    
480    /* Redefine LINK_SIZE as a multiple of sizeof(pcre_uchar) */
481    #undef LINK_SIZE
482    #define LINK_SIZE 2
483    
484    #define PUT(a,n,d)   \
485      (a[n] = (d) >> 16), \
486      (a[(n)+1] = (d) & 65535)
487    
488    #define GET(a,n) \
489      (((a)[n] << 16) | (a)[(n)+1])
490    
491    /* Keep it positive */
492    #define MAX_PATTERN_SIZE (1 << 30)
493    
494  #else  #else
495  #error LINK_SIZE must be either 2, 3, or 4  #error LINK_SIZE must be either 2, 3, or 4
496  #endif  #endif
497    
498    #elif defined COMPILE_PCRE32
499    
500    /* Only supported LINK_SIZE is 4 */
501    /* Redefine LINK_SIZE as a multiple of sizeof(pcre_uchar) */
502    #undef LINK_SIZE
503    #define LINK_SIZE 1
504    
505    #define PUT(a,n,d)   \
506      (a[n] = (d))
507    
508    #define GET(a,n) \
509      (a[n])
510    
511    /* Keep it positive */
512    #define MAX_PATTERN_SIZE (1 << 30)
513    
514    #else
515    #error Unsupported compiling mode
516    #endif /* COMPILE_PCRE[8|16|32] */
517    
518  /* Convenience macro defined in terms of the others */  /* Convenience macro defined in terms of the others */
519    
# Line 396  is automated on Unix systems via the "co Line 524  is automated on Unix systems via the "co
524  offsets changes. There are used for repeat counts and for other things such as  offsets changes. There are used for repeat counts and for other things such as
525  capturing parenthesis numbers in back references. */  capturing parenthesis numbers in back references. */
526    
527    #if defined COMPILE_PCRE8
528    
529    #define IMM2_SIZE 2
530    
531  #define PUT2(a,n,d)   \  #define PUT2(a,n,d)   \
532    a[n] = (d) >> 8; \    a[n] = (d) >> 8; \
533    a[(n)+1] = (d) & 255    a[(n)+1] = (d) & 255
534    
535    /* For reasons that I do not understand, the expression in this GET2 macro is
536    treated by gcc as a signed expression, even when a is declared as unsigned. It
537    seems that any kind of arithmetic results in a signed value. */
538    
539  #define GET2(a,n) \  #define GET2(a,n) \
540    (((a)[n] << 8) | (a)[(n)+1])    (unsigned int)(((a)[n] << 8) | (a)[(n)+1])
541    
542  #define PUT2INC(a,n,d)  PUT2(a,n,d), a += 2  #elif defined COMPILE_PCRE16
543    
544    #define IMM2_SIZE 1
545    
546  /* When UTF-8 encoding is being used, a character is no longer just a single  #define PUT2(a,n,d)   \
547  byte. The macros for character handling generate simple sequences when used in     a[n] = d
548  byte-mode, and more complicated ones for UTF-8 characters. GETCHARLENTEST is  
549  not used when UTF-8 is not supported, so it is not defined, and BACKCHAR should  #define GET2(a,n) \
550  never be called in byte mode. To make sure they can never even appear when     a[n]
551  UTF-8 support is omitted, we don't even define them. */  
552    #elif defined COMPILE_PCRE32
553    
554    #define IMM2_SIZE 1
555    
556  #ifndef SUPPORT_UTF8  #define PUT2(a,n,d)   \
557       a[n] = d
558    
559    #define GET2(a,n) \
560       a[n]
561    
562    #else
563    #error Unsupported compiling mode
564    #endif /* COMPILE_PCRE[8|16|32] */
565    
566    #define PUT2INC(a,n,d)  PUT2(a,n,d), a += IMM2_SIZE
567    
568    /* The maximum length of a MARK name is currently one data unit; it may be
569    changed in future to be a fixed number of bytes or to depend on LINK_SIZE. */
570    
571    #if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
572    #define MAX_MARK ((1u << 16) - 1)
573    #else
574    #define MAX_MARK ((1u << 8) - 1)
575    #endif
576    
577    /* When UTF encoding is being used, a character is no longer just a single
578    byte. The macros for character handling generate simple sequences when used in
579    character-mode, and more complicated ones for UTF characters. GETCHARLENTEST
580    and other macros are not used when UTF is not supported, so they are not
581    defined. To make sure they can never even appear when UTF support is omitted,
582    we don't even define them. */
583    
584    #ifndef SUPPORT_UTF
585    
586    /* #define MAX_VALUE_FOR_SINGLE_CHAR */
587    /* #define HAS_EXTRALEN(c) */
588    /* #define GET_EXTRALEN(c) */
589    /* #define NOT_FIRSTCHAR(c) */
590  #define GETCHAR(c, eptr) c = *eptr;  #define GETCHAR(c, eptr) c = *eptr;
591  #define GETCHARTEST(c, eptr) c = *eptr;  #define GETCHARTEST(c, eptr) c = *eptr;
592  #define GETCHARINC(c, eptr) c = *eptr++;  #define GETCHARINC(c, eptr) c = *eptr++;
593  #define GETCHARINCTEST(c, eptr) c = *eptr++;  #define GETCHARINCTEST(c, eptr) c = *eptr++;
594  #define GETCHARLEN(c, eptr, len) c = *eptr;  #define GETCHARLEN(c, eptr, len) c = *eptr;
595    #define RAWUCHAR(eptr) (*(eptr))
596    #define RAWUCHARINC(eptr) (*(eptr)++)
597    #define RAWUCHARTEST(eptr) (*(eptr))
598    #define RAWUCHARINCTEST(eptr) (*(eptr)++)
599  /* #define GETCHARLENTEST(c, eptr, len) */  /* #define GETCHARLENTEST(c, eptr, len) */
600  /* #define BACKCHAR(eptr) */  /* #define BACKCHAR(eptr) */
601    /* #define FORWARDCHAR(eptr) */
602    /* #define ACROSSCHAR(condition, eptr, action) */
603    
604  #else   /* SUPPORT_UTF8 */  #else   /* SUPPORT_UTF */
605    
606  /* These macros were originally written in the form of loops that used data  /* Tests whether the code point needs extra characters to decode. */
607  from the tables whose names start with _pcre_utf8_table. They were rewritten by  
608  a user so as not to use loops, because in some environments this gives a  #define HASUTF8EXTRALEN(c) ((c) >= 0xc0)
 significant performance advantage, and it seems never to do any harm. */  
609    
610  /* Base macro to pick up the remaining bytes of a UTF-8 character, not  /* Base macro to pick up the remaining bytes of a UTF-8 character, not
611  advancing the pointer. */  advancing the pointer. */
# Line 451  advancing the pointer. */ Line 629  advancing the pointer. */
629            ((eptr[4] & 0x3f) << 6) | (eptr[5] & 0x3f); \            ((eptr[4] & 0x3f) << 6) | (eptr[5] & 0x3f); \
630      }      }
631    
 /* Get the next UTF-8 character, not advancing the pointer. This is called when  
 we know we are in UTF-8 mode. */  
   
 #define GETCHAR(c, eptr) \  
   c = *eptr; \  
   if (c >= 0xc0) GETUTF8(c, eptr);  
   
 /* Get the next UTF-8 character, testing for UTF-8 mode, and not advancing the  
 pointer. */  
   
 #define GETCHARTEST(c, eptr) \  
   c = *eptr; \  
   if (utf8 && c >= 0xc0) GETUTF8(c, eptr);  
   
632  /* Base macro to pick up the remaining bytes of a UTF-8 character, advancing  /* Base macro to pick up the remaining bytes of a UTF-8 character, advancing
633  the pointer. */  the pointer. */
634    
# Line 499  the pointer. */ Line 663  the pointer. */
663        } \        } \
664      }      }
665    
666    #if defined COMPILE_PCRE8
667    
668    /* These macros were originally written in the form of loops that used data
669    from the tables whose names start with PRIV(utf8_table). They were rewritten by
670    a user so as not to use loops, because in some environments this gives a
671    significant performance advantage, and it seems never to do any harm. */
672    
673    /* Tells the biggest code point which can be encoded as a single character. */
674    
675    #define MAX_VALUE_FOR_SINGLE_CHAR 127
676    
677    /* Tests whether the code point needs extra characters to decode. */
678    
679    #define HAS_EXTRALEN(c) ((c) >= 0xc0)
680    
681    /* Returns with the additional number of characters if IS_MULTICHAR(c) is TRUE.
682    Otherwise it has an undefined behaviour. */
683    
684    #define GET_EXTRALEN(c) (PRIV(utf8_table4)[(c) & 0x3f])
685    
686    /* Returns TRUE, if the given character is not the first character
687    of a UTF sequence. */
688    
689    #define NOT_FIRSTCHAR(c) (((c) & 0xc0) == 0x80)
690    
691    /* Get the next UTF-8 character, not advancing the pointer. This is called when
692    we know we are in UTF-8 mode. */
693    
694    #define GETCHAR(c, eptr) \
695      c = *eptr; \
696      if (c >= 0xc0) GETUTF8(c, eptr);
697    
698    /* Get the next UTF-8 character, testing for UTF-8 mode, and not advancing the
699    pointer. */
700    
701    #define GETCHARTEST(c, eptr) \
702      c = *eptr; \
703      if (utf && c >= 0xc0) GETUTF8(c, eptr);
704    
705  /* Get the next UTF-8 character, advancing the pointer. This is called when we  /* Get the next UTF-8 character, advancing the pointer. This is called when we
706  know we are in UTF-8 mode. */  know we are in UTF-8 mode. */
707    
# Line 511  This is called when we don't know if we Line 714  This is called when we don't know if we
714    
715  #define GETCHARINCTEST(c, eptr) \  #define GETCHARINCTEST(c, eptr) \
716    c = *eptr++; \    c = *eptr++; \
717    if (utf8 && c >= 0xc0) GETUTF8INC(c, eptr);    if (utf && c >= 0xc0) GETUTF8INC(c, eptr);
718    
719  /* Base macro to pick up the remaining bytes of a UTF-8 character, not  /* Base macro to pick up the remaining bytes of a UTF-8 character, not
720  advancing the pointer, incrementing the length. */  advancing the pointer, incrementing the length. */
# Line 563  do not know if we are in UTF-8 mode. */ Line 766  do not know if we are in UTF-8 mode. */
766    
767  #define GETCHARLENTEST(c, eptr, len) \  #define GETCHARLENTEST(c, eptr, len) \
768    c = *eptr; \    c = *eptr; \
769    if (utf8 && c >= 0xc0) GETUTF8LEN(c, eptr, len);    if (utf && c >= 0xc0) GETUTF8LEN(c, eptr, len);
770    
771    /* Returns the next uchar, not advancing the pointer. This is called when
772    we know we are in UTF mode. */
773    
774    #define RAWUCHAR(eptr) \
775      (*(eptr))
776    
777    /* Returns the next uchar, advancing the pointer. This is called when
778    we know we are in UTF mode. */
779    
780    #define RAWUCHARINC(eptr) \
781      (*((eptr)++))
782    
783    /* Returns the next uchar, testing for UTF mode, and not advancing the
784    pointer. */
785    
786    #define RAWUCHARTEST(eptr) \
787      (*(eptr))
788    
789    /* Returns the next uchar, testing for UTF mode, advancing the
790    pointer. */
791    
792    #define RAWUCHARINCTEST(eptr) \
793      (*((eptr)++))
794    
795  /* If the pointer is not at the start of a character, move it back until  /* If the pointer is not at the start of a character, move it back until
796  it is. This is called only in UTF-8 mode - we don't put a test within the macro  it is. This is called only in UTF-8 mode - we don't put a test within the macro
# Line 571  because almost all calls are already wit Line 798  because almost all calls are already wit
798    
799  #define BACKCHAR(eptr) while((*eptr & 0xc0) == 0x80) eptr--  #define BACKCHAR(eptr) while((*eptr & 0xc0) == 0x80) eptr--
800    
801  #endif  /* SUPPORT_UTF8 */  /* Same as above, just in the other direction. */
802    #define FORWARDCHAR(eptr) while((*eptr & 0xc0) == 0x80) eptr++
803    
804    /* Same as above, but it allows a fully customizable form. */
805    #define ACROSSCHAR(condition, eptr, action) \
806      while((condition) && ((eptr) & 0xc0) == 0x80) action
807    
808  /* In case there is no definition of offsetof() provided - though any proper  #elif defined COMPILE_PCRE16
 Standard C system should have one. */  
809    
810  #ifndef offsetof  /* Tells the biggest code point which can be encoded as a single character. */
811  #define offsetof(p_type,field) ((size_t)&(((p_type *)0)->field))  
812  #endif  #define MAX_VALUE_FOR_SINGLE_CHAR 65535
813    
814    /* Tests whether the code point needs extra characters to decode. */
815    
816    #define HAS_EXTRALEN(c) (((c) & 0xfc00) == 0xd800)
817    
818    /* Returns with the additional number of characters if IS_MULTICHAR(c) is TRUE.
819    Otherwise it has an undefined behaviour. */
820    
821    #define GET_EXTRALEN(c) 1
822    
823    /* Returns TRUE, if the given character is not the first character
824    of a UTF sequence. */
825    
826    #define NOT_FIRSTCHAR(c) (((c) & 0xfc00) == 0xdc00)
827    
828    /* Base macro to pick up the low surrogate of a UTF-16 character, not
829    advancing the pointer. */
830    
831    #define GETUTF16(c, eptr) \
832       { c = (((c & 0x3ff) << 10) | (eptr[1] & 0x3ff)) + 0x10000; }
833    
834    /* Get the next UTF-16 character, not advancing the pointer. This is called when
835    we know we are in UTF-16 mode. */
836    
837    #define GETCHAR(c, eptr) \
838      c = *eptr; \
839      if ((c & 0xfc00) == 0xd800) GETUTF16(c, eptr);
840    
841    /* Get the next UTF-16 character, testing for UTF-16 mode, and not advancing the
842    pointer. */
843    
844    #define GETCHARTEST(c, eptr) \
845      c = *eptr; \
846      if (utf && (c & 0xfc00) == 0xd800) GETUTF16(c, eptr);
847    
848    /* Base macro to pick up the low surrogate of a UTF-16 character, advancing
849    the pointer. */
850    
851    #define GETUTF16INC(c, eptr) \
852       { c = (((c & 0x3ff) << 10) | (*eptr++ & 0x3ff)) + 0x10000; }
853    
854    /* Get the next UTF-16 character, advancing the pointer. This is called when we
855    know we are in UTF-16 mode. */
856    
857    #define GETCHARINC(c, eptr) \
858      c = *eptr++; \
859      if ((c & 0xfc00) == 0xd800) GETUTF16INC(c, eptr);
860    
861    /* Get the next character, testing for UTF-16 mode, and advancing the pointer.
862    This is called when we don't know if we are in UTF-16 mode. */
863    
864    #define GETCHARINCTEST(c, eptr) \
865      c = *eptr++; \
866      if (utf && (c & 0xfc00) == 0xd800) GETUTF16INC(c, eptr);
867    
868    /* Base macro to pick up the low surrogate of a UTF-16 character, not
869    advancing the pointer, incrementing the length. */
870    
871    #define GETUTF16LEN(c, eptr, len) \
872       { c = (((c & 0x3ff) << 10) | (eptr[1] & 0x3ff)) + 0x10000; len++; }
873    
874    /* Get the next UTF-16 character, not advancing the pointer, incrementing
875    length if there is a low surrogate. This is called when we know we are in
876    UTF-16 mode. */
877    
878    #define GETCHARLEN(c, eptr, len) \
879      c = *eptr; \
880      if ((c & 0xfc00) == 0xd800) GETUTF16LEN(c, eptr, len);
881    
882    /* Get the next UTF-816character, testing for UTF-16 mode, not advancing the
883    pointer, incrementing length if there is a low surrogate. This is called when
884    we do not know if we are in UTF-16 mode. */
885    
886    #define GETCHARLENTEST(c, eptr, len) \
887      c = *eptr; \
888      if (utf && (c & 0xfc00) == 0xd800) GETUTF16LEN(c, eptr, len);
889    
890    /* Returns the next uchar, not advancing the pointer. This is called when
891    we know we are in UTF mode. */
892    
893    #define RAWUCHAR(eptr) \
894      (*(eptr))
895    
896    /* Returns the next uchar, advancing the pointer. This is called when
897    we know we are in UTF mode. */
898    
899    #define RAWUCHARINC(eptr) \
900      (*((eptr)++))
901    
902    /* Returns the next uchar, testing for UTF mode, and not advancing the
903    pointer. */
904    
905    #define RAWUCHARTEST(eptr) \
906      (*(eptr))
907    
908    /* Returns the next uchar, testing for UTF mode, advancing the
909    pointer. */
910    
911    #define RAWUCHARINCTEST(eptr) \
912      (*((eptr)++))
913    
914    /* If the pointer is not at the start of a character, move it back until
915    it is. This is called only in UTF-16 mode - we don't put a test within the
916    macro because almost all calls are already within a block of UTF-16 only
917    code. */
918    
919    #define BACKCHAR(eptr) if ((*eptr & 0xfc00) == 0xdc00) eptr--
920    
921    /* Same as above, just in the other direction. */
922    #define FORWARDCHAR(eptr) if ((*eptr & 0xfc00) == 0xdc00) eptr++
923    
924    /* Same as above, but it allows a fully customizable form. */
925    #define ACROSSCHAR(condition, eptr, action) \
926      if ((condition) && ((eptr) & 0xfc00) == 0xdc00) action
927    
928    #elif defined COMPILE_PCRE32
929    
930    /* These are trivial for the 32-bit library, since all UTF-32 characters fit
931    into one pcre_uchar unit. */
932    #define MAX_VALUE_FOR_SINGLE_CHAR (0x10ffffu)
933    #define HAS_EXTRALEN(c) (0)
934    #define GET_EXTRALEN(c) (0)
935    #define NOT_FIRSTCHAR(c) (0)
936    
937    #define UTF32_MASK (0x1fffffu)
938    
939    /* Base macro to pick up an UTF-32 character out of a uint32 */
940    
941    #define MASKHIGHBITS(c) ((c) & UTF32_MASK)
942    
943    /* Base macro to pick up an UTF-32 character, not advancing the pointer */
944    
945    #define GETUTF32(eptr) (MASKHIGHBITS(*(eptr)))
946    
947    /* Base macro to pick up an UTF-32 character, advancing the pointer */
948    
949    #define GETUTF32INC(eptr) (MASKHIGHBITS(*((eptr)++)))
950    
951    /* Get the next UTF-32 character, not advancing the pointer. This is called when
952    we know we are in UTF-32 mode. */
953    
954    #define GETCHAR(c, eptr) \
955      c = GETUTF32(eptr);
956    
957    /* Get the next UTF-32 character, testing for UTF-32 mode, and not advancing the
958    pointer. */
959    
960    #define GETCHARTEST(c, eptr) \
961      c = (utf ? GETUTF32(eptr) : *(eptr));
962    
963    /* Get the next UTF-32 character, advancing the pointer. This is called when we
964    know we are in UTF-32 mode. */
965    
966    #define GETCHARINC(c, eptr) \
967      c = GETUTF32INC(eptr);
968    
969    /* Get the next character, testing for UTF-32 mode, and advancing the pointer.
970    This is called when we don't know if we are in UTF-32 mode. */
971    
972    #define GETCHARINCTEST(c, eptr) \
973      c = (utf ? GETUTF32INC(eptr) : *((eptr)++));
974    
975    /* Get the next UTF-32 character, not advancing the pointer, not incrementing
976    length (since all UTF-32 is of length 1). This is called when we know we are in
977    UTF-32 mode. */
978    
979    #define GETCHARLEN(c, eptr, len) \
980      GETCHAR(c, eptr)
981    
982    /* Get the next UTF-32character, testing for UTF-32 mode, not advancing the
983    pointer, not incrementing the length (since all UTF-32 is of length 1).
984    This is called when we do not know if we are in UTF-32 mode. */
985    
986    #define GETCHARLENTEST(c, eptr, len) \
987      GETCHARTEST(c, eptr)
988    
989    /* Returns the next uchar, not advancing the pointer. This is called when
990    we know we are in UTF mode. */
991    
992    #define RAWUCHAR(eptr) \
993      (MASKHIGHBITS(*(eptr)))
994    
995    /* Returns the next uchar, advancing the pointer. This is called when
996    we know we are in UTF mode. */
997    
998    #define RAWUCHARINC(eptr) \
999      (MASKHIGHBITS(*((eptr)++)))
1000    
1001    /* Returns the next uchar, testing for UTF mode, and not advancing the
1002    pointer. */
1003    
1004    #define RAWUCHARTEST(eptr) \
1005      (utf ? (MASKHIGHBITS(*(eptr))) : *(eptr))
1006    
1007    /* Returns the next uchar, testing for UTF mode, advancing the
1008    pointer. */
1009    
1010    #define RAWUCHARINCTEST(eptr) \
1011      (utf ? (MASKHIGHBITS(*((eptr)++))) : *((eptr)++))
1012    
1013    /* If the pointer is not at the start of a character, move it back until
1014    it is. This is called only in UTF-32 mode - we don't put a test within the
1015    macro because almost all calls are already within a block of UTF-32 only
1016    code.
1017    These are all no-ops since all UTF-32 characters fit into one pcre_uchar. */
1018    
1019    #define BACKCHAR(eptr) do { } while (0)
1020    
1021    /* Same as above, just in the other direction. */
1022    #define FORWARDCHAR(eptr) do { } while (0)
1023    
1024    /* Same as above, but it allows a fully customizable form. */
1025    #define ACROSSCHAR(condition, eptr, action) do { } while (0)
1026    
1027    #else
1028    #error Unsupported compiling mode
1029    #endif /* COMPILE_PCRE[8|16|32] */
1030    
1031    #endif  /* SUPPORT_UTF */
1032    
1033    /* Tests for Unicode horizontal and vertical whitespace characters must check a
1034    number of different values. Using a switch statement for this generates the
1035    fastest code (no loop, no memory access), and there are several places in the
1036    interpreter code where this happens. In order to ensure that all the case lists
1037    remain in step, we use macros so that there is only one place where the lists
1038    are defined.
1039    
1040    These values are also required as lists in pcre_compile.c when processing \h,
1041    \H, \v and \V in a character class. The lists are defined in pcre_tables.c, but
1042    macros that define the values are here so that all the definitions are
1043    together. The lists must be in ascending character order, terminated by
1044    NOTACHAR (which is 0xffffffff).
1045    
1046    Any changes should ensure that the various macros are kept in step with each
1047    other. NOTE: The values also appear in pcre_jit_compile.c. */
1048    
1049    /* ------ ASCII/Unicode environments ------ */
1050    
1051    #ifndef EBCDIC
1052    
1053    #define HSPACE_LIST \
1054      CHAR_HT, CHAR_SPACE, 0xa0, \
1055      0x1680, 0x180e, 0x2000, 0x2001, 0x2002, 0x2003, 0x2004, 0x2005, \
1056      0x2006, 0x2007, 0x2008, 0x2009, 0x200A, 0x202f, 0x205f, 0x3000, \
1057      NOTACHAR
1058    
1059    #define HSPACE_MULTIBYTE_CASES \
1060      case 0x1680:  /* OGHAM SPACE MARK */ \
1061      case 0x180e:  /* MONGOLIAN VOWEL SEPARATOR */ \
1062      case 0x2000:  /* EN QUAD */ \
1063      case 0x2001:  /* EM QUAD */ \
1064      case 0x2002:  /* EN SPACE */ \
1065      case 0x2003:  /* EM SPACE */ \
1066      case 0x2004:  /* THREE-PER-EM SPACE */ \
1067      case 0x2005:  /* FOUR-PER-EM SPACE */ \
1068      case 0x2006:  /* SIX-PER-EM SPACE */ \
1069      case 0x2007:  /* FIGURE SPACE */ \
1070      case 0x2008:  /* PUNCTUATION SPACE */ \
1071      case 0x2009:  /* THIN SPACE */ \
1072      case 0x200A:  /* HAIR SPACE */ \
1073      case 0x202f:  /* NARROW NO-BREAK SPACE */ \
1074      case 0x205f:  /* MEDIUM MATHEMATICAL SPACE */ \
1075      case 0x3000   /* IDEOGRAPHIC SPACE */
1076    
1077    #define HSPACE_BYTE_CASES \
1078      case CHAR_HT: \
1079      case CHAR_SPACE: \
1080      case 0xa0     /* NBSP */
1081    
1082    #define HSPACE_CASES \
1083      HSPACE_BYTE_CASES: \
1084      HSPACE_MULTIBYTE_CASES
1085    
1086    #define VSPACE_LIST \
1087      CHAR_LF, CHAR_VT, CHAR_FF, CHAR_CR, CHAR_NEL, 0x2028, 0x2029, NOTACHAR
1088    
1089    #define VSPACE_MULTIBYTE_CASES \
1090      case 0x2028:    /* LINE SEPARATOR */ \
1091      case 0x2029     /* PARAGRAPH SEPARATOR */
1092    
1093    #define VSPACE_BYTE_CASES \
1094      case CHAR_LF: \
1095      case CHAR_VT: \
1096      case CHAR_FF: \
1097      case CHAR_CR: \
1098      case CHAR_NEL
1099    
1100    #define VSPACE_CASES \
1101      VSPACE_BYTE_CASES: \
1102      VSPACE_MULTIBYTE_CASES
1103    
1104    /* ------ EBCDIC environments ------ */
1105    
1106    #else
1107    #define HSPACE_LIST CHAR_HT, CHAR_SPACE
1108    
1109    #define HSPACE_BYTE_CASES \
1110      case CHAR_HT: \
1111      case CHAR_SPACE
1112    
1113    #define HSPACE_CASES HSPACE_BYTE_CASES
1114    
1115    #ifdef EBCDIC_NL25
1116    #define VSPACE_LIST \
1117      CHAR_VT, CHAR_FF, CHAR_CR, CHAR_NEL, CHAR_LF, NOTACHAR
1118    #else
1119    #define VSPACE_LIST \
1120      CHAR_VT, CHAR_FF, CHAR_CR, CHAR_LF, CHAR_NEL, NOTACHAR
1121    #endif
1122    
1123    #define VSPACE_BYTE_CASES \
1124      case CHAR_LF: \
1125      case CHAR_VT: \
1126      case CHAR_FF: \
1127      case CHAR_CR: \
1128      case CHAR_NEL
1129    
1130    #define VSPACE_CASES VSPACE_BYTE_CASES
1131    #endif  /* EBCDIC */
1132    
1133    /* ------ End of whitespace macros ------ */
1134    
 /* These are the public options that can change during matching. */  
1135    
 #define PCRE_IMS (PCRE_CASELESS|PCRE_MULTILINE|PCRE_DOTALL)  
1136    
1137  /* Private flags containing information about the compiled regex. They used to  /* Private flags containing information about the compiled regex. They used to
1138  live at the top end of the options word, but that got almost full, so now they  live at the top end of the options word, but that got almost full, so now they
# Line 592  are in a 16-bit flags word. From release Line 1140  are in a 16-bit flags word. From release
1140  the restrictions on partial matching have been lifted. It remains for backwards  the restrictions on partial matching have been lifted. It remains for backwards
1141  compatibility. */  compatibility. */
1142    
1143  #define PCRE_NOPARTIAL     0x0001  /* can't use partial with this regex */  #define PCRE_MODE8         0x0001  /* compiled in 8 bit mode */
1144  #define PCRE_FIRSTSET      0x0002  /* first_byte is set */  #define PCRE_MODE16        0x0002  /* compiled in 16 bit mode */
1145  #define PCRE_REQCHSET      0x0004  /* req_byte is set */  #define PCRE_MODE32        0x0004  /* compiled in 32 bit mode */
1146  #define PCRE_STARTLINE     0x0008  /* start after \n for multiline */  #define PCRE_FIRSTSET      0x0010  /* first_char is set */
1147  #define PCRE_JCHANGED      0x0010  /* j option used in regex */  #define PCRE_FCH_CASELESS  0x0020  /* caseless first char */
1148  #define PCRE_HASCRORLF     0x0020  /* explicit \r or \n in pattern */  #define PCRE_REQCHSET      0x0040  /* req_byte is set */
1149    #define PCRE_RCH_CASELESS  0x0080  /* caseless requested char */
1150    #define PCRE_STARTLINE     0x0100  /* start after \n for multiline */
1151    #define PCRE_NOPARTIAL     0x0200  /* can't use partial with this regex */
1152    #define PCRE_JCHANGED      0x0400  /* j option used in regex */
1153    #define PCRE_HASCRORLF     0x0800  /* explicit \r or \n in pattern */
1154    #define PCRE_HASTHEN       0x1000  /* pattern contains (*THEN) */
1155    
1156    #if defined COMPILE_PCRE8
1157    #define PCRE_MODE          PCRE_MODE8
1158    #elif defined COMPILE_PCRE16
1159    #define PCRE_MODE          PCRE_MODE16
1160    #elif defined COMPILE_PCRE32
1161    #define PCRE_MODE          PCRE_MODE32
1162    #endif
1163    #define PCRE_MODE_MASK     (PCRE_MODE8 | PCRE_MODE16 | PCRE_MODE32)
1164    
1165  /* Options for the "extra" block produced by pcre_study(). */  /* Flags for the "extra" block produced by pcre_study(). */
1166    
1167  #define PCRE_STUDY_MAPPED   0x01     /* a map of starting chars exists */  #define PCRE_STUDY_MAPPED  0x0001  /* a map of starting chars exists */
1168  #define PCRE_STUDY_MINLEN   0x02     /* a minimum length field exists */  #define PCRE_STUDY_MINLEN  0x0002  /* a minimum length field exists */
1169    
1170  /* Masks for identifying the public options that are permitted at compile  /* Masks for identifying the public options that are permitted at compile
1171  time, run time, or study time, respectively. */  time, run time, or study time, respectively. */
# Line 628  time, run time, or study time, respectiv Line 1191  time, run time, or study time, respectiv
1191     PCRE_DFA_RESTART|PCRE_NEWLINE_BITS|PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE| \     PCRE_DFA_RESTART|PCRE_NEWLINE_BITS|PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE| \
1192     PCRE_NO_START_OPTIMIZE)     PCRE_NO_START_OPTIMIZE)
1193    
1194  #define PUBLIC_STUDY_OPTIONS 0   /* None defined */  #define PUBLIC_STUDY_OPTIONS \
1195       (PCRE_STUDY_JIT_COMPILE|PCRE_STUDY_JIT_PARTIAL_SOFT_COMPILE| \
1196        PCRE_STUDY_JIT_PARTIAL_HARD_COMPILE|PCRE_STUDY_EXTRA_NEEDED)
1197    
1198    #define PUBLIC_JIT_EXEC_OPTIONS \
1199       (PCRE_NO_UTF8_CHECK|PCRE_NOTBOL|PCRE_NOTEOL|PCRE_NOTEMPTY|\
1200        PCRE_NOTEMPTY_ATSTART|PCRE_PARTIAL_SOFT|PCRE_PARTIAL_HARD)
1201    
1202  /* Magic number to provide a small check against being handed junk. Also used  /* Magic number to provide a small check against being handed junk. */
 to detect whether a pattern was compiled on a host of different endianness. */  
1203    
1204  #define MAGIC_NUMBER  0x50435245UL   /* 'PCRE' */  #define MAGIC_NUMBER  0x50435245UL   /* 'PCRE' */
1205    
1206  /* Negative values for the firstchar and reqchar variables */  /* This variable is used to detect a loaded regular expression
1207    in different endianness. */
1208    
1209  #define REQ_UNSET (-2)  #define REVERSED_MAGIC_NUMBER  0x45524350UL   /* 'ERCP' */
 #define REQ_NONE  (-1)  
1210    
1211  /* The maximum remaining length of subject we are prepared to search for a  /* The maximum remaining length of subject we are prepared to search for a
1212  req_byte match. */  req_byte match. */
1213    
1214  #define REQ_BYTE_MAX 1000  #define REQ_BYTE_MAX 1000
1215    
 /* Flags added to firstbyte or reqbyte; a "non-literal" item is either a  
 variable-length repeat, or a anything other than literal characters. */  
   
 #define REQ_CASELESS 0x0100    /* indicates caselessness */  
 #define REQ_VARY     0x0200    /* reqbyte followed non-literal item */  
   
1216  /* Miscellaneous definitions. The #ifndef is to pacify compiler warnings in  /* Miscellaneous definitions. The #ifndef is to pacify compiler warnings in
1217  environments where these macros are defined elsewhere. Unfortunately, there  environments where these macros are defined elsewhere. Unfortunately, there
1218  is no way to do the same for the typedef. */  is no way to do the same for the typedef. */
# Line 679  for) in a minority area (EBCDIC platform Line 1241  for) in a minority area (EBCDIC platform
1241  application that did need both could compile two versions of the library, using  application that did need both could compile two versions of the library, using
1242  macros to give the functions distinct names. */  macros to give the functions distinct names. */
1243    
1244  #ifndef SUPPORT_UTF8  #ifndef SUPPORT_UTF
1245    
1246  /* UTF-8 support is not enabled; use the platform-dependent character literals  /* UTF-8 support is not enabled; use the platform-dependent character literals
1247  so that PCRE works on both ASCII and EBCDIC platforms, in non-UTF-mode only. */  so that PCRE works in both ASCII and EBCDIC environments, but only in non-UTF
1248    mode. Newline characters are problematic in EBCDIC. Though it has CR and LF
1249    characters, a common practice has been to use its NL (0x15) character as the
1250    line terminator in C-like processing environments. However, sometimes the LF
1251    (0x25) character is used instead, according to this Unicode document:
1252    
1253    http://unicode.org/standard/reports/tr13/tr13-5.html
1254    
1255    PCRE defaults EBCDIC NL to 0x15, but has a build-time option to select 0x25
1256    instead. Whichever is *not* chosen is defined as NEL.
1257    
1258    In both ASCII and EBCDIC environments, CHAR_NL and CHAR_LF are synonyms for the
1259    same code point. */
1260    
1261    #ifdef EBCDIC
1262    
1263    #ifndef EBCDIC_NL25
1264    #define CHAR_NL                     '\x15'
1265    #define CHAR_NEL                    '\x25'
1266    #define STR_NL                      "\x15"
1267    #define STR_NEL                     "\x25"
1268    #else
1269    #define CHAR_NL                     '\x25'
1270    #define CHAR_NEL                    '\x15'
1271    #define STR_NL                      "\x25"
1272    #define STR_NEL                     "\x15"
1273    #endif
1274    
1275    #define CHAR_LF                     CHAR_NL
1276    #define STR_LF                      STR_NL
1277    
1278    #define CHAR_ESC                    '\047'
1279    #define CHAR_DEL                    '\007'
1280    #define STR_ESC                     "\047"
1281    #define STR_DEL                     "\007"
1282    
1283    #else  /* Not EBCDIC */
1284    
1285    /* In ASCII/Unicode, linefeed is '\n' and we equate this to NL for
1286    compatibility. NEL is the Unicode newline character; make sure it is
1287    a positive value. */
1288    
1289    #define CHAR_LF                     '\n'
1290    #define CHAR_NL                     CHAR_LF
1291    #define CHAR_NEL                    ((unsigned char)'\x85')
1292    #define CHAR_ESC                    '\033'
1293    #define CHAR_DEL                    '\177'
1294    
1295    #define STR_LF                      "\n"
1296    #define STR_NL                      STR_LF
1297    #define STR_NEL                     "\x85"
1298    #define STR_ESC                     "\033"
1299    #define STR_DEL                     "\177"
1300    
1301    #endif  /* EBCDIC */
1302    
1303    /* The remaining definitions work in both environments. */
1304    
1305    #define CHAR_NULL                   '\0'
1306  #define CHAR_HT                     '\t'  #define CHAR_HT                     '\t'
1307  #define CHAR_VT                     '\v'  #define CHAR_VT                     '\v'
1308  #define CHAR_FF                     '\f'  #define CHAR_FF                     '\f'
1309  #define CHAR_CR                     '\r'  #define CHAR_CR                     '\r'
 #define CHAR_NL                     '\n'  
1310  #define CHAR_BS                     '\b'  #define CHAR_BS                     '\b'
1311  #define CHAR_BEL                    '\a'  #define CHAR_BEL                    '\a'
 #ifdef EBCDIC  
 #define CHAR_ESC                    '\047'  
 #define CHAR_DEL                    '\007'  
 #else  
 #define CHAR_ESC                    '\033'  
 #define CHAR_DEL                    '\177'  
 #endif  
1312    
1313  #define CHAR_SPACE                  ' '  #define CHAR_SPACE                  ' '
1314  #define CHAR_EXCLAMATION_MARK       '!'  #define CHAR_EXCLAMATION_MARK       '!'
# Line 799  so that PCRE works on both ASCII and EBC Line 1410  so that PCRE works on both ASCII and EBC
1410  #define STR_VT                      "\v"  #define STR_VT                      "\v"
1411  #define STR_FF                      "\f"  #define STR_FF                      "\f"
1412  #define STR_CR                      "\r"  #define STR_CR                      "\r"
 #define STR_NL                      "\n"  
1413  #define STR_BS                      "\b"  #define STR_BS                      "\b"
1414  #define STR_BEL                     "\a"  #define STR_BEL                     "\a"
 #ifdef EBCDIC  
 #define STR_ESC                     "\047"  
 #define STR_DEL                     "\007"  
 #else  
 #define STR_ESC                     "\033"  
 #define STR_DEL                     "\177"  
 #endif  
1415    
1416  #define STR_SPACE                   " "  #define STR_SPACE                   " "
1417  #define STR_EXCLAMATION_MARK        "!"  #define STR_EXCLAMATION_MARK        "!"
# Line 939  so that PCRE works on both ASCII and EBC Line 1542  so that PCRE works on both ASCII and EBC
1542  #define STRING_ANYCRLF_RIGHTPAR        "ANYCRLF)"  #define STRING_ANYCRLF_RIGHTPAR        "ANYCRLF)"
1543  #define STRING_BSR_ANYCRLF_RIGHTPAR    "BSR_ANYCRLF)"  #define STRING_BSR_ANYCRLF_RIGHTPAR    "BSR_ANYCRLF)"
1544  #define STRING_BSR_UNICODE_RIGHTPAR    "BSR_UNICODE)"  #define STRING_BSR_UNICODE_RIGHTPAR    "BSR_UNICODE)"
1545  #define STRING_UTF8_RIGHTPAR           "UTF8)"  #ifdef COMPILE_PCRE8
1546    #define STRING_UTF_RIGHTPAR            "UTF8)"
1547    #endif
1548    #ifdef COMPILE_PCRE16
1549    #define STRING_UTF_RIGHTPAR            "UTF16)"
1550    #endif
1551    #ifdef COMPILE_PCRE32
1552    #define STRING_UTF_RIGHTPAR            "UTF32)"
1553    #endif
1554  #define STRING_UCP_RIGHTPAR            "UCP)"  #define STRING_UCP_RIGHTPAR            "UCP)"
1555  #define STRING_NO_START_OPT_RIGHTPAR   "NO_START_OPT)"  #define STRING_NO_START_OPT_RIGHTPAR   "NO_START_OPT)"
1556    
1557  #else  /* SUPPORT_UTF8 */  #else  /* SUPPORT_UTF */
1558    
1559  /* UTF-8 support is enabled; always use UTF-8 (=ASCII) character codes. This  /* UTF-8 support is enabled; always use UTF-8 (=ASCII) character codes. This
1560  works in both modes non-EBCDIC platforms, and on EBCDIC platforms in UTF-8 mode  works in both modes non-EBCDIC platforms, and on EBCDIC platforms in UTF-8 mode
# Line 953  only. */ Line 1564  only. */
1564  #define CHAR_VT                     '\013'  #define CHAR_VT                     '\013'
1565  #define CHAR_FF                     '\014'  #define CHAR_FF                     '\014'
1566  #define CHAR_CR                     '\015'  #define CHAR_CR                     '\015'
1567  #define CHAR_NL                     '\012'  #define CHAR_LF                     '\012'
1568    #define CHAR_NL                     CHAR_LF
1569    #define CHAR_NEL                    ((unsigned char)'\x85')
1570  #define CHAR_BS                     '\010'  #define CHAR_BS                     '\010'
1571  #define CHAR_BEL                    '\007'  #define CHAR_BEL                    '\007'
1572  #define CHAR_ESC                    '\033'  #define CHAR_ESC                    '\033'
1573  #define CHAR_DEL                    '\177'  #define CHAR_DEL                    '\177'
1574    
1575    #define CHAR_NULL                   '\0'
1576  #define CHAR_SPACE                  '\040'  #define CHAR_SPACE                  '\040'
1577  #define CHAR_EXCLAMATION_MARK       '\041'  #define CHAR_EXCLAMATION_MARK       '\041'
1578  #define CHAR_QUOTATION_MARK         '\042'  #define CHAR_QUOTATION_MARK         '\042'
# Line 1194  only. */ Line 1808  only. */
1808  #define STRING_ANYCRLF_RIGHTPAR        STR_A STR_N STR_Y STR_C STR_R STR_L STR_F STR_RIGHT_PARENTHESIS  #define STRING_ANYCRLF_RIGHTPAR        STR_A STR_N STR_Y STR_C STR_R STR_L STR_F STR_RIGHT_PARENTHESIS
1809  #define STRING_BSR_ANYCRLF_RIGHTPAR    STR_B STR_S STR_R STR_UNDERSCORE STR_A STR_N STR_Y STR_C STR_R STR_L STR_F STR_RIGHT_PARENTHESIS  #define STRING_BSR_ANYCRLF_RIGHTPAR    STR_B STR_S STR_R STR_UNDERSCORE STR_A STR_N STR_Y STR_C STR_R STR_L STR_F STR_RIGHT_PARENTHESIS
1810  #define STRING_BSR_UNICODE_RIGHTPAR    STR_B STR_S STR_R STR_UNDERSCORE STR_U STR_N STR_I STR_C STR_O STR_D STR_E STR_RIGHT_PARENTHESIS  #define STRING_BSR_UNICODE_RIGHTPAR    STR_B STR_S STR_R STR_UNDERSCORE STR_U STR_N STR_I STR_C STR_O STR_D STR_E STR_RIGHT_PARENTHESIS
1811  #define STRING_UTF8_RIGHTPAR           STR_U STR_T STR_F STR_8 STR_RIGHT_PARENTHESIS  #ifdef COMPILE_PCRE8
1812    #define STRING_UTF_RIGHTPAR            STR_U STR_T STR_F STR_8 STR_RIGHT_PARENTHESIS
1813    #endif
1814    #ifdef COMPILE_PCRE16
1815    #define STRING_UTF_RIGHTPAR            STR_U STR_T STR_F STR_1 STR_6 STR_RIGHT_PARENTHESIS
1816    #endif
1817    #ifdef COMPILE_PCRE32
1818    #define STRING_UTF_RIGHTPAR            STR_U STR_T STR_F STR_3 STR_2 STR_RIGHT_PARENTHESIS
1819    #endif
1820  #define STRING_UCP_RIGHTPAR            STR_U STR_C STR_P STR_RIGHT_PARENTHESIS  #define STRING_UCP_RIGHTPAR            STR_U STR_C STR_P STR_RIGHT_PARENTHESIS
1821  #define STRING_NO_START_OPT_RIGHTPAR   STR_N STR_O STR_UNDERSCORE STR_S STR_T STR_A STR_R STR_T STR_UNDERSCORE STR_O STR_P STR_T STR_RIGHT_PARENTHESIS  #define STRING_NO_START_OPT_RIGHTPAR   STR_N STR_O STR_UNDERSCORE STR_S STR_T STR_A STR_R STR_T STR_UNDERSCORE STR_O STR_P STR_T STR_RIGHT_PARENTHESIS
1822    
1823  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF */
1824    
1825  /* Escape items that are just an encoding of a particular data value. */  /* Escape items that are just an encoding of a particular data value. */
1826    
# Line 1211  only. */ Line 1833  only. */
1833  #endif  #endif
1834    
1835  #ifndef ESC_n  #ifndef ESC_n
1836  #define ESC_n CHAR_NL  #define ESC_n CHAR_LF
1837  #endif  #endif
1838    
1839  #ifndef ESC_r  #ifndef ESC_r
# Line 1236  only. */ Line 1858  only. */
1858  #define PT_SPACE      6    /* Perl space - Z plus 9,10,12,13 */  #define PT_SPACE      6    /* Perl space - Z plus 9,10,12,13 */
1859  #define PT_PXSPACE    7    /* POSIX space - Z plus 9,10,11,12,13 */  #define PT_PXSPACE    7    /* POSIX space - Z plus 9,10,11,12,13 */
1860  #define PT_WORD       8    /* Word - L plus N plus underscore */  #define PT_WORD       8    /* Word - L plus N plus underscore */
1861    #define PT_CLIST      9    /* Pseudo-property: match character list */
1862    
1863  /* Flag bits and data types for the extended class (OP_XCLASS) for classes that  /* Flag bits and data types for the extended class (OP_XCLASS) for classes that
1864  contain UTF-8 characters with values greater than 255. */  contain characters with values greater than 255. */
1865    
1866  #define XCL_NOT    0x01    /* Flag: this is a negative class */  #define XCL_NOT    0x01    /* Flag: this is a negative class */
1867  #define XCL_MAP    0x02    /* Flag: a 32-byte map is present */  #define XCL_MAP    0x02    /* Flag: a 32-byte map is present */
# Line 1251  contain UTF-8 characters with values gre Line 1874  contain UTF-8 characters with values gre
1874    
1875  /* These are escaped items that aren't just an encoding of a particular data  /* These are escaped items that aren't just an encoding of a particular data
1876  value such as \n. They must have non-zero values, as check_escape() returns  value such as \n. They must have non-zero values, as check_escape() returns
1877  their negation. Also, they must appear in the same order as in the opcode  0 for a data character.  Also, they must appear in the same order as in the opcode
1878  definitions below, up to ESC_z. There's a dummy for OP_ALLANY because it  definitions below, up to ESC_z. There's a dummy for OP_ALLANY because it
1879  corresponds to "." in DOTALL mode rather than an escape sequence. It is also  corresponds to "." in DOTALL mode rather than an escape sequence. It is also
1880  used for [^] in JavaScript compatibility mode. In non-DOTALL mode, "." behaves  used for [^] in JavaScript compatibility mode, and for \C in non-utf mode. In
1881  like \N.  non-DOTALL mode, "." behaves like \N.
1882    
1883  The special values ESC_DU, ESC_du, etc. are used instead of ESC_D, ESC_d, etc.  The special values ESC_DU, ESC_du, etc. are used instead of ESC_D, ESC_d, etc.
1884  when PCRE_UCP is set, when replacement of \d etc by \p sequences is required.  when PCRE_UCP is set and replacement of \d etc by \p sequences is required.
1885  They must be contiguous, and remain in order so that the replacements can be  They must be contiguous, and remain in order so that the replacements can be
1886  looked up from a table.  looked up from a table.
1887    
1888  The final escape must be ESC_REF as subsequent values are used for  Negative numbers are used to encode a backreference (\1, \2, \3, etc.) in
1889  backreferences (\1, \2, \3, etc). There are two tests in the code for an escape  check_escape(). There are two tests in the code for an escape
1890  greater than ESC_b and less than ESC_Z to detect the types that may be  greater than ESC_b and less than ESC_Z to detect the types that may be
1891  repeated. These are the types that consume characters. If any new escapes are  repeated. These are the types that consume characters. If any new escapes are
1892  put in between that don't consume a character, that code will have to change.  put in between that don't consume a character, that code will have to change.
# Line 1273  enum { ESC_A = 1, ESC_G, ESC_K, ESC_B, E Line 1896  enum { ESC_A = 1, ESC_G, ESC_K, ESC_B, E
1896         ESC_W, ESC_w, ESC_N, ESC_dum, ESC_C, ESC_P, ESC_p, ESC_R, ESC_H,         ESC_W, ESC_w, ESC_N, ESC_dum, ESC_C, ESC_P, ESC_p, ESC_R, ESC_H,
1897         ESC_h, ESC_V, ESC_v, ESC_X, ESC_Z, ESC_z,         ESC_h, ESC_V, ESC_v, ESC_X, ESC_Z, ESC_z,
1898         ESC_E, ESC_Q, ESC_g, ESC_k,         ESC_E, ESC_Q, ESC_g, ESC_k,
1899         ESC_DU, ESC_du, ESC_SU, ESC_su, ESC_WU, ESC_wu,         ESC_DU, ESC_du, ESC_SU, ESC_su, ESC_WU, ESC_wu };
        ESC_REF };  
1900    
1901  /* Opcode table: Starting from 1 (i.e. after OP_END), the values up to  /* Opcode table: Starting from 1 (i.e. after OP_END), the values up to
1902  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.
# Line 1299  enum { Line 1921  enum {
1921    OP_WHITESPACE,         /*  9 \s */    OP_WHITESPACE,         /*  9 \s */
1922    OP_NOT_WORDCHAR,       /* 10 \W */    OP_NOT_WORDCHAR,       /* 10 \W */
1923    OP_WORDCHAR,           /* 11 \w */    OP_WORDCHAR,           /* 11 \w */
1924    OP_ANY,            /* 12 Match any character except newline */  
1925      OP_ANY,            /* 12 Match any character except newline (\N) */
1926    OP_ALLANY,         /* 13 Match any character */    OP_ALLANY,         /* 13 Match any character */
1927    OP_ANYBYTE,        /* 14 Match any byte (\C); different to OP_ANY for UTF-8 */    OP_ANYBYTE,        /* 14 Match any byte (\C); different to OP_ANY for UTF-8 */
1928    OP_NOTPROP,        /* 15 \P (not Unicode property) */    OP_NOTPROP,        /* 15 \P (not Unicode property) */
# Line 1310  enum { Line 1933  enum {
1933    OP_NOT_VSPACE,     /* 20 \V (not vertical whitespace) */    OP_NOT_VSPACE,     /* 20 \V (not vertical whitespace) */
1934    OP_VSPACE,         /* 21 \v (vertical whitespace) */    OP_VSPACE,         /* 21 \v (vertical whitespace) */
1935    OP_EXTUNI,         /* 22 \X (extended Unicode sequence */    OP_EXTUNI,         /* 22 \X (extended Unicode sequence */
1936    OP_EODN,           /* 23 End of data or \n at end of data: \Z. */    OP_EODN,           /* 23 End of data or \n at end of data (\Z) */
1937    OP_EOD,            /* 24 End of data: \z */    OP_EOD,            /* 24 End of data (\z) */
1938    
1939    OP_OPT,            /* 25 Set runtime options */    OP_CIRC,           /* 25 Start of line - not multiline */
1940    OP_CIRC,           /* 26 Start of line - varies with multiline switch */    OP_CIRCM,          /* 26 Start of line - multiline */
1941    OP_DOLL,           /* 27 End of line - varies with multiline switch */    OP_DOLL,           /* 27 End of line - not multiline */
1942    OP_CHAR,           /* 28 Match one character, casefully */    OP_DOLLM,          /* 28 End of line - multiline */
1943    OP_CHARNC,         /* 29 Match one character, caselessly */    OP_CHAR,           /* 29 Match one character, casefully */
1944    OP_NOT,            /* 30 Match one character, not the following one */    OP_CHARI,          /* 30 Match one character, caselessly */
1945      OP_NOT,            /* 31 Match one character, not the given one, casefully */
1946    OP_STAR,           /* 31 The maximizing and minimizing versions of */    OP_NOTI,           /* 32 Match one character, not the given one, caselessly */
1947    OP_MINSTAR,        /* 32 these six opcodes must come in pairs, with */  
1948    OP_PLUS,           /* 33 the minimizing one second. */    /* The following sets of 13 opcodes must always be kept in step because
1949    OP_MINPLUS,        /* 34 This first set applies to single characters.*/    the offset from the first one is used to generate the others. */
1950    OP_QUERY,          /* 35 */  
1951    OP_MINQUERY,       /* 36 */    /**** Single characters, caseful, must precede the caseless ones ****/
1952    
1953    OP_UPTO,           /* 37 From 0 to n matches */    OP_STAR,           /* 33 The maximizing and minimizing versions of */
1954    OP_MINUPTO,        /* 38 */    OP_MINSTAR,        /* 34 these six opcodes must come in pairs, with */
1955    OP_EXACT,          /* 39 Exactly n matches */    OP_PLUS,           /* 35 the minimizing one second. */
1956      OP_MINPLUS,        /* 36 */
1957    OP_POSSTAR,        /* 40 Possessified star */    OP_QUERY,          /* 37 */
1958    OP_POSPLUS,        /* 41 Possessified plus */    OP_MINQUERY,       /* 38 */
1959    OP_POSQUERY,       /* 42 Posesssified query */  
1960    OP_POSUPTO,        /* 43 Possessified upto */    OP_UPTO,           /* 39 From 0 to n matches of one character, caseful*/
1961      OP_MINUPTO,        /* 40 */
1962    OP_NOTSTAR,        /* 44 The maximizing and minimizing versions of */    OP_EXACT,          /* 41 Exactly n matches */
1963    OP_NOTMINSTAR,     /* 45 these six opcodes must come in pairs, with */  
1964    OP_NOTPLUS,        /* 46 the minimizing one second. They must be in */    OP_POSSTAR,        /* 42 Possessified star, caseful */
1965    OP_NOTMINPLUS,     /* 47 exactly the same order as those above. */    OP_POSPLUS,        /* 43 Possessified plus, caseful */
1966    OP_NOTQUERY,       /* 48 This set applies to "not" single characters. */    OP_POSQUERY,       /* 44 Posesssified query, caseful */
1967    OP_NOTMINQUERY,    /* 49 */    OP_POSUPTO,        /* 45 Possessified upto, caseful */
1968    
1969    OP_NOTUPTO,        /* 50 From 0 to n matches */    /**** Single characters, caseless, must follow the caseful ones */
1970    OP_NOTMINUPTO,     /* 51 */  
1971    OP_NOTEXACT,       /* 52 Exactly n matches */    OP_STARI,          /* 46 */
1972      OP_MINSTARI,       /* 47 */
1973    OP_NOTPOSSTAR,     /* 53 Possessified versions */    OP_PLUSI,          /* 48 */
1974    OP_NOTPOSPLUS,     /* 54 */    OP_MINPLUSI,       /* 49 */
1975    OP_NOTPOSQUERY,    /* 55 */    OP_QUERYI,         /* 50 */
1976    OP_NOTPOSUPTO,     /* 56 */    OP_MINQUERYI,      /* 51 */
1977    
1978    OP_TYPESTAR,       /* 57 The maximizing and minimizing versions of */    OP_UPTOI,          /* 52 From 0 to n matches of one character, caseless */
1979    OP_TYPEMINSTAR,    /* 58 these six opcodes must come in pairs, with */    OP_MINUPTOI,       /* 53 */
1980    OP_TYPEPLUS,       /* 59 the minimizing one second. These codes must */    OP_EXACTI,         /* 54 */
1981    OP_TYPEMINPLUS,    /* 60 be in exactly the same order as those above. */  
1982    OP_TYPEQUERY,      /* 61 This set applies to character types such as \d */    OP_POSSTARI,       /* 55 Possessified star, caseless */
1983    OP_TYPEMINQUERY,   /* 62 */    OP_POSPLUSI,       /* 56 Possessified plus, caseless */
1984      OP_POSQUERYI,      /* 57 Posesssified query, caseless */
1985    OP_TYPEUPTO,       /* 63 From 0 to n matches */    OP_POSUPTOI,       /* 58 Possessified upto, caseless */
1986    OP_TYPEMINUPTO,    /* 64 */  
1987    OP_TYPEEXACT,      /* 65 Exactly n matches */    /**** The negated ones must follow the non-negated ones, and match them ****/
1988      /**** Negated single character, caseful; must precede the caseless ones ****/
1989    OP_TYPEPOSSTAR,    /* 66 Possessified versions */  
1990    OP_TYPEPOSPLUS,    /* 67 */    OP_NOTSTAR,        /* 59 The maximizing and minimizing versions of */
1991    OP_TYPEPOSQUERY,   /* 68 */    OP_NOTMINSTAR,     /* 60 these six opcodes must come in pairs, with */
1992    OP_TYPEPOSUPTO,    /* 69 */    OP_NOTPLUS,        /* 61 the minimizing one second. They must be in */
1993      OP_NOTMINPLUS,     /* 62 exactly the same order as those above. */
1994    OP_CRSTAR,         /* 70 The maximizing and minimizing versions of */    OP_NOTQUERY,       /* 63 */
1995    OP_CRMINSTAR,      /* 71 all these opcodes must come in pairs, with */    OP_NOTMINQUERY,    /* 64 */
1996    OP_CRPLUS,         /* 72 the minimizing one second. These codes must */  
1997    OP_CRMINPLUS,      /* 73 be in exactly the same order as those above. */    OP_NOTUPTO,        /* 65 From 0 to n matches, caseful */
1998    OP_CRQUERY,        /* 74 These are for character classes and back refs */    OP_NOTMINUPTO,     /* 66 */
1999    OP_CRMINQUERY,     /* 75 */    OP_NOTEXACT,       /* 67 Exactly n matches */
2000    OP_CRRANGE,        /* 76 These are different to the three sets above. */  
2001    OP_CRMINRANGE,     /* 77 */    OP_NOTPOSSTAR,     /* 68 Possessified versions, caseful */
2002      OP_NOTPOSPLUS,     /* 69 */
2003    OP_CLASS,          /* 78 Match a character class, chars < 256 only */    OP_NOTPOSQUERY,    /* 70 */
2004    OP_NCLASS,         /* 79 Same, but the bitmap was created from a negative    OP_NOTPOSUPTO,     /* 71 */
2005                             class - the difference is relevant only when a UTF-8  
2006                             character > 255 is encountered. */    /**** Negated single character, caseless; must follow the caseful ones ****/
2007    
2008    OP_XCLASS,         /* 80 Extended class for handling UTF-8 chars within the    OP_NOTSTARI,       /* 72 */
2009                             class. This does both positive and negative. */    OP_NOTMINSTARI,    /* 73 */
2010      OP_NOTPLUSI,       /* 74 */
2011    OP_REF,            /* 81 Match a back reference */    OP_NOTMINPLUSI,    /* 75 */
2012    OP_RECURSE,        /* 82 Match a numbered subpattern (possibly recursive) */    OP_NOTQUERYI,      /* 76 */
2013    OP_CALLOUT,        /* 83 Call out to external function if provided */    OP_NOTMINQUERYI,   /* 77 */
2014    
2015    OP_ALT,            /* 84 Start of alternation */    OP_NOTUPTOI,       /* 78 From 0 to n matches, caseless */
2016    OP_KET,            /* 85 End of group that doesn't have an unbounded repeat */    OP_NOTMINUPTOI,    /* 79 */
2017    OP_KETRMAX,        /* 86 These two must remain together and in this */    OP_NOTEXACTI,      /* 80 Exactly n matches */
2018    OP_KETRMIN,        /* 87 order. They are for groups the repeat for ever. */  
2019      OP_NOTPOSSTARI,    /* 81 Possessified versions, caseless */
2020    /* The assertions must come before BRA, CBRA, ONCE, and COND.*/    OP_NOTPOSPLUSI,    /* 82 */
2021      OP_NOTPOSQUERYI,   /* 83 */
2022    OP_ASSERT,         /* 88 Positive lookahead */    OP_NOTPOSUPTOI,    /* 84 */
2023    OP_ASSERT_NOT,     /* 89 Negative lookahead */  
2024    OP_ASSERTBACK,     /* 90 Positive lookbehind */    /**** Character types ****/
2025    OP_ASSERTBACK_NOT, /* 91 Negative lookbehind */  
2026    OP_REVERSE,        /* 92 Move pointer back - used in lookbehind assertions */    OP_TYPESTAR,       /* 85 The maximizing and minimizing versions of */
2027      OP_TYPEMINSTAR,    /* 86 these six opcodes must come in pairs, with */
2028    /* ONCE, BRA, CBRA, and COND must come after the assertions, with ONCE first,    OP_TYPEPLUS,       /* 87 the minimizing one second. These codes must */
2029    as there's a test for >= ONCE for a subpattern that isn't an assertion. */    OP_TYPEMINPLUS,    /* 88 be in exactly the same order as those above. */
2030      OP_TYPEQUERY,      /* 89 */
2031    OP_ONCE,           /* 93 Atomic group */    OP_TYPEMINQUERY,   /* 90 */
2032    OP_BRA,            /* 94 Start of non-capturing bracket */  
2033    OP_CBRA,           /* 95 Start of capturing bracket */    OP_TYPEUPTO,       /* 91 From 0 to n matches */
2034    OP_COND,           /* 96 Conditional group */    OP_TYPEMINUPTO,    /* 92 */
2035      OP_TYPEEXACT,      /* 93 Exactly n matches */
2036    
2037      OP_TYPEPOSSTAR,    /* 94 Possessified versions */
2038      OP_TYPEPOSPLUS,    /* 95 */
2039      OP_TYPEPOSQUERY,   /* 96 */
2040      OP_TYPEPOSUPTO,    /* 97 */
2041    
2042      /* These are used for character classes and back references; only the
2043      first six are the same as the sets above. */
2044    
2045      OP_CRSTAR,         /* 98 The maximizing and minimizing versions of */
2046      OP_CRMINSTAR,      /* 99 all these opcodes must come in pairs, with */
2047      OP_CRPLUS,         /* 100 the minimizing one second. These codes must */
2048      OP_CRMINPLUS,      /* 101 be in exactly the same order as those above. */
2049      OP_CRQUERY,        /* 102 */
2050      OP_CRMINQUERY,     /* 103 */
2051    
2052      OP_CRRANGE,        /* 104 These are different to the three sets above. */
2053      OP_CRMINRANGE,     /* 105 */
2054    
2055      /* End of quantifier opcodes */
2056    
2057      OP_CLASS,          /* 106 Match a character class, chars < 256 only */
2058      OP_NCLASS,         /* 107 Same, but the bitmap was created from a negative
2059                                  class - the difference is relevant only when a
2060                                  character > 255 is encountered. */
2061      OP_XCLASS,         /* 108 Extended class for handling > 255 chars within the
2062                                  class. This does both positive and negative. */
2063      OP_REF,            /* 109 Match a back reference, casefully */
2064      OP_REFI,           /* 110 Match a back reference, caselessly */
2065      OP_RECURSE,        /* 111 Match a numbered subpattern (possibly recursive) */
2066      OP_CALLOUT,        /* 112 Call out to external function if provided */
2067    
2068      OP_ALT,            /* 113 Start of alternation */
2069      OP_KET,            /* 114 End of group that doesn't have an unbounded repeat */
2070      OP_KETRMAX,        /* 115 These two must remain together and in this */
2071      OP_KETRMIN,        /* 116 order. They are for groups the repeat for ever. */
2072      OP_KETRPOS,        /* 117 Possessive unlimited repeat. */
2073    
2074      /* The assertions must come before BRA, CBRA, ONCE, and COND, and the four
2075      asserts must remain in order. */
2076    
2077      OP_REVERSE,        /* 118 Move pointer back - used in lookbehind assertions */
2078      OP_ASSERT,         /* 119 Positive lookahead */
2079      OP_ASSERT_NOT,     /* 120 Negative lookahead */
2080      OP_ASSERTBACK,     /* 121 Positive lookbehind */
2081      OP_ASSERTBACK_NOT, /* 122 Negative lookbehind */
2082    
2083      /* ONCE, ONCE_NC, BRA, BRAPOS, CBRA, CBRAPOS, and COND must come immediately
2084      after the assertions, with ONCE first, as there's a test for >= ONCE for a
2085      subpattern that isn't an assertion. The POS versions must immediately follow
2086      the non-POS versions in each case. */
2087    
2088      OP_ONCE,           /* 123 Atomic group, contains captures */
2089      OP_ONCE_NC,        /* 124 Atomic group containing no captures */
2090      OP_BRA,            /* 125 Start of non-capturing bracket */
2091      OP_BRAPOS,         /* 126 Ditto, with unlimited, possessive repeat */
2092      OP_CBRA,           /* 127 Start of capturing bracket */
2093      OP_CBRAPOS,        /* 128 Ditto, with unlimited, possessive repeat */
2094      OP_COND,           /* 129 Conditional group */
2095    
2096    /* These three must follow the previous three, in the same order. There's a    /* These five must follow the previous five, in the same order. There's a
2097    check for >= SBRA to distinguish the two sets. */    check for >= SBRA to distinguish the two sets. */
2098    
2099    OP_SBRA,           /* 97 Start of non-capturing bracket, check empty  */    OP_SBRA,           /* 130 Start of non-capturing bracket, check empty  */
2100    OP_SCBRA,          /* 98 Start of capturing bracket, check empty */    OP_SBRAPOS,        /* 131 Ditto, with unlimited, possessive repeat */
2101    OP_SCOND,          /* 99 Conditional group, check empty */    OP_SCBRA,          /* 132 Start of capturing bracket, check empty */
2102      OP_SCBRAPOS,       /* 133 Ditto, with unlimited, possessive repeat */
2103      OP_SCOND,          /* 134 Conditional group, check empty */
2104    
2105    /* The next two pairs must (respectively) be kept together. */    /* The next two pairs must (respectively) be kept together. */
2106    
2107    OP_CREF,           /* 100 Used to hold a capture number as condition */    OP_CREF,           /* 135 Used to hold a capture number as condition */
2108    OP_NCREF,          /* 101 Same, but generaged by a name reference*/    OP_NCREF,          /* 136 Same, but generated by a name reference*/
2109    OP_RREF,           /* 102 Used to hold a recursion number as condition */    OP_RREF,           /* 137 Used to hold a recursion number as condition */
2110    OP_NRREF,          /* 103 Same, but generaged by a name reference*/    OP_NRREF,          /* 138 Same, but generated by a name reference*/
2111    OP_DEF,            /* 104 The DEFINE condition */    OP_DEF,            /* 139 The DEFINE condition */
2112    
2113    OP_BRAZERO,        /* 105 These two must remain together and in this */    OP_BRAZERO,        /* 140 These two must remain together and in this */
2114    OP_BRAMINZERO,     /* 106 order. */    OP_BRAMINZERO,     /* 141 order. */
2115      OP_BRAPOSZERO,     /* 142 */
2116    
2117    /* These are backtracking control verbs */    /* These are backtracking control verbs */
2118    
2119    OP_MARK,           /* 107 always has an argument */    OP_MARK,           /* 143 always has an argument */
2120    OP_PRUNE,          /* 108 */    OP_PRUNE,          /* 144 */
2121    OP_PRUNE_ARG,      /* 109 same, but with argument */    OP_PRUNE_ARG,      /* 145 same, but with argument */
2122    OP_SKIP,           /* 110 */    OP_SKIP,           /* 146 */
2123    OP_SKIP_ARG,       /* 111 same, but with argument */    OP_SKIP_ARG,       /* 147 same, but with argument */
2124    OP_THEN,           /* 112 */    OP_THEN,           /* 148 */
2125    OP_THEN_ARG,       /* 113 same, but with argument */    OP_THEN_ARG,       /* 149 same, but with argument */
2126    OP_COMMIT,         /* 114 */    OP_COMMIT,         /* 150 */
2127    
2128    /* These are forced failure and success verbs */    /* These are forced failure and success verbs */
2129    
2130    OP_FAIL,           /* 115 */    OP_FAIL,           /* 151 */
2131    OP_ACCEPT,         /* 116 */    OP_ACCEPT,         /* 152 */
2132    OP_CLOSE,          /* 117 Used before OP_ACCEPT to close open captures */    OP_ASSERT_ACCEPT,  /* 153 Used inside assertions */
2133      OP_CLOSE,          /* 154 Used before OP_ACCEPT to close open captures */
2134    
2135    /* This is used to skip a subpattern with a {0} quantifier */    /* This is used to skip a subpattern with a {0} quantifier */
2136    
2137    OP_SKIPZERO,       /* 118 */    OP_SKIPZERO,       /* 155 */
2138    
2139    /* This is not an opcode, but is used to check that tables indexed by opcode    /* This is not an opcode, but is used to check that tables indexed by opcode
2140    are the correct length, in order to catch updating errors - there have been    are the correct length, in order to catch updating errors - there have been
# Line 1462  called "coptable" and "poptable" in pcre Line 2149  called "coptable" and "poptable" in pcre
2149    
2150    
2151  /* 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
2152  for debugging. The macro is referenced only in pcre_printint.c. */  for debugging, and some of them are only partial names. The macro is referenced
2153    only in pcre_printint.c, which fills out the full names in many cases (and in
2154    some cases doesn't actually use these names at all). */
2155    
2156  #define OP_NAME_LIST \  #define OP_NAME_LIST \
2157    "End", "\\A", "\\G", "\\K", "\\B", "\\b", "\\D", "\\d",         \    "End", "\\A", "\\G", "\\K", "\\B", "\\b", "\\D", "\\d",         \
2158    "\\S", "\\s", "\\W", "\\w", "Any", "AllAny", "Anybyte",         \    "\\S", "\\s", "\\W", "\\w", "Any", "AllAny", "Anybyte",         \
2159    "notprop", "prop", "\\R", "\\H", "\\h", "\\V", "\\v",           \    "notprop", "prop", "\\R", "\\H", "\\h", "\\V", "\\v",           \
2160    "extuni",  "\\Z", "\\z",                                        \    "extuni",  "\\Z", "\\z",                                        \
2161    "Opt", "^", "$", "char", "charnc", "not",                       \    "^", "^", "$", "$", "char", "chari", "not", "noti",             \
2162    "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \    "*", "*?", "+", "+?", "?", "??",                                \
2163      "{", "{", "{",                                                  \
2164    "*+","++", "?+", "{",                                           \    "*+","++", "?+", "{",                                           \
2165    "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \    "*", "*?", "+", "+?", "?", "??",                                \
2166      "{", "{", "{",                                                  \
2167      "*+","++", "?+", "{",                                           \
2168      "*", "*?", "+", "+?", "?", "??",                                \
2169      "{", "{", "{",                                                  \
2170      "*+","++", "?+", "{",                                           \
2171      "*", "*?", "+", "+?", "?", "??",                                \
2172      "{", "{", "{",                                                  \
2173    "*+","++", "?+", "{",                                           \    "*+","++", "?+", "{",                                           \
2174    "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \    "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \
2175    "*+","++", "?+", "{",                                           \    "*+","++", "?+", "{",                                           \
2176    "*", "*?", "+", "+?", "?", "??", "{", "{",                      \    "*", "*?", "+", "+?", "?", "??", "{", "{",                      \
2177    "class", "nclass", "xclass", "Ref", "Recurse", "Callout",       \    "class", "nclass", "xclass", "Ref", "Refi",                     \
2178    "Alt", "Ket", "KetRmax", "KetRmin", "Assert", "Assert not",     \    "Recurse", "Callout",                                           \
2179    "AssertB", "AssertB not", "Reverse",                            \    "Alt", "Ket", "KetRmax", "KetRmin", "KetRpos",                  \
2180    "Once", "Bra", "CBra", "Cond", "SBra", "SCBra", "SCond",        \    "Reverse", "Assert", "Assert not", "AssertB", "AssertB not",    \
2181      "Once", "Once_NC",                                              \
2182      "Bra", "BraPos", "CBra", "CBraPos",                             \
2183      "Cond",                                                         \
2184      "SBra", "SBraPos", "SCBra", "SCBraPos",                         \
2185      "SCond",                                                        \
2186    "Cond ref", "Cond nref", "Cond rec", "Cond nrec", "Cond def",   \    "Cond ref", "Cond nref", "Cond rec", "Cond nrec", "Cond def",   \
2187    "Brazero", "Braminzero",                                        \    "Brazero", "Braminzero", "Braposzero",                          \
2188    "*MARK", "*PRUNE", "*PRUNE", "*SKIP", "*SKIP",                  \    "*MARK", "*PRUNE", "*PRUNE", "*SKIP", "*SKIP",                  \
2189    "*THEN", "*THEN", "*COMMIT", "*FAIL", "*ACCEPT",                \    "*THEN", "*THEN", "*COMMIT", "*FAIL",                           \
2190      "*ACCEPT", "*ASSERT_ACCEPT",                                    \
2191    "Close", "Skip zero"    "Close", "Skip zero"
2192    
2193    
# Line 1505  in UTF-8 mode. The code that uses this t Line 2208  in UTF-8 mode. The code that uses this t
2208    3, 3,                          /* \P, \p                                 */ \    3, 3,                          /* \P, \p                                 */ \
2209    1, 1, 1, 1, 1,                 /* \R, \H, \h, \V, \v                     */ \    1, 1, 1, 1, 1,                 /* \R, \H, \h, \V, \v                     */ \
2210    1,                             /* \X                                     */ \    1,                             /* \X                                     */ \
2211    1, 1, 2, 1, 1,                 /* \Z, \z, Opt, ^, $                      */ \    1, 1, 1, 1, 1, 1,              /* \Z, \z, ^, ^M, $, $M                   */ \
2212    2,                             /* Char  - the minimum length             */ \    2,                             /* Char  - the minimum length             */ \
2213    2,                             /* Charnc  - the minimum length           */ \    2,                             /* Chari  - the minimum length            */ \
2214    2,                             /* not                                    */ \    2,                             /* not                                    */ \
2215    /* Positive single-char repeats                            ** These are  */ \    2,                             /* noti                                   */ \
2216    2, 2, 2, 2, 2, 2,              /* *, *?, +, +?, ?, ??      ** minima in  */ \    /* Positive single-char repeats                             ** These are */ \
2217    4, 4, 4,                       /* upto, minupto, exact     ** UTF-8 mode */ \    2, 2, 2, 2, 2, 2,              /* *, *?, +, +?, ?, ??       ** minima in */ \
2218    2, 2, 2, 4,                    /* *+, ++, ?+, upto+                      */ \    2+IMM2_SIZE, 2+IMM2_SIZE,      /* upto, minupto             ** mode      */ \
2219      2+IMM2_SIZE,                   /* exact                                  */ \
2220      2, 2, 2, 2+IMM2_SIZE,          /* *+, ++, ?+, upto+                      */ \
2221      2, 2, 2, 2, 2, 2,              /* *I, *?I, +I, +?I, ?I, ??I ** UTF-8     */ \
2222      2+IMM2_SIZE, 2+IMM2_SIZE,      /* upto I, minupto I                      */ \
2223      2+IMM2_SIZE,                   /* exact I                                */ \
2224      2, 2, 2, 2+IMM2_SIZE,          /* *+I, ++I, ?+I, upto+I                  */ \
2225    /* Negative single-char repeats - only for chars < 256                   */ \    /* Negative single-char repeats - only for chars < 256                   */ \
2226    2, 2, 2, 2, 2, 2,              /* NOT *, *?, +, +?, ?, ??                */ \    2, 2, 2, 2, 2, 2,              /* NOT *, *?, +, +?, ?, ??                */ \
2227    4, 4, 4,                       /* NOT upto, minupto, exact               */ \    2+IMM2_SIZE, 2+IMM2_SIZE,      /* NOT upto, minupto                      */ \
2228    2, 2, 2, 4,                    /* Possessive *, +, ?, upto               */ \    2+IMM2_SIZE,                   /* NOT exact                              */ \
2229      2, 2, 2, 2+IMM2_SIZE,          /* Possessive NOT *, +, ?, upto           */ \
2230      2, 2, 2, 2, 2, 2,              /* NOT *I, *?I, +I, +?I, ?I, ??I          */ \
2231      2+IMM2_SIZE, 2+IMM2_SIZE,      /* NOT upto I, minupto I                  */ \
2232      2+IMM2_SIZE,                   /* NOT exact I                            */ \
2233      2, 2, 2, 2+IMM2_SIZE,          /* Possessive NOT *I, +I, ?I, upto I      */ \
2234    /* Positive type repeats                                                 */ \    /* Positive type repeats                                                 */ \
2235    2, 2, 2, 2, 2, 2,              /* Type *, *?, +, +?, ?, ??               */ \    2, 2, 2, 2, 2, 2,              /* Type *, *?, +, +?, ?, ??               */ \
2236    4, 4, 4,                       /* Type upto, minupto, exact              */ \    2+IMM2_SIZE, 2+IMM2_SIZE,      /* Type upto, minupto                     */ \
2237    2, 2, 2, 4,                    /* Possessive *+, ++, ?+, upto+           */ \    2+IMM2_SIZE,                   /* Type exact                             */ \
2238      2, 2, 2, 2+IMM2_SIZE,          /* Possessive *+, ++, ?+, upto+           */ \
2239    /* Character class & ref repeats                                         */ \    /* Character class & ref repeats                                         */ \
2240    1, 1, 1, 1, 1, 1,              /* *, *?, +, +?, ?, ??                    */ \    1, 1, 1, 1, 1, 1,              /* *, *?, +, +?, ?, ??                    */ \
2241    5, 5,                          /* CRRANGE, CRMINRANGE                    */ \    1+2*IMM2_SIZE, 1+2*IMM2_SIZE,  /* CRRANGE, CRMINRANGE                    */ \
2242   33,                             /* CLASS                                  */ \    1+(32/sizeof(pcre_uchar)),     /* CLASS                                  */ \
2243   33,                             /* NCLASS                                 */ \    1+(32/sizeof(pcre_uchar)),     /* NCLASS                                 */ \
2244    0,                             /* XCLASS - variable length               */ \    0,                             /* XCLASS - variable length               */ \
2245    3,                             /* REF                                    */ \    1+IMM2_SIZE,                   /* REF                                    */ \
2246      1+IMM2_SIZE,                   /* REFI                                   */ \
2247    1+LINK_SIZE,                   /* RECURSE                                */ \    1+LINK_SIZE,                   /* RECURSE                                */ \
2248    2+2*LINK_SIZE,                 /* CALLOUT                                */ \    2+2*LINK_SIZE,                 /* CALLOUT                                */ \
2249    1+LINK_SIZE,                   /* Alt                                    */ \    1+LINK_SIZE,                   /* Alt                                    */ \
2250    1+LINK_SIZE,                   /* Ket                                    */ \    1+LINK_SIZE,                   /* Ket                                    */ \
2251    1+LINK_SIZE,                   /* KetRmax                                */ \    1+LINK_SIZE,                   /* KetRmax                                */ \
2252    1+LINK_SIZE,                   /* KetRmin                                */ \    1+LINK_SIZE,                   /* KetRmin                                */ \
2253      1+LINK_SIZE,                   /* KetRpos                                */ \
2254      1+LINK_SIZE,                   /* Reverse                                */ \
2255    1+LINK_SIZE,                   /* Assert                                 */ \    1+LINK_SIZE,                   /* Assert                                 */ \
2256    1+LINK_SIZE,                   /* Assert not                             */ \    1+LINK_SIZE,                   /* Assert not                             */ \
2257    1+LINK_SIZE,                   /* Assert behind                          */ \    1+LINK_SIZE,                   /* Assert behind                          */ \
2258    1+LINK_SIZE,                   /* Assert behind not                      */ \    1+LINK_SIZE,                   /* Assert behind not                      */ \
   1+LINK_SIZE,                   /* Reverse                                */ \  
2259    1+LINK_SIZE,                   /* ONCE                                   */ \    1+LINK_SIZE,                   /* ONCE                                   */ \
2260      1+LINK_SIZE,                   /* ONCE_NC                                */ \
2261    1+LINK_SIZE,                   /* BRA                                    */ \    1+LINK_SIZE,                   /* BRA                                    */ \
2262    3+LINK_SIZE,                   /* CBRA                                   */ \    1+LINK_SIZE,                   /* BRAPOS                                 */ \
2263      1+LINK_SIZE+IMM2_SIZE,         /* CBRA                                   */ \
2264      1+LINK_SIZE+IMM2_SIZE,         /* CBRAPOS                                */ \
2265    1+LINK_SIZE,                   /* COND                                   */ \    1+LINK_SIZE,                   /* COND                                   */ \
2266    1+LINK_SIZE,                   /* SBRA                                   */ \    1+LINK_SIZE,                   /* SBRA                                   */ \
2267    3+LINK_SIZE,                   /* SCBRA                                  */ \    1+LINK_SIZE,                   /* SBRAPOS                                */ \
2268      1+LINK_SIZE+IMM2_SIZE,         /* SCBRA                                  */ \
2269      1+LINK_SIZE+IMM2_SIZE,         /* SCBRAPOS                               */ \
2270    1+LINK_SIZE,                   /* SCOND                                  */ \    1+LINK_SIZE,                   /* SCOND                                  */ \
2271    3, 3,                          /* CREF, NCREF                            */ \    1+IMM2_SIZE, 1+IMM2_SIZE,      /* CREF, NCREF                            */ \
2272    3, 3,                          /* RREF, NRREF                            */ \    1+IMM2_SIZE, 1+IMM2_SIZE,      /* RREF, NRREF                            */ \
2273    1,                             /* DEF                                    */ \    1,                             /* DEF                                    */ \
2274    1, 1,                          /* BRAZERO, BRAMINZERO                    */ \    1, 1, 1,                       /* BRAZERO, BRAMINZERO, BRAPOSZERO        */ \
2275    3, 1, 3,                       /* MARK, PRUNE, PRUNE_ARG                 */ \    3, 1, 3,                       /* MARK, PRUNE, PRUNE_ARG                 */ \
2276    1, 3,                          /* SKIP, SKIP_ARG                         */ \    1, 3,                          /* SKIP, SKIP_ARG                         */ \
2277    1+LINK_SIZE, 3+LINK_SIZE,      /* THEN, THEN_ARG                         */ \    1, 3,                          /* THEN, THEN_ARG                         */ \
2278    1, 1, 1, 3, 1                  /* COMMIT, FAIL, ACCEPT, CLOSE, SKIPZERO  */    1, 1, 1, 1,                    /* COMMIT, FAIL, ACCEPT, ASSERT_ACCEPT    */ \
2279      1+IMM2_SIZE, 1                 /* CLOSE, SKIPZERO                        */
2280    
2281  /* A magic value for OP_RREF and OP_NRREF to indicate the "any recursion"  /* A magic value for OP_RREF and OP_NRREF to indicate the "any recursion"
2282  condition. */  condition. */
# Line 1571  enum { ERR0,  ERR1,  ERR2,  ERR3,  ERR4, Line 2293  enum { ERR0,  ERR1,  ERR2,  ERR3,  ERR4,
2293         ERR30, ERR31, ERR32, ERR33, ERR34, ERR35, ERR36, ERR37, ERR38, ERR39,         ERR30, ERR31, ERR32, ERR33, ERR34, ERR35, ERR36, ERR37, ERR38, ERR39,
2294         ERR40, ERR41, ERR42, ERR43, ERR44, ERR45, ERR46, ERR47, ERR48, ERR49,         ERR40, ERR41, ERR42, ERR43, ERR44, ERR45, ERR46, ERR47, ERR48, ERR49,
2295         ERR50, ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58, ERR59,         ERR50, ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58, ERR59,
2296         ERR60, ERR61, ERR62, ERR63, ERR64, ERR65, ERR66, ERR67, ERR68,         ERR60, ERR61, ERR62, ERR63, ERR64, ERR65, ERR66, ERR67, ERR68, ERR69,
2297         ERRCOUNT };         ERR70, ERR71, ERR72, ERR73, ERR74, ERR75, ERR76, ERR77, ERRCOUNT };
2298    
2299    /* JIT compiling modes. The function list is indexed by them. */
2300    enum { JIT_COMPILE, JIT_PARTIAL_SOFT_COMPILE, JIT_PARTIAL_HARD_COMPILE,
2301           JIT_NUMBER_OF_COMPILE_MODES };
2302    
2303  /* 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
2304  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 1591  fields are present. Currently PCRE alway Line 2317  fields are present. Currently PCRE alway
2317  NOTE NOTE NOTE  NOTE NOTE NOTE
2318  */  */
2319    
2320  typedef struct real_pcre {  #if defined COMPILE_PCRE8
2321    #define REAL_PCRE real_pcre
2322    #elif defined COMPILE_PCRE16
2323    #define REAL_PCRE real_pcre16
2324    #elif defined COMPILE_PCRE32
2325    #define REAL_PCRE real_pcre32
2326    #endif
2327    
2328    /* It is necessary to fork the struct for 32 bit, since it needs to use
2329     * pcre_uchar for first_char and req_char. Can't put an ifdef inside the
2330     * typedef since pcretest needs access to  the struct of the 8-, 16-
2331     * and 32-bit variants. */
2332    
2333    typedef struct real_pcre8_or_16 {
2334    pcre_uint32 magic_number;    pcre_uint32 magic_number;
2335    pcre_uint32 size;               /* Total that was malloced */    pcre_uint32 size;               /* Total that was malloced */
2336    pcre_uint32 options;            /* Public options */    pcre_uint32 options;            /* Public options */
2337    pcre_uint16 flags;              /* Private flags */    pcre_uint16 flags;              /* Private flags */
2338    pcre_uint16 dummy1;             /* For future use */    pcre_uint16 max_lookbehind;     /* Longest lookbehind (characters) */
2339    pcre_uint16 top_bracket;    pcre_uint16 top_bracket;        /* Highest numbered group */
2340    pcre_uint16 top_backref;    pcre_uint16 top_backref;        /* Highest numbered back reference */
2341    pcre_uint16 first_byte;    pcre_uint16 first_char;         /* Starting character */
2342    pcre_uint16 req_byte;    pcre_uint16 req_char;           /* This character must be seen */
2343    pcre_uint16 name_table_offset;  /* Offset to name table that follows */    pcre_uint16 name_table_offset;  /* Offset to name table that follows */
2344    pcre_uint16 name_entry_size;    /* Size of any name items */    pcre_uint16 name_entry_size;    /* Size of any name items */
2345    pcre_uint16 name_count;         /* Number of name items */    pcre_uint16 name_count;         /* Number of name items */
2346    pcre_uint16 ref_count;          /* Reference count */    pcre_uint16 ref_count;          /* Reference count */
2347      const pcre_uint8 *tables;       /* Pointer to tables or NULL for std */
2348      const pcre_uint8 *nullpad;      /* NULL padding */
2349    } real_pcre8_or_16;
2350    
2351    const unsigned char *tables;    /* Pointer to tables or NULL for std */  typedef struct real_pcre8_or_16 real_pcre;
2352    const unsigned char *nullpad;   /* NULL padding */  typedef struct real_pcre8_or_16 real_pcre16;
2353  } real_pcre;  
2354    typedef struct real_pcre32 {
2355      pcre_uint32 magic_number;
2356      pcre_uint32 size;               /* Total that was malloced */
2357      pcre_uint32 options;            /* Public options */
2358      pcre_uint16 flags;              /* Private flags */
2359      pcre_uint16 max_lookbehind;     /* Longest lookbehind (characters) */
2360      pcre_uint16 top_bracket;        /* Highest numbered group */
2361      pcre_uint16 top_backref;        /* Highest numbered back reference */
2362      pcre_uint32 first_char;         /* Starting character */
2363      pcre_uint32 req_char;           /* This character must be seen */
2364      pcre_uint16 name_table_offset;  /* Offset to name table that follows */
2365      pcre_uint16 name_entry_size;    /* Size of any name items */
2366      pcre_uint16 name_count;         /* Number of name items */
2367      pcre_uint16 ref_count;          /* Reference count */
2368      pcre_uint16 dummy1;             /* for later expansion */
2369      pcre_uint16 dummy2;             /* for later expansion */
2370      const pcre_uint8 *tables;       /* Pointer to tables or NULL for std */
2371      void *nullpad;                  /* for later expansion */
2372    } real_pcre32;
2373    
2374    /* Assert that the size of REAL_PCRE is divisible by 8 */
2375    typedef int __assert_real_pcre_size_divisible_8[(sizeof(REAL_PCRE) % 8) == 0 ? 1 : -1];
2376    
2377    /* Needed in pcretest to access some fields in the real_pcre* structures
2378     * directly. They're unified for 8/16/32 bits since the structs only differ
2379     * after these fields; if that ever changes, need to fork those defines into
2380     * 8/16 and 32 bit versions. */
2381    #define REAL_PCRE_MAGIC(re)     (((REAL_PCRE*)re)->magic_number)
2382    #define REAL_PCRE_SIZE(re)      (((REAL_PCRE*)re)->size)
2383    #define REAL_PCRE_OPTIONS(re)   (((REAL_PCRE*)re)->options)
2384    #define REAL_PCRE_FLAGS(re)     (((REAL_PCRE*)re)->flags)
2385    
2386  /* The format of the block used to store data from pcre_study(). The same  /* The format of the block used to store data from pcre_study(). The same
2387  remark (see NOTE above) about extending this structure applies. */  remark (see NOTE above) about extending this structure applies. */
# Line 1616  remark (see NOTE above) about extending Line 2389  remark (see NOTE above) about extending
2389  typedef struct pcre_study_data {  typedef struct pcre_study_data {
2390    pcre_uint32 size;               /* Total that was malloced */    pcre_uint32 size;               /* Total that was malloced */
2391    pcre_uint32 flags;              /* Private flags */    pcre_uint32 flags;              /* Private flags */
2392    uschar start_bits[32];          /* Starting char bits */    pcre_uint8 start_bits[32];      /* Starting char bits */
2393    pcre_uint32 minlength;          /* Minimum subject length */    pcre_uint32 minlength;          /* Minimum subject length */
2394  } pcre_study_data;  } pcre_study_data;
2395    
# Line 1635  typedef struct open_capitem { Line 2408  typedef struct open_capitem {
2408  doing the compiling, so that they are thread-safe. */  doing the compiling, so that they are thread-safe. */
2409    
2410  typedef struct compile_data {  typedef struct compile_data {
2411    const uschar *lcc;            /* Points to lower casing table */    const pcre_uint8 *lcc;            /* Points to lower casing table */
2412    const uschar *fcc;            /* Points to case-flipping table */    const pcre_uint8 *fcc;            /* Points to case-flipping table */
2413    const uschar *cbits;          /* Points to character type table */    const pcre_uint8 *cbits;          /* Points to character type table */
2414    const uschar *ctypes;         /* Points to table of type maps */    const pcre_uint8 *ctypes;         /* Points to table of type maps */
2415    const uschar *start_workspace;/* The start of working space */    const pcre_uchar *start_workspace;/* The start of working space */
2416    const uschar *start_code;     /* The start of the compiled code */    const pcre_uchar *start_code;     /* The start of the compiled code */
2417    const uschar *start_pattern;  /* The start of the pattern */    const pcre_uchar *start_pattern;  /* The start of the pattern */
2418    const uschar *end_pattern;    /* The end of the pattern */    const pcre_uchar *end_pattern;    /* The end of the pattern */
2419    open_capitem *open_caps;      /* Chain of open capture items */    open_capitem *open_caps;          /* Chain of open capture items */
2420    uschar *hwm;                  /* High watermark of workspace */    pcre_uchar *hwm;                  /* High watermark of workspace */
2421    uschar *name_table;           /* The name/number table */    pcre_uchar *name_table;           /* The name/number table */
2422    int  names_found;             /* Number of entries so far */    int  names_found;                 /* Number of entries so far */
2423    int  name_entry_size;         /* Size of each entry */    int  name_entry_size;             /* Size of each entry */
2424    int  bracount;                /* Count of capturing parens as we compile */    int  workspace_size;              /* Size of workspace */
2425    int  final_bracount;          /* Saved value after first pass */    unsigned int  bracount;           /* Count of capturing parens as we compile */
2426    int  top_backref;             /* Maximum back reference */    int  final_bracount;              /* Saved value after first pass */
2427    unsigned int backref_map;     /* Bitmap of low back refs */    int  max_lookbehind;              /* Maximum lookbehind (characters) */
2428    int  external_options;        /* External (initial) options */    int  top_backref;                 /* Maximum back reference */
2429    int  external_flags;          /* External flag bits to be set */    unsigned int backref_map;         /* Bitmap of low back refs */
2430    int  req_varyopt;             /* "After variable item" flag for reqbyte */    int  assert_depth;                /* Depth of nested assertions */
2431    BOOL had_accept;              /* (*ACCEPT) encountered */    int  external_options;            /* External (initial) options */
2432    BOOL check_lookbehind;        /* Lookbehinds need later checking */    int  external_flags;              /* External flag bits to be set */
2433    int  nltype;                  /* Newline type */    int  req_varyopt;                 /* "After variable item" flag for reqbyte */
2434    int  nllen;                   /* Newline string length */    BOOL had_accept;                  /* (*ACCEPT) encountered */
2435    uschar nl[4];                 /* Newline string when fixed length */    BOOL had_pruneorskip;             /* (*PRUNE) or (*SKIP) encountered */
2436      BOOL check_lookbehind;            /* Lookbehinds need later checking */
2437      int  nltype;                      /* Newline type */
2438      int  nllen;                       /* Newline string length */
2439      pcre_uchar nl[4];                 /* Newline string when fixed length */
2440  } compile_data;  } compile_data;
2441    
2442  /* Structure for maintaining a chain of pointers to the currently incomplete  /* Structure for maintaining a chain of pointers to the currently incomplete
2443  branches, for testing for left recursion. */  branches, for testing for left recursion while compiling. */
2444    
2445  typedef struct branch_chain {  typedef struct branch_chain {
2446    struct branch_chain *outer;    struct branch_chain *outer;
2447    uschar *current_branch;    pcre_uchar *current_branch;
2448  } branch_chain;  } branch_chain;
2449    
2450  /* Structure for items in a linked list that represents an explicit recursive  /* Structure for items in a linked list that represents an explicit recursive
2451  call within the pattern. */  call within the pattern; used by pcre_exec(). */
2452    
2453  typedef struct recursion_info {  typedef struct recursion_info {
2454    struct recursion_info *prevrec; /* Previous recursion record (or NULL) */    struct recursion_info *prevrec; /* Previous recursion record (or NULL) */
2455    int group_num;                /* Number of group that was called */    unsigned int group_num;         /* Number of group that was called */
2456    const uschar *after_call;     /* "Return value": points after the call in the expr */    int *offset_save;               /* Pointer to start of saved offsets */
2457    int *offset_save;             /* Pointer to start of saved offsets */    int saved_max;                  /* Number of saved offsets */
2458    int saved_max;                /* Number of saved offsets */    PCRE_PUCHAR subject_position;   /* Position at start of recursion */
   int save_offset_top;          /* Current value of offset_top */  
2459  } recursion_info;  } recursion_info;
2460    
2461    /* A similar structure for pcre_dfa_exec(). */
2462    
2463    typedef struct dfa_recursion_info {
2464      struct dfa_recursion_info *prevrec;
2465      int group_num;
2466      PCRE_PUCHAR subject_position;
2467    } dfa_recursion_info;
2468    
2469  /* Structure for building a chain of data for holding the values of the subject  /* Structure for building a chain of data for holding the values of the subject
2470  pointer at the start of each subpattern, so as to detect when an empty string  pointer at the start of each subpattern, so as to detect when an empty string
2471  has been matched by a subpattern - to break infinite loops. */  has been matched by a subpattern - to break infinite loops; used by
2472    pcre_exec(). */
2473    
2474  typedef struct eptrblock {  typedef struct eptrblock {
2475    struct eptrblock *epb_prev;    struct eptrblock *epb_prev;
2476    USPTR epb_saved_eptr;    PCRE_PUCHAR epb_saved_eptr;
2477  } eptrblock;  } eptrblock;
2478    
2479    
# Line 1699  typedef struct match_data { Line 2484  typedef struct match_data {
2484    unsigned long int match_call_count;      /* As it says */    unsigned long int match_call_count;      /* As it says */
2485    unsigned long int match_limit;           /* As it says */    unsigned long int match_limit;           /* As it says */
2486    unsigned long int match_limit_recursion; /* As it says */    unsigned long int match_limit_recursion; /* As it says */
2487    int   *offset_vector;         /* Offset vector */    int   *offset_vector;           /* Offset vector */
2488    int    offset_end;            /* One past the end */    int    offset_end;              /* One past the end */
2489    int    offset_max;            /* The maximum usable for return data */    int    offset_max;              /* The maximum usable for return data */
2490    int    nltype;                /* Newline type */    int    nltype;                  /* Newline type */
2491    int    nllen;                 /* Newline string length */    int    nllen;                   /* Newline string length */
2492    int    name_count;            /* Number of names in name table */    int    name_count;              /* Number of names in name table */
2493    int    name_entry_size;       /* Size of entry in names table */    int    name_entry_size;         /* Size of entry in names table */
2494    uschar *name_table;           /* Table of names */    pcre_uchar *name_table;         /* Table of names */
2495    uschar nl[4];                 /* Newline string when fixed */    pcre_uchar nl[4];               /* Newline string when fixed */
2496    const uschar *lcc;            /* Points to lower casing table */    const  pcre_uint8 *lcc;         /* Points to lower casing table */
2497    const uschar *ctypes;         /* Points to table of type maps */    const  pcre_uint8 *fcc;         /* Points to case-flipping table */
2498    BOOL   offset_overflow;       /* Set if too many extractions */    const  pcre_uint8 *ctypes;      /* Points to table of type maps */
2499    BOOL   notbol;                /* NOTBOL flag */    BOOL   offset_overflow;         /* Set if too many extractions */
2500    BOOL   noteol;                /* NOTEOL flag */    BOOL   notbol;                  /* NOTBOL flag */
2501    BOOL   utf8;                  /* UTF8 flag */    BOOL   noteol;                  /* NOTEOL flag */
2502    BOOL   jscript_compat;        /* JAVASCRIPT_COMPAT flag */    BOOL   utf;                     /* UTF-8 / UTF-16 flag */
2503    BOOL   use_ucp;               /* PCRE_UCP flag */    BOOL   jscript_compat;          /* JAVASCRIPT_COMPAT flag */
2504    BOOL   endonly;               /* Dollar not before final \n */    BOOL   use_ucp;                 /* PCRE_UCP flag */
2505    BOOL   notempty;              /* Empty string match not wanted */    BOOL   endonly;                 /* Dollar not before final \n */
2506    BOOL   notempty_atstart;      /* Empty string match at start not wanted */    BOOL   notempty;                /* Empty string match not wanted */
2507    BOOL   hitend;                /* Hit the end of the subject at some point */    BOOL   notempty_atstart;        /* Empty string match at start not wanted */
2508    BOOL   bsr_anycrlf;           /* \R is just any CRLF, not full Unicode */    BOOL   hitend;                  /* Hit the end of the subject at some point */
2509    const uschar *start_code;     /* For use when recursing */    BOOL   bsr_anycrlf;             /* \R is just any CRLF, not full Unicode */
2510    USPTR  start_subject;         /* Start of the subject string */    BOOL   hasthen;                 /* Pattern contains (*THEN) */
2511    USPTR  end_subject;           /* End of the subject string */    BOOL   ignore_skip_arg;         /* For re-run when SKIP name not found */
2512    USPTR  start_match_ptr;       /* Start of matched string */    const  pcre_uchar *start_code;  /* For use when recursing */
2513    USPTR  end_match_ptr;         /* Subject position at end match */    PCRE_PUCHAR start_subject;      /* Start of the subject string */
2514    USPTR  start_used_ptr;        /* Earliest consulted character */    PCRE_PUCHAR end_subject;        /* End of the subject string */
2515    int    partial;               /* PARTIAL options */    PCRE_PUCHAR start_match_ptr;    /* Start of matched string */
2516    int    end_offset_top;        /* Highwater mark at end of match */    PCRE_PUCHAR end_match_ptr;      /* Subject position at end match */
2517    int    capture_last;          /* Most recent capture number */    PCRE_PUCHAR start_used_ptr;     /* Earliest consulted character */
2518    int    start_offset;          /* The start offset value */    int    partial;                 /* PARTIAL options */
2519    eptrblock *eptrchain;         /* Chain of eptrblocks for tail recursions */    int    end_offset_top;          /* Highwater mark at end of match */
2520    int    eptrn;                 /* Next free eptrblock */    int    capture_last;            /* Most recent capture number */
2521    recursion_info *recursive;    /* Linked list of recursion data */    int    start_offset;            /* The start offset value */
2522    void  *callout_data;          /* To pass back to callouts */    int    match_function_type;     /* Set for certain special calls of MATCH() */
2523    const uschar *mark;           /* Mark pointer to pass back */    eptrblock *eptrchain;           /* Chain of eptrblocks for tail recursions */
2524      int    eptrn;                   /* Next free eptrblock */
2525      recursion_info *recursive;      /* Linked list of recursion data */
2526      void  *callout_data;            /* To pass back to callouts */
2527      const  pcre_uchar *mark;        /* Mark pointer to pass back on success */
2528      const  pcre_uchar *nomatch_mark;/* Mark pointer to pass back on failure */
2529      const  pcre_uchar *once_target; /* Where to back up to for atomic groups */
2530    #ifdef NO_RECURSE
2531      void  *match_frames_base;       /* For remembering malloc'd frames */
2532    #endif
2533  } match_data;  } match_data;
2534    
2535  /* 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
2536  functions. */  functions. */
2537    
2538  typedef struct dfa_match_data {  typedef struct dfa_match_data {
2539    const uschar *start_code;     /* Start of the compiled pattern */    const pcre_uchar *start_code;     /* Start of the compiled pattern */
2540    const uschar *start_subject;  /* Start of the subject string */    const pcre_uchar *start_subject ; /* Start of the subject string */
2541    const uschar *end_subject;    /* End of subject string */    const pcre_uchar *end_subject;    /* End of subject string */
2542    const uschar *start_used_ptr; /* Earliest consulted character */    const pcre_uchar *start_used_ptr; /* Earliest consulted character */
2543    const uschar *tables;         /* Character tables */    const pcre_uint8 *tables;         /* Character tables */
2544    int   start_offset;           /* The start offset value */    int   start_offset;               /* The start offset value */
2545    int   moptions;               /* Match options */    int   moptions;                   /* Match options */
2546    int   poptions;               /* Pattern options */    int   poptions;                   /* Pattern options */
2547    int    nltype;                /* Newline type */    int   nltype;                     /* Newline type */
2548    int    nllen;                 /* Newline string length */    int   nllen;                      /* Newline string length */
2549    uschar nl[4];                 /* Newline string when fixed */    pcre_uchar nl[4];                 /* Newline string when fixed */
2550    void  *callout_data;          /* To pass back to callouts */    void *callout_data;               /* To pass back to callouts */
2551      dfa_recursion_info *recursive;    /* Linked list of recursion data */
2552  } dfa_match_data;  } dfa_match_data;
2553    
2554  /* Bit definitions for entries in the pcre_ctypes table. */  /* Bit definitions for entries in the pcre_ctypes table. */
# Line 1789  total length. */ Line 2584  total length. */
2584  #define ctypes_offset (cbits_offset + cbit_length)  #define ctypes_offset (cbits_offset + cbit_length)
2585  #define tables_length (ctypes_offset + 256)  #define tables_length (ctypes_offset + 256)
2586    
2587    /* Internal function and data prefixes. */
2588    
2589    #if defined COMPILE_PCRE8
2590    #ifndef PUBL
2591    #define PUBL(name) pcre_##name
2592    #endif
2593    #ifndef PRIV
2594    #define PRIV(name) _pcre_##name
2595    #endif
2596    #elif defined COMPILE_PCRE16
2597    #ifndef PUBL
2598    #define PUBL(name) pcre16_##name
2599    #endif
2600    #ifndef PRIV
2601    #define PRIV(name) _pcre16_##name
2602    #endif
2603    #elif defined COMPILE_PCRE32
2604    #ifndef PUBL
2605    #define PUBL(name) pcre32_##name
2606    #endif
2607    #ifndef PRIV
2608    #define PRIV(name) _pcre32_##name
2609    #endif
2610    #else
2611    #error Unsupported compiling mode
2612    #endif /* COMPILE_PCRE[8|16|32] */
2613    
2614  /* Layout of the UCP type table that translates property names into types and  /* Layout of the UCP type table that translates property names into types and
2615  codes. Each entry used to point directly to a name, but to reduce the number of  codes. Each entry used to point directly to a name, but to reduce the number of
2616  relocations in shared libraries, it now has an offset into a single string  relocations in shared libraries, it now has an offset into a single string
# Line 1806  of the exported public functions. They h Line 2628  of the exported public functions. They h
2628  but are not part of the PCRE public API. The data for these tables is in the  but are not part of the PCRE public API. The data for these tables is in the
2629  pcre_tables.c module. */  pcre_tables.c module. */
2630    
2631  extern const int    _pcre_utf8_table1[];  #ifdef COMPILE_PCRE8
2632  extern const int    _pcre_utf8_table2[];  extern const int            PRIV(utf8_table1)[];
2633  extern const int    _pcre_utf8_table3[];  extern const int            PRIV(utf8_table1_size);
2634  extern const uschar _pcre_utf8_table4[];  extern const int            PRIV(utf8_table2)[];
2635    extern const int            PRIV(utf8_table3)[];
2636  extern const int    _pcre_utf8_table1_size;  extern const pcre_uint8     PRIV(utf8_table4)[];
2637    #endif /* COMPILE_PCRE8 */
2638    
2639    extern const char           PRIV(utt_names)[];
2640    extern const ucp_type_table PRIV(utt)[];
2641    extern const int            PRIV(utt_size);
2642    
2643  extern const char   _pcre_utt_names[];  extern const pcre_uint8     PRIV(OP_lengths)[];
2644  extern const ucp_type_table _pcre_utt[];  extern const pcre_uint8     PRIV(default_tables)[];
 extern const int _pcre_utt_size;  
2645    
2646  extern const uschar _pcre_default_tables[];  extern const pcre_uint32    PRIV(hspace_list)[];
2647    extern const pcre_uint32    PRIV(vspace_list)[];
 extern const uschar _pcre_OP_lengths[];  
2648    
2649    
2650  /* Internal shared functions. These are functions that are used by more than  /* Internal shared functions. These are functions that are used by more than
2651  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
2652  sense, but are not part of the PCRE public API. */  sense, but are not part of the PCRE public API. */
2653    
2654  extern const uschar *_pcre_find_bracket(const uschar *, BOOL, int);  /* String comparison functions. */
2655  extern BOOL          _pcre_is_newline(USPTR, int, USPTR, int *, BOOL);  #if defined COMPILE_PCRE8
 extern int           _pcre_ord2utf8(int, uschar *);  
 extern real_pcre    *_pcre_try_flipped(const real_pcre *, real_pcre *,  
                        const pcre_study_data *, pcre_study_data *);  
 extern int           _pcre_valid_utf8(USPTR, int);  
 extern BOOL          _pcre_was_newline(USPTR, int, USPTR, int *, BOOL);  
 extern BOOL          _pcre_xclass(int, const uschar *);  
2656    
2657    #define STRCMP_UC_UC(str1, str2) \
2658      strcmp((char *)(str1), (char *)(str2))
2659    #define STRCMP_UC_C8(str1, str2) \
2660      strcmp((char *)(str1), (str2))
2661    #define STRNCMP_UC_UC(str1, str2, num) \
2662      strncmp((char *)(str1), (char *)(str2), (num))
2663    #define STRNCMP_UC_C8(str1, str2, num) \
2664      strncmp((char *)(str1), (str2), (num))
2665    #define STRLEN_UC(str) strlen((const char *)str)
2666    
2667    #elif defined COMPILE_PCRE16 || defined COMPILE_PCRE32
2668    
2669    extern int               PRIV(strcmp_uc_uc)(const pcre_uchar *,
2670                               const pcre_uchar *);
2671    extern int               PRIV(strcmp_uc_c8)(const pcre_uchar *,
2672                               const char *);
2673    extern int               PRIV(strncmp_uc_uc)(const pcre_uchar *,
2674                               const pcre_uchar *, unsigned int num);
2675    extern int               PRIV(strncmp_uc_c8)(const pcre_uchar *,
2676                               const char *, unsigned int num);
2677    extern unsigned int      PRIV(strlen_uc)(const pcre_uchar *str);
2678    
2679    #define STRCMP_UC_UC(str1, str2) \
2680      PRIV(strcmp_uc_uc)((str1), (str2))
2681    #define STRCMP_UC_C8(str1, str2) \
2682      PRIV(strcmp_uc_c8)((str1), (str2))
2683    #define STRNCMP_UC_UC(str1, str2, num) \
2684      PRIV(strncmp_uc_uc)((str1), (str2), (num))
2685    #define STRNCMP_UC_C8(str1, str2, num) \
2686      PRIV(strncmp_uc_c8)((str1), (str2), (num))
2687    #define STRLEN_UC(str) PRIV(strlen_uc)(str)
2688    
2689    #endif /* COMPILE_PCRE[8|16|32] */
2690    
2691    #if defined COMPILE_PCRE8 || defined COMPILE_PCRE16
2692    
2693    #define STRCMP_UC_UC_TEST(str1, str2) STRCMP_UC_UC(str1, str2)
2694    #define STRCMP_UC_C8_TEST(str1, str2) STRCMP_UC_C8(str1, str2)
2695    
2696    #elif defined COMPILE_PCRE32
2697    
2698    extern int               PRIV(strcmp_uc_uc_utf)(const pcre_uchar *,
2699                               const pcre_uchar *);
2700    extern int               PRIV(strcmp_uc_c8_utf)(const pcre_uchar *,
2701                               const char *);
2702    
2703    #define STRCMP_UC_UC_TEST(str1, str2) \
2704      (utf ? PRIV(strcmp_uc_uc_utf)((str1), (str2)) : PRIV(strcmp_uc_uc)((str1), (str2)))
2705    #define STRCMP_UC_C8_TEST(str1, str2) \
2706      (utf ? PRIV(strcmp_uc_c8_utf)((str1), (str2)) : PRIV(strcmp_uc_c8)((str1), (str2)))
2707    
2708    #endif /* COMPILE_PCRE[8|16|32] */
2709    
2710    extern const pcre_uchar *PRIV(find_bracket)(const pcre_uchar *, BOOL, int);
2711    extern BOOL              PRIV(is_newline)(PCRE_PUCHAR, int, PCRE_PUCHAR,
2712                               int *, BOOL);
2713    extern unsigned int      PRIV(ord2utf)(pcre_uint32, pcre_uchar *);
2714    extern int               PRIV(valid_utf)(PCRE_PUCHAR, int, int *);
2715    extern BOOL              PRIV(was_newline)(PCRE_PUCHAR, int, PCRE_PUCHAR,
2716                               int *, BOOL);
2717    extern BOOL              PRIV(xclass)(pcre_uint32, const pcre_uchar *, BOOL);
2718    
2719    #ifdef SUPPORT_JIT
2720    extern void              PRIV(jit_compile)(const REAL_PCRE *,
2721                               PUBL(extra) *, int);
2722    extern int               PRIV(jit_exec)(const PUBL(extra) *,
2723                               const pcre_uchar *, int, int, int, int *, int);
2724    extern void              PRIV(jit_free)(void *);
2725    extern int               PRIV(jit_get_size)(void *);
2726    extern const char*       PRIV(jit_get_target)(void);
2727    #endif
2728    
2729  /* Unicode character database (UCD) */  /* Unicode character database (UCD) */
2730    
2731  typedef struct {  typedef struct {
2732    uschar script;    pcre_uint8 script;     /* ucp_Arabic, etc. */
2733    uschar chartype;    pcre_uint8 chartype;   /* ucp_Cc, etc. (general categories) */
2734    pcre_int32 other_case;    pcre_uint8 gbprop;     /* ucp_gbControl, etc. (grapheme break property) */
2735      pcre_uint8 caseset;    /* offset to multichar other cases or zero */
2736      pcre_int32 other_case; /* offset to other case, or zero if none */
2737  } ucd_record;  } ucd_record;
2738    
2739  extern const ucd_record  _pcre_ucd_records[];  extern const pcre_uint32 PRIV(ucd_caseless_sets)[];
2740  extern const uschar      _pcre_ucd_stage1[];  extern const ucd_record  PRIV(ucd_records)[];
2741  extern const pcre_uint16 _pcre_ucd_stage2[];  extern const pcre_uint8  PRIV(ucd_stage1)[];
2742  extern const int         _pcre_ucp_gentype[];  extern const pcre_uint16 PRIV(ucd_stage2)[];
2743    extern const pcre_uint32 PRIV(ucp_gentype)[];
2744    extern const pcre_uint32 PRIV(ucp_gbtable)[];
2745    #ifdef SUPPORT_JIT
2746    extern const int         PRIV(ucp_typerange)[];
2747    #endif
2748    
2749    #ifdef SUPPORT_UCP
2750  /* UCD access macros */  /* UCD access macros */
2751    
2752  #define UCD_BLOCK_SIZE 128  #define UCD_BLOCK_SIZE 128
2753  #define GET_UCD(ch) (_pcre_ucd_records + \  #define GET_UCD(ch) (PRIV(ucd_records) + \
2754          _pcre_ucd_stage2[_pcre_ucd_stage1[(ch) / UCD_BLOCK_SIZE] * \          PRIV(ucd_stage2)[PRIV(ucd_stage1)[(int)(ch) / UCD_BLOCK_SIZE] * \
2755          UCD_BLOCK_SIZE + ch % UCD_BLOCK_SIZE])          UCD_BLOCK_SIZE + (int)(ch) % UCD_BLOCK_SIZE])
2756    
2757  #define UCD_CHARTYPE(ch)  GET_UCD(ch)->chartype  #define UCD_CHARTYPE(ch)    GET_UCD(ch)->chartype
2758  #define UCD_SCRIPT(ch)    GET_UCD(ch)->script  #define UCD_SCRIPT(ch)      GET_UCD(ch)->script
2759  #define UCD_CATEGORY(ch)  _pcre_ucp_gentype[UCD_CHARTYPE(ch)]  #define UCD_CATEGORY(ch)    PRIV(ucp_gentype)[UCD_CHARTYPE(ch)]
2760  #define UCD_OTHERCASE(ch) (ch + GET_UCD(ch)->other_case)  #define UCD_GRAPHBREAK(ch)  GET_UCD(ch)->gbprop
2761    #define UCD_CASESET(ch)     GET_UCD(ch)->caseset
2762    #define UCD_OTHERCASE(ch)   ((pcre_uint32)((int)ch + (int)(GET_UCD(ch)->other_case)))
2763    
2764    #endif /* SUPPORT_UCP */
2765    
2766  #endif  #endif
2767    

Legend:
Removed from v.576  
changed lines
  Added in v.1199

  ViewVC Help
Powered by ViewVC 1.1.5