#include "sqclass.h"\r
#include "sqclosure.h"\r
\r
-SQString *SQString::Create(SQSharedState *ss,const SQChar *s,int len)\r
+SQString *SQString::Create(SQSharedState *ss,const SQChar *s,SQInteger len)\r
{\r
SQString *str=ADD_STRING(ss,s,len);\r
str->_sharedstate=ss;\r
REMOVE_STRING(_sharedstate,this);\r
}\r
\r
-unsigned int TranslateIndex(const SQObjectPtr &idx)\r
+SQUnsignedInteger TranslateIndex(const SQObjectPtr &idx)\r
{\r
switch(type(idx)){\r
case OT_NULL:\r
return 0;\r
case OT_INTEGER:\r
- return (unsigned int)_integer(idx);\r
+ return (SQUnsignedInteger)_integer(idx);\r
}\r
assert(0);\r
return 0;\r
}\r
\r
+SQWeakRef *SQRefCounted::GetWeakRef(SQObjectType type)\r
+{\r
+ if(!_weakref) {\r
+ sq_new(_weakref,SQWeakRef);\r
+ _weakref->_obj._type = type;\r
+ _weakref->_obj._unVal.pRefCounted = this;\r
+ }\r
+ return _weakref;\r
+}\r
+\r
+SQRefCounted::~SQRefCounted()\r
+{\r
+ if(_weakref) {\r
+ _weakref->_obj._type = OT_NULL;\r
+ _weakref->_obj._unVal.pRefCounted = NULL;\r
+ }\r
+}\r
+\r
+void SQWeakRef::Release() { \r
+ if(ISREFCOUNTED(_obj._type)) { \r
+ _obj._unVal.pRefCounted->_weakref = NULL;\r
+ } \r
+ sq_delete(this,SQWeakRef);\r
+}\r
+\r
bool SQDelegable::GetMetaMethod(SQMetaMethod mm,SQObjectPtr &res) {\r
if(_delegate) {\r
return _delegate->Get((*_ss(this)->_metamethods)[mm],res);\r
return false;\r
}\r
\r
+bool SQDelegable::SetDelegate(SQTable *mt)\r
+{\r
+ SQTable *temp = mt;\r
+ while (temp) {\r
+ if (temp->_delegate == this) return false; //cycle detected\r
+ temp = temp->_delegate;\r
+ }\r
+ if (mt) __ObjAddRef(mt);\r
+ __ObjRelease(_delegate);\r
+ _delegate = mt;\r
+ return true;\r
+}\r
+\r
bool SQGenerator::Yield(SQVM *v)\r
{\r
if(_state==eSuspended) { v->Raise_Error(_SC("internal vm error, yielding dead generator")); return false;}\r
if(_state==eDead) { v->Raise_Error(_SC("internal vm error, yielding a dead generator")); return false; }\r
- int size = v->_top-v->_stackbase;\r
+ SQInteger size = v->_top-v->_stackbase;\r
_ci=*v->ci;\r
_stack.resize(size);\r
- for(int n =0; n<size; n++) {\r
+ for(SQInteger n =0; n<size; n++) {\r
_stack._vals[n] = v->_stack[v->_stackbase+n];\r
v->_stack[v->_stackbase+n] = _null_;\r
}\r
- int nvargs = v->ci->_vargs.size;\r
- int vargsbase = v->ci->_vargs.base;\r
- for(int j = nvargs - 1; j >= 0; j--) {\r
+ SQInteger nvargs = v->ci->_vargs.size;\r
+ SQInteger vargsbase = v->ci->_vargs.base;\r
+ for(SQInteger j = nvargs - 1; j >= 0; j--) {\r
_vargsstack.push_back(v->_vargsstack[vargsbase+j]);\r
}\r
_ci._generator=_null_;\r
- for(int i=0;i<_ci._etraps;i++) {\r
+ for(SQInteger i=0;i<_ci._etraps;i++) {\r
_etraps.push_back(v->_etraps.top());\r
v->_etraps.pop_back();\r
}\r
return true;\r
}\r
\r
-bool SQGenerator::Resume(SQVM *v,int target)\r
+bool SQGenerator::Resume(SQVM *v,SQInteger target)\r
{\r
- int size=_stack.size();\r
+ SQInteger size=_stack.size();\r
if(_state==eDead){ v->Raise_Error(_SC("resuming dead generator")); return false; }\r
if(_state==eRunning){ v->Raise_Error(_SC("resuming active generator")); return false; }\r
- int prevtop=v->_top-v->_stackbase;\r
+ SQInteger prevtop=v->_top-v->_stackbase;\r
PUSH_CALLINFO(v,_ci);\r
- int oldstackbase=v->_stackbase;\r
+ SQInteger oldstackbase=v->_stackbase;\r
v->_stackbase=v->_top;\r
v->ci->_target=target;\r
v->ci->_generator=SQObjectPtr(this);\r
v->ci->_vargs.size = _vargsstack.size();\r
\r
- for(int i=0;i<_ci._etraps;i++) {\r
+ for(SQInteger i=0;i<_ci._etraps;i++) {\r
v->_etraps.push_back(_etraps.top());\r
_etraps.pop_back();\r
}\r
- for(int n =0; n<size; n++) {\r
+ for(SQInteger n =0; n<size; n++) {\r
v->_stack[v->_stackbase+n] = _stack._vals[n];\r
_stack._vals[0] = _null_;\r
}\r
}\r
\r
void SQArray::Extend(const SQArray *a){\r
- int xlen;\r
+ SQInteger xlen;\r
if((xlen=a->Size()))\r
- for(int i=0;i<xlen;i++)\r
+ for(SQInteger i=0;i<xlen;i++)\r
Append(a->_values[i]);\r
}\r
\r
-const SQChar* SQFunctionProto::GetLocal(SQVM *vm,unsigned int stackbase,unsigned int nseq,unsigned int nop)\r
+const SQChar* SQFunctionProto::GetLocal(SQVM *vm,SQUnsignedInteger stackbase,SQUnsignedInteger nseq,SQUnsignedInteger nop)\r
{\r
- unsigned int nvars=_localvarinfos.size();\r
+ SQUnsignedInteger nvars=_localvarinfos.size();\r
const SQChar *res=NULL; \r
if(nvars>=nseq){\r
- for(unsigned int i=0;i<nvars;i++){\r
+ for(SQUnsignedInteger i=0;i<nvars;i++){\r
if(_localvarinfos[i]._start_op<=nop && _localvarinfos[i]._end_op>=nop)\r
{\r
if(nseq==0){\r
return res;\r
}\r
\r
-int SQFunctionProto::GetLine(SQInstruction *curr)\r
+SQInteger SQFunctionProto::GetLine(SQInstruction *curr)\r
{\r
- int op=(curr-_instructions._vals);\r
- int line=_lineinfos[0]._line;\r
- for(unsigned int i=1;i<_lineinfos.size();i++){\r
+ SQInteger op=(curr-_instructions._vals);\r
+ SQInteger line=_lineinfos[0]._line;\r
+ for(SQUnsignedInteger i=1;i<_lineinfos.size();i++){\r
if(_lineinfos[i]._op>=op)\r
return line;\r
line=_lineinfos[i]._line;\r
\r
//#define _ERROR_TRAP() error_trap:\r
#define _CHECK_IO(exp) { if(!exp)return false; }\r
-bool SafeWrite(HSQUIRRELVM v,SQWRITEFUNC write,SQUserPointer up,SQUserPointer dest,int size)\r
+bool SafeWrite(HSQUIRRELVM v,SQWRITEFUNC write,SQUserPointer up,SQUserPointer dest,SQInteger size)\r
{\r
if(write(up,dest,size) != size) {\r
v->Raise_Error(_SC("io error (write function failure)"));\r
return true;\r
}\r
\r
-bool SafeRead(HSQUIRRELVM v,SQWRITEFUNC read,SQUserPointer up,SQUserPointer dest,int size)\r
+bool SafeRead(HSQUIRRELVM v,SQWRITEFUNC read,SQUserPointer up,SQUserPointer dest,SQInteger size)\r
{\r
if(size && read(up,dest,size) != size) {\r
v->Raise_Error(_SC("io error, read function failure, the origin stream could be corrupted/trucated"));\r
return true;\r
}\r
\r
-bool WriteTag(HSQUIRRELVM v,SQWRITEFUNC write,SQUserPointer up,int tag)\r
+bool WriteTag(HSQUIRRELVM v,SQWRITEFUNC write,SQUserPointer up,SQInteger tag)\r
{\r
return SafeWrite(v,write,up,&tag,sizeof(tag));\r
}\r
\r
-bool CheckTag(HSQUIRRELVM v,SQWRITEFUNC read,SQUserPointer up,int tag)\r
+bool CheckTag(HSQUIRRELVM v,SQWRITEFUNC read,SQUserPointer up,SQInteger tag)\r
{\r
- int t;\r
+ SQInteger t;\r
_CHECK_IO(SafeRead(v,read,up,&t,sizeof(t)));\r
if(t != tag){\r
v->Raise_Error(_SC("invalid or corrupted closure stream"));\r
_CHECK_IO(SafeRead(v,read,up,&t,sizeof(SQObjectType)));\r
switch(t){\r
case OT_STRING:{\r
- int len;\r
+ SQInteger len;\r
_CHECK_IO(SafeRead(v,read,up,&len,sizeof(SQInteger)));\r
_CHECK_IO(SafeRead(v,read,up,_ss(v)->GetScratchPad(rsl(len)),rsl(len)));\r
o=SQString::Create(_ss(v),_ss(v)->GetScratchPad(-1),len);\r
\r
bool SQFunctionProto::Save(SQVM *v,SQUserPointer up,SQWRITEFUNC write)\r
{\r
- int i,nsize=_literals.size();\r
+ SQInteger i,nsize=_literals.size();\r
_CHECK_IO(WriteTag(v,write,up,SQ_CLOSURESTREAM_PART));\r
_CHECK_IO(WriteObject(v,up,write,_sourcename));\r
_CHECK_IO(WriteObject(v,up,write,_name));\r
nsize=_outervalues.size();\r
_CHECK_IO(SafeWrite(v,write,up,&nsize,sizeof(nsize)));\r
for(i=0;i<nsize;i++){\r
- _CHECK_IO(SafeWrite(v,write,up,&_outervalues[i]._type,sizeof(unsigned int)));\r
+ _CHECK_IO(SafeWrite(v,write,up,&_outervalues[i]._type,sizeof(SQUnsignedInteger)));\r
_CHECK_IO(WriteObject(v,up,write,_outervalues[i]._src));\r
_CHECK_IO(WriteObject(v,up,write,_outervalues[i]._name));\r
}\r
for(i=0;i<nsize;i++){\r
SQLocalVarInfo &lvi=_localvarinfos[i];\r
_CHECK_IO(WriteObject(v,up,write,lvi._name));\r
- _CHECK_IO(SafeWrite(v,write,up,&lvi._pos,sizeof(unsigned int)));\r
- _CHECK_IO(SafeWrite(v,write,up,&lvi._start_op,sizeof(unsigned int)));\r
- _CHECK_IO(SafeWrite(v,write,up,&lvi._end_op,sizeof(unsigned int)));\r
+ _CHECK_IO(SafeWrite(v,write,up,&lvi._pos,sizeof(SQUnsignedInteger)));\r
+ _CHECK_IO(SafeWrite(v,write,up,&lvi._start_op,sizeof(SQUnsignedInteger)));\r
+ _CHECK_IO(SafeWrite(v,write,up,&lvi._end_op,sizeof(SQUnsignedInteger)));\r
}\r
_CHECK_IO(WriteTag(v,write,up,SQ_CLOSURESTREAM_PART));\r
nsize=_lineinfos.size();\r
\r
bool SQFunctionProto::Load(SQVM *v,SQUserPointer up,SQREADFUNC read)\r
{\r
- int i, nsize = _literals.size();\r
+ SQInteger i, nsize = _literals.size();\r
SQObjectPtr o;\r
_CHECK_IO(CheckTag(v,read,up,SQ_CLOSURESTREAM_PART));\r
_CHECK_IO(ReadObject(v, up, read, _sourcename));\r
_CHECK_IO(CheckTag(v,read,up,SQ_CLOSURESTREAM_PART));\r
_CHECK_IO(SafeRead(v,read,up,&nsize,sizeof(nsize)));\r
for(i = 0; i < nsize; i++){\r
- unsigned int type;\r
+ SQUnsignedInteger type;\r
SQObjectPtr name;\r
- _CHECK_IO(SafeRead(v,read,up, &type, sizeof(unsigned int)));\r
+ _CHECK_IO(SafeRead(v,read,up, &type, sizeof(SQUnsignedInteger)));\r
_CHECK_IO(ReadObject(v, up, read, o));\r
_CHECK_IO(ReadObject(v, up, read, name));\r
_outervalues.push_back(SQOuterVar(name,o, (SQOuterType)type));\r
for(i = 0; i < nsize; i++){\r
SQLocalVarInfo lvi;\r
_CHECK_IO(ReadObject(v, up, read, lvi._name));\r
- _CHECK_IO(SafeRead(v,read,up, &lvi._pos, sizeof(unsigned int)));\r
- _CHECK_IO(SafeRead(v,read,up, &lvi._start_op, sizeof(unsigned int)));\r
- _CHECK_IO(SafeRead(v,read,up, &lvi._end_op, sizeof(unsigned int)));\r
+ _CHECK_IO(SafeRead(v,read,up, &lvi._pos, sizeof(SQUnsignedInteger)));\r
+ _CHECK_IO(SafeRead(v,read,up, &lvi._start_op, sizeof(SQUnsignedInteger)));\r
+ _CHECK_IO(SafeRead(v,read,up, &lvi._end_op, sizeof(SQUnsignedInteger)));\r
_localvarinfos.push_back(lvi);\r
}\r
_CHECK_IO(CheckTag(v,read,up,SQ_CLOSURESTREAM_PART));\r
SQSharedState::MarkObject(_debughook,chain);\r
SQSharedState::MarkObject(_roottable, chain);\r
SQSharedState::MarkObject(temp_reg, chain);\r
- for(unsigned int i = 0; i < _stack.size(); i++) SQSharedState::MarkObject(_stack[i], chain);\r
- for(unsigned int j = 0; j < _vargsstack.size(); j++) SQSharedState::MarkObject(_vargsstack[j], chain);\r
+ for(SQUnsignedInteger i = 0; i < _stack.size(); i++) SQSharedState::MarkObject(_stack[i], chain);\r
+ for(SQUnsignedInteger j = 0; j < _vargsstack.size(); j++) SQSharedState::MarkObject(_vargsstack[j], chain);\r
END_MARK()\r
}\r
\r
void SQArray::Mark(SQCollectable **chain)\r
{\r
START_MARK()\r
- int len = _values.size();\r
- for(int i = 0;i < len; i++) SQSharedState::MarkObject(_values[i], chain);\r
+ SQInteger len = _values.size();\r
+ for(SQInteger i = 0;i < len; i++) SQSharedState::MarkObject(_values[i], chain);\r
END_MARK()\r
}\r
void SQTable::Mark(SQCollectable **chain)\r
{\r
START_MARK()\r
if(_delegate) _delegate->Mark(chain);\r
- int len = _numofnodes;\r
- for(int i = 0; i < len; i++){\r
+ SQInteger len = _numofnodes;\r
+ for(SQInteger i = 0; i < len; i++){\r
SQSharedState::MarkObject(_nodes[i].key, chain);\r
SQSharedState::MarkObject(_nodes[i].val, chain);\r
}\r
_members->Mark(chain);\r
if(_base) _base->Mark(chain);\r
SQSharedState::MarkObject(_attributes, chain);\r
- for(unsigned int i =0; i< _defaultvalues.size(); i++) {\r
+ for(SQUnsignedInteger i =0; i< _defaultvalues.size(); i++) {\r
SQSharedState::MarkObject(_defaultvalues[i].val, chain);\r
SQSharedState::MarkObject(_defaultvalues[i].attrs, chain);\r
}\r
- for(unsigned int j =0; j< _methods.size(); j++) {\r
+ for(SQUnsignedInteger j =0; j< _methods.size(); j++) {\r
SQSharedState::MarkObject(_methods[j].val, chain);\r
SQSharedState::MarkObject(_methods[j].attrs, chain);\r
}\r
- for(unsigned int k =0; k< _metamethods.size(); k++) {\r
+ for(SQUnsignedInteger k =0; k< _metamethods.size(); k++) {\r
SQSharedState::MarkObject(_metamethods[k], chain);\r
}\r
END_MARK()\r
{\r
START_MARK()\r
_class->Mark(chain);\r
- for(unsigned int i =0; i< _values.size(); i++) {\r
+ for(SQUnsignedInteger i =0; i< _nvalues; i++) {\r
SQSharedState::MarkObject(_values[i], chain);\r
}\r
END_MARK()\r
void SQGenerator::Mark(SQCollectable **chain)\r
{\r
START_MARK()\r
- for(unsigned int i = 0; i < _stack.size(); i++) SQSharedState::MarkObject(_stack[i], chain);\r
- for(unsigned int j = 0; j < _vargsstack.size(); j++) SQSharedState::MarkObject(_vargsstack[j], chain);\r
+ for(SQUnsignedInteger i = 0; i < _stack.size(); i++) SQSharedState::MarkObject(_stack[i], chain);\r
+ for(SQUnsignedInteger j = 0; j < _vargsstack.size(); j++) SQSharedState::MarkObject(_vargsstack[j], chain);\r
SQSharedState::MarkObject(_closure, chain);\r
END_MARK()\r
}\r
void SQClosure::Mark(SQCollectable **chain)\r
{\r
START_MARK()\r
- for(unsigned int i = 0; i < _outervalues.size(); i++) SQSharedState::MarkObject(_outervalues[i], chain);\r
+ for(SQUnsignedInteger i = 0; i < _outervalues.size(); i++) SQSharedState::MarkObject(_outervalues[i], chain);\r
END_MARK()\r
}\r
\r
void SQNativeClosure::Mark(SQCollectable **chain)\r
{\r
START_MARK()\r
- for(unsigned int i = 0; i < _outervalues.size(); i++) SQSharedState::MarkObject(_outervalues[i], chain);\r
+ for(SQUnsignedInteger i = 0; i < _outervalues.size(); i++) SQSharedState::MarkObject(_outervalues[i], chain);\r
END_MARK()\r
}\r
\r
projects / supertux.git / blobdiff