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

Fix local multi dim array init

This commit is contained in:
drmortalwombat 2023-10-16 15:01:30 +02:00
parent 19e2498cc8
commit da5326cc5f
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oscar64/InterCodeGenerator.cpp
View File

@ -2890,7 +2890,7 @@ InterCodeGenerator::ExValue InterCodeGenerator::TranslateExpression(Declaration*
mErrors->Error(exp->mLocation, EERR_INCOMPATIBLE_OPERATOR, "Not a pointer type"); mErrors->Error(exp->mLocation, EERR_INCOMPATIBLE_OPERATOR, "Not a pointer type");
else if (vl.mType->mStride != 1) else if (vl.mType->mStride != 1)
vl = Dereference(proc, exp, block, vl, 0); vl = Dereference(proc, exp, block, vl, 0);
return ExValue(vl.mType->mBase, vl.mTemp, vl.mReference + 1); return ExValue(vl.mType->mBase, vl.mTemp, 1);
case TK_BINARY_AND: case TK_BINARY_AND:
{ {
if (vl.mReference < 1 || vl.mBits) if (vl.mReference < 1 || vl.mBits)

30
oscar64/Parser.cpp
View File

@ -3092,6 +3092,17 @@ void Parser::AppendMemberDestructor(Declaration* pthis)
} }
else else
{ {
qexp->mDecType = dec->mBase->mBase;
while (qexp->mDecType->mType == DT_TYPE_ARRAY)
{
Expression* iexp = new Expression(pthis->mLocation, EX_PREFIX);
iexp->mToken = TK_MUL;
iexp->mLeft = qexp;
iexp->mDecType = qexp->mDecType->mBase;
qexp = iexp;
}
qexp->mDecType = new Declaration(pthis->mLocation, DT_TYPE_POINTER); qexp->mDecType = new Declaration(pthis->mLocation, DT_TYPE_POINTER);
qexp->mDecType->mFlags |= DTF_CONST | DTF_DEFINED; qexp->mDecType->mFlags |= DTF_CONST | DTF_DEFINED;
qexp->mDecType->mBase = bdec; qexp->mDecType->mBase = bdec;
@ -4504,6 +4515,19 @@ Declaration* Parser::ParseDeclaration(Declaration * pdec, bool variable, bool ex
} }
else else
{ {
Expression* texp = vexp;
while (texp->mDecType->mBase->mType == DT_TYPE_ARRAY)
{
Expression* iexp = new Expression(vexp->mLocation, EX_PREFIX);
iexp->mToken = TK_MUL;
iexp->mLeft = texp;
iexp->mDecType = texp->mDecType->mBase;
texp = iexp;
}
//texp->mDecType = bdec->BuildPointer(vexp->mLocation);
Declaration* ncdec = new Declaration(mScanner->mLocation, DT_CONST_INTEGER); Declaration* ncdec = new Declaration(mScanner->mLocation, DT_CONST_INTEGER);
ncdec->mBase = TheUnsignedIntTypeDeclaration; ncdec->mBase = TheUnsignedIntTypeDeclaration;
ncdec->mInteger = ndec->mSize / bdec->mSize; ncdec->mInteger = ndec->mSize / bdec->mSize;
@ -4520,11 +4544,11 @@ Declaration* Parser::ParseDeclaration(Declaration * pdec, bool variable, bool ex
fexp->mLeft = cexp; fexp->mLeft = cexp;
fexp->mRight = new Expression(mScanner->mLocation, EX_LIST); fexp->mRight = new Expression(mScanner->mLocation, EX_LIST);
fexp->mRight->mLeft = vexp; fexp->mRight->mLeft = texp;
fexp->mRight->mRight = new Expression(mScanner->mLocation, EX_BINARY); fexp->mRight->mRight = new Expression(mScanner->mLocation, EX_BINARY);
fexp->mRight->mRight->mToken = TK_ADD; fexp->mRight->mRight->mToken = TK_ADD;
fexp->mRight->mRight->mLeft = vexp; fexp->mRight->mRight->mLeft = texp;
fexp->mRight->mRight->mDecType = vexp->mDecType; fexp->mRight->mRight->mDecType = texp->mDecType;
fexp->mRight->mRight->mRight = new Expression(mScanner->mLocation, EX_CONSTANT); fexp->mRight->mRight->mRight = new Expression(mScanner->mLocation, EX_CONSTANT);
fexp->mRight->mRight->mRight->mDecType = ncdec->mBase; fexp->mRight->mRight->mRight->mDecType = ncdec->mBase;
fexp->mRight->mRight->mRight->mDecValue = ncdec; fexp->mRight->mRight->mRight->mDecValue = ncdec;