diff options
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/squirrel.cpp | 49 | ||||
| -rw-r--r-- | src/script/squirrel.hpp | 22 |
2 files changed, 65 insertions, 6 deletions
diff --git a/src/script/squirrel.cpp b/src/script/squirrel.cpp index 602cc593d..0718f7945 100644 --- a/src/script/squirrel.cpp +++ b/src/script/squirrel.cpp @@ -24,7 +24,9 @@ void Squirrel::CompileError(HSQUIRRELVM vm, const SQChar *desc, const SQChar *so #endif /* Check if we have a custom print function */ - SQPrintFunc *func = ((Squirrel *)sq_getforeignptr(vm))->print_func; + Squirrel *engine = (Squirrel *)sq_getforeignptr(vm); + engine->crashed = true; + SQPrintFunc *func = engine->print_func; if (func == NULL) { scfprintf(stderr, _SC("%s"), buf); } else { @@ -59,7 +61,9 @@ void Squirrel::RunError(HSQUIRRELVM vm, const SQChar *error) /* Check if we have a custom print function */ SQChar buf[1024]; scsnprintf(buf, lengthof(buf), _SC("Your script made an error: %s\n"), error); - SQPrintFunc *func = ((Squirrel *)sq_getforeignptr(vm))->print_func; + Squirrel *engine = (Squirrel *)sq_getforeignptr(vm); + engine->crashed = true; + SQPrintFunc *func = engine->print_func; if (func == NULL) { scfprintf(stderr, _SC("%s"), buf); } else { @@ -156,6 +160,7 @@ void Squirrel::AddClassEnd() bool Squirrel::MethodExists(HSQOBJECT instance, const char *method_name) { + assert(!this->crashed); int top = sq_gettop(this->vm); /* Go to the instance-root */ sq_pushobject(this->vm, instance); @@ -171,6 +176,7 @@ bool Squirrel::MethodExists(HSQOBJECT instance, const char *method_name) bool Squirrel::Resume(int suspend) { + assert(!this->crashed); sq_resumecatch(this->vm, suspend); return this->vm->_suspended != 0; } @@ -182,6 +188,7 @@ void Squirrel::CollectGarbage() bool Squirrel::CallMethod(HSQOBJECT instance, const char *method_name, HSQOBJECT *ret, int suspend) { + assert(!this->crashed); /* Store the stack-location for the return value. We need to * restore this after saving or the stack will be corrupted * if we're in the middle of a DoCommand. */ @@ -199,7 +206,7 @@ bool Squirrel::CallMethod(HSQOBJECT instance, const char *method_name, HSQOBJECT } /* Call the method */ sq_pushobject(this->vm, instance); - sq_call(this->vm, 1, ret == NULL ? SQFalse : SQTrue, SQTrue, suspend); + if (SQ_FAILED(sq_call(this->vm, 1, ret == NULL ? SQFalse : SQTrue, SQTrue, suspend))) return false; if (ret != NULL) sq_getstackobj(vm, -1, ret); /* Reset the top, but don't do so for the AI main function, as we need * a correct stack when resuming. */ @@ -207,7 +214,25 @@ bool Squirrel::CallMethod(HSQOBJECT instance, const char *method_name, HSQOBJECT /* Restore the return-value location. */ this->vm->_suspended_target = last_target; - return this->vm->_suspended != 0; + return true; +} + +bool Squirrel::CallStringMethodStrdup(HSQOBJECT instance, const char *method_name, const char **res, int suspend) +{ + HSQOBJECT ret; + if (!this->CallMethod(instance, method_name, &ret, suspend)) return false; + if (ret._type != OT_STRING) return false; + *res = strdup(ObjectToString(&ret)); + return true; +} + +bool Squirrel::CallIntegerMethod(HSQOBJECT instance, const char *method_name, int *res, int suspend) +{ + HSQOBJECT ret; + if (!this->CallMethod(instance, method_name, &ret, suspend)) return false; + if (ret._type != OT_INTEGER) return false; + *res = ObjectToInteger(&ret); + return true; } /* static */ bool Squirrel::CreateClassInstanceVM(HSQUIRRELVM vm, const char *class_name, void *real_instance, HSQOBJECT *instance, SQRELEASEHOOK release_hook) @@ -258,6 +283,7 @@ Squirrel::Squirrel() this->vm = sq_open(1024); this->print_func = NULL; this->global_pointer = NULL; + this->crashed = false; /* Handle compile-errors ourself, so we can display it nicely */ sq_setcompilererrorhandler(this->vm, &Squirrel::CompileError); @@ -459,3 +485,18 @@ void Squirrel::InsertResult(int result) { vm->DecreaseOps(ops); } + +bool Squirrel::IsSuspended() +{ + return this->vm->_suspended != 0; +} + +bool Squirrel::HasScriptCrashed() +{ + return this->crashed; +} + +void Squirrel::ResetCrashed() +{ + this->crashed = false; +} diff --git a/src/script/squirrel.hpp b/src/script/squirrel.hpp index b5b352bd0..5ce8675ed 100644 --- a/src/script/squirrel.hpp +++ b/src/script/squirrel.hpp @@ -12,6 +12,7 @@ private: HSQUIRRELVM vm; ///< The VirtualMachine instnace for squirrel void *global_pointer; ///< Can be set by who ever initializes Squirrel SQPrintFunc *print_func; ///< Points to either NULL, or a custom print handler + bool crashed; ///< True if the squirrel script made an error. /** * The internal RunError handler. It looks up the real error and calls RunError with it. @@ -111,11 +112,12 @@ public: /** * Call a method of an instance, in various flavors. + * @return False if the script crashed or returned a wrong type. */ bool CallMethod(HSQOBJECT instance, const char *method_name, HSQOBJECT *ret, int suspend = -1); bool CallMethod(HSQOBJECT instance, const char *method_name, int suspend = -1) { return this->CallMethod(instance, method_name, NULL, suspend); } - const char *CallStringMethodStrdup(HSQOBJECT instance, const char *method_name, int suspend = -1) { HSQOBJECT ret; this->CallMethod(instance, method_name, &ret, suspend); return strdup(ObjectToString(&ret)); } - int CallIntegerMethod(HSQOBJECT instance, const char *method_name, int suspend = -1) { HSQOBJECT ret; this->CallMethod(instance, method_name, &ret, suspend); return ObjectToInteger(&ret); } + bool CallStringMethodStrdup(HSQOBJECT instance, const char *method_name, const char **res, int suspend = -1); + bool CallIntegerMethod(HSQOBJECT instance, const char *method_name, int *res, int suspend = -1); /** * Check if a method exists in an instance. @@ -191,6 +193,22 @@ public: * Tell the VM to remove \c amount ops from the number of ops till suspend. */ static void DecreaseOps(HSQUIRRELVM vm, int amount); + + /** + * Did the squirrel code suspend or return normally. + * @return True if the function suspended. + */ + bool IsSuspended(); + + /** + * Find out if the squirrel script made an error before. + */ + bool HasScriptCrashed(); + + /** + * Reset the crashed status. + */ + void ResetCrashed(); }; #endif /* SQUIRREL_HPP */ |