Remove QV4::DiagnosticMessage

QQmlError provides the same functionality, so let's rather
use that where required. Remove the dependency of
codegen onto the ExecutionContext that was only
required for error handling.

Change-Id: Ib0b61c0e138f89ff989c32996c93c339e4b62223
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 22 insertions, 15 deletions

diff --git a/src/qml/compiler/qv4codegen_p.h b/src/qml/compiler/qv4codegen_p.h
index 75ca915a13..c55a45b107 100644
--- a/src/qml/compiler/qv4codegen_p.h
+++ b/src/qml/compiler/qv4codegen_p.h
@@ -46,12 +46,12 @@
 #include <private/qqmljsastvisitor_p.h>
 #include <private/qqmljsast_p.h>
 #include <QtCore/QStringList>
+#include <qqmlerror.h>
 #include <assert.h>
 
 QT_BEGIN_NAMESPACE
 
 namespace QV4 {
-struct DiagnosticMessage;
 struct ExecutionContext;
 }
 
@@ -61,18 +61,10 @@ class UiParameterList;
 }
 
 
-
-class ErrorHandler
-{
-public:
-    virtual void syntaxError(QV4::DiagnosticMessage *message) = 0;
-};
-
 class Q_QML_EXPORT Codegen: protected AST::Visitor
 {
 public:
-    Codegen(QV4::ExecutionContext *ctx, bool strict);
-    Codegen(ErrorHandler *errorHandler, bool strictMode);
+    Codegen(bool strict);
 
     enum Mode {
         GlobalCode,
@@ -415,11 +407,12 @@ protected:
     virtual bool visit(AST::UiSourceElement *ast);
 
     void throwSyntaxErrorOnEvalOrArgumentsInStrictMode(V4IR::Expr* expr, const AST::SourceLocation &loc);
+    virtual void throwSyntaxError(const AST::SourceLocation &loc, const QString &detail);
+    virtual void throwReferenceError(const AST::SourceLocation &loc, const QString &detail);
 
-    void throwSyntaxError(const AST::SourceLocation &loc, const QString &detail);
-    void throwReferenceError(const AST::SourceLocation &loc, const QString &detail);
+    QList<QQmlError> errors();
 
-private:
+protected:
     QString _fileName;
     Result _expr;
     QString _property;
@@ -437,13 +430,27 @@ private:
     ScopeAndFinally *_scopeAndFinally;
     QHash<AST::Node *, Environment *> _envMap;
     QHash<AST::FunctionExpression *, int> _functionMap;
-    QV4::ExecutionContext *_context;
     bool _strictMode;
-    ErrorHandler *_errorHandler;
+
+    QList<QQmlError> _errors;
 
     class ScanFunctions;
 };
 
+class RuntimeCodegen : public Codegen
+{
+public:
+    RuntimeCodegen(QV4::ExecutionContext *ctx, bool strict)
+        : Codegen(strict)
+        , context(ctx)
+    {}
+
+    virtual void throwSyntaxError(const AST::SourceLocation &loc, const QString &detail);
+    virtual void throwReferenceError(const AST::SourceLocation &loc, const QString &detail);
+private:
+    QV4::ExecutionContext *context;
+};
+
 }
 
 QT_END_NAMESPACE