chiark
/
gitweb
/
~ian
/
topbloke-formulae.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d3b8215
)
merge coherence complex - fix proof intro re haspatch nonexclusivity
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 18 Mar 2012 10:59:16 +0000
(10:59 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 18 Mar 2012 10:59:16 +0000
(10:59 +0000)
merge.tex
patch
|
blob
|
history
diff --git
a/merge.tex
b/merge.tex
index d9415bcb88e5c7fbd8d0a244763f079c1348695d..5dc99ee548760ebeb80f908a8d1dd959416bd928 100644
(file)
--- a/
merge.tex
+++ b/
merge.tex
@@
-157,8
+157,9
@@
One of the Merge Ends conditions applies.
Recall that we are considering $D \in \py$.
$D \isin Y \equiv D \le Y$. $D \not\isin X$.
We will show for each of
Recall that we are considering $D \in \py$.
$D \isin Y \equiv D \le Y$. $D \not\isin X$.
We will show for each of
-various cases that $D \isin C \equiv M \nothaspatch \p \land D \le C$
-(which suffices by definition of $\haspatch$ and $\nothaspatch$).
+various cases that
+if $M \haspatch \p$, $D \not\isin C$,
+whereas if $M \nothaspatch \p$, $D \isin C \equiv \land D \le C$.
Consider $D = C$: Thus $C \in \py, L \in \py$.
By Tip Own Contents, $\neg[ L \nothaspatch \p ]$ so $L \neq X$,
Consider $D = C$: Thus $C \in \py, L \in \py$.
By Tip Own Contents, $\neg[ L \nothaspatch \p ]$ so $L \neq X$,