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

Fix passing rvalue to non const reference

This commit is contained in:
drmortalwombat 2025-03-02 15:02:01 +01:00
parent 0032d42b2c
commit 2582f3076d
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oscar64/InterCodeGenerator.cpp
View File

@ -4178,7 +4178,9 @@ InterCodeGenerator::ExValue InterCodeGenerator::TranslateExpression(Declaration*
vr = CoerceType(proc, texp, block, inlineMapper, vr, pdec->mBase); vr = CoerceType(proc, texp, block, inlineMapper, vr, pdec->mBase);
} }
else if (pdec && (pdec->mBase->IsReference() && !vr.mType->IsReference())) else if (pdec && (pdec->mBase->IsReference() && !vr.mType->IsReference()))
{
vr = Dereference(proc, texp, block, inlineMapper, vr, 1); vr = Dereference(proc, texp, block, inlineMapper, vr, 1);
}
else if (vr.mType->IsReference() && !(pdec && pdec->mBase->IsReference())) else if (vr.mType->IsReference() && !(pdec && pdec->mBase->IsReference()))
{ {
vr.mReference++; vr.mReference++;

11
oscar64/Parser.cpp
View File

@ -4303,7 +4303,7 @@ Expression* Parser::AddFunctionCallRefReturned(Expression* exp)
if (pex->mDecValue->mType == DT_CONST_INTEGER || pex->mDecValue->mType == DT_CONST_FLOAT || pex->mDecValue->mType == DT_CONST_POINTER || pex->mDecValue->mType == DT_CONST_ADDRESS) if (pex->mDecValue->mType == DT_CONST_INTEGER || pex->mDecValue->mType == DT_CONST_FLOAT || pex->mDecValue->mType == DT_CONST_POINTER || pex->mDecValue->mType == DT_CONST_ADDRESS)
{ {
if (pdec->mType == DT_TYPE_REFERENCE && !(pdec->mBase->mFlags & DTF_CONST)) if (pdec->mType == DT_TYPE_REFERENCE && !(pdec->mBase->mFlags & DTF_CONST))
mErrors->Error(pex->mLocation, EERR_INCOMPATIBLE_TYPES, "Can't pass constant as non constante reference"); mErrors->Error(pex->mLocation, EERR_INCOMPATIBLE_TYPES, "Can't pass constant as non constant reference");
Declaration* vdec = AllocTempVar(pdec->mBase->mBase); Declaration* vdec = AllocTempVar(pdec->mBase->mBase);
@ -4328,6 +4328,9 @@ Expression* Parser::AddFunctionCallRefReturned(Expression* exp)
} }
else if ((pdec->mBase->mType == DT_TYPE_REFERENCE && !pex->IsConstRef()) || (pdec->mBase->mType == DT_TYPE_RVALUEREF && !pex->IsLValue())) else if ((pdec->mBase->mType == DT_TYPE_REFERENCE && !pex->IsConstRef()) || (pdec->mBase->mType == DT_TYPE_RVALUEREF && !pex->IsLValue()))
{ {
if (pdec->mBase->mType == DT_TYPE_REFERENCE && !(pdec->mBase->mBase->mFlags & DTF_CONST))
mErrors->Error(pex->mLocation, EERR_NOT_AN_LVALUE, "Can't pass rvalue as non constant reference");
Declaration* vdec = AllocTempVar(pex->mDecType); Declaration* vdec = AllocTempVar(pex->mDecType);
Expression* vexp = new Expression(pex->mLocation, EX_VARIABLE); Expression* vexp = new Expression(pex->mLocation, EX_VARIABLE);
@ -8059,11 +8062,11 @@ Expression* Parser::ParsePostfixExpression(bool lhs)
} }
} }
if (exp->mDecType->mType == DT_TYPE_POINTER || exp->mDecType->mType == DT_TYPE_ARRAY) if (exp->mDecType->NonRefBase()->mType == DT_TYPE_POINTER || exp->mDecType->NonRefBase()->mType == DT_TYPE_ARRAY)
{ {
Expression * dexp = new Expression(mScanner->mLocation, EX_PREFIX); Expression * dexp = new Expression(mScanner->mLocation, EX_PREFIX);
dexp->mToken = TK_MUL; dexp->mToken = TK_MUL;
dexp->mDecType = exp->mDecType->mBase; dexp->mDecType = exp->mDecType->NonRefBase()->mBase;
dexp->mLeft = exp; dexp->mLeft = exp;
exp = ParseQualify(dexp); exp = ParseQualify(dexp);
@ -8547,7 +8550,7 @@ Expression* Parser::ParseMulExpression(bool lhs)
nexp->mRight = ParsePrefixExpression(false); nexp->mRight = ParsePrefixExpression(false);
if (nexp->mLeft->mDecType->mType == DT_TYPE_FLOAT || nexp->mRight->mDecType->mType == DT_TYPE_FLOAT) if (nexp->mLeft->mDecType->NonRefBase()->mType == DT_TYPE_FLOAT || nexp->mRight->mDecType->NonRefBase()->mType == DT_TYPE_FLOAT)
nexp->mDecType = TheFloatTypeDeclaration; nexp->mDecType = TheFloatTypeDeclaration;
else else
nexp->mDecType = exp->mDecType; nexp->mDecType = exp->mDecType;