Rename tokenize to helper_tokenize

2 files changed, 53 insertions, 53 deletions

diff --git a/test/helper-tokenize.c b/test/helper-tokenize.c
index 6fdc43be..111cf37f 100644
--- a/test/helper-tokenize.c
+++ b/test/helper-tokenize.c
@@ -59,13 +59,13 @@ void display_startup_notification ( G_GNUC_UNUSED RofiHelperExecuteContext *cont
 }
 START_TEST(test_tokenizer_free )
 {
-        tokenize_free ( NULL );
+        helper_tokenize_free ( NULL );
 }
 END_TEST
 START_TEST ( test_tokenizer_match_normal_single_ci )
 {
     config.matching_method = MM_NORMAL;
-    rofi_int_matcher **tokens = tokenize ( "noot", FALSE );
+    rofi_int_matcher **tokens = helper_tokenize ( "noot", FALSE );
 
     ck_assert_int_eq ( helper_token_match ( tokens, "aap noot mies") , TRUE );
     ck_assert_int_eq ( helper_token_match ( tokens, "aap mies") , FALSE );
@@ -75,7 +75,7 @@ START_TEST ( test_tokenizer_match_normal_single_ci )
     ck_assert_int_eq ( helper_token_match ( tokens, "Nooaap mies") , FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "noOTap mies") , TRUE );
 
-    tokenize_free ( tokens );
+    helper_tokenize_free ( tokens );
 }
 END_TEST
 
@@ -83,7 +83,7 @@ START_TEST ( test_tokenizer_match_normal_single_cs )
 {
     config.matching_method = MM_NORMAL;
     rofi_int_matcher **tokens = NULL; 
-    tokens = tokenize ( "noot", TRUE );
+    tokens = helper_tokenize ( "noot", TRUE );
 
     ck_assert_int_eq ( helper_token_match ( tokens, "aap noot mies") , TRUE );
     ck_assert_int_eq ( helper_token_match ( tokens, "aap mies") , FALSE );
@@ -93,7 +93,7 @@ START_TEST ( test_tokenizer_match_normal_single_cs )
     ck_assert_int_eq ( helper_token_match ( tokens, "Nooaap mies") , FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "noOTap mies") , FALSE );
 
-    tokenize_free ( tokens );
+    helper_tokenize_free ( tokens );
 }
 END_TEST
 
@@ -102,13 +102,13 @@ START_TEST ( test_tokenizer_match_normal_multiple_ci )
     config.matching_method = MM_NORMAL;
     rofi_int_matcher **tokens = NULL; 
 
-    tokens = tokenize ( "no ot", FALSE );
+    tokens = helper_tokenize ( "no ot", FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "aap noot mies") , TRUE );
     ck_assert_int_eq ( helper_token_match ( tokens, "aap mies") , FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "nooaap mies") , FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "nootap mies") , TRUE );
     ck_assert_int_eq ( helper_token_match ( tokens, "noap miesot") , TRUE );
-    tokenize_free ( tokens );
+    helper_tokenize_free ( tokens );
 
 }
 END_TEST
@@ -117,13 +117,13 @@ START_TEST ( test_tokenizer_match_normal_single_ci_negate )
 {
     config.matching_method = MM_NORMAL;
     rofi_int_matcher **tokens = NULL; 
-    tokens = tokenize ( "-noot", FALSE );
+    tokens = helper_tokenize ( "-noot", FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "aap noot mies") , FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "aap mies") , TRUE );
     ck_assert_int_eq ( helper_token_match ( tokens, "nooaap mies") , TRUE );
     ck_assert_int_eq ( helper_token_match ( tokens, "nootap mies") , FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "noap miesot") , TRUE );
-    tokenize_free ( tokens );
+    helper_tokenize_free ( tokens );
 }
 END_TEST
 
@@ -132,13 +132,13 @@ START_TEST ( test_tokenizer_match_normal_multiple_ci_negate )
     config.matching_method = MM_NORMAL;
     rofi_int_matcher **tokens = NULL; 
 
