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

Fix const enum type check

This commit is contained in:
drmortalwombat 2022-10-25 11:02:00 +02:00
parent 04624f208c
commit 44bd9cf595
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
oscar64/Declaration.cpp
View File

@ -639,9 +639,9 @@ bool Declaration::IsSubType(const Declaration* dec) const
return true; return true;
else if (mType == DT_TYPE_BOOL || mType == DT_TYPE_FLOAT || mType == DT_TYPE_VOID) else if (mType == DT_TYPE_BOOL || mType == DT_TYPE_FLOAT || mType == DT_TYPE_VOID)
return true; return true;
else if (mType == DT_TYPE_STRUCT) else if (mType == DT_TYPE_STRUCT || mType == DT_TYPE_ENUM)
return mScope == dec->mScope || (mIdent == dec->mIdent && mSize == dec->mSize); return mScope == dec->mScope || (mIdent == dec->mIdent && mSize == dec->mSize);
else if (mType == DT_TYPE_STRUCT || mType == DT_TYPE_ENUM || mType == DT_TYPE_UNION) else if (mType == DT_TYPE_UNION)
return false; return false;
else if (mType == DT_TYPE_ARRAY) else if (mType == DT_TYPE_ARRAY)
return mSize <= dec->mSize && mBase->IsSubType(dec->mBase); return mSize <= dec->mSize && mBase->IsSubType(dec->mBase);

4
oscar64/Parser.cpp
View File

@ -277,6 +277,7 @@ Declaration* Parser::ParseBaseTypeDeclaration(uint64 flags)
dec = new Declaration(mScanner->mLocation, DT_TYPE_ENUM); dec = new Declaration(mScanner->mLocation, DT_TYPE_ENUM);
dec->mFlags = flags; dec->mFlags = flags;
dec->mSize = 1; dec->mSize = 1;
dec->mScope = new DeclarationScope(nullptr);
mScanner->NextToken(); mScanner->NextToken();
if (mScanner->mToken == TK_IDENT) if (mScanner->mToken == TK_IDENT)
@ -635,7 +636,10 @@ Declaration * Parser::CopyConstantInitializer(int offset, Declaration* dtype, Ex
dec->mOffset = offset; dec->mOffset = offset;
} }
else else
{
dtype->CanAssign(exp->mDecType);
mErrors->Error(exp->mLocation, EERR_CONSTANT_INITIALIZER, "Incompatible constant initializer"); mErrors->Error(exp->mLocation, EERR_CONSTANT_INITIALIZER, "Incompatible constant initializer");
}
} }
else else
mErrors->Error(exp->mLocation, EERR_CONSTANT_INITIALIZER, "Constant initializer expected"); mErrors->Error(exp->mLocation, EERR_CONSTANT_INITIALIZER, "Constant initializer expected");