Skip to content

Improve defn.PolyFunctionOf extractor #18442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 30, 2023
Merged

Improve defn.PolyFunctionOf extractor #18442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/cc/CheckCaptures.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -808,7 +808,7 @@ class CheckCaptures extends Recheck, SymTransformer:

try
val eres = expected.dealias.stripCapturing match
case RefinedType(_, _, rinfo: PolyType) => rinfo.resType
case defn.PolyFunctionOf(rinfo: PolyType) => rinfo.resType
case expected: PolyType => expected.resType
case _ => WildcardType

Expand Down
11 changes: 6 additions & 5 deletions compiler/src/dotty/tools/dotc/core/Definitions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1140,11 +1140,12 @@ class Definitions {
*
* Pattern: `PolyFunction { def apply: $mt }`
*/
def unapply(ft: Type)(using Context): Option[MethodicType] = ft.dealias match
case RefinedType(parent, nme.apply, mt: MethodicType)
if parent.derivesFrom(defn.PolyFunctionClass) =>
Some(mt)
case _ => None
def unapply(tpe: RefinedType)(using Context): Option[MethodOrPoly] =
tpe.refinedInfo match
case mt: MethodOrPoly
if tpe.refinedName == nme.apply && tpe.parent.derivesFrom(defn.PolyFunctionClass) =>
Some(mt)
case _ => None

private def isValidPolyFunctionInfo(info: Type)(using Context): Boolean =
def isValidMethodType(info: Type) = info match
Expand Down
5 changes: 3 additions & 2 deletions compiler/src/dotty/tools/dotc/typer/Typer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1648,10 +1648,11 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
def typedPolyFunctionValue(tree: untpd.PolyFunction, pt: Type)(using Context): Tree =
val untpd.PolyFunction(tparams: List[untpd.TypeDef] @unchecked, fun) = tree: @unchecked
val untpd.Function(vparams: List[untpd.ValDef] @unchecked, body) = fun: @unchecked
val dpt = pt.dealias

// If the expected type is a polymorphic function with the same number of
// type and value parameters, then infer the types of value parameters from the expected type.
val inferredVParams = pt match
val inferredVParams = dpt match
case defn.PolyFunctionOf(poly @ PolyType(_, mt: MethodType))
if tparams.lengthCompare(poly.paramNames) == 0 && vparams.lengthCompare(mt.paramNames) == 0 =>
vparams.zipWithConserve(mt.paramInfos): (vparam, formal) =>
Expand All @@ -1667,7 +1668,7 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
case _ =>
vparams

val resultTpt = pt.dealias match
val resultTpt = dpt match
case defn.PolyFunctionOf(poly @ PolyType(_, mt: MethodType)) =>
untpd.InLambdaTypeTree(isResult = true, (tsyms, vsyms) =>
mt.resultType.substParams(mt, vsyms.map(_.termRef)).substParams(poly, tsyms.map(_.typeRef)))
Expand Down