thijn/SqMod
1
0
Fork 0
mirror of https://github.com/VCMP-SqMod/SqMod.git synced 2025-02-22 04:37:13 +01:00
Code Releases Activity

Allow Function::Assign to specify how many parameters it consumed.

Browse Source
This commit is contained in:
Sandu Liviu Catalin 2019-08-15 17:51:21 +03:00
parent 57d4855426
commit ca23bb03e1
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/sqrat/sqratFunction.h
View File

@ -180,9 +180,11 @@ struct Function {
// If `idx1` is null, it defaults to root table // If `idx1` is null, it defaults to root table
// If `idx1` is an object, it will be used as the environment // If `idx1` is an object, it will be used as the environment
// If `idx1` is actually a function/closure then `idx2` is ignored // If `idx1` is actually a function/closure then `idx2` is ignored
void Assign(HSQUIRRELVM vm, SQInteger idx1, SQInteger idx2) { bool Assign(HSQUIRRELVM vm, SQInteger idx1, SQInteger idx2) {
// Release current callback, if any // Release current callback, if any
Release(); Release();
// Tells if the current environment was used
bool cenv = false;
// Retrieve the environment type // Retrieve the environment type
const SQObjectType ty1 = sq_gettype(vm, idx1); const SQObjectType ty1 = sq_gettype(vm, idx1);
// Should we use the root table as the environment? // Should we use the root table as the environment?
@ -194,6 +196,7 @@ struct Function {
} else if (ty1 & (_RT_CLOSURE | _RT_NATIVECLOSURE)) { } else if (ty1 & (_RT_CLOSURE | _RT_NATIVECLOSURE)) {
sq_getstackobj(vm, 1, &mEnv); // `this` as environment sq_getstackobj(vm, 1, &mEnv); // `this` as environment
idx2 = idx1; // There is no explicit environment given idx2 = idx1; // There is no explicit environment given
cenv = true;
// Is there a specific environment? // Is there a specific environment?
} else if (ty1 & (_RT_TABLE | _RT_CLASS | _RT_INSTANCE)) { } else if (ty1 & (_RT_TABLE | _RT_CLASS | _RT_INSTANCE)) {
sq_getstackobj(vm, idx1, &mEnv); // Grab the given environment sq_getstackobj(vm, idx1, &mEnv); // Grab the given environment
@ -201,7 +204,7 @@ struct Function {
#if !defined (SCRAT_NO_ERROR_CHECKING) #if !defined (SCRAT_NO_ERROR_CHECKING)
SQTHROW(vm, FormatTypeError(vm, idx1, _SC("object"))); SQTHROW(vm, FormatTypeError(vm, idx1, _SC("object")));
#else #else
return; return cenv;
#endif #endif
} }
// Retrieve the callback type // Retrieve the callback type
@ -218,6 +221,8 @@ struct Function {
SQTHROW(vm, FormatTypeError(vm, idx2, _SC("closure"))); SQTHROW(vm, FormatTypeError(vm, idx2, _SC("closure")));
#endif #endif
} }
// Return whether current environment was used
return cenv;
} }
// Runs the Function and returns its value as a SharedPtr // Runs the Function and returns its value as a SharedPtr
template<class R, class... Args> SharedPtr<R> Evaluate(Args &&... args) { template<class R, class... Args> SharedPtr<R> Evaluate(Args &&... args) {