Changeset 4600

Timestamp:

11/21/08 15:34:32 (7 weeks ago)

Author:

pmoura

Message:

Updated the "expansion" example to illustrate the new expand_goal/2 built-in method.

Location:

trunk

Files:

• compiler/logtalk.pl (modified) (1 diff)
• examples/expansion/expansion.lgt (modified) (2 diffs)
• examples/expansion/SCRIPT.txt (modified) (3 diffs)
• RELEASE_NOTES.txt (modified) (1 diff)

trunk/compiler/logtalk.pl

@@ -2976 +2976 @@
 % expand_goal/2 built-in method
 
-'$lgt_expand_goal'(Obj, Goal, Expansion, Sender, Scope) :-
+'$lgt_expand_goal'(Obj, Goal, EGoal, Sender, Scope) :-
     (    var(Goal) ->
-         Expansion = Goal
-    ;    '$lgt_goal_expansion'(Obj, Goal, Expand, Sender, Scope) ->
-         Expansion = Expand
-    ;    Expansion = Goal
+         EGoal = Goal
+    ;    '$lgt_goal_expansion'(Obj, Goal, Expanded, Sender, Scope) ->
+         '$lgt_expand_goal'(Obj, Expanded, EGoal, Sender, Scope)
+    ;    EGoal = Goal
     ). 
 

trunk/examples/expansion/expansion.lgt

@@ -14 +14 @@
     term_expansion(9, nine).
 
+    goal_expansion(write(Term), writeq(Term)).
+    goal_expansion(writeq(Term), write_term(Term, [quoted(true)])).
+
 :- end_category.
 
@@ -19 +22 @@
 :- category(conversion_test).
 
-    :- public(test/2).
+    :- public(test_term/2).
 
-    test(Term, Expansion) :-
+    test_term(Term, Expansion) :-
         expand_term(Term, Expansion).
+
+    :- public(test_goal/2).
+
+    test_goal(Goal, EGoal) :-
+        expand_goal(Goal, EGoal).
 
 :- end_category.

trunk/examples/expansion/SCRIPT.txt

@@ -16 +16 @@
 
 
-% simple tests of the expand_term/2 built-in method:
+% simple tests of the expand_term/2 and expand_goal/2 built-in methods:
 
 | ?- exp_public::expand_term(8, Term).
@@ -23 +23 @@
 yes
 
+| ?- exp_public::expand_goal(write(Term), EGoal).
+
+EGoal = write_term(Term, [quoted(true)]).
+yes
+
+
 | ?- exp_protected::expand_term(8, Term).
 
 Term = 8 
 yes
+
+| ?- exp_protected::expand_goal(write(Term), EGoal).
+
+EGoal = write(Term).
+yes
+
 
 | ?- exp_private::expand_term(8, Term).
@@ -33 +45 @@
 yes
 
-| ?- desc_public::test(8, Term).
+| ?- exp_private::expand_goal(write(Term), EGoal).
+
+EGoal = write(Term).
+yes
+
+
+| ?- desc_public::test_term(8, Term).
 
 Term = eight 
 yes
 
-| ?- desc_protected::test(8, Term).
+| ?- desc_public::test_goal(write(Term), EGoal).
+
+EGoal = write_term(Term, [quoted(true)])
+yes
+
+
+| ?- desc_protected::test_term(8, Term).
 
 Term = eight 
 yes
 
-| ?- desc_private::test(8, Term).
+| ?- desc_protected::test_goal(write(Term), EGoal).
+
+EGoal = write_term(Term, [quoted(true)])
+yes
+
+
+| ?- desc_private::test_term(8, Term).
 
 Term = 8 
 yes
+
+| ?- desc_private::test_goal(write(Term), EGoal).
+
+EGoal = write(Term)
+yes

trunk/RELEASE_NOTES.txt

@@ -58 +58 @@
     to illustrate the use of some of the meta-predicates implemented in the
     Logtalk library.
+
+    Updated the "expansion" example to illustrate the new expand_goal/2
+    built-in method.
 
     Added an example, "cc", of using conditional compilation directives to