1
0
Fork 0

Codechange: Add missing override specifiers to squirrel.

pull/11337/head
Peter Nelson 2023-09-25 13:02:51 +01:00 committed by PeterN
parent 49dae08a3b
commit 015fbafe34
7 changed files with 22 additions and 22 deletions

View File

@ -55,13 +55,13 @@ public:
bool SetAttributes(const SQObjectPtr &key,const SQObjectPtr &val); bool SetAttributes(const SQObjectPtr &key,const SQObjectPtr &val);
bool GetAttributes(const SQObjectPtr &key,SQObjectPtr &outval); bool GetAttributes(const SQObjectPtr &key,SQObjectPtr &outval);
void Lock() { _locked = true; if(_base) _base->Lock(); } void Lock() { _locked = true; if(_base) _base->Lock(); }
void Release() { void Release() override {
if (_hook) { _hook(_typetag,0);} if (_hook) { _hook(_typetag,0);}
sq_delete(this, SQClass); sq_delete(this, SQClass);
} }
void Finalize(); void Finalize() override;
#ifndef NO_GARBAGE_COLLECTOR #ifndef NO_GARBAGE_COLLECTOR
void EnqueueMarkObjectForChildren(SQGCMarkerQueue &queue); void EnqueueMarkObjectForChildren(SQGCMarkerQueue &queue) override;
#endif #endif
SQInteger Next(const SQObjectPtr &refpos, SQObjectPtr &outkey, SQObjectPtr &outval); SQInteger Next(const SQObjectPtr &refpos, SQObjectPtr &outkey, SQObjectPtr &outval);
SQInstance *CreateInstance(); SQInstance *CreateInstance();

View File

@ -14,7 +14,7 @@ public:
new (nc) SQClosure(ss,func); new (nc) SQClosure(ss,func);
return nc; return nc;
} }
void Release(){ void Release() override {
sq_delete(this,SQClosure); sq_delete(this,SQClosure);
} }
SQClosure *Clone() SQClosure *Clone()
@ -32,8 +32,8 @@ public:
bool Save(SQVM *v,SQUserPointer up,SQWRITEFUNC write); bool Save(SQVM *v,SQUserPointer up,SQWRITEFUNC write);
static bool Load(SQVM *v,SQUserPointer up,SQREADFUNC read,SQObjectPtr &ret); static bool Load(SQVM *v,SQUserPointer up,SQREADFUNC read,SQObjectPtr &ret);
#ifndef NO_GARBAGE_COLLECTOR #ifndef NO_GARBAGE_COLLECTOR
void EnqueueMarkObjectForChildren(SQGCMarkerQueue &queue); void EnqueueMarkObjectForChildren(SQGCMarkerQueue &queue) override;
void Finalize(){_outervalues.resize(0); } void Finalize() override {_outervalues.resize(0); }
#endif #endif
SQObjectPtr _env; SQObjectPtr _env;
SQObjectPtr _function; SQObjectPtr _function;
@ -60,14 +60,14 @@ public:
_state=eDead; _state=eDead;
_stack.resize(0); _stack.resize(0);
_closure=_null_;} _closure=_null_;}
void Release(){ void Release() override {
sq_delete(this,SQGenerator); sq_delete(this,SQGenerator);
} }
bool Yield(SQVM *v); bool Yield(SQVM *v);
bool Resume(SQVM *v,SQInteger target); bool Resume(SQVM *v,SQInteger target);
#ifndef NO_GARBAGE_COLLECTOR #ifndef NO_GARBAGE_COLLECTOR
void EnqueueMarkObjectForChildren(SQGCMarkerQueue &queue); void EnqueueMarkObjectForChildren(SQGCMarkerQueue &queue) override;
void Finalize(){_stack.resize(0);_closure=_null_;} void Finalize() override {_stack.resize(0);_closure=_null_;}
#endif #endif
SQObjectPtr _closure; SQObjectPtr _closure;
SQObjectPtrVec _stack; SQObjectPtrVec _stack;
@ -102,12 +102,12 @@ public:
{ {
REMOVE_FROM_CHAIN(&_ss(this)->_gc_chain,this); REMOVE_FROM_CHAIN(&_ss(this)->_gc_chain,this);
} }
void Release(){ void Release() override {
sq_delete(this,SQNativeClosure); sq_delete(this,SQNativeClosure);
} }
#ifndef NO_GARBAGE_COLLECTOR #ifndef NO_GARBAGE_COLLECTOR
void EnqueueMarkObjectForChildren(SQGCMarkerQueue &queue); void EnqueueMarkObjectForChildren(SQGCMarkerQueue &queue) override;
void Finalize(){_outervalues.resize(0);} void Finalize() override {_outervalues.resize(0);}
#endif #endif
SQInteger _nparamscheck; SQInteger _nparamscheck;
SQIntVec _typecheck; SQIntVec _typecheck;

