From 9fe3c0f09a7cff1917b85b93c548744126250403 Mon Sep 17 00:00:00 2001 From: Allen Webster Date: Sun, 14 Mar 2021 17:37:30 -0700 Subject: [PATCH] string split cleanup --- .../example_site/generated/blog1.html | 185 +++++++++--------- .../example_site/generated/blog2.html | 88 +++++---- .../example_site/generated/blog_main.html | 136 ++++++------- .../example_site/generated/site.js | 120 ++++++------ .../example_site/generated/style.css | 12 +- source/md.h | 7 +- 6 files changed, 275 insertions(+), 273 deletions(-) diff --git a/samples/static_site_generator/example_site/generated/blog1.html b/samples/static_site_generator/example_site/generated/blog1.html index ea7006b..559ce50 100644 --- a/samples/static_site_generator/example_site/generated/blog1.html +++ b/samples/static_site_generator/example_site/generated/blog1.html @@ -1,91 +1,94 @@ - - - - - - - - - - - - - - - -Test Blog #1 | Example Site - - - -
-

Example Site

-Test Link 1 -Test Link 2 -Test Link 3 -
-
-
← Back

Test Blog #1

This is my test blog.

30 November 2020

Section 1

-

-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse ut ornare neque, vitae finibus leo. Praesent pulvinar, urna id lobortis iaculis, velit turpis luctus tortor, quis malesuada neque neque vitae turpis. Phasellus id molestie elit. Sed elementum ipsum a ligula semper, at varius augue rutrum. Pellentesque fringilla, orci nec fringilla finibus, turpis lacus vehicula elit, nec bibendum magna est quis massa. Aliquam efficitur facilisis nibh, ut sodales sapien scelerisque nec. Integer justo sem, pellentesque et ante imperdiet, interdum placerat sem.

-

Nunc hendrerit lobortis commodo. Morbi felis quam, fermentum vitae libero vitae, fermentum sodales quam. Nulla bibendum tellus quis lorem sollicitudin pretium. Etiam commodo ex eget aliquet porta. In sit amet dui eleifend, mattis sem nec, tristique erat. Morbi malesuada fringilla bibendum. Integer odio ex, cursus a sodales quis, vehicula non dolor.

-

Praesent vitae pharetra felis. Curabitur non ex non nunc pretium feugiat eu sit amet turpis. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean blandit ante leo. Vivamus iaculis mi vel sem tincidunt maximus. Aenean elementum ipsum non laoreet semper. Morbi non felis interdum lectus pulvinar mollis id non purus. Nullam eu ipsum ut turpis aliquam feugiat at non tellus. Suspendisse ornare erat quis enim ullamcorper, at rhoncus nulla suscipit. -

-
-

Section 2

-

-Aliquam quis diam at sem interdum imperdiet. Nunc imperdiet ligula tempus nibh semper mattis. Suspendisse fringilla molestie semper. Sed felis dolor, vehicula et tempus sed, porttitor finibus lacus. Pellentesque egestas ex finibus, facilisis tellus suscipit, accumsan turpis. Ut imperdiet vitae nisl eget vestibulum. Donec eu bibendum erat, id maximus magna. Vivamus quis rhoncus justo. Morbi eget commodo lorem, vulputate varius ipsum. Interdum et malesuada fames ac ante ipsum primis in faucibus. Integer accumsan, sem vel rutrum cursus, odio enim sodales leo, sit amet rutrum odio purus at nisi. Fusce iaculis ante id nunc volutpat tincidunt. Duis nec tincidunt ipsum. Fusce vitae odio ac velit sollicitudin maximus. Vestibulum ante dui, varius auctor ante eu, gravida laoreet justo.

-

