Rename variables

Author: nicolasstucki

compiler/src/dotty/tools/dotc/core/tasty/TastyClassName.scala

@@ -27,29 +27,29 @@ class TastyClassName(bytes: Array[Byte]) {
         val idx = readNat()
         nameAtRef(NameRef(idx))
       }
-      def readNames(pack: TermName): (TermName, TermName) = {
+      def readNames(packageName: TermName): (TermName, TermName) = {
         val tag = readByte()
         if (tag >= firstLengthTreeTag) {
           val len = readNat()
           val end = currentAddr + len
           tag match {
             case TYPEDEF =>
-              val name = readName()
+              val className = readName()
               goto(end)
-              (pack, name)
+              (packageName, className)
             case IMPORT | VALDEF =>
               goto(end)
-              readNames(pack)
+              readNames(packageName)
             case PACKAGE =>
-              readNames(pack)
+              readNames(packageName)
           }
         }
         else tag match {
           case TERMREFpkg | TYPEREFpkg =>
-            val packName = readName()
-            readNames(packName)
+            val subPackageName = readName()
+            readNames(subPackageName)
           case _ =>
-            readNames(pack)
+            readNames(packageName)
         }
       }
       readNames(nme.EMPTY_PACKAGE)

compiler/src/dotty/tools/dotc/fromtasty/TastyFileUtil.scala

@@ -26,8 +26,8 @@ object TastyFileUtil {
     assert(Files.exists(path))
     val bytes = Files.readAllBytes(path)
     val names = new core.tasty.TastyClassName(bytes).readName()
-    names.map { case (packName, className) =>
-      val fullName = s"$packName.${className.lastPart}"
+    names.map { case (packageName, className) =>
+      val fullName = s"$packageName.${className.lastPart}"
       val classInPath = fullName.replace(".", io.File.separator) + ".tasty"
       val classpath = path.toString.replace(classInPath, "")
       (classpath, fullName)