Skip to content

Commit

Permalink
Merge pull request #2079 from GaloisInc/bump-latest-cryptol-submodule…
Browse files Browse the repository at this point in the history
…-commit

Bump to latest `cryptol` submodule commit
  • Loading branch information
RyanGlScott authored Jul 19, 2024
2 parents 125f9a6 + f513938 commit ee655b4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions cryptol-saw-core/src/Verifier/SAW/CryptolEnv.hs
Original file line number Diff line number Diff line change
Expand Up @@ -225,9 +225,9 @@ initCryptolEnv sc = do
termEnv <- genTermEnv sc modEnv cryEnv0

return CryptolEnv
{ eImports = [ (OnlyPublic, P.Import preludeName Nothing Nothing Nothing)
, (OnlyPublic, P.Import preludeReferenceName (Just preludeReferenceName) Nothing Nothing)
, (OnlyPublic, P.Import arrayName Nothing Nothing Nothing)
{ eImports = [ (OnlyPublic, P.Import preludeName Nothing Nothing Nothing Nothing)
, (OnlyPublic, P.Import preludeReferenceName (Just preludeReferenceName) Nothing Nothing Nothing)
, (OnlyPublic, P.Import arrayName Nothing Nothing Nothing Nothing)
]
, eModuleEnv = modEnv
, eExtraNames = mempty
Expand Down Expand Up @@ -529,7 +529,7 @@ importModule sc env src as vis imps = do

return $
updateFFITypes m
env { eImports = (vis, P.Import (T.mName m) as imps Nothing)
env { eImports = (vis, P.Import (T.mName m) as imps Nothing Nothing)
: eImports env
, eModuleEnv = modEnv'
, eTermEnv = newTermEnv
Expand Down
2 changes: 1 addition & 1 deletion deps/cryptol
Submodule cryptol updated 85 files
+5 −1 .gitignore
+40 −0 CHANGES.md
+2 −2 bench/Main.hs
+1 −1 cry
+8 −0 cryptol-remote-api/CHANGELOG.md
+2 −2 cryptol-remote-api/cryptol-eval-server/Main.hs
+1 −1 cryptol-remote-api/docs/Errors.rst
+7 −7 cryptol-remote-api/python/poetry.lock
+23 −0 cryptol-remote-api/python/tests/cryptol/test_cryptol_api.py
+17 −2 cryptol-remote-api/src/CryptolServer.hs
+3 −1 cryptol-remote-api/src/CryptolServer/Check.hs
+2 −3 cryptol-remote-api/src/CryptolServer/EvalExpr.hs
+7 −6 cryptol-remote-api/src/CryptolServer/Exceptions.hs
+2 −1 cryptol-remote-api/src/CryptolServer/Sat.hs
+7 −7 cryptol/Main.hs
+28 −27 cryptol/REPL/Haskeline.hs
+321 −0 dev/dev_setup.sh
+23 −0 dev/ubuntu20.04.Dockerfile
+23 −0 dev/ubuntu22.04.Dockerfile
+4 −5 docs/ProgrammingCryptol/crashCourse/CrashCourse.tex
+14 −3 src/Cryptol/ModuleSystem.hs
+19 −2 src/Cryptol/ModuleSystem/Base.hs
+1 −1 src/Cryptol/ModuleSystem/Binds.hs
+93 −15 src/Cryptol/ModuleSystem/Env.hs
+21 −9 src/Cryptol/ModuleSystem/Interface.hs
+8 −5 src/Cryptol/ModuleSystem/Monad.hs
+0 −1 src/Cryptol/ModuleSystem/Name.hs
+29 −19 src/Cryptol/ModuleSystem/Renamer/ImplicitImports.hs
+19 −14 src/Cryptol/Parser.y
+25 −12 src/Cryptol/Parser/AST.hs
+153 −7 src/Cryptol/Parser/ExpandPropGuards.hs
+1 −1 src/Cryptol/Parser/LexerUtils.hs
+3 −3 src/Cryptol/Parser/NoPat.hs
+44 −8 src/Cryptol/Parser/ParserUtils.hs
+3 −3 src/Cryptol/PrimeEC.hs
+497 −161 src/Cryptol/REPL/Command.hs
+5 −2 src/Cryptol/REPL/Help.hs
+34 −33 src/Cryptol/REPL/Monad.hs
+36 −7 src/Cryptol/TypeCheck/AST.hs
+0 −25 src/Cryptol/TypeCheck/Error.hs
+15 −43 src/Cryptol/TypeCheck/Infer.hs
+3 −2 src/Cryptol/TypeCheck/Interface.hs
+1 −1 src/Cryptol/TypeCheck/Kind.hs
+6 −0 src/Cryptol/TypeCheck/ModuleInstance.hs
+6 −3 src/Cryptol/TypeCheck/Monad.hs
+1 −1 src/Cryptol/TypeCheck/Type.hs
+12 −6 src/Cryptol/Utils/Ident.hs
+1 −1 tests/constraint-guards/noNested.icry.stdout
+1 −0 tests/constraint-guards/noTypeSig.cry
+1 −0 tests/constraint-guards/noTypeSig.icry
+7 −0 tests/constraint-guards/noTypeSig.icry.stdout
+5 −0 tests/constraint-guards/noTypeSigNested.cry
+1 −0 tests/constraint-guards/noTypeSigNested.icry
+7 −0 tests/constraint-guards/noTypeSigNested.icry.stdout
+24 −0 tests/docstrings/T01.cry
+2 −0 tests/docstrings/T01.icry
+20 −0 tests/docstrings/T01.icry.stdout
+31 −0 tests/docstrings/T02.cry
+2 −0 tests/docstrings/T02.icry
+17 −0 tests/docstrings/T02.icry.stdout
+20 −0 tests/docstrings/T03.cry
+2 −0 tests/docstrings/T03.icry
+6 −0 tests/docstrings/T03.icry.stdout
+16 −0 tests/docstrings/T04.cry
+2 −0 tests/docstrings/T04.icry
+7 −0 tests/docstrings/T04.icry.stdout
+0 −14 tests/issues/issue1455_3.icry.stdout
+0 −14 tests/issues/issue1455_3.icry.stdout.mingw32
+5 −0 tests/issues/issue1593.cry
+1 −0 tests/issues/issue1593.icry
+7 −0 tests/issues/issue1593.icry.stdout
+4 −0 tests/issues/issue1675/issue1675.icry
+6 −0 tests/issues/issue1675/issue1675.icry.stdout
+4 −0 tests/issues/issue1693.cry
+1 −0 tests/issues/issue1693.icry
+12 −0 tests/issues/issue1693.icry.stdout
+11 −0 tests/issues/issue_1691.cry
+2 −0 tests/issues/issue_1691.icry
+4 −0 tests/issues/issue_1691.icry.stdout
+12 −0 tests/issues/issue_1691_2.cry
+2 −0 tests/issues/issue_1691_2.icry
+4 −0 tests/issues/issue_1691_2.icry.stdout
+2 −2 tests/parser/docs.cry
+2 −0 tests/parser/docs.icry
+10 −0 tests/parser/docs.icry.stdout

0 comments on commit ee655b4

Please sign in to comment.