Vivamus dignissim mauris nec turpis convallis, vitae pellentesque sapien faucibus. Phasellus eu euismod elit, sit amet vehicula diam. Curabitur sit amet leo magna. In est erat, congue vel euismod id, venenatis vitae mauris. Vestibulum sit amet leo eget leo ornare feugiat. Interdum et malesuada fames ac ante ipsum primis in faucibus. Vivamus at efficitur ex, a mattis lorem. Maecenas blandit tincidunt tortor vel cursus. In in purus a nisi pretium venenatis in ut lacus. Maecenas venenatis rutrum laoreet. Donec aliquam leo vel risus cursus, placerat pretium lacus fringilla. Suspendisse ut porttitor mauris. -

- -

Section 3

- -

Section 4

-
-char *html_tag = "p";
-if(DD_NodeHasTag(node, DD_S8Lit("title")))
-{
-    html_tag = "h1";
-}
-else if(DD_NodeHasTag(node, DD_S8Lit("subtitle")))
-{
-    html_tag = "h2";
-}
-else if(DD_NodeHasTag(node, DD_S8Lit("code")))
-{
-    html_tag = "pre";
-}
-
-
- -
-

Example Site Footer

-Test Link 1 -Test Link 2 -Test Link 3 -
- - + + + + + + + + + + + + + + + +Test Blog #1 | Example Site + + + +
+

Example Site

+Test Link 1 +Test Link 2 +Test Link 3 +
+
+
← Back

Test Blog #1

This is my test blog.

30 November 2020

Section 1

+

+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse ut ornare neque, vitae finibus leo. Praesent pulvinar, urna id lobortis iaculis, velit turpis luctus tortor, quis malesuada neque neque vitae turpis. Phasellus id molestie elit. Sed elementum ipsum a ligula semper, at varius augue rutrum. Pellentesque fringilla, orci nec fringilla finibus, turpis lacus vehicula elit, nec bibendum magna est quis massa. Aliquam efficitur facilisis nibh, ut sodales sapien scelerisque nec. Integer justo sem, pellentesque et ante imperdiet, interdum placerat sem. + +Nunc hendrerit lobortis commodo. Morbi felis quam, fermentum vitae libero vitae, fermentum sodales quam. Nulla bibendum tellus quis lorem sollicitudin pretium. Etiam commodo ex eget aliquet porta. In sit amet dui eleifend, mattis sem nec, tristique erat. Morbi malesuada fringilla bibendum. Integer odio ex, cursus a sodales quis, vehicula non dolor. + +Praesent vitae pharetra felis. Curabitur non ex non nunc pretium feugiat eu sit amet turpis. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean blandit ante leo. Vivamus iaculis mi vel sem tincidunt maximus. Aenean elementum ipsum non laoreet semper. Morbi non felis interdum lectus pulvinar mollis id non purus. Nullam eu ipsum ut turpis aliquam feugiat at non tellus. Suspendisse ornare erat quis enim ullamcorper, at rhoncus nulla suscipit. +

+
+

Section 2

+

+Aliquam quis diam at sem interdum imperdiet. Nunc imperdiet ligula tempus nibh semper mattis. Suspendisse fringilla molestie semper. Sed felis dolor, vehicula et tempus sed, porttitor finibus lacus. Pellentesque egestas ex finibus, facilisis tellus suscipit, accumsan turpis. Ut imperdiet vitae nisl eget vestibulum. Donec eu bibendum erat, id maximus magna. Vivamus quis rhoncus justo. Morbi eget commodo lorem, vulputate varius ipsum. Interdum et malesuada fames ac ante ipsum primis in faucibus. Integer accumsan, sem vel rutrum cursus, odio enim sodales leo, sit amet rutrum odio purus at nisi. Fusce iaculis ante id nunc volutpat tincidunt. Duis nec tincidunt ipsum. Fusce vitae odio ac velit sollicitudin maximus. Vestibulum ante dui, varius auctor ante eu, gravida laoreet justo. + +Vivamus dignissim mauris nec turpis convallis, vitae pellentesque sapien faucibus. Phasellus eu euismod elit, sit amet vehicula diam. Curabitur sit amet leo magna. In est erat, congue vel euismod id, venenatis vitae mauris. Vestibulum sit amet leo eget leo ornare feugiat. Interdum et malesuada fames ac ante ipsum primis in faucibus. Vivamus at efficitur ex, a mattis lorem. Maecenas blandit tincidunt tortor vel cursus. In in purus a nisi pretium venenatis in ut lacus. Maecenas venenatis rutrum laoreet. Donec aliquam leo vel risus cursus, placerat pretium lacus fringilla. Suspendisse ut porttitor mauris. +

