From dff40b4f7a70d2b772d0cae6917324fa6ae1d6e1 Mon Sep 17 00:00:00 2001
From: ryanfleury <ryan.j.fleury@gmail.com>
Date: Tue, 29 Jun 2021 20:43:30 -0600
Subject: [PATCH] bugfixes and convergence in new parser

---
 source/md.h      |  2 +-
 source/md_impl.c | 47 +++++++++++++++++++++++++++++++++++------------
 2 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/source/md.h b/source/md.h
index b75e782..70768b4 100644
--- a/source/md.h
+++ b/source/md.h
@@ -814,7 +814,7 @@ MD_FUNCTION MD_b32 MD_NodeMatch(MD_Node *a, MD_Node *b, MD_MatchFlags flags);
 MD_FUNCTION MD_b32 MD_NodeDeepMatch(MD_Node *a, MD_Node *b, MD_MatchFlags node_flags);
 
 //~ Generation
-MD_FUNCTION void MD_OutputTree(FILE *file, MD_Node *node);
+MD_FUNCTION void MD_OutputTree(FILE *file, MD_Node *node, int indent_spaces);
 
 //~ Command Line Argument Helper
 MD_FUNCTION MD_String8List MD_StringListFromArgCV(int argument_count, char **arguments);
diff --git a/source/md_impl.c b/source/md_impl.c
index 2e9cb44..f62312b 100644
--- a/source/md_impl.c
+++ b/source/md_impl.c
@@ -1904,11 +1904,13 @@ MD_ParseOneNode(MD_String8 string, MD_u64 offset)
             }
             
             //- rjf: try to parse children for this node
-            off += MD_BytesFromStringTokenGroupRun(MD_StringSkip(string, off), MD_TokenGroup_Comment|MD_TokenGroup_Whitespace);
-            MD_Token colon = MD_TokenFromString(MD_StringSkip(string, off));
+            MD_u64 colon_check_off = off;
+            colon_check_off += MD_BytesFromStringTokenGroupRun(MD_StringSkip(string, colon_check_off), MD_TokenGroup_Comment|MD_TokenGroup_Whitespace);
+            MD_Token colon = MD_TokenFromString(MD_StringSkip(string, colon_check_off));
             if(MD_StringMatch(colon.string, MD_S8Lit(":"), 0) && colon.kind == MD_TokenKind_Symbol)
             {
-                off += colon.outer_string.size;
+                colon_check_off += colon.outer_string.size;
+                off = colon_check_off;
                 
                 //- rjf: prohibit tags here
                 for(MD_u64 tag_check_off = off; tag_check_off < string.size;)
@@ -1958,7 +1960,6 @@ MD_ParseOneNode(MD_String8 string, MD_u64 offset)
     
     end_parse:;
     
-    
     //- rjf: parse comments after nodes.
     MD_String8 comment_after = MD_ZERO_STRUCT;
     {
@@ -2003,6 +2004,11 @@ MD_ParseOneNode(MD_String8 string, MD_u64 offset)
     parsed_node->comment_before = comment_before;
     parsed_node->comment_after = comment_after;
     result.node = parsed_node;
+    if(!MD_NodeIsNil(result.node))
+    {
+        result.node->first_tag = tags_parse.node;
+        result.node->last_tag = tags_parse.last_node;
+    }
     result.last_node = parsed_node;
     result.bytes_parsed = off - offset;
     
@@ -3341,42 +3347,59 @@ MD_NodeDeepMatch(MD_Node *a, MD_Node *b, MD_MatchFlags flags)
 //~ Generation
 
 MD_FUNCTION_IMPL void
-MD_OutputTree(FILE *file, MD_Node *node)
+MD_OutputTree(FILE *file, MD_Node *node, int indent_spaces)
 {
+#define MD_PrintIndent() do { for(int i = 0; i < indent_spaces; i += 1) fprintf(file, " "); } while(0)
     for(MD_Node *tag = node->first_tag; !MD_NodeIsNil(tag); tag = tag->next)
     {
+        MD_PrintIndent();
         fprintf(file, "@%.*s", MD_StringExpand(tag->string));
         if(!MD_NodeIsNil(tag->first_child))
         {
             fprintf(file, "(");
             for(MD_Node *child = tag->first_child; !MD_NodeIsNil(child); child = child->next)
             {
-                MD_OutputTree(file, child);
+                MD_OutputTree(file, child, 0);
                 fprintf(file, ", ");
             }
             fprintf(file, ")\n");
         }
-        else
+        else if(!MD_NodeIsNil(tag->next))
         {
             fprintf(file, " ");
         }
     }
+    if(!MD_NodeIsNil(node->first_tag))
+    {
+        fprintf(file, "\n");
+    }
+    
+    if(node->whole_string.size > 0)
+    {
+        MD_PrintIndent();
+        fprintf(file, "%.*s", MD_StringExpand(node->whole_string));
+    }
     
-    fprintf(file, "%.*s", MD_StringExpand(node->whole_string));
     if(!MD_NodeIsNil(node->first_child))
     {
-        fprintf(file, ":\n{\n");
+        if(node->whole_string.size > 0)
+        {
+            fprintf(file, ":\n");
+        }
+        MD_PrintIndent();
+        fprintf(file, "{\n");
         for(MD_Node *child = node->first_child; !MD_NodeIsNil(child); child = child->next)
         {
-            MD_OutputTree(file, child);
-            fprintf(file, ",\n");
+            MD_OutputTree(file, child, indent_spaces+2);
         }
+        MD_PrintIndent();
         fprintf(file, "}\n");
     }
     else
     {
-        fprintf(file, " ");
+        fprintf(file, "\n");
     }
+#undef MD_PrintIndent
 }
 
 //~ Command Line Argument Helper