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

make sure we always close intermediate memory streams on exit.

Browse Source
This commit is contained in:
Vitor Santos Costa 2008-08-25 15:19:00 +01:00
parent 7a94144ccb
commit a6b9d096a6
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
C/iopreds.c
View File

@ -5371,6 +5371,8 @@ p_format2(void)
CloseStream(stream); CloseStream(stream);
if (!Yap_unify(tat,ArgOfTerm(1,ARG1))) if (!Yap_unify(tat,ArgOfTerm(1,ARG1)))
return FALSE; return FALSE;
} else {
CloseStream(stream);
} }
} else { } else {
Yap_c_output_stream = old_c_stream; Yap_c_output_stream = old_c_stream;

5
pl/yio.yap
View File

@ -1055,15 +1055,16 @@ current_stream(File, Opts, Stream) :-
catch(Goal, Exception, '$handle_exception'(Exception,Stream,SO)), catch(Goal, Exception, '$handle_exception'(Exception,Stream,SO)),
!, !,
set_output(SO), set_output(SO),
charsio:peek_mem_write_stream(Stream, L0, Chars). charsio:peek_mem_write_stream(Stream, L0, Chars),
close(Stream).
'$do_output_to_chars'(_Goal, Stream, _L0, _Chars, SO) :- '$do_output_to_chars'(_Goal, Stream, _L0, _Chars, SO) :-
set_output(SO), set_output(SO),
close(Stream), close(Stream),
fail. fail.
'$handle_exception'(Exception, Stream, SO) :- '$handle_exception'(Exception, Stream, SO) :-
set_output(SO),
close(Stream), close(Stream),
current_output(SO),
throw(Exception). throw(Exception).
write_depth(T,L) :- write_depth(T,L,_). write_depth(T,L) :- write_depth(T,L,_).