From 7da0cb7ffc87a10a41b9c3287160a10319eb8900 Mon Sep 17 00:00:00 2001
From: Erik Post <erik@shinsetsu.nl>
Date: Wed, 7 Aug 2019 21:28:15 +0200
Subject: [PATCH] Address @marcosh's comments from #128. #146

---
 src/Language/Instance.hs        | 10 ++++++----
 src/Language/Parser/Instance.hs |  1 -
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Language/Instance.hs b/src/Language/Instance.hs
index 8019381..08125bb 100644
--- a/src/Language/Instance.hs
+++ b/src/Language/Instance.hs
@@ -31,7 +31,6 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 {-# LANGUAGE RankNTypes            #-}
 {-# LANGUAGE ScopedTypeVariables   #-}
 {-# LANGUAGE StandaloneDeriving    #-}
-
 {-# LANGUAGE TupleSections         #-}
 {-# LANGUAGE TypeOperators         #-}
 {-# LANGUAGE TypeSynonymInstances  #-}
@@ -644,7 +643,7 @@ pivot (Instance sch _ idp (Algebra _ ens _ fk fn tys nnf rep2'' teqs)) = (sch',
     dp' (EQ (l, r)) = idp $ EQ (instToInst l, instToInst r)
 
     ens' = Set.singleton
-    gen'  = id
+    gen' = id
     fk' (x, f) (x', _) | x == x' = (fk f x', snd $ Schema.sch_fks sch ! f)
                        | otherwise = error "anomaly, please report"
     rep'  = Gen
@@ -669,14 +668,17 @@ pivot (Instance sch _ idp (Algebra _ ens _ fk fn tys nnf rep2'' teqs)) = (sch',
     inst  = Instance sch' (Presentation gens' sks' eqs') dp' alg'
     mapp  = Mapping sch' sch em fm am
 
-    schToInst' :: x -> Term () ty sym (x, en) (x, fk) (x, att) Void Void -> Term Void ty sym en fk att gen sk
+    schToInst'
+      :: x
+      -> Term ()   ty sym (x, en) (x, fk) (x, att) Void Void
+      -> Term Void ty sym     en      fk      att  gen  sk
     schToInst' x z = case z of
       Sym f as     -> Sym f $ fmap (schToInst' x) as
       Att (_, f) a -> Att f $ schToInst' x a
       Sk x0        -> absurd x0
       Var ()       -> upp $ fn x
       Fk (_, f) a  -> Fk f $ schToInst' x a
-      Gen x0       ->  absurd x0
+      Gen x0       -> absurd x0
 
     instToInst :: Term Void ty sym (x, en) (x, fk) (x, att) (x, en) y -> Term Void ty sym en fk att gen sk
     instToInst z = case z of
diff --git a/src/Language/Parser/Instance.hs b/src/Language/Parser/Instance.hs
index 7918747..8c461f2 100644
--- a/src/Language/Parser/Instance.hs
+++ b/src/Language/Parser/Instance.hs
@@ -18,7 +18,6 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 -}
-
 {-# LANGUAGE TupleSections         #-}
 
 module Language.Parser.Instance where