Properly distinguish between class expressions and declarations

Introduce both types in the AST, and handle them properly
in the code generator.

Change-Id: I754ac0976de69009bdb8b203d890e4ec0ad03b30
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

4 files changed, 28 insertions, 2 deletions

diff --git a/src/qml/compiler/qv4codegen.cpp b/src/qml/compiler/qv4codegen.cpp
index 3e7fcbf77b..a7517fcde9 100644
--- a/src/qml/compiler/qv4codegen.cpp
+++ b/src/qml/compiler/qv4codegen.cpp
@@ -916,12 +916,19 @@ bool Codegen::visit(ClassExpression *ast)
 
     Reference ctor = referenceForName(ast->name.toString(), true);
     (void) ctor.storeRetainAccumulator();
-    (void) outerVar.storeRetainAccumulator();
 
     _expr.setResult(Reference::fromAccumulator(this));
     return false;
 }
 
+bool Codegen::visit(ClassDeclaration *ast)
+{
+    Reference outerVar = referenceForName(ast->name.toString(), true);
+    visit(static_cast<ClassExpression *>(ast));
+    (void) outerVar.storeRetainAccumulator();
+    return false;
+}
+
 bool Codegen::visit(Expression *ast)
 {
     if (hasError)
diff --git a/src/qml/compiler/qv4codegen_p.h b/src/qml/compiler/qv4codegen_p.h
index 5ddb762c8b..5232624f0f 100644
--- a/src/qml/compiler/qv4codegen_p.h
+++ b/src/qml/compiler/qv4codegen_p.h
@@ -600,6 +600,7 @@ protected:
     bool visit(AST::FunctionDeclaration *ast) override;
     bool visit(AST::YieldExpression *ast) override;
     bool visit(AST::ClassExpression *ast) override;
+    bool visit(AST::ClassDeclaration *ast) override;
 
     // statements
     bool visit(AST::Block *ast) override;
diff --git a/src/qml/compiler/qv4compilerscanfunctions.cpp b/src/qml/compiler/qv4compilerscanfunctions.cpp
index eda0102844..8b8c385b84 100644
--- a/src/qml/compiler/qv4compilerscanfunctions.cpp
+++ b/src/qml/compiler/qv4compilerscanfunctions.cpp
@@ -226,6 +226,21 @@ bool ScanFunctions::visit(FunctionExpression *ast)
 
 bool ScanFunctions::visit(ClassExpression *ast)
 {
+    enterEnvironment(ast, ContextType::Block, QStringLiteral("%Class"));
+    _context->isStrict = true;
+    _context->hasNestedFunctions = true;
+    if (!ast->name.isEmpty())
+        _context->addLocalVar(ast->name.toString(), Context::VariableDeclaration, AST::VariableScope::Let);
+    return true;
+}
+
+void ScanFunctions::endVisit(ClassExpression *)
+{
+    leaveEnvironment();
+}
+
+bool ScanFunctions::visit(ClassDeclaration *ast)
+{
     if (!ast->name.isEmpty())
         _context->addLocalVar(ast->name.toString(), Context::VariableDeclaration, AST::VariableScope::Let);
 
@@ -237,7 +252,7 @@ bool ScanFunctions::visit(ClassExpression *ast)
     return true;
 }
 
-void ScanFunctions::endVisit(ClassExpression *)
+void ScanFunctions::endVisit(ClassDeclaration *)
 {
     leaveEnvironment();
 }
diff --git a/src/qml/compiler/qv4compilerscanfunctions_p.h b/src/qml/compiler/qv4compilerscanfunctions_p.h
index ffa1409da9..f2d8c2988d 100644
--- a/src/qml/compiler/qv4compilerscanfunctions_p.h
+++ b/src/qml/compiler/qv4compilerscanfunctions_p.h
@@ -124,6 +124,9 @@ protected:
     bool visit(AST::ClassExpression *ast) override;
     void endVisit(AST::ClassExpression *) override;
 
+    bool visit(AST::ClassDeclaration *ast) override;
+    void endVisit(AST::ClassDeclaration *) override;
+
     bool visit(AST::DoWhileStatement *ast) override;
     bool visit(AST::ForStatement *ast) override;
     void endVisit(AST::ForStatement *) override;