rewrite of SearchExpression

ParadoxSaveParser.WebAPI/Program.cs

@@ -42,21 +42,29 @@ public partial class Program
 
     static void TestSearchExpression(Stream saveStream, TestCase tc)
     {
-        saveStream.Seek(0, SeekOrigin.Begin);
-        var se = SearchExpression.Parse(tc.q);
-        var parser = new SaveParserEU4(saveStream, se);
-        var rootNode = parser.Parse();
-        string json = JsonSerializer.Serialize(rootNode, _saveSerializerOptions);
-        string pdx = json.Substring(1, json.Length - 2)
-            .Replace(",", " ").Replace("{", "{ ").Replace("}", " }")
-            .Replace("\"", "").Replace("[", "").Replace("]", "").Replace(":", "=");
-        if(pdx == tc.a)
+        try
         {
-            Console.WriteLine($"[OK] q:'{tc.q}' a:'{tc.a}'");
+
+            saveStream.Seek(0, SeekOrigin.Begin);
+            var se = SearchExpressionCompiler.Compile(tc.q);
+            var parser = new SaveParserEU4(saveStream, se);
+            var rootNode = parser.Parse();
+            string json = JsonSerializer.Serialize(rootNode, _saveSerializerOptions);
+            string pdx = json.Substring(1, json.Length - 2)
+                .Replace(",", " ").Replace("{", "{ ").Replace("}", " }")
+                .Replace("\"", "").Replace("[", "").Replace("]", "").Replace(":", "=");
+            if (pdx == tc.a)
+            {
+                Console.WriteLine($"[OK] q:'{tc.q}' a:'{tc.a}'");
+            }
+            else
+            {
+                Console.WriteLine($"[Invalid] q:'{tc.q}' a:'{tc.a}' r:'{pdx}'");
+            }
         }
-        else
+        catch (Exception ex)
         {
-            Console.WriteLine($"[Error] q:'{tc.q}' a:'{tc.a}' r:'{pdx}'");
+            Console.WriteLine($"[Error] q:'{tc.q}' a:'{tc.a}' e:\n" + ex.ToStringDemystified());
         }
     }