From d05ecd7d17e8149e44a4ed256edfb4f1fe4eb96e Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 18 Apr 2012 21:37:05 +0100 Subject: [PATCH] unique tips: fix various \pendsof and \pancsof to refer to \py not \p --- invariants.tex | 2 +- lemmas.tex | 6 +++--- merge.tex | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/invariants.tex b/invariants.tex index bc3813e..bd77d69 100644 --- a/invariants.tex +++ b/invariants.tex @@ -19,7 +19,7 @@ We maintain these each time we construct a new commit. \\ \bigforall_{C,\p} C \haspatch \p \lor C \nothaspatch \p }\] \[\eqn{Unique Tips:}{ - \bigforall_{C,\p} C \haspatch \p \implies \pendsof{C}{\p} = \{ T \} + \bigforall_{C,\p} C \haspatch \p \implies \pendsof{C}{\py} = \{ T \} }\] \[\eqn{Foreign Inclusion:}{ \bigforall_{D \text{ s.t. } \patchof{D} = \bot} D \isin C \equiv D \leq C diff --git a/lemmas.tex b/lemmas.tex index 40cc5f4..9373982 100644 --- a/lemmas.tex +++ b/lemmas.tex @@ -133,12 +133,12 @@ $$ \Big[ C \hasparents \{ A \} \Big] \implies \left[ - \bigforall_{P \patchisin C} \pendsof{C}{\p} = \{ T \} + \bigforall_{P \patchisin C} \pendsof{C}{\py} = \{ T \} \right] $$ \proof{ - Trivial for $C \in \p$. - For $C \not\in \p$, $\pancsof{C}{\p} = \pancsof{A}{\p}$, + Trivial for $C \in \py$. + For $C \not\in \py$, $\pancsof{C}{\py} = \pancsof{A}{\py}$, so Unique Tips of $A$ suffices. } diff --git a/merge.tex b/merge.tex index 45b7f66..7ca8446 100644 --- a/merge.tex +++ b/merge.tex @@ -48,9 +48,9 @@ $L \in \pn$, $R \in \pry$, $M = \baseof{R}$. }\] \[ \eqn{ Suitable Tip }{ \bigexists_T - \pendsof{J}{\p} = \{ T \} + \pendsof{J}{\py} = \{ T \} \land - \forall_{E \in \pendsof{K}{\p}} T \ge E + \forall_{E \in \pendsof{K}{\py}} T \ge E , \text{where} \{J,K\} = \{L,R\} }\] \[ \eqn{ Foreign Merges }{ -- 2.30.2