change start/end of CalloutListEntry type from int to UChar*

diff --git a/src/regint.h b/src/regint.h
index d87d21552d9a99844a059d57b1fb93332d217d9a..d55f31d5114a80b7512e4efedb51f92672fffa98 100644 (file)
--- a/src/regint.h
+++ b/src/regint.h
@@ -270,8 +270,8 @@ typedef struct {
   CalloutType   type;
   union {
     struct {
-      int start;
-      int end;
+      UChar* start;
+      UChar* end;
     } content;
     struct {
       int max_num;

diff --git a/src/regparse.c b/src/regparse.c
index 727af6f1f79a1214c44bcbee19d53e38fb68aa66..aacb287800acd47314c256e7fdb9fcf45340d77f 100644 (file)
--- a/src/regparse.c
+++ b/src/regparse.c
@@ -2459,16 +2459,6 @@ static int
 node_new_callout(Node** node, OnigCalloutOf callout_of, int num,
                  int id, int dirs, int with_tag, ScanEnv* env)
 {
-  int r;
-  RegexExt* ext;
-
-  ext = onig_get_regex_ext(env->reg);
-  CHECK_NULL_RETURN_MEMERR(ext);
-  if (IS_NULL(ext->pattern)) {
-    r = onig_ext_set_pattern(env->reg, env->pattern, env->pattern_end);
-    if (r != ONIG_NORMAL) return r;
-  }
-
   *node = node_new();
   CHECK_NULL_RETURN_MEMERR(*node);
 
@@ -6382,6 +6372,7 @@ parse_callout_of_code(Node** np, int cterm, UChar** src, UChar* end, ScanEnv* en
   UChar* code_end;
   int brace_nest;
   CalloutListEntry* e;
+  RegexExt* ext;
   OnigEncoding enc = env->enc;
   UChar* p = *src;
 
@@ -6440,12 +6431,19 @@ parse_callout_of_code(Node** np, int cterm, UChar** src, UChar* end, ScanEnv* en
     GIMMICK_(*np)->code_end   = (int )(code_end   - env->pattern);
   }
 
+  ext = onig_get_regex_ext(env->reg);
+  CHECK_NULL_RETURN_MEMERR(ext);
+  if (IS_NULL(ext->pattern)) {
+    r = onig_ext_set_pattern(env->reg, env->pattern, env->pattern_end);
+    if (r != ONIG_NORMAL) return r;
+  }
+
   e = reg_callout_list_at(env, num);
   e->of      = ONIG_CALLOUT_OF_CODE;
   e->in      = in;
   e->name_id = ONIG_NO_NAME_ID;
-  e->u.content.start = (int )(code_start - env->pattern);
-  e->u.content.end   = (int )(code_end   - env->pattern);
+  e->u.content.start = ext->pattern + (code_start - env->pattern);
+  e->u.content.end   = ext->pattern + (code_end   - env->pattern);
 
   *src = p;
   return 0;
@@ -6592,6 +6590,7 @@ parse_callout_of_name(Node** np, int cterm, UChar** src, UChar* end, ScanEnv* en
   UChar* tag_end;
   Node*  node;
   CalloutListEntry* e;
+  RegexExt* ext;
   OnigType  types[ONIG_CALLOUT_MAX_ARG_NUM];
   OnigValue vals[ONIG_CALLOUT_MAX_ARG_NUM];
   OnigEncoding enc = env->enc;
@@ -6684,6 +6683,13 @@ parse_callout_of_name(Node** np, int cterm, UChar** src, UChar* end, ScanEnv* en
     }
   }
 
+  ext = onig_get_regex_ext(env->reg);
+  CHECK_NULL_RETURN_MEMERR(ext);
+  if (IS_NULL(ext->pattern)) {
+    r = onig_ext_set_pattern(env->reg, env->pattern, env->pattern_end);
+    if (r != ONIG_NORMAL) return r;
+  }
+
   e = reg_callout_list_at(env, num);
   e->of      = ONIG_CALLOUT_OF_NAME;
   e->in      = in;