From: K.Kosako Date: Tue, 22 Aug 2017 00:23:23 +0000 (+0900) Subject: refactoring X-Git-Tag: v6.6.0~18 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4a852b8dbe14c886bc6fe08d2d08431b3dc74167;p=onig refactoring --- diff --git a/src/regcomp.c b/src/regcomp.c index 89f9255..d0dde1c 100644 --- a/src/regcomp.c +++ b/src/regcomp.c @@ -1656,7 +1656,7 @@ compile_anchor_node(AnchorNode* node, regex_t* reg, ScanEnv* env) break; case ANCHOR_NO_EXTENDED_GRAPHEME_CLUSTER_BOUNDARY: - r = add_opcode(reg, OP_NO_EXTENDED_GRAPHEME_CLUSTER_BOUND); + r = add_opcode(reg, OP_NO_EXTENDED_GRAPHEME_CLUSTER_BOUNDARY); break; case ANCHOR_PREC_READ: diff --git a/src/regexec.c b/src/regexec.c index e5dfb15..9dbef70 100644 --- a/src/regexec.c +++ b/src/regexec.c @@ -2273,8 +2273,8 @@ match_at(regex_t* reg, const UChar* str, const UChar* end, goto fail; break; - case OP_NO_EXTENDED_GRAPHEME_CLUSTER_BOUND: - MOP_IN(OP_NO_EXTENDED_GRAPHEME_CLUSTER_BOUND); + case OP_NO_EXTENDED_GRAPHEME_CLUSTER_BOUNDARY: + MOP_IN(OP_NO_EXTENDED_GRAPHEME_CLUSTER_BOUNDARY); if (onigenc_egcb_is_break_position(encode, s, sprev, str, end)) goto fail; diff --git a/src/regint.h b/src/regint.h index 575c19b..9dc1723 100644 --- a/src/regint.h +++ b/src/regint.h @@ -521,7 +521,7 @@ enum OpCode { OP_WORD_END, OP_EXTENDED_GRAPHEME_CLUSTER_BOUNDARY, - OP_NO_EXTENDED_GRAPHEME_CLUSTER_BOUND, + OP_NO_EXTENDED_GRAPHEME_CLUSTER_BOUNDARY, OP_BEGIN_BUF, OP_END_BUF,