Skip to content
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

feat: compute type of elvis operators with nullable left operand #715

Merged
merged 8 commits into from
Oct 31, 2023
Merged

feat: compute type of elvis operators with nullable left operand #715

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
943d74c
refactor: wire type computer and type checker together
lars-reimann Oct 31, 2023
65bf603
fix: `updateNullability` now always makes types nullable by wrapping …
lars-reimann Oct 31, 2023
98120b5
feat: improve `unwrap`
lars-reimann Oct 31, 2023
61fe5b6
test: `lowestCommonSupertype`
lars-reimann Oct 31, 2023
a32580b
feat: compute lowest common supertype for class based types
lars-reimann Oct 31, 2023
5a6f200
feat: compute lowest common supertype for enum based types
lars-reimann Oct 31, 2023
097aa81
test: ignore some lines for coverage
lars-reimann Oct 31, 2023
3309001
style: fix indentation
lars-reimann Oct 31, 2023
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
test: ignore some lines for coverage
  • Loading branch information
@lars-reimann
lars-reimann committed Oct 31, 2023
commit 097aa81c5c0c0e060126d1055f5ccc2059c639b3
2 changes: 2 additions & 0 deletions packages/safe-ds-lang/src/language/typing/model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,11 @@ export class NamedTupleType<T extends SdsDeclaration> extends Type {
/**
* The length of this tuple.
*/
/* c8 ignore start */
get length(): number {
return this.entries.length;
}
/* c8 ignore stop */

/**
* Returns the type of the entry at the given index. If the index is out of bounds, returns `undefined`.
Expand Down
3 changes: 3 additions & 0 deletions packages/safe-ds-lang/src/language/typing/safe-ds-type-checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import {
import { SafeDsClassHierarchy } from './safe-ds-class-hierarchy.js';
import { SafeDsCoreTypes } from './safe-ds-core-types.js';

/* c8 ignore start */
export class SafeDsTypeChecker {
private readonly classHierarchy: SafeDsClassHierarchy;
private readonly coreTypes: SafeDsCoreTypes;
Expand Down Expand Up @@ -196,6 +197,7 @@ export class SafeDsTypeChecker {
return this.isAssignableTo(classType, other);
}

/* c8 ignore start */
private namedTupleTypeIsAssignableTo(type: NamedTupleType<SdsDeclaration>, other: Type): boolean {
return type.equals(other);
}
Expand All @@ -209,3 +211,4 @@ export class SafeDsTypeChecker {
return type.equals(other);
}
}
/* c8 ignore stop */
9 changes: 4 additions & 5 deletions packages/safe-ds-lang/src/language/typing/safe-ds-type-computer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import {
isSdsTemplateString,
isSdsType,
isSdsTypeArgument,
isSdsTypeParameter,
isSdsTypeProjection,
isSdsUnionType,
isSdsYield,
Expand Down Expand Up @@ -192,6 +193,8 @@ export class SafeDsTypeComputer {
return UnknownType;
} else if (isSdsSegment(node)) {
return this.computeTypeOfCallableWithManifestTypes(node);
} else if (isSdsTypeParameter(node)) {
return UnknownType;
} /* c8 ignore start */ else {
throw new Error(`Unexpected node type: ${node.$type}`);
} /* c8 ignore stop */
Expand Down Expand Up @@ -597,7 +600,7 @@ export class SafeDsTypeComputer {
return candidateType;
}
}

/* c8 ignore next */
return this.getAny(isNullable);
}

Expand All @@ -606,10 +609,6 @@ export class SafeDsTypeComputer {
enumVariantTypes: EnumVariantType[],
isNullable: boolean,
): Type {
if (isEmpty(enumTypes) && isEmpty(enumVariantTypes)) {
return this.coreTypes.Nothing;
}

// Build candidates & other
const candidates: Type[] = [];
if (!isEmpty(enumTypes)) {
Expand Down
Loading