Fix SynTree.dump2 that is supposed to show a pruned tree

SSW-CocoR · Jun 12, 2021 · 2f2beee · 2f2beee
1 parent 5a04a9c
commit 2f2beee
Show file tree

Hide file tree

Showing 20 changed files with 97 additions and 59 deletions.
diff --git a/src/Parser.cpp b/src/Parser.cpp
@@ -1333,26 +1333,28 @@ void SynTree::dump(int indent, bool isLast) {
         }
 }
 
-void SynTree::dump2(int maxT, int indent, bool isLast) {
+void SynTree::dump2(int indent, bool isLast) {
         int last_idx = children.Count;
+        int indentPlus = 4;
         if(tok->col) {
             printIndent(indent);
             wprintf(_SC("%s\t%d\t%d\t%d\t%") _SFMT _SC("\n"), ((isLast || (last_idx == 0)) ? "= " : " "), tok->line, tok->col, tok->kind, tok->val);
         }
         else {
             if(last_idx == 1) {
-                if(((SynTree*)children[0])->tok->kind < maxT) {
+                if(((SynTree*)children[0])->children.Count == 0) {
                     printIndent(indent);
                     wprintf(_SC("%d\t%d\t%d\t%") _SFMT _SC("\n"), children.Count, tok->line, tok->kind, tok->val);
                 }
+                else indentPlus = 0;
             }
             else {
                 printIndent(indent);
                 wprintf(_SC("%d\t%d\t%d\t%") _SFMT _SC("\n"), children.Count, tok->line, tok->kind, tok->val);
             }
         }
         if(last_idx) {
-                for(int idx=0; idx < last_idx; ++idx) ((SynTree*)children[idx])->dump2(maxT, indent+4, idx == last_idx);
+                for(int idx=0; idx < last_idx; ++idx) ((SynTree*)children[idx])->dump2(indent+indentPlus, idx == last_idx);
         }
 }
 

diff --git a/src/Parser.frame b/src/Parser.frame
@@ -51,7 +51,7 @@ struct SynTree {
 	TArrayList<SynTree*> children;
 
 	void dump(int indent=0, bool isLast=false);
-	void dump2(int maxT, int indent=0, bool isLast=false);
+	void dump2(int indent=0, bool isLast=false);
 };
 
 #endif
@@ -406,26 +406,28 @@ void SynTree::dump(int indent, bool isLast) {
         }
 }
 
-void SynTree::dump2(int maxT, int indent, bool isLast) {
+void SynTree::dump2(int indent, bool isLast) {
         int last_idx = children.Count;
+        int indentPlus = 4;
         if(tok->col) {
             printIndent(indent);
             wprintf(_SC("%s\t%d\t%d\t%d\t%") _SFMT _SC("\n"), ((isLast || (last_idx == 0)) ? "= " : " "), tok->line, tok->col, tok->kind, tok->val);
         }
         else {
             if(last_idx == 1) {
-                if(((SynTree*)children[0])->tok->kind < maxT) {
+                if(((SynTree*)children[0])->children.Count == 0) {
                     printIndent(indent);
                     wprintf(_SC("%d\t%d\t%d\t%") _SFMT _SC("\n"), children.Count, tok->line, tok->kind, tok->val);
                 }
+                else indentPlus = 0;
             }
             else {
                 printIndent(indent);
                 wprintf(_SC("%d\t%d\t%d\t%") _SFMT _SC("\n"), children.Count, tok->line, tok->kind, tok->val);
             }
         }
         if(last_idx) {
-                for(int idx=0; idx < last_idx; ++idx) ((SynTree*)children[idx])->dump2(maxT, indent+4, idx == last_idx);
+                for(int idx=0; idx < last_idx; ++idx) ((SynTree*)children[idx])->dump2(indent+indentPlus, idx == last_idx);
         }
 }
 

diff --git a/src/Parser.h b/src/Parser.h
@@ -51,7 +51,7 @@ struct SynTree {
 	TArrayList<SynTree*> children;
 
 	void dump(int indent=0, bool isLast=false);
-	void dump2(int maxT, int indent=0, bool isLast=false);
+	void dump2(int indent=0, bool isLast=false);
 };
 
 #endif

diff --git a/src/TestSuite/TestAlts_Parser.cpp b/src/TestSuite/TestAlts_Parser.cpp
@@ -381,26 +381,28 @@ void SynTree::dump(int indent, bool isLast) {
         }
 }
 
-void SynTree::dump2(int maxT, int indent, bool isLast) {
+void SynTree::dump2(int indent, bool isLast) {
         int last_idx = children.Count;
+        int indentPlus = 4;
         if(tok->col) {
             printIndent(indent);
             wprintf(_SC("%s\t%d\t%d\t%d\t%") _SFMT _SC("\n"), ((isLast || (last_idx == 0)) ? "= " : " "), tok->line, tok->col, tok->kind, tok->val);
         }
         else {
             if(last_idx == 1) {
-                if(((SynTree*)children[0])->tok->kind < maxT) {
+                if(((SynTree*)children[0])->children.Count == 0) {
                     printIndent(indent);
                     wprintf(_SC("%d\t%d\t%d\t%") _SFMT _SC("\n"), children.Count, tok->line, tok->kind, tok->val);
                 }
+                else indentPlus = 0;
             }
             else {
                 printIndent(indent);
                 wprintf(_SC("%d\t%d\t%d\t%") _SFMT _SC("\n"), children.Count, tok->line, tok->kind, tok->val);
             }
         }
         if(last_idx) {
-                for(int idx=0; idx < last_idx; ++idx) ((SynTree*)children[idx])->dump2(maxT, indent+4, idx == last_idx);
+                for(int idx=0; idx < last_idx; ++idx) ((SynTree*)children[idx])->dump2(indent+indentPlus, idx == last_idx);
         }
 }
 

diff --git a/src/TestSuite/TestAny1_Parser.cpp b/src/TestSuite/TestAny1_Parser.cpp
@@ -402,26 +402,28 @@ void SynTree::dump(int indent, bool isLast) {
         }
 }
 
-void SynTree::dump2(int maxT, int indent, bool isLast) {
+void SynTree::dump2(int indent, bool isLast) {
         int last_idx = children.Count;
+        int indentPlus = 4;
         if(tok->col) {
             printIndent(indent);
             wprintf(_SC("%s\t%d\t%d\t%d\t%") _SFMT _SC("\n"), ((isLast || (last_idx == 0)) ? "= " : " "), tok->line, tok->col, tok->kind, tok->val);
         }
         else {
             if(last_idx == 1) {
-                if(((SynTree*)children[0])->tok->kind < maxT) {
+                if(((SynTree*)children[0])->children.Count == 0) {
                     printIndent(indent);
                     wprintf(_SC("%d\t%d\t%d\t%") _SFMT _SC("\n"), children.Count, tok->line, tok->kind, tok->val);
                 }
+                else indentPlus = 0;
             }
             else {
                 printIndent(indent);
                 wprintf(_SC("%d\t%d\t%d\t%") _SFMT _SC("\n"), children.Count, tok->line, tok->kind, tok->val);
             }
         }
         if(last_idx) {
-                for(int idx=0; idx < last_idx; ++idx) ((SynTree*)children[idx])->dump2(maxT, indent+4, idx == last_idx);
+                for(int idx=0; idx < last_idx; ++idx) ((SynTree*)children[idx])->dump2(indent+indentPlus, idx == last_idx);
         }
 }
 

diff --git a/src/TestSuite/TestAny_Parser.cpp b/src/TestSuite/TestAny_Parser.cpp
@@ -439,26 +439,28 @@ void SynTree::dump(int indent, bool isLast) {
         }
 }
 
-void SynTree::dump2(int maxT, int indent, bool isLast) {
+void SynTree::dump2(int indent, bool isLast) {
         int last_idx = children.Count;
+        int indentPlus = 4;
         if(tok->col) {
             printIndent(indent);
             wprintf(_SC("%s\t%d\t%d\t%d\t%") _SFMT _SC("\n"), ((isLast || (last_idx == 0)) ? "= " : " "), tok->line, tok->col, tok->kind, tok->val);
         }
         else {
             if(last_idx == 1) {
-                if(((SynTree*)children[0])->tok->kind < maxT) {
+                if(((SynTree*)children[0])->children.Count == 0) {
                     printIndent(indent);
                     wprintf(_SC("%d\t%d\t%d\t%") _SFMT _SC("\n"), children.Count, tok->line, tok->kind, tok->val);
                 }
+                else indentPlus = 0;
             }
             else {
                 printIndent(indent);
                 wprintf(_SC("%d\t%d\t%d\t%") _SFMT _SC("\n"), children.Count, tok->line, tok->kind, tok->val);
             }
         }
         if(last_idx) {
-                for(int idx=0; idx < last_idx; ++idx) ((SynTree*)children[idx])->dump2(maxT, indent+4, idx == last_idx);
+                for(int idx=0; idx < last_idx; ++idx) ((SynTree*)children[idx])->dump2(indent+indentPlus, idx == last_idx);
         }
 }
 

diff --git a/src/TestSuite/TestCasing_Parser.cpp b/src/TestSuite/TestCasing_Parser.cpp
@@ -377,26 +377,28 @@ void SynTree::dump(int indent, bool isLast) {
         }
 }
 
-void SynTree::dump2(int maxT, int indent, bool isLast) {
+void SynTree::dump2(int indent, bool isLast) {
         int last_idx = children.Count;
+        int indentPlus = 4;
         if(tok->col) {
             printIndent(indent);
             wprintf(_SC("%s\t%d\t%d\t%d\t%") _SFMT _SC("\n"), ((isLast || (last_idx == 0)) ? "= " : " "), tok->line, tok->col, tok->kind, tok->val);
         }
         else {
             if(last_idx == 1) {
-                if(((SynTree*)children[0])->tok->kind < maxT) {
+                if(((SynTree*)children[0])->children.Count == 0) {
                     printIndent(indent);
                     wprintf(_SC("%d\t%d\t%d\t%") _SFMT _SC("\n"), children.Count, tok->line, tok->kind, tok->val);
                 }
+                else indentPlus = 0;
             }
             else {
                 printIndent(indent);
                 wprintf(_SC("%d\t%d\t%d\t%") _SFMT _SC("\n"), children.Count, tok->line, tok->kind, tok->val);
             }
         }
         if(last_idx) {
-                for(int idx=0; idx < last_idx; ++idx) ((SynTree*)children[idx])->dump2(maxT, indent+4, idx == last_idx);
+                for(int idx=0; idx < last_idx; ++idx) ((SynTree*)children[idx])->dump2(indent+indentPlus, idx == last_idx);
         }
 }
 

diff --git a/src/TestSuite/TestChars_Parser.cpp b/src/TestSuite/TestChars_Parser.cpp
@@ -333,26 +333,28 @@ void SynTree::dump(int indent, bool isLast) {
         }
 }
 
-void SynTree::dump2(int maxT, int indent, bool isLast) {
+void SynTree::dump2(int indent, bool isLast) {
         int last_idx = children.Count;
+        int indentPlus = 4;
         if(tok->col) {
             printIndent(indent);
             wprintf(_SC("%s\t%d\t%d\t%d\t%") _SFMT _SC("\n"), ((isLast || (last_idx == 0)) ? "= " : " "), tok->line, tok->col, tok->kind, tok->val);
         }
         else {
             if(last_idx == 1) {
-                if(((SynTree*)children[0])->tok->kind < maxT) {
+                if(((SynTree*)children[0])->children.Count == 0) {
                     printIndent(indent);
                     wprintf(_SC("%d\t%d\t%d\t%") _SFMT _SC("\n"), children.Count, tok->line, tok->kind, tok->val);
                 }
+                else indentPlus = 0;
             }
             else {
                 printIndent(indent);
                 wprintf(_SC("%d\t%d\t%d\t%") _SFMT _SC("\n"), children.Count, tok->line, tok->kind, tok->val);
             }
         }
         if(last_idx) {
-                for(int idx=0; idx < last_idx; ++idx) ((SynTree*)children[idx])->dump2(maxT, indent+4, idx == last_idx);
+                for(int idx=0; idx < last_idx; ++idx) ((SynTree*)children[idx])->dump2(indent+indentPlus, idx == last_idx);
         }
 }
 

diff --git a/src/TestSuite/TestComments_Parser.cpp b/src/TestSuite/TestComments_Parser.cpp
@@ -333,26 +333,28 @@ void SynTree::dump(int indent, bool isLast) {
         }
 }
 
-void SynTree::dump2(int maxT, int indent, bool isLast) {
+void SynTree::dump2(int indent, bool isLast) {
         int last_idx = children.Count;
+        int indentPlus = 4;
         if(tok->col) {
             printIndent(indent);
             wprintf(_SC("%s\t%d\t%d\t%d\t%") _SFMT _SC("\n"), ((isLast || (last_idx == 0)) ? "= " : " "), tok->line, tok->col, tok->kind, tok->val);
         }
         else {
             if(last_idx == 1) {
-                if(((SynTree*)children[0])->tok->kind < maxT) {
+                if(((SynTree*)children[0])->children.Count == 0) {
                     printIndent(indent);
                     wprintf(_SC("%d\t%d\t%d\t%") _SFMT _SC("\n"), children.Count, tok->line, tok->kind, tok->val);
                 }
+                else indentPlus = 0;
             }
             else {
                 printIndent(indent);
                 wprintf(_SC("%d\t%d\t%d\t%") _SFMT _SC("\n"), children.Count, tok->line, tok->kind, tok->val);
             }
         }
         if(last_idx) {
-                for(int idx=0; idx < last_idx; ++idx) ((SynTree*)children[idx])->dump2(maxT, indent+4, idx == last_idx);
+                for(int idx=0; idx < last_idx; ++idx) ((SynTree*)children[idx])->dump2(indent+indentPlus, idx == last_idx);
         }
 }
 

diff --git a/src/TestSuite/TestDel_Parser.cpp b/src/TestSuite/TestDel_Parser.cpp
@@ -438,26 +438,28 @@ void SynTree::dump(int indent, bool isLast) {
         }
 }
 
-void SynTree::dump2(int maxT, int indent, bool isLast) {
+void SynTree::dump2(int indent, bool isLast) {
         int last_idx = children.Count;
+        int indentPlus = 4;
         if(tok->col) {
             printIndent(indent);
             wprintf(_SC("%s\t%d\t%d\t%d\t%") _SFMT _SC("\n"), ((isLast || (last_idx == 0)) ? "= " : " "), tok->line, tok->col, tok->kind, tok->val);
         }
         else {
             if(last_idx == 1) {
-                if(((SynTree*)children[0])->tok->kind < maxT) {
+                if(((SynTree*)children[0])->children.Count == 0) {
                     printIndent(indent);
                     wprintf(_SC("%d\t%d\t%d\t%") _SFMT _SC("\n"), children.Count, tok->line, tok->kind, tok->val);
                 }
+                else indentPlus = 0;
             }
             else {
                 printIndent(indent);
                 wprintf(_SC("%d\t%d\t%d\t%") _SFMT _SC("\n"), children.Count, tok->line, tok->kind, tok->val);
             }
         }
         if(last_idx) {
-                for(int idx=0; idx < last_idx; ++idx) ((SynTree*)children[idx])->dump2(maxT, indent+4, idx == last_idx);
+                for(int idx=0; idx < last_idx; ++idx) ((SynTree*)children[idx])->dump2(indent+indentPlus, idx == last_idx);
         }
 }
 

diff --git a/src/TestSuite/TestEps_Parser.cpp b/src/TestSuite/TestEps_Parser.cpp
@@ -366,26 +366,28 @@ void SynTree::dump(int indent, bool isLast) {
         }
 }
 
-void SynTree::dump2(int maxT, int indent, bool isLast) {
+void SynTree::dump2(int indent, bool isLast) {
         int last_idx = children.Count;
+        int indentPlus = 4;
         if(tok->col) {
             printIndent(indent);
             wprintf(_SC("%s\t%d\t%d\t%d\t%") _SFMT _SC("\n"), ((isLast || (last_idx == 0)) ? "= " : " "), tok->line, tok->col, tok->kind, tok->val);
         }
         else {
             if(last_idx == 1) {
-                if(((SynTree*)children[0])->tok->kind < maxT) {
+                if(((SynTree*)children[0])->children.Count == 0) {
                     printIndent(indent);
                     wprintf(_SC("%d\t%d\t%d\t%") _SFMT _SC("\n"), children.Count, tok->line, tok->kind, tok->val);
                 }
+                else indentPlus = 0;
             }
             else {
                 printIndent(indent);
                 wprintf(_SC("%d\t%d\t%d\t%") _SFMT _SC("\n"), children.Count, tok->line, tok->kind, tok->val);
             }
         }
         if(last_idx) {
-                for(int idx=0; idx < last_idx; ++idx) ((SynTree*)children[idx])->dump2(maxT, indent+4, idx == last_idx);
+                for(int idx=0; idx < last_idx; ++idx) ((SynTree*)children[idx])->dump2(indent+indentPlus, idx == last_idx);
         }
 }
 

diff --git a/src/TestSuite/TestIters_Parser.cpp b/src/TestSuite/TestIters_Parser.cpp
@@ -389,26 +389,28 @@ void SynTree::dump(int indent, bool isLast) {
         }
 }
 
-void SynTree::dump2(int maxT, int indent, bool isLast) {
+void SynTree::dump2(int indent, bool isLast) {
         int last_idx = children.Count;
+        int indentPlus = 4;
         if(tok->col) {
             printIndent(indent);
             wprintf(_SC("%s\t%d\t%d\t%d\t%") _SFMT _SC("\n"), ((isLast || (last_idx == 0)) ? "= " : " "), tok->line, tok->col, tok->kind, tok->val);
         }
         else {
             if(last_idx == 1) {
-                if(((SynTree*)children[0])->tok->kind < maxT) {
+                if(((SynTree*)children[0])->children.Count == 0) {
                     printIndent(indent);
                     wprintf(_SC("%d\t%d\t%d\t%") _SFMT _SC("\n"), children.Count, tok->line, tok->kind, tok->val);
                 }
+                else indentPlus = 0;
             }
             else {
                 printIndent(indent);
                 wprintf(_SC("%d\t%d\t%d\t%") _SFMT _SC("\n"), children.Count, tok->line, tok->kind, tok->val);
             }
         }
         if(last_idx) {
-                for(int idx=0; idx < last_idx; ++idx) ((SynTree*)children[idx])->dump2(maxT, indent+4, idx == last_idx);
+                for(int idx=0; idx < last_idx; ++idx) ((SynTree*)children[idx])->dump2(indent+indentPlus, idx == last_idx);
         }
 }