Merge pull request #297 from groessler/something_to_pull

[cc65] / src / ca65 / toklist.c

diff --git a/src/ca65/toklist.c b/src/ca65/toklist.c
index 9c12422ec2eb31fa2f564431f3e683e0af214815..16efd24dfa1e2fdb17db7327fa078f7d8ed1612a 100644 (file)
--- a/src/ca65/toklist.c
+++ b/src/ca65/toklist.c
@@ -1,8 +1,8 @@
 /*****************************************************************************/
 /*                                                                           */
-/*                                toklist.c                                 */
+/*                                 toklist.c                                 */
 /*                                                                           */
-/*                 Token list for the ca65 macroassembler                   */
+/*                  Token list for the ca65 macroassembler                   */
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
@@ -61,7 +61,7 @@ static unsigned PushCounter = 0;
 
 
 /*****************************************************************************/
-/*                                          Code                                    */
+/*                                   Code                                    */
 /*****************************************************************************/
 
 
@@ -107,19 +107,19 @@ enum TC TokCmp (const TokNode* N)
 /* Compare the token given as parameter against the current token */
 {
     if (N->T.Tok != CurTok.Tok) {
-       /* Different token */
-       return tcDifferent;
+        /* Different token */
+        return tcDifferent;
     }
 
     /* If the token has string attribute, check it */
     if (TokHasSVal (N->T.Tok)) {
-               if (SB_Compare (&CurTok.SVal, &N->T.SVal) != 0) {
-           return tcSameToken;
-       }
+        if (SB_Compare (&CurTok.SVal, &N->T.SVal) != 0) {
+            return tcSameToken;
+        }
     } else if (TokHasIVal (N->T.Tok)) {
-       if (N->T.IVal != CurTok.IVal) {
-           return tcSameToken;
-       }
+        if (N->T.IVal != CurTok.IVal) {
+            return tcSameToken;
+        }
     }
 
     /* Tokens are identical */
@@ -135,14 +135,14 @@ TokList* NewTokList (void)
     TokList* T = xmalloc (sizeof (TokList));
 
     /* Initialize the fields */
-    T->Next    = 0;
-    T->Root    = 0;
-    T->Last    = 0;
-    T->RepCount        = 0;
-    T->RepMax  = 1;
-    T->Count   = 0;
-    T->Check   = 0;
-    T->Data    = 0;
+    T->Next     = 0;
+    T->Root     = 0;
+    T->Last     = 0;
+    T->RepCount = 0;
+    T->RepMax   = 1;
+    T->Count    = 0;
+    T->Check    = 0;
+    T->Data     = 0;
     T->LI       = 0;
 
     /* Return the new list */
@@ -157,9 +157,9 @@ void FreeTokList (TokList* List)
     /* Free the token list */
     TokNode* T = List->Root;
     while (T) {
-       TokNode* Tmp = T;
-       T = T->Next;
-       FreeTokNode (Tmp);
+        TokNode* Tmp = T;
+        T = T->Next;
+        FreeTokNode (Tmp);
     }
 
     /* Free associated line info */
@@ -169,7 +169,7 @@ void FreeTokList (TokList* List)
 
     /* If we have associated data, free it */
     if (List->Data) {
-       xfree (List->Data);
+        xfree (List->Data);
     }
 
     /* Free the list structure itself */
@@ -180,9 +180,9 @@ void FreeTokList (TokList* 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.
- */
+** 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 ();
@@ -202,9 +202,9 @@ void AddCurTok (TokList* List)
 
     /* Insert the node into the list */
     if (List->Root == 0) {
-       List->Root = T;
+        List->Root = T;
     } else {
-       List->Last->Next = T;
+        List->Last->Next = T;
     }
     List->Last = T;
 
@@ -216,27 +216,27 @@ void AddCurTok (TokList* List)
 
 static int ReplayTokList (void* List)
 /* Function that gets the next token from a token list and sets it. This
- * function may be used together with the PushInput function from the istack
- * module.
- */
+** function may be used together with the PushInput function from the istack
+** module.
+*/
 {
     /* Cast the generic pointer to an actual list */
     TokList* L = List;
 
     /* If there are no more tokens, decrement the repeat counter. If it goes
-     * zero, delete the list and remove the function from the stack.
-     */
+    ** zero, delete the list and remove the function from the stack.
+    */
     if (L->Last == 0) {
-       if (++L->RepCount >= L->RepMax) {
-           /* Done with this list */
-           FreeTokList (L);
+        if (++L->RepCount >= L->RepMax) {
+            /* Done with this list */
+            FreeTokList (L);
             --PushCounter;
-           PopInput ();
+            PopInput ();
             return 0;
-       } else {
-           /* Replay one more time */
-           L->Last = L->Root;
-       }
+        } else {
+            /* Replay one more time */
+            L->Last = L->Root;
+        }
     }
 
     /* Set the next token from the list */
@@ -249,10 +249,10 @@ static int ReplayTokList (void* List)
     L->LI = StartLine (&CurTok.Pos, LI_TYPE_ASM, PushCounter);
 
     /* If a check function is defined, call it, so it may look at the token
-     * just set and changed it as apropriate.
-     */
+    ** just set and changed it as apropriate.
+    */
     if (L->Check) {
-       L->Check (L);
+        L->Check (L);
     }
 
     /* Set the pointer to the next token */
@@ -266,14 +266,14 @@ static int ReplayTokList (void* List)
 
 void PushTokList (TokList* List, const char* Desc)
 /* Push a token list to be used as input for InputFromStack. This includes
- * several initializations needed in the token list structure, so don't use
- * PushInput directly.
- */
+** several initializations needed in the token list structure, so don't use
+** PushInput directly.
+*/
 {
     /* If the list is empty, just delete it and bail out */
     if (List->Count == 0) {
-       FreeTokList (List);
-       return;
+        FreeTokList (List);
+        return;
     }
 
     /* Reset the last pointer to the first element */
@@ -283,6 +283,3 @@ void PushTokList (TokList* List, const char* Desc)
     ++PushCounter;
     PushInput (ReplayTokList, List, Desc);
 }
-
-
-