6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2025-08-09 13:25:06 +00:00
Code Issues Projects Releases Wiki Activity

Fixed handling multiple storage specifiers in one declaration.

Browse Source
This commit is contained in:
acqn
2020-08-01 22:08:19 +08:00
committed by Oliver Schmidt
parent 633cd17a3e
commit e526cbbff6
1 changed files with 57 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
src/cc65/declare.c
View File

@@ -410,6 +410,48 @@ static void FixQualifiers (Type* DataType)
static unsigned ParseOneStorageClass (void)
/* Parse and return a storage class */
{
unsigned StorageClass = 0;
/* Check the storage class given */
switch (CurTok.Tok) {
case TOK_EXTERN:
StorageClass = SC_EXTERN | SC_STATIC;
NextToken ();
break;
case TOK_STATIC:
StorageClass = SC_STATIC;
NextToken ();
break;
case TOK_REGISTER:
StorageClass = SC_REGISTER | SC_STATIC;
NextToken ();
break;
case TOK_AUTO:
StorageClass = SC_AUTO;
NextToken ();
break;
case TOK_TYPEDEF:
StorageClass = SC_TYPEDEF;
NextToken ();
break;
default:
break;
}
return StorageClass;
}
static void ParseStorageClass (DeclSpec* D, unsigned DefStorage) static void ParseStorageClass (DeclSpec* D, unsigned DefStorage)
/* Parse a storage class */ /* Parse a storage class */
{ {
@@ -417,38 +459,21 @@ static void ParseStorageClass (DeclSpec* D, unsigned DefStorage)
D->Flags &= ~DS_DEF_STORAGE; D->Flags &= ~DS_DEF_STORAGE;
/* Check the storage class given */ /* Check the storage class given */
switch (CurTok.Tok) { D->StorageClass = ParseOneStorageClass ();
if (D->StorageClass == 0) {
case TOK_EXTERN: /* No storage class given, use default */
D->StorageClass = SC_EXTERN | SC_STATIC; D->Flags |= DS_DEF_STORAGE;
NextToken (); D->StorageClass = DefStorage;
break; } else {
unsigned StorageClass = ParseOneStorageClass ();
case TOK_STATIC: while (StorageClass != 0) {
D->StorageClass = SC_STATIC; if (D->StorageClass == StorageClass) {
NextToken (); Warning ("Duplicate storage class specifier");
break; } else {
Error ("Conflicting storage class specifier");
case TOK_REGISTER: }
D->StorageClass = SC_REGISTER | SC_STATIC; StorageClass = ParseOneStorageClass ();
NextToken (); }
break;
case TOK_AUTO:
D->StorageClass = SC_AUTO;
NextToken ();
break;
case TOK_TYPEDEF:
D->StorageClass = SC_TYPEDEF;
NextToken ();
break;
default:
/* No storage class given, use default */
D->Flags |= DS_DEF_STORAGE;
D->StorageClass = DefStorage;
break;
} }
} }