More lineinfo usage.

[cc65] / src / ca65 / toklist.c

diff --git a/src/ca65/toklist.c b/src/ca65/toklist.c
index ab93a6766a55e743e1349a8888c0694a333ae858..12e125e67cb2ece98f8b424ce8a2b13be1557627 100644 (file)
--- a/src/ca65/toklist.c
+++ b/src/ca65/toklist.c
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 1998     Ullrich von Bassewitz                                        */
-/*              Wacholderweg 14                                              */
-/*              D-70597 Stuttgart                                            */
-/* EMail:       uz@musoftware.de                                             */
+/* (C) 1998-2011, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -35,10 +35,14 @@
 
 #include <string.h>
 
-#include "../common/xmalloc.h"
+/* common */
+#include "check.h"
+#include "xmalloc.h"
 
+/* ca65 */
 #include "error.h"
 #include "istack.h"
+#include "nexttok.h"
 #include "scanner.h"
 #include "toklist.h"
 
@@ -53,61 +57,55 @@
 TokNode* NewTokNode (void)
 /* Create and return a token node with the current token value */
 {
-    TokNode* T;
 
     /* Allocate memory */
-    unsigned Len = TokHasSVal (Tok)? strlen (SVal) : 0;
-    T = xmalloc (sizeof (TokNode) + Len);
+    TokNode* N = xmalloc (sizeof (TokNode));
 
     /* Initialize the token contents */
-    T->Next    = 0;
-    T->Tok     = Tok;
-    T->WS      = WS;
-    T->IVal    = IVal;
-    memcpy (T->SVal, SVal, Len);
-    T->SVal [Len] = '\0';
+    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 */
 {
-    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 */
-    Tok  = T->Tok;
-    WS   = T->WS;
-    IVal = T->IVal;
-    strcpy (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 != Tok) {
+    if (N->T.Tok != CurTok.Tok) {
        /* Different token */
        return tcDifferent;
     }
 
     /* If the token has string attribute, check it */
-    if (TokHasSVal (T->Tok)) {
-       if (strcmp  (T->SVal, 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 != IVal) {
+    } else if (TokHasIVal (N->T.Tok)) {
+       if (N->T.IVal != CurTok.IVal) {
            return tcSameToken;
        }
     }
@@ -125,8 +123,11 @@ void InitTokList (TokList* T)
     T->Next    = 0;
     T->Root    = 0;
     T->Last    = 0;
-    T->Repeat  = 1;
+    T->RepCount        = 0;
+    T->RepMax  = 1;
     T->Count   = 0;
+    T->Check   = 0;
+    T->Data    = 0;
 }
 
 
@@ -157,12 +158,33 @@ void FreeTokList (TokList* List)
        FreeTokNode (Tmp);
     }
 
+    /* If we have associated data, free it */
+    if (List->Data) {
+       xfree (List->Data);
+    }
+
     /* Free the list structure itself */
     xfree (List);
 }
 
 
 
+enum token_t GetTokListTerm (enum token_t Term)
+/* Determine if the following token list is enclosed in curly braces. This is
+ * the case if the next token is the opening brace. If so, skip it and return
+ * a closing brace, otherwise return Term.
+ */
+{
+    if (CurTok.Tok == TOK_LCURLY) {
+        NextTok ();
+        return TOK_RCURLY;
+    } else {
+        return Term;
+    }
+}
+
+
+
 void AddCurTok (TokList* List)
 /* Add the current token to the token list */
 {
@@ -198,6 +220,13 @@ static int ReplayTokList (void* List)
     /* Set the next token from the list */
     TokSet (L->Last);
 
+    /* If a check function is defined, call it, so it may look at the token
+     * just set and changed it as apropriate.
+     */
+    if (L->Check) {
+       L->Check (L);
+    }
+
     /* Set the pointer to the next token */
     L->Last = L->Last->Next;
 
@@ -205,7 +234,7 @@ static int ReplayTokList (void* List)
      * zero, delete the list and remove the function from the stack.
      */
     if (L->Last == 0) {
-       if (--L->Repeat == 0) {
+       if (++L->RepCount >= L->RepMax) {
            /* Done with this list */
            FreeTokList (L);
            PopInput ();