portray_clause should not bind variables.

fix to look more like SICStus.
use standard streams and format.


git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@611 b08c6af1-5177-4d33-ba66-4b1c6b8b522a

pl/listing.yap

@@ -20,129 +20,131 @@
 */
 
 listing :-
+	current_output(Stream),
 	'$current_module'(Mod),
         '$current_predicate_no_modules'(Mod,_,Pred),
-        '$list_clauses'(Mod,Pred).
+        '$list_clauses'(Stream,Mod,Pred).
 listing.
 
 
 listing(V) :-
+	current_output(Stream),
 	'$current_module'(M),
-	'$listing'(V,M).
+	'$listing'(V,M,Stream).
 
-'$listing'(V,_) :- var(V), !.       % ignore variables
+'$listing'(V,Mod,Stream) :- var(V), !,
-'$listing'(M:V,_) :- !,
+	'$current_predicate_no_modules'(Mod,_,Pred),
+        '$list_clauses'(Stream,Mod,Pred).
+'$listing'(M:V,_,_) :- !,
 	'$listing'(V,M).
-'$listing'([],_) :- !.
+'$listing'([],_,_) :- !.
-'$listing'([X|Rest], M) :-
+'$listing'([X|Rest], M, Stream) :-
         !,
-        '$listing'(X, M),
+        '$listing'(X, M, Stream),
-        '$listing'(Rest, M).
+        '$listing'(Rest, M, Stream).
-'$listing'(X, M) :-
+'$listing'(X, M, Stream) :-
         '$funcspec'(X,Name,Arity),
         '$current_predicate_no_modules'(M,Name,Pred),
         functor(Pred,Name,Arity),
-        '$list_clauses'(M,Pred).
+        '$list_clauses'(Stream,M,Pred).
-'$listing'(_,_).
+'$listing'(_,_,_).
 
 '$funcspec'(Name/Arity,Name,Arity) :- !, atom(Name).
 '$funcspec'(Name,Name,_) :- atom(Name), !.
-'$funcspec'(Name,_,_) :- write('! Invalid procedure specification : '),
+'$funcspec'(Name,_,_) :-
-			write(Name), nl.
+	'$do_error'(domain_error(predicate_spec,Name),listing(Name)).
 
-'$list_clauses'(M,Pred) :-
+'$list_clauses'(Stream, M, Pred) :-
-	( '$recordedp'(M:Pred,_,_) -> nl ),
+	( '$recordedp'(M:Pred,_,_) -> nl(Stream) ),
 	fail.
-'$list_clauses'(M,Pred) :-
+'$list_clauses'(Stream, M, Pred) :-
         '$recordedp'(M:Pred,(Pred:-Body),_),
-	'$beautify_vars'((Pred:-Body)),
+	'$portray_clause'(Stream,(Pred:-Body)),
-        '$write_clause'(Pred,Body),
         fail.
 
 portray_clause(Stream, Clause) :-
-        current_output(OldStream),
+	'$portray_clause'(Stream, Clause),
-	set_output(Stream),
+	fail.
-	portray_clause(Clause),
+portray_clause(_, _).
-	set_output(OldStream).
 
-portray_clause((Pred:-Body)) :- !,
+portray_clause(Clause) :-
+        current_output(Stream),
+	'$portray_clause'(Stream, Clause),
+	fail.
+portray_clause(_).
+
+'$portray_clause'(Stream, (Pred :- true)) :- !,
+	'$beautify_vars'(Pred),
+	'$format'(Stream, "~q.~n", [Pred]).
+'$portray_clause'(Stream, (Pred:-Body)) :-
 	'$beautify_vars'((Pred:-Body)),
-	'$write_clause'(Pred,Body).
+	'$format'(Stream, "~q :-", [Pred]),
-portray_clause(Pred) :- 
+	'$write_body'(Body, 3, ',', Stream),
-	'$beautify_vars'((Pred:-true)),
+	'$format'(Stream, ".~n", []).
-	'$write_clause'(Pred,true).
 
