From e4ce7f658741a7428597da4872435a1b0bae944c Mon Sep 17 00:00:00 2001 From: Eugen Wissner Date: Sat, 3 Oct 2026 20:51:22 +0200 Subject: Rework generics for parameters to be plain types --- testsuite/runnable/generic_base.elna | 14 +++++++------- testsuite/runnable/generic_constructor.elna | 6 +++--- testsuite/runnable/generic_erasure.elna | 12 ++++++------ testsuite/runnable/generic_record.elna | 8 ++++---- 4 files changed, 20 insertions(+), 20 deletions(-) (limited to 'testsuite/runnable') diff --git a/testsuite/runnable/generic_base.elna b/testsuite/runnable/generic_base.elna index 63737e0..161c59d 100644 --- a/testsuite/runnable/generic_base.elna +++ b/testsuite/runnable/generic_base.elna @@ -5,26 +5,26 @@ type end List#[T] = record - head: T; + head: ^T; count: Word end Queue#[T] = record(List#[T]) - tail: T + tail: ^T end var - jobs: Queue#[^File] - seen: ^List#[^File] + jobs: Queue#[File] + seen: ^List#[File] f: File -proc push#[T](target: ^List#[T]; value: T) +proc push#[T](target: ^List#[T]; value: ^T) begin target^.head := value; target^.count := target^.count + 1u return -proc enqueue#[T](target: ^Queue#[T]; value: T) +proc enqueue#[T](target: ^Queue#[T]; value: ^T) begin push(target, value); target^.tail := value @@ -36,5 +36,5 @@ begin assert(jobs.count = 1u); assert(jobs.head = @f); assert(jobs.tail = @f); - assert(#size(Queue#[^File]) = #size(Pointer) * 3u) + assert(#size(Queue#[File]) = #size(Pointer) * 3u) end. diff --git a/testsuite/runnable/generic_constructor.elna b/testsuite/runnable/generic_constructor.elna index d0a3f78..b21cd4a 100644 --- a/testsuite/runnable/generic_constructor.elna +++ b/testsuite/runnable/generic_constructor.elna @@ -5,16 +5,16 @@ type end Stack#[T] = record - items: T; + items: ^T; top: Word end var - s: Stack#[^File] + s: Stack#[File] 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/generic_erasure.elna b/testsuite/runnable/generic_erasure.elna index 20862fa..db4d8c9 100644 --- a/testsuite/runnable/generic_erasure.elna +++ b/testsuite/runnable/generic_erasure.elna @@ -5,16 +5,16 @@ type end Cell#[T] = record - held: T + held: ^T end var - files: Cell#[^File] - bytes: Cell#[^Word8] + files: Cell#[File] + bytes: Cell#[Word8] f: File b: Word8 -proc store#[T](target: ^Cell#[T]; value: T) +proc store#[T](target: ^Cell#[T]; value: ^T) begin target^.held := value return @@ -22,8 +22,8 @@ return begin f.fd := 7; b := 3u8; - store#[^File](@files, @f); - store#[^Word8](@bytes, @b); + store#[File](@files, @f); + store#[Word8](@bytes, @b); assert(files.held^.fd = 7); assert(bytes.held^ = 3u8) end. diff --git a/testsuite/runnable/generic_record.elna b/testsuite/runnable/generic_record.elna index 4164c3d..1fff97d 100644 --- a/testsuite/runnable/generic_record.elna +++ b/testsuite/runnable/generic_record.elna @@ -5,15 +5,15 @@ type end Stack#[T] = record - items: T; + items: ^T; top: Word end var - s: Stack#[^File] + s: Stack#[File] f: File -proc push#[T](target: ^Stack#[T]; value: T) +proc push#[T](target: ^Stack#[T]; value: ^T) begin target^.items := value; target^.top := target^.top + 1u @@ -21,7 +21,7 @@ return begin s.top := 0u; - push#[^File](@s, @f); + push#[File](@s, @f); assert(s.top = 1u); assert(s.items = @f) end. -- cgit v1.2.3