Merge pull request #621 from GaloisInc/update-deps

Update saw-core version; adapt to changed type of NatLit constructor.
GaloisInc · Jan 6, 2020 · 74ddfaf · 74ddfaf
2 parents 0c0fabb + b4dd85c
commit 74ddfaf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/deps/saw-core b/deps/saw-core
diff --git a/src/SAWScript/Interpreter.hs b/src/SAWScript/Interpreter.hs
@@ -146,7 +146,7 @@ typedTermOfString :: String -> TypedTerm
 typedTermOfString cs = TypedTerm schema trm
   where
     nat :: Integer -> Term
-    nat n = Unshared (FTermF (NatLit n))
+    nat n = Unshared (FTermF (NatLit (fromInteger n)))
     bvNat :: Term
     bvNat = Unshared (FTermF (GlobalDef "Prelude.bvNat"))
     bvNat8 :: Term
+2 −2		src/Verifier/SAW/Conversion.hs
+3 −2		src/Verifier/SAW/Grammar.y
+2 −1		src/Verifier/SAW/Lexer.x
+3 −1		src/Verifier/SAW/OpenTerm.hs
+2 −2		src/Verifier/SAW/Recognizer.hs
+34 −15		src/Verifier/SAW/Rewriter.hs
+42 −16		src/Verifier/SAW/SharedTerm.hs
+1 −1		src/Verifier/SAW/Simulator.hs
+7 −7		src/Verifier/SAW/Term/Functor.hs
+1 −1		src/Verifier/SAW/Term/Pretty.hs
+3 −2		src/Verifier/SAW/UntypedAST.hs