diff options
author | K.Kosako <kosako@sofnec.co.jp> | 2018-10-02 13:22:47 +0900 |
---|---|---|
committer | K.Kosako <kosako@sofnec.co.jp> | 2018-10-02 13:22:47 +0900 |
commit | 1a0b6d6b679eb73e61f14de801fa3d1dcf2c49a5 (patch) | |
tree | 59e0504ab115102212311fc552a9bb8ff8533751 | |
parent | e944b31ae1da2da5e56d3bebf267ab3939593563 (diff) | |
download | oniguruma-1a0b6d6b679eb73e61f14de801fa3d1dcf2c49a5.zip oniguruma-1a0b6d6b679eb73e61f14de801fa3d1dcf2c49a5.tar.gz oniguruma-1a0b6d6b679eb73e61f14de801fa3d1dcf2c49a5.tar.bz2 |
refactoring
-rw-r--r-- | src/regcomp.c | 14 | ||||
-rw-r--r-- | src/regint.h | 3 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/regcomp.c b/src/regcomp.c index 9263863..a7db2eb 100644 --- a/src/regcomp.c +++ b/src/regcomp.c @@ -4656,7 +4656,7 @@ set_sunday_quick_search_skip_table(regex_t* reg, int case_expand, *roffset = offset; - for (i = 0; i < ONIG_CHAR_TABLE_SIZE; i++) { + for (i = 0; i < CHAR_MAP_SIZE; i++) { skip[i] = (UChar )(len + offset); } @@ -4697,7 +4697,7 @@ set_bmh_search_skip_table(UChar* s, UChar* end, OnigEncoding enc ARG_UNUSED, len = (int )(end - s); if (len < UCHAR_MAX) { - for (i = 0; i < ONIG_CHAR_TABLE_SIZE; i++) skip[i] = len; + for (i = 0; i < CHAR_MAP_SIZE; i++) skip[i] = len; for (i = 0; i < len - 1; i++) skip[s[i]] = len - 1 - i; @@ -4748,7 +4748,7 @@ typedef struct { MinMax mmd; /* position */ OptAnc anc; int value; /* weighted value */ - UChar map[ONIG_CHAR_TABLE_SIZE]; + UChar map[CHAR_MAP_SIZE]; } OptMap; typedef struct { @@ -5210,7 +5210,7 @@ alt_merge_opt_map(OnigEncoding enc, OptMap* to, OptMap* add) alt_merge_mml(&to->mmd, &add->mmd); val = 0; - for (i = 0; i < ONIG_CHAR_TABLE_SIZE; i++) { + for (i = 0; i < CHAR_MAP_SIZE; i++) { if (add->map[i]) to->map[i] = 1; @@ -5731,7 +5731,7 @@ set_optimize_map(regex_t* reg, OptMap* m) { int i; - for (i = 0; i < ONIG_CHAR_TABLE_SIZE; i++) + for (i = 0; i < CHAR_MAP_SIZE; i++) reg->map[i] = m->map[i]; reg->optimize = OPTIMIZE_MAP; @@ -5962,14 +5962,14 @@ print_optimize_info(FILE* f, regex_t* reg) else if (reg->optimize & OPTIMIZE_MAP) { int c, i, n = 0; - for (i = 0; i < ONIG_CHAR_TABLE_SIZE; i++) + for (i = 0; i < CHAR_MAP_SIZE; i++) if (reg->map[i]) n++; fprintf(f, "map: n=%d\n", n); if (n > 0) { c = 0; fputc('[', f); - for (i = 0; i < ONIG_CHAR_TABLE_SIZE; i++) { + for (i = 0; i < CHAR_MAP_SIZE; i++) { if (reg->map[i] != 0) { if (c > 0) fputs(", ", f); c++; diff --git a/src/regint.h b/src/regint.h index bdb5ea5..d791776 100644 --- a/src/regint.h +++ b/src/regint.h @@ -188,6 +188,7 @@ typedef unsigned int uintptr_t; #define CHECK_NULL_RETURN_MEMERR(p) if (IS_NULL(p)) return ONIGERR_MEMORY #define NULL_UCHARP ((UChar* )0) +#define CHAR_MAP_SIZE 256 #define INFINITE_LEN ONIG_INFINITE_DISTANCE #ifdef PLATFORM_UNALIGNED_WORD_ACCESS @@ -295,7 +296,7 @@ struct re_pattern_buffer { int sub_anchor; /* start-anchor for exact or map */ unsigned char *exact; unsigned char *exact_end; - unsigned char map[ONIG_CHAR_TABLE_SIZE]; /* used as BMH skip or char-map */ + unsigned char map[CHAR_MAP_SIZE]; /* used as BMH skip or char-map */ int map_offset; OnigLen dmin; /* min-distance of exact or map */ OnigLen dmax; /* max-distance of exact or map */ |