Represent paths as Text.

Author: robrix

semantic-core/src/Analysis/Concrete.hs

@@ -29,7 +29,7 @@ import           Data.Loc
 import qualified Data.Map as Map
 import           Data.Monoid (Alt(..))
 import           Data.Name
-import           Data.Text (Text)
+import           Data.Text (Text, unpack)
 import           Prelude hiding (fail)
 
 type Precise = Int
@@ -196,7 +196,7 @@ addressStyle heap = (G.defaultStyle vertex) { G.edgeAttributes }
           Unit ->  "()"
           Bool b -> show b
           String s -> show s
-          Closure (Loc p (Span s e)) n _ _ -> "\\\\ " <> fromName n <> " [" <> p <> ":" <> showPos s <> "-" <> showPos e <> "]"
+          Closure (Loc p (Span s e)) n _ _ -> "\\\\ " <> fromName n <> " [" <> unpack p <> ":" <> showPos s <> "-" <> showPos e <> "]"
           Obj _ -> "{}"
         showPos (Pos l c) = show l <> ":" <> show c
         fromName (User s)  = s

semantic-core/src/Analysis/Eval.hs

@@ -1,4 +1,4 @@
-{-# LANGUAGE FlexibleContexts, GeneralizedNewtypeDeriving, LambdaCase, RankNTypes, RecordWildCards #-}
+{-# LANGUAGE FlexibleContexts, GeneralizedNewtypeDeriving, LambdaCase, OverloadedStrings, RankNTypes, RecordWildCards #-}
 module Analysis.Eval
 ( eval
 , prog1
@@ -21,7 +21,7 @@ import Data.Functor
 import Data.Loc
 import Data.Maybe (fromJust)
 import Data.Name
-import Data.Text (Text, unpack)
+import Data.Text (Text)
 import GHC.Stack
 import Prelude hiding (fail)
 
@@ -43,7 +43,7 @@ eval Analysis{..} eval = \case
   String s -> string s
   Load p -> do
     path <- eval p >>= asString
-    lookupEnv' (Path (unpack path)) >>= deref' (Path (unpack path))
+    lookupEnv' (Path path) >>= deref' (Path path)
   Edge e a -> ref a >>= edge e >> unit
   Frame -> frame
   a :. b -> do

semantic-core/src/Analysis/ImportGraph.hs

@@ -25,7 +25,7 @@ import qualified Data.Set as Set
 import           Data.Text (Text)
 import           Prelude hiding (fail)
 
-type ImportGraph = Map.Map FilePath (Set.Set FilePath)
+type ImportGraph = Map.Map Text (Set.Set Text)
 
 data Value = Value
   { valueSemi  :: Semi

semantic-core/src/Data/Core/Parser.hs

@@ -14,6 +14,7 @@ import           Data.Core
 import           Data.Name
 import           Data.Semigroup
 import           Data.String
+import           Data.Text (pack)
 import qualified Text.Parser.Token as Token
 import qualified Text.Parser.Token.Highlight as Highlight
 import           Text.Trifecta hiding (ident)
@@ -94,7 +95,7 @@ lvalue = choice
 name :: (TokenParsing m, Monad m) => m Name
 name = choice [regular, strpath] <?> "name" where
   regular = User <$> identifier
-  strpath = Path <$> between (symbolic '"') (symbolic '"') (some $ noneOf "\"")
+  strpath = Path . pack <$> between (symbolic '"') (symbolic '"') (some $ noneOf "\"")
 
 lit :: (TokenParsing m, Monad m) => m Core
 lit = let x `given` n = x <$ reserved n in choice
@@ -112,4 +113,3 @@ lambda = Lam <$ lambduh <*> name <* arrow <*> core <?> "lambda" where
 
 ident :: (Monad m, TokenParsing m) => m Core
 ident = Var <$> name <?> "identifier"
-

semantic-core/src/Data/Loc.hs

@@ -16,12 +16,13 @@ import Control.Effect.Error
 import Control.Effect.Fail
 import Control.Effect.Reader
 import Control.Effect.Sum
+import Data.Text (Text, pack)
 import Data.Text.Prettyprint.Doc (Pretty (..))
 import GHC.Stack
 import Prelude hiding (fail)
 
 data Loc = Loc
-  { locPath :: !FilePath
+  { locPath :: !Text
   , locSpan :: {-# UNPACK #-} !Span
   }
   deriving (Eq, Ord, Show)
@@ -58,7 +59,7 @@ stackLoc cs = case getCallStack cs of
   _             -> Nothing
 
 fromGHCSrcLoc :: SrcLoc -> Loc
-fromGHCSrcLoc SrcLoc{..} = Loc srcLocFile (Span (Pos srcLocStartLine srcLocStartCol) (Pos srcLocEndLine srcLocEndCol))
+fromGHCSrcLoc SrcLoc{..} = Loc (pack srcLocFile) (Span (Pos srcLocStartLine srcLocStartCol) (Pos srcLocEndLine srcLocEndCol))
 
 
 runFailWithLoc :: FailWithLocC m a -> m (Either (Loc, String) a)

semantic-core/src/Data/Name.hs

@@ -26,6 +26,7 @@ import           Control.Monad.IO.Class
 import qualified Data.Char as Char
 import           Data.HashSet (HashSet)
 import qualified Data.HashSet as HashSet
+import           Data.Text (Text)
 import           Data.Text.Prettyprint.Doc (Pretty (..))
 import qualified Data.Text.Prettyprint.Doc as Pretty
 
@@ -47,7 +48,7 @@ data Name
   --   This should be used for names which the user provided and which other code (other functions, other modules, other packages) could call, e.g. declaration names.
   | User User
   -- | A variable name represented as the path to a source file. Used for loading modules at a specific name.
-  | Path FilePath
+  | Path Text
   deriving (Eq, Ord, Show)
 
 instance Pretty Name where