Use sq_type instead of the duplicated sqtype as it's done in squirrel

SquiLu/squirrel/sqapi.cpp

@@ -19,12 +19,12 @@ void sq_raise_type_error(HSQUIRRELVM v, SQObjectType type,SQObjectPtr &o)
     SQObjectPtr oval = v->PrintObjVal(o);
     v->Raise_Error(_SC("wrong argument type, expected '%s' got '%.50s'"),IdType2Name(type),_stringval(oval));
 }
-#define _CHECK_OBJ_TYPE(v,otype,o) if(sqtype(o) != otype) {sq_raise_type_error(v, otype, o); return SQ_ERROR;}
+#define _CHECK_OBJ_TYPE(v,otype,o) if(sq_type(o) != otype) {sq_raise_type_error(v, otype, o); return SQ_ERROR;}
 
 bool sq_aux_gettypedarg(HSQUIRRELVM v,SQInteger idx,SQObjectType type,SQObjectPtr **o)
 {
 	*o = &stack_get(v,idx);
-	if(sqtype(**o) != type){
+	if(sq_type(**o) != type){
 		SQObjectPtr oval = v->PrintObjVal(**o);
 		v->Raise_Error(_SC("wrong argument type, expected '%s' got '%.50s'"),IdType2Name(type),_stringval(oval));
 		return false;
@@ -189,7 +189,7 @@ void sq_notifyallexceptions(HSQUIRRELVM v, SQBool enable)
 
 void sq_addref(HSQUIRRELVM v,HSQOBJECT *po)
 {
-	if(!ISREFCOUNTED(sqtype(*po))) return;
+	if(!ISREFCOUNTED(sq_type(*po))) return;
 #ifdef NO_GARBAGE_COLLECTOR
 	__AddRef(po->_type,po->_unVal);
 #else
@@ -199,7 +199,7 @@ void sq_addref(HSQUIRRELVM v,HSQOBJECT *po)
 
 SQUnsignedInteger sq_getrefcount(HSQUIRRELVM v,HSQOBJECT *po)
 {
-	if(!ISREFCOUNTED(sqtype(*po))) return 0;
+	if(!ISREFCOUNTED(sq_type(*po))) return 0;
 #ifdef NO_GARBAGE_COLLECTOR
    return po->_unVal.pRefCounted->_uiRef;
 #else
@@ -209,7 +209,7 @@ SQUnsignedInteger sq_getrefcount(HSQUIRRELVM v,HSQOBJECT *po)
 
 SQBool sq_release(HSQUIRRELVM v,HSQOBJECT *po)
 {
-	if(!ISREFCOUNTED(sqtype(*po))) return SQTrue;
+	if(!ISREFCOUNTED(sq_type(*po))) return SQTrue;
 #ifdef NO_GARBAGE_COLLECTOR
 	bool ret = (po->_unVal.pRefCounted->_uiRef <= 1) ? SQTrue : SQFalse;
 	__Release(po->_type,po->_unVal);
@@ -221,13 +221,13 @@ SQBool sq_release(HSQUIRRELVM v,HSQOBJECT *po)
 
 SQUnsignedInteger sq_getvmrefcount(HSQUIRRELVM SQ_UNUSED_ARG(v), const HSQOBJECT *po)
 {
-    if (!ISREFCOUNTED(sqtype(*po))) return 0;
+    if (!ISREFCOUNTED(sq_type(*po))) return 0;
     return po->_unVal.pRefCounted->_uiRef;
 }
 
 const SQChar *sq_objtostring(const HSQOBJECT *o)
 {
-	if(sqtype(*o) == OT_STRING) {
+	if(sq_type(*o) == OT_STRING) {
 		return _stringval(*o);
 	}
 	return NULL;
@@ -342,7 +342,7 @@ SQRESULT sq_newclass(HSQUIRRELVM v,SQBool hasbase)
 	SQClass *baseclass = NULL;
 	if(hasbase) {
 		SQObjectPtr &base = stack_get(v,-1);
-		if(sqtype(base) != OT_CLASS)
+		if(sq_type(base) != OT_CLASS)
 			return sq_throwerror(v,_SC("invalid base type"));
 		baseclass = _class(base);
 	}
@@ -391,7 +391,7 @@ SQBool sq_instanceof(HSQUIRRELVM v)
 {
 	SQObjectPtr &inst = stack_get(v,-1);
 	SQObjectPtr &cl = stack_get(v,-2);
-	if(sqtype(inst) != OT_INSTANCE || sqtype(cl) != OT_CLASS)
+	if(sq_type(inst) != OT_INSTANCE || sq_type(cl) != OT_CLASS)
 		return sq_throwerror(v,_SC("invalid param type"));
 	return _instance(inst)->InstanceOf(_class(cl))?SQTrue:SQFalse;
 }
@@ -510,14 +510,14 @@ void sq_newclosure(HSQUIRRELVM v,SQFUNCTION func,SQUnsignedInteger nfreevars)
 SQRESULT sq_getclosureinfo(HSQUIRRELVM v,SQInteger idx,SQUnsignedInteger *nparams,SQUnsignedInteger *nfreevars)
 {
 	SQObjectPtr &o = stack_get(v, idx);
-	if(sqtype(o) == OT_CLOSURE) {
+	if(sq_type(o) == OT_CLOSURE) {
 		SQClosure *c = _closure(o);
 		SQFunctionProto *proto = c->_function;
 		*nparams = (SQUnsignedInteger)proto->_nparameters;
 		*nfreevars = (SQUnsignedInteger)proto->_noutervalues;
 		return SQ_OK;
 	}
-	else if(sqtype(o) == OT_NATIVECLOSURE)
+	else if(sq_type(o) == OT_NATIVECLOSURE)
 	{
 		SQNativeClosure *c = _nativeclosure(o);
 		*nparams = (SQUnsignedInteger)c->_nparamscheck;
@@ -572,7 +572,7 @@ SQRESULT sq_setfenv(HSQUIRRELVM v,SQInteger idx, SQBool cloning)
 		!sq_isclass(env) &&
 		!sq_isinstance(env))
 		return sq_throwerror(v,_SC("invalid environment"));
-	SQWeakRef *w = _refcounted(env)->GetWeakRef(sqtype(env));
+	SQWeakRef *w = _refcounted(env)->GetWeakRef(sq_type(env));
 	SQObjectPtr ret;
 	if(sq_isclosure(o)) {
 		SQClosure *c = cloning ? _closure(o)->Clone() : _closure(o);
@@ -666,7 +666,7 @@ SQRESULT sq_getclosureroot(HSQUIRRELVM v,SQInteger idx)
 SQRESULT sq_clear(HSQUIRRELVM v,SQInteger idx)
 {
 	SQObjectPtr &o=stack_get(v,idx);
-	switch(sqtype(o)) {
+	switch(sq_type(o)) {
 		case OT_TABLE: _table(o)->Clear();	break;
 		case OT_ARRAY: _array(o)->Resize(0); break;
 		default:
@@ -694,7 +694,7 @@ SQRESULT sq_getonroottable(HSQUIRRELVM v)
 SQRESULT sq_setonroottable(HSQUIRRELVM v)
 {
     SQObjectPtr &key = v->GetUp(-2);
-	if(sqtype(key) == OT_NULL) {
+	if(sq_type(key) == OT_NULL) {
 		v->Pop(2);
 		return sq_throwerror(v, _SC("null key"));
 	}
@@ -720,7 +720,7 @@ SQRESULT sq_getonregistrytable(HSQUIRRELVM v)
 SQRESULT sq_setonregistrytable(HSQUIRRELVM v)
 {
     SQObjectPtr &key = v->GetUp(-2);
-	if(sqtype(key) == OT_NULL) {
+	if(sq_type(key) == OT_NULL) {
 		v->Pop(2);
 		return sq_throwerror(v, _SC("null key"));
 	}
@@ -732,7 +732,7 @@ SQRESULT sq_setonregistrytable(HSQUIRRELVM v)
 SQRESULT sq_delete_on_registry_table(HSQUIRRELVM v, SQUserPointer uptr)
 {
     SQObjectPtr key = uptr;
-	if(sqtype(key) == OT_NULL) {
+	if(sq_type(key) == OT_NULL) {
 		return sq_throwerror(v, _SC("null key"));
 	}
 	if(v->_closing) return SQ_OK;
@@ -860,7 +860,7 @@ void sq_push(HSQUIRRELVM v,SQInteger idx)
 
 SQObjectType sq_gettype(HSQUIRRELVM v,SQInteger idx)
 {
-	return sqtype(stack_get(v, idx));
+	return sq_type(stack_get(v, idx));
 }
 
 SQUIRREL_API const SQChar *sq_gettypename(HSQUIRRELVM v,SQInteger idx){
@@ -1013,7 +1013,7 @@ SQRESULT sq_clone(HSQUIRRELVM v,SQInteger idx)
 SQInteger sq_getsize(HSQUIRRELVM v, SQInteger idx)
 {
 	SQObjectPtr &o = stack_get(v, idx);
-	SQObjectType type = sqtype(o);
+	SQObjectType type = sq_type(o);
 	switch(type) {
 	case OT_STRING:		return _string(o)->_len;
 	case OT_TABLE:		return _table(o)->CountUsed();
@@ -1044,7 +1044,7 @@ SQRESULT sq_getuserdata(HSQUIRRELVM v,SQInteger idx,SQUserPointer *p,SQUserPoint
 SQRESULT sq_settypetag(HSQUIRRELVM v,SQInteger idx,SQUserPointer typetag)
 {
 	SQObjectPtr &o = stack_get(v,idx);
-	switch(sqtype(o)) {
+	switch(sq_type(o)) {
 		case OT_USERDATA:	_userdata(o)->_typetag = typetag;	break;
 		case OT_CLASS:		_class(o)->_typetag = typetag;		break;
 		default:			return sq_throwerror(v,_SC("invalid object type"));
@@ -1054,7 +1054,7 @@ SQRESULT sq_settypetag(HSQUIRRELVM v,SQInteger idx,SQUserPointer typetag)
 
 SQRESULT sq_getobjtypetag(const HSQOBJECT *o,SQUserPointer * typetag)
 {
-  switch(sqtype(*o)) {
+  switch(sq_type(*o)) {
     case OT_INSTANCE: *typetag = _instance(*o)->_class->_typetag; break;
     case OT_USERDATA: *typetag = _userdata(*o)->_typetag; break;
     case OT_CLASS:    *typetag = _class(*o)->_typetag; break;
@@ -1088,7 +1088,7 @@ SQUserPointer sq_get_as_userpointer(HSQUIRRELVM v,SQInteger idx)
 SQRESULT sq_setinstanceup(HSQUIRRELVM v, SQInteger idx, SQUserPointer p)
 {
 	SQObjectPtr &o = stack_get(v,idx);
-	if(sqtype(o) != OT_INSTANCE) return sq_throwerror(v,_SC("the object is not a class instance"));
+	if(sq_type(o) != OT_INSTANCE) return sq_throwerror(v,_SC("the object is not a class instance"));
 	_instance(o)->_userpointer = p;
 	return SQ_OK;
 }
@@ -1096,7 +1096,7 @@ SQRESULT sq_setinstanceup(HSQUIRRELVM v, SQInteger idx, SQUserPointer p)
 SQRESULT sq_setclassudsize(HSQUIRRELVM v, SQInteger idx, SQInteger udsize)
 {
 	SQObjectPtr &o = stack_get(v,idx);
-	if(sqtype(o) != OT_CLASS) return sq_throwerror(v,_SC("the object is not a class"));
+	if(sq_type(o) != OT_CLASS) return sq_throwerror(v,_SC("the object is not a class"));
 	if(_class(o)->_locked) return sq_throwerror(v,_SC("the class is locked"));
 	_class(o)->_udsize = udsize;
 	return SQ_OK;
@@ -1106,7 +1106,7 @@ SQRESULT sq_setclassudsize(HSQUIRRELVM v, SQInteger idx, SQInteger udsize)
 SQRESULT sq_getinstanceup(HSQUIRRELVM v, SQInteger idx, SQUserPointer *p,SQUserPointer typetag)
 {
 	SQObjectPtr &o = stack_get(v,idx);
-	if(sqtype(o) != OT_INSTANCE) return sq_throwerror(v,_SC("the object is not a class instance"));
+	if(sq_type(o) != OT_INSTANCE) return sq_throwerror(v,_SC("the object is not a class instance"));
 	(*p) = _instance(o)->_userpointer;
 	if(typetag != 0) {
 		SQClass *cl = _instance(o)->_class;
@@ -1185,9 +1185,9 @@ SQRESULT sq_newslot(HSQUIRRELVM v, SQInteger idx, SQBool bstatic)
 {
 	sq_aux_paramscheck(v, 3);
 	SQObjectPtr &self = stack_get(v, idx);
-	if(sqtype(self) == OT_TABLE || sqtype(self) == OT_CLASS) {
+	if(sq_type(self) == OT_TABLE || sq_type(self) == OT_CLASS) {
 		SQObjectPtr &key = v->GetUp(-2);
-		if(sqtype(key) == OT_NULL) return sq_throwerror(v, _SC("null is not a valid key"));
+		if(sq_type(key) == OT_NULL) return sq_throwerror(v, _SC("null is not a valid key"));
 		v->NewSlot(self, key, v->GetUp(-1),bstatic?true:false);
 		v->Pop(2);
 	}
@@ -1200,7 +1200,7 @@ SQRESULT sq_deleteslot(HSQUIRRELVM v,SQInteger idx,SQBool pushval)
 	SQObjectPtr &self = stack_get(v,idx);
 	_CHECK_OBJ_TYPE(v, OT_TABLE, self);
 	SQObjectPtr &key = v->GetUp(-1);
-	if(sqtype(key) == OT_NULL) return sq_throwerror(v, _SC("null is not a valid key"));
+	if(sq_type(key) == OT_NULL) return sq_throwerror(v, _SC("null is not a valid key"));
 	SQObjectPtr res;
 	if(!v->DeleteSlot(self, key, res)){
 		v->Pop();
@@ -1225,11 +1225,11 @@ SQRESULT sq_rawset(HSQUIRRELVM v,SQInteger idx)
 {
 	SQObjectPtr &self = stack_get(v, idx);
 	SQObjectPtr &key = v->GetUp(-2);
-	if(sqtype(key) == OT_NULL) {
+	if(sq_type(key) == OT_NULL) {
 		v->Pop(2);
 		return sq_throwerror(v, _SC("null key"));
 	}
-	switch(sqtype(self)) {
+	switch(sq_type(self)) {
 	case OT_TABLE:
 		_table(self)->NewSlot(key, v->GetUp(-1));
 		v->Pop(2);
@@ -1262,9 +1262,9 @@ SQRESULT sq_rawset(HSQUIRRELVM v,SQInteger idx)
 SQRESULT sq_newmember(HSQUIRRELVM v,SQInteger idx,SQBool bstatic)
 {
 	SQObjectPtr &self = stack_get(v, idx);
-	if(sqtype(self) != OT_CLASS) return sq_throwerror(v, _SC("new member only works with classes"));
+	if(sq_type(self) != OT_CLASS) return sq_throwerror(v, _SC("new member only works with classes"));
 	SQObjectPtr &key = v->GetUp(-3);
-	if(sqtype(key) == OT_NULL) return sq_throwerror(v, _SC("null key"));
+	if(sq_type(key) == OT_NULL) return sq_throwerror(v, _SC("null key"));
 	if(!v->NewSlotA(self,key,v->GetUp(-2),v->GetUp(-1),bstatic?true:false,false))
 		return SQ_ERROR;
 	return SQ_OK;
@@ -1273,9 +1273,9 @@ SQRESULT sq_newmember(HSQUIRRELVM v,SQInteger idx,SQBool bstatic)
 SQRESULT sq_rawnewmember(HSQUIRRELVM v,SQInteger idx,SQBool bstatic)
 {
 	SQObjectPtr &self = stack_get(v, idx);
-	if(sqtype(self) != OT_CLASS) return sq_throwerror(v, _SC("new member only works with classes"));
+	if(sq_type(self) != OT_CLASS) return sq_throwerror(v, _SC("new member only works with classes"));
 	SQObjectPtr &key = v->GetUp(-3);
-	if(sqtype(key) == OT_NULL) return sq_throwerror(v, _SC("null key"));
+	if(sq_type(key) == OT_NULL) return sq_throwerror(v, _SC("null key"));
 	if(!v->NewSlotA(self,key,v->GetUp(-2),v->GetUp(-1),bstatic?true:false,true))
 		return SQ_ERROR;
 	return SQ_OK;
@@ -1285,23 +1285,23 @@ SQRESULT sq_setdelegate(HSQUIRRELVM v,SQInteger idx)
 {
 	SQObjectPtr &self = stack_get(v, idx);
 	SQObjectPtr &mt = v->GetUp(-1);
-	SQObjectType type = sqtype(self);
+	SQObjectType type = sq_type(self);
 	switch(type) {
 	case OT_TABLE:
-		if(sqtype(mt) == OT_TABLE) {
+		if(sq_type(mt) == OT_TABLE) {
 			if(!_table(self)->SetDelegate(_table(mt))) {
                 return sq_throwerror(v, _SC("delagate cycle"));
             }
 			v->Pop();
         }
-		else if(sqtype(mt)==OT_NULL) {
+		else if(sq_type(mt)==OT_NULL) {
 			_table(self)->SetDelegate(NULL); v->Pop(); }
 		else return sq_aux_invalidtype(v,type);
 		break;
 	case OT_USERDATA:
-		if(sqtype(mt)==OT_TABLE) {
+		if(sq_type(mt)==OT_TABLE) {
 			_userdata(self)->SetDelegate(_table(mt)); v->Pop(); }
-		else if(sqtype(mt)==OT_NULL) {
+		else if(sq_type(mt)==OT_NULL) {
 			_userdata(self)->SetDelegate(NULL); v->Pop(); }
 		else return sq_aux_invalidtype(v, type);
 		break;
@@ -1332,7 +1332,7 @@ SQRESULT sq_rawdeleteslot(HSQUIRRELVM v,SQInteger idx,SQBool pushval)
 SQRESULT sq_getdelegate(HSQUIRRELVM v,SQInteger idx)
 {
 	SQObjectPtr &self=stack_get(v,idx);
-	switch(sqtype(self)){
+	switch(sq_type(self)){
 	case OT_TABLE:
 	case OT_USERDATA:
 		if(!_delegable(self)->_delegate){
@@ -1362,7 +1362,7 @@ SQRESULT sq_getbyname(HSQUIRRELVM v,SQInteger idx, const SQChar *key, SQInteger
 	SQObjectPtr &self=stack_get(v,idx);
 	sq_pushstring(v, key, key_len);
 	SQObjectPtr &obj = v->GetUp(-1);
-	switch(sqtype(self)) {
+	switch(sq_type(self)) {
 	case OT_TABLE:
 		if(_table(self)->Get(obj,obj))
 			return SQ_OK;
@@ -1387,7 +1387,7 @@ SQRESULT sq_rawget(HSQUIRRELVM v,SQInteger idx)
 {
 	SQObjectPtr &self=stack_get(v,idx);
 	SQObjectPtr &obj = v->GetUp(-1);
-	switch(sqtype(self)) {
+	switch(sq_type(self)) {
 	case OT_TABLE:
 		if(_table(self)->Get(obj,obj))
 			return SQ_OK;
@@ -1425,7 +1425,7 @@ SQBool sq_rawexists(HSQUIRRELVM v,SQInteger idx)
 	SQObjectPtr &self=stack_get(v,idx);
 	SQObjectPtr &obj = v->GetUp(-1);
 	SQBool result = SQFalse;
-	switch(sqtype(self)) {
+	switch(sq_type(self)) {
 	case OT_TABLE:
 		result = _table(self)->Exists(obj);
 		break;
@@ -1462,7 +1462,7 @@ const SQChar *sq_getlocal(HSQUIRRELVM v,SQUnsignedInteger level,SQUnsignedIntege
 			stackbase-=ci._prevstkbase;
 		}
 		SQVM::CallInfo &ci=v->_callsstack[lvl];
-		if(sqtype(ci._closure)!=OT_CLOSURE)
+		if(sq_type(ci._closure)!=OT_CLOSURE)
 			return NULL;
 		SQClosure *c=_closure(ci._closure);
 		SQFunctionProto *func=c->_function;
@@ -1553,7 +1553,7 @@ SQRESULT sq_reservestack(HSQUIRRELVM v,SQInteger nsize)
 
 SQRESULT sq_resume(HSQUIRRELVM v,SQBool retval,SQBool raiseerror)
 {
-	if (sqtype(v->GetUp(-1)) == OT_GENERATOR)
+	if (sq_type(v->GetUp(-1)) == OT_GENERATOR)
 	{
 		v->PushNull(); //retval
 		if (!v->Execute(v->GetUp(-2), 0, v->_top, v->GetUp(-1), raiseerror, SQVM::ET_RESUME_GENERATOR))
@@ -1621,7 +1621,7 @@ void sq_setreleasehook(HSQUIRRELVM v,SQInteger idx,SQRELEASEHOOK hook)
 {
 	if(sq_gettop(v) >= 1){
 		SQObjectPtr &ud=stack_get(v,idx);
-		switch( sqtype(ud) ) {
+		switch( sq_type(ud) ) {
 		case OT_USERDATA:	_userdata(ud)->_hook = hook;	break;
 		case OT_INSTANCE:	_instance(ud)->_hook = hook;	break;
 		case OT_CLASS:		_class(ud)->_hook = hook;		break;
@@ -1634,7 +1634,7 @@ SQRELEASEHOOK sq_getreleasehook(HSQUIRRELVM v,SQInteger idx)
 {
     if(sq_gettop(v) >= 1){
         SQObjectPtr &ud=stack_get(v,idx);
-        switch( sqtype(ud) ) {
+        switch( sq_type(ud) ) {
         case OT_USERDATA:   return _userdata(ud)->_hook;    break;
         case OT_INSTANCE:   return _instance(ud)->_hook;    break;
         case OT_CLASS:      return _class(ud)->_hook;       break;
@@ -1733,7 +1733,7 @@ const SQChar *sq_getfreevariable(HSQUIRRELVM v,SQInteger idx,SQUnsignedInteger n
 {
 	SQObjectPtr &self=stack_get(v,idx);
 	const SQChar *name = NULL;
-	switch(sqtype(self))
+	switch(sq_type(self))
 	{
 	case OT_CLOSURE:{
 		SQClosure *clo = _closure(self);
@@ -1761,7 +1761,7 @@ const SQChar *sq_getfreevariable(HSQUIRRELVM v,SQInteger idx,SQUnsignedInteger n
 SQRESULT sq_setfreevariable(HSQUIRRELVM v,SQInteger idx,SQUnsignedInteger nval)
 {
 	SQObjectPtr &self=stack_get(v,idx);
-	switch(sqtype(self))
+	switch(sq_type(self))
 	{
 	case OT_CLOSURE:{
 		SQFunctionProto *fp = _closure(self)->_function;
@@ -1778,7 +1778,7 @@ SQRESULT sq_setfreevariable(HSQUIRRELVM v,SQInteger idx,SQUnsignedInteger nval)
 		else return sq_throwerror(v,_SC("invalid free var index"));
 		break;
 	default:
-		return sq_aux_invalidtype(v,sqtype(self));
+		return sq_aux_invalidtype(v,sq_type(self));
 	}
 	v->Pop();
 	return SQ_OK;
@@ -1791,7 +1791,7 @@ SQRESULT sq_setattributes(HSQUIRRELVM v,SQInteger idx)
 	SQObjectPtr &key = stack_get(v,-2);
 	SQObjectPtr &val = stack_get(v,-1);
 	SQObjectPtr attrs;
-	if(sqtype(key) == OT_NULL) {
+	if(sq_type(key) == OT_NULL) {
 		attrs = _class(o)->_attributes;
 		_class(o)->_attributes = val;
 		v->Pop(2);
@@ -1812,7 +1812,7 @@ SQRESULT sq_getattributes(HSQUIRRELVM v,SQInteger idx)
 	_CHECK_OBJ_TYPE(v, OT_CLASS, o);
 	SQObjectPtr &key = stack_get(v,-1);
 	SQObjectPtr attrs;
-	if(sqtype(key) == OT_NULL) {
+	if(sq_type(key) == OT_NULL) {
 		attrs = _class(o)->_attributes;
 		v->Pop();
 		v->Push(attrs);
@@ -1844,7 +1844,7 @@ SQRESULT sq_getmemberhandle(HSQUIRRELVM v,SQInteger idx,HSQMEMBERHANDLE *handle)
 
 SQRESULT _getmemberbyhandle(HSQUIRRELVM v,SQObjectPtr &self,const HSQMEMBERHANDLE *handle,SQObjectPtr *&val)
 {
-	switch(sqtype(self)) {
+	switch(sq_type(self)) {
 		case OT_INSTANCE: {
 				SQInstance *i = _instance(self);
 				if(handle->_static) {
@@ -1927,8 +1927,8 @@ SQRESULT sq_createinstance(HSQUIRRELVM v,SQInteger idx)
 void sq_weakref(HSQUIRRELVM v,SQInteger idx)
 {
 	SQObjectPtr &o=stack_get(v,idx);
-	if(ISREFCOUNTED(sqtype(o))) {
-		v->Push(_refcounted(o)->GetWeakRef(sqtype(o)));
+	if(ISREFCOUNTED(sq_type(o))) {
+		v->Push(_refcounted(o)->GetWeakRef(sq_type(o)));
 		return;
 	}
 	v->Push(o);
@@ -1937,7 +1937,7 @@ void sq_weakref(HSQUIRRELVM v,SQInteger idx)
 SQRESULT sq_getweakrefval(HSQUIRRELVM v,SQInteger idx)
 {
 	SQObjectPtr &o = stack_get(v,idx);
-	if(sqtype(o) != OT_WEAKREF) {
+	if(sq_type(o) != OT_WEAKREF) {
 		return sq_throwerror(v,_SC("the object must be a weakref"));
 	}
 	v->Push(_weakref(o)->_obj);
@@ -1966,7 +1966,7 @@ SQRESULT sq_getdefaultdelegate(HSQUIRRELVM v,SQObjectType t)
 SQRESULT sq_next(HSQUIRRELVM v,SQInteger idx)
 {
 	SQObjectPtr &o=stack_get(v,idx),&refpos = stack_get(v,-1),realkey,val;
-	if(sqtype(o) == OT_GENERATOR) {
+	if(sq_type(o) == OT_GENERATOR) {
 		return sq_throwerror(v,_SC("cannot iterate a generator"));
 	}
 	int faketojump;

SquiLu/squirrel/sqbaselib.cpp

@@ -62,7 +62,7 @@ static SQRESULT base_resurectureachable(HSQUIRRELVM v)
 static SQRESULT base_getrefcount(HSQUIRRELVM v)
 {
     SQObjectPtr &o=stack_get(v,2);
-    if(!ISREFCOUNTED(sqtype(o))) sq_pushinteger(v,0);
+    if(!ISREFCOUNTED(sq_type(o))) sq_pushinteger(v,0);
     else sq_pushinteger(v, o._unVal.pRefCounted->_uiRef - 1);
 	return 1;
 }
@@ -244,7 +244,7 @@ static SQRESULT get_slice_params(HSQUIRRELVM v,SQInteger &sidx,SQInteger &eidx,S
 	o=stack_get(v,1);
 	if(top>1){
 		SQObjectPtr &start=stack_get(v,2);
-		if(sqtype(start)!=OT_NULL && sq_isnumeric(start)){
+		if(sq_type(start)!=OT_NULL && sq_isnumeric(start)){
 			sidx=tointeger(start);
 		}
 	}
@@ -626,7 +626,7 @@ static SQRESULT default_delegate_len(HSQUIRRELVM v)
 static SQRESULT default_delegate_tofloat(HSQUIRRELVM v)
 {
 	SQObjectPtr &o=stack_get(v,1);
-	switch(sqtype(o)){
+	switch(sq_type(o)){
 	case OT_STRING:{
 		SQObjectPtr res;
 		if(str2num(_stringval(o),res)){
@@ -651,7 +651,7 @@ static SQRESULT default_delegate_tofloat(HSQUIRRELVM v)
 static SQRESULT default_delegate_tointeger(HSQUIRRELVM v)
 {
 	SQObjectPtr &o=stack_get(v,1);
-	switch(sqtype(o)){
+	switch(sq_type(o)){
 	case OT_STRING:{
 		SQObjectPtr res;
 		SQInteger base;
@@ -1171,7 +1171,7 @@ static SQRESULT array_concat0 (HSQUIRRELVM v, int allowAll) {
 
   for (; i < last; ++i) {
       SQObjectPtr str, &o = aryvec[i];
-      switch(sqtype(o)){
+      switch(sq_type(o)){
           case OT_STRING:
               break;
           case OT_INTEGER:
@@ -1191,7 +1191,7 @@ static SQRESULT array_concat0 (HSQUIRRELVM v, int allowAll) {
 
       const SQChar *value;
       SQInteger value_size;
-      if(sqtype(o) == OT_STRING) {
+      if(sq_type(o) == OT_STRING) {
 		value = _stringval(o);
 		value_size = _string(o)->_len;
       }
@@ -2379,7 +2379,7 @@ static SQRESULT closure_getenv(HSQUIRRELVM v)
 static SQRESULT closure_getinfos(HSQUIRRELVM v) {
 	SQObject o = stack_get(v,1);
 	SQTable *res = SQTable::Create(_ss(v),4);
-	if(sqtype(o) == OT_CLOSURE) {
+	if(sq_type(o) == OT_CLOSURE) {
 		SQFunctionProto *f = _closure(o)->_function;
 		SQInteger nparams = f->_nparameters + (f->_varparams?1:0);
 		SQObjectPtr params = SQArray::Create(_ss(v),nparams);
@@ -2476,7 +2476,7 @@ SQRegFunction SQSharedState::_generator_default_delegate_funcz[]={
 static SQRESULT thread_call(HSQUIRRELVM v)
 {
 	SQObjectPtr o = stack_get(v,1);
-	if(sqtype(o) == OT_THREAD) {
+	if(sq_type(o) == OT_THREAD) {
 		SQInteger nparams = sq_gettop(v);
 		_thread(o)->Push(_thread(o)->_roottable);
 		for(SQInteger i = 2; i<(nparams+1); i++)
@@ -2495,7 +2495,7 @@ static SQRESULT thread_call(HSQUIRRELVM v)
 static SQRESULT thread_wakeup(HSQUIRRELVM v)
 {
 	SQObjectPtr o = stack_get(v,1);
-	if(sqtype(o) == OT_THREAD) {
+	if(sq_type(o) == OT_THREAD) {
 		SQVM *thread = _thread(o);
 		SQInteger state = sq_getvmstate(thread);
 		if(state != SQ_VMSTATE_SUSPENDED) {
@@ -2550,7 +2550,7 @@ static SQRESULT thread_getstatus(HSQUIRRELVM v)
 static SQRESULT thread_getstackinfos(HSQUIRRELVM v)
 {
 	SQObjectPtr o = stack_get(v,1);
-	if(sqtype(o) == OT_THREAD) {
+	if(sq_type(o) == OT_THREAD) {
 		SQVM *thread = _thread(o);
 		SQInteger threadtop = sq_gettop(thread);
 		SQInteger level;
@@ -2559,7 +2559,7 @@ static SQRESULT thread_getstackinfos(HSQUIRRELVM v)
 		if(SQ_FAILED(res))
 		{
 			sq_settop(thread,threadtop);
-			if(sqtype(thread->_lasterror) == OT_STRING) {
+			if(sq_type(thread->_lasterror) == OT_STRING) {
 				sq_throwerror(v,_stringval(thread->_lasterror));
 			}
 			else {

SquiLu/squirrel/sqclass.cpp

@@ -49,7 +49,7 @@ SQClass::~SQClass()
 bool SQClass::NewSlot(SQSharedState *ss,const SQObjectPtr &key,const SQObjectPtr &val,bool bstatic)
 {
 	SQObjectPtr temp;
-	bool belongs_to_static_table = sqtype(val) == OT_CLOSURE || sqtype(val) == OT_NATIVECLOSURE || bstatic;
+	bool belongs_to_static_table = sq_type(val) == OT_CLOSURE || sq_type(val) == OT_NATIVECLOSURE || bstatic;
 	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
@@ -59,18 +59,18 @@ bool SQClass::NewSlot(SQSharedState *ss,const SQObjectPtr &key,const SQObjectPtr
 	}
 	if(belongs_to_static_table) {
 		SQInteger mmidx;
-		if((sqtype(val) == OT_CLOSURE || sqtype(val) == OT_NATIVECLOSURE) &&
+		if((sq_type(val) == OT_CLOSURE || sq_type(val) == OT_NATIVECLOSURE) &&
 			(mmidx = ss->GetMetaMethodIdxByName(key)) != -1) {
 			_metamethods[mmidx] = val;
 		}
 		else {
 			SQObjectPtr theval = val;
-			if(_base && sqtype(val) == OT_CLOSURE) {
+			if(_base && sq_type(val) == OT_CLOSURE) {
 				theval = _closure(val)->Clone();
 				_closure(theval)->_base = _base;
 				__ObjAddRef(_base); //ref for the closure
 			}
-			if(sqtype(temp) == OT_NULL) {
+			if(sq_type(temp) == OT_NULL) {
 				if(SQVM::IsEqual(ss->_constructoridx, key)) {
 					_constructoridx = (SQInteger)_methods.size();
 				}
@@ -191,7 +191,7 @@ SQInstance::~SQInstance()
 
 bool SQInstance::GetMetaMethod(SQVM* SQ_UNUSED_ARG(v),SQMetaMethod mm,SQObjectPtr &res)
 {
-	if(sqtype(_class->_metamethods[mm]) != OT_NULL) {
+	if(sq_type(_class->_metamethods[mm]) != OT_NULL) {
 		res = _class->_metamethods[mm];
 		return true;
 	}

SquiLu/squirrel/sqclass.h

@@ -63,7 +63,7 @@ public:
 	}
     bool Set(SQObjectPtr &idx, const SQObjectPtr &val){
         SQClassMember &m = _methods[_member_idx(idx)];
-        if(!(sqtype(m.val) == OT_CLOSURE || sqtype(m.val) == OT_NATIVECLOSURE)){
+        if(!(sq_type(m.val) == OT_CLOSURE || sq_type(m.val) == OT_NATIVECLOSURE)){
             m.val = val;
             return true;
         }

SquiLu/squirrel/sqcompiler.cpp

@@ -298,7 +298,7 @@ public:
             /* Handle named constant */
             SQObjectPtr constval;
             SQObject    constid;
-            if(sqtype(constant) == OT_TABLE) {
+            if(sq_type(constant) == OT_TABLE) {
                 Expect('.');
                 constid = Expect(TK_IDENTIFIER);
                 if(!_table(constant)->Get(constid, constval)) {
@@ -312,7 +312,7 @@ public:
             epos = _fs->PushTarget();
 
             /* generate direct or literal function depending on size */
-            SQObjectType ctype = sqtype(constval);
+            SQObjectType ctype = sq_type(constval);
             switch(ctype) {
                 case OT_INTEGER: EmitLoadConstInt(_integer(constval),epos); break;
                 case OT_FLOAT: EmitLoadConstFloat(_float(constval),epos); break;
@@ -586,7 +586,7 @@ public:
 		}
 		else {
 			if(_raiseerror && _ss(_vm)->_compilererrorhandler) {
-				_ss(_vm)->_compilererrorhandler(_vm, _compilererror, sqtype(_sourcename) == OT_STRING?_stringval(_sourcename):_SC("unknown"),
+				_ss(_vm)->_compilererrorhandler(_vm, _compilererror, sq_type(_sourcename) == OT_STRING?_stringval(_sourcename):_SC("unknown"),
 					_lex.data->currentline, _lex.data->currentcolumn);
 			}
 			_vm->_lasterror = SQString::Create(_ss(_vm), _compilererror, -1);
@@ -938,7 +938,7 @@ public:
 				if(ds == OBJECT || ds == BASE) {
 					EmitDerefOp(_OP_NEWSLOT);
                     if((_es.epos == -1) && (es.etype == EXPR_STATEMENT)
-                       && (sqtype(id) == OT_STRING) ) AddGlobalName(id);
+                       && (sq_type(id) == OT_STRING) ) AddGlobalName(id);
 				}
 				else //if _derefstate != DEREF_NO_DEREF && DEREF_FIELD so is the index of a local
 					Error(_SC("can't 'create' a local slot"));
@@ -1324,7 +1324,7 @@ public:
 					/* Handle named constant */
 					SQObjectPtr constval;
 					SQObject    constid;
-					if(sqtype(constant) == OT_TABLE) {
+					if(sq_type(constant) == OT_TABLE) {
 						Expect('.');
 						constid = Expect(TK_IDENTIFIER);
 						if(!_table(constant)->Get(constid, constval)) {
@@ -1338,7 +1338,7 @@ public:
 					_es.epos = _fs->PushTarget();
 
 					/* generate direct or literal function depending on size */
-					SQObjectType ctype = sqtype(constval);
+					SQObjectType ctype = sq_type(constval);
 					switch(ctype) {
 						case OT_INTEGER: EmitLoadConstInt(_integer(constval),_es.epos); break;
 						case OT_FLOAT: EmitLoadConstFloat(_float(constval),_es.epos); break;
@@ -1615,7 +1615,7 @@ member_has_type:
 				Lex();
 				obj_id = saved_tok == TK_FUNCTION ? Expect(TK_IDENTIFIER) :
 					_fs->CreateString(saved_tok == TK_CONSTRUCTOR ? _SC("constructor") : _SC("destructor"));
-                if(sqtype(member_names) == OT_TABLE) CheckClassMemberExists(member_names, obj_id);
+                if(sq_type(member_names) == OT_TABLE) CheckClassMemberExists(member_names, obj_id);
                 else Error(_SC("unexpected error in class declaration"));
 				Expect(_SC('('));
 function_params_decl:

SquiLu/squirrel/sqdebug.cpp

@@ -17,8 +17,8 @@ SQRESULT sq_getfunctioninfo(HSQUIRRELVM v,SQInteger level,SQFunctionInfo *fi)
 			SQClosure *c = _closure(ci._closure);
 			SQFunctionProto *proto = c->_function;
 			fi->funcid = proto;
-			fi->name = sqtype(proto->_name) == OT_STRING?_stringval(proto->_name):_SC("unknown");
-			fi->source = sqtype(proto->_sourcename) == OT_STRING?_stringval(proto->_sourcename):_SC("unknown");
+			fi->name = sq_type(proto->_name) == OT_STRING?_stringval(proto->_name):_SC("unknown");
+			fi->source = sq_type(proto->_sourcename) == OT_STRING?_stringval(proto->_sourcename):_SC("unknown");
 			fi->line = proto->_lineinfos[0]._line;
 			return SQ_OK;
 		}
@@ -32,12 +32,12 @@ SQRESULT sq_stackinfos(HSQUIRRELVM v, SQInteger level, SQStackInfos *si)
 	if (cssize > level) {
 		memset(si, 0, sizeof(SQStackInfos));
 		SQVM::CallInfo &ci = v->_callsstack[cssize-level-1];
-		switch (sqtype(ci._closure)) {
+		switch (sq_type(ci._closure)) {
 		case OT_CLOSURE:{
 			SQFunctionProto *func = _closure(ci._closure)->_function;
-			if (sqtype(func->_name) == OT_STRING)
+			if (sq_type(func->_name) == OT_STRING)
 				si->funcname = _stringval(func->_name);
-			if (sqtype(func->_sourcename) == OT_STRING)
+			if (sq_type(func->_sourcename) == OT_STRING)
 				si->source = _stringval(func->_sourcename);
 			si->line = func->GetLine(ci._ip);
 						}
@@ -45,7 +45,7 @@ SQRESULT sq_stackinfos(HSQUIRRELVM v, SQInteger level, SQStackInfos *si)
 		case OT_NATIVECLOSURE:
 			si->source = _SC("NATIVE");
 			si->funcname = _SC("unknown");
-			if(sqtype(_nativeclosure(ci._closure)->_name) == OT_STRING)
+			if(sq_type(_nativeclosure(ci._closure)->_name) == OT_STRING)
 				si->funcname = _stringval(_nativeclosure(ci._closure)->_name);
 			si->line = -1;
 			break;
@@ -73,7 +73,7 @@ void SQVM::Raise_Error(const SQObjectPtr &desc)
 
 SQString *SQVM::PrintObjVal(const SQObjectPtr &o)
 {
-    switch(sqtype(o)) {
+    switch(sq_type(o)) {
     case OT_STRING: return _string(o);
     case OT_INTEGER:
         scsprintf(_sp(sq_rsl(NUMBER_MAX_CHAR+1)),sq_rsl(NUMBER_MAX_CHAR), _PRINT_INT_FMT, _integer(o));

SquiLu/squirrel/sqfuncstate.cpp

@@ -19,7 +19,7 @@ SQInstructionDesc g_InstrDesc[]={
 #endif
 void DumpLiteral(SQObjectPtr &o)
 {
-	switch(sqtype(o)){
+	switch(sq_type(o)){
 		case OT_STRING:	scprintf(_SC("\"%s\""),_stringval(o));break;
 		case OT_FLOAT: scprintf(_SC("{%f}"),_float(o));break;
 		case OT_INTEGER: scprintf(_SC("{") _PRINT_INT_FMT _SC("}"),_integer(o));break;
@@ -50,7 +50,7 @@ void SQFuncState::Dump(SQFunctionProto *func)
 	scprintf(_SC("SQInstruction sizeof %d\n"),(SQInt32)sizeof(SQInstruction));
 	scprintf(_SC("SQObject sizeof %d\n"),(SQInt32)sizeof(SQObject));
 	scprintf(_SC("--------------------------------------------------------------------\n"));
-	scprintf(_SC("*****FUNCTION [%s]\n"),sqtype(func->_name)==OT_STRING?_stringval(func->_name):_SC("unknown"));
+	scprintf(_SC("*****FUNCTION [%s]\n"),sq_type(func->_name)==OT_STRING?_stringval(func->_name):_SC("unknown"));
 	scprintf(_SC("-----LITERALS\n"));
 	SQObjectPtr refidx,key,val;
 	SQInteger idx;
@@ -220,7 +220,7 @@ SQInteger SQFuncState::PopTarget()
 	SQUnsignedInteger npos=_targetstack.back();
 	assert(npos < _vlocals.size());
 	SQLocalVarInfo &t = _vlocals[npos];
-	if(sqtype(t._name)==OT_NULL){
+	if(sq_type(t._name)==OT_NULL){
 		_vlocals.pop_back();
 	}
 	_targetstack.pop_back();
@@ -252,7 +252,7 @@ void SQFuncState::SetStackSize(SQInteger n)
 	while(size>n){
 		size--;
 		SQLocalVarInfo lvi = _vlocals.back();
-		if(sqtype(lvi._name)!=OT_NULL){
+		if(sq_type(lvi._name)!=OT_NULL){
 			if(lvi._end_op == UINT_MINUS_ONE) { //this means is an outer
 				_outers--;
 			}
@@ -276,7 +276,7 @@ bool SQFuncState::IsConstant(const SQObject &name,SQObject &e)
 bool SQFuncState::IsLocal(SQUnsignedInteger stkpos)
 {
 	if(stkpos>=_vlocals.size())return false;
-	else if(sqtype(_vlocals[stkpos]._name)!=OT_NULL)return true;
+	else if(sq_type(_vlocals[stkpos]._name)!=OT_NULL)return true;
 	return false;
 }
 
@@ -302,7 +302,7 @@ SQInteger SQFuncState::GetLocalVariable(const SQObject &name)
 	SQInteger locals=_vlocals.size();
 	while(locals>=1){
 		SQLocalVarInfo &lvi = _vlocals[locals-1];
-		if(sqtype(lvi._name)==OT_STRING && _string(lvi._name)==_string(name)){
+		if(sq_type(lvi._name)==OT_STRING && _string(lvi._name)==_string(name)){
 			return locals-1;
 		}
 		locals--;

SquiLu/squirrel/sqobject.cpp

@@ -43,18 +43,18 @@ const SQChar *IdType2Name(SQObjectType type)
 
 const SQChar *GetTypeName(const SQObjectPtr &obj1)
 {
-	return IdType2Name(sqtype(obj1));
+	return IdType2Name(sq_type(obj1));
 }
 
 SQObjectPtr SQObjectPtr::operator[](SQInteger nidx) {
     SQObjectPtr val;
-    if(sqtype(*this) == OT_ARRAY) _array(*this)->Get(nidx, val);
+    if(sq_type(*this) == OT_ARRAY) _array(*this)->Get(nidx, val);
     return val;
 }
 
 SQObjectPtr SQObjectPtr::operator[](const SQChar *key) {
     SQObjectPtr val;
-    switch(sqtype(*this))
+    switch(sq_type(*this))
     {
         case OT_TABLE: _table(*this)->Get(key, val); break;
         case OT_CLASS: _class(*this)->Get(key, val); break;
@@ -89,7 +89,7 @@ SQInteger SQString::Next(const SQObjectPtr &refpos, SQObjectPtr &outkey, SQObjec
 
 SQUnsignedInteger SQTranslateIndex(const SQObjectPtr &idx)
 {
-	switch(sqtype(idx)){
+	switch(sq_type(idx)){
 		case OT_NULL:
 			return 0;
 		case OT_INTEGER:
@@ -156,7 +156,7 @@ bool SQGenerator::Yield(SQVM *v,SQInteger target)
 
 	_stack.resize(size);
 	SQObject _this = v->_stack[v->_stackbase];
-	_stack._vals[0] = ISREFCOUNTED(sqtype(_this)) ? SQObjectPtr(_refcounted(_this)->GetWeakRef(sqtype(_this))) : _this;
+	_stack._vals[0] = ISREFCOUNTED(sq_type(_this)) ? SQObjectPtr(_refcounted(_this)->GetWeakRef(sq_type(_this))) : _this;
 	for(SQInteger n =1; n<target; n++) {
 		_stack._vals[n] = v->_stack[v->_stackbase+n];
 	}
@@ -208,7 +208,7 @@ bool SQGenerator::Resume(SQVM *v,SQObjectPtr &dest)
 		et._stacksize += newbase;
 	}
 	SQObject _this = _stack._vals[0];
-	v->_stack[v->_stackbase] = sqtype(_this) == OT_WEAKREF ? _weakref(_this)->_obj : _this;
+	v->_stack[v->_stackbase] = sq_type(_this) == OT_WEAKREF ? _weakref(_this)->_obj : _this;
 
 	for(SQInteger n = 1; n<size; n++) {
 		v->_stack[v->_stackbase+n] = _stack._vals[n];
@@ -344,7 +344,7 @@ static bool WriteObjectAsCode(HSQUIRRELVM v,SQUserPointer up,SQWRITEFUNC write,S
 {
 	SQChar buf[32];
 	SQInteger sz;
-	switch(sqtype(o)){
+	switch(sq_type(o)){
 	case OT_STRING:{
             SQInteger str_size = _string(o)->_len;
             if(str_size){
@@ -390,9 +390,9 @@ static bool WriteObjectAsCode(HSQUIRRELVM v,SQUserPointer up,SQWRITEFUNC write,S
 
 static bool WriteObject(HSQUIRRELVM v,SQUserPointer up,SQWRITEFUNC write,SQObjectPtr &o)
 {
-	SQUnsignedInteger32 _type = (SQUnsignedInteger32)sqtype(o);
+	SQUnsignedInteger32 _type = (SQUnsignedInteger32)sq_type(o);
 	_CHECK_IO(SafeWrite(v,write,up,&_type,sizeof(_type)));
-	switch(sqtype(o)){
+	switch(sq_type(o)){
 	case OT_STRING:
 		_CHECK_IO(SafeWrite(v,write,up,&_string(o)->_len,sizeof(SQInteger)));
 		_CHECK_IO(SafeWrite(v,write,up,_stringval(o),rsl(_string(o)->_len)));
@@ -794,7 +794,7 @@ bool SQFunctionProto::SaveAsSource(SQVM *v,SQUserPointer up,SQWRITEFUNC write)
                                      inst._arg0, inst._arg1, SQGetNewObjTypeName(inst._arg3), inst._arg3);
             break;
             case _OP_APPENDARRAY:
-                        SafeWriteFmt(v,write,up,"\t/* array_at_stk(%d), %s(%d), sqtype(%d) */",
+                        SafeWriteFmt(v,write,up,"\t/* array_at_stk(%d), %s(%d), sq_type(%d) */",
                                      inst._arg0, SQGetArrayAppendTypeName(inst._arg2), inst._arg1, inst._arg2);
             break;
             case _OP_NEWSLOT:

SquiLu/squirrel/sqobject.h

@@ -101,7 +101,7 @@ struct SQWeakRef : SQRefCounted
 	SQObject _obj;
 };
 
-#define _realval(o) (sqtype((o)) != OT_WEAKREF?(SQObject)o:_weakref(o)->_obj)
+#define _realval(o) (sq_type((o)) != OT_WEAKREF?(SQObject)o:_weakref(o)->_obj)
 
 struct SQObjectPtr;
 
@@ -129,8 +129,7 @@ struct SQObjectPtr;
 	(obj)->_uiRef++; \
 }
 
-#define sqtype(obj) ((obj)._type)
-#define is_delegable(t) (sqtype(t)&SQOBJECT_DELEGABLE)
+#define is_delegable(t) (sq_type(t)&SQOBJECT_DELEGABLE)
 #define raw_type(obj) _RAW_TYPE((obj)._type)
 
 #define _integer(obj) ((obj)._unVal.nInteger)
@@ -156,8 +155,8 @@ struct SQObjectPtr;
 #define _stringval(obj) (obj)._unVal.pString->_val
 #define _userdataval(obj) ((SQUserPointer)sq_aligning((obj)._unVal.pUserData + 1))
 
-#define tofloat(num) ((sqtype(num)==OT_INTEGER)?(SQFloat)_integer(num):_float(num))
-#define tointeger(num) ((sqtype(num)==OT_FLOAT)?(SQInteger)_float(num):_integer(num))
+#define tofloat(num) ((sq_type(num)==OT_INTEGER)?(SQFloat)_integer(num):_float(num))
+#define tointeger(num) ((sq_type(num)==OT_FLOAT)?(SQInteger)_float(num):_integer(num))
 /////////////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////////////
 #if defined(SQUSEDOUBLE) && !defined(_SQ64) || !defined(SQUSEDOUBLE) && defined(_SQ64)

SquiLu/squirrel/sqstate.cpp

@@ -185,7 +185,7 @@ SQSharedState::~SQSharedState()
 		_systemstrings->back().Null();
 		_systemstrings->pop_back();
 	}
-	if(sqtype(_root_vm) != OT_NULL)
+	if(sq_type(_root_vm) != OT_NULL)
     {
         _thread(_root_vm)->Finalize();
         _root_vm.Null();
@@ -232,7 +232,7 @@ SQSharedState::~SQSharedState()
 
 SQInteger SQSharedState::GetMetaMethodIdxByName(const SQObjectPtr &name)
 {
-	if(sqtype(name) != OT_STRING)
+	if(sq_type(name) != OT_STRING)
 		return -1;
 	SQObjectPtr ret;
 	if(_table(_metamethodsmap)->Get(name,ret)) {
@@ -275,7 +275,7 @@ void SQSharedState::CallDelayedReleaseHooks(SQVM *vm, int count)
 
 void SQSharedState::MarkObject(SQObjectPtr &o,SQCollectable **chain)
 {
-	switch(sqtype(o)){
+	switch(sq_type(o)){
 	case OT_TABLE:_table(o)->Mark(chain);break;
 	case OT_ARRAY:_array(o)->Mark(chain);break;
 	case OT_USERDATA:_userdata(o)->Mark(chain);break;
@@ -464,7 +464,7 @@ void RefTable::Mark(SQCollectable **chain)
 {
 	RefNode *nodes = (RefNode *)_nodes;
 	for(SQUnsignedInteger n = 0; n < _numofslots; n++) {
-		if(sqtype(nodes->obj) != OT_NULL) {
+		if(sq_type(nodes->obj) != OT_NULL) {
 			SQSharedState::MarkObject(nodes->obj,chain);
 		}
 		nodes++;
@@ -526,7 +526,7 @@ void RefTable::Resize(SQUnsignedInteger size)
 	//rehash
 	SQUnsignedInteger nfound = 0;
 	for(SQUnsignedInteger n = 0; n < oldnumofslots; n++) {
-		if(sqtype(t->obj) != OT_NULL) {
+		if(sq_type(t->obj) != OT_NULL) {
 			//add back;
 			assert(t->refs != 0);
 			RefNode *nn = Add(::HashObj(t->obj)&(_numofslots-1),t->obj);
@@ -559,7 +559,7 @@ RefTable::RefNode *RefTable::Get(SQObject &obj,SQHash &mainpos,RefNode **prev,bo
 	mainpos = ::HashObj(obj)&(_numofslots-1);
 	*prev = NULL;
 	for (ref = _buckets[mainpos]; ref; ) {
-		if(_rawval(ref->obj) == _rawval(obj) && sqtype(ref->obj) == sqtype(obj))
+		if(_rawval(ref->obj) == _rawval(obj) && sq_type(ref->obj) == sq_type(obj))
 			break;
 		*prev = ref;
 		ref = ref->next;

SquiLu/squirrel/sqtable.cpp

@@ -61,7 +61,7 @@ void SQTable::Rehash(bool force)
 	_usednodes = 0;
 	for (SQInteger i=0; i<oldsize; i++) {
 		_HashNode *old = nold+i;
-		if (sqtype(old->key) != OT_NULL)
+		if (sq_type(old->key) != OT_NULL)
 			NewSlot(old->key,old->val);
 	}
 	for(SQInteger k=0;k<oldsize;k++)
@@ -106,7 +106,7 @@ SQTable *SQTable::Clone()
 
 bool SQTable::Get(const SQObjectPtr &key,SQObjectPtr &val)
 {
-	if(sqtype(key) == OT_NULL)
+	if(sq_type(key) == OT_NULL)
 		return false;
 	_HashNode *n = _Get(key, HashObj(key) & (_numofnodes - 1));
 	if (n) {
@@ -117,14 +117,14 @@ bool SQTable::Get(const SQObjectPtr &key,SQObjectPtr &val)
 }
 bool SQTable::Exists(const SQObjectPtr &key)
 {
-	if(sqtype(key) == OT_NULL)
+	if(sq_type(key) == OT_NULL)
 		return false;
 	_HashNode *n = _Get(key, HashObj(key) & (_numofnodes - 1));
 	return n ? true : false;
 }
 bool SQTable::NewSlot(const SQObjectPtr &key,const SQObjectPtr &val)
 {
-	assert(sqtype(key) != OT_NULL);
+	assert(sq_type(key) != OT_NULL);
 	SQHash h = HashObj(key) & (_numofnodes - 1);
 	_HashNode *n = _Get(key, h);
 	if (n) {
@@ -138,7 +138,7 @@ bool SQTable::NewSlot(const SQObjectPtr &key,const SQObjectPtr &val)
 	//key not found I'll insert it
 	//main pos is not free
 
-	if(sqtype(mp->key) != OT_NULL) {
+	if(sq_type(mp->key) != OT_NULL) {
 		n = _firstfree;  /* get a free place */
 		SQHash mph = HashObj(mp->key) & (_numofnodes - 1);
 		_HashNode *othern;  /* main position of colliding node */
@@ -167,7 +167,7 @@ bool SQTable::NewSlot(const SQObjectPtr &key,const SQObjectPtr &val)
 	mp->key = key;
 
 	for (;;) {  /* correct `firstfree' */
-		if (sqtype(_firstfree->key) == OT_NULL && _firstfree->next == NULL) {
+		if (sq_type(_firstfree->key) == OT_NULL && _firstfree->next == NULL) {
 			mp->val = val;
 			_usednodes++;
 			return true;  /* OK; table still has a free place */
@@ -183,7 +183,7 @@ SQInteger SQTable::Next(bool getweakrefs,const SQObjectPtr &refpos, SQObjectPtr
 {
 	SQInteger idx = (SQInteger)SQTranslateIndex(refpos);
 	while (idx < _numofnodes) {
-		if(sqtype(_nodes[idx].key) != OT_NULL) {
+		if(sq_type(_nodes[idx].key) != OT_NULL) {
 			//first found
 			_HashNode &n = _nodes[idx];
 			outkey = n.key;

SquiLu/squirrel/sqtable.h

@@ -14,7 +14,7 @@
 
 inline SQHash HashObj(const SQObjectPtr &key)
 {
-	switch(sqtype(key)) {
+	switch(sq_type(key)) {
 		case OT_STRING:		return _string(key)->_hash;
 		case OT_FLOAT:		return (SQHash)((SQInteger)_float(key));
 		case OT_BOOL: case OT_INTEGER:	return (SQHash)((SQInteger)_integer(key));
@@ -67,7 +67,7 @@ public:
 	{
 		_HashNode *n = &_nodes[hash];
 		do{
-			if(_rawval(n->key) == _rawval(key) && sqtype(n->key) == sqtype(key)){
+			if(_rawval(n->key) == _rawval(key) && sq_type(n->key) == sq_type(key)){
 				return n;
 			}
 		}while((n = n->next));
@@ -80,7 +80,7 @@ public:
 		_HashNode *n = &_nodes[hash & (_numofnodes - 1)];
 		_HashNode *res = NULL;
 		do{
-			if(sqtype(n->key) == OT_STRING && (scstrcmp(_stringval(n->key),key) == 0)){
+			if(sq_type(n->key) == OT_STRING && (scstrcmp(_stringval(n->key),key) == 0)){
 				res = n;
 				break;
 			}

SquiLu/squirrel/sqvm.cpp

@@ -28,7 +28,7 @@
 bool SQVM::BW_OP(SQUnsignedInteger op,SQObjectPtr &trg,const SQObjectPtr &o1,const SQObjectPtr &o2)
 {
 	SQInteger res;
-	if((sqtype(o1)|sqtype(o2)) == OT_INTEGER)
+	if((sq_type(o1)|sq_type(o2)) == OT_INTEGER)
 	{
 		SQInteger i1 = _integer(o1), i2 = _integer(o2);
 		switch(op) {
@@ -48,7 +48,7 @@ bool SQVM::BW_OP(SQUnsignedInteger op,SQObjectPtr &trg,const SQObjectPtr &o1,con
 
 #define _ARITH_BASE_(op,trg,o1,o2, ARITH_INTEGER) \
 { \
-	switch(sqtype(o1)|sqtype(o2)) { \
+	switch(sq_type(o1)|sq_type(o2)) { \
 		case OT_INTEGER: ARITH_INTEGER;break; \
 		case (OT_FLOAT): trg = _float(o1) op _float(o2); break;\
 		case (OT_FLOAT|OT_INTEGER): trg = tofloat(o1) op tofloat(o2); break;\
@@ -67,7 +67,7 @@ bool SQVM::BW_OP(SQUnsignedInteger op,SQObjectPtr &trg,const SQObjectPtr &o1,con
 
 bool SQVM::ARITH_OP(SQUnsignedInteger op,SQObjectPtr &trg,const SQObjectPtr &o1,const SQObjectPtr &o2)
 {
-	SQInteger tmask = sqtype(o1)|sqtype(o2);
+	SQInteger tmask = sq_type(o1)|sq_type(o2);
 
 	switch(tmask) {
 		case OT_INTEGER:{
@@ -228,7 +228,7 @@ bool SQVM::ArithMetaMethod(SQInteger op,const SQObjectPtr &o1,const SQObjectPtr
 bool SQVM::NEG_OP(SQObjectPtr &trg,const SQObjectPtr &o)
 {
 
-	switch(sqtype(o)) {
+	switch(sq_type(o)) {
 	case OT_INTEGER:
 		trg = -_integer(o);
 		return true;
@@ -257,7 +257,7 @@ bool SQVM::NEG_OP(SQObjectPtr &trg,const SQObjectPtr &o)
 #define _RET_SUCCEED(exp) { result = (exp); return true; }
 bool SQVM::ObjCmp(const SQObjectPtr &o1,const SQObjectPtr &o2,SQInteger &result)
 {
-	SQObjectType t1 = sqtype(o1), t2 = sqtype(o2);
+	SQObjectType t1 = sq_type(o1), t2 = sq_type(o2);
 	if(t1 == t2) {
 		if(_rawval(o1) == _rawval(o2))_RET_SUCCEED(0);
 		SQObjectPtr res;
@@ -276,7 +276,7 @@ bool SQVM::ObjCmp(const SQObjectPtr &o1,const SQObjectPtr &o2,SQInteger &result)
 				if(_delegable(o1)->GetMetaMethod(this, MT_CMP, closure)) {
 					Push(o1);Push(o2);
 					if(CallMetaMethod(closure,MT_CMP,2,res)) {
-						if(sqtype(res) != OT_INTEGER) {
+						if(sq_type(res) != OT_INTEGER) {
 							Raise_Error(_SC("_cmp must return an integer"));
 							return false;
 						}
@@ -290,7 +290,7 @@ bool SQVM::ObjCmp(const SQObjectPtr &o1,const SQObjectPtr &o2,SQInteger &result)
 			_RET_SUCCEED( _userpointer(o1) < _userpointer(o2)?-1:1 );
 		}
 		assert(0);
-		//if(sqtype(res)!=OT_INTEGER) { Raise_CompareError(o1,o2); return false; }
+		//if(sq_type(res)!=OT_INTEGER) { Raise_CompareError(o1,o2); return false; }
 		//	_RET_SUCCEED(_integer(res));
 
 	}
@@ -334,7 +334,7 @@ bool SQVM::CMP_OP(CmpOP op, const SQObjectPtr &o1,const SQObjectPtr &o2,SQObject
 
 bool SQVM::ToString(const SQObjectPtr &o,SQObjectPtr &res)
 {
-	switch(sqtype(o)) {
+	switch(sq_type(o)) {
 	case OT_STRING:
 		res = o;
 		return true;
@@ -355,7 +355,7 @@ bool SQVM::ToString(const SQObjectPtr &o,SQObjectPtr &res)
 			if(_delegable(o)->GetMetaMethod(this, MT_TOSTRING, closure)) {
 				Push(o);
 				if(CallMetaMethod(closure,MT_TOSTRING,1,res)) {
-					if(sqtype(res) == OT_STRING)
+					if(sq_type(res) == OT_STRING)
 						return true;
 				}
 				else {
@@ -569,7 +569,7 @@ bool SQVM::FOREACH_OP(SQObjectPtr &o1,SQObjectPtr &o2,SQObjectPtr
 &o3,SQObjectPtr &o4,SQInteger SQ_UNUSED_ARG(arg_2),int exitpos,int &jump)
 {
 	SQInteger nrefidx;
-	switch(sqtype(o1)) {
+	switch(sq_type(o1)) {
 	case OT_TABLE:
 		if((nrefidx = _table(o1)->Next(false,o4, o2, o3)) == -1) _FINISH(exitpos);
 		o4 = (SQInteger)nrefidx; _FINISH(1);
@@ -592,7 +592,7 @@ bool SQVM::FOREACH_OP(SQObjectPtr &o1,SQObjectPtr &o2,SQObjectPtr
 				Push(o4);
 				if(CallMetaMethod(closure, MT_NEXTI, 2, itr)) {
 					o4 = o2 = itr;
-					if(sqtype(itr) == OT_NULL) _FINISH(exitpos);
+					if(sq_type(itr) == OT_NULL) _FINISH(exitpos);
 					if(!Get(o1, itr, o3, false, DONT_FALL_BACK)) {
 						Raise_Error(_SC("_nexti returned an invalid idx")); // cloud be changed
 						return false;
@@ -613,7 +613,7 @@ bool SQVM::FOREACH_OP(SQObjectPtr &o1,SQObjectPtr &o2,SQObjectPtr
             break;
             case SQGenerator::eSuspended:{
                 SQInteger idx = 0;
-                if(sqtype(o4) == OT_INTEGER) {
+                if(sq_type(o4) == OT_INTEGER) {
                     idx = _integer(o4) + 1;
                 }
                 o2 = idx;
@@ -670,14 +670,14 @@ bool SQVM::CLASS_OP(SQObjectPtr &target,SQInteger baseclass,SQInteger attributes
 	SQClass *base = NULL;
 	SQObjectPtr attrs;
 	if(baseclass != -1) {
-		if(sqtype(_stack._vals[_stackbase+baseclass]) != OT_CLASS) { Raise_Error(_SC("trying to inherit from a %s"),GetTypeName(_stack._vals[_stackbase+baseclass])); return false; }
+		if(sq_type(_stack._vals[_stackbase+baseclass]) != OT_CLASS) { Raise_Error(_SC("trying to inherit from a %s"),GetTypeName(_stack._vals[_stackbase+baseclass])); return false; }
 		base = _class(_stack._vals[_stackbase + baseclass]);
 	}
 	if(attributes != MAX_FUNC_STACKSIZE) {
 		attrs = _stack._vals[_stackbase+attributes];
 	}
 	target = SQClass::Create(_ss(this),base);
-	if(sqtype(_class(target)->_metamethods[MT_INHERITED]) != OT_NULL) {
+	if(sq_type(_class(target)->_metamethods[MT_INHERITED]) != OT_NULL) {
 		int nparams = 2;
 		SQObjectPtr ret;
 		Push(target); Push(attrs);
@@ -694,7 +694,7 @@ bool SQVM::CLASS_OP(SQObjectPtr &target,SQInteger baseclass,SQInteger attributes
 bool SQVM::IsEqual(const SQObjectPtr &o1,const SQObjectPtr &o2)
 {
 	bool res = false;
-	if(sqtype(o1) == sqtype(o2)) {
+	if(sq_type(o1) == sq_type(o2)) {
 		res = (_rawval(o1) == _rawval(o2));
 	}
 	else if(sq_isnumeric(o1) && sq_isnumeric(o2)) {
@@ -706,7 +706,7 @@ bool SQVM::IsEqual(const SQObjectPtr &o1,const SQObjectPtr &o2)
 bool SQVM::IsEqualIdentity(const SQObjectPtr &o1,const SQObjectPtr &o2)
 {
 	bool res = false;
-	if(sqtype(o1) == sqtype(o2)) {
+	if(sq_type(o1) == sq_type(o2)) {
 		res = (_rawval(o1) == _rawval(o2));
 	}
 	return res;
@@ -714,12 +714,12 @@ bool SQVM::IsEqualIdentity(const SQObjectPtr &o1,const SQObjectPtr &o2)
 
 bool SQVM::IsFalse(SQObjectPtr &o)
 {
-	if(((sqtype(o) & SQOBJECT_CANBEFALSE)
-		&& ( ((sqtype(o) == OT_FLOAT) && (_float(o) == SQFloat(0.0))) ))
+	if(((sq_type(o) & SQOBJECT_CANBEFALSE)
+		&& ( ((sq_type(o) == OT_FLOAT) && (_float(o) == SQFloat(0.0))) ))
 #if !defined(SQUSEDOUBLE) || (defined(SQUSEDOUBLE) && defined(_SQ64))
 		|| (_integer(o) == 0) )  //OT_NULL|OT_INTEGER|OT_BOOL
 #else
-		|| (((sqtype(o) != OT_FLOAT) && (_integer(o) == 0))) )  //OT_NULL|OT_INTEGER|OT_BOOL
+		|| (((sq_type(o) != OT_FLOAT) && (_integer(o) == 0))) )  //OT_NULL|OT_INTEGER|OT_BOOL
 #endif
 	{
 		return true;
@@ -917,7 +917,7 @@ exception_restore:
 			OPCODE_TARGET(DLOAD) { TARGET = ci->_literals[arg1]; STK(arg2) = ci->_literals[arg3];continue;}
 			OPCODE_TARGET(TAILCALL) {
 				SQObjectPtr &t = STK(arg1);
-				if (sqtype(t) == OT_CLOSURE
+				if (sq_type(t) == OT_CLOSURE
 					&& (!_closure(t)->_function->_bgenerator)){
 					SQObjectPtr clo = t;
 					SQInteger last_top = _top;
@@ -930,7 +930,7 @@ exception_restore:
 							  }
 			OPCODE_TARGET(CALL) {
 					SQObjectPtr clo = STK(arg1);
-					switch (sqtype(clo)) {
+					switch (sq_type(clo)) {
 					case OT_CLOSURE:
 						_GUARD(StartCall(_closure(clo), sarg0, arg3, _stackbase+arg2, false));
 						continue;
@@ -960,7 +960,7 @@ exception_restore:
 							STK(arg0) = inst;
 						}
 						SQInteger stkbase;
-						switch(sqtype(clo)) {
+						switch(sq_type(clo)) {
 							case OT_CLOSURE:
 								stkbase = _stackbase+arg2;
 								_stack._vals[stkbase] = inst;
@@ -995,7 +995,7 @@ exception_restore:
 					  }
 					default:
 						Raise_Error(_SC("attempt to call '%s' [%s]"), GetTypeName(clo),
-                            sqtype(clo) == OT_STRING ? _stringval(clo) : "");
+                            sq_type(clo) == OT_STRING ? _stringval(clo) : "");
 						SQ_THROW();
 					}
 				}
@@ -1135,7 +1135,7 @@ exception_restore:
 			OPCODE_TARGET(INC) {SQObjectPtr o(sarg3); _GUARD(DerefInc('+',TARGET, STK(arg1), STK(arg2), o, false, arg1));} continue;
 			OPCODE_TARGET(INCL) {
 				SQObjectPtr &a = STK(arg1);
-				if(sqtype(a) == OT_INTEGER) {
+				if(sq_type(a) == OT_INTEGER) {
 					a._unVal.nInteger = _integer(a) + sarg3;
 				}
 				else {
@@ -1146,7 +1146,7 @@ exception_restore:
 			OPCODE_TARGET(PINC) {SQObjectPtr o(sarg3); _GUARD(DerefInc('+',TARGET, STK(arg1), STK(arg2), o, true, arg1));} continue;
 			OPCODE_TARGET(PINCL) {
 				SQObjectPtr &a = STK(arg1);
-				if(sqtype(a) == OT_INTEGER) {
+				if(sq_type(a) == OT_INTEGER) {
 					TARGET = a;
 					a._unVal.nInteger = _integer(a) + sarg3;
 				}
@@ -1158,9 +1158,9 @@ exception_restore:
 			OPCODE_TARGET(CMP) {	_GUARD(CMP_OP((CmpOP)arg3,STK(arg2),STK(arg1),TARGET))	continue;}
 			OPCODE_TARGET(EXISTS) { TARGET = Get(STK(arg1), STK(arg2), temp_reg, true,EXISTS_FALL_BACK);continue;}
 			OPCODE_TARGET(INSTANCEOF) {
-				if(sqtype(STK(arg1)) != OT_CLASS)
+				if(sq_type(STK(arg1)) != OT_CLASS)
 				{Raise_Error(_SC("cannot apply instanceof between a %s and a %s"),GetTypeName(STK(arg1)),GetTypeName(STK(arg2))); SQ_THROW();}
-				TARGET = (sqtype(STK(arg2)) == OT_INSTANCE) ? (_instance(STK(arg2))->InstanceOf(_class(STK(arg1)))?true:false) : false;
+				TARGET = (sq_type(STK(arg2)) == OT_INSTANCE) ? (_instance(STK(arg2))->InstanceOf(_class(STK(arg1)))?true:false) : false;
 				continue;}
 			OPCODE_TARGET(AND) {
 				if(IsFalse(STK(arg2))) {
@@ -1177,7 +1177,7 @@ exception_restore:
 			OPCODE_TARGET(NEG) { _GUARD(NEG_OP(TARGET,STK(arg1))); continue;}
 			OPCODE_TARGET(NOT) { TARGET = IsFalse(STK(arg1)); continue;}
 			OPCODE_TARGET(BWNOT) {
-				if(sqtype(STK(arg1)) == OT_INTEGER) {
+				if(sq_type(STK(arg1)) == OT_INTEGER) {
 					SQInteger t = _integer(STK(arg1));
 					TARGET = SQInteger(~t);
 					continue;
@@ -1207,7 +1207,7 @@ exception_restore:
 				}
 				continue;
 			OPCODE_TARGET(RESUME) {
-				if(sqtype(STK(arg1)) != OT_GENERATOR){ Raise_Error(_SC("trying to resume a '%s',only genenerator can be resumed"), GetTypeName(STK(arg1))); SQ_THROW();}
+				if(sq_type(STK(arg1)) != OT_GENERATOR){ Raise_Error(_SC("trying to resume a '%s',only genenerator can be resumed"), GetTypeName(STK(arg1))); SQ_THROW();}
 				_GUARD(_generator(STK(arg1))->Resume(this, TARGET));
 				traps += ci->_etraps;
                 continue;}
@@ -1216,7 +1216,7 @@ exception_restore:
 				ci->_ip += tojump; }
 				continue;
 			OPCODE_TARGET(POSTFOREACH) {
-				assert(sqtype(STK(arg0)) == OT_GENERATOR);
+				assert(sq_type(STK(arg0)) == OT_GENERATOR);
 				if(_generator(STK(arg0))->_state == SQGenerator::eDead)
 					ci->_ip += (sarg1 - 1);
 				continue;}
@@ -1313,7 +1313,7 @@ bool SQVM::CreateClassInstance(SQClass *theclass, SQObjectPtr &inst, SQObjectPtr
 
 void SQVM::CallErrorHandler(SQObjectPtr &error)
 {
-	if(sqtype(_errorhandler) != OT_NULL) {
+	if(sq_type(_errorhandler) != OT_NULL) {
 		SQObjectPtr out;
 		Push(_roottable); Push(error);
 		Call(_errorhandler, 2, _top-2, out,SQFalse);
@@ -1323,7 +1323,7 @@ void SQVM::CallErrorHandler(SQObjectPtr &error)
 
 void SQVM::CallAtExitHandler()
 {
-	if(sqtype(_atexithandler) != OT_NULL) {
+	if(sq_type(_atexithandler) != OT_NULL) {
 		SQObjectPtr out;
 		Push(_roottable);
 		Call(_atexithandler, 1, _top-1, out,SQFalse);
@@ -1336,8 +1336,8 @@ void SQVM::CallDebugHook(SQInteger type,SQInteger forcedline)
 	_debughook = false;
 	SQFunctionProto *func=_closure(ci->_closure)->_function;
 	if(_debughook_native) {
-		const SQChar *src = sqtype(func->_sourcename) == OT_STRING?_stringval(func->_sourcename):NULL;
-		const SQChar *fname = sqtype(func->_name) == OT_STRING?_stringval(func->_name):NULL;
+		const SQChar *src = sq_type(func->_sourcename) == OT_STRING?_stringval(func->_sourcename):NULL;
+		const SQChar *fname = sq_type(func->_name) == OT_STRING?_stringval(func->_name):NULL;
 		SQInteger line = forcedline?forcedline:func->GetLine(ci->_ip);
 		_debughook_native(this,type,src,line,fname);
 	}
@@ -1378,7 +1378,7 @@ bool SQVM::CallNative(SQNativeClosure *nclosure, SQInteger nargs, SQInteger newb
 					//if nclosure->_env is set then check it instead
 					ptype = nclosure->_env->_obj._type;
 				}
-				else ptype = sqtype(_stack._vals[newbase+i]);
+				else ptype = sq_type(_stack._vals[newbase+i]);
 
 				if(!(ptype & tc._vals[i])) {
 					Raise_ParamTypeError(i,tc._vals[i],ptype);
@@ -1429,7 +1429,7 @@ bool SQVM::CallNative(SQNativeClosure *nclosure, SQInteger nargs, SQInteger newb
 
 bool SQVM::Get(const SQObjectPtr &self,const SQObjectPtr &key,SQObjectPtr &dest,bool raw, SQInteger selfidx)
 {
-	switch(sqtype(self)){
+	switch(sq_type(self)){
 	case OT_TABLE:
 		if(_table(self)->Get(key,dest))return true;
 		break;
@@ -1480,7 +1480,7 @@ bool SQVM::Get(const SQObjectPtr &self,const SQObjectPtr &key,SQObjectPtr &dest,
 bool SQVM::InvokeDefaultDelegate(const SQObjectPtr &self,const SQObjectPtr &key,SQObjectPtr &dest)
 {
 	SQTable *ddel = NULL;
-	switch(sqtype(self)) {
+	switch(sq_type(self)) {
 		case OT_CLASS: ddel = _class_ddel; break;
 		case OT_TABLE: ddel = _table_ddel; break;
 		case OT_ARRAY: ddel = _array_ddel; break;
@@ -1499,7 +1499,7 @@ bool SQVM::InvokeDefaultDelegate(const SQObjectPtr &self,const SQObjectPtr &key,
 
 SQInteger SQVM::FallBackGet(const SQObjectPtr &self,const SQObjectPtr &key,SQObjectPtr &dest)
 {
-	switch(sqtype(self)){
+	switch(sq_type(self)){
 	case OT_TABLE:
 	case OT_USERDATA:
         //delegation
@@ -1522,7 +1522,7 @@ SQInteger SQVM::FallBackGet(const SQObjectPtr &self,const SQObjectPtr &key,SQObj
 			}
 			else {
 				Pop(2);
-				if(sqtype(_lasterror) != OT_NULL) { //NULL means "clean failure" (not found)
+				if(sq_type(_lasterror) != OT_NULL) { //NULL means "clean failure" (not found)
 					return FALLBACK_ERROR;
 				}
 			}
@@ -1537,7 +1537,7 @@ SQInteger SQVM::FallBackGet(const SQObjectPtr &self,const SQObjectPtr &key,SQObj
 
 bool SQVM::Set(const SQObjectPtr &self,const SQObjectPtr &key,const SQObjectPtr &val,SQInteger selfidx)
 {
-	switch(sqtype(self)){
+	switch(sq_type(self)){
 	case OT_TABLE:
 		if(_table(self)->Set(key,val)) return true;
 		break;
@@ -1575,7 +1575,7 @@ bool SQVM::Set(const SQObjectPtr &self,const SQObjectPtr &key,const SQObjectPtr
 
 SQInteger SQVM::FallBackSet(const SQObjectPtr &self,const SQObjectPtr &key,const SQObjectPtr &val)
 {
-	switch(sqtype(self)) {
+	switch(sq_type(self)) {
 	case OT_TABLE:
 		if(_table(self)->_delegate) {
 			if(Set(_table(self)->_delegate,key,val,DONT_FALL_BACK))	return FALLBACK_OK;
@@ -1595,7 +1595,7 @@ SQInteger SQVM::FallBackSet(const SQObjectPtr &self,const SQObjectPtr &key,const
 			}
 			else {
                 Pop(3);
-				if(sqtype(_lasterror) != OT_NULL) { //NULL means "clean failure" (not found)
+				if(sq_type(_lasterror) != OT_NULL) { //NULL means "clean failure" (not found)
 					return FALLBACK_ERROR;
 				}
 			}
@@ -1612,7 +1612,7 @@ bool SQVM::Clone(const SQObjectPtr &self,SQObjectPtr &target)
 {
 	SQObjectPtr temp_reg;
 	SQObjectPtr newobj;
-	switch(sqtype(self)){
+	switch(sq_type(self)){
 	case OT_TABLE:
 		newobj = _table(self)->Clone();
 		goto cloned_mt;
@@ -1640,14 +1640,14 @@ cloned_mt:
 
 bool SQVM::NewSlotA(const SQObjectPtr &self,const SQObjectPtr &key,const SQObjectPtr &val,const SQObjectPtr &attrs,bool bstatic,bool raw)
 {
-	if(sqtype(self) != OT_CLASS) {
+	if(sq_type(self) != OT_CLASS) {
 		Raise_Error(_SC("object must be a class"));
 		return false;
 	}
 	SQClass *c = _class(self);
 	if(!raw) {
 		SQObjectPtr &mm = c->_metamethods[MT_NEWMEMBER];
-		if(sqtype(mm) != OT_NULL ) {
+		if(sq_type(mm) != OT_NULL ) {
 			Push(self); Push(key); Push(val);
 			Push(attrs);
 			Push(bstatic);
@@ -1656,7 +1656,7 @@ bool SQVM::NewSlotA(const SQObjectPtr &self,const SQObjectPtr &key,const SQObjec
 	}
 	if(!NewSlot(self, key, val,bstatic))
 		return false;
-	if(sqtype(attrs) != OT_NULL) {
+	if(sq_type(attrs) != OT_NULL) {
 		c->SetAttributes(key,attrs);
 	}
 	return true;
@@ -1664,8 +1664,8 @@ bool SQVM::NewSlotA(const SQObjectPtr &self,const SQObjectPtr &key,const SQObjec
 
 bool SQVM::NewSlot(const SQObjectPtr &self,const SQObjectPtr &key,const SQObjectPtr &val,bool bstatic)
 {
-	if(sqtype(key) == OT_NULL) { Raise_Error(_SC("null cannot be used as index")); return false; }
-	switch(sqtype(self)) {
+	if(sq_type(key) == OT_NULL) { Raise_Error(_SC("null cannot be used as index")); return false; }
+	switch(sq_type(self)) {
 	case OT_TABLE: {
 		bool rawcall = true;
 		if(_table(self)->_delegate) {
@@ -1725,7 +1725,7 @@ bool SQVM::NewSlot(const SQObjectPtr &self,const SQObjectPtr &key,const SQObject
 
 bool SQVM::DeleteSlot(const SQObjectPtr &self,const SQObjectPtr &key,SQObjectPtr &res)
 {
-	switch(sqtype(self)) {
+	switch(sq_type(self)) {
 	case OT_TABLE:
 	case OT_INSTANCE:
 	case OT_USERDATA: {
@@ -1737,7 +1737,7 @@ bool SQVM::DeleteSlot(const SQObjectPtr &self,const SQObjectPtr &key,SQObjectPtr
 			return CallMetaMethod(closure,MT_DELSLOT,2,res);
 		}
 		else {
-			if(sqtype(self) == OT_TABLE) {
+			if(sq_type(self) == OT_TABLE) {
 				if(_table(self)->Get(key,t)) {
 					_table(self)->Remove(key);
 				}
@@ -1766,7 +1766,7 @@ bool SQVM::Call(SQObjectPtr &closure,SQInteger nparams,SQInteger stackbase,SQObj
 #ifdef _DEBUG
 SQInteger prevstackbase = _stackbase;
 #endif
-	switch(sqtype(closure)) {
+	switch(sq_type(closure)) {
 	case OT_CLOSURE:
 		return Execute(closure, nparams, stackbase, outres, raiseerror);
 		break;
@@ -1780,7 +1780,7 @@ SQInteger prevstackbase = _stackbase;
 		SQObjectPtr constr;
 		SQObjectPtr temp;
 		CreateClassInstance(_class(closure),outres,constr);
-		SQObjectType ctype = sqtype(constr);
+		SQObjectType ctype = sq_type(constr);
 		if (ctype == OT_NATIVECLOSURE || ctype == OT_CLOSURE) {
 			_stack[stackbase] = outres;
 			return Call(constr,nparams,stackbase,temp,raiseerror);
@@ -1880,7 +1880,7 @@ void SQVM::LeaveFrame() {
 			SQObjectPtr dtor;
 			if(_instance(val)->_class->GetDestructor(dtor)){
 				SQInteger stkbase;
-				switch(sqtype(dtor)) {
+				switch(sq_type(dtor)) {
 					case OT_CLOSURE:
 					case OT_NATIVECLOSURE:{
 						SQObjectPtr res;
@@ -1995,7 +1995,7 @@ SQObjectPtr &SQVM::PopGet() { return _stack[--_top]; }
 SQObjectPtr &SQVM::GetUp(SQInteger n) { return _stack[_top+n]; }
 SQObjectPtr &SQVM::GetAt(SQInteger n) { return _stack[n]; }
 void SQVM::SetIncludePath(const SQChar *s){_include_path = SQString::Create(_ss(this), s);}
-const SQChar *SQVM::GetIncludePath(){return (sqtype(_include_path) == OT_STRING) ? _stringval(_include_path) : NULL;}
+const SQChar *SQVM::GetIncludePath(){return (sq_type(_include_path) == OT_STRING) ? _stringval(_include_path) : NULL;}
 
 #ifdef _DEBUG_DUMP
 void SQVM::dumpstack(SQInteger stackbase,bool dumpall)
@@ -2011,7 +2011,7 @@ void SQVM::dumpstack(SQInteger stackbase,bool dumpall)
 		SQObjectPtr &obj=_stack[i];
 		if(stackbase==i)scprintf(_SC(">"));else scprintf(_SC(" "));
 		scprintf(_SC("[" _PRINT_INT_FMT "]:"),n);
-		switch(sqtype(obj)){
+		switch(sq_type(obj)){
 		case OT_FLOAT:			scprintf(_SC("FLOAT %.3f"),_float(obj));break;
 		case OT_INTEGER:		scprintf(_SC("INTEGER " _PRINT_INT_FMT),_integer(obj));break;
 		case OT_BOOL:			scprintf(_SC("BOOL %s"),_integer(obj)?"true":"false");break;