1 files changed, 8 insertions, 9 deletions
diff --git a/src/declarative/qml/parser/javascriptparser_p.h b/src/declarative/qml/parser/javascriptparser_p.h
index 497fae8..5e68fe7 100644
--- a/src/declarative/qml/parser/javascriptparser_p.h
+++ b/src/declarative/qml/parser/javascriptparser_p.h
@@ -119,10 +119,10 @@ public:
         enum Kind { Warning, Error };
 
         DiagnosticMessage()
-            : kind(Error), line(0), column(0) {}
+            : kind(Error) {}
 
-        DiagnosticMessage(Kind kind, int line, int column, const QString &message)
-            : kind(kind), line(line), column(column), message(message) {}
+        DiagnosticMessage(Kind kind, const JavaScript::AST::SourceLocation &loc, const QString &message)
+            : kind(kind), loc(loc), message(message) {}
 
         bool isWarning() const
         { return kind == Warning; }
@@ -131,8 +131,7 @@ public:
         { return kind == Error; }
 
         Kind kind;
-        int line;
-        int column;
+        JavaScript::AST::SourceLocation loc;
         QString message;
     };
 
@@ -162,10 +161,10 @@ public:
     { return diagnosticMessage().message; }
 
     inline int errorLineNumber() const
-    { return diagnosticMessage().line; }
+    { return diagnosticMessage().loc.startLine; }
 
     inline int errorColumnNumber() const
-    { return diagnosticMessage().column; }
+    { return diagnosticMessage().loc.startColumn; }
 
 protected:
     void reallocateStack();
@@ -206,9 +205,9 @@ protected:
 };
 
 
-#define J_SCRIPT_REGEXPLITERAL_RULE1 50
+#define J_SCRIPT_REGEXPLITERAL_RULE1 52
 
-#define J_SCRIPT_REGEXPLITERAL_RULE2 51
+#define J_SCRIPT_REGEXPLITERAL_RULE2 53
 
 QT_END_NAMESPACE