From 72faae829a789664eedbda930cf815663c41c591 Mon Sep 17 00:00:00 2001 From: Jedidiah Barber Date: Sat, 15 Nov 2025 08:03:12 +1300 Subject: Prelude combined into base, lazy Conjunct kinda working but still loops in some circumstances --- test/ab.adb | 2 +- test/fivesix.adb | 4 ++-- test/membero.adb | 8 +++----- test/pprint.adb | 2 +- 4 files changed, 7 insertions(+), 9 deletions(-) (limited to 'test') diff --git a/test/ab.adb b/test/ab.adb index 5df34e2..3ca2fee 100644 --- a/test/ab.adb +++ b/test/ab.adb @@ -23,7 +23,7 @@ procedure AB is package InPrin is new InKomp.Pretty_Print (Integer'Image); use InPrin; - Verse : Mu_World := Empty_Mu_World; + Verse : World := Empty_World; Ref : Term; begin diff --git a/test/fivesix.adb b/test/fivesix.adb index b8046af..3eabf6a 100644 --- a/test/fivesix.adb +++ b/test/fivesix.adb @@ -23,8 +23,8 @@ procedure FiveSix is package InPrin is new InKomp.Pretty_Print (Integer'Image); use InPrin; - Fives, Sixes : Mu_World := Empty_Mu_World; - Result : Mu_World; + Fives, Sixes : World := Empty_World; + Result : World; begin diff --git a/test/membero.adb b/test/membero.adb index 1143df2..46127d7 100644 --- a/test/membero.adb +++ b/test/membero.adb @@ -10,7 +10,6 @@ with Ada.Strings.Unbounded, Ada.Text_IO, - Kompsos.Prelude, Kompsos.Pretty_Print; @@ -28,10 +27,9 @@ procedure Membero is package InKomp is new Kompsos (SU.Unbounded_String); use InKomp; - package Prelude is new InKomp.Prelude; package Printer is new InKomp.Pretty_Print (SU.To_String); - Verse : Prelude.World := Prelude.Empty_World; + Verse : World := Empty_World; Test_Item : constant Term := T (T (+"one") & T (+"two") & T (+"three") & T (+"four")); @@ -44,9 +42,9 @@ begin TIO.New_Line; - Verse.Member (Verse.Fresh ("result"), Test_Item); + Verse.Member (Verse.Fresh ("result") & Test_Item); - TIO.Put_Line (Printer.Image (Verse)); + TIO.Put_Line (Printer.Image (Verse.Take (5))); end Membero; diff --git a/test/pprint.adb b/test/pprint.adb index 8bce15e..b34f255 100644 --- a/test/pprint.adb +++ b/test/pprint.adb @@ -50,7 +50,7 @@ begin TIO.New_Line; - TIO.Put_Line (Image (Empty_Mu_World)); + TIO.Put_Line (Image (Empty_World)); end PPrint; -- cgit