oniguruma.h   oniguruma.h 
skipping to change at line 39 skipping to change at line 39
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#define ONIGURUMA #define ONIGURUMA
#define ONIGURUMA_VERSION_MAJOR 5 #define ONIGURUMA_VERSION_MAJOR 5
#define ONIGURUMA_VERSION_MINOR 9 #define ONIGURUMA_VERSION_MINOR 9
#define ONIGURUMA_VERSION_TEENY 0 #define ONIGURUMA_VERSION_TEENY 1
#ifdef __cplusplus #ifdef __cplusplus
# ifndef HAVE_PROTOTYPES # ifndef HAVE_PROTOTYPES
# define HAVE_PROTOTYPES 1 # define HAVE_PROTOTYPES 1
# endif # endif
# ifndef HAVE_STDARG_PROTOTYPES # ifndef HAVE_STDARG_PROTOTYPES
# define HAVE_STDARG_PROTOTYPES 1 # define HAVE_STDARG_PROTOTYPES 1
# endif # endif
#endif #endif
/* escape Mac OS X/Xcode 2.4/gcc 4.0.1 problem */ /* escape Mac OS X/Xcode 2.4/gcc 4.0.1 problem */
#if defined(__APPLE__) && defined(__GNUC__) && __GNUC__ >= 4 #if defined(__APPLE__) && defined(__GNUC__) && __GNUC__ >= 4
# ifndef HAVE_STDARG_PROTOTYPES # ifndef HAVE_STDARG_PROTOTYPES
# define HAVE_STDARG_PROTOTYPES 1 # define HAVE_STDARG_PROTOTYPES 1
# endif # endif
#endif #endif
#ifdef HAVE_STDARG_H
# ifndef HAVE_STDARG_PROTOTYPES
# define HAVE_STDARG_PROTOTYPES 1
# endif
#endif
#ifndef P_ #ifndef P_
#if defined(__STDC__) || defined(_WIN32) #if defined(__STDC__) || defined(_WIN32)
# define P_(args) args # define P_(args) args
#else #else
# define P_(args) () # define P_(args) ()
#endif #endif
#endif #endif
#ifndef PV_ #ifndef PV_
#ifdef HAVE_STDARG_PROTOTYPES #ifdef HAVE_STDARG_PROTOTYPES
skipping to change at line 95 skipping to change at line 101
#endif #endif
/* PART: character encoding */ /* PART: character encoding */
#ifndef ONIG_ESCAPE_UCHAR_COLLISION #ifndef ONIG_ESCAPE_UCHAR_COLLISION
#define UChar OnigUChar #define UChar OnigUChar
#endif #endif
typedef unsigned char OnigUChar; typedef unsigned char OnigUChar;
typedef unsigned long OnigCodePoint; typedef unsigned long OnigCodePoint;
typedef unsigned int OnigCtype;
typedef unsigned int OnigDistance; typedef unsigned int OnigDistance;
#define ONIG_INFINITE_DISTANCE ~((OnigDistance )0) #define ONIG_INFINITE_DISTANCE ~((OnigDistance )0)
/* case fold flag */ typedef unsigned int OnigCaseFoldType; /* case fold flag */
typedef unsigned int OnigCaseFoldType;
ONIG_EXTERN OnigCaseFoldType OnigDefaultCaseFoldFlag; ONIG_EXTERN OnigCaseFoldType OnigDefaultCaseFoldFlag;
/* #define ONIGENC_CASE_FOLD_HIRAGANA_KATAKANA (1<<1) */ /* #define ONIGENC_CASE_FOLD_HIRAGANA_KATAKANA (1<<1) */
/* #define ONIGENC_CASE_FOLD_KATAKANA_WIDTH (1<<2) */ /* #define ONIGENC_CASE_FOLD_KATAKANA_WIDTH (1<<2) */
#define ONIGENC_CASE_FOLD_TURKISH_AZERI (1<<20) #define ONIGENC_CASE_FOLD_TURKISH_AZERI (1<<20)
#define INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR (1<<30) #define INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR (1<<30)
#define ONIGENC_CASE_FOLD_MIN INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR #define ONIGENC_CASE_FOLD_MIN INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR
#define ONIGENC_CASE_FOLD_DEFAULT OnigDefaultCaseFoldFlag #define ONIGENC_CASE_FOLD_DEFAULT OnigDefaultCaseFoldFlag
skipping to change at line 151 skipping to change at line 157
int max_enc_len; int max_enc_len;
int min_enc_len; int min_enc_len;
int (*is_mbc_newline)(const OnigUChar* p, const OnigUChar* end); int (*is_mbc_newline)(const OnigUChar* p, const OnigUChar* end);
OnigCodePoint (*mbc_to_code)(const OnigUChar* p, const OnigUChar* end); OnigCodePoint (*mbc_to_code)(const OnigUChar* p, const OnigUChar* end);
int (*code_to_mbclen)(OnigCodePoint code); int (*code_to_mbclen)(OnigCodePoint code);
int (*code_to_mbc)(OnigCodePoint code, OnigUChar *buf); int (*code_to_mbc)(OnigCodePoint code, OnigUChar *buf);
int (*mbc_case_fold)(OnigCaseFoldType flag, const OnigUChar** pp, cons t OnigUChar* end, OnigUChar* to); int (*mbc_case_fold)(OnigCaseFoldType flag, const OnigUChar** pp, cons t OnigUChar* end, OnigUChar* to);
int (*apply_all_case_fold)(OnigCaseFoldType flag, OnigApplyAllCaseFold Func f, void* arg); int (*apply_all_case_fold)(OnigCaseFoldType flag, OnigApplyAllCaseFold Func f, void* arg);
int (*get_case_fold_codes_by_str)(OnigCaseFoldType flag, const OnigUCh ar* p, const OnigUChar* end, OnigCaseFoldCodeItem acs[]); int (*get_case_fold_codes_by_str)(OnigCaseFoldType flag, const OnigUCh ar* p, const OnigUChar* end, OnigCaseFoldCodeItem acs[]);
int (*property_name_to_ctype)(struct OnigEncodingTypeST* enc, OnigUCha r* p, OnigUChar* end); int (*property_name_to_ctype)(struct OnigEncodingTypeST* enc, OnigUCha r* p, OnigUChar* end);
int (*is_code_ctype)(OnigCodePoint code, unsigned int ctype); int (*is_code_ctype)(OnigCodePoint code, OnigCtype ctype);
int (*get_ctype_code_range)(int ctype, OnigCodePoint* sb_out, const On int (*get_ctype_code_range)(OnigCtype ctype, OnigCodePoint* sb_out, co
igCodePoint* ranges[]); nst OnigCodePoint* ranges[]);
OnigUChar* (*left_adjust_char_head)(const OnigUChar* start, const OnigUCh ar* p); OnigUChar* (*left_adjust_char_head)(const OnigUChar* start, const OnigUCh ar* p);
int (*is_allowed_reverse_match)(const OnigUChar* p, const OnigUChar* e nd); int (*is_allowed_reverse_match)(const OnigUChar* p, const OnigUChar* e nd);
} OnigEncodingType; } OnigEncodingType;
typedef OnigEncodingType* OnigEncoding; typedef OnigEncodingType* OnigEncoding;
ONIG_EXTERN OnigEncodingType OnigEncodingASCII; ONIG_EXTERN OnigEncodingType OnigEncodingASCII;
ONIG_EXTERN OnigEncodingType OnigEncodingISO_8859_1; ONIG_EXTERN OnigEncodingType OnigEncodingISO_8859_1;
ONIG_EXTERN OnigEncodingType OnigEncodingISO_8859_2; ONIG_EXTERN OnigEncodingType OnigEncodingISO_8859_2;
ONIG_EXTERN OnigEncodingType OnigEncodingISO_8859_3; ONIG_EXTERN OnigEncodingType OnigEncodingISO_8859_3;
skipping to change at line 248 skipping to change at line 254
#define ONIGENC_CTYPE_PRINT 7 #define ONIGENC_CTYPE_PRINT 7
#define ONIGENC_CTYPE_PUNCT 8 #define ONIGENC_CTYPE_PUNCT 8
#define ONIGENC_CTYPE_SPACE 9 #define ONIGENC_CTYPE_SPACE 9
#define ONIGENC_CTYPE_UPPER 10 #define ONIGENC_CTYPE_UPPER 10
#define ONIGENC_CTYPE_XDIGIT 11 #define ONIGENC_CTYPE_XDIGIT 11
#define ONIGENC_CTYPE_WORD 12 #define ONIGENC_CTYPE_WORD 12
#define ONIGENC_CTYPE_ALNUM 13 /* alpha || digit */ #define ONIGENC_CTYPE_ALNUM 13 /* alpha || digit */
#define ONIGENC_CTYPE_ASCII 14 #define ONIGENC_CTYPE_ASCII 14
#define ONIGENC_MAX_STD_CTYPE ONIGENC_CTYPE_ASCII #define ONIGENC_MAX_STD_CTYPE ONIGENC_CTYPE_ASCII
#define enc_len(enc,p) ONIGENC_MBC_ENC_LEN(enc, p) #define onig_enc_len(enc,p,end) ONIGENC_MBC_ENC_LEN(enc,p)
#define ONIGENC_IS_UNDEF(enc) ((enc) == ONIG_ENCODING_UNDEF) #define ONIGENC_IS_UNDEF(enc) ((enc) == ONIG_ENCODING_UNDEF)
#define ONIGENC_IS_SINGLEBYTE(enc) (ONIGENC_MBC_MAXLEN(enc) == 1) #define ONIGENC_IS_SINGLEBYTE(enc) (ONIGENC_MBC_MAXLEN(enc) == 1)
#define ONIGENC_IS_MBC_HEAD(enc,p) (ONIGENC_MBC_ENC_LEN(enc,p) != 1) #define ONIGENC_IS_MBC_HEAD(enc,p) (ONIGENC_MBC_ENC_LEN(enc,p) != 1)
#define ONIGENC_IS_MBC_ASCII(p) (*(p) < 128) #define ONIGENC_IS_MBC_ASCII(p) (*(p) < 128)
#define ONIGENC_IS_CODE_ASCII(code) ((code) < 128) #define ONIGENC_IS_CODE_ASCII(code) ((code) < 128)
#define ONIGENC_IS_MBC_WORD(enc,s,end) \ #define ONIGENC_IS_MBC_WORD(enc,s,end) \
ONIGENC_IS_CODE_WORD(enc,ONIGENC_MBC_TO_CODE(enc,s,end)) ONIGENC_IS_CODE_WORD(enc,ONIGENC_MBC_TO_CODE(enc,s,end))
#define ONIGENC_NAME(enc) ((enc)->name) #define ONIGENC_NAME(enc) ((enc)->name)
skipping to change at line 567 skipping to change at line 573
#define ONIGERR_EMPTY_GROUP_NAME -214 #define ONIGERR_EMPTY_GROUP_NAME -214
#define ONIGERR_INVALID_GROUP_NAME -215 #define ONIGERR_INVALID_GROUP_NAME -215
#define ONIGERR_INVALID_CHAR_IN_GROUP_NAME -216 #define ONIGERR_INVALID_CHAR_IN_GROUP_NAME -216
#define ONIGERR_UNDEFINED_NAME_REFERENCE -217 #define ONIGERR_UNDEFINED_NAME_REFERENCE -217
#define ONIGERR_UNDEFINED_GROUP_REFERENCE -218 #define ONIGERR_UNDEFINED_GROUP_REFERENCE -218
#define ONIGERR_MULTIPLEX_DEFINED_NAME -219 #define ONIGERR_MULTIPLEX_DEFINED_NAME -219
#define ONIGERR_MULTIPLEX_DEFINITION_NAME_CALL -220 #define ONIGERR_MULTIPLEX_DEFINITION_NAME_CALL -220
#define ONIGERR_NEVER_ENDING_RECURSION -221 #define ONIGERR_NEVER_ENDING_RECURSION -221
#define ONIGERR_GROUP_NUMBER_OVER_FOR_CAPTURE_HISTORY -222 #define ONIGERR_GROUP_NUMBER_OVER_FOR_CAPTURE_HISTORY -222
#define ONIGERR_INVALID_CHAR_PROPERTY_NAME -223 #define ONIGERR_INVALID_CHAR_PROPERTY_NAME -223
#define ONIGERR_INVALID_CODE_POINT_VALUE -400
#define ONIGERR_INVALID_WIDE_CHAR_VALUE -400 #define ONIGERR_INVALID_WIDE_CHAR_VALUE -400
#define ONIGERR_TOO_BIG_WIDE_CHAR_VALUE -401 #define ONIGERR_TOO_BIG_WIDE_CHAR_VALUE -401
#define ONIGERR_NOT_SUPPORTED_ENCODING_COMBINATION -402 #define ONIGERR_NOT_SUPPORTED_ENCODING_COMBINATION -402
#define ONIGERR_INVALID_COMBINATION_OF_OPTIONS -403 #define ONIGERR_INVALID_COMBINATION_OF_OPTIONS -403
/* errors related to thread */ /* errors related to thread */
#define ONIGERR_OVER_THREAD_PASS_LIMIT_COUNT -1001 #define ONIGERR_OVER_THREAD_PASS_LIMIT_COUNT -1001
/* must be smaller than BIT_STATUS_BITS_NUM (unsigned int * 8) */ /* must be smaller than BIT_STATUS_BITS_NUM (unsigned int * 8) */
#define ONIG_MAX_CAPTURE_HISTORY_GROUP 31 #define ONIG_MAX_CAPTURE_HISTORY_GROUP 31
 End of changes. 7 change blocks. 
7 lines changed or deleted 14 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/