Allow negative numbers in FGD metadata dictionaries

Fixes #38
LogicAndTrick · Aug 26, 2024 · 56d8478 · 56d8478
1 parent 1836036
commit 56d8478
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 5 deletions.
diff --git a/Sledge.Formats.GameData.Tests/Fgd/TestFgdSource.cs b/Sledge.Formats.GameData.Tests/Fgd/TestFgdSource.cs
@@ -444,4 +444,29 @@ input ExampleInput(void) { another_test = 1 }
         Assert.AreEqual(1, in1.Metadata.Count);
         Assert.AreEqual(1m, in1.Metadata["another_test"].Value);
     }
+
+    [TestMethod]
+    public void TestMetadataDictionaryWithNegativeValue()
+    {
+        const string fgd = @"@PointClass metadata { view_attach_offset = [ -10.0, 0.0, 0.0 ] } = test : ""test"" []";
+        var format = new FgdFormat();
+        var def = format.Read(fgd);
+
+        Assert.AreEqual(1, def.Classes.Count);
+
+        var ent = def.Classes[0];
+        Assert.AreEqual("test", ent.Name);
+        Assert.AreEqual(1, ent.Dictionaries.Count);
+
+        var meta = ent.Dictionaries[0];
+        var vao = meta["view_attach_offset"];
+        Assert.AreEqual(GameDataDictionaryValueType.Array, vao.Type);
+        Assert.IsInstanceOfType<List<GameDataDictionaryValue>>(vao.Value);
+
+        var values = (List<GameDataDictionaryValue>)vao.Value;
+        Assert.AreEqual(3, values.Count);
+        Assert.AreEqual(-10m, values[0].Value);
+        Assert.AreEqual(0m, values[1].Value);
+        Assert.AreEqual(0m, values[2].Value);
+    }
 }
diff --git a/Sledge.Formats.GameData/FgdFormat.cs b/Sledge.Formats.GameData/FgdFormat.cs
@@ -592,7 +592,7 @@ private static GameDataDictionaryValue ParseGameDataDictionaryValue(IEnumerator<
                 else if (cur.Value == "false") return new GameDataDictionaryValue(false);
                 else throw new TokenParsingException(cur, $"Unknown dictionary value {cur.Value}");
             }
-            else if (it.Current?.Is(TokenType.Number) == true)
+            else if (it.Current?.Is(TokenType.Number) == true || it.Current?.Is(TokenType.Symbol, Symbols.Minus) == true)
             {
                 var metaValue = TokenParsing.ParseDecimal(it);
                 return new GameDataDictionaryValue(metaValue);

diff --git a/Sledge.Formats.GameData/Objects/GameDataDictionary.cs b/Sledge.Formats.GameData/Objects/GameDataDictionary.cs
@@ -1,6 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace Sledge.Formats.GameData.Objects
 {
@@ -12,5 +11,10 @@ public GameDataDictionary(string name)
         {
             Name = name;
         }
+
+        public override string ToString()
+        {
+            return Name + " { " + string.Join(", ", this.Select(kv => kv.Key + " = " + kv.Value)) + " }";
+        }
     }
 }
diff --git a/Sledge.Formats.GameData/Objects/GameDataDictionaryValue.cs b/Sledge.Formats.GameData/Objects/GameDataDictionaryValue.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 
 namespace Sledge.Formats.GameData.Objects
@@ -42,5 +43,20 @@ public GameDataDictionaryValue(IEnumerable<GameDataDictionaryValue> values)
         public static implicit operator GameDataDictionaryValue(decimal val) => new GameDataDictionaryValue(val);
         public static implicit operator GameDataDictionaryValue(bool val) => new GameDataDictionaryValue(val);
         public static implicit operator GameDataDictionaryValue(GameDataDictionary val) => new GameDataDictionaryValue(val);
+
+        public override string ToString()
+        {
+            switch (Value)
+            {
+                case null:
+                    return "null";
+                case string s:
+                    return '"' + s.Replace("\"", "\\\"") + '"';
+                case IList<GameDataDictionaryValue> list:
+                    return "[ " + String.Join(",", list) + "]";
+                default:
+                    return Value.ToString();
+            }
+        }
     }
 }