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>

1 files changed, 4 insertions, 4 deletions

diff --git a/qmljs_objects.h b/qmljs_objects.h
index a74f6198ec..927b9f32d1 100644
--- a/qmljs_objects.h
+++ b/qmljs_objects.h
@@ -490,7 +490,7 @@ struct ArrayObject: Object {
 };
 
 struct FunctionObject: Object {
-    DeclarativeEnvironment *scope;
+    ExecutionContext *scope;
     String *name;
     String **formalParameterList;
     unsigned int formalParameterCount;
@@ -500,7 +500,7 @@ struct FunctionObject: Object {
     bool strictMode;
 
     FunctionObject(ExecutionContext *scope)
-        : scope(scope ? scope->lexicalEnvironment : 0)
+        : scope(scope)
         , name(0)
         , formalParameterList(0)
         , formalParameterCount(0)
@@ -633,9 +633,9 @@ struct URIErrorObject: ErrorObject {
 };
 
 struct ActivationObject: Object {
-    DeclarativeEnvironment *context;
+    ExecutionContext *context;
     Value arguments;
-    ActivationObject(DeclarativeEnvironment *context)
+    ActivationObject(ExecutionContext *context)
         : context(context), arguments(Value::undefinedValue()) {}
     virtual QString className() { return QStringLiteral("Activation"); }
     virtual ActivationObject *asActivationObject() { return this; }