Add illegal character check to LogicProcessor to detect common substi…

…tution errors.
homothetyhk · Apr 16, 2023 · d6a629c · d6a629c
1 parent cbb84cb
commit d6a629c
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/RandomizerCore/StringLogic/LogicProcessor.cs b/RandomizerCore/StringLogic/LogicProcessor.cs
@@ -122,6 +122,8 @@ public ComparisonToken GetComparisonToken(ComparisonType comparisonType, string
             }
         }
 
+        private static readonly HashSet<char> illegalSimpleTokenChars = new() { '|', '+', '<', '>', '=', '?', '(', ')', '*' };
+
         public TermToken GetTermToken(string name)
         {
             if (globalTokens.TryGetValue(name, out LogicToken lt) || tokenPool.TryGetValue(name, out lt)) return (TermToken)lt;
@@ -134,6 +136,8 @@ public TermToken GetTermToken(string name)
                     return rt;
                 }
 
+                if (name.Any(illegalSimpleTokenChars.Contains)) throw new ArgumentException($"Failed to convert {name} to token due to illegal characters.");
+
                 TermToken tt = new SimpleToken(name);
                 tokenPool.Add(name, tt);
                 return tt;