-'$write_clause'(Head,Body) :-
+'$write_body'(X,I,T,Stream) :- var(X), !,
-        writeq(Head),
+	'$beforelit'(T,I,Stream),
-        ( Body = true  ;
+	writeq(Stream, '_').
-                '$tab'(1), write((:-)),
+'$write_body'((P,Q), I, T, Stream) :-
-                '$write_body'(Body,3,',')
+        !,
-        ),
+        '$write_body'(P,I,T, Stream),
-        put("."), nl,
+        put(Stream, ","),
-        !.
+        '$write_body'(Q,I,',',Stream).
+'$write_body'((P->Q;S),I,_, Stream) :-
+	!,
+	'$format'(Stream, "~n~*c(",[I,0' ]),
+	I1 is I+2,
+	'$write_body'(P,I1,'(',Stream),
+	'$format'(Stream, " ->",[]),
+	'$write_disj'((Q;S),I,I1,'->',Stream),
+	'$format'(Stream, "~n~*c)",[I,0' ]).
+'$write_body'((P->Q|S),I,_,Stream) :-
+	!,
+	'$format'(Stream, "~n~*c(",[I,0' ]),
+	I1 is I+2,
+	'$write_body'(P,I,'(',Stream),
+	'$format'(Stream, " ->",[]),
+	'$write_disj'((Q|S),I,I1,'->',Stream),
+	'$format'(Stream, "~n~*c)",[I,0' ]).
+'$write_body'((P->Q),I,_,Stream) :-
+	!,
+	'$format'(Stream, "~n~*c(",[I,0' ]),
+	I1 is I+2,
+        '$write_body'(P,I1,'(',Stream),
+	'$format'(Stream, " ->",[]),
+        '$write_body'(Q,I1,'->',Stream),
+	'$format'(Stream, "~n~*c)",[I,0' ]).
+'$write_body'((P;Q),I,_,Stream) :-
+        !,
+	'$format'(Stream, "~n~*c(",[I,0' ]),
+	I1 is I+2,
+	'$write_disj'((P;Q),I,I1,'->',Stream),
+	'$format'(Stream, "~n~*c)",[I,0' ]).
+'$write_body'((P|Q),I,_,Stream) :-
+        !,
+	'$format'(Stream, "~n~*c(",[I,0' ]),
+	I1 is I+2,
+	'$write_disj'((P|Q),I,I1,'->',Stream),
+	'$format'(Stream, "~n~*c)",[I,0' ]).
+'$write_body'(X,I,T,Stream) :-
+        '$beforelit'(T,I,Stream),
+        '$format'(Stream,"~q",[X]).
 
-'$write_body'(X,I,T) :- var(X), !, '$beforelit'(T,I), writeq('_').
-'$write_body'((P,Q), IO, T) :-
-        !,
-        '$write_body'(P,IO,T),
-        put(","),
-        '$aftercomma'(T,IO,I),
-        '$write_body'(Q,I,',').
-'$write_body'((P->Q;S),I,_) :-
-	!,
-	nl, '$tab'(I-2), put("("),
-	'$write_body'(P,I,'('),
-	put("-"), put(">"),
-	'$write_body'(Q,I,'->'),
-	put(";"),
-	'$write_body'(S,I,';'),
-	'$tab'(1), put(")").
-'$write_body'((P->Q|S),I,_) :-
-	!,
-	nl, '$tab'(I-2), put("("),
-	'$write_body'(P,I,'('),
-	put("-"), put(">"),
-	'$write_body'(Q,I,'->'),
-	put("|"),
-	'$write_body'(S,I,'|'),
-	'$tab'(1), put(")").
-'$write_body'((P->Q),I,_) :-
-	!,
-	nl, '$tab'(I-2), put("("),
-        '$write_body'(P,I,'('),
-        put("-"), put(">"),
-        '$write_body'(Q,I,'->'),
-        '$tab'(1), put(")").
-'$write_body'((P;Q),I,_) :-
-        !,
-        nl, '$tab'(I-2), put("("),
-        '$write_body'(P,I,'('),
-        put(";"),
-        '$write_body'(Q,I,';'),
-        '$tab'(1), put(")").
-'$write_body'((P|Q),I,_) :-
-        !,
-        nl, '$tab'(I-2), put("("),
-        '$write_body'(P,I,'('),
-        put("|"),
-        '$write_body'(Q,I,'|'),
-        '$tab'(1), put(")").
-'$write_body'((P|Q),I,_) :-
-        !,
-        nl, '$tab'(I-2), put("("),
-        '$write_body'(P,I,'('),
-        put("|"),
-        '$write_body'(Q,I,'|'),
-        '$tab'(1), put(")").
-'$write_body'(X,I,T) :-
-        '$beforelit'(T,I),
-        writeq(X).
 
-'$aftercomma'(',',I,I) :- !.
+'$write_disj'((Q;S),I0,I,C,Stream) :- !,
-'$aftercomma'(_,I0,I) :- I is I0+3.
+	'$write_body'(Q,I,C,Stream),
+	'$format'(Stream, "~n~*c;",[I0,0' ]),
+	'$write_disj'(S,I0,I,';',Stream).
+'$write_disj'((Q|S),I0,I,C,Stream) :- !,
+	'$write_body'(Q,I,C,Stream),
+	'$format'(Stream, "~n~*c|",[I0,0' ]),
+	'$write_disj'(S,I0,I,'|',Stream).
+'$write_disj'(S,I0,I,C,Stream) :-
+	'$write_body'(S,I,C,Stream).
 	
-'$beforelit'('(',_) :- !, '$tab'(1).
+
-'$beforelit'(_,I) :- nl, '$tab'(I).
+'$beforelit'('(',_,Stream) :- !, '$format'(Stream," ",[]).
+'$beforelit'(_,I,Stream) :- '$format'(Stream,"~n~*c",[I,0' ]).
 
 '$beautify_vars'(T) :-
 	'$list_get_vars'(T,[],L),