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

Move all attributes and other information that is attached to a token into a

Browse Source 
structure named Token.


git-svn-id: svn://svn.cc65.org/cc65/trunk@4910 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
uz
2011-01-16 16:05:43 +00:00
parent dbfae85f54
commit ddb7296b6c
23 changed files with 526 additions and 496 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/ca65/toklist.c
View File

@@ -64,11 +64,11 @@ TokNode* NewTokNode (void)
/* Initialize the token contents */
T->Next = 0;
T->Tok = Tok;
T->WS = WS;
T->IVal = IVal;
T->Tok = CurTok.Tok;
T->WS = CurTok.WS;
T->IVal = CurTok.IVal;
SB_Init (&T->SVal);
SB_Copy (&T->SVal, &SVal);
SB_Copy (&T->SVal, &CurTok.SVal);
/* Return the node */
return T;
@@ -89,11 +89,11 @@ void TokSet (TokNode* T)
/* Set the scanner token from the given token node */
{
/* Set the values */
Tok = T->Tok;
WS = T->WS;
IVal = T->IVal;
SB_Copy (&SVal, &T->SVal);
SB_Terminate (&SVal);
CurTok.Tok = T->Tok;
CurTok.WS = T->WS;
CurTok.IVal = T->IVal;
SB_Copy (&CurTok.SVal, &T->SVal);
SB_Terminate (&CurTok.SVal);
}
@@ -101,18 +101,18 @@ void TokSet (TokNode* T)
enum TC TokCmp (const TokNode* T)
/* Compare the token given as parameter against the current token */
{
if (T->Tok != Tok) {
if (T->Tok != CurTok.Tok) {
/* Different token */
return tcDifferent;
}
/* If the token has string attribute, check it */
if (TokHasSVal (T->Tok)) {
if (SB_Compare (&SVal, &T->SVal) != 0) {
if (SB_Compare (&CurTok.SVal, &T->SVal) != 0) {
return tcSameToken;
}
} else if (TokHasIVal (T->Tok)) {
if (T->IVal != IVal) {
if (T->IVal != CurTok.IVal) {
return tcSameToken;
}
}
@@ -182,7 +182,7 @@ enum token_t GetTokListTerm (enum token_t Term)
* a closing brace, otherwise return Term.
*/
{
if (Tok == TOK_LCURLY) {
if (CurTok.Tok == TOK_LCURLY) {
NextTok ();
return TOK_RCURLY;
} else {
@@ -278,3 +278,4 @@ void PushTokList (TokList* List, const char* Desc)