aboutsummaryrefslogtreecommitdiff
path: root/src/dotty/tools/dotc/printing/RefinedPrinter.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2015-07-20 10:36:53 +0200
committerMartin Odersky <odersky@gmail.com>2015-09-18 18:10:39 +0200
commit2634498cede2525b07c1e40fbad0f5ae0cf96fda (patch)
treef4f24517a670557bc9a85433a72bffafc167680c /src/dotty/tools/dotc/printing/RefinedPrinter.scala
parentcaae19ba37b7b05b2fd2e1edbad62ee9bf46c5e4 (diff)
downloaddotty-2634498cede2525b07c1e40fbad0f5ae0cf96fda.tar.gz
dotty-2634498cede2525b07c1e40fbad0f5ae0cf96fda.tar.bz2
dotty-2634498cede2525b07c1e40fbad0f5ae0cf96fda.zip
Rename Apply -> hkApply
Want to have a unique name for Apply, so that tests for higher-kinded types become cheaper.
Diffstat (limited to 'src/dotty/tools/dotc/printing/RefinedPrinter.scala')
-rw-r--r--src/dotty/tools/dotc/printing/RefinedPrinter.scala8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/dotty/tools/dotc/printing/RefinedPrinter.scala b/src/dotty/tools/dotc/printing/RefinedPrinter.scala
index 70fab7e0f..a46665ec0 100644
--- a/src/dotty/tools/dotc/printing/RefinedPrinter.scala
+++ b/src/dotty/tools/dotc/printing/RefinedPrinter.scala
@@ -122,7 +122,7 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
return (toTextLocal(tycon) ~ "[" ~ Text(args map argText, ", ") ~ "]").close
}
if (tp.isSafeLambda) {
- val (prefix, body, bindings) = extractApply(tp)
+ val (prefix, body, bindings) = decomposeHKApply(tp)
prefix match {
case prefix: TypeRef if prefix.symbol.isLambdaTrait && body.exists =>
return typeLambdaText(prefix.symbol, body, bindings)
@@ -184,9 +184,9 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
* without a prefix, because the latter print nicer.
*
*/
- def extractApply(tp: Type): (Type, Type, List[(Name, Type)]) = tp.stripTypeVar match {
+ def decomposeHKApply(tp: Type): (Type, Type, List[(Name, Type)]) = tp.stripTypeVar match {
case tp @ RefinedType(parent, name) =>
- if (name == tpnme.Apply) {
+ if (name == tpnme.hkApply) {
// simplify arguments so that parameters just print HK$i and not
// LambdaI{...}.HK$i
val simplifyArgs = new TypeMap {
@@ -199,7 +199,7 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
}
(parent, simplifyArgs(tp.refinedInfo.followTypeAlias), Nil)
} else if (name.isLambdaArgName) {
- val (prefix, body, argBindings) = extractApply(parent)
+ val (prefix, body, argBindings) = decomposeHKApply(parent)
(prefix, body, (name, tp.refinedInfo) :: argBindings)
} else (tp, NoType, Nil)
case _ =>