Represent strings as Text.

Author: robrix

semantic-core/semantic-core.cabal

@@ -47,6 +47,7 @@ library
                      , prettyprinter-ansi-terminal ^>= 1.1.1
                      , recursion-schemes           ^>= 5.1
                      , semigroupoids               ^>= 5.3
+                     , text                        ^>= 1.2.3.1
                      , transformers                ^>= 0.5.6
                      , trifecta                    ^>= 2
                      , unordered-containers        ^>= 0.2.10

semantic-core/src/Analysis/Concrete.hs

@@ -29,6 +29,7 @@ import           Data.Loc
 import qualified Data.Map as Map
 import           Data.Monoid (Alt(..))
 import           Data.Name
+import           Data.Text (Text)
 import           Prelude hiding (fail)
 
 type Precise = Int
@@ -41,7 +42,7 @@ data Concrete
   = Closure Loc Name Core.Core Precise
   | Unit
   | Bool Bool
-  | String String
+  | String Text
   | Obj Frame
   deriving (Eq, Ord, Show)
 

semantic-core/src/Analysis/Eval.hs

@@ -21,6 +21,7 @@ import Data.Functor
 import Data.Loc
 import Data.Maybe (fromJust)
 import Data.Name
+import Data.Text (Text, unpack)
 import GHC.Stack
 import Prelude hiding (fail)
 
@@ -42,7 +43,7 @@ eval Analysis{..} eval = \case
   String s -> string s
   Load p -> do
     path <- eval p >>= asString
-    lookupEnv' (Path path) >>= deref' (Path path)
+    lookupEnv' (Path (unpack path)) >>= deref' (Path (unpack path))
   Edge e a -> ref a >>= edge e >> unit
   Frame -> frame
   a :. b -> do
@@ -207,8 +208,8 @@ data Analysis address value m = Analysis
   , unit        :: m value
   , bool        :: Bool -> m value
   , asBool      :: value -> m Bool
-  , string      :: String -> m value -- FIXME: Text
-  , asString    :: value -> m String
+  , string      :: Text -> m value -- FIXME: Text
+  , asString    :: value -> m Text
   , frame       :: m value
   , edge        :: Edge -> address -> m ()
   , (...)       :: forall a . address -> m a -> m a

semantic-core/src/Analysis/ImportGraph.hs

@@ -22,6 +22,7 @@ import           Data.Loc
 import qualified Data.Map as Map
 import           Data.Name
 import qualified Data.Set as Set
+import           Data.Text (Text)
 import           Prelude hiding (fail)
 
 type ImportGraph = Map.Map FilePath (Set.Set FilePath)
@@ -41,7 +42,7 @@ instance Monoid Value where
 data Semi
   = Closure Loc Name Core.Core Name
   -- FIXME: Bound String values.
-  | String String
+  | String Text
   | Abstract
   deriving (Eq, Ord, Show)
 
@@ -98,7 +99,7 @@ importGraphAnalysis = Analysis{..}
         asBool _ = pure True <|> pure False
         string s = pure (Value (String s) mempty)
         asString (Value (String s) _) = pure s
-        asString _ = pure ""
+        asString _ = pure mempty
         frame = pure mempty
         edge Core.Import (Path to) = do
           Loc{locPath=from} <- ask

semantic-core/src/Analysis/Typecheck.hs

@@ -160,7 +160,7 @@ typecheckingAnalysis = Analysis{..}
         bool _ = pure MBool
         asBool b = unify MBool b >> pure True <|> pure False
         string _ = pure MString
-        asString s = unify MString s *> pure ""
+        asString s = unify MString s *> pure mempty
         frame = fail "unimplemented"
         edge _ _ = pure ()
         _ ... m = m

semantic-core/src/Data/Core.hs

@@ -20,6 +20,7 @@ import           Data.Foldable (foldl')
 import           Data.Loc
 import           Data.Name
 import           Data.Stack
+import           Data.Text (Text)
 import           GHC.Stack
 
 data Edge = Lexical | Import
@@ -36,7 +37,7 @@ data Core
   | Unit
   | Bool Bool
   | If Core Core Core
-  | String String -- FIXME: Text
+  | String Text
   -- | Load the specified file (by path).
   | Load Core
   | Edge Edge Core