Changed the prototype of SquiLu extension functions from "SQInteger (*SQFUNCTION)(HSQUIRRELVM)" to "SQRESULT (*SQFUNCTION)(HSQUIRRELVM)" and update all functions to use SQRESULT for consistency.

ext/sq_axtls.c

@@ -25,14 +25,14 @@ static const SQChar SSL_Tag[]   = _SC("sq_axtls_ssl");
 #define GET_ssl_INSTANCE() SQ_GET_INSTANCE(v, 1, SSL, SSL_Tag) \
     if(self == NULL) return sq_throwerror(v, _SC("ssl object already closed"));
 
-static SQInteger ssl_release_hook(SQUserPointer p, SQInteger size, HSQUIRRELVM v)
+static SQRESULT ssl_release_hook(SQUserPointer p, SQInteger size, HSQUIRRELVM v)
 {
     SSL *self = (SSL*)p;
     if(self) ssl_free(self);
 	return 0;
 }
 
-static SQInteger sq_ssl_free(HSQUIRRELVM v)
+static SQRESULT sq_ssl_free(HSQUIRRELVM v)
 {
     SQ_FUNC_VARS_NO_TOP(v);
     GET_ssl_INSTANCE();
@@ -41,7 +41,7 @@ static SQInteger sq_ssl_free(HSQUIRRELVM v)
 	return 0;
 }
 
