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

remove code support for null streams.

Browse Source
This commit is contained in:
Vitor Santos Costa 2011-02-12 23:45:19 +00:00
parent 9c1d780931
commit 0d0a95ae8a
2 changed files with 9 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
C/iopreds.c
View File

@ -246,8 +246,7 @@ yap_fflush(int sno)
#endif #endif
if ( (Stream[sno].status & Output_Stream_f) && if ( (Stream[sno].status & Output_Stream_f) &&
! (Stream[sno].status & ! (Stream[sno].status &
(Null_Stream_f| (Free_Stream_f)) ) {
Free_Stream_f)) ) {
if (Stream[sno].status & SWI_Stream_f) { if (Stream[sno].status & SWI_Stream_f) {
return SWIFlush(Stream[sno].u.swi_stream.swi_ptr); return SWIFlush(Stream[sno].u.swi_stream.swi_ptr);
} }
@ -510,12 +509,10 @@ count_output_char(int ch, StreamDesc *s)
{ {
#if MPWSHELL #if MPWSHELL
if (mpwshell && (sno == StdOutStream || sno == if (mpwshell && (sno == StdOutStream || sno ==
StdErrStream) && StdErrStream))
!(s->status & Null_Stream_f))
{ {
putc (MPWSEP, s->u.file.file); putc (MPWSEP, s->u.file.file);
if (!(Stream[Yap_c_output_stream].status & Null_Stream_f)) fflush (stdout);
fflush (stdout);
} }
#endif #endif
/* Inform that we have written a newline */ /* Inform that we have written a newline */
@ -541,12 +538,10 @@ console_count_output_char(int ch, StreamDesc *s)
{ {
#if MPWSHELL #if MPWSHELL
if (mpwshell && (sno == StdOutStream || sno == if (mpwshell && (sno == StdOutStream || sno ==
StdErrStream) && StdErrStream))
!(s->status & Null_Stream_f))
{ {
putc (MPWSEP, s->u.file.file); putc (MPWSEP, s->u.file.file);
if (!(Stream[Yap_c_output_stream].status & Null_Stream_f)) fflush (stdout);
fflush (stdout);
} }
#endif #endif
++s->charcount; ++s->charcount;
@ -1984,8 +1979,7 @@ SetAlias (Atom arg, int sno)
if (aliasp->name == arg) { if (aliasp->name == arg) {
Int alno = aliasp-FileAliases; Int alno = aliasp-FileAliases;
aliasp->alias_stream = sno; aliasp->alias_stream = sno;
if (!(Stream[sno].status & {
(Null_Stream_f))) {
switch(alno) { switch(alno) {
case 0: case 0:
Yap_stdin = Stream[sno].u.file.file; Yap_stdin = Stream[sno].u.file.file;
@ -2379,11 +2373,8 @@ Yap_CloseStreams (int loud)
pclose (Stream[sno].u.file.file); pclose (Stream[sno].u.file.file);
else if (Stream[sno].status & (SWI_Stream_f)) { else if (Stream[sno].status & (SWI_Stream_f)) {
SWIClose(Stream[sno].u.swi_stream.swi_ptr); SWIClose(Stream[sno].u.swi_stream.swi_ptr);
} else if (!(Stream[sno].status & Null_Stream_f)) {
YP_fclose (Stream[sno].u.file.file);
} else { } else {
if (loud) YP_fclose (Stream[sno].u.file.file);
fprintf (Yap_stderr, "%% YAP Error: while closing stream: %s\n", RepAtom (Stream[sno].u.file.name)->StrOfAE);
} }
if (Yap_c_input_stream == sno) { if (Yap_c_input_stream == sno) {
Yap_c_input_stream = StdInStream; Yap_c_input_stream = StdInStream;
@ -2398,7 +2389,7 @@ Yap_CloseStreams (int loud)
static void static void
CloseStream(int sno) CloseStream(int sno)
{ {
if (!(Stream[sno].status & (Null_Stream_f|SWI_Stream_f))) { if (!(Stream[sno].status & (SWI_Stream_f))) {
YP_fclose (Stream[sno].u.file.file); YP_fclose (Stream[sno].u.file.file);
} else if (Stream[sno].status & (SWI_Stream_f)) { } else if (Stream[sno].status & (SWI_Stream_f)) {
SWIClose(Stream[sno].u.swi_stream.swi_ptr); SWIClose(Stream[sno].u.swi_stream.swi_ptr);
@ -3347,8 +3338,6 @@ p_character_count (void)
} }
tout = MkIntTerm (no); tout = MkIntTerm (no);
} }
else if (Stream[sno].status & Null_Stream_f)
tout = MkIntTerm (Stream[sno].charcount);
else else
tout = MkIntTerm (YP_ftell (Stream[sno].u.file.file)); tout = MkIntTerm (YP_ftell (Stream[sno].u.file.file));
UNLOCK(Stream[sno].streamlock); UNLOCK(Stream[sno].streamlock);
@ -3620,10 +3609,6 @@ p_put (void)
return(FALSE); return(FALSE);
} }
Stream[sno].stream_wputc (sno, (int) IntegerOfTerm (Deref (ARG2))); Stream[sno].stream_wputc (sno, (int) IntegerOfTerm (Deref (ARG2)));
/*
* if (!(Stream[sno].status & Null_Stream_f))
* yap_fflush(Stream[sno].u.file.file);
*/
UNLOCK(Stream[sno].streamlock); UNLOCK(Stream[sno].streamlock);
return (TRUE); return (TRUE);
} }
@ -3641,10 +3626,6 @@ p_put_byte (void)
return(FALSE); return(FALSE);
} }
Stream[sno].stream_putc(sno, (int) IntegerOfTerm (Deref (ARG2))); Stream[sno].stream_putc(sno, (int) IntegerOfTerm (Deref (ARG2)));
/*
* if (!(Stream[sno].status & Null_Stream_f))
* yap_fflush(Stream[sno].u.file.file);
*/
UNLOCK(Stream[sno].streamlock); UNLOCK(Stream[sno].streamlock);
return (TRUE); return (TRUE);
} }
@ -5173,8 +5154,7 @@ Yap_FileDescriptorFromStream(Term t)
int sno = CheckStream (t, Input_Stream_f|Output_Stream_f, "FileDescriptorFromStream"); int sno = CheckStream (t, Input_Stream_f|Output_Stream_f, "FileDescriptorFromStream");
if (sno < 0) if (sno < 0)
return NULL; return NULL;
if (Stream[sno].status & (Null_Stream_f| if (Stream[sno].status & (Free_Stream_f))
Free_Stream_f))
return NULL; return NULL;
return Stream[sno].u.file.file; return Stream[sno].u.file.file;
} }

1
H/iopreds.h
View File

@ -104,7 +104,6 @@ StreamDesc;
#define Input_Stream_f 0x000004 #define Input_Stream_f 0x000004
#define Append_Stream_f 0x000008 #define Append_Stream_f 0x000008
#define Eof_Stream_f 0x000010 #define Eof_Stream_f 0x000010
#define Null_Stream_f 0x000020
#define Tty_Stream_f 0x000040 #define Tty_Stream_f 0x000040
#define Binary_Stream_f 0x000100 #define Binary_Stream_f 0x000100
#define Eof_Error_Stream_f 0x000200 #define Eof_Error_Stream_f 0x000200