the10thwiz/cc65
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed compatibility checking of function declarations by using the composite types of them.

Browse Source
This commit is contained in:
acqn
2020-08-12 21:35:47 +08:00
committed by Oliver Schmidt
parent 44d52935da
commit 13ed557b92
10 changed files with 129 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/cc65/compile.c
View File

@@ -177,18 +177,23 @@ static void Parse (void)
}
/* If this is a function declarator that is not followed by a comma
** or semicolon, it must be followed by a function body. If this is
** the case, convert an empty parameter list into one accepting no
** parameters (same as void) as required by the standard.
** or semicolon, it must be followed by a function body.
*/
if ((Decl.StorageClass & SC_FUNC) != 0 &&
(CurTok.Tok != TOK_COMMA) &&
(CurTok.Tok != TOK_SEMI)) {
if ((Decl.StorageClass & SC_FUNC) != 0) {
if (CurTok.Tok != TOK_COMMA && CurTok.Tok != TOK_SEMI) {
/* A definition */
Decl.StorageClass |= SC_DEF;
FuncDesc* D = GetFuncDesc (Decl.Type);
if (D->Flags & FD_EMPTY) {
D->Flags = (D->Flags & ~FD_EMPTY) | FD_VOID_PARAM;
/* Convert an empty parameter list into one accepting no
** parameters (same as void) as required by the standard.
*/
FuncDesc* D = GetFuncDesc (Decl.Type);
if (D->Flags & FD_EMPTY) {
D->Flags = (D->Flags & ~FD_EMPTY) | FD_VOID_PARAM;
}
} else {
/* Just a declaration */
Decl.StorageClass |= SC_DECL;
}
}
@@ -309,13 +314,6 @@ SkipOneDecl:
/* Prototype only */
NextToken ();
} else {
/* Function body. Check for duplicate function definitions */
if (SymIsDef (Entry)) {
Error ("Body for function '%s' has already been defined",
Entry->Name);
}
/* Parse the function body */
NewFunc (Entry);
}