diff options
Diffstat (limited to 'src/3rdparty/squirrel/squirrel/sqstate.cpp')
-rw-r--r-- | src/3rdparty/squirrel/squirrel/sqstate.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/3rdparty/squirrel/squirrel/sqstate.cpp b/src/3rdparty/squirrel/squirrel/sqstate.cpp index 31345d664..0f95c396c 100644 --- a/src/3rdparty/squirrel/squirrel/sqstate.cpp +++ b/src/3rdparty/squirrel/squirrel/sqstate.cpp @@ -79,12 +79,12 @@ SQTable *CreateDefaultDelegate(SQSharedState *ss,SQRegFunction *funcz) { SQInteger i=0; SQTable *t=SQTable::Create(ss,0); - while(funcz[i].name!=0){ + while(funcz[i].name!=nullptr){ SQNativeClosure *nc = SQNativeClosure::Create(ss,funcz[i].f); nc->_nparamscheck = funcz[i].nparamscheck; nc->_name = SQString::Create(ss,funcz[i].name); if(funcz[i].typemask && !CompileTypemask(nc->_typecheck,funcz[i].typemask)) - return NULL; + return nullptr; t->NewSlot(SQString::Create(ss,funcz[i].name),nc); i++; } @@ -93,15 +93,15 @@ SQTable *CreateDefaultDelegate(SQSharedState *ss,SQRegFunction *funcz) SQSharedState::SQSharedState() { - _compilererrorhandler = NULL; - _printfunc = NULL; + _compilererrorhandler = nullptr; + _printfunc = nullptr; _debuginfo = false; _notifyallexceptions = false; - _scratchpad=NULL; + _scratchpad=nullptr; _scratchpadsize=0; _collectable_free_processing = false; #ifndef NO_GARBAGE_COLLECTOR - _gc_chain=NULL; + _gc_chain=nullptr; #endif sq_new(_stringtable,SQStringTable); sq_new(_metamethods,SQObjectPtrVec); @@ -189,7 +189,7 @@ SQSharedState::~SQSharedState() _refs_table.Finalize(); #ifndef NO_GARBAGE_COLLECTOR SQCollectable *t = _gc_chain; - SQCollectable *nx = NULL; + SQCollectable *nx = nullptr; if(t) { t->_uiRef++; while(t) { @@ -299,7 +299,7 @@ SQInteger SQSharedState::CollectGarbage(SQVM *vm) EnqueueMarkObject(_instance_default_delegate,queue); EnqueueMarkObject(_weakref_default_delegate,queue); - SQCollectable *tchain=NULL; + SQCollectable *tchain=nullptr; while (!queue.IsEmpty()) { SQCollectable *q = queue.Pop(); @@ -309,7 +309,7 @@ SQInteger SQSharedState::CollectGarbage(SQVM *vm) } SQCollectable *t = _gc_chain; - SQCollectable *nx = NULL; + SQCollectable *nx = nullptr; if(t) { t->_uiRef++; while(t) { @@ -340,7 +340,7 @@ SQInteger SQSharedState::CollectGarbage(SQVM *vm) #ifndef NO_GARBAGE_COLLECTOR void SQCollectable::AddToChain(SQCollectable **chain,SQCollectable *c) { - c->_prev = NULL; + c->_prev = nullptr; c->_next = *chain; if(*chain) (*chain)->_prev = c; *chain = c; @@ -352,8 +352,8 @@ void SQCollectable::RemoveFromChain(SQCollectable **chain,SQCollectable *c) else *chain = c->_next; if(c->_next) c->_next->_prev = c->_prev; - c->_next = NULL; - c->_prev = NULL; + c->_next = nullptr; + c->_prev = nullptr; } #endif @@ -483,16 +483,16 @@ RefTable::RefNode *RefTable::Get(SQObject &obj,SQHash &mainpos,RefNode **prev,bo { RefNode *ref; mainpos = ::HashObj(obj)&(_numofslots-1); - *prev = NULL; + *prev = nullptr; for (ref = _buckets[mainpos]; ref; ) { if(_rawval(ref->obj) == _rawval(obj) && type(ref->obj) == type(obj)) break; *prev = ref; ref = ref->next; } - if(ref == NULL && add) { + if(ref == nullptr && add) { if(_numofslots == _slotused) { - assert(_freelist == 0); + assert(_freelist == nullptr); Resize(_numofslots*2); mainpos = ::HashObj(obj)&(_numofslots-1); } @@ -510,16 +510,16 @@ void RefTable::AllocNodes(SQUnsignedInteger size) RefNode *temp = nodes; SQUnsignedInteger n; for(n = 0; n < size - 1; n++) { - bucks[n] = NULL; + bucks[n] = nullptr; temp->refs = 0; new (&temp->obj) SQObjectPtr; temp->next = temp+1; temp++; } - bucks[n] = NULL; + bucks[n] = nullptr; temp->refs = 0; new (&temp->obj) SQObjectPtr; - temp->next = NULL; + temp->next = nullptr; _freelist = nodes; _nodes = nodes; _buckets = bucks; @@ -543,7 +543,7 @@ SQStringTable::SQStringTable() SQStringTable::~SQStringTable() { SQ_FREE(_strings,sizeof(SQString*)*_numofslots); - _strings = NULL; + _strings = nullptr; } void SQStringTable::AllocNodes(SQInteger size) @@ -580,8 +580,8 @@ SQString::SQString(const SQChar *news, SQInteger len) _val[len] = '\0'; _len = len; _hash = ::_hashstr(news,(size_t)len); - _next = NULL; - _sharedstate = NULL; + _next = nullptr; + _sharedstate = nullptr; } void SQStringTable::Resize(SQInteger size) @@ -605,7 +605,7 @@ void SQStringTable::Resize(SQInteger size) void SQStringTable::Remove(SQString *bs) { SQString *s; - SQString *prev=NULL; + SQString *prev=nullptr; SQHash h = bs->_hash&(_numofslots - 1); for (s = _strings[h]; s; ){ |