|
|
@@ -14,7 +14,7 @@ SQClass::SQClass(SQSharedState *ss,SQClass *base)
|
|
|
{
|
|
|
_base = base;
|
|
|
_typetag = 0;
|
|
|
- _hook = NULL;
|
|
|
+ _hook = NULL;
|
|
|
_udsize = 0;
|
|
|
_locked = false;
|
|
|
_constructoridx = -1;
|
|
|
@@ -28,12 +28,12 @@ SQClass::SQClass(SQSharedState *ss,SQClass *base)
|
|
|
}
|
|
|
_members = base?base->_members->Clone() : SQTable::Create(ss,0);
|
|
|
__ObjAddRef(_members);
|
|
|
-
|
|
|
+
|
|
|
INIT_CHAIN();
|
|
|
ADD_TO_CHAIN(&_sharedstate->_gc_chain, this);
|
|
|
}
|
|
|
|
|
|
-void SQClass::Finalize() {
|
|
|
+void SQClass::Finalize() {
|
|
|
_attributes.Null();
|
|
|
_defaultvalues.resize(0);
|
|
|
_methods.resize(0);
|
|
|
@@ -54,7 +54,7 @@ bool SQClass::NewSlot(SQSharedState *ss,const SQObjectPtr &key,const SQObjectPtr
|
|
|
{
|
|
|
SQObjectPtr temp;
|
|
|
bool belongs_to_static_table = type(val) == OT_CLOSURE || type(val) == OT_NATIVECLOSURE || bstatic;
|
|
|
- if(_locked && !belongs_to_static_table)
|
|
|
+ if(_locked && !belongs_to_static_table)
|
|
|
return false; //the class already has an instance so cannot be modified
|
|
|
if(_members->Get(key,temp) && _isfield(temp)) //overrides the default value
|
|
|
{
|
|
|
@@ -63,10 +63,10 @@ bool SQClass::NewSlot(SQSharedState *ss,const SQObjectPtr &key,const SQObjectPtr
|
|
|
}
|
|
|
if(belongs_to_static_table) {
|
|
|
SQInteger mmidx;
|
|
|
- if((type(val) == OT_CLOSURE || type(val) == OT_NATIVECLOSURE) &&
|
|
|
+ if((type(val) == OT_CLOSURE || type(val) == OT_NATIVECLOSURE) &&
|
|
|
(mmidx = ss->GetMetaMethodIdxByName(key)) != -1) {
|
|
|
_metamethods[mmidx] = val;
|
|
|
- }
|
|
|
+ }
|
|
|
else {
|
|
|
SQObjectPtr theval = val;
|
|
|
if(_base && type(val) == OT_CLOSURE) {
|
|
|
@@ -176,7 +176,7 @@ SQInstance::SQInstance(SQSharedState *ss, SQInstance *i, SQInteger memsize)
|
|
|
Init(ss);
|
|
|
}
|
|
|
|
|
|
-void SQInstance::Finalize()
|
|
|
+void SQInstance::Finalize()
|
|
|
{
|
|
|
SQUnsignedInteger nvalues = _class->_defaultvalues.size();
|
|
|
__ObjRelease(_class);
|