Skip to content

Mark override functions #1319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tobil4sk wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Mark override functions #1319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
86fbe41
Mark override functions
tobil4sk Mar 14, 2026
0b7af0d
Fix overrides in cffi
tobil4sk Mar 14, 2026
a2930f4
Fix broken toString methods
tobil4sk Mar 15, 2026
e9cb73c
Avoid override warnings in haxe 4
tobil4sk Mar 17, 2026
a8e83bb
[tools] Remove warning suppression for overrides
tobil4sk Mar 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
134 changes: 67 additions & 67 deletions include/Array.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,18 +152,18 @@ class ArrayIterator : public cpp::FastIterator_obj<TO>
ArrayIterator(Array<FROM> inArray) : mArray(inArray), mIdx(0) { }

// Fast versions ...
bool hasNext() { return mIdx < mArray->length; }
bool hasNext() HXCPP_OVERRIDE { return mIdx < mArray->length; }

inline TO toTo(const Dynamic &inD) { return inD.StaticCast<TO>(); }

template<typename T>
inline TO toTo(T inT) { return inT; }

TO next() { return toTo(mArray->__get(mIdx++)); }
TO next() HXCPP_OVERRIDE { return toTo(mArray->__get(mIdx++)); }

void __Mark(hx::MarkContext *__inCtx) { HX_MARK_MEMBER_NAME(mArray,"mArray"); }
void __Mark(hx::MarkContext *__inCtx) HXCPP_OVERRIDE { HX_MARK_MEMBER_NAME(mArray,"mArray"); }
#ifdef HXCPP_VISIT_ALLOCS
void __Visit(hx::VisitContext *__inCtx) { HX_VISIT_MEMBER_NAME(mArray,"mArray"); }
void __Visit(hx::VisitContext *__inCtx) HXCPP_OVERRIDE { HX_VISIT_MEMBER_NAME(mArray,"mArray"); }
#endif

int mIdx;
Expand All @@ -179,19 +179,19 @@ class ArrayKeyValueIterator : public cpp::FastIterator_obj<Dynamic>

ArrayKeyValueIterator(Array<FROM> inArray) : mArray(inArray), mIdx(0) { }

bool hasNext() { return mIdx < mArray->length; }
bool hasNext() HXCPP_OVERRIDE { return mIdx < mArray->length; }

inline TO toTo(const Dynamic &inD) { return inD.StaticCast<TO>(); }

template<typename T>
inline TO toTo(T inT) { return inT; }


Dynamic next();
Dynamic next() HXCPP_OVERRIDE;

void __Mark(hx::MarkContext *__inCtx) { HX_MARK_MEMBER_NAME(mArray,"mArray"); }
void __Mark(hx::MarkContext *__inCtx) HXCPP_OVERRIDE { HX_MARK_MEMBER_NAME(mArray,"mArray"); }
#ifdef HXCPP_VISIT_ALLOCS
void __Visit(hx::VisitContext *__inCtx) { HX_VISIT_MEMBER_NAME(mArray,"mArray"); }
void __Visit(hx::VisitContext *__inCtx) HXCPP_OVERRIDE { HX_VISIT_MEMBER_NAME(mArray,"mArray"); }
#endif

int mIdx;
Expand Down Expand Up @@ -265,14 +265,14 @@ class HXCPP_EXTERN_CLASS_ATTRIBUTES ArrayBase : public ArrayCommon
inline char * getBase() const { return mBase; }


hx::Val __SetField(const String &inString,const hx::Val &inValue ,hx::PropertyAccess inCallProp) { return null(); }
hx::Val __SetField(const String &inString,const hx::Val &inValue ,hx::PropertyAccess inCallProp) HXCPP_OVERRIDE { return null(); }

static hx::Class __mClass;
static hx::Class &__SGetClass() { return __mClass; }
hx::Class __GetClass() const { return __mClass; }
String toString();
String __ToString() const;
int __Compare(const hx::Object *inRHS) const;
hx::Class __GetClass() const HXCPP_OVERRIDE { return __mClass; }
String toString() HXCPP_OVERRIDE;
String __ToString() const HXCPP_OVERRIDE;
int __Compare(const hx::Object *inRHS) const HXCPP_OVERRIDE;


void setData(void *inData, int inElements)
Expand All @@ -291,14 +291,14 @@ class HXCPP_EXTERN_CLASS_ATTRIBUTES ArrayBase : public ArrayCommon
}


int __GetType() const { return vtArray; }
int __GetType() const HXCPP_OVERRIDE { return vtArray; }

