thijn/SqMod
1
0
Fork 0
mirror of https://github.com/VCMP-SqMod/SqMod.git synced 2025-07-03 07:27:11 +02:00
Code Releases Activity

Updated the Squirrel library to include the latest changes straight from the repository.

Browse Source
This commit is contained in:
Sandu Liviu Catalin
2016-08-03 16:39:37 +03:00
parent c5192399e2
commit e0cd48e639
7 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
external/Squirrel/sqapi.cpp vendored
View File

@ -510,7 +510,7 @@ SQRESULT sq_setclosureroot(HSQUIRRELVM v,SQInteger idx)
v->Pop();
return SQ_OK;
}
return sq_throwerror(v, _SC("ivalid type"));
return sq_throwerror(v, _SC("invalid type"));
}
SQRESULT sq_getclosureroot(HSQUIRRELVM v,SQInteger idx)
@ -558,7 +558,7 @@ SQRESULT sq_setroottable(HSQUIRRELVM v)
v->Pop();
return SQ_OK;
}
return sq_throwerror(v, _SC("ivalid type"));
return sq_throwerror(v, _SC("invalid type"));
}
SQRESULT sq_setconsttable(HSQUIRRELVM v)
@ -569,7 +569,7 @@ SQRESULT sq_setconsttable(HSQUIRRELVM v)
v->Pop();
return SQ_OK;
}
return sq_throwerror(v, _SC("ivalid type, expected table"));
return sq_throwerror(v, _SC("invalid type, expected table"));
}
void sq_setforeignptr(HSQUIRRELVM v,SQUserPointer p)
@ -657,6 +657,10 @@ SQRESULT sq_getinteger(HSQUIRRELVM v,SQInteger idx,SQInteger *i)
*i = tointeger(o);
return SQ_OK;
}
if(sq_isbool(o)) {
*i = SQVM::IsFalse(o)?SQFalse:SQTrue;
return SQ_OK;
}
return SQ_ERROR;
}
@ -1164,7 +1168,7 @@ SQRESULT sq_call(HSQUIRRELVM v,SQInteger params,SQBool retval,SQBool raiseerror)
if(v->Call(v->GetUp(-(params+1)),params,v->_top-params,res,raiseerror?true:false)){
if(!v->_suspended) {
v->Pop(params);//pop closure and args
v->Pop(params);//pop args
}
if(retval){
v->Push(res); return SQ_OK;
@ -1239,7 +1243,7 @@ SQRESULT sq_writeclosure(HSQUIRRELVM v,SQWRITEFUNC w,SQUserPointer up)
_GETSAFE_OBJ(v, -1, OT_CLOSURE,o);
unsigned short tag = SQ_BYTECODE_STREAM_TAG;
if(_closure(*o)->_function->_noutervalues)
return sq_throwerror(v,_SC("a closure with free valiables bound it cannot be serialized"));
return sq_throwerror(v,_SC("a closure with free variables bound cannot be serialized"));
if(w(up,&tag,2) != 2)
return sq_throwerror(v,_SC("io error"));
if(!_closure(*o)->Save(v,up,w))