Simplify parsing of pragma directives

We only support 'pragma Singleton' currently, so there is no need
to parse the right hand side of pragma as a member expression.

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

3 files changed, 2 insertions, 9 deletions

diff --git a/src/qml/compiler/qqmlirbuilder.cpp b/src/qml/compiler/qqmlirbuilder.cpp
index e9685597f6..ed3b55c2c6 100644
--- a/src/qml/compiler/qqmlirbuilder.cpp
+++ b/src/qml/compiler/qqmlirbuilder.cpp
@@ -691,9 +691,9 @@ bool IRBuilder::visit(QQmlJS::AST::UiPragma *node)
     Pragma *pragma = New<Pragma>();
 
     // For now the only valid pragma is Singleton, so lets validate the input
-    if (!node->pragmaType->name.isNull())
+    if (!node->name.isNull())
     {
-        if (QLatin1String("Singleton") == node->pragmaType->name)
+        if (QLatin1String("Singleton") == node->name)
         {
             pragma->type = Pragma::PragmaSingleton;
         } else {
diff --git a/src/qml/compiler/qv4codegen.cpp b/src/qml/compiler/qv4codegen.cpp
index c81ea09cce..30a73d31bd 100644
--- a/src/qml/compiler/qv4codegen.cpp
+++ b/src/qml/compiler/qv4codegen.cpp
@@ -806,12 +806,6 @@ bool Codegen::visit(UiQualifiedId *)
     return false;
 }
 
-bool Codegen::visit(UiQualifiedPragmaId *)
-{
-    Q_UNREACHABLE();
-    return false;
-}
-
 bool Codegen::visit(VariableDeclarationList *)
 {
     Q_UNREACHABLE();
diff --git a/src/qml/compiler/qv4codegen_p.h b/src/qml/compiler/qv4codegen_p.h
index 337c4dbfe3..92f8b0b13d 100644
--- a/src/qml/compiler/qv4codegen_p.h
+++ b/src/qml/compiler/qv4codegen_p.h
@@ -570,7 +570,6 @@ protected:
     bool visit(AST::UiParameterList *ast) override;
     bool visit(AST::UiProgram *ast) override;
     bool visit(AST::UiQualifiedId *ast) override;
-    bool visit(AST::UiQualifiedPragmaId *ast) override;
     bool visit(AST::VariableDeclarationList *ast) override;
 
     bool visit(AST::PatternElement *ast) override;