Improved detection and logging for mismatched parens, other minor cha…

…nges.
homothetyhk · Jun 18, 2022 · b39c7a6 · b39c7a6
1 parent 2da7ea7
commit b39c7a6
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/RandomizerCore/Logic/LogicManager.cs b/RandomizerCore/Logic/LogicManager.cs
@@ -120,6 +120,19 @@ public LogicInt GetVariable(int id)
             return _variables[intVariableOffset - id];
         }
 
+        public LogicInt GetVariable(string name)
+        {
+            if (_variableIndices.TryGetValue(name, out int index)) return _variables[intVariableOffset - index];
+            else if (VariableResolver.TryMatch(this, name, out LogicInt li))
+            {
+                index = intVariableOffset - _variables.Count;
+                _variableIndices.Add(name, index);
+                _variables.Add(li);
+                return li;
+            }
+            else return null;
+        }
+
         public LogicItem GetItem(string name)
         {
             if (!_items.TryGetValue(name, out LogicItem item))

diff --git a/RandomizerCore/StringLogic/Infix.cs b/RandomizerCore/StringLogic/Infix.cs
@@ -82,6 +82,9 @@ public static List<LogicToken> Tokenize(string infix, ITokenSource tokenSource)
                             output.Add(tokenSource.GetComparisonToken(ComparerEnum[op], left, right));
                         }
                         break;
+                    case "(":
+                    case ")":
+                        throw new ArgumentException($"Failed to tokenize infix {infix}: extra parens found after parsing.");
                     default:
                         {
                             output.Add(tokenSource.GetTermToken(postfix[j]));

diff --git a/RandomizerCore/StringLogic/LogicClauseBuilder.cs b/RandomizerCore/StringLogic/LogicClauseBuilder.cs
@@ -58,7 +58,7 @@ public LogicClauseBuilder(LogicClauseBuilder lcb)
         public void OrWith(IEnumerable<LogicToken> ts)
         {
             Append(ts);
-            Append(OperatorToken.AND);
+            Append(OperatorToken.OR);
         }
 
         public void OrWith(TermToken t)