inline size_t size() const { return length; }
inline int __length() const { return (int)length; }
inline int __length() const HXCPP_OVERRIDE { return (int)length; }

virtual String ItemString(int inI) = 0;

const char * __CStr() const { return mBase; }
const char * __CStr() const HXCPP_OVERRIDE { return mBase; }
inline const char *GetBase() const { return mBase; }
inline char *GetBase() { return mBase; }

Expand Down Expand Up @@ -344,7 +344,7 @@ class HXCPP_EXTERN_CLASS_ATTRIBUTES ArrayBase : public ArrayCommon
hx::Val __pointerToBase();
hx::Val __Field(const String &inString ,hx::PropertyAccess inCallProp) override = 0;
#else
hx::Val __Field(const String& inString, hx::PropertyAccess inCallProp);
hx::Val __Field(const String& inString, hx::PropertyAccess inCallProp) HXCPP_OVERRIDE;
#endif

inline void ____SetSize(int len) { resize(len); }
Expand Down Expand Up @@ -641,15 +641,15 @@ class Array_obj : public hx::ArrayBase
hx::Val __Field(const String& inString, hx::PropertyAccess inCallProp) override;
#endif

bool _hx_isInstanceOf(int inClassId)
bool _hx_isInstanceOf(int inClassId) HXCPP_OVERRIDE
{
return inClassId==1 || inClassId==(int)hx::clsIdArrayBase || inClassId==(int)_hx_ClassId;
}

virtual bool AllocAtomic() const { return !hx::ContainsPointers<ELEM_>(); }
bool AllocAtomic() const HXCPP_OVERRIDE { return !hx::ContainsPointers<ELEM_>(); }

virtual Dynamic __GetItem(int inIndex) const { return __get(inIndex); }
virtual Dynamic __SetItem(int inIndex,Dynamic inValue)
Dynamic __GetItem(int inIndex) const HXCPP_OVERRIDE { return __get(inIndex); }
Dynamic __SetItem(int inIndex, Dynamic inValue) HXCPP_OVERRIDE
{
ELEM_ &elem = Item(inIndex);
elem = inValue;
Expand Down Expand Up @@ -709,7 +709,7 @@ class Array_obj : public hx::ArrayBase
}


void __Mark(hx::MarkContext *__inCtx)
void __Mark(hx::MarkContext *__inCtx) HXCPP_OVERRIDE
{
if (mAlloc>0) hx::MarkAlloc((void *)mBase, __inCtx );
if (length && hx::ContainsPointers<ELEM_>())
Expand All @@ -720,7 +720,7 @@ class Array_obj : public hx::ArrayBase
}

