notation: define \commitmergeof in terms of \stmtmergeof

[topbloke-formulae.git] / invariants.tex

diff --git a/invariants.tex b/invariants.tex
index 736fb8ee569ed5a2791bfae5b1c817cd95cfaa23..bb926ea1f71460e1db981d110bf06078ab818a78 100644 (file)
--- a/invariants.tex
+++ b/invariants.tex
@@ -22,11 +22,11 @@ We maintain these each time we construct a new commit. \\
   \bigforall_{C,\p} C \haspatch \p \implies \pendsof{C}{\py} = \{ T \}
 }\]
 \[\eqn{Foreign Inclusion}{
-  \bigforall_{D \text{ s.t. } \patchof{D} = \foreign} D \isin C \equiv D \leq C
+  \bigforall_{D \in \foreign} D \isin C \equiv D \leq C
 }\]
 \[\eqn{Foreign Contents}{
-  \bigforall_{C \text{ s.t. } \patchof{C} = \foreign}
-    D \le C \implies \patchof{D} = \foreign
+  \bigforall_{C \in \foreign}
+    D \le C \implies \isforeign{D}
 }\]
 
 We also assign each new commit $C$ to zero or one of the sets $\p$, as