# HG changeset patch # User Cezary Kaliszyk # Date 1272371444 -7200 # Node ID 4223770814ef8a8384dd55fd5fa5942c39ddbbfd # Parent e2e19188576ee38d6a48e9f1aa142cd1007e058b# Parent 47430fe78912e9229b59140a1f24474c2459a938 merge diff -r e2e19188576e -r 4223770814ef Paper/Paper.thy --- a/Paper/Paper.thy Tue Apr 27 14:29:59 2010 +0200 +++ b/Paper/Paper.thy Tue Apr 27 14:30:44 2010 +0200 @@ -1193,20 +1193,20 @@ % \begin{equation}\label{deepbinder} \mbox{% - \begin{tabular}{c@ {\hspace{2mm}}p{7cm}} + \begin{tabular}{c@ {\hspace{2mm}}p{7.4cm}} \multicolumn{2}{@ {}l}{\isacommand{bind}~@{term "{}"}~\isacommand{in}~@{text "y"}:}\\ $\bullet$ & @{term "v = fv_ty y"} provided @{text "y"} is of type @{text "ty"}\smallskip\\ - \multicolumn{2}{@ {}l}{\isacommand{bind}~@{text "x\<^isub>1..x\<^isub>n"}~\isacommand{in}~@{text "y\<^isub>1..y\<^isub>m"}:}\\ - $\bullet$ & @{text "v = (fv_ty\<^isub>1 y\<^isub>1 \ .. \ fv_ty\<^isub>m y\<^isub>m)"}\\ - & \hspace{10mm}@{text "- (fv_aty\<^isub>1 x\<^isub>1 \ .. \ fv_aty\<^isub>n x\<^isub>n)"}\\ + \multicolumn{2}{@ {}l}{\isacommand{bind}~@{text "x\<^isub>1\x\<^isub>n"}~\isacommand{in}~@{text "y\<^isub>1\y\<^isub>m"}:}\\ + $\bullet$ & @{text "v = (fv_ty\<^isub>1 y\<^isub>1 \ \ \ fv_ty\<^isub>m y\<^isub>m)"}\\ + & \hspace{15mm}@{text "- (fv_aty\<^isub>1 x\<^isub>1 \ \ \ fv_aty\<^isub>n x\<^isub>n)"}\\ & provided the bodies @{text "y"}$_{1..m}$ are of type @{text "ty"}$_{1..m}$ and the binders @{text "x"}$_{1..n}$ of atomic types @{text "aty"}$_{1..n}$\smallskip\\ - \multicolumn{2}{@ {}l}{\isacommand{bind}~@{text "bn x"}~\isacommand{in}~@{text "y\<^isub>1..y\<^isub>m"}:}\\ - $\bullet$ & @{text "v = (fv_ty\<^isub>1 y\<^isub>1 \ .. \ fv_ty\<^isub>m y\<^isub>m) - (bn x) \ (fv_bn x)"}\\ - $\bullet$ & @{text "v = (fv_ty\<^isub>1 y\<^isub>1 \ .. \ fv_ty\<^isub>m y\<^isub>m) - (bn x)"}\\ - & provided the @{text "y\<^isub>i"} are of type @{text "ty\<^isub>i"}; the first + \multicolumn{2}{@ {}l}{\isacommand{bind}~@{text "bn x"}~\isacommand{in}~@{text "y\<^isub>1\y\<^isub>m"}:}\\ + $\bullet$ & @{text "v = (fv_ty\<^isub>1 y\<^isub>1 \ \ \ fv_ty\<^isub>m y\<^isub>m) - set (bn x) \ (fv_bn x)"}\\ + $\bullet$ & @{text "v = (fv_ty\<^isub>1 y\<^isub>1 \ \ \ fv_ty\<^isub>m y\<^isub>m) - set (bn x)"}\\ + & provided the @{text "y"}$_{1..m}$ are of type @{text "ty"}$_{1..m}$; the first clause applies for @{text x} being a non-recursive deep binder, the second for a recursive deep binder \end{tabular}}