the10thwiz/cc65
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mark tokens with the file position from where they're read. Restore this

Browse Source 
position for tokens read from a token list. This means that line info does
now show the actual point of definition. This is an improvement but needs to
be refined.


git-svn-id: svn://svn.cc65.org/cc65/trunk@4911 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
uz
2011-01-20 20:54:30 +00:00
parent ddb7296b6c
commit 3b59a8ca6f
8 changed files with 67 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/ca65/toklist.c
View File

@@ -57,62 +57,55 @@
TokNode* NewTokNode (void)
/* Create and return a token node with the current token value */
{
TokNode* T;
/* Allocate memory */
T = xmalloc (sizeof (TokNode));
TokNode* N = xmalloc (sizeof (TokNode));
/* Initialize the token contents */
T->Next = 0;
T->Tok = CurTok.Tok;
T->WS = CurTok.WS;
T->IVal = CurTok.IVal;
SB_Init (&T->SVal);
SB_Copy (&T->SVal, &CurTok.SVal);
N->Next = 0;
SB_Init (&N->T.SVal);
CopyToken (&N->T, &CurTok);
/* Return the node */
return T;
return N;
}
void FreeTokNode (TokNode* T)
void FreeTokNode (TokNode* N)
/* Free the given token node */
{
SB_Done (&T->SVal);
xfree (T);
SB_Done (&N->T.SVal);
xfree (N);
}
void TokSet (TokNode* T)
void TokSet (TokNode* N)
/* Set the scanner token from the given token node */
{
/* Set the values */
CurTok.Tok = T->Tok;
CurTok.WS = T->WS;
CurTok.IVal = T->IVal;
SB_Copy (&CurTok.SVal, &T->SVal);
CopyToken (&CurTok, &N->T);
SB_Terminate (&CurTok.SVal);
}
enum TC TokCmp (const TokNode* T)
enum TC TokCmp (const TokNode* N)
/* Compare the token given as parameter against the current token */
{
if (T->Tok != CurTok.Tok) {
if (N->T.Tok != CurTok.Tok) {
/* Different token */
return tcDifferent;
}
/* If the token has string attribute, check it */
if (TokHasSVal (T->Tok)) {
if (SB_Compare (&CurTok.SVal, &T->SVal) != 0) {
if (TokHasSVal (N->T.Tok)) {
if (SB_Compare (&CurTok.SVal, &N->T.SVal) != 0) {
return tcSameToken;
}
} else if (TokHasIVal (T->Tok)) {
if (T->IVal != CurTok.IVal) {
} else if (TokHasIVal (N->T.Tok)) {
if (N->T.IVal != CurTok.IVal) {
return tcSameToken;
}
}
@@ -278,4 +271,3 @@ void PushTokList (TokList* List, const char* Desc)