Simplify errors and diagnostics

We only need two classes to describe all possible diagnostics:

* A low-level private POD DiagnosticMessage. This is easily copied and
  passed around internally. It doesn't need to adhere to a stable API
  and it doesn't carry any extra baggage.

* The high-level public QQmlError with its stable interface. This can
  internally also use a DiagnosticMessage as storage.

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

4 files changed, 22 insertions, 40 deletions

diff --git a/src/qml/compiler/qqmlirbuilder.cpp b/src/qml/compiler/qqmlirbuilder.cpp
index 3e5798ba8b..cb46a59713 100644
--- a/src/qml/compiler/qqmlirbuilder.cpp
+++ b/src/qml/compiler/qqmlirbuilder.cpp
@@ -374,13 +374,12 @@ bool IRBuilder::generateFromQml(const QString &code, const QString &url, Documen
         if (!parseResult || !diagnosticMessages.isEmpty()) {
             // Extract errors from the parser
             for (const QQmlJS::DiagnosticMessage &m : diagnosticMessages) {
-
                 if (m.isWarning()) {
-                    qWarning("%s:%d : %s", qPrintable(url), m.loc.startLine, qPrintable(m.message));
+                    qWarning("%s:%d : %s", qPrintable(url), m.line, qPrintable(m.message));
                     continue;
                 }
 
-                recordError(m.loc, m.message);
+                errors << m;
             }
             return false;
         }
@@ -1502,7 +1501,8 @@ bool IRBuilder::resolveQualifiedId(QQmlJS::AST::UiQualifiedId **nameToResolve, O
 void IRBuilder::recordError(const QQmlJS::AST::SourceLocation &location, const QString &description)
 {
     QQmlJS::DiagnosticMessage error;
-    error.loc = location;
+    error.line = location.startLine;
+    error.column = location.startColumn;
     error.message = description;
     errors << error;
 }
diff --git a/src/qml/compiler/qqmlirbuilder_p.h b/src/qml/compiler/qqmlirbuilder_p.h
index b49eaee420..64298466e0 100644
--- a/src/qml/compiler/qqmlirbuilder_p.h
+++ b/src/qml/compiler/qqmlirbuilder_p.h
@@ -526,16 +526,15 @@ private:
 
 } // namespace QmlIR
 
-struct QQmlCompileError
+inline QQmlJS::DiagnosticMessage qQmlCompileError(const QV4::CompiledData::Location &location,
+                                                  const QString &description)
 {
-    QQmlCompileError() {}
-    QQmlCompileError(const QV4::CompiledData::Location &location, const QString &description)
-        : location(location), description(description) {}
-    QV4::CompiledData::Location location;
-    QString description;
-
-    bool isSet() const { return !description.isEmpty(); }
-};
+    QQmlJS::DiagnosticMessage error;
+    error.line = location.line;
+    error.column = location.column;
+    error.message = description;
+    return error;
+}
 
 QT_END_NAMESPACE
 
diff --git a/src/qml/compiler/qv4codegen.cpp b/src/qml/compiler/qv4codegen.cpp
index 04e6efb1e9..99b73679c5 100644
--- a/src/qml/compiler/qv4codegen.cpp
+++ b/src/qml/compiler/qv4codegen.cpp
@@ -53,7 +53,8 @@
 #include <private/qv4compilercontrolflow_p.h>
 #include <private/qv4bytecodegenerator_p.h>
 #include <private/qv4compilerscanfunctions_p.h>
-#include <qqmlerror.h>
+#include <private/qv4stringtoarrayindex_p.h>
+#include <private/qqmljsdiagnosticmessage_p.h>
 
 #include <cmath>
 #include <iostream>
@@ -3777,7 +3778,8 @@ void Codegen::throwSyntaxError(const SourceLocation &loc, const QString &detail)
     hasError = true;
     QQmlJS::DiagnosticMessage error;
     error.message = detail;
-    error.loc = loc;
+    error.line = loc.startLine;
+    error.column = loc.startColumn;
     _errors << error;
 }
 
@@ -3789,7 +3791,8 @@ void Codegen::throwReferenceError(const SourceLocation &loc, const QString &deta
     hasError = true;
     QQmlJS::DiagnosticMessage error;
     error.message = detail;
-    error.loc = loc;
+    error.line = loc.startLine;
+    error.column = loc.startColumn;
     _errors << error;
 }
 
@@ -3961,28 +3964,9 @@ Codegen::VolatileMemoryLocations Codegen::scanVolatileMemoryLocations(AST::Node
     return scanner.scan(ast);
 }
 
-
-QList<QQmlError> Codegen::qmlErrors() const
+QUrl Codegen::url() const
 {
-    QList<QQmlError> qmlErrors;
-
-    // Short circuit to avoid costly (de)heap allocation of QUrl if there are no errors.
-    if (_errors.size() == 0)
-        return qmlErrors;
-
-    qmlErrors.reserve(_errors.size());
-
-    QUrl url(_fileNameIsUrl ? QUrl(_module->fileName) : QUrl::fromLocalFile(_module->fileName));
-    for (const QQmlJS::DiagnosticMessage &msg: qAsConst(_errors)) {
-        QQmlError e;
-        e.setUrl(url);
-        e.setLine(msg.loc.startLine);
-        e.setColumn(msg.loc.startColumn);
-        e.setDescription(msg.message);
-        qmlErrors << e;
-    }
-
-    return qmlErrors;
+    return QUrl(_fileNameIsUrl ? QUrl(_module->fileName) : QUrl::fromLocalFile(_module->fileName));
 }
 
 bool Codegen::RValue::operator==(const RValue &other) const
diff --git a/src/qml/compiler/qv4codegen_p.h b/src/qml/compiler/qv4codegen_p.h
index 65dc4b97b5..c76957620e 100644
--- a/src/qml/compiler/qv4codegen_p.h
+++ b/src/qml/compiler/qv4codegen_p.h
@@ -54,14 +54,13 @@
 #include <private/qqmljsastvisitor_p.h>
 #include <private/qqmljsengine_p.h>
 #include <private/qqmljsast_p.h>
+#include <private/qqmljsdiagnosticmessage_p.h>
 #include <private/qv4compiler_p.h>
 #include <private/qv4compilercontext_p.h>
 #include <private/qv4util_p.h>
 #include <private/qv4bytecodegenerator_p.h>
 #include <private/qv4calldata_p.h>
 
-#include <QtQml/qqmlerror.h>
-
 QT_BEGIN_NAMESPACE
 
 using namespace QQmlJS;
@@ -673,7 +672,7 @@ protected:
 
 public:
     QList<DiagnosticMessage> errors() const;
-    QList<QQmlError> qmlErrors() const;
+    QUrl url() const;
 
     Reference binopHelper(QSOperator::Op oper, Reference &left, Reference &right);
     Reference jumpBinop(QSOperator::Op oper, Reference &left, Reference &right);