-    tokens = tokenize ( "-noot aap", FALSE );
+    tokens = helper_tokenize ( "-noot aap", FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "aap noot mies") , FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "aap mies") , TRUE );
     ck_assert_int_eq ( helper_token_match ( tokens, "nooaap mies") , TRUE );
     ck_assert_int_eq ( helper_token_match ( tokens, "nootap mies") , FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "noap miesot") , FALSE );
-    tokenize_free ( tokens );
+    helper_tokenize_free ( tokens );
 
 }
 END_TEST
@@ -147,7 +147,7 @@ START_TEST ( test_tokenizer_match_glob_single_ci )
 {
     config.matching_method = MM_GLOB;
     rofi_int_matcher **tokens = NULL;
-    tokens = tokenize ( "noot", FALSE );
+    tokens = helper_tokenize ( "noot", FALSE );
 
     ck_assert_int_eq ( helper_token_match ( tokens, "aap noot mies") , TRUE );
     ck_assert_int_eq ( helper_token_match ( tokens, "aap mies") , FALSE );
@@ -157,7 +157,7 @@ START_TEST ( test_tokenizer_match_glob_single_ci )
     ck_assert_int_eq ( helper_token_match ( tokens, "Nooaap mies") , FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "noOTap mies") , TRUE );
 
-    tokenize_free ( tokens );
+    helper_tokenize_free ( tokens );
 }
 END_TEST
 
@@ -165,7 +165,7 @@ START_TEST ( test_tokenizer_match_glob_single_cs )
 {
     config.matching_method = MM_GLOB;
     rofi_int_matcher **tokens = NULL;
-    tokens = tokenize ( "noot", TRUE );
+    tokens = helper_tokenize ( "noot", TRUE );
 
     ck_assert_int_eq ( helper_token_match ( tokens, "aap noot mies") , TRUE );
     ck_assert_int_eq ( helper_token_match ( tokens, "aap mies") , FALSE );
@@ -174,7 +174,7 @@ START_TEST ( test_tokenizer_match_glob_single_cs )
     ck_assert_int_eq ( helper_token_match ( tokens, "aap Noot mies") , FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "Nooaap mies") , FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "noOTap mies") , FALSE );
-    tokenize_free ( tokens );
+    helper_tokenize_free ( tokens );
 
 }
 END_TEST
@@ -183,13 +183,13 @@ START_TEST ( test_tokenizer_match_glob_multiple_ci )
 {
     config.matching_method = MM_GLOB;
     rofi_int_matcher **tokens = NULL;
-    tokens = tokenize ( "no ot", FALSE );
+    tokens = helper_tokenize ( "no ot", FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "aap noot mies") , TRUE );
     ck_assert_int_eq ( helper_token_match ( tokens, "aap mies") , FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "nooaap mies") , FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "nootap mies") , TRUE );
     ck_assert_int_eq ( helper_token_match ( tokens, "noap miesot") , TRUE );
-    tokenize_free ( tokens );
+    helper_tokenize_free ( tokens );
 }
 END_TEST
 
@@ -198,13 +198,13 @@ START_TEST ( test_tokenizer_match_glob_single_ci_question )
     config.matching_method = MM_GLOB;
     rofi_int_matcher **tokens = NULL;
 
-    tokens = tokenize ( "n?ot", FALSE );
+    tokens = helper_tokenize ( "n?ot", FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "aap noot mies") , TRUE );
     ck_assert_int_eq ( helper_token_match ( tokens, "aap mies") , FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "nooaap mies") , FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "nootap mies") , TRUE );
     ck_assert_int_eq ( helper_token_match ( tokens, "noap miesot") , FALSE);
-    tokenize_free ( tokens );
+    helper_tokenize_free ( tokens );
 }
 END_TEST
 
@@ -212,13 +212,13 @@ START_TEST ( test_tokenizer_match_glob_single_ci_star )
 {
     config.matching_method = MM_GLOB;
     rofi_int_matcher **tokens = NULL;
-    tokens = tokenize ( "n*ot", FALSE );
+    tokens = helper_tokenize ( "n*ot", FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "aap noot mies") , TRUE );
     ck_assert_int_eq ( helper_token_match ( tokens, "aap mies") , FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "nooaap mies") , FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "nootap mies") , TRUE );
     ck_assert_int_eq ( helper_token_match ( tokens, "noap miesot") , TRUE);
