Move AST -> CompiledData location transformation to scan functions

That's the only place where we use it and this way we can remove the AST
dependency from the compiled data.

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

3 files changed, 18 insertions, 19 deletions

diff --git a/src/qml/compiler/qv4compileddata.cpp b/src/qml/compiler/qv4compileddata.cpp
index 813868b0ae..ee413a906d 100644
--- a/src/qml/compiler/qv4compileddata.cpp
+++ b/src/qml/compiler/qv4compileddata.cpp
@@ -269,13 +269,6 @@ bool Unit::verifyHeader(QDateTime expectedSourceTimeStamp, QString *errorString)
     return true;
 }
 
-Location &Location::operator=(const QQmlJS::AST::SourceLocation &astLocation)
-{
-    line = astLocation.startLine;
-    column = astLocation.startColumn;
-    return *this;
-}
-
 }
 
 }
diff --git a/src/qml/compiler/qv4compileddata_p.h b/src/qml/compiler/qv4compileddata_p.h
index 63738d6002..cbc350a723 100644
--- a/src/qml/compiler/qv4compileddata_p.h
+++ b/src/qml/compiler/qv4compileddata_p.h
@@ -63,7 +63,6 @@
 #include <private/qv4identifier_p.h>
 #include <private/qflagpointer_p.h>
 #include <private/qendian_p.h>
-#include <private/qqmljsastfwd_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -128,8 +127,6 @@ struct Location
 
     Location() : _dummy(0) { }
 
-    Location &operator=(const QQmlJS::AST::SourceLocation &astLocation);
-
     inline bool operator<(const Location &other) const {
         return line < other.line ||
                (line == other.line && column < other.column);
diff --git a/src/qml/compiler/qv4compilerscanfunctions.cpp b/src/qml/compiler/qv4compilerscanfunctions.cpp
index f6c79ae42b..416a0edee0 100644
--- a/src/qml/compiler/qv4compilerscanfunctions.cpp
+++ b/src/qml/compiler/qv4compilerscanfunctions.cpp
@@ -54,6 +54,15 @@ using namespace QV4;
 using namespace QV4::Compiler;
 using namespace QQmlJS::AST;
 
+static CompiledData::Location location(const QQmlJS::AST::SourceLocation &astLocation)
+{
+    CompiledData::Location target;
+    target.line = astLocation.startLine;
+    target.column = astLocation.startColumn;
+    return target;
+}
+
+
 ScanFunctions::ScanFunctions(Codegen *cg, const QString &sourceCode, ContextType defaultProgramType)
     : QQmlJS::AST::Visitor(cg->recursionDepth())
     , _cg(cg)
@@ -175,7 +184,7 @@ bool ScanFunctions::visit(ExportDeclaration *declaration)
         Compiler::ExportEntry entry;
         entry.moduleRequest = declaration->fromClause->moduleSpecifier.toString();
         entry.importName = QStringLiteral("*");
-        entry.location = declaration->firstSourceLocation();
+        entry.location = location(declaration->firstSourceLocation());
         _context->exportEntries << entry;
     } else if (declaration->exportClause) {
         for (ExportsList *it = declaration->exportClause->exportsList; it; it = it->next) {
@@ -188,7 +197,7 @@ bool ScanFunctions::visit(ExportDeclaration *declaration)
 
             entry.moduleRequest = module;
             entry.exportName = spec->exportedIdentifier.toString();
-            entry.location = it->firstSourceLocation();
+            entry.location = location(it->firstSourceLocation());
 
             _context->exportEntries << entry;
         }
@@ -203,7 +212,7 @@ bool ScanFunctions::visit(ExportDeclaration *declaration)
             Compiler::ExportEntry entry;
             entry.localName = name;
             entry.exportName = name;
-            entry.location = vstmt->firstSourceLocation();
+            entry.location = location(vstmt->firstSourceLocation());
             _context->exportEntries << entry;
         }
     } else if (auto *classDecl = AST::cast<AST::ClassDeclaration*>(declaration->variableStatementOrDeclaration)) {
@@ -212,7 +221,7 @@ bool ScanFunctions::visit(ExportDeclaration *declaration)
             Compiler::ExportEntry entry;
             entry.localName = name;
             entry.exportName = name;
-            entry.location = classDecl->firstSourceLocation();
+            entry.location = location(classDecl->firstSourceLocation());
             _context->exportEntries << entry;
             if (declaration->exportDefault)
                 localNameForDefaultExport = entry.localName;
@@ -231,7 +240,7 @@ bool ScanFunctions::visit(ExportDeclaration *declaration)
             Compiler::ExportEntry entry;
             entry.localName = functionName;
             entry.exportName = functionName;
-            entry.location = fdef->firstSourceLocation();
+            entry.location = location(fdef->firstSourceLocation());
             _context->exportEntries << entry;
             if (declaration->exportDefault)
                 localNameForDefaultExport = entry.localName;
@@ -243,7 +252,7 @@ bool ScanFunctions::visit(ExportDeclaration *declaration)
         entry.localName = localNameForDefaultExport;
         _context->localNameForDefaultExport = localNameForDefaultExport;
         entry.exportName = QStringLiteral("default");
-        entry.location = declaration->firstSourceLocation();
+        entry.location = location(declaration->firstSourceLocation());
         _context->exportEntries << entry;
     }
 
@@ -268,7 +277,7 @@ bool ScanFunctions::visit(ImportDeclaration *declaration)
             entry.moduleRequest = module;
             entry.importName = QStringLiteral("default");
             entry.localName = import->importedDefaultBinding.toString();
-            entry.location = declaration->firstSourceLocation();
+            entry.location = location(declaration->firstSourceLocation());
             _context->importEntries << entry;
         }
 
@@ -277,7 +286,7 @@ bool ScanFunctions::visit(ImportDeclaration *declaration)
             entry.moduleRequest = module;
             entry.importName = QStringLiteral("*");
             entry.localName = import->nameSpaceImport->importedBinding.toString();
-            entry.location = declaration->firstSourceLocation();
+            entry.location = location(declaration->firstSourceLocation());
             _context->importEntries << entry;
         }
 
@@ -290,7 +299,7 @@ bool ScanFunctions::visit(ImportDeclaration *declaration)
                     entry.importName = it->importSpecifier->identifier.toString();
                 else
                     entry.importName = entry.localName;
-                entry.location = declaration->firstSourceLocation();
+                entry.location = location(declaration->firstSourceLocation());
                 _context->importEntries << entry;
             }
         }