Changeset 4216

Timestamp:

04/22/08 08:09:59 (2 months ago)

Author:

pmoura

Message:

Updated the definitions of the predicate valid/1 for the library objects "list", "list(Type)", "numberlist", "set", "set(Type)", "varlist" to fail for lists with unbound tails after discussion with Jan Wielemaker and Ulrich Neumerkel.

Location:

trunk

Files:

• library/list.lgt (modified) (2 diffs)
• library/list1.lgt (modified) (1 diff)
• library/numberlist.lgt (modified) (2 diffs)
• library/set.lgt (modified) (2 diffs)
• library/set1.lgt (modified) (1 diff)
• library/varlist.lgt (modified) (2 diffs)
• RELEASE_NOTES.txt (modified) (1 diff)

trunk/library/list.lgt

@@ -5 +5 @@
 
     :- info([
-        version is 1.3,
+        version is 1.4,
         author is 'Paulo Moura',
-        date is 2006/12/21,
+        date is 2008/4/22,
         comment is 'List predicates.']).
 
@@ -203 +203 @@
         suffix(List, Tail).
 
-    valid(List) :-
-        nonvar(List),
-        \+ \+ valid2(List).
-
-    valid2([]).
-    valid2([_| List]) :-
-        valid2(List).
+    valid(-) :-     % catch variables and lists with unbound tails
+        !,
+        fail.
+    valid([]).
+    valid([_| List]) :-
+        valid(List).
 
 :- end_object.

trunk/library/list1.lgt

@@ -4 +4 @@
 
     :- info([
-        version is 1.01,
+        version is 1.1,
         author is 'Paulo Moura',
-        date is 2006/4/25,
+        date is 2008/4/22,
         comment is 'List predicates with elements constrained to a single type.']).
 
-    valid(List) :-
-        nonvar(List),
+    valid(-) :-     % catch variables and lists with unbound tails
+        !,
+        fail.
+    valid([]).
+    valid([Element| List]) :-
         parameter(1, Type),
-        \+ \+ valid(List, Type).
-
-    valid([], _).
-    valid([Value| List], Type) :-
-        Type::valid(Value),
-        valid(List, Type).
+        Type::valid(Element),
+        valid(List).
 
 :- end_object.

trunk/library/numberlist.lgt

@@ -5 +5 @@
 
     :- info([
-        version is 1.1,
+        version is 1.2,
         author is 'Paulo Moura',
-        date is 2007/4/20,
+        date is 2008/4/22,
         comment is 'List of numbers predicates.']).
 
@@ -57 +57 @@
         sum(Ns, Acc2, Sum).
 
-    valid(List) :-
-        nonvar(List),
-        \+ \+ valid2(List).
-
-    valid2([]).
-    valid2([Head| Tail]) :-
-        number(Head),
-        valid2(Tail).
+    valid(-) :-     % catch variables and lists with unbound tails
+        !,
+        fail.
+    valid([]).
+    valid([Element| List]) :-
+        number(Element),
+        valid(List).
 
 :- end_object.

trunk/library/set.lgt

@@ -5 +5 @@
 
     :- info([
-        version is 1.0,
+        version is 1.1,
         author is 'Paulo Moura',
-        date is 2000/7/24,
+        date is 2008/4/22,
         comment is 'Set predicates implemented using ordered lists. Uses ==/2 for element comparison and standard term ordering.']).
 
@@ -179 +179 @@
         union([Head1| Tail1], Tail2, Union).
 
-    valid(Set) :-
-        nonvar(Set),
-        valid2(Set).
+    valid(-) :-             % catch variables
+        !,
+        fail.
+    valid([]) :-
+        !.
+    valid([Element| Set]) :-
+        check_order(Set, Element).
 
-    valid2([]) :-
+    check_order(-, _) :-    % catch unbound tails
+        !,
+        fail.
+    check_order([], _) :-
         !.
-    valid2([_]) :-
-        !.
-    valid2([Element1, Element2| Set]) :-
-        Element1 @< Element2,
-        valid2([Element2| Set]).
+    check_order([Element2| Set], Element1) :-
+        Element2 @> Element1,
+        check_order(Set, Element2).
 
 :- end_object.

trunk/library/set1.lgt

@@ -4 +4 @@
 
     :- info([
-        version is 1.01,
+        version is 1.1,
         author is 'Paulo Moura',
-        date is 2006/4/25,
+        date is 2008/4/22,
         comment is 'Set predicates with elements constrained to a single type.']).
 
-    valid(Set) :-
-        nonvar(Set),
+    valid(-) :-             % catch variables
+        !,
+        fail.
+    valid([]) :-
+        !.
+    valid([Element| Set]) :-
+        check_order(Set, Element).
+
+    check_order(-, _) :-    % catch unbound tails
+        !,
+        fail.
+    check_order([], _) :-
+        !.
+    check_order([Element2| Set], Element1) :-
         parameter(1, Type),
-        \+ \+ valid(Set, Type).
-
-    valid([], _) :-
-        !.
-    valid([Element], Type) :-
-        !,
-        Type::valid(Element).
-    valid([Element1, Element2| Set], Type) :-
-        Element1 @< Element2,
         Type::valid(Element1),
         Type::valid(Element2),
-        valid([Element2| Set], Type).
+        Element2 @> Element1,
+        check_order(Set, Element2).
 
 :- end_object.

trunk/library/varlist.lgt

@@ -4 +4 @@
 
     :- info([
-        version is 1.0,
+        version is 1.1,
         author is 'Paulo Moura',
-        date is 2000/7/24,
+        date is 2008/4/22,
         comment is 'List of variables predicates.']).
 
@@ -26 +26 @@
         prefix(Tail1, Tail2).
 
-    valid(List) :-
-        nonvar(List),
-        \+ \+ valid2(List).
-
-    valid2([]).
-    valid2([Head| Tail]) :-
-        var(Head),
-        valid2(Tail).
+    valid(-) :-     % catch variables and lists with unbound tails
+        !,
+        fail.
+    valid([]).
+    valid([Element| List]) :-
+        var(Element),
+        valid(List).
 
 :- end_object.

trunk/RELEASE_NOTES.txt

@@ -62 +62 @@
     installation script to use the "C:\lgtsvn" as base. Simplified manual 
     installation instructions.
+
+    Updated the definitions of the predicate valid/1 for the library objects 
+    "list", "list(Type)", "numberlist", "set", "set(Type)", "varlist" to fail 
+    for lists with unbound tails after discussion with Jan Wielemaker and 
+    Ulrich Neumerkel.
 
     Added a simple example, "debug_hooks", of using compilation hooks and