rename member

diff --git a/src/regcomp.c b/src/regcomp.c
index 53bbc863e58a74c1662508f815402a6fba45a77e..7f84d9f73f93eaf2c4e80a7db5f8e69da83787f0 100644 (file)
--- 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 a7cb2ddc5c8351284d5ec24537d1b19df14daf7b..b549ae71e315893b5c9a1b0b70661accde581eb7 100644 (file)
--- 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 88a5258bec27ab5fadd442903577e6e4f4a5788e..c2514d45f32adaa72c4e0ce4ad54effe3072f9ed 100644 (file)
--- 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;