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

fix module_property, ignoring modules that are not actually implemented as files.

Browse Source
This commit is contained in:
Vítor Santos Costa 2016-03-05 23:18:57 +00:00
parent 23d18ac0fd
commit 79d99a7768
2 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
C/stdpreds.c
View File

@ -863,26 +863,13 @@ static Int cont_current_predicate(USES_REGS1) {
pp = firstModulePred(m->PredForME, task); pp = firstModulePred(m->PredForME, task);
if (!pp) { if (!pp) {
/* try Prolog Module */ /* try Prolog Module */
if (task != TermUser) { cut_fail();
ModEntry *m = Yap_GetModuleEntry(TermProlog);
pp = firstModulePred(m->PredForME, task);
if (!pp) {
cut_fail();
}
}
} }
} }
npp = firstModulePred(pp, task); npp = firstModulePred(pp, task);
if (!npp) { if (!npp) {
if (pp->ModuleOfPred != PROLOG_MODULE && task != TermUser) { will_cut = true;
ModEntry *m = Yap_GetModuleEntry(TermProlog);
npp = firstModulePred(m->PredForME, task);
if (!npp)
will_cut = true;
} else {
will_cut = true;
}
} }
// just try next one // just try next one
else { else {

41
pl/modules.yap
View File

@ -692,6 +692,11 @@ Reports the following properties of _Module_:
operator symbols exported or re-exported by this module. operator symbols exported or re-exported by this module.
*/ */
module_property(Mod, Prop) :-
var(Mod),
!,
recorded('$module','$module'(_,Mod,_,_Es,_),_),
module_property(Mod, Prop).
module_property(Mod, class(L)) :- module_property(Mod, class(L)) :-
'$module_class'(Mod, L). '$module_class'(Mod, L).
module_property(Mod, line_count(L)) :- module_property(Mod, line_count(L)) :-
@ -699,24 +704,30 @@ module_property(Mod, line_count(L)) :-
module_property(Mod, file(F)) :- module_property(Mod, file(F)) :-
recorded('$module','$module'(F,Mod,_,_,_),_). recorded('$module','$module'(F,Mod,_,_,_),_).
module_property(Mod, exports(Es)) :- module_property(Mod, exports(Es)) :-
recorded('$module','$module'(_,Mod,_,Es,_),_). (
recorded('$module','$module'(_,Mod,_,Es,_),_)
->
true
;
Mod==user
->
findall( P, (current_predicate(user:P)), Es)
;
Mod==prolog
->
findall( N/A, (predicate_property(Mod:P0, public),functor(P0,N,A)), Es)
).
'$module_class'(Mod, system) :- '$is_system_module'( Mod ). '$module_class'(Mod, system) :- '$is_system_module'( Mod ), !.
'$module_class'(Mod, library) :- '$library_module'( Mod ). '$module_class'(Mod, library) :- '$library_module'( Mod ), !.
'$module_class'(Mod, user) :- '$user_module'( Mod ). '$module_class'(Mod, user) :- !.
'$module_class'(_, temporary) :- fail. '$module_class'( _, temporary) :- fail.
'$module_class'(_, test) :- fail. '$module_class'( _, test) :- fail.
'$module_class'(_, development) :- fail. '$module_class'( _, development) :- fail.
'$library_module'(M1) :- '$library_module'(M1) :-
recorded('$module','$module'(F, M1, _, _MyExports,_Line),_), recorded('$module','$module'(F, M1, library(_), _MyExports,_Line),_).
user:library_directory(D),
sub_atom(F, 0, _, _, D).
'$user_module'( Mod ) :-
\+ '$library_module'( Mod),
\+ '$system_module'( Mod).
ls_imports :- ls_imports :-
recorded('$import','$import'(M0,M,G0,G,_N,_K),_R), recorded('$import','$import'(M0,M,G0,G,_N,_K),_R),
numbervars(G0+G, 0, _), numbervars(G0+G, 0, _),