Add support for var in refinements
#19982
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
hamzaremmal
added
the
needs-minor-release
odersky
requested changes
Mar 23, 2024
| @@ -1943,12 +1943,26 @@ object desugar { | |||
| case AndType(tp1, tp2) => stripToCore(tp1) ::: stripToCore(tp2) | |||
| case _ => defn.AnyType :: Nil | |||
| } | |||
|
|
|||
| val refinements1 = refinements.flatMap { | |||
There was a problem hiding this comment.
It's more efficient to make this a refinements.mapConserve(...).flatten. If there are no var refinements this will then never copy the trees.
| case tree: ValDef if tree.mods.is(Mutable) => | ||
| val getter = | ||
| cpy.DefDef(tree)(name = tree.name, paramss = Nil, tpt = tree.tpt, rhs = tree.rhs) | ||
| .withMods(Modifiers(tree.mods.flags & (AccessFlags | Synthetic), tree.mods.privateWithin)) |
There was a problem hiding this comment.
This expression appears twice and could be lifted out. Also, one can use withFlags.
val mods1 = tree.mods.withFlags(tree.mods.flags & AccessFlags | Synthetic)| val setter = | ||
| cpy.DefDef(tree)(name = tree.name.setterName, paramss = (setterParam :: Nil) :: Nil, tpt = untpd.scalaUnit, rhs = EmptyTree) | ||
| .withMods(Modifiers(tree.mods.flags & (AccessFlags | Synthetic), tree.mods.privateWithin)) | ||
| List(getter, setter) |
There was a problem hiding this comment.
If we go with mapConserve, this will be Thicket(getter, setter)
| cpy.DefDef(tree)(name = tree.name.setterName, paramss = (setterParam :: Nil) :: Nil, tpt = untpd.scalaUnit, rhs = EmptyTree) | ||
| .withMods(Modifiers(tree.mods.flags & (AccessFlags | Synthetic), tree.mods.privateWithin)) | ||
| List(getter, setter) | ||
| case tree => tree :: Nil |
There was a problem hiding this comment.
If we go with mapConserve, this will be tree.
| @@ -431,6 +431,7 @@ EndMarkerTag ::= id | ‘if’ | ‘while’ | ‘for’ | ‘match’ | | |||
| ### Definitions | |||
| ```ebnf | |||
| RefineDcl ::= ‘val’ ValDcl | |||
| | ‘var’ ValDcl | |||
There was a problem hiding this comment.
Same change needed in reference/syntax.md.
Co-authored-by: Anna Herlihy <[email protected]> Co-authored-by: Nicolas Stucki <[email protected]>
odersky
approved these changes
Apr 3, 2024
|
This has been decided to be included in the 3.5.0 release. |
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.
Closes #19809