frederik
/
oscar64
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved storage class parsing from base type to variable level

This commit is contained in:
drmortalwombat 2021-09-07 08:13:14 +02:00
parent 16aa0ac315
commit a839ccc960
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
oscar64/Parser.cpp
View File

@ -44,14 +44,6 @@ Declaration* Parser::ParseBaseTypeDeclaration(uint32 flags)
break; break;
case TK_STATIC:
mScanner->NextToken();
return ParseBaseTypeDeclaration(flags | DTF_STATIC);
case TK_EXTERN:
mScanner->NextToken();
return ParseBaseTypeDeclaration(flags | DTF_EXTERN);
case TK_CONST: case TK_CONST:
mScanner->NextToken(); mScanner->NextToken();
return ParseBaseTypeDeclaration(flags | DTF_CONST); return ParseBaseTypeDeclaration(flags | DTF_CONST);
@ -615,6 +607,7 @@ Expression* Parser::ParseInitExpression(Declaration* dtype)
Declaration* Parser::ParseDeclaration(bool variable) Declaration* Parser::ParseDeclaration(bool variable)
{ {
bool definingType = false; bool definingType = false;
uint32 storageFlags = 0;
if (mScanner->mToken == TK_TYPEDEF) if (mScanner->mToken == TK_TYPEDEF)
{ {
@ -622,6 +615,16 @@ Declaration* Parser::ParseDeclaration(bool variable)
variable = false; variable = false;
mScanner->NextToken(); mScanner->NextToken();
} }
else if (mScanner->mToken == TK_STATIC)
{
storageFlags |= DTF_STATIC;
mScanner->NextToken();
}
else if (mScanner->mToken == TK_EXTERN)
{
storageFlags |= DTF_EXTERN;
mScanner->NextToken();
}
Declaration* bdec = ParseBaseTypeDeclaration(0); Declaration* bdec = ParseBaseTypeDeclaration(0);
@ -646,7 +649,8 @@ Declaration* Parser::ParseDeclaration(bool variable)
{ {
if (variable) if (variable)
{ {
ndec->mFlags |= ndec->mBase->mFlags & (DTF_CONST | DTF_STATIC | DTF_VOLATILE | DTF_EXTERN); ndec->mFlags |= storageFlags;
ndec->mFlags |= ndec->mBase->mFlags & (DTF_CONST | DTF_VOLATILE);
if (ndec->mBase->mType == DT_TYPE_FUNCTION) if (ndec->mBase->mType == DT_TYPE_FUNCTION)
ndec->mType = DT_CONST_FUNCTION; ndec->mType = DT_CONST_FUNCTION;