Skip to content

Changes in preparation to make caps.Capability stable #22849

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Mar 24, 2025
Merged

Changes in preparation to make caps.Capability stable #22849

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b32c242
Make caps a package with non-experimental Capability trait, add caps.…
natsukagami Mar 20, 2025
77b70c6
Add documentation for `Capability` and some other experimental annota…
natsukagami Mar 20, 2025
0d75c91
Rename capsOf in makeCapsOf
natsukagami Mar 20, 2025
4b54891
Add all newly @experimental annotated items to cc exception list
natsukagami Mar 20, 2025
65c8e25
Move untrackedCaptures to unsafe
natsukagami Mar 20, 2025
95b98b1
Update error messages
natsukagami Mar 20, 2025
2674d47
Keep Capability experimental
natsukagami Mar 21, 2025
dfe6309
Fix untrackedCaptures import in scala2-library-cc
natsukagami Mar 21, 2025
97bfef9
Update list of experimental references
natsukagami Mar 21, 2025
698810d
Make `cap` an object instead of a val, change how it is printed
natsukagami Mar 21, 2025
e07db84
Rename caps.* to caps.cap
natsukagami Mar 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Rename capsOf in makeCapsOf
  • Loading branch information
@natsukagami
natsukagami committed Mar 20, 2025
commit 0d75c91f3da9405d29ff04832bd8408101f27ca7
5 changes: 4 additions & 1 deletion compiler/src/dotty/tools/dotc/ast/untpd.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,14 +521,17 @@ object untpd extends Trees.Instance[Untyped] with UntypedTreeInfo {
def scalaUnit(implicit src: SourceFile): Select = scalaDot(tpnme.Unit)
def scalaAny(implicit src: SourceFile): Select = scalaDot(tpnme.Any)

def capsInternalDot(name: Name)(using SourceFile): Select =
Select(Select(scalaDot(nme.caps), nme.internal), name)

def captureRoot(using Context): Select =
Select(scalaDot(nme.caps), nme.CAPTURE_ROOT)

def makeRetaining(parent: Tree, refs: List[Tree], annotName: TypeName)(using Context): Annotated =
Annotated(parent, New(scalaAnnotationDot(annotName), List(refs)))

def makeCapsOf(tp: RefTree)(using Context): Tree =
TypeApply(Select(scalaDot(nme.caps), nme.capsOf), tp :: Nil)
TypeApply(capsInternalDot(nme.capsOf), tp :: Nil)

// Capture set variable `[C^]` becomes: `[C >: CapSet <: CapSet^{cap}]`
def makeCapsBound()(using Context): TypeBoundsTree =
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/core/Definitions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1085,7 +1085,7 @@ class Definitions {
@tu lazy val FunctionalInterfaceAnnot: ClassSymbol = requiredClass("java.lang.FunctionalInterface")
@tu lazy val TargetNameAnnot: ClassSymbol = requiredClass("scala.annotation.targetName")
@tu lazy val VarargsAnnot: ClassSymbol = requiredClass("scala.annotation.varargs")
@tu lazy val ReachCapabilityAnnot = requiredClass("scala.annotation.reachCapability")
@tu lazy val ReachCapabilityAnnot = requiredClass("scala.annotation.internal.reachCapability")
@tu lazy val RootCapabilityAnnot = requiredClass("scala.caps.internal.rootCapability")
@tu lazy val ReadOnlyCapabilityAnnot = requiredClass("scala.annotation.internal.readOnlyCapability")
@tu lazy val RequiresCapabilityAnnot: ClassSymbol = requiredClass("scala.annotation.internal.requiresCapability")
Expand Down