Names and definitions for Lambdas

Adding names and definitions for the Lambda scheme to hk types.
Also add HigherKinded flag for HK type parameters and abstract types.

1 files changed, 7 insertions, 5 deletions

diff --git a/src/dotty/tools/dotc/core/NameOps.scala b/src/dotty/tools/dotc/core/NameOps.scala
index 22a7e5734..187946590 100644
--- a/src/dotty/tools/dotc/core/NameOps.scala
+++ b/src/dotty/tools/dotc/core/NameOps.scala
@@ -87,13 +87,15 @@ object NameOps {
         name.last == '=' && name.head != '=' && isOperatorPart(name.head)
     }
 
-    /** Is this the name of a higher-kinded type parameter? */
-    def isHkParamName: Boolean = name(0) == '_' && name.startsWith(HK_PARAM_PREFIX)
+    /** Is this the name of a higher-kinded type parameter of a Lambda? */
+    def isLambdaArgName = name.startsWith(tpnme.LAMBDA_ARG_PREFIX)
+    def isHkParamName: Boolean = name(0) == '_' && name.startsWith(HK_PARAM_PREFIX) // tbr
 
     /** The index of the higher-kinded type parameter with this name.
-     *  Pre: isHkParamName.
+     *  Pre: isLambdaArgName.
      */
-    def hkParamIndex: Int = name.drop(name.lastIndexOf('$') + 1).toString.toInt
+    def lambdaArgIndex: Int = name.drop(name.lastIndexOf('$') + 1).toString.toInt
+    def hkParamIndex: Int = name.drop(name.lastIndexOf('$') + 1).toString.toInt // tbr
 
     /** If the name ends with $nn where nn are
       * all digits, strip the $ and the digits.
@@ -181,7 +183,7 @@ object NameOps {
      *  by this name.
      *  @pre The name is a higher-kinded trait name, i.e. it starts with HK_TRAIT_PREFIX
      */
-    def hkVariances: List[Int] = {
+    def hkVariances: List[Int] = { // tbr
       def varianceOfSuffix(suffix: Char): Int = {
         val idx = tpnme.varianceSuffixes.indexOf(suffix)
         assert(idx >= 0)