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

Add qualified constructor invocation

This commit is contained in:
drmortalwombat 2024-08-23 17:53:58 +02:00
parent ca995bf342
commit 967b315be5
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
oscar64/Parser.cpp
View File

@ -5014,6 +5014,9 @@ Declaration* Parser::ParseQualIdent(void)
{ {
Declaration* ndec = dec->mScope->Lookup(mScanner->mTokenIdent, SLEVEL_USING); Declaration* ndec = dec->mScope->Lookup(mScanner->mTokenIdent, SLEVEL_USING);
if (!ndec && dec->mType == DT_TYPE_STRUCT && dec->mIdent == mScanner->mTokenIdent)
ndec = dec->mScope->Lookup(mScanner->mTokenIdent->PreMangle("+"));
if (ndec) if (ndec)
dec = ndec; dec = ndec;
else else
@ -5821,7 +5824,13 @@ Expression* Parser::ParseSimpleExpression(bool lhs, bool tid)
{ {
Expression* nexp = new Expression(mScanner->mLocation, EX_TYPECAST); Expression* nexp = new Expression(mScanner->mLocation, EX_TYPECAST);
nexp->mDecType = exp->mDecType; nexp->mDecType = exp->mDecType;
nexp->mLeft = ParsePrefixExpression(false); if (ConsumeTokenIf(TK_OPEN_PARENTHESIS))
{
nexp->mLeft = ParseListExpression(false);
ConsumeToken(TK_CLOSE_PARENTHESIS);
}
else
nexp->mLeft = ParsePrefixExpression(false);
nexp = CheckOperatorOverload(nexp); nexp = CheckOperatorOverload(nexp);
exp = nexp->ConstantFold(mErrors, mDataSection); exp = nexp->ConstantFold(mErrors, mDataSection);
} }
@ -6685,6 +6694,14 @@ Expression* Parser::ParsePostfixExpression(bool lhs)
} }
else if (mScanner->mToken == TK_OPEN_PARENTHESIS) else if (mScanner->mToken == TK_OPEN_PARENTHESIS)
{ {
// Explicit constructor invocation
if (exp->mType == EX_CONSTANT && exp->mDecValue->mType == DT_CONST_FUNCTION && exp->mDecValue->mIdent && exp->mDecValue->mIdent->mString[0] == '+')
{
exp->mType = EX_TYPE;
exp->mDecType = exp->mDecType->mParams->mBase->mBase;
exp->mDecValue = nullptr;
}
if (exp->mType == EX_TYPE) if (exp->mType == EX_TYPE)
{ {
Expression * pexp = nullptr; Expression * pexp = nullptr;