diff options
author | yexo <yexo@openttd.org> | 2009-08-25 12:47:50 +0000 |
---|---|---|
committer | yexo <yexo@openttd.org> | 2009-08-25 12:47:50 +0000 |
commit | b9536e933f114bb233b99ee4226f51030db65a18 (patch) | |
tree | 2595cd913eb91092fe1980583d80d35ca7004832 | |
parent | c46c0a7c86a2e3184c0b6c2e961c6cf3dee16cec (diff) | |
download | openttd-b9536e933f114bb233b99ee4226f51030db65a18.tar.xz |
(svn r17283) -Cleanup [Squirrel]: remove a few unneeded changes to squirrel code
-rw-r--r-- | src/3rdparty/squirrel/samples/ackermann.nut | 1 | ||||
-rw-r--r-- | src/3rdparty/squirrel/sqstdlib/sqstdrex.cpp | 2 | ||||
-rw-r--r-- | src/3rdparty/squirrel/squirrel/sqapi.cpp | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/3rdparty/squirrel/samples/ackermann.nut b/src/3rdparty/squirrel/samples/ackermann.nut index c8d056082..9fdaff06b 100644 --- a/src/3rdparty/squirrel/samples/ackermann.nut +++ b/src/3rdparty/squirrel/samples/ackermann.nut @@ -20,3 +20,4 @@ if(ARGS.len()!=0) { } print("n="+n+"\n"); print("Ack(3,"+ n+ "):"+ Ack(3, n)); + diff --git a/src/3rdparty/squirrel/sqstdlib/sqstdrex.cpp b/src/3rdparty/squirrel/sqstdlib/sqstdrex.cpp index f07899d1e..60d8c6bad 100644 --- a/src/3rdparty/squirrel/sqstdlib/sqstdrex.cpp +++ b/src/3rdparty/squirrel/sqstdlib/sqstdrex.cpp @@ -558,12 +558,12 @@ SQRex *sqstd_rex_compile(const SQChar *pattern,const SQChar **error) #endif exp->_matches = (SQRexMatch *) sq_malloc(exp->_nsubexpr * sizeof(SQRexMatch)); memset(exp->_matches,0,exp->_nsubexpr * sizeof(SQRexMatch)); - return exp; } catch (...) { sqstd_rex_free(exp); return NULL; } + return exp; } void sqstd_rex_free(SQRex *exp) diff --git a/src/3rdparty/squirrel/squirrel/sqapi.cpp b/src/3rdparty/squirrel/squirrel/sqapi.cpp index 2d53d71bb..bfe4ba449 100644 --- a/src/3rdparty/squirrel/squirrel/sqapi.cpp +++ b/src/3rdparty/squirrel/squirrel/sqapi.cpp @@ -834,7 +834,7 @@ SQRESULT sq_getdelegate(HSQUIRRELVM v,SQInteger idx) } v->Push(SQObjectPtr(_delegable(self)->_delegate)); break; - default: return sq_throwerror(v,_SC("wrong type")); + default: return sq_throwerror(v,_SC("wrong type")); break; } return SQ_OK; |