diogo
/
yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meta-expansion should be done before calling goal_expansion :(

This commit is contained in:
Vítor Santos Costa II 2010-04-20 23:14:15 +01:00
parent bc6846d6f7
commit 1a4c414831
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/jpl

@ -1 +1 @@
Subproject commit 3823a8b909e99c8f0a581d14c9505a4fbd9a2853
Subproject commit 9efaf4ce7063fbdae534b4555a80fa1373bb7e9a

9
pl/modules.yap
View File

@ -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.