From 1b3c9e47c4d433e5504aab9c047c6486d66b3d1c Mon Sep 17 00:00:00 2001 From: "K.Kosako" Date: Wed, 28 Jun 2017 13:21:28 +0900 Subject: [PATCH] rename member --- src/regcomp.c | 10 +++++----- src/regparse.c | 2 +- src/regparse.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/regcomp.c b/src/regcomp.c index 53bbc86..7f84d9f 100644 --- a/src/regcomp.c +++ b/src/regcomp.c @@ -1365,9 +1365,9 @@ compile_enclosure_memory_node(EnclosureNode* node, regex_t* reg, ScanEnv* env) if (node->m.regnum == 0 && NODE_IS_CALLED(node)) { r = add_opcode(reg, OP_CALL); if (r != 0) return r; - node->m.call_addr = BBUF_GET_OFFSET_POS(reg) + SIZE_ABSADDR + SIZE_OP_JUMP; + node->m.called_addr = BBUF_GET_OFFSET_POS(reg) + SIZE_ABSADDR + SIZE_OP_JUMP; NODE_STATUS_ADD(node, NST_ADDR_FIXED); - r = add_abs_addr(reg, (int )node->m.call_addr); + r = add_abs_addr(reg, (int )node->m.called_addr); if (r != 0) return r; len = compile_length_tree(NODE_ENCLOSURE_BODY(node), reg); len += SIZE_OP_RETURN; @@ -1385,9 +1385,9 @@ compile_enclosure_memory_node(EnclosureNode* node, regex_t* reg, ScanEnv* env) if (NODE_IS_CALLED(node)) { r = add_opcode(reg, OP_CALL); if (r != 0) return r; - node->m.call_addr = BBUF_GET_OFFSET_POS(reg) + SIZE_ABSADDR + SIZE_OP_JUMP; + node->m.called_addr = BBUF_GET_OFFSET_POS(reg) + SIZE_ABSADDR + SIZE_OP_JUMP; NODE_STATUS_ADD(node, NST_ADDR_FIXED); - r = add_abs_addr(reg, (int )node->m.call_addr); + r = add_abs_addr(reg, (int )node->m.called_addr); if (r != 0) return r; len = compile_length_tree(NODE_ENCLOSURE_BODY(node), reg); len += (SIZE_OP_MEMORY_START_PUSH + SIZE_OP_RETURN); @@ -2073,7 +2073,7 @@ unset_addr_list_fix(UnsetAddrList* uslist, regex_t* reg) for (i = 0; i < uslist->num; i++) { en = ENCLOSURE_(uslist->us[i].target); if (! NODE_IS_ADDR_FIXED(en)) return ONIGERR_PARSER_BUG; - addr = en->m.call_addr; + addr = en->m.called_addr; offset = uslist->us[i].offset; BBUF_WRITE(reg, offset, &addr, SIZE_ABSADDR); diff --git a/src/regparse.c b/src/regparse.c index a7cb2dd..b549ae7 100644 --- a/src/regparse.c +++ b/src/regparse.c @@ -1331,7 +1331,7 @@ node_new_enclosure(int type) switch (type) { case ENCLOSURE_MEMORY: ENCLOSURE_(node)->m.regnum = 0; - ENCLOSURE_(node)->m.call_addr = -1; + ENCLOSURE_(node)->m.called_addr = -1; ENCLOSURE_(node)->m.entry_count = 1; ENCLOSURE_(node)->m.called_state = 0; break; diff --git a/src/regparse.h b/src/regparse.h index 88a5258..c2514d4 100644 --- a/src/regparse.h +++ b/src/regparse.h @@ -213,7 +213,7 @@ typedef struct { union { struct { int regnum; - AbsAddrType call_addr; + AbsAddrType called_addr; int entry_count; int called_state; } m; -- 2.40.0