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

improve term expansion: avoid duplicated calls and handle throws gracefully.

Browse Source
This commit is contained in:
Vítor Santos Costa 2011-11-10 12:27:36 +00:00
parent 02a8b35e36
commit cfc13a0d61
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pl/boot.yap
View File

@ -279,7 +279,7 @@ true :- true.
'$execute_commands'([],_,_,_,_) :- !. '$execute_commands'([],_,_,_,_) :- !.
'$execute_commands'([C|Cs],VL,Pos,Con,Source) :- !, '$execute_commands'([C|Cs],VL,Pos,Con,Source) :- !,
( (
'$execute_command'(C,VL,Pos,Con,Source), '$system_catch'('$execute_command'(C,VL,Pos,Con,C),prolog,Error,user:'$LoopError'(Error, Con)),
fail fail
; ;
'$execute_commands'(Cs,VL,Pos,Con,Source) '$execute_commands'(Cs,VL,Pos,Con,Source)
@ -287,8 +287,6 @@ true :- true.
'$execute_commands'(C,VL,Pos,Con,Source) :- '$execute_commands'(C,VL,Pos,Con,Source) :-
'$execute_command'(C,VL,Pos,Con,Source). '$execute_command'(C,VL,Pos,Con,Source).
% %
% %
% %
@ -1111,11 +1109,12 @@ bootstrap(F) :-
expand_term(Term,Expanded) :- expand_term(Term,Expanded) :-
( '$current_module'(Mod), \+ '$undefined'(term_expansion(_,_), Mod), '$current_module'(Mod),
( \+ '$undefined'(term_expansion(_,_), Mod),
'$notrace'(Mod:term_expansion(Term,Expanded)) '$notrace'(Mod:term_expansion(Term,Expanded))
; \+ '$undefined'(term_expansion(_,_), system), ; \+ '$undefined'(term_expansion(_,_), system),
'$notrace'(system:term_expansion(Term,Expanded)) '$notrace'(system:term_expansion(Term,Expanded))
; \+ '$undefined'(term_expansion(_,_), user), ; Mod \= user, \+ '$undefined'(term_expansion(_,_), user),
'$notrace'(user:term_expansion(Term,Expanded)) '$notrace'(user:term_expansion(Term,Expanded))
; ;
'$expand_term_grammar'(Term,Expanded) '$expand_term_grammar'(Term,Expanded)