ed/metadesk
1
0
Fork 0
mirror of https://github.com/Ed94/metadesk.git synced 2026-08-03 14:18:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Allen Webster
2021-06-27 10:21:41 -04:00
parent aba3c9a164 f2991a89bb
commit 0724d0a910
9 changed files with 304 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files
samples/output_parse/examples/output/parsed_example.txt
+19 -19
View File
@@ -1,32 +1,32 @@
Node {
Kind: Label,
Flags: 00001100000100000000000000000000,
Flag Names: BraceLeft, BraceRight, Identifier,
Flags: 0000110000000000000000010000000000000000000000000000000000000000,
Flag Names: BraceLeft, BraceRight,
String: foo,
Whole String: foo,
Tag: @struct
Node {
Kind: Label,
Flags: 11000001000100000000000000000000,
Flag Names: ParenLeft, ParenRight, BeforeComma, Identifier,
Flags: 1100000010000000000000010000000000000000000000000000000000000000,
Flag Names: ParenLeft, ParenRight, BeforeComma,
String: x,
Whole String: x,
Node {
Kind: Label,
Flags: 00110000000000000000000000000000,
Flags: 0011000000000000000000000000000000000000000000000000000000000000,
Flag Names: BracketLeft, BracketRight,
Node {
Kind: Label,
Flags: 00000000000100000000000000000000,
Flag Names: Identifier,
Flags: 0000000000000000000000010000000000000000000000000000000000000000,
Flag Names: ,
String: MAX_PATH,
Whole String: MAX_PATH,
}
}
Node {
Kind: Label,
Flags: 00000000000100000000000000000000,
Flag Names: Identifier,
Flags: 0000000000000000000000010000000000000000000000000000000000000000,
Flag Names: ,
String: char,
Whole String: char,
}
@@ -35,36 +35,36 @@ Node {
Node {
Kind: Label,
Flags: 00001100000100000000000000000000,
Flag Names: BraceLeft, BraceRight, Identifier,
Flags: 0000110000000000000000010000000000000000000000000000000000000000,
Flag Names: BraceLeft, BraceRight,
String: bar,
Whole String: bar,
Tag: @struct
Tag: @test_tag
Node {
Kind: Label,
Flags: 00000001000100000000000000000000,
Flag Names: BeforeComma, Identifier,
Flags: 0000000010000000000000010000000000000000000000000000000000000000,
Flag Names: BeforeComma,
String: y,
Whole String: y,
Node {
Kind: Label,
Flags: 00000000000100000000000000000000,
Flag Names: Identifier,
Flags: 0000000000000000000000010000000000000000000000000000000000000000,
Flag Names: ,
String: float,
Whole String: float,
}
}
Node {
Kind: Label,
Flags: 00000001010100000000000000000000,
Flag Names: BeforeComma, AfterComma, Identifier,
Flags: 0000000011000000000000010000000000000000000000000000000000000000,
Flag Names: BeforeComma, AfterComma,
String: z,
Whole String: z,
Node {
Kind: Label,
Flags: 00000000000100000000000000000000,
Flag Names: Identifier,
Flags: 0000000000000000000000010000000000000000000000000000000000000000,
Flag Names: ,
String: i32,
Whole String: i32,
}
samples/output_parse/examples/output/parsed_example2.txt
+71 -71
View File
@@ -1,138 +1,138 @@
Node {
Kind: Label,
Flags: 00001100000100000000000000000000,
Flag Names: BraceLeft, BraceRight, Identifier,
Flags: 0000110000000000000000010000000000000000000000000000000000000000,
Flag Names: BraceLeft, BraceRight,
String: a_set,
Whole String: a_set,
Tag: @sets
Node {
Kind: Label,
Flags: 00001101000100000000000000000000,
Flag Names: BraceLeft, BraceRight, BeforeComma, Identifier,
Flags: 0000110010000000000000010000000000000000000000000000000000000000,
Flag Names: BraceLeft, BraceRight, BeforeComma,
String: named_set,
Whole String: named_set,
Node {
Kind: Label,
Flags: 00000001001000000000000000000000,
Flag Names: BeforeComma, Numeric,
Flags: 0000000010000000000000100000000000000000000000000000000000000000,
Flag Names: BeforeComma,
String: 1,
Whole String: 1,
}
Node {
Kind: Label,
Flags: 00000001011000000000000000000000,
Flag Names: BeforeComma, AfterComma, Numeric,
Flags: 0000000011000000000000100000000000000000000000000000000000000000,
Flag Names: BeforeComma, AfterComma,
String: 3,
Whole String: 3,
}
Node {
Kind: Label,
Flags: 00000000011000000000000000000000,
Flag Names: AfterComma, Numeric,
Flags: 0000000001000000000000100000000000000000000000000000000000000000,
Flag Names: AfterComma,
String: 7,
Whole String: 7,
}
}
Node {
Kind: Label,
Flags: 00001101010000000000000000000000,
Flags: 0000110011000000000000000000000000000000000000000000000000000000,
Flag Names: BraceLeft, BraceRight, BeforeComma, AfterComma,
Node {
Kind: Label,
Flags: 00000001000100000000000000000000,
Flag Names: BeforeComma, Identifier,
Flags: 0000000010000000000000010000000000000000000000000000000000000000,
Flag Names: BeforeComma,
String: not,
Whole String: not,
}
Node {
Kind: Label,
Flags: 00000001010100000000000000000000,
Flag Names: BeforeComma, AfterComma, Identifier,
Flags: 0000000011000000000000010000000000000000000000000000000000000000,
Flag Names: BeforeComma, AfterComma,
String: named,
Whole String: named,
}
Node {
Kind: Label,
Flags: 00000000010100000000000000000000,
Flag Names: AfterComma, Identifier,
Flags: 0000000001000000000000010000000000000000000000000000000000000000,
Flag Names: AfterComma,
String: set,
Whole String: set,
}
}
Node {
Kind: Label,
Flags: 00001101010000000000000000000000,
Flags: 0000110011000000000000000000000000000000000000000000000000000000,
Flag Names: BraceLeft, BraceRight, BeforeComma, AfterComma,
Tag: @tag_with_params
Tag Children{
Node {
Kind: Label,
Flags: 00000001000100000000000000000000,
Flag Names: BeforeComma, Identifier,
Flags: 0000000010000000000000010000000000000000000000000000000000000000,
Flag Names: BeforeComma,
String: p1,
Whole String: p1,
}
Node {
Kind: Label,
Flags: 00000001010100000000000000000000,
Flag Names: BeforeComma, AfterComma, Identifier,
Flags: 0000000011000000000000010000000000000000000000000000000000000000,
Flag Names: BeforeComma, AfterComma,
String: p2,
Whole String: p2,
}
Node {
Kind: Label,
Flags: 00000000010100000000000000000000,
Flag Names: AfterComma, Identifier,
Flags: 0000000001000000000000010000000000000000000000000000000000000000,
Flag Names: AfterComma,
String: p3,
Whole String: p3,
}
}
Node {
Kind: Label,
Flags: 00000001000100000000000000000000,
Flag Names: BeforeComma, Identifier,
Flags: 0000000010000000000000010000000000000000000000000000000000000000,
Flag Names: BeforeComma,
String: e1,
Whole String: e1,
}
Node {
Kind: Label,
Flags: 00000001010100000000000000000000,
Flag Names: BeforeComma, AfterComma, Identifier,
Flags: 0000000011000000000000010000000000000000000000000000000000000000,
Flag Names: BeforeComma, AfterComma,
String: e2,
Whole String: e2,
}
Node {
Kind: Label,
Flags: 00000000010100000000000000000000,
Flag Names: AfterComma, Identifier,
Flags: 0000000001000000000000010000000000000000000000000000000000000000,
Flag Names: AfterComma,
String: e3,
Whole String: e3,
}
}
Node {
Kind: Label,
Flags: 00001101010000000000000000000000,
Flags: 0000110011000000000000000000000000000000000000000000000000000000,
Flag Names: BraceLeft, BraceRight, BeforeComma, AfterComma,
Tag: @tag_with_params
Tag Children{
Node {
Kind: Label,
Flags: 00000001000100000000000000000000,
Flag Names: BeforeComma, Identifier,
Flags: 0000000010000000000000010000000000000000000000000000000000000000,
Flag Names: BeforeComma,
String: p1,
Whole String: p1,
}
Node {
Kind: Label,
Flags: 00000001010100000000000000000000,
Flag Names: BeforeComma, AfterComma, Identifier,
Flags: 0000000011000000000000010000000000000000000000000000000000000000,
Flag Names: BeforeComma, AfterComma,
String: p2,
Whole String: p2,
}
Node {
Kind: Label,
Flags: 00000000010100000000000000000000,
Flag Names: AfterComma, Identifier,
Flags: 0000000001000000000000010000000000000000000000000000000000000000,
Flag Names: AfterComma,
String: p3,
Whole String: p3,
}
@@ -141,44 +141,44 @@ Node {
Tag Children{
Node {
Kind: Label,
Flags: 00000001000100000000000000000000,
Flag Names: BeforeComma, Identifier,
Flags: 0000000010000000000000010000000000000000000000000000000000000000,
Flag Names: BeforeComma,
String: p,
Whole String: p,
}
Node {
Kind: Label,
Flags: 00000001010100000000000000000000,
Flag Names: BeforeComma, AfterComma, Identifier,
Flags: 0000000011000000000000010000000000000000000000000000000000000000,
Flag Names: BeforeComma, AfterComma,
String: pp,
Whole String: pp,
}
Node {
Kind: Label,
Flags: 00000000010100000000000000000000,
Flag Names: AfterComma, Identifier,
Flags: 0000000001000000000000010000000000000000000000000000000000000000,
Flag Names: AfterComma,
String: ppp,
Whole String: ppp,
}
}
Node {
Kind: Label,
Flags: 00000001000100000000000000000000,
Flag Names: BeforeComma, Identifier,
Flags: 0000000010000000000000010000000000000000000000000000000000000000,
Flag Names: BeforeComma,
String: e1,
Whole String: e1,
}
Node {
Kind: Label,
Flags: 00000001010100000000000000000000,
Flag Names: BeforeComma, AfterComma, Identifier,
Flags: 0000000011000000000000010000000000000000000000000000000000000000,
Flag Names: BeforeComma, AfterComma,
String: e2,
Whole String: e2,
}
Node {
Kind: Label,
Flags: 00000000010100000000000000000000,
Flag Names: AfterComma, Identifier,
Flags: 0000000001000000000000010000000000000000000000000000000000000000,
Flag Names: AfterComma,
String: e3,
Whole String: e3,
}
@@ -187,8 +187,8 @@ Node {
Node {
Kind: Label,
Flags: 00001100000100000000000000000000,
Flag Names: BraceLeft, BraceRight, Identifier,
Flags: 0000110000000000000000010000000000000000000000000000000000000000,
Flag Names: BraceLeft, BraceRight,
String: empty,
Whole String: empty,
Tag: @empty_set
@@ -196,19 +196,19 @@ Node {
Node {
Kind: Label,
Flags: 00001100000000000000000000000000,
Flags: 0000110000000000000000000000000000000000000000000000000000000000,
Flag Names: BraceLeft, BraceRight,
Tag: @tagged_unnamed_set
Node {
Kind: Label,
Flags: 00001100000100000000000000000000,
Flag Names: BraceLeft, BraceRight, Identifier,
Flags: 0000110000000000000000010000000000000000000000000000000000000000,
Flag Names: BraceLeft, BraceRight,
String: a_label,
Whole String: a_label,
Node {
Kind: Label,
Flags: 00000000000100000000000000000000,
Flag Names: Identifier,
Flags: 0000000000000000000000010000000000000000000000000000000000000000,
Flag Names: ,
String: unnamed_set_element,
Whole String: unnamed_set_element,
}
@@ -217,63 +217,63 @@ Node {
Node {
Kind: Label,
Flags: 00001100000000000000000000000000,
Flags: 0000110000000000000000000000000000000000000000000000000000000000,
Flag Names: BraceLeft, BraceRight,
Tag: @showcase_mixed_set_scoping
Node {
Kind: Label,
Flags: 10010001000000000000000000000000,
Flags: 1001000010000000000000000000000000000000000000000000000000000000,
Flag Names: ParenLeft, BracketRight, BeforeComma,
String: +,
Whole String: +,
Tag: @symbol_label
Node {
Kind: Label,
Flags: 00000000001000000000000000000000,
Flag Names: Numeric,
Flags: 0000000000000000000000100000000000000000000000000000000000000000,
Flag Names: ,
String: 1,
Whole String: 1,
}
Node {
Kind: Label,
Flags: 00000000001000000000000000000000,
Flag Names: Numeric,
Flags: 0000000000000000000000100000000000000000000000000000000000000000,
Flag Names: ,
String: 2,
Whole String: 2,
}
Node {
Kind: Label,
Flags: 00000000001000000000000000000000,
Flag Names: Numeric,
Flags: 0000000000000000000000100000000000000000000000000000000000000000,
Flag Names: ,
String: 3,
Whole String: 3,
}
}
Node {
Kind: Label,
Flags: 01100001010000000000000000000000,
Flags: 0110000011000000000000000000000000000000000000000000000000000000,
Flag Names: ParenRight, BracketLeft, BeforeComma, AfterComma,
String: *,
Whole String: *,
Tag: @symbol_label
Node {
Kind: Label,
Flags: 00000000000100000000000000000000,
Flag Names: Identifier,
Flags: 0000000000000000000000010000000000000000000000000000000000000000,
Flag Names: ,
String: x,
Whole String: x,
}
Node {
Kind: Label,
Flags: 00000000000100000000000000000000,
Flag Names: Identifier,
Flags: 0000000000000000000000010000000000000000000000000000000000000000,
Flag Names: ,
String: y,
Whole String: y,
}
Node {
Kind: Label,
Flags: 00000000000100000000000000000000,
Flag Names: Identifier,
Flags: 0000000000000000000000010000000000000000000000000000000000000000,
Flag Names: ,
String: z,
Whole String: z,
}
samples/output_parse/output_parse.c
+1 -1
View File
@@ -71,7 +71,7 @@ int main(int argument_count, char **arguments)
for(MD_EachNode(root, first))
{
MD_String8 code_filename = MD_ChopExtension(MD_SkipFolder(root->filename));
MD_String8 code_filename = MD_ChopExtension(MD_SkipFolder(root->string));
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));
samples/static_site_generator/static_site_generator.c
+6 -5
View File
@@ -127,7 +127,7 @@ int main(int argument_count, char **arguments)
{
PageInfo page_info = ParsePageInfo(root);
MD_String8 name_without_extension = MD_SkipFolder(MD_ChopExtension(root->filename));
MD_String8 name_without_extension = MD_SkipFolder(MD_ChopExtension(root->string));
FILE *file = fopen(MD_PushStringF("%.*s.html", MD_StringExpand(name_without_extension)).str, "wb");
if(file)
{
@@ -379,8 +379,7 @@ GeneratePageContent(MD_Map *index_table, SiteInfo *site_info, PageInfo *page_inf
//~ NOTE(rjf): Text blobs
if(MD_NodeIsNil(node->first_child) &&
(node->flags & MD_NodeFlag_StringLiteral ||
node->flags & MD_NodeFlag_CharLiteral))
(node->flags & MD_NodeFlag_StringLiteral))
{
char *html_tag = "p";
char *style = "paragraph";
@@ -413,7 +412,8 @@ GeneratePageContent(MD_Map *index_table, SiteInfo *site_info, PageInfo *page_inf
{
if(strnode->string.str[i] == '@')
{
MD_ParseResult parse = MD_ParseOneNode(node->filename, MD_StringSubstring(strnode->string, i, strnode->string.size));
MD_Node *root = MD_RootFromNode(node);
MD_ParseResult parse = MD_ParseOneNode(root->string, MD_StringSubstring(strnode->string, i, strnode->string.size));
if(!MD_NodeIsNil(parse.node))
{
if(MD_NodeHasTag(node, MD_S8Lit("i")))
@@ -521,9 +521,10 @@ GeneratePageContent(MD_Map *index_table, SiteInfo *site_info, PageInfo *page_inf
if(slot->val)
{
MD_Node *node = slot->val;
MD_Node *root = MD_RootFromNode(node);
PageInfo info = ParsePageInfo(node);
MD_String8 filename = node->filename;
MD_String8 filename = root->string;
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;