Skip to content

Commit 656001a

Browse files
committed
Rename Term.simplifyFix to Term.simplifyTheory. #148
1 parent b7712e6 commit 656001a

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

src/Language/CQL/Collage.hs

+3-3
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ import Data.Map.Strict as Map hiding (foldr, size)
4646
import Data.Set as Set hiding (foldr, size)
4747
import Data.Void
4848
import Language.CQL.Common
49-
import Language.CQL.Term (Head(..), Term(..), simplifyFix, occsTerm, upp)
50-
import Language.CQL.Term (EQ(..), Ctx)
49+
import Language.CQL.Term (Ctx, EQ(..), Head(..), Term(..), occsTerm, upp)
50+
import qualified Language.CQL.Term as T (simplifyTheory)
5151
import Prelude hiding (EQ)
5252

5353
data Collage var ty sym en fk att gen sk
@@ -83,7 +83,7 @@ simplify
8383
simplify (Collage ceqs' ctys' cens' csyms' cfks' catts' cgens' csks' )
8484
= (Collage ceqs'' ctys' cens' csyms' cfks' catts' cgens'' csks'', f)
8585
where
86-
(ceqs'', f) = simplifyFix ceqs' []
86+
(ceqs'', f) = T.simplifyTheory ceqs' []
8787
cgens'' = Map.fromList $ Prelude.filter (\(x,_) -> notElem (HGen x) $ fmap fst f) $ Map.toList cgens'
8888
csks'' = Map.fromList $ Prelude.filter (\(x,_) -> notElem (HSk x) $ fmap fst f) $ Map.toList csks'
8989

src/Language/CQL/Instance/Algebra.hs

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ import qualified Data.Set as Set
4949
import Data.Void
5050
import Language.CQL.Common (intercalate, mapl, section, MultiTyMap, TyMap, type (+))
5151
import Language.CQL.Schema as Schema
52-
import Language.CQL.Term as Term
52+
import Language.CQL.Term (EQ(..), Head(HSk), Term(..), subst, upp, replaceRepeatedly, simplifyTheory)
5353
import Language.CQL.Typeside as Typeside
5454
import Prelude hiding (EQ)
5555
import qualified Text.Tabular as T
@@ -181,7 +181,7 @@ simplify
181181
Algebra sch en' nf''' nf'''2 repr''' ty'' nf''''' repr'''' teqs''''
182182
where
183183
teqs'' = Set.map (\x -> (Map.empty, x)) teqs'
184-
(teqs''', f) = simplifyFix teqs'' []
184+
(teqs''', f) = simplifyTheory teqs'' []
185185
teqs'''' = Set.map snd teqs'''
186186
ty'' t = Set.filter (\x -> notElem (HSk x) $ map fst f) $ ty' t
187187
nf''''' e = replaceRepeatedly f $ nf'''' e

src/Language/CQL/Term.hs

+6-6
Original file line numberDiff line numberDiff line change
@@ -314,23 +314,23 @@ replaceRepeatedly
314314
replaceRepeatedly [] t = t
315315
replaceRepeatedly ((s,t):r) e = replaceRepeatedly r $ replace' s t e
316316

317-
-- | Takes in a theory and a translation function and repeatedly (to fixpoint) attempts to simplfiy (extend) it.
318-
simplifyFix
317+
-- | Takes in a theory and a translation function and repeatedly (to fixpoint) attempts to simplify (extend) it.
318+
simplifyTheory
319319
:: (MultiTyMap '[Ord] '[var, ty, sym, en, fk, att, gen, sk])
320320
=> Set (Ctx var (ty + en), EQ var ty sym en fk att gen sk)
321321
-> [(Head ty sym en fk att gen sk, Term var ty sym en fk att gen sk)]
322322
-> (Set (Ctx var (ty+en), EQ var ty sym en fk att gen sk), [(Head ty sym en fk att gen sk, Term var ty sym en fk att gen sk)])
323-
simplifyFix eqs subst0 = case simplify eqs of
323+
simplifyTheory eqs subst0 = case simplifyTheoryStep eqs of
324324
Nothing -> (eqs, subst0)
325-
Just (eqs1, subst1) -> simplifyFix eqs1 $ subst0 ++ [subst1]
325+
Just (eqs1, subst1) -> simplifyTheory eqs1 $ subst0 ++ [subst1]
326326

327327
-- | Does a one step simplifcation of a theory, looking for equations @gen/sk = term@, yielding also a
328328
-- translation function from the old theory to the new, encoded as a list of (symbol, term) pairs.
329-
simplify
329+
simplifyTheoryStep
330330
:: (MultiTyMap '[Ord] '[var, ty, sym, en, fk, att, gen, sk])
331331
=> Set (Ctx var (ty+en), EQ var ty sym en fk att gen sk)
332332
-> Maybe (Set (Ctx var (ty+en), EQ var ty sym en fk att gen sk), (Head ty sym en fk att gen sk, Term var ty sym en fk att gen sk))
333-
simplify eqs = case findSimplifiable eqs of
333+
simplifyTheoryStep eqs = case findSimplifiable eqs of
334334
Nothing -> Nothing
335335
Just (toRemove, replacer) -> let
336336
eqs2 = Set.map (\(ctx, EQ (lhs, rhs)) -> (ctx, EQ (replace' toRemove replacer lhs, replace' toRemove replacer rhs))) eqs

0 commit comments

Comments
 (0)