regex.h   regex.h 
skipping to change at line 54 skipping to change at line 54
#ifdef TRE_USE_SYSTEM_REGEX_H #ifdef TRE_USE_SYSTEM_REGEX_H
#ifndef REG_OK #ifndef REG_OK
#define REG_OK 0 #define REG_OK 0
#endif /* !REG_OK */ #endif /* !REG_OK */
#ifndef HAVE_REG_ERRCODE_T #ifndef HAVE_REG_ERRCODE_T
typedef int reg_errcode_t; typedef int reg_errcode_t;
#endif /* !HAVE_REG_ERRCODE_T */ #endif /* !HAVE_REG_ERRCODE_T */
/* Extra regcomp() flags. */
#define REG_LITERAL 0x1000
#define REG_RIGHT_ASSOC (REG_LITERAL << 1)
/* Extra regexec() flags. */
#define REG_APPROX_MATCHER 0x1000
#define REG_BACKTRACKING_MATCHER (REG_APPROX_MATCHER << 1)
#else /* !TRE_USE_SYSTEM_REGEX_H */ #else /* !TRE_USE_SYSTEM_REGEX_H */
/* If the we're not using system regex.h, we need to define the /* If the we're not using system regex.h, we need to define the
structs and enums ourselves. */ structs and enums ourselves. */
typedef int regoff_t; typedef int regoff_t;
typedef struct { typedef struct {
size_t re_nsub; /* Number of parenthesized subexpressions. */ size_t re_nsub; /* Number of parenthesized subexpressions. */
void *value; /* For internal use only. */ void *value; /* For internal use only. */
} regex_t; } regex_t;
typedef struct { typedef struct {
regoff_t rm_so; regoff_t rm_so;
regoff_t rm_eo; regoff_t rm_eo;
} regmatch_t; } regmatch_t;
typedef enum { typedef enum {
REG_OK = 0, /* No error. */ REG_OK = 0, /* No error. */
/* POSIX regcomp() return error codes. (In the order listed in the /* POSIX regcomp() return error codes. (In the order listed in the
standard.) */ standard.) */
REG_NOMATCH, /* No match. */ REG_NOMATCH, /* No match. */
REG_BADPAT, /* Invalid regexp. */ REG_BADPAT, /* Invalid regexp. */
REG_ECOLLATE, /* Unknown collating element. */ REG_ECOLLATE, /* Unknown collating element. */
REG_ECTYPE, /* Unknown character class name. */ REG_ECTYPE, /* Unknown character class name. */
REG_EESCAPE, /* Trailing backslash. */ REG_EESCAPE, /* Trailing backslash. */
REG_ESUBREG, /* Invalid back reference. */ REG_ESUBREG, /* Invalid back reference. */
REG_EBRACK, /* "[]" imbalance */ REG_EBRACK, /* "[]" imbalance */
REG_EPAREN, /* "\(\)" or "()" imbalance */ REG_EPAREN, /* "\(\)" or "()" imbalance */
REG_EBRACE, /* "\{\}" or "{}" imbalance */ REG_EBRACE, /* "\{\}" or "{}" imbalance */
REG_BADBR, /* Invalid content of {} */ REG_BADBR, /* Invalid content of {} */
REG_ERANGE, /* Invalid use of range operator */ REG_ERANGE, /* Invalid use of range operator */
REG_ESPACE, /* Out of memory. */ REG_ESPACE, /* Out of memory. */
REG_BADRPT REG_BADRPT
} reg_errcode_t; } reg_errcode_t;
/* POSIX regcomp() flags. */ /* POSIX regcomp() flags. */
#define REG_EXTENDED 1 #define REG_EXTENDED 1
#define REG_ICASE (REG_EXTENDED << 1) #define REG_ICASE (REG_EXTENDED << 1)
#define REG_NEWLINE (REG_ICASE << 1) #define REG_NEWLINE (REG_ICASE << 1)
#define REG_NOSUB (REG_NEWLINE << 1) #define REG_NOSUB (REG_NEWLINE << 1)
/* Extra regcomp() flags. */ /* Extra regcomp() flags. */
#define REG_BASIC 0 #define REG_BASIC 0
#define REG_LITERAL (REG_NOSUB << 1) #define REG_LITERAL (REG_NOSUB << 1)
#define REG_RIGHT_ASSOC (REG_LITERAL << 1)
/* POSIX regexec() flags. */ /* POSIX regexec() flags. */
#define REG_NOTBOL 1 #define REG_NOTBOL 1
#define REG_NOTEOL (REG_NOTBOL << 1) #define REG_NOTEOL (REG_NOTBOL << 1)
/* Extra regexec() flags. */
#define REG_APPROX_MATCHER (REG_NOTEOL << 1)
#define REG_BACKTRACKING_MATCHER (REG_APPROX_MATCHER << 1)
#endif /* !TRE_USE_SYSTEM_REGEX_H */ #endif /* !TRE_USE_SYSTEM_REGEX_H */
/* REG_NOSPEC and REG_LITERAL mean the same thing. */ /* REG_NOSPEC and REG_LITERAL mean the same thing. */
#if defined(REG_LITERAL) #if defined(REG_LITERAL)
#define REG_NOSPEC REG_LITERAL #define REG_NOSPEC REG_LITERAL
#elif defined(REG_NOSPEC) #elif defined(REG_NOSPEC)
#define REG_LITERAL REG_NOSPEC #define REG_LITERAL REG_NOSPEC
#endif /* defined(REG_NOSPEC) */ #endif /* defined(REG_NOSPEC) */
/* The maximum number of iterations in a bound expression. */ /* The maximum number of iterations in a bound expression. */
#undef RE_DUP_MAX #undef RE_DUP_MAX
#define RE_DUP_MAX 255 #define RE_DUP_MAX 255
/* The POSIX.2 regexp functions */ /* The POSIX.2 regexp functions */
int regcomp(regex_t *preg, const char *regex, int cflags); int regcomp(regex_t *preg, const char *regex, int cflags);
int regexec(const regex_t *preg, const char *string, size_t nmatch, int regexec(const regex_t *preg, const char *string, size_t nmatch,
regmatch_t pmatch[], int eflags); regmatch_t pmatch[], int eflags);
skipping to change at line 150 skipping to change at line 163
#ifdef TRE_WCHAR #ifdef TRE_WCHAR
int regwncomp(regex_t *preg, const wchar_t *regex, size_t len, int cflags); int regwncomp(regex_t *preg, const wchar_t *regex, size_t len, int cflags);
int regwnexec(const regex_t *preg, const wchar_t *string, size_t len, int regwnexec(const regex_t *preg, const wchar_t *string, size_t len,
size_t nmatch, regmatch_t pmatch[], int eflags); size_t nmatch, regmatch_t pmatch[], int eflags);
#endif /* TRE_WCHAR */ #endif /* TRE_WCHAR */
#ifdef TRE_APPROX #ifdef TRE_APPROX
/* Approximate matching parameter struct. */ /* Approximate matching parameter struct. */
typedef struct { typedef struct {
int cost_ins; /* Default cost of an inserted character. */ int cost_ins; /* Default cost of an inserted character. */
int cost_del; /* Default cost of a deleted character. */ int cost_del; /* Default cost of a deleted character. */
int cost_subst; /* Default cost of a substituted character. */ int cost_subst; /* Default cost of a substituted character. */
int max_cost; /* Maximum allowed cost of a match. */ int max_cost; /* Maximum allowed cost of a match. */
int max_ins; /* Maximum allowed number of inserts. */ int max_ins; /* Maximum allowed number of inserts. */
int max_del; /* Maximum allowed number of deletes. */ int max_del; /* Maximum allowed number of deletes. */
int max_subst; /* Maximum allowed number of substitutes. */ int max_subst; /* Maximum allowed number of substitutes. */
int max_err; /* Maximum allowed number of errors total. */ int max_err; /* Maximum allowed number of errors total. */
} regaparams_t; } regaparams_t;
/* Approximate matching result struct. */ /* Approximate matching result struct. */
typedef struct { typedef struct {
size_t nmatch; /* Length of pmatch[] array. */ size_t nmatch; /* Length of pmatch[] array. */
regmatch_t *pmatch; /* Submatch data. */ regmatch_t *pmatch; /* Submatch data. */
int cost; /* Cost of the match. */ int cost; /* Cost of the match. */
int num_ins; /* Number of inserts in the match. */ int num_ins; /* Number of inserts in the match. */
int num_del; /* Number of deletes in the match. */ int num_del; /* Number of deletes in the match. */
int num_subst; /* Number of substitutes in the match. */ int num_subst; /* Number of substitutes in the match. */
} regamatch_t; } regamatch_t;
/* Approximate matching functions. */ /* Approximate matching functions. */
int regaexec(const regex_t *preg, const char *string, int regaexec(const regex_t *preg, const char *string,
regamatch_t *match, regaparams_t params, int eflags); regamatch_t *match, regaparams_t params, int eflags);
int reganexec(const regex_t *preg, const char *string, size_t len, int reganexec(const regex_t *preg, const char *string, size_t len,
regamatch_t *match, regaparams_t params, int eflags); regamatch_t *match, regaparams_t params, int eflags);
#ifdef TRE_WCHAR #ifdef TRE_WCHAR
/* Wide character approximate matching. */ /* Wide character approximate matching. */
int regawexec(const regex_t *preg, const wchar_t *string, int regawexec(const regex_t *preg, const wchar_t *string,
regamatch_t *match, regaparams_t params, int eflags); regamatch_t *match, regaparams_t params, int eflags);
int regawnexec(const regex_t *preg, const wchar_t *string, size_t len, int regawnexec(const regex_t *preg, const wchar_t *string, size_t len,
regamatch_t *match, regaparams_t params, int eflags); regamatch_t *match, regaparams_t params, int eflags);
#endif /* TRE_WCHAR */ #endif /* TRE_WCHAR */
/* Sets the parameters to default values. */ /* Sets the parameters to default values. */
void regaparams_default(regaparams_t *params); void regaparams_default(regaparams_t *params);
#endif /* TRE_APPROX */ #endif /* TRE_APPROX */
/* Returns the version string. The returned string is static. */ #ifdef TRE_WCHAR
typedef wchar_t tre_char_t;
#else /* !TRE_WCHAR */
typedef unsigned char tre_char_t;
#endif /* !TRE_WCHAR */
typedef struct {
int (*get_next_char)(tre_char_t *c, unsigned int *pos_add, void *context)
;
void (*rewind)(size_t pos, void *context);
int (*compare)(size_t pos1, size_t pos2, size_t len, void *context);
void *context;
} tre_str_source;
int reguexec(const regex_t *preg, const tre_str_source *string,
size_t nmatch, regmatch_t pmatch[], int eflags);
/* Returns the version string. The returned string is static. */
char *tre_version(void); char *tre_version(void);
/* Returns the value for a config parameter. The type to which `result'
must point to depends of the value of `query', see documentation for
more details. */
int tre_config(int query, void *result); int tre_config(int query, void *result);
enum { enum {
TRE_CONFIG_APPROX, TRE_CONFIG_APPROX,
TRE_CONFIG_WCHAR, TRE_CONFIG_WCHAR,
TRE_CONFIG_MULTIBYTE, TRE_CONFIG_MULTIBYTE,
TRE_CONFIG_SYSTEM_ABI, TRE_CONFIG_SYSTEM_ABI,
TRE_CONFIG_VERSION TRE_CONFIG_VERSION
}; };
/* Returns 1 if the compiled pattern has back references, 0 if not. */
int tre_have_backrefs(const regex_t *preg);
/* Returns 1 if the compiled pattern uses approximate matching features,
0 if not. */
int tre_have_approx(const regex_t *preg);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* TRE_REGEX_H */ #endif /* TRE_REGEX_H */
/* EOF */ /* EOF */
 End of changes. 17 change blocks. 