+ +

Section 3

+ +

Section 4

+

+char *html_tag = "p";

+if(DD_NodeHasTag(node, DD_S8Lit("title")))

+{

+    html_tag = "h1";

+}

+else if(DD_NodeHasTag(node, DD_S8Lit("subtitle")))

+{

+    html_tag = "h2";

+}

+else if(DD_NodeHasTag(node, DD_S8Lit("code")))

+{

+    html_tag = "pre";

+}

+
+
+ +
+

Example Site Footer

+Test Link 1 +Test Link 2 +Test Link 3 +
+ + diff --git a/samples/static_site_generator/example_site/generated/blog2.html b/samples/static_site_generator/example_site/generated/blog2.html index 55a3c73..74fee8f 100644 --- a/samples/static_site_generator/example_site/generated/blog2.html +++ b/samples/static_site_generator/example_site/generated/blog2.html @@ -1,43 +1,45 @@ - - - - - - - - - - - - - - - -Hello, Again! | Example Site - - - -
-

Example Site

-Test Link 1 -Test Link 2 -Test Link 3 -
-
-
← Back

Hello, Again!

This is another test blog.

28 November 2020

Section 1

-

-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse ut ornare neque, vitae finibus leo. Praesent pulvinar, urna id lobortis iaculis, velit turpis luctus tortor, quis malesuada neque neque vitae turpis. Phasellus id molestie elit. Sed elementum ipsum a ligula semper, at varius augue rutrum. Pellentesque fringilla, orci nec fringilla finibus, turpis lacus vehicula elit, nec bibendum magna est quis massa. Aliquam efficitur facilisis nibh, ut sodales sapien scelerisque nec. Integer justo sem, pellentesque et ante imperdiet, interdum placerat sem.

-

Nunc hendrerit lobortis commodo. Morbi felis quam, fermentum vitae libero vitae, fermentum sodales quam. Nulla bibendum tellus quis lorem sollicitudin pretium. Etiam commodo ex eget aliquet porta. In sit amet dui eleifend, mattis sem nec, tristique erat. Morbi malesuada fringilla bibendum. Integer odio ex, cursus a sodales quis, vehicula non dolor.

-

Praesent vitae pharetra felis. Curabitur non ex non nunc pretium feugiat eu sit amet turpis. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean blandit ante leo. Vivamus iaculis mi vel sem tincidunt maximus. Aenean elementum ipsum non laoreet semper. Morbi non felis interdum lectus pulvinar mollis id non purus. Nullam eu ipsum ut turpis aliquam feugiat at non tellus. Suspendisse ornare erat quis enim ullamcorper, at rhoncus nulla suscipit. -

-
-
- -
-

Example Site Footer

-Test Link 1 -Test Link 2 -Test Link 3 -
- - + + + + + + + + + + + + + + + +Hello, Again! | Example Site + + + +
+

Example Site

+Test Link 1 +Test Link 2 +Test Link 3 +
+
+
← Back

Hello, Again!

This is another test blog.

28 November 2020

Section 1

+

