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>

8 files changed, 14 insertions, 105 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;
diff --git a/src/qml/parser/qqmljs.g b/src/qml/parser/qqmljs.g
index db583ff82c..2a5970364b 100644
--- a/src/qml/parser/qqmljs.g
+++ b/src/qml/parser/qqmljs.g
@@ -314,7 +314,6 @@ public:
       AST::UiObjectMemberList *UiObjectMemberList;
       AST::UiArrayMemberList *UiArrayMemberList;
       AST::UiQualifiedId *UiQualifiedId;
-      AST::UiQualifiedPragmaId *UiQualifiedPragmaId;
       AST::UiEnumMemberList *UiEnumMemberList;
     };
 
@@ -398,7 +397,6 @@ protected:
     { return location_stack [tos + index - 1]; }
 
     AST::UiQualifiedId *reparseAsQualifiedId(AST::ExpressionNode *expr);
-    AST::UiQualifiedPragmaId *reparseAsQualifiedPragmaId(AST::ExpressionNode *expr);
 
     void pushToken(int token);
     int lookaheadToken(Lexer *lexer);
@@ -551,18 +549,6 @@ AST::UiQualifiedId *Parser::reparseAsQualifiedId(AST::ExpressionNode *expr)
     return 0;
 }
 
-AST::UiQualifiedPragmaId *Parser::reparseAsQualifiedPragmaId(AST::ExpressionNode *expr)
-{
-    if (AST::IdentifierExpression *idExpr = AST::cast<AST::IdentifierExpression *>(expr)) {
-        AST::UiQualifiedPragmaId *q = new (pool) AST::UiQualifiedPragmaId(idExpr->name);
-        q->identifierToken = idExpr->identifierToken;
-
-        return q->finish();
-    }
-
-    return 0;
-}
-
 void Parser::pushToken(int token)
 {
     last_token->token = yytoken;
@@ -768,18 +754,21 @@ UiHeaderItemList: UiHeaderItemList UiImport;
     } break;
 ./
 
-PragmaId: MemberExpression;
-
-ImportId: MemberExpression;
+PragmaId: JsIdentifier;
 
-UiPragma: UiPragmaHead T_AUTOMATIC_SEMICOLON;
-UiPragma: UiPragmaHead T_SEMICOLON;
+UiPragma: T_PRAGMA PragmaId T_AUTOMATIC_SEMICOLON;
+UiPragma: T_PRAGMA PragmaId T_SEMICOLON;
 /.
     case $rule_number: {
-        sym(1).UiPragma->semicolonToken = loc(2);
+        AST::UiPragma *pragma = new (pool) AST::UiPragma(stringRef(2));
+        pragma->pragmaToken = loc(1);
+        pragma->semicolonToken = loc(3);
+        sym(1).Node = pragma;
     } break;
 ./
 
+ImportId: MemberExpression;
+
 UiImport: UiImportHead T_AUTOMATIC_SEMICOLON;
 UiImport: UiImportHead T_SEMICOLON;
 /.
@@ -820,28 +809,6 @@ UiImport: UiImportHead T_AS QmlIdentifier T_SEMICOLON;
     } break;
 ./
 
-UiPragmaHead: T_PRAGMA PragmaId;
-/.
-    case $rule_number: {
-        AST::UiPragma *node = 0;
-
-        if (AST::UiQualifiedPragmaId *qualifiedId = reparseAsQualifiedPragmaId(sym(2).Expression))
-            node = new (pool) AST::UiPragma(qualifiedId);
-
-        sym(1).Node = node;
-
-        if (node) {
-            node->pragmaToken = loc(1);
-        } else {
-           diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, loc(1),
-             QLatin1String("Expected a qualified name id")));
-
-            return false; // ### remove me
-        }
-    } break;
-./
-
-
 UiImportHead: T_IMPORT ImportId;
 /.
     case $rule_number: {
diff --git a/src/qml/parser/qqmljsast.cpp b/src/qml/parser/qqmljsast.cpp
index 73b6131d52..f43956814a 100644
--- a/src/qml/parser/qqmljsast.cpp
+++ b/src/qml/parser/qqmljsast.cpp
@@ -1304,18 +1304,9 @@ void UiImport::accept0(Visitor *visitor)
     visitor->endVisit(this);
 }
 
