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: include enum name in string conversion of enum variant types #907

Merged
merged 1 commit into from
Feb 22, 2024
Merged

feat: include enum name in string conversion of enum variant types #907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 12 additions & 1 deletion packages/safe-ds-lang/src/language/typing/model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { isEmpty } from '../../helpers/collections.js';
import {
isSdsEnum,
SdsAbstractResult,
SdsCallable,
SdsClass,
Expand All @@ -11,7 +12,7 @@ import {
} from '../generated/ast.js';
import { getTypeParameters, Parameter } from '../helpers/nodeProperties.js';
import { Constant, NullConstant } from '../partialEvaluation/model.js';
import { stream } from 'langium';
import { getContainerOfType, stream } from 'langium';
import { SafeDsCoreTypes } from './safe-ds-core-types.js';
import { SafeDsServices } from '../safe-ds-module.js';
import { SafeDsTypeFactory } from './safe-ds-type-factory.js';
Expand Down Expand Up @@ -512,6 +513,16 @@ export class EnumVariantType extends NamedType<SdsEnumVariant> {
return this;
}

override toString(): string {
const containingEnum = getContainerOfType(this.declaration, isSdsEnum);
if (containingEnum) {
return `${containingEnum.name}.${super.toString()}`;
} else {
/* c8 ignore next 2 */
return super.toString();
}
}

override withExplicitNullability(isExplicitlyNullable: boolean): EnumVariantType {
if (this.isExplicitlyNullable === isExplicitlyNullable) {
return this;
Expand Down
4 changes: 2 additions & 2 deletions packages/safe-ds-lang/tests/language/typing/model.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,11 +205,11 @@ describe('type model', async () => {
},
{
value: new EnumVariantType(enumVariant1, false),
expectedString: 'MyEnumVariant1',
expectedString: 'MyEnum1.MyEnumVariant1',
},
{
value: new EnumVariantType(enumVariant1, true),
expectedString: 'MyEnumVariant1?',
expectedString: 'MyEnum1.MyEnumVariant1?',
},
{
value: new TypeParameterType(typeParameter1, false),
Expand Down
4 changes: 2 additions & 2 deletions packages/safe-ds-lang/tests/resources/typing/declarations/enum variants/main.sdstest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package tests.typing.declarations.enumVariants

enum MyEnum {
// $TEST$ serialization MyEnumVariant1
// $TEST$ serialization MyEnum.MyEnumVariant1
»MyEnumVariant1«

// $TEST$ serialization MyEnumVariant2
// $TEST$ serialization MyEnum.MyEnumVariant2
»MyEnumVariant2«
}
16 changes: 8 additions & 8 deletions packages/safe-ds-lang/tests/resources/typing/expressions/calls/of enum variants/main.sdstest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ enum MyEnum {
}

pipeline myPipeline {
// $TEST$ serialization MyEnumVariantWithoutParameterList
// $TEST$ serialization MyEnum.MyEnumVariantWithoutParameterList
»MyEnum.MyEnumVariantWithoutParameterList()«;

// $TEST$ serialization $unknown
val alias1 = MyEnum.MyEnumVariantWithoutParameterList;
»alias1()«;

// $TEST$ serialization MyEnumVariantWithoutParameters
// $TEST$ serialization MyEnum.MyEnumVariantWithoutParameters
»MyEnum.MyEnumVariantWithoutParameters()«;

// $TEST$ serialization $unknown
Expand All @@ -28,10 +28,10 @@ pipeline myPipeline {
val alias3 = MyEnum.MyEnumVariantWithoutParameters();
»alias3()«;

// $TEST$ serialization MyEnumVariantWithParameters
// $TEST$ serialization MyEnum.MyEnumVariantWithParameters
»MyEnum.MyEnumVariantWithParameters(1)«;

// $TEST$ serialization MyEnumVariantWithParameters
// $TEST$ serialization MyEnum.MyEnumVariantWithParameters
val alias4 = MyEnum.MyEnumVariantWithParameters;
»alias4(1)«;

Expand All @@ -45,14 +45,14 @@ pipeline myPipeline {

// Null-safe calls -------------------------------------------------------------------------------------------------

// $TEST$ serialization MyEnumVariantWithoutParameterList
// $TEST$ serialization MyEnum.MyEnumVariantWithoutParameterList
»MyEnum.MyEnumVariantWithoutParameterList?()«;

// $TEST$ serialization $unknown
val alias1 = MyEnum.MyEnumVariantWithoutParameterList;
»alias1?()«;

// $TEST$ serialization MyEnumVariantWithoutParameters
// $TEST$ serialization MyEnum.MyEnumVariantWithoutParameters
»MyEnum.MyEnumVariantWithoutParameters?()«;

// $TEST$ serialization $unknown
Expand All @@ -66,10 +66,10 @@ pipeline myPipeline {
val alias3 = MyEnum.MyEnumVariantWithoutParameters?();
»alias3?()«;

// $TEST$ serialization MyEnumVariantWithParameters
// $TEST$ serialization MyEnum.MyEnumVariantWithParameters
»MyEnum.MyEnumVariantWithParameters(1)«;

// $TEST$ serialization MyEnumVariantWithParameters
// $TEST$ serialization MyEnum.MyEnumVariantWithParameters
val alias4 = MyEnum.MyEnumVariantWithParameters;
»alias4?(1)«;

Expand Down
12 changes: 6 additions & 6 deletions ...-ds-lang/tests/resources/typing/expressions/member accesses/to enum variants/main.sdstest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,22 @@ enum MyEnum {
}

pipeline myPipeline {
// $TEST$ serialization MyEnumVariantWithoutParameterList
// $TEST$ serialization MyEnum.MyEnumVariantWithoutParameterList
»MyEnum.MyEnumVariantWithoutParameterList«;

// $TEST$ serialization MyEnumVariantWithoutParameters
// $TEST$ serialization MyEnum.MyEnumVariantWithoutParameters
»MyEnum.MyEnumVariantWithoutParameters«;

// $TEST$ serialization $type<MyEnumVariantWithParameters>
// $TEST$ serialization $type<MyEnum.MyEnumVariantWithParameters>
»MyEnum.MyEnumVariantWithParameters«;


// $TEST$ serialization MyEnumVariantWithoutParameterList
// $TEST$ serialization MyEnum.MyEnumVariantWithoutParameterList
»MyEnum?.MyEnumVariantWithoutParameterList«;

// $TEST$ serialization MyEnumVariantWithoutParameters
// $TEST$ serialization MyEnum.MyEnumVariantWithoutParameters
»MyEnum?.MyEnumVariantWithoutParameters«;

// $TEST$ serialization $type<MyEnumVariantWithParameters>
// $TEST$ serialization $type<MyEnum.MyEnumVariantWithParameters>
»MyEnum?.MyEnumVariantWithParameters«;
}
8 changes: 4 additions & 4 deletions ...ng/tests/resources/typing/highest common subtype/class type and enum variant/main.sdstest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ segment mySegment(
v: Contravariant<E.V>,
vOrNull: Contravariant<E.V?>,
) {
// $TEST$ serialization List<Contravariant<V>>
// $TEST$ serialization List<Contravariant<E.V>>
»[any, v]«;
// $TEST$ serialization List<Contravariant<V>>
// $TEST$ serialization List<Contravariant<E.V>>
»[anyOrNull, v]«;
// $TEST$ serialization List<Contravariant<V>>
// $TEST$ serialization List<Contravariant<E.V>>
»[any, vOrNull]«;
// $TEST$ serialization List<Contravariant<V?>>
// $TEST$ serialization List<Contravariant<E.V?>>
»[anyOrNull, vOrNull]«;

// $TEST$ serialization List<Contravariant<Nothing>>
Expand Down
6 changes: 3 additions & 3 deletions ...ests/resources/typing/highest common subtype/enum type and enum variant type/main.sdstest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ segment mySegment(
v2: Contravariant<E2.V2>,
v2OrNull: Contravariant<E2.V2?>,
) {
// $TEST$ serialization List<Contravariant<V1>>
// $TEST$ serialization List<Contravariant<E1.V1>>
»[e1, v1]«;

// $TEST$ serialization List<Contravariant<V1>>
// $TEST$ serialization List<Contravariant<E1.V1>>
»[e1, v1OrNull]«;

// $TEST$ serialization List<Contravariant<V1?>>
// $TEST$ serialization List<Contravariant<E1.V1?>>
»[e1OrNull, v1OrNull]«;


Expand Down
6 changes: 3 additions & 3 deletions ...ources/typing/highest common subtype/enum variant type and enum variant type/main.sdstest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ segment mySegment(
v3: Contravariant<E3.V3>,
v3OrNull: Contravariant<E3.V3?>
) {
// $TEST$ serialization List<Contravariant<V1>>
// $TEST$ serialization List<Contravariant<E1.V1>>
»[v1, v1]«;

// $TEST$ serialization List<Contravariant<V1>>
// $TEST$ serialization List<Contravariant<E1.V1>>
»[v1, v1OrNull]«;

// $TEST$ serialization List<Contravariant<V1?>>
// $TEST$ serialization List<Contravariant<E1.V1?>>
»[v1OrNull, v1OrNull]«;


Expand Down
4 changes: 2 additions & 2 deletions ...urces/typing/lowest common supertype/enum variant type and enum variant type/main.sdstest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ segment mySegment(
v3: E3.V3,
v3OrNull: E3.V3?
) {
// $TEST$ serialization List<V1>
// $TEST$ serialization List<E1.V1>
»[v1, v1]«;

// $TEST$ serialization List<V1?>
// $TEST$ serialization List<E1.V1?>
»[v1, v1OrNull]«;


Expand Down
2 changes: 1 addition & 1 deletion ...ces/typing/lowest common supertype/enum variant type and type parameter type/main.sdstest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class D<
p1: Any = »[v, unbounded]«,
// $TEST$ serialization List<Any?>
p2: Any = »[v, unboundedOrNull]«,
// $TEST$ serialization List<V1>
// $TEST$ serialization List<E.V1>
p3: Any = »[v, boundedByEnumVariant]«,
// $TEST$ serialization List<E>
p4: Any = »[v, boundedByOtherEnumVariant]«,
Expand Down
2 changes: 1 addition & 1 deletion .../resources/typing/lowest common supertype/singular type after simplification/main.sdstest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ segment mySegment(
// $TEST$ serialization List<E>
»[p1]«;

// $TEST$ serialization List<V>
// $TEST$ serialization List<E.V>
»[E.V]«;

// $TEST$ serialization List<$type<C>>
Expand Down
2 changes: 1 addition & 1 deletion packages/safe-ds-lang/tests/resources/typing/types/member types/main.sdstest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ fun nullableMemberTypes(
a: »MyClass.MyNestedClass?«,
// $TEST$ serialization MyNestedEnum?
b: »MyClass.MyNestedEnum?«,
// $TEST$ serialization MyEnumVariant?
// $TEST$ serialization MyEnum.MyEnumVariant?
d: »MyEnum.MyEnumVariant?«,
// $TEST$ serialization $unknown
e: »MyEnum.unresolved?«,
Expand Down