Skip to content

Commit

Permalink
fix calling constructor with arguments
Browse files Browse the repository at this point in the history
Report error if class doesn't have dedicated constructor, but is
instantinated with arguments.

Example

  local class A { x = 123 }
  local a = A("foo", 567)

Before this change arguments were ignored, now an error is raised
  • Loading branch information
VasiliyRyabtsev committed Dec 21, 2021
1 parent e258e5a commit 4c2b49a
Showing 1 changed file with 17 additions and 6 deletions.
23 changes: 17 additions & 6 deletions squirrel/sqvm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -814,25 +814,36 @@ bool SQVM::Execute(SQObjectPtr &closure, SQInteger nargs, SQInteger stackbase,SQ
}
continue;
case OT_CLASS:{
SQObjectPtr inst;
_GUARD(CreateClassInstance(_class(clo),inst,clo));
SQObjectPtr inst, ctor;
_GUARD(CreateClassInstance(_class(clo),inst,ctor));
if(tgt0 != -1) {
STK(tgt0) = inst;
}
SQInteger stkbase;
switch(sq_type(clo)) {
switch(sq_type(ctor)) {
case OT_CLOSURE:
stkbase = _stackbase+arg2;
_stack._vals[stkbase] = inst;
_GUARD(StartCall(_closure(clo), -1, arg3, stkbase, false));
_GUARD(StartCall(_closure(ctor), -1, arg3, stkbase, false));
break;
case OT_NATIVECLOSURE:
bool dummy;
stkbase = _stackbase+arg2;
_stack._vals[stkbase] = inst;
_GUARD(CallNative(_nativeclosure(clo), arg3, stkbase, clo, -1, dummy, dummy));
_GUARD(CallNative(_nativeclosure(ctor), arg3, stkbase, ctor, -1, dummy, dummy));
break;
case OT_NULL:
if (arg3 > 1) {
Raise_Error(_SC("cannot call default constructor with arguments"));
SQ_THROW();
}
break;
default:
// cannot happen, but still...
assert(!"invalid constructor type");
Raise_Error(_SC("invalid constructor type %s"), IdType2Name(sq_type(ctor)));
SQ_THROW();
break;
default: break; //shutup GCC 4.x
}
}
break;
Expand Down

0 comments on commit 4c2b49a

Please sign in to comment.