Fixed a problem with {} enclosed token lists and implemented them for
.blank and .tcount. git-svn-id: svn://svn.cc65.org/cc65/trunk@3014 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
@@ -677,12 +677,7 @@ static void StartExpClassic (Macro* M)
|
||||
}
|
||||
|
||||
/* The macro may optionally be enclosed in curly braces */
|
||||
if (Tok == TOK_LCURLY) {
|
||||
NextTok ();
|
||||
Term = TOK_RCURLY;
|
||||
} else {
|
||||
Term = TOK_COMMA;
|
||||
}
|
||||
Term = GetTokListTerm (TOK_COMMA);
|
||||
|
||||
/* Read tokens for one parameter, accept empty params */
|
||||
Last = 0;
|
||||
@@ -760,16 +755,10 @@ static void StartExpDefine (Macro* M)
|
||||
/* Read the actual parameters */
|
||||
while (Count--) {
|
||||
|
||||
enum Token Term;
|
||||
TokNode* Last;
|
||||
|
||||
/* The macro may optionally be enclosed in curly braces */
|
||||
if (Tok == TOK_LCURLY) {
|
||||
NextTok ();
|
||||
Term = TOK_RCURLY;
|
||||
} else {
|
||||
Term = TOK_COMMA;
|
||||
}
|
||||
enum Token Term = GetTokListTerm (TOK_COMMA);
|
||||
|
||||
/* Check if there is really a parameter */
|
||||
if (TokIsSep (Tok) || Tok == Term) {
|
||||
|
||||
Reference in New Issue
Block a user