Clean up leftovers from moving Carrier and TalgGen into Algebra. #148

Author: epost

src/Language/CQL/Collage.hs

@@ -102,6 +102,7 @@ attsFrom sch en' = f $ Map.assocs $ catts sch
   where f []               = []
         f ((fk,(en1,t)):l) = if en1 == en' then (fk,t) : (f l) else f l
 
+-- TODO Carrier is duplicated here from Instance.Algebra (Carrier) because it is used in assembleGens.
 type Carrier en fk gen = Term Void Void Void en fk Void gen Void
 
 assembleGens

src/Language/CQL/Instance.hs

@@ -50,7 +50,7 @@ import           Data.Typeable         hiding (typeOf)
 import           Data.Void
 import           Language.CQL.Collage  (Collage(..), assembleGens, attsFrom, fksFrom, typeOf)
 import           Language.CQL.Common   (elem', fromListAccum, section, toMapSafely, Deps(..), Err, Kind(INSTANCE), MultiTyMap, TyMap, type (+))
-import           Language.CQL.Instance.Algebra (Algebra(..), aAtt, down1, evalSchTerm, evalSchTerm', nf, nf'', repr'')
+import           Language.CQL.Instance.Algebra (Algebra(..), aAtt, Carrier, down1, evalSchTerm, evalSchTerm', nf, nf'', repr'', TalgGen(..))
 import qualified Language.CQL.Instance.Algebra as A (simplify)
 import           Language.CQL.Instance.Presentation (Presentation(..))
 import qualified Language.CQL.Instance.Presentation as IP (toCollage, typecheck, Presentation(eqs))
@@ -198,13 +198,6 @@ saturatedInstance sch (Presentation gens sks eqs) = do
 ---------------------------------------------------------------------------------------------------------------
 -- Initial algebras
 
--- | The carrier for the initial algebra of an instance; they are just terms.
---   Made into a separate type so this could be changed; cql-java for example just uses natural numbers as the carrier.
-type Carrier en fk gen = Term Void Void Void en fk Void gen Void
-
--- | The generating labelled nulls for the type algebra of the associated instance.
-newtype TalgGen en fk att gen sk = MkTalgGen (Either sk (Carrier en fk gen, att))
-
 -- | Computes an initial instance (minimal model of a presentation).
 -- Actually, computes the cannonical term model, where the underlying elements
 -- of the carriers are equivalence class of terms modulo provable equality
@@ -264,17 +257,6 @@ assembleSks col ens' = unionWith Set.union sks' $ fromListAccum gens'
 instance NFData InstanceEx where
   rnf (InstanceEx x) = rnf x
 
-instance TyMap NFData '[en, fk, att, gen, sk] => NFData (TalgGen en fk att gen sk) where
-  rnf (MkTalgGen x) = rnf x
-
-instance TyMap Show '[en, fk, att, gen, sk] => Show (TalgGen en fk att gen sk) where
-  show (MkTalgGen (Left  x)) = show x
-  show (MkTalgGen (Right x)) = show x
-
-deriving instance TyMap Ord '[en, fk, att, gen, sk] => Ord (TalgGen en fk att gen sk)
-
-deriving instance TyMap Eq '[fk, att, gen, sk] => Eq (TalgGen en fk att gen sk)
-
 -- TODO move to Collage? Algebra?
 -- TODO move to Collage? Algebra?
 -- TODO move to Collage? Algebra?

src/Language/CQL/Term.hs

@@ -325,8 +325,8 @@ simplifyTheory th subst0 = case simplifyTheoryStep th of
   Nothing            -> (th, subst0)
   Just (th', subst1) -> simplifyTheory th' $ subst0 ++ [subst1]
 
--- | Does a one step simplifcation of a theory, looking for equations @gen/sk = term@, yielding also a
--- translation function from the old theory to the new, encoded as a list of (symbol, term) pairs.
+-- | Does a one step simplification of a theory, looking for equations @gen/sk = term@, yielding also a
+--   translation function from the old theory to the new, encoded as a list of (symbol, term) pairs.
 simplifyTheoryStep
   :: (MultiTyMap '[Ord] '[var, ty, sym, en, fk, att, gen, sk])
   => Theory var ty sym en fk att gen sk

src/Language/CQL/Transform.hs

@@ -49,7 +49,7 @@ import           Data.Void
 import           Language.CQL.Common
 import           Language.CQL.Instance              as I
 import qualified Language.CQL.Instance.Presentation as IP (Presentation(eqs, gens, sks), toCollage)
-import           Language.CQL.Instance.Algebra      (Algebra(..), nf, nf'')
+import           Language.CQL.Instance.Algebra      (Algebra(..), Carrier, nf, nf'', TalgGen(..))
 import           Language.CQL.Mapping               as M hiding (toMorphism)
 import           Language.CQL.Morphism              (Morphism(..), translate, translate')
 import           Language.CQL.Morphism              as Morphism (typeOf)