/[pcre]/code/branches/pcre16/pcre_internal.h
ViewVC logotype

Diff of /code/branches/pcre16/pcre_internal.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 226 by ph10, Tue Aug 21 11:46:08 2007 UTC revision 335 by ph10, Sat Apr 12 14:36:14 2008 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-2007 University of Cambridge             Copyright (c) 1997-2008 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 363  never be called in byte mode. To make su Line 363  never be called in byte mode. To make su
363  support is omitted, we don't even define it. */  support is omitted, we don't even define it. */
364    
365  #ifndef SUPPORT_UTF8  #ifndef SUPPORT_UTF8
366    #define NEXTCHAR(p) p++;
367  #define GETCHAR(c, eptr) c = *eptr;  #define GETCHAR(c, eptr) c = *eptr;
368  #define GETCHARTEST(c, eptr) c = *eptr;  #define GETCHARTEST(c, eptr) c = *eptr;
369  #define GETCHARINC(c, eptr) c = *eptr++;  #define GETCHARINC(c, eptr) c = *eptr++;
# Line 372  support is omitted, we don't even define Line 373  support is omitted, we don't even define
373    
374  #else   /* SUPPORT_UTF8 */  #else   /* SUPPORT_UTF8 */
375    
376    /* Advance a character pointer one byte in non-UTF-8 mode and by one character
377    in UTF-8 mode. */
378    
379    #define NEXTCHAR(p) \
380      p++; \
381      if (utf8) { while((*p & 0xc0) == 0x80) p++; }
382    
383  /* 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
384  we know we are in UTF-8 mode. */  we know we are in UTF-8 mode. */
385    
# Line 481  Standard C system should have one. */ Line 489  Standard C system should have one. */
489    
490  #define PCRE_IMS (PCRE_CASELESS|PCRE_MULTILINE|PCRE_DOTALL)  #define PCRE_IMS (PCRE_CASELESS|PCRE_MULTILINE|PCRE_DOTALL)
491    
492  /* Private options flags start at the most significant end of the four bytes.  /* Private flags containing information about the compiled regex. They used to
493  The public options defined in pcre.h start at the least significant end. Make  live at the top end of the options word, but that got almost full, so now they
494  sure they don't overlap! The bits are getting a bit scarce now -- when we run  are in a 16-bit flags word. */
495  out, there is a dummy word in the structure that could be used for the private  
496  bits. */  #define PCRE_NOPARTIAL     0x0001  /* can't use partial with this regex */
497    #define PCRE_FIRSTSET      0x0002  /* first_byte is set */
498  #define PCRE_NOPARTIAL     0x80000000  /* can't use partial with this regex */  #define PCRE_REQCHSET      0x0004  /* req_byte is set */
499  #define PCRE_FIRSTSET      0x40000000  /* first_byte is set */  #define PCRE_STARTLINE     0x0008  /* start after \n for multiline */
500  #define PCRE_REQCHSET      0x20000000  /* req_byte is set */  #define PCRE_JCHANGED      0x0010  /* j option used in regex */
501  #define PCRE_STARTLINE     0x10000000  /* start after \n for multiline */  #define PCRE_HASCRORLF     0x0020  /* explicit \r or \n in pattern */
 #define PCRE_JCHANGED      0x08000000  /* j option changes within regex */  
 #define PCRE_HASCRORLF     0x04000000  /* explicit \r or \n in pattern */  
