Deukhoofd
/
PkmnLib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix error in Windows build.
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Deukhoofd 2020-02-07 19:21:22 +01:00
parent 67d317e22b
commit b8b692d4d6
Signed by: Deukhoofd
GPG Key ID: ADF2E9256009EDCE
1 changed files with 267 additions and 260 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

253
extern/angelscript_addons/scripthandle/scripthandle.cpp vendored
View File

@ -1,6 +1,6 @@
#include "scripthandle.h"
#include <new>
#include <assert.h>
#include <new>
#include <string.h>
BEGIN_AS_NAMESPACE
@ -11,22 +11,19 @@ static void Construct(CScriptHandle *self, const CScriptHandle &o) { new(self) C
void Construct(CScriptHandle* self, void* ref, int typeId) { new (self) CScriptHandle(ref, typeId); }
static void Destruct(CScriptHandle* self) { self->~CScriptHandle(); }
CScriptHandle::CScriptHandle()
{
CScriptHandle::CScriptHandle() {
m_ref = 0;
m_type = 0;
}
CScriptHandle::CScriptHandle(const CScriptHandle &other)
{
CScriptHandle::CScriptHandle(const CScriptHandle& other) {
m_ref = other.m_ref;
m_type = other.m_type;
AddRefHandle();
}
CScriptHandle::CScriptHandle(void *ref, asITypeInfo *type)
{
CScriptHandle::CScriptHandle(void* ref, asITypeInfo* type) {
m_ref = ref;
m_type = type;
@ -35,23 +32,17 @@ CScriptHandle::CScriptHandle(void *ref, asITypeInfo *type)
// This constructor shouldn't be called from the application
// directly as it requires an active script context
CScriptHandle::CScriptHandle(void *ref, int typeId)
{
CScriptHandle::CScriptHandle(void* ref, int typeId) {
m_ref = 0;
m_type = 0;
Assign(ref, typeId);
}
CScriptHandle::~CScriptHandle()
{
ReleaseHandle();
}
CScriptHandle::~CScriptHandle() { ReleaseHandle(); }
void CScriptHandle::ReleaseHandle()
{
if( m_ref && m_type )
{
void CScriptHandle::ReleaseHandle() {
if (m_ref && m_type) {
asIScriptEngine* engine = m_type->GetEngine();
engine->ReleaseScriptObject(m_ref, m_type);
@ -62,10 +53,8 @@ void CScriptHandle::ReleaseHandle()
}
}
void CScriptHandle::AddRefHandle()
{
if( m_ref && m_type )
{
void CScriptHandle::AddRefHandle() {
if (m_ref && m_type) {
asIScriptEngine* engine = m_type->GetEngine();
engine->AddRefScriptObject(m_ref, m_type);
@ -75,16 +64,15 @@ void CScriptHandle::AddRefHandle()
}
}
CScriptHandle &CScriptHandle::operator =(const CScriptHandle &other)
{
CScriptHandle& CScriptHandle::operator=(const CScriptHandle& other) {
Set(other.m_ref, other.m_type);
return *this;
}
void CScriptHandle::Set(void *ref, asITypeInfo *type)
{
if( m_ref == ref ) return;
void CScriptHandle::Set(void* ref, asITypeInfo* type) {
if (m_ref == ref)
return;
ReleaseHandle();
@ -94,37 +82,28 @@ void CScriptHandle::Set(void *ref, asITypeInfo *type)
AddRefHandle();
}
void *CScriptHandle::GetRef()
{
return m_ref;
}
void* CScriptHandle::GetRef() { return m_ref; }
asITypeInfo *CScriptHandle::GetType() const
{
return m_type;
}
asITypeInfo* CScriptHandle::GetType() const { return m_type; }
int CScriptHandle::GetTypeId() const
{
if( m_type == 0 ) return 0;
int CScriptHandle::GetTypeId() const {
if (m_type == 0)
return 0;
return m_type->GetTypeId() | asTYPEID_OBJHANDLE;
}
// This method shouldn't be called from the application
// directly as it requires an active script context
CScriptHandle &CScriptHandle::Assign(void *ref, int typeId)
{
CScriptHandle& CScriptHandle::Assign(void* ref, int typeId) {
// When receiving a null handle we just clear our memory
if( typeId == 0 )
{
if (typeId == 0) {
Set(0, 0);
return *this;
}
// Dereference received handles to get the object
if( typeId & asTYPEID_OBJHANDLE )
{
if (typeId & asTYPEID_OBJHANDLE) {
// Store the actual reference
ref = *(void**)ref;
typeId &= ~asTYPEID_OBJHANDLE;
@ -136,8 +115,7 @@ CScriptHandle &CScriptHandle::Assign(void *ref, int typeId)
asITypeInfo* type = engine->GetTypeInfoById(typeId);
// If the argument is another CScriptHandle, we should copy the content instead
if( type && strcmp(type->GetName(), "ref") == 0 )
{
if (type && strcmp(type->GetName(), "ref") == 0) {
CScriptHandle* r = (CScriptHandle*)ref;
ref = r->m_ref;
type = r->m_type;
@ -148,10 +126,8 @@ CScriptHandle &CScriptHandle::Assign(void *ref, int typeId)
return *this;
}
bool CScriptHandle::operator==(const CScriptHandle &o) const
{
if( m_ref == o.m_ref &&
m_type == o.m_type )
bool CScriptHandle::operator==(const CScriptHandle& o) const {
if (m_ref == o.m_ref && m_type == o.m_type)
return true;
// TODO: If type is not the same, we should attempt to do a dynamic cast,
@ -160,20 +136,15 @@ bool CScriptHandle::operator==(const CScriptHandle &o) const
return false;
}
bool CScriptHandle::operator!=(const CScriptHandle &o) const
{
return !(*this == o);
}
bool CScriptHandle::operator!=(const CScriptHandle& o) const { return !(*this == o); }
bool CScriptHandle::Equals(void *ref, int typeId) const
{
bool CScriptHandle::Equals(void* ref, int typeId) const {
// Null handles are received as reference to a null handle
if (typeId == 0)
ref = 0;
// Dereference handles to get the object
if( typeId & asTYPEID_OBJHANDLE )
{
if (typeId & asTYPEID_OBJHANDLE) {
// Compare the actual reference
ref = *(void**)ref;
typeId &= ~asTYPEID_OBJHANDLE;
@ -182,17 +153,16 @@ bool CScriptHandle::Equals(void *ref, int typeId) const
// TODO: If typeId is not the same, we should attempt to do a dynamic cast,
// which may change the pointer for application registered classes
if( ref == m_ref ) return true;
if (ref == m_ref)
return true;
return false;
}
// AngelScript: used as '@obj = cast<obj>(ref);'
void CScriptHandle::Cast(void **outRef, int typeId)
{
void CScriptHandle::Cast(void** outRef, int typeId) {
// If we hold a null handle, then just return null
if( m_type == 0 )
{
if (m_type == 0) {
*outRef = 0;
return;
}
@ -211,8 +181,7 @@ void CScriptHandle::Cast(void **outRef, int typeId)
engine->RefCastObject(m_ref, m_type, type, outRef);
}
void CScriptHandle::EnumReferences(asIScriptEngine *inEngine)
{
void CScriptHandle::EnumReferences(asIScriptEngine* inEngine) {
// If we're holding a reference, we'll notify the garbage collector of it
if (m_ref)
inEngine->GCEnumCallback(m_ref);
@ -222,80 +191,101 @@ void CScriptHandle::EnumReferences(asIScriptEngine *inEngine)
inEngine->GCEnumCallback(m_type);
}
void CScriptHandle::ReleaseReferences(asIScriptEngine *inEngine)
{
void CScriptHandle::ReleaseReferences(asIScriptEngine* inEngine) {
// Simply clear the content to release the references
Set(0, 0);
}
void RegisterScriptHandle_Native(asIScriptEngine *engine)
{
int r;
void RegisterScriptHandle_Native(asIScriptEngine* engine) {
[[maybe_unused]] int r;
#if AS_CAN_USE_CPP11
// With C++11 it is possible to use asGetTypeTraits to automatically determine the flags that represent the C++ class
r = engine->RegisterObjectType("ref", sizeof(CScriptHandle), asOBJ_VALUE | asOBJ_ASHANDLE | asOBJ_GC | asGetTypeTraits<CScriptHandle>()); assert( r >= 0 );
// With C++11 it is possible to use asGetTypeTraits to automatically determine the flags that represent the C++
// class
r = engine->RegisterObjectType("ref", sizeof(CScriptHandle),
asOBJ_VALUE | asOBJ_ASHANDLE | asOBJ_GC | asGetTypeTraits<CScriptHandle>());
assert(r >= 0);
#else
r = engine->RegisterObjectType("ref", sizeof(CScriptHandle), asOBJ_VALUE | asOBJ_ASHANDLE | asOBJ_GC | asOBJ_APP_CLASS_CDAK); assert( r >= 0 );
r = engine->RegisterObjectType("ref", sizeof(CScriptHandle),
asOBJ_VALUE | asOBJ_ASHANDLE | asOBJ_GC | asOBJ_APP_CLASS_CDAK);
assert(r >= 0);
#endif
r = engine->RegisterObjectBehaviour("ref", asBEHAVE_CONSTRUCT, "void f()", asFUNCTIONPR(Construct, (CScriptHandle *), void), asCALL_CDECL_OBJFIRST); assert( r >= 0 );
r = engine->RegisterObjectBehaviour("ref", asBEHAVE_CONSTRUCT, "void f(const ref &in)", asFUNCTIONPR(Construct, (CScriptHandle *, const CScriptHandle &), void), asCALL_CDECL_OBJFIRST); assert( r >= 0 );
r = engine->RegisterObjectBehaviour("ref", asBEHAVE_CONSTRUCT, "void f(const ?&in)", asFUNCTIONPR(Construct, (CScriptHandle *, void *, int), void), asCALL_CDECL_OBJFIRST); assert( r >= 0 );
r = engine->RegisterObjectBehaviour("ref", asBEHAVE_DESTRUCT, "void f()", asFUNCTIONPR(Destruct, (CScriptHandle *), void), asCALL_CDECL_OBJFIRST); assert( r >= 0 );
r = engine->RegisterObjectBehaviour("ref", asBEHAVE_ENUMREFS, "void f(int&in)", asMETHOD(CScriptHandle,EnumReferences), asCALL_THISCALL); assert(r >= 0);
r = engine->RegisterObjectBehaviour("ref", asBEHAVE_RELEASEREFS, "void f(int&in)", asMETHOD(CScriptHandle, ReleaseReferences), asCALL_THISCALL); assert(r >= 0);
r = engine->RegisterObjectMethod("ref", "void opCast(?&out)", asMETHODPR(CScriptHandle, Cast, (void **, int), void), asCALL_THISCALL); assert( r >= 0 );
r = engine->RegisterObjectMethod("ref", "ref &opHndlAssign(const ref &in)", asMETHOD(CScriptHandle, operator=), asCALL_THISCALL); assert( r >= 0 );
r = engine->RegisterObjectMethod("ref", "ref &opHndlAssign(const ?&in)", asMETHOD(CScriptHandle, Assign), asCALL_THISCALL); assert( r >= 0 );
r = engine->RegisterObjectMethod("ref", "bool opEquals(const ref &in) const", asMETHODPR(CScriptHandle, operator==, (const CScriptHandle &) const, bool), asCALL_THISCALL); assert( r >= 0 );
r = engine->RegisterObjectMethod("ref", "bool opEquals(const ?&in) const", asMETHODPR(CScriptHandle, Equals, (void*, int) const, bool), asCALL_THISCALL); assert( r >= 0 );
r = engine->RegisterObjectBehaviour("ref", asBEHAVE_CONSTRUCT, "void f()",
asFUNCTIONPR(Construct, (CScriptHandle*), void), asCALL_CDECL_OBJFIRST);
assert(r >= 0);
r = engine->RegisterObjectBehaviour("ref", asBEHAVE_CONSTRUCT, "void f(const ref &in)",
asFUNCTIONPR(Construct, (CScriptHandle*, const CScriptHandle&), void),
asCALL_CDECL_OBJFIRST);
assert(r >= 0);
r = engine->RegisterObjectBehaviour("ref", asBEHAVE_CONSTRUCT, "void f(const ?&in)",
asFUNCTIONPR(Construct, (CScriptHandle*, void*, int), void),
asCALL_CDECL_OBJFIRST);
assert(r >= 0);
r = engine->RegisterObjectBehaviour("ref", asBEHAVE_DESTRUCT, "void f()",
asFUNCTIONPR(Destruct, (CScriptHandle*), void), asCALL_CDECL_OBJFIRST);
assert(r >= 0);
r = engine->RegisterObjectBehaviour("ref", asBEHAVE_ENUMREFS, "void f(int&in)",
asMETHOD(CScriptHandle, EnumReferences), asCALL_THISCALL);
assert(r >= 0);
r = engine->RegisterObjectBehaviour("ref", asBEHAVE_RELEASEREFS, "void f(int&in)",
asMETHOD(CScriptHandle, ReleaseReferences), asCALL_THISCALL);
assert(r >= 0);
r = engine->RegisterObjectMethod("ref", "void opCast(?&out)", asMETHODPR(CScriptHandle, Cast, (void**, int), void),
asCALL_THISCALL);
assert(r >= 0);
r = engine->RegisterObjectMethod("ref", "ref &opHndlAssign(const ref &in)", asMETHOD(CScriptHandle, operator=),
asCALL_THISCALL);
assert(r >= 0);
r = engine->RegisterObjectMethod("ref", "ref &opHndlAssign(const ?&in)", asMETHOD(CScriptHandle, Assign),
asCALL_THISCALL);
assert(r >= 0);
r = engine->RegisterObjectMethod("ref", "bool opEquals(const ref &in) const",
asMETHODPR(CScriptHandle, operator==,(const CScriptHandle&) const, bool),
asCALL_THISCALL);
assert(r >= 0);
r = engine->RegisterObjectMethod("ref", "bool opEquals(const ?&in) const",
asMETHODPR(CScriptHandle, Equals, (void*, int)const, bool), asCALL_THISCALL);
assert(r >= 0);
}
void CScriptHandle_Construct_Generic(asIScriptGeneric *gen)
{
void CScriptHandle_Construct_Generic(asIScriptGeneric* gen) {
CScriptHandle* self = reinterpret_cast<CScriptHandle*>(gen->GetObject());
new (self) CScriptHandle();
}
void CScriptHandle_ConstructCopy_Generic(asIScriptGeneric *gen)
{
void CScriptHandle_ConstructCopy_Generic(asIScriptGeneric* gen) {
CScriptHandle* other = reinterpret_cast<CScriptHandle*>(gen->GetArgAddress(0));
CScriptHandle* self = reinterpret_cast<CScriptHandle*>(gen->GetObject());
new (self) CScriptHandle(*other);
}
void CScriptHandle_ConstructVar_Generic(asIScriptGeneric *gen)
{
void CScriptHandle_ConstructVar_Generic(asIScriptGeneric* gen) {
void* ref = gen->GetArgAddress(0);
int typeId = gen->GetArgTypeId(0);
CScriptHandle* self = reinterpret_cast<CScriptHandle*>(gen->GetObject());
Construct(self, ref, typeId);
}
void CScriptHandle_Destruct_Generic(asIScriptGeneric *gen)
{
void CScriptHandle_Destruct_Generic(asIScriptGeneric* gen) {
CScriptHandle* self = reinterpret_cast<CScriptHandle*>(gen->GetObject());
self->~CScriptHandle();
}
void CScriptHandle_Cast_Generic(asIScriptGeneric *gen)
{
void CScriptHandle_Cast_Generic(asIScriptGeneric* gen) {
void** ref = reinterpret_cast<void**>(gen->GetArgAddress(0));
int typeId = gen->GetArgTypeId(0);
CScriptHandle* self = reinterpret_cast<CScriptHandle*>(gen->GetObject());
self->Cast(ref, typeId);
}
void CScriptHandle_Assign_Generic(asIScriptGeneric *gen)
{
void CScriptHandle_Assign_Generic(asIScriptGeneric* gen) {
CScriptHandle* other = reinterpret_cast<CScriptHandle*>(gen->GetArgAddress(0));
CScriptHandle* self = reinterpret_cast<CScriptHandle*>(gen->GetObject());
*self = *other;
gen->SetReturnAddress(self);
}
void CScriptHandle_AssignVar_Generic(asIScriptGeneric *gen)
{
void CScriptHandle_AssignVar_Generic(asIScriptGeneric* gen) {
void* ref = gen->GetArgAddress(0);
int typeId = gen->GetArgTypeId(0);
CScriptHandle* self = reinterpret_cast<CScriptHandle*>(gen->GetObject());
@ -303,58 +293,75 @@ void CScriptHandle_AssignVar_Generic(asIScriptGeneric *gen)
gen->SetReturnAddress(self);
}
void CScriptHandle_Equals_Generic(asIScriptGeneric *gen)
{
void CScriptHandle_Equals_Generic(asIScriptGeneric* gen) {
CScriptHandle* other = reinterpret_cast<CScriptHandle*>(gen->GetArgAddress(0));
CScriptHandle* self = reinterpret_cast<CScriptHandle*>(gen->GetObject());
gen->SetReturnByte(*self == *other);
}
void CScriptHandle_EqualsVar_Generic(asIScriptGeneric *gen)
{
void CScriptHandle_EqualsVar_Generic(asIScriptGeneric* gen) {
void* ref = gen->GetArgAddress(0);
int typeId = gen->GetArgTypeId(0);
CScriptHandle* self = reinterpret_cast<CScriptHandle*>(gen->GetObject());
gen->SetReturnByte(self->Equals(ref, typeId));
}
void CScriptHandle_EnumReferences_Generic(asIScriptGeneric *gen)
{
void CScriptHandle_EnumReferences_Generic(asIScriptGeneric* gen) {
CScriptHandle* self = reinterpret_cast<CScriptHandle*>(gen->GetObject());
self->EnumReferences(gen->GetEngine());
}
void CScriptHandle_ReleaseReferences_Generic(asIScriptGeneric *gen)
{
void CScriptHandle_ReleaseReferences_Generic(asIScriptGeneric* gen) {
CScriptHandle* self = reinterpret_cast<CScriptHandle*>(gen->GetObject());
self->ReleaseReferences(gen->GetEngine());
}
void RegisterScriptHandle_Generic(asIScriptEngine *engine)
{
int r;
void RegisterScriptHandle_Generic(asIScriptEngine* engine) {
[[maybe_unused]] int r;
r = engine->RegisterObjectType("ref", sizeof(CScriptHandle), asOBJ_VALUE | asOBJ_ASHANDLE | asOBJ_GC | asOBJ_APP_CLASS_CDAK); assert( r >= 0 );
r = engine->RegisterObjectBehaviour("ref", asBEHAVE_CONSTRUCT, "void f()", asFUNCTION(CScriptHandle_Construct_Generic), asCALL_GENERIC); assert( r >= 0 );
r = engine->RegisterObjectBehaviour("ref", asBEHAVE_CONSTRUCT, "void f(const ref &in)", asFUNCTION(CScriptHandle_ConstructCopy_Generic), asCALL_GENERIC); assert( r >= 0 );
r = engine->RegisterObjectBehaviour("ref", asBEHAVE_CONSTRUCT, "void f(const ?&in)", asFUNCTION(CScriptHandle_ConstructVar_Generic), asCALL_GENERIC); assert( r >= 0 );
r = engine->RegisterObjectBehaviour("ref", asBEHAVE_DESTRUCT, "void f()", asFUNCTION(CScriptHandle_Destruct_Generic), asCALL_GENERIC); assert( r >= 0 );
r = engine->RegisterObjectBehaviour("ref", asBEHAVE_ENUMREFS, "void f(int&in)", asFUNCTION(CScriptHandle_EnumReferences_Generic), asCALL_GENERIC); assert(r >= 0);
r = engine->RegisterObjectBehaviour("ref", asBEHAVE_RELEASEREFS, "void f(int&in)", asFUNCTION(CScriptHandle_ReleaseReferences_Generic), asCALL_GENERIC); assert(r >= 0);
r = engine->RegisterObjectMethod("ref", "void opCast(?&out)", asFUNCTION(CScriptHandle_Cast_Generic), asCALL_GENERIC); assert( r >= 0 );
r = engine->RegisterObjectMethod("ref", "ref &opHndlAssign(const ref &in)", asFUNCTION(CScriptHandle_Assign_Generic), asCALL_GENERIC); assert( r >= 0 );
r = engine->RegisterObjectMethod("ref", "ref &opHndlAssign(const ?&in)", asFUNCTION(CScriptHandle_AssignVar_Generic), asCALL_GENERIC); assert( r >= 0 );
r = engine->RegisterObjectMethod("ref", "bool opEquals(const ref &in) const", asFUNCTION(CScriptHandle_Equals_Generic), asCALL_GENERIC); assert( r >= 0 );
r = engine->RegisterObjectMethod("ref", "bool opEquals(const ?&in) const", asFUNCTION(CScriptHandle_EqualsVar_Generic), asCALL_GENERIC); assert( r >= 0 );
r = engine->RegisterObjectType("ref", sizeof(CScriptHandle),
asOBJ_VALUE | asOBJ_ASHANDLE | asOBJ_GC | asOBJ_APP_CLASS_CDAK);
assert(r >= 0);
r = engine->RegisterObjectBehaviour("ref", asBEHAVE_CONSTRUCT, "void f()",
asFUNCTION(CScriptHandle_Construct_Generic), asCALL_GENERIC);
assert(r >= 0);
r = engine->RegisterObjectBehaviour("ref", asBEHAVE_CONSTRUCT, "void f(const ref &in)",
asFUNCTION(CScriptHandle_ConstructCopy_Generic), asCALL_GENERIC);
assert(r >= 0);
r = engine->RegisterObjectBehaviour("ref", asBEHAVE_CONSTRUCT, "void f(const ?&in)",
asFUNCTION(CScriptHandle_ConstructVar_Generic), asCALL_GENERIC);
assert(r >= 0);
r = engine->RegisterObjectBehaviour("ref", asBEHAVE_DESTRUCT, "void f()",
asFUNCTION(CScriptHandle_Destruct_Generic), asCALL_GENERIC);
assert(r >= 0);
r = engine->RegisterObjectBehaviour("ref", asBEHAVE_ENUMREFS, "void f(int&in)",
asFUNCTION(CScriptHandle_EnumReferences_Generic), asCALL_GENERIC);
assert(r >= 0);
r = engine->RegisterObjectBehaviour("ref", asBEHAVE_RELEASEREFS, "void f(int&in)",
asFUNCTION(CScriptHandle_ReleaseReferences_Generic), asCALL_GENERIC);
assert(r >= 0);
r = engine->RegisterObjectMethod("ref", "void opCast(?&out)", asFUNCTION(CScriptHandle_Cast_Generic),
asCALL_GENERIC);
assert(r >= 0);
r = engine->RegisterObjectMethod("ref", "ref &opHndlAssign(const ref &in)",
asFUNCTION(CScriptHandle_Assign_Generic), asCALL_GENERIC);
assert(r >= 0);
r = engine->RegisterObjectMethod("ref", "ref &opHndlAssign(const ?&in)",
asFUNCTION(CScriptHandle_AssignVar_Generic), asCALL_GENERIC);
assert(r >= 0);
r = engine->RegisterObjectMethod("ref", "bool opEquals(const ref &in) const",
asFUNCTION(CScriptHandle_Equals_Generic), asCALL_GENERIC);
assert(r >= 0);
r = engine->RegisterObjectMethod("ref", "bool opEquals(const ?&in) const",
asFUNCTION(CScriptHandle_EqualsVar_Generic), asCALL_GENERIC);
assert(r >= 0);
}
void RegisterScriptHandle(asIScriptEngine *engine)
{
void RegisterScriptHandle(asIScriptEngine* engine) {
if (strstr(asGetLibraryOptions(), "AS_MAX_PORTABILITY"))
RegisterScriptHandle_Generic(engine);
else
RegisterScriptHandle_Native(engine);
}
END_AS_NAMESPACE