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

fix GetCurInpPos to use the stream we are scanning, not current input. 

git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@775 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc 2003-02-14 10:56:56 +00:00
parent e7f92398da
commit 1f914e7746
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
C/scanner.c
View File

@ -608,7 +608,7 @@ Yap_tokenizer(int inp_stream)
while (chtype[ch] == BS) { while (chtype[ch] == BS) {
ch = Nxtch(inp_stream); ch = Nxtch(inp_stream);
} }
t->TokPos = GetCurInpPos(); t->TokPos = GetCurInpPos(inp_stream);
switch (chtype[ch]) { switch (chtype[ch]) {
@ -658,7 +658,7 @@ Yap_tokenizer(int inp_stream)
if (cherr) { if (cherr) {
TokEntry *e; TokEntry *e;
t->Tok = Number_tok; t->Tok = Number_tok;
t->TokPos = GetCurInpPos(); t->TokPos = GetCurInpPos(inp_stream);
e = (TokEntry *) AllocScannerMemory(sizeof(TokEntry)); e = (TokEntry *) AllocScannerMemory(sizeof(TokEntry));
if (e == NULL) { if (e == NULL) {
Yap_ErrorMessage = "not enough stack space to read in term"; Yap_ErrorMessage = "not enough stack space to read in term";
@ -683,7 +683,7 @@ Yap_tokenizer(int inp_stream)
t->Tok = Ord(Var_tok); t->Tok = Ord(Var_tok);
t->TokInfo = Unsigned(Yap_LookupVar("E")); t->TokInfo = Unsigned(Yap_LookupVar("E"));
t->TokPos = GetCurInpPos(); t->TokPos = GetCurInpPos(inp_stream);
e2 = (TokEntry *) AllocScannerMemory(sizeof(TokEntry)); e2 = (TokEntry *) AllocScannerMemory(sizeof(TokEntry));
if (e2 == NULL) { if (e2 == NULL) {
Yap_ErrorMessage = "not enough stack space to read in term"; Yap_ErrorMessage = "not enough stack space to read in term";
@ -710,7 +710,7 @@ Yap_tokenizer(int inp_stream)
if (ch == '(') if (ch == '(')
solo_flag = FALSE; solo_flag = FALSE;
t->TokInfo = Unsigned(Yap_LookupAtom("e")); t->TokInfo = Unsigned(Yap_LookupAtom("e"));
t->TokPos = GetCurInpPos(); t->TokPos = GetCurInpPos(inp_stream);
e2 = (TokEntry *) AllocScannerMemory(sizeof(TokEntry)); e2 = (TokEntry *) AllocScannerMemory(sizeof(TokEntry));
if (e2 == NULL) { if (e2 == NULL) {
Yap_ErrorMessage = "not enough stack space to read in term"; Yap_ErrorMessage = "not enough stack space to read in term";
@ -894,7 +894,7 @@ Yap_tokenizer(int inp_stream)
p->TokNext = e; p->TokNext = e;
e->Tok = Error_tok; e->Tok = Error_tok;
e->TokInfo = MkAtomTerm(Yap_LookupAtom(Yap_ErrorMessage)); e->TokInfo = MkAtomTerm(Yap_LookupAtom(Yap_ErrorMessage));
e->TokPos = GetCurInpPos(); e->TokPos = GetCurInpPos(inp_stream);
e->TokNext = NIL; e->TokNext = NIL;
Yap_ErrorMessage = NULL; Yap_ErrorMessage = NULL;
p = e; p = e;

4
H/iopreds.h
View File

@ -106,8 +106,8 @@ StreamDesc;
void STD_PROTO (Yap_InitStdStreams, (void)); void STD_PROTO (Yap_InitStdStreams, (void));
EXTERN inline int EXTERN inline int
GetCurInpPos (void) GetCurInpPos (int inp_stream)
{ {
return (Stream[Yap_c_input_stream].linecount); return (Stream[inp_stream].linecount);
} }