From 1a4c414831f3f00fb54c839fdb41b62d6dfa139d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADtor=20Santos=20Costa=20II?= <vsc@dcc.fc.up.pt>
Date: Tue, 20 Apr 2010 23:14:15 +0100
Subject: [PATCH] meta-expansion should be done before calling goal_expansion
 :(

---
 packages/jpl   | 2 +-
 pl/modules.yap | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/jpl b/packages/jpl
index 3823a8b90..9efaf4ce7 160000
--- a/packages/jpl
+++ b/packages/jpl
@@ -1 +1 @@
-Subproject commit 3823a8b909e99c8f0a581d14c9505a4fbd9a2853
+Subproject commit 9efaf4ce7063fbdae534b4555a80fa1373bb7e9a
diff --git a/pl/modules.yap b/pl/modules.yap
index 3ab4bc53b..078f4be7a 100644
--- a/pl/modules.yap
+++ b/pl/modules.yap
@@ -296,10 +296,6 @@ module(N) :-
 '$module_expansion'(M:G,call(M:G),'$execute_wo_mod'(G,M),_,_,_,_) :- var(M), !.
 '$module_expansion'(M:G,G1,GO,_,CM,_,HVars) :- !,
 	'$module_expansion'(G,G1,GO,M,M,HM,HVars).
-'$module_expansion'(G, G1, GO, CurMod, MM, HM, HVars) :-
-	'$pred_goal_expansion_on',
-	'$do_expand'(G, CurMod, GI), !,
-	'$module_expansion'(GI, G1, GO, CurMod, MM, HM, HVars).
 '$module_expansion'(G, G1, GO, CurMod, MM, HM,HVars) :-
 	% is this imported from some other module M1?
 	'$imported_pred'(G, CurMod, GG, M1),
@@ -342,6 +338,11 @@ expand_goal(G, G).
 %       goal to pass to listing
 %       goal to pass to compiler
 %       head variables.
+'$complete_goal_expansion'(G, CurMod, MM, HM, G1, GO, HVars) :-
+%	'$pred_goal_expansion_on',
+	'$do_expand'(G, CurMod, GI),
+	GI \== G, !,
+	'$module_expansion'(GI, G1, GO, CurMod, MM, HM, HVars).
 '$complete_goal_expansion'(G, M, CM, HM, G1, G2, HVars) :-
 	'$all_system_predicate'(G,M,ORIG), !,
 	% make built-in processing transparent.