expand_call_goals/3 should expand meta-predicate subgoals (#2361)

2024-03-19 17:12:26 -06:00
parent 7b33eafbb0
commit 0292cb73d3
6 changed files with 82 additions and 31 deletions
--- a/src/loader.pl
+++ b/src/loader.pl
@@ -887,7 +887,12 @@ expand_call_goal_(UnexpandedGoals, Module, ExpandedGoals) :-
       UnexpandedGoals = ExpandedGoals
    ;  goal_expansion(UnexpandedGoals, Module, UnexpandedGoals1),
       (  Module \== user ->
-          goal_expansion(UnexpandedGoals1, user, ExpandedGoals)
+          goal_expansion(UnexpandedGoals1, user, Goals),
+          (  predicate_property(Module:Goals, meta_predicate(MetaSpecs0)),
+             MetaSpecs0 =.. [_ | MetaSpecs] ->
+             expand_module_names(Goals, MetaSpecs, Module, ExpandedGoals, HeadVars, TGs)
+          ;  ExpandedGoals = Goals
+          )
       ;  ExpandedGoals = UnexpandedGoals1
       )
    ).