Skip to content

Commit ce21de0

Browse files
oderskyodersky
committed
Rename importDelegate -> importGiven
1 parent 2100d36 commit ce21de0

18 files changed

+45
-45
lines changed

‎compiler/src/dotty/tools/dotc/ast/Desugar.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ object desugar {
480480
if (enumCases.isEmpty)
481481
ctx.error("Enumerations must constain at least one case", namePos)
482482
val enumCompanionRef = TermRefTree()
483-
val enumImport = Import(importDelegate = false, enumCompanionRef, enumCases.flatMap(caseIds))
483+
val enumImport = Import(importGiven = false, enumCompanionRef, enumCases.flatMap(caseIds))
484484
(enumImport :: enumStats, enumCases, enumCompanionRef)
485485
}
486486
else (stats, Nil, EmptyTree)

‎compiler/src/dotty/tools/dotc/ast/TreeInfo.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -874,7 +874,7 @@ object TreeInfo {
874874
/** The expression has no side effects */
875875
val Pure: PurityLevel = new PurityLevel(3)
876876

877-
/** Running the expression a second time has no side effects. Delegate by `Pure`. */
877+
/** Running the expression a second time has no side effects. Implied by `Pure`. */
878878
val Idempotent: PurityLevel = new PurityLevel(1)
879879

880880
val Impure: PurityLevel = new PurityLevel(0)

‎compiler/src/dotty/tools/dotc/ast/Trees.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -800,7 +800,7 @@ object Trees {
800800
* where a selector is either an untyped `Ident`, `name` or
801801
* an untyped thicket consisting of `name` and `rename`.
802802
*/
803-
case class Import[-T >: Untyped] private[ast] (importDelegate: Boolean, expr: Tree[T], selectors: List[Tree[Untyped]])(implicit @constructorOnly src: SourceFile)
803+
case class Import[-T >: Untyped] private[ast] (importGiven: Boolean, expr: Tree[T], selectors: List[Tree[Untyped]])(implicit @constructorOnly src: SourceFile)
804804
extends DenotingTree[T] {
805805
type ThisTree[-T >: Untyped] = Import[T]
806806
}
@@ -1188,9 +1188,9 @@ object Trees {
11881188
case tree: Template if (constr eq tree.constr) && (parents eq tree.parents) && (derived eq tree.derived) && (self eq tree.self) && (body eq tree.unforcedBody) => tree
11891189
case tree => finalize(tree, untpd.Template(constr, parents, derived, self, body)(sourceFile(tree)))
11901190
}
1191-
def Import(tree: Tree)(importDelegate: Boolean, expr: Tree, selectors: List[untpd.Tree])(implicit ctx: Context): Import = tree match {
1192-
case tree: Import if (importDelegate == tree.importDelegate) && (expr eq tree.expr) && (selectors eq tree.selectors) => tree
1193-
case _ => finalize(tree, untpd.Import(importDelegate, expr, selectors)(sourceFile(tree)))
1191+
def Import(tree: Tree)(importGiven: Boolean, expr: Tree, selectors: List[untpd.Tree])(implicit ctx: Context): Import = tree match {
1192+
case tree: Import if (importGiven == tree.importGiven) && (expr eq tree.expr) && (selectors eq tree.selectors) => tree
1193+
case _ => finalize(tree, untpd.Import(importGiven, expr, selectors)(sourceFile(tree)))
11941194
}
11951195
def PackageDef(tree: Tree)(pid: RefTree, stats: List[Tree])(implicit ctx: Context): PackageDef = tree match {
11961196
case tree: PackageDef if (pid eq tree.pid) && (stats eq tree.stats) => tree
@@ -1331,8 +1331,8 @@ object Trees {
13311331
cpy.TypeDef(tree)(name, transform(rhs))
13321332
case tree @ Template(constr, parents, self, _) if tree.derived.isEmpty =>
13331333
cpy.Template(tree)(transformSub(constr), transform(tree.parents), Nil, transformSub(self), transformStats(tree.body))
1334-
case Import(importDelegate, expr, selectors) =>
1335-
cpy.Import(tree)(importDelegate, transform(expr), selectors)
1334+
case Import(importGiven, expr, selectors) =>
1335+
cpy.Import(tree)(importGiven, transform(expr), selectors)
13361336
case PackageDef(pid, stats) =>
13371337
cpy.PackageDef(tree)(transformSub(pid), transformStats(stats)(localCtx))
13381338
case Annotated(arg, annot) =>

‎compiler/src/dotty/tools/dotc/ast/tpd.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,8 +333,8 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
333333
Block(cdef :: Nil, New(cls.typeRef, Nil))
334334
}
335335

336-
def Import(importDelegate: Boolean, expr: Tree, selectors: List[untpd.Tree])(implicit ctx: Context): Import =
337-
ta.assignType(untpd.Import(importDelegate, expr, selectors), ctx.newImportSymbol(ctx.owner, expr))
336+
def Import(importGiven: Boolean, expr: Tree, selectors: List[untpd.Tree])(implicit ctx: Context): Import =
337+
ta.assignType(untpd.Import(importGiven, expr, selectors), ctx.newImportSymbol(ctx.owner, expr))
338338

339339
def PackageDef(pid: RefTree, stats: List[Tree])(implicit ctx: Context): PackageDef =
340340
ta.assignType(untpd.PackageDef(pid, stats), pid)

‎compiler/src/dotty/tools/dotc/ast/untpd.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ object untpd extends Trees.Instance[Untyped] with UntypedTreeInfo {
339339
def Template(constr: DefDef, parents: List[Tree], derived: List[Tree], self: ValDef, body: LazyTreeList)(implicit src: SourceFile): Template =
340340
if (derived.isEmpty) new Template(constr, parents, self, body)
341341
else new DerivingTemplate(constr, parents ++ derived, self, body, derived.length)
342-
def Import(importDelegate: Boolean, expr: Tree, selectors: List[Tree])(implicit src: SourceFile): Import = new Import(importDelegate, expr, selectors)
342+
def Import(importGiven: Boolean, expr: Tree, selectors: List[Tree])(implicit src: SourceFile): Import = new Import(importGiven, expr, selectors)
343343
def PackageDef(pid: RefTree, stats: List[Tree])(implicit src: SourceFile): PackageDef = new PackageDef(pid, stats)
344344
def Annotated(arg: Tree, annot: Tree)(implicit src: SourceFile): Annotated = new Annotated(arg, annot)
345345

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ object Contexts {
404404
case _ => None
405405
}
406406
ctx.fresh.setImportInfo(
407-
ImportInfo(sym, imp.selectors, impNameOpt, imp.importDelegate))
407+
ImportInfo(sym, imp.selectors, impNameOpt, imp.importGiven))
408408
}
409409

410410
/** Does current phase use an erased types interpretation? */

‎compiler/src/dotty/tools/dotc/core/Types.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -789,7 +789,7 @@ object Types {
789789
}
790790

791791
/** The set of implicit term members of this type
792-
* @param kind A subset of {Implicit, Delegate} that specifies what kind of implicit should
792+
* @param kind A subset of {Implicit, Given} that specifies what kind of implicit should
793793
* be returned
794794
*/
795795
final def implicitMembers(kind: FlagSet)(implicit ctx: Context): List[TermRef] = track("implicitMembers") {

‎compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -528,10 +528,10 @@ class TreePickler(pickler: TastyPickler) {
528528
}
529529
pickleStats(tree.constr :: rest)
530530
}
531-
case Import(importDelegate, expr, selectors) =>
531+
case Import(importGiven, expr, selectors) =>
532532
writeByte(IMPORT)
533533
withLength {
534-
if (importDelegate) writeByte(GIVEN)
534+
if (importGiven) writeByte(GIVEN)
535535
pickleTree(expr)
536536
pickleSelectors(selectors)
537537
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -947,10 +947,10 @@ class TreeUnpickler(reader: TastyReader,
947947
assert(sourcePathAt(start).isEmpty)
948948
readByte()
949949
readEnd()
950-
val importDelegate = nextByte == GIVEN
951-
if (importDelegate) readByte()
950+
val importGiven = nextByte == GIVEN
951+
if (importGiven) readByte()
952952
val expr = readTerm()
953-
setSpan(start, Import(importDelegate, expr, readSelectors()))
953+
setSpan(start, Import(importGiven, expr, readSelectors()))
954954
}
955955

956956
def readSelectors()(implicit ctx: Context): List[untpd.Tree] = nextByte match {

‎compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1072,7 +1072,7 @@ class Scala2Unpickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClas
10721072
val to = untpd.Ident(toName)
10731073
if (toName.isEmpty) from else untpd.Thicket(from, untpd.Ident(toName))
10741074
})
1075-
Import(importDelegate = false, expr, selectors)
1075+
Import(importGiven = false, expr, selectors)
10761076

10771077
case TEMPLATEtree =>
10781078
setSym()

‎compiler/src/dotty/tools/dotc/parsing/JavaParsers.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,7 @@ object JavaParsers {
600600
}
601601

602602
def importCompanionObject(cdef: TypeDef): Tree =
603-
Import(importDelegate = false, Ident(cdef.name.toTermName).withSpan(NoSpan), Ident(nme.WILDCARD) :: Nil)
603+
Import(importGiven = false, Ident(cdef.name.toTermName).withSpan(NoSpan), Ident(nme.WILDCARD) :: Nil)
604604

605605
// Importing the companion object members cannot be done uncritically: see
606606
// ticket #2377 wherein a class contains two static inner classes, each of which
@@ -662,7 +662,7 @@ object JavaParsers {
662662
// case nme.WILDCARD => Pair(ident, Ident(null) withPos Span(-1))
663663
// case _ => Pair(ident, ident)
664664
// }
665-
val imp = atSpan(start) { Import(importDelegate = false, qual, List(ident)) }
665+
val imp = atSpan(start) { Import(importGiven = false, qual, List(ident)) }
666666
imp :: Nil
667667
}
668668
}

‎compiler/src/dotty/tools/dotc/parsing/Parsers.scala

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2407,9 +2407,9 @@ object Parsers {
24072407
*/
24082408
def importClause(leading: Token, mkTree: ImportConstr): List[Tree] = {
24092409
val offset = accept(leading)
2410-
val importDelegate = in.token == IMPLIED || in.token == GIVEN
2411-
if (importDelegate) in.nextToken()
2412-
commaSeparated(importExpr(importDelegate, mkTree)) match {
2410+
val importGiven = in.token == IMPLIED || in.token == GIVEN
2411+
if (importGiven) in.nextToken()
2412+
commaSeparated(importExpr(importGiven, mkTree)) match {
24132413
case t :: rest =>
24142414
// The first import should start at the start offset of the keyword.
24152415
val firstPos =
@@ -2422,7 +2422,7 @@ object Parsers {
24222422

24232423
/** ImportExpr ::= StableId `.' (id | `_' | ImportSelectors)
24242424
*/
2425-
def importExpr(importDelegate: Boolean, mkTree: ImportConstr): () => Tree = {
2425+
def importExpr(importGiven: Boolean, mkTree: ImportConstr): () => Tree = {
24262426

24272427
/** ImportSelectors ::= `{' {ImportSelector `,'} FinalSelector ‘}’
24282428
* FinalSelector ::= ImportSelector
@@ -2439,7 +2439,7 @@ object Parsers {
24392439
else id
24402440
} :: Nil
24412441
case FOR =>
2442-
if (!importDelegate)
2442+
if (!importGiven)
24432443
syntaxError(em"`for` qualifier only allowed in `import given`")
24442444
atSpan(in.skipToken()) {
24452445
var t = infixType()
@@ -2480,24 +2480,24 @@ object Parsers {
24802480
}
24812481

24822482
val handleImport: Tree => Tree = { tree: Tree =>
2483-
if (in.token == USCORE) mkTree(importDelegate, tree, wildcardIdent() :: Nil)
2484-
else if (in.token == LBRACE) mkTree(importDelegate, tree, inBraces(importSelectors()))
2483+
if (in.token == USCORE) mkTree(importGiven, tree, wildcardIdent() :: Nil)
2484+
else if (in.token == LBRACE) mkTree(importGiven, tree, inBraces(importSelectors()))
24852485
else tree
24862486
}
24872487

24882488
def derived(impExp: Tree, qual: Tree, selectors: List[Tree]) =
2489-
mkTree(importDelegate, qual, selectors).withSpan(impExp.span)
2489+
mkTree(importGiven, qual, selectors).withSpan(impExp.span)
24902490

24912491
() => {
24922492
val p = path(thisOK = false, handleImport)
24932493
p match {
24942494
case _: Import | _: Export => p
24952495
case sel @ Select(qual, name) =>
24962496
val selector = atSpan(pointOffset(sel)) { Ident(name) }
2497-
mkTree(importDelegate, qual, selector :: Nil).withSpan(sel.span)
2497+
mkTree(importGiven, qual, selector :: Nil).withSpan(sel.span)
24982498
case t =>
24992499
accept(DOT)
2500-
mkTree(importDelegate, t, Ident(nme.WILDCARD) :: Nil)
2500+
mkTree(importGiven, t, Ident(nme.WILDCARD) :: Nil)
25012501
}
25022502
}
25032503
}

‎compiler/src/dotty/tools/dotc/sbt/ExtractDependencies.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,10 +339,10 @@ private class ExtractDependenciesCollector extends tpd.TreeTraverser { thisTreeT
339339
tree match {
340340
case Match(selector, _) =>
341341
addPatMatDependency(selector.tpe)
342-
case Import(importDelegate, expr, selectors) =>
342+
case Import(importGiven, expr, selectors) =>
343343
def lookupImported(name: Name) = {
344344
val sym = expr.tpe.member(name).symbol
345-
if (sym.is(Given) == importDelegate) sym else NoSymbol
345+
if (sym.is(Given) == importGiven) sym else NoSymbol
346346
}
347347
def addImported(name: Name) = {
348348
// importing a name means importing both a term and a type (if they exist)

‎compiler/src/dotty/tools/dotc/tastyreflect/KernelImpl.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ class KernelImpl(val rootContext: core.Contexts.Context, val rootPosition: util.
126126
case _ => None
127127
}
128128

129-
def Import_implied(self: Import): Boolean = self.importDelegate
129+
def Import_implied(self: Import): Boolean = self.importGiven
130130
def Import_expr(self: Import)(implicit ctx: Context): Tree = self.expr
131131
def Import_selectors(self: Import)(implicit ctx: Context): List[ImportSelector] = self.selectors
132132

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1129,7 +1129,7 @@ trait Checking {
11291129
val cases =
11301130
for (stat <- impl.body if isCase(stat))
11311131
yield untpd.Ident(stat.symbol.name.toTermName)
1132-
val caseImport: Import = Import(importDelegate = false, ref(cdef.symbol), cases)
1132+
val caseImport: Import = Import(importGiven = false, ref(cdef.symbol), cases)
11331133
val caseCtx = enumCtx.importContext(caseImport, caseImport.symbol)
11341134
for (stat <- impl.body) checkCaseOrDefault(stat, caseCtx)
11351135
case _ =>

‎compiler/src/dotty/tools/dotc/typer/ImportInfo.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ import Decorators._
1515

1616
object ImportInfo {
1717
/** The import info for a root import from given symbol `sym` */
18-
def rootImport(refFn: () => TermRef, importDelegate: Boolean = false)(implicit ctx: Context): ImportInfo = {
18+
def rootImport(refFn: () => TermRef, importGiven: Boolean = false)(implicit ctx: Context): ImportInfo = {
1919
val selectors = untpd.Ident(nme.WILDCARD) :: Nil
2020
def expr(implicit ctx: Context) = tpd.Ident(refFn())
21-
def imp(implicit ctx: Context) = tpd.Import(importDelegate = importDelegate, expr, selectors)
22-
new ImportInfo(imp.symbol, selectors, None, importDelegate = importDelegate, isRootImport = true)
21+
def imp(implicit ctx: Context) = tpd.Import(importGiven = importGiven, expr, selectors)
22+
new ImportInfo(imp.symbol, selectors, None, importGiven = importGiven, isRootImport = true)
2323
}
2424
}
2525

@@ -28,13 +28,13 @@ object ImportInfo {
2828
* @param selectors The selector clauses
2929
* @param symNameOpt Optionally, the name of the import symbol. None for root imports.
3030
* Defined for all explicit imports from ident or select nodes.
31-
* @param importDelegate true if this is a delegate import
31+
* @param importGiven true if this is a delegate import
3232
* @param isRootImport true if this is one of the implicit imports of scala, java.lang,
3333
* scala.Predef or dotty.DottyPredef in the start context, false otherwise.
3434
*/
3535
class ImportInfo(symf: given Context => Symbol, val selectors: List[untpd.Tree],
3636
symNameOpt: Option[TermName],
37-
val importDelegate: Boolean,
37+
val importGiven: Boolean,
3838
val isRootImport: Boolean = false) extends Showable {
3939

4040
// Dotty deviation: we cannot use a lazy val here for the same reason
@@ -114,7 +114,7 @@ class ImportInfo(symf: given Context => Symbol, val selectors: List[untpd.Tree],
114114
}
115115

116116
private def implicitFlags(implicit ctx: Context) =
117-
if (importDelegate || ctx.mode.is(Mode.FindHiddenImplicits)) GivenOrImplicit
117+
if (importGiven || ctx.mode.is(Mode.FindHiddenImplicits)) GivenOrImplicit
118118
else Implicit
119119

120120
/** The implicit references imported by this import clause */

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ class Typer extends Namer
184184
val pre = imp.site
185185
var reqd = required
186186
var excl = EmptyFlags
187-
if (imp.importDelegate) reqd |= Given else excl |= Given
187+
if (imp.importGiven) reqd |= Given else excl |= Given
188188
var denot = pre.memberBasedOnFlags(name, reqd, excl).accessibleFrom(pre)(refctx)
189189
if (checkBounds && imp.wildcardBound.exists)
190190
denot = denot.filterWithPredicate(mbr =>
@@ -1781,7 +1781,7 @@ class Typer extends Namer
17811781
untpd.cpy.TypeBoundsTree(sel)(sel.lo, untpd.TypedSplice(typedType(tpt)))
17821782
case sel => sel
17831783
}
1784-
assignType(cpy.Import(imp)(imp.importDelegate, expr1, selectors1), sym)
1784+
assignType(cpy.Import(imp)(imp.importGiven, expr1, selectors1), sym)
17851785
}
17861786

17871787
def typedPackageDef(tree: untpd.PackageDef)(implicit ctx: Context): Tree = track("typedPackageDef") {

‎compiler/src/dotty/tools/repl/ReplCompiler.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ class ReplCompiler extends Compiler {
4848
def importPreviousRun(id: Int)(implicit ctx: Context) = {
4949
// we first import the wrapper object id
5050
val path = nme.EMPTY_PACKAGE ++ "." ++ objectNames(id)
51-
def importWrapper(c: Context, importDelegate: Boolean) = {
51+
def importWrapper(c: Context, importGiven: Boolean) = {
5252
val importInfo = ImportInfo.rootImport(() =>
53-
c.requiredModuleRef(path), importDelegate)
53+
c.requiredModuleRef(path), importGiven)
5454
c.fresh.setNewScope.setImportInfo(importInfo)
5555
}
5656
val ctx0 = importWrapper(importWrapper(ctx, false), true)

0 commit comments

Comments
 (0)