From 36c308bf57fa5768d2f812a1cdd2cb10357f812f Mon Sep 17 00:00:00 2001 From: Avelino Date: Sat, 13 Aug 2016 17:45:05 -0300 Subject: [PATCH 1/3] Fixed code style, remove the warning from gcc issue #69 --- squirrel/sqapi.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/squirrel/sqapi.cpp b/squirrel/sqapi.cpp index 9c48af9..a404c2a 100644 --- a/squirrel/sqapi.cpp +++ b/squirrel/sqapi.cpp @@ -971,7 +971,9 @@ SQRESULT sq_setdelegate(HSQUIRRELVM v,SQInteger idx) switch(type) { case OT_TABLE: if(type(mt) == OT_TABLE) { - if(!_table(self)->SetDelegate(_table(mt))) return sq_throwerror(v, _SC("delagate cycle")); v->Pop();} + if(!_table(self)->SetDelegate(_table(mt))) { + return sq_throwerror(v, _SC("delagate cycle")); v->Pop();} + } else if(type(mt)==OT_NULL) { _table(self)->SetDelegate(NULL); v->Pop(); } else return sq_aux_invalidtype(v,type); From f3bb11ef994006a52f01b69c7972e5b432ed042a Mon Sep 17 00:00:00 2001 From: Avelino Date: Sat, 13 Aug 2016 18:01:21 -0300 Subject: [PATCH 2/3] fixed typo, file indentation --- squirrel/sqapi.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/squirrel/sqapi.cpp b/squirrel/sqapi.cpp index a404c2a..72d942c 100644 --- a/squirrel/sqapi.cpp +++ b/squirrel/sqapi.cpp @@ -972,8 +972,8 @@ SQRESULT sq_setdelegate(HSQUIRRELVM v,SQInteger idx) case OT_TABLE: if(type(mt) == OT_TABLE) { if(!_table(self)->SetDelegate(_table(mt))) { - return sq_throwerror(v, _SC("delagate cycle")); v->Pop();} - } + return sq_throwerror(v, _SC("delagate cycle")); v->Pop();} + } else if(type(mt)==OT_NULL) { _table(self)->SetDelegate(NULL); v->Pop(); } else return sq_aux_invalidtype(v,type); From 48842f097926e2b0a4c1b1e5cda5dc2368772dad Mon Sep 17 00:00:00 2001 From: Avelino Date: Wed, 17 Aug 2016 20:23:08 -0300 Subject: [PATCH 3/3] fixing indentation error and return object delegate cycle --- squirrel/sqapi.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/squirrel/sqapi.cpp b/squirrel/sqapi.cpp index 72d942c..3651d0a 100644 --- a/squirrel/sqapi.cpp +++ b/squirrel/sqapi.cpp @@ -972,8 +972,10 @@ SQRESULT sq_setdelegate(HSQUIRRELVM v,SQInteger idx) case OT_TABLE: if(type(mt) == OT_TABLE) { if(!_table(self)->SetDelegate(_table(mt))) { - return sq_throwerror(v, _SC("delagate cycle")); v->Pop();} + return sq_throwerror(v, _SC("delagate cycle")); } + v->Pop(); + } else if(type(mt)==OT_NULL) { _table(self)->SetDelegate(NULL); v->Pop(); } else return sq_aux_invalidtype(v,type);