Skip to content

Commit 803e06a

Browse files
committed
Rename caps.Root to caps.Cap
1 parent 9249611 commit 803e06a

31 files changed

+49
-49
lines changed

compiler/src/dotty/tools/dotc/cc/CaptureOps.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ extension (sym: Symbol)
369369
/** The owner of the current level. Qualifying owners are
370370
* - methods other than constructors and anonymous functions
371371
* - anonymous functions, provided they either define a local
372-
* root of type caps.Root, or they are the rhs of a val definition.
372+
* root of type caps.Cap, or they are the rhs of a val definition.
373373
* - classes, if they are not staticOwners
374374
* - _root_
375375
*/
@@ -397,19 +397,19 @@ extension (sym: Symbol)
397397
def setNestingLevel(level: Int)(using Context): Unit =
398398
ccState.nestingLevels(sym) = level
399399

400-
/** The parameter with type caps.Root in the leading term parameter section,
400+
/** The parameter with type caps.Cap in the leading term parameter section,
401401
* or NoSymbol, if none exists.
402402
*/
403403
def definedLocalRoot(using Context): Symbol =
404404
sym.paramSymss.dropWhile(psyms => psyms.nonEmpty && psyms.head.isType) match
405-
case psyms :: _ => psyms.find(_.info.typeSymbol == defn.Caps_Root).getOrElse(NoSymbol)
405+
case psyms :: _ => psyms.find(_.info.typeSymbol == defn.Caps_Cap).getOrElse(NoSymbol)
406406
case _ => NoSymbol
407407

408408
def localRoot(using Context): Symbol =
409409
val owner = sym.levelOwner
410410
assert(owner.exists)
411411
def newRoot = newSymbol(if owner.isClass then newLocalDummy(owner) else owner,
412-
nme.LOCAL_CAPTURE_ROOT, Synthetic, defn.Caps_Root.typeRef, nestingLevel = owner.ccNestingLevel)
412+
nme.LOCAL_CAPTURE_ROOT, Synthetic, defn.Caps_Cap.typeRef, nestingLevel = owner.ccNestingLevel)
413413
def lclRoot =
414414
if owner.isTerm then owner.definedLocalRoot.orElse(newRoot)
415415
else newRoot

compiler/src/dotty/tools/dotc/cc/CaptureRoot.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ object CaptureRoot:
4242

4343
def computeHash(bs: Binders): Int = hash
4444
def hash: Int = System.identityHashCode(this)
45-
def underlying(using Context): Type = defn.Caps_Root.typeRef
45+
def underlying(using Context): Type = defn.Caps_Cap.typeRef
4646
end Var
4747

4848
def isEnclosingRoot(c1: CaptureRoot, c2: CaptureRoot)(using Context): Boolean =

compiler/src/dotty/tools/dotc/cc/CaptureSet.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -968,7 +968,7 @@ object CaptureSet:
968968
case tp: TermParamRef =>
969969
tp.captureSet
970970
case tp: TypeRef =>
971-
if tp.typeSymbol == defn.Caps_Root then universal else empty
971+
if tp.typeSymbol == defn.Caps_Cap then universal else empty
972972
case _: TypeParamRef =>
973973
empty
974974
case CapturingType(parent, refs: RefiningVar) =>

compiler/src/dotty/tools/dotc/cc/CheckCaptures.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1151,7 +1151,7 @@ class CheckCaptures extends Recheck, SymTransformer:
11511151
for case ref: TermParamRef <- elems do
11521152
if !allowed.contains(ref) && !seen.contains(ref) then
11531153
seen += ref
1154-
if ref.underlying.isRef(defn.Caps_Root) then
1154+
if ref.underlying.isRef(defn.Caps_Cap) then
11551155
report.error(i"escaping local reference $ref", tree.srcPos)
11561156
else
11571157
val widened = ref.captureSetOfInfo