-void UiQualifiedPragmaId::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-    }
-
-    visitor->endVisit(this);
-}
-
 void UiPragma::accept0(Visitor *visitor)
 {
     if (visitor->visit(this)) {
-        accept(pragmaType, visitor);
     }
 
     visitor->endVisit(this);
diff --git a/src/qml/parser/qqmljsast_p.h b/src/qml/parser/qqmljsast_p.h
index ed4523b019..4d161e9e51 100644
--- a/src/qml/parser/qqmljsast_p.h
+++ b/src/qml/parser/qqmljsast_p.h
@@ -248,7 +248,6 @@ public:
         Kind_UiParameterList,
         Kind_UiPublicMember,
         Kind_UiQualifiedId,
-        Kind_UiQualifiedPragmaId,
         Kind_UiScriptBinding,
         Kind_UiSourceElement,
         Kind_UiHeaderItemList,
@@ -2926,51 +2925,13 @@ public:
     UiObjectMember *member;
 };
 
-class QML_PARSER_EXPORT UiQualifiedPragmaId: public Node
-{
-public:
-    QQMLJS_DECLARE_AST_NODE(UiQualifiedPragmaId)
-
-    UiQualifiedPragmaId(const QStringRef &name)
-        : next(this), name(name)
-    { kind = K; }
-
-    UiQualifiedPragmaId(UiQualifiedPragmaId *previous, const QStringRef &name)
-        : name(name)
-    {
-        kind = K;
-        next = previous->next;
-        previous->next = this;
-    }
-
-    UiQualifiedPragmaId *finish()
-    {
-        UiQualifiedPragmaId *head = next;
-        next = nullptr;
-        return head;
-    }
-
-    void accept0(Visitor *visitor) override;
-
-    SourceLocation firstSourceLocation() const override
-    { return identifierToken; }
-
-    SourceLocation lastSourceLocation() const override
-    { return next ? next->lastSourceLocation() : identifierToken; }
-
-// attributes
-    UiQualifiedPragmaId *next;
-    QStringRef name;
-    SourceLocation identifierToken;
-};
-
 class QML_PARSER_EXPORT UiPragma: public Node
 {
 public:
     QQMLJS_DECLARE_AST_NODE(UiPragma)
 
-    UiPragma(UiQualifiedPragmaId *type)
-        : pragmaType(type)
+    UiPragma(QStringRef name)
+        : name(name)
     { kind = K; }
 
     void accept0(Visitor *visitor) override;
@@ -2982,7 +2943,7 @@ public:
     { return semicolonToken; }
 
 // attributes
-    UiQualifiedPragmaId *pragmaType;
+    QStringRef name;
     SourceLocation pragmaToken;
     SourceLocation semicolonToken;
 };
diff --git a/src/qml/parser/qqmljsastfwd_p.h b/src/qml/parser/qqmljsastfwd_p.h
index ce8ff8bfab..f94ec1dbff 100644
--- a/src/qml/parser/qqmljsastfwd_p.h
+++ b/src/qml/parser/qqmljsastfwd_p.h
@@ -196,7 +196,6 @@ class UiObjectMember;
 class UiObjectMemberList;
 class UiArrayMemberList;
 class UiQualifiedId;
-class UiQualifiedPragmaId;
 class UiHeaderItemList;
 class UiEnumDeclaration;
 class UiEnumMemberList;
diff --git a/src/qml/parser/qqmljsastvisitor_p.h b/src/qml/parser/qqmljsastvisitor_p.h
index 21a2bc6019..3162bb1630 100644
--- a/src/qml/parser/qqmljsastvisitor_p.h
+++ b/src/qml/parser/qqmljsastvisitor_p.h
@@ -83,7 +83,6 @@ public:
     virtual bool visit(UiObjectMemberList *) { return true; }
     virtual bool visit(UiArrayMemberList *) { return true; }
     virtual bool visit(UiQualifiedId *) { return true; }
-    virtual bool visit(UiQualifiedPragmaId *) { return true; }
     virtual bool visit(UiEnumDeclaration *) { return true; }
     virtual bool visit(UiEnumMemberList *) { return true; }
 
@@ -102,7 +101,6 @@ public:
     virtual void endVisit(UiObjectMemberList *) {}
     virtual void endVisit(UiArrayMemberList *) {}
     virtual void endVisit(UiQualifiedId *) {}
-    virtual void endVisit(UiQualifiedPragmaId *) {}
     virtual void endVisit(UiEnumDeclaration *) {}
     virtual void endVisit(UiEnumMemberList *) { }