rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

expand attributed variable goals

Browse Source
This commit is contained in:
Mark Thom
2021-02-02 21:47:59 -07:00
parent a2447ecaa3
commit e928a0aaea
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/loader.pl
View File

@@ -460,7 +460,7 @@ expand_goal(UnexpandedGoals, Module, ExpandedGoals, HeadVars) :-
; Goals = (\+ Goals0) -> ; Goals = (\+ Goals0) ->
expand_goal(Goals0, Module, Goals1, HeadVars), expand_goal(Goals0, Module, Goals1, HeadVars),
ExpandedGoals = (\+ Goals1) ExpandedGoals = (\+ Goals1)
; predicate_property(Goals, meta_predicate(MetaSpecs)) -> ; predicate_property(Module:Goals, meta_predicate(MetaSpecs)) ->
expand_module_names(Goals, MetaSpecs, Module, ExpandedGoals, HeadVars) expand_module_names(Goals, MetaSpecs, Module, ExpandedGoals, HeadVars)
; thread_goals(Goals, ExpandedGoals, (',')) ; thread_goals(Goals, ExpandedGoals, (','))
; Goals = ExpandedGoals ; Goals = ExpandedGoals

3
src/machine/attributed_variables.pl
View File

@@ -51,6 +51,7 @@ call_goals_0([Module-GoalList | GoalLists]) :-
call_goals_0([]). call_goals_0([]).
call_goals_1([Goal | Goals], Module) :- call_goals_1([Goal | Goals], Module) :-
call(Module:Goal), expand_goal(Goal, Module, Goal1), % TODO: remove this when goal expansions are added to call/N.
call(Module:Goal1),
call_goals_1(Goals, Module). call_goals_1(Goals, Module).
call_goals_1([], _). call_goals_1([], _).