Move inline code to new package

Author: odersky

compiler/src/dotty/tools/dotc/core/Contexts.scala

@@ -14,7 +14,8 @@ import Uniques._
 import ast.Trees._
 import ast.untpd
 import util.{NoSource, SimpleIdentityMap, SourceFile, HashSet, ReusableInstance}
-import typer.{Implicits, ImportInfo, Inliner, SearchHistory, SearchRoot, TypeAssigner, Typer, Nullables}
+import typer.{Implicits, ImportInfo, SearchHistory, SearchRoot, TypeAssigner, Typer, Nullables}
+import inlines.Inliner
 import Nullables._
 import Implicits.ContextualImplicits
 import config.Settings._

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

@@ -830,7 +830,7 @@ class TreeUnpickler(reader: TastyReader,
         else if sym.isInlineMethod && !sym.is(Deferred) then
           // The body of an inline method is stored in an annotation, so no need to unpickle it again
           new Trees.Lazy[Tree] {
-            def complete(using Context) = typer.Inlines.bodyToInline(sym)
+            def complete(using Context) = inlines.Inlines.bodyToInline(sym)
           }
         else
           readLater(end, _.readTerm())

compiler/src/dotty/tools/dotc/typer/InlineReducer.scala renamed to compiler/src/dotty/tools/dotc/inlines/InlineReducer.scala

@@ -1,6 +1,6 @@
 package dotty.tools
 package dotc
-package typer
+package inlines
 
 import core._
 import ast.*
@@ -12,6 +12,7 @@ import Constants._
 import StagingContext._
 import StdNames._
 import transform.SymUtils._
+import typer.*
 import Contexts._
 import Names.{Name, TermName}
 import NameKinds.{InlineAccessorName, InlineBinderName, InlineScrutineeName, BodyRetainerName}

compiler/src/dotty/tools/dotc/typer/Inliner.scala renamed to compiler/src/dotty/tools/dotc/inlines/Inliner.scala

@@ -1,6 +1,6 @@
 package dotty.tools
 package dotc
-package typer
+package inlines
 
 import ast.{TreeInfo, tpd, _}
 import core._
@@ -12,6 +12,7 @@ import Constants._
 import StagingContext._
 import StdNames._
 import transform.SymUtils._
+import typer.*
 import Contexts._
 import Names.{Name, TermName}
 import NameKinds.{InlineAccessorName, InlineBinderName, InlineScrutineeName, BodyRetainerName}
@@ -38,7 +39,7 @@ import scala.annotation.constructorOnly
 object Inliner:
   import tpd._
 
-  private[typer] type DefBuffer = mutable.ListBuffer[ValOrDefDef]
+  private[inlines] type DefBuffer = mutable.ListBuffer[ValOrDefDef]
 
   /** Very similar to TreeInfo.isPureExpr, but with the following inliner-only exceptions:
    *  - synthetic case class apply methods, when the case class constructor is empty, are
@@ -141,7 +142,7 @@ class Inliner(val call: tpd.Tree)(using Context):
   /** A map from references to (type and value) parameters of the inlineable method
    *  to their corresponding argument or proxy references, as given by `paramBinding`.
    */
-  private[typer] val paramProxy = new mutable.HashMap[Type, Type]
+  private[inlines] val paramProxy = new mutable.HashMap[Type, Type]
 
   /** A map from the classes of (direct and outer) this references in `rhsToInline`
    *  to references of their proxies.
@@ -161,7 +162,7 @@ class Inliner(val call: tpd.Tree)(using Context):
   /** A buffer for bindings that define proxies for actual arguments */
   private val bindingsBuf = new mutable.ListBuffer[ValOrDefDef]
 
-  private[typer] def newSym(name: Name, flags: FlagSet, info: Type)(using Context): Symbol =
+  private[inlines] def newSym(name: Name, flags: FlagSet, info: Type)(using Context): Symbol =
     newSymbol(ctx.owner, name, flags, info, coord = call.span)
 
   /** A binding for the parameter of an inline method. This is a `val` def for
@@ -173,7 +174,7 @@ class Inliner(val call: tpd.Tree)(using Context):
    *  @param arg         the argument corresponding to the parameter
    *  @param buf         the buffer to which the definition should be appended
    */
-  private[typer] def paramBindingDef(name: Name, formal: Type, arg0: Tree,
+  private[inlines] def paramBindingDef(name: Name, formal: Type, arg0: Tree,
                               buf: DefBuffer)(using Context): ValOrDefDef = {
     val isByName = formal.dealias.isInstanceOf[ExprType]
     val arg = arg0 match {
@@ -706,7 +707,7 @@ class Inliner(val call: tpd.Tree)(using Context):
     }
   }
 
-  private[typer] def tryInlineArg(tree: Tree)(using Context): Tree = tree match {
+  private[inlines] def tryInlineArg(tree: Tree)(using Context): Tree = tree match {
     case InlineableArg(rhs) =>
       inlining.println(i"inline arg $tree -> $rhs")
       rhs

compiler/src/dotty/tools/dotc/typer/Inlines.scala renamed to compiler/src/dotty/tools/dotc/inlines/Inlines.scala

@@ -1,6 +1,6 @@
 package dotty.tools
 package dotc
-package typer
+package inlines
 
 import ast.{TreeInfo, tpd, _}
 import core._
@@ -12,6 +12,7 @@ import Constants._
 import StagingContext._
 import StdNames._
 import transform.SymUtils._
+import typer.*
 import Contexts._
 import Names.{Name, TermName}
 import NameKinds.{InlineAccessorName, InlineBinderName, InlineScrutineeName, BodyRetainerName}
@@ -41,7 +42,7 @@ object Inlines:
   /** An exception signalling that an inline info cannot be computed due to a
    *  cyclic reference. i14772.scala shows a case where this happens.
    */
-  private[typer] class MissingInlineInfo extends Exception
+  private[dotc] class MissingInlineInfo extends Exception
 
   /** `sym` is an inline method with a known body to inline.
    */

compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala

@@ -16,7 +16,7 @@ import Types._
 import Symbols._
 import Names._
 import NameOps._
-import typer.Inlines
+import inlines.Inlines
 import transform.ValueClasses
 import transform.SymUtils._
 import dotty.tools.io.File

compiler/src/dotty/tools/dotc/transform/Erasure.scala

@@ -19,7 +19,7 @@ import core.Constants._
 import core.Definitions._
 import core.Annotations.BodyAnnotation
 import typer.NoChecking
-import typer.Inlines
+import inlines.Inlines
 import typer.ProtoTypes._
 import typer.ErrorReporting.errorTree
 import typer.Checking.checkValue

compiler/src/dotty/tools/dotc/transform/InlineVals.scala

@@ -8,7 +8,7 @@ import dotty.tools.dotc.core.Symbols._
 import dotty.tools.dotc.core.Flags._
 import dotty.tools.dotc.core.Types._
 import dotty.tools.dotc.transform.MegaPhase.MiniPhase
-import dotty.tools.dotc.typer.Inlines
+import dotty.tools.dotc.inlines.Inlines
 
 /** Check that `tree.rhs` can be right hand-side of an `inline` value definition. */
 class InlineVals extends MiniPhase:

compiler/src/dotty/tools/dotc/transform/Inlining.scala

@@ -9,7 +9,7 @@ import SymUtils._
 import dotty.tools.dotc.ast.tpd
 
 import dotty.tools.dotc.core.StagingContext._
-import dotty.tools.dotc.typer.Inlines
+import dotty.tools.dotc.inlines.Inlines
 import dotty.tools.dotc.ast.TreeMapWithImplicits
 
 

compiler/src/dotty/tools/dotc/transform/PickleQuotes.scala

@@ -20,7 +20,7 @@ import dotty.tools.dotc.core.Annotations._
 import dotty.tools.dotc.core.StdNames._
 import dotty.tools.dotc.quoted._
 import dotty.tools.dotc.transform.TreeMapWithStages._
-import dotty.tools.dotc.typer.Inlines
+import dotty.tools.dotc.inlines.Inlines
 
 import scala.annotation.constructorOnly
 

compiler/src/dotty/tools/dotc/transform/PostTyper.scala

@@ -5,7 +5,7 @@ import dotty.tools.dotc.ast.{Trees, tpd, untpd, desugar}
 import scala.collection.mutable
 import core._
 import dotty.tools.dotc.typer.Checking
-import dotty.tools.dotc.typer.Inlines
+import dotty.tools.dotc.inlines.Inlines
 import dotty.tools.dotc.typer.VarianceChecker
 import typer.ErrorReporting.errorTree
 import Types._, Contexts._, Names._, Flags._, DenotTransformers._, Phases._

compiler/src/dotty/tools/dotc/transform/SpecializeTuples.scala

@@ -6,7 +6,7 @@ import ast.Trees.*, ast.tpd, core.*
 import Contexts.*, Types.*, Decorators.*, Symbols.*, DenotTransformers.*
 import SymDenotations.*, Scopes.*, StdNames.*, NameOps.*, Names.*
 import MegaPhase.MiniPhase
-import typer.Inliner.isElideableExpr
+import inlines.Inliner.isElideableExpr
 
 /** Specializes Tuples by replacing tuple construction and selection trees.
  *

compiler/src/dotty/tools/dotc/typer/Checking.scala

@@ -15,14 +15,14 @@ import ProtoTypes._
 import Scopes._
 import CheckRealizable._
 import ErrorReporting.errorTree
-import rewrites.Rewrites.patch
 import util.Spans.Span
 import Phases.refchecksPhase
 import Constants.Constant
 
 import util.SrcPos
 import util.Spans.Span
 import rewrites.Rewrites.patch
+import inlines.Inlines
 import transform.SymUtils._
 import transform.ValueClasses._
 import Decorators._

compiler/src/dotty/tools/dotc/typer/Namer.scala

@@ -17,6 +17,7 @@ import tpd.tpes
 import Variances.alwaysInvariant
 import config.{Config, Feature}
 import config.Printers.typr
+import inlines.Inlines
 import parsing.JavaParsers.JavaParser
 import parsing.Parsers.Parser
 import Annotations._

compiler/src/dotty/tools/dotc/typer/PrepareInlineable.scala

@@ -14,6 +14,7 @@ import StdNames.nme
 import Contexts._
 import Names.{Name, TermName}
 import NameKinds.{InlineAccessorName, UniqueInlineName}
+import inlines.Inlines
 import NameOps._
 import Annotations._
 import transform.{AccessProxies, PCPCheckAndHeal, Splicer}

compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala

@@ -11,6 +11,7 @@ import Constants._
 import util.{Stats, SimpleIdentityMap, SimpleIdentitySet}
 import Decorators._
 import Uniques._
+import inlines.Inlines
 import config.Printers.typr
 import util.SourceFile
 import TypeComparer.necessarySubType

compiler/src/dotty/tools/dotc/typer/Typer.scala

@@ -29,6 +29,7 @@ import Inferencing._
 import Dynamic.isDynamicExpansion
 import EtaExpansion.etaExpand
 import TypeComparer.CompareResult
+import inlines.Inlines
 import util.Spans._
 import util.common._
 import util.{Property, SimpleIdentityMap, SrcPos}