Add support for prelude files #160
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
bclement-ocp
force-pushed
the
bclement/prelude_files
branch
from
02ebf8e
to
c534bb3
Compare
|
(V0 messed up the lang inference exception handling, it is fixed now, sorry for the noise) |
Gbury
requested changes
Jun 12, 2023
Gbury
requested changes
Jun 13, 2023
There was a problem hiding this comment.
I think we're almost there: I left a few comments, but aside from that I think we're missing some kind of tests to check whether this is working as intended. The simplest would probably be to add a --prelude option to the dolmen cli and use it in a test, for instance to test a combination of the ae fpa prelude and a smtlib2 file ?
|
You might need to rebase on |
bclement-ocp
force-pushed
the
bclement/prelude_files
branch
from
e109bbd
to
e685dc6
Compare
bclement-ocp
force-pushed
the
bclement/prelude_files
branch
3 times, most recently
from
808150b
to
929b753
Compare
|
@Gbury This should be good to go now |
Gbury
reviewed
Jun 15, 2023
This improves Dolmen's prelude support by allowing to provide preludes as files, rather than as statements. The prelude files are parsed separately from the main file, and can use a different language from the main file. The `logic_file` is reset to the appropriate file during statement generation to ensure that the typer always uses the right language. Since a single pipe is now expected to potentially include statements from different languages, the `additional_builtins` in the typer is passed the current language as an additional argument, allowing to define language-specific additional builtins. Since this is already a breaking change, `additional_builtins` is also changed from a reference to a `State` key for consistency with the rest of Dolmen's API.
bclement-ocp
force-pushed
the
bclement/prelude_files
branch
from
929b753
to
633c6bd
Compare
Gbury
approved these changes
Jun 15, 2023
bclement-ocp
added a commit
to bclement-ocp/alt-ergo
that referenced
this pull request
Jun 15, 2023
Compatibility with the changes in Gbury/dolmen#160
bclement-ocp
added a commit
to OCamlPro/alt-ergo
that referenced
this pull request
Jun 15, 2023
Compatibility with the changes in Gbury/dolmen#160
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 improves Dolmen's prelude support by allowing to provide preludes as files, rather than as statements.
The prelude files are parsed separately from the main file, and can use a different language from the main file. The
logic_fileis reset to the appropriate file during statement generation to ensure that the typer always uses the right language.Since a single pipe is now expected to potentially include statements from different languages, the
additional_builtinsin the typer is passed the current language as an additional argument, allowing to define language-specific additional builtins. Since this is already a breaking change,additional_builtinsis also changed from a reference to aStatekey for consistency with the rest of Dolmen's API.