1 files changed, 31 insertions, 12 deletions

diff --git a/src/qml/compiler/qv4codegen_p.h b/src/qml/compiler/qv4codegen_p.h
index 6d5f8c0951..51b821aafe 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;
@@ -199,8 +198,9 @@ public:
             codegen = cg;
         }
 
-        Reference() :
+        Reference(const QString &name = QString()) :
             constant(0),
+            name(name),
             isArgOrEval(false),
             isReadonly(false),
             isReferenceToConst(false),
@@ -418,6 +418,11 @@ protected:
         bool _trueBlockFollowsCondition = false;
 
     public:
+        explicit Result(const QString &name)
+            : _result(name)
+            , _requested(ex)
+        {}
+
         explicit Result(const Reference &lrvalue)
             : _result(lrvalue)
             , _requested(ex)
@@ -476,6 +481,10 @@ protected:
         void setResult(Reference &&result) {
             _result = std::move(result);
         }
+
+        void clearResultName() {
+            _result.name.clear();
+        }
     };
 
     void enterContext(AST::Node *node);
@@ -523,19 +532,19 @@ protected:
                    const BytecodeGenerator::Label *iffalse,
                    bool trueBlockFollowsCondition);
 
-    inline Reference expression(AST::ExpressionNode *ast)
+    inline Reference expression(AST::ExpressionNode *ast, const QString &name = QString())
     {
-        if (!ast || hasError)
+        if (!ast || hasError())
             return Reference();
 
-        pushExpr();
+        pushExpr(name);
         ast->accept(this);
         return popResult();
     }
 
     inline void accept(AST::Node *node)
     {
-        if (!hasError && node)
+        if (!hasError() && node)
             node->accept(this);
     }
 
@@ -662,8 +671,16 @@ protected:
     }
 
 public:
-    QList<DiagnosticMessage> errors() const;
-    QList<QQmlError> qmlErrors() const;
+    enum ErrorType {
+        NoError,
+        SyntaxError,
+        ReferenceError
+    };
+
+    ErrorType errorType() const { return _errorType; }
+    bool hasError() const { return _errorType != NoError; }
+    DiagnosticMessage error() const;
+    QUrl url() const;
 
     Reference binopHelper(QSOperator::Op oper, Reference &left, Reference &right);
     Reference jumpBinop(QSOperator::Op oper, Reference &left, Reference &right);
@@ -716,6 +733,7 @@ protected:
     inline void setExprResult(const Reference &result) { m_expressions.back().setResult(result); }
     inline void setExprResult(Reference &&result) { m_expressions.back().setResult(std::move(result)); }
     inline Reference exprResult() const { return m_expressions.back().result(); }
+    inline void clearExprResultName() { m_expressions.back().clearResultName(); }
 
     inline bool exprAccept(Format f) { return m_expressions.back().accept(f); }
 
@@ -723,7 +741,7 @@ protected:
 
     inline void pushExpr(Result &&expr) { m_expressions.push_back(std::move(expr)); }
     inline void pushExpr(const Result &expr) { m_expressions.push_back(expr); }
-    inline void pushExpr() { m_expressions.emplace_back(); }
+    inline void pushExpr(const QString &name = QString()) { m_expressions.emplace_back(name); }
 
     inline Result popExpr()
     {
@@ -760,8 +778,8 @@ protected:
     ControlFlow *controlFlow = nullptr;
 
     bool _fileNameIsUrl;
-    bool hasError;
-    QList<QQmlJS::DiagnosticMessage> _errors;
+    ErrorType _errorType = NoError;
+    QQmlJS::DiagnosticMessage _error;
 
     class TailCallBlocker
     {
@@ -790,6 +808,7 @@ protected:
 private:
     VolatileMemoryLocations scanVolatileMemoryLocations(AST::Node *ast);
     void handleConstruct(const Reference &base, AST::ArgumentList *args);
+    void throwError(ErrorType errorType, const AST::SourceLocation &loc, const QString &detail);
 };
 
 }