From d4b7f5e52a33f2d15aafca7f1b040f3f2821fd0c Mon Sep 17 00:00:00 2001 From: Eugen Wissner Date: Thu, 8 Oct 2026 01:29:37 +0200 Subject: Move record constructor type into the braces --- testsuite/fail_compilation/assign_const_member.elna | 4 ++-- testsuite/fail_compilation/assign_member_of_const.elna | 2 +- .../fail_compilation/record_base_constructor_type_mismatch.elna | 2 +- testsuite/runnable/aggregate_argument.elna | 2 +- testsuite/runnable/aggregate_equality.elna | 2 +- testsuite/runnable/case_record.elna | 6 +++--- testsuite/runnable/generic_constructor.elna | 2 +- testsuite/runnable/record_base_constructor.elna | 2 +- testsuite/runnable/record_construction.elna | 2 +- testsuite/runnable/return_aggregate.elna | 4 ++-- testsuite/runnable/two_fields_same_type.elna | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) (limited to 'testsuite') diff --git a/testsuite/fail_compilation/assign_const_member.elna b/testsuite/fail_compilation/assign_const_member.elna index a603729..13e9e40 100644 --- a/testsuite/fail_compilation/assign_const_member.elna +++ b/testsuite/fail_compilation/assign_const_member.elna @@ -7,8 +7,8 @@ type proc f() var - r1: R := R{ x: 5 } - r2: R := R{ x: 5 } + r1: R := { R; x: 5 } + r2: R := { R; x: 5 } begin r1 := r2 (* @Error Cannot assign to a value of type 'R', because it is constant or contains constant members *) return diff --git a/testsuite/fail_compilation/assign_member_of_const.elna b/testsuite/fail_compilation/assign_member_of_const.elna index efdf67b..44fb566 100644 --- a/testsuite/fail_compilation/assign_member_of_const.elna +++ b/testsuite/fail_compilation/assign_member_of_const.elna @@ -7,7 +7,7 @@ type proc f() var - r: const R := R{ x: 5 } + r: const R := { R; x: 5 } begin r.x := 6 (* @Error Cannot assign to a value of type 'const Int', because it is constant or contains constant members *) return diff --git a/testsuite/fail_compilation/record_base_constructor_type_mismatch.elna b/testsuite/fail_compilation/record_base_constructor_type_mismatch.elna index d7a8419..27a652c 100644 --- a/testsuite/fail_compilation/record_base_constructor_type_mismatch.elna +++ b/testsuite/fail_compilation/record_base_constructor_type_mismatch.elna @@ -11,5 +11,5 @@ var c: Child begin - c := Child{a: "wrong", b: 9} (* @Error Expected type 'Int', but got '\[\]const Word8' *) + c := { Child; a: "wrong", b: 9 } (* @Error Expected type 'Int', but got '\[\]const Word8' *) end. diff --git a/testsuite/runnable/aggregate_argument.elna b/testsuite/runnable/aggregate_argument.elna index 7ae4947..edd9529 100644 --- a/testsuite/runnable/aggregate_argument.elna +++ b/testsuite/runnable/aggregate_argument.elna @@ -9,5 +9,5 @@ proc f(r: R) -> Bool return r.a = 1 & r.b = 2 begin - assert(f(R{a: 1, b: 2})) + assert(f({ R; a: 1, b: 2 })) end. diff --git a/testsuite/runnable/aggregate_equality.elna b/testsuite/runnable/aggregate_equality.elna index c9601f9..b3e0646 100644 --- a/testsuite/runnable/aggregate_equality.elna +++ b/testsuite/runnable/aggregate_equality.elna @@ -6,7 +6,7 @@ type end proc f() -> Bool -return R{a: 1, b: 2} = R{a: 1, b: 2} +return { R; a: 1, b: 2 } = { R; a: 1, b: 2 } begin assert(f()) diff --git a/testsuite/runnable/case_record.elna b/testsuite/runnable/case_record.elna index db8a6ff..13d6add 100644 --- a/testsuite/runnable/case_record.elna +++ b/testsuite/runnable/case_record.elna @@ -6,12 +6,12 @@ type end var - r: R := R{a: 1, b: 2} + r: R := { R; a: 1, b: 2 } begin case r of - R{a: 0, b: 0}: assert(false) - | R{a: 1, b: 2}: assert(true) + { R; a: 0, b: 0 }: assert(false) | + { R; a: 1, b: 2 }: assert(true) else assert(false) end diff --git a/testsuite/runnable/generic_constructor.elna b/testsuite/runnable/generic_constructor.elna index b21cd4a..a67b4f3 100644 --- a/testsuite/runnable/generic_constructor.elna +++ b/testsuite/runnable/generic_constructor.elna @@ -14,7 +14,7 @@ var f: File begin - s := Stack#[File]{ top: 1u, items: @f }; + s := { Stack#[File]; top: 1u, items: @f }; assert(s.top = 1u); assert(s.items = @f) end. diff --git a/testsuite/runnable/record_base_constructor.elna b/testsuite/runnable/record_base_constructor.elna index 80b6802..58e81ca 100644 --- a/testsuite/runnable/record_base_constructor.elna +++ b/testsuite/runnable/record_base_constructor.elna @@ -11,7 +11,7 @@ type end var - g: Grandchild := Grandchild{a: 3, b: 5, c: 7} + g: Grandchild := { Grandchild; a: 3, b: 5, c: 7 } begin assert(g.a = 3); diff --git a/testsuite/runnable/record_construction.elna b/testsuite/runnable/record_construction.elna index 5a3a254..64770de 100644 --- a/testsuite/runnable/record_construction.elna +++ b/testsuite/runnable/record_construction.elna @@ -5,7 +5,7 @@ type end var - r: R := R{x: 1, y: 2} + r: R := { R; x: 1, y: 2 } begin assert(r.x = 1 & r.y = 2) diff --git a/testsuite/runnable/return_aggregate.elna b/testsuite/runnable/return_aggregate.elna index 6959b60..c39823d 100644 --- a/testsuite/runnable/return_aggregate.elna +++ b/testsuite/runnable/return_aggregate.elna @@ -6,8 +6,8 @@ type end proc f() -> R -return R{ a: 1, b: 2 } +return { R; a: 1, b: 2 } begin - assert(f() = R{ a: 1, b: 2 }) + assert(f() = { R; a: 1, b: 2 }) end. diff --git a/testsuite/runnable/two_fields_same_type.elna b/testsuite/runnable/two_fields_same_type.elna index 2b905b6..8f1d4cf 100644 --- a/testsuite/runnable/two_fields_same_type.elna +++ b/testsuite/runnable/two_fields_same_type.elna @@ -6,7 +6,7 @@ type proc f() -> Int var - r: R := R{x: 3, y: 2} + r: R := { R; x: 3, y: 2 } return r.x + r.y begin -- cgit v1.2.3