ed/metadesk
1
0
Fork 0
mirror of https://github.com/Ed94/metadesk.git synced 2026-06-13 07:52:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/Dion-Systems/metadesk into dev

Browse Source
This commit is contained in:
Allen Webster
2021-09-17 00:48:13 -07:00
parent b6cbff2eb1 1b31e6f41d
commit cbd755852d
3 changed files with 104 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/md.c
+65 -52
View File
@@ -2624,7 +2624,16 @@ MD_FUNCTION MD_CodeLoc
MD_CodeLocFromNode(MD_Node *node)
{
MD_Node *root = MD_RootFromNode(node);
MD_CodeLoc loc = MD_CodeLocFromFileOffset(root->string, root->raw_string.str, node->offset);
MD_Node *first_tag = root->first_tag;
MD_CodeLoc loc = {0};
if(MD_NodeIsNil(first_tag))
{
loc = MD_CodeLocFromFileOffset(root->string, root->raw_string.str, node->offset);
}
else
{
loc = MD_CodeLocFromFileOffset(root->string, first_tag->raw_string.str, node->offset);
}
return loc;
}
@@ -2907,7 +2916,11 @@ MD_NodeMatch(MD_Node *a, MD_Node *b, MD_MatchFlags flags)
if(a->kind == b->kind && MD_S8Match(a->string, b->string, flags))
{
result = 1;
if(a->kind != MD_NodeKind_Tag && (flags & MD_NodeMatchFlag_Tags))
if(result && flags & MD_NodeMatchFlag_NodeFlags)
{
result = result && a->flags == b->flags;
}
if(result && a->kind != MD_NodeKind_Tag && (flags & MD_NodeMatchFlag_Tags))
{
for(MD_Node *a_tag = a->first_tag, *b_tag = b->first_tag;
!MD_NodeIsNil(a_tag) || !MD_NodeIsNil(b_tag);
@@ -3329,7 +3342,6 @@ MD_S8ListPush(arena, out, indent_string);\
}while(0)
//- rjf: prev-comment
// TODO(rjf): @node_comments
if(flags & MD_GenerateFlag_Comments && node->prev_comment.size != 0)
{
MD_PrintIndent(indent);
@@ -3386,7 +3398,6 @@ MD_S8ListPush(arena, out, indent_string);\
}
//- rjf: node flags
// TODO(rjf): @node_comments
if(flags & MD_GenerateFlag_NodeFlags)
{
MD_PrintIndent(indent);
@@ -3461,15 +3472,8 @@ MD_S8ListPush(arena, out, indent_string);\
MD_FUNCTION void
MD_ReconstructionFromNode(MD_Arena *arena, MD_String8List *out, MD_Node *node,
int indent, MD_String8 indent_string,
MD_GenerateFlags flags)
int indent, MD_String8 indent_string)
{
// TODO(rjf): // TODO(rjf): // TODO(rjf):
// TODO(rjf): // TODO(rjf): // TODO(rjf):
// TODO(rjf): cleanup pass
// TODO(rjf): // TODO(rjf): // TODO(rjf):
// TODO(rjf): // TODO(rjf): // TODO(rjf):
MD_CodeLoc code_loc = MD_CodeLocFromNode(node);
#define MD_PrintIndent(_indent_level) do\
@@ -3481,8 +3485,7 @@ MD_S8ListPush(arena, out, indent_string);\
}while(0)
//- rjf: prev-comment
// TODO(rjf): @node_comments
if(flags & MD_GenerateFlag_Comments && node->prev_comment.size != 0)
if(node->prev_comment.size != 0)
{
MD_String8 comment = MD_S8SkipWhitespace(MD_S8ChopWhitespace(node->prev_comment));
MD_b32 requires_multiline = MD_S8FindSubstring(comment, MD_S8Lit("\n"), 0, 0) < comment.size;
@@ -3507,14 +3510,26 @@ MD_S8ListPush(arena, out, indent_string);\
}
//- rjf: tags of node
if(flags & MD_GenerateFlag_Tags)
MD_u32 tag_first_line = MD_CodeLocFromNode(node->first_tag).line;
MD_u32 tag_last_line = tag_first_line;
{
for(MD_EachNode(tag, node->first_tag))
{
MD_u32 tag_line = MD_CodeLocFromNode(tag).line;
if(tag_line != tag_last_line)
{
MD_S8ListPush(arena, out, MD_S8Lit("\n"));
tag_last_line = tag_line;
}
else if(!MD_NodeIsNil(tag->prev))
{
MD_S8ListPush(arena, out, MD_S8Lit(" "));
}
MD_PrintIndent(indent);
MD_S8ListPush(arena, out, MD_S8Lit("@"));
MD_S8ListPush(arena, out, tag->string);
if(flags & MD_GenerateFlag_TagArguments && !MD_NodeIsNil(tag->first_child))
if(!MD_NodeIsNil(tag->first_child))
{
int tag_arg_indent = indent + 1 + tag->string.size + 1;
MD_S8ListPush(arena, out, MD_S8Lit("("));
@@ -3534,17 +3549,13 @@ MD_S8ListPush(arena, out, indent_string);\
{
child_indent = 0;
}
MD_ReconstructionFromNode(arena, out, child, child_indent, MD_S8Lit(" "), flags);
MD_ReconstructionFromNode(arena, out, child, child_indent, MD_S8Lit(" "));
if(!MD_NodeIsNil(child->next))
{
MD_S8ListPush(arena, out, MD_S8Lit(",\n"));
}
}
MD_S8ListPush(arena, out, MD_S8Lit(")\n"));
}
else
{
MD_S8ListPush(arena, out, MD_S8Lit("\n"));
MD_S8ListPush(arena, out, MD_S8Lit(")"));
}
}
}
@@ -3552,7 +3563,15 @@ MD_S8ListPush(arena, out, indent_string);\
//- rjf: name of node
if(node->string.size != 0)
{
MD_PrintIndent(indent);
if(tag_first_line != tag_last_line)
{
MD_S8ListPush(arena, out, MD_S8Lit("\n"));
MD_PrintIndent(indent);
}
else if(!MD_NodeIsNil(node->first_tag) || !MD_NodeIsNil(node->prev))
{
MD_S8ListPush(arena, out, MD_S8Lit(" "));
}
if(node->kind == MD_NodeKind_File)
{
MD_S8ListPush(arena, out, MD_S8Lit("`"));
@@ -3566,41 +3585,22 @@ MD_S8ListPush(arena, out, indent_string);\
}
//- rjf: children list
if(flags & MD_GenerateFlag_Children && !MD_NodeIsNil(node->first_child))
if(!MD_NodeIsNil(node->first_child))
{
if(node->string.size != 0)
{
MD_S8ListPush(arena, out, MD_S8Lit(":"));
}
MD_PrintIndent(indent);
// rjf: figure out opener/closer symbols
MD_u8 opener_char = 0;
MD_u8 closer_char = 0;
if(node->flags & MD_NodeFlag_HasParenLeft)
{
opener_char = '(';
}
else if(node->flags & MD_NodeFlag_HasBracketLeft)
{
opener_char = '[';
}
else if(node->flags & MD_NodeFlag_HasBraceLeft)
{
opener_char = '{';
}
if(node->flags & MD_NodeFlag_HasParenRight)
{
closer_char = ')';
}
else if(node->flags & MD_NodeFlag_HasBracketRight)
{
closer_char = ']';
}
else if(node->flags & MD_NodeFlag_HasBraceRight)
{
closer_char = '}';
}
if(node->flags & MD_NodeFlag_HasParenLeft) { opener_char = '('; }
else if(node->flags & MD_NodeFlag_HasBracketLeft) { opener_char = '['; }
else if(node->flags & MD_NodeFlag_HasBraceLeft) { opener_char = '{'; }
if(node->flags & MD_NodeFlag_HasParenRight) { closer_char = ')'; }
else if(node->flags & MD_NodeFlag_HasBracketRight){ closer_char = ']'; }
else if(node->flags & MD_NodeFlag_HasBraceRight) { closer_char = '}'; }
MD_b32 multiline = 0;
for(MD_EachNode(child, node->first_child))
@@ -3620,9 +3620,18 @@ MD_S8ListPush(arena, out, indent_string);\
MD_S8ListPush(arena, out, MD_S8Lit("\n"));
MD_PrintIndent(indent);
}
else
{
MD_S8ListPush(arena, out, MD_S8Lit(" "));
}
MD_S8ListPush(arena, out, MD_S8(&opener_char, 1));
if(multiline)
{
MD_S8ListPush(arena, out, MD_S8Lit("\n"));
MD_PrintIndent(indent+1);
}
}
MD_u32 last_line = code_loc.line;
MD_u32 last_line = MD_CodeLocFromNode(node->first_child).line;
for(MD_EachNode(child, node->first_child))
{
int child_indent = 0;
@@ -3634,7 +3643,7 @@ MD_S8ListPush(arena, out, indent_string);\
child_indent = indent+1;
}
last_line = child_loc.line;
MD_ReconstructionFromNode(arena, out, child, child_indent, indent_string, flags);
MD_ReconstructionFromNode(arena, out, child, child_indent, indent_string);
}
MD_PrintIndent(indent);
if(closer_char != 0)
@@ -3644,6 +3653,10 @@ MD_S8ListPush(arena, out, indent_string);\
MD_S8ListPush(arena, out, MD_S8Lit("\n"));
MD_PrintIndent(indent);
}
else
{
MD_S8ListPush(arena, out, MD_S8Lit(" "));
}
MD_S8ListPush(arena, out, MD_S8(&closer_char, 1));
}
}
@@ -3660,7 +3673,7 @@ MD_S8ListPush(arena, out, indent_string);\
//- rjf: next-comment
// TODO(rjf): @node_comments
if(flags & MD_GenerateFlag_Comments && node->next_comment.size != 0)
if(node->next_comment.size != 0)
{
MD_String8 comment = MD_S8SkipWhitespace(MD_S8ChopWhitespace(node->next_comment));
MD_b32 requires_multiline = MD_S8FindSubstring(comment, MD_S8Lit("\n"), 0, 0) < comment.size;
source/md.h
+2 -2
View File
@@ -506,6 +506,7 @@ enum
{
MD_NodeMatchFlag_Tags = (1<<16),
MD_NodeMatchFlag_TagArguments = (1<<17),
MD_NodeMatchFlag_NodeFlags = (1<<18),
};
typedef struct MD_DecodedCodepoint MD_DecodedCodepoint;
@@ -1131,8 +1132,7 @@ MD_FUNCTION void MD_DebugDumpFromNode(MD_Arena *arena, MD_String8List *out, MD_N
int indent, MD_String8 indent_string,
MD_GenerateFlags flags);
MD_FUNCTION void MD_ReconstructionFromNode(MD_Arena *arena, MD_String8List *out, MD_Node *node,
int indent, MD_String8 indent_string,
MD_GenerateFlags flags);
int indent, MD_String8 indent_string);
//~ Command Line Argument Helper
tests/sanity_tests.c
+37
View File
@@ -810,6 +810,43 @@ int main(void)
MD_String8 actual = MD_S8ListJoin(arena, actual_strings, 0);
TestResult(MD_S8Match(expected, actual, 0));
}
{
MD_String8 code = MD_S8Lit("@foo @bar @baz a: { b c d e f }");
MD_ParseResult parse1 = MD_ParseOneNode(arena, code, 0);
MD_String8List reconstruction_strs = {0};
MD_ReconstructionFromNode(arena, &reconstruction_strs, parse1.node, 0, MD_S8Lit(" "));
MD_String8 reconstruction = MD_S8ListJoin(arena, reconstruction_strs, 0);
MD_ParseResult parse2 = MD_ParseOneNode(arena, reconstruction, 0);
TestResult(MD_NodeDeepMatch(parse1.node, parse2.node, MD_NodeMatchFlag_TagArguments|MD_NodeMatchFlag_NodeFlags));
}
{
MD_String8 code = MD_S8Lit("@foo(x: y: z) @bar(a: b: c) @baz(1: 2: 3) abcdefg: { b: 4, c d: 5; e; f, }");
MD_ParseResult parse1 = MD_ParseOneNode(arena, code, 0);
MD_String8List reconstruction_strs = {0};
MD_ReconstructionFromNode(arena, &reconstruction_strs, parse1.node, 0, MD_S8Lit(" "));
MD_String8 reconstruction = MD_S8ListJoin(arena, reconstruction_strs, 0);
MD_ParseResult parse2 = MD_ParseOneNode(arena, reconstruction, 0);
TestResult(MD_NodeDeepMatch(parse1.node, parse2.node, MD_NodeMatchFlag_TagArguments|MD_NodeMatchFlag_NodeFlags));
}
{
MD_String8 code = MD_S8Lit("@foo(x: y: z)\n"
"@bar(a: b: c)\n"
"@baz(1: 2: 3)\n"
"abcdefg:\n"
"{\n"
" b: 4,\n"
" c\n"
" d: 5;\n"
" e;\n"
" f,\n"
"}\n");
MD_ParseResult parse1 = MD_ParseOneNode(arena, code, 0);
MD_String8List reconstruction_strs = {0};
MD_ReconstructionFromNode(arena, &reconstruction_strs, parse1.node, 0, MD_S8Lit(" "));
MD_String8 reconstruction = MD_S8ListJoin(arena, reconstruction_strs, 0);
MD_ParseResult parse2 = MD_ParseOneNode(arena, reconstruction, 0);
TestResult(MD_NodeDeepMatch(parse1.node, parse2.node, MD_NodeMatchFlag_TagArguments|MD_NodeMatchFlag_NodeFlags));
}
}
return 0;