-    tokenize_free ( tokens );
+    helper_tokenize_free ( tokens );
 }
 END_TEST
 
@@ -227,14 +227,14 @@ START_TEST ( test_tokenizer_match_glob_multiple_ci_star )
     config.matching_method = MM_GLOB;
     rofi_int_matcher **tokens = NULL;
 
-    tokens = tokenize ( "n* ot", FALSE );
+    tokens = helper_tokenize ( "n* ot", FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "aap noot mies") , TRUE );
     ck_assert_int_eq ( helper_token_match ( tokens, "aap mies") , FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "nooaap mies") , FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "nootap mies") , TRUE );
     ck_assert_int_eq ( helper_token_match ( tokens, "noap miesot") , TRUE);
     ck_assert_int_eq ( helper_token_match ( tokens, "ot nap mies") , TRUE);
-    tokenize_free ( tokens );
+    helper_tokenize_free ( tokens );
 }
 END_TEST
 
@@ -242,7 +242,7 @@ START_TEST ( test_tokenizer_match_fuzzy_single_ci )
 {
     config.matching_method = MM_FUZZY;
     rofi_int_matcher **tokens = NULL;
-    tokens = tokenize ( "noot", FALSE );
+    tokens = helper_tokenize ( "noot", FALSE );
 
     ck_assert_int_eq ( helper_token_match ( tokens, "aap noot mies") , TRUE );
     ck_assert_int_eq ( helper_token_match ( tokens, "aap mies") , FALSE );
@@ -252,7 +252,7 @@ START_TEST ( test_tokenizer_match_fuzzy_single_ci )
     ck_assert_int_eq ( helper_token_match ( tokens, "Nooaap mies") , FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "noOTap mies") , TRUE );
 
-    tokenize_free ( tokens );
+    helper_tokenize_free ( tokens );
 }
 END_TEST
 
@@ -261,7 +261,7 @@ START_TEST ( test_tokenizer_match_fuzzy_single_cs )
     config.matching_method = MM_FUZZY;
     rofi_int_matcher **tokens = NULL;
 
-    tokens = tokenize ( "noot", TRUE );
+    tokens = helper_tokenize ( "noot", TRUE );
 
     ck_assert_int_eq ( helper_token_match ( tokens, "aap noot mies") , TRUE );
     ck_assert_int_eq ( helper_token_match ( tokens, "aap mies") , FALSE );
@@ -270,7 +270,7 @@ START_TEST ( test_tokenizer_match_fuzzy_single_cs )
     ck_assert_int_eq ( helper_token_match ( tokens, "aap Noot mies") , FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "Nooaap mies") , FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "noOTap mies") , FALSE );
-    tokenize_free ( tokens );
+    helper_tokenize_free ( tokens );
 }
 END_TEST
 
@@ -279,21 +279,21 @@ START_TEST ( test_tokenizer_match_fuzzy_multiple_ci )
     config.matching_method = MM_FUZZY;
     rofi_int_matcher **tokens = NULL;
 
-    tokens = tokenize ( "no ot", FALSE );
+    tokens = helper_tokenize ( "no ot", FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "aap noot mies") , TRUE );
     ck_assert_int_eq ( helper_token_match ( tokens, "aap mies") , FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "nooaap mies") , FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "nootap mies") , TRUE );
     ck_assert_int_eq ( helper_token_match ( tokens, "noap miesot") , TRUE );
-    tokenize_free ( tokens );
+    helper_tokenize_free ( tokens );
 
-    tokens = tokenize ( "n ot", FALSE );
+    tokens = helper_tokenize ( "n ot", FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "aap noot mies") , TRUE );
     ck_assert_int_eq ( helper_token_match ( tokens, "aap mies") , FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "nooaap mies") , FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "nootap mies") , TRUE );
     ck_assert_int_eq ( helper_token_match ( tokens, "noap miesot") , TRUE);
-    tokenize_free ( tokens );
+    helper_tokenize_free ( tokens );
 }
 END_TEST
 
