rename function _from_xxx to _by_xxx

diff --git a/sample/callout.c b/sample/callout.c
index c060c607a7358093922767537d9870735106d775..f9496d4aed56f0882ddef2458ede044175f62c25 100644 (file)
--- a/sample/callout.c
+++ b/sample/callout.c
@@ -46,7 +46,7 @@ callout_body(OnigCalloutArgs* args, void* user_data)
   }
 
   if (name_id != ONIG_NO_NAME_ID) {
-    UChar* name = onig_get_callout_name_from_name_id(name_id);
+    UChar* name = onig_get_callout_name_by_name_id(name_id);
     fprintf(stdout, "name: %s\n", name);
   }
   fprintf(stdout,

diff --git a/src/oniguruma.h b/src/oniguruma.h
index 92d17da9eb0f16bad6fb75c4d7fd9923ba2a4d09..efa2968ea3fe3fca44f626833e04ed2875cb4470 100644 (file)
--- a/src/oniguruma.h
+++ b/src/oniguruma.h
@@ -943,9 +943,9 @@ int onig_set_retraction_callout_of_contents P_((OnigCalloutFunc f));
 ONIG_EXTERN
 int onig_set_callout_of_name P_((OnigEncoding enc, OnigCalloutType type, OnigUChar* name, OnigUChar* name_end, int callout_in, OnigCalloutFunc callout, OnigCalloutFunc end_callout, int arg_num, OnigType arg_types[], int optional_arg_num, OnigValue opt_defaults[])); /* name: single-byte string */
 ONIG_EXTERN
-OnigUChar* onig_get_callout_name_from_name_id P_((int id));
+OnigUChar* onig_get_callout_name_by_name_id P_((int id));
 ONIG_EXTERN
-int onig_get_callout_num_from_tag P_((OnigRegex reg, const UChar* tag, const UChar* tag_end));
+int onig_get_callout_num_by_tag P_((OnigRegex reg, const UChar* tag, const UChar* tag_end));
 ONIG_EXTERN
 int onig_get_callout_data_by_tag P_((OnigRegex reg, OnigMatchParam* mp, const UChar* tag, const UChar* tag_end, int slot, OnigType* type, OnigValue* val));
 ONIG_EXTERN

diff --git a/src/regexec.c b/src/regexec.c
index 77cc1dbbadf1447c1af120ccb618c783f629934e..e2720a6192586153428942bc8eb27d970d2dce7c 100644 (file)
--- a/src/regexec.c
+++ b/src/regexec.c
@@ -1219,7 +1219,7 @@ onig_get_callout_data_by_tag(regex_t* reg, OnigMatchParam* mp,
   int i;
   CalloutData* d;
 
-  num = onig_get_callout_num_from_tag(reg, tag, tag_end);
+  num = onig_get_callout_num_by_tag(reg, tag, tag_end);
   if (num < 0) return num;
   if (num == 0) return ONIGERR_INVALID_CALLOUT_TAG_NAME;
 
@@ -1239,7 +1239,7 @@ onig_set_callout_data_by_tag(regex_t* reg, OnigMatchParam* mp,
   int i;
   CalloutData* d;
 
-  num = onig_get_callout_num_from_tag(reg, tag, tag_end);
+  num = onig_get_callout_num_by_tag(reg, tag, tag_end);
   if (num < 0) return num;
   if (num == 0) return ONIGERR_INVALID_CALLOUT_TAG_NAME;
 
@@ -1612,7 +1612,7 @@ stack_double(int is_alloca, char** arg_alloc_base,
     }\
     else {\
       aof = ONIG_CALLOUT_OF_NAME;\
-      func = onig_get_callout_start_func_from_name_id(stk->zid);\
+      func = onig_get_callout_start_func_by_name_id(stk->zid);\
     }\
     RETRACTION_CALLOUT(func, aof, stk->zid, stk->u.callout.num, msa->mp->callout_user_data);\
   }
@@ -3748,7 +3748,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
 
         of = ONIG_CALLOUT_OF_NAME;
         GET_MEMNUM_INC(name_id, p);
-        func = onig_get_callout_start_func_from_name_id(name_id);
+        func = onig_get_callout_start_func_by_name_id(name_id);
 
       callout_common_entry:
         GET_MEMNUM_INC(num, p);
@@ -3781,7 +3781,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
         retraction_callout2:
           if ((in & ONIG_CALLOUT_IN_RETRACTION) != 0) {
             if (of == ONIG_CALLOUT_OF_NAME) {
-              func = onig_get_callout_start_func_from_name_id(name_id);
+              func = onig_get_callout_start_func_by_name_id(name_id);
               if (IS_NOT_NULL(func)) {
                 STACK_PUSH_CALLOUT_NAME(name_id, num);
               }

diff --git a/src/regint.h b/src/regint.h
index f486050c3b699da1d095164adbe9d4e1f9f72e62..07e80f277a57a39f93b87f2dad206db9af7ff086 100644 (file)
--- a/src/regint.h
+++ b/src/regint.h
@@ -820,9 +820,9 @@ extern int    onig_ext_set_pattern(regex_t* reg, const UChar* pattern, const UCh
 
 #ifdef USE_CALLOUT
 
-extern OnigCalloutType onig_get_callout_type_from_name_id(int name_id);
-extern OnigCalloutFunc onig_get_callout_start_func_from_name_id(int id);
-extern OnigCalloutFunc onig_get_callout_end_func_from_name_id(int id);
+extern OnigCalloutType onig_get_callout_type_by_name_id(int name_id);
+extern OnigCalloutFunc onig_get_callout_start_func_by_name_id(int id);
+extern OnigCalloutFunc onig_get_callout_end_func_by_name_id(int id);
 extern int             onig_callout_tag_table_free(void* table);
 extern void            onig_free_reg_callout_list(int n, CalloutListEntry* list);
 extern CalloutListEntry* onig_reg_callout_list_at(regex_t* reg, int num);

diff --git a/src/regparse.c b/src/regparse.c
index 91c3715197c3aa98835382d4a1e90994b93f0897..e23260ba48c442ac21892896949d12a255557c56 100644 (file)
--- a/src/regparse.c
+++ b/src/regparse.c
@@ -1532,8 +1532,8 @@ onig_set_callout_of_name(OnigEncoding enc, OnigCalloutType callout_type,
 }
 
 static int
-get_callout_name_id_from_name(OnigEncoding enc, int is_not_single,
-                              UChar* name, UChar* name_end, int* rid)
+get_callout_name_id_by_name(OnigEncoding enc, int is_not_single,
+                            UChar* name, UChar* name_end, int* rid)
 {
   int r;
   CalloutNameEntry* e;
@@ -1555,55 +1555,55 @@ get_callout_name_id_from_name(OnigEncoding enc, int is_not_single,
 
 
 extern OnigCalloutType
-onig_get_callout_type_from_name_id(int name_id)
+onig_get_callout_type_by_name_id(int name_id)
 {
   return GlobalCalloutNameList->v[name_id].type;
 }
 
 extern OnigCalloutFunc
-onig_get_callout_start_func_from_name_id(int name_id)
+onig_get_callout_start_func_by_name_id(int name_id)
 {
   return GlobalCalloutNameList->v[name_id].start_func;
 }
 
 extern OnigCalloutFunc
-onig_get_callout_end_func_from_name_id(int name_id)
+onig_get_callout_end_func_by_name_id(int name_id)
 {
   return GlobalCalloutNameList->v[name_id].end_func;
 }
 
 extern int
-onig_get_callout_in_from_name_id(int name_id)
+onig_get_callout_in_by_name_id(int name_id)
 {
   return GlobalCalloutNameList->v[name_id].in;
 }
 
 static int
-get_callout_arg_num_from_name_id(int name_id)
+get_callout_arg_num_by_name_id(int name_id)
 {
   return GlobalCalloutNameList->v[name_id].arg_num;
 }
 
 static int
-get_callout_opt_arg_num_from_name_id(int name_id)
+get_callout_opt_arg_num_by_name_id(int name_id)
 {
   return GlobalCalloutNameList->v[name_id].opt_arg_num;
 }
 
 static OnigType
-get_callout_arg_type_from_name_id(int name_id, int index)
+get_callout_arg_type_by_name_id(int name_id, int index)
 {
   return GlobalCalloutNameList->v[name_id].arg_types[index];
 }
 
 static OnigValue
-get_callout_opt_default_from_name_id(int name_id, int index)
+get_callout_opt_default_by_name_id(int name_id, int index)
 {
   return GlobalCalloutNameList->v[name_id].opt_defaults[index];
 }
 
 extern UChar*
-onig_get_callout_name_from_name_id(int name_id)
+onig_get_callout_name_by_name_id(int name_id)
 {
   return GlobalCalloutNameList->v[name_id].name;
 }
@@ -1686,8 +1686,8 @@ onig_callout_tag_table_free(void* table)
 }
 
 extern int
-onig_get_callout_num_from_tag(regex_t* reg,
-                             const UChar* tag, const UChar* tag_end)
+onig_get_callout_num_by_tag(regex_t* reg,
+                            const UChar* tag, const UChar* tag_end)
 {
   int r;
   RegexExt* ext;
@@ -6702,13 +6702,13 @@ parse_callout_of_name(Node** np, int cterm, UChar** src, UChar* end, ScanEnv* en
 
     is_not_single = PPEEK_IS(cterm) ?  0 : 1;
     p = save;
-    r = get_callout_name_id_from_name(enc, is_not_single, name_start, name_end,
-                                      &name_id);
+    r = get_callout_name_id_by_name(enc, is_not_single, name_start, name_end,
+                                    &name_id);
     if (r != ONIG_NORMAL) return r;
 
-    max_arg_num = get_callout_arg_num_from_name_id(name_id);
+    max_arg_num = get_callout_arg_num_by_name_id(name_id);
     for (i = 0; i < max_arg_num; i++) {
-      types[i] = get_callout_arg_type_from_name_id(name_id, i);
+      types[i] = get_callout_arg_type_by_name_id(name_id, i);
     }
 
     arg_num = parse_callout_args(0, ')', &p, end, types, vals, env);
@@ -6721,18 +6721,18 @@ parse_callout_of_name(Node** np, int cterm, UChar** src, UChar* end, ScanEnv* en
     arg_num = 0;
 
     is_not_single = 0;
-    r = get_callout_name_id_from_name(enc, is_not_single, name_start, name_end,
+    r = get_callout_name_id_by_name(enc, is_not_single, name_start, name_end,
                                       &name_id);
     if (r != ONIG_NORMAL) return r;
 
-    max_arg_num = get_callout_arg_num_from_name_id(name_id);
+    max_arg_num = get_callout_arg_num_by_name_id(name_id);
     for (i = 0; i < max_arg_num; i++) {
-      types[i] = get_callout_arg_type_from_name_id(name_id, i);
+      types[i] = get_callout_arg_type_by_name_id(name_id, i);
     }
   }
 
-  in = onig_get_callout_in_from_name_id(name_id);
-  opt_arg_num = get_callout_opt_arg_num_from_name_id(name_id);
+  in = onig_get_callout_in_by_name_id(name_id);
+  opt_arg_num = get_callout_opt_arg_num_by_name_id(name_id);
   if (arg_num > max_arg_num || arg_num < (max_arg_num - opt_arg_num))
     return ONIGERR_INVALID_CALLOUT_ARG;
 
@@ -6769,7 +6769,7 @@ parse_callout_of_name(Node** np, int cterm, UChar** src, UChar* end, ScanEnv* en
   e->of      = ONIG_CALLOUT_OF_NAME;
   e->in      = in;
   e->name_id = name_id;
-  e->type    = onig_get_callout_type_from_name_id(name_id);
+  e->type    = onig_get_callout_type_by_name_id(name_id);
   e->u.arg.num        = max_arg_num;
   e->u.arg.passed_num = arg_num;
   for (i = 0; i < max_arg_num; i++) {
@@ -6777,7 +6777,7 @@ parse_callout_of_name(Node** np, int cterm, UChar** src, UChar* end, ScanEnv* en
     if (i < arg_num)
       e->u.arg.vals[i] = vals[i];
     else
-      e->u.arg.vals[i] = get_callout_opt_default_from_name_id(name_id, i);
+      e->u.arg.vals[i] = get_callout_opt_default_by_name_id(name_id, i);
   }
 
   *np = node;