+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse ut ornare neque, vitae finibus leo. Praesent pulvinar, urna id lobortis iaculis, velit turpis luctus tortor, quis malesuada neque neque vitae turpis. Phasellus id molestie elit. Sed elementum ipsum a ligula semper, at varius augue rutrum. Pellentesque fringilla, orci nec fringilla finibus, turpis lacus vehicula elit, nec bibendum magna est quis massa. Aliquam efficitur facilisis nibh, ut sodales sapien scelerisque nec. Integer justo sem, pellentesque et ante imperdiet, interdum placerat sem. + +Nunc hendrerit lobortis commodo. Morbi felis quam, fermentum vitae libero vitae, fermentum sodales quam. Nulla bibendum tellus quis lorem sollicitudin pretium. Etiam commodo ex eget aliquet porta. In sit amet dui eleifend, mattis sem nec, tristique erat. Morbi malesuada fringilla bibendum. Integer odio ex, cursus a sodales quis, vehicula non dolor. + +Praesent vitae pharetra felis. Curabitur non ex non nunc pretium feugiat eu sit amet turpis. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean blandit ante leo. Vivamus iaculis mi vel sem tincidunt maximus. Aenean elementum ipsum non laoreet semper. Morbi non felis interdum lectus pulvinar mollis id non purus. Nullam eu ipsum ut turpis aliquam feugiat at non tellus. Suspendisse ornare erat quis enim ullamcorper, at rhoncus nulla suscipit. +

+
+
+ +
+

Example Site Footer

+Test Link 1 +Test Link 2 +Test Link 3 +
+ + diff --git a/samples/static_site_generator/example_site/generated/blog_main.html b/samples/static_site_generator/example_site/generated/blog_main.html index 82e9b84..710894d 100644 --- a/samples/static_site_generator/example_site/generated/blog_main.html +++ b/samples/static_site_generator/example_site/generated/blog_main.html @@ -1,68 +1,68 @@ - - - - - - - - - - - - - - - -Blog | Example Site - - - -
-

Example Site

-Test Link 1 -Test Link 2 -Test Link 3 -
-
-

Blog

-
- -
-

Example Site Footer

-Test Link 1 -Test Link 2 -Test Link 3 -
- - + + + + + + + + + + + + + + + +Blog | Example Site + + + +
+

Example Site

+Test Link 1 +Test Link 2 +Test Link 3 +
+
+

Blog

+
+ +
+

Example Site Footer

