Changing opaque type to abstract type #3990
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
RustanLeino
requested changes
May 18, 2023
| @@ -204,7 +204,7 @@ declared identifier. | |||
|
|
|||
| Add(ErrorId.p_misplaced_ellipsis_in_newtype, | |||
| @" | |||
| There are limitations on refining a newtype, namely that the base type cannot be changed. You can change an opaque type into a newtype, however. | |||
| There are limitations on refining a newtype, namely that the base type cannot be changed. You can change an abstract type into a newtype, however. | |||
There was a problem hiding this comment.
This reads very nice with "abstract type" instead of "opaque type".
Source/DafnyCore/AST/Types/Types.cs
Outdated
| @@ -2371,7 +2371,7 @@ public UserDefinedType(TypeParameter tp) | |||
|
|
|||
| /// <summary> | |||
| /// This constructor constructs a resolved type parameter (but shouldn't be called if "tp" denotes | |||
| /// the .TheType of an opaque type -- use the (OpaqueType_AsParameter, OpaqueTypeDecl, List(Type)) | |||
| /// the .TheType of an abstract type -- use the (AbstractType_AsParameter, AbstractTypeDecl, List(Type)) | |||
There was a problem hiding this comment.
This entire parenthetic remark is stale and can be deleted. (The .TheType field and OpaqueType_AsParameter thing went away several years ago.)
| @@ -8296,17 +8296,17 @@ public ForceCheckToken(IToken tok) | |||
| } | |||
| } | |||
|
|
|||
| Bpl.Expr trTypeParamOrOpaqueType(TopLevelDecl x, List<Type>/*?*/ tyArguments = null) { | |||
| Contract.Requires(x is TypeParameter || x is OpaqueTypeDecl); | |||
| Bpl.Expr trTypeParamOrAbstractType(TopLevelDecl x, List<Type>/*?*/ tyArguments = null) { | |||
There was a problem hiding this comment.
Please capitalize trTypeParamOrAbstractType to TrTypeParamOrAbstractType, since you're editing it anyway. And while you're at it, would you mind also renaming method nameTypeParam to NameTypeParam just above it?
|
This is an excellent renaming, thanks for thinking about it and implementing it ! |
RustanLeino
approved these changes
May 19, 2023
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.
Changing the ambiguous terminology 'opaque type' to 'abstract type'
By submitting this pull request, I confirm that my contribution is made under the terms of the MIT license.