#ifdef HXCPP_VISIT_ALLOCS
void __Visit(hx::VisitContext *__inCtx)
void __Visit(hx::VisitContext *__inCtx) HXCPP_OVERRIDE
{
if (mAlloc>0) __inCtx->visitAlloc((void **)&mBase);
if (hx::ContainsPointers<ELEM_>())
Expand All @@ -736,9 +736,9 @@ class Array_obj : public hx::ArrayBase

inline Array<ELEM_> __SetSizeExact(int inLen);

int GetElementSize() const { return sizeof(ELEM_); }
int GetElementSize() const HXCPP_OVERRIDE { return sizeof(ELEM_); }

String ItemString(int inI)
String ItemString(int inI) HXCPP_OVERRIDE
{
String result(__get(inI));
if (result==null()) return HX_CSTRING("null");
Expand Down Expand Up @@ -991,8 +991,8 @@ class Array_obj : public hx::ArrayBase

template<typename TO>
Dynamic keyValueIteratorFast() { return new hx::ArrayKeyValueIterator<ELEM_,TO>(this); }
virtual hx::ArrayStore getStoreType() const

hx::ArrayStore getStoreType() const HXCPP_OVERRIDE
{
return (hx::ArrayStore) hx::ArrayTraits<ELEM_>::StoreType;
}
Expand All @@ -1006,49 +1006,49 @@ class Array_obj : public hx::ArrayBase


// Dynamic interface
virtual hx::ArrayBase *__concat(const cpp::VirtualArray &a0) { return concat(a0).mPtr; }
virtual hx::ArrayBase *__copy() { return copy().mPtr; }
virtual void __insert(int inIndex,const Dynamic &a1) { insert(inIndex,a1);}
virtual Dynamic __iterator() { return iterator(); }
virtual Dynamic __keyValueIterator() { return keyValueIterator(); }
virtual ::String __join(::String a0) { return join(a0); }
virtual Dynamic __pop() { return pop(); }
virtual int __push(const Dynamic &a0) { return push(a0);}
virtual bool __contains(const Dynamic &a0) { return contains(a0); }
virtual bool __remove(const Dynamic &a0) { return remove(a0); }
virtual bool __removeAt(int inIndex) { return removeAt(inIndex); }
virtual int __indexOf(const Dynamic &a0,const Dynamic &a1) { return indexOf(a0, a1); }
virtual int __lastIndexOf(const Dynamic &a0,const Dynamic &a1) { return lastIndexOf(a0, a1); }
virtual void __reverse() { reverse(); }
virtual Dynamic __shift() { return shift(); }
virtual hx::ArrayBase *__slice(const Dynamic &a0,const Dynamic &a1) { return slice(a0,a1).mPtr; }
virtual hx::ArrayBase *__splice(const Dynamic &a0,const Dynamic &a1) { return splice(a0,a1).mPtr; }
virtual void __sort(const DynamicSorterFunc& a0) override { sort(a0); }
virtual ::String __toString() { return toString(); }
virtual void __unshift(const Dynamic &a0) { unshift(a0); }
hx::ArrayBase* __concat(const cpp::VirtualArray& a0) HXCPP_OVERRIDE { return concat(a0).mPtr; }
hx::ArrayBase *__copy() HXCPP_OVERRIDE { return copy().mPtr; }
void __insert(int inIndex,const Dynamic &a1) HXCPP_OVERRIDE { insert(inIndex,a1);}
Dynamic __iterator() HXCPP_OVERRIDE { return iterator(); }
Dynamic __keyValueIterator() HXCPP_OVERRIDE { return keyValueIterator(); }
::String __join(::String a0) HXCPP_OVERRIDE { return join(a0); }
Dynamic __pop() HXCPP_OVERRIDE { return pop(); }
int __push(const Dynamic &a0) HXCPP_OVERRIDE { return push(a0);}
bool __contains(const Dynamic &a0) HXCPP_OVERRIDE { return contains(a0); }
bool __remove(const Dynamic &a0) HXCPP_OVERRIDE { return remove(a0); }
bool __removeAt(int inIndex) HXCPP_OVERRIDE { return removeAt(inIndex); }
int __indexOf(const Dynamic &a0,const Dynamic &a1) HXCPP_OVERRIDE { return indexOf(a0, a1); }
int __lastIndexOf(const Dynamic &a0,const Dynamic &a1) HXCPP_OVERRIDE { return lastIndexOf(a0, a1); }
void __reverse() HXCPP_OVERRIDE { reverse(); }
Dynamic __shift() HXCPP_OVERRIDE { return shift(); }
hx::ArrayBase *__slice(const Dynamic &a0,const Dynamic &a1) HXCPP_OVERRIDE { return slice(a0,a1).mPtr; }
hx::ArrayBase *__splice(const Dynamic &a0,const Dynamic &a1) HXCPP_OVERRIDE { return splice(a0,a1).mPtr; }
void __sort(const DynamicSorterFunc& a0) HXCPP_OVERRIDE { sort(a0); }
::String __toString() HXCPP_OVERRIDE { return toString(); }
void __unshift(const Dynamic &a0) HXCPP_OVERRIDE { unshift(a0); }
#if (HXCPP_API_LEVEL>=500)
virtual cpp::VirtualArray_obj* __map(const DynamicMappingFunc& func) { return cpp::VirtualArray(map<Dynamic>(func)).mPtr; }
cpp::VirtualArray_obj* __map(const DynamicMappingFunc& func) override { return cpp::VirtualArray(map<Dynamic>(func)).mPtr; }
#else
virtual cpp::VirtualArray_obj* __map(const DynamicMappingFunc& func) { return map(func).mPtr; }
cpp::VirtualArray_obj* __map(const DynamicMappingFunc& func) HXCPP_OVERRIDE { return map(func).mPtr; }
#endif
virtual void __resize(int inLen) { resize(inLen); }
void __resize(int inLen) HXCPP_OVERRIDE { resize(inLen); }

virtual hx::ArrayBase *__filter(const DynamicFilterFunc &func) override { return filter(func).mPtr; }
virtual void __blit(int inDestElement,const cpp::VirtualArray &inSourceArray,int inSourceElement,int inElementCount)
hx::ArrayBase *__filter(const DynamicFilterFunc &func) HXCPP_OVERRIDE { return filter(func).mPtr; }
void __blit(int inDestElement,const cpp::VirtualArray &inSourceArray,int inSourceElement,int inElementCount) HXCPP_OVERRIDE
{
blit(inDestElement,inSourceArray,inSourceElement,inElementCount);
}
virtual int __memcmp(const cpp::VirtualArray &a0) { return memcmp(a0); }
virtual void __qsort(DynamicSorterFunc inCompare) override { this->qsort(inCompare); };
int __memcmp(const cpp::VirtualArray &a0) HXCPP_OVERRIDE { return memcmp(a0); }
void __qsort(DynamicSorterFunc inCompare) HXCPP_OVERRIDE { this->qsort(inCompare); };

virtual void set(int inIndex, const cpp::Variant &inValue) {
void set(int inIndex, const cpp::Variant &inValue) HXCPP_OVERRIDE {
ELEM_ &elem = Item(inIndex);
elem = ELEM_(inValue);
if (hx::ContainsPointers<ELEM_>()) {
HX_OBJ_WB_GET(this, hx::PointerOf(elem));
}
}
virtual void setUnsafe(int inIndex, const cpp::Variant &inValue) {
void setUnsafe(int inIndex, const cpp::Variant& inValue) HXCPP_OVERRIDE {
ELEM_ &elem = *(ELEM_ *)(mBase + inIndex*sizeof(ELEM_));
elem = ELEM_(inValue);
if (hx::ContainsPointers<ELEM_>()) { HX_OBJ_WB_GET(this,hx::PointerOf(elem)); }
Expand Down Expand Up @@ -1378,7 +1378,7 @@ cpp::VirtualArray Array_obj<ELEM_>::map(MappingFunc inFunc)

#ifdef HXCPP_VISIT_ALLOCS
#define ARRAY_VISIT_FUNC \
void __Visit(::hx::VisitContext *__inCtx) { HX_VISIT_MEMBER(mThis); }
void __Visit(::hx::VisitContext *__inCtx) HXCPP_OVERRIDE { HX_VISIT_MEMBER(mThis); }
#else
#define ARRAY_VISIT_FUNC
#endif
Expand Down Expand Up @@ -1423,7 +1423,7 @@ namespace hx
ret mThis->name(args_call); \
} \
void *__GetHandle() const override { return mThis.GetPtr(); } \
void __Mark(::hx::MarkContext *__inCtx) { HX_MARK_MEMBER(mThis); } \
void __Mark(::hx::MarkContext *__inCtx) override { HX_MARK_MEMBER(mThis); } \
ARRAY_VISIT_FUNC \
int __Compare(const ::hx::Object* inRhs) const override \
{ \
Expand Down Expand Up @@ -1472,7 +1472,7 @@ ::hx::Callable<Array<TO>(::hx::Callable<TO(ELEM_)>)> Array_obj<ELEM_>::map_dyn()
{
return mThis->map(inArg0);
}
void __Mark(hx::MarkContext* __inCtx)
void __Mark(hx::MarkContext* __inCtx) override
{
hx::MarkMember(mThis, __inCtx);
}
Expand Down Expand Up @@ -1517,19 +1517,19 @@ hx::Val Array_obj<ELEM_>::__Field(const String& inString, hx::PropertyAccess inC
bool __IsFunction() const { return true; } \
::Array_obj<ELEM_> *mThis; \
Reflective_##func(::Array_obj<ELEM_> *inThis) : mThis(inThis) { } \
::String toString() const{ return HX_CSTRING(#func) ; } \
::String __ToString() const{ return HX_CSTRING(#func) ; } \
int __GetType() const { return vtFunction; } \
void *__GetHandle() const { return mThis; } \
int __ArgCount() const { return ARG_C; } \
void __Mark(::hx::MarkContext *__inCtx) { HX_MARK_MEMBER(mThis); } \
::String toString() override { return HX_CSTRING(#func) ; } \
::String __ToString() const override { return HX_CSTRING(#func) ; } \
int __GetType() const override { return vtFunction; } \
void *__GetHandle() const override { return mThis; } \
int __ArgCount() const override { return ARG_C; } \
void __Mark(::hx::MarkContext *__inCtx) override { HX_MARK_MEMBER(mThis); } \
ARRAY_VISIT_FUNC \
::Dynamic __Run(const ::Array<::Dynamic> &inArgs) \
::Dynamic __Run(const ::Array<::Dynamic> &inArgs) override \
{ \
ret mThis->__##func(array_list); return ::Dynamic(); \
} \
run_func \
int __Compare(const ::hx::Object *inRHS) const \
int __Compare(const ::hx::Object *inRHS) const override \
{ \
if (!dynamic_cast<const Reflective_##func *>(inRHS)) return -1; \
return (mThis==inRHS->__GetHandle() ? 0 : -1); \
Expand Down
12 changes: 6 additions & 6 deletions include/Enum.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,18 +47,18 @@ class HXCPP_EXTERN_CLASS_ATTRIBUTES EnumBase_obj : public hx::Object
static hx::ObjectPtr<hx::Class_obj> &__SGetClass();


String toString();
String toString() HXCPP_OVERRIDE;

EnumBase_obj() : index(-1) { }
EnumBase_obj(const null &inNull) : index(-1) { }
int __GetType() const { return vtEnum; }
int __GetType() const HXCPP_OVERRIDE { return vtEnum; }
static Dynamic __CreateEmpty();
static Dynamic __Create(DynamicArray inArgs);
static void __boot();

void __Mark(hx::MarkContext *__inCtx);
void __Mark(hx::MarkContext *__inCtx) HXCPP_OVERRIDE;
#ifdef HXCPP_VISIT_ALLOCS
void __Visit(hx::VisitContext *__inCtx);
void __Visit(hx::VisitContext *__inCtx) HXCPP_OVERRIDE;
#endif

static hx::ObjectPtr<EnumBase_obj> Resolve(String inName);
Expand Down Expand Up @@ -98,7 +98,7 @@ class HXCPP_EXTERN_CLASS_ATTRIBUTES EnumBase_obj : public hx::Object
inline ::Dynamic _hx_getParamI(int inId) { return _hx_getFixed()[inId]; }
inline int _hx_getParamCount() { return mFixedFields; }
// Alias for _hx_getParamI
Dynamic __GetItem(int inIndex) const;
Dynamic __GetItem(int inIndex) const HXCPP_OVERRIDE;

// For legacy
inline String __Tag() const { return _hx_tag; }
Expand All @@ -108,7 +108,7 @@ class HXCPP_EXTERN_CLASS_ATTRIBUTES EnumBase_obj : public hx::Object
int _hx_getIndex() const { return index; }


int __Compare(const hx::Object *inRHS) const;
int __Compare(const hx::Object *inRHS) const HXCPP_OVERRIDE;

virtual String GetEnumName( ) const { return HX_CSTRING("Enum"); }
};
Expand Down
12 changes: 6 additions & 6 deletions include/cpp/FastIterator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace cpp
class HXCPP_EXTERN_CLASS_ATTRIBUTES IteratorBase : public hx::Object
{
public:
hx::Val __Field(const String &inString ,hx::PropertyAccess inCallProp);
hx::Val __Field(const String &inString ,hx::PropertyAccess inCallProp) HXCPP_OVERRIDE;
virtual bool hasNext() = 0;
virtual Dynamic _dynamicNext() = 0;

Expand All @@ -26,10 +26,10 @@ template<typename T>
class HXCPP_EXTERN_CLASS_ATTRIBUTES FastIterator_obj : public IteratorBase
{
public:
virtual bool hasNext() = 0;
bool hasNext() HXCPP_OVERRIDE = 0;
virtual T next() = 0;

virtual Dynamic _dynamicNext() { return next(); }
Dynamic _dynamicNext() HXCPP_OVERRIDE { return next(); }
};


Expand Down Expand Up @@ -84,15 +84,15 @@ class HXCPP_EXTERN_CLASS_ATTRIBUTES StringIterator : public cpp::FastIterator_ob

StringIterator(const String &inValue) : value(inValue), pos(0) { }

bool hasNext() { return pos<value.length; }
void __Mark(hx::MarkContext *__inCtx)
bool hasNext() HXCPP_OVERRIDE { return pos<value.length; }
void __Mark(hx::MarkContext *__inCtx) HXCPP_OVERRIDE
{
cpp::FastIterator_obj<T>::__Mark(__inCtx);
HX_MARK_MEMBER_NAME(value,"value");
}

#ifdef HXCPP_VISIT_ALLOCS
void __Visit(hx::VisitContext *__inCtx)
void __Visit(hx::VisitContext *__inCtx) HXCPP_OVERRIDE
{
cpp::FastIterator_obj<T>::__Visit(__inCtx);
HX_VISIT_MEMBER_NAME(value,"value");
Expand Down
Loading
Loading