-/*
- * declare.c
- *
- * Ullrich von Bassewitz, 20.06.1998
- */
+/*****************************************************************************/
+/* */
+/* declare.c */
+/* */
+/* Parse variable and function declarations */
+/* */
+/* */
+/* */
+/* (C) 1998-2002 Ullrich von Bassewitz */
+/* Wacholderweg 14 */
+/* D-70597 Stuttgart */
+/* EMail: uz@musoftware.de */
+/* */
+/* */
+/* This software is provided 'as-is', without any expressed or implied */
+/* warranty. In no event will the authors be held liable for any damages */
+/* arising from the use of this software. */
+/* */
+/* Permission is granted to anyone to use this software for any purpose, */
+/* including commercial applications, and to alter it and redistribute it */
+/* freely, subject to the following restrictions: */
+/* */
+/* 1. The origin of this software must not be misrepresented; you must not */
+/* claim that you wrote the original software. If you use this software */
+/* in a product, an acknowledgment in the product documentation would be */
+/* appreciated but is not required. */
+/* 2. Altered source versions must be plainly marked as such, and must not */
+/* be misrepresented as being the original software. */
+/* 3. This notice may not be removed or altered from any source */
+/* distribution. */
+/* */
+/*****************************************************************************/
#include <stdio.h>
#include <string.h>
#include <errno.h>
-#include <ctype.h>
+/* common */
+#include "xmalloc.h"
+
+/* cc65 */
#include "anonname.h"
#include "codegen.h"
#include "datatype.h"
+#include "declattr.h"
#include "error.h"
#include "expr.h"
#include "funcdesc.h"
#include "function.h"
#include "global.h"
#include "litpool.h"
-#include "mem.h"
#include "pragma.h"
#include "scanner.h"
#include "symtab.h"
-static void optional_modifiers (void)
-/* Eat optional "const" or "volatile" tokens */
+static type OptionalQualifiers (type Q)
+/* Read type qualifiers if we have any */
{
- while (curtok == CONST || curtok == VOLATILE) {
- /* Skip it */
- gettok ();
+ while (CurTok.Tok == TOK_CONST || CurTok.Tok == TOK_VOLATILE) {
+
+ switch (CurTok.Tok) {
+
+ case TOK_CONST:
+ if (Q & T_QUAL_CONST) {
+ Error ("Duplicate qualifier: `const'");
+ }
+ Q |= T_QUAL_CONST;
+ break;
+
+ case TOK_VOLATILE:
+ if (Q & T_QUAL_VOLATILE) {
+ Error ("Duplicate qualifier: `volatile'");
+ }
+ Q |= T_QUAL_VOLATILE;
+ break;
+
+ default:
+ /* Keep gcc silent */
+ break;
+
+ }
+
+ /* Skip the token */
+ NextToken ();
}
+
+ /* Return the qualifiers read */
+ return Q;
}
static void optionalint (void)
/* Eat an optional "int" token */
{
- if (curtok == INT) {
+ if (CurTok.Tok == TOK_INT) {
/* Skip it */
- gettok ();
+ NextToken ();
}
}
static void optionalsigned (void)
/* Eat an optional "signed" token */
{
- if (curtok == SIGNED) {
+ if (CurTok.Tok == TOK_SIGNED) {
/* Skip it */
- gettok ();
+ NextToken ();
}
}
/* Initialize the Declaration struct for use */
{
D->Ident[0] = '\0';
- D->Type[0] = T_END;
+ D->Type[0] = T_END;
D->T = D->Type;
}
D->Flags &= ~DS_DEF_STORAGE;
/* Check the storage class given */
- switch (curtok) {
+ switch (CurTok.Tok) {
- case EXTERN:
+ case TOK_EXTERN:
D->StorageClass = SC_EXTERN | SC_STATIC;
- gettok ();
+ NextToken ();
break;
- case STATIC:
+ case TOK_STATIC:
D->StorageClass = SC_STATIC;
- gettok ();
+ NextToken ();
break;
- case REGISTER:
+ case TOK_REGISTER:
D->StorageClass = SC_REGISTER | SC_STATIC;
- gettok ();
+ NextToken ();
break;
- case AUTO:
+ case TOK_AUTO:
D->StorageClass = SC_AUTO;
- gettok ();
+ NextToken ();
break;
- case TYPEDEF:
+ case TOK_TYPEDEF:
D->StorageClass = SC_TYPEDEF;
- gettok ();
+ NextToken ();
break;
default:
ident Ident;
/* Accept forward definitions */
- if (curtok != LCURLY) {
+ if (CurTok.Tok != TOK_LCURLY) {
return;
}
/* Skip the opening curly brace */
- gettok ();
+ NextToken ();
/* Read the enum tags */
EnumVal = 0;
- while (curtok != RCURLY) {
+ while (CurTok.Tok != TOK_RCURLY) {
/* We expect an identifier */
- if (curtok != IDENT) {
- Error (ERR_IDENT_EXPECTED);
+ if (CurTok.Tok != TOK_IDENT) {
+ Error ("Identifier expected");
continue;
}
/* Remember the identifier and skip it */
strcpy (Ident, CurTok.Ident);
- gettok ();
+ NextToken ();
/* Check for an assigned value */
- if (curtok == ASGN) {
- struct expent lval;
- gettok ();
- constexpr (&lval);
- EnumVal = lval.e_const;
+ if (CurTok.Tok == TOK_ASSIGN) {
+ ExprDesc lval;
+ NextToken ();
+ ConstExpr (&lval);
+ EnumVal = lval.ConstVal;
}
/* Add an entry to the symbol table */
- AddEnumSym (Ident, EnumVal++);
+ AddConstSym (Ident, type_int, SC_ENUM, EnumVal++);
/* Check for end of definition */
- if (curtok != COMMA)
+ if (CurTok.Tok != TOK_COMMA)
break;
- gettok ();
+ NextToken ();
}
ConsumeRCurly ();
}
SymEntry* Entry;
- if (curtok != LCURLY) {
+ if (CurTok.Tok != TOK_LCURLY) {
/* Just a forward declaration. Try to find a struct with the given
* name. If there is none, insert a forward declaration into the
* current lexical level.
*/
- Entry = FindStructSym (Name);
- if (Entry == 0 || Entry->Flags != SC_STRUCT) {
+ Entry = FindTagSym (Name);
+ if (Entry == 0) {
Entry = AddStructSym (Name, 0, 0);
+ } else if (SymIsLocal (Entry) && (Entry->Flags & SC_STRUCT) == 0) {
+ /* Already defined in the level but no struct */
+ Error ("Symbol `%s' is already different kind", Name);
}
- return Entry;
+ return Entry;
}
/* Add a forward declaration for the struct in the current lexical level */
Entry = AddStructSym (Name, 0, 0);
/* Skip the curly brace */
- gettok ();
+ NextToken ();
/* Enter a new lexical level for the struct */
EnterStructLevel ();
/* Parse struct fields */
Size = 0;
- while (curtok != RCURLY) {
+ while (CurTok.Tok != TOK_RCURLY) {
/* Get the type of the entry */
DeclSpec Spec;
AddLocalSym (Decl.Ident, Decl.Type, SC_SFLD, (StructType == T_STRUCT)? Size : 0);
/* Calculate offset of next field/size of the union */
- Offs = SizeOf (Decl.Type);
+ Offs = CheckedSizeOf (Decl.Type);
if (StructType == T_STRUCT) {
Size += Offs;
} else {
}
}
- if (curtok != COMMA)
+ if (CurTok.Tok != TOK_COMMA)
break;
- gettok ();
+ NextToken ();
}
ConsumeSemi ();
}
/* Skip the closing brace */
- gettok ();
+ NextToken ();
/* Remember the symbol table and leave the struct level */
FieldTab = GetSymTab ();
static void ParseTypeSpec (DeclSpec* D, int Default)
/* Parse a type specificier */
{
- ident Ident;
- SymEntry* Entry;
- type StructType;
+ ident Ident;
+ SymEntry* Entry;
+ type StructType;
+ type Qualifiers; /* Type qualifiers */
- /* Assume have an explicit type */
+ /* Assume we have an explicit type */
D->Flags &= ~DS_DEF_TYPE;
- /* Skip const or volatile modifiers if needed */
- optional_modifiers ();
+ /* Read type qualifiers if we have any */
+ Qualifiers = OptionalQualifiers (T_QUAL_NONE);
/* Look at the data type */
- switch (curtok) {
+ switch (CurTok.Tok) {
- case VOID:
- gettok ();
+ case TOK_VOID:
+ NextToken ();
D->Type[0] = T_VOID;
D->Type[1] = T_END;
break;
- case CHAR:
- gettok ();
+ case TOK_CHAR:
+ NextToken ();
D->Type[0] = GetDefaultChar();
D->Type[1] = T_END;
break;
- case LONG:
- gettok ();
- if (curtok == UNSIGNED) {
- gettok ();
- optionalint ();
- D->Type[0] = T_ULONG;
- D->Type[1] = T_END;
+ case TOK_LONG:
+ NextToken ();
+ if (CurTok.Tok == TOK_UNSIGNED) {
+ NextToken ();
+ optionalint ();
+ D->Type[0] = T_ULONG;
+ D->Type[1] = T_END;
} else {
- optionalsigned ();
- optionalint ();
- D->Type[0] = T_LONG;
- D->Type[1] = T_END;
+ optionalsigned ();
+ optionalint ();
+ D->Type[0] = T_LONG;
+ D->Type[1] = T_END;
}
break;
- case SHORT:
- gettok ();
- if (curtok == UNSIGNED) {
- gettok ();
- optionalint ();
- D->Type[0] = T_USHORT;
- D->Type[1] = T_END;
+ case TOK_SHORT:
+ NextToken ();
+ if (CurTok.Tok == TOK_UNSIGNED) {
+ NextToken ();
+ optionalint ();
+ D->Type[0] = T_USHORT;
+ D->Type[1] = T_END;
} else {
- optionalsigned ();
- optionalint ();
- D->Type[0] = T_SHORT;
+ optionalsigned ();
+ optionalint ();
+ D->Type[0] = T_SHORT;
D->Type[1] = T_END;
}
break;
- case INT:
- gettok ();
+ case TOK_INT:
+ NextToken ();
D->Type[0] = T_INT;
D->Type[1] = T_END;
break;
- case SIGNED:
- gettok ();
- switch (curtok) {
+ case TOK_SIGNED:
+ NextToken ();
+ switch (CurTok.Tok) {
- case CHAR:
- gettok ();
- D->Type[0] = T_CHAR;
+ case TOK_CHAR:
+ NextToken ();
+ D->Type[0] = T_SCHAR;
D->Type[1] = T_END;
break;
- case SHORT:
- gettok ();
+ case TOK_SHORT:
+ NextToken ();
optionalint ();
D->Type[0] = T_SHORT;
D->Type[1] = T_END;
break;
- case LONG:
- gettok ();
+ case TOK_LONG:
+ NextToken ();
optionalint ();
D->Type[0] = T_LONG;
D->Type[1] = T_END;
- break;
+ break;
- case INT:
- gettok ();
+ case TOK_INT:
+ NextToken ();
/* FALL THROUGH */
default:
}
break;
- case UNSIGNED:
- gettok ();
- switch (curtok) {
+ case TOK_UNSIGNED:
+ NextToken ();
+ switch (CurTok.Tok) {
- case CHAR:
- gettok ();
+ case TOK_CHAR:
+ NextToken ();
D->Type[0] = T_UCHAR;
D->Type[1] = T_END;
- break;
+ break;
- case SHORT:
- gettok ();
+ case TOK_SHORT:
+ NextToken ();
optionalint ();
D->Type[0] = T_USHORT;
D->Type[1] = T_END;
break;
- case LONG:
- gettok ();
+ case TOK_LONG:
+ NextToken ();
optionalint ();
D->Type[0] = T_ULONG;
D->Type[1] = T_END;
break;
- case INT:
- gettok ();
+ case TOK_INT:
+ NextToken ();
/* FALL THROUGH */
default:
D->Type[0] = T_UINT;
- D->Type[1] = T_END;
+ D->Type[1] = T_END;
break;
}
break;
- case STRUCT:
- case UNION:
- StructType = (curtok == STRUCT)? T_STRUCT : T_UNION;
- gettok ();
- if (curtok == IDENT) {
+ case TOK_STRUCT:
+ case TOK_UNION:
+ StructType = (CurTok.Tok == TOK_STRUCT)? T_STRUCT : T_UNION;
+ NextToken ();
+ /* */
+ if (CurTok.Tok == TOK_IDENT) {
strcpy (Ident, CurTok.Ident);
- gettok ();
+ NextToken ();
} else {
AnonName (Ident, (StructType == T_STRUCT)? "struct" : "union");
}
+ /* Remember we have an extra type decl */
+ D->Flags |= DS_EXTRA_TYPE;
/* Declare the struct in the current scope */
Entry = ParseStructDecl (Ident, StructType);
/* Encode the struct entry into the type */
D->Type[DECODE_SIZE+1] = T_END;
break;
- case ENUM:
- gettok ();
- if (curtok != LCURLY) {
- /* Named enum */
- Consume (IDENT, ERR_IDENT_EXPECTED);
+ case TOK_ENUM:
+ NextToken ();
+ if (CurTok.Tok != TOK_LCURLY) {
+ /* Named enum */
+ if (CurTok.Tok == TOK_IDENT) {
+ /* Find an entry with this name */
+ Entry = FindTagSym (CurTok.Ident);
+ if (Entry) {
+ if (SymIsLocal (Entry) && (Entry->Flags & SC_ENUM) == 0) {
+ Error ("Symbol `%s' is already different kind", Entry->Name);
+ }
+ } else {
+ /* Insert entry into table ### */
+ }
+ /* Skip the identifier */
+ NextToken ();
+ } else {
+ Error ("Identifier expected");
+ }
}
+ /* Remember we have an extra type decl */
+ D->Flags |= DS_EXTRA_TYPE;
+ /* Parse the enum decl */
ParseEnumDecl ();
D->Type[0] = T_INT;
D->Type[1] = T_END;
break;
- case IDENT:
+ case TOK_IDENT:
Entry = FindSym (CurTok.Ident);
if (Entry && IsTypeDef (Entry)) {
/* It's a typedef */
- gettok ();
+ NextToken ();
TypeCpy (D->Type, Entry->Type);
break;
}
default:
if (Default < 0) {
- Error (ERR_TYPE_EXPECTED);
+ Error ("Type expected");
D->Type[0] = T_INT;
D->Type[1] = T_END;
} else {
}
break;
}
+
+ /* There may also be qualifiers *after* the initial type */
+ D->Type[0] |= OptionalQualifiers (Qualifiers);
}
-static FuncDesc* ParseFuncDecl (void)
-/* Parse the argument list of a function. */
+static type* ParamTypeCvt (type* T)
+/* If T is an array, convert it to a pointer else do nothing. Return the
+ * resulting type.
+ */
{
- unsigned UnnamedCount = 0;
- unsigned Offs;
- SymEntry* Sym;
- type* Type;
+ if (IsTypeArray (T)) {
+ T += DECODE_SIZE;
+ T[0] = T_PTR;
+ }
+ return T;
+}
- /* Create a new function descriptor */
- FuncDesc* F = NewFuncDesc ();
- /* Enter a new lexical level */
- EnterFunctionLevel ();
- /* Check for an empty or void parameter list */
- if (curtok == RPAREN) {
- /* Parameter list is empty */
- F->Flags |= (FD_EMPTY | FD_ELLIPSIS);
- } else if (curtok == VOID && nxttok == RPAREN) {
- /* Parameter list declared as void */
- gettok ();
- F->Flags |= FD_VOID_PARAM;
+static void ParseOldStyleParamList (FuncDesc* F)
+/* Parse an old style (K&R) parameter list */
+{
+ /* Parse params */
+ while (CurTok.Tok != TOK_RPAREN) {
+
+ /* List of identifiers expected */
+ if (CurTok.Tok != TOK_IDENT) {
+ Error ("Identifier expected");
+ }
+
+ /* Create a symbol table entry with type int */
+ AddLocalSym (CurTok.Ident, type_int, SC_AUTO | SC_PARAM | SC_DEF, 0);
+
+ /* Count arguments */
+ ++F->ParamCount;
+
+ /* Skip the identifier */
+ NextToken ();
+
+ /* Check for more parameters */
+ if (CurTok.Tok == TOK_COMMA) {
+ NextToken ();
+ } else {
+ break;
+ }
}
+ /* Skip right paren. We must explicitly check for one here, since some of
+ * the breaks above bail out without checking.
+ */
+ ConsumeRParen ();
+
+ /* An optional list of type specifications follows */
+ while (CurTok.Tok != TOK_LCURLY) {
+
+ DeclSpec Spec;
+
+ /* Read the declaration specifier */
+ ParseDeclSpec (&Spec, SC_AUTO, T_INT);
+
+ /* We accept only auto and register as storage class specifiers, but
+ * we ignore all this, since we use auto anyway.
+ */
+ if ((Spec.StorageClass & SC_AUTO) == 0 &&
+ (Spec.StorageClass & SC_REGISTER) == 0) {
+ Error ("Illegal storage class");
+ }
+
+ /* Parse a comma separated variable list */
+ while (1) {
+
+ Declaration Decl;
+
+ /* Read the parameter */
+ ParseDecl (&Spec, &Decl, DM_NEED_IDENT);
+ if (Decl.Ident[0] != '\0') {
+
+ /* We have a name given. Search for the symbol */
+ SymEntry* Sym = FindLocalSym (Decl.Ident);
+ if (Sym) {
+ /* Found it, change the default type to the one given */
+ ChangeSymType (Sym, ParamTypeCvt (Decl.Type));
+ } else {
+ Error ("Unknown identifier: `%s'", Decl.Ident);
+ }
+ }
+
+ if (CurTok.Tok == TOK_COMMA) {
+ NextToken ();
+ } else {
+ break;
+ }
+
+ }
+
+ /* Variable list must be semicolon terminated */
+ ConsumeSemi ();
+ }
+}
+
+
+
+static void ParseAnsiParamList (FuncDesc* F)
+/* Parse a new style (ANSI) parameter list */
+{
/* Parse params */
- while (curtok != RPAREN) {
+ while (CurTok.Tok != TOK_RPAREN) {
- DeclSpec Spec;
- Declaration Decl;
+ DeclSpec Spec;
+ Declaration Decl;
+ DeclAttr Attr;
/* Allow an ellipsis as last parameter */
- if (curtok == ELLIPSIS) {
- gettok ();
- F->Flags |= FD_ELLIPSIS;
+ if (CurTok.Tok == TOK_ELLIPSIS) {
+ NextToken ();
+ F->Flags |= FD_VARIADIC;
break;
}
*/
if ((Spec.StorageClass & SC_AUTO) == 0 &&
(Spec.StorageClass & SC_REGISTER) == 0) {
- Error (ERR_ILLEGAL_STORAGE_CLASS);
+ Error ("Illegal storage class");
}
Spec.StorageClass = SC_AUTO | SC_PARAM | SC_DEF;
/* Unnamed symbol. Generate a name that is not user accessible,
* then handle the symbol normal.
*/
- AnonName (Decl.Ident, "param");
- ++UnnamedCount;
+ AnonName (Decl.Ident, "param");
+ F->Flags |= FD_UNNAMED_PARAMS;
- /* Clear defined bit on nonames */
- Spec.StorageClass &= ~SC_DEF;
- }
+ /* Clear defined bit on nonames */
+ Spec.StorageClass &= ~SC_DEF;
+ }
- /* If the parameter is an array, convert it to a pointer */
- Type = Decl.Type;
- if (IsArray (Type)) {
- Type += DECODE_SIZE;
- Type[0] = T_PTR;
- }
+ /* Parse an attribute ### */
+ ParseAttribute (&Decl, &Attr);
/* Create a symbol table entry */
- AddLocalSym (Decl.Ident, Type, Spec.StorageClass, 0);
+ AddLocalSym (Decl.Ident, ParamTypeCvt (Decl.Type), Spec.StorageClass, 0);
/* Count arguments */
++F->ParamCount;
- F->ParamSize += SizeOf (Type);
/* Check for more parameters */
- if (curtok == COMMA) {
- gettok ();
+ if (CurTok.Tok == TOK_COMMA) {
+ NextToken ();
} else {
break;
}
*/
ConsumeRParen ();
+ /* Check if this is a function definition */
+ if (CurTok.Tok == TOK_LCURLY) {
+ /* Print an error if in strict ANSI mode and we have unnamed
+ * parameters.
+ */
+ if (ANSI && (F->Flags & FD_UNNAMED_PARAMS) != 0) {
+ Error ("Parameter name omitted");
+ }
+ }
+}
+
+
+
+static FuncDesc* ParseFuncDecl (const DeclSpec* Spec)
+/* Parse the argument list of a function. */
+{
+ unsigned Offs;
+ SymEntry* Sym;
+
+ /* Create a new function descriptor */
+ FuncDesc* F = NewFuncDesc ();
+
+ /* Enter a new lexical level */
+ EnterFunctionLevel ();
+
+ /* Check for several special parameter lists */
+ if (CurTok.Tok == TOK_RPAREN) {
+ /* Parameter list is empty */
+ F->Flags |= (FD_EMPTY | FD_VARIADIC);
+ } else if (CurTok.Tok == TOK_VOID && NextTok.Tok == TOK_RPAREN) {
+ /* Parameter list declared as void */
+ NextToken ();
+ F->Flags |= FD_VOID_PARAM;
+ } else if (CurTok.Tok == TOK_IDENT &&
+ (NextTok.Tok == TOK_COMMA || NextTok.Tok == TOK_RPAREN)) {
+ /* If the identifier is a typedef, we have a new style parameter list,
+ * if it's some other identifier, it's an old style parameter list.
+ */
+ Sym = FindSym (CurTok.Ident);
+ if (Sym == 0 || !IsTypeDef (Sym)) {
+ /* Old style (K&R) function. Assume variable param list. */
+ F->Flags |= (FD_OLDSTYLE | FD_VARIADIC);
+
+ /* Check for an implicit int return in the K&R function */
+ if ((Spec->Flags & DS_DEF_TYPE) != 0 &&
+ Spec->Type[0] == T_INT &&
+ Spec->Type[1] == T_END) {
+ /* Function has an implicit int return */
+ F->Flags |= FD_OLDSTYLE_INTRET;
+ }
+ }
+ }
+
+ /* Parse params */
+ if ((F->Flags & FD_OLDSTYLE) == 0) {
+ /* New style function */
+ ParseAnsiParamList (F);
+ } else {
+ /* Old style function */
+ ParseOldStyleParamList (F);
+ }
+
/* Assign offsets. If the function has a variable parameter list,
* there's one additional byte (the arg size).
*/
- Offs = (F->Flags & FD_ELLIPSIS)? 1 : 0;
+ Offs = (F->Flags & FD_VARIADIC)? 1 : 0;
Sym = GetSymTab()->SymTail;
while (Sym) {
+ unsigned Size = CheckedSizeOf (Sym->Type);
Sym->V.Offs = Offs;
- Offs += SizeOf (Sym->Type);
- Sym = Sym->PrevSym;
- }
-
- /* Check if this is a function definition */
- if (curtok == LCURLY) {
- /* Print an error if in strict ANSI mode and we have unnamed
- * parameters.
- */
- if (ANSI && UnnamedCount > 0) {
- Error (ERR_MISSING_PARAM_NAME);
- }
+ Offs += Size;
+ F->ParamSize += Size;
+ Sym = Sym->PrevSym;
}
/* Leave the lexical level remembering the symbol tables */
-static void Decl (Declaration* D, unsigned Mode)
+static void Decl (const DeclSpec* Spec, Declaration* D, unsigned Mode)
/* Recursively process declarators. Build a type array in reverse order. */
{
- if (curtok == STAR) {
- gettok ();
- /* Allow optional const or volatile modifiers */
- optional_modifiers ();
- Decl (D, Mode);
- *D->T++ = T_PTR;
+
+ if (CurTok.Tok == TOK_STAR) {
+ type T = T_PTR;
+ NextToken ();
+ /* Allow optional const or volatile qualifiers */
+ T |= OptionalQualifiers (T_QUAL_NONE);
+ Decl (Spec, D, Mode);
+ *D->T++ = T;
return;
- } else if (curtok == LPAREN) {
- gettok ();
- Decl (D, Mode);
+ } else if (CurTok.Tok == TOK_LPAREN) {
+ NextToken ();
+ Decl (Spec, D, Mode);
ConsumeRParen ();
- } else if (curtok == FASTCALL) {
+ } else if (CurTok.Tok == TOK_FASTCALL) {
/* Remember the current type pointer */
type* T = D->T;
/* Skip the fastcall token */
- gettok ();
+ NextToken ();
/* Parse the function */
- Decl (D, Mode);
+ Decl (Spec, D, Mode);
/* Set the fastcall flag */
- if (!IsFunc (T)) {
- Error (ERR_ILLEGAL_MODIFIER);
+ if (!IsTypeFunc (T) && !IsTypeFuncPtr (T)) {
+ Error ("__fastcall__ modifier applied to non function");
+ } else if (IsVariadicFunc (T)) {
+ Error ("Cannot apply __fastcall__ to functions with variable parameter list");
} else {
- FuncDesc* F = DecodePtr (T+1);
+ FuncDesc* F = GetFuncDesc (T);
F->Flags |= FD_FASTCALL;
}
return;
} else {
- /* Things depend on Mode now:
+ /* Things depend on Mode now:
* - Mode == DM_NEED_IDENT means:
- * we *must* have a type and a variable identifer.
- * - Mode == DM_NO_IDENT means:
- * we must have a type but no variable identifer
- * (if there is one, it's not read).
- * - Mode == DM_ACCEPT_IDENT means:
- * we *may* have an identifier. If there is an identifier,
- * it is read, but it is no error, if there is none.
- */
- if (Mode == DM_NO_IDENT) {
- D->Ident[0] = '\0';
- } else if (curtok == IDENT) {
+ * we *must* have a type and a variable identifer.
+ * - Mode == DM_NO_IDENT means:
+ * we must have a type but no variable identifer
+ * (if there is one, it's not read).
+ * - Mode == DM_ACCEPT_IDENT means:
+ * we *may* have an identifier. If there is an identifier,
+ * it is read, but it is no error, if there is none.
+ */
+ if (Mode == DM_NO_IDENT) {
+ D->Ident[0] = '\0';
+ } else if (CurTok.Tok == TOK_IDENT) {
strcpy (D->Ident, CurTok.Ident);
- gettok ();
- } else {
- if (Mode == DM_NEED_IDENT) {
- Error (ERR_IDENT_EXPECTED);
- }
- D->Ident[0] = '\0';
- return;
- }
+ NextToken ();
+ } else {
+ if (Mode == DM_NEED_IDENT) {
+ Error ("Identifier expected");
+ }
+ D->Ident[0] = '\0';
+ }
}
- while (curtok == LBRACK || curtok == LPAREN) {
- if (curtok == LPAREN) {
+ while (CurTok.Tok == TOK_LBRACK || CurTok.Tok == TOK_LPAREN) {
+ if (CurTok.Tok == TOK_LPAREN) {
/* Function declaration */
FuncDesc* F;
- gettok ();
+ NextToken ();
/* Parse the function declaration */
- F = ParseFuncDecl ();
+ F = ParseFuncDecl (Spec);
*D->T++ = T_FUNC;
EncodePtr (D->T, F);
D->T += DECODE_SIZE;
} else {
/* Array declaration */
unsigned long Size = 0;
- gettok ();
+ NextToken ();
/* Read the size if it is given */
- if (curtok != RBRACK) {
- struct expent lval;
- constexpr (&lval);
- Size = lval.e_const;
+ if (CurTok.Tok != TOK_RBRACK) {
+ ExprDesc lval;
+ ConstExpr (&lval);
+ Size = lval.ConstVal;
}
ConsumeRBrack ();
*D->T++ = T_ARRAY;
InitDeclaration (D);
/* Get additional declarators and the identifier */
- Decl (D, Mode);
+ Decl (Spec, D, Mode);
/* Add the base type. */
TypeCpy (D->T, Spec->Type);
/* Check the size of the generated type */
- if (!IsFunc (D->Type) && SizeOf (D->Type) >= 0x10000) {
- Error (ERR_ILLEGAL_SIZE);
+ if (!IsTypeFunc (D->Type) && !IsTypeVoid (D->Type) && SizeOf (D->Type) >= 0x10000) {
+ if (D->Ident[0] != '\0') {
+ Error ("Size of `%s' is invalid", D->Ident);
+ } else {
+ Error ("Invalid size");
+ }
}
}
+void CheckEmptyDecl (const DeclSpec* D)
+/* Called after an empty type declaration (that is, a type declaration without
+ * a variable). Checks if the declaration does really make sense and issues a
+ * warning if not.
+ */
+{
+ if ((D->Flags & DS_EXTRA_TYPE) == 0) {
+ Warning ("Useless declaration");
+ }
+}
+
+
+
static void ParseVoidInit (void)
/* Parse an initialization of a void variable (special cc65 extension) */
{
- struct expent lval;
+ ExprDesc lval;
/* Allow an arbitrary list of values */
ConsumeLCurly ();
do {
- constexpr (&lval);
- switch (lval.e_tptr[0]) {
+ ConstExpr (&lval);
+ switch (lval.Type[0]) {
- case T_CHAR:
+ case T_SCHAR:
case T_UCHAR:
- if ((lval.e_flags & E_MCTYPE) == E_TCONST) {
+ if ((lval.Flags & E_MCTYPE) == E_TCONST) {
/* Make it byte sized */
- lval.e_const &= 0xFF;
+ lval.ConstVal &= 0xFF;
}
DefineData (&lval);
break;
case T_UINT:
case T_PTR:
case T_ARRAY:
- if ((lval.e_flags & E_MCTYPE) == E_TCONST) {
- /* Make it word sized */
- lval.e_const &= 0xFFFF;
+ if ((lval.Flags & E_MCTYPE) == E_TCONST) {
+ /* Make it word sized */
+ lval.ConstVal &= 0xFFFF;
}
DefineData (&lval);
break;
break;
default:
- Error (ERR_ILLEGAL_TYPE);
+ Error ("Illegal type in initialization");
break;
}
- if (curtok != COMMA) {
+ if (CurTok.Tok != TOK_COMMA) {
break;
}
- gettok ();
+ NextToken ();
- } while (curtok != RCURLY);
+ } while (CurTok.Tok != TOK_RCURLY);
ConsumeRCurly ();
}
*/
Tab = Entry->V.S.SymTab;
if (Tab == 0) {
- Error (ERR_INIT_INCOMPLETE_TYPE);
+ Error ("Cannot initialize variables with incomplete type");
/* Returning here will cause lots of errors, but recovery is difficult */
return;
}
/* Get a pointer to the list of symbols */
Entry = Tab->SymHead;
- while (curtok != RCURLY) {
- if (Entry == NULL) {
- Error (ERR_TOO_MANY_INITIALIZERS);
+ while (CurTok.Tok != TOK_RCURLY) {
+ if (Entry == 0) {
+ Error ("Too many initializers");
return;
}
ParseInit (Entry->Type);
Entry = Entry->NextSym;
- if (curtok != COMMA)
+ if (CurTok.Tok != TOK_COMMA)
break;
- gettok ();
+ NextToken ();
}
/* Consume the closing curly brace */
/* If there are struct fields left, reserve additional storage */
while (Entry) {
- g_zerobytes (SizeOf (Entry->Type));
+ g_zerobytes (CheckedSizeOf (Entry->Type));
Entry = Entry->NextSym;
}
}
-
-
-void ParseInit (type *tptr)
-/* Parse initialization of variables */
+void ParseInit (type* T)
+/* Parse initialization of variables. */
{
- int count;
- struct expent lval;
+ ExprDesc lval;
type* t;
const char* str;
- int sz;
+ int Count;
+ int Size;
- switch (*tptr) {
+ switch (UnqualifiedType (*T)) {
- case T_CHAR:
+ case T_SCHAR:
case T_UCHAR:
- constexpr (&lval);
- if ((lval.e_flags & E_MCTYPE) == E_TCONST) {
+ ConstExpr (&lval);
+ if ((lval.Flags & E_MCTYPE) == E_TCONST) {
/* Make it byte sized */
- lval.e_const &= 0xFF;
+ lval.ConstVal &= 0xFF;
}
- assignadjust (tptr, &lval);
+ assignadjust (T, &lval);
DefineData (&lval);
break;
case T_INT:
case T_UINT:
case T_PTR:
- constexpr (&lval);
- if ((lval.e_flags & E_MCTYPE) == E_TCONST) {
+ ConstExpr (&lval);
+ if ((lval.Flags & E_MCTYPE) == E_TCONST) {
/* Make it word sized */
- lval.e_const &= 0xFFFF;
+ lval.ConstVal &= 0xFFFF;
}
- assignadjust (tptr, &lval);
+ assignadjust (T, &lval);
DefineData (&lval);
break;
case T_LONG:
case T_ULONG:
- constexpr (&lval);
- if ((lval.e_flags & E_MCTYPE) == E_TCONST) {
+ ConstExpr (&lval);
+ if ((lval.Flags & E_MCTYPE) == E_TCONST) {
/* Make it long sized */
- lval.e_const &= 0xFFFFFFFF;
+ lval.ConstVal &= 0xFFFFFFFF;
}
- assignadjust (tptr, &lval);
+ assignadjust (T, &lval);
DefineData (&lval);
break;
case T_ARRAY:
- sz = Decode (tptr + 1);
- t = tptr + DECODE_SIZE + 1;
- if ((t [0] == T_CHAR || t [0] == T_UCHAR) && curtok == SCONST) {
- str = GetLiteral (curval);
- count = strlen (str) + 1;
- TranslateLiteralPool (curval); /* Translate into target charset */
- g_defbytes (str, count);
- ResetLiteralOffs (curval); /* Remove string from pool */
- gettok ();
+ Size = Decode (T + 1);
+ t = T + DECODE_SIZE + 1;
+ if (IsTypeChar(t) && CurTok.Tok == TOK_SCONST) {
+ str = GetLiteral (CurTok.IVal);
+ Count = strlen (str) + 1;
+ TranslateLiteralPool (CurTok.IVal); /* Translate into target charset */
+ g_defbytes (str, Count);
+ ResetLiteralPoolOffs (CurTok.IVal); /* Remove string from pool */
+ NextToken ();
} else {
ConsumeLCurly ();
- count = 0;
- while (curtok != RCURLY) {
- ParseInit (tptr + DECODE_SIZE + 1);
- ++count;
- if (curtok != COMMA)
+ Count = 0;
+ while (CurTok.Tok != TOK_RCURLY) {
+ ParseInit (T + DECODE_SIZE + 1);
+ ++Count;
+ if (CurTok.Tok != TOK_COMMA)
break;
- gettok ();
+ NextToken ();
}
ConsumeRCurly ();
}
- if (sz == 0) {
- Encode (tptr + 1, count);
- } else if (count < sz) {
- g_zerobytes ((sz - count) * SizeOf (tptr + DECODE_SIZE + 1));
- } else if (count > sz) {
- Error (ERR_TOO_MANY_INITIALIZERS);
+ if (Size == 0) {
+ Encode (T + 1, Count);
+ } else if (Count < Size) {
+ g_zerobytes ((Size - Count) * CheckedSizeOf (T + DECODE_SIZE + 1));
+ } else if (Count > Size) {
+ Error ("Too many initializers");
}
break;
case T_STRUCT:
case T_UNION:
- ParseStructInit (tptr);
+ ParseStructInit (T);
break;
case T_VOID:
/* FALLTHROUGH */
default:
- Error (ERR_ILLEGAL_TYPE);
+ Error ("Illegal type");
break;
}
projects / cc65 / blobdiff