Simplify

Author: xPaw

ValveKeyValue/ValveKeyValue.Test/Test Data/TextKV3/types.kv3

@@ -25,4 +25,5 @@ this is a multi
 line
 key
 """ = "multi line key parsed"
+	empty.string = ""
 }

ValveKeyValue/ValveKeyValue.Test/Test Data/TextKV3/types_serialized.kv3

@@ -21,6 +21,7 @@
 	key_with._various.separators = "test"
 	"quoted key with : {} terminators" = "test quoted key"
 	"this is a multi\nline\nkey" = "multi line key parsed"
+	empty.string = ""
 	multiLineString = """
 hello
 world

ValveKeyValue/ValveKeyValue.Test/TextKV3/BasicKV3TestCases.cs

@@ -181,6 +181,9 @@ public void DeserializesBasicTypes()
 
                 Assert.That(data["this is a multi\nline\nkey"].ValueType, Is.EqualTo(KVValueType.String));
                 Assert.That((string)data["this is a multi\nline\nkey"], Is.EqualTo("multi line key parsed"));
+
+                Assert.That(data["empty.string"].ValueType, Is.EqualTo(KVValueType.String));
+                Assert.That((string)data["empty.string"], Is.EqualTo(string.Empty));
             });
         }
     }

ValveKeyValue/ValveKeyValue/Deserialization/KeyValues3/KV3TokenReader.cs

@@ -74,6 +74,42 @@ public void Dispose()
             }
         }
 
+        KVToken ReadAssignment()
+        {
+            ReadChar(Assignment);
+            return new KVToken(KVTokenType.Assignment);
+        }
+
+        KVToken ReadComma()
+        {
+            ReadChar(Comma);
+            return new KVToken(KVTokenType.Comma);
+        }
+
+        KVToken ReadArrayStart()
+        {
+            ReadChar(ArrayStart);
+            return new KVToken(KVTokenType.ArrayStart);
+        }
+
+        KVToken ReadArrayEnd()
+        {
+            ReadChar(ArrayEnd);
+            return new KVToken(KVTokenType.ArrayEnd);
+        }
+
+        KVToken ReadObjectStart()
+        {
+            ReadChar(ObjectStart);
+            return new KVToken(KVTokenType.ObjectStart);
+        }
+
+        KVToken ReadObjectEnd()
+        {
+            ReadChar(ObjectEnd);
+            return new KVToken(KVTokenType.ObjectEnd);
+        }
+
         KVToken ReadStringOrIdentifier()
         {
             SwallowWhitespace();
@@ -97,18 +133,6 @@ KVToken ReadStringOrIdentifier()
             return new KVToken(type, token);
         }
 
-        KVToken ReadAssignment()
-        {
-            ReadChar(Assignment);
-            return new KVToken(KVTokenType.Assignment);
-        }
-
-        KVToken ReadComma()
-        {
-            ReadChar(Comma);
-            return new KVToken(KVTokenType.Comma);
-        }
-
         KVToken ReadBinaryBlob()
         {
             ReadChar(BinaryBlobMarker);
@@ -136,30 +160,6 @@ KVToken ReadBinaryBlob()
             return new KVToken(KVTokenType.BinaryBlob, sb.ToString());
         }
 
-        KVToken ReadArrayStart()
-        {
-            ReadChar(ArrayStart);
-            return new KVToken(KVTokenType.ArrayStart);
-        }
-
-        KVToken ReadArrayEnd()
-        {
-            ReadChar(ArrayEnd);
-            return new KVToken(KVTokenType.ArrayEnd);
-        }
-
-        KVToken ReadObjectStart()
-        {
-            ReadChar(ObjectStart);
-            return new KVToken(KVTokenType.ObjectStart);
-        }
-
-        KVToken ReadObjectEnd()
-        {
-            ReadChar(ObjectEnd);
-            return new KVToken(KVTokenType.ObjectEnd);
-        }
-
         public KVToken ReadHeader()
         {
             var str = ReadToken();
@@ -254,7 +254,6 @@ KVToken ReadComment()
             var next = Next();
             var isMultiline = false;
 
-            // TODO: Read /* */ comments
             if (next == '*')
             {
                 isMultiline = true;
@@ -324,7 +323,7 @@ char Next()
                 next = textReader.Read();
             }
 
-            if (next == -1)
+            if (IsEndOfFile(next))
             {
                 throw new EndOfStreamException();
             }
@@ -454,6 +453,7 @@ string ReadQuotedStringRaw(char quotationMark)
                     return string.Empty;
                 }
             }
+
             if (isMultiline)
             {
                 var escapeNext = false;
@@ -471,37 +471,19 @@ string ReadQuotedStringRaw(char quotationMark)
 
                     if (!escapeNext && next == '\n')
                     {
-                        sb.Append(next);
+                        var a = Next();
+                        var b = Next();
+                        var c = Next();
 
-                        next = Next();
-
-                        // TODO: This is absolutely terrible
-                        if (next == '"')
-                        {
-                            next = Next();
-
-                            if (next == '"')
-                            {
-                                next = Next();
-
-                                if (next == '"')
-                                {
-                                    break;
-                                }
-                                else
-                                {
-                                    sb.Append(next);
-                                }
-                            }
-                            else
-                            {
-                                sb.Append(next);
-                            }
-                        }
-                        else
+                        if (a == '"' && b == '"' && c == '"')
                         {
-                            sb.Append(next);
+                            break;
                         }
+
+                        sb.Append(next);
+                        sb.Append(a);
+                        sb.Append(b);
+                        sb.Append(c);
                     }
                     else
                     {
@@ -511,11 +493,6 @@ string ReadQuotedStringRaw(char quotationMark)
                     }
                 }
 
-                if (sb.Length > 0 && sb[^1] == '\n')
-                {
-                    sb.Remove(sb.Length - 1, 1);
-                }
-
                 if (sb.Length > 0 && sb[^1] == '\r')
                 {
                     sb.Remove(sb.Length - 1, 1);