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

Fix enum base type selection with trailing comma

This commit is contained in:
drmortalwombat 2025-05-15 08:46:57 +02:00
parent fe667863b2
commit c0abe031ee
1 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
oscar64/Parser.cpp
View File

@ -1008,7 +1008,7 @@ Declaration* Parser::ParseBaseTypeDeclaration(uint64 flags, bool qualified, Decl
dec->mSize = 1; dec->mSize = 1;
dec->mScope = new DeclarationScope(nullptr, SLEVEL_CLASS); dec->mScope = new DeclarationScope(nullptr, SLEVEL_CLASS);
bool classTemplate = false; bool classTemplate = false, baseClass = false;
mScanner->NextToken(); mScanner->NextToken();
@ -1041,6 +1041,7 @@ Declaration* Parser::ParseBaseTypeDeclaration(uint64 flags, bool qualified, Decl
{ {
dec->mSize = pdec->mSize; dec->mSize = pdec->mSize;
dec->mFlags |= pdec->mFlags & DTF_SIGNED; dec->mFlags |= pdec->mFlags & DTF_SIGNED;
baseClass = true;
} }
else else
mErrors->Error(pdec->mLocation, EERR_INCOMPATIBLE_TYPES, "Integer base type expected"); mErrors->Error(pdec->mLocation, EERR_INCOMPATIBLE_TYPES, "Integer base type expected");
@ -1096,7 +1097,11 @@ Declaration* Parser::ParseBaseTypeDeclaration(uint64 flags, bool qualified, Decl
dec->mParams = cdec; dec->mParams = cdec;
if (mScanner->mToken == TK_COMMA) if (mScanner->mToken == TK_COMMA)
{
mScanner->NextToken(); mScanner->NextToken();
if (mScanner->mToken == TK_CLOSE_BRACE)
break;
}
else else
break; break;
} }
@ -1106,13 +1111,33 @@ Declaration* Parser::ParseBaseTypeDeclaration(uint64 flags, bool qualified, Decl
if (minValue < 0) if (minValue < 0)
{ {
dec->mFlags |= DTF_SIGNED; if (baseClass)
if (minValue < -128 || maxValue > 127) {
dec->mSize = 2; if (dec->mFlags & DTF_SIGNED)
{
if (minValue < -128 && dec->mSize == 1)
mErrors->Error(mScanner->mLocation, EWARN_INVALID_VALUE_RANGE, "Enum constant out of bounds");
}
else
mErrors->Error(mScanner->mLocation, EWARN_INVALID_VALUE_RANGE, "Enum constant out of bounds");
}
else
{
dec->mFlags |= DTF_SIGNED;
if (minValue < -128 || maxValue > 127)
dec->mSize = 2;
}
} }
else if (maxValue > 255) else if (maxValue > 255)
dec->mSize = 2; {
if (baseClass)
{
if (dec->mSize == 1)
mErrors->Error(mScanner->mLocation, EWARN_INVALID_VALUE_RANGE, "Enum constant out of bounds");
}
else
dec->mSize = 2;
}
} }
if (mScanner->mToken == TK_CLOSE_BRACE) if (mScanner->mToken == TK_CLOSE_BRACE)