Changeset 4094 for trunk/library

Timestamp:

02/16/08 03:54:30 (11 months ago)

Author:

pmoura

Message:

Added forto/5 and fordownto/5 meta-predicates to the library object "loop".

Location:

trunk/library

Files:

• loop.lgt (modified) (5 diffs)
• loopp.lgt (modified) (2 diffs)

trunk/library/loop.lgt

@@ -6 +6 @@
         version is 1.2,
         author is 'Paulo Moura',
-        date is 2008/2/15,
+        date is 2008/2/16,
         comment is 'Loop control structures predicates.']).
 
@@ -31 +31 @@
         foreach_inv(List, Count, Goal).
 
+    :- meta_predicate(forto_aux(*, *, *, *, ::)).
+    forto_aux(Count, First, Last, Increment, Goal) :-
+        (   First =< Last ->
+            \+ \+ (Count = First, call(Goal)),
+            Next is First + Increment,
+            forto_aux(Count, Next, Last, Increment, Goal)
+        ;   true
+        ).
+
     :- meta_predicate(forto(*, *, ::)).
     forto(FirstExp, LastExp, Goal) :-
         First is FirstExp,
         Last is LastExp,
-        (   First =< Last ->
-            \+ \+ call(Goal),
-            Next is First + 1,
-            forto(Next, Last, Goal)
-        ;   true
-        ).
+        forto_aux(_, First, Last, 1, Goal).
 
     :- meta_predicate(forto(*, *, *, ::)).
@@ -46 +50 @@
         First is FirstExp,
         Last is LastExp,
-        (   First =< Last ->
+        forto_aux(Count, First, Last, 1, Goal).
+
+    :- meta_predicate(forto(*, *, *, *, ::)).
+    forto(Count, FirstExp, LastExp, IncrementExp, Goal) :-
+        First is FirstExp,
+        Last is LastExp,
+        Increment is abs(IncrementExp),
+        forto_aux(Count, First, Last, Increment, Goal).
+
+    :- meta_predicate(fordownto_aux(*, *, *, *, ::)).
+    fordownto_aux(Count, First, Last, Decrement, Goal) :-
+        (   First >= Last ->
             \+ \+ (Count = First, call(Goal)),
-            Next is First + 1,
-            forto(Count, Next, Last, Goal)
+            Next is First - Decrement,
+            fordownto_aux(Count, Next, Last, Decrement, Goal)
         ;   true
         ).
@@ -57 +72 @@
         First is FirstExp,
         Last is LastExp,
-        (   First >= Last ->
-            \+ \+ call(Goal),
-            Next is First - 1,
-            fordownto(Next, Last, Goal)
-        ;   true
-        ).
+        fordownto_aux(_, First, Last, 1, Goal).
 
     :- meta_predicate(fordownto(*, *, *, ::)).
@@ -68 +78 @@
         First is FirstExp,
         Last is LastExp,
-        (   First >= Last ->
-            \+ \+ (Count = First, call(Goal)),
-            Next is First - 1,
-            fordownto(Count, Next, Last, Goal)
-        ;   true
-        ).
+        fordownto_aux(Count, First, Last, 1, Goal).
+
+    :- meta_predicate(fordownto(*, *, *, *, ::)).
+    fordownto(Count, FirstExp, LastExp, DecrementExp, Goal) :-
+        First is FirstExp,
+        Last is LastExp,
+        Decrement is abs(DecrementExp),
+        fordownto_aux(Count, First, Last, Decrement, Goal).
 
 :- end_object.

trunk/library/loopp.lgt

@@ -5 +5 @@
         version is 1.2,
         author is 'Paulo Moura',
-        date is 2008/2/15,
+        date is 2008/2/16,
         comment is 'Loop control constructs protocol.']).
+
+
+    :- public(whiledo/2).
+    :- meta_predicate(whiledo(::, ::)).
+    :- mode(whiledo(+callable, @callable), zero_or_one).
+    :- info(whiledo/2, [
+        comment is 'While Condition is true do Action.',
+        argnames is ['Condition', 'Action']]).
 
     :- public(dowhile/2).
@@ -17 +25 @@
     :- public(foreach/3).
     :- meta_predicate(foreach(*, *, ::)).
