regint.h - Oniguruma (regular expression library)\r
**********************************************************************/\r
/*-\r
- * Copyright (c) 2002-2013 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>\r
+ * Copyright (c) 2002-2018 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>\r
* All rights reserved.\r
*\r
* Redistribution and use in source and binary forms, with or without\r
*/\r
\r
/* for debug */\r
-/* #define ONIG_DEBUG_PARSE_TREE */\r
+/* #define ONIG_DEBUG_PARSE */\r
/* #define ONIG_DEBUG_COMPILE */\r
/* #define ONIG_DEBUG_SEARCH */\r
/* #define ONIG_DEBUG_MATCH */\r
/* for byte-code statistical data. */\r
/* #define ONIG_DEBUG_STATISTICS */\r
\r
-#if defined(ONIG_DEBUG_PARSE_TREE) || defined(ONIG_DEBUG_MATCH) || \\r
+#if defined(ONIG_DEBUG_PARSE) || defined(ONIG_DEBUG_MATCH) || \\r
defined(ONIG_DEBUG_SEARCH) || defined(ONIG_DEBUG_COMPILE) || \\r
defined(ONIG_DEBUG_STATISTICS)\r
#ifndef ONIG_DEBUG\r
\r
/* config */\r
/* spec. config */\r
-#define USE_NAMED_GROUP\r
-#define USE_SUBEXP_CALL\r
+#define USE_CALL\r
+#define USE_CALLOUT\r
#define USE_BACKREF_WITH_LEVEL /* \k<name+n>, \k<name-n> */\r
-#define USE_MONOMANIAC_CHECK_CAPTURES_IN_ENDLESS_REPEAT /* /(?:()|())*\2/ */\r
+#define USE_INSISTENT_CHECK_CAPTURES_IN_EMPTY_REPEAT /* /(?:()|())*\2/ */\r
#define USE_NEWLINE_AT_END_OF_STRING_HAS_EMPTY_LINE /* /\n$/ =~ "\n" */\r
#define USE_WARNING_REDUNDANT_NESTED_REPEAT_OPERATOR\r
-/* #define USE_RECOMPILE_API */\r
-/* !!! moved to regenc.h. */ /* #define USE_CRNL_AS_LINE_TERMINATOR */\r
+\r
+#define USE_RETRY_LIMIT_IN_MATCH\r
\r
/* internal config */\r
-#define USE_PARSE_TREE_NODE_RECYCLE\r
#define USE_OP_PUSH_OR_JUMP_EXACT\r
-#define USE_QTFR_PEEK_NEXT\r
+#define USE_QUANT_PEEK_NEXT\r
#define USE_ST_LIBRARY\r
-#define USE_SHARED_CCLASS_TABLE\r
\r
-#define INIT_MATCH_STACK_SIZE 160\r
-#define DEFAULT_MATCH_STACK_LIMIT_SIZE 0 /* unlimited */\r
+#include "regenc.h"\r
\r
-#if defined(__GNUC__)\r
-# define ARG_UNUSED __attribute__ ((unused))\r
-#else\r
-# define ARG_UNUSED\r
+#ifdef __cplusplus\r
+# ifndef HAVE_STDARG_PROTOTYPES\r
+# define HAVE_STDARG_PROTOTYPES 1\r
+# endif\r
+#endif\r
+\r
+/* escape Mac OS X/Xcode 2.4/gcc 4.0.1 problem */\r
+#if defined(__APPLE__) && defined(__GNUC__) && __GNUC__ >= 4\r
+# ifndef HAVE_STDARG_PROTOTYPES\r
+# define HAVE_STDARG_PROTOTYPES 1\r
+# endif\r
#endif\r
\r
+#ifdef HAVE_STDARG_H\r
+# ifndef HAVE_STDARG_PROTOTYPES\r
+# define HAVE_STDARG_PROTOTYPES 1\r
+# endif\r
+#endif\r
+\r
+\r
+#define INIT_MATCH_STACK_SIZE 160\r
+#define DEFAULT_MATCH_STACK_LIMIT_SIZE 0 /* unlimited */\r
+#define DEFAULT_RETRY_LIMIT_IN_MATCH 10000000\r
+#define DEFAULT_PARSE_DEPTH_LIMIT 4096\r
+\r
/* */\r
/* escape other system UChar definition */\r
-//#include "config.h"\r
#ifdef ONIG_ESCAPE_UCHAR_COLLISION\r
#undef ONIG_ESCAPE_UCHAR_COLLISION\r
#endif\r
#define USE_VARIABLE_META_CHARS\r
#define USE_POSIX_API_REGION_OPTION\r
#define USE_FIND_LONGEST_SEARCH_ALL_OF_RANGE\r
-/* #define USE_COMBINATION_EXPLOSION_CHECK */ /* (X*)* */\r
-\r
-/* #define USE_MULTI_THREAD_SYSTEM */\r
-#define THREAD_SYSTEM_INIT /* depend on thread system */\r
-#define THREAD_SYSTEM_END /* depend on thread system */\r
-#define THREAD_ATOMIC_START /* depend on thread system */\r
-#define THREAD_ATOMIC_END /* depend on thread system */\r
-#define THREAD_PASS /* depend on thread system */\r
+\r
#define xmalloc malloc\r
#define xrealloc realloc\r
#define xcalloc calloc\r
#define xfree free\r
\r
-#define CHECK_INTERRUPT_IN_MATCH_AT\r
-\r
#define st_init_table onig_st_init_table\r
#define st_init_table_with_size onig_st_init_table_with_size\r
#define st_init_numtable onig_st_init_numtable\r
/* */\r
#define onig_st_is_member st_is_member\r
\r
-#define STATE_CHECK_STRING_THRESHOLD_LEN 7\r
-#define STATE_CHECK_BUFF_MAX_SIZE 0x4000\r
-\r
-#define THREAD_PASS_LIMIT_COUNT 8\r
//#define xmemset memset\r
//#define xmemcpy memcpy\r
//#define xmemmove memmove\r
\r
#if defined(_WIN32) && !defined(__GNUC__)\r
#define xalloca _alloca\r
-#define xvsnprintf _vsnprintf\r
+#define xvsnprintf(buf,size,fmt,args) _vsnprintf_s(buf,size,_TRUNCATE,fmt,args)\r
+#define xsnprintf sprintf_s\r
+#define xstrcat(dest,src,size) strcat_s(dest,size,src)\r
#else\r
#define xalloca alloca\r
#define xvsnprintf vsnprintf\r
+#define xsnprintf snprintf\r
+#define xstrcat(dest,src,size) strcat(dest,src)\r
#endif\r
\r
\r
-#if defined(USE_RECOMPILE_API) && defined(USE_MULTI_THREAD_SYSTEM)\r
-#define ONIG_STATE_INC(reg) (reg)->state++\r
-#define ONIG_STATE_DEC(reg) (reg)->state--\r
+// #include <stddef.h>\r
\r
-#define ONIG_STATE_INC_THREAD(reg) do {\\r
- THREAD_ATOMIC_START;\\r
- (reg)->state++;\\r
- THREAD_ATOMIC_END;\\r
-} while(0)\r
-#define ONIG_STATE_DEC_THREAD(reg) do {\\r
- THREAD_ATOMIC_START;\\r
- (reg)->state--;\\r
- THREAD_ATOMIC_END;\\r
-} while(0)\r
-#else\r
-#define ONIG_STATE_INC(reg) /* Nothing */\r
-#define ONIG_STATE_DEC(reg) /* Nothing */\r
-#define ONIG_STATE_INC_THREAD(reg) /* Nothing */\r
-#define ONIG_STATE_DEC_THREAD(reg) /* Nothing */\r
-#endif /* USE_RECOMPILE_API && USE_MULTI_THREAD_SYSTEM */\r
+#ifdef HAVE_LIMITS_H\r
+#include <limits.h>\r
+#endif\r
\r
#if 0\r
#ifdef HAVE_STDLIB_H\r
#include <stdlib.h>\r
#endif\r
\r
+#ifdef HAVE_STDINT_H\r
+#include <stdint.h>\r
+#endif\r
+\r
#if defined(HAVE_ALLOCA_H) && !defined(__GNUC__)\r
#include <alloca.h>\r
#endif\r
#endif\r
#endif\r
\r
+#ifdef HAVE_INTTYPES_H\r
+#include <inttypes.h>\r
+#endif\r
+\r
#ifdef __BORLANDC__\r
#include <malloc.h>\r
#endif\r
#endif\r
#endif\r
\r
-#include "regenc.h"\r
+#ifdef _WIN32\r
+#if defined(_MSC_VER) && (_MSC_VER < 1300)\r
+typedef int intptr_t;\r
+typedef unsigned int uintptr_t;\r
+#endif\r
+#endif\r
+\r
+typedef INTN intptr_t;\r
+typedef UINTN uintptr_t;\r
+\r
+#ifndef offsetof\r
+#define offsetof OFFSET_OF\r
+#endif\r
\r
#ifdef MIN\r
#undef MIN\r
#ifdef MAX\r
#undef MAX\r
#endif\r
+\r
#define MIN(a,b) (((a)>(b))?(b):(a))\r
#define MAX(a,b) (((a)<(b))?(b):(a))\r
\r
#define CHECK_NULL_RETURN_MEMERR(p) if (IS_NULL(p)) return ONIGERR_MEMORY\r
#define NULL_UCHARP ((UChar* )0)\r
\r
+#define INFINITE_LEN ONIG_INFINITE_DISTANCE\r
+\r
#ifdef PLATFORM_UNALIGNED_WORD_ACCESS\r
\r
#define PLATFORM_GET_INC(val,p,type) do{\\r
} while(0)\r
\r
/* sizeof(OnigCodePoint) */\r
-#define WORD_ALIGNMENT_SIZE SIZEOF_LONG\r
+#ifdef SIZEOF_SIZE_T\r
+# define WORD_ALIGNMENT_SIZE SIZEOF_SIZE_T\r
+#else\r
+# define WORD_ALIGNMENT_SIZE SIZEOF_LONG\r
+#endif\r
\r
#define GET_ALIGNMENT_PAD_SIZE(addr,pad_size) do {\\r
- (pad_size) = WORD_ALIGNMENT_SIZE \\r
- - ((unsigned int )(UINTN)(addr) % WORD_ALIGNMENT_SIZE);\\r
+ (pad_size) = WORD_ALIGNMENT_SIZE - ((uintptr_t )(addr) % WORD_ALIGNMENT_SIZE);\\r
if ((pad_size) == WORD_ALIGNMENT_SIZE) (pad_size) = 0;\\r
} while (0)\r
\r
#define ALIGNMENT_RIGHT(addr) do {\\r
(addr) += (WORD_ALIGNMENT_SIZE - 1);\\r
- (addr) -= ((unsigned int )(UINTN)(addr) % WORD_ALIGNMENT_SIZE);\\r
+ (addr) -= ((uintptr_t )(addr) % WORD_ALIGNMENT_SIZE);\\r
} while (0)\r
\r
#endif /* PLATFORM_UNALIGNED_WORD_ACCESS */\r
\r
+\r
+#ifdef USE_CALLOUT\r
+\r
+typedef struct {\r
+ int flag;\r
+ OnigCalloutOf of;\r
+ int in;\r
+ int name_id;\r
+ const UChar* tag_start;\r
+ const UChar* tag_end;\r
+ OnigCalloutType type;\r
+ OnigCalloutFunc start_func;\r
+ OnigCalloutFunc end_func;\r
+ union {\r
+ struct {\r
+ const UChar* start;\r
+ const UChar* end;\r
+ } content;\r
+ struct {\r
+ int num;\r
+ int passed_num;\r
+ OnigType types[ONIG_CALLOUT_MAX_ARGS_NUM];\r
+ OnigValue vals[ONIG_CALLOUT_MAX_ARGS_NUM];\r
+ } arg;\r
+ } u;\r
+} CalloutListEntry;\r
+\r
+#endif\r
+\r
+typedef struct {\r
+ const UChar* pattern;\r
+ const UChar* pattern_end;\r
+#ifdef USE_CALLOUT\r
+ void* tag_table;\r
+ int callout_num;\r
+ int callout_list_alloc;\r
+ CalloutListEntry* callout_list; /* index: callout num */\r
+#endif\r
+} RegexExt;\r
+\r
+#define REG_EXTP(reg) ((RegexExt* )((reg)->chain))\r
+#define REG_EXTPL(reg) ((reg)->chain)\r
+\r
+struct re_pattern_buffer {\r
+ /* common members of BBuf(bytes-buffer) */\r
+ unsigned char* p; /* compiled pattern */\r
+ unsigned int used; /* used space for p */\r
+ unsigned int alloc; /* allocated space for p */\r
+\r
+ int num_mem; /* used memory(...) num counted from 1 */\r
+ int num_repeat; /* OP_REPEAT/OP_REPEAT_NG id-counter */\r
+ int num_null_check; /* OP_EMPTY_CHECK_START/END id counter */\r
+ int num_comb_exp_check; /* no longer used (combination explosion check) */\r
+ int num_call; /* number of subexp call */\r
+ unsigned int capture_history; /* (?@...) flag (1-31) */\r
+ unsigned int bt_mem_start; /* need backtrack flag */\r
+ unsigned int bt_mem_end; /* need backtrack flag */\r
+ int stack_pop_level;\r
+ int repeat_range_alloc;\r
+ OnigRepeatRange* repeat_range;\r
+\r
+ OnigEncoding enc;\r
+ OnigOptionType options;\r
+ OnigSyntaxType* syntax;\r
+ OnigCaseFoldType case_fold_flag;\r
+ void* name_table;\r
+\r
+ /* optimization info (string search, char-map and anchors) */\r
+ int optimize; /* optimize flag */\r
+ int threshold_len; /* search str-length for apply optimize */\r
+ int anchor; /* BEGIN_BUF, BEGIN_POS, (SEMI_)END_BUF */\r
+ OnigLen anchor_dmin; /* (SEMI_)END_BUF anchor distance */\r
+ OnigLen anchor_dmax; /* (SEMI_)END_BUF anchor distance */\r
+ int sub_anchor; /* start-anchor for exact or map */\r
+ unsigned char *exact;\r
+ unsigned char *exact_end;\r
+ unsigned char map[ONIG_CHAR_TABLE_SIZE]; /* used as BM skip or char-map */\r
+ int *int_map; /* BM skip for exact_len > 255 */\r
+ int *int_map_backward; /* BM skip for backward search */\r
+ OnigLen dmin; /* min-distance of exact or map */\r
+ OnigLen dmax; /* max-distance of exact or map */\r
+\r
+ /* regex_t link chain */\r
+ struct re_pattern_buffer* chain; /* escape compile-conflict */\r
+};\r
+\r
+\r
/* stack pop level */\r
-#define STACK_POP_LEVEL_FREE 0\r
-#define STACK_POP_LEVEL_MEM_START 1\r
-#define STACK_POP_LEVEL_ALL 2\r
+enum StackPopLevel {\r
+ STACK_POP_LEVEL_FREE = 0,\r
+ STACK_POP_LEVEL_MEM_START = 1,\r
+ STACK_POP_LEVEL_ALL = 2\r
+};\r
\r
/* optimize flags */\r
-#define ONIG_OPTIMIZE_NONE 0\r
-#define ONIG_OPTIMIZE_EXACT 1 /* Slow Search */\r
-#define ONIG_OPTIMIZE_EXACT_BM 2 /* Boyer Moore Search */\r
-#define ONIG_OPTIMIZE_EXACT_BM_NOT_REV 3 /* BM (but not simple match) */\r
-#define ONIG_OPTIMIZE_EXACT_IC 4 /* Slow Search (ignore case) */\r
-#define ONIG_OPTIMIZE_MAP 5 /* char map */\r
+enum OptimizeType {\r
+ OPTIMIZE_NONE = 0,\r
+ OPTIMIZE_EXACT = 1, /* Slow Search */\r
+ OPTIMIZE_EXACT_BM = 2, /* Boyer Moore Search */\r
+ OPTIMIZE_EXACT_BM_NO_REV = 3, /* BM (but not simple match) */\r
+ OPTIMIZE_EXACT_IC = 4, /* Slow Search (ignore case) */\r
+ OPTIMIZE_MAP = 5 /* char map */\r
+};\r
\r
/* bit status */\r
-typedef unsigned int BitStatusType;\r
-\r
-#define BIT_STATUS_BITS_NUM (sizeof(BitStatusType) * 8)\r
-#define BIT_STATUS_CLEAR(stats) (stats) = 0\r
-#define BIT_STATUS_ON_ALL(stats) (stats) = ~((BitStatusType )0)\r
-#define BIT_STATUS_AT(stats,n) \\r
- ((n) < (int )BIT_STATUS_BITS_NUM ? ((stats) & (1 << n)) : ((stats) & 1))\r
-\r
-#define BIT_STATUS_ON_AT(stats,n) do {\\r
- if ((n) < (int )BIT_STATUS_BITS_NUM) \\r
- (stats) |= (1 << (n));\\r
+typedef unsigned int MemStatusType;\r
+\r
+#define MEM_STATUS_BITS_NUM (sizeof(MemStatusType) * 8)\r
+#define MEM_STATUS_CLEAR(stats) (stats) = 0\r
+#define MEM_STATUS_ON_ALL(stats) (stats) = ~((MemStatusType )0)\r
+#define MEM_STATUS_AT(stats,n) \\r
+ ((n) < (int )MEM_STATUS_BITS_NUM ? ((stats) & ((MemStatusType )1 << n)) : ((stats) & 1))\r
+#define MEM_STATUS_AT0(stats,n) \\r
+ ((n) > 0 && (n) < (int )MEM_STATUS_BITS_NUM ? ((stats) & ((MemStatusType )1 << n)) : ((stats) & 1))\r
+\r
+#define MEM_STATUS_ON(stats,n) do {\\r
+ if ((n) < (int )MEM_STATUS_BITS_NUM) {\\r
+ if ((n) != 0)\\r
+ (stats) |= ((MemStatusType )1 << (n));\\r
+ }\\r
else\\r
(stats) |= 1;\\r
} while (0)\r
\r
-#define BIT_STATUS_ON_AT_SIMPLE(stats,n) do {\\r
- if ((n) < (int )BIT_STATUS_BITS_NUM)\\r
- (stats) |= (1 << (n));\\r
+#define MEM_STATUS_ON_SIMPLE(stats,n) do {\\r
+ if ((n) < (int )MEM_STATUS_BITS_NUM)\\r
+ (stats) |= ((MemStatusType )1 << (n));\\r
} while (0)\r
\r
\r
#define INT_MAX_LIMIT ((1UL << (SIZEOF_INT * 8 - 1)) - 1)\r
\r
+#define IS_CODE_WORD_ASCII(enc,code) \\r
+ (ONIGENC_IS_CODE_ASCII(code) && ONIGENC_IS_CODE_WORD(enc,code))\r
+#define IS_CODE_DIGIT_ASCII(enc, code) \\r
+ (ONIGENC_IS_CODE_ASCII(code) && ONIGENC_IS_CODE_DIGIT(enc,code))\r
+#define IS_CODE_XDIGIT_ASCII(enc, code) \\r
+ (ONIGENC_IS_CODE_ASCII(code) && ONIGENC_IS_CODE_XDIGIT(enc,code))\r
+\r
#define DIGITVAL(code) ((code) - '0')\r
#define ODIGITVAL(code) DIGITVAL(code)\r
#define XDIGITVAL(enc,code) \\r
- (ONIGENC_IS_CODE_DIGIT(enc,code) ? DIGITVAL(code) \\r
+ (IS_CODE_DIGIT_ASCII(enc,code) ? DIGITVAL(code) \\r
: (ONIGENC_IS_CODE_UPPER(enc,code) ? (code) - 'A' + 10 : (code) - 'a' + 10))\r
\r
#define IS_SINGLELINE(option) ((option) & ONIG_OPTION_SINGLELINE)\r
#define IS_NOTEOL(option) ((option) & ONIG_OPTION_NOTEOL)\r
#define IS_POSIX_REGION(option) ((option) & ONIG_OPTION_POSIX_REGION)\r
\r
-/* OP_SET_OPTION is required for these options.\r
-#define IS_DYNAMIC_OPTION(option) \\r
- (((option) & (ONIG_OPTION_MULTILINE | ONIG_OPTION_IGNORECASE)) != 0)\r
-*/\r
-/* ignore-case and multibyte status are included in compiled code. */\r
-#define IS_DYNAMIC_OPTION(option) 0\r
+#define IS_WORD_ASCII(option) \\r
+ ((option) & (ONIG_OPTION_WORD_IS_ASCII | ONIG_OPTION_POSIX_IS_ASCII))\r
+#define IS_DIGIT_ASCII(option) \\r
+ ((option) & (ONIG_OPTION_DIGIT_IS_ASCII | ONIG_OPTION_POSIX_IS_ASCII))\r
+#define IS_SPACE_ASCII(option) \\r
+ ((option) & (ONIG_OPTION_SPACE_IS_ASCII | ONIG_OPTION_POSIX_IS_ASCII))\r
+#define IS_POSIX_ASCII(option) ((option) & ONIG_OPTION_POSIX_IS_ASCII)\r
+\r
+#define IS_ASCII_MODE_CTYPE_OPTION(ctype, options) \\r
+ ((ctype) >= 0 && \\r
+ (((ctype) < ONIGENC_CTYPE_ASCII && IS_POSIX_ASCII(options)) ||\\r
+ ((ctype) == ONIGENC_CTYPE_WORD && IS_WORD_ASCII(options)) ||\\r
+ ((ctype) == ONIGENC_CTYPE_DIGIT && IS_DIGIT_ASCII(options)) ||\\r
+ ((ctype) == ONIGENC_CTYPE_SPACE && IS_SPACE_ASCII(options))))\r
\r
#define DISABLE_CASE_FOLD_MULTI_CHAR(case_fold_flag) \\r
((case_fold_flag) & ~INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR)\r
#define SIZE_BITSET sizeof(BitSet)\r
\r
#define BITSET_CLEAR(bs) do {\\r
- int id;\\r
- for (id = 0; id < (int )BITSET_SIZE; id++) { (bs)[id] = 0; } \\r
+ int i;\\r
+ for (i = 0; i < (int )BITSET_SIZE; i++) { (bs)[i] = 0; } \\r
} while (0)\r
\r
#define BS_ROOM(bs,pos) (bs)[pos / BITS_IN_ROOM]\r
unsigned int alloc;\r
} BBuf;\r
\r
-#define BBUF_INIT(buf,size) onig_bbuf_init((BBuf* )(buf), (size))\r
+#define BB_INIT(buf,size) onig_bbuf_init((BBuf* )(buf), (size))\r
\r
-#define BBUF_SIZE_INC(buf,inc) do{\\r
+#define BB_SIZE_INC(buf,inc) do{\\r
(buf)->alloc += (inc);\\r
(buf)->p = (UChar* )xrealloc((buf)->p, (buf)->alloc);\\r
if (IS_NULL((buf)->p)) return(ONIGERR_MEMORY);\\r
} while (0)\r
\r
-#define BBUF_EXPAND(buf,low) do{\\r
+#define BB_EXPAND(buf,low) do{\\r
unsigned int OldSize_ = (buf)->alloc * sizeof((buf)->p[0]);\\r
do { (buf)->alloc *= 2; } while ((buf)->alloc < (unsigned int )low);\\r
(buf)->p = (UChar* )xrealloc((buf)->p, (buf)->alloc, OldSize_);\\r
if (IS_NULL((buf)->p)) return(ONIGERR_MEMORY);\\r
} while (0)\r
\r
-#define BBUF_ENSURE_SIZE(buf,size) do{\\r
+#define BB_ENSURE_SIZE(buf,size) do{\\r
unsigned int new_alloc = (buf)->alloc;\\r
while (new_alloc < (unsigned int )(size)) { new_alloc *= 2; }\\r
if ((buf)->alloc != new_alloc) {\\r
}\\r
} while (0)\r
\r
-#define BBUF_WRITE(buf,pos,bytes,n) do{\\r
+#define BB_WRITE(buf,pos,bytes,n) do{\\r
int used = (pos) + (n);\\r
- if ((buf)->alloc < (unsigned int )used) BBUF_EXPAND((buf),used);\\r
+ if ((buf)->alloc < (unsigned int )used) BB_EXPAND((buf),used);\\r
xmemcpy((buf)->p + (pos), (bytes), (n));\\r
if ((buf)->used < (unsigned int )used) (buf)->used = used;\\r
} while (0)\r
\r
-#define BBUF_WRITE1(buf,pos,byte) do{\\r
+#define BB_WRITE1(buf,pos,byte) do{\\r
int used = (pos) + 1;\\r
- if ((buf)->alloc < (unsigned int )used) BBUF_EXPAND((buf),used);\\r
+ if ((buf)->alloc < (unsigned int )used) BB_EXPAND((buf),used);\\r
(buf)->p[(pos)] = (byte);\\r
if ((buf)->used < (unsigned int )used) (buf)->used = used;\\r
} while (0)\r
\r
-#define BBUF_ADD(buf,bytes,n) BBUF_WRITE((buf),(buf)->used,(bytes),(n))\r
-#define BBUF_ADD1(buf,byte) BBUF_WRITE1((buf),(buf)->used,(byte))\r
-#define BBUF_GET_ADD_ADDRESS(buf) ((buf)->p + (buf)->used)\r
-#define BBUF_GET_OFFSET_POS(buf) ((buf)->used)\r
+#define BB_ADD(buf,bytes,n) BB_WRITE((buf),(buf)->used,(bytes),(n))\r
+#define BB_ADD1(buf,byte) BB_WRITE1((buf),(buf)->used,(byte))\r
+#define BB_GET_ADD_ADDRESS(buf) ((buf)->p + (buf)->used)\r
+#define BB_GET_OFFSET_POS(buf) ((buf)->used)\r
\r
/* from < to */\r
-#define BBUF_MOVE_RIGHT(buf,from,to,n) do {\\r
- if ((unsigned int )((to)+(n)) > (buf)->alloc) BBUF_EXPAND((buf),(to) + (n));\\r
+#define BB_MOVE_RIGHT(buf,from,to,n) do {\\r
+ if ((unsigned int )((to)+(n)) > (buf)->alloc) BB_EXPAND((buf),(to) + (n));\\r
xmemmove((buf)->p + (to), (buf)->p + (from), (n));\\r
if ((unsigned int )((to)+(n)) > (buf)->used) (buf)->used = (to) + (n);\\r
} while (0)\r
\r
/* from > to */\r
-#define BBUF_MOVE_LEFT(buf,from,to,n) do {\\r
+#define BB_MOVE_LEFT(buf,from,to,n) do {\\r
xmemmove((buf)->p + (to), (buf)->p + (from), (n));\\r
} while (0)\r
\r
/* from > to */\r
-#define BBUF_MOVE_LEFT_REDUCE(buf,from,to) do {\\r
+#define BB_MOVE_LEFT_REDUCE(buf,from,to) do {\\r
xmemmove((buf)->p + (to), (buf)->p + (from), (buf)->used - (from));\\r
(buf)->used -= (from - to);\\r
} while (0)\r
\r
-#define BBUF_INSERT(buf,pos,bytes,n) do {\\r
+#define BB_INSERT(buf,pos,bytes,n) do {\\r
if (pos >= (buf)->used) {\\r
- BBUF_WRITE(buf,pos,bytes,n);\\r
+ BB_WRITE(buf,pos,bytes,n);\\r
}\\r
else {\\r
- BBUF_MOVE_RIGHT((buf),(pos),(pos) + (n),((buf)->used - (pos)));\\r
+ BB_MOVE_RIGHT((buf),(pos),(pos) + (n),((buf)->used - (pos)));\\r
xmemcpy((buf)->p + (pos), (bytes), (n));\\r
}\\r
} while (0)\r
\r
-#define BBUF_GET_BYTE(buf, pos) (buf)->p[(pos)]\r
-\r
-\r
-#define ANCHOR_BEGIN_BUF (1<<0)\r
-#define ANCHOR_BEGIN_LINE (1<<1)\r
-#define ANCHOR_BEGIN_POSITION (1<<2)\r
-#define ANCHOR_END_BUF (1<<3)\r
-#define ANCHOR_SEMI_END_BUF (1<<4)\r
-#define ANCHOR_END_LINE (1<<5)\r
-\r
-#define ANCHOR_WORD_BOUND (1<<6)\r
-#define ANCHOR_NOT_WORD_BOUND (1<<7)\r
-#define ANCHOR_WORD_BEGIN (1<<8)\r
-#define ANCHOR_WORD_END (1<<9)\r
-#define ANCHOR_PREC_READ (1<<10)\r
-#define ANCHOR_PREC_READ_NOT (1<<11)\r
-#define ANCHOR_LOOK_BEHIND (1<<12)\r
-#define ANCHOR_LOOK_BEHIND_NOT (1<<13)\r
-\r
-#define ANCHOR_ANYCHAR_STAR (1<<14) /* ".*" optimize info */\r
-#define ANCHOR_ANYCHAR_STAR_ML (1<<15) /* ".*" optimize info (multi-line) */\r
+#define BB_GET_BYTE(buf, pos) (buf)->p[(pos)]\r
+\r
+\r
+/* has body */\r
+#define ANCHOR_PREC_READ (1<<0)\r
+#define ANCHOR_PREC_READ_NOT (1<<1)\r
+#define ANCHOR_LOOK_BEHIND (1<<2)\r
+#define ANCHOR_LOOK_BEHIND_NOT (1<<3)\r
+/* no body */\r
+#define ANCHOR_BEGIN_BUF (1<<4)\r
+#define ANCHOR_BEGIN_LINE (1<<5)\r
+#define ANCHOR_BEGIN_POSITION (1<<6)\r
+#define ANCHOR_END_BUF (1<<7)\r
+#define ANCHOR_SEMI_END_BUF (1<<8)\r
+#define ANCHOR_END_LINE (1<<9)\r
+#define ANCHOR_WORD_BOUNDARY (1<<10)\r
+#define ANCHOR_NO_WORD_BOUNDARY (1<<11)\r
+#define ANCHOR_WORD_BEGIN (1<<12)\r
+#define ANCHOR_WORD_END (1<<13)\r
+#define ANCHOR_ANYCHAR_INF (1<<14)\r
+#define ANCHOR_ANYCHAR_INF_ML (1<<15)\r
+#define ANCHOR_EXTENDED_GRAPHEME_CLUSTER_BOUNDARY (1<<16)\r
+#define ANCHOR_NO_EXTENDED_GRAPHEME_CLUSTER_BOUNDARY (1<<17)\r
+\r
+\r
+#define ANCHOR_HAS_BODY(a) ((a)->type < ANCHOR_BEGIN_BUF)\r
+\r
+#define IS_WORD_ANCHOR_TYPE(type) \\r
+ ((type) == ANCHOR_WORD_BOUNDARY || (type) == ANCHOR_NO_WORD_BOUNDARY || \\r
+ (type) == ANCHOR_WORD_BEGIN || (type) == ANCHOR_WORD_END)\r
\r
/* operation code */\r
enum OpCode {\r
OP_CCLASS_NOT,\r
OP_CCLASS_MB_NOT,\r
OP_CCLASS_MIX_NOT,\r
+#ifdef USE_OP_CCLASS_NODE\r
OP_CCLASS_NODE, /* pointer to CClassNode node */\r
+#endif\r
\r
OP_ANYCHAR, /* "." */\r
OP_ANYCHAR_ML, /* "." multi-line */\r
OP_ANYCHAR_ML_STAR_PEEK_NEXT,\r
\r
OP_WORD,\r
- OP_NOT_WORD,\r
- OP_WORD_BOUND,\r
- OP_NOT_WORD_BOUND,\r
+ OP_WORD_ASCII,\r
+ OP_NO_WORD,\r
+ OP_NO_WORD_ASCII,\r
+ OP_WORD_BOUNDARY,\r
+ OP_NO_WORD_BOUNDARY,\r
OP_WORD_BEGIN,\r
OP_WORD_END,\r
\r
+ OP_EXTENDED_GRAPHEME_CLUSTER_BOUNDARY,\r
+ OP_NO_EXTENDED_GRAPHEME_CLUSTER_BOUNDARY,\r
+\r
OP_BEGIN_BUF,\r
OP_END_BUF,\r
OP_BEGIN_LINE,\r
\r
OP_BACKREF1,\r
OP_BACKREF2,\r
- OP_BACKREFN,\r
- OP_BACKREFN_IC,\r
+ OP_BACKREF_N,\r
+ OP_BACKREF_N_IC,\r
OP_BACKREF_MULTI,\r
OP_BACKREF_MULTI_IC,\r
- OP_BACKREF_WITH_LEVEL, /* \k<xxx+n>, \k<xxx-n> */\r
+ OP_BACKREF_WITH_LEVEL, /* \k<xxx+n>, \k<xxx-n> */\r
+ OP_BACKREF_CHECK, /* (?(n)), (?('name')) */\r
+ OP_BACKREF_CHECK_WITH_LEVEL, /* (?(n-level)), (?('name-level')) */\r
\r
OP_MEMORY_START,\r
OP_MEMORY_START_PUSH, /* push back-tracker to stack */\r
OP_FAIL, /* pop stack and move */\r
OP_JUMP,\r
OP_PUSH,\r
- OP_POP,\r
+ OP_PUSH_SUPER,\r
+ OP_POP_OUT,\r
OP_PUSH_OR_JUMP_EXACT1, /* if match exact then push, else jump. */\r
OP_PUSH_IF_PEEK_NEXT, /* if match exact then push, else none. */\r
OP_REPEAT, /* {n,m} */\r
OP_REPEAT_INC_NG, /* non greedy */\r
OP_REPEAT_INC_SG, /* search and get in stack */\r
OP_REPEAT_INC_NG_SG, /* search and get in stack (non greedy) */\r
- OP_NULL_CHECK_START, /* null loop checker start */\r
- OP_NULL_CHECK_END, /* null loop checker end */\r
- OP_NULL_CHECK_END_MEMST, /* null loop checker end (with capture status) */\r
- OP_NULL_CHECK_END_MEMST_PUSH, /* with capture status and push check-end */\r
-\r
- OP_PUSH_POS, /* (?=...) start */\r
- OP_POP_POS, /* (?=...) end */\r
- OP_PUSH_POS_NOT, /* (?!...) start */\r
- OP_FAIL_POS, /* (?!...) end */\r
- OP_PUSH_STOP_BT, /* (?>...) start */\r
- OP_POP_STOP_BT, /* (?>...) end */\r
- OP_LOOK_BEHIND, /* (?<=...) start (no needs end opcode) */\r
- OP_PUSH_LOOK_BEHIND_NOT, /* (?<!...) start */\r
- OP_FAIL_LOOK_BEHIND_NOT, /* (?<!...) end */\r
-\r
- OP_CALL, /* \g<name> */\r
+ OP_EMPTY_CHECK_START, /* null loop checker start */\r
+ OP_EMPTY_CHECK_END, /* null loop checker end */\r
+ OP_EMPTY_CHECK_END_MEMST, /* null loop checker end (with capture status) */\r
+ OP_EMPTY_CHECK_END_MEMST_PUSH, /* with capture status and push check-end */\r
+\r
+ OP_PREC_READ_START, /* (?=...) start */\r
+ OP_PREC_READ_END, /* (?=...) end */\r
+ OP_PREC_READ_NOT_START, /* (?!...) start */\r
+ OP_PREC_READ_NOT_END, /* (?!...) end */\r
+ OP_ATOMIC_START, /* (?>...) start */\r
+ OP_ATOMIC_END, /* (?>...) end */\r
+ OP_LOOK_BEHIND, /* (?<=...) start (no needs end opcode) */\r
+ OP_LOOK_BEHIND_NOT_START, /* (?<!...) start */\r
+ OP_LOOK_BEHIND_NOT_END, /* (?<!...) end */\r
+\r
+ OP_CALL, /* \g<name> */\r
OP_RETURN,\r
+ OP_PUSH_SAVE_VAL,\r
+ OP_UPDATE_VAR,\r
+#ifdef USE_CALLOUT\r
+ OP_CALLOUT_CONTENTS, /* (?{...}) (?{{...}}) */\r
+ OP_CALLOUT_NAME, /* (*name) (*name[tag](args...)) */\r
+#endif\r
+};\r
\r
- OP_STATE_CHECK_PUSH, /* combination explosion check and push */\r
- OP_STATE_CHECK_PUSH_OR_JUMP, /* check ok -> push, else jump */\r
- OP_STATE_CHECK, /* check only */\r
- OP_STATE_CHECK_ANYCHAR_STAR,\r
- OP_STATE_CHECK_ANYCHAR_ML_STAR,\r
+enum SaveType {\r
+ SAVE_KEEP = 0, /* SAVE S */\r
+ SAVE_S = 1,\r
+ SAVE_RIGHT_RANGE = 2,\r
+};\r
\r
- /* no need: IS_DYNAMIC_OPTION() == 0 */\r
- OP_SET_OPTION_PUSH, /* set option and push recover option */\r
- OP_SET_OPTION /* set option */\r
+enum UpdateVarType {\r
+ UPDATE_VAR_KEEP_FROM_STACK_LAST = 0,\r
+ UPDATE_VAR_S_FROM_STACK = 1,\r
+ UPDATE_VAR_RIGHT_RANGE_FROM_STACK = 2,\r
+ UPDATE_VAR_RIGHT_RANGE_FROM_S_STACK = 3,\r
+ UPDATE_VAR_RIGHT_RANGE_INIT = 4,\r
};\r
\r
typedef int RelAddrType;\r
typedef int AbsAddrType;\r
typedef int LengthType;\r
typedef int RepeatNumType;\r
-typedef short int MemNumType;\r
-typedef short int StateCheckNumType;\r
+typedef int MemNumType;\r
typedef void* PointerType;\r
+typedef int SaveType;\r
+typedef int UpdateVarType;\r
+typedef int ModeType;\r
\r
#define SIZE_OPCODE 1\r
#define SIZE_RELADDR sizeof(RelAddrType)\r
#define SIZE_ABSADDR sizeof(AbsAddrType)\r
#define SIZE_LENGTH sizeof(LengthType)\r
#define SIZE_MEMNUM sizeof(MemNumType)\r
-#define SIZE_STATE_CHECK_NUM sizeof(StateCheckNumType)\r
#define SIZE_REPEATNUM sizeof(RepeatNumType)\r
#define SIZE_OPTION sizeof(OnigOptionType)\r
#define SIZE_CODE_POINT sizeof(OnigCodePoint)\r
#define SIZE_POINTER sizeof(PointerType)\r
-\r
+#define SIZE_SAVE_TYPE sizeof(SaveType)\r
+#define SIZE_UPDATE_VAR_TYPE sizeof(UpdateVarType)\r
+#define SIZE_MODE sizeof(ModeType)\r
\r
#define GET_RELADDR_INC(addr,p) PLATFORM_GET_INC(addr, p, RelAddrType)\r
#define GET_ABSADDR_INC(addr,p) PLATFORM_GET_INC(addr, p, AbsAddrType)\r
#define GET_REPEATNUM_INC(num,p) PLATFORM_GET_INC(num, p, RepeatNumType)\r
#define GET_OPTION_INC(option,p) PLATFORM_GET_INC(option, p, OnigOptionType)\r
#define GET_POINTER_INC(ptr,p) PLATFORM_GET_INC(ptr, p, PointerType)\r
-#define GET_STATE_CHECK_NUM_INC(num,p) PLATFORM_GET_INC(num, p, StateCheckNumType)\r
+#define GET_SAVE_TYPE_INC(type,p) PLATFORM_GET_INC(type, p, SaveType)\r
+#define GET_UPDATE_VAR_TYPE_INC(type,p) PLATFORM_GET_INC(type, p, UpdateVarType)\r
+#define GET_MODE_INC(mode,p) PLATFORM_GET_INC(mode, p, ModeType)\r
\r
/* code point's address must be aligned address. */\r
#define GET_CODE_POINT(code,p) code = *((OnigCodePoint* )(p))\r
#define SIZE_OP_ANYCHAR_STAR_PEEK_NEXT (SIZE_OPCODE + 1)\r
#define SIZE_OP_JUMP (SIZE_OPCODE + SIZE_RELADDR)\r
#define SIZE_OP_PUSH (SIZE_OPCODE + SIZE_RELADDR)\r
-#define SIZE_OP_POP SIZE_OPCODE\r
+#define SIZE_OP_PUSH_SUPER (SIZE_OPCODE + SIZE_RELADDR)\r
+#define SIZE_OP_POP_OUT SIZE_OPCODE\r
#define SIZE_OP_PUSH_OR_JUMP_EXACT1 (SIZE_OPCODE + SIZE_RELADDR + 1)\r
#define SIZE_OP_PUSH_IF_PEEK_NEXT (SIZE_OPCODE + SIZE_RELADDR + 1)\r
#define SIZE_OP_REPEAT_INC (SIZE_OPCODE + SIZE_MEMNUM)\r
#define SIZE_OP_REPEAT_INC_NG (SIZE_OPCODE + SIZE_MEMNUM)\r
-#define SIZE_OP_PUSH_POS SIZE_OPCODE\r
-#define SIZE_OP_PUSH_POS_NOT (SIZE_OPCODE + SIZE_RELADDR)\r
-#define SIZE_OP_POP_POS SIZE_OPCODE\r
-#define SIZE_OP_FAIL_POS SIZE_OPCODE\r
-#define SIZE_OP_SET_OPTION (SIZE_OPCODE + SIZE_OPTION)\r
-#define SIZE_OP_SET_OPTION_PUSH (SIZE_OPCODE + SIZE_OPTION)\r
+#define SIZE_OP_WORD_BOUNDARY (SIZE_OPCODE + SIZE_MODE)\r
+#define SIZE_OP_PREC_READ_START SIZE_OPCODE\r
+#define SIZE_OP_PREC_READ_NOT_START (SIZE_OPCODE + SIZE_RELADDR)\r
+#define SIZE_OP_PREC_READ_END SIZE_OPCODE\r
+#define SIZE_OP_PREC_READ_NOT_END SIZE_OPCODE\r
#define SIZE_OP_FAIL SIZE_OPCODE\r
#define SIZE_OP_MEMORY_START (SIZE_OPCODE + SIZE_MEMNUM)\r
#define SIZE_OP_MEMORY_START_PUSH (SIZE_OPCODE + SIZE_MEMNUM)\r
#define SIZE_OP_MEMORY_END_PUSH_REC (SIZE_OPCODE + SIZE_MEMNUM)\r
#define SIZE_OP_MEMORY_END (SIZE_OPCODE + SIZE_MEMNUM)\r
#define SIZE_OP_MEMORY_END_REC (SIZE_OPCODE + SIZE_MEMNUM)\r
-#define SIZE_OP_PUSH_STOP_BT SIZE_OPCODE\r
-#define SIZE_OP_POP_STOP_BT SIZE_OPCODE\r
-#define SIZE_OP_NULL_CHECK_START (SIZE_OPCODE + SIZE_MEMNUM)\r
-#define SIZE_OP_NULL_CHECK_END (SIZE_OPCODE + SIZE_MEMNUM)\r
+#define SIZE_OP_ATOMIC_START SIZE_OPCODE\r
+#define SIZE_OP_ATOMIC_END SIZE_OPCODE\r
+#define SIZE_OP_EMPTY_CHECK_START (SIZE_OPCODE + SIZE_MEMNUM)\r
+#define SIZE_OP_EMPTY_CHECK_END (SIZE_OPCODE + SIZE_MEMNUM)\r
#define SIZE_OP_LOOK_BEHIND (SIZE_OPCODE + SIZE_LENGTH)\r
-#define SIZE_OP_PUSH_LOOK_BEHIND_NOT (SIZE_OPCODE + SIZE_RELADDR + SIZE_LENGTH)\r
-#define SIZE_OP_FAIL_LOOK_BEHIND_NOT SIZE_OPCODE\r
+#define SIZE_OP_LOOK_BEHIND_NOT_START (SIZE_OPCODE + SIZE_RELADDR + SIZE_LENGTH)\r
+#define SIZE_OP_LOOK_BEHIND_NOT_END SIZE_OPCODE\r
#define SIZE_OP_CALL (SIZE_OPCODE + SIZE_ABSADDR)\r
#define SIZE_OP_RETURN SIZE_OPCODE\r
+#define SIZE_OP_PUSH_SAVE_VAL (SIZE_OPCODE + SIZE_SAVE_TYPE + SIZE_MEMNUM)\r
+#define SIZE_OP_UPDATE_VAR (SIZE_OPCODE + SIZE_UPDATE_VAR_TYPE + SIZE_MEMNUM)\r
\r
-#ifdef USE_COMBINATION_EXPLOSION_CHECK\r
-#define SIZE_OP_STATE_CHECK (SIZE_OPCODE + SIZE_STATE_CHECK_NUM)\r
-#define SIZE_OP_STATE_CHECK_PUSH (SIZE_OPCODE + SIZE_STATE_CHECK_NUM + SIZE_RELADDR)\r
-#define SIZE_OP_STATE_CHECK_PUSH_OR_JUMP (SIZE_OPCODE + SIZE_STATE_CHECK_NUM + SIZE_RELADDR)\r
-#define SIZE_OP_STATE_CHECK_ANYCHAR_STAR (SIZE_OPCODE + SIZE_STATE_CHECK_NUM)\r
+#ifdef USE_CALLOUT\r
+#define SIZE_OP_CALLOUT_CONTENTS (SIZE_OPCODE + SIZE_MEMNUM)\r
+#define SIZE_OP_CALLOUT_NAME (SIZE_OPCODE + SIZE_MEMNUM + SIZE_MEMNUM)\r
#endif\r
\r
#define MC_ESC(syn) (syn)->meta_char_table.esc\r
#define FLAG_NCCLASS_SHARE (1<<1)\r
\r
#define NCCLASS_SET_NOT(nd) NCCLASS_FLAG_SET(nd, FLAG_NCCLASS_NOT)\r
-#define NCCLASS_SET_SHARE(nd) NCCLASS_FLAG_SET(nd, FLAG_NCCLASS_SHARE)\r
#define NCCLASS_CLEAR_NOT(nd) NCCLASS_FLAG_CLEAR(nd, FLAG_NCCLASS_NOT)\r
#define IS_NCCLASS_NOT(nd) IS_NCCLASS_FLAG_ON(nd, FLAG_NCCLASS_NOT)\r
-#define IS_NCCLASS_SHARE(nd) IS_NCCLASS_FLAG_ON(nd, FLAG_NCCLASS_SHARE)\r
\r
-typedef struct {\r
- int type;\r
- /* struct _Node* next; */\r
- /* unsigned int flags; */\r
-} NodeBase;\r
+extern void onig_add_end_call(void (*func)(void));\r
\r
-typedef struct {\r
- NodeBase base;\r
- unsigned int flags;\r
- BitSet bs;\r
- BBuf* mbuf; /* multi-byte info or NULL */\r
-} CClassNode;\r
\r
-typedef long OnigStackIndex;\r
+#ifdef ONIG_DEBUG\r
\r
-typedef struct _OnigStackType {\r
- unsigned int type;\r
- union {\r
- struct {\r
- UChar *pcode; /* byte code position */\r
- UChar *pstr; /* string position */\r
- UChar *pstr_prev; /* previous char position of pstr */\r
-#ifdef USE_COMBINATION_EXPLOSION_CHECK\r
- unsigned int state_check;\r
-#endif\r
- } state;\r
- struct {\r
- int count; /* for OP_REPEAT_INC, OP_REPEAT_INC_NG */\r
- UChar *pcode; /* byte code position (head of repeated target) */\r
- int num; /* repeat id */\r
- } repeat;\r
- struct {\r
- OnigStackIndex si; /* index of stack */\r
- } repeat_inc;\r
- struct {\r
- int num; /* memory num */\r
- UChar *pstr; /* start/end position */\r
- /* Following information is setted, if this stack type is MEM-START */\r
- OnigStackIndex start; /* prev. info (for backtrack "(...)*" ) */\r
- OnigStackIndex end; /* prev. info (for backtrack "(...)*" ) */\r
- } mem;\r
- struct {\r
- int num; /* null check id */\r
- UChar *pstr; /* start position */\r
- } null_check;\r
-#ifdef USE_SUBEXP_CALL\r
- struct {\r
- UChar *ret_addr; /* byte code position */\r
- int num; /* null check id */\r
- UChar *pstr; /* string position */\r
- } call_frame;\r
+#ifdef ONIG_DEBUG_COMPILE\r
+extern void onig_print_compiled_byte_code_list(FILE* f, regex_t* reg);\r
#endif\r
- } u;\r
-} OnigStackType;\r
\r
-typedef struct {\r
- void* stack_p;\r
- int stack_n;\r
- OnigOptionType options;\r
- OnigRegion* region;\r
- const UChar* start; /* search start position (for \G: BEGIN_POSITION) */\r
-#ifdef USE_FIND_LONGEST_SEARCH_ALL_OF_RANGE\r
- int best_len; /* for ONIG_OPTION_FIND_LONGEST */\r
- UChar* best_s;\r
+#ifdef ONIG_DEBUG_STATISTICS\r
+extern void onig_statistics_init P_((void));\r
+extern int onig_print_statistics P_((FILE* f));\r
#endif\r
-#ifdef USE_COMBINATION_EXPLOSION_CHECK\r
- void* state_check_buff;\r
- int state_check_buff_size;\r
#endif\r
-} OnigMatchArg;\r
\r
+extern void onig_warning(const char* s);\r
+extern UChar* onig_error_code_to_format P_((int code));\r
+extern void EFIAPI onig_snprintf_with_pattern PV_((UChar buf[], int bufsize, OnigEncoding enc, UChar* pat, UChar* pat_end, const UChar *fmt, ...));\r
+extern int onig_bbuf_init P_((BBuf* buf, int size));\r
+extern int onig_compile P_((regex_t* reg, const UChar* pattern, const UChar* pattern_end, OnigErrorInfo* einfo));\r
+extern void onig_transfer P_((regex_t* to, regex_t* from));\r
+extern int onig_is_code_in_cc_len P_((int enclen, OnigCodePoint code, void* /* CClassNode* */ cc));\r
+extern RegexExt* onig_get_regex_ext(regex_t* reg);\r
+extern int onig_ext_set_pattern(regex_t* reg, const UChar* pattern, const UChar* pattern_end);\r
+\r
+#ifdef USE_CALLOUT\r
+\r
+extern OnigCalloutType onig_get_callout_type_by_name_id(int name_id);\r
+extern OnigCalloutFunc onig_get_callout_start_func_by_name_id(int id);\r
+extern OnigCalloutFunc onig_get_callout_end_func_by_name_id(int id);\r
+extern int onig_callout_tag_table_free(void* table);\r
+extern void onig_free_reg_callout_list(int n, CalloutListEntry* list);\r
+extern CalloutListEntry* onig_reg_callout_list_at(regex_t* reg, int num);\r
+extern OnigCalloutFunc onig_get_callout_start_func(regex_t* reg, int callout_num);\r
+\r
+/* for definition of builtin callout */\r
+#define BC0_P(name, func) do {\\r
+ int len = onigenc_str_bytelen_null(enc, (UChar* )name);\\r
+ id = onig_set_callout_of_name(enc, ONIG_CALLOUT_TYPE_SINGLE,\\r
+ (UChar* )(name), (UChar* )((name) + len),\\r
+ ONIG_CALLOUT_IN_PROGRESS,\\r
+ onig_builtin_ ## func, 0, 0, 0, 0, 0);\\r
+ if (id < 0) return id;\\r
+} while(0)\r
\r
-#define IS_CODE_SB_WORD(enc,code) \\r
- (ONIGENC_IS_CODE_ASCII(code) && ONIGENC_IS_CODE_WORD(enc,code))\r
+#define BC0_R(name, func) do {\\r
+ int len = onigenc_str_bytelen_null(enc, (UChar* )name);\\r
+ id = onig_set_callout_of_name(enc, ONIG_CALLOUT_TYPE_SINGLE,\\r
+ (UChar* )(name), (UChar* )((name) + len),\\r
+ ONIG_CALLOUT_IN_RETRACTION,\\r
+ onig_builtin_ ## func, 0, 0, 0, 0, 0);\\r
+ if (id < 0) return id;\\r
+} while(0)\r
\r
-typedef struct OnigEndCallListItem {\r
- struct OnigEndCallListItem* next;\r
- void (*func)(void);\r
-} OnigEndCallListItemType;\r
+#define BC0_B(name, func) do {\\r
+ int len = onigenc_str_bytelen_null(enc, (UChar* )name);\\r
+ id = onig_set_callout_of_name(enc, ONIG_CALLOUT_TYPE_SINGLE,\\r
+ (UChar* )(name), (UChar* )((name) + len),\\r
+ ONIG_CALLOUT_IN_BOTH,\\r
+ onig_builtin_ ## func, 0, 0, 0, 0, 0);\\r
+ if (id < 0) return id;\\r
+} while(0)\r
\r
-extern void onig_add_end_call(void (*func)(void));\r
+#define BC_P(name, func, na, ts) do {\\r
+ int len = onigenc_str_bytelen_null(enc, (UChar* )name);\\r
+ id = onig_set_callout_of_name(enc, ONIG_CALLOUT_TYPE_SINGLE,\\r
+ (UChar* )(name), (UChar* )((name) + len),\\r
+ ONIG_CALLOUT_IN_PROGRESS,\\r
+ onig_builtin_ ## func, 0, (na), (ts), 0, 0); \\r
+ if (id < 0) return id;\\r
+} while(0)\r
\r
+#define BC_P_O(name, func, nts, ts, nopts, opts) do {\\r
+ int len = onigenc_str_bytelen_null(enc, (UChar* )name);\\r
+ id = onig_set_callout_of_name(enc, ONIG_CALLOUT_TYPE_SINGLE,\\r
+ (UChar* )(name), (UChar* )((name) + len),\\r
+ ONIG_CALLOUT_IN_PROGRESS,\\r
+ onig_builtin_ ## func, 0, (nts), (ts), (nopts), (opts));\\r
+ if (id < 0) return id;\\r
+} while(0)\r
\r
-#ifdef ONIG_DEBUG\r
+#define BC_B(name, func, na, ts) do {\\r
+ int len = onigenc_str_bytelen_null(enc, (UChar* )name);\\r
+ id = onig_set_callout_of_name(enc, ONIG_CALLOUT_TYPE_SINGLE,\\r
+ (UChar* )(name), (UChar* )((name) + len),\\r
+ ONIG_CALLOUT_IN_BOTH,\\r
+ onig_builtin_ ## func, 0, (na), (ts), 0, 0);\\r
+ if (id < 0) return id;\\r
+} while(0)\r
\r
-typedef struct {\r
- short int opcode;\r
- char* name;\r
- short int arg_type;\r
-} OnigOpInfoType;\r
+#define BC_B_O(name, func, nts, ts, nopts, opts) do {\\r
+ int len = onigenc_str_bytelen_null(enc, (UChar* )name);\\r
+ id = onig_set_callout_of_name(enc, ONIG_CALLOUT_TYPE_SINGLE,\\r
+ (UChar* )(name), (UChar* )((name) + len),\\r
+ ONIG_CALLOUT_IN_BOTH,\\r
+ onig_builtin_ ## func, 0, (nts), (ts), (nopts), (opts));\\r
+ if (id < 0) return id;\\r
+} while(0)\r
\r
-extern OnigOpInfoType OnigOpInfo[];\r
+#endif /* USE_CALLOUT */\r
\r
\r
-extern void onig_print_compiled_byte_code P_((FILE* f, UChar* bp, UChar** nextp, OnigEncoding enc));\r
+/* strend hash */\r
+typedef void hash_table_type;\r
\r
-#ifdef ONIG_DEBUG_STATISTICS\r
-extern void onig_statistics_init P_((void));\r
-extern void onig_print_statistics P_((FILE* f));\r
-#endif\r
+#ifdef _WIN32\r
+# include <windows.h>\r
+typedef ULONG_PTR hash_data_type;\r
+#else\r
+//typedef unsigned long hash_data_type;\r
#endif\r
\r
-extern UChar* onig_error_code_to_format P_((int code));\r
-extern void EFIAPI onig_snprintf_with_pattern PV_((UChar buf[], int bufsize, OnigEncoding enc, UChar* pat, UChar* pat_end, const UChar *fmt, ...));\r
-extern int onig_bbuf_init P_((BBuf* buf, int size));\r
-extern int onig_compile P_((regex_t* reg, const UChar* pattern, const UChar* pattern_end, OnigErrorInfo* einfo));\r
-extern void onig_chain_reduce P_((regex_t* reg));\r
-extern void onig_chain_link_add P_((regex_t* to, regex_t* add));\r
-extern void onig_transfer P_((regex_t* to, regex_t* from));\r
-extern int onig_is_code_in_cc P_((OnigEncoding enc, OnigCodePoint code, CClassNode* cc));\r
-extern int onig_is_code_in_cc_len P_((int enclen, OnigCodePoint code, CClassNode* cc));\r
-\r
-/* strend hash */\r
-typedef void hash_table_type;\r
-typedef unsigned long hash_data_type;\r
+typedef UINTN hash_data_type;\r
\r
extern hash_table_type* onig_st_init_strend_table_with_size P_((int size));\r
extern int onig_st_lookup_strend P_((hash_table_type* table, const UChar* str_key, const UChar* end_key, hash_data_type *value));\r
extern int onig_st_insert_strend P_((hash_table_type* table, const UChar* str_key, const UChar* end_key, hash_data_type value));\r
\r
-/* encoding property management */\r
-#define PROPERTY_LIST_ADD_PROP(Name, CR) \\r
- r = onigenc_property_list_add_property((UChar* )Name, CR,\\r
- &PropertyNameTable, &PropertyList, &PropertyListNum,\\r
- &PropertyListSize);\\r
- if (r != 0) goto end\r
-\r
-#define PROPERTY_LIST_INIT_CHECK \\r
- if (PropertyInited == 0) {\\r
- int r = onigenc_property_list_init(init_property_list);\\r
- if (r != 0) return r;\\r
- }\r
-\r
-extern int onigenc_property_list_add_property P_((UChar* name, const OnigCodePoint* prop, hash_table_type **table, const OnigCodePoint*** plist, int *pnum, int *psize));\r
-\r
typedef int (*ONIGENC_INIT_PROPERTY_LIST_FUNC_TYPE)(void);\r
\r
-extern int onigenc_property_list_init P_((ONIGENC_INIT_PROPERTY_LIST_FUNC_TYPE));\r
-\r
#endif /* REGINT_H */\r
+#include <ProcessorBind.h>\r
+#define INT_MAX MAX_INTN\r
+#define LONG_MAX MAX_UINTN\r