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

fix report on initial and token line for parser.

Browse Source 
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@540 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc
2002-06-17 15:28:01 +00:00
parent 804f7ecebc
commit b48f1264b9
9 changed files with 59 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
C/scanner.c
View File

@@ -42,6 +42,7 @@ static char SccsId[] = "@(#)scanner.c 1.2";
#include "yapio.h"
#include "alloc.h"
#include "eval.h"
#include "iopreds.h"
#if HAVE_STRING_H
#include <string.h>
#endif
@@ -515,9 +516,7 @@ token(void)
charp = TokImage;
while (chtype[ch] == BS)
my_getch();
#ifdef EMACS
TokenPos = GetCurInpPos();
#endif
switch (chtype[ch]) {
case CC:
while (my_getch() != 10 && chtype[ch] != EF);
@@ -826,7 +825,6 @@ tokenizer(int (*Nxtch) (int), int (*QuotedNxtch) (int))
my_getch();
while (chtype[ch] == BS)
my_getch();
FirstLineInParse();
do {
t = (TokEntry *) AllocScannerMemory(sizeof(TokEntry));
@@ -898,7 +896,6 @@ fast_tokenizer(void)
my_fgetch();
if (chtype[ch] == EF)
return(NIL);
FirstLineInParse();
do {
t = (TokEntry *) AllocScannerMemory(sizeof(TokEntry));
if (t == NULL) {
@@ -925,16 +922,12 @@ fast_tokenizer(void)
charp = TokImage = ((AtomEntry *) ( PreAllocCodeSpace()))->StrOfAE;
while (chtype[ch] == BS)
my_fgetch();
#ifdef EMACS
TokenPos = GetCurInpPos();
#endif
switch (chtype[ch]) {
case CC:
while (my_fgetch() != 10 && chtype[ch] != EF);
if (chtype[ch] != EF) {
my_fgetch();
if (t == l)
FirstLineInParse();
ReleasePreAllocCodeSpace((CODEADDR)TokImage);
goto get_tok;
}
@@ -1489,8 +1482,6 @@ fast_tokenizer(void)
break;
}
my_fgetch();
if (t == l)
FirstLineInParse();
ReleasePreAllocCodeSpace((CODEADDR)TokImage);
goto get_tok;
}