When collecting tokens to be repeated inside of a .REPEAT section, do this in

raw token mode, otherwise stuff is already partially evaluated.


git-svn-id: svn://svn.cc65.org/cc65/trunk@4897 b7a2c559-68d2-44c3-8de9-860c34a00d81

src/ca65/repeat.c

@@ -72,15 +72,6 @@ static TokList* CollectRepeatTokens (void)
      	    return 0;
      	}
 
-	/* If we find a token that is equal to the repeat counter name,
-	 * replace it by a REPCOUNTER token. This way we have to do strcmps
-	 * only once for each identifier, and not for each expansion.
-	 * Note: This will fail for nested repeats using the same repeat
-	 * counter name, but
-	 */
-
-
-
        	/* Collect all tokens in the list */
 	AddCurTok (List);
 
@@ -149,7 +140,8 @@ void ParseRepeat (void)
        	}
     }
 
-    /* Separator */
+    /* Switch to raw token mode, then skip the separator */
+    EnterRawTokenMode ();
     ConsumeSep ();
 
     /* Read the token list */
@@ -158,7 +150,7 @@ void ParseRepeat (void)
     /* If we had an error, bail out */
     if (List == 0) {
      	xfree (Name);
-       	return;
+       	goto Done;
     }
 
     /* Update the token list for replay */
@@ -171,11 +163,15 @@ void ParseRepeat (void)
      */
     if (List->Count == 0 || RepCount == 0) {
      	FreeTokList (List);
-	return;
+     	goto Done;
     }
 
     /* Read input from the repeat descriptor */
     PushTokList (List, ".REPEAT");
+
+Done:
+    /* Switch out of raw token mode */
+    LeaveRawTokenMode ();
 }