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

PLIOError should return file number, where

Browse Source
This commit is contained in:
Vítor Santos Costa 2015-10-05 10:34:32 +01:00
parent 166d4892f9
commit 4cbf3387e1
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
os/iopreds.h
View File

@ -252,9 +252,9 @@ GetCurInpPos (StreamDesc * inp_stream)
return (inp_stream->linecount); return (inp_stream->linecount);
} }
#define PlIOError(type, culprit,...) PlIOError__(__FUNCTION__, __LINE__,__FILE__, type, culprit, __VA_ARGS__) #define PlIOError(type, culprit,...) PlIOError__(__FILE__, __FUNCTION__, __LINE__, type, culprit, __VA_ARGS__)
Int PlIOError__( const char *, int, const char *, yap_error_number, Term, ...); Int PlIOError__( const char *, const char *, int, yap_error_number, Term, ...);
int GetFreeStreamD(void); int GetFreeStreamD(void);
Term Yap_MkStream (int n); Term Yap_MkStream (int n);
@ -415,14 +415,14 @@ console_count_output_char(int ch, StreamDesc *s)
inline static Term inline static Term
StreamPosition(int sno) StreamPosition(int sno)
{ {
CACHE_REGS CACHE_REGS
Term sargs[5]; Term sargs[5];
Int cpos; Int cpos;
cpos = GLOBAL_Stream[sno].charcount; cpos = GLOBAL_Stream[sno].charcount;
if (GLOBAL_Stream[sno].stream_getc == PlUnGetc) { if (GLOBAL_Stream[sno].stream_getc == PlUnGetc) {
cpos--; cpos--;
} }
sargs[0] = MkIntegerTerm (cpos); sargs[0] = MkIntegerTerm (LOCAL_StartCharCount = cpos);
sargs[1] = MkIntegerTerm (LOCAL_StartLineCount = GLOBAL_Stream[sno].linecount); sargs[1] = MkIntegerTerm (LOCAL_StartLineCount = GLOBAL_Stream[sno].linecount);
sargs[2] = MkIntegerTerm (LOCAL_StartLinePos = GLOBAL_Stream[sno].linepos); sargs[2] = MkIntegerTerm (LOCAL_StartLinePos = GLOBAL_Stream[sno].linepos);
sargs[3] = sargs[4] = MkIntTerm (0); sargs[3] = sargs[4] = MkIntTerm (0);
@ -430,6 +430,21 @@ CACHE_REGS
} }
inline static Term
CurrentPositionToTerm(void)
{
CACHE_REGS
Term sargs[5];
sargs[0] = MkIntegerTerm (LOCAL_StartCharCount);
sargs[1] = MkIntegerTerm (LOCAL_StartLineCount );
sargs[2] = MkIntegerTerm (LOCAL_StartLinePos );
sargs[3] = sargs[4] = MkIntTerm (0);
return Yap_MkApplTerm (FunctorStreamPos, 5, sargs);
}
extern FILE *Yap_stdin; extern FILE *Yap_stdin;
extern FILE *Yap_stdout; extern FILE *Yap_stdout;