From: K.Kosako Date: Fri, 26 Jul 2019 05:31:06 +0000 (+0900) Subject: refactoring X-Git-Tag: v6.9.3~25 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=31b8339ad314d42c822176b41ae9a4dc2886ed58;p=onig refactoring --- diff --git a/src/regcomp.c b/src/regcomp.c index bb0bb85..259e48a 100644 --- a/src/regcomp.c +++ b/src/regcomp.c @@ -599,7 +599,7 @@ select_str_opcode(int mb_len, int str_len, int ignore_case) } static int -is_simple_type_node(Node* node) +is_strict_real_node(Node* node) { switch (NODE_TYPE(node)) { case NODE_STRING: @@ -3620,7 +3620,7 @@ next_setup(Node* node, Node* next_node, regex_t* reg) #endif /* automatic posseivation a*b ==> (?>a*)b */ if (qn->lower <= 1) { - if (is_simple_type_node(NODE_BODY(node))) { + if (is_strict_real_node(NODE_BODY(node))) { Node *x, *y; x = get_head_value_node(NODE_BODY(node), 0, reg); if (IS_NOT_NULL(x)) { @@ -4783,7 +4783,7 @@ setup_tree(Node* node, regex_t* reg, int state, ScanEnv* env) QuantNode* tqn = QUANT_(target); if (IS_INFINITE_REPEAT(tqn->upper) && tqn->lower <= 1 && tqn->greedy != 0) { /* (?>a*), a*+ etc... */ - if (is_simple_type_node(NODE_BODY(target))) + if (is_strict_real_node(NODE_BODY(target))) NODE_STATUS_ADD(node, STOP_BT_SIMPLE_REPEAT); } }