@@ -301,12 +301,12 @@ START_TEST ( test_tokenizer_match_fuzzy_single_ci_split )
 {
     config.matching_method = MM_FUZZY;
     rofi_int_matcher **tokens = NULL;
-    tokens = tokenize ( "ont", FALSE );
+    tokens = helper_tokenize ( "ont", FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "aap noot mies") , FALSE);
     ck_assert_int_eq ( helper_token_match ( tokens, "aap mies") , FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "nooaap mies") , FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "nootap nmiest") , TRUE );
-    tokenize_free ( tokens );
+    helper_tokenize_free ( tokens );
 }
 END_TEST
 
@@ -315,14 +315,14 @@ START_TEST ( test_tokenizer_match_fuzzy_multiple_ci_split )
     config.matching_method = MM_FUZZY;
     rofi_int_matcher **tokens = NULL;
 
-    tokens = tokenize ( "o n t", FALSE );
+    tokens = helper_tokenize ( "o n t", FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "aap noot mies") , TRUE );
     ck_assert_int_eq ( helper_token_match ( tokens, "aap mies") , FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "nooaap mies") , FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "nootap mies") , TRUE );
     ck_assert_int_eq ( helper_token_match ( tokens, "noap miesot") , TRUE);
     ck_assert_int_eq ( helper_token_match ( tokens, "ot nap mies") , TRUE);
-    tokenize_free ( tokens );
+    helper_tokenize_free ( tokens );
 }
 END_TEST
 
@@ -330,7 +330,7 @@ START_TEST ( test_tokenizer_match_regex_single_ci )
 {
     config.matching_method = MM_REGEX;
     rofi_int_matcher **tokens = NULL;
-    tokens = tokenize ( "noot", FALSE );
+    tokens = helper_tokenize ( "noot", FALSE );
 
     ck_assert_int_eq ( helper_token_match ( tokens, "aap noot mies") , TRUE );
     ck_assert_int_eq ( helper_token_match ( tokens, "aap mies") , FALSE );
@@ -340,7 +340,7 @@ START_TEST ( test_tokenizer_match_regex_single_ci )
     ck_assert_int_eq ( helper_token_match ( tokens, "Nooaap mies") , FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "noOTap mies") , TRUE );
 
-    tokenize_free ( tokens );
+    helper_tokenize_free ( tokens );
 }
 END_TEST
 
@@ -349,7 +349,7 @@ START_TEST ( test_tokenizer_match_regex_single_cs )
     config.matching_method = MM_REGEX;
     rofi_int_matcher **tokens = NULL;
 
-    tokens = tokenize ( "noot", TRUE );
+    tokens = helper_tokenize ( "noot", TRUE );
 
     ck_assert_int_eq ( helper_token_match ( tokens, "aap noot mies") , TRUE );
     ck_assert_int_eq ( helper_token_match ( tokens, "aap mies") , FALSE );
@@ -358,7 +358,7 @@ START_TEST ( test_tokenizer_match_regex_single_cs )
     ck_assert_int_eq ( helper_token_match ( tokens, "aap Noot mies") , FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "Nooaap mies") , FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "noOTap mies") , FALSE );
-    tokenize_free ( tokens );
+    helper_tokenize_free ( tokens );
 }
 END_TEST
 
@@ -367,13 +367,13 @@ START_TEST ( test_tokenizer_match_regex_multiple_ci )
     config.matching_method = MM_REGEX;
     rofi_int_matcher **tokens = NULL;
 
-    tokens = tokenize ( "no ot", FALSE );
+    tokens = helper_tokenize ( "no ot", FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "aap noot mies") , TRUE );
     ck_assert_int_eq ( helper_token_match ( tokens, "aap mies") , FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "nooaap mies") , FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "nootap mies") , TRUE );
     ck_assert_int_eq ( helper_token_match ( tokens, "noap miesot") , TRUE );
-    tokenize_free ( tokens );
+    helper_tokenize_free ( tokens );
 }
 END_TEST
 
@@ -382,13 +382,13 @@ START_TEST ( test_tokenizer_match_regex_single_ci_dq )
     config.matching_method = MM_REGEX;
     rofi_int_matcher **tokens = NULL;
 