compiler/src/dotty/tools/dotc/cc/Setup.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ extends tpd.TreeTraverser:
318318
return
319319
inContext(ctx.withOwner(tree.symbol)):
320320
if tree.symbol.isAnonymousFunction && tree.symbol.definedLocalRoot.exists then
321-
// closures that define parameters of type caps.Root count as level owners
321+
// closures that define parameters of type caps.Cap count as level owners
322322
tree.symbol.setNestingLevel(ctx.owner.nestingLevel + 1)
323323
tree.tpt match
324324
case tpt: TypeTree if tree.symbol.allOverriddenSymbols.hasNext =>
@@ -518,7 +518,7 @@ extends tpd.TreeTraverser:
518518
// we assume Any is a shorthand of {cap} Any, so if Any is an upper
519519
// bound, the type is taken to be impure.
520520
else
521-
sym != defn.Caps_Root && superTypeIsImpure(tp.superType)
521+
sym != defn.Caps_Cap && superTypeIsImpure(tp.superType)
522522
case tp: (RefinedOrRecType | MatchType) =>
523523
superTypeIsImpure(tp.underlying)
524524
case tp: AndType =>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -971,7 +971,7 @@ class Definitions {
971971

972972
@tu lazy val CapsModule: Symbol = requiredModule("scala.caps")
973973
@tu lazy val captureRoot: TermSymbol = CapsModule.requiredValue("cap")
974-
@tu lazy val Caps_Root: TypeSymbol = CapsModule.requiredType("Root")
974+
@tu lazy val Caps_Cap: TypeSymbol = CapsModule.requiredType("Cap")
975975
@tu lazy val CapsUnsafeModule: Symbol = requiredModule("scala.caps.unsafe")
976976
@tu lazy val Caps_unsafeAssumePure: Symbol = CapsUnsafeModule.requiredMethod("unsafeAssumePure")
977977
@tu lazy val Caps_unsafeBox: Symbol = CapsUnsafeModule.requiredMethod("unsafeBox")

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2930,7 +2930,7 @@ object Types {
29302930
if name == nme.LOCAL_CAPTURE_ROOT then
29312931
if symbol.owner.isLocalDummy then symbol.owner.owner
29322932
else symbol.owner
2933-
else if info.isRef(defn.Caps_Root) then
2933+
else if info.isRef(defn.Caps_Cap) then
29342934
val owner = symbol.maybeOwner
29352935
if owner.isTerm then owner else NoSymbol
29362936
else NoSymbol

library/src/scala/caps.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ import annotation.experimental
44

55
@experimental object caps:
66

7-
opaque type Root = Unit
7+
opaque type Cap = Unit
88

99
/** The universal capture reference (deprecated) */
1010
@deprecated("Use `cap` instead")
11-
val `*`: Root = ()
11+
val `*`: Cap = ()
1212

1313
/** The universal capture reference */
14-
val cap: Root = ()
14+
val cap: Cap = ()
1515

16-
given Root = cap
16+
given Cap = cap
1717

1818
object unsafe:
1919

tests/neg-custom-args/captures/capt-test.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ def raise[E <: Exception](e: E): Nothing throws E = throw e
1414
def foo(x: Boolean): Int throws Fail =
1515
if x then 1 else raise(Fail())
1616

17-
def handle[E <: Exception, R <: Top](op: (lcap: caps.Root) ?-> (CT[E] @retains(lcap)) => R)(handler: E => R): R =
17+
def handle[E <: Exception, R <: Top](op: (lcap: caps.Cap) ?-> (CT[E] @retains(lcap)) => R)(handler: E => R): R =
1818
val x: CT[E] = ???
1919
try op(x)
2020
catch case ex: E => handler(ex)

tests/neg-custom-args/captures/cc-this2.check

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
-- Error: tests/neg-custom-args/captures/cc-this2/D_2.scala:2:6 --------------------------------------------------------
33
2 |class D extends C: // error
44
|^
5-
|reference (cap : caps.Root) is not included in the allowed capture set {} of pure base class class C
5+
|reference (cap : caps.Cap) is not included in the allowed capture set {} of pure base class class C
66
3 | this: D^ =>

0 commit comments

Comments
 (0)