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

Fix cascaded type casts

This commit is contained in:
drmortalwombat 2024-08-29 13:34:55 +02:00
parent f38b366d81
commit da93410468
2 changed files with 44 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
oscar64/Parser.cpp
View File

@ -5352,6 +5352,47 @@ Declaration* Parser::ParseTypeID(bool tid, Declaration* bdec)
return dec; return dec;
} }
Expression* Parser::ParseCastExpression(Expression* exp)
{
if (exp->mType == EX_TYPE)
{
if (mScanner->mToken == TK_OPEN_BRACE)
{
Declaration* vdec = new Declaration(mScanner->mLocation, DT_VARIABLE);
vdec->mBase = exp->mDecType;
vdec->mFlags |= DTF_CONST | DTF_STATIC | DTF_GLOBAL;
Expression* nexp = new Expression(mScanner->mLocation, EX_VARIABLE);
nexp->mDecValue = vdec;
nexp->mDecType = vdec->mBase;
vdec->mValue = ParseInitExpression(vdec->mBase);
vdec->mSection = mDataSection;
vdec->mSize = vdec->mBase->mSize;
exp = nexp;
}
else
{
Expression* nexp = new Expression(mScanner->mLocation, EX_TYPECAST);
nexp->mDecType = exp->mDecType;
if (ConsumeTokenIf(TK_OPEN_PARENTHESIS))
{
nexp->mLeft = ParseListExpression(false);
ConsumeToken(TK_CLOSE_PARENTHESIS);
nexp->mLeft = ParseCastExpression(nexp->mLeft);
}
else
nexp->mLeft = ParsePrefixExpression(false);
nexp = CheckOperatorOverload(nexp);
exp = nexp->ConstantFold(mErrors, mDataSection);
}
}
return exp;
}
Expression* Parser::ParseSimpleExpression(bool lhs, bool tid) Expression* Parser::ParseSimpleExpression(bool lhs, bool tid)
{ {
Declaration* dec = nullptr; Declaration* dec = nullptr;
@ -5797,44 +5838,9 @@ Expression* Parser::ParseSimpleExpression(bool lhs, bool tid)
case TK_OPEN_PARENTHESIS: case TK_OPEN_PARENTHESIS:
mScanner->NextToken(); mScanner->NextToken();
exp = ParseListExpression(true); exp = ParseListExpression(true);
if (mScanner->mToken == TK_CLOSE_PARENTHESIS) ConsumeToken(TK_CLOSE_PARENTHESIS);
mScanner->NextToken();
else
mErrors->Error(mScanner->mLocation, EERR_SYNTAX, "')' expected");
if (exp->mType == EX_TYPE) exp = ParseCastExpression(exp);
{
if (mScanner->mToken == TK_OPEN_BRACE)
{
Declaration* vdec = new Declaration(mScanner->mLocation, DT_VARIABLE);
vdec->mBase = exp->mDecType;
vdec->mFlags |= DTF_CONST | DTF_STATIC | DTF_GLOBAL;
Expression* nexp = new Expression(mScanner->mLocation, EX_VARIABLE);
nexp->mDecValue = vdec;
nexp->mDecType = vdec->mBase;
vdec->mValue = ParseInitExpression(vdec->mBase);
vdec->mSection = mDataSection;
vdec->mSize = vdec->mBase->mSize;
exp = nexp;
}
else
{
Expression* nexp = new Expression(mScanner->mLocation, EX_TYPECAST);
nexp->mDecType = exp->mDecType;
if (ConsumeTokenIf(TK_OPEN_PARENTHESIS))
{
nexp->mLeft = ParseListExpression(false);
ConsumeToken(TK_CLOSE_PARENTHESIS);
}
else
nexp->mLeft = ParsePrefixExpression(false);
nexp = CheckOperatorOverload(nexp);
exp = nexp->ConstantFold(mErrors, mDataSection);
}
}
break; break;
case TK_OPEN_BRACKET: case TK_OPEN_BRACKET:
if (mCompilerOptions & COPT_CPLUSPLUS) if (mCompilerOptions & COPT_CPLUSPLUS)

1
oscar64/Parser.h
View File

@ -127,6 +127,7 @@ protected:
Declaration* ParseTypeID(bool tid, Declaration * bdec = nullptr); Declaration* ParseTypeID(bool tid, Declaration * bdec = nullptr);
Expression* ParseCastExpression(Expression* exp);
Expression* ParseSimpleExpression(bool lhs, bool tid = false); Expression* ParseSimpleExpression(bool lhs, bool tid = false);
Expression* ParsePrefixExpression(bool lhs); Expression* ParsePrefixExpression(bool lhs);
Expression* ParsePostfixExpression(bool lhs); Expression* ParsePostfixExpression(bool lhs);