502    
503  /* Options for the "extra" block produced by pcre_study(). */  /* Options for the "extra" block produced by pcre_study(). */
504    
# Line 508  time, run time, or study time, respectiv Line 514  time, run time, or study time, respectiv
514    (PCRE_CASELESS|PCRE_EXTENDED|PCRE_ANCHORED|PCRE_MULTILINE| \    (PCRE_CASELESS|PCRE_EXTENDED|PCRE_ANCHORED|PCRE_MULTILINE| \
515     PCRE_DOTALL|PCRE_DOLLAR_ENDONLY|PCRE_EXTRA|PCRE_UNGREEDY|PCRE_UTF8| \     PCRE_DOTALL|PCRE_DOLLAR_ENDONLY|PCRE_EXTRA|PCRE_UNGREEDY|PCRE_UTF8| \
516     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| \
517     PCRE_DUPNAMES|PCRE_NEWLINE_BITS)     PCRE_DUPNAMES|PCRE_NEWLINE_BITS|PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE)
518    
519  #define PUBLIC_EXEC_OPTIONS \  #define PUBLIC_EXEC_OPTIONS \
520    (PCRE_ANCHORED|PCRE_NOTBOL|PCRE_NOTEOL|PCRE_NOTEMPTY|PCRE_NO_UTF8_CHECK| \    (PCRE_ANCHORED|PCRE_NOTBOL|PCRE_NOTEOL|PCRE_NOTEMPTY|PCRE_NO_UTF8_CHECK| \
521     PCRE_PARTIAL|PCRE_NEWLINE_BITS)     PCRE_PARTIAL|PCRE_NEWLINE_BITS|PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE)
522    
523  #define PUBLIC_DFA_EXEC_OPTIONS \  #define PUBLIC_DFA_EXEC_OPTIONS \
524    (PCRE_ANCHORED|PCRE_NOTBOL|PCRE_NOTEOL|PCRE_NOTEMPTY|PCRE_NO_UTF8_CHECK| \    (PCRE_ANCHORED|PCRE_NOTBOL|PCRE_NOTEOL|PCRE_NOTEMPTY|PCRE_NO_UTF8_CHECK| \
525     PCRE_PARTIAL|PCRE_DFA_SHORTEST|PCRE_DFA_RESTART|PCRE_NEWLINE_BITS)     PCRE_PARTIAL|PCRE_DFA_SHORTEST|PCRE_DFA_RESTART|PCRE_NEWLINE_BITS| \
526       PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE)
527    
528  #define PUBLIC_STUDY_OPTIONS 0   /* None defined */  #define PUBLIC_STUDY_OPTIONS 0   /* None defined */
529    
# Line 606  character, that code will have to change Line 613  character, that code will have to change
613    
614  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,
615         ESC_W, ESC_w, ESC_dum1, ESC_C, ESC_P, ESC_p, ESC_R, ESC_H, ESC_h,         ESC_W, ESC_w, ESC_dum1, ESC_C, ESC_P, ESC_p, ESC_R, ESC_H, ESC_h,
616         ESC_V, ESC_v, ESC_X, ESC_Z, ESC_z, ESC_E, ESC_Q, ESC_k, ESC_REF };         ESC_V, ESC_v, ESC_X, ESC_Z, ESC_z, ESC_E, ESC_Q, ESC_g, ESC_k, ESC_REF };
617    
618    
619  /* 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
# Line 766  enum { Line 773  enum {
773    /* These are forced failure and success verbs */    /* These are forced failure and success verbs */
774    
775    OP_FAIL,           /* 108 */    OP_FAIL,           /* 108 */
776    OP_ACCEPT          /* 109 */    OP_ACCEPT,         /* 109 */
777    
778      /* This is used to skip a subpattern with a {0} quantifier */
779    
780      OP_SKIPZERO        /* 110 */
781  };  };
782    
783    
# Line 791  for debugging. The macro is referenced o Line 802  for debugging. The macro is referenced o
802    "AssertB", "AssertB not", "Reverse",                            \    "AssertB", "AssertB not", "Reverse",                            \
803    "Once", "Bra", "CBra", "Cond", "SBra", "SCBra", "SCond",        \    "Once", "Bra", "CBra", "Cond", "SBra", "SCBra", "SCond",        \
804    "Cond ref", "Cond rec", "Cond def", "Brazero", "Braminzero",    \    "Cond ref", "Cond rec", "Cond def", "Brazero", "Braminzero",    \
805    "*PRUNE", "*SKIP", "*THEN", "*COMMIT", "*FAIL", "*ACCEPT"    "*PRUNE", "*SKIP", "*THEN", "*COMMIT", "*FAIL", "*ACCEPT",      \
806      "Skip zero"
807    
808    
809  /* This macro defines the length of fixed length operations in the compiled  /* This macro defines the length of fixed length operations in the compiled
# Line 856  in UTF-8 mode. The code that uses this t Line 868  in UTF-8 mode. The code that uses this t
868    1,                             /* DEF                                    */ \    1,                             /* DEF                                    */ \
869    1, 1,                          /* BRAZERO, BRAMINZERO                    */ \    1, 1,                          /* BRAZERO, BRAMINZERO                    */ \
870    1, 1, 1, 1,                    /* PRUNE, SKIP, THEN, COMMIT,             */ \    1, 1, 1, 1,                    /* PRUNE, SKIP, THEN, COMMIT,             */ \
871    1, 1                           /* FAIL, ACCEPT                           */    1, 1, 1                        /* FAIL, ACCEPT, SKIPZERO                 */
872    
873    
874  /* A magic value for OP_RREF to indicate the "any recursion" condition. */  /* A magic value for OP_RREF to indicate the "any recursion" condition. */
# Line 872  enum { ERR0,  ERR1,  ERR2,  ERR3,  ERR4, Line 884  enum { ERR0,  ERR1,  ERR2,  ERR3,  ERR4,
884         ERR30, ERR31, ERR32, ERR33, ERR34, ERR35, ERR36, ERR37, ERR38, ERR39,         ERR30, ERR31, ERR32, ERR33, ERR34, ERR35, ERR36, ERR37, ERR38, ERR39,
885         ERR40, ERR41, ERR42, ERR43, ERR44, ERR45, ERR46, ERR47, ERR48, ERR49,         ERR40, ERR41, ERR42, ERR43, ERR44, ERR45, ERR46, ERR47, ERR48, ERR49,
886         ERR50, ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58, ERR59,         ERR50, ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58, ERR59,
887         ERR60, ERR61 };         ERR60, ERR61, ERR62, ERR63 };
888    
889  /* 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
890  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 894  NOTE NOTE NOTE: Line 906  NOTE NOTE NOTE:
906  typedef struct real_pcre {  typedef struct real_pcre {
907    pcre_uint32 magic_number;    pcre_uint32 magic_number;
908    pcre_uint32 size;               /* Total that was malloced */    pcre_uint32 size;               /* Total that was malloced */
909    pcre_uint32 options;    pcre_uint32 options;            /* Public options */
910    pcre_uint32 dummy1;             /* For future use, maybe */    pcre_uint16 flags;              /* Private flags */
911      pcre_uint16 dummy1;             /* For future use */
912    pcre_uint16 top_bracket;    pcre_uint16 top_bracket;
913    pcre_uint16 top_backref;    pcre_uint16 top_backref;
914    pcre_uint16 first_byte;    pcre_uint16 first_byte;
# Line 935  typedef struct compile_data { Line 947  typedef struct compile_data {
947    uschar *name_table;           /* The name/number table */    uschar *name_table;           /* The name/number table */
948    int  names_found;             /* Number of entries so far */    int  names_found;             /* Number of entries so far */
949    int  name_entry_size;         /* Size of each entry */    int  name_entry_size;         /* Size of each entry */
950    int  bracount;                /* Count of capturing parens */    int  bracount;                /* Count of capturing parens as we compile */
951      int  final_bracount;          /* Saved value after first pass */
952    int  top_backref;             /* Maximum back reference */    int  top_backref;             /* Maximum back reference */
953    unsigned int backref_map;     /* Bitmap of low back refs */    unsigned int backref_map;     /* Bitmap of low back refs */
954    int  external_options;        /* External (initial) options */    int  external_options;        /* External (initial) options */
955      int  external_flags;          /* External flag bits to be set */
956    int  req_varyopt;             /* "After variable item" flag for reqbyte */    int  req_varyopt;             /* "After variable item" flag for reqbyte */
   BOOL nopartial;               /* Set TRUE if partial won't work */  
