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

user:term_expansion

Browse Source
This commit is contained in:
Vitor Santos Costa 2016-04-28 21:59:06 +01:00
parent 70061308ff
commit c8f1e8a74a
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
C/exec.c
View File

@ -1105,9 +1105,17 @@ static Int do_term_expansion(USES_REGS1) {
Term g = Yap_YapStripModule(ARG1, &cmod); Term g = Yap_YapStripModule(ARG1, &cmod);
yhandle_t h1 = Yap_InitSlot(g), h2 = Yap_InitSlot(ARG2); yhandle_t h1 = Yap_InitSlot(g), h2 = Yap_InitSlot(ARG2);
/* user:term_expansion(A,B) */
ARG1 = g;
if ((pe = RepPredProp(Yap_GetPredPropByFunc(FunctorTermExpansion, USER_MODULE))) &&
pe->OpcodeOfPred != FAIL_OPCODE && pe->OpcodeOfPred != UNDEF_OPCODE &&
Yap_execute_pred(pe, NULL, false PASS_REGS)) {
return complete_ge(true, omod, sl, creeping);
}
/* CurMod:term_expansion(A,B) */ /* CurMod:term_expansion(A,B) */
ARG1 = g; ARG1 = g;
if ((pe = RepPredProp(Yap_GetPredPropByFunc(FunctorTermExpansion, cmod))) && if (cmod != USER_MODULE &&
(pe = RepPredProp(Yap_GetPredPropByFunc(FunctorTermExpansion, cmod))) &&
pe->OpcodeOfPred != FAIL_OPCODE && pe->OpcodeOfPred != UNDEF_OPCODE && pe->OpcodeOfPred != FAIL_OPCODE && pe->OpcodeOfPred != UNDEF_OPCODE &&
Yap_execute_pred(pe, NULL, false PASS_REGS)) { Yap_execute_pred(pe, NULL, false PASS_REGS)) {
return complete_ge(true, omod, sl, creeping); return complete_ge(true, omod, sl, creeping);

1
pl/modules.yap
View File

@ -500,6 +500,7 @@ export_list(Module, List) :-
'$add_to_imports'(Tab, Module, ContextModule). '$add_to_imports'(Tab, Module, ContextModule).
'$do_import'(op(Prio,Assoc,Name), _Mod, ContextMod) :- '$do_import'(op(Prio,Assoc,Name), _Mod, ContextMod) :-
writeln(ContextMod:Name),
op(Prio,Assoc,ContextMod:Name). op(Prio,Assoc,ContextMod:Name).
'$do_import'(N0/K0-N0/K0, Mod, Mod) :- !. '$do_import'(N0/K0-N0/K0, Mod, Mod) :- !.
'$do_import'(N0/K0-N0/K0, _Mod, prolog) :- !. '$do_import'(N0/K0-N0/K0, _Mod, prolog) :- !.