Skip to content

Commit

Permalink
feat: substitute type parameters when computing type of inherited mem…
Browse files Browse the repository at this point in the history
…bers (#864)

Closes #863

### Summary of Changes

We now also substitute type parameters when computing the type for
inherited members in a member access. Example:

```
class C<T> {
    attr member: T
}

class D sub C<Int>

segment mySegment(p: D) {
    val a = p.member;
}
```

`a` now get the correct type `Int` (previously it was `T`).
  • Loading branch information
lars-reimann committed Feb 7, 2024
1 parent 5780ed7 commit 33de1e8
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 8 deletions.
20 changes: 13 additions & 7 deletions packages/safe-ds-lang/src/language/typing/safe-ds-type-computer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -507,16 +507,22 @@ export class SafeDsTypeComputer {
}

const receiverType = this.computeType(node.receiver);
const unsubstitutedResult = memberType.updateNullability(
(receiverType.isNullable && node.isNullSafe) || memberType.isNullable,
);
let result: Type = memberType;

// Substitute type parameters
// Substitute type parameters (must also work for inherited members)
if (receiverType instanceof ClassType) {
return unsubstitutedResult.substituteTypeParameters(receiverType.substitutions);
} else {
return unsubstitutedResult;
const classContainingMember = getContainerOfType(node.member?.target.ref, isSdsClass);
const typeContainingMember = stream([receiverType], this.streamSupertypes(receiverType)).find(
(it) => it.declaration === classContainingMember,
);

if (typeContainingMember) {
result = result.substituteTypeParameters(typeContainingMember.substitutions);
}
}

// Update nullability
return result.updateNullability((receiverType.isNullable && node.isNullSafe) || memberType.isNullable);
}

private computeTypeOfArithmeticPrefixOperation(node: SdsPrefixOperation): Type {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,13 @@ class C<T> {
@Pure fun method() -> r: T
}

class D sub C<Int>

@Pure fun nullableC() -> result: C<Int>?
@Pure fun nullableD() -> result: D?

segment mySegment(p: C<Int>) {
// Accessing own members
segment mySegment1(p: C<Int>) {
// $TEST$ serialization Int
»p.nonNullableMember«;
// $TEST$ serialization Int?
Expand Down Expand Up @@ -38,3 +42,35 @@ segment mySegment(p: C<Int>) {
// $TEST$ serialization union<() -> (r: Int), literal<null>>
»nullableC()?.method«;
}

// Accessing inherited members
segment mySegment2(p: D) {
// $TEST$ serialization Int
»p.nonNullableMember«;
// $TEST$ serialization Int?
»p.nullableMember«;
// $TEST$ serialization () -> (r: Int)
»p.method«;

// $TEST$ serialization Int
»p?.nonNullableMember«;
// $TEST$ serialization Int?
»p?.nullableMember«;
// $TEST$ serialization () -> (r: Int)
»p?.method«;


// $TEST$ serialization Int
»nullableD().nonNullableMember«;
// $TEST$ serialization Int?
»nullableD().nullableMember«;
// $TEST$ serialization () -> (r: Int)
»nullableD().method«;

// $TEST$ serialization Int?
»nullableD()?.nonNullableMember«;
// $TEST$ serialization Int?
»nullableD()?.nullableMember«;
// $TEST$ serialization union<() -> (r: Int), literal<null>>
»nullableD()?.method«;
}

0 comments on commit 33de1e8

Please sign in to comment.