957    BOOL had_accept;              /* (*ACCEPT) encountered */    BOOL had_accept;              /* (*ACCEPT) encountered */
958    int  nltype;                  /* Newline type */    int  nltype;                  /* Newline type */
959    int  nllen;                   /* Newline string length */    int  nllen;                   /* Newline string length */
# Line 1000  typedef struct match_data { Line 1013  typedef struct match_data {
1013    BOOL   notempty;              /* Empty string match not wanted */    BOOL   notempty;              /* Empty string match not wanted */
1014    BOOL   partial;               /* PARTIAL flag */    BOOL   partial;               /* PARTIAL flag */
1015    BOOL   hitend;                /* Hit the end of the subject at some point */    BOOL   hitend;                /* Hit the end of the subject at some point */
1016      BOOL   bsr_anycrlf;           /* \R is just any CRLF, not full Unicode */
1017    const uschar *start_code;     /* For use when recursing */    const uschar *start_code;     /* For use when recursing */
1018    USPTR  start_subject;         /* Start of the subject string */    USPTR  start_subject;         /* Start of the subject string */
1019    USPTR  end_subject;           /* End of the subject string */    USPTR  end_subject;           /* End of the subject string */
# Line 1036  typedef struct dfa_match_data { Line 1050  typedef struct dfa_match_data {
1050  #define ctype_letter  0x02  #define ctype_letter  0x02
1051  #define ctype_digit   0x04  #define ctype_digit   0x04
1052  #define ctype_xdigit  0x08  #define ctype_xdigit  0x08
1053  #define ctype_word    0x10   /* alphameric or '_' */  #define ctype_word    0x10   /* alphanumeric or '_' */
1054  #define ctype_meta    0x80   /* regexp meta char or zero (end pattern) */  #define ctype_meta    0x80   /* regexp meta char or zero (end pattern) */
1055    
1056  /* Offsets for the bitmap tables in pcre_cbits. Each table contains a set  /* Offsets for the bitmap tables in pcre_cbits. Each table contains a set
# Line 1064  total length. */ Line 1078  total length. */
1078  #define tables_length (ctypes_offset + 256)  #define tables_length (ctypes_offset + 256)
1079    
1080  /* 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
1081  codes. */  codes. Each entry used to point directly to a name, but to reduce the number of
1082    relocations in shared libraries, it now has an offset into a single string
1083    instead. */
1084    
1085  typedef struct {  typedef struct {
1086    const char *name;    pcre_uint16 name_offset;
1087    pcre_uint16 type;    pcre_uint16 type;
1088    pcre_uint16 value;    pcre_uint16 value;
1089  } ucp_type_table;  } ucp_type_table;
# Line 1085  extern const uschar _pcre_utf8_table4[]; Line 1101  extern const uschar _pcre_utf8_table4[];
1101    
1102  extern const int    _pcre_utf8_table1_size;  extern const int    _pcre_utf8_table1_size;
1103    
1104    extern const char   _pcre_utt_names[];
1105  extern const ucp_type_table _pcre_utt[];  extern const ucp_type_table _pcre_utt[];
1106  extern const int _pcre_utt_size;  extern const int _pcre_utt_size;
1107    

Legend:
Removed from v.226  
changed lines
  Added in v.335

  ViewVC Help
Powered by ViewVC 1.1.5