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

Add struct member initializer

This commit is contained in:
drmortalwombat 2023-08-05 21:52:44 +02:00
parent 58ab6818ed
commit 1931f25475
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
oscar64/Parser.cpp
View File

@ -1548,7 +1548,7 @@ void Parser::PrependMemberConstructor(Declaration* pthis, Declaration* cfunc)
while (bdec->mType == DT_TYPE_ARRAY) while (bdec->mType == DT_TYPE_ARRAY)
bdec = bdec->mBase; bdec = bdec->mBase;
if (bdec->mType == DT_TYPE_STRUCT && bdec->mDefaultConstructor) if (bdec->mType == DT_TYPE_STRUCT && bdec->mDefaultConstructor || dec->mValue)
{ {
Expression* qexp = new Expression(pthis->mLocation, EX_QUALIFY); Expression* qexp = new Expression(pthis->mLocation, EX_QUALIFY);
qexp->mLeft = thisexp; qexp->mLeft = thisexp;
@ -1556,7 +1556,17 @@ void Parser::PrependMemberConstructor(Declaration* pthis, Declaration* cfunc)
Expression* dexp; Expression* dexp;
if (dec->mSize == bdec->mSize) if (dec->mValue)
{
qexp->mDecType = bdec;
dexp = new Expression(mScanner->mLocation, EX_INITIALIZATION);
dexp->mToken = TK_ASSIGN;
dexp->mDecType = bdec;
dexp->mLeft = qexp;
dexp->mRight = dec->mValue;
}
else if (dec->mSize == bdec->mSize)
{ {
qexp->mDecType = bdec; qexp->mDecType = bdec;
@ -1825,6 +1835,8 @@ void Parser::AddDefaultConstructors(Declaration* pthis)
if (bdec->mCopyAssignment) if (bdec->mCopyAssignment)
simpleAssignment = false; simpleAssignment = false;
} }
if (dec->mValue)
simpleConstructor = false;
} }
dec = dec->mNext; dec = dec->mNext;
} }