zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-01-31 04:50:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed erroneous "Return type mismatch error" when returning value of derived type

Browse source
This commit is contained in:
Player701 2019-11-09 16:46:06 +03:00 committed by alexey.lysiuk
parent 093901a561
commit 8c05816378
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/scripting/backend/codegen.cpp
View file

@ -86,6 +86,7 @@ static const FLOP FxFlops[] =
{ NAME_Round, FLOP_ROUND, [](double v) { return round(v); } }, { NAME_Round, FLOP_ROUND, [](double v) { return round(v); } },
}; };
static bool AreCompatiblePointerTypes(PType* dest, PType* source, bool forcompare = false);
//========================================================================== //==========================================================================
// //
@ -143,9 +144,12 @@ void FCompileContext::CheckReturn(PPrototype *proto, FScriptPosition &pos)
// A prototype that defines fewer return types can be compatible with // A prototype that defines fewer return types can be compatible with
// one that defines more if the shorter one matches the initial types // one that defines more if the shorter one matches the initial types
// for the longer one. // for the longer one.
bool swapped = false;
if (ReturnProto->ReturnTypes.Size() < proto->ReturnTypes.Size()) if (ReturnProto->ReturnTypes.Size() < proto->ReturnTypes.Size())
{ // Make proto the shorter one to avoid code duplication below. { // Make proto the shorter one to avoid code duplication below.
swapvalues(proto, ReturnProto); swapvalues(proto, ReturnProto);
swapped = true;
} }
// If one prototype returns nothing, they both must. // If one prototype returns nothing, they both must.
if (proto->ReturnTypes.Size() == 0) if (proto->ReturnTypes.Size() == 0)
@ -159,9 +163,13 @@ void FCompileContext::CheckReturn(PPrototype *proto, FScriptPosition &pos)
{ {
for (unsigned i = 0; i < proto->ReturnTypes.Size(); i++) for (unsigned i = 0; i < proto->ReturnTypes.Size(); i++)
{ {
if (ReturnProto->ReturnTypes[i] != proto->ReturnTypes[i]) PType* expected = ReturnProto->ReturnTypes[i];
PType* actual = proto->ReturnTypes[i];
if (swapped) swapvalues(expected, actual);
if (expected != actual && !AreCompatiblePointerTypes(expected, actual))
{ // Incompatible { // Incompatible
Printf("Return type %s mismatch with %s\n", ReturnProto->ReturnTypes[i]->DescriptiveName(), proto->ReturnTypes[i]->DescriptiveName()); Printf("Return type %s mismatch with %s\n", expected->DescriptiveName(), actual->DescriptiveName());
fail = true; fail = true;
break; break;
} }
@ -274,7 +282,7 @@ static PFunction *FindBuiltinFunction(FName funcname)
// //
//========================================================================== //==========================================================================
static bool AreCompatiblePointerTypes(PType *dest, PType *source, bool forcompare = false) static bool AreCompatiblePointerTypes(PType *dest, PType *source, bool forcompare)
{ {
if (dest->isPointer() && source->isPointer()) if (dest->isPointer() && source->isPointer())
{ {