Merge branch 'master' of github.com:toothbrush/apa-proj2

toothbrush · Jul 8, 2011 · 01bfd2f · 01bfd2f
2 parents 929ae17 + d0813fe
commit 01bfd2f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/apa-proj2.cabal b/apa-proj2.cabal
@@ -22,7 +22,6 @@ extra-source-files:    src/Components.hs,
                        src/APA2/AG/FreeTyVars.ag,
                        src/APA2/AG/FreeVars.ag,
                        src/APA2/AG/Infer.ag,
-                       examples/*.hm,
                        examples/well-typed/*.hm,
                        examples/ill-typed/*.hm,
                        doc/main.tex,

diff --git a/doc/main.tex b/doc/main.tex
@@ -247,10 +247,10 @@ \subsection{Type System}
         } \\
 ~&~\\
         $ [$\emph{t-letrec}$] $& \inference{
-        & \Gamma[f \mapsto (\tau_x^{\varphi_x} -> \tau_r^{\varphi_r}, \varphi),x \mapsto (\tau_x, \varphi_x)],
+        & \Gamma[f \mapsto (\tau_x^{\varphi_x} -> \tau_r^{\varphi_r}, \varphi),x \mapsto (\tau_x, \varphi_x)]
         & C |- e_1 : \tau_r^{\varphi_r}, \\
-        & \sigma = gen(\tau_r),
-        & \Gamma[f \mapsto (\sigma, \varphi_r)],
+        & \sigma = gen(\tau_r)
+        & \Gamma[f \mapsto (\sigma, \varphi_r)]
         & C |- e_2 : \tau_2^{\varphi_2}
         & C |- \varphi_3 \sqsupseteq \varphi_2
         }