/[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 510 by ph10, Sat Mar 27 17:45:29 2010 UTC revision 1046 by ph10, Tue Sep 25 16:27:58 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_" or "_pcre16_" depending on
44    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. */
56  script prevents both being selected, but not everybody uses "configure". */  #ifndef COMPILE_PCRE16
57    #define COMPILE_PCRE8
 #if defined EBCDIC && defined SUPPORT_UTF8  
 #error The use of both EBCDIC and SUPPORT_UTF8 is not supported.  
58  #endif  #endif
59    
60  /* If SUPPORT_UCP is defined, SUPPORT_UTF8 must also be defined. The  /* If SUPPORT_UCP is defined, SUPPORT_UTF must also be defined. The
61  "configure" script ensures this, but not everybody uses "configure". */  "configure" script ensures this, but not everybody uses "configure". */
62    
63  #if defined SUPPORT_UCP && !defined SUPPORT_UTF8  #if defined SUPPORT_UCP && !(defined SUPPORT_UTF)
64    #define SUPPORT_UTF 1
65    #endif
66    
67    /* We define SUPPORT_UTF if SUPPORT_UTF8 is enabled for compatibility
68    reasons with existing code. */
69    
70    #if defined SUPPORT_UTF8 && !(defined SUPPORT_UTF)
71    #define SUPPORT_UTF 1
72    #endif
73    
74    /* Fixme: SUPPORT_UTF8 should be eventually disappear from the code.
75    Until then we define it if SUPPORT_UTF is defined. */
76    
77    #if defined SUPPORT_UTF && !(defined SUPPORT_UTF8)
78  #define SUPPORT_UTF8 1  #define SUPPORT_UTF8 1
79  #endif  #endif
80    
81    /* We do not support both EBCDIC and UTF-8/16 at the same time. The "configure"
82    script prevents both being selected, but not everybody uses "configure". */
83    
84    #if defined EBCDIC && defined SUPPORT_UTF
85    #error The use of both EBCDIC and SUPPORT_UTF8/16 is not supported.
86    #endif
87    
88  /* 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
89  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
90  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 158  set, we ensure here that it has no effec Line 178  set, we ensure here that it has no effec
178  #define PCRE_CALL_CONVENTION  #define PCRE_CALL_CONVENTION
179  #endif  #endif
180    
181  /* 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
182  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
183  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
184  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
185  preprocessor time in standard C environments. */  preprocessor time in standard C environments. */
186    
187    typedef unsigned char pcre_uint8;
188    
189  #if USHRT_MAX == 65535  #if USHRT_MAX == 65535
190    typedef unsigned short pcre_uint16;    typedef unsigned short pcre_uint16;
191    typedef short pcre_int16;    typedef short pcre_int16;
# Line 206  by "configure". */ Line 228  by "configure". */
228    
229  /* All character handling must be done as unsigned characters. Otherwise there  /* All character handling must be done as unsigned characters. Otherwise there
230  are problems with top-bit-set characters and functions such as isspace().  are problems with top-bit-set characters and functions such as isspace().
231  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 *,
232  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
233  to save lots of typing. I tried "uchar", but it causes problems on Digital  called pcre_uchar.
234  Unix, where it is defined in sys/types, so use "uschar" instead. */  
235    The IN_UCHARS macro multiply its argument with the byte size of the current
236    pcre_uchar type. Useful for memcpy and such operations, whose require the
237    byte size of their input/output buffers.
238    
239    The MAX_255 macro checks whether its pcre_uchar input is less than 256.
240    
241    The TABLE_GET macro is designed for accessing elements of tables whose contain
242    exactly 256 items. When the character is able to contain more than 256
243    items, some check is needed before accessing these tables.
244    */
245    
246  typedef unsigned char uschar;  #ifdef COMPILE_PCRE8
247    
248    typedef unsigned char pcre_uchar;
249    #define IN_UCHARS(x) (x)
250    #define MAX_255(c) 1
251    #define TABLE_GET(c, table, default) ((table)[c])
252    
253    #else
254    
255    #ifdef COMPILE_PCRE16
256    #if USHRT_MAX != 65535
257    /* This is a warning message. Change PCRE_UCHAR16 to a 16 bit data type in
258    pcre.h(.in) and disable (comment out) this message. */
259    #error Warning: PCRE_UCHAR16 is not a 16 bit data type.
260    #endif
261    
262    typedef pcre_uint16 pcre_uchar;
263    #define IN_UCHARS(x) ((x) << 1)
264    #define MAX_255(c) ((c) <= 255u)
265    #define TABLE_GET(c, table, default) (MAX_255(c)? ((table)[c]):(default))
266    
267    #else
268    #error Unsupported compiling mode
269    #endif /* COMPILE_PCRE16 */
270    
271    #endif /* COMPILE_PCRE8 */
272    
273  /* 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
274  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 291  start/end of string field names are. */
291  #define IS_NEWLINE(p) \  #define IS_NEWLINE(p) \
292    ((NLBLOCK->nltype != NLTYPE_FIXED)? \    ((NLBLOCK->nltype != NLTYPE_FIXED)? \
293      ((p) < NLBLOCK->PSEND && \      ((p) < NLBLOCK->PSEND && \
294       _pcre_is_newline((p), NLBLOCK->nltype, NLBLOCK->PSEND, &(NLBLOCK->nllen),\       PRIV(is_newline)((p), NLBLOCK->nltype, NLBLOCK->PSEND, \
295         utf8)) \         &(NLBLOCK->nllen), utf)) \
296      : \      : \
297      ((p) <= NLBLOCK->PSEND - NLBLOCK->nllen && \      ((p) <= NLBLOCK->PSEND - NLBLOCK->nllen && \
298       (p)[0] == NLBLOCK->nl[0] && \       (p)[0] == NLBLOCK->nl[0] && \
# Line 248  start/end of string field names are. */ Line 305  start/end of string field names are. */
305  #define WAS_NEWLINE(p) \  #define WAS_NEWLINE(p) \
306    ((NLBLOCK->nltype != NLTYPE_FIXED)? \    ((NLBLOCK->nltype != NLTYPE_FIXED)? \
307      ((p) > NLBLOCK->PSSTART && \      ((p) > NLBLOCK->PSSTART && \
308       _pcre_was_newline((p), NLBLOCK->nltype, NLBLOCK->PSSTART, \       PRIV(was_newline)((p), NLBLOCK->nltype, NLBLOCK->PSSTART, \
309         &(NLBLOCK->nllen), utf8)) \         &(NLBLOCK->nllen), utf)) \
310      : \      : \
311      ((p) >= NLBLOCK->PSSTART + NLBLOCK->nllen && \      ((p) >= NLBLOCK->PSSTART + NLBLOCK->nllen && \
312       (p)[-NLBLOCK->nllen] == NLBLOCK->nl[0] && \       (p)[-NLBLOCK->nllen] == NLBLOCK->nl[0] && \
# Line 267  used for the external interface and appe Line 324  used for the external interface and appe
324  must begin with PCRE_. */  must begin with PCRE_. */
325    
326  #ifdef CUSTOM_SUBJECT_PTR  #ifdef CUSTOM_SUBJECT_PTR
327  #define PCRE_SPTR CUSTOM_SUBJECT_PTR  #define PCRE_PUCHAR CUSTOM_SUBJECT_PTR
 #define USPTR CUSTOM_SUBJECT_PTR  
328  #else  #else
329  #define PCRE_SPTR const char *  #define PCRE_PUCHAR const pcre_uchar *
 #define USPTR const unsigned char *  
330  #endif  #endif
331    
   
   
332  /* Include the public PCRE header and the definitions of UCP character property  /* Include the public PCRE header and the definitions of UCP character property
333  values. */  values. */
334    
# Line 343  The macros are controlled by the value o Line 396  The macros are controlled by the value o
396  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
397  is automated on Unix systems via the "configure" command. */  is automated on Unix systems via the "configure" command. */
398    
399    #ifdef COMPILE_PCRE8
400    
401  #if LINK_SIZE == 2  #if LINK_SIZE == 2
402    
403  #define PUT(a,n,d)   \  #define PUT(a,n,d)   \
# Line 379  is automated on Unix systems via the "co Line 434  is automated on Unix systems via the "co
434  #define GET(a,n) \  #define GET(a,n) \
435    (((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])
436    
437  #define MAX_PATTERN_SIZE (1 << 30)   /* Keep it positive */  /* Keep it positive */
438    #define MAX_PATTERN_SIZE (1 << 30)
439    
440    #else
441    #error LINK_SIZE must be either 2, 3, or 4
442    #endif
443    
444    #else /* COMPILE_PCRE8 */
445    
446    #ifdef COMPILE_PCRE16
447    
448    #if LINK_SIZE == 2
449    
450    #undef LINK_SIZE
451    #define LINK_SIZE 1
452    
453    #define PUT(a,n,d)   \
454      (a[n] = (d))
455    
456    #define GET(a,n) \
457      (a[n])
458    
459    #define MAX_PATTERN_SIZE (1 << 16)
460    
461    #elif LINK_SIZE == 3 || LINK_SIZE == 4
462    
463    #undef LINK_SIZE
464    #define LINK_SIZE 2
465    
466    #define PUT(a,n,d)   \
467      (a[n] = (d) >> 16), \
468      (a[(n)+1] = (d) & 65535)
469    
470    #define GET(a,n) \
471      (((a)[n] << 16) | (a)[(n)+1])
472    
473    /* Keep it positive */
474    #define MAX_PATTERN_SIZE (1 << 30)
475    
476  #else  #else
477  #error LINK_SIZE must be either 2, 3, or 4  #error LINK_SIZE must be either 2, 3, or 4
478  #endif  #endif
479    
480    #else
481    #error Unsupported compiling mode
482    #endif /* COMPILE_PCRE16 */
483    
484    #endif /* COMPILE_PCRE8 */
485    
486  /* Convenience macro defined in terms of the others */  /* Convenience macro defined in terms of the others */
487    
# Line 396  is automated on Unix systems via the "co Line 492  is automated on Unix systems via the "co
492  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
493  capturing parenthesis numbers in back references. */  capturing parenthesis numbers in back references. */
494    
495    #ifdef COMPILE_PCRE8
496    
497    #define IMM2_SIZE 2
498    
499  #define PUT2(a,n,d)   \  #define PUT2(a,n,d)   \
500    a[n] = (d) >> 8; \    a[n] = (d) >> 8; \
501    a[(n)+1] = (d) & 255    a[(n)+1] = (d) & 255
# Line 403  capturing parenthesis numbers in back re Line 503  capturing parenthesis numbers in back re
503  #define GET2(a,n) \  #define GET2(a,n) \
504    (((a)[n] << 8) | (a)[(n)+1])    (((a)[n] << 8) | (a)[(n)+1])
505    
506  #define PUT2INC(a,n,d)  PUT2(a,n,d), a += 2  #else /* COMPILE_PCRE8 */
507    
508    #ifdef COMPILE_PCRE16
509    
510  /* When UTF-8 encoding is being used, a character is no longer just a single  #define IMM2_SIZE 1
511  byte. The macros for character handling generate simple sequences when used in  
512  byte-mode, and more complicated ones for UTF-8 characters. BACKCHAR should  #define PUT2(a,n,d)   \
513  never be called in byte mode. To make sure it can never even appear when UTF-8     a[n] = d
514  support is omitted, we don't even define it. */  
515    #define GET2(a,n) \
516       a[n]
517    
518    #else
519    #error Unsupported compiling mode
520    #endif /* COMPILE_PCRE16 */
521    
522    #endif /* COMPILE_PCRE8 */
523    
524    #define PUT2INC(a,n,d)  PUT2(a,n,d), a += IMM2_SIZE
525    
526    /* The maximum length of a MARK name is currently one data unit; it may be
527    changed in future to be a fixed number of bytes or to depend on LINK_SIZE. */
528    
529    #define MAX_MARK ((1 << (sizeof(pcre_uchar)*8)) - 1)
530    
531  #ifndef SUPPORT_UTF8  /* When UTF encoding is being used, a character is no longer just a single
532    byte. The macros for character handling generate simple sequences when used in
533    character-mode, and more complicated ones for UTF characters. GETCHARLENTEST
534    and other macros are not used when UTF is not supported, so they are not
535    defined. To make sure they can never even appear when UTF support is omitted,
536    we don't even define them. */
537    
538    #ifndef SUPPORT_UTF
539    
540    /* #define MAX_VALUE_FOR_SINGLE_CHAR */
541    /* #define HAS_EXTRALEN(c) */
542    /* #define GET_EXTRALEN(c) */
543    /* #define NOT_FIRSTCHAR(c) */
544  #define GETCHAR(c, eptr) c = *eptr;  #define GETCHAR(c, eptr) c = *eptr;
545  #define GETCHARTEST(c, eptr) c = *eptr;  #define GETCHARTEST(c, eptr) c = *eptr;
546  #define GETCHARINC(c, eptr) c = *eptr++;  #define GETCHARINC(c, eptr) c = *eptr++;
547  #define GETCHARINCTEST(c, eptr) c = *eptr++;  #define GETCHARINCTEST(c, eptr) c = *eptr++;
548  #define GETCHARLEN(c, eptr, len) c = *eptr;  #define GETCHARLEN(c, eptr, len) c = *eptr;
549    /* #define GETCHARLENTEST(c, eptr, len) */
550  /* #define BACKCHAR(eptr) */  /* #define BACKCHAR(eptr) */
551    /* #define FORWARDCHAR(eptr) */
552    /* #define ACROSSCHAR(condition, eptr, action) */
553    
554    #else   /* SUPPORT_UTF */
555    
556    #ifdef COMPILE_PCRE8
557    
558    /* These macros were originally written in the form of loops that used data
559    from the tables whose names start with PRIV(utf8_table). They were rewritten by
560    a user so as not to use loops, because in some environments this gives a
561    significant performance advantage, and it seems never to do any harm. */
562    
563    /* Tells the biggest code point which can be encoded as a single character. */
564    
565    #define MAX_VALUE_FOR_SINGLE_CHAR 127
566    
567    /* Tests whether the code point needs extra characters to decode. */
568    
569    #define HAS_EXTRALEN(c) ((c) >= 0xc0)
570    
571  #else   /* SUPPORT_UTF8 */  /* Returns with the additional number of characters if IS_MULTICHAR(c) is TRUE.
572    Otherwise it has an undefined behaviour. */
573    
574    #define GET_EXTRALEN(c) (PRIV(utf8_table4)[(c) & 0x3f])
575    
576    /* Returns TRUE, if the given character is not the first character
577    of a UTF sequence. */
578    
579    #define NOT_FIRSTCHAR(c) (((c) & 0xc0) == 0x80)
580    
581    /* Base macro to pick up the remaining bytes of a UTF-8 character, not
582    advancing the pointer. */
583    
584    #define GETUTF8(c, eptr) \
585        { \
586        if ((c & 0x20) == 0) \
587          c = ((c & 0x1f) << 6) | (eptr[1] & 0x3f); \
588        else if ((c & 0x10) == 0) \
589          c = ((c & 0x0f) << 12) | ((eptr[1] & 0x3f) << 6) | (eptr[2] & 0x3f); \
590        else if ((c & 0x08) == 0) \
591          c = ((c & 0x07) << 18) | ((eptr[1] & 0x3f) << 12) | \
592          ((eptr[2] & 0x3f) << 6) | (eptr[3] & 0x3f); \
593        else if ((c & 0x04) == 0) \
594          c = ((c & 0x03) << 24) | ((eptr[1] & 0x3f) << 18) | \
595              ((eptr[2] & 0x3f) << 12) | ((eptr[3] & 0x3f) << 6) | \
596              (eptr[4] & 0x3f); \
597        else \
598          c = ((c & 0x01) << 30) | ((eptr[1] & 0x3f) << 24) | \
599              ((eptr[2] & 0x3f) << 18) | ((eptr[3] & 0x3f) << 12) | \
600              ((eptr[4] & 0x3f) << 6) | (eptr[5] & 0x3f); \
601        }
602    
603  /* Get the next UTF-8 character, not advancing the pointer. This is called when  /* Get the next UTF-8 character, not advancing the pointer. This is called when
604  we know we are in UTF-8 mode. */  we know we are in UTF-8 mode. */
605    
606  #define GETCHAR(c, eptr) \  #define GETCHAR(c, eptr) \
607    c = *eptr; \    c = *eptr; \
608    if (c >= 0xc0) \    if (c >= 0xc0) GETUTF8(c, eptr);
     { \  
     int gcii; \  
     int gcaa = _pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */ \  
     int gcss = 6*gcaa; \  
     c = (c & _pcre_utf8_table3[gcaa]) << gcss; \  
     for (gcii = 1; gcii <= gcaa; gcii++) \  
       { \  
       gcss -= 6; \  
       c |= (eptr[gcii] & 0x3f) << gcss; \  
       } \  
     }  
609    
610  /* Get the next UTF-8 character, testing for UTF-8 mode, and not advancing the  /* Get the next UTF-8 character, testing for UTF-8 mode, and not advancing the
611  pointer. */  pointer. */
612    
613  #define GETCHARTEST(c, eptr) \  #define GETCHARTEST(c, eptr) \
614    c = *eptr; \    c = *eptr; \
615    if (utf8 && c >= 0xc0) \    if (utf && c >= 0xc0) GETUTF8(c, eptr);
616    
617    /* Base macro to pick up the remaining bytes of a UTF-8 character, advancing
618    the pointer. */
619    
620    #define GETUTF8INC(c, eptr) \
621      { \      { \
622      int gcii; \      if ((c & 0x20) == 0) \
623      int gcaa = _pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */ \        c = ((c & 0x1f) << 6) | (*eptr++ & 0x3f); \
624      int gcss = 6*gcaa; \      else if ((c & 0x10) == 0) \
625      c = (c & _pcre_utf8_table3[gcaa]) << gcss; \        { \
626      for (gcii = 1; gcii <= gcaa; gcii++) \        c = ((c & 0x0f) << 12) | ((*eptr & 0x3f) << 6) | (eptr[1] & 0x3f); \
627          eptr += 2; \
628          } \
629        else if ((c & 0x08) == 0) \
630        { \        { \
631        gcss -= 6; \        c = ((c & 0x07) << 18) | ((*eptr & 0x3f) << 12) | \
632        c |= (eptr[gcii] & 0x3f) << gcss; \            ((eptr[1] & 0x3f) << 6) | (eptr[2] & 0x3f); \
633          eptr += 3; \
634          } \
635        else if ((c & 0x04) == 0) \
636          { \
637          c = ((c & 0x03) << 24) | ((*eptr & 0x3f) << 18) | \
638              ((eptr[1] & 0x3f) << 12) | ((eptr[2] & 0x3f) << 6) | \
639              (eptr[3] & 0x3f); \
640          eptr += 4; \
641          } \
642        else \
643          { \
644          c = ((c & 0x01) << 30) | ((*eptr & 0x3f) << 24) | \
645              ((eptr[1] & 0x3f) << 18) | ((eptr[2] & 0x3f) << 12) | \
646              ((eptr[3] & 0x3f) << 6) | (eptr[4] & 0x3f); \
647          eptr += 5; \
648        } \        } \
649      }      }
650    
# Line 463  know we are in UTF-8 mode. */ Line 653  know we are in UTF-8 mode. */
653    
654  #define GETCHARINC(c, eptr) \  #define GETCHARINC(c, eptr) \
655    c = *eptr++; \    c = *eptr++; \
656    if (c >= 0xc0) \    if (c >= 0xc0) GETUTF8INC(c, eptr);
     { \  
     int gcaa = _pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */ \  
     int gcss = 6*gcaa; \  
     c = (c & _pcre_utf8_table3[gcaa]) << gcss; \  
     while (gcaa-- > 0) \  
       { \  
       gcss -= 6; \  
       c |= (*eptr++ & 0x3f) << gcss; \  
       } \  
     }  
657    
658  /* Get the next character, testing for UTF-8 mode, and advancing the pointer */  /* Get the next character, testing for UTF-8 mode, and advancing the pointer.
659    This is called when we don't know if we are in UTF-8 mode. */
660    
661  #define GETCHARINCTEST(c, eptr) \  #define GETCHARINCTEST(c, eptr) \
662    c = *eptr++; \    c = *eptr++; \
663    if (utf8 && c >= 0xc0) \    if (utf && c >= 0xc0) GETUTF8INC(c, eptr);
664    
665    /* Base macro to pick up the remaining bytes of a UTF-8 character, not
666    advancing the pointer, incrementing the length. */
667    
668    #define GETUTF8LEN(c, eptr, len) \
669      { \      { \
670      int gcaa = _pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */ \      if ((c & 0x20) == 0) \
671      int gcss = 6*gcaa; \        { \
672      c = (c & _pcre_utf8_table3[gcaa]) << gcss; \        c = ((c & 0x1f) << 6) | (eptr[1] & 0x3f); \
673      while (gcaa-- > 0) \        len++; \
674          } \
675        else if ((c & 0x10)  == 0) \
676        { \        { \
677        gcss -= 6; \        c = ((c & 0x0f) << 12) | ((eptr[1] & 0x3f) << 6) | (eptr[2] & 0x3f); \
678        c |= (*eptr++ & 0x3f) << gcss; \        len += 2; \
679          } \
680        else if ((c & 0x08)  == 0) \
681          {\
682          c = ((c & 0x07) << 18) | ((eptr[1] & 0x3f) << 12) | \
683              ((eptr[2] & 0x3f) << 6) | (eptr[3] & 0x3f); \
684          len += 3; \
685          } \
686        else if ((c & 0x04)  == 0) \
687          { \
688          c = ((c & 0x03) << 24) | ((eptr[1] & 0x3f) << 18) | \
689              ((eptr[2] & 0x3f) << 12) | ((eptr[3] & 0x3f) << 6) | \
690              (eptr[4] & 0x3f); \
691          len += 4; \
692          } \
693        else \
694          {\
695          c = ((c & 0x01) << 30) | ((eptr[1] & 0x3f) << 24) | \
696              ((eptr[2] & 0x3f) << 18) | ((eptr[3] & 0x3f) << 12) | \
697              ((eptr[4] & 0x3f) << 6) | (eptr[5] & 0x3f); \
698          len += 5; \
699        } \        } \
700      }      }
701    
# Line 496  if there are extra bytes. This is called Line 704  if there are extra bytes. This is called
704    
705  #define GETCHARLEN(c, eptr, len) \  #define GETCHARLEN(c, eptr, len) \
706    c = *eptr; \    c = *eptr; \
707    if (c >= 0xc0) \    if (c >= 0xc0) GETUTF8LEN(c, eptr, len);
     { \  
     int gcii; \  
     int gcaa = _pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */ \  
     int gcss = 6*gcaa; \  
     c = (c & _pcre_utf8_table3[gcaa]) << gcss; \  
     for (gcii = 1; gcii <= gcaa; gcii++) \  
       { \  
       gcss -= 6; \  
       c |= (eptr[gcii] & 0x3f) << gcss; \  
       } \  
     len += gcaa; \  
     }  
708    
709  /* Get the next UTF-8 character, testing for UTF-8 mode, not advancing the  /* Get the next UTF-8 character, testing for UTF-8 mode, not advancing the
710  pointer, incrementing length if there are extra bytes. This is called when we  pointer, incrementing length if there are extra bytes. This is called when we
711  know we are in UTF-8 mode. */  do not know if we are in UTF-8 mode. */
712    
713  #define GETCHARLENTEST(c, eptr, len) \  #define GETCHARLENTEST(c, eptr, len) \
714    c = *eptr; \    c = *eptr; \
715    if (utf8 && c >= 0xc0) \    if (utf && c >= 0xc0) GETUTF8LEN(c, eptr, len);
     { \  
     int gcii; \  
     int gcaa = _pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */ \  
     int gcss = 6*gcaa; \  
     c = (c & _pcre_utf8_table3[gcaa]) << gcss; \  
     for (gcii = 1; gcii <= gcaa; gcii++) \  
       { \  
       gcss -= 6; \  
       c |= (eptr[gcii] & 0x3f) << gcss; \  
       } \  
     len += gcaa; \  
     }  
716    
717  /* 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
718  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 536  because almost all calls are already wit Line 720  because almost all calls are already wit
720    
721  #define BACKCHAR(eptr) while((*eptr & 0xc0) == 0x80) eptr--  #define BACKCHAR(eptr) while((*eptr & 0xc0) == 0x80) eptr--
722    
723  #endif  /* Same as above, just in the other direction. */
724    #define FORWARDCHAR(eptr) while((*eptr & 0xc0) == 0x80) eptr++
725    
726    /* Same as above, but it allows a fully customizable form. */
727    #define ACROSSCHAR(condition, eptr, action) \
728      while((condition) && ((eptr) & 0xc0) == 0x80) action
729    
730    #else /* COMPILE_PCRE8 */
731    
732    #ifdef COMPILE_PCRE16
733    
734    /* Tells the biggest code point which can be encoded as a single character. */
735    
736    #define MAX_VALUE_FOR_SINGLE_CHAR 65535
737    
738    /* Tests whether the code point needs extra characters to decode. */
739    
740    #define HAS_EXTRALEN(c) (((c) & 0xfc00) == 0xd800)
741    
742    /* Returns with the additional number of characters if IS_MULTICHAR(c) is TRUE.
743    Otherwise it has an undefined behaviour. */
744    
745    #define GET_EXTRALEN(c) 1
746    
747    /* Returns TRUE, if the given character is not the first character
748    of a UTF sequence. */
749    
750    #define NOT_FIRSTCHAR(c) (((c) & 0xfc00) == 0xdc00)
751    
752    /* Base macro to pick up the low surrogate of a UTF-16 character, not
753    advancing the pointer. */
754    
755    #define GETUTF16(c, eptr) \
756       { c = (((c & 0x3ff) << 10) | (eptr[1] & 0x3ff)) + 0x10000; }
757    
758    /* Get the next UTF-16 character, not advancing the pointer. This is called when
759    we know we are in UTF-16 mode. */
760    
761    #define GETCHAR(c, eptr) \
762      c = *eptr; \
763      if ((c & 0xfc00) == 0xd800) GETUTF16(c, eptr);
764    
765    /* Get the next UTF-16 character, testing for UTF-16 mode, and not advancing the
766    pointer. */
767    
768    #define GETCHARTEST(c, eptr) \
769      c = *eptr; \
770      if (utf && (c & 0xfc00) == 0xd800) GETUTF16(c, eptr);
771    
772    /* Base macro to pick up the low surrogate of a UTF-16 character, advancing
773    the pointer. */
774    
775    #define GETUTF16INC(c, eptr) \
776       { c = (((c & 0x3ff) << 10) | (*eptr++ & 0x3ff)) + 0x10000; }
777    
778    /* Get the next UTF-16 character, advancing the pointer. This is called when we
779    know we are in UTF-16 mode. */
780    
781    #define GETCHARINC(c, eptr) \
782      c = *eptr++; \
783      if ((c & 0xfc00) == 0xd800) GETUTF16INC(c, eptr);
784    
785    /* Get the next character, testing for UTF-16 mode, and advancing the pointer.
786    This is called when we don't know if we are in UTF-16 mode. */
787    
788    #define GETCHARINCTEST(c, eptr) \
789      c = *eptr++; \
790      if (utf && (c & 0xfc00) == 0xd800) GETUTF16INC(c, eptr);
791    
792    /* Base macro to pick up the low surrogate of a UTF-16 character, not
793    advancing the pointer, incrementing the length. */
794    
795    #define GETUTF16LEN(c, eptr, len) \
796       { c = (((c & 0x3ff) << 10) | (eptr[1] & 0x3ff)) + 0x10000; len++; }
797    
798    /* Get the next UTF-16 character, not advancing the pointer, incrementing
799    length if there is a low surrogate. This is called when we know we are in
800    UTF-16 mode. */
801    
802    #define GETCHARLEN(c, eptr, len) \
803      c = *eptr; \
804      if ((c & 0xfc00) == 0xd800) GETUTF16LEN(c, eptr, len);
805    
806    /* Get the next UTF-816character, testing for UTF-16 mode, not advancing the
807    pointer, incrementing length if there is a low surrogate. This is called when
808    we do not know if we are in UTF-16 mode. */
809    
810    #define GETCHARLENTEST(c, eptr, len) \
811      c = *eptr; \
812      if (utf && (c & 0xfc00) == 0xd800) GETUTF16LEN(c, eptr, len);
813    
814    /* If the pointer is not at the start of a character, move it back until
815    it is. This is called only in UTF-16 mode - we don't put a test within the
816    macro because almost all calls are already within a block of UTF-16 only
817    code. */
818    
819    #define BACKCHAR(eptr) if ((*eptr & 0xfc00) == 0xdc00) eptr--
820    
821    /* Same as above, just in the other direction. */
822    #define FORWARDCHAR(eptr) if ((*eptr & 0xfc00) == 0xdc00) eptr++
823    
824    /* Same as above, but it allows a fully customizable form. */
825    #define ACROSSCHAR(condition, eptr, action) \
826      if ((condition) && ((eptr) & 0xfc00) == 0xdc00) action
827    
828    #endif
829    
830    #endif /* COMPILE_PCRE8 */
831    
832    #endif  /* SUPPORT_UTF */
833    
834    
835    /* Tests for Unicode horizontal and vertical whitespace characters must check a
836    number of different values. Using a switch statement for this generates the
837    fastest code (no loop, no memory access), and there are several places in the
838    interpreter code where this happens. In order to ensure that all the case lists
839    remain in step, we use macros so that there is only one place where the lists
840    are defined.
841    
842    These values are also required as lists in pcre_compile.c when processing \h,
843    \H, \v and \V in a character class. The lists are defined in pcre_tables.c, but
844    macros that define the values are here so that all the definitions are
845    together. The lists must be in ascending character order, terminated by
846    NOTACHAR (which is 0xffffffff).
847    
848    Any changes should ensure that the various macros are kept in step with each
849    other. NOTE: The values also appear in pcre_jit_compile.c. */
850    
851    /* ------ ASCII/Unicode environments ------ */
852    
853    #ifndef EBCDIC
854    
855    #define HSPACE_LIST \
856      CHAR_HT, CHAR_SPACE, 0xa0, \
857      0x1680, 0x180e, 0x2000, 0x2001, 0x2002, 0x2003, 0x2004, 0x2005, \
858      0x2006, 0x2007, 0x2008, 0x2009, 0x200A, 0x202f, 0x205f, 0x3000, \
859      NOTACHAR
860    
861    #define HSPACE_MULTIBYTE_CASES \
862      case 0x1680:  /* OGHAM SPACE MARK */ \
863      case 0x180e:  /* MONGOLIAN VOWEL SEPARATOR */ \
864      case 0x2000:  /* EN QUAD */ \
865      case 0x2001:  /* EM QUAD */ \
866      case 0x2002:  /* EN SPACE */ \
867      case 0x2003:  /* EM SPACE */ \
868      case 0x2004:  /* THREE-PER-EM SPACE */ \
869      case 0x2005:  /* FOUR-PER-EM SPACE */ \
870      case 0x2006:  /* SIX-PER-EM SPACE */ \
871      case 0x2007:  /* FIGURE SPACE */ \
872      case 0x2008:  /* PUNCTUATION SPACE */ \
873      case 0x2009:  /* THIN SPACE */ \
874      case 0x200A:  /* HAIR SPACE */ \
875      case 0x202f:  /* NARROW NO-BREAK SPACE */ \
876      case 0x205f:  /* MEDIUM MATHEMATICAL SPACE */ \
877      case 0x3000   /* IDEOGRAPHIC SPACE */
878    
879    #define HSPACE_BYTE_CASES \
880      case CHAR_HT: \
881      case CHAR_SPACE: \
882      case 0xa0     /* NBSP */
883    
884    #define HSPACE_CASES \
885      HSPACE_BYTE_CASES: \
886      HSPACE_MULTIBYTE_CASES
887    
888    #define VSPACE_LIST \
889      CHAR_LF, CHAR_VT, CHAR_FF, CHAR_CR, CHAR_NEL, 0x2028, 0x2029, NOTACHAR
890    
891    #define VSPACE_MULTIBYTE_CASES \
892      case 0x2028:    /* LINE SEPARATOR */ \
893      case 0x2029     /* PARAGRAPH SEPARATOR */
894    
895    #define VSPACE_BYTE_CASES \
896      case CHAR_LF: \
897      case CHAR_VT: \
898      case CHAR_FF: \
899      case CHAR_CR: \
900      case CHAR_NEL
901    
902    #define VSPACE_CASES \
903      VSPACE_BYTE_CASES: \
904      VSPACE_MULTIBYTE_CASES
905    
906    /* ------ EBCDIC environments ------ */
907    
908    #else
909    #define HSPACE_LIST CHAR_HT, CHAR_SPACE
910    
911    #define HSPACE_BYTE_CASES \
912      case CHAR_HT: \
913      case CHAR_SPACE
914    
915    #define HSPACE_CASES HSPACE_BYTE_CASES
916    
917    #ifdef EBCDIC_NL25
918    #define VSPACE_LIST \
919      CHAR_VT, CHAR_FF, CHAR_CR, CHAR_NEL, CHAR_LF, NOTACHAR
920    #else
921    #define VSPACE_LIST \
922      CHAR_VT, CHAR_FF, CHAR_CR, CHAR_LF, CHAR_NEL, NOTACHAR
923    #endif
924    
925    #define VSPACE_BYTE_CASES \
926      case CHAR_LF: \
927      case CHAR_VT: \
928      case CHAR_FF: \
929      case CHAR_CR: \
930      case CHAR_NEL
931    
932    #define VSPACE_CASES VSPACE_BYTE_CASES
933    #endif  /* EBCDIC */
934    
935    /* ------ End of whitespace macros ------ */
936    
937    
938  /* In case there is no definition of offsetof() provided - though any proper  /* In case there is no definition of offsetof() provided - though any proper
# Line 547  Standard C system should have one. */ Line 943  Standard C system should have one. */
943  #endif  #endif
944    
945    
 /* These are the public options that can change during matching. */  
   
 #define PCRE_IMS (PCRE_CASELESS|PCRE_MULTILINE|PCRE_DOTALL)  
   
946  /* Private flags containing information about the compiled regex. They used to  /* Private flags containing information about the compiled regex. They used to
947  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
948  are in a 16-bit flags word. From release 8.00, PCRE_NOPARTIAL is unused, as  are in a 16-bit flags word. From release 8.00, PCRE_NOPARTIAL is unused, as
949  the restrictions on partial matching have been lifted. It remains for backwards  the restrictions on partial matching have been lifted. It remains for backwards
950  compatibility. */  compatibility. */
951    
952  #define PCRE_NOPARTIAL     0x0001  /* can't use partial with this regex */  #ifdef COMPILE_PCRE8
953  #define PCRE_FIRSTSET      0x0002  /* first_byte is set */  #define PCRE_MODE          0x0001  /* compiled in 8 bit mode */
954  #define PCRE_REQCHSET      0x0004  /* req_byte is set */  #endif
955  #define PCRE_STARTLINE     0x0008  /* start after \n for multiline */  #ifdef COMPILE_PCRE16
956  #define PCRE_JCHANGED      0x0010  /* j option used in regex */  #define PCRE_MODE          0x0002  /* compiled in 16 bit mode */
957  #define PCRE_HASCRORLF     0x0020  /* explicit \r or \n in pattern */  #endif
958    #define PCRE_FIRSTSET      0x0010  /* first_char is set */
959    #define PCRE_FCH_CASELESS  0x0020  /* caseless first char */
960    #define PCRE_REQCHSET      0x0040  /* req_byte is set */
961    #define PCRE_RCH_CASELESS  0x0080  /* caseless requested char */
962    #define PCRE_STARTLINE     0x0100  /* start after \n for multiline */
963    #define PCRE_NOPARTIAL     0x0200  /* can't use partial with this regex */
964    #define PCRE_JCHANGED      0x0400  /* j option used in regex */
965    #define PCRE_HASCRORLF     0x0800  /* explicit \r or \n in pattern */
966    #define PCRE_HASTHEN       0x1000  /* pattern contains (*THEN) */
967    
968  /* Options for the "extra" block produced by pcre_study(). */  /* Flags for the "extra" block produced by pcre_study(). */
969    
970  #define PCRE_STUDY_MAPPED   0x01     /* a map of starting chars exists */  #define PCRE_STUDY_MAPPED  0x0001  /* a map of starting chars exists */
971  #define PCRE_STUDY_MINLEN   0x02     /* a minimum length field exists */  #define PCRE_STUDY_MINLEN  0x0002  /* a minimum length field exists */
972    
973  /* Masks for identifying the public options that are permitted at compile  /* Masks for identifying the public options that are permitted at compile
974  time, run time, or study time, respectively. */  time, run time, or study time, respectively. */
# Line 580  time, run time, or study time, respectiv Line 981  time, run time, or study time, respectiv
981     PCRE_DOTALL|PCRE_DOLLAR_ENDONLY|PCRE_EXTRA|PCRE_UNGREEDY|PCRE_UTF8| \     PCRE_DOTALL|PCRE_DOLLAR_ENDONLY|PCRE_EXTRA|PCRE_UNGREEDY|PCRE_UTF8| \
982     PCRE_NO_AUTO_CAPTURE|PCRE_NO_UTF8_CHECK|PCRE_AUTO_CALLOUT|PCRE_FIRSTLINE| \     PCRE_NO_AUTO_CAPTURE|PCRE_NO_UTF8_CHECK|PCRE_AUTO_CALLOUT|PCRE_FIRSTLINE| \
983     PCRE_DUPNAMES|PCRE_NEWLINE_BITS|PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE| \     PCRE_DUPNAMES|PCRE_NEWLINE_BITS|PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE| \
984     PCRE_JAVASCRIPT_COMPAT)     PCRE_JAVASCRIPT_COMPAT|PCRE_UCP|PCRE_NO_START_OPTIMIZE)
985    
986  #define PUBLIC_EXEC_OPTIONS \  #define PUBLIC_EXEC_OPTIONS \
987    (PCRE_ANCHORED|PCRE_NOTBOL|PCRE_NOTEOL|PCRE_NOTEMPTY|PCRE_NOTEMPTY_ATSTART| \    (PCRE_ANCHORED|PCRE_NOTBOL|PCRE_NOTEOL|PCRE_NOTEMPTY|PCRE_NOTEMPTY_ATSTART| \
# Line 593  time, run time, or study time, respectiv Line 994  time, run time, or study time, respectiv
994     PCRE_DFA_RESTART|PCRE_NEWLINE_BITS|PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE| \     PCRE_DFA_RESTART|PCRE_NEWLINE_BITS|PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE| \
995     PCRE_NO_START_OPTIMIZE)     PCRE_NO_START_OPTIMIZE)
996    
997  #define PUBLIC_STUDY_OPTIONS 0   /* None defined */  #define PUBLIC_STUDY_OPTIONS \
998       (PCRE_STUDY_JIT_COMPILE|PCRE_STUDY_JIT_PARTIAL_SOFT_COMPILE| \
999        PCRE_STUDY_JIT_PARTIAL_HARD_COMPILE|PCRE_STUDY_EXTRA_NEEDED)
1000    
1001  /* 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. */  
1002    
1003  #define MAGIC_NUMBER  0x50435245UL   /* 'PCRE' */  #define MAGIC_NUMBER  0x50435245UL   /* 'PCRE' */
1004    
1005    /* This variable is used to detect a loaded regular expression
1006    in different endianness. */
1007    
1008    #define REVERSED_MAGIC_NUMBER  0x45524350UL   /* 'ERCP' */
1009    
1010  /* Negative values for the firstchar and reqchar variables */  /* Negative values for the firstchar and reqchar variables */
1011    
1012  #define REQ_UNSET (-2)  #define REQ_UNSET (-2)
# Line 610  req_byte match. */ Line 1017  req_byte match. */
1017    
1018  #define REQ_BYTE_MAX 1000  #define REQ_BYTE_MAX 1000
1019    
 /* 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 */  
   
1020  /* Miscellaneous definitions. The #ifndef is to pacify compiler warnings in  /* Miscellaneous definitions. The #ifndef is to pacify compiler warnings in
1021  environments where these macros are defined elsewhere. Unfortunately, there  environments where these macros are defined elsewhere. Unfortunately, there
1022  is no way to do the same for the typedef. */  is no way to do the same for the typedef. */
# Line 644  for) in a minority area (EBCDIC platform Line 1045  for) in a minority area (EBCDIC platform
1045  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
1046  macros to give the functions distinct names. */  macros to give the functions distinct names. */
1047    
1048  #ifndef SUPPORT_UTF8  #ifndef SUPPORT_UTF
1049    
1050  /* UTF-8 support is not enabled; use the platform-dependent character literals  /* UTF-8 support is not enabled; use the platform-dependent character literals
1051  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
1052    mode. Newline characters are problematic in EBCDIC. Though it has CR and LF
1053    characters, a common practice has been to use its NL (0x15) character as the
1054    line terminator in C-like processing environments. However, sometimes the LF
1055    (0x25) character is used instead, according to this Unicode document:
1056    
1057    http://unicode.org/standard/reports/tr13/tr13-5.html
1058    
1059    PCRE defaults EBCDIC NL to 0x15, but has a build-time option to select 0x25
1060    instead. Whichever is *not* chosen is defined as NEL.
1061    
1062    In both ASCII and EBCDIC environments, CHAR_NL and CHAR_LF are synonyms for the
1063    same code point. */
1064    
1065    #ifdef EBCDIC
1066    
1067    #ifndef EBCDIC_NL25
1068    #define CHAR_NL                     '\x15'
1069    #define CHAR_NEL                    '\x25'
1070    #define STR_NL                      "\x15"
1071    #define STR_NEL                     "\x25"
1072    #else
1073    #define CHAR_NL                     '\x25'
1074    #define CHAR_NEL                    '\x15'
1075    #define STR_NL                      "\x25"
1076    #define STR_NEL                     "\x15"
1077    #endif
1078    
1079    #define CHAR_LF                     CHAR_NL
1080    #define STR_LF                      STR_NL
1081    
1082    #define CHAR_ESC                    '\047'
1083    #define CHAR_DEL                    '\007'
1084    #define STR_ESC                     "\047"
1085    #define STR_DEL                     "\007"
1086    
1087    #else  /* Not EBCDIC */
1088    
1089    /* In ASCII/Unicode, linefeed is '\n' and we equate this to NL for
1090    compatibility. NEL is the Unicode newline character; make sure it is
1091    a positive value. */
1092    
1093    #define CHAR_LF                     '\n'
1094    #define CHAR_NL                     CHAR_LF
1095    #define CHAR_NEL                    ((unsigned char)'\x85')
1096    #define CHAR_ESC                    '\033'
1097    #define CHAR_DEL                    '\177'
1098    
1099    #define STR_LF                      "\n"
1100    #define STR_NL                      STR_LF
1101    #define STR_NEL                     "\x85"
1102    #define STR_ESC                     "\033"
1103    #define STR_DEL                     "\177"
1104    
1105    #endif  /* EBCDIC */
1106    
1107    /* The remaining definitions work in both environments. */
1108    
1109  #define CHAR_HT                     '\t'  #define CHAR_HT                     '\t'
1110  #define CHAR_VT                     '\v'  #define CHAR_VT                     '\v'
1111  #define CHAR_FF                     '\f'  #define CHAR_FF                     '\f'
1112  #define CHAR_CR                     '\r'  #define CHAR_CR                     '\r'
 #define CHAR_NL                     '\n'  
1113  #define CHAR_BS                     '\b'  #define CHAR_BS                     '\b'
1114  #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  
1115    
1116  #define CHAR_SPACE                  ' '  #define CHAR_SPACE                  ' '
1117  #define CHAR_EXCLAMATION_MARK       '!'  #define CHAR_EXCLAMATION_MARK       '!'
# Line 764  so that PCRE works on both ASCII and EBC Line 1213  so that PCRE works on both ASCII and EBC
1213  #define STR_VT                      "\v"  #define STR_VT                      "\v"
1214  #define STR_FF                      "\f"  #define STR_FF                      "\f"
1215  #define STR_CR                      "\r"  #define STR_CR                      "\r"
 #define STR_NL                      "\n"  
1216  #define STR_BS                      "\b"  #define STR_BS                      "\b"
1217  #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  
1218    
1219  #define STR_SPACE                   " "  #define STR_SPACE                   " "
1220  #define STR_EXCLAMATION_MARK        "!"  #define STR_EXCLAMATION_MARK        "!"
# Line 897  so that PCRE works on both ASCII and EBC Line 1338  so that PCRE works on both ASCII and EBC
1338    
1339  #define STRING_DEFINE               "DEFINE"  #define STRING_DEFINE               "DEFINE"
1340    
1341  #define STRING_CR_RIGHTPAR          "CR)"  #define STRING_CR_RIGHTPAR             "CR)"
1342  #define STRING_LF_RIGHTPAR          "LF)"  #define STRING_LF_RIGHTPAR             "LF)"
1343  #define STRING_CRLF_RIGHTPAR        "CRLF)"  #define STRING_CRLF_RIGHTPAR           "CRLF)"
1344  #define STRING_ANY_RIGHTPAR         "ANY)"  #define STRING_ANY_RIGHTPAR            "ANY)"
1345  #define STRING_ANYCRLF_RIGHTPAR     "ANYCRLF)"  #define STRING_ANYCRLF_RIGHTPAR        "ANYCRLF)"
1346  #define STRING_BSR_ANYCRLF_RIGHTPAR "BSR_ANYCRLF)"  #define STRING_BSR_ANYCRLF_RIGHTPAR    "BSR_ANYCRLF)"
1347  #define STRING_BSR_UNICODE_RIGHTPAR "BSR_UNICODE)"  #define STRING_BSR_UNICODE_RIGHTPAR    "BSR_UNICODE)"
1348  #define STRING_UTF8_RIGHTPAR        "UTF8)"  #ifdef COMPILE_PCRE8
1349    #define STRING_UTF_RIGHTPAR            "UTF8)"
1350    #endif
1351    #ifdef COMPILE_PCRE16
1352    #define STRING_UTF_RIGHTPAR            "UTF16)"
1353    #endif
1354    #define STRING_UCP_RIGHTPAR            "UCP)"
1355    #define STRING_NO_START_OPT_RIGHTPAR   "NO_START_OPT)"
1356    
1357  #else  /* SUPPORT_UTF8 */  #else  /* SUPPORT_UTF */
1358    
1359  /* 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
1360  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 916  only. */ Line 1364  only. */
1364  #define CHAR_VT                     '\013'  #define CHAR_VT                     '\013'
1365  #define CHAR_FF                     '\014'  #define CHAR_FF                     '\014'
1366  #define CHAR_CR                     '\015'  #define CHAR_CR                     '\015'
1367  #define CHAR_NL                     '\012'  #define CHAR_LF                     '\012'
1368    #define CHAR_NL                     CHAR_LF
1369    #define CHAR_NEL                    ((unsigned char)'\x85')
1370  #define CHAR_BS                     '\010'  #define CHAR_BS                     '\010'
1371  #define CHAR_BEL                    '\007'  #define CHAR_BEL                    '\007'
1372  #define CHAR_ESC                    '\033'  #define CHAR_ESC                    '\033'
# Line 1150  only. */ Line 1600  only. */
1600    
1601  #define STRING_DEFINE               STR_D STR_E STR_F STR_I STR_N STR_E  #define STRING_DEFINE               STR_D STR_E STR_F STR_I STR_N STR_E
1602    
1603  #define STRING_CR_RIGHTPAR          STR_C STR_R STR_RIGHT_PARENTHESIS  #define STRING_CR_RIGHTPAR             STR_C STR_R STR_RIGHT_PARENTHESIS
1604  #define STRING_LF_RIGHTPAR          STR_L STR_F STR_RIGHT_PARENTHESIS  #define STRING_LF_RIGHTPAR             STR_L STR_F STR_RIGHT_PARENTHESIS
1605  #define STRING_CRLF_RIGHTPAR        STR_C STR_R STR_L STR_F STR_RIGHT_PARENTHESIS  #define STRING_CRLF_RIGHTPAR           STR_C STR_R STR_L STR_F STR_RIGHT_PARENTHESIS
1606  #define STRING_ANY_RIGHTPAR         STR_A STR_N STR_Y STR_RIGHT_PARENTHESIS  #define STRING_ANY_RIGHTPAR            STR_A STR_N STR_Y STR_RIGHT_PARENTHESIS
1607  #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
1608  #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
1609  #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
1610  #define STRING_UTF8_RIGHTPAR        STR_U STR_T STR_F STR_8 STR_RIGHT_PARENTHESIS  #ifdef COMPILE_PCRE8
1611    #define STRING_UTF_RIGHTPAR            STR_U STR_T STR_F STR_8 STR_RIGHT_PARENTHESIS
1612    #endif
1613    #ifdef COMPILE_PCRE16
1614    #define STRING_UTF_RIGHTPAR            STR_U STR_T STR_F STR_1 STR_6 STR_RIGHT_PARENTHESIS
1615    #endif
1616    #define STRING_UCP_RIGHTPAR            STR_U STR_C STR_P STR_RIGHT_PARENTHESIS
1617    #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
1618    
1619  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF */
1620    
1621  /* Escape items that are just an encoding of a particular data value. */  /* Escape items that are just an encoding of a particular data value. */
1622    
# Line 1172  only. */ Line 1629  only. */
1629  #endif  #endif
1630    
1631  #ifndef ESC_n  #ifndef ESC_n
1632  #define ESC_n CHAR_NL  #define ESC_n CHAR_LF
1633  #endif  #endif
1634    
1635  #ifndef ESC_r  #ifndef ESC_r
# Line 1190  only. */ Line 1647  only. */
1647    
1648  #define PT_ANY        0    /* Any property - matches all chars */  #define PT_ANY        0    /* Any property - matches all chars */
1649  #define PT_LAMP       1    /* L& - the union of Lu, Ll, Lt */  #define PT_LAMP       1    /* L& - the union of Lu, Ll, Lt */
1650  #define PT_GC         2    /* General characteristic (e.g. L) */  #define PT_GC         2    /* Specified general characteristic (e.g. L) */
1651  #define PT_PC         3    /* Particular characteristic (e.g. Lu) */  #define PT_PC         3    /* Specified particular characteristic (e.g. Lu) */
1652  #define PT_SC         4    /* Script (e.g. Han) */  #define PT_SC         4    /* Script (e.g. Han) */
1653    #define PT_ALNUM      5    /* Alphanumeric - the union of L and N */
1654    #define PT_SPACE      6    /* Perl space - Z plus 9,10,12,13 */
1655    #define PT_PXSPACE    7    /* POSIX space - Z plus 9,10,11,12,13 */
1656    #define PT_WORD       8    /* Word - L plus N plus underscore */
1657    #define PT_CLIST      9    /* Pseudo-property: match character list */
1658    
1659  /* 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
1660  contain UTF-8 characters with values greater than 255. */  contain characters with values greater than 255. */
1661    
1662  #define XCL_NOT    0x01    /* Flag: this is a negative class */  #define XCL_NOT    0x01    /* Flag: this is a negative class */
1663  #define XCL_MAP    0x02    /* Flag: a 32-byte map is present */  #define XCL_MAP    0x02    /* Flag: a 32-byte map is present */
# Line 1209  contain UTF-8 characters with values gre Line 1671  contain UTF-8 characters with values gre
1671  /* 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
1672  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
1673  their negation. Also, they must appear in the same order as in the opcode  their negation. Also, they must appear in the same order as in the opcode
1674  definitions below, up to ESC_z. There's a dummy for OP_ANY because it  definitions below, up to ESC_z. There's a dummy for OP_ALLANY because it
1675  corresponds to "." rather than an escape sequence, and another for OP_ALLANY  corresponds to "." in DOTALL mode rather than an escape sequence. It is also
1676  (which is used for [^] in JavaScript compatibility mode).  used for [^] in JavaScript compatibility mode, and for \C in non-utf mode. In
1677    non-DOTALL mode, "." behaves like \N.
1678    
1679    The special values ESC_DU, ESC_du, etc. are used instead of ESC_D, ESC_d, etc.
1680    when PCRE_UCP is set and replacement of \d etc by \p sequences is required.
1681    They must be contiguous, and remain in order so that the replacements can be
1682    looked up from a table.
1683    
1684  The final escape must be ESC_REF as subsequent values are used for  The final escape must be ESC_REF as subsequent values are used for
1685  backreferences (\1, \2, \3, etc). There are two tests in the code for an escape  backreferences (\1, \2, \3, etc). There are two tests in the code for an escape
# Line 1221  put in between that don't consume a char Line 1689  put in between that don't consume a char
1689  */  */
1690    
1691  enum { ESC_A = 1, ESC_G, ESC_K, ESC_B, ESC_b, ESC_D, ESC_d, ESC_S, ESC_s,  enum { ESC_A = 1, ESC_G, ESC_K, ESC_B, ESC_b, ESC_D, ESC_d, ESC_S, ESC_s,
1692         ESC_W, ESC_w, ESC_dum1, ESC_dum2, ESC_C, ESC_P, ESC_p, ESC_R, ESC_H,         ESC_W, ESC_w, ESC_N, ESC_dum, ESC_C, ESC_P, ESC_p, ESC_R, ESC_H,
1693         ESC_h, ESC_V, ESC_v, ESC_X, ESC_Z, ESC_z, ESC_E, ESC_Q, ESC_g, ESC_k,         ESC_h, ESC_V, ESC_v, ESC_X, ESC_Z, ESC_z,
1694           ESC_E, ESC_Q, ESC_g, ESC_k,
1695           ESC_DU, ESC_du, ESC_SU, ESC_su, ESC_WU, ESC_wu,
1696         ESC_REF };         ESC_REF };
1697    
   
1698  /* 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
1699  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.
1700    
# Line 1249  enum { Line 1718  enum {
1718    OP_WHITESPACE,         /*  9 \s */    OP_WHITESPACE,         /*  9 \s */
1719    OP_NOT_WORDCHAR,       /* 10 \W */    OP_NOT_WORDCHAR,       /* 10 \W */
1720    OP_WORDCHAR,           /* 11 \w */    OP_WORDCHAR,           /* 11 \w */
1721    OP_ANY,            /* 12 Match any character (subject to DOTALL) */  
1722    OP_ALLANY,         /* 13 Match any character (not subject to DOTALL) */    OP_ANY,            /* 12 Match any character except newline (\N) */
1723      OP_ALLANY,         /* 13 Match any character */
1724    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 */
1725    OP_NOTPROP,        /* 15 \P (not Unicode property) */    OP_NOTPROP,        /* 15 \P (not Unicode property) */
1726    OP_PROP,           /* 16 \p (Unicode property) */    OP_PROP,           /* 16 \p (Unicode property) */
# Line 1260  enum { Line 1730  enum {
1730    OP_NOT_VSPACE,     /* 20 \V (not vertical whitespace) */    OP_NOT_VSPACE,     /* 20 \V (not vertical whitespace) */
1731    OP_VSPACE,         /* 21 \v (vertical whitespace) */    OP_VSPACE,         /* 21 \v (vertical whitespace) */
1732    OP_EXTUNI,         /* 22 \X (extended Unicode sequence */    OP_EXTUNI,         /* 22 \X (extended Unicode sequence */
1733    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) */
1734    OP_EOD,            /* 24 End of data: \z */    OP_EOD,            /* 24 End of data (\z) */
1735    
1736    OP_OPT,            /* 25 Set runtime options */    OP_CIRC,           /* 25 Start of line - not multiline */
1737    OP_CIRC,           /* 26 Start of line - varies with multiline switch */    OP_CIRCM,          /* 26 Start of line - multiline */
1738    OP_DOLL,           /* 27 End of line - varies with multiline switch */    OP_DOLL,           /* 27 End of line - not multiline */
1739    OP_CHAR,           /* 28 Match one character, casefully */    OP_DOLLM,          /* 28 End of line - multiline */
1740    OP_CHARNC,         /* 29 Match one character, caselessly */    OP_CHAR,           /* 29 Match one character, casefully */
1741    OP_NOT,            /* 30 Match one character, not the following one */    OP_CHARI,          /* 30 Match one character, caselessly */
1742      OP_NOT,            /* 31 Match one character, not the given one, casefully */
1743    OP_STAR,           /* 31 The maximizing and minimizing versions of */    OP_NOTI,           /* 32 Match one character, not the given one, caselessly */
1744    OP_MINSTAR,        /* 32 these six opcodes must come in pairs, with */  
1745    OP_PLUS,           /* 33 the minimizing one second. */    /* The following sets of 13 opcodes must always be kept in step because
1746    OP_MINPLUS,        /* 34 This first set applies to single characters.*/    the offset from the first one is used to generate the others. */
1747    OP_QUERY,          /* 35 */  
1748    OP_MINQUERY,       /* 36 */    /**** Single characters, caseful, must precede the caseless ones ****/
1749    
1750    OP_UPTO,           /* 37 From 0 to n matches */    OP_STAR,           /* 33 The maximizing and minimizing versions of */
1751    OP_MINUPTO,        /* 38 */    OP_MINSTAR,        /* 34 these six opcodes must come in pairs, with */
1752    OP_EXACT,          /* 39 Exactly n matches */    OP_PLUS,           /* 35 the minimizing one second. */
1753      OP_MINPLUS,        /* 36 */
1754    OP_POSSTAR,        /* 40 Possessified star */    OP_QUERY,          /* 37 */
1755    OP_POSPLUS,        /* 41 Possessified plus */    OP_MINQUERY,       /* 38 */
1756    OP_POSQUERY,       /* 42 Posesssified query */  
1757    OP_POSUPTO,        /* 43 Possessified upto */    OP_UPTO,           /* 39 From 0 to n matches of one character, caseful*/
1758      OP_MINUPTO,        /* 40 */
1759    OP_NOTSTAR,        /* 44 The maximizing and minimizing versions of */    OP_EXACT,          /* 41 Exactly n matches */
1760    OP_NOTMINSTAR,     /* 45 these six opcodes must come in pairs, with */  
1761    OP_NOTPLUS,        /* 46 the minimizing one second. They must be in */    OP_POSSTAR,        /* 42 Possessified star, caseful */
1762    OP_NOTMINPLUS,     /* 47 exactly the same order as those above. */    OP_POSPLUS,        /* 43 Possessified plus, caseful */
1763    OP_NOTQUERY,       /* 48 This set applies to "not" single characters. */    OP_POSQUERY,       /* 44 Posesssified query, caseful */
1764    OP_NOTMINQUERY,    /* 49 */    OP_POSUPTO,        /* 45 Possessified upto, caseful */
1765    
1766    OP_NOTUPTO,        /* 50 From 0 to n matches */    /**** Single characters, caseless, must follow the caseful ones */
1767    OP_NOTMINUPTO,     /* 51 */  
1768    OP_NOTEXACT,       /* 52 Exactly n matches */    OP_STARI,          /* 46 */
1769      OP_MINSTARI,       /* 47 */
1770    OP_NOTPOSSTAR,     /* 53 Possessified versions */    OP_PLUSI,          /* 48 */
1771    OP_NOTPOSPLUS,     /* 54 */    OP_MINPLUSI,       /* 49 */
1772    OP_NOTPOSQUERY,    /* 55 */    OP_QUERYI,         /* 50 */
1773    OP_NOTPOSUPTO,     /* 56 */    OP_MINQUERYI,      /* 51 */
1774    
1775    OP_TYPESTAR,       /* 57 The maximizing and minimizing versions of */    OP_UPTOI,          /* 52 From 0 to n matches of one character, caseless */
1776    OP_TYPEMINSTAR,    /* 58 these six opcodes must come in pairs, with */    OP_MINUPTOI,       /* 53 */
1777    OP_TYPEPLUS,       /* 59 the minimizing one second. These codes must */    OP_EXACTI,         /* 54 */
1778    OP_TYPEMINPLUS,    /* 60 be in exactly the same order as those above. */  
1779    OP_TYPEQUERY,      /* 61 This set applies to character types such as \d */    OP_POSSTARI,       /* 55 Possessified star, caseless */
1780    OP_TYPEMINQUERY,   /* 62 */    OP_POSPLUSI,       /* 56 Possessified plus, caseless */
1781      OP_POSQUERYI,      /* 57 Posesssified query, caseless */
1782    OP_TYPEUPTO,       /* 63 From 0 to n matches */    OP_POSUPTOI,       /* 58 Possessified upto, caseless */
1783    OP_TYPEMINUPTO,    /* 64 */  
1784    OP_TYPEEXACT,      /* 65 Exactly n matches */    /**** The negated ones must follow the non-negated ones, and match them ****/
1785      /**** Negated single character, caseful; must precede the caseless ones ****/
1786    OP_TYPEPOSSTAR,    /* 66 Possessified versions */  
1787    OP_TYPEPOSPLUS,    /* 67 */    OP_NOTSTAR,        /* 59 The maximizing and minimizing versions of */
1788    OP_TYPEPOSQUERY,   /* 68 */    OP_NOTMINSTAR,     /* 60 these six opcodes must come in pairs, with */
1789    OP_TYPEPOSUPTO,    /* 69 */    OP_NOTPLUS,        /* 61 the minimizing one second. They must be in */
1790      OP_NOTMINPLUS,     /* 62 exactly the same order as those above. */
1791    OP_CRSTAR,         /* 70 The maximizing and minimizing versions of */    OP_NOTQUERY,       /* 63 */
1792    OP_CRMINSTAR,      /* 71 all these opcodes must come in pairs, with */    OP_NOTMINQUERY,    /* 64 */
1793    OP_CRPLUS,         /* 72 the minimizing one second. These codes must */  
1794    OP_CRMINPLUS,      /* 73 be in exactly the same order as those above. */    OP_NOTUPTO,        /* 65 From 0 to n matches, caseful */
1795    OP_CRQUERY,        /* 74 These are for character classes and back refs */    OP_NOTMINUPTO,     /* 66 */
1796    OP_CRMINQUERY,     /* 75 */    OP_NOTEXACT,       /* 67 Exactly n matches */
1797    OP_CRRANGE,        /* 76 These are different to the three sets above. */  
1798    OP_CRMINRANGE,     /* 77 */    OP_NOTPOSSTAR,     /* 68 Possessified versions, caseful */
1799      OP_NOTPOSPLUS,     /* 69 */
1800    OP_CLASS,          /* 78 Match a character class, chars < 256 only */    OP_NOTPOSQUERY,    /* 70 */
1801    OP_NCLASS,         /* 79 Same, but the bitmap was created from a negative    OP_NOTPOSUPTO,     /* 71 */
1802                             class - the difference is relevant only when a UTF-8  
1803                             character > 255 is encountered. */    /**** Negated single character, caseless; must follow the caseful ones ****/
1804    
1805    OP_XCLASS,         /* 80 Extended class for handling UTF-8 chars within the    OP_NOTSTARI,       /* 72 */
1806                             class. This does both positive and negative. */    OP_NOTMINSTARI,    /* 73 */
1807      OP_NOTPLUSI,       /* 74 */
1808    OP_REF,            /* 81 Match a back reference */    OP_NOTMINPLUSI,    /* 75 */
1809    OP_RECURSE,        /* 82 Match a numbered subpattern (possibly recursive) */    OP_NOTQUERYI,      /* 76 */
1810    OP_CALLOUT,        /* 83 Call out to external function if provided */    OP_NOTMINQUERYI,   /* 77 */
1811    
1812    OP_ALT,            /* 84 Start of alternation */    OP_NOTUPTOI,       /* 78 From 0 to n matches, caseless */
1813    OP_KET,            /* 85 End of group that doesn't have an unbounded repeat */    OP_NOTMINUPTOI,    /* 79 */
1814    OP_KETRMAX,        /* 86 These two must remain together and in this */    OP_NOTEXACTI,      /* 80 Exactly n matches */
1815    OP_KETRMIN,        /* 87 order. They are for groups the repeat for ever. */  
1816      OP_NOTPOSSTARI,    /* 81 Possessified versions, caseless */
1817    /* The assertions must come before BRA, CBRA, ONCE, and COND.*/    OP_NOTPOSPLUSI,    /* 82 */
1818      OP_NOTPOSQUERYI,   /* 83 */
1819    OP_ASSERT,         /* 88 Positive lookahead */    OP_NOTPOSUPTOI,    /* 84 */
1820    OP_ASSERT_NOT,     /* 89 Negative lookahead */  
1821    OP_ASSERTBACK,     /* 90 Positive lookbehind */    /**** Character types ****/
1822    OP_ASSERTBACK_NOT, /* 91 Negative lookbehind */  
1823    OP_REVERSE,        /* 92 Move pointer back - used in lookbehind assertions */    OP_TYPESTAR,       /* 85 The maximizing and minimizing versions of */
1824      OP_TYPEMINSTAR,    /* 86 these six opcodes must come in pairs, with */
1825    /* ONCE, BRA, CBRA, and COND must come after the assertions, with ONCE first,    OP_TYPEPLUS,       /* 87 the minimizing one second. These codes must */
1826    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. */
1827      OP_TYPEQUERY,      /* 89 */
1828    OP_ONCE,           /* 93 Atomic group */    OP_TYPEMINQUERY,   /* 90 */
1829    OP_BRA,            /* 94 Start of non-capturing bracket */  
1830    OP_CBRA,           /* 95 Start of capturing bracket */    OP_TYPEUPTO,       /* 91 From 0 to n matches */
1831    OP_COND,           /* 96 Conditional group */    OP_TYPEMINUPTO,    /* 92 */
1832      OP_TYPEEXACT,      /* 93 Exactly n matches */
1833    
1834      OP_TYPEPOSSTAR,    /* 94 Possessified versions */
1835      OP_TYPEPOSPLUS,    /* 95 */
1836      OP_TYPEPOSQUERY,   /* 96 */
1837      OP_TYPEPOSUPTO,    /* 97 */
1838    
1839      /* These are used for character classes and back references; only the
1840      first six are the same as the sets above. */
1841    
1842      OP_CRSTAR,         /* 98 The maximizing and minimizing versions of */
1843      OP_CRMINSTAR,      /* 99 all these opcodes must come in pairs, with */
1844      OP_CRPLUS,         /* 100 the minimizing one second. These codes must */
1845      OP_CRMINPLUS,      /* 101 be in exactly the same order as those above. */
1846      OP_CRQUERY,        /* 102 */
1847      OP_CRMINQUERY,     /* 103 */
1848    
1849      OP_CRRANGE,        /* 104 These are different to the three sets above. */
1850      OP_CRMINRANGE,     /* 105 */
1851    
1852      /* End of quantifier opcodes */
1853    
1854      OP_CLASS,          /* 106 Match a character class, chars < 256 only */
1855      OP_NCLASS,         /* 107 Same, but the bitmap was created from a negative
1856                                  class - the difference is relevant only when a
1857                                  character > 255 is encountered. */
1858      OP_XCLASS,         /* 108 Extended class for handling > 255 chars within the
1859                                  class. This does both positive and negative. */
1860      OP_REF,            /* 109 Match a back reference, casefully */
1861      OP_REFI,           /* 110 Match a back reference, caselessly */
1862      OP_RECURSE,        /* 111 Match a numbered subpattern (possibly recursive) */
1863      OP_CALLOUT,        /* 112 Call out to external function if provided */
1864    
1865      OP_ALT,            /* 113 Start of alternation */
1866      OP_KET,            /* 114 End of group that doesn't have an unbounded repeat */
1867      OP_KETRMAX,        /* 115 These two must remain together and in this */
1868      OP_KETRMIN,        /* 116 order. They are for groups the repeat for ever. */
1869      OP_KETRPOS,        /* 117 Possessive unlimited repeat. */
1870    
1871      /* The assertions must come before BRA, CBRA, ONCE, and COND, and the four
1872      asserts must remain in order. */
1873    
1874      OP_REVERSE,        /* 118 Move pointer back - used in lookbehind assertions */
1875      OP_ASSERT,         /* 119 Positive lookahead */
1876      OP_ASSERT_NOT,     /* 120 Negative lookahead */
1877      OP_ASSERTBACK,     /* 121 Positive lookbehind */
1878      OP_ASSERTBACK_NOT, /* 122 Negative lookbehind */
1879    
1880      /* ONCE, ONCE_NC, BRA, BRAPOS, CBRA, CBRAPOS, and COND must come immediately
1881      after the assertions, with ONCE first, as there's a test for >= ONCE for a
1882      subpattern that isn't an assertion. The POS versions must immediately follow
1883      the non-POS versions in each case. */
1884    
1885      OP_ONCE,           /* 123 Atomic group, contains captures */
1886      OP_ONCE_NC,        /* 124 Atomic group containing no captures */
1887      OP_BRA,            /* 125 Start of non-capturing bracket */
1888      OP_BRAPOS,         /* 126 Ditto, with unlimited, possessive repeat */
1889      OP_CBRA,           /* 127 Start of capturing bracket */
1890      OP_CBRAPOS,        /* 128 Ditto, with unlimited, possessive repeat */
1891      OP_COND,           /* 129 Conditional group */
1892    
1893    /* 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
1894    check for >= SBRA to distinguish the two sets. */    check for >= SBRA to distinguish the two sets. */
1895    
1896    OP_SBRA,           /* 97 Start of non-capturing bracket, check empty  */    OP_SBRA,           /* 130 Start of non-capturing bracket, check empty  */
1897    OP_SCBRA,          /* 98 Start of capturing bracket, check empty */    OP_SBRAPOS,        /* 131 Ditto, with unlimited, possessive repeat */
1898    OP_SCOND,          /* 99 Conditional group, check empty */    OP_SCBRA,          /* 132 Start of capturing bracket, check empty */
1899      OP_SCBRAPOS,       /* 133 Ditto, with unlimited, possessive repeat */
1900      OP_SCOND,          /* 134 Conditional group, check empty */
1901    
1902    /* The next two pairs must (respectively) be kept together. */    /* The next two pairs must (respectively) be kept together. */
1903    
1904    OP_CREF,           /* 100 Used to hold a capture number as condition */    OP_CREF,           /* 135 Used to hold a capture number as condition */
1905    OP_NCREF,          /* 101 Same, but generaged by a name reference*/    OP_NCREF,          /* 136 Same, but generated by a name reference*/
1906    OP_RREF,           /* 102 Used to hold a recursion number as condition */    OP_RREF,           /* 137 Used to hold a recursion number as condition */
1907    OP_NRREF,          /* 103 Same, but generaged by a name reference*/    OP_NRREF,          /* 138 Same, but generated by a name reference*/
1908    OP_DEF,            /* 104 The DEFINE condition */    OP_DEF,            /* 139 The DEFINE condition */
1909    
1910    OP_BRAZERO,        /* 105 These two must remain together and in this */    OP_BRAZERO,        /* 140 These two must remain together and in this */
1911    OP_BRAMINZERO,     /* 106 order. */    OP_BRAMINZERO,     /* 141 order. */
1912      OP_BRAPOSZERO,     /* 142 */
1913    
1914    /* These are backtracking control verbs */    /* These are backtracking control verbs */
1915    
1916    OP_MARK,           /* 107 always has an argument */    OP_MARK,           /* 143 always has an argument */
1917    OP_PRUNE,          /* 108 */    OP_PRUNE,          /* 144 */
1918    OP_PRUNE_ARG,      /* 109 same, but with argument */    OP_PRUNE_ARG,      /* 145 same, but with argument */
1919    OP_SKIP,           /* 110 */    OP_SKIP,           /* 146 */
1920    OP_SKIP_ARG,       /* 111 same, but with argument */    OP_SKIP_ARG,       /* 147 same, but with argument */
1921    OP_THEN,           /* 112 */    OP_THEN,           /* 148 */
1922    OP_THEN_ARG,       /* 113 same, but with argument */    OP_THEN_ARG,       /* 149 same, but with argument */
1923    OP_COMMIT,         /* 114 */    OP_COMMIT,         /* 150 */
1924    
1925    /* These are forced failure and success verbs */    /* These are forced failure and success verbs */
1926    
1927    OP_FAIL,           /* 115 */    OP_FAIL,           /* 151 */
1928    OP_ACCEPT,         /* 116 */    OP_ACCEPT,         /* 152 */
1929    OP_CLOSE,          /* 117 Used before OP_ACCEPT to close open captures */    OP_ASSERT_ACCEPT,  /* 153 Used inside assertions */
1930      OP_CLOSE,          /* 154 Used before OP_ACCEPT to close open captures */
1931    
1932    /* This is used to skip a subpattern with a {0} quantifier */    /* This is used to skip a subpattern with a {0} quantifier */
1933    
1934    OP_SKIPZERO,       /* 118 */    OP_SKIPZERO,       /* 155 */
1935    
1936    /* 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
1937    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 1412  called "coptable" and "poptable" in pcre Line 1946  called "coptable" and "poptable" in pcre
1946    
1947    
1948  /* 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
1949  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
1950    only in pcre_printint.c, which fills out the full names in many cases (and in
1951    some cases doesn't actually use these names at all). */
1952    
1953  #define OP_NAME_LIST \  #define OP_NAME_LIST \
1954    "End", "\\A", "\\G", "\\K", "\\B", "\\b", "\\D", "\\d",         \    "End", "\\A", "\\G", "\\K", "\\B", "\\b", "\\D", "\\d",         \
1955    "\\S", "\\s", "\\W", "\\w", "Any", "AllAny", "Anybyte",         \    "\\S", "\\s", "\\W", "\\w", "Any", "AllAny", "Anybyte",         \
1956    "notprop", "prop", "\\R", "\\H", "\\h", "\\V", "\\v",           \    "notprop", "prop", "\\R", "\\H", "\\h", "\\V", "\\v",           \
1957    "extuni",  "\\Z", "\\z",                                        \    "extuni",  "\\Z", "\\z",                                        \
1958    "Opt", "^", "$", "char", "charnc", "not",                       \    "^", "^", "$", "$", "char", "chari", "not", "noti",             \
1959    "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \    "*", "*?", "+", "+?", "?", "??",                                \
1960      "{", "{", "{",                                                  \
1961    "*+","++", "?+", "{",                                           \    "*+","++", "?+", "{",                                           \
1962    "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \    "*", "*?", "+", "+?", "?", "??",                                \
1963      "{", "{", "{",                                                  \
1964      "*+","++", "?+", "{",                                           \
1965      "*", "*?", "+", "+?", "?", "??",                                \
1966      "{", "{", "{",                                                  \
1967      "*+","++", "?+", "{",                                           \
1968      "*", "*?", "+", "+?", "?", "??",                                \
1969      "{", "{", "{",                                                  \
1970    "*+","++", "?+", "{",                                           \    "*+","++", "?+", "{",                                           \
1971    "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \    "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \
1972    "*+","++", "?+", "{",                                           \    "*+","++", "?+", "{",                                           \
1973    "*", "*?", "+", "+?", "?", "??", "{", "{",                      \    "*", "*?", "+", "+?", "?", "??", "{", "{",                      \
1974    "class", "nclass", "xclass", "Ref", "Recurse", "Callout",       \    "class", "nclass", "xclass", "Ref", "Refi",                     \
1975    "Alt", "Ket", "KetRmax", "KetRmin", "Assert", "Assert not",     \    "Recurse", "Callout",                                           \
1976    "AssertB", "AssertB not", "Reverse",                            \    "Alt", "Ket", "KetRmax", "KetRmin", "KetRpos",                  \
1977    "Once", "Bra", "CBra", "Cond", "SBra", "SCBra", "SCond",        \    "Reverse", "Assert", "Assert not", "AssertB", "AssertB not",    \
1978      "Once", "Once_NC",                                              \
1979      "Bra", "BraPos", "CBra", "CBraPos",                             \
1980      "Cond",                                                         \
1981      "SBra", "SBraPos", "SCBra", "SCBraPos",                         \
1982      "SCond",                                                        \
1983    "Cond ref", "Cond nref", "Cond rec", "Cond nrec", "Cond def",   \    "Cond ref", "Cond nref", "Cond rec", "Cond nrec", "Cond def",   \
1984    "Brazero", "Braminzero",                                        \    "Brazero", "Braminzero", "Braposzero",                          \
1985    "*MARK", "*PRUNE", "*PRUNE", "*SKIP", "*SKIP",                  \    "*MARK", "*PRUNE", "*PRUNE", "*SKIP", "*SKIP",                  \
1986    "*THEN", "*THEN", "*COMMIT", "*FAIL", "*ACCEPT",                \    "*THEN", "*THEN", "*COMMIT", "*FAIL",                           \
1987      "*ACCEPT", "*ASSERT_ACCEPT",                                    \
1988    "Close", "Skip zero"    "Close", "Skip zero"
1989    
1990    
# Line 1455  in UTF-8 mode. The code that uses this t Line 2005  in UTF-8 mode. The code that uses this t
2005    3, 3,                          /* \P, \p                                 */ \    3, 3,                          /* \P, \p                                 */ \
2006    1, 1, 1, 1, 1,                 /* \R, \H, \h, \V, \v                     */ \    1, 1, 1, 1, 1,                 /* \R, \H, \h, \V, \v                     */ \
2007    1,                             /* \X                                     */ \    1,                             /* \X                                     */ \
2008    1, 1, 2, 1, 1,                 /* \Z, \z, Opt, ^, $                      */ \    1, 1, 1, 1, 1, 1,              /* \Z, \z, ^, ^M, $, $M                   */ \
2009    2,                             /* Char  - the minimum length             */ \    2,                             /* Char  - the minimum length             */ \
2010    2,                             /* Charnc  - the minimum length           */ \    2,                             /* Chari  - the minimum length            */ \
2011    2,                             /* not                                    */ \    2,                             /* not                                    */ \
2012    /* Positive single-char repeats                            ** These are  */ \    2,                             /* noti                                   */ \
2013    2, 2, 2, 2, 2, 2,              /* *, *?, +, +?, ?, ??      ** minima in  */ \    /* Positive single-char repeats                             ** These are */ \
2014    4, 4, 4,                       /* upto, minupto, exact     ** UTF-8 mode */ \    2, 2, 2, 2, 2, 2,              /* *, *?, +, +?, ?, ??       ** minima in */ \
2015    2, 2, 2, 4,                    /* *+, ++, ?+, upto+                      */ \    2+IMM2_SIZE, 2+IMM2_SIZE,      /* upto, minupto             ** mode      */ \
2016      2+IMM2_SIZE,                   /* exact                                  */ \
2017      2, 2, 2, 2+IMM2_SIZE,          /* *+, ++, ?+, upto+                      */ \
2018      2, 2, 2, 2, 2, 2,              /* *I, *?I, +I, +?I, ?I, ??I ** UTF-8     */ \
2019      2+IMM2_SIZE, 2+IMM2_SIZE,      /* upto I, minupto I                      */ \
2020      2+IMM2_SIZE,                   /* exact I                                */ \
2021      2, 2, 2, 2+IMM2_SIZE,          /* *+I, ++I, ?+I, upto+I                  */ \
2022    /* Negative single-char repeats - only for chars < 256                   */ \    /* Negative single-char repeats - only for chars < 256                   */ \
2023    2, 2, 2, 2, 2, 2,              /* NOT *, *?, +, +?, ?, ??                */ \    2, 2, 2, 2, 2, 2,              /* NOT *, *?, +, +?, ?, ??                */ \
2024    4, 4, 4,                       /* NOT upto, minupto, exact               */ \    2+IMM2_SIZE, 2+IMM2_SIZE,      /* NOT upto, minupto                      */ \
2025    2, 2, 2, 4,                    /* Possessive *, +, ?, upto               */ \    2+IMM2_SIZE,                   /* NOT exact                              */ \
2026      2, 2, 2, 2+IMM2_SIZE,          /* Possessive NOT *, +, ?, upto           */ \
2027      2, 2, 2, 2, 2, 2,              /* NOT *I, *?I, +I, +?I, ?I, ??I          */ \
2028      2+IMM2_SIZE, 2+IMM2_SIZE,      /* NOT upto I, minupto I                  */ \
2029      2+IMM2_SIZE,                   /* NOT exact I                            */ \
2030      2, 2, 2, 2+IMM2_SIZE,          /* Possessive NOT *I, +I, ?I, upto I      */ \
2031    /* Positive type repeats                                                 */ \    /* Positive type repeats                                                 */ \
2032    2, 2, 2, 2, 2, 2,              /* Type *, *?, +, +?, ?, ??               */ \    2, 2, 2, 2, 2, 2,              /* Type *, *?, +, +?, ?, ??               */ \
2033    4, 4, 4,                       /* Type upto, minupto, exact              */ \    2+IMM2_SIZE, 2+IMM2_SIZE,      /* Type upto, minupto                     */ \
2034    2, 2, 2, 4,                    /* Possessive *+, ++, ?+, upto+           */ \    2+IMM2_SIZE,                   /* Type exact                             */ \
2035      2, 2, 2, 2+IMM2_SIZE,          /* Possessive *+, ++, ?+, upto+           */ \
2036    /* Character class & ref repeats                                         */ \    /* Character class & ref repeats                                         */ \
2037    1, 1, 1, 1, 1, 1,              /* *, *?, +, +?, ?, ??                    */ \    1, 1, 1, 1, 1, 1,              /* *, *?, +, +?, ?, ??                    */ \
2038    5, 5,                          /* CRRANGE, CRMINRANGE                    */ \    1+2*IMM2_SIZE, 1+2*IMM2_SIZE,  /* CRRANGE, CRMINRANGE                    */ \
2039   33,                             /* CLASS                                  */ \    1+(32/sizeof(pcre_uchar)),     /* CLASS                                  */ \
2040   33,                             /* NCLASS                                 */ \    1+(32/sizeof(pcre_uchar)),     /* NCLASS                                 */ \
2041    0,                             /* XCLASS - variable length               */ \    0,                             /* XCLASS - variable length               */ \
2042    3,                             /* REF                                    */ \    1+IMM2_SIZE,                   /* REF                                    */ \
2043      1+IMM2_SIZE,                   /* REFI                                   */ \
2044    1+LINK_SIZE,                   /* RECURSE                                */ \    1+LINK_SIZE,                   /* RECURSE                                */ \
2045    2+2*LINK_SIZE,                 /* CALLOUT                                */ \    2+2*LINK_SIZE,                 /* CALLOUT                                */ \
2046    1+LINK_SIZE,                   /* Alt                                    */ \    1+LINK_SIZE,                   /* Alt                                    */ \
2047    1+LINK_SIZE,                   /* Ket                                    */ \    1+LINK_SIZE,                   /* Ket                                    */ \
2048    1+LINK_SIZE,                   /* KetRmax                                */ \    1+LINK_SIZE,                   /* KetRmax                                */ \
2049    1+LINK_SIZE,                   /* KetRmin                                */ \    1+LINK_SIZE,                   /* KetRmin                                */ \
2050      1+LINK_SIZE,                   /* KetRpos                                */ \
2051      1+LINK_SIZE,                   /* Reverse                                */ \
2052    1+LINK_SIZE,                   /* Assert                                 */ \    1+LINK_SIZE,                   /* Assert                                 */ \
2053    1+LINK_SIZE,                   /* Assert not                             */ \    1+LINK_SIZE,                   /* Assert not                             */ \
2054    1+LINK_SIZE,                   /* Assert behind                          */ \    1+LINK_SIZE,                   /* Assert behind                          */ \
2055    1+LINK_SIZE,                   /* Assert behind not                      */ \    1+LINK_SIZE,                   /* Assert behind not                      */ \
   1+LINK_SIZE,                   /* Reverse                                */ \  
2056    1+LINK_SIZE,                   /* ONCE                                   */ \    1+LINK_SIZE,                   /* ONCE                                   */ \
2057      1+LINK_SIZE,                   /* ONCE_NC                                */ \
2058    1+LINK_SIZE,                   /* BRA                                    */ \    1+LINK_SIZE,                   /* BRA                                    */ \
2059    3+LINK_SIZE,                   /* CBRA                                   */ \    1+LINK_SIZE,                   /* BRAPOS                                 */ \
2060      1+LINK_SIZE+IMM2_SIZE,         /* CBRA                                   */ \
2061      1+LINK_SIZE+IMM2_SIZE,         /* CBRAPOS                                */ \
2062    1+LINK_SIZE,                   /* COND                                   */ \    1+LINK_SIZE,                   /* COND                                   */ \
2063    1+LINK_SIZE,                   /* SBRA                                   */ \    1+LINK_SIZE,                   /* SBRA                                   */ \
2064    3+LINK_SIZE,                   /* SCBRA                                  */ \    1+LINK_SIZE,                   /* SBRAPOS                                */ \
2065      1+LINK_SIZE+IMM2_SIZE,         /* SCBRA                                  */ \
2066      1+LINK_SIZE+IMM2_SIZE,         /* SCBRAPOS                               */ \
2067    1+LINK_SIZE,                   /* SCOND                                  */ \    1+LINK_SIZE,                   /* SCOND                                  */ \
2068    3, 3,                          /* CREF, NCREF                            */ \    1+IMM2_SIZE, 1+IMM2_SIZE,      /* CREF, NCREF                            */ \
2069    3, 3,                          /* RREF, NRREF                            */ \    1+IMM2_SIZE, 1+IMM2_SIZE,      /* RREF, NRREF                            */ \
2070    1,                             /* DEF                                    */ \    1,                             /* DEF                                    */ \
2071    1, 1,                          /* BRAZERO, BRAMINZERO                    */ \    1, 1, 1,                       /* BRAZERO, BRAMINZERO, BRAPOSZERO        */ \
2072    3, 1, 3,                       /* MARK, PRUNE, PRUNE_ARG,                */ \    3, 1, 3,                       /* MARK, PRUNE, PRUNE_ARG                 */ \
2073    1, 3, 1, 3,                    /* SKIP, SKIP_ARG, THEN, THEN_ARG,        */ \    1, 3,                          /* SKIP, SKIP_ARG                         */ \
2074    1, 1, 1, 3, 1                  /* COMMIT, FAIL, ACCEPT, CLOSE, SKIPZERO  */    1, 3,                          /* THEN, THEN_ARG                         */ \
2075      1, 1, 1, 1,                    /* COMMIT, FAIL, ACCEPT, ASSERT_ACCEPT    */ \
2076      1+IMM2_SIZE, 1                 /* CLOSE, SKIPZERO                        */
2077    
2078  /* 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"
2079  condition. */  condition. */
# Line 1520  enum { ERR0,  ERR1,  ERR2,  ERR3,  ERR4, Line 2090  enum { ERR0,  ERR1,  ERR2,  ERR3,  ERR4,
2090         ERR30, ERR31, ERR32, ERR33, ERR34, ERR35, ERR36, ERR37, ERR38, ERR39,         ERR30, ERR31, ERR32, ERR33, ERR34, ERR35, ERR36, ERR37, ERR38, ERR39,
2091         ERR40, ERR41, ERR42, ERR43, ERR44, ERR45, ERR46, ERR47, ERR48, ERR49,         ERR40, ERR41, ERR42, ERR43, ERR44, ERR45, ERR46, ERR47, ERR48, ERR49,
2092         ERR50, ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58, ERR59,         ERR50, ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58, ERR59,
2093         ERR60, ERR61, ERR62, ERR63, ERR64, ERR65, ERR66, ERRCOUNT };         ERR60, ERR61, ERR62, ERR63, ERR64, ERR65, ERR66, ERR67, ERR68, ERR69,
2094           ERR70, ERR71, ERR72, ERR73, ERR74, ERR75, ERR76, ERRCOUNT };
2095    
2096    /* JIT compiling modes. The function list is indexed by them. */
2097    enum { JIT_COMPILE, JIT_PARTIAL_SOFT_COMPILE, JIT_PARTIAL_HARD_COMPILE,
2098           JIT_NUMBER_OF_COMPILE_MODES };
2099    
2100  /* 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
2101  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 1539  fields are present. Currently PCRE alway Line 2114  fields are present. Currently PCRE alway
2114  NOTE NOTE NOTE  NOTE NOTE NOTE
2115  */  */
2116    
2117  typedef struct real_pcre {  #ifdef COMPILE_PCRE8
2118    #define REAL_PCRE real_pcre
2119    #else
2120    #define REAL_PCRE real_pcre16
2121    #endif
2122    
2123    typedef struct REAL_PCRE {
2124    pcre_uint32 magic_number;    pcre_uint32 magic_number;
2125    pcre_uint32 size;               /* Total that was malloced */    pcre_uint32 size;               /* Total that was malloced */
2126    pcre_uint32 options;            /* Public options */    pcre_uint32 options;            /* Public options */
2127    pcre_uint16 flags;              /* Private flags */    pcre_uint16 flags;              /* Private flags */
2128    pcre_uint16 dummy1;             /* For future use */    pcre_uint16 max_lookbehind;     /* Longest lookbehind (characters) */
2129    pcre_uint16 top_bracket;    pcre_uint16 top_bracket;        /* Highest numbered group */
2130    pcre_uint16 top_backref;    pcre_uint16 top_backref;        /* Highest numbered back reference */
2131    pcre_uint16 first_byte;    pcre_uint16 first_char;         /* Starting character */
2132    pcre_uint16 req_byte;    pcre_uint16 req_char;           /* This character must be seen */
2133    pcre_uint16 name_table_offset;  /* Offset to name table that follows */    pcre_uint16 name_table_offset;  /* Offset to name table that follows */
2134    pcre_uint16 name_entry_size;    /* Size of any name items */    pcre_uint16 name_entry_size;    /* Size of any name items */
2135    pcre_uint16 name_count;         /* Number of name items */    pcre_uint16 name_count;         /* Number of name items */
2136    pcre_uint16 ref_count;          /* Reference count */    pcre_uint16 ref_count;          /* Reference count */
2137      const pcre_uint8 *tables;       /* Pointer to tables or NULL for std */
2138    const unsigned char *tables;    /* Pointer to tables or NULL for std */    const pcre_uint8 *nullpad;      /* NULL padding */
2139    const unsigned char *nullpad;   /* NULL padding */  } REAL_PCRE;
 } real_pcre;  
2140    
2141  /* 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
2142  remark (see NOTE above) about extending this structure applies. */  remark (see NOTE above) about extending this structure applies. */
# Line 1564  remark (see NOTE above) about extending Line 2144  remark (see NOTE above) about extending
2144  typedef struct pcre_study_data {  typedef struct pcre_study_data {
2145    pcre_uint32 size;               /* Total that was malloced */    pcre_uint32 size;               /* Total that was malloced */
2146    pcre_uint32 flags;              /* Private flags */    pcre_uint32 flags;              /* Private flags */
2147    uschar start_bits[32];          /* Starting char bits */    pcre_uint8 start_bits[32];      /* Starting char bits */
2148    pcre_uint32 minlength;          /* Minimum subject length */    pcre_uint32 minlength;          /* Minimum subject length */
2149  } pcre_study_data;  } pcre_study_data;
2150    
# Line 1583  typedef struct open_capitem { Line 2163  typedef struct open_capitem {
2163  doing the compiling, so that they are thread-safe. */  doing the compiling, so that they are thread-safe. */
2164    
2165  typedef struct compile_data {  typedef struct compile_data {
2166    const uschar *lcc;            /* Points to lower casing table */    const pcre_uint8 *lcc;            /* Points to lower casing table */
2167    const uschar *fcc;            /* Points to case-flipping table */    const pcre_uint8 *fcc;            /* Points to case-flipping table */
2168    const uschar *cbits;          /* Points to character type table */    const pcre_uint8 *cbits;          /* Points to character type table */
2169    const uschar *ctypes;         /* Points to table of type maps */    const pcre_uint8 *ctypes;         /* Points to table of type maps */
2170    const uschar *start_workspace;/* The start of working space */    const pcre_uchar *start_workspace;/* The start of working space */
2171    const uschar *start_code;     /* The start of the compiled code */    const pcre_uchar *start_code;     /* The start of the compiled code */
2172    const uschar *start_pattern;  /* The start of the pattern */    const pcre_uchar *start_pattern;  /* The start of the pattern */
2173    const uschar *end_pattern;    /* The end of the pattern */    const pcre_uchar *end_pattern;    /* The end of the pattern */
2174    open_capitem *open_caps;      /* Chain of open capture items */    open_capitem *open_caps;          /* Chain of open capture items */
2175    uschar *hwm;                  /* High watermark of workspace */    pcre_uchar *hwm;                  /* High watermark of workspace */
2176    uschar *name_table;           /* The name/number table */    pcre_uchar *name_table;           /* The name/number table */
2177    int  names_found;             /* Number of entries so far */    int  names_found;                 /* Number of entries so far */
2178    int  name_entry_size;         /* Size of each entry */    int  name_entry_size;             /* Size of each entry */
2179    int  bracount;                /* Count of capturing parens as we compile */    int  workspace_size;              /* Size of workspace */
2180    int  final_bracount;          /* Saved value after first pass */    int  bracount;                    /* Count of capturing parens as we compile */
2181    int  top_backref;             /* Maximum back reference */    int  final_bracount;              /* Saved value after first pass */
2182    unsigned int backref_map;     /* Bitmap of low back refs */    int  max_lookbehind;              /* Maximum lookbehind (characters) */
2183    int  external_options;        /* External (initial) options */    int  top_backref;                 /* Maximum back reference */
2184    int  external_flags;          /* External flag bits to be set */    unsigned int backref_map;         /* Bitmap of low back refs */
2185    int  req_varyopt;             /* "After variable item" flag for reqbyte */    int  assert_depth;                /* Depth of nested assertions */
2186    BOOL had_accept;              /* (*ACCEPT) encountered */    int  external_options;            /* External (initial) options */
2187    BOOL check_lookbehind;        /* Lookbehinds need later checking */    int  external_flags;              /* External flag bits to be set */
2188    int  nltype;                  /* Newline type */    int  req_varyopt;                 /* "After variable item" flag for reqbyte */
2189    int  nllen;                   /* Newline string length */    BOOL had_accept;                  /* (*ACCEPT) encountered */
2190    uschar nl[4];                 /* Newline string when fixed length */    BOOL had_pruneorskip;             /* (*PRUNE) or (*SKIP) encountered */
2191      BOOL check_lookbehind;            /* Lookbehinds need later checking */
2192      int  nltype;                      /* Newline type */
2193      int  nllen;                       /* Newline string length */
2194      pcre_uchar nl[4];                 /* Newline string when fixed length */
2195  } compile_data;  } compile_data;
2196    
2197  /* Structure for maintaining a chain of pointers to the currently incomplete  /* Structure for maintaining a chain of pointers to the currently incomplete
2198  branches, for testing for left recursion. */  branches, for testing for left recursion while compiling. */
2199    
2200  typedef struct branch_chain {  typedef struct branch_chain {
2201    struct branch_chain *outer;    struct branch_chain *outer;
2202    uschar *current_branch;    pcre_uchar *current_branch;
2203  } branch_chain;  } branch_chain;
2204    
2205  /* Structure for items in a linked list that represents an explicit recursive  /* Structure for items in a linked list that represents an explicit recursive
2206  call within the pattern. */  call within the pattern; used by pcre_exec(). */
2207    
2208  typedef struct recursion_info {  typedef struct recursion_info {
2209    struct recursion_info *prevrec; /* Previous recursion record (or NULL) */    struct recursion_info *prevrec; /* Previous recursion record (or NULL) */
2210    int group_num;                /* Number of group that was called */    int group_num;                  /* Number of group that was called */
2211    const uschar *after_call;     /* "Return value": points after the call in the expr */    int *offset_save;               /* Pointer to start of saved offsets */
2212    int *offset_save;             /* Pointer to start of saved offsets */    int saved_max;                  /* Number of saved offsets */
2213    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 */  
2214  } recursion_info;  } recursion_info;
2215    
2216    /* A similar structure for pcre_dfa_exec(). */
2217    
2218    typedef struct dfa_recursion_info {
2219      struct dfa_recursion_info *prevrec;
2220      int group_num;
2221      PCRE_PUCHAR subject_position;
2222    } dfa_recursion_info;
2223    
2224  /* 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
2225  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
2226  has been matched by a subpattern - to break infinite loops. */  has been matched by a subpattern - to break infinite loops; used by
2227    pcre_exec(). */
2228    
2229  typedef struct eptrblock {  typedef struct eptrblock {
2230    struct eptrblock *epb_prev;    struct eptrblock *epb_prev;
2231    USPTR epb_saved_eptr;    PCRE_PUCHAR epb_saved_eptr;
2232  } eptrblock;  } eptrblock;
2233    
2234    
# Line 1647  typedef struct match_data { Line 2239  typedef struct match_data {
2239    unsigned long int match_call_count;      /* As it says */    unsigned long int match_call_count;      /* As it says */
2240    unsigned long int match_limit;           /* As it says */    unsigned long int match_limit;           /* As it says */
2241    unsigned long int match_limit_recursion; /* As it says */    unsigned long int match_limit_recursion; /* As it says */
2242    int   *offset_vector;         /* Offset vector */    int   *offset_vector;           /* Offset vector */
2243    int    offset_end;            /* One past the end */    int    offset_end;              /* One past the end */
2244    int    offset_max;            /* The maximum usable for return data */    int    offset_max;              /* The maximum usable for return data */
2245    int    nltype;                /* Newline type */    int    nltype;                  /* Newline type */
2246    int    nllen;                 /* Newline string length */    int    nllen;                   /* Newline string length */
2247    int    name_count;            /* Number of names in name table */    int    name_count;              /* Number of names in name table */
2248    int    name_entry_size;       /* Size of entry in names table */    int    name_entry_size;         /* Size of entry in names table */
2249    uschar *name_table;           /* Table of names */    pcre_uchar *name_table;         /* Table of names */
2250    uschar nl[4];                 /* Newline string when fixed */    pcre_uchar nl[4];               /* Newline string when fixed */
2251    const uschar *lcc;            /* Points to lower casing table */    const  pcre_uint8 *lcc;         /* Points to lower casing table */
2252    const uschar *ctypes;         /* Points to table of type maps */    const  pcre_uint8 *fcc;         /* Points to case-flipping table */
2253    BOOL   offset_overflow;       /* Set if too many extractions */    const  pcre_uint8 *ctypes;      /* Points to table of type maps */
2254    BOOL   notbol;                /* NOTBOL flag */    BOOL   offset_overflow;         /* Set if too many extractions */
2255    BOOL   noteol;                /* NOTEOL flag */    BOOL   notbol;                  /* NOTBOL flag */
2256    BOOL   utf8;                  /* UTF8 flag */    BOOL   noteol;                  /* NOTEOL flag */
2257    BOOL   jscript_compat;        /* JAVASCRIPT_COMPAT flag */    BOOL   utf;                     /* UTF-8 / UTF-16 flag */
2258    BOOL   endonly;               /* Dollar not before final \n */    BOOL   jscript_compat;          /* JAVASCRIPT_COMPAT flag */
2259    BOOL   notempty;              /* Empty string match not wanted */    BOOL   use_ucp;                 /* PCRE_UCP flag */
2260    BOOL   notempty_atstart;      /* Empty string match at start not wanted */    BOOL   endonly;                 /* Dollar not before final \n */
2261    BOOL   hitend;                /* Hit the end of the subject at some point */    BOOL   notempty;                /* Empty string match not wanted */
2262    BOOL   bsr_anycrlf;           /* \R is just any CRLF, not full Unicode */    BOOL   notempty_atstart;        /* Empty string match at start not wanted */
2263    const uschar *start_code;     /* For use when recursing */    BOOL   hitend;                  /* Hit the end of the subject at some point */
2264    USPTR  start_subject;         /* Start of the subject string */    BOOL   bsr_anycrlf;             /* \R is just any CRLF, not full Unicode */
2265    USPTR  end_subject;           /* End of the subject string */    BOOL   hasthen;                 /* Pattern contains (*THEN) */
2266    USPTR  start_match_ptr;       /* Start of matched string */    BOOL   ignore_skip_arg;         /* For re-run when SKIP name not found */
2267    USPTR  end_match_ptr;         /* Subject position at end match */    const  pcre_uchar *start_code;  /* For use when recursing */
2268    USPTR  start_used_ptr;        /* Earliest consulted character */    PCRE_PUCHAR start_subject;      /* Start of the subject string */
2269    int    partial;               /* PARTIAL options */    PCRE_PUCHAR end_subject;        /* End of the subject string */
2270    int    end_offset_top;        /* Highwater mark at end of match */    PCRE_PUCHAR start_match_ptr;    /* Start of matched string */
2271    int    capture_last;          /* Most recent capture number */    PCRE_PUCHAR end_match_ptr;      /* Subject position at end match */
2272    int    start_offset;          /* The start offset value */    PCRE_PUCHAR start_used_ptr;     /* Earliest consulted character */
2273    eptrblock *eptrchain;         /* Chain of eptrblocks for tail recursions */    int    partial;                 /* PARTIAL options */
2274    int    eptrn;                 /* Next free eptrblock */    int    end_offset_top;          /* Highwater mark at end of match */
2275    recursion_info *recursive;    /* Linked list of recursion data */    int    capture_last;            /* Most recent capture number */
2276    void  *callout_data;          /* To pass back to callouts */    int    start_offset;            /* The start offset value */
2277    const uschar *mark;           /* Mark pointer to pass back */    int    match_function_type;     /* Set for certain special calls of MATCH() */
2278      eptrblock *eptrchain;           /* Chain of eptrblocks for tail recursions */
2279      int    eptrn;                   /* Next free eptrblock */
2280      recursion_info *recursive;      /* Linked list of recursion data */
2281      void  *callout_data;            /* To pass back to callouts */
2282      const  pcre_uchar *mark;        /* Mark pointer to pass back on success */
2283      const  pcre_uchar *nomatch_mark;/* Mark pointer to pass back on failure */
2284      const  pcre_uchar *once_target; /* Where to back up to for atomic groups */
2285    #ifdef NO_RECURSE
2286      void  *match_frames_base;       /* For remembering malloc'd frames */
2287    #endif
2288  } match_data;  } match_data;
2289    
2290  /* 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
2291  functions. */  functions. */
2292    
2293  typedef struct dfa_match_data {  typedef struct dfa_match_data {
2294    const uschar *start_code;     /* Start of the compiled pattern */    const pcre_uchar *start_code;     /* Start of the compiled pattern */
2295    const uschar *start_subject;  /* Start of the subject string */    const pcre_uchar *start_subject ; /* Start of the subject string */
2296    const uschar *end_subject;    /* End of subject string */    const pcre_uchar *end_subject;    /* End of subject string */
2297    const uschar *start_used_ptr; /* Earliest consulted character */    const pcre_uchar *start_used_ptr; /* Earliest consulted character */
2298    const uschar *tables;         /* Character tables */    const pcre_uint8 *tables;         /* Character tables */
2299    int   start_offset;           /* The start offset value */    int   start_offset;               /* The start offset value */
2300    int   moptions;               /* Match options */    int   moptions;                   /* Match options */
2301    int   poptions;               /* Pattern options */    int   poptions;                   /* Pattern options */
2302    int    nltype;                /* Newline type */    int   nltype;                     /* Newline type */
2303    int    nllen;                 /* Newline string length */    int   nllen;                      /* Newline string length */
2304    uschar nl[4];                 /* Newline string when fixed */    pcre_uchar nl[4];                 /* Newline string when fixed */
2305    void  *callout_data;          /* To pass back to callouts */    void *callout_data;               /* To pass back to callouts */
2306      dfa_recursion_info *recursive;    /* Linked list of recursion data */
2307  } dfa_match_data;  } dfa_match_data;
2308    
2309  /* Bit definitions for entries in the pcre_ctypes table. */  /* Bit definitions for entries in the pcre_ctypes table. */
# Line 1736  total length. */ Line 2339  total length. */
2339  #define ctypes_offset (cbits_offset + cbit_length)  #define ctypes_offset (cbits_offset + cbit_length)
2340  #define tables_length (ctypes_offset + 256)  #define tables_length (ctypes_offset + 256)
2341    
2342    /* Internal function and data prefixes. */
2343    
2344    #ifdef COMPILE_PCRE8
2345    #ifndef PUBL
2346    #define PUBL(name) pcre_##name
2347    #endif
2348    #ifndef PRIV
2349    #define PRIV(name) _pcre_##name
2350    #endif
2351    #else /* COMPILE_PCRE8 */
2352    #ifdef COMPILE_PCRE16
2353    #ifndef PUBL
2354    #define PUBL(name) pcre16_##name
2355    #endif
2356    #ifndef PRIV
2357    #define PRIV(name) _pcre16_##name
2358    #endif
2359    #else
2360    #error Unsupported compiling mode
2361    #endif /* COMPILE_PCRE16 */
2362    #endif /* COMPILE_PCRE8 */
2363    
2364  /* 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
2365  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
2366  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 1753  of the exported public functions. They h Line 2378  of the exported public functions. They h
2378  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
2379  pcre_tables.c module. */  pcre_tables.c module. */
2380    
2381  extern const int    _pcre_utf8_table1[];  #ifdef COMPILE_PCRE8
2382  extern const int    _pcre_utf8_table2[];  extern const int            PRIV(utf8_table1)[];
2383  extern const int    _pcre_utf8_table3[];  extern const int            PRIV(utf8_table1_size);
2384  extern const uschar _pcre_utf8_table4[];  extern const int            PRIV(utf8_table2)[];
2385    extern const int            PRIV(utf8_table3)[];
2386  extern const int    _pcre_utf8_table1_size;  extern const pcre_uint8     PRIV(utf8_table4)[];
2387    #endif /* COMPILE_PCRE8 */
2388  extern const char   _pcre_utt_names[];  
2389  extern const ucp_type_table _pcre_utt[];  extern const char           PRIV(utt_names)[];
2390  extern const int _pcre_utt_size;  extern const ucp_type_table PRIV(utt)[];
2391    extern const int            PRIV(utt_size);
2392    
2393  extern const uschar _pcre_default_tables[];  extern const pcre_uint8     PRIV(OP_lengths)[];
2394    extern const pcre_uint8     PRIV(default_tables)[];
2395    
2396  extern const uschar _pcre_OP_lengths[];  extern const pcre_uint32    PRIV(hspace_list)[];
2397    extern const pcre_uint32    PRIV(vspace_list)[];
2398    
2399    
2400  /* Internal shared functions. These are functions that are used by more than  /* Internal shared functions. These are functions that are used by more than
2401  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
2402  sense, but are not part of the PCRE public API. */  sense, but are not part of the PCRE public API. */
2403    
2404  extern const uschar *_pcre_find_bracket(const uschar *, BOOL, int);  /* String comparison functions. */
2405  extern BOOL          _pcre_is_newline(USPTR, int, USPTR, int *, BOOL);  #ifdef 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 *);  
2406    
2407    #define STRCMP_UC_UC(str1, str2) \
2408      strcmp((char *)(str1), (char *)(str2))
2409    #define STRCMP_UC_C8(str1, str2) \
2410      strcmp((char *)(str1), (str2))
2411    #define STRNCMP_UC_UC(str1, str2, num) \
2412      strncmp((char *)(str1), (char *)(str2), (num))
2413    #define STRNCMP_UC_C8(str1, str2, num) \
2414      strncmp((char *)(str1), (str2), (num))
2415    #define STRLEN_UC(str) strlen((const char *)str)
2416    
2417    #else
2418    
2419    extern int               PRIV(strcmp_uc_uc)(const pcre_uchar *,
2420                               const pcre_uchar *);
2421    extern int               PRIV(strcmp_uc_c8)(const pcre_uchar *,
2422                               const char *);
2423    extern int               PRIV(strncmp_uc_uc)(const pcre_uchar *,
2424                               const pcre_uchar *, unsigned int num);
2425    extern int               PRIV(strncmp_uc_c8)(const pcre_uchar *,
2426                               const char *, unsigned int num);
2427    extern unsigned int      PRIV(strlen_uc)(const pcre_uchar *str);
2428    
2429    #define STRCMP_UC_UC(str1, str2) \
2430      PRIV(strcmp_uc_uc)((str1), (str2))
2431    #define STRCMP_UC_C8(str1, str2) \
2432      PRIV(strcmp_uc_c8)((str1), (str2))
2433    #define STRNCMP_UC_UC(str1, str2, num) \
2434      PRIV(strncmp_uc_uc)((str1), (str2), (num))
2435    #define STRNCMP_UC_C8(str1, str2, num) \
2436      PRIV(strncmp_uc_c8)((str1), (str2), (num))
2437    #define STRLEN_UC(str) PRIV(strlen_uc)(str)
2438    
2439    #endif /* COMPILE_PCRE8 */
2440    
2441    extern const pcre_uchar *PRIV(find_bracket)(const pcre_uchar *, BOOL, int);
2442    extern BOOL              PRIV(is_newline)(PCRE_PUCHAR, int, PCRE_PUCHAR,
2443                               int *, BOOL);
2444    extern int               PRIV(ord2utf)(pcre_uint32, pcre_uchar *);
2445    extern int               PRIV(valid_utf)(PCRE_PUCHAR, int, int *);
2446    extern BOOL              PRIV(was_newline)(PCRE_PUCHAR, int, PCRE_PUCHAR,
2447                               int *, BOOL);
2448    extern BOOL              PRIV(xclass)(int, const pcre_uchar *, BOOL);
2449    
2450    #ifdef SUPPORT_JIT
2451    extern void              PRIV(jit_compile)(const REAL_PCRE *,
2452                               PUBL(extra) *, int);
2453    extern int               PRIV(jit_exec)(const REAL_PCRE *, const PUBL(extra) *,
2454                               const pcre_uchar *, int, int, int, int *, int);
2455    extern void              PRIV(jit_free)(void *);
2456    extern int               PRIV(jit_get_size)(void *);
2457    extern const char*       PRIV(jit_get_target)(void);
2458    #endif
2459    
2460  /* Unicode character database (UCD) */  /* Unicode character database (UCD) */
2461    
2462  typedef struct {  typedef struct {
2463    uschar script;    pcre_uint8 script;     /* ucp_Arabic, etc. */
2464    uschar chartype;    pcre_uint8 chartype;   /* ucp_Cc, etc. (general categories) */
2465    pcre_int32 other_case;    pcre_uint8 gbprop;     /* ucp_gbControl, etc. (grapheme break property) */
2466      pcre_uint8 caseset;    /* offset to multichar other cases or zero */
2467      pcre_int32 other_case; /* offset to other case, or zero if none */
2468  } ucd_record;  } ucd_record;
2469    
2470  extern const ucd_record  _pcre_ucd_records[];  extern const pcre_uint32 PRIV(ucd_caseless_sets)[];
2471  extern const uschar      _pcre_ucd_stage1[];  extern const ucd_record  PRIV(ucd_records)[];
2472  extern const pcre_uint16 _pcre_ucd_stage2[];  extern const pcre_uint8  PRIV(ucd_stage1)[];
2473  extern const int         _pcre_ucp_gentype[];  extern const pcre_uint16 PRIV(ucd_stage2)[];
2474    extern const int         PRIV(ucp_gentype)[];
2475    extern const pcre_uint32 PRIV(ucp_gbtable)[];
2476    #ifdef SUPPORT_JIT
2477    extern const int         PRIV(ucp_typerange)[];
2478    #endif
2479    
2480    #ifdef SUPPORT_UCP
2481  /* UCD access macros */  /* UCD access macros */
2482    
2483  #define UCD_BLOCK_SIZE 128  #define UCD_BLOCK_SIZE 128
2484  #define GET_UCD(ch) (_pcre_ucd_records + \  #define GET_UCD(ch) (PRIV(ucd_records) + \
2485          _pcre_ucd_stage2[_pcre_ucd_stage1[(ch) / UCD_BLOCK_SIZE] * \          PRIV(ucd_stage2)[PRIV(ucd_stage1)[(ch) / UCD_BLOCK_SIZE] * \
2486          UCD_BLOCK_SIZE + ch % UCD_BLOCK_SIZE])          UCD_BLOCK_SIZE + (ch) % UCD_BLOCK_SIZE])
2487    
2488  #define UCD_CHARTYPE(ch)  GET_UCD(ch)->chartype  #define UCD_CHARTYPE(ch)    GET_UCD(ch)->chartype
2489  #define UCD_SCRIPT(ch)    GET_UCD(ch)->script  #define UCD_SCRIPT(ch)      GET_UCD(ch)->script
2490  #define UCD_CATEGORY(ch)  _pcre_ucp_gentype[UCD_CHARTYPE(ch)]  #define UCD_CATEGORY(ch)    PRIV(ucp_gentype)[UCD_CHARTYPE(ch)]
2491  #define UCD_OTHERCASE(ch) (ch + GET_UCD(ch)->other_case)  #define UCD_GRAPHBREAK(ch)  GET_UCD(ch)->gbprop
2492    #define UCD_CASESET(ch)     GET_UCD(ch)->caseset
2493    #define UCD_OTHERCASE(ch)   (ch + GET_UCD(ch)->other_case)
2494    
2495    #endif /* SUPPORT_UCP */
2496    
2497  #endif  #endif
2498    

Legend:
Removed from v.510  
changed lines
  Added in v.1046

  ViewVC Help
Powered by ViewVC 1.1.5