diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2012-11-19 22:24:12 +0100 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@digia.com> | 2012-11-20 10:43:19 +0100 |
| commit | 590b9491836fc5357393c5b89c2a8f82f5ec24b6 (patch) | |
| tree | a156d8317117121cbaa6e1c2d9051b54a071c104 /qmljs_environment.cpp | |
| parent | be507044a9f0eefb247fb9e385808d5d39b5dc38 (diff) | |
Move the exception variable into the engine
It's easier to store this in the engine then
in the execution context.
Change-Id: I01ff447602a7d785165e774bdf6e1735c073be2d
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Diffstat (limited to 'qmljs_environment.cpp')
| -rw-r--r-- | qmljs_environment.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/qmljs_environment.cpp b/qmljs_environment.cpp index 87f8543722..121670c999 100644 --- a/qmljs_environment.cpp +++ b/qmljs_environment.cpp @@ -171,7 +171,7 @@ void ExecutionContext::init(ExecutionEngine *eng) variableEnvironment = new DeclarativeEnvironment(eng); lexicalEnvironment = variableEnvironment; thisObject = Value::nullValue(); - res = Value::undefinedValue(); + eng->exception = Value::undefinedValue(); } PropertyDescriptor *ExecutionContext::lookupPropertyDescriptor(String *name, PropertyDescriptor *tmp) @@ -235,7 +235,6 @@ void ExecutionContext::initCallContext(ExecutionContext *parent, const Value tha lexicalEnvironment = variableEnvironment; thisObject = that; - res = Value::undefinedValue(); } void ExecutionContext::leaveCallContext() |