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

use YAPSHAREDIR for Prolog files, not YAPLIBDIR

Browse Source 
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@285 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc 2002-01-10 20:55:10 +00:00
parent bd28a74d45
commit e6da9e09b6
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changes4.3.html
View File

@ -16,6 +16,8 @@
<h2>Yap-4.3.21:</h2> <h2>Yap-4.3.21:</h2>
<ul> <ul>
<li>NEW: new option for error handling in the debugger.</li>
<li>UPDATE: new version of logtalk.</li>
<li>FIXED: heap library.</li> <li>FIXED: heap library.</li>
<li>NEW: empty_heap/3.</li> <li>NEW: empty_heap/3.</li>
<li>FIXED: some system predicates are exported outside the <li>FIXED: some system predicates are exported outside the

2
pl/boot.yap
View File

@ -1031,7 +1031,7 @@ break :- '$get_value'('$break',BL), NBL is BL+1,
atom_codes(NewFile,NewS), atom_codes(NewFile,NewS),
'$exists'(NewFile,'$csult'), !. '$exists'(NewFile,'$csult'), !.
'$find_library_in_path'(File, NewFile) :- '$find_library_in_path'(File, NewFile) :-
'$getenv'('YAPLIBDIR', LibDir), '$getenv'('YAPSHAREDIR', LibDir),
'$dir_separator'(A), '$dir_separator'(A),
atom_codes(File,FileS), atom_codes(File,FileS),
atom_codes(LibDir,Dir1S), atom_codes(LibDir,Dir1S),

22
pl/modules.yap
View File

