Merge pull request #530 from GaloisInc/combine-repos

Update for cryptol-verifier -> cryptol-saw-core.
GaloisInc · Aug 7, 2020 · 996db66 · 996db66
2 parents cf39f32 + 62d9cfb
commit 996db66
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 10 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -10,9 +10,6 @@
 [submodule "dependencies/cryptol"]
 	path = dependencies/cryptol
 	url = https://github.com/GaloisInc/cryptol.git
-[submodule "dependencies/cryptol-verifier"]
-	path = dependencies/cryptol-verifier
-	url = https://github.com/GaloisInc/cryptol-verifier.git
 [submodule "dependencies/jvm-parser"]
 	path = dependencies/jvm-parser
 	url = https://github.com/GaloisInc/jvm-parser.git

diff --git a/cabal.project b/cabal.project
@@ -27,8 +27,8 @@ optional-packages:
   dependencies/saw-core/saw-core-aig/
   dependencies/saw-core/saw-core-sbv/
   dependencies/saw-core/saw-core-what4/
+  dependencies/saw-core/cryptol-saw-core/
   dependencies/cryptol/
-  dependencies/cryptol-verifier/
   dependencies/what4/what4/
   dependencies/what4/what4-abc/
   dependencies/what4/what4-blt/
diff --git a/crucible-server/crucible-server.cabal b/crucible-server/crucible-server.cabal
@@ -37,7 +37,7 @@ library
     crucible >= 0.1,
     crucible-saw,
     cryptol,
-    cryptol-verifier,
+    cryptol-saw-core,
     directory,
     exceptions,
     executable-path,
@@ -92,7 +92,7 @@ executable crucible-server
     crucible,
     crucible-saw,
     crucible-server,
-    cryptol-verifier,
+    cryptol-saw-core,
     hpb >= 0.1.1,
     lens,
     parameterized-utils >= 0.1.7,

diff --git a/dependencies/cryptol b/dependencies/cryptol
diff --git a/dependencies/cryptol-verifier b/dependencies/cryptol-verifier
diff --git a/dependencies/saw-core b/dependencies/saw-core
diff --git a/dependencies/what4 b/dependencies/what4
+13 −27		CHANGES.md
+11 −0		lib/Float.cry
+41 −28		src/Cryptol/Eval.hs
+42 −42		src/Cryptol/Eval/Concrete.hs
+129 −13		src/Cryptol/TypeCheck/Solver/Class.hs
+23 −2		src/Cryptol/TypeCheck/Type.hs
+2 −0		tests/issues/issue835.icry
+11 −0		tests/issues/issue835.icry.stdout
+2 −0		tests/issues/issue845.cry
+11 −0		tests/issues/issue845.icry
+71 −0		tests/issues/issue845.icry.stdout
+14 −0		tests/issues/issue850.cry
+2 −0		tests/issues/issue850.icry
+4 −0		tests/issues/issue850.icry.stdout
+16 −0		tests/issues/issue851.cry
+2 −0		tests/issues/issue851.icry
+5 −0		tests/issues/issue851.icry.stdout
+365 −0		tests/regression/instance.cry
+122 −0		tests/regression/instance.icry
+543 −0		tests/regression/instance.icry.stdout
+2 −2		win32/cryptol.wxs
+2 −0		.gitignore
+30 −0		cryptol-saw-core/LICENSE
+5 −0		cryptol-saw-core/README.md
+2 −0		cryptol-saw-core/Setup.hs
+93 −0		cryptol-saw-core/cryptol-saw-core.cabal
+138 −0		cryptol-saw-core/css/Main.hs
+1,574 −0		cryptol-saw-core/saw/Cryptol.sawcore
+1,555 −0		cryptol-saw-core/src/Verifier/SAW/Cryptol.hs
+24 −0		cryptol-saw-core/src/Verifier/SAW/Cryptol/Panic.hs
+22 −0		cryptol-saw-core/src/Verifier/SAW/Cryptol/Prelude.hs
+54 −0		cryptol-saw-core/src/Verifier/SAW/Cryptol/Simpset.hs
+598 −0		cryptol-saw-core/src/Verifier/SAW/CryptolEnv.hs
+61 −0		cryptol-saw-core/src/Verifier/SAW/TypedTerm.hs
+55 −0		cryptol-saw-core/test/CryptolVerifierTC.hs
+355 −0		cryptol-saw-core/test/instance.cry
+32 −0		cryptol-saw-core/test/superclass.cry
+3 −2		saw-core/src/Verifier/SAW/Simulator/Prims.hs