zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-13 07:57:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: For varargs, not only the type but also the flag of the last specified argument need to be stored for later parameters.

Browse source
This commit is contained in:
Christoph Oelckers 2016-11-20 09:47:46 +01:00
parent 3c726aa570
commit ab6b2f369e
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/scripting/codegeneration/codegen.cpp
View file

@ -7218,6 +7218,7 @@ FxExpression *FxVMFunctionCall::Resolve(FCompileContext& ctx)
{ {
bool foundvarargs = false; bool foundvarargs = false;
PType * type = nullptr; PType * type = nullptr;
int flag = 0;
if (argtypes.Last() != nullptr && ArgList.Size() + implicit > argtypes.Size()) if (argtypes.Last() != nullptr && ArgList.Size() + implicit > argtypes.Size())
{ {
ScriptPosition.Message(MSG_ERROR, "Too many arguments in call to %s", Function->SymbolName.GetChars()); ScriptPosition.Message(MSG_ERROR, "Too many arguments in call to %s", Function->SymbolName.GetChars());
@ -7231,12 +7232,16 @@ FxExpression *FxVMFunctionCall::Resolve(FCompileContext& ctx)
if (!foundvarargs) if (!foundvarargs)
{ {
if (argtypes[i + implicit] == nullptr) foundvarargs = true; if (argtypes[i + implicit] == nullptr) foundvarargs = true;
else type = argtypes[i + implicit]; else
{
type = argtypes[i + implicit];
flag = argflags[i + implicit];
}
} }
assert(type != nullptr); assert(type != nullptr);
FxExpression *x; FxExpression *x;
if (!(argflags[i + implicit] & VARF_Ref)) if (!(flag & VARF_Ref))
{ {
x = new FxTypeCast(ArgList[i], type, false); x = new FxTypeCast(ArgList[i], type, false);
x = x->Resolve(ctx); x = x->Resolve(ctx);