Add Node.HasValue and Node.ClearValue()

JimmyCushnie · Apr 12, 2024 · 59d076c · 59d076c
1 parent 2f6922e
commit 59d076c
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 15 deletions.
diff --git a/SUCC/Exceptions.cs b/SUCC/Exceptions.cs
@@ -53,13 +53,10 @@ public override string Message
 
                 string startOfErrorMessage = $"Invalid file data on line {lineNumber} of {file}. Expected data of type {ExpectedDataType}, but couldn't interpret data as that type";
 
-                bool nodeHasChildren = ErroneousNode.ChildNodes.Count > 0;
-                bool nodeHasValue = !ErroneousNode.Value.IsNullOrEmpty();
-
-                if (nodeHasChildren)
+                if (ErroneousNode.HasChildNodes)
                     return startOfErrorMessage + $" (node has {ErroneousNode.ChildNodes.Count} children)";
 
-                if (nodeHasValue)
+                if (ErroneousNode.HasValue)
                     return startOfErrorMessage + $": {ErroneousNode.Value}";
 
                 return startOfErrorMessage + ".";

diff --git a/SUCC/Parsing Logic/DataConverter.cs b/SUCC/Parsing Logic/DataConverter.cs
@@ -167,10 +167,10 @@ internal static (List<Line> topLevelLines, Dictionary<string, KeyNode> topLevelN
                         }
                     }
 
-                    if (node.Value == "") // If this is a node with children
+                    if (!node.HasValue) // If this node can have children, but is not the start of a multi-line string
                         nestingNodeStack.Push(node);
 
-                    if (node.Value == MultiLineStringNode.Terminator) // if this is the start of a multi line string
+                    if (node.Value == MultiLineStringNode.Terminator) // If this is the start of a multi line string
                     {
                         nestingNodeStack.Push(node);
                         node.ChildNodeType = NodeChildrenType.MultiLineString;

diff --git a/SUCC/Parsing Logic/NodeManager.cs b/SUCC/Parsing Logic/NodeManager.cs
@@ -78,7 +78,7 @@ internal static object GetNodeData(Node node, Type type)
             if (CollectionTypesManager.IsSupportedType(type))
                 return RetrieveDataWithErrorChecking(() => CollectionTypesManager.RetrieveCollection(node, type));
 
-            if (!node.Value.IsNullOrEmpty())
+            if (node.HasValue)
                 return RetrieveDataWithErrorChecking(() => ComplexTypeShortcuts.GetFromShortcut(node.Value, type));
 
             return RetrieveDataWithErrorChecking(() => ComplexTypes.RetrieveComplexType(node, type));

diff --git a/SUCC/Parsing Logic/Nodes/Node.cs b/SUCC/Parsing Logic/Nodes/Node.cs
@@ -114,7 +114,7 @@ private int GetProperChildIndentation()
 
         private void EnsureProperChildType(NodeChildrenType expectedType)
         {
-            if (expectedType != NodeChildrenType.MultiLineString && !this.Value.IsNullOrEmpty())
+            if (this.HasValue && expectedType != NodeChildrenType.MultiLineString)
                 throw new Exception($"node has a value ({Value}), which means it can't have children");
 
             if (ChildNodeType != expectedType)
@@ -127,10 +127,10 @@ private void EnsureProperChildType(NodeChildrenType expectedType)
         }
 
 
+        public bool HasValue => !Value.IsNullOrEmpty();
+        public void ClearValue() => Value = String.Empty;
 
-        public bool ContainsChildNode(string key)
-            => GetChildKeys().Contains(key);
-
+        public bool HasChildNodes => ChildNodes.Count > 0;
         public void ClearChildren()
         {
             _ChildLines.Clear();
@@ -139,6 +139,10 @@ public void ClearChildren()
             ChildNodeType = NodeChildrenType.None;
         }
 
+
+        public bool ContainsChildNode(string key)
+            => GetChildKeys().Contains(key);
+
         public void AddChild(Line newLine)
         {
             if (this.ChildNodeType == NodeChildrenType.Key && newLine is KeyNode keyNode && this.ContainsChildNode(keyNode.Key))

diff --git a/SUCC/Parsing Logic/Types/Collection Types/CollectionTypesManager.cs b/SUCC/Parsing Logic/Types/Collection Types/CollectionTypesManager.cs
@@ -41,7 +41,7 @@ public static void SetCollectionNode(Node node, object data, Type collectionType
 
         public static object RetrieveCollection(Node node, Type collectionType)
         {
-            if (!node.Value.IsNullOrEmpty())
+            if (node.HasValue)
                 throw new FormatException("Collection nodes cannot have a value");
 
 

diff --git a/SUCC/Parsing Logic/Types/Complex Types/ComplexTypes.cs b/SUCC/Parsing Logic/Types/Complex Types/ComplexTypes.cs
@@ -10,8 +10,8 @@ internal static class ComplexTypes
         internal static void SetComplexNode(Node node, object item, Type type, FileStyle style)
         {
             // Clear the shortcut if there is any
-            if (!node.Value.IsNullOrEmpty())
-                node.Value = "";
+            if (node.HasValue)
+                node.ClearValue();
 
             foreach (var m in type.GetValidMembers())
             {