@ -65,7 +65,7 @@ use_module(File,Imports) :-
( '$recorded'('$module','$module'(TrueFileName,Mod,Publics),_) -> ( '$recorded'('$module','$module'(TrueFileName,Mod,Publics),_) ->
'$use_preds'(Imports,Publics,Mod,M) '$use_preds'(Imports,Publics,Mod,M)
; ;
'$format'(user_error,'[ use_module/2 can not find a module in file ~w]~n',File), '$format'(user_error,"[ use_module/2 can not find a module in file ~w]~n",File),
fail fail
) )
; ;
@ -88,7 +88,7 @@ use_module(library(File),Imports) :- !,
( '$recorded'('$module','$module'(TrueFileName,Mod,Publics),_) -> ( '$recorded'('$module','$module'(TrueFileName,Mod,Publics),_) ->
'$use_preds'(Imports,Publics,Mod,M) '$use_preds'(Imports,Publics,Mod,M)
; ;
'$format'(user_error,'[ use_module/2 can not find a module in file ~w]~n',[File]), '$format'(user_error,"[ use_module/2 can not find a module in file ~w]~n",[File]),
fail fail
) )
; ;
@ -114,7 +114,7 @@ use_module(Module,File,Imports) :-
( '$recorded'('$module','$module'(TrueFileName,Module,Publics),_) -> ( '$recorded'('$module','$module'(TrueFileName,Module,Publics),_) ->
'$use_preds'(Imports,Publics,Module,M) '$use_preds'(Imports,Publics,Module,M)
; ;
'$format'(user_error,'[ use_module/2 can not find module ~w in file ~w]~n',[Module,File]), '$format'(user_error,"[ use_module/2 can not find module ~w in file ~w]~n",[Module,File]),
fail fail
) )
; ;
@ -132,7 +132,7 @@ use_module(Module,V,Decls) :-
'$module_dec'(N,P). '$module_dec'(N,P).
'$module'(consult,N,P) :- '$module'(consult,N,P) :-
( '$recorded'('$module','$module'(F,N,_),_), ( '$recorded'('$module','$module'(F,N,_),_),
'$format'(user_error,'[ Module ~w was already defined in file ~w]~n',[N,F]), '$format'(user_error,"[ Module ~w was already defined in file ~w]~n",[N,F]),
'$abolish_module_data'(N), '$abolish_module_data'(N),
fail fail
; ;
@ -212,7 +212,7 @@ module(N) :-
'$import'([N/K|L],M,T) :- '$import'([N/K|L],M,T) :-
integer(K), atom(N), !, integer(K), atom(N), !,
( '$check_import'(M,T,N,K) -> ( '$check_import'(M,T,N,K) ->
% '$format'(user_error,'[vsc1: Importing ~w to ~w]~n',[M:N/K,T]), % '$format'(user_error,"[vsc1: Importing ~w to ~w]~n",[M:N/K,T]),
( T = user -> ( T = user ->
recordz('$import','$import'(M,user,N,K),_) recordz('$import','$import'(M,user,N,K),_)
; ;
@ -223,13 +223,13 @@ module(N) :-
), ),
'$import'(L,M,T). '$import'(L,M,T).
'$import'([PS|L],M,T) :- '$import'([PS|L],M,T) :-
'$format'(user_error,'[Illegal pred specification(~w) in module declaration for module ~w]~n',[PS,M]), '$format'(user_error,"[Illegal pred specification(~w) in module declaration for module ~w]~n",[PS,M]),
'$import'(L,M,T). '$import'(L,M,T).
'$check_import'(M,T,N,K) :- '$check_import'(M,T,N,K) :-
'$recorded'('$import','$import'(M1,T0,N,K),R), T0 == T, M1 \= M, /* ZP */ !, '$recorded'('$import','$import'(M1,T0,N,K),R), T0 == T, M1 \= M, /* ZP */ !,
'$format'(user_error,'NAME CLASH: ~w was already imported to module ~w;~n',[M1:N/K,T]), '$format'(user_error,"NAME CLASH: ~w was already imported to module ~w;~n",[M1:N/K,T]),
'$format'(user_error,' Do you want to import it from ~w ? [y or n] ',M), '$format'(user_error," Do you want to import it from ~w ? [y or n] ",M),
repeat, repeat,
get0(C), '$skipeol'(C), get0(C), '$skipeol'(C),
( C is "y" -> erase(R), !; ( C is "y" -> erase(R), !;
@ -250,7 +250,7 @@ module(N) :-
( '$check_import'(M,Mod,N,K) -> ( '$check_import'(M,Mod,N,K) ->
% '$format'(user_error,'[ Importing ~w to ~w]~n',[M:N/K,Mod]), % '$format'(user_error,'[ Importing ~w to ~w]~n',[M:N/K,Mod]),
% '$trace_module'(importing(M:N/K,Mod)), % '$trace_module'(importing(M:N/K,Mod)),
% '$format'(user_error,'[vsc2: Importing ~w to ~w]~n',[M:N/K,T]), % '$format'(user_error,"[vsc2: Importing ~w to ~w]~n",[M:N/K,T]),
(Mod = user -> (Mod = user ->
recordz('$import','$import'(M,user,N,K),_) recordz('$import','$import'(M,user,N,K),_)
; ;
@ -464,9 +464,9 @@ module(N) :-
functor(G,F,N), functor(G,F,N),
user:'$meta_predicate'(F,Mod,N,D), !, user:'$meta_predicate'(F,Mod,N,D), !,
functor(G1,F,N), functor(G1,F,N),
% '$format'(user_error,'[expanding ~w:~w in ~w',[Mod,G,MP]), % '$format'(user_error,"[expanding ~w:~w in ~w",[Mod,G,MP]),
'$meta_expansion_loop'(N,D,G,G1,HVars,MP). '$meta_expansion_loop'(N,D,G,G1,HVars,MP).
% '$format'(user_error,' gives ~w~n]',[G1]). % '$format'(user_error," gives ~w~n]",[G1]).
% expand argument % expand argument
'$meta_expansion_loop'(0,_,_,_,_,_) :- !. '$meta_expansion_loop'(0,_,_,_,_,_) :- !.