/[pcre2]/code/trunk/src/pcre2_internal.h
ViewVC logotype

Diff of /code/trunk/src/pcre2_internal.h

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

revision 600 by ph10, Sat Nov 19 12:46:24 2016 UTC revision 670 by ph10, Fri Feb 24 18:25:32 2017 UTC
# Line 1774  typedef struct { Line 1774  typedef struct {
1774  /* UCD access macros */  /* UCD access macros */
1775    
1776  #define UCD_BLOCK_SIZE 128  #define UCD_BLOCK_SIZE 128
1777  #define GET_UCD(ch) (PRIV(ucd_records) + \  #define REAL_GET_UCD(ch) (PRIV(ucd_records) + \
1778          PRIV(ucd_stage2)[PRIV(ucd_stage1)[(int)(ch) / UCD_BLOCK_SIZE] * \          PRIV(ucd_stage2)[PRIV(ucd_stage1)[(int)(ch) / UCD_BLOCK_SIZE] * \
1779          UCD_BLOCK_SIZE + (int)(ch) % UCD_BLOCK_SIZE])          UCD_BLOCK_SIZE + (int)(ch) % UCD_BLOCK_SIZE])
1780    
1781    #if PCRE2_CODE_UNIT_WIDTH == 32
1782    #define GET_UCD(ch) ((ch > MAX_UTF_CODE_POINT)? \
1783      PRIV(dummy_ucd_record) : REAL_GET_UCD(ch))
1784    #else
1785    #define GET_UCD(ch) REAL_GET_UCD(ch)
1786    #endif
1787    
1788  #define UCD_CHARTYPE(ch)    GET_UCD(ch)->chartype  #define UCD_CHARTYPE(ch)    GET_UCD(ch)->chartype
1789  #define UCD_SCRIPT(ch)      GET_UCD(ch)->script  #define UCD_SCRIPT(ch)      GET_UCD(ch)->script
1790  #define UCD_CATEGORY(ch)    PRIV(ucp_gentype)[UCD_CHARTYPE(ch)]  #define UCD_CATEGORY(ch)    PRIV(ucp_gentype)[UCD_CHARTYPE(ch)]
# Line 1834  extern const uint8_t          PRIV(utf8_ Line 1841  extern const uint8_t          PRIV(utf8_
1841  #define _pcre2_default_compile_context PCRE2_SUFFIX(_pcre2_default_compile_context_)  #define _pcre2_default_compile_context PCRE2_SUFFIX(_pcre2_default_compile_context_)
1842  #define _pcre2_default_match_context   PCRE2_SUFFIX(_pcre2_default_match_context_)  #define _pcre2_default_match_context   PCRE2_SUFFIX(_pcre2_default_match_context_)
1843  #define _pcre2_default_tables          PCRE2_SUFFIX(_pcre2_default_tables_)  #define _pcre2_default_tables          PCRE2_SUFFIX(_pcre2_default_tables_)
1844    #if PCRE2_CODE_UNIT_WIDTH == 32
1845    #define _pcre2_dummy_ucd_record        PCRE2_SUFFIX(_pcre2_dummy_ucd_record_)
1846    #endif
1847  #define _pcre2_hspace_list             PCRE2_SUFFIX(_pcre2_hspace_list_)  #define _pcre2_hspace_list             PCRE2_SUFFIX(_pcre2_hspace_list_)
1848  #define _pcre2_vspace_list             PCRE2_SUFFIX(_pcre2_vspace_list_)  #define _pcre2_vspace_list             PCRE2_SUFFIX(_pcre2_vspace_list_)
1849  #define _pcre2_ucd_caseless_sets       PCRE2_SUFFIX(_pcre2_ucd_caseless_sets_)  #define _pcre2_ucd_caseless_sets       PCRE2_SUFFIX(_pcre2_ucd_caseless_sets_)
# Line 1858  extern const uint32_t                  P Line 1868  extern const uint32_t                  P
1868  extern const uint32_t                  PRIV(vspace_list)[];  extern const uint32_t                  PRIV(vspace_list)[];
1869  extern const uint32_t                  PRIV(ucd_caseless_sets)[];  extern const uint32_t                  PRIV(ucd_caseless_sets)[];
1870  extern const ucd_record                PRIV(ucd_records)[];  extern const ucd_record                PRIV(ucd_records)[];
1871    #if PCRE2_CODE_UNIT_WIDTH == 32
1872    extern const ucd_record                PRIV(dummy_ucd_record)[];
1873    #endif
1874  extern const uint8_t                   PRIV(ucd_stage1)[];  extern const uint8_t                   PRIV(ucd_stage1)[];
1875  extern const uint16_t                  PRIV(ucd_stage2)[];  extern const uint16_t                  PRIV(ucd_stage2)[];
1876  extern const uint32_t                  PRIV(ucp_gbtable)[];  extern const uint32_t                  PRIV(ucp_gbtable)[];

Legend:
Removed from v.600  
changed lines
  Added in v.670

  ViewVC Help
Powered by ViewVC 1.1.5