OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Add VMCallScript template for calling ZScript functions with type checking

Browse source
This commit is contained in:
Magnus Norddahl 2025-03-19 22:15:29 +01:00 • committed by Ricardo Luís Vaz Silva
commit 92cc96a672
2 changed files with 300 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

70
src/common/scripting/vm/vmframe.cpp
View file

@ -552,6 +552,76 @@ VMFrame *VMFrameStack::PopFrame()
return parent;
}
//===========================================================================
// Templates for calling ZScript from C++ with type checks
void VMCheckParamCount(VMFunction* func, int retcount, int argcount)
{
if (func->Proto->ReturnTypes.Size() != retcount)
I_FatalError("Incorrect return value passed to %s", func->PrintableName);
if (func->Proto->ArgumentTypes.Size() != argcount)
I_FatalError("Incorrect parameter count passed to %s", func->PrintableName);
}
template<> void VMCheckParam<int>(VMFunction* func, int index)
{
if (!func->Proto->ArgumentTypes[index]->isIntCompatible())
I_FatalError("%s argument %d is not an integer", func->PrintableName);
}
template<> void VMCheckParam<double>(VMFunction* func, int index)
{
if (func->Proto->ArgumentTypes[index] != TypeFloat64)
I_FatalError("%s argument %d is not a double", func->PrintableName);
}
template<> void VMCheckParam<FString>(VMFunction* func, int index)
{
if (func->Proto->ArgumentTypes[index] != TypeString)
I_FatalError("%s argument %d is not a string", func->PrintableName);
}
template<> void VMCheckParam<DObject*>(VMFunction* func, int index)
{
if (func->Proto->ArgumentTypes[index]->isObjectPointer())
I_FatalError("%s argument %d is not an object", func->PrintableName);
}
template<> void VMCheckReturn<void>(VMFunction* func)
{
}
template<> void VMCheckReturn<int>(VMFunction* func)
{
if (!func->Proto->ReturnTypes[0]->isIntCompatible())
I_FatalError("%s return value %d is not an integer", func->PrintableName);
}
template<> void VMCheckReturn<double>(VMFunction* func)
{
if (func->Proto->ReturnTypes[0] != TypeFloat64)
I_FatalError("%s return value %d is not a double", func->PrintableName);
}
template<> void VMCheckReturn<FString>(VMFunction* func)
{
if (func->Proto->ReturnTypes[0] != TypeString)
I_FatalError("%s return value %d is not a string", func->PrintableName);
}
template<> void VMCheckReturn<DObject*>(VMFunction* func)
{
if (func->Proto->ReturnTypes[0]->isObjectPointer())
I_FatalError("%s return value %d is not an object", func->PrintableName);
}
void VMCallCheckResult(VMFunction* func, VMValue* params, int numparams, VMReturn* results, int numresults)
{
int retval = VMCall(func, params, numparams, results, numresults);
if (retval != numresults)
I_FatalError("%s did not return the expected number of results", func->PrintableName);
}
//===========================================================================
//
// VMFrameStack :: Call