git: 707bf5e07d22 - main - lang/squirrel: Update to 3.2 and take maintainership
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 09 Feb 2025 12:23:34 UTC
The branch main has been updated by diizzy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=707bf5e07d22f544a1a14c96cd4be7776fafe0de
commit 707bf5e07d22f544a1a14c96cd4be7776fafe0de
Author: Mitchell Clay <mclay@astate.edu>
AuthorDate: 2025-02-09 08:21:48 +0000
Commit: Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2025-02-09 12:19:30 +0000
lang/squirrel: Update to 3.2 and take maintainership
* Add LICENSE_FILE
* Report correct version in .cmake files
* Disable static binary and libs
* Adjust port Makefile layout to more closely follow Porters Handbook
* Disable GNU C/C++ extensions
References:
https://github.com/albertodemichelis/squirrel/commit/af69eb70844d5830c99d24e671352b2e5e0fe255
PR: 284650
---
lang/squirrel/Makefile | 23 +-
lang/squirrel/distinfo | 6 +-
lang/squirrel/files/patch-CMakeLists.txt | 28 +-
lang/squirrel/files/patch-git_57ca6c | 1291 ------------------------------
lang/squirrel/pkg-plist | 7 +-
5 files changed, 29 insertions(+), 1326 deletions(-)
diff --git a/lang/squirrel/Makefile b/lang/squirrel/Makefile
index 1ee425cb78b5..f6a11b7bf864 100644
--- a/lang/squirrel/Makefile
+++ b/lang/squirrel/Makefile
@@ -1,19 +1,26 @@
PORTNAME= squirrel
-DISTVERSION= 3_1
-PORTREVISION= 3
+DISTVERSIONPREFIX= v
+DISTVERSION= 3.2
CATEGORIES= lang
-MASTER_SITES= SF/${PORTNAME}/${PORTNAME}3/${PORTNAME}%20${PORTVERSION}%20stable
-DISTNAME= ${PORTNAME}_${DISTVERSION}_stable
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= mclay@astate.edu
COMMENT= High level imperative/OO programming language
WWW= http://squirrel-lang.org/
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/COPYRIGHT
+
+USES= cmake compiler:c++11-lang
+USE_LDCONFIG= yes
+
+USE_GITHUB= yes
+GH_ACCOUNT= albertodemichelis
+
CONFLICTS= squsq
-USES= cmake compiler:c++11-lang dos2unix
+CMAKE_OFF= CMAKE_C_EXTENSIONS \
+ CMAKE_CXX_EXTENSIONS
+CMAKE_ON= DISABLE_STATIC
CMAKE_ARGS= -DINSTALL_INC_DIR:STRING=include
-USE_LDCONFIG= yes
-WRKSRC= ${WRKDIR}/${PORTNAME}3
.include <bsd.port.mk>
diff --git a/lang/squirrel/distinfo b/lang/squirrel/distinfo
index 47b23ba9fb2e..bae378a4d6d1 100644
--- a/lang/squirrel/distinfo
+++ b/lang/squirrel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1487088121
-SHA256 (squirrel_3_1_stable.tar.gz) = 4845a7fb82e4740bde01b0854112e3bb92a0816ad959c5758236e73f4409d0cb
-SIZE (squirrel_3_1_stable.tar.gz) = 616961
+TIMESTAMP = 1739028196
+SHA256 (albertodemichelis-squirrel-v3.2_GH0.tar.gz) = 02805414cfadd5bbb921891d3599b83375a40650abd6404a8ab407dc5e86a996
+SIZE (albertodemichelis-squirrel-v3.2_GH0.tar.gz) = 182795
diff --git a/lang/squirrel/files/patch-CMakeLists.txt b/lang/squirrel/files/patch-CMakeLists.txt
index 7d504adea6b0..1754d5241eca 100644
--- a/lang/squirrel/files/patch-CMakeLists.txt
+++ b/lang/squirrel/files/patch-CMakeLists.txt
@@ -1,23 +1,9 @@
---- CMakeLists.txt.orig 2017-02-14 16:19:11 UTC
+--- CMakeLists.txt.orig 2025-02-08 15:24:36 UTC
+++ CMakeLists.txt
-@@ -11,19 +11,9 @@ project(squirrel C CXX)
+@@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.4)
+ cmake_minimum_required(VERSION 3.4)
+-project(squirrel VERSION 3.1 LANGUAGES C CXX)
++project(squirrel VERSION 3.2 LANGUAGES C CXX)
- include_directories(${CMAKE_SOURCE_DIR}/include)
-
--if(CMAKE_COMPILER_IS_GNUCXX)
-+if(CMAKE_CXX_COMPILER_ID MATCHES GNU OR CMAKE_CXX_COMPILER_ID MATCHES Clang)
- set(SQ_FLAGS -fno-exceptions -fno-strict-aliasing -Wall -Wextra -pedantic -Wcast-qual)
-
-- if(CMAKE_BUILD_TYPE STREQUAL "Release")
-- set(SQ_FLAGS ${SQ_FLAGS} -O3)
-- elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
-- set(SQ_FLAGS ${SQ_FLAGS} -O3 -g)
-- elseif(CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
-- set(SQ_FLAGS ${SQ_FLAGS} -Os)
-- elseif(CMAKE_BUILD_TYPE STREQUAL "Debug")
-- set(SQ_FLAGS ${SQ_FLAGS} -pg -pie -gstabs -g3 -Og)
-- endif()
--
- if(CMAKE_VERSION VERSION_GREATER 3)
- add_compile_options(${SQ_FLAGS})
- else()
+ option(DISABLE_STATIC "Avoid building/installing static libraries.")
+ option(LONG_OUTPUT_NAMES "Use longer names for binaries and libraries: squirrel3 (not sq).")
diff --git a/lang/squirrel/files/patch-git_57ca6c b/lang/squirrel/files/patch-git_57ca6c
deleted file mode 100644
index ef7511d063ae..000000000000
--- a/lang/squirrel/files/patch-git_57ca6c
+++ /dev/null
@@ -1,1291 +0,0 @@
-From 57ca6c191e4422ed3d53d406c9d5b47bb185489d Mon Sep 17 00:00:00 2001
-From: zeromus <zeromus@users.noreply.github.com>
-Date: Sat, 29 Jul 2017 14:51:26 -0500
-Subject: [PATCH] rename `type` macro to `sqtype`
-
---- squirrel/sqapi.cpp.orig 2017-08-31 12:07:29 UTC
-+++ squirrel/sqapi.cpp
-@@ -16,7 +16,7 @@
- static bool sq_aux_gettypedarg(HSQUIRRELVM v,SQInteger idx,SQObjectType type,SQObjectPtr **o)
- {
- *o = &stack_get(v,idx);
-- if(type(**o) != type){
-+ if(sqtype(**o) != type){
- SQObjectPtr oval = v->PrintObjVal(**o);
- v->Raise_Error(_SC("wrong argument type, expected '%s' got '%.50s'"),IdType2Name(type),_stringval(oval));
- return false;
-@@ -150,7 +150,7 @@ void sq_notifyallexceptions(HSQUIRRELVM v, SQBool enab
-
- void sq_addref(HSQUIRRELVM v,HSQOBJECT *po)
- {
-- if(!ISREFCOUNTED(type(*po))) return;
-+ if(!ISREFCOUNTED(sqtype(*po))) return;
- #ifdef NO_GARBAGE_COLLECTOR
- __AddRef(po->_type,po->_unVal);
- #else
-@@ -160,7 +160,7 @@ void sq_addref(HSQUIRRELVM v,HSQOBJECT *po)
-
- SQUnsignedInteger sq_getrefcount(HSQUIRRELVM v,HSQOBJECT *po)
- {
-- if(!ISREFCOUNTED(type(*po))) return 0;
-+ if(!ISREFCOUNTED(sqtype(*po))) return 0;
- #ifdef NO_GARBAGE_COLLECTOR
- return po->_unVal.pRefCounted->_uiRef;
- #else
-@@ -170,7 +170,7 @@ SQUnsignedInteger sq_getrefcount(HSQUIRRELVM v,HSQOBJE
-
- SQBool sq_release(HSQUIRRELVM v,HSQOBJECT *po)
- {
-- if(!ISREFCOUNTED(type(*po))) return SQTrue;
-+ if(!ISREFCOUNTED(sqtype(*po))) return SQTrue;
- #ifdef NO_GARBAGE_COLLECTOR
- bool ret = (po->_unVal.pRefCounted->_uiRef <= 1) ? SQTrue : SQFalse;
- __Release(po->_type,po->_unVal);
-@@ -182,7 +182,7 @@ SQBool sq_release(HSQUIRRELVM v,HSQOBJECT *po)
-
- SQUnsignedInteger sq_getvmrefcount(HSQUIRRELVM SQ_UNUSED_ARG(v), const HSQOBJECT *po)
- {
-- if (!ISREFCOUNTED(type(*po))) return 0;
-+ if (!ISREFCOUNTED(sqtype(*po))) return 0;
- return po->_unVal.pRefCounted->_uiRef;
- }
-
-@@ -290,7 +290,7 @@ SQRESULT sq_newclass(HSQUIRRELVM v,SQBool hasbase)
- SQClass *baseclass = NULL;
- if(hasbase) {
- SQObjectPtr &base = stack_get(v,-1);
-- if(type(base) != OT_CLASS)
-+ if(sqtype(base) != OT_CLASS)
- return sq_throwerror(v,_SC("invalid base type"));
- baseclass = _class(base);
- }
-@@ -304,7 +304,7 @@ SQBool sq_instanceof(HSQUIRRELVM v)
- {
- SQObjectPtr &inst = stack_get(v,-1);
- SQObjectPtr &cl = stack_get(v,-2);
-- if(type(inst) != OT_INSTANCE || type(cl) != OT_CLASS)
-+ if(sqtype(inst) != OT_INSTANCE || sqtype(cl) != OT_CLASS)
- return sq_throwerror(v,_SC("invalid param type"));
- return _instance(inst)->InstanceOf(_class(cl))?SQTrue:SQFalse;
- }
-@@ -397,14 +397,14 @@ void sq_newclosure(HSQUIRRELVM v,SQFUNCTION func,SQUns
- SQRESULT sq_getclosureinfo(HSQUIRRELVM v,SQInteger idx,SQUnsignedInteger *nparams,SQUnsignedInteger *nfreevars)
- {
- SQObject o = stack_get(v, idx);
-- if(type(o) == OT_CLOSURE) {
-+ if(sqtype(o) == OT_CLOSURE) {
- SQClosure *c = _closure(o);
- SQFunctionProto *proto = c->_function;
- *nparams = (SQUnsignedInteger)proto->_nparameters;
- *nfreevars = (SQUnsignedInteger)proto->_noutervalues;
- return SQ_OK;
- }
-- else if(type(o) == OT_NATIVECLOSURE)
-+ else if(sqtype(o) == OT_NATIVECLOSURE)
- {
- SQNativeClosure *c = _nativeclosure(o);
- *nparams = (SQUnsignedInteger)c->_nparamscheck;
-@@ -459,7 +459,7 @@ SQRESULT sq_bindenv(HSQUIRRELVM v,SQInteger idx)
- !sq_isclass(env) &&
- !sq_isinstance(env))
- return sq_throwerror(v,_SC("invalid environment"));
-- SQWeakRef *w = _refcounted(env)->GetWeakRef(type(env));
-+ SQWeakRef *w = _refcounted(env)->GetWeakRef(sqtype(env));
- SQObjectPtr ret;
- if(sq_isclosure(o)) {
- SQClosure *c = _closure(o)->Clone();
-@@ -524,7 +524,7 @@ SQRESULT sq_getclosureroot(HSQUIRRELVM v,SQInteger idx
- SQRESULT sq_clear(HSQUIRRELVM v,SQInteger idx)
- {
- SQObject &o=stack_get(v,idx);
-- switch(type(o)) {
-+ switch(sqtype(o)) {
- case OT_TABLE: _table(o)->Clear(); break;
- case OT_ARRAY: _array(o)->Resize(0); break;
- default:
-@@ -619,7 +619,7 @@ void sq_push(HSQUIRRELVM v,SQInteger idx)
-
- SQObjectType sq_gettype(HSQUIRRELVM v,SQInteger idx)
- {
-- return type(stack_get(v, idx));
-+ return sqtype(stack_get(v, idx));
- }
-
- SQRESULT sq_typeof(HSQUIRRELVM v,SQInteger idx)
-@@ -710,7 +710,7 @@ SQRESULT sq_clone(HSQUIRRELVM v,SQInteger idx)
- SQInteger sq_getsize(HSQUIRRELVM v, SQInteger idx)
- {
- SQObjectPtr &o = stack_get(v, idx);
-- SQObjectType type = type(o);
-+ SQObjectType type = sqtype(o);
- switch(type) {
- case OT_STRING: return _string(o)->_len;
- case OT_TABLE: return _table(o)->CountUsed();
-@@ -741,7 +741,7 @@ SQRESULT sq_getuserdata(HSQUIRRELVM v,SQInteger idx,SQ
- SQRESULT sq_settypetag(HSQUIRRELVM v,SQInteger idx,SQUserPointer typetag)
- {
- SQObjectPtr &o = stack_get(v,idx);
-- switch(type(o)) {
-+ switch(sqtype(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"));
-@@ -751,7 +751,7 @@ SQRESULT sq_settypetag(HSQUIRRELVM v,SQInteger idx,SQU
-
- SQRESULT sq_getobjtypetag(const HSQOBJECT *o,SQUserPointer * typetag)
- {
-- switch(type(*o)) {
-+ switch(sqtype(*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;
-@@ -779,7 +779,7 @@ SQRESULT sq_getuserpointer(HSQUIRRELVM v, SQInteger id
- SQRESULT sq_setinstanceup(HSQUIRRELVM v, SQInteger idx, SQUserPointer p)
- {
- SQObjectPtr &o = stack_get(v,idx);
-- if(type(o) != OT_INSTANCE) return sq_throwerror(v,_SC("the object is not a class instance"));
-+ if(sqtype(o) != OT_INSTANCE) return sq_throwerror(v,_SC("the object is not a class instance"));
- _instance(o)->_userpointer = p;
- return SQ_OK;
- }
-@@ -787,7 +787,7 @@ SQRESULT sq_setinstanceup(HSQUIRRELVM v, SQInteger idx
- SQRESULT sq_setclassudsize(HSQUIRRELVM v, SQInteger idx, SQInteger udsize)
- {
- SQObjectPtr &o = stack_get(v,idx);
-- if(type(o) != OT_CLASS) return sq_throwerror(v,_SC("the object is not a class"));
-+ if(sqtype(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;
-@@ -797,7 +797,7 @@ SQRESULT sq_setclassudsize(HSQUIRRELVM v, SQInteger id
- SQRESULT sq_getinstanceup(HSQUIRRELVM v, SQInteger idx, SQUserPointer *p,SQUserPointer typetag)
- {
- SQObjectPtr &o = stack_get(v,idx);
-- if(type(o) != OT_INSTANCE) return sq_throwerror(v,_SC("the object is not a class instance"));
-+ if(sqtype(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;
-@@ -854,9 +854,9 @@ SQRESULT sq_newslot(HSQUIRRELVM v, SQInteger idx, SQBo
- {
- sq_aux_paramscheck(v, 3);
- SQObjectPtr &self = stack_get(v, idx);
-- if(type(self) == OT_TABLE || type(self) == OT_CLASS) {
-+ if(sqtype(self) == OT_TABLE || sqtype(self) == OT_CLASS) {
- SQObjectPtr &key = v->GetUp(-2);
-- if(type(key) == OT_NULL) return sq_throwerror(v, _SC("null is not a valid key"));
-+ if(sqtype(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);
- }
-@@ -869,7 +869,7 @@ SQRESULT sq_deleteslot(HSQUIRRELVM v,SQInteger idx,SQB
- SQObjectPtr *self;
- _GETSAFE_OBJ(v, idx, OT_TABLE,self);
- SQObjectPtr &key = v->GetUp(-1);
-- if(type(key) == OT_NULL) return sq_throwerror(v, _SC("null is not a valid key"));
-+ if(sqtype(key) == OT_NULL) return sq_throwerror(v, _SC("null is not a valid key"));
- SQObjectPtr res;
- if(!v->DeleteSlot(*self, key, res)){
- v->Pop();
-@@ -894,11 +894,11 @@ SQRESULT sq_rawset(HSQUIRRELVM v,SQInteger idx)
- {
- SQObjectPtr &self = stack_get(v, idx);
- SQObjectPtr &key = v->GetUp(-2);
-- if(type(key) == OT_NULL) {
-+ if(sqtype(key) == OT_NULL) {
- v->Pop(2);
- return sq_throwerror(v, _SC("null key"));
- }
-- switch(type(self)) {
-+ switch(sqtype(self)) {
- case OT_TABLE:
- _table(self)->NewSlot(key, v->GetUp(-1));
- v->Pop(2);
-@@ -931,9 +931,9 @@ SQRESULT sq_rawset(HSQUIRRELVM v,SQInteger idx)
- SQRESULT sq_newmember(HSQUIRRELVM v,SQInteger idx,SQBool bstatic)
- {
- SQObjectPtr &self = stack_get(v, idx);
-- if(type(self) != OT_CLASS) return sq_throwerror(v, _SC("new member only works with classes"));
-+ if(sqtype(self) != OT_CLASS) return sq_throwerror(v, _SC("new member only works with classes"));
- SQObjectPtr &key = v->GetUp(-3);
-- if(type(key) == OT_NULL) return sq_throwerror(v, _SC("null key"));
-+ if(sqtype(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;
-@@ -942,9 +942,9 @@ SQRESULT sq_newmember(HSQUIRRELVM v,SQInteger idx,SQBo
- SQRESULT sq_rawnewmember(HSQUIRRELVM v,SQInteger idx,SQBool bstatic)
- {
- SQObjectPtr &self = stack_get(v, idx);
-- if(type(self) != OT_CLASS) return sq_throwerror(v, _SC("new member only works with classes"));
-+ if(sqtype(self) != OT_CLASS) return sq_throwerror(v, _SC("new member only works with classes"));
- SQObjectPtr &key = v->GetUp(-3);
-- if(type(key) == OT_NULL) return sq_throwerror(v, _SC("null key"));
-+ if(sqtype(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;
-@@ -954,19 +954,19 @@ SQRESULT sq_setdelegate(HSQUIRRELVM v,SQInteger idx)
- {
- SQObjectPtr &self = stack_get(v, idx);
- SQObjectPtr &mt = v->GetUp(-1);
-- SQObjectType type = type(self);
-+ SQObjectType type = sqtype(self);
- switch(type) {
- case OT_TABLE:
-- if(type(mt) == OT_TABLE) {
-+ if(sqtype(mt) == OT_TABLE) {
- if(!_table(self)->SetDelegate(_table(mt))) return sq_throwerror(v, _SC("delagate cycle")); v->Pop();}
-- else if(type(mt)==OT_NULL) {
-+ else if(sqtype(mt)==OT_NULL) {
- _table(self)->SetDelegate(NULL); v->Pop(); }
- else return sq_aux_invalidtype(v,type);
- break;
- case OT_USERDATA:
-- if(type(mt)==OT_TABLE) {
-+ if(sqtype(mt)==OT_TABLE) {
- _userdata(self)->SetDelegate(_table(mt)); v->Pop(); }
-- else if(type(mt)==OT_NULL) {
-+ else if(sqtype(mt)==OT_NULL) {
- _userdata(self)->SetDelegate(NULL); v->Pop(); }
- else return sq_aux_invalidtype(v, type);
- break;
-@@ -997,7 +997,7 @@ SQRESULT sq_rawdeleteslot(HSQUIRRELVM v,SQInteger idx,
- SQRESULT sq_getdelegate(HSQUIRRELVM v,SQInteger idx)
- {
- SQObjectPtr &self=stack_get(v,idx);
-- switch(type(self)){
-+ switch(sqtype(self)){
- case OT_TABLE:
- case OT_USERDATA:
- if(!_delegable(self)->_delegate){
-@@ -1026,7 +1026,7 @@ SQRESULT sq_rawget(HSQUIRRELVM v,SQInteger idx)
- {
- SQObjectPtr &self=stack_get(v,idx);
- SQObjectPtr &obj = v->GetUp(-1);
-- switch(type(self)) {
-+ switch(sqtype(self)) {
- case OT_TABLE:
- if(_table(self)->Get(obj,obj))
- return SQ_OK;
-@@ -1076,7 +1076,7 @@ const SQChar *sq_getlocal(HSQUIRRELVM v,SQUnsignedInte
- stackbase-=ci._prevstkbase;
- }
- SQVM::CallInfo &ci=v->_callsstack[lvl];
-- if(type(ci._closure)!=OT_CLOSURE)
-+ if(sqtype(ci._closure)!=OT_CLOSURE)
- return NULL;
- SQClosure *c=_closure(ci._closure);
- SQFunctionProto *func=c->_function;
-@@ -1137,7 +1137,7 @@ SQRESULT sq_reservestack(HSQUIRRELVM v,SQInteger nsize
-
- SQRESULT sq_resume(HSQUIRRELVM v,SQBool retval,SQBool raiseerror)
- {
-- if (type(v->GetUp(-1)) == OT_GENERATOR)
-+ if (sqtype(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))
-@@ -1201,7 +1201,7 @@ void sq_setreleasehook(HSQUIRRELVM v,SQInteger idx,SQR
- {
- if(sq_gettop(v) >= 1){
- SQObjectPtr &ud=stack_get(v,idx);
-- switch( type(ud) ) {
-+ switch( sqtype(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;
-@@ -1214,7 +1214,7 @@ SQRELEASEHOOK sq_getreleasehook(HSQUIRRELVM v,SQIntege
- {
- if(sq_gettop(v) >= 1){
- SQObjectPtr &ud=stack_get(v,idx);
-- switch( type(ud) ) {
-+ switch( sqtype(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;
-@@ -1296,7 +1296,7 @@ const SQChar *sq_getfreevariable(HSQUIRRELVM v,SQInteg
- {
- SQObjectPtr &self=stack_get(v,idx);
- const SQChar *name = NULL;
-- switch(type(self))
-+ switch(sqtype(self))
- {
- case OT_CLOSURE:{
- SQClosure *clo = _closure(self);
-@@ -1324,7 +1324,7 @@ const SQChar *sq_getfreevariable(HSQUIRRELVM v,SQInteg
- SQRESULT sq_setfreevariable(HSQUIRRELVM v,SQInteger idx,SQUnsignedInteger nval)
- {
- SQObjectPtr &self=stack_get(v,idx);
-- switch(type(self))
-+ switch(sqtype(self))
- {
- case OT_CLOSURE:{
- SQFunctionProto *fp = _closure(self)->_function;
-@@ -1341,7 +1341,7 @@ SQRESULT sq_setfreevariable(HSQUIRRELVM v,SQInteger id
- else return sq_throwerror(v,_SC("invalid free var index"));
- break;
- default:
-- return sq_aux_invalidtype(v,type(self));
-+ return sq_aux_invalidtype(v, sqtype(self));
- }
- v->Pop();
- return SQ_OK;
-@@ -1354,7 +1354,7 @@ SQRESULT sq_setattributes(HSQUIRRELVM v,SQInteger idx)
- SQObjectPtr &key = stack_get(v,-2);
- SQObjectPtr &val = stack_get(v,-1);
- SQObjectPtr attrs;
-- if(type(key) == OT_NULL) {
-+ if(sqtype(key) == OT_NULL) {
- attrs = _class(*o)->_attributes;
- _class(*o)->_attributes = val;
- v->Pop(2);
-@@ -1375,7 +1375,7 @@ SQRESULT sq_getattributes(HSQUIRRELVM v,SQInteger idx)
- _GETSAFE_OBJ(v, idx, OT_CLASS,o);
- SQObjectPtr &key = stack_get(v,-1);
- SQObjectPtr attrs;
-- if(type(key) == OT_NULL) {
-+ if(sqtype(key) == OT_NULL) {
- attrs = _class(*o)->_attributes;
- v->Pop();
- v->Push(attrs);
-@@ -1407,7 +1407,7 @@ SQRESULT sq_getmemberhandle(HSQUIRRELVM v,SQInteger id
-
- SQRESULT _getmemberbyhandle(HSQUIRRELVM v,SQObjectPtr &self,const HSQMEMBERHANDLE *handle,SQObjectPtr *&val)
- {
-- switch(type(self)) {
-+ switch(sqtype(self)) {
- case OT_INSTANCE: {
- SQInstance *i = _instance(self);
- if(handle->_static) {
-@@ -1490,8 +1490,8 @@ SQRESULT sq_createinstance(HSQUIRRELVM v,SQInteger idx
- void sq_weakref(HSQUIRRELVM v,SQInteger idx)
- {
- SQObject &o=stack_get(v,idx);
-- if(ISREFCOUNTED(type(o))) {
-- v->Push(_refcounted(o)->GetWeakRef(type(o)));
-+ if(ISREFCOUNTED(sqtype(o))) {
-+ v->Push(_refcounted(o)->GetWeakRef(sqtype(o)));
- return;
- }
- v->Push(o);
-@@ -1500,7 +1500,7 @@ void sq_weakref(HSQUIRRELVM v,SQInteger idx)
- SQRESULT sq_getweakrefval(HSQUIRRELVM v,SQInteger idx)
- {
- SQObjectPtr &o = stack_get(v,idx);
-- if(type(o) != OT_WEAKREF) {
-+ if(sqtype(o) != OT_WEAKREF) {
- return sq_throwerror(v,_SC("the object must be a weakref"));
- }
- v->Push(_weakref(o)->_obj);
-@@ -1529,7 +1529,7 @@ SQRESULT sq_getdefaultdelegate(HSQUIRRELVM v,SQObjectT
- SQRESULT sq_next(HSQUIRRELVM v,SQInteger idx)
- {
- SQObjectPtr o=stack_get(v,idx),&refpos = stack_get(v,-1),realkey,val;
-- if(type(o) == OT_GENERATOR) {
-+ if(sqtype(o) == OT_GENERATOR) {
- return sq_throwerror(v,_SC("cannot iterate a generator"));
- }
- int faketojump;
---- squirrel/sqbaselib.cpp.orig 2017-08-31 12:07:29 UTC
-+++ squirrel/sqbaselib.cpp
-@@ -169,7 +169,7 @@ static SQInteger get_slice_params(HSQUIRRELVM v,SQInte
- o=stack_get(v,1);
- if(top>1){
- SQObjectPtr &start=stack_get(v,2);
-- if(type(start)!=OT_NULL && sq_isnumeric(start)){
-+ if(sqtype(start)!=OT_NULL && sq_isnumeric(start)){
- sidx=tointeger(start);
- }
- }
-@@ -340,7 +340,7 @@ static SQInteger default_delegate_len(HSQUIRRELVM v)
- static SQInteger default_delegate_tofloat(HSQUIRRELVM v)
- {
- SQObjectPtr &o=stack_get(v,1);
-- switch(type(o)){
-+ switch(sqtype(o)){
- case OT_STRING:{
- SQObjectPtr res;
- if(str2num(_stringval(o),res,10)){
-@@ -369,7 +369,7 @@ static SQInteger default_delegate_tointeger(HSQUIRRELV
- if(sq_gettop(v) > 1) {
- sq_getinteger(v,2,&base);
- }
-- switch(type(o)){
-+ switch(sqtype(o)){
- case OT_STRING:{
- SQObjectPtr res;
- if(str2num(_stringval(o),res,base)){
-@@ -931,7 +931,7 @@ static SQInteger closure_setroot(HSQUIRRELVM v)
- static SQInteger closure_getinfos(HSQUIRRELVM v) {
- SQObject o = stack_get(v,1);
- SQTable *res = SQTable::Create(_ss(v),4);
-- if(type(o) == OT_CLOSURE) {
-+ if(sqtype(o) == OT_CLOSURE) {
- SQFunctionProto *f = _closure(o)->_function;
- SQInteger nparams = f->_nparameters + (f->_varparams?1:0);
- SQObjectPtr params = SQArray::Create(_ss(v),nparams);
-@@ -1010,7 +1010,7 @@ const SQRegFunction SQSharedState::_generator_default_
- static SQInteger thread_call(HSQUIRRELVM v)
- {
- SQObjectPtr o = stack_get(v,1);
-- if(type(o) == OT_THREAD) {
-+ if(sqtype(o) == OT_THREAD) {
- SQInteger nparams = sq_gettop(v);
- _thread(o)->Push(_thread(o)->_roottable);
- for(SQInteger i = 2; i<(nparams+1); i++)
-@@ -1029,7 +1029,7 @@ static SQInteger thread_call(HSQUIRRELVM v)
- static SQInteger thread_wakeup(HSQUIRRELVM v)
- {
- SQObjectPtr o = stack_get(v,1);
-- if(type(o) == OT_THREAD) {
-+ if(sqtype(o) == OT_THREAD) {
- SQVM *thread = _thread(o);
- SQInteger state = sq_getvmstate(thread);
- if(state != SQ_VMSTATE_SUSPENDED) {
-@@ -1065,7 +1065,7 @@ static SQInteger thread_wakeup(HSQUIRRELVM v)
- static SQInteger thread_wakeupthrow(HSQUIRRELVM v)
- {
- SQObjectPtr o = stack_get(v,1);
-- if(type(o) == OT_THREAD) {
-+ if(sqtype(o) == OT_THREAD) {
- SQVM *thread = _thread(o);
- SQInteger state = sq_getvmstate(thread);
- if(state != SQ_VMSTATE_SUSPENDED) {
-@@ -1125,7 +1125,7 @@ static SQInteger thread_getstatus(HSQUIRRELVM v)
- static SQInteger thread_getstackinfos(HSQUIRRELVM v)
- {
- SQObjectPtr o = stack_get(v,1);
-- if(type(o) == OT_THREAD) {
-+ if(sqtype(o) == OT_THREAD) {
- SQVM *thread = _thread(o);
- SQInteger threadtop = sq_gettop(thread);
- SQInteger level;
-@@ -1134,7 +1134,7 @@ static SQInteger thread_getstackinfos(HSQUIRRELVM v)
- if(SQ_FAILED(res))
- {
- sq_settop(thread,threadtop);
-- if(type(thread->_lasterror) == OT_STRING) {
-+ if(sqtype(thread->_lasterror) == OT_STRING) {
- sq_throwerror(v,_stringval(thread->_lasterror));
- }
- else {
---- squirrel/sqclass.cpp.orig 2017-08-31 12:07:29 UTC
-+++ squirrel/sqclass.cpp
-@@ -53,7 +53,7 @@ SQClass::~SQClass()
- bool SQClass::NewSlot(SQSharedState *ss,const SQObjectPtr &key,const SQObjectPtr &val,bool bstatic)
- {
- SQObjectPtr temp;
-- bool belongs_to_static_table = type(val) == OT_CLOSURE || type(val) == OT_NATIVECLOSURE || bstatic;
-+ bool belongs_to_static_table = sqtype(val) == OT_CLOSURE || sqtype(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
-@@ -63,18 +63,18 @@ bool SQClass::NewSlot(SQSharedState *ss,const SQObject
- }
- if(belongs_to_static_table) {
- SQInteger mmidx;
-- if((type(val) == OT_CLOSURE || type(val) == OT_NATIVECLOSURE) &&
-+ if((sqtype(val) == OT_CLOSURE || sqtype(val) == OT_NATIVECLOSURE) &&
- (mmidx = ss->GetMetaMethodIdxByName(key)) != -1) {
- _metamethods[mmidx] = val;
- }
- else {
- SQObjectPtr theval = val;
-- if(_base && type(val) == OT_CLOSURE) {
-+ if(_base && sqtype(val) == OT_CLOSURE) {
- theval = _closure(val)->Clone();
- _closure(theval)->_base = _base;
- __ObjAddRef(_base); //ref for the closure
- }
-- if(type(temp) == OT_NULL) {
-+ if(sqtype(temp) == OT_NULL) {
- bool isconstructor;
- SQVM::IsEqual(ss->_constructoridx, key, isconstructor);
- if(isconstructor) {
-@@ -191,7 +191,7 @@ SQInstance::~SQInstance()
-
- bool SQInstance::GetMetaMethod(SQVM SQ_UNUSED_ARG(*v),SQMetaMethod mm,SQObjectPtr &res)
- {
-- if(type(_class->_metamethods[mm]) != OT_NULL) {
-+ if(sqtype(_class->_metamethods[mm]) != OT_NULL) {
- res = _class->_metamethods[mm];
- return true;
- }
---- squirrel/sqcompiler.cpp.orig 2017-08-31 12:07:29 UTC
-+++ squirrel/sqcompiler.cpp
-@@ -191,7 +191,7 @@ class SQCompiler (public)
- }
- else {
- if(_raiseerror && _ss(_vm)->_compilererrorhandler) {
-- _ss(_vm)->_compilererrorhandler(_vm, _compilererror, type(_sourcename) == OT_STRING?_stringval(_sourcename):_SC("unknown"),
-+ _ss(_vm)->_compilererrorhandler(_vm, _compilererror, sqtype(_sourcename) == OT_STRING?_stringval(_sourcename):_SC("unknown"),
- _lex._currentline, _lex._currentcolumn);
- }
- _vm->_lasterror = SQString::Create(_ss(_vm), _compilererror, -1);
-@@ -762,7 +762,7 @@ class SQCompiler (public)
- /* Handle named constant */
- SQObjectPtr constval;
- SQObject constid;
-- if(type(constant) == OT_TABLE) {
-+ if(sqtype(constant) == OT_TABLE) {
- Expect('.');
- constid = Expect(TK_IDENTIFIER);
- if(!_table(constant)->Get(constid, constval)) {
-@@ -776,7 +776,7 @@ class SQCompiler (public)
- _es.epos = _fs->PushTarget();
-
- /* generate direct or literal function depending on size */
-- SQObjectType ctype = type(constval);
-+ SQObjectType ctype = sqtype(constval);
- switch(ctype) {
- case OT_INTEGER: EmitLoadConstInt(_integer(constval),_es.epos); break;
- case OT_FLOAT: EmitLoadConstFloat(_float(constval),_es.epos); break;
---- squirrel/sqdebug.cpp.orig 2017-08-31 12:07:29 UTC
-+++ squirrel/sqdebug.cpp
-@@ -17,8 +17,8 @@ SQRESULT sq_getfunctioninfo(HSQUIRRELVM v,SQInteger le
- SQClosure *c = _closure(ci._closure);
- SQFunctionProto *proto = c->_function;
- fi->funcid = proto;
-- fi->name = type(proto->_name) == OT_STRING?_stringval(proto->_name):_SC("unknown");
-- fi->source = type(proto->_sourcename) == OT_STRING?_stringval(proto->_sourcename):_SC("unknown");
-+ 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->line = proto->_lineinfos[0]._line;
- return SQ_OK;
- }
-@@ -32,12 +32,12 @@ SQRESULT sq_stackinfos(HSQUIRRELVM v, SQInteger level,
- if (cssize > level) {
- memset(si, 0, sizeof(SQStackInfos));
- SQVM::CallInfo &ci = v->_callsstack[cssize-level-1];
-- switch (type(ci._closure)) {
-+ switch (sqtype(ci._closure)) {
- case OT_CLOSURE:{
- SQFunctionProto *func = _closure(ci._closure)->_function;
-- if (type(func->_name) == OT_STRING)
-+ if (sqtype(func->_name) == OT_STRING)
- si->funcname = _stringval(func->_name);
-- if (type(func->_sourcename) == OT_STRING)
-+ if (sqtype(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,
- case OT_NATIVECLOSURE:
- si->source = _SC("NATIVE");
- si->funcname = _SC("unknown");
-- if(type(_nativeclosure(ci._closure)->_name) == OT_STRING)
-+ if(sqtype(_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(type(o)) {
-+ switch(sqtype(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));
---- squirrel/sqfuncstate.cpp.orig 2017-08-31 12:07:29 UTC
-+++ squirrel/sqfuncstate.cpp
-@@ -77,7 +77,7 @@ SQInstructionDesc g_InstrDesc[]={
- #endif
- void DumpLiteral(SQObjectPtr &o)
- {
-- switch(type(o)){
-+ switch(sqtype(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;
-@@ -290,7 +290,7 @@ SQInteger SQFuncState::PopTarget()
- SQUnsignedInteger npos=_targetstack.back();
- assert(npos < _vlocals.size());
- SQLocalVarInfo &t = _vlocals[npos];
-- if(type(t._name)==OT_NULL){
-+ if(sqtype(t._name)==OT_NULL){
- _vlocals.pop_back();
- }
- _targetstack.pop_back();
-@@ -322,7 +322,7 @@ void SQFuncState::SetStackSize(SQInteger n)
- while(size>n){
- size--;
- SQLocalVarInfo lvi = _vlocals.back();
-- if(type(lvi._name)!=OT_NULL){
-+ if(sqtype(lvi._name)!=OT_NULL){
- if(lvi._end_op == UINT_MINUS_ONE) { //this means is an outer
- _outers--;
- }
-@@ -346,7 +346,7 @@ bool SQFuncState::IsConstant(const SQObject &name,SQOb
- bool SQFuncState::IsLocal(SQUnsignedInteger stkpos)
- {
- if(stkpos>=_vlocals.size())return false;
-- else if(type(_vlocals[stkpos]._name)!=OT_NULL)return true;
-+ else if(sqtype(_vlocals[stkpos]._name)!=OT_NULL)return true;
- return false;
- }
-
-@@ -369,7 +369,7 @@ SQInteger SQFuncState::GetLocalVariable(const SQObject
- SQInteger locals=_vlocals.size();
- while(locals>=1){
- SQLocalVarInfo &lvi = _vlocals[locals-1];
-- if(type(lvi._name)==OT_STRING && _string(lvi._name)==_string(name)){
-+ if(sqtype(lvi._name)==OT_STRING && _string(lvi._name)==_string(name)){
- return locals-1;
- }
- locals--;
---- squirrel/sqobject.cpp.orig 2017-08-31 12:07:29 UTC
-+++ squirrel/sqobject.cpp
-@@ -43,7 +43,7 @@ const SQChar *IdType2Name(SQObjectType type)
-
- const SQChar *GetTypeName(const SQObjectPtr &obj1)
- {
-- return IdType2Name(type(obj1));
-+ return IdType2Name(sqtype(obj1));
- }
-
- SQString *SQString::Create(SQSharedState *ss,const SQChar *s,SQInteger len)
-@@ -72,7 +72,7 @@ SQInteger SQString::Next(const SQObjectPtr &refpos, SQ
-
- SQUnsignedInteger TranslateIndex(const SQObjectPtr &idx)
- {
-- switch(type(idx)){
-+ switch(sqtype(idx)){
- case OT_NULL:
- return 0;
- case OT_INTEGER:
-@@ -139,7 +139,7 @@ bool SQGenerator::Yield(SQVM *v,SQInteger target)
-
- _stack.resize(size);
- SQObject _this = v->_stack[v->_stackbase];
-- _stack._vals[0] = ISREFCOUNTED(type(_this)) ? SQObjectPtr(_refcounted(_this)->GetWeakRef(type(_this))) : _this;
-+ _stack._vals[0] = ISREFCOUNTED(sqtype(_this)) ? SQObjectPtr(_refcounted(_this)->GetWeakRef(sqtype(_this))) : _this;
- for(SQInteger n =1; n<target; n++) {
- _stack._vals[n] = v->_stack[v->_stackbase+n];
- }
-@@ -191,7 +191,7 @@ bool SQGenerator::Resume(SQVM *v,SQObjectPtr &dest)
- et._stacksize += newbase;
- }
- SQObject _this = _stack._vals[0];
-- v->_stack[v->_stackbase] = type(_this) == OT_WEAKREF ? _weakref(_this)->_obj : _this;
-+ v->_stack[v->_stackbase] = sqtype(_this) == OT_WEAKREF ? _weakref(_this)->_obj : _this;
-
- for(SQInteger n = 1; n<size; n++) {
- v->_stack[v->_stackbase+n] = _stack._vals[n];
-@@ -312,9 +312,9 @@ bool CheckTag(HSQUIRRELVM v,SQWRITEFUNC read,SQUserPoi
-
- bool WriteObject(HSQUIRRELVM v,SQUserPointer up,SQWRITEFUNC write,SQObjectPtr &o)
- {
-- SQUnsignedInteger32 _type = (SQUnsignedInteger32)type(o);
-+ SQUnsignedInteger32 _type = (SQUnsignedInteger32)sqtype(o);
- _CHECK_IO(SafeWrite(v,write,up,&_type,sizeof(_type)));
-- switch(type(o)){
-+ switch(sqtype(o)){
- case OT_STRING:
- _CHECK_IO(SafeWrite(v,write,up,&_string(o)->_len,sizeof(SQInteger)));
- _CHECK_IO(SafeWrite(v,write,up,_stringval(o),sq_rsl(_string(o)->_len)));
---- squirrel/sqobject.h.orig 2017-08-31 12:07:29 UTC
-+++ squirrel/sqobject.h
-@@ -101,7 +101,7 @@ struct SQWeakRef : SQRefCounted
- SQObject _obj;
- };
-
--#define _realval(o) (type((o)) != OT_WEAKREF?(SQObject)o:_weakref(o)->_obj)
-+#define _realval(o) (sqtype((o)) != OT_WEAKREF?(SQObject)o:_weakref(o)->_obj)
-
- struct SQObjectPtr;
-
-@@ -128,8 +128,8 @@ struct SQObjectPtr;
- (obj)->_uiRef++; \
- }
-
--#define type(obj) ((obj)._type)
--#define is_delegable(t) (type(t)&SQOBJECT_DELEGABLE)
-+#define sqtype(obj) ((obj)._type)
-+#define is_delegable(t) (sqtype(t)&SQOBJECT_DELEGABLE)
- #define raw_type(obj) _RAW_TYPE((obj)._type)
-
- #define _integer(obj) ((obj)._unVal.nInteger)
-@@ -155,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) ((type(num)==OT_INTEGER)?(SQFloat)_integer(num):_float(num))
--#define tointeger(num) ((type(num)==OT_FLOAT)?(SQInteger)_float(num):_integer(num))
-+#define tofloat(num) ((sqtype(num)==OT_INTEGER)?(SQFloat)_integer(num):_float(num))
-+#define tointeger(num) ((sqtype(num)==OT_FLOAT)?(SQInteger)_float(num):_integer(num))
- /////////////////////////////////////////////////////////////////////////////////////
- /////////////////////////////////////////////////////////////////////////////////////
- #if defined(SQUSEDOUBLE) && !defined(_SQ64) || !defined(SQUSEDOUBLE) && defined(_SQ64)
---- squirrel/sqstate.cpp.orig 2017-08-31 12:07:29 UTC
-+++ squirrel/sqstate.cpp
-@@ -221,7 +221,7 @@ SQSharedState::~SQSharedState()
-
- SQInteger SQSharedState::GetMetaMethodIdxByName(const SQObjectPtr &name)
- {
-- if(type(name) != OT_STRING)
-+ if(sqtype(name) != OT_STRING)
- return -1;
- SQObjectPtr ret;
- if(_table(_metamethodsmap)->Get(name,ret)) {
-@@ -234,7 +234,7 @@ SQInteger SQSharedState::GetMetaMethodIdxByName(const
-
- void SQSharedState::MarkObject(SQObjectPtr &o,SQCollectable **chain)
- {
-- switch(type(o)){
-+ switch(sqtype(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;
-@@ -423,7 +423,7 @@ void RefTable::Mark(SQCollectable **chain)
- {
- RefNode *nodes = (RefNode *)_nodes;
- for(SQUnsignedInteger n = 0; n < _numofslots; n++) {
-- if(type(nodes->obj) != OT_NULL) {
-+ if(sqtype(nodes->obj) != OT_NULL) {
- SQSharedState::MarkObject(nodes->obj,chain);
- }
- nodes++;
-@@ -485,7 +485,7 @@ void RefTable::Resize(SQUnsignedInteger size)
- //rehash
- SQUnsignedInteger nfound = 0;
- for(SQUnsignedInteger n = 0; n < oldnumofslots; n++) {
-- if(type(t->obj) != OT_NULL) {
-+ if(sqtype(t->obj) != OT_NULL) {
- //add back;
- assert(t->refs != 0);
- RefNode *nn = Add(::HashObj(t->obj)&(_numofslots-1),t->obj);
-@@ -518,7 +518,7 @@ RefTable::RefNode *RefTable::Get(SQObject &obj,SQHash
- mainpos = ::HashObj(obj)&(_numofslots-1);
- *prev = NULL;
- for (ref = _buckets[mainpos]; ref; ) {
-- if(_rawval(ref->obj) == _rawval(obj) && type(ref->obj) == type(obj))
-+ if(_rawval(ref->obj) == _rawval(obj) && sqtype(ref->obj) == sqtype(obj))
- break;
- *prev = ref;
- ref = ref->next;
---- squirrel/sqtable.cpp.orig 2017-08-31 12:07:29 UTC
-+++ squirrel/sqtable.cpp
-@@ -62,7 +62,7 @@ void SQTable::Rehash(bool force)
- _usednodes = 0;
- for (SQInteger i=0; i<oldsize; i++) {
- _HashNode *old = nold+i;
-- if (type(old->key) != OT_NULL)
-+ if (sqtype(old->key) != OT_NULL)
- NewSlot(old->key,old->val);
- }
- for(SQInteger k=0;k<oldsize;k++)
-@@ -107,7 +107,7 @@ SQTable *SQTable::Clone()
-
- bool SQTable::Get(const SQObjectPtr &key,SQObjectPtr &val)
- {
-- if(type(key) == OT_NULL)
-+ if(sqtype(key) == OT_NULL)
- return false;
- _HashNode *n = _Get(key, HashObj(key) & (_numofnodes - 1));
- if (n) {
-@@ -118,7 +118,7 @@ bool SQTable::Get(const SQObjectPtr &key,SQObjectPtr &
- }
- bool SQTable::NewSlot(const SQObjectPtr &key,const SQObjectPtr &val)
- {
-- assert(type(key) != OT_NULL);
-+ assert(sqtype(key) != OT_NULL);
- SQHash h = HashObj(key) & (_numofnodes - 1);
- _HashNode *n = _Get(key, h);
- if (n) {
-@@ -132,7 +132,7 @@ bool SQTable::NewSlot(const SQObjectPtr &key,const SQO
- //key not found I'll insert it
- //main pos is not free
-
-- if(type(mp->key) != OT_NULL) {
-+ if(sqtype(mp->key) != OT_NULL) {
- n = _firstfree; /* get a free place */
- SQHash mph = HashObj(mp->key) & (_numofnodes - 1);
- _HashNode *othern; /* main position of colliding node */
-@@ -161,7 +161,7 @@ bool SQTable::NewSlot(const SQObjectPtr &key,const SQO
- mp->key = key;
-
- for (;;) { /* correct `firstfree' */
-- if (type(_firstfree->key) == OT_NULL && _firstfree->next == NULL) {
-+ if (sqtype(_firstfree->key) == OT_NULL && _firstfree->next == NULL) {
- mp->val = val;
- _usednodes++;
- return true; /* OK; table still has a free place */
-@@ -177,7 +177,7 @@ SQInteger SQTable::Next(bool getweakrefs,const SQObjec
- {
- SQInteger idx = (SQInteger)TranslateIndex(refpos);
- while (idx < _numofnodes) {
-- if(type(_nodes[idx].key) != OT_NULL) {
-+ if(sqtype(_nodes[idx].key) != OT_NULL) {
- //first found
- _HashNode &n = _nodes[idx];
- outkey = n.key;
---- squirrel/sqtable.h.orig 2017-08-31 12:07:29 UTC
-+++ squirrel/sqtable.h
-@@ -14,7 +14,7 @@
-
- inline SQHash HashObj(const SQObjectPtr &key)
- {
-- switch(type(key)) {
-+ switch(sqtype(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 @@ struct SQTable : public SQDelegable (public)
- {
- _HashNode *n = &_nodes[hash];
- do{
-- if(_rawval(n->key) == _rawval(key) && type(n->key) == type(key)){
-+ if(_rawval(n->key) == _rawval(key) && sqtype(n->key) == sqtype(key)){
- return n;
- }
- }while((n = n->next));
-@@ -80,7 +80,7 @@ struct SQTable : public SQDelegable (public)
- _HashNode *n = &_nodes[hash & (_numofnodes - 1)];
- _HashNode *res = NULL;
- do{
-- if(type(n->key) == OT_STRING && (scstrcmp(_stringval(n->key),key) == 0)){
-+ if(sqtype(n->key) == OT_STRING && (scstrcmp(_stringval(n->key),key) == 0)){
- res = n;
- break;
- }
---- squirrel/sqvm.cpp.orig 2017-08-31 12:07:29 UTC
-+++ squirrel/sqvm.cpp
-@@ -19,7 +19,7 @@
- bool SQVM::BW_OP(SQUnsignedInteger op,SQObjectPtr &trg,const SQObjectPtr &o1,const SQObjectPtr &o2)
- {
- SQInteger res;
-- if((type(o1)|type(o2)) == OT_INTEGER)
-+ if((sqtype(o1)| sqtype(o2)) == OT_INTEGER)
- {
- SQInteger i1 = _integer(o1), i2 = _integer(o2);
- switch(op) {
-@@ -39,7 +39,7 @@ bool SQVM::BW_OP(SQUnsignedInteger op,SQObjectPtr &trg
-
*** 449 LINES SKIPPED ***