diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2012-12-01 14:05:07 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-12-02 15:50:37 +0100 |
| commit | 2104e7fdcb9c16cabc58e93f0cd1d11e36bdca34 (patch) | |
| tree | ebd2686e7cf8f0e4b561394f28e0aa4cc5b35eb4 /qmljs_engine.cpp | |
| parent | b589811f735ffde5dd1272bd9dd69599de421000 (diff) | |
Remove the DeclarativeEnvironment class again
The class is a specification detail that we can implement
in a more performant way. ExecutionContext now contains
everything needed again.
Change-Id: Ideb5f04eeeecaf2b8543676c626e3943e4d6d7a1
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'qmljs_engine.cpp')
| -rw-r--r-- | qmljs_engine.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qmljs_engine.cpp b/qmljs_engine.cpp index 4ccbe4ea84..6c5edd16e2 100644 --- a/qmljs_engine.cpp +++ b/qmljs_engine.cpp @@ -158,7 +158,7 @@ ExecutionEngine::ExecutionEngine(EvalISelFactory *factory) // VM::Object *glo = newObject(/*rootContext*/); globalObject = Value::fromObject(glo); - rootContext->lexicalEnvironment->activation = glo; + rootContext->activation = glo; glo->__put__(rootContext, identifier(QStringLiteral("Object")), objectCtor); glo->__put__(rootContext, identifier(QStringLiteral("String")), stringCtor); @@ -348,7 +348,7 @@ Object *ExecutionEngine::newMathObject(ExecutionContext *ctx) return object; } -Object *ExecutionEngine::newActivationObject(DeclarativeEnvironment *ctx) +Object *ExecutionEngine::newActivationObject(ExecutionContext *ctx) { return new ActivationObject(ctx); } |