6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2025-02-06 12:31:12 +00:00
Code Issues Projects Releases Wiki Activity

Improved diagnostics on wrong number of arguments in function-like macro calls.

Browse Source
This commit is contained in:
acqn 2022-09-01 12:59:00 +08:00
parent 92f94e4e5b
commit 950606d46a
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/cc65/preproc.c
View File

@ -1551,7 +1551,10 @@ static unsigned ReadMacroArgs (unsigned NameIdx, MacroExp* E, const Macro* M, in
/* If this is not the single empty argument for a macro with an /* If this is not the single empty argument for a macro with an
** empty argument list, remember it. ** empty argument list, remember it.
*/ */
if (CurC != ')' || SB_NotEmpty (&Arg.Tokens) || M->ParamCount > 0) { if (CurC != ')' ||
CollCount (&E->Args) > 0 ||
SB_NotEmpty (&Arg.Tokens) ||
M->ParamCount > 0) {
MacroExp* A = ME_AppendArg (E, &Arg); MacroExp* A = ME_AppendArg (E, &Arg);
unsigned I; unsigned I;
@ -1669,11 +1672,23 @@ static unsigned ReadMacroArgs (unsigned NameIdx, MacroExp* E, const Macro* M, in
} }
/* Compare formal and actual argument count */ /* Compare formal and actual argument count */
if (CollCount (&E->Args) != (unsigned) M->ParamCount) { if (CollCount (&E->Args) < (unsigned) M->ParamCount) {
/* Check further only when the parentheses are paired */
if (Parens == 0) { if (Parens == 0) {
/* Argument count mismatch */ /* Specially casing variable argument */
PPError ("Macro argument count mismatch"); if (M->Variadic &&
M->ParamCount > 0 &&
CollCount (&E->Args) + 1 == (unsigned) M->ParamCount) {
/* The variable argument is left out entirely */
E->Flags |= MES_NO_VA_COMMA;
if (IS_Get (&Standard) < STD_CC65) {
PPWarning ("ISO C does not permit leaving out the comma before the variable argument");
}
} else {
/* Too few argument */
PPError ("Macro \"%s\" passed only %u arguments, but requires %u",
M->Name, CollCount (&E->Args), (unsigned) M->ParamCount);
}
} }
/* Be sure to make enough empty arguments available */ /* Be sure to make enough empty arguments available */
@ -1683,6 +1698,10 @@ static unsigned ReadMacroArgs (unsigned NameIdx, MacroExp* E, const Macro* M, in
while (CollCount (&E->Args) < (unsigned) M->ParamCount) { while (CollCount (&E->Args) < (unsigned) M->ParamCount) {
ME_AppendArg (E, &Arg); ME_AppendArg (E, &Arg);
} }
} else if (Parens == 0 && CollCount (&E->Args) > (unsigned) M->ParamCount) {
/* Too many arguments */
PPError ("Macro \"%s\" passed %u arguments, but takes just %u",
M->Name, CollCount (&E->Args), (unsigned) M->ParamCount);
} }
/* Deallocate argument resources */ /* Deallocate argument resources */