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

modules and extra cut.

Browse Source
This commit is contained in:
Vitor Santos Costa 2016-05-19 13:38:54 +01:00
parent 7c1ea8f3ae
commit 437a303681
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pl/boot.yap
View File

@ -273,7 +273,7 @@ private(_).
'$handle_error'(_Action,_G0,_M0) :- fail. '$handle_error'(_Action,_G0,_M0) :- fail.
% cases where we cannot afford to ever fail. % cases where we cannot afford to ever fail.
'$undefp'([ImportingMod|G], _) :- !, '$undefp'([ImportingMod|G], _) :-
recorded('$import','$import'(ExportingModI,ImportingMod,G,G0I,_,_),_), !, recorded('$import','$import'(ExportingModI,ImportingMod,G,G0I,_,_),_), !,
% writeln('$execute0'(G0I, ExportingModI)), % writeln('$execute0'(G0I, ExportingModI)),
'$execute0'(G0I, ExportingModI). '$execute0'(G0I, ExportingModI).
@ -659,7 +659,7 @@ number of steps.
'$execute_commands'([],_,_,_,_) :- !. '$execute_commands'([],_,_,_,_) :- !.
'$execute_commands'([C|Cs],VL,Pos,Con,Source) :- !, '$execute_commands'([C|Cs],VL,Pos,Con,Source) :- !,
( (
'$system_catch'('$execute_command'(C,VL,Pos,Con,C),prolog,Error,'$LoopError'(Error, Con)), '$system_catch'('$execute_command'(C,VL,Pos,Con,Source),prolog,Error,'$LoopError'(Error, Con)),
fail fail
; ;
'$execute_commands'(Cs,VL,Pos,Con,Source) '$execute_commands'(Cs,VL,Pos,Con,Source)
@ -691,12 +691,12 @@ number of steps.
'$execute_command'((:-G),VL,Pos,Option,_) :- '$execute_command'((:-G),VL,Pos,Option,_) :-
% !, % !,
Option \= top, !, Option \= top, !,
'$current_module'(M),
% allow user expansion % allow user expansion
expand_term((:- M:G), O), expand_term((:- G), O),
( (
O = (:- G1) O = (:- G1)
-> ->
'$current_module'(M),
'$process_directive'(G1, Option, M, VL, Pos) '$process_directive'(G1, Option, M, VL, Pos)
; ;
'$execute_commands'(O,VL,Pos,Option,O) '$execute_commands'(O,VL,Pos,Option,O)

3
pl/messages.yap
View File

@ -218,7 +218,7 @@ location(error(style_check(style_check(_,LN,FileName,_ ) ),_), _ , _) -->
location( error(_,Term), Level, LC ) --> location( error(_,Term), Level, LC ) -->
{ source_location(F0, L), { source_location(F0, L),
stream_property(_Stream, alias(loop_stream)) }, !, stream_property(_Stream, alias(loop_stream)) }, !,
display_consulting( F0, Level, LC ), display_consulting( F0, Level, LC ),
{ lists:memberchk([p|p(M,Na,Ar,_File,_FilePos)], Term ) }, { lists:memberchk([p|p(M,Na,Ar,_File,_FilePos)], Term ) },
[ '~a:~d:0 ~a in ~a:~q/~d:'-[F0, L,Level,M,Na,Ar] ]. [ '~a:~d:0 ~a in ~a:~q/~d:'-[F0, L,Level,M,Na,Ar] ].
location( error(_,Term), Level, LC ) --> location( error(_,Term), Level, LC ) -->
@ -912,6 +912,7 @@ prolog:print_message(Severity, Msg) :-
!, !,
format(user_error, 'uninstantiated message~n', []) format(user_error, 'uninstantiated message~n', [])
; ;
'$pred_exists'(portray_message(_,_),user),
user:portray_message(Severity, Msg) user:portray_message(Severity, Msg)
), ),
!. !.