+Test Link 1 +Test Link 2 +Test Link 3 +
+ + diff --git a/samples/static_site_generator/example_site/generated/site.js b/samples/static_site_generator/example_site/generated/site.js index d38215e..116a345 100644 --- a/samples/static_site_generator/example_site/generated/site.js +++ b/samples/static_site_generator/example_site/generated/site.js @@ -1,61 +1,61 @@ -function StringFitsFilter(str, filter) -{ - let match = true; - let filter_upper = filter.toUpperCase(); - let filter_substrings = filter_upper.split(/[ _*]+/); - let str_upper = str.toUpperCase(); - let minimum_index = 0; - - for(let i = 0; i < filter_substrings.length; ++i) - { - if(filter_substrings[i].length > 0) - { - let index_of_substring = str_upper.indexOf(filter_substrings[i], minimum_index); - if(index_of_substring < 0 || index_of_substring < minimum_index) - { - match = false; - break; - } - minimum_index = index_of_substring + filter_substrings[i].length - 1; - } - } - - return match; -} - -function UpdateListByFilter(menu_id, filter_id) -{ - let ul = document.getElementById(menu_id); - let li = ul.getElementsByTagName("li"); - let input = document.getElementById(filter_id); - let filter = input.value.toUpperCase(); - for(let i = 0; i < li.length; i++) - { - if(filter.length > 0) - { - let a = li[i].getElementsByTagName("a")[0]; - if(StringFitsFilter(a.innerHTML, filter)) - { - li[i].style.display = ""; - } - else - { - li[i].style.display = "none"; - } - } - else - { - li[i].style.display = ""; - } - } -} - -function SearchInput(event, lister_idx) -{ - UpdateListByFilter("lister_"+lister_idx, "lister_search_"+lister_idx); -} - -function SearchKeyDown(event, lister_idx) -{ - UpdateListByFilter("lister_"+lister_idx, "lister_search_"+lister_idx); +function StringFitsFilter(str, filter) +{ + let match = true; + let filter_upper = filter.toUpperCase(); + let filter_substrings = filter_upper.split(/[ _*]+/); + let str_upper = str.toUpperCase(); + let minimum_index = 0; + + for(let i = 0; i < filter_substrings.length; ++i) + { + if(filter_substrings[i].length > 0) + { + let index_of_substring = str_upper.indexOf(filter_substrings[i], minimum_index); + if(index_of_substring < 0 || index_of_substring < minimum_index) + { + match = false; + break; + } + minimum_index = index_of_substring + filter_substrings[i].length - 1; + } + } + + return match; +} + +function UpdateListByFilter(menu_id, filter_id) +{ + let ul = document.getElementById(menu_id); + let li = ul.getElementsByTagName("li"); + let input = document.getElementById(filter_id); + let filter = input.value.toUpperCase(); + for(let i = 0; i < li.length; i++) + { + if(filter.length > 0) + { + let a = li[i].getElementsByTagName("a")[0]; + if(StringFitsFilter(a.innerHTML, filter)) + { + li[i].style.display = ""; + } + else + { + li[i].style.display = "none"; + } + } + else + { + li[i].style.display = ""; + } + } +} + +function SearchInput(event, lister_idx) +{ + UpdateListByFilter("lister_"+lister_idx, "lister_search_"+lister_idx); +} + +function SearchKeyDown(event, lister_idx) +{ + UpdateListByFilter("lister_"+lister_idx, "lister_search_"+lister_idx); } \ No newline at end of file diff --git a/samples/static_site_generator/example_site/generated/style.css b/samples/static_site_generator/example_site/generated/style.css index 4200426..9f1afc9 100644 --- a/samples/static_site_generator/example_site/generated/style.css +++ b/samples/static_site_generator/example_site/generated/style.css @@ -1,6 +1,6 @@ - -* -{ - padding: 0; - margins: 0; -} + +* +{ + padding: 0; + margins: 0; +} diff --git a/source/md.h b/source/md.h index eed92e5..6d3c619 100644 --- a/source/md.h +++ b/source/md.h @@ -451,7 +451,7 @@ typedef enum MD_TokenKind MD_TokenKind_Whitespace, MD_TokenKind_Newline, MD_TokenKind_WhitespaceMax, - + MD_TokenKind_NonASCII, // Provisional category to deal with single characters > 127 // while we don't support encodings other than ASCII @@ -668,13 +668,10 @@ MD_FUNCTION MD_String8 MD_PushStringF(char *fmt, ...); MD_FUNCTION void MD_PushStringToList(MD_String8List *list, MD_String8 string); MD_FUNCTION void MD_PushStringListToList(MD_String8List *list, MD_String8List *to_push); -// TODO(rjf): Just simplify to a single splitter MD_FUNCTION MD_String8List MD_SplitString(MD_String8 string, int split_count, MD_String8 *splits); -MD_FUNCTION MD_String8List MD_SplitStringByString(MD_String8 string, MD_String8 split); -MD_FUNCTION MD_String8List MD_SplitStringByCharacter(MD_String8 string, MD_u8 character); +// TODO(allen): single joiner with MD_StringJoin optional parameter MD_FUNCTION MD_String8 MD_JoinStringList(MD_String8List list); MD_FUNCTION MD_String8 MD_JoinStringListWithSeparator(MD_String8List list, MD_String8 separator); -// TODO(rjf): Radix MD_FUNCTION MD_i64 MD_I64FromString(MD_String8 string, MD_u32 radix); MD_FUNCTION MD_f64 MD_F64FromString(MD_String8 string); MD_FUNCTION MD_u64 MD_HashString(MD_String8 string);