From 91d88b1fd14fb4d079931b5f68f3711655495ad7 Mon Sep 17 00:00:00 2001 From: Dave Davenport Date: Sun, 1 Oct 2017 10:51:02 +0200 Subject: [PATCH] Rename tokenize to helper_tokenize --- include/helper.h | 8 ++-- source/dialogs/dmenu.c | 8 ++-- source/helper.c | 4 +- source/view.c | 6 +-- test/helper-tokenize.c | 98 +++++++++++++++++++++--------------------- test/mode-test.c | 8 ++-- 6 files changed, 66 insertions(+), 66 deletions(-) diff --git a/include/helper.h b/include/helper.h index b761e647..f8cf1c27 100644 --- a/include/helper.h +++ b/include/helper.h @@ -59,16 +59,16 @@ int helper_parse_setup ( char * string, char ***output, int *length, ... ); * * Tokenize the string on spaces. * - * @returns a newly allocated array of regex objest + * @returns a newly allocated array of matching objects */ -rofi_int_matcher **tokenize ( const char *input, int case_sensitive ); +rofi_int_matcher **helper_tokenize ( const char *input, int case_sensitive ); /** * @param tokens Array of regex objects * - * Frees the array of regex expressions. + * Frees the array of matching objects. */ -void tokenize_free ( rofi_int_matcher ** tokens ); +void helper_tokenize_free ( rofi_int_matcher ** tokens ); /** * @param key The key to search for diff --git a/source/dialogs/dmenu.c b/source/dialogs/dmenu.c index 8bbf3a0a..5f91279e 100644 --- a/source/dialogs/dmenu.c +++ b/source/dialogs/dmenu.c @@ -612,7 +612,7 @@ int dmenu_switcher_dialog ( void ) char *select = NULL; find_arg_str ( "-select", &select ); if ( select != NULL ) { - rofi_int_matcher **tokens = tokenize ( select, config.case_sensitive ); + rofi_int_matcher **tokens = helper_tokenize ( select, config.case_sensitive ); unsigned int i = 0; for ( i = 0; i < cmd_list_length; i++ ) { if ( helper_token_match ( tokens, cmd_list[i] ) ) { @@ -620,17 +620,17 @@ int dmenu_switcher_dialog ( void ) break; } } - tokenize_free ( tokens ); + helper_tokenize_free ( tokens ); } if ( find_arg ( "-dump" ) >= 0 ) { - rofi_int_matcher **tokens = tokenize ( config.filter ? config.filter : "", config.case_sensitive ); + rofi_int_matcher **tokens = helper_tokenize ( config.filter ? config.filter : "", config.case_sensitive ); unsigned int i = 0; for ( i = 0; i < cmd_list_length; i++ ) { if ( tokens == NULL || helper_token_match ( tokens, cmd_list[i] ) ) { rofi_output_formatted_line ( pd->format, cmd_list[i], i, config.filter ); } } - tokenize_free ( tokens ); + helper_tokenize_free ( tokens ); dmenu_mode_free ( &dmenu_mode ); g_free ( input ); return TRUE; diff --git a/source/helper.c b/source/helper.c index 8ead7f84..93ba997b 100644 --- a/source/helper.c +++ b/source/helper.c @@ -153,7 +153,7 @@ int helper_parse_setup ( char * string, char ***output, int *length, ... ) return FALSE; } -void tokenize_free ( rofi_int_matcher ** tokens ) +void helper_tokenize_free ( rofi_int_matcher ** tokens ) { for ( size_t i = 0; tokens && tokens[i]; i++ ) { g_regex_unref ( (GRegex *) tokens[i]->regex ); @@ -255,7 +255,7 @@ static rofi_int_matcher * create_regex ( const char *input, int case_sensitive ) rv->regex = retv; return rv; } -rofi_int_matcher **tokenize ( const char *input, int case_sensitive ) +rofi_int_matcher **helper_tokenize ( const char *input, int case_sensitive ) { if ( input == NULL ) { return NULL; diff --git a/source/view.c b/source/view.c index c5c08ac3..0e3f8ffe 100644 --- a/source/view.c +++ b/source/view.c @@ -497,7 +497,7 @@ void rofi_view_set_selected_line ( RofiViewState *state, unsigned int selected_l void rofi_view_free ( RofiViewState *state ) { if ( state->tokens ) { - tokenize_free ( state->tokens ); + helper_tokenize_free ( state->tokens ); state->tokens = NULL; } // Do this here? @@ -1019,14 +1019,14 @@ static void rofi_view_refilter ( RofiViewState *state ) state->reload = FALSE; } if ( state->tokens ) { - tokenize_free ( state->tokens ); + helper_tokenize_free ( state->tokens ); state->tokens = NULL; } if ( state->text && strlen ( state->text->text ) > 0 ) { unsigned int j = 0; gchar *pattern = mode_preprocess_input ( state->sw, state->text->text ); glong plen = pattern ? g_utf8_strlen ( pattern, -1 ) : 0; - state->tokens = tokenize ( pattern, config.case_sensitive ); + state->tokens = helper_tokenize ( pattern, config.case_sensitive ); /** * On long lists it can be beneficial to parallelize. * If number of threads is 1, no thread is spawn. 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