-    :- mode(foreach(-term, +list(term), @callable), zero_or_one).
+    :- mode(foreach(@var, +list(term), @callable), zero_or_one).
     :- info(foreach/3, [
-        comment is 'For each element Count in List call Goal.',
-        argnames is ['Count', 'List', 'Goal']]).
+        comment is 'For each element Element in List call Goal.',
+        argnames is ['Element', 'List', 'Goal']]).
 
     :- public(forto/3).
     :- meta_predicate(forto(*, *, ::)).
-    :- mode(forto(+integer, +integer, @callable), zero_or_one).
+    :- mode(forto(+number, +number, @callable), zero_or_one).
     :- info(forto/3, [
-        comment is 'Counting from First to Last call Goal. For convenience and clarity, First and Last can be integer expressions.',
+        comment is 'Call Goal counting up from First to Last. Increment is 1. For convenience and clarity, First and Last can be arithmetic expressions.',
         argnames is ['First', 'Last', 'Goal']]).
 
     :- public(forto/4).
     :- meta_predicate(forto(*, *, *, ::)).
-    :- mode(forto(-integer, +integer, +integer, @callable), zero_or_one).
+    :- mode(forto(@var, +number, +number, @callable), zero_or_one).
     :- info(forto/4, [
-        comment is 'Call Goal counting from First to Last and instantiating Count to each successive value. For convenience and clarity, First and Last can be integer expressions.',
+        comment is 'Call Goal counting up from First to Last and instantiating Count to each successive value. Increment is 1. For convenience and clarity, First and Last can be arithmetic expressions.',
         argnames is ['Count', 'First', 'Last', 'Goal']]).
+
+    :- public(forto/5).
+    :- meta_predicate(forto(*, *, *, *, ::)).
+    :- mode(forto(@var, +number, +number, +number, @callable), zero_or_one).
+    :- info(forto/5, [
+        comment is 'Call Goal counting up from First to Last and instantiating Count to each successive value. For convenience and clarity, First, Last, and Increment can be arithmetic expressions. The absolute value of Increment is used.',
+        argnames is ['Count', 'First', 'Last', 'Increment', 'Goal']]).
 
     :- public(fordownto/3).
     :- meta_predicate(fordownto(*, *, ::)).
-    :- mode(fordownto(+integer, +integer, @callable), zero_or_one).
+    :- mode(fordownto(+number, +number, @callable), zero_or_one).
     :- info(fordownto/3, [
-        comment is 'Counting from First to Last call Goal. For convenience and clarity, First and Last can be integer expressions.',
+        comment is 'Call Goal counting down from First to Last. Decrement is 1. For convenience and clarity, First and Last can be arithmetic expressions.',
         argnames is ['First', 'Last', 'Goal']]).
 
     :- public(fordownto/4).
     :- meta_predicate(fordownto(*, *, *, ::)).
-    :- mode(fordownto(-integer, +integer, +integer, @callable), zero_or_one).
+    :- mode(fordownto(@var, +number, +number, @callable), zero_or_one).
     :- info(fordownto/4, [
-        comment is 'Call Goal counting from First to Last and instantiating Count to each successive value. For convenience and clarity, First and Last can be integer expressions.',
+        comment is 'Call Goal counting down from First to Last and instantiating Count to each successive value. Decrement is 1. For convenience and clarity, First and Last can be arithmetic expressions.',
         argnames is ['Count', 'First', 'Last', 'Goal']]).
 
-    :- public(whiledo/2).
-    :- meta_predicate(whiledo(::, ::)).
-    :- mode(whiledo(+callable, @callable), zero_or_one).
-    :- info(whiledo/2, [
-        comment is 'While Condition is true do Action.',
-        argnames is ['Condition', 'Action']]).
+    :- public(fordownto/5).
+    :- meta_predicate(fordownto(*, *, *, *, ::)).
+    :- mode(fordownto(@var, +number, +number, +number, @callable), zero_or_one).
+    :- info(fordownto/5, [
+        comment is 'Call Goal counting down from First to Last and instantiating Count to each successive value. For convenience and clarity, First, Last, and Decrement can be arithmetic expressions. The absolute value of Decrement is used.',
+        argnames is ['Count', 'First', 'Last', 'Decrement', 'Goal']]).
 
 :- end_protocol.