Integrate higher-rank polymorphism on block parameters #298
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
b-studios
approved these changes
Nov 7, 2023
|
Approved by the Effekt committee in person :) |
b-studios
reviewed
Nov 7, 2023
| @@ -228,7 +228,9 @@ class EffektParsers(positions: Positions) extends EffektLexers(positions) { | |||
| ) | |||
|
|
|||
| lazy val functionArg: P[BlockLiteral] = | |||
| ( `{` ~> lambdaParams ~ (`=>` ~/> stmts <~ `}`) ^^ { case (vps, bps) ~ body => BlockLiteral(Nil, vps, bps, body) : BlockLiteral } | |||
| ( `{` ~> (`[` ~> manySep(idDef, `,`) <~ `]`).? ~ lambdaParams ~ (`=>` ~/> stmts <~ `}`) ^^ { | |||
There was a problem hiding this comment.
@dvdvgt maybe we can refactor this to add types to lambdaParams
There was a problem hiding this comment.
Or at the very least use existing maybeTypeParams :)
b-studios
reviewed
Nov 7, 2023
| ( (`(` ~> manySep(valueType, `,`) <~ `)`) ~ many(blockTypeParam) ~ (`=>` ~/> primValueType) ~ maybeEffects ^^ FunctionType.apply | ||
| | some(blockTypeParam) ~ (`=>` ~/> primValueType) ~ maybeEffects ^^ { case tpes ~ ret ~ eff => FunctionType(Nil, tpes, ret, eff) } | ||
| | primValueType ~ (`=>` ~/> primValueType) ~ maybeEffects ^^ { case t ~ ret ~ eff => FunctionType(List(t), Nil, ret, eff) } | ||
| ( (`[` ~> manySep(idDef, `,`) <~ `]`).? ~ (`(` ~> manySep(valueType, `,`) <~ `)`).? ~ many(blockTypeParam) ~ (`=>` ~/> primValueType) ~ maybeEffects ^^ { |
There was a problem hiding this comment.
@dvdvgt maybe have auxiliary definition for typeParam to make the role of Id explicit?
There was a problem hiding this comment.
I just noticed, we already have maybeTypeParams for this.
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 PR resolves #246 and integrates higher-rank polymorphism on block parameters. This only required a few changes:
[A]List[A] => Intis instead pretty printed as[A](List[A]) => Int.