View File

@ -103,7 +103,7 @@ public:
new (f) SQFunctionProto(ninstructions, nliterals, nparameters, nfunctions, noutervalues, nlineinfos, nlocalvarinfos, ndefaultparams); new (f) SQFunctionProto(ninstructions, nliterals, nparameters, nfunctions, noutervalues, nlineinfos, nlocalvarinfos, ndefaultparams);
return f; return f;
} }
void Release(){ void Release() override {
_DESTRUCT_VECTOR(SQObjectPtr,_nliterals,_literals); _DESTRUCT_VECTOR(SQObjectPtr,_nliterals,_literals);
_DESTRUCT_VECTOR(SQObjectPtr,_nparameters,_parameters); _DESTRUCT_VECTOR(SQObjectPtr,_nparameters,_parameters);
_DESTRUCT_VECTOR(SQObjectPtr,_nfunctions,_functions); _DESTRUCT_VECTOR(SQObjectPtr,_nfunctions,_functions);

View File

@ -84,7 +84,7 @@ private:
struct SQWeakRef : SQRefCounted struct SQWeakRef : SQRefCounted
{ {
void Release(); void Release() override;
SQObject _obj; SQObject _obj;
}; };
@ -362,7 +362,7 @@ struct SQCollectable : public SQRefCounted {
SQCollectable *_next; SQCollectable *_next;
SQCollectable *_prev; SQCollectable *_prev;
SQSharedState *_sharedstate; SQSharedState *_sharedstate;
virtual void Release()=0; void Release() override=0;
virtual void EnqueueMarkObjectForChildren(class SQGCMarkerQueue &queue)=0; virtual void EnqueueMarkObjectForChildren(class SQGCMarkerQueue &queue)=0;
void UnMark(); void UnMark();
virtual void Finalize()=0; virtual void Finalize()=0;

View File

@ -19,7 +19,7 @@ public:
static SQString *Create(SQSharedState *ss, const SQChar *, SQInteger len = -1 ); static SQString *Create(SQSharedState *ss, const SQChar *, SQInteger len = -1 );
static SQString *Create(SQSharedState *ss, const std::string &str) { return Create(ss, str.data(), str.size()); } static SQString *Create(SQSharedState *ss, const std::string &str) { return Create(ss, str.data(), str.size()); }
SQInteger Next(const SQObjectPtr &refpos, SQObjectPtr &outkey, SQObjectPtr &outval); SQInteger Next(const SQObjectPtr &refpos, SQObjectPtr &outkey, SQObjectPtr &outval);
void Release(); void Release() override;
SQSharedState *_sharedstate; SQSharedState *_sharedstate;
SQString *_next; //chain for the string table SQString *_next; //chain for the string table
SQInteger _len; SQInteger _len;

View File

@ -18,10 +18,10 @@ struct SQUserData : SQDelegable
return ud; return ud;
} }
#ifndef NO_GARBAGE_COLLECTOR #ifndef NO_GARBAGE_COLLECTOR
void EnqueueMarkObjectForChildren(SQGCMarkerQueue &queue); void EnqueueMarkObjectForChildren(SQGCMarkerQueue &queue) override;
void Finalize(){SetDelegate(nullptr);} void Finalize() override {SetDelegate(nullptr);}
#endif #endif
void Release() { void Release() override {
if (_hook) _hook(_val,_size); if (_hook) _hook(_val,_size);
SQInteger tsize = _size - 1; SQInteger tsize = _size - 1;
this->~SQUserData(); this->~SQUserData();

View File

@ -112,16 +112,16 @@ public:
#endif #endif
#ifndef NO_GARBAGE_COLLECTOR #ifndef NO_GARBAGE_COLLECTOR
void EnqueueMarkObjectForChildren(SQGCMarkerQueue &queue); void EnqueueMarkObjectForChildren(SQGCMarkerQueue &queue) override;
#endif #endif
void Finalize(); void Finalize() override;
void GrowCallStack() { void GrowCallStack() {
SQInteger newsize = _alloccallsstacksize*2; SQInteger newsize = _alloccallsstacksize*2;
_callstackdata.resize(newsize); _callstackdata.resize(newsize);
_callsstack = &_callstackdata[0]; _callsstack = &_callstackdata[0];
_alloccallsstacksize = newsize; _alloccallsstacksize = newsize;
} }
void Release(){ sq_delete(this,SQVM); } //does nothing void Release() override { sq_delete(this,SQVM); } //does nothing
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
//stack functions for the api //stack functions for the api
void Remove(SQInteger n); void Remove(SQInteger n);