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

handle old style binding lists.

Browse Source
This commit is contained in:
Vitor Santos Costa 2009-09-09 18:00:35 -05:00
parent ef05f4a919
commit 0688fb4d68
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pl/boot.yap
View File

@ -635,11 +635,11 @@ true :- true.
charsio:peek_mem_write_stream(W, [], String), charsio:peek_mem_write_stream(W, [], String),
close(W). close(W).
'$write_goal_output'(var([V|VL]), First, [var([V|VL])|L], next, L) :- '$write_goal_output'(var([V|VL]), First, [var([V|VL])|L], next, L) :- !,
( First = first -> true ; format(user_error,',~n',[]) ), ( First = first -> true ; format(user_error,',~n',[]) ),
format(user_error,'~s',[V]), format(user_error,'~s',[V]),
'$write_output_vars'(VL). '$write_output_vars'(VL).
'$write_goal_output'(nonvar([V|VL],B), First, [nonvar([V|VL],B)|L], next, L) :- '$write_goal_output'(nonvar([V|VL],B), First, [nonvar([V|VL],B)|L], next, L) :- !,
( First = first -> true ; format(user_error,',~n',[]) ), ( First = first -> true ; format(user_error,',~n',[]) ),
format(user_error,'~s',[V]), format(user_error,'~s',[V]),
'$write_output_vars'(VL), '$write_output_vars'(VL),
@ -650,7 +650,7 @@ true :- true.
). ).
'$write_goal_output'(nl, First, NG, First, NG) :- !, '$write_goal_output'(nl, First, NG, First, NG) :- !,
format(user_error,'~n',[]). format(user_error,'~n',[]).
'$write_goal_output'(Format-G, First, NG, Next, IG) :- '$write_goal_output'(Format-G, First, NG, Next, IG) :- !,
G = [_|_], !, G = [_|_], !,
% dump on string first so that we can check whether we actually % dump on string first so that we can check whether we actually
% had any output from the solver. % had any output from the solver.
@ -664,13 +664,20 @@ true :- true.
format(user_error, '~s', [String]), format(user_error, '~s', [String]),
NG = [G|IG] NG = [G|IG]
). ).
'$write_goal_output'(_-G, First, [G|NG], next, NG) :- '$write_goal_output'(_-G, First, [G|NG], next, NG) :- !,
( First = first -> true ; format(user_error,',~n',[]) ), ( First = first -> true ; format(user_error,',~n',[]) ),
( recorded('$print_options','$toplevel'(Opts),_) -> ( recorded('$print_options','$toplevel'(Opts),_) ->
write_term(user_error,G,Opts) ; write_term(user_error,G,Opts) ;
format(user_error,'~w',[G]) format(user_error,'~w',[G])
). ).
'$write_goal_output'(_M:G, First, [G|NG], next, NG) :- '$write_goal_output'(_M:G, First, [G|NG], next, NG) :- !,
( First = first -> true ; format(user_error,',~n',[]) ),
( recorded('$print_options','$toplevel'(Opts),_) ->
write_term(user_error,G,Opts) ;
format(user_error,'~w',[G])
).
'$write_goal_output'(G, First, [M:G|NG], next, NG) :-
'$current_module'(M),
( First = first -> true ; format(user_error,',~n',[]) ), ( First = first -> true ; format(user_error,',~n',[]) ),
( recorded('$print_options','$toplevel'(Opts),_) -> ( recorded('$print_options','$toplevel'(Opts),_) ->
write_term(user_error,G,Opts) ; write_term(user_error,G,Opts) ;