Extend type bounds #3059
Open
Extend type bounds #3059
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
Cadence Benchstat comparisonThis branch with compared with the base branch onflow:master commit a0dd6cf Collapsed results for better readability
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
6 tasks
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #3059 +/- ##
==========================================
- Coverage 80.74% 80.61% -0.14%
==========================================
Files 380 381 +1
Lines 93307 93886 +579
==========================================
+ Hits 75339 75684 +345
- Misses 15260 15499 +239
+ Partials 2708 2703 -5
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
|
cc @turbolent do we need to implement importing/exporting if the only places we are currently using the expanded type bounds is in builtin types? |
dsainati1
reviewed
Apr 3, 2024
Comment on lines
+2192
to
+2193
| // TODO: implement this for generalized bounds | ||
| return cadence.NewTypeParameter(name, typeBound), nil |
There was a problem hiding this comment.
This should be sufficient to support decoding any function types that aren't one of the small set of builtins that this PR changes.
Comment on lines
+1948
to
+1959
| // TODO: perhaps generalize this? | ||
| if typeParameter.TypeBound == nil { | ||
| return e.encodeNullableTypeValue(nil, visited) | ||
| } | ||
|
|
||
| subTypeBound, isSubtypeBound := typeParameter.TypeBound.(cadence.SubtypeTypeBound) | ||
| if !isSubtypeBound { | ||
| panic(cadenceErrors.NewUnexpectedError("cannot store non-subtype bounded function type parameter %s", typeParameter.TypeBound)) | ||
| } | ||
|
|
||
| // element 1: type as type-bound. | ||
| return e.encodeNullableTypeValue(typeParameter.TypeBound, visited) | ||
| return e.encodeNullableTypeValue(subTypeBound.Type, visited) |
There was a problem hiding this comment.
This should be sufficient to support encoding any function types that aren't one of the small set of builtins that this PR changes.
| if typeBound != nil { | ||
| convertedParameterTypeBound = ExportMeteredType(gauge, typeBound, results) | ||
| convertedParameterTypeBound = exportTypeBound(gauge, typeBound, results) |
There was a problem hiding this comment.
Perhaps I just couldn't find it, but is there an equivalent importFunctionType or similar that also needs to change here?
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.
Work towards https://github.com/dapperlabs/cadence-internal/issues/188
Description
See https://github.com/dapperlabs/cadence-internal/issues/188#issuecomment-1906752366
Currently, type bounds for type parameters may only be subtype relationships.
Generalize the type bounds feature to support:
T <: U)T <: U && T != U)U <: T)U <: T && T != U)X && Y)X || Y)This also replaces some existing cases that were using
TypeArgumentsCheckto use this new generalized type bound infrastructure. In particular:Capabilities.get,InclusiveRangeandrevertibleRandom.TODO
masterbranchFiles changedin the Github PR explorer