Rename Decorating to Analysis.

semantic-diff.cabal

@@ -14,8 +14,10 @@ cabal-version:       >=1.10
 library
   hs-source-dirs:      src
   exposed-modules:
+                     -- Analyses & term annotations
+                       Analysis.Decorator
                      -- Semantic assignment
-                       Assigning.Assignment
+                     , Assigning.Assignment
                      , Assigning.Assignment.Table
                      , Category
                      -- General datatype definitions & generic algorithms
@@ -47,8 +49,6 @@ library
                      , Data.Syntax.Statement
                      , Data.Syntax.Type
                      , Data.Term
-                     -- Analyses & term annotations
-                     , Decorating.Decorator
                      -- Diffing algorithms & interpretation thereof
                      , Diffing.Algorithm
                      , Diffing.Algorithm.RWS

src/Analysis/Decorator.hs

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

src/Diffing/Interpreter.hs

@@ -4,7 +4,7 @@ module Diffing.Interpreter
 , diffSyntaxTerms
 ) where
 
-import Diffing.Algorithm
+import Analysis.Decorator
 import Control.Applicative (Alternative(..))
 import Control.Monad.Free.Freer
 import Data.Align.Generic
@@ -15,7 +15,7 @@ import Data.Maybe (fromMaybe)
 import Data.Record
 import Data.Term
 import Data.Text (Text)
-import Decorating.Decorator
+import Diffing.Algorithm
 import Diffing.Algorithm.RWS
 import Info hiding (Empty, Return)
 import Syntax (Syntax(Leaf))

src/Rendering/TOC.hs

@@ -20,6 +20,7 @@ module Rendering.TOC
 , toCategoryName
 ) where
 
+import Analysis.Decorator (RAlgebra)
 import Data.Aeson
 import Data.Align (bicrosswalk)
 import Data.Bifoldable (bifoldMap)
@@ -47,7 +48,6 @@ 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 qualified Data.List as List

src/Semantic.hs

@@ -7,7 +7,7 @@ module Semantic
 , diffTermPair
 ) where
 
-import Diffing.Algorithm (Diffable)
+import Analysis.Decorator
 import Control.Exception
 import Control.Monad ((>=>), guard)
 import Control.Monad.Error.Class
@@ -19,18 +19,18 @@ import Data.Diff
 import Data.Functor.Both as Both
 import Data.Functor.Classes
 import Data.JSON.Fields
+import qualified Data.Language as Language
 import Data.Output
 import Data.Record
 import Data.Term
 import Data.Typeable
-import Decorating.Decorator
-import Info
+import Diffing.Algorithm (Diffable)
 import Diffing.Interpreter
-import qualified Data.Language as Language
+import Info
 import Parsing.Parser
 import Rendering.Renderer
-import Semantic.Task as Task
 import Semantic.Stat as Stat
+import Semantic.Task as Task
 
 -- This is the primary interface to the Semantic library which provides two
 -- major classes of functionality: semantic parsing and diffing of source code

src/Semantic/Task.hs

@@ -25,6 +25,7 @@ module Semantic.Task
 , runTaskWithOptions
 ) where
 
+import Analysis.Decorator (RAlgebra, decoratorWithAlgebra)
 import qualified Assigning.Assignment as Assignment
 import Control.Exception
 import Control.Monad.Error.Class
@@ -45,7 +46,6 @@ import Data.Record
 import qualified Data.Syntax as Syntax
 import Data.Term
 import Data.Union
-import Decorating.Decorator (RAlgebra, decoratorWithAlgebra)
 import Info hiding (Category(..))
 import Parsing.Parser
 import Parsing.CMark

test/Diffing/Algorithm/RWS/Spec.hs

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