Allow type synonyms inside other type synonyms #1986
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
Instantiate the body of a type synonym declaration with the existing type synonym map before adding it to the map, so that the map never contains any uninstantiated type synonyms.
RyanGlScott
approved these changes
Nov 20, 2023
src/SAWScript/MGU.hs
Outdated
| @@ -382,10 +387,13 @@ instance Instantiate Type where | |||
| TySkolemVar _ _ -> ty | |||
| LType pos ty' -> LType pos (instantiate nts ty') | |||
|
|
|||
| instantiateType :: Instantiate t => Map Name Type -> t -> t | |||
| instantiateType tenv = instantiate (M.assocs tenv) | |||
There was a problem hiding this comment.
This does almost the exact same thing as the instantiate method of the Instantiate class, except that this function uses a Map Name Type instead of [(Name, Type)]. I think using a Map makes more sense here—any objection to simply changing the type signature of instantiate to use a Map instead?
Either way, it would be worth leaving a comment saying precisely what we are instantiating. (Particularly, we're instantiating typedefs.)
There was a problem hiding this comment.
Ok, I've changed instantiate to use Map. It seems like it's not only used with typedefs, so I wrote a more general description.
RyanGlScott
approved these changes
Dec 5, 2023
qsctr
added
the
PR: ready to merge
RyanGlScott
added a commit
that referenced
this pull request
Feb 1, 2024
RyanGlScott
added a commit
that referenced
this pull request
Feb 3, 2024
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.
Instantiate the body of a type synonym declaration with the existing type synonym map before adding it to the map, so that the map never contains any uninstantiated type synonyms.
Fixes #1985.