Merge pull request #926 from GaloisInc/update-deps

Update deps
GaloisInc · Nov 20, 2020 · d521320 · d521320
2 parents 1547897 + e08210b
commit d521320
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/deps/argo b/deps/argo
diff --git a/deps/crucible b/deps/crucible
diff --git a/deps/cryptol b/deps/cryptol
diff --git a/deps/jvm-parser b/deps/jvm-parser
diff --git a/deps/jvm-verifier b/deps/jvm-verifier
diff --git a/deps/saw-core b/deps/saw-core
diff --git a/saw-remote-api/src/SAWServer/CryptolExpression.hs b/saw-remote-api/src/SAWServer/CryptolExpression.hs
@@ -88,12 +88,12 @@ defaultEvalOpts = EvalOpts quietLogger defaultPPOpts
 runInferOutput :: InferOutput a -> ModuleM a
 runInferOutput out =
   case out of
-    InferOK warns seeds supply o ->
+    InferOK nm warns seeds supply o ->
       do setNameSeeds seeds
          setSupply supply
-         typeCheckWarnings warns
+         typeCheckWarnings nm warns
          return o
 
-    InferFailed warns errs ->
-      do typeCheckWarnings warns
-         typeCheckingFailed errs
+    InferFailed nm warns errs ->
+      do typeCheckWarnings nm warns
+         typeCheckingFailed nm errs
+1 −0		.gitignore
+336 −0		docs/Cryptol.rst
+21 −0		docs/CryptolPython.rst
+5 −350		docs/Protocol.rst
+6 −37		docs/Python.rst
+10 −0		docs/SAW.rst
+3 −0		docs/SAWPython.rst
+6 −2		docs/index.rst
+1 −1		.github/Dockerfile-remote-api
+1 −1		.github/ci.sh
+0 −1		.github/workflows/build.yml
+19 −1		.github/workflows/docker.yml
+19 −1		.github/workflows/nightly.yml
+58 −0		CHANGES.md
+5 −3		README.md
+2 −0		cry
+2 −0		cryptol-remote-api/cryptol-remote-api.cabal
+1 −1		cryptol-remote-api/src/CryptolServer/Data/Type.hs
+2 −2		cryptol-remote-api/src/CryptolServer/Exceptions.hs
+1 −1		cryptol-remote-api/test-scripts/cryptol-api_test.py
+3 −3		cryptol-remote-api/test-scripts/cryptol-tests.py
+0 −40		cryptol.cabal
+1 −1		deps/argo
+0 −1		docs/ProgrammingCryptol/Makefile
+9 −0		lib/PrimeEC.cry
+128 −118		src/Cryptol/Backend/What4.hs
+0 −1		src/Cryptol/Eval/Concrete.hs
+24 −1		src/Cryptol/Eval/Generic.hs
+0 −1		src/Cryptol/Eval/SBV.hs
+2 −2		src/Cryptol/Eval/Type.hs
+455 −24		src/Cryptol/Eval/What4.hs
+5 −5		src/Cryptol/ModuleSystem/Base.hs
+11 −11		src/Cryptol/ModuleSystem/Monad.hs
+37 −1		src/Cryptol/PrimeEC.hs
+101 −71		src/Cryptol/REPL/Command.hs
+2 −0		src/Cryptol/REPL/Monad.hs
+32 −10		src/Cryptol/Symbolic/What4.hs
+145 −198		src/Cryptol/Testing/Random.hs
+14 −0		src/Cryptol/TypeCheck.hs
+1 −2		src/Cryptol/TypeCheck/AST.hs
+10 −8		src/Cryptol/TypeCheck/CheckModuleInstance.hs
+183 −29		src/Cryptol/TypeCheck/Error.hs
+1 −1		src/Cryptol/TypeCheck/Infer.hs
+23 −21		src/Cryptol/TypeCheck/Monad.hs
+16 −13		src/Cryptol/TypeCheck/SimpType.hs
+4 −2		src/Cryptol/TypeCheck/SimpleSolver.hs
+2 −5		src/Cryptol/TypeCheck/Solve.hs
+54 −114		src/Cryptol/TypeCheck/Solver/Class.hs
+18 −35		src/Cryptol/TypeCheck/Solver/Numeric.hs
+1 −2		src/Cryptol/TypeCheck/Solver/Numeric/Fin.hs
+0 −3		src/Cryptol/TypeCheck/Solver/SMT.hs
+5 −2		src/Cryptol/TypeCheck/Solver/Types.hs
+4 −11		src/Cryptol/TypeCheck/TCon.hs
+51 −44		src/Cryptol/TypeCheck/Type.hs
+3 −3		src/Cryptol/TypeCheck/TypePat.hs
+4 −4		tests/issues/T146.icry.stdout
+9 −11		tests/issues/T820.icry.stdout
+2 −3		tests/issues/issue101.icry.stdout
+12 −18		tests/issues/issue582.icry.stdout
+4 −6		tests/issues/issue835.icry.stdout
+20 −30		tests/issues/issue845.icry.stdout
+18 −22		tests/issues/issue910.icry.stdout
+2 −3		tests/issues/issue913.icry.stdout
+1 −0		tests/issues/issue933.icry
+2 −0		tests/issues/issue933.icry.stdout
+4 −6		tests/mono-binds/test04.icry.stdout
+8 −12		tests/regression/float.icry.stdout
+230 −321		tests/regression/instance.icry.stdout
+4 −6		tests/regression/primes.icry.stdout
+10 −11		tests/regression/tc-errors.icry.stdout
+19 −0		tests/regression/twinmult.cry
+3 −0		tests/regression/twinmult.icry
+19 −0		tests/regression/twinmult.icry.stdout
+1 −1		utils/CryTC.hs
+1 −1		cryptol-saw-core/src/Verifier/SAW/Cryptol.hs
+6 −6		cryptol-saw-core/src/Verifier/SAW/CryptolEnv.hs