Skip to content

Refine rules for capture parameters and members #22000

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 13 commits into from
Dec 1, 2024
Merged

Refine rules for capture parameters and members #22000

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
921e9e0
Make capture parameters and members bounded by CapSet by default
noti0na1 Nov 21, 2024
c996062
Correct rules for CapSet; update definition for Contains; fix tests
noti0na1 Nov 24, 2024
8a15af3
Refine subsumes rule; fix test
noti0na1 Nov 26, 2024
092b358
Add constraint to capsOf
noti0na1 Nov 26, 2024
acde5c0
Update test
noti0na1 Nov 26, 2024
ed7eed6
Apply suggestions from code review
noti0na1 Nov 26, 2024
bf8dccc
Fix test
noti0na1 Nov 27, 2024
1fb05b2
Fix crash error
noti0na1 Nov 27, 2024
82c5512
Fix overriding check
noti0na1 Nov 28, 2024
0750d5c
Update Stepper in the library
noti0na1 Nov 29, 2024
1ed08de
Clean comments
noti0na1 Nov 29, 2024
c1a0835
Drop syntax sugar for capture set member
noti0na1 Nov 30, 2024
6866bd1
Update comment
noti0na1 Nov 30, 2024
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
Clean comments
  • Loading branch information
@noti0na1
noti0na1 committed Dec 1, 2024
commit 1ed08dee4a26d6ae1806a6d5368ef0160bbe3a8d
4 changes: 1 addition & 3 deletions compiler/src/dotty/tools/dotc/typer/RefChecks.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,8 @@ object RefChecks {
* This one used to succeed only if forwarding parameters is on.
* (Forwarding tends to hide problems by binding parameter names).
*/

private def upwardsThisType(cls: Symbol)(using Context) = cls.info match {
case ClassInfo(_, _, _, _, tp: Type) if (tp.stripCapturing ne cls.typeRef) && !cls.isOneOf(FinalOrModuleClass) =>
// println(i"upwardsThisType($cls) = ${cls.typeRef}, ne $tp")
SkolemType(cls.appliedRef).withName(nme.this_)
case _ =>
cls.thisType
Expand Down Expand Up @@ -442,7 +440,7 @@ object RefChecks {
val (mtp, otp) = if compareTypes then (memberTp(self), otherTp(self)) else (NoType, NoType)
OverrideError(core, self, member, other, mtp, otp)

def compatTypes(memberTp: Type, otherTp: Type): Boolean = // race.force(i"compatTypes $memberTp <:< $otherTp"):
def compatTypes(memberTp: Type, otherTp: Type): Boolean =
try
isOverridingPair(member, memberTp, other, otherTp,
fallBack = warnOnMigration(
Expand Down