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_engine.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_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 9229dbd9a2..8097639e54 100644 --- a/qmljs_engine.cpp +++ b/qmljs_engine.cpp @@ -139,7 +139,7 @@ ExecutionEngine::ExecutionEngine() // VM::Object *glo = newObject(/*rootContext*/); globalObject = Value::fromObject(glo); - rootContext->activation = glo; + rootContext->variableEnvironment->activation = glo; glo->__put__(rootContext, identifier(QStringLiteral("Object")), objectCtor); glo->__put__(rootContext, identifier(QStringLiteral("String")), stringCtor); @@ -324,7 +324,7 @@ Object *ExecutionEngine::newMathObject(ExecutionContext *ctx) return object; } -Object *ExecutionEngine::newActivationObject(ExecutionContext *ctx) +Object *ExecutionEngine::newActivationObject(DeclarativeEnvironment *ctx) { return new ActivationObject(ctx); } |