From 49a6d709bd17c01cb7d0344b8e25a8764fc4dbd3 Mon Sep 17 00:00:00 2001 From: Davide Fissore Date: Mon, 16 Dec 2024 18:21:19 +0100 Subject: [PATCH] update mode signatures of tests --- tests/sources/dt_var.elpi | 1 + tests/sources/functionality/test29.elpi | 2 +- tests/sources/helena_elpi/helena.elpi | 16 ++++++++-------- tests/sources/hilbert/hilbert.mod | 1 + tests/sources/hilbert2/hilbert2.mod | 1 + tests/sources/map_list_opt.elpi | 4 ++-- tests/sources/set.elpi | 4 ++-- tests/sources/shorten_trie.elpi | 6 +++--- 8 files changed, 19 insertions(+), 16 deletions(-) diff --git a/tests/sources/dt_var.elpi b/tests/sources/dt_var.elpi index 685f9e9f0..aa1b4819c 100644 --- a/tests/sources/dt_var.elpi +++ b/tests/sources/dt_var.elpi @@ -11,6 +11,7 @@ p [1 | X] :- print "OK". pred exec i:prop. exec P :- (P, fail); true. +:untyped main :- exec (f X), exec (p [1 | Y]). \ No newline at end of file diff --git a/tests/sources/functionality/test29.elpi b/tests/sources/functionality/test29.elpi index 1b45dcc33..495468928 100644 --- a/tests/sources/functionality/test29.elpi +++ b/tests/sources/functionality/test29.elpi @@ -1,5 +1,5 @@ % YES -:functional pred r o:int, o:int. +:functional pred r o:int, i:int. :functional pred p i:(pred i:int). diff --git a/tests/sources/helena_elpi/helena.elpi b/tests/sources/helena_elpi/helena.elpi index 8c2be7cf3..a1bf0da3b 100644 --- a/tests/sources/helena_elpi/helena.elpi +++ b/tests/sources/helena_elpi/helena.elpi @@ -68,13 +68,13 @@ m+pred m+y m+y. % EXTENDED REDUCTION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -pred maybe+sn o:any,o:any,o:any,o:any,o:any,o:any,o:any,o:any. -pred age+check o:any,o:any,o:any,o:any,o:any,o:any,o:any,o:any,o:any,o:any. -pred conv+ o:any,o:any,o:any,o:any,o:any,o:any. -pred conv+s o:any,o:any. -pred conv+r o:any,o:any,o:any,o:any,o:any,o:any. -pred conv+l o:any,o:any,o:any,o:any,o:any,o:any. -pred conv+0 o:any,o:any,o:any,o:any,o:any,o:any. +pred maybe+sn i:any,i:any,o:any,o:any,o:any,o:any,i:any,i:any. +pred age+check i:any,i:any,o:any,o:any,o:any,o:any,i:any,o:any,i:any,i:any. +pred conv+ o:any,i:any,o:any,o:any,i:any,i:any. +pred conv+s i:any,i:any. +pred conv+r i:any,i:any,o:any,o:any,i:any,o:any. +pred conv+l o:any,i:any,o:any,o:any,i:any,i:any. +pred conv+0 o:any,i:any,o:any,o:any,i:any,i:any. pred k+succ o:any,o:any. type k+prop any. type k+set any. @@ -94,7 +94,7 @@ type sort any -> any. type abst any -> any -> (any -> any) -> any. type abbr any -> (any -> any) -> any. type prod any -> any -> (any -> any) -> any. -pred appl+ o:any,o:any,o:any,o:any. +pred appl+ i:any,o:any,o:any,o:any. pred gv+ o:any. pred tv+ o:any. type gtop any. diff --git a/tests/sources/hilbert/hilbert.mod b/tests/sources/hilbert/hilbert.mod index fd289eb37..57d2b4e29 100644 --- a/tests/sources/hilbert/hilbert.mod +++ b/tests/sources/hilbert/hilbert.mod @@ -124,6 +124,7 @@ problem1 X U Y Z :- % converts ints to church numerals cn 0 Z :- zero Z. cn 1 One :- one One. +:untyped cn N (P CNP One) :- N > 1, NP is (N - 1), plus P, one One, cn NP CNP. % tests: diff --git a/tests/sources/hilbert2/hilbert2.mod b/tests/sources/hilbert2/hilbert2.mod index 8d10560a5..d60f5c633 100644 --- a/tests/sources/hilbert2/hilbert2.mod +++ b/tests/sources/hilbert2/hilbert2.mod @@ -108,6 +108,7 @@ problem1 X U Y Z :- % converts ints to church numerals cn 0 Z :- zero Z. cn 1 One :- one One. +:untyped cn N (P CNP One) :- N > 1, NP is (N - 1), plus P, one One, cn NP CNP. % tests: diff --git a/tests/sources/map_list_opt.elpi b/tests/sources/map_list_opt.elpi index 2f822b7bb..05e13ad8f 100644 --- a/tests/sources/map_list_opt.elpi +++ b/tests/sources/map_list_opt.elpi @@ -21,14 +21,14 @@ build N M X X1 :- add N N X XR, build N1 M XR X1. -pred test i:int, i:int, i:(int -> A -> int -> prop), i:A. +pred test i:int, i:int, i:(pred i:int, i:A, o:int), i:A. test N N _ _ :- !. test N M F X :- N1 is N + 1, std.assert! (F N X N) "not found", test N1 M F X. -pred test2 i:int, i:int, i:(int -> A -> A -> prop), i:A. +pred test2 i:int, i:int, i:(pred i:int, i:A, o:A), i:A. test2 N N _ _ :- !. test2 N M F X :- N1 is N + 1, diff --git a/tests/sources/set.elpi b/tests/sources/set.elpi index 827bf8319..d298d0e28 100644 --- a/tests/sources/set.elpi +++ b/tests/sources/set.elpi @@ -6,14 +6,14 @@ build N M X X1 :- std.set.add N X XR, build N1 M XR X1. -pred test i:int, i:int, i:(int -> A -> prop), i:A. +pred test i:int, i:int, i:(pred i:int, i:A), i:A. test N N _ _ :- !. test N M F X :- N1 is N + 1, std.assert! (F N X) "not found", test N1 M F X. -pred test2 i:int, i:int, i:(int -> A -> A -> prop), i:A, o:A. +pred test2 i:int, i:int, i:(pred i:int, i:A, o:A), i:A, o:A. test2 N N _ R R :- !. test2 N M F X R :- N1 is N + 1, diff --git a/tests/sources/shorten_trie.elpi b/tests/sources/shorten_trie.elpi index 939abea04..a6f364b91 100644 --- a/tests/sources/shorten_trie.elpi +++ b/tests/sources/shorten_trie.elpi @@ -1,8 +1,8 @@ -pred std.list.map i:any, i:any. +pred std.list.map o:any, i:any. std.list.map _ _. -pred std.string.concat1 i:any, i:any, i:any. +pred std.string.concat1 i:any, i:any, o:any. std.string.concat1 _ _ _. -pred std.string.escape i:any, i:any. +pred std.string.escape i:any, o:any. std.string.escape _ _. shorten std.{list.map, string.{ concat1, escape }}.