Coq translator: fix array literal support #1815
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…tput types of Coq Definitions generated from cryptol modules are annotated with the translations of their types
eddywestbrook
added
subsystem: cryptol-saw-core
RyanGlScott
reviewed
Feb 8, 2023
| @@ -666,26 +673,29 @@ translateTermToDocWith :: | |||
| TranslationReader -> | |||
| [String] -> | |||
| [String] -> | |||
| (Coq.Term -> Doc ann) -> | |||
| Term -> | |||
| (Coq.Term -> Coq.Term -> Doc ann) -> | |||
There was a problem hiding this comment.
Worth stating in a comment what these two Terms represent, since it's not obvious unless you stare at the code a bit.
There was a problem hiding this comment.
Ooh, good point. In fact, there probably needs to be even more haddock as well...
There was a problem hiding this comment.
Does Haddock now support -- ^ after the arrow correctly?
| @@ -102,7 +103,7 @@ From Coq Require Import String. | |||
| From Coq Require Import Vectors.Vector. | |||
| From CryptolToCoq Require Import SAWCoreScaffolding. | |||
| From CryptolToCoq Require Import #{vectorModule}. | |||
| Import ListNotations. | |||
| Import VectorNotations. | |||
There was a problem hiding this comment.
It might be worth expanding the Haddock to state why we import VectorNotations here: it's because we rely on this notation when translating array values.
There was a problem hiding this comment.
Sure, that makes sense
RyanGlScott
approved these changes
Feb 8, 2023
eddywestbrook
added
the
PR: ready to merge
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR addresses issue #1813 by changing the translation of SAW core array literals to use Coq vector literals, rather than using
Vector.of_listapplied to an array literal. This ensures that the type of the generated vector literal does not depend on its input (which was the problem noted by #1813).As also suggested in the discussion in that issue, this PR adds output types to Coq
Definitions that are generated by translating cryptol modules.