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

Fix default member constructor for single sized member arrays

This commit is contained in:
drmortalwombat 2024-09-04 12:17:58 +02:00
parent dcfa50e36e
commit 1f9226255a
2 changed files with 51 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/c64/sprites.c
View File

@ -3,6 +3,9 @@
static volatile char * vspriteScreen; static volatile char * vspriteScreen;
#ifdef VSPRITE_BSS
#pragma bss(VSPRITE_BSS)
#endif
void spr_init(char * screen) void spr_init(char * screen)
{ {

53
oscar64/Parser.cpp
View File

@ -2067,7 +2067,7 @@ void Parser::PrependMemberConstructor(Declaration* pthis, Declaration* cfunc)
dexp->mLeft = qexp; dexp->mLeft = qexp;
dexp->mRight = dec->mValue; dexp->mRight = dec->mValue;
} }
else if (dec->mSize == bdec->mSize) else if (dec->mBase->mType == DT_TYPE_STRUCT)
{ {
qexp->mDecType = bdec; qexp->mDecType = bdec;
@ -2549,7 +2549,7 @@ void Parser::AddDefaultConstructors(Declaration* pthis)
if (bdec->mType == DT_TYPE_STRUCT && bdec->mCopyConstructor) if (bdec->mType == DT_TYPE_STRUCT && bdec->mCopyConstructor)
{ {
if (dec->mSize == bdec->mSize) if (dec->mBase->mType == DT_TYPE_STRUCT)
{ {
Expression* pexp = new Expression(pthis->mLocation, EX_PREFIX); Expression* pexp = new Expression(pthis->mLocation, EX_PREFIX);
pexp->mLeft = lexp; pexp->mLeft = lexp;
@ -2722,7 +2722,7 @@ void Parser::AddDefaultConstructors(Declaration* pthis)
if (bdec->mType == DT_TYPE_STRUCT && bdec->mCopyAssignment) if (bdec->mType == DT_TYPE_STRUCT && bdec->mCopyAssignment)
{ {
if (dec->mSize == bdec->mSize) if (dec->mBase->mType == DT_TYPE_STRUCT)
{ {
Expression* pexp = new Expression(pthis->mLocation, EX_PREFIX); Expression* pexp = new Expression(pthis->mLocation, EX_PREFIX);
pexp->mLeft = lexp; pexp->mLeft = lexp;
@ -3206,7 +3206,7 @@ void Parser::AppendMemberDestructor(Declaration* pthis)
Expression* dexp; Expression* dexp;
if (dec->mSize == bdec->mSize) if (dec->mBase->mType == DT_TYPE_STRUCT)
{ {
qexp->mDecType = bdec; qexp->mDecType = bdec;
@ -4707,7 +4707,7 @@ Declaration* Parser::ParseDeclaration(Declaration * pdec, bool variable, bool ex
texp->mDecType->mBase = bdec; texp->mDecType->mBase = bdec;
texp->mDecType->mSize = 2; texp->mDecType->mSize = 2;
if (bdec->mSize == ndec->mBase->mSize) if (ndec->mBase->mType == DT_TYPE_STRUCT)
{ {
Expression* cexp = new Expression(mScanner->mLocation, EX_CONSTANT); Expression* cexp = new Expression(mScanner->mLocation, EX_CONSTANT);
cexp->mDecValue = bdec->mDefaultConstructor; cexp->mDecValue = bdec->mDefaultConstructor;
@ -11984,6 +11984,49 @@ void Parser::ParsePragma(void)
ConsumeToken(TK_CLOSE_PARENTHESIS); ConsumeToken(TK_CLOSE_PARENTHESIS);
} }
else if (!strcmp(mScanner->mTokenIdent->mString, "place"))
{
mScanner->NextToken();
ConsumeToken(TK_OPEN_PARENTHESIS);
if (mScanner->mToken == TK_IDENT)
{
const Ident* sectionIdent = mScanner->mTokenIdent;
mScanner->NextToken();
LinkerSection* lsec = mCompilationUnits->mLinker->FindSection(sectionIdent);
if (lsec)
{
while (ConsumeTokenIf(TK_COMMA))
{
if (mScanner->mToken == TK_IDENT)
{
Declaration* dec = mGlobals->Lookup(mScanner->mTokenIdent);
if (dec && dec->mType == DT_VARIABLE && (dec->mFlags & DTF_GLOBAL))
{
mScanner->NextToken();
dec->mSection = lsec;
if (dec->mLinkerObject)
dec->mLinkerObject->MoveToSection(lsec);
}
else
{
mErrors->Error(mScanner->mLocation, EERR_OBJECT_NOT_FOUND, "Variable not found");
mScanner->NextToken();
}
}
else
mErrors->Error(mScanner->mLocation, EERR_PRAGMA_PARAMETER, "Variable name expected");
}
}
else
mErrors->Error(mScanner->mLocation, EERR_PRAGMA_PARAMETER, "Section not defined");
}
else
mErrors->Error(mScanner->mLocation, EERR_PRAGMA_PARAMETER, "Section name expected");
ConsumeToken(TK_CLOSE_PARENTHESIS);
}
else if (!strcmp(mScanner->mTokenIdent->mString, "code")) else if (!strcmp(mScanner->mTokenIdent->mString, "code"))
{ {
mScanner->NextToken(); mScanner->NextToken();