#include "sqfuncproto.h"\r
#include "sqclosure.h"\r
#include "squserdata.h"\r
-#include "sqfuncstate.h"\r
#include "sqcompiler.h"\r
+#include "sqfuncstate.h"\r
#include "sqclass.h"\r
\r
-bool sq_aux_gettypedarg(HSQUIRRELVM v,int idx,SQObjectType type,SQObjectPtr **o)\r
+bool sq_aux_gettypedarg(HSQUIRRELVM v,SQInteger idx,SQObjectType type,SQObjectPtr **o)\r
{\r
*o = &stack_get(v,idx);\r
if(type(**o) != type){\r
if(sq_gettop(v) < count){ v->Raise_Error(_SC("not enough params in the stack")); return SQ_ERROR; }\\r
} \r
\r
-int sq_aux_throwobject(HSQUIRRELVM v,SQObjectPtr &e)\r
+SQInteger sq_aux_throwobject(HSQUIRRELVM v,SQObjectPtr &e)\r
{\r
v->_lasterror = e;\r
return SQ_ERROR;\r
}\r
\r
-int sq_aux_invalidtype(HSQUIRRELVM v,SQObjectType type)\r
+SQInteger sq_aux_invalidtype(HSQUIRRELVM v,SQObjectType type)\r
{\r
scsprintf(_ss(v)->GetScratchPad(100), _SC("unexpected type %s"), IdType2Name(type));\r
return sq_throwerror(v, _ss(v)->GetScratchPad(-1));\r
}\r
\r
-HSQUIRRELVM sq_open(int initialstacksize)\r
+HSQUIRRELVM sq_open(SQInteger initialstacksize)\r
{\r
SQSharedState *ss;\r
SQVM *v;\r
return v;\r
}\r
\r
-HSQUIRRELVM sq_newthread(HSQUIRRELVM friendvm, int initialstacksize)\r
+HSQUIRRELVM sq_newthread(HSQUIRRELVM friendvm, SQInteger initialstacksize)\r
{\r
SQSharedState *ss;\r
SQVM *v;\r
}\r
}\r
\r
-int sq_getvmstate(HSQUIRRELVM v)\r
+SQInteger sq_getvmstate(HSQUIRRELVM v)\r
{\r
if(v->_suspended)\r
return SQ_VMSTATE_SUSPENDED;\r
SQObjectPtr refs;\r
if(!ISREFCOUNTED(type(*po))) return SQTrue;\r
if(_table(_ss(v)->_refs_table)->Get(*po, refs)) {\r
- int n = _integer(refs) - 1;\r
+ SQInteger n = _integer(refs) - 1;\r
if(n <= 0) {\r
_table(_ss(v)->_refs_table)->Remove(*po);\r
sq_resetobject(po);\r
const SQChar *sq_objtostring(HSQOBJECT *o) \r
{\r
if(sq_type(*o) == OT_STRING) {\r
- return o->_unVal.pString->_val;\r
+ return _stringval(*o);\r
}\r
return NULL;\r
}\r
return 0;\r
}\r
\r
+SQBool sq_objtobool(HSQOBJECT *o) \r
+{\r
+ if(sq_isbool(*o)) {\r
+ return _integer(*o);\r
+ }\r
+ return SQFalse;\r
+}\r
+\r
void sq_pushnull(HSQUIRRELVM v)\r
{\r
v->Push(_null_);\r
}\r
\r
-void sq_pushstring(HSQUIRRELVM v,const SQChar *s,int len)\r
+void sq_pushstring(HSQUIRRELVM v,const SQChar *s,SQInteger len)\r
{\r
if(s)\r
v->Push(SQObjectPtr(SQString::Create(_ss(v), s, len)));\r
v->Push(p);\r
}\r
\r
-SQUserPointer sq_newuserdata(HSQUIRRELVM v,unsigned int size)\r
+SQUserPointer sq_newuserdata(HSQUIRRELVM v,SQUnsignedInteger size)\r
{\r
SQUserData *ud = SQUserData::Create(_ss(v), size);\r
v->Push(ud);\r
v->Push(SQTable::Create(_ss(v), 0)); \r
}\r
\r
-void sq_newarray(HSQUIRRELVM v,int size)\r
+void sq_newarray(HSQUIRRELVM v,SQInteger size)\r
{\r
v->Push(SQArray::Create(_ss(v), size)); \r
}\r
return SQ_OK;\r
}\r
\r
-int sq_instanceof(HSQUIRRELVM v)\r
+SQInteger sq_instanceof(HSQUIRRELVM v)\r
{\r
SQObjectPtr &inst = stack_get(v,-1);\r
SQObjectPtr &cl = stack_get(v,-2);\r
return _instance(inst)->InstanceOf(_class(cl))?1:0;\r
}\r
\r
-SQRESULT sq_arrayappend(HSQUIRRELVM v,int idx)\r
+SQRESULT sq_arrayappend(HSQUIRRELVM v,SQInteger idx)\r
{\r
sq_aux_paramscheck(v,2);\r
SQObjectPtr *arr;\r
return SQ_OK;\r
}\r
\r
-SQRESULT sq_arraypop(HSQUIRRELVM v,int idx,SQBool pushval)\r
+SQRESULT sq_arraypop(HSQUIRRELVM v,SQInteger idx,SQBool pushval)\r
{\r
sq_aux_paramscheck(v, 1);\r
SQObjectPtr *arr;\r
return sq_throwerror(v, _SC("empty array"));\r
}\r
\r
-SQRESULT sq_arrayresize(HSQUIRRELVM v,int idx,int newsize)\r
+SQRESULT sq_arrayresize(HSQUIRRELVM v,SQInteger idx,SQInteger newsize)\r
{\r
sq_aux_paramscheck(v,1);\r
SQObjectPtr *arr;\r
_array(*arr)->Resize(newsize);\r
return SQ_OK;\r
}\r
- return sq_throwerror(v, _SC("empty array"));\r
+ return SQ_OK;\r
}\r
\r
-SQRESULT sq_arrayreverse(HSQUIRRELVM v,int idx)\r
+SQRESULT sq_arrayreverse(HSQUIRRELVM v,SQInteger idx)\r
{\r
sq_aux_paramscheck(v, 1);\r
SQObjectPtr *o;\r
SQArray *arr = _array(*o);\r
if(arr->Size() > 0) {\r
SQObjectPtr t;\r
- int size = arr->Size();\r
- int n = size >> 1; size -= 1;\r
- for(int i = 0; i < n; i++) {\r
+ SQInteger size = arr->Size();\r
+ SQInteger n = size >> 1; size -= 1;\r
+ for(SQInteger i = 0; i < n; i++) {\r
t = arr->_values[i];\r
arr->_values[i] = arr->_values[size-i];\r
arr->_values[size-i] = t;\r
}\r
return SQ_OK;\r
}\r
- return sq_throwerror(v, _SC("empty array"));\r
+ return SQ_OK;\r
}\r
\r
-void sq_newclosure(HSQUIRRELVM v,SQFUNCTION func,unsigned int nfreevars)\r
+void sq_newclosure(HSQUIRRELVM v,SQFUNCTION func,SQUnsignedInteger nfreevars)\r
{\r
SQNativeClosure *nc = SQNativeClosure::Create(_ss(v), func);\r
nc->_nparamscheck = 0;\r
- for(unsigned int i = 0; i < nfreevars; i++) {\r
+ for(SQUnsignedInteger i = 0; i < nfreevars; i++) {\r
nc->_outervalues.push_back(v->Top());\r
v->Pop();\r
}\r
v->Push(SQObjectPtr(nc)); \r
}\r
\r
-SQRESULT sq_getclosureinfo(HSQUIRRELVM v,int idx,unsigned int *nparams,unsigned int *nfreevars)\r
+SQRESULT sq_getclosureinfo(HSQUIRRELVM v,SQInteger idx,SQUnsignedInteger *nparams,SQUnsignedInteger *nfreevars)\r
{\r
SQObject o = stack_get(v, idx);\r
if(sq_isclosure(o)) {\r
SQClosure *c = _closure(o);\r
SQFunctionProto *proto = _funcproto(c->_function);\r
- *nparams = (unsigned int)proto->_parameters.size();\r
- *nfreevars = (unsigned int)c->_outervalues.size();\r
+ *nparams = (SQUnsignedInteger)proto->_parameters.size();\r
+ *nfreevars = (SQUnsignedInteger)c->_outervalues.size();\r
return SQ_OK;\r
}\r
return sq_throwerror(v,_SC("the object is not a closure"));\r
}\r
\r
-SQRESULT sq_setnativeclosurename(HSQUIRRELVM v,int idx,const SQChar *name)\r
+SQRESULT sq_setnativeclosurename(HSQUIRRELVM v,SQInteger idx,const SQChar *name)\r
{\r
SQObject o = stack_get(v, idx);\r
if(sq_isnativeclosure(o)) {\r
return sq_throwerror(v,_SC("the object is not a nativeclosure"));\r
}\r
\r
-SQRESULT sq_setparamscheck(HSQUIRRELVM v,int nparamscheck,const SQChar *typemask)\r
+SQRESULT sq_setparamscheck(HSQUIRRELVM v,SQInteger nparamscheck,const SQChar *typemask)\r
{\r
SQObject o = stack_get(v, -1);\r
if(!sq_isnativeclosure(o))\r
else {\r
nc->_typecheck.resize(0);\r
}\r
+ if(nparamscheck == SQ_MATCHTYPEMASKSTRING) {\r
+ nc->_nparamscheck = nc->_typecheck.size();\r
+ }\r
return SQ_OK;\r
}\r
\r
return v->_foreignptr;\r
}\r
\r
-void sq_push(HSQUIRRELVM v,int idx)\r
+void sq_push(HSQUIRRELVM v,SQInteger idx)\r
{\r
v->Push(stack_get(v, idx));\r
}\r
\r
-SQObjectType sq_gettype(HSQUIRRELVM v,int idx)\r
+SQObjectType sq_gettype(HSQUIRRELVM v,SQInteger idx)\r
{\r
return type(stack_get(v, idx));\r
}\r
\r
-SQRESULT sq_getinteger(HSQUIRRELVM v,int idx,SQInteger *i)\r
+void sq_tostring(HSQUIRRELVM v,SQInteger idx)\r
+{\r
+ SQObjectPtr &o = stack_get(v, idx);\r
+ SQObjectPtr res;\r
+ v->ToString(o,res);\r
+ v->Push(res);\r
+}\r
+\r
+SQRESULT sq_getinteger(HSQUIRRELVM v,SQInteger idx,SQInteger *i)\r
{\r
SQObjectPtr &o = stack_get(v, idx);\r
if(sq_isnumeric(o)) {\r
return SQ_ERROR;\r
}\r
\r
-SQRESULT sq_getfloat(HSQUIRRELVM v,int idx,SQFloat *f)\r
+SQRESULT sq_getfloat(HSQUIRRELVM v,SQInteger idx,SQFloat *f)\r
{\r
SQObjectPtr &o = stack_get(v, idx);\r
if(sq_isnumeric(o)) {\r
return SQ_ERROR;\r
}\r
\r
-SQRESULT sq_getbool(HSQUIRRELVM v,int idx,SQBool *b)\r
+SQRESULT sq_getbool(HSQUIRRELVM v,SQInteger idx,SQBool *b)\r
{\r
SQObjectPtr &o = stack_get(v, idx);\r
if(sq_isbool(o)) {\r
return SQ_ERROR;\r
}\r
\r
-SQRESULT sq_getstring(HSQUIRRELVM v,int idx,const SQChar **c)\r
+SQRESULT sq_getstring(HSQUIRRELVM v,SQInteger idx,const SQChar **c)\r
{\r
SQObjectPtr *o = NULL;\r
_GETSAFE_OBJ(v, idx, OT_STRING,o);\r
return SQ_OK;\r
}\r
\r
-SQRESULT sq_getthread(HSQUIRRELVM v,int idx,HSQUIRRELVM *thread)\r
+SQRESULT sq_getthread(HSQUIRRELVM v,SQInteger idx,HSQUIRRELVM *thread)\r
{\r
SQObjectPtr *o = NULL;\r
_GETSAFE_OBJ(v, idx, OT_THREAD,o);\r
return SQ_OK;\r
}\r
\r
-SQRESULT sq_clone(HSQUIRRELVM v,int idx)\r
+SQRESULT sq_clone(HSQUIRRELVM v,SQInteger idx)\r
{\r
SQObjectPtr &o = stack_get(v,idx);\r
v->Push(_null_);\r
return SQ_OK;\r
}\r
\r
-SQInteger sq_getsize(HSQUIRRELVM v, int idx)\r
+SQInteger sq_getsize(HSQUIRRELVM v, SQInteger idx)\r
{\r
SQObjectPtr &o = stack_get(v, idx);\r
SQObjectType type = type(o);\r
}\r
}\r
\r
-SQRESULT sq_getuserdata(HSQUIRRELVM v,int idx,SQUserPointer *p,unsigned int *typetag)\r
+SQRESULT sq_getuserdata(HSQUIRRELVM v,SQInteger idx,SQUserPointer *p,SQUserPointer *typetag)\r
{\r
SQObjectPtr *o = NULL;\r
_GETSAFE_OBJ(v, idx, OT_USERDATA,o);\r
return SQ_OK;\r
}\r
\r
-SQRESULT sq_settypetag(HSQUIRRELVM v,int idx,unsigned int typetag)\r
+SQRESULT sq_settypetag(HSQUIRRELVM v,SQInteger idx,SQUserPointer typetag)\r
{\r
SQObjectPtr &o = stack_get(v,idx);\r
switch(type(o)) {\r
return SQ_OK;\r
}\r
\r
-SQRESULT sq_gettypetag(HSQUIRRELVM v,int idx,unsigned int *typetag)\r
+SQRESULT sq_getobjtypetag(HSQOBJECT *o,SQUserPointer * typetag)\r
+{\r
+ switch(type(*o)) {\r
+ case OT_INSTANCE: *typetag = _instance(*o)->_class->_typetag; break;\r
+ case OT_USERDATA: *typetag = _userdata(*o)->_typetag; break;\r
+ case OT_CLASS: *typetag = _class(*o)->_typetag; break;\r
+ default: return SQ_ERROR;\r
+ }\r
+ return SQ_OK;\r
+}\r
+\r
+SQRESULT sq_gettypetag(HSQUIRRELVM v,SQInteger idx,SQUserPointer *typetag)\r
{\r
SQObjectPtr &o = stack_get(v,idx);\r
- switch(type(o)) {\r
- case OT_USERDATA: *typetag = _userdata(o)->_typetag; break;\r
- case OT_CLASS: *typetag = _class(o)->_typetag; break;\r
- default: return sq_throwerror(v,_SC("invalid object type"));\r
- }\r
+ if(SQ_FAILED(sq_getobjtypetag(&o,typetag)))\r
+ return sq_throwerror(v,_SC("invalid object type"));\r
return SQ_OK;\r
}\r
\r
-SQRESULT sq_getuserpointer(HSQUIRRELVM v, int idx, SQUserPointer *p)\r
+SQRESULT sq_getuserpointer(HSQUIRRELVM v, SQInteger idx, SQUserPointer *p)\r
{\r
SQObjectPtr *o = NULL;\r
_GETSAFE_OBJ(v, idx, OT_USERPOINTER,o);\r
return SQ_OK;\r
}\r
\r
-SQRESULT sq_setinstanceup(HSQUIRRELVM v, int idx, SQUserPointer p)\r
+SQRESULT sq_setinstanceup(HSQUIRRELVM v, SQInteger idx, SQUserPointer p)\r
{\r
SQObjectPtr &o = stack_get(v,idx);\r
if(type(o) != OT_INSTANCE) return sq_throwerror(v,_SC("the object is not a class instance"));\r
return SQ_OK;\r
}\r
\r
-SQRESULT sq_getinstanceup(HSQUIRRELVM v, int idx, SQUserPointer *p,unsigned int typetag)\r
+SQRESULT sq_getinstanceup(HSQUIRRELVM v, SQInteger idx, SQUserPointer *p,SQUserPointer typetag)\r
{\r
SQObjectPtr &o = stack_get(v,idx);\r
if(type(o) != OT_INSTANCE) return sq_throwerror(v,_SC("the object is not a class instance"));\r
return SQ_OK;\r
}\r
\r
-int sq_gettop(HSQUIRRELVM v)\r
+SQInteger sq_gettop(HSQUIRRELVM v)\r
{\r
return (v->_top) - v->_stackbase;\r
}\r
\r
-void sq_settop(HSQUIRRELVM v, int newtop)\r
+void sq_settop(HSQUIRRELVM v, SQInteger newtop)\r
{\r
- int top = sq_gettop(v);\r
+ SQInteger top = sq_gettop(v);\r
if(top > newtop)\r
sq_pop(v, top - newtop);\r
else\r
while(top < newtop) sq_pushnull(v);\r
}\r
\r
-void sq_pop(HSQUIRRELVM v, int nelemstopop)\r
+void sq_pop(HSQUIRRELVM v, SQInteger nelemstopop)\r
{\r
assert(v->_top >= nelemstopop);\r
v->Pop(nelemstopop);\r
}\r
\r
-void sq_remove(HSQUIRRELVM v, int idx)\r
+void sq_poptop(HSQUIRRELVM v)\r
+{\r
+ assert(v->_top >= 1);\r
+ v->Pop();\r
+}\r
+\r
+\r
+void sq_remove(HSQUIRRELVM v, SQInteger idx)\r
{\r
v->Remove(idx);\r
}\r
\r
-int sq_cmp(HSQUIRRELVM v)\r
+SQInteger sq_cmp(HSQUIRRELVM v)\r
{\r
- int res;\r
+ SQInteger res;\r
v->ObjCmp(stack_get(v, -1), stack_get(v, -2),res);\r
return res;\r
}\r
\r
-SQRESULT sq_createslot(HSQUIRRELVM v, int idx)\r
+SQRESULT sq_createslot(HSQUIRRELVM v, SQInteger idx)\r
{\r
sq_aux_paramscheck(v, 3);\r
SQObjectPtr &self = stack_get(v, idx);\r
return SQ_OK;\r
}\r
\r
-SQRESULT sq_deleteslot(HSQUIRRELVM v,int idx,SQBool pushval)\r
+SQRESULT sq_deleteslot(HSQUIRRELVM v,SQInteger idx,SQBool pushval)\r
{\r
sq_aux_paramscheck(v, 2);\r
SQObjectPtr *self;\r
return SQ_OK;\r
}\r
\r
-SQRESULT sq_set(HSQUIRRELVM v,int idx)\r
+SQRESULT sq_set(HSQUIRRELVM v,SQInteger idx)\r
{\r
SQObjectPtr &self = stack_get(v, idx);\r
if(v->Set(self, v->GetUp(-2), v->GetUp(-1),false)) {\r
v->Raise_IdxError(v->GetUp(-2));return SQ_ERROR;\r
}\r
\r
-SQRESULT sq_rawset(HSQUIRRELVM v,int idx)\r
+SQRESULT sq_rawset(HSQUIRRELVM v,SQInteger idx)\r
{\r
SQObjectPtr &self = stack_get(v, idx);\r
if(type(v->GetUp(-2)) == OT_NULL) return sq_throwerror(v, _SC("null key"));\r
break;\r
default:\r
v->Pop(2);\r
- return sq_throwerror(v, _SC("rawset works only on arrays,tables,calsses and instances"));\r
+ return sq_throwerror(v, _SC("rawset works only on array/table/calsse and instance"));\r
}\r
v->Raise_IdxError(v->GetUp(-2));return SQ_ERROR;\r
}\r
\r
-SQRESULT sq_setdelegate(HSQUIRRELVM v,int idx)\r
+SQRESULT sq_setdelegate(HSQUIRRELVM v,SQInteger idx)\r
{\r
SQObjectPtr &self = stack_get(v, idx);\r
SQObjectPtr &mt = v->GetUp(-1);\r
return SQ_OK;\r
}\r
\r
-SQRESULT sq_rawdeleteslot(HSQUIRRELVM v,int idx,SQBool pushval)\r
+SQRESULT sq_rawdeleteslot(HSQUIRRELVM v,SQInteger idx,SQBool pushval)\r
{\r
sq_aux_paramscheck(v, 2);\r
SQObjectPtr *self;\r
return SQ_OK;\r
}\r
\r
-SQRESULT sq_getdelegate(HSQUIRRELVM v,int idx)\r
+SQRESULT sq_getdelegate(HSQUIRRELVM v,SQInteger idx)\r
{\r
SQObjectPtr &self=stack_get(v,idx);\r
switch(type(self)){\r
return sq_throwerror(v,_SC("wrong type"));\r
}\r
\r
-SQRESULT sq_get(HSQUIRRELVM v,int idx)\r
+SQRESULT sq_get(HSQUIRRELVM v,SQInteger idx)\r
{\r
SQObjectPtr &self=stack_get(v,idx);\r
if(v->Get(self,v->GetUp(-1),v->GetUp(-1),false,false))\r
return sq_throwerror(v,_SC("the index doesn't exist"));\r
}\r
\r
-SQRESULT sq_rawget(HSQUIRRELVM v,int idx)\r
+SQRESULT sq_rawget(HSQUIRRELVM v,SQInteger idx)\r
{\r
SQObjectPtr &self=stack_get(v,idx);\r
switch(type(self)) {\r
break;\r
default:\r
v->Pop(1);\r
- return sq_throwerror(v,_SC("rawget works only on arrays and tables"));\r
+ return sq_throwerror(v,_SC("rawget works only on array/table/instance and class"));\r
} \r
v->Pop(1);\r
return sq_throwerror(v,_SC("the index doesn't exist"));\r
}\r
\r
-SQRESULT sq_getstackobj(HSQUIRRELVM v,int idx,HSQOBJECT *po)\r
+SQRESULT sq_getstackobj(HSQUIRRELVM v,SQInteger idx,HSQOBJECT *po)\r
{\r
*po=stack_get(v,idx);\r
return SQ_OK;\r
}\r
\r
-const SQChar *sq_getlocal(HSQUIRRELVM v,unsigned int level,unsigned int idx)\r
+const SQChar *sq_getlocal(HSQUIRRELVM v,SQUnsignedInteger level,SQUnsignedInteger idx)\r
{\r
- unsigned int cstksize=v->_callsstack.size();\r
- unsigned int lvl=(cstksize-level)-1;\r
- int stackbase=v->_stackbase;\r
+ SQUnsignedInteger cstksize=v->_callsstack.size();\r
+ SQUnsignedInteger lvl=(cstksize-level)-1;\r
+ SQInteger stackbase=v->_stackbase;\r
if(lvl<cstksize){\r
- for(unsigned int i=0;i<level;i++){\r
+ for(SQUnsignedInteger i=0;i<level;i++){\r
SQVM::CallInfo &ci=v->_callsstack[(cstksize-i)-1];\r
stackbase-=ci._prevstkbase;\r
}\r
v->Push(v->_lasterror);\r
}\r
\r
-void sq_reservestack(HSQUIRRELVM v,int nsize)\r
+void sq_reservestack(HSQUIRRELVM v,SQInteger nsize)\r
{\r
- if (((unsigned int)v->_top + nsize) > v->_stack.size()) {\r
+ if (((SQUnsignedInteger)v->_top + nsize) > v->_stack.size()) {\r
v->_stack.resize(v->_stack.size() + ((v->_top + nsize) - v->_stack.size()));\r
}\r
}\r
return sq_throwerror(v,_SC("only generators can be resumed"));\r
}\r
\r
-SQRESULT sq_call(HSQUIRRELVM v,int params,SQBool retval)\r
+SQRESULT sq_call(HSQUIRRELVM v,SQInteger params,SQBool retval)\r
{\r
SQObjectPtr res;\r
if(v->Call(v->GetUp(-(params+1)),params,v->_top-params,res)){\r
return SQ_OK;\r
}\r
\r
-void sq_setreleasehook(HSQUIRRELVM v,int idx,SQRELEASEHOOK hook)\r
+void sq_setreleasehook(HSQUIRRELVM v,SQInteger idx,SQRELEASEHOOK hook)\r
{\r
if(sq_gettop(v) >= 1){\r
SQObjectPtr &ud=stack_get(v,idx);\r
return SQ_OK;\r
}\r
\r
-SQChar *sq_getscratchpad(HSQUIRRELVM v,int minsize)\r
+SQChar *sq_getscratchpad(HSQUIRRELVM v,SQInteger minsize)\r
{\r
return _ss(v)->GetScratchPad(minsize);\r
}\r
\r
-int sq_collectgarbage(HSQUIRRELVM v)\r
+SQInteger sq_collectgarbage(HSQUIRRELVM v)\r
{\r
#ifndef NO_GARBAGE_COLLECTOR\r
return _ss(v)->CollectGarbage(v);\r
#endif\r
}\r
\r
-SQRESULT sq_setfreevariable(HSQUIRRELVM v,int idx,unsigned int nval)\r
+const SQChar *sq_getfreevariable(HSQUIRRELVM v,SQInteger idx,SQUnsignedInteger nval)\r
+{\r
+ SQObjectPtr &self = stack_get(v,idx);\r
+ const SQChar *name = NULL;\r
+ if(type(self) == OT_CLOSURE) {\r
+ if(_closure(self)->_outervalues.size()>nval) {\r
+ v->Push(_closure(self)->_outervalues[nval]);\r
+ SQFunctionProto *fp = _funcproto(_closure(self)->_function);\r
+ SQOuterVar &ov = fp->_outervalues[nval];\r
+ name = _stringval(ov._name);\r
+ }\r
+ }\r
+ return name;\r
+}\r
+\r
+SQRESULT sq_setfreevariable(HSQUIRRELVM v,SQInteger idx,SQUnsignedInteger nval)\r
{\r
SQObjectPtr &self=stack_get(v,idx);\r
switch(type(self))\r
return SQ_OK;\r
}\r
\r
-SQRESULT sq_setattributes(HSQUIRRELVM v,int idx)\r
+SQRESULT sq_setattributes(HSQUIRRELVM v,SQInteger idx)\r
{\r
SQObjectPtr *o = NULL;\r
_GETSAFE_OBJ(v, idx, OT_CLASS,o);\r
return sq_throwerror(v,_SC("wrong index"));\r
}\r
\r
-SQRESULT sq_getattributes(HSQUIRRELVM v,int idx)\r
+SQRESULT sq_getattributes(HSQUIRRELVM v,SQInteger idx)\r
{\r
SQObjectPtr *o = NULL;\r
_GETSAFE_OBJ(v, idx, OT_CLASS,o);\r
return sq_throwerror(v,_SC("wrong index"));\r
}\r
\r
-SQRESULT sq_getclass(HSQUIRRELVM v,int idx)\r
+SQRESULT sq_getclass(HSQUIRRELVM v,SQInteger idx)\r
{\r
SQObjectPtr *o = NULL;\r
_GETSAFE_OBJ(v, idx, OT_INSTANCE,o);\r
return SQ_OK;\r
}\r
\r
-SQRESULT sq_createinstance(HSQUIRRELVM v,int idx)\r
+SQRESULT sq_createinstance(HSQUIRRELVM v,SQInteger idx)\r
{\r
SQObjectPtr *o = NULL;\r
_GETSAFE_OBJ(v, idx, OT_CLASS,o);\r
return SQ_OK;\r
}\r
\r
-SQRESULT sq_next(HSQUIRRELVM v,int idx)\r
+void sq_weakref(HSQUIRRELVM v,SQInteger idx)\r
+{\r
+ SQObject &o=stack_get(v,idx);\r
+ if(ISREFCOUNTED(type(o))) {\r
+ v->Push(_refcounted(o)->GetWeakRef(type(o)));\r
+ return;\r
+ }\r
+ v->Push(o);\r
+}\r
+\r
+SQRESULT sq_getweakrefval(HSQUIRRELVM v,SQInteger idx)\r
+{\r
+ SQObjectPtr &o = stack_get(v,idx);\r
+ if(type(o) != OT_WEAKREF) {\r
+ return sq_throwerror(v,_SC("the object must be a weakref"));\r
+ }\r
+ v->Push(_weakref(o)->_obj);\r
+ return SQ_OK;\r
+}\r
+\r
+SQRESULT sq_next(HSQUIRRELVM v,SQInteger idx)\r
{\r
SQObjectPtr o=stack_get(v,idx),&refpos = stack_get(v,-1),realkey,val;\r
if(type(o) == OT_GENERATOR) {\r
\r
struct BufState{\r
const SQChar *buf;\r
- int ptr;\r
- int size;\r
+ SQInteger ptr;\r
+ SQInteger size;\r
};\r
\r
SQInteger buf_lexfeed(SQUserPointer file)\r
return buf->buf[buf->ptr++];\r
}\r
\r
-SQRESULT sq_compilebuffer(HSQUIRRELVM v,const SQChar *s,int size,const SQChar *sourcename,SQBool raiseerror) {\r
+SQRESULT sq_compilebuffer(HSQUIRRELVM v,const SQChar *s,SQInteger size,const SQChar *sourcename,SQBool raiseerror) {\r
BufState buf;\r
buf.buf = s;\r
buf.size = size;\r
return sq_compile(v, buf_lexfeed, &buf, sourcename, raiseerror);\r
}\r
\r
-void sq_move(HSQUIRRELVM dest,HSQUIRRELVM src,int idx)\r
+void sq_move(HSQUIRRELVM dest,HSQUIRRELVM src,SQInteger idx)\r
{\r
dest->Push(stack_get(src,idx));\r
}\r
return _ss(v)->_printfunc;\r
}\r
\r
-void *sq_malloc(unsigned int size)\r
+void *sq_malloc(SQUnsignedInteger size)\r
{\r
return SQ_MALLOC(size);\r
}\r
\r
-void *sq_realloc(void* p,unsigned int oldsize,unsigned int newsize)\r
+void *sq_realloc(void* p,SQUnsignedInteger oldsize,SQUnsignedInteger newsize)\r
{\r
return SQ_REALLOC(p,oldsize,newsize);\r
}\r
-void sq_free(void *p,unsigned int size)\r
+void sq_free(void *p,SQUnsignedInteger size)\r
{\r
SQ_FREE(p,size);\r
}\r
projects / supertux.git / blobdiff