big naming pass for main API

This commit is contained in:
ryanfleury
2021-07-02 17:15:51 -06:00
parent 33bde8cc2f
commit 9ff0392f04
24 changed files with 1226 additions and 1181 deletions
@@ -1,22 +1,22 @@
Node {
Kind: Label,
Kind: Main,
Flags: 0000110000000001000000000000000000000000000000000000000000000000,
Flag Names: BraceLeft, BraceRight, Identifier,
Flag Names: HasBraceLeft, HasBraceRight, Identifier,
String: foo,
Whole String: foo,
Tag: @struct
Node {
Kind: Label,
Kind: Main,
Flags: 1100000010000001000000000000000000000000000000000000000000000000,
Flag Names: ParenLeft, ParenRight, BeforeComma, Identifier,
Flag Names: HasParenLeft, HasParenRight, IsBeforeComma, Identifier,
String: x,
Whole String: x,
Node {
Kind: Label,
Kind: Main,
Flags: 0011000000000000000000000000000000000000000000000000000000000000,
Flag Names: BracketLeft, BracketRight,
Flag Names: HasBracketLeft, HasBracketRight,
Node {
Kind: Label,
Kind: Main,
Flags: 0000000000000001000000000000000000000000000000000000000000000000,
Flag Names: Identifier,
String: MAX_PATH,
@@ -24,7 +24,7 @@ Node {
}
}
Node {
Kind: Label,
Kind: Main,
Flags: 0000000000000001000000000000000000000000000000000000000000000000,
Flag Names: Identifier,
String: char,
@@ -34,21 +34,21 @@ Node {
}
Node {
Kind: Label,
Kind: Main,
Flags: 0000110000000001000000000000000000000000000000000000000000000000,
Flag Names: BraceLeft, BraceRight, Identifier,
Flag Names: HasBraceLeft, HasBraceRight, Identifier,
String: bar,
Whole String: bar,
Tag: @struct
Tag: @test_tag
Node {
Kind: Label,
Kind: Main,
Flags: 0000000000000001000000000000000000000000000000000000000000000000,
Flag Names: Identifier,
String: y,
Whole String: y,
Node {
Kind: Label,
Kind: Main,
Flags: 0000000000000001000000000000000000000000000000000000000000000000,
Flag Names: Identifier,
String: float,
@@ -56,13 +56,13 @@ Node {
}
}
Node {
Kind: Label,
Kind: Main,
Flags: 0000000000000001000000000000000000000000000000000000000000000000,
Flag Names: Identifier,
String: z,
Whole String: z,
Node {
Kind: Label,
Kind: Main,
Flags: 0000000000000001000000000000000000000000000000000000000000000000,
Flag Names: Identifier,
String: i32,
@@ -1,138 +1,138 @@
Node {
Kind: Label,
Kind: Main,
Flags: 0000110000000001000000000000000000000000000000000000000000000000,
Flag Names: BraceLeft, BraceRight, Identifier,
Flag Names: HasBraceLeft, HasBraceRight, Identifier,
String: a_set,
Whole String: a_set,
Tag: @sets
Node {
Kind: Label,
Kind: Main,
Flags: 0000110010000001000000000000000000000000000000000000000000000000,
Flag Names: BraceLeft, BraceRight, BeforeComma, Identifier,
Flag Names: HasBraceLeft, HasBraceRight, IsBeforeComma, Identifier,
String: named_set,
Whole String: named_set,
Node {
Kind: Label,
Kind: Main,
Flags: 0000000010000010000000000000000000000000000000000000000000000000,
Flag Names: BeforeComma, Numeric,
Flag Names: IsBeforeComma, Numeric,
String: 1,
Whole String: 1,
}
Node {
Kind: Label,
Kind: Main,
Flags: 0000000011000010000000000000000000000000000000000000000000000000,
Flag Names: BeforeComma, AfterComma, Numeric,
Flag Names: IsBeforeComma, IsAfterComma, Numeric,
String: 3,
Whole String: 3,
}
Node {
Kind: Label,
Kind: Main,
Flags: 0000000001000010000000000000000000000000000000000000000000000000,
Flag Names: AfterComma, Numeric,
Flag Names: IsAfterComma, Numeric,
String: 7,
Whole String: 7,
}
}
Node {
Kind: Label,
Kind: Main,
Flags: 0000110011000000000000000000000000000000000000000000000000000000,
Flag Names: BraceLeft, BraceRight, BeforeComma, AfterComma,
Flag Names: HasBraceLeft, HasBraceRight, IsBeforeComma, IsAfterComma,
Node {
Kind: Label,
Kind: Main,
Flags: 0000000010000001000000000000000000000000000000000000000000000000,
Flag Names: BeforeComma, Identifier,
Flag Names: IsBeforeComma, Identifier,
String: not,
Whole String: not,
}
Node {
Kind: Label,
Kind: Main,
Flags: 0000000011000001000000000000000000000000000000000000000000000000,
Flag Names: BeforeComma, AfterComma, Identifier,
Flag Names: IsBeforeComma, IsAfterComma, Identifier,
String: named,
Whole String: named,
}
Node {
Kind: Label,
Kind: Main,
Flags: 0000000001000001000000000000000000000000000000000000000000000000,
Flag Names: AfterComma, Identifier,
Flag Names: IsAfterComma, Identifier,
String: set,
Whole String: set,
}
}
Node {
Kind: Label,
Kind: Main,
Flags: 0000110011000000000000000000000000000000000000000000000000000000,
Flag Names: BraceLeft, BraceRight, BeforeComma, AfterComma,
Flag Names: HasBraceLeft, HasBraceRight, IsBeforeComma, IsAfterComma,
Tag: @tag_with_params
Tag Children{
Node {
Kind: Label,
Kind: Main,
Flags: 0000000010000001000000000000000000000000000000000000000000000000,
Flag Names: BeforeComma, Identifier,
Flag Names: IsBeforeComma, Identifier,
String: p1,
Whole String: p1,
}
Node {
Kind: Label,
Kind: Main,
Flags: 0000000011000001000000000000000000000000000000000000000000000000,
Flag Names: BeforeComma, AfterComma, Identifier,
Flag Names: IsBeforeComma, IsAfterComma, Identifier,
String: p2,
Whole String: p2,
}
Node {
Kind: Label,
Kind: Main,
Flags: 0000000001000001000000000000000000000000000000000000000000000000,
Flag Names: AfterComma, Identifier,
Flag Names: IsAfterComma, Identifier,
String: p3,
Whole String: p3,
}
}
Node {
Kind: Label,
Kind: Main,
Flags: 0000000010000001000000000000000000000000000000000000000000000000,
Flag Names: BeforeComma, Identifier,
Flag Names: IsBeforeComma, Identifier,
String: e1,
Whole String: e1,
}
Node {
Kind: Label,
Kind: Main,
Flags: 0000000011000001000000000000000000000000000000000000000000000000,
Flag Names: BeforeComma, AfterComma, Identifier,
Flag Names: IsBeforeComma, IsAfterComma, Identifier,
String: e2,
Whole String: e2,
}
Node {
Kind: Label,
Kind: Main,
Flags: 0000000001000001000000000000000000000000000000000000000000000000,
Flag Names: AfterComma, Identifier,
Flag Names: IsAfterComma, Identifier,
String: e3,
Whole String: e3,
}
}
Node {
Kind: Label,
Kind: Main,
Flags: 0000110011000000000000000000000000000000000000000000000000000000,
Flag Names: BraceLeft, BraceRight, BeforeComma, AfterComma,
Flag Names: HasBraceLeft, HasBraceRight, IsBeforeComma, IsAfterComma,
Tag: @tag_with_params
Tag Children{
Node {
Kind: Label,
Kind: Main,
Flags: 0000000010000001000000000000000000000000000000000000000000000000,
Flag Names: BeforeComma, Identifier,
Flag Names: IsBeforeComma, Identifier,
String: p1,
Whole String: p1,
}
Node {
Kind: Label,
Kind: Main,
Flags: 0000000011000001000000000000000000000000000000000000000000000000,
Flag Names: BeforeComma, AfterComma, Identifier,
Flag Names: IsBeforeComma, IsAfterComma, Identifier,
String: p2,
Whole String: p2,
}
Node {
Kind: Label,
Kind: Main,
Flags: 0000000001000001000000000000000000000000000000000000000000000000,
Flag Names: AfterComma, Identifier,
Flag Names: IsAfterComma, Identifier,
String: p3,
Whole String: p3,
}
@@ -140,45 +140,45 @@ Node {
Tag: @tag2_with_params
Tag Children{
Node {
Kind: Label,
Kind: Main,
Flags: 0000000010000001000000000000000000000000000000000000000000000000,
Flag Names: BeforeComma, Identifier,
Flag Names: IsBeforeComma, Identifier,
String: p,
Whole String: p,
}
Node {
Kind: Label,
Kind: Main,
Flags: 0000000011000001000000000000000000000000000000000000000000000000,
Flag Names: BeforeComma, AfterComma, Identifier,
Flag Names: IsBeforeComma, IsAfterComma, Identifier,
String: pp,
Whole String: pp,
}
Node {
Kind: Label,
Kind: Main,
Flags: 0000000001000001000000000000000000000000000000000000000000000000,
Flag Names: AfterComma, Identifier,
Flag Names: IsAfterComma, Identifier,
String: ppp,
Whole String: ppp,
}
}
Node {
Kind: Label,
Kind: Main,
Flags: 0000000010000001000000000000000000000000000000000000000000000000,
Flag Names: BeforeComma, Identifier,
Flag Names: IsBeforeComma, Identifier,
String: e1,
Whole String: e1,
}
Node {
Kind: Label,
Kind: Main,
Flags: 0000000011000001000000000000000000000000000000000000000000000000,
Flag Names: BeforeComma, AfterComma, Identifier,
Flag Names: IsBeforeComma, IsAfterComma, Identifier,
String: e2,
Whole String: e2,
}
Node {
Kind: Label,
Kind: Main,
Flags: 0000000001000001000000000000000000000000000000000000000000000000,
Flag Names: AfterComma, Identifier,
Flag Names: IsAfterComma, Identifier,
String: e3,
Whole String: e3,
}
@@ -186,27 +186,27 @@ Node {
}
Node {
Kind: Label,
Kind: Main,
Flags: 0000110000000001000000000000000000000000000000000000000000000000,
Flag Names: BraceLeft, BraceRight, Identifier,
Flag Names: HasBraceLeft, HasBraceRight, Identifier,
String: empty,
Whole String: empty,
Tag: @empty_set
}
Node {
Kind: Label,
Kind: Main,
Flags: 0000110000000000000000000000000000000000000000000000000000000000,
Flag Names: BraceLeft, BraceRight,
Flag Names: HasBraceLeft, HasBraceRight,
Tag: @tagged_unnamed_set
Node {
Kind: Label,
Kind: Main,
Flags: 0000110000000001000000000000000000000000000000000000000000000000,
Flag Names: BraceLeft, BraceRight, Identifier,
Flag Names: HasBraceLeft, HasBraceRight, Identifier,
String: a_label,
Whole String: a_label,
Node {
Kind: Label,
Kind: Main,
Flags: 0000000000000001000000000000000000000000000000000000000000000000,
Flag Names: Identifier,
String: unnamed_set_element,
@@ -216,33 +216,33 @@ Node {
}
Node {
Kind: Label,
Kind: Main,
Flags: 0000110000000000000000000000000000000000000000000000000000000000,
Flag Names: BraceLeft, BraceRight,
Flag Names: HasBraceLeft, HasBraceRight,
Tag: @showcase_mixed_set_scoping
Node {
Kind: Label,
Kind: Main,
Flags: 1001000010000000000000000000000000000000000000000000000000000000,
Flag Names: ParenLeft, BracketRight, BeforeComma,
Flag Names: HasParenLeft, HasBracketRight, IsBeforeComma,
String: +,
Whole String: +,
Tag: @symbol_label
Node {
Kind: Label,
Kind: Main,
Flags: 0000000000000010000000000000000000000000000000000000000000000000,
Flag Names: Numeric,
String: 1,
Whole String: 1,
}
Node {
Kind: Label,
Kind: Main,
Flags: 0000000000000010000000000000000000000000000000000000000000000000,
Flag Names: Numeric,
String: 2,
Whole String: 2,
}
Node {
Kind: Label,
Kind: Main,
Flags: 0000000000000010000000000000000000000000000000000000000000000000,
Flag Names: Numeric,
String: 3,
@@ -250,28 +250,28 @@ Node {
}
}
Node {
Kind: Label,
Kind: Main,
Flags: 0110000011000000000000000000000000000000000000000000000000000000,
Flag Names: ParenRight, BracketLeft, BeforeComma, AfterComma,
Flag Names: HasParenRight, HasBracketLeft, IsBeforeComma, IsAfterComma,
String: *,
Whole String: *,
Tag: @symbol_label
Node {
Kind: Label,
Kind: Main,
Flags: 0000000000000001000000000000000000000000000000000000000000000000,
Flag Names: Identifier,
String: x,
Whole String: x,
}
Node {
Kind: Label,
Kind: Main,
Flags: 0000000000000001000000000000000000000000000000000000000000000000,
Flag Names: Identifier,
String: y,
Whole String: y,
}
Node {
Kind: Label,
Kind: Main,
Flags: 0000000000000001000000000000000000000000000000000000000000000000,
Flag Names: Identifier,
String: z,
+11 -11
View File
@@ -16,7 +16,7 @@ static void Print(FILE* file, int indent_count, char* fmt, ...) {
static void PrintNode(MD_Node* node, FILE* file, int indent_count) {
Print(file, indent_count, "Node {\n");
Print(file, indent_count+1, "Kind: %.*s,\n", MD_StringExpand(MD_StringFromNodeKind(node->kind)));
Print(file, indent_count+1, "Kind: %.*s,\n", MD_S8VArg(MD_StringFromNodeKind(node->kind)));
int flags_bits = sizeof(node->flags)*8;
char binary_flags[sizeof(node->flags)*8+1];
@@ -32,14 +32,14 @@ static void PrintNode(MD_Node* node, FILE* file, int indent_count) {
Print(file, indent_count+1, "Flags: %s,\n", binary_flags);
Print(file, indent_count+1, "Flag Names: ", binary_flags);
MD_String8List flags_list = MD_StringListFromNodeFlags(node->flags);
MD_String8 flag_names = MD_JoinStringList(flags_list, MD_S8CString(", "));
fprintf(file, "%.*s,\n", MD_StringExpand(flag_names));
MD_String8 flag_names = MD_S8ListJoin(flags_list, MD_S8CString(", "));
fprintf(file, "%.*s,\n", MD_S8VArg(flag_names));
if(node->string.size > 0) Print(file, indent_count+1, "String: %.*s,\n", MD_StringExpand(node->string));
if(node->whole_string.size > 0) Print(file, indent_count+1, "Whole String: %.*s,\n", MD_StringExpand(node->whole_string));
if(node->string.size > 0) Print(file, indent_count+1, "String: %.*s,\n", MD_S8VArg(node->string));
if(node->raw_string.size > 0) Print(file, indent_count+1, "Whole String: %.*s,\n", MD_S8VArg(node->raw_string));
if (node->first_tag->kind != MD_NodeKind_Nil) {
for (MD_EachNode(tag, node->first_tag)) {
Print(file, indent_count+1, "Tag: @%.*s\n", MD_StringExpand(tag->string));
Print(file, indent_count+1, "Tag: @%.*s\n", MD_S8VArg(tag->string));
if (tag->first_child->kind != MD_NodeKind_Nil) {
Print(file, indent_count+2, "Tag Children{\n");
for (MD_EachNode(arg, tag->first_child)) {
@@ -63,15 +63,15 @@ int main(int argument_count, char **arguments)
for(int i = 1; i < argument_count; i += 1)
{
MD_Node *root = MD_ParseWholeFile(MD_S8CString(arguments[i])).node;
MD_PushReference(list, root);
MD_PushNewReference(list, root);
}
for(MD_EachNode(ref, list->first_child))
{
MD_Node *root = MD_Deref(ref);
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));
MD_Node *root = MD_NodeFromReference(ref);
MD_String8 code_filename = MD_PathChopLastPeriod(MD_PathSkipLastSlash(root->string));
MD_String8 info_filename = MD_S8Fmt("parsed_%.*s.txt", MD_S8VArg(code_filename));
printf("Parse Input -> Output: %.*s -> %.*s\n", MD_S8VArg(code_filename), MD_S8VArg(info_filename));
FILE* file = fopen((char *)info_filename.str, "wb");
for(MD_EachNode(node, root->first_child))