From: K.Kosako Date: Thu, 28 Mar 2019 00:43:26 +0000 (+0900) Subject: refactoring X-Git-Tag: v6.9.2_rc1~23 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f665cbcd925fdfece47d7d10c73400c54400c586;p=onig refactoring --- diff --git a/src/regcomp.c b/src/regcomp.c index c0ef71a..c2c04a4 100644 --- a/src/regcomp.c +++ b/src/regcomp.c @@ -952,7 +952,7 @@ compile_length_quantifier_node(QuantNode* qn, regex_t* reg) { int len, mod_tlen; int infinite = IS_REPEAT_INFINITE(qn->upper); - enum QuantBodyEmpty empty_info = qn->empty_info; + enum BodyEmpty empty_info = qn->empty_info; int tlen = compile_length_tree(NODE_QUANT_BODY(qn), reg); if (tlen < 0) return tlen; @@ -1027,7 +1027,7 @@ compile_quantifier_node(QuantNode* qn, regex_t* reg, ScanEnv* env) { int i, r, mod_tlen; int infinite = IS_REPEAT_INFINITE(qn->upper); - enum QuantBodyEmpty empty_info = qn->empty_info; + enum BodyEmpty empty_info = qn->empty_info; int tlen = compile_length_tree(NODE_QUANT_BODY(qn), reg); if (tlen < 0) return tlen; @@ -4002,7 +4002,7 @@ expand_case_fold_string(Node* node, regex_t* reg, int state) } #ifdef USE_INSISTENT_CHECK_CAPTURES_IN_EMPTY_REPEAT -static enum QuantBodyEmpty +static enum BodyEmpty quantifiers_memory_node_info(Node* node) { int r = BODY_IS_EMPTY; diff --git a/src/regparse.h b/src/regparse.h index f673c1a..b7a2867 100644 --- a/src/regparse.h +++ b/src/regparse.h @@ -66,7 +66,7 @@ enum GimmickType { #endif }; -enum QuantBodyEmpty { +enum BodyEmpty { BODY_IS_NOT_EMPTY = 0, BODY_IS_EMPTY = 1, BODY_IS_EMPTY_MEM = 2, @@ -101,7 +101,7 @@ typedef struct { int lower; int upper; int greedy; - enum QuantBodyEmpty empty_info; + enum BodyEmpty empty_info; struct _Node* head_exact; struct _Node* next_head_exact; int is_refered; /* include called node. don't eliminate even if {0} */