diff options
Diffstat (limited to 'src/libs/qmljs/parser/qmljsast_p.h')
| -rw-r--r-- | src/libs/qmljs/parser/qmljsast_p.h | 582 |
1 files changed, 297 insertions, 285 deletions
diff --git a/src/libs/qmljs/parser/qmljsast_p.h b/src/libs/qmljs/parser/qmljsast_p.h index a05a363496..0a06dace61 100644 --- a/src/libs/qmljs/parser/qmljsast_p.h +++ b/src/libs/qmljs/parser/qmljsast_p.h @@ -238,7 +238,7 @@ class QML_PARSER_EXPORT ExpressionNode: public Node public: ExpressionNode() {} - virtual ExpressionNode *expressionCast(); + ExpressionNode *expressionCast() override; }; class QML_PARSER_EXPORT Statement: public Node @@ -246,7 +246,7 @@ class QML_PARSER_EXPORT Statement: public Node public: Statement() {} - virtual Statement *statementCast(); + Statement *statementCast() override; }; class QML_PARSER_EXPORT NestedExpression: public ExpressionNode @@ -258,12 +258,12 @@ public: : expression(expression) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return lparenToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return rparenToken; } // attributes @@ -279,12 +279,12 @@ public: ThisExpression() { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return thisToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return thisToken; } // attributes @@ -299,12 +299,12 @@ public: IdentifierExpression(const QStringRef &n): name (n) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return identifierToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return identifierToken; } // attributes @@ -319,12 +319,12 @@ public: NullExpression() { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return nullToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return nullToken; } // attributes @@ -338,12 +338,12 @@ public: TrueLiteral() { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return trueToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return trueToken; } // attributes @@ -357,12 +357,12 @@ public: FalseLiteral() { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return falseToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return falseToken; } // attributes @@ -377,12 +377,12 @@ public: NumericLiteral(double v): value(v) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return literalToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return literalToken; } // attributes: @@ -398,12 +398,12 @@ public: StringLiteral(const QStringRef &v): value (v) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return literalToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return literalToken; } // attributes: @@ -419,12 +419,12 @@ public: RegExpLiteral(const QStringRef &p, int f): pattern (p), flags (f) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return literalToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return literalToken; } // attributes: @@ -450,12 +450,12 @@ public: elements (elts), elision (e) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return lbracketToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return rbracketToken; } // attributes @@ -477,12 +477,12 @@ public: ObjectLiteral(PropertyAssignmentList *plist): properties (plist) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return lbraceToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return rbraceToken; } // attributes @@ -506,12 +506,12 @@ public: previous->next = this; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return commaToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return next ? next->lastSourceLocation() : commaToken; } inline Elision *finish () @@ -550,16 +550,16 @@ public: return front; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { if (elision) return elision->firstSourceLocation(); return expression->firstSourceLocation(); } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { if (next) return next->lastSourceLocation(); @@ -580,10 +580,10 @@ public: PropertyName() { kind = K; } - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return propertyNameToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return propertyNameToken; } virtual QString asString() const = 0; @@ -627,12 +627,12 @@ public: return front; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return assignment->firstSourceLocation(); } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return next ? next->lastSourceLocation() : assignment->lastSourceLocation(); } // attributes @@ -650,12 +650,12 @@ public: : PropertyAssignment(n), value(v) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return name->firstSourceLocation(); } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return value->lastSourceLocation(); } // attributes @@ -682,12 +682,12 @@ public: : PropertyAssignment(n), type(Setter), formals(f), functionBody (b) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return getSetToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return rbraceToken; } // attributes @@ -709,9 +709,9 @@ public: IdentifierPropertyName(const QStringRef &n): id (n) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual QString asString() const { return id.toString(); } + QString asString() const override { return id.toString(); } // attributes QStringRef id; @@ -725,9 +725,9 @@ public: StringLiteralPropertyName(const QStringRef &n): id (n) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual QString asString() const { return id.toString(); } + QString asString() const override { return id.toString(); } // attributes QStringRef id; @@ -741,9 +741,9 @@ public: NumericLiteralPropertyName(double n): id (n) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual QString asString() const { return QString::number(id, 'g', 16); } + QString asString() const override { return QString::number(id, 'g', 16); } // attributes double id; @@ -758,12 +758,12 @@ public: base (b), expression (e) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return base->firstSourceLocation(); } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return rbracketToken; } // attributes @@ -782,12 +782,12 @@ public: base (b), name (n) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return base->firstSourceLocation(); } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return identifierToken; } // attributes @@ -806,12 +806,12 @@ public: base (b), arguments (a) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return newToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return rparenToken; } // attributes @@ -830,12 +830,12 @@ public: NewExpression(ExpressionNode *e): expression (e) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return newToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return expression->lastSourceLocation(); } // attributes @@ -852,12 +852,12 @@ public: base (b), arguments (a) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return base->firstSourceLocation(); } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return rparenToken; } // attributes @@ -884,12 +884,12 @@ public: previous->next = this; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return expression->firstSourceLocation(); } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { if (next) return next->lastSourceLocation(); @@ -917,12 +917,12 @@ public: PostIncrementExpression(ExpressionNode *b): base (b) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return base->firstSourceLocation(); } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return incrementToken; } // attributes @@ -938,12 +938,12 @@ public: PostDecrementExpression(ExpressionNode *b): base (b) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return base->firstSourceLocation(); } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return decrementToken; } // attributes @@ -959,12 +959,12 @@ public: DeleteExpression(ExpressionNode *e): expression (e) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return deleteToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return expression->lastSourceLocation(); } // attributes @@ -980,12 +980,12 @@ public: VoidExpression(ExpressionNode *e): expression (e) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return voidToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return expression->lastSourceLocation(); } // attributes @@ -1001,12 +1001,12 @@ public: TypeOfExpression(ExpressionNode *e): expression (e) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return typeofToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return expression->lastSourceLocation(); } // attributes @@ -1022,12 +1022,12 @@ public: PreIncrementExpression(ExpressionNode *e): expression (e) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return incrementToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return expression->lastSourceLocation(); } // attributes @@ -1043,12 +1043,12 @@ public: PreDecrementExpression(ExpressionNode *e): expression (e) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return decrementToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return expression->lastSourceLocation(); } // attributes @@ -1064,12 +1064,12 @@ public: UnaryPlusExpression(ExpressionNode *e): expression (e) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return plusToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return expression->lastSourceLocation(); } // attributes @@ -1085,12 +1085,12 @@ public: UnaryMinusExpression(ExpressionNode *e): expression (e) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return minusToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return expression->lastSourceLocation(); } // attributes @@ -1106,12 +1106,12 @@ public: TildeExpression(ExpressionNode *e): expression (e) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return tildeToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return expression->lastSourceLocation(); } // attributes @@ -1127,12 +1127,12 @@ public: NotExpression(ExpressionNode *e): expression (e) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return notToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return expression->lastSourceLocation(); } // attributes @@ -1149,14 +1149,14 @@ public: left (l), op (o), right (r) { kind = K; } - virtual BinaryExpression *binaryExpressionCast(); + BinaryExpression *binaryExpressionCast() override; - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return left->firstSourceLocation(); } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return right->lastSourceLocation(); } // attributes @@ -1175,12 +1175,12 @@ public: expression (e), ok (t), ko (f) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return expression->firstSourceLocation(); } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return ko->lastSourceLocation(); } // attributes @@ -1199,12 +1199,12 @@ public: Expression(ExpressionNode *l, ExpressionNode *r): left (l), right (r) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return left->firstSourceLocation(); } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return right->lastSourceLocation(); } // attributes @@ -1221,12 +1221,12 @@ public: Block(StatementList *slist): statements (slist) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return lbraceToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return rbraceToken; } // attributes @@ -1252,12 +1252,12 @@ public: previous->next = this; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return statement->firstSourceLocation(); } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return next ? next->lastSourceLocation() : statement->lastSourceLocation(); } inline StatementList *finish () @@ -1281,12 +1281,12 @@ public: declarations (vlist) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return declarationKindToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return semicolonToken; } // attributes @@ -1304,12 +1304,12 @@ public: name (n), expression (e), readOnly(false) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return identifierToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return expression ? expression->lastSourceLocation() : identifierToken; } // attributes @@ -1336,12 +1336,12 @@ public: previous->next = this; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return declaration->firstSourceLocation(); } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { if (next) return next->lastSourceLocation(); @@ -1373,12 +1373,12 @@ public: EmptyStatement() { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return semicolonToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return semicolonToken; } // attributes @@ -1393,12 +1393,12 @@ public: ExpressionStatement(ExpressionNode *e): expression (e) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return expression->firstSourceLocation(); } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return semicolonToken; } // attributes @@ -1415,12 +1415,12 @@ public: expression (e), ok (t), ko (f) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return ifToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { if (ko) return ko->lastSourceLocation(); @@ -1447,12 +1447,12 @@ public: statement (stmt), expression (e) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return doToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return semicolonToken; } // attributes @@ -1474,12 +1474,12 @@ public: expression (e), statement (stmt) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return whileToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return statement->lastSourceLocation(); } // attributes @@ -1499,12 +1499,12 @@ public: initialiser (i), condition (c), expression (e), statement (stmt) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return forToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return statement->lastSourceLocation(); } // attributes @@ -1528,12 +1528,12 @@ public: declarations (vlist), condition (c), expression (e), statement (stmt) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return forToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return statement->lastSourceLocation(); } // attributes @@ -1558,12 +1558,12 @@ public: initialiser (i), expression (e), statement (stmt) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return forToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return statement->lastSourceLocation(); } // attributes @@ -1585,12 +1585,12 @@ public: declaration (v), expression (e), statement (stmt) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return forToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return statement->lastSourceLocation(); } // attributes @@ -1612,12 +1612,12 @@ public: ContinueStatement(const QStringRef &l = QStringRef()): label (l) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return continueToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return semicolonToken; } // attributes @@ -1635,12 +1635,12 @@ public: BreakStatement(const QStringRef &l): label (l) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return breakToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return semicolonToken; } // attributes @@ -1658,12 +1658,12 @@ public: ReturnStatement(ExpressionNode *e): expression (e) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return returnToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return semicolonToken; } // attributes @@ -1681,12 +1681,12 @@ public: expression (e), statement (stmt) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return withToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return statement->lastSourceLocation(); } // attributes @@ -1706,12 +1706,12 @@ public: clauses (c), defaultClause (d), moreClauses (r) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return lbraceToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return rbraceToken; } // attributes @@ -1731,12 +1731,12 @@ public: expression (e), block (b) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return switchToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return block->rbraceToken; } // attributes @@ -1756,12 +1756,12 @@ public: expression (e), statements (slist) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return caseToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return statements ? statements->lastSourceLocation() : colonToken; } // attributes @@ -1788,12 +1788,12 @@ public: previous->next = this; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return clause->firstSourceLocation(); } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return next ? next->lastSourceLocation() : clause->lastSourceLocation(); } inline CaseClauses *finish () @@ -1817,12 +1817,12 @@ public: statements (slist) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return defaultToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return statements ? statements->lastSourceLocation() : colonToken; } // attributes @@ -1840,12 +1840,12 @@ public: label (l), statement (stmt) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return identifierToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return statement->lastSourceLocation(); } // attributes @@ -1863,12 +1863,12 @@ public: ThrowStatement(ExpressionNode *e): expression (e) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return throwToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return semicolonToken; } // attributes @@ -1886,12 +1886,12 @@ public: name (n), statement (stmt) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return catchToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return statement->lastSourceLocation(); } // attributes @@ -1912,12 +1912,12 @@ public: statement (stmt) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return finallyToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return statement ? statement->lastSourceLocation() : finallyToken; } // attributes @@ -1942,12 +1942,12 @@ public: statement (stmt), catchExpression (c), finallyExpression (0) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return tryToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { if (finallyExpression) return finallyExpression->statement->rbraceToken; @@ -1973,12 +1973,12 @@ public: name (n), formals (f), body (b) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return functionToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return rbraceToken; } // attributes @@ -2002,7 +2002,7 @@ public: FunctionExpression(n, f, b) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; }; class QML_PARSER_EXPORT FormalParameterList: public Node @@ -2022,12 +2022,12 @@ public: previous->next = this; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return identifierToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return next ? next->lastSourceLocation() : identifierToken; } inline FormalParameterList *finish () @@ -2070,12 +2070,12 @@ public: previous->next = this; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return element->firstSourceLocation(); } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return next ? next->lastSourceLocation() : element->lastSourceLocation(); } inline SourceElements *finish () @@ -2099,12 +2099,12 @@ public: elements (elts) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return elements ? elements->firstSourceLocation() : SourceLocation(); } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return elements ? elements->lastSourceLocation() : SourceLocation(); } // attributes @@ -2120,12 +2120,12 @@ public: elements (elts) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return elements ? elements->firstSourceLocation() : SourceLocation(); } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return elements ? elements->lastSourceLocation() : SourceLocation(); } // attributes @@ -2141,12 +2141,12 @@ public: declaration (f) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return declaration->firstSourceLocation(); } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return declaration->lastSourceLocation(); } // attributes @@ -2162,12 +2162,12 @@ public: statement (stmt) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return statement->firstSourceLocation(); } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return statement->lastSourceLocation(); } // attributes @@ -2182,12 +2182,12 @@ public: DebuggerStatement() { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return debuggerToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return semicolonToken; } // attributes @@ -2219,12 +2219,12 @@ public: return head; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return identifierToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return next ? next->lastSourceLocation() : identifierToken; } // attributes @@ -2246,12 +2246,12 @@ public: : importUri(uri) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return importToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return semicolonToken; } // attributes @@ -2269,10 +2269,10 @@ public: class QML_PARSER_EXPORT UiObjectMember: public Node { public: - virtual SourceLocation firstSourceLocation() const = 0; - virtual SourceLocation lastSourceLocation() const = 0; + SourceLocation firstSourceLocation() const override = 0; + SourceLocation lastSourceLocation() const override = 0; - virtual UiObjectMember *uiObjectMemberCast(); + UiObjectMember *uiObjectMemberCast() override; }; class QML_PARSER_EXPORT UiObjectMemberList: public Node @@ -2292,12 +2292,12 @@ public: previous->next = this; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return member->firstSourceLocation(); } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return next ? next->lastSourceLocation() : member->lastSourceLocation(); } UiObjectMemberList *finish() @@ -2336,12 +2336,12 @@ public: return head; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return identifierToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return next ? next->lastSourceLocation() : identifierToken; } // attributes @@ -2359,12 +2359,12 @@ public: : pragmaType(type) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return pragmaToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return semicolonToken; } // attributes @@ -2409,12 +2409,12 @@ public: return head; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return headerItem->firstSourceLocation(); } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return next ? next->lastSourceLocation() : headerItem->lastSourceLocation(); } // attributes @@ -2431,9 +2431,9 @@ public: : headers(headers), members(members) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { if (headers) return headers->firstSourceLocation(); @@ -2442,7 +2442,7 @@ public: return SourceLocation(); } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { if (members) return members->lastSourceLocation(); @@ -2473,12 +2473,12 @@ public: previous->next = this; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return member->firstSourceLocation(); } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return next ? next->lastSourceLocation() : member->lastSourceLocation(); } UiArrayMemberList *finish() @@ -2503,12 +2503,12 @@ public: : members(members) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return lbraceToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return rbraceToken; } // attributes @@ -2522,11 +2522,11 @@ class QML_PARSER_EXPORT UiParameterList: public Node public: QMLJS_DECLARE_AST_NODE(UiParameterList) - UiParameterList(const QStringRef &t, const QStringRef &n): + UiParameterList(UiQualifiedId *t, const QStringRef &n): type (t), name (n), next (this) { kind = K; } - UiParameterList(UiParameterList *previous, const QStringRef &t, const QStringRef &n): + UiParameterList(UiParameterList *previous, UiQualifiedId *t, const QStringRef &n): type (t), name (n) { kind = K; @@ -2534,12 +2534,12 @@ public: previous->next = this; } - virtual void accept0(Visitor *); + void accept0(Visitor *) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return propertyTypeToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return next ? next->lastSourceLocation() : identifierToken; } inline UiParameterList *finish () @@ -2550,7 +2550,7 @@ public: } // attributes - QStringRef type; + UiQualifiedId *type; QStringRef name; UiParameterList *next; SourceLocation commaToken; @@ -2563,20 +2563,20 @@ class QML_PARSER_EXPORT UiPublicMember: public UiObjectMember public: QMLJS_DECLARE_AST_NODE(UiPublicMember) - UiPublicMember(const QStringRef &memberType, + UiPublicMember(UiQualifiedId *memberType, const QStringRef &name) : type(Property), memberType(memberType), name(name), statement(0), binding(0), isDefaultMember(false), isReadonlyMember(false), parameters(0) { kind = K; } - UiPublicMember(const QStringRef &memberType, + UiPublicMember(UiQualifiedId *memberType, const QStringRef &name, Statement *statement) : type(Property), memberType(memberType), name(name), statement(statement), binding(0), isDefaultMember(false), isReadonlyMember(false), parameters(0) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { if (defaultToken.isValid()) return defaultToken; @@ -2586,7 +2586,7 @@ public: return propertyToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { if (binding) return binding->lastSourceLocation(); @@ -2596,10 +2596,21 @@ public: return semicolonToken; } + QStringRef memberTypeName() const + { + return memberType ? memberType->name : QStringRef(); + } + + bool isValid() const + { + return memberType && !memberType->name.isNull() && !memberType->name.isEmpty(); + } + // attributes enum { Signal, Property } type; QStringRef typeModifier; - QStringRef memberType; + //QStringRef memberType; + UiQualifiedId *memberType; QStringRef name; Statement *statement; // initialized with a JS expression UiObjectMember *binding; // initialized with a QML object or array. @@ -2626,12 +2637,12 @@ public: : qualifiedTypeNameId(qualifiedTypeNameId), initializer(initializer) { kind = K; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return qualifiedTypeNameId->identifierToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return initializer->rbraceToken; } // attributes @@ -2648,7 +2659,7 @@ public: : sourceElement(sourceElement) { kind = K; } - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { if (FunctionDeclaration *funDecl = cast<FunctionDeclaration *>(sourceElement)) return funDecl->firstSourceLocation(); @@ -2658,7 +2669,7 @@ public: return SourceLocation(); } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { if (FunctionDeclaration *funDecl = cast<FunctionDeclaration *>(sourceElement)) return funDecl->lastSourceLocation(); @@ -2668,7 +2679,7 @@ public: return SourceLocation(); } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; // attributes @@ -2689,7 +2700,7 @@ public: hasOnToken(false) { kind = K; } - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { if (hasOnToken && qualifiedTypeNameId) return qualifiedTypeNameId->identifierToken; @@ -2697,10 +2708,10 @@ public: return qualifiedId->identifierToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return initializer->rbraceToken; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; // attributes @@ -2722,13 +2733,13 @@ public: statement(statement) { kind = K; } - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return qualifiedId->identifierToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return statement->lastSourceLocation(); } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; // attributes UiQualifiedId *qualifiedId; @@ -2747,13 +2758,13 @@ public: members(members) { kind = K; } - virtual SourceLocation firstSourceLocation() const + SourceLocation firstSourceLocation() const override { return qualifiedId->identifierToken; } - virtual SourceLocation lastSourceLocation() const + SourceLocation lastSourceLocation() const override { return rbracketToken; } - virtual void accept0(Visitor *visitor); + void accept0(Visitor *visitor) override; // attributes UiQualifiedId *qualifiedId; @@ -2768,3 +2779,4 @@ public: QT_QML_END_NAMESPACE + |