diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2012-11-18 23:33:06 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-19 10:33:35 +0100 |
| commit | a2676884804fb523ee586f1ebc6a11353ec79fcb (patch) | |
| tree | 485f9b97affb19a3a24c914f83159765d74b9f55 /qmljs_runtime.cpp | |
| parent | 4f1dfd1e260c238a0f8b1e3c7338431fa2972b90 (diff) | |
Better handling of contexts and environments
Make the ExecutionContext standard compliant.
Move most of it's members into a new
DeclarativeEnvironment data structure that
contains locals and arguments.
Change-Id: I094f559168810dbd3717d677fe28750076015976
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'qmljs_runtime.cpp')
| -rw-r--r-- | qmljs_runtime.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qmljs_runtime.cpp b/qmljs_runtime.cpp index 44226fb593..407348fe6a 100644 --- a/qmljs_runtime.cpp +++ b/qmljs_runtime.cpp @@ -197,7 +197,7 @@ Value __qmljs_delete_member(ExecutionContext *ctx, Value base, String *name) Value __qmljs_delete_property(ExecutionContext *ctx, String *name) { - Object *obj = ctx->activation; + Object *obj = ctx->lexicalEnvironment->activation; if (!obj) obj = ctx->engine->globalObject.objectValue(); return Value::fromBoolean(obj->__delete__(ctx, name, true)); @@ -779,7 +779,7 @@ Value __qmljs_call_property(ExecutionContext *context, Value base, String *name, Value thisObject; if (base.isUndefined()) { - baseObject = context->activation; + baseObject = context->lexicalEnvironment->activation; thisObject = Value::nullValue(); } else { if (!base.isObject()) |