-static SQInteger ssl_constructor(HSQUIRRELVM v, SSL *ssl, int free_on_gc)
+static SQRESULT ssl_constructor(HSQUIRRELVM v, SSL *ssl, int free_on_gc)
 {
     if(!ssl)
         return sq_throwerror(v, _SC("Could'nt create an ssl object."));
@@ -236,14 +236,14 @@ static int sq_axtls_get_error(HSQUIRRELVM v){
 	return 1;
 }
 
-static SQInteger ssl_ctx_release_hook(SQUserPointer p, SQInteger size, HSQUIRRELVM v)
+static SQRESULT ssl_ctx_release_hook(SQUserPointer p, SQInteger size, HSQUIRRELVM v)
 {
     SSL_CTX *self = (SSL_CTX*)p;
     if(self) ssl_ctx_free(self);
 	return 0;
 }
 
-static SQInteger sq_ssl_ctx_free(HSQUIRRELVM v)
+static SQRESULT sq_ssl_ctx_free(HSQUIRRELVM v)
 {
     SQ_FUNC_VARS_NO_TOP(v);
     GET_ssl_ctx_INSTANCE();
@@ -253,7 +253,7 @@ static SQInteger sq_ssl_ctx_free(HSQUIRRELVM v)
 }
 
 
-static SQInteger sq_ssl_ctx_constructor(HSQUIRRELVM v)
+static SQRESULT sq_ssl_ctx_constructor(HSQUIRRELVM v)
 {
 	SQInteger options, num_sessions;
     sq_getinteger(v, 2, &options);

ext/sq_mongoose.cpp

@@ -965,7 +965,7 @@ push_request(HSQUIRRELVM v, const struct mg_request_info *ri)
     sq_poptop(v); //remove data table
 }
 
-static SQInteger
+static SQRESULT
 sq_mg_pcall_master_plugin(HSQUIRRELVM v)
 {
 #if 0

ext/sq_sqlite3.cpp

@@ -758,7 +758,7 @@ static SQRESULT sq_sqlite3_stmt_asJsonObject(HSQUIRRELVM v) {
 
 static SQRESULT sle2array(HSQUIRRELVM v, const unsigned char *p, size_t sle_size, const unsigned char **next)
 {
-    size_t size, data_count = 1, data_len = 0;
+    size_t size, data_len = 0;
 
     if(sle_size == 0) {
         *next = 0;

ext/sqratimport.cpp

@@ -278,7 +278,7 @@ SQRESULT sqrat_import(HSQUIRRELVM v) {
     return res;
 }
 
-static SQInteger sqratbase_import(HSQUIRRELVM v) {
+static SQRESULT sqratbase_import(HSQUIRRELVM v) {
     SQInteger args = sq_gettop(v);
     switch(args) {
     case 2:

include/squirrel.h

@@ -309,8 +309,8 @@ typedef struct tagSQStackInfos{
 typedef struct SQVM* HSQUIRRELVM;
 typedef SQObject HSQOBJECT;
 typedef SQMemberHandle HSQMEMBERHANDLE;
-typedef SQInteger (*SQFUNCTION)(HSQUIRRELVM);
-typedef SQInteger (*SQRELEASEHOOK)(SQUserPointer ptr, SQInteger size, HSQUIRRELVM v);
+typedef SQRESULT (*SQFUNCTION)(HSQUIRRELVM);
+typedef SQRESULT (*SQRELEASEHOOK)(SQUserPointer ptr, SQInteger size, HSQUIRRELVM v);
 typedef void (*SQCOMPILERERROR)(HSQUIRRELVM,const SQChar * /*desc*/,const SQChar * /*source*/,SQInteger /*line*/,SQInteger /*column*/);
 typedef void (*SQPRINTFUNCTION)(HSQUIRRELVM,const SQChar * ,...);
 typedef void (*SQDEBUGHOOK)(HSQUIRRELVM /*v*/, SQInteger /*type*/, const SQChar * /*sourcename*/, SQInteger /*line*/, const SQChar * /*funcname*/);

sqstdlib/sqstdaux.cpp

@@ -96,7 +96,7 @@ void sqstd_printcallstack(HSQUIRRELVM v)
 	}
 }
 
-static SQInteger _sqstd_aux_printerror(HSQUIRRELVM v)
+static SQRESULT _sqstd_aux_printerror(HSQUIRRELVM v)
 {
 	SQPRINTFUNCTION pf = sq_geterrorfunc(v);
 	if(pf) {

sqstdlib/sqstdblob.cpp

@@ -121,7 +121,7 @@ bool SQBlob::SetLen(SQInteger len){
 		return sq_throwerror(v,_SC("the blob is invalid"));
 
 
-static SQInteger _blob_resize(HSQUIRRELVM v)
+static SQRESULT _blob_resize(HSQUIRRELVM v)
 {
 	SETUP_BLOB(v);
 	SQInteger size;
@@ -131,7 +131,7 @@ static SQInteger _blob_resize(HSQUIRRELVM v)
 	return 0;
 }
 
-static SQInteger _blob_reserve(HSQUIRRELVM v)
+static SQRESULT _blob_reserve(HSQUIRRELVM v)
 {
 	SETUP_BLOB(v);
 	SQInteger size;
@@ -154,7 +154,7 @@ static void __swap_word(unsigned short *n)
 	*n=(unsigned short)((*n>>8)&0x00FF)| ((*n<<8)&0xFF00);
 }
 
-static SQInteger _blob_swap4(HSQUIRRELVM v)
+static SQRESULT _blob_swap4(HSQUIRRELVM v)
 {
 	SETUP_BLOB(v);
 	SQInteger num=(self->Len()-(self->Len()%4))>>2;
@@ -165,7 +165,7 @@ static SQInteger _blob_swap4(HSQUIRRELVM v)
 	return 0;
 }
 
-static SQInteger _blob_swap2(HSQUIRRELVM v)
+static SQRESULT _blob_swap2(HSQUIRRELVM v)
 {
 	SETUP_BLOB(v);
 	SQInteger num=(self->Len()-(self->Len()%2))>>1;
@@ -176,7 +176,7 @@ static SQInteger _blob_swap2(HSQUIRRELVM v)
 	return 0;
 }
 
-static SQInteger _blob_memset(HSQUIRRELVM v)
+static SQRESULT _blob_memset(HSQUIRRELVM v)
 {
     SQ_FUNC_VARS_NO_TOP(v);
 	SETUP_BLOB(v);
@@ -191,7 +191,7 @@ static SQInteger _blob_memset(HSQUIRRELVM v)
 	return 0;
 }
 
-static SQInteger _blob__set(HSQUIRRELVM v)
+static SQRESULT _blob__set(HSQUIRRELVM v)
 {
 	SETUP_BLOB(v);
 	SQInteger idx,val;
@@ -204,7 +204,7 @@ static SQInteger _blob__set(HSQUIRRELVM v)
 	return 1;
 }
 
-static SQInteger _blob__get(HSQUIRRELVM v)
+static SQRESULT _blob__get(HSQUIRRELVM v)
 {
 	SETUP_BLOB(v);
 	SQInteger idx;
@@ -221,7 +221,7 @@ static SQInteger _blob__get(HSQUIRRELVM v)
 	return 1;
 }
 
-static SQInteger _blob__nexti(HSQUIRRELVM v)
+static SQRESULT _blob__nexti(HSQUIRRELVM v)
 {
 	SETUP_BLOB(v);
 	if(sq_gettype(v,2) == OT_NULL) {
@@ -240,13 +240,13 @@ static SQInteger _blob__nexti(HSQUIRRELVM v)
 	return sq_throwerror(v,_SC("internal error (_nexti) wrong argument type"));
 }
 
-static SQInteger _blob__typeof(HSQUIRRELVM v)
+static SQRESULT _blob__typeof(HSQUIRRELVM v)
 {
 	sq_pushstring(v,_SC("blob"),-1);
 	return 1;
 }
 
-static SQInteger _blob_releasehook(SQUserPointer p, SQInteger size, HSQUIRRELVM v)
+static SQRESULT _blob_releasehook(SQUserPointer p, SQInteger size, HSQUIRRELVM v)
 {
 	SQBlob *self = (SQBlob*)p;
 	self->~SQBlob();
@@ -254,7 +254,7 @@ static SQInteger _blob_releasehook(SQUserPointer p, SQInteger size, HSQUIRRELVM
 	return 1;
 }
 
-static SQInteger _blob_constructor(HSQUIRRELVM v)
+static SQRESULT _blob_constructor(HSQUIRRELVM v)
 {
 	SQInteger nparam = sq_gettop(v);
 	SQInteger size = 0, allocate = 0;
@@ -278,7 +278,7 @@ static SQInteger _blob_constructor(HSQUIRRELVM v)
 	return 0;
 }
 
-static SQInteger _blob__cloned(HSQUIRRELVM v)
+static SQRESULT _blob__cloned(HSQUIRRELVM v)
 {
 	SQBlob *other = NULL;
 	{
@@ -297,19 +297,19 @@ static SQInteger _blob__cloned(HSQUIRRELVM v)
 	return 0;
 }
 
-static SQInteger _blob__tostring(HSQUIRRELVM v)
+static SQRESULT _blob__tostring(HSQUIRRELVM v)
 {
     SETUP_BLOB(v);
 	sq_pushstring(v, (const SQChar*)self->GetBuf(), self->Len());
 	return 1;
 }
 
-static SQInteger _blob_tostring(HSQUIRRELVM v)
+static SQRESULT _blob_tostring(HSQUIRRELVM v)
 {
     return _blob__tostring(v);
 }
 
-static SQInteger _blob_setLen(HSQUIRRELVM v)
+static SQRESULT _blob_setLen(HSQUIRRELVM v)
 {
     SQ_FUNC_VARS_NO_TOP(v);
     SETUP_BLOB(v);
@@ -318,7 +318,7 @@ static SQInteger _blob_setLen(HSQUIRRELVM v)
     return 0;
 }
 
-static SQInteger _blob_clear(HSQUIRRELVM v)
+static SQRESULT _blob_clear(HSQUIRRELVM v)
 {
     SETUP_BLOB(v);
     self->SetLen(0);
@@ -349,7 +349,7 @@ static SQRegFunction _blob_methods[] = {
 
 //GLOBAL FUNCTIONS
 
-static SQInteger _g_blob_casti2f(HSQUIRRELVM v)
+static SQRESULT _g_blob_casti2f(HSQUIRRELVM v)
 {
 	SQInteger i;
 	sq_getinteger(v,2,&i);
@@ -357,7 +357,7 @@ static SQInteger _g_blob_casti2f(HSQUIRRELVM v)
 	return 1;
 }
 
-static SQInteger _g_blob_castf2i(HSQUIRRELVM v)
+static SQRESULT _g_blob_castf2i(HSQUIRRELVM v)
 {
 	SQFloat f;
 	sq_getfloat(v,2,&f);
@@ -365,7 +365,7 @@ static SQInteger _g_blob_castf2i(HSQUIRRELVM v)
 	return 1;
 }
 
-static SQInteger _g_blob_swap2(HSQUIRRELVM v)
+static SQRESULT _g_blob_swap2(HSQUIRRELVM v)
 {
 	SQInteger i;
 	sq_getinteger(v,2,&i);
@@ -374,7 +374,7 @@ static SQInteger _g_blob_swap2(HSQUIRRELVM v)
 	return 1;
 }
 
-static SQInteger _g_blob_swap4(HSQUIRRELVM v)
+static SQRESULT _g_blob_swap4(HSQUIRRELVM v)
 {
 	SQInteger i;
 	sq_getinteger(v,2,&i);
@@ -384,7 +384,7 @@ static SQInteger _g_blob_swap4(HSQUIRRELVM v)
 	return 1;
 }
 
-static SQInteger _g_blob_swapfloat(HSQUIRRELVM v)
+static SQRESULT _g_blob_swapfloat(HSQUIRRELVM v)
 {
 	SQFloat f;
 	sq_getfloat(v,2,&f);

sqstdlib/sqstdio.cpp

@@ -110,13 +110,13 @@ private:
 	bool _owns;
 };
 
-static SQInteger _file__typeof(HSQUIRRELVM v)
+static SQRESULT _file__typeof(HSQUIRRELVM v)
 {
 	sq_pushstring(v,_SC("file"),-1);
 	return 1;
 }
 
-static SQInteger _file_releasehook(SQUserPointer p, SQInteger size, HSQUIRRELVM v)
+static SQRESULT _file_releasehook(SQUserPointer p, SQInteger size, HSQUIRRELVM v)
 {
 	SQFile *self = (SQFile*)p;
 	self->~SQFile();
@@ -124,7 +124,7 @@ static SQInteger _file_releasehook(SQUserPointer p, SQInteger size, HSQUIRRELVM
 	return 1;
 }
 
-static SQInteger _file_constructor(HSQUIRRELVM v)
+static SQRESULT _file_constructor(HSQUIRRELVM v)
 {
 	const SQChar *filename,*mode;
 	bool owns = true;
@@ -152,7 +152,7 @@ static SQInteger _file_constructor(HSQUIRRELVM v)
 	return 0;
 }
 
-static SQInteger _file_close(HSQUIRRELVM v)
+static SQRESULT _file_close(HSQUIRRELVM v)
 {
 	SQFile *self = NULL;
 	if(SQ_SUCCEEDED(sq_getinstanceup(v,1,(SQUserPointer*)&self,(SQUserPointer)SQSTD_FILE_TYPE_TAG))
@@ -210,7 +210,7 @@ SQRESULT sqstd_getfile(HSQUIRRELVM v, SQInteger idx, SQFILE *file)
 
 
 
-static SQInteger _io_file_lexfeed_PLAIN(SQUserPointer file)
+static SQRESULT _io_file_lexfeed_PLAIN(SQUserPointer file)
 {
 	SQInteger ret;
 	char c;
@@ -220,7 +220,7 @@ static SQInteger _io_file_lexfeed_PLAIN(SQUserPointer file)
 }
 
 #ifdef SQUNICODE
-static SQInteger _io_file_lexfeed_UTF8(SQUserPointer file)
+static SQRESULT _io_file_lexfeed_UTF8(SQUserPointer file)
 {
 #define READ() \
 	if(sqstd_fread(&inchar,sizeof(inchar),1,(FILE *)file) != 1) \
@@ -258,7 +258,7 @@ static SQInteger _io_file_lexfeed_UTF8(SQUserPointer file)
 }
 #endif
 
-static SQInteger _io_file_lexfeed_UCS2_LE(SQUserPointer file)
+static SQRESULT _io_file_lexfeed_UCS2_LE(SQUserPointer file)
 {
 	SQInteger ret;
 	wchar_t c;
@@ -267,7 +267,7 @@ static SQInteger _io_file_lexfeed_UCS2_LE(SQUserPointer file)
 	return 0;
 }
 
-static SQInteger _io_file_lexfeed_UCS2_BE(SQUserPointer file)
+static SQRESULT _io_file_lexfeed_UCS2_BE(SQUserPointer file)
 {
 	SQInteger ret;
 	unsigned short c;

sqstdlib/sqstdmath.cpp

@@ -4,14 +4,14 @@
 #include <stdlib.h>
 #include <sqstdmath.h>
 
-#define SINGLE_ARG_FUNC(_funcname) static SQInteger math_##_funcname(HSQUIRRELVM v){ \
+#define SINGLE_ARG_FUNC(_funcname) static SQRESULT math_##_funcname(HSQUIRRELVM v){ \
 	SQFloat f; \
 	sq_getfloat(v,2,&f); \
 	sq_pushfloat(v,(SQFloat)_funcname(f)); \
 	return 1; \
 }
 
-#define TWO_ARGS_FUNC(_funcname) static SQInteger math_##_funcname(HSQUIRRELVM v){ \
+#define TWO_ARGS_FUNC(_funcname) static SQRESULT math_##_funcname(HSQUIRRELVM v){ \
 	SQFloat p1,p2; \
 	sq_getfloat(v,2,&p1); \
 	sq_getfloat(v,3,&p2); \
@@ -19,7 +19,7 @@
 	return 1; \
 }
 
-static SQInteger math_srand(HSQUIRRELVM v)
+static SQRESULT math_srand(HSQUIRRELVM v)
 {
 	SQInteger i;
 	if(SQ_FAILED(sq_getinteger(v,2,&i)))
@@ -28,7 +28,7 @@ static SQInteger math_srand(HSQUIRRELVM v)
 	return 0;
 }
 
-static SQInteger math_rand(HSQUIRRELVM v)
+static SQRESULT math_rand(HSQUIRRELVM v)
 {
 	sq_pushinteger(v,rand());
 	return 1;
@@ -53,7 +53,7 @@ static int math_random(HSQUIRRELVM v) {
   return 1;
 }
 
-static SQInteger math_abs(HSQUIRRELVM v)
+static SQRESULT math_abs(HSQUIRRELVM v)
 {
 	SQInteger n;
 	sq_getinteger(v,2,&n);

sqstdlib/sqstdstring.cpp

@@ -11,7 +11,7 @@
 #define MAX_WFORMAT_LEN	3
 #define ADDITIONAL_FORMAT_SPACE (100*sizeof(SQChar))
 
-static SQInteger validate_format(HSQUIRRELVM v, SQChar *fmt, const SQChar *src, SQInteger n,SQInteger &width)
+static SQRESULT validate_format(HSQUIRRELVM v, SQChar *fmt, const SQChar *src, SQInteger n,SQInteger &width)
 {
 	SQChar swidth[MAX_WFORMAT_LEN];
 	SQInteger wc = 0;
@@ -199,7 +199,7 @@ SQRESULT sqstd_format(HSQUIRRELVM v,SQInteger nformatstringidx,SQInteger *outlen
 	return SQ_OK;
 }
 
-static SQInteger _string_format(HSQUIRRELVM v)
+static SQRESULT _string_format(HSQUIRRELVM v)
 {
 	SQChar *dest = NULL;
 	SQInteger length = 0;
@@ -209,7 +209,7 @@ static SQInteger _string_format(HSQUIRRELVM v)
 	return 1;
 }
 
-static SQInteger _string_printf(HSQUIRRELVM v)
+static SQRESULT _string_printf(HSQUIRRELVM v)
 {
 	SQChar *dest = NULL;
 	SQInteger length = 0;
@@ -228,14 +228,14 @@ static SQInteger _string_printf(HSQUIRRELVM v)
 	SQRex *self = NULL; \
 	sq_getinstanceup(v,1,(SQUserPointer *)&self,0);
 
-static SQInteger _rexobj_releasehook(SQUserPointer p, SQInteger size, HSQUIRRELVM v)
+static SQRESULT _rexobj_releasehook(SQUserPointer p, SQInteger size, HSQUIRRELVM v)
 {
 	SQRex *self = ((SQRex *)p);
 	sqstd_rex_free(self);
 	return 1;
 }
 
-static SQInteger _regexp_match(HSQUIRRELVM v)
+static SQRESULT _regexp_match(HSQUIRRELVM v)
 {
 	SETUP_REX(v);
 	const SQChar *str;
@@ -249,7 +249,7 @@ static SQInteger _regexp_match(HSQUIRRELVM v)
 	return 1;
 }
 
-static SQInteger _regexp_gmatch(HSQUIRRELVM v)
+static SQRESULT _regexp_gmatch(HSQUIRRELVM v)
 {
 	SETUP_REX(v);
 	const SQChar *str;
@@ -278,7 +278,7 @@ static SQInteger _regexp_gmatch(HSQUIRRELVM v)
 }
 
 #include "sqstdblobimpl.h"
-static SQInteger _regexp_gsub(HSQUIRRELVM v)
+static SQRESULT _regexp_gsub(HSQUIRRELVM v)
 {
 	SETUP_REX(v);
 	const SQChar *str;
@@ -364,7 +364,7 @@ static void _addrexmatch(HSQUIRRELVM v,const SQChar *str,const SQChar *begin,con
 	sq_rawset(v,-3);
 }
 
-static SQInteger _regexp_search(HSQUIRRELVM v)
+static SQRESULT _regexp_search(HSQUIRRELVM v)
 {
 	SETUP_REX(v);
 	const SQChar *str,*begin,*end;
@@ -378,7 +378,7 @@ static SQInteger _regexp_search(HSQUIRRELVM v)
 	return 0;
 }
 
-static SQInteger _regexp_capture(HSQUIRRELVM v)
+static SQRESULT _regexp_capture(HSQUIRRELVM v)
 {
 	SETUP_REX(v);
 	const SQChar *str,*begin,*end;
@@ -402,7 +402,7 @@ static SQInteger _regexp_capture(HSQUIRRELVM v)
 	return 0;
 }
 
-static SQInteger _regexp_xcapture(HSQUIRRELVM v)
+static SQRESULT _regexp_xcapture(HSQUIRRELVM v)
 {
 	SETUP_REX(v);
 	const SQChar *str,*begin,*end;
@@ -416,7 +416,7 @@ static SQInteger _regexp_xcapture(HSQUIRRELVM v)
 	return 0;
 }
 
-static SQInteger _regexp_getxcapture(HSQUIRRELVM v)
+static SQRESULT _regexp_getxcapture(HSQUIRRELVM v)
 {
 	SETUP_REX(v);
 	SQInteger n, start;
@@ -437,14 +437,14 @@ static SQInteger _regexp_getxcapture(HSQUIRRELVM v)
 	return 0;
 }
 
-static SQInteger _regexp_subexpcount(HSQUIRRELVM v)
+static SQRESULT _regexp_subexpcount(HSQUIRRELVM v)
 {
 	SETUP_REX(v);
 	sq_pushinteger(v,sqstd_rex_getsubexpcount(self));
 	return 1;
 }
 
-static SQInteger _regexp_constructor(HSQUIRRELVM v)
+static SQRESULT _regexp_constructor(HSQUIRRELVM v)
 {
 	const SQChar *error,*pattern;
 	sq_getstring(v,2,&pattern);
@@ -455,7 +455,7 @@ static SQInteger _regexp_constructor(HSQUIRRELVM v)
 	return 0;
 }
 
-static SQInteger _regexp__typeof(HSQUIRRELVM v)
+static SQRESULT _regexp__typeof(HSQUIRRELVM v)
 {
 	sq_pushstring(v,_SC("regexp"),-1);
 	return 1;

sqstdlib/sqstdsystem.cpp

@@ -31,7 +31,7 @@
 
 SQ_OPT_STRING_STRLEN();
 
-static SQInteger _system_getenv(HSQUIRRELVM v)
+static SQRESULT _system_getenv(HSQUIRRELVM v)
 {
 	const SQChar *s;
 	if(SQ_SUCCEEDED(sq_getstring(v,2,&s))){
@@ -42,7 +42,7 @@ static SQInteger _system_getenv(HSQUIRRELVM v)
 }
 
 
-static SQInteger _system_system(HSQUIRRELVM v)
+static SQRESULT _system_system(HSQUIRRELVM v)
 {
 	const SQChar *s;
 	if(SQ_SUCCEEDED(sq_getstring(v,2,&s))){
@@ -53,14 +53,14 @@ static SQInteger _system_system(HSQUIRRELVM v)
 }
 
 
-static SQInteger _system_clock(HSQUIRRELVM v)
+static SQRESULT _system_clock(HSQUIRRELVM v)
 {
 	sq_pushfloat(v,((SQFloat)clock())/(SQFloat)CLOCKS_PER_SEC);
 	return 1;
 }
 
 /*
-static SQInteger _system_time(HSQUIRRELVM v)
+static SQRESULT _system_time(HSQUIRRELVM v)
 {
 	time_t t;
 	time(&t);
@@ -69,7 +69,7 @@ static SQInteger _system_time(HSQUIRRELVM v)
 }
 */
 
-static SQInteger get_int_field (HSQUIRRELVM v, const SQChar *key, int dflt) {
+static SQRESULT get_int_field (HSQUIRRELVM v, const SQChar *key, int dflt) {
     SQInteger res;
     SQObjectType stype;
     sq_pushstring(v, key, -1);
@@ -86,7 +86,7 @@ static SQInteger get_int_field (HSQUIRRELVM v, const SQChar *key, int dflt) {
   return dflt;
 }
 
-static SQInteger _system_time(HSQUIRRELVM v) {
+static SQRESULT _system_time(HSQUIRRELVM v) {
   time_t t;
   if (sq_gettop(v) == 1)  /* called without args? */
     t = time(NULL);  /* get current time */
@@ -145,7 +145,7 @@ static SQRESULT _system_difftime (HSQUIRRELVM v) {
   return 1;
 }
 
-static SQInteger _system_remove(HSQUIRRELVM v)
+static SQRESULT _system_remove(HSQUIRRELVM v)
 {
 	const SQChar *s;
 	sq_getstring(v,2,&s);
@@ -154,7 +154,7 @@ static SQInteger _system_remove(HSQUIRRELVM v)
 	return 0;
 }
 
-static SQInteger _system_rename(HSQUIRRELVM v)
+static SQRESULT _system_rename(HSQUIRRELVM v)
 {
 	const SQChar *oldn,*newn;
 	sq_getstring(v,2,&oldn);
@@ -171,7 +171,7 @@ static void _set_integer_slot(HSQUIRRELVM v,const SQChar *name,SQInteger val)
 	sq_rawset(v,-3);
 }
 
-static SQInteger _system_date(HSQUIRRELVM v)
+static SQRESULT _system_date(HSQUIRRELVM v)
 {
     SQ_FUNC_VARS(v);
     SQ_OPT_STRING(v, 2, arg_format, _SC("%c"));

squirrel/sqbaselib.cpp

@@ -40,38 +40,38 @@ bool str2num(const SQChar *s,SQObjectPtr &res, SQInteger base=10)
 	return true;
 }
 
-static SQInteger base_dummy(HSQUIRRELVM v)
+static SQRESULT base_dummy(HSQUIRRELVM v)
 {
 	return 0;
 }
 
 #ifndef NO_GARBAGE_COLLECTOR
-static SQInteger base_collectgarbage(HSQUIRRELVM v)
+static SQRESULT base_collectgarbage(HSQUIRRELVM v)
 {
 	sq_pushinteger(v, sq_collectgarbage(v));
 	return 1;
 }
-static SQInteger base_resurectureachable(HSQUIRRELVM v)
+static SQRESULT base_resurectureachable(HSQUIRRELVM v)
 {
 	sq_resurrectunreachable(v);
 	return 1;
 }
 #endif
 
-static SQInteger base_getroottable(HSQUIRRELVM v)
+static SQRESULT base_getroottable(HSQUIRRELVM v)
 {
 	v->Push(v->_roottable);
 	return 1;
 }
 
-static SQInteger base_getconsttable(HSQUIRRELVM v)
+static SQRESULT base_getconsttable(HSQUIRRELVM v)
 {
 	v->Push(_ss(v)->_consts);
 	return 1;
 }
 
 
-static SQInteger base_setroottable(HSQUIRRELVM v)
+static SQRESULT base_setroottable(HSQUIRRELVM v)
 {
 	SQObjectPtr o = v->_roottable;
 	if(SQ_FAILED(sq_setroottable(v))) return SQ_ERROR;
@@ -79,7 +79,7 @@ static SQInteger base_setroottable(HSQUIRRELVM v)
 	return 1;
 }
 
-static SQInteger base_setconsttable(HSQUIRRELVM v)
+static SQRESULT base_setconsttable(HSQUIRRELVM v)
 {
 	SQObjectPtr o = _ss(v)->_consts;
 	if(SQ_FAILED(sq_setconsttable(v))) return SQ_ERROR;
@@ -87,35 +87,35 @@ static SQInteger base_setconsttable(HSQUIRRELVM v)
 	return 1;
 }
 
-static SQInteger base_seterrorhandler(HSQUIRRELVM v)
+static SQRESULT base_seterrorhandler(HSQUIRRELVM v)
 {
 	sq_seterrorhandler(v);
 	return 0;
 }
 
-static SQInteger base_geterrorhandler(HSQUIRRELVM v)
+static SQRESULT base_geterrorhandler(HSQUIRRELVM v)
 {
 	return sq_geterrorhandler(v);
 }
 
-static SQInteger base_setatexithandler(HSQUIRRELVM v)
+static SQRESULT base_setatexithandler(HSQUIRRELVM v)
 {
 	sq_setatexithandler(v);
 	return 0;
 }
 
-static SQInteger base_getatexithandler(HSQUIRRELVM v)
+static SQRESULT base_getatexithandler(HSQUIRRELVM v)
 {
 	return sq_getatexithandler(v);
 }
 
-static SQInteger base_setdebughook(HSQUIRRELVM v)
+static SQRESULT base_setdebughook(HSQUIRRELVM v)
 {
 	sq_setdebughook(v);
 	return 0;
 }
 
-static SQInteger base_enabledebuginfo(HSQUIRRELVM v)
+static SQRESULT base_enabledebuginfo(HSQUIRRELVM v)
 {
 	SQObjectPtr &o=stack_get(v,2);
 
@@ -123,7 +123,7 @@ static SQInteger base_enabledebuginfo(HSQUIRRELVM v)
 	return 0;
 }
 
-static SQInteger __getcallstackinfos(HSQUIRRELVM v,SQInteger level)
+static SQRESULT __getcallstackinfos(HSQUIRRELVM v,SQInteger level)
 {
 	SQStackInfos si;
 	SQInteger seq = 0;
@@ -161,20 +161,20 @@ static SQInteger __getcallstackinfos(HSQUIRRELVM v,SQInteger level)
 
 	return 0;
 }
-static SQInteger base_getstackinfos(HSQUIRRELVM v)
+static SQRESULT base_getstackinfos(HSQUIRRELVM v)
 {
 	SQInteger level;
 	sq_getinteger(v, -1, &level);
 	return __getcallstackinfos(v,level);
 }
 
-static SQInteger base_getstacktop(HSQUIRRELVM v)
+static SQRESULT base_getstacktop(HSQUIRRELVM v)
 {
     sq_pushinteger(v, sq_getfulltop(v));
 	return 1;
 }
 
-static SQInteger base_gettypetag(HSQUIRRELVM v)
+static SQRESULT base_gettypetag(HSQUIRRELVM v)
 {
     SQUserPointer bklass = 0;
     if(sq_gettypetag(v, 2, &bklass) == SQ_OK && bklass){
@@ -191,14 +191,14 @@ static SQInteger base_gettypetag(HSQUIRRELVM v)
 	return 1;
 }
 
-static SQInteger base_getdefaultdelegate(HSQUIRRELVM v)
+static SQRESULT base_getdefaultdelegate(HSQUIRRELVM v)
 {
     if(sq_getdefaultdelegate(v, sq_gettype(v, 2)) != SQ_OK)
         sq_pushnull(v);
 	return 1;
 }
 
-static SQInteger base_assert(HSQUIRRELVM v)
+static SQRESULT base_assert(HSQUIRRELVM v)
 {
 	if(SQVM::IsFalse(stack_get(v,2))){
 		return sq_throwerror(v,_SC("assertion failed"));
@@ -206,7 +206,7 @@ static SQInteger base_assert(HSQUIRRELVM v)
 	return 0;
 }
 
-static SQInteger get_slice_params(HSQUIRRELVM v,SQInteger &sidx,SQInteger &eidx,SQObjectPtr &o)
+static SQRESULT get_slice_params(HSQUIRRELVM v,SQInteger &sidx,SQInteger &eidx,SQObjectPtr &o)
 {
 	SQInteger top = sq_gettop(v);
 	sidx=0;
@@ -228,7 +228,7 @@ static SQInteger get_slice_params(HSQUIRRELVM v,SQInteger &sidx,SQInteger &eidx,
 	return 1;
 }
 
-static SQInteger base_print1(HSQUIRRELVM v)
+static SQRESULT base_print1(HSQUIRRELVM v)
 {
 	const SQChar *str;
 	sq_tostring(v,2);
@@ -237,7 +237,7 @@ static SQInteger base_print1(HSQUIRRELVM v)
 	return 0;
 }
 
-static SQInteger base_print(HSQUIRRELVM v)
+static SQRESULT base_print(HSQUIRRELVM v)
 {
     if(_ss(v)->_printfunc){
         SQPRINTFUNCTION sqprint = _ss(v)->_printfunc;
@@ -255,7 +255,7 @@ static SQInteger base_print(HSQUIRRELVM v)
 	return 0;
 }
 
-static SQInteger base_error(HSQUIRRELVM v)
+static SQRESULT base_error(HSQUIRRELVM v)
 {
 	const SQChar *str;
 	sq_tostring(v,2);
@@ -264,19 +264,19 @@ static SQInteger base_error(HSQUIRRELVM v)
 	return 0;
 }
 
-static SQInteger base_get_last_error(HSQUIRRELVM v)
+static SQRESULT base_get_last_error(HSQUIRRELVM v)
 {
     sq_getlasterror(v);
 	return 1;
 }
 
-static SQInteger base_get_last_stackinfo(HSQUIRRELVM v)
+static SQRESULT base_get_last_stackinfo(HSQUIRRELVM v)
 {
     sq_getlaststackinfo(v);
 	return 1;
 }
 
-static SQInteger base_compilestring(HSQUIRRELVM v)
+static SQRESULT base_compilestring(HSQUIRRELVM v)
 {
 	SQInteger nargs=sq_gettop(v);
 	const SQChar *src=NULL,*name=_SC("unnamedbuffer");
@@ -292,7 +292,7 @@ static SQInteger base_compilestring(HSQUIRRELVM v)
 		return SQ_ERROR;
 }
 
-static SQInteger base_newthread(HSQUIRRELVM v)
+static SQRESULT base_newthread(HSQUIRRELVM v)
 {
 	SQObjectPtr &func = stack_get(v,2);
 	SQInteger stksize = (_closure(func)->_function->_stacksize << 1) +2;
@@ -301,12 +301,12 @@ static SQInteger base_newthread(HSQUIRRELVM v)
 	return 1;
 }
 
-static SQInteger base_suspend(HSQUIRRELVM v)
+static SQRESULT base_suspend(HSQUIRRELVM v)
 {
 	return sq_suspendvm(v);
 }
 
-static SQInteger base_array(HSQUIRRELVM v)
+static SQRESULT base_array(HSQUIRRELVM v)
 {
 	SQArray *a;
 	SQObject &size = stack_get(v,2);
@@ -321,14 +321,14 @@ static SQInteger base_array(HSQUIRRELVM v)
 	return 1;
 }
 
-static SQInteger base_type(HSQUIRRELVM v)
+static SQRESULT base_type(HSQUIRRELVM v)
 {
 	SQObjectPtr &o = stack_get(v,2);
 	v->Push(SQString::Create(_ss(v),GetTypeName(o),-1));
 	return 1;
 }
 
-static SQInteger base_callee(HSQUIRRELVM v)
+static SQRESULT base_callee(HSQUIRRELVM v)
 {
 	if(v->_callsstacksize > 1)
 	{
@@ -339,7 +339,7 @@ static SQInteger base_callee(HSQUIRRELVM v)
 }
 
 
-static SQInteger base_str_from_chars (HSQUIRRELVM v) {
+static SQRESULT base_str_from_chars (HSQUIRRELVM v) {
   SQ_FUNC_VARS_NO_TOP(v);
   SQInteger n = sq_gettop(v);  /* number of arguments */
   int i;
@@ -424,13 +424,13 @@ void sq_base_register(HSQUIRRELVM v)
 	sq_pop(v,1);
 }
 
-static SQInteger default_delegate_len(HSQUIRRELVM v)
+static SQRESULT default_delegate_len(HSQUIRRELVM v)
 {
 	v->Push(SQInteger(sq_getsize(v,1)));
 	return 1;
 }
 
-static SQInteger default_delegate_tofloat(HSQUIRRELVM v)
+static SQRESULT default_delegate_tofloat(HSQUIRRELVM v)
 {
 	SQObjectPtr &o=stack_get(v,1);
 	switch(type(o)){
@@ -455,7 +455,7 @@ static SQInteger default_delegate_tofloat(HSQUIRRELVM v)
 	return 1;
 }
 
-static SQInteger default_delegate_tointeger(HSQUIRRELVM v)
+static SQRESULT default_delegate_tointeger(HSQUIRRELVM v)
 {
 	SQObjectPtr &o=stack_get(v,1);
 	switch(type(o)){
@@ -486,25 +486,25 @@ static SQInteger default_delegate_tointeger(HSQUIRRELVM v)
 	return 1;
 }
 
-static SQInteger default_delegate_tostring(HSQUIRRELVM v)
+static SQRESULT default_delegate_tostring(HSQUIRRELVM v)
 {
 	sq_tostring(v,1);
 	return 1;
 }
 
-static SQInteger obj_delegate_weakref(HSQUIRRELVM v)
+static SQRESULT obj_delegate_weakref(HSQUIRRELVM v)
 {
 	sq_weakref(v,1);
 	return 1;
 }
 
-static SQInteger obj_clear(HSQUIRRELVM v)
+static SQRESULT obj_clear(HSQUIRRELVM v)
 {
 	return sq_clear(v,-1);
 }
 
 
-static SQInteger number_delegate_tochar(HSQUIRRELVM v)
+static SQRESULT number_delegate_tochar(HSQUIRRELVM v)
 {
 	SQObject &o=stack_get(v,1);
 	SQChar c = (SQChar)tointeger(o);
@@ -517,7 +517,7 @@ static SQInteger number_delegate_tochar(HSQUIRRELVM v)
 /////////////////////////////////////////////////////////////////
 //TABLE DEFAULT DELEGATE
 
-static SQInteger table_rawdelete(HSQUIRRELVM v)
+static SQRESULT table_rawdelete(HSQUIRRELVM v)
 {
 	if(SQ_FAILED(sq_rawdeleteslot(v,1,SQTrue)))
 		return SQ_ERROR;
@@ -525,7 +525,7 @@ static SQInteger table_rawdelete(HSQUIRRELVM v)
 }
 
 
-static SQInteger container_rawexists(HSQUIRRELVM v)
+static SQRESULT container_rawexists(HSQUIRRELVM v)
 {
 	if(SQ_SUCCEEDED(sq_rawexists(v,-2))) {
 		sq_pushbool(v,SQTrue);
@@ -533,12 +533,12 @@ static SQInteger container_rawexists(HSQUIRRELVM v)
 	return 1;
 }
 
-static SQInteger container_rawset(HSQUIRRELVM v)
+static SQRESULT container_rawset(HSQUIRRELVM v)
 {
 	return sq_rawset(v,-3);
 }
 
-static SQInteger container_rawget(HSQUIRRELVM v)
+static SQRESULT container_rawget(HSQUIRRELVM v)
 {
     switch(sq_gettop(v)){
         case 2: return SQ_SUCCEEDED(sq_rawget(v,-2))?1:SQ_ERROR;break;
@@ -552,7 +552,7 @@ static SQInteger container_rawget(HSQUIRRELVM v)
     return sq_throwerror(v, _SC("invalid number of parameters"));
 }
 
-static SQInteger container_get(HSQUIRRELVM v)
+static SQRESULT container_get(HSQUIRRELVM v)
 {
     switch(sq_gettop(v)){
         case 2: return SQ_SUCCEEDED(sq_get(v,-2))?1:SQ_ERROR;break;
@@ -566,7 +566,7 @@ static SQInteger container_get(HSQUIRRELVM v)
     return sq_throwerror(v, _SC("invalid number of parameters"));
 }
 
-static SQInteger table_setdelegate(HSQUIRRELVM v)
+static SQRESULT table_setdelegate(HSQUIRRELVM v)
 {
 	if(SQ_FAILED(sq_setdelegate(v,-2)))
 		return SQ_ERROR;
@@ -574,7 +574,7 @@ static SQInteger table_setdelegate(HSQUIRRELVM v)
 	return 1;
 }
 
-static SQInteger table_getdelegate(HSQUIRRELVM v)
+static SQRESULT table_getdelegate(HSQUIRRELVM v)
 {
 	return SQ_SUCCEEDED(sq_getdelegate(v,-1))?1:SQ_ERROR;
 }
@@ -597,28 +597,28 @@ SQRegFunction SQSharedState::_table_default_delegate_funcz[]={
 
 //ARRAY DEFAULT DELEGATE///////////////////////////////////////
 
-static SQInteger array_append(HSQUIRRELVM v)
+static SQRESULT array_append(HSQUIRRELVM v)
 {
 	return sq_arrayappend(v,-2);
 }
 
-static SQInteger array_extend(HSQUIRRELVM v)
+static SQRESULT array_extend(HSQUIRRELVM v)
 {
 	_array(stack_get(v,1))->Extend(_array(stack_get(v,2)));
 	return 0;
 }
 
-static SQInteger array_reverse(HSQUIRRELVM v)
+static SQRESULT array_reverse(HSQUIRRELVM v)
 {
 	return sq_arrayreverse(v,-1);
 }
 
-static SQInteger array_pop(HSQUIRRELVM v)
+static SQRESULT array_pop(HSQUIRRELVM v)
 {
 	return SQ_SUCCEEDED(sq_arraypop(v,1,SQTrue))?1:SQ_ERROR;
 }
 
-static SQInteger array_top(HSQUIRRELVM v)
+static SQRESULT array_top(HSQUIRRELVM v)
 {
 	SQObject &o=stack_get(v,1);
 	if(_array(o)->Size()>0){
@@ -628,7 +628,7 @@ static SQInteger array_top(HSQUIRRELVM v)
 	else return sq_throwerror(v,_SC("top() on a empty array"));
 }
 
-static SQInteger array_insert(HSQUIRRELVM v)
+static SQRESULT array_insert(HSQUIRRELVM v)
 {
 	SQObject &o=stack_get(v,1);
 	SQObject &idx=stack_get(v,2);
@@ -638,7 +638,7 @@ static SQInteger array_insert(HSQUIRRELVM v)
 	return 0;
 }
 
-static SQInteger array_remove(HSQUIRRELVM v)
+static SQRESULT array_remove(HSQUIRRELVM v)
 {
 	SQObject &o = stack_get(v, 1);
 	SQObject &idx = stack_get(v, 2);
@@ -652,7 +652,7 @@ static SQInteger array_remove(HSQUIRRELVM v)
 	return sq_throwerror(v, _SC("idx out of range"));
 }
 
-static SQInteger array_resize(HSQUIRRELVM v)
+static SQRESULT array_resize(HSQUIRRELVM v)
 {
 	SQObject &o = stack_get(v, 1);
 	SQObject &nsize = stack_get(v, 2);
@@ -666,7 +666,7 @@ static SQInteger array_resize(HSQUIRRELVM v)
 	return sq_throwerror(v, _SC("size must be a number"));
 }
 
-static SQInteger __map_array(SQArray *dest,SQArray *src,HSQUIRRELVM v) {
+static SQRESULT __map_array(SQArray *dest,SQArray *src,HSQUIRRELVM v) {
 	SQObjectPtr temp;
 	SQInteger size = src->Size();
 	for(SQInteger n = 0; n < size; n++) {
@@ -682,7 +682,7 @@ static SQInteger __map_array(SQArray *dest,SQArray *src,HSQUIRRELVM v) {
 	return 0;
 }
 
-static SQInteger array_map(HSQUIRRELVM v)
+static SQRESULT array_map(HSQUIRRELVM v)
 {
 	SQObject &o = stack_get(v,1);
 	SQInteger size = _array(o)->Size();
@@ -693,7 +693,7 @@ static SQInteger array_map(HSQUIRRELVM v)
 	return 1;
 }
 
-static SQInteger array_apply(HSQUIRRELVM v)
+static SQRESULT array_apply(HSQUIRRELVM v)
 {
 	SQObject &o = stack_get(v,1);
 	if(SQ_FAILED(__map_array(_array(o),_array(o),v)))
@@ -701,7 +701,7 @@ static SQInteger array_apply(HSQUIRRELVM v)
 	return 0;
 }
 
-static SQInteger array_reduce(HSQUIRRELVM v)
+static SQRESULT array_reduce(HSQUIRRELVM v)
 {
 	SQObject &o = stack_get(v,1);
 	SQArray *a = _array(o);
@@ -729,7 +729,7 @@ static SQInteger array_reduce(HSQUIRRELVM v)
 	return 1;
 }
 
-static SQInteger array_filter(HSQUIRRELVM v)
+static SQRESULT array_filter(HSQUIRRELVM v)
 {
 	SQObject &o = stack_get(v,1);
 	SQArray *a = _array(o);
@@ -753,7 +753,7 @@ static SQInteger array_filter(HSQUIRRELVM v)
 	return 1;
 }
 
-static SQInteger array_find(HSQUIRRELVM v)
+static SQRESULT array_find(HSQUIRRELVM v)
 {
 	SQObject &o = stack_get(v,1);
 	SQObjectPtr &val = stack_get(v,2);
@@ -772,7 +772,7 @@ static SQInteger array_find(HSQUIRRELVM v)
 }
 
 
-static SQInteger array_bsearch(HSQUIRRELVM v)
+static SQRESULT array_bsearch(HSQUIRRELVM v)
 {
 	SQObject &o = stack_get(v,1);
 	SQObjectPtr &val = stack_get(v,2);
@@ -890,7 +890,7 @@ bool _hsort(HSQUIRRELVM v,SQObjectPtr &arr, SQInteger l, SQInteger r,SQInteger f
 	return true;
 }
 
-static SQInteger array_sort(HSQUIRRELVM v)
+static SQRESULT array_sort(HSQUIRRELVM v)
 {
 	SQInteger func = -1;
 	SQObjectPtr &o = stack_get(v,1);
@@ -903,7 +903,7 @@ static SQInteger array_sort(HSQUIRRELVM v)
 	return 0;
 }
 
-static SQInteger array_slice(HSQUIRRELVM v)
+static SQRESULT array_slice(HSQUIRRELVM v)
 {
 	SQInteger sidx,eidx;
 	SQObjectPtr o;
@@ -933,7 +933,7 @@ static SQInteger array_slice(HSQUIRRELVM v)
 
 SQ_OPT_STRING_STRLEN();
 
-static SQInteger array_concat0 (HSQUIRRELVM v, int allowAll) {
+static SQRESULT array_concat0 (HSQUIRRELVM v, int allowAll) {
     SQ_FUNC_VARS(v);
     SQInteger last = sq_getsize(v, 1);
     if(last == 0){
@@ -982,20 +982,20 @@ static SQInteger array_concat0 (HSQUIRRELVM v, int allowAll) {
   return 1;
 }
 
-static SQInteger array_concat (HSQUIRRELVM v) {
+static SQRESULT array_concat (HSQUIRRELVM v) {
   return array_concat0(v, 0);
 }
 
-static SQInteger array_concat2 (HSQUIRRELVM v) {
+static SQRESULT array_concat2 (HSQUIRRELVM v) {
   return array_concat0(v, 1);
 }
 
-static SQInteger array_getdelegate(HSQUIRRELVM v)
+static SQRESULT array_getdelegate(HSQUIRRELVM v)
 {
 	return SQ_SUCCEEDED(sq_getdefaultdelegate(v,OT_ARRAY))?1:SQ_ERROR;
 }
 
-static SQInteger array_empty(HSQUIRRELVM v)
+static SQRESULT array_empty(HSQUIRRELVM v)
 {
 	sq_pushbool(v,sq_getsize(v,1) == 0);
 	return 1;
@@ -1080,7 +1080,7 @@ static SQRESULT string_find(HSQUIRRELVM v)
 	return sq_throwerror(v,_SC("invalid param"));
 }
 
-#define STRING_TOFUNCZ(func) static SQInteger string_##func(HSQUIRRELVM v) \
+#define STRING_TOFUNCZ(func) static SQRESULT string_##func(HSQUIRRELVM v) \
 { \
 	SQObject str=stack_get(v,1); \
 	SQInteger len=_string(str)->_len; \
@@ -1728,7 +1728,7 @@ SQRegFunction SQSharedState::_string_default_delegate_funcz[]={
 };
 
 //NUMBER DEFAULT DELEGATE//////////////////////////
-static SQInteger number_getdelegate(HSQUIRRELVM v)
+static SQRESULT number_getdelegate(HSQUIRRELVM v)
 {
 	return SQ_SUCCEEDED(sq_getdefaultdelegate(v,OT_INTEGER))?1:SQ_ERROR;
 }
@@ -1744,17 +1744,17 @@ SQRegFunction SQSharedState::_number_default_delegate_funcz[]={
 };
 
 //CLOSURE DEFAULT DELEGATE//////////////////////////
-static SQInteger closure_pcall(HSQUIRRELVM v)
+static SQRESULT closure_pcall(HSQUIRRELVM v)
 {
 	return SQ_SUCCEEDED(sq_call(v,sq_gettop(v)-1,SQTrue,SQFalse))?1:SQ_ERROR;
 }
 
-static SQInteger closure_call(HSQUIRRELVM v)
+static SQRESULT closure_call(HSQUIRRELVM v)
 {
 	return SQ_SUCCEEDED(sq_call(v,sq_gettop(v)-1,SQTrue,SQTrue))?1:SQ_ERROR;
 }
 
-static SQInteger _closure_acall(HSQUIRRELVM v,SQBool raiseerror, SQBool v2)
+static SQRESULT _closure_acall(HSQUIRRELVM v,SQBool raiseerror, SQBool v2)
 {
 	SQArray *aparams=_array(stack_get(v, v2 ? 3 : 2));
 	SQInteger nparams=aparams->Size();
@@ -1764,42 +1764,42 @@ static SQInteger _closure_acall(HSQUIRRELVM v,SQBool raiseerror, SQBool v2)
 	return SQ_SUCCEEDED(sq_call(v,nparams + (v2 ? 1 : 0),SQTrue,raiseerror))?1:SQ_ERROR;
 }
 
-static SQInteger closure_acall(HSQUIRRELVM v)
+static SQRESULT closure_acall(HSQUIRRELVM v)
 {
 	return _closure_acall(v,SQTrue, SQFalse);
 }
 
-static SQInteger closure_acall2(HSQUIRRELVM v)
+static SQRESULT closure_acall2(HSQUIRRELVM v)
 {
 	return _closure_acall(v,SQTrue, SQTrue);
 }
 
-static SQInteger closure_pacall(HSQUIRRELVM v)
+static SQRESULT closure_pacall(HSQUIRRELVM v)
 {
 	return _closure_acall(v,SQFalse, SQFalse);
 }
 
-static SQInteger closure_bindenv(HSQUIRRELVM v)
+static SQRESULT closure_bindenv(HSQUIRRELVM v)
 {
 	if(SQ_FAILED(sq_bindenv(v,1)))
 		return SQ_ERROR;
 	return 1;
 }
 
-static SQInteger closure_setenv(HSQUIRRELVM v)
+static SQRESULT closure_setenv(HSQUIRRELVM v)
 {
 	if(SQ_FAILED(sq_setfenv(v,1, SQFalse)))
 		return SQ_ERROR;
 	return 0;
 }
-static SQInteger closure_getenv(HSQUIRRELVM v)
+static SQRESULT closure_getenv(HSQUIRRELVM v)
 {
 	if(SQ_FAILED(sq_getfenv(v,1, SQFalse)))
 		return SQ_ERROR;
 	return 1;
 }
 
-static SQInteger closure_getinfos(HSQUIRRELVM v) {
+static SQRESULT closure_getinfos(HSQUIRRELVM v) {
 	SQObject o = stack_get(v,1);
 	SQTable *res = SQTable::Create(_ss(v),4);
 	if(type(o) == OT_CLOSURE) {
@@ -1843,7 +1843,7 @@ static SQInteger closure_getinfos(HSQUIRRELVM v) {
 }
 
 //CLOSURE DEFAULT DELEGATE//////////////////////////
-static SQInteger closure_getdelegate(HSQUIRRELVM v)
+static SQRESULT closure_getdelegate(HSQUIRRELVM v)
 {
 	return SQ_SUCCEEDED(sq_getdefaultdelegate(v,OT_CLOSURE))?1:SQ_ERROR;
 }
@@ -1866,7 +1866,7 @@ SQRegFunction SQSharedState::_closure_default_delegate_funcz[]={
 };
 
 //GENERATOR DEFAULT DELEGATE
-static SQInteger generator_getstatus(HSQUIRRELVM v)
+static SQRESULT generator_getstatus(HSQUIRRELVM v)
 {
 	SQObject &o=stack_get(v,1);
 	switch(_generator(o)->_state){
@@ -1878,7 +1878,7 @@ static SQInteger generator_getstatus(HSQUIRRELVM v)
 }
 
 //GENERATOR DEFAULT DELEGATE//////////////////////////
-static SQInteger generator_getdelegate(HSQUIRRELVM v)
+static SQRESULT generator_getdelegate(HSQUIRRELVM v)
 {
 	return SQ_SUCCEEDED(sq_getdefaultdelegate(v,OT_GENERATOR))?1:SQ_ERROR;
 }
@@ -1892,7 +1892,7 @@ SQRegFunction SQSharedState::_generator_default_delegate_funcz[]={
 };
 
 //THREAD DEFAULT DELEGATE
-static SQInteger thread_call(HSQUIRRELVM v)
+static SQRESULT thread_call(HSQUIRRELVM v)
 {
 	SQObjectPtr o = stack_get(v,1);
 	if(type(o) == OT_THREAD) {
@@ -1911,7 +1911,7 @@ static SQInteger thread_call(HSQUIRRELVM v)
 	return sq_throwerror(v,_SC("wrong parameter"));
 }
 
-static SQInteger thread_wakeup(HSQUIRRELVM v)
+static SQRESULT thread_wakeup(HSQUIRRELVM v)
 {
 	SQObjectPtr o = stack_get(v,1);
 	if(type(o) == OT_THREAD) {
@@ -1947,7 +1947,7 @@ static SQInteger thread_wakeup(HSQUIRRELVM v)
 	return sq_throwerror(v,_SC("wrong parameter"));
 }
 
-static SQInteger thread_getstatus(HSQUIRRELVM v)
+static SQRESULT thread_getstatus(HSQUIRRELVM v)
 {
 	SQObjectPtr &o = stack_get(v,1);
 	switch(sq_getvmstate(_thread(o))) {
@@ -1966,7 +1966,7 @@ static SQInteger thread_getstatus(HSQUIRRELVM v)
 	return 1;
 }
 
-static SQInteger thread_getstackinfos(HSQUIRRELVM v)
+static SQRESULT thread_getstackinfos(HSQUIRRELVM v)
 {
 	SQObjectPtr o = stack_get(v,1);
 	if(type(o) == OT_THREAD) {
@@ -2000,7 +2000,7 @@ static SQInteger thread_getstackinfos(HSQUIRRELVM v)
 }
 
 //THREAD DEFAULT DELEGATE//////////////////////////
-static SQInteger thread_getdelegate(HSQUIRRELVM v)
+static SQRESULT thread_getdelegate(HSQUIRRELVM v)
 {
 	return SQ_SUCCEEDED(sq_getdefaultdelegate(v,OT_THREAD))?1:SQ_ERROR;
 }
@@ -2017,27 +2017,27 @@ SQRegFunction SQSharedState::_thread_default_delegate_funcz[] = {
 	{0,0},
 };
 
-static SQInteger class_getattributes(HSQUIRRELVM v)
+static SQRESULT class_getattributes(HSQUIRRELVM v)
 {
 	return SQ_SUCCEEDED(sq_getattributes(v,-2))?1:SQ_ERROR;
 }
 
-static SQInteger class_setattributes(HSQUIRRELVM v)
+static SQRESULT class_setattributes(HSQUIRRELVM v)
 {
 	return SQ_SUCCEEDED(sq_setattributes(v,-3))?1:SQ_ERROR;
 }
 
-static SQInteger class_instance(HSQUIRRELVM v)
+static SQRESULT class_instance(HSQUIRRELVM v)
 {
 	return SQ_SUCCEEDED(sq_createinstance(v,-1))?1:SQ_ERROR;
 }
 
-static SQInteger class_getbase(HSQUIRRELVM v)
+static SQRESULT class_getbase(HSQUIRRELVM v)
 {
 	return SQ_SUCCEEDED(sq_getbase(v,-1))?1:SQ_ERROR;
 }
 
-static SQInteger class_newmember(HSQUIRRELVM v)
+static SQRESULT class_newmember(HSQUIRRELVM v)
 {
 	SQInteger top = sq_gettop(v);
 	SQBool bstatic = SQFalse;
@@ -2053,7 +2053,7 @@ static SQInteger class_newmember(HSQUIRRELVM v)
 	return SQ_SUCCEEDED(sq_newmember(v,-4,bstatic))?1:SQ_ERROR;
 }
 
-static SQInteger class_rawnewmember(HSQUIRRELVM v)
+static SQRESULT class_rawnewmember(HSQUIRRELVM v)
 {
 	SQInteger top = sq_gettop(v);
 	SQBool bstatic = SQFalse;
@@ -2069,7 +2069,7 @@ static SQInteger class_rawnewmember(HSQUIRRELVM v)
 	return SQ_SUCCEEDED(sq_rawnewmember(v,-4,bstatic))?1:SQ_ERROR;
 }
 
-static SQInteger class_getdelegate(HSQUIRRELVM v)
+static SQRESULT class_getdelegate(HSQUIRRELVM v)
 {
 	return SQ_SUCCEEDED(sq_getdefaultdelegate(v,OT_CLASS))?1:SQ_ERROR;
 }
@@ -2092,14 +2092,14 @@ SQRegFunction SQSharedState::_class_default_delegate_funcz[] = {
 };
 
 
-static SQInteger instance_getclass(HSQUIRRELVM v)
+static SQRESULT instance_getclass(HSQUIRRELVM v)
 {
 	if(SQ_SUCCEEDED(sq_getclass(v,1)))
 		return 1;
 	return SQ_ERROR;
 }
 
-static SQInteger instance_getdelegate(HSQUIRRELVM v)
+static SQRESULT instance_getdelegate(HSQUIRRELVM v)
 {
 	return SQ_SUCCEEDED(sq_getdefaultdelegate(v,OT_INSTANCE))?1:SQ_ERROR;
 }
@@ -2116,14 +2116,14 @@ SQRegFunction SQSharedState::_instance_default_delegate_funcz[] = {
 	{0,0}
 };
 
-static SQInteger weakref_ref(HSQUIRRELVM v)
+static SQRESULT weakref_ref(HSQUIRRELVM v)
 {
 	if(SQ_FAILED(sq_getweakrefval(v,1)))
 		return SQ_ERROR;
 	return 1;
 }
 
-static SQInteger weakref_getdelegate(HSQUIRRELVM v)
+static SQRESULT weakref_getdelegate(HSQUIRRELVM v)
 {
 	return SQ_SUCCEEDED(sq_getdefaultdelegate(v,OT_WEAKREF))?1:SQ_ERROR;
 }