Update saw-core and adapt to changed FieldName type.

GaloisInc/saw-core#111 changed type FieldName from String to
Data.Text.

src/SAWScript/Builtins.hs

@@ -115,7 +115,7 @@ import qualified Cryptol.Backend.Monad as C (runEval)
 import qualified Cryptol.Eval.Type as C (evalType)
 import qualified Cryptol.Eval.Value as C (fromVBit, fromVWord)
 import qualified Cryptol.Eval.Concrete as C (Concrete(..), bvVal)
-import qualified Cryptol.Utils.Ident as C (packIdent, packModName)
+import qualified Cryptol.Utils.Ident as C (mkIdent, packModName)
 import qualified Cryptol.Utils.RecordMap as C (recordFromFields)
 import Cryptol.Utils.PP (pretty)
 
@@ -192,7 +192,7 @@ readSBV path unintlst =
           SBV.TFun t1 t2 -> C.tFun (toCType t1) (toCType t2)
           SBV.TVec n t   -> C.tSeq (C.tNum n) (toCType t)
           SBV.TTuple ts  -> C.tTuple (map toCType ts)
-          SBV.TRecord bs -> C.tRec (C.recordFromFields [ (C.packIdent n, toCType t) | (n, t) <- bs ])
+          SBV.TRecord bs -> C.tRec (C.recordFromFields [ (C.mkIdent n, toCType t) | (n, t) <- bs ])
 
 
 

src/SAWScript/SBVParser.hs

@@ -24,6 +24,7 @@ import Control.Monad.State hiding (mapM)
 import Data.List (intercalate)
 import Data.Map (Map)
 import qualified Data.Map as Map
+import qualified Data.Text as Text
 import Data.Traversable (mapM)
 import Numeric.Natural (Natural)
 
@@ -210,15 +211,15 @@ data Typ
   | TFun Typ Typ
   | TVec SBV.Size Typ
   | TTuple [Typ]
-  | TRecord [(String, Typ)]
+  | TRecord [(FieldName, Typ)]
 
 instance Show Typ where
   show TBool = "."
   show (TFun t1 t2) = "(" ++ show t1 ++ " -> " ++ show t2 ++ ")"
   show (TVec size t) = "[" ++ show size ++ "]" ++ show t
   show (TTuple ts) = "(" ++ intercalate "," (map show ts) ++ ")"
   show (TRecord fields) = "{" ++ intercalate "," (map showField fields) ++ "}"
-    where showField (s, t) = s ++ ":" ++ show t
+    where showField (s, t) = Text.unpack s ++ ":" ++ show t
 
 parseIRType :: SBV.IRType -> Typ
 parseIRType (SBV.TApp "." []) = TBool
@@ -227,7 +228,7 @@ parseIRType (SBV.TApp ":" [SBV.TInt n, a]) = TVec n (parseIRType a)
 parseIRType (SBV.TApp c ts)
   | c == "(" ++ replicate (length ts - 1) ',' ++ ")" = TTuple (map parseIRType ts)
 parseIRType (SBV.TRecord fields) =
-    TRecord [ (name, parseIRType t) | (name, SBV.Scheme [] [] [] t) <- fields ]
+    TRecord [ (Text.pack name, parseIRType t) | (name, SBV.Scheme [] [] [] t) <- fields ]
 parseIRType t = error ("parseIRType: " ++ show t)
 
 typSizes :: Typ -> [SBV.Size]