-    tokens = tokenize ( "n.?ot", FALSE );
+    tokens = helper_tokenize ( "n.?ot", FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "aap noot mies") , TRUE );
     ck_assert_int_eq ( helper_token_match ( tokens, "aap mies") , FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "nooaap mies") , FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "nootap mies") , TRUE );
     ck_assert_int_eq ( helper_token_match ( tokens, "noap miesot") , FALSE);
-    tokenize_free ( tokens );
+    helper_tokenize_free ( tokens );
 }
 END_TEST
 
@@ -396,14 +396,14 @@ START_TEST ( test_tokenizer_match_regex_single_two_char )
 {
     config.matching_method = MM_REGEX;
     rofi_int_matcher **tokens = NULL;
-    tokens = tokenize ( "n[oa]{2}t", FALSE );
+    tokens = helper_tokenize ( "n[oa]{2}t", FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "aap noot mies") , TRUE );
     ck_assert_int_eq ( helper_token_match ( tokens, "aap mies") , FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "nooaap mies") , FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "nootap mies") , TRUE );
     ck_assert_int_eq ( helper_token_match ( tokens, "noat miesot") , TRUE);
     ck_assert_int_eq ( helper_token_match ( tokens, "noaat miesot") , FALSE);
-    tokenize_free ( tokens );
+    helper_tokenize_free ( tokens );
 }
 END_TEST
 
@@ -412,18 +412,18 @@ START_TEST ( test_tokenizer_match_regex_single_two_word_till_end )
     config.matching_method = MM_REGEX;
     rofi_int_matcher **tokens = NULL;
 
-    tokens = tokenize ( "^(aap|noap)\\sMie.*", FALSE );
+    tokens = helper_tokenize ( "^(aap|noap)\\sMie.*", FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "aap noot mies") , FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "aap mies") , TRUE);
     ck_assert_int_eq ( helper_token_match ( tokens, "nooaap mies") , FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "nootap mies") , FALSE );
     ck_assert_int_eq ( helper_token_match ( tokens, "noap miesot") , TRUE);
     ck_assert_int_eq ( helper_token_match ( tokens, "ot nap mies") , FALSE );
-    tokenize_free ( tokens );
+    helper_tokenize_free ( tokens );
 }
 END_TEST
 
-static Suite * tokenizer_suite (void)
+static Suite * helper_tokenizer_suite (void)
 {
     Suite *s;
 
@@ -490,7 +490,7 @@ int main ( G_GNUC_UNUSED int argc, G_GNUC_UNUSED char ** argv )
     Suite *s;
     SRunner *sr;
 
-    s = tokenizer_suite();
+    s = helper_tokenizer_suite();
     sr = srunner_create(s);
 
     srunner_run_all(sr, CK_NORMAL);
diff --git a/test/mode-test.c b/test/mode-test.c
index 1c1a271a..201f0b4a 100644
--- a/test/mode-test.c
+++ b/test/mode-test.c
@@ -146,19 +146,19 @@ END_TEST
 
 START_TEST(test_mode_match_entry)
 {
-    rofi_int_matcher **t = tokenize( "primary-paste", FALSE );
+    rofi_int_matcher **t = helper_tokenize( "primary-paste", FALSE );
     ck_assert_ptr_nonnull ( t );
 
     ck_assert_int_eq ( mode_token_match ( &help_keys_mode, t, 0), TRUE );
     ck_assert_int_eq ( mode_token_match ( &help_keys_mode, t, 1), FALSE );
-    tokenize_free ( t );
-    t = tokenize( "y-paste", FALSE );
+    helper_tokenize_free ( t );
+    t = helper_tokenize( "y-paste", FALSE );
     ck_assert_ptr_nonnull ( t );
 
     ck_assert_int_eq ( mode_token_match ( &help_keys_mode, t, 0), TRUE );
     ck_assert_int_eq ( mode_token_match ( &help_keys_mode, t, 1), TRUE );
     ck_assert_int_eq ( mode_token_match ( &help_keys_mode, t, 2), FALSE );
-    tokenize_free ( t );
+    helper_tokenize_free ( t );
 
 }
 END_TEST