From: Mark Thom Date: Wed, 17 Feb 2021 08:15:29 +0000 (-0700) Subject: handle user:goal_expansion, but not Target:goal_expansion, explicitly in loader.pl X-Git-Tag: v0.9.0~150^2~49 X-Git-Url: https://git.sagredo.dev/?a=commitdiff_plain;h=e9ba3ad22337a5defa140a3bf10d80c285802cc1;p=scryer-prolog.git handle user:goal_expansion, but not Target:goal_expansion, explicitly in loader.pl --- diff --git a/src/loader.pl b/src/loader.pl index 548d0e46..c34c57f4 100644 --- a/src/loader.pl +++ b/src/loader.pl @@ -231,15 +231,15 @@ compile_dispatch(user:term_expansion(Term, Terms), Evacuable, VNs) :- compile_dispatch((user:term_expansion(Term, Terms) :- Body), Evacuable, VNs) :- '$add_term_expansion_clause'((term_expansion(Term, Terms) :- Body), Evacuable, VNs). compile_dispatch(goal_expansion(Term, Terms), Evacuable, VNs) :- - prolog_load_context(module, Target), - '$add_goal_expansion_clause'(Target, goal_expansion(Term, Terms), Evacuable, VNs). + prolog_load_context(module, user), + '$add_goal_expansion_clause'(user, goal_expansion(Term, Terms), Evacuable, VNs). compile_dispatch((goal_expansion(Term, Terms) :- Body), Evacuable, VNs) :- - prolog_load_context(module, Target), - '$add_goal_expansion_clause'(Target, (goal_expansion(Term, Terms) :- Body), Evacuable, VNs). -compile_dispatch(Target:goal_expansion(Term, Terms), Evacuable, VNs) :- - '$add_goal_expansion_clause'(Target, goal_expansion(Term, Terms), Evacuable, VNs). -compile_dispatch((Target:goal_expansion(Term, Terms) :- Body), Evacuable, VNs) :- - '$add_goal_expansion_clause'(Target, (goal_expansion(Term, Terms) :- Body), Evacuable, VNs). + prolog_load_context(module, user), + '$add_goal_expansion_clause'(user, (goal_expansion(Term, Terms) :- Body), Evacuable, VNs). +compile_dispatch(user:goal_expansion(Term, Terms), Evacuable, VNs) :- + '$add_goal_expansion_clause'(user, goal_expansion(Term, Terms), Evacuable, VNs). +compile_dispatch((user:goal_expansion(Term, Terms) :- Body), Evacuable, VNs) :- + '$add_goal_expansion_clause'(user, (goal_expansion(Term, Terms) :- Body), Evacuable, VNs). compile_declaration(use_module(Module), Evacuable) :-