Make everything work with Analysis.Functor.Named.

semantic-analysis/semantic-analysis.cabal

@@ -50,6 +50,7 @@ library
     Analysis.Effect.Heap
     Analysis.File
     Analysis.FlowInsensitive
+    Analysis.Functor.Named
     Analysis.ImportGraph
     Analysis.Intro
     Analysis.Name

semantic-analysis/src/Analysis/Concrete.hs

@@ -29,7 +29,7 @@ import qualified Analysis.Carrier.Env.Precise as A
 import qualified Analysis.Carrier.Heap.Precise as A
 import qualified Analysis.Effect.Domain as A
 import           Analysis.File
-import           Analysis.Name
+import           Analysis.Functor.Named
 import           Control.Algebra
 import           Control.Carrier.Fail.WithLoc
 import           Control.Carrier.Fresh.Strict

semantic-analysis/src/Analysis/Effect/Domain.hs

@@ -24,7 +24,7 @@ module Analysis.Effect.Domain
 , run
 ) where
 
-import Analysis.Name
+import Analysis.Functor.Named
 import Control.Algebra
 import Data.Text (Text)
 import GHC.Generics (Generic1)

semantic-analysis/src/Analysis/Functor/Named.hs

@@ -1,3 +1,6 @@
+{-# LANGUAGE DeriveFoldable #-}
+{-# LANGUAGE DeriveFunctor #-}
+{-# LANGUAGE DeriveTraversable #-}
 module Analysis.Functor.Named
 ( module Analysis.Name
 , Named (..)
@@ -7,7 +10,9 @@ module Analysis.Functor.Named
 , namedValue
 ) where
 
+
 import Analysis.Name
+import Data.Function (on)
 
 -- | Annotates an @a@ with a 'Name'-provided name, which is ignored for '==' and 'compare'.
 data Named a = Named Name a

semantic-analysis/src/Analysis/ImportGraph.hs

@@ -21,7 +21,7 @@ import qualified Analysis.Carrier.Heap.Monovariant as A
 import qualified Analysis.Effect.Domain as A
 import           Analysis.File
 import           Analysis.FlowInsensitive
-import           Analysis.Name
+import           Analysis.Functor.Named
 import           Control.Algebra
 import           Control.Applicative (Alternative (..))
 import           Control.Carrier.Fail.WithLoc

semantic-analysis/src/Analysis/Intro.hs

@@ -11,7 +11,7 @@ module Analysis.Intro
 , record
 ) where
 
-import Analysis.Name
+import Analysis.Functor.Named
 import Control.Algebra
 import Data.Text (Text)
 import GHC.Generics (Generic1)

semantic-analysis/src/Analysis/Typecheck.hs

@@ -26,8 +26,8 @@ import qualified Analysis.Carrier.Heap.Monovariant as A
 import qualified Analysis.Effect.Domain as A
 import           Analysis.File
 import           Analysis.FlowInsensitive
+import           Analysis.Functor.Named
 import qualified Analysis.Intro as Intro
-import           Analysis.Name
 import           Control.Algebra
 import           Control.Applicative (Alternative (..))
 import           Control.Carrier.Fail.WithLoc

semantic-core/src/Core/Name.hs

@@ -1,11 +1,13 @@
 {-# LANGUAGE DeriveGeneric, DeriveTraversable, GeneralizedNewtypeDeriving, LambdaCase, OverloadedLists #-}
 module Core.Name
 ( module Analysis.Name
+, module Analysis.Functor.Named
 , reservedNames
 , isSimpleCharacter
 , needsQuotation
 ) where
 
+import           Analysis.Functor.Named
 import           Analysis.Name
 import qualified Data.Char as Char
 import           Data.HashSet (HashSet)

semantic-core/src/Core/Parser.hs

@@ -1,4 +1,6 @@
-{-# LANGUAGE FlexibleContexts, GeneralizedNewtypeDeriving, TypeOperators #-}
+{-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE TypeOperators #-}
 module Core.Parser
   ( core
   , lit