33 lines changed or deleted 73 lines changed or added


 tre-config.h   tre-config.h 
skipping to change at line 33 skipping to change at line 33
/* Define to the absolute path to the system regex.h */ /* Define to the absolute path to the system regex.h */
/* #undef TRE_SYSTEM_REGEX_H_PATH */ /* #undef TRE_SYSTEM_REGEX_H_PATH */
/* Define to include the system regex.h from TRE regex.h */ /* Define to include the system regex.h from TRE regex.h */
/* #undef TRE_USE_SYSTEM_REGEX_H */ /* #undef TRE_USE_SYSTEM_REGEX_H */
/* Define to enable wide character (wchar_t) support. */ /* Define to enable wide character (wchar_t) support. */
#define TRE_WCHAR 1 #define TRE_WCHAR 1
/* TRE version string. */ /* TRE version string. */
#define TRE_VERSION "0.6.8" #define TRE_VERSION "0.7.0"
/* TRE version level 1. */ /* TRE version level 1. */
#define TRE_VERSION_1 0 #define TRE_VERSION_1 0
/* TRE version level 2. */ /* TRE version level 2. */
#define TRE_VERSION_2 6 #define TRE_VERSION_2 7
/* TRE version level 3. */ /* TRE version level 3. */
#define TRE_VERSION_3 8 #define TRE_VERSION_3 0
 End of changes. 3 change blocks. 
2 lines changed or deleted 2 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/