X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=blobdiff_plain;f=notation.tex;h=6eb2e80d947a8bd1cb7d960bd43738ebbd352d8c;hp=352781a8202a1799fad747d827a416fd5e3ed23f;hb=8d37b843888b4da3d31f1a038fbc15729037e858;hpb=ea05ce35fdb318c46be22edb918b11f85e5a2f57 diff --git a/notation.tex b/notation.tex index 352781a..6eb2e80 100644 --- a/notation.tex +++ b/notation.tex @@ -1,5 +1,8 @@ \section{Notation} +Throughout, any free variables are implicitly universally quantified +at the outermost level. + \begin{basedescript}{ \desclabelwidth{5em} \desclabelstyle{\nextlinelabel} @@ -27,7 +30,12 @@ A patch $\p$ consists of two sets of commits $\pn$ and $\py$, which are respectively the base and tip git branches. $\p$ may be used where the context requires a set, in which case the statement is to be taken as applying to both $\py$ and $\pn$. -All of these sets are disjoint. Hence: +All of these sets will be disjoint by construction +(see Invariants, below). Hence: + +\item[ $\set A$, $\set P$, $\ldots$ ] +Arbitrary sets of commits. Maybe $\set P = \p$ i.e.\ some $\py$ or $\pn$, but +maybe not. \item[ $ \patchof{ C } $ ] Either $\p$ s.t. $ C \in \p $, or $\bot$. @@ -61,8 +69,10 @@ $\displaystyle \bigforall_{D \in \py} D \isin C \equiv D \le C $. $\displaystyle C \zhaspatch \p \land \exists_{F \in \py} F \le C $. ~ Informally, $C$ nontrivially has all the reachable contents of $\p$. -Note that $\zhaspatch$ and $\nothaspatch$ are not mutually exclusive. -$\haspatch$ and $\nothaspatch$ are. +Note that $\zhaspatch$ and $\nothaspatch$ are neither +mutually exclusive nor exhaustive. +$\haspatch$ and $\nothaspatch$ are mutually exclusive but not +necessarily exhaustive. Commits on Non-Topbloke branches are $\nothaspatch \p$ for all $\p$. This includes commits on plain git branches made by applying a Topbloke