Rename Decorator to Decorating.Decorator.

semantic-diff.cabal

@@ -41,7 +41,7 @@ library
                      , Data.Syntax.Statement
                      , Data.Syntax.Type
                      , Data.Term
-                     , Decorator
+                     , Decorating.Decorator
                      , Diffing.Algorithm
                      , Diffing.Algorithm.RWS
                      , Diffing.Algorithm.RWS.FeatureVector

src/Decorating/Decorator.hs

@@ -1,5 +1,5 @@
 {-# LANGUAGE DataKinds, GADTs, GeneralizedNewtypeDeriving, MultiParamTypeClasses, RankNTypes, ScopedTypeVariables, TypeFamilies, TypeOperators, UndecidableInstances #-}
-module Decorator
+module Decorating.Decorator
 ( FAlgebra
 , RAlgebra
 , OpenFAlgebra

src/Diffing/Interpreter.hs

@@ -15,7 +15,7 @@ import Data.Maybe (fromMaybe)
 import Data.Record
 import Data.Term
 import Data.Text (Text)
-import Decorator
+import Decorating.Decorator
 import Diffing.Algorithm.RWS
 import Info hiding (Empty, Return)
 import Syntax (Syntax(Leaf))

src/Rendering/TOC.hs

@@ -46,6 +46,7 @@ import Data.Term
 import Data.Text (toLower, stripEnd)
 import qualified Data.Text as T
 import Data.Union
+import Decorating.Decorator (RAlgebra)
 import GHC.Generics
 import Info
 import Language
@@ -54,7 +55,6 @@ import qualified Data.Map as Map hiding (null)
 import Syntax as S
 import qualified Data.Syntax as Syntax
 import qualified Data.Syntax.Declaration as Declaration
-import Decorator (RAlgebra)
 import qualified Language.Markdown.Syntax as Markdown
 
 data Summaries = Summaries { changes, errors :: !(Map.Map T.Text [Value]) }

src/Semantic.hs

@@ -23,7 +23,7 @@ import Data.Output
 import Data.Record
 import Data.Term
 import Data.Typeable
-import Decorator
+import Decorating.Decorator
 import Info
 import Diffing.Interpreter
 import qualified Language

src/Semantic/Task.hs

@@ -44,7 +44,7 @@ import Data.Record
 import qualified Data.Syntax as Syntax
 import Data.Term
 import Data.Union
-import Decorator (RAlgebra, decoratorWithAlgebra)
+import Decorating.Decorator (RAlgebra, decoratorWithAlgebra)
 import Info hiding (Category(..))
 import Language
 import Parsing.Parser

test/Data/RandomWalkSimilarity/Spec.hs

@@ -1,7 +1,6 @@
 {-# LANGUAGE DataKinds #-}
 module Data.RandomWalkSimilarity.Spec where
 
-import Diffing.Algorithm
 import Data.Array.IArray
 import Data.Bifunctor
 import Data.Diff
@@ -11,7 +10,8 @@ import qualified Data.Syntax as Syntax
 import Data.Term
 import Data.These
 import Data.Union
-import Decorator
+import Decorating.Decorator
+import Diffing.Algorithm
 import Diffing.Algorithm.RWS
 import Diffing.Interpreter
 import Test.Hspec