Move Semantic.Name to Data.Name.

Author: robrix

semantic-core/semantic-core.cabal

@@ -27,9 +27,9 @@ library
                      , Control.Effect.Readline
                      , Data.File
                      , Data.Loc
+                     , Data.Name
                      , Data.Stack
                      , Semantic.Core
-                     , Semantic.Name
   -- other-modules:
   -- other-extensions:
   build-depends:       algebraic-graphs ^>= 0.3

semantic-core/src/Analysis/Concrete.hs

@@ -27,9 +27,9 @@ import qualified Data.IntSet as IntSet
 import           Data.Loc
 import qualified Data.Map as Map
 import           Data.Monoid (Alt(..))
+import           Data.Name
 import           Prelude hiding (fail)
 import qualified Semantic.Core as Core
-import           Semantic.Name
 
 type Precise = Int
 type Env = Map.Map Name Precise

semantic-core/src/Analysis/Eval.hs

@@ -19,10 +19,10 @@ import Data.File
 import Data.Functor
 import Data.Loc
 import Data.Maybe (fromJust)
+import Data.Name
 import GHC.Stack
 import Prelude hiding (fail)
 import Semantic.Core as Core
-import Semantic.Name
 
 eval :: (Carrier sig m, Member (Reader Loc) sig, MonadFail m) => Analysis address value m -> (Core -> m value) -> Core -> m value
 eval Analysis{..} eval = \case

semantic-core/src/Analysis/FlowInsensitive.hs

@@ -16,9 +16,9 @@ import           Control.Effect.State
 import qualified Data.Map as Map
 import           Data.Maybe (fromMaybe)
 import           Data.Monoid (Alt(..))
+import           Data.Name
 import qualified Data.Set as Set
 import qualified Semantic.Core as Core
-import           Semantic.Name
 
 type Cache a = Map.Map Core.Core (Set.Set a)
 type Heap a = Map.Map Name (Set.Set a)

semantic-core/src/Analysis/ImportGraph.hs

@@ -19,10 +19,10 @@ import           Data.Function (fix)
 import           Data.List.NonEmpty (nonEmpty)
 import           Data.Loc
 import qualified Data.Map as Map
+import           Data.Name
 import qualified Data.Set as Set
 import           Prelude hiding (fail)
 import qualified Semantic.Core as Core
-import           Semantic.Name
 
 type ImportGraph = Map.Map FilePath (Set.Set FilePath)
 

semantic-core/src/Analysis/Typecheck.hs

@@ -28,10 +28,10 @@ import qualified Data.IntSet as IntSet
 import           Data.List.NonEmpty (nonEmpty)
 import           Data.Loc
 import qualified Data.Map as Map
+import           Data.Name
 import qualified Data.Set as Set
 import           Prelude hiding (fail)
 import qualified Semantic.Core as Core
-import           Semantic.Name
 
 data Monotype a
   = MBool

semantic-core/src/Semantic/Name.hs semantic-core/src/Data/Name.hssemantic-core/src/Semantic/Name.hs renamed to semantic-core/src/Data/Name.hs

@@ -1,5 +1,5 @@
 {-# LANGUAGE DeriveFunctor, ExistentialQuantification, FlexibleContexts, FlexibleInstances, GeneralizedNewtypeDeriving, LambdaCase, MultiParamTypeClasses, OverloadedStrings, StandaloneDeriving, TypeOperators, UndecidableInstances #-}
-module Semantic.Name
+module Data.Name
 ( User
 , Namespaced
 , Name(..)

semantic-core/src/Semantic/Core.hs

@@ -15,12 +15,12 @@ module Semantic.Core
 import           Control.Applicative (Alternative (..))
 import           Data.Foldable (foldl')
 import           Data.Loc
+import           Data.Name
 import           Data.Stack
 import           Data.Text.Prettyprint.Doc (Pretty (..), (<+>), vsep)
 import qualified Data.Text.Prettyprint.Doc as Pretty
 import qualified Data.Text.Prettyprint.Doc.Render.String as Pretty
 import           GHC.Stack
-import           Semantic.Name
 
 data Core
   = Var Name