From a0ef78a49aac6be06f73700eba2452a6aabfbf0d Mon Sep 17 00:00:00 2001 From: Allen Webster Date: Sun, 14 Mar 2021 17:40:57 -0700 Subject: [PATCH] trim -> skip/chop --- samples/output_parse/output_parse.c | 2 +- .../static_site_generator/static_site_generator.c | 8 ++++---- source/md.h | 4 ++-- source/md_impl.c | 12 ------------ 4 files changed, 7 insertions(+), 19 deletions(-) diff --git a/samples/output_parse/output_parse.c b/samples/output_parse/output_parse.c index e1035aa..c57888e 100644 --- a/samples/output_parse/output_parse.c +++ b/samples/output_parse/output_parse.c @@ -69,7 +69,7 @@ int main(int argument_count, char **arguments) for(MD_EachNode(root, first)) { - MD_String8 code_filename = MD_TrimExtension(MD_TrimFolder(root->filename)); + MD_String8 code_filename = MD_ChopExtension(MD_SkipFolder(root->filename)); MD_String8 info_filename = MD_PushStringF("parsed_%.*s.txt", MD_StringExpand(code_filename)); printf("Parse Input -> Output: %.*s -> %.*s\n", MD_StringExpand(code_filename), MD_StringExpand(info_filename)); diff --git a/samples/static_site_generator/static_site_generator.c b/samples/static_site_generator/static_site_generator.c index ccb27b7..be4dc3f 100644 --- a/samples/static_site_generator/static_site_generator.c +++ b/samples/static_site_generator/static_site_generator.c @@ -64,8 +64,8 @@ int main(int argument_count, char **arguments) for(MD_FileIter it = {0}; MD_FileIterIncrement(&it, page_dir_path, &file_info);) { if(MD_StringMatch(MD_ExtensionFromPath(file_info.filename), MD_S8Lit("md"), MD_StringMatchFlag_CaseInsensitive) && - !MD_StringMatch(MD_TrimFolder(MD_TrimExtension(file_info.filename)), - MD_TrimFolder(MD_TrimExtension(site_info_path)), + !MD_StringMatch(MD_SkipFolder(MD_ChopExtension(file_info.filename)), + MD_SkipFolder(MD_ChopExtension(site_info_path)), MD_StringMatchFlag_CaseInsensitive | MD_StringMatchFlag_SlashInsensitive)) { @@ -125,7 +125,7 @@ int main(int argument_count, char **arguments) { PageInfo page_info = ParsePageInfo(root); - MD_String8 name_without_extension = MD_TrimFolder(MD_TrimExtension(root->filename)); + MD_String8 name_without_extension = MD_SkipFolder(MD_ChopExtension(root->filename)); FILE *file = fopen(MD_PushStringF("%.*s.html", MD_StringExpand(name_without_extension)).str, "w"); if(file) { @@ -521,7 +521,7 @@ GeneratePageContent(MD_NodeTable *index_table, SiteInfo *site_info, PageInfo *pa PageInfo info = ParsePageInfo(slot->node); MD_String8 filename = slot->node->filename; - MD_String8 filename_no_ext = MD_TrimExtension(MD_TrimFolder(filename)); + MD_String8 filename_no_ext = MD_ChopExtension(MD_SkipFolder(filename)); MD_String8 link = MD_PushStringF("%.*s.html", MD_StringExpand(filename_no_ext)); MD_String8 name = info.title->string; MD_String8 date = MakeDateString(info.date); diff --git a/source/md.h b/source/md.h index 6d3c619..81f2aba 100644 --- a/source/md.h +++ b/source/md.h @@ -655,8 +655,8 @@ MD_FUNCTION MD_u64 MD_FindSubstring(MD_String8 str, MD_String8 substring MD_u64 start_pos, MD_StringMatchFlags flags); MD_FUNCTION MD_u64 MD_FindLastSubstring(MD_String8 str, MD_String8 substring, MD_StringMatchFlags flags); -MD_FUNCTION MD_String8 MD_TrimExtension(MD_String8 string); -MD_FUNCTION MD_String8 MD_TrimFolder(MD_String8 string); +MD_FUNCTION MD_String8 MD_ChopExtension(MD_String8 string); +MD_FUNCTION MD_String8 MD_SkipFolder(MD_String8 string); MD_FUNCTION MD_String8 MD_ExtensionFromPath(MD_String8 string); MD_FUNCTION MD_String8 MD_FolderFromPath(MD_String8 string); diff --git a/source/md_impl.c b/source/md_impl.c index d09a886..fa72651 100644 --- a/source/md_impl.c +++ b/source/md_impl.c @@ -432,18 +432,6 @@ MD_SplitString(MD_String8 string, int split_count, MD_String8 *splits) return list; } -MD_FUNCTION_IMPL MD_String8List -MD_SplitStringByString(MD_String8 string, MD_String8 split) -{ - return MD_SplitString(string, 1, &split); -} - -MD_FUNCTION_IMPL MD_String8List -MD_SplitStringByCharacter(MD_String8 string, MD_u8 character) -{ - return MD_SplitStringByString(string, MD_S8(&character, 1)); -} - MD_FUNCTION_IMPL MD_String8 MD_JoinStringList(MD_String8List list) {