generic-library/squirrel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ensure class constructors are functions

Browse Source
This commit is contained in:
Peter Hartley 2016-01-24 01:17:37 +08:00 committed by albertodemichelis
parent 42ebb979ae
commit d23b238093
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
squirrel/sqvm.cpp
View File

@ -1216,8 +1216,9 @@ bool SQVM::Get(const SQObjectPtr &self, const SQObjectPtr &key, SQObjectPtr &des
case OT_STRING: case OT_STRING:
if(sq_isnumeric(key)){ if(sq_isnumeric(key)){
SQInteger n = tointeger(key); SQInteger n = tointeger(key);
if(abs((int)n) < _string(self)->_len) { SQInteger len = _string(self)->_len;
if(n < 0) n = _string(self)->_len - n; if (n < 0) { n += len; }
if (n >= 0 && n < len) {
dest = SQInteger(_stringval(self)[n]); dest = SQInteger(_stringval(self)[n]);
return true; return true;
} }
@ -1551,7 +1552,8 @@ SQInteger prevstackbase = _stackbase;
SQObjectPtr constr; SQObjectPtr constr;
SQObjectPtr temp; SQObjectPtr temp;
CreateClassInstance(_class(closure),outres,constr); CreateClassInstance(_class(closure),outres,constr);
if(type(constr) != OT_NULL) { SQObjectType ctype = type(constr);
if (ctype == OT_NATIVECLOSURE || ctype == OT_CLOSURE) {
_stack[stackbase] = outres; _stack[stackbase] = outres;
return Call(constr,nparams,stackbase,temp,raiseerror); return Call(constr,nparams,stackbase,temp,raiseerror);
} }
@ -1631,7 +1633,7 @@ bool SQVM::EnterFrame(SQInteger newbase, SQInteger newtop, bool tailcall)
Raise_Error(_SC("stack overflow, cannot resize stack while in a metamethod")); Raise_Error(_SC("stack overflow, cannot resize stack while in a metamethod"));
return false; return false;
} }
_stack.resize(_stack.size() + (MIN_STACK_OVERHEAD << 2)); _stack.resize(newtop + (MIN_STACK_OVERHEAD << 2));
RelocateOuters(); RelocateOuters();
} }
return true; return true;