From 72a83eec6256a1400b83f736d38191e30a26ca71 Mon Sep 17 00:00:00 2001
From: Vitor Santos Costa <vsc@dcc.fc.up.pt>
Date: Sun, 8 May 2011 23:49:06 +0100
Subject: [PATCH] small fixes.

---
 packages/meld/meldc.yap | 9 +++++----
 packages/meld/meldi.yap | 6 +++++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/packages/meld/meldc.yap b/packages/meld/meldc.yap
index 35d8ecdc4..11b74cc01 100644
--- a/packages/meld/meldc.yap
+++ b/packages/meld/meldc.yap
@@ -116,7 +116,7 @@ rule(Head, Body) :-
 
 builtins([]) --> [].
 builtins(G.Gs) -->
-	builtin(G), !,
+	builtin(G),
         builtins(Gs).
 
 builtin(Res = Op) --> !,
@@ -198,8 +198,8 @@ compile_goal(Goal, Goals, Gs, Head) :-
 	reorder_builtins(DelGoal, DelBLF, DelBLF2),
 	listtobody(BLF2, Body),
 	listtobody(DelBLF2, DelBody),
-	once((assert(meld_program:(run(Goal) :- Body)),
-	assert(meld_program:(run(deleted(DelGoal)) :- DelBody)))).
+	assert(meld_program:(run(Goal) :- Body)),
+	assert(meld_program:(run(deleted(DelGoal)) :- DelBody)).
 
 % quantified variables should not leave the scope of the forall.
 quantified_vars(G,Extern,NG) :-
@@ -312,7 +312,8 @@ listtobody([G|GL], (G,Gs)) :-
 
 reorder_builtins(Head, BLF, BLF2) :-
 	term_variables(Head, Vs0),
-	reorder_term(BLF, Vs0, [], BLF2).
+	sort(Vs0, Vs),
+	reorder_term(BLF, Vs, [], BLF2).
 
 % 4 arguments
 % list of input goals
diff --git a/packages/meld/meldi.yap b/packages/meld/meldi.yap
index 622cbf869..f1a98fc83 100644
--- a/packages/meld/meldi.yap
+++ b/packages/meld/meldi.yap
@@ -117,13 +117,17 @@ min(Skel,_,Goal) :-
 
 sum(Skel,Arg,Goal) :-
 	copy_term(Skel, NGoal),
-	meld_program:Skel,
+	meld_program:Skel, !,
 	arg(Arg, Skel, A0),
 	delete(Skel),
 	arg(Arg, Goal, A),
 	AN is A0+A,
 	arg(Arg, NGoal, AN),
 	push(NGoal).
+sum(_Skel,_Arg,Goal) :-
+	format('S~w~n',[Goal]),
+	assert(meld_program:Goal),
+	fail.
 
 clean(Skel) :-
 %	format('D~w~n',[Skel]),