diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/ab.adb | 14 | ||||
| -rw-r--r-- | test/fivesix.adb | 14 | ||||
| -rw-r--r-- | test/membero.adb | 8 | ||||
| -rw-r--r-- | test/pprint.adb | 2 | ||||
| -rw-r--r-- | test/rembero.adb | 6 |
5 files changed, 22 insertions, 22 deletions
diff --git a/test/ab.adb b/test/ab.adb index 3ca2fee..de89207 100644 --- a/test/ab.adb +++ b/test/ab.adb @@ -23,8 +23,8 @@ procedure AB is package InPrin is new InKomp.Pretty_Print (Integer'Image); use InPrin; - Verse : World := Empty_World; - Ref : Term; + Relation : Goal := Empty_Goal; + Item : Term; begin @@ -32,12 +32,12 @@ begin TIO.New_Line; - Ref := Verse.Fresh ("a"); - Verse.Unify (Ref, 7); - Ref := Verse.Fresh ("b"); - Verse := Disjunct (Verse.Unify (Ref, 5), Verse.Unify (Ref, 6)); + Item := Relation.Fresh ("a"); + Relation.Unify (Item, 7); + Item := Relation.Fresh ("b"); + Relation := Disjunct (Relation.Unify (Item, 5), Relation.Unify (Item, 6)); - TIO.Put_Line (Image (Verse)); + TIO.Put_Line (Image (Relation)); end AB; diff --git a/test/fivesix.adb b/test/fivesix.adb index 5876c44..9620c60 100644 --- a/test/fivesix.adb +++ b/test/fivesix.adb @@ -26,10 +26,10 @@ procedure FiveSix is -- It is possible to create a recursion using functions like this... function Fives - (This : in World) - return World + (This : in Goal) + return Goal is - One, Two : World := This; + One, Two : Goal := This; begin One.Unify (One.Fresh, 5); Two.Conjunct (Fives'Access); @@ -37,8 +37,8 @@ procedure FiveSix is end Fives; - Sixes : World := Empty_World; - Result : World; + Sixes : Goal := Empty_Goal; + Result : Goal; begin @@ -51,10 +51,10 @@ begin Sixes.Unify (Sixes.Fresh, 6); Sixes.Recurse; - Result := Disjunct (Fives (Empty_World), Sixes); + Result := Disjunct (Fives (Empty_Goal), Sixes); -- Note how the States from Fives keep creating new Variables instead of looping. - TIO.Put_Line (Image (Result.Take (5))); + TIO.Put_Line (Image (Result.Run (5))); end FiveSix; diff --git a/test/membero.adb b/test/membero.adb index 827e6ab..057843f 100644 --- a/test/membero.adb +++ b/test/membero.adb @@ -29,7 +29,7 @@ procedure Membero is package Printer is new SKomp.Pretty_Print (SU.To_String); - Verse : World := Empty_World; + Relation : Goal := Empty_Goal; Test_Item : constant Term := T (T (+"one") & T (+"two") & T (+"three") & T (+"four")); @@ -42,15 +42,15 @@ begin TIO.New_Line; - Verse.Member (Verse.Fresh ("result") & Test_Item); + Relation.Member (Relation.Fresh ("result") & Test_Item); TIO.Put_Line ("Raw results:"); - TIO.Put_Line (Printer.Image (Verse)); + TIO.Put_Line (Printer.Image (Relation)); TIO.New_Line; TIO.Put_Line ("Reified results:"); - for Subst of Verse.Take_All loop + for Subst of Relation.Run_All loop TIO.Put_Line (Printer.Image (Resolve_First (Subst, "result"))); end loop; diff --git a/test/pprint.adb b/test/pprint.adb index c42b2c8..e2fe3d4 100644 --- a/test/pprint.adb +++ b/test/pprint.adb @@ -50,7 +50,7 @@ begin TIO.New_Line; - TIO.Put_Line (Image (Empty_World)); + TIO.Put_Line (Image (Empty_Goal)); end PPrint; diff --git a/test/rembero.adb b/test/rembero.adb index 669d42a..e64314e 100644 --- a/test/rembero.adb +++ b/test/rembero.adb @@ -24,7 +24,7 @@ procedure Rembero is package Printer is new InKomp.Pretty_Print (Integer'Image); - Verse : World := Empty_World; + Relation : Goal := Empty_Goal; begin @@ -35,10 +35,10 @@ begin TIO.New_Line; - Verse.Remove (Verse.Fresh ("item") & Verse.Fresh ("list") & Verse.Fresh ("out")); + Relation.Remove (Relation.Fresh ("item") & Relation.Fresh ("list") & Relation.Fresh ("out")); declare - First_Five : constant State_Array := Verse.Take (5); + First_Five : constant State_Array := Relation.Run (5); begin TIO.Put_Line ("Raw results:"); TIO.Put_Line (Printer.Image (First_Five)); |