Add error message when using state modifiers without a state provider.

homothetyhk · Mar 2, 2024 · 69e3bee · 69e3bee
1 parent 6cbd34d
commit 69e3bee
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/RandomizerCore/Logic/DNFLogicDefBuilder.cs b/RandomizerCore/Logic/DNFLogicDefBuilder.cs
@@ -74,6 +74,10 @@ DNFLogicDef.StatePath[] CreateClauses(DNFLogicDef parent)
                         }
                         #endif
                     }
+                    if (paths.Any(p => p.stateProvider is null && p.stateModifiers.Length > 0))
+                    {
+                        throw new ArgumentException("Found state modifiers without an associated state provider.");
+                    }
 
                     return paths;
                 }
@@ -138,6 +142,7 @@ private void ExpandToken(int index)
                         break;
                     case CoalescingToken qt:
                         tokens[index] = IsValidToken(qt.Left) ? qt.Left : qt.Right;
+                        ExpandToken(index);
                         break;
                 }
             }