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

Fix static constexpr in class context

This commit is contained in:
drmortalwombat 2025-05-02 16:44:24 +02:00
parent 739f1e2161
commit 12e832ebd3
1 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
oscar64/Parser.cpp
View File

@ -359,6 +359,29 @@ Declaration* Parser::ParseStructDeclaration(uint64 flags, DecType dt, Declaratio
mdec->mVarIndex = -1; mdec->mVarIndex = -1;
mdec->mQualIdent = mScope->Mangle(mdec->mIdent); mdec->mQualIdent = mScope->Mangle(mdec->mIdent);
if (mdec->mValue && (mdec->mBase->mFlags & DTF_CONST))
{
if (mdec->mBase->IsNumericType())
{
if (mdec->mValue->mType == EX_CONSTANT)
{
mdec->mType = mdec->mValue->mDecValue->mType;
mdec->mInteger = mdec->mValue->mDecValue->mInteger;
}
}
else if (dec->mBase->mType == DT_TYPE_POINTER)
{
if (dec->mValue->mType == EX_CONSTANT)
{
if (dec->mValue->mDecValue->mType == DT_CONST_ADDRESS || dec->mValue->mDecValue->mType == DT_CONST_POINTER)
{
mdec->mType = mdec->mValue->mDecValue->mType;
mdec->mInteger = mdec->mValue->mDecValue->mInteger;
}
}
}
}
Declaration * pdec = mCompilationUnits->mScope->Insert(mdec->mQualIdent, mdec); Declaration * pdec = mCompilationUnits->mScope->Insert(mdec->mQualIdent, mdec);
if (pdec) if (pdec)
@ -5479,6 +5502,11 @@ Declaration* Parser::ParseDeclaration(Declaration * pdec, bool variable, bool ex
else if (pthis) else if (pthis)
{ {
ndec->mFlags |= storageFlags & (DTF_STATIC | DTF_PREVENT_INLINE | DTF_FORCE_INLINE); ndec->mFlags |= storageFlags & (DTF_STATIC | DTF_PREVENT_INLINE | DTF_FORCE_INLINE);
if (storageFlags & DTF_CONSTEXPR)
{
ndec->mFlags |= DTF_CONSTEXPR;
ndec->mBase = ndec->mBase->ToConstType();
}
} }
ndec->mOffset = 0; ndec->mOffset = 0;