diff options
232 files changed, 2426 insertions, 2352 deletions
diff --git a/dist/changes-5.12.5 b/dist/changes-5.12.5 new file mode 100644 index 0000000..e8be931 --- /dev/null +++ b/dist/changes-5.12.5 @@ -0,0 +1,20 @@ +Qt 5.12.5 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.12.0 through 5.12.4. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +https://doc.qt.io/qt-5/index.html + +The Qt version 5.12 series is binary compatible with the 5.11.x series. +Applications compiled for 5.11 will continue to run with 5.12. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + + - This release contains only minor code improvements. diff --git a/dist/changes-5.13.1 b/dist/changes-5.13.1 new file mode 100644 index 0000000..57ebdbe --- /dev/null +++ b/dist/changes-5.13.1 @@ -0,0 +1,20 @@ +Qt 5.13.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.13.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +https://doc.qt.io/qt-5/index.html + +The Qt version 5.13 series is binary compatible with the 5.12.x series. +Applications compiled for 5.12 will continue to run with 5.13. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + + - This release contains only minor code improvements. diff --git a/src/xmlpatterns/acceltree/qacceliterators_p.h b/src/xmlpatterns/acceltree/qacceliterators_p.h index 0da7976..cc86965 100644 --- a/src/xmlpatterns/acceltree/qacceliterators_p.h +++ b/src/xmlpatterns/acceltree/qacceliterators_p.h @@ -66,8 +66,8 @@ namespace QPatternist class AccelIterator : public QXmlNodeModelIndex::Iterator { public: - virtual xsInteger position() const; - virtual QXmlNodeModelIndex current() const; + xsInteger position() const override; + QXmlNodeModelIndex current() const override; protected: inline AccelIterator(const AccelTree *const doc, @@ -124,7 +124,7 @@ namespace QPatternist Q_ASSERT(IncludeSelf || m_document->hasParent(pre)); } - virtual QXmlNodeModelIndex next() + QXmlNodeModelIndex next() override { if(m_currentPre == -1) return closedExit(); @@ -138,7 +138,7 @@ namespace QPatternist } } - virtual QXmlNodeModelIndex::Iterator::Ptr copy() const + QXmlNodeModelIndex::Iterator::Ptr copy() const override { return QXmlNodeModelIndex::Iterator::Ptr(new AncestorIterator<IncludeSelf>(m_document, m_preNumber)); } @@ -176,8 +176,8 @@ namespace QPatternist } } - virtual QXmlNodeModelIndex next(); - virtual QXmlNodeModelIndex::Iterator::Ptr copy() const; + QXmlNodeModelIndex next() override; + QXmlNodeModelIndex::Iterator::Ptr copy() const override; private: const AccelTree::Depth m_depth; @@ -202,7 +202,7 @@ namespace QPatternist "When being following-sibling, the context node cannot be the last node in the document."); } - virtual QXmlNodeModelIndex next() + QXmlNodeModelIndex next() override { if(m_currentPre == -1) return QXmlNodeModelIndex(); @@ -245,7 +245,7 @@ namespace QPatternist } } - virtual QXmlNodeModelIndex::Iterator::Ptr copy() const + QXmlNodeModelIndex::Iterator::Ptr copy() const override { return QXmlNodeModelIndex::Iterator::Ptr(new SiblingIterator<IsFollowing>(m_document, m_preNumber)); } @@ -292,7 +292,7 @@ namespace QPatternist } } - virtual QXmlNodeModelIndex next() + QXmlNodeModelIndex next() override { if(m_currentPre == -1) return closedExit(); @@ -326,7 +326,7 @@ namespace QPatternist return m_current; } - virtual QXmlNodeModelIndex::Iterator::Ptr copy() const + QXmlNodeModelIndex::Iterator::Ptr copy() const override { return QXmlNodeModelIndex::Iterator::Ptr(new DescendantIterator<IncludeSelf>(m_document, m_preNumber)); } @@ -351,8 +351,8 @@ namespace QPatternist { } - virtual QXmlNodeModelIndex next(); - virtual QXmlNodeModelIndex::Iterator::Ptr copy() const; + QXmlNodeModelIndex next() override; + QXmlNodeModelIndex::Iterator::Ptr copy() const override; }; /** @@ -373,8 +373,8 @@ namespace QPatternist { } - virtual QXmlNodeModelIndex next(); - virtual QXmlNodeModelIndex::Iterator::Ptr copy() const; + QXmlNodeModelIndex next() override; + QXmlNodeModelIndex::Iterator::Ptr copy() const override; private: const AccelTree::PreNumber m_postNumber; @@ -397,8 +397,8 @@ namespace QPatternist Q_ASSERT(m_document->kind(m_currentPre) == QXmlNodeModelIndex::Attribute); } - virtual QXmlNodeModelIndex next(); - virtual QXmlNodeModelIndex::Iterator::Ptr copy() const; + QXmlNodeModelIndex next() override; + QXmlNodeModelIndex::Iterator::Ptr copy() const override; }; } diff --git a/src/xmlpatterns/acceltree/qacceltree.cpp b/src/xmlpatterns/acceltree/qacceltree.cpp index 23503fe..62c23ad 100644 --- a/src/xmlpatterns/acceltree/qacceltree.cpp +++ b/src/xmlpatterns/acceltree/qacceltree.cpp @@ -64,7 +64,7 @@ namespace QPatternist { { } - virtual QSourceLocation sourceLocation(const QXmlNodeModelIndex &index) const + QSourceLocation sourceLocation(const QXmlNodeModelIndex &index) const override { return m_accelTree->sourceLocation(index); } diff --git a/src/xmlpatterns/acceltree/qacceltree_p.h b/src/xmlpatterns/acceltree/qacceltree_p.h index 91efd95..3a42657 100644 --- a/src/xmlpatterns/acceltree/qacceltree_p.h +++ b/src/xmlpatterns/acceltree/qacceltree_p.h @@ -215,11 +215,11 @@ namespace QPatternist QXmlNodeModelIndex::NodeKind m_kind : 8; }; - virtual QUrl baseUri(const QXmlNodeModelIndex &ni) const; - virtual QUrl documentUri(const QXmlNodeModelIndex &ni) const; - virtual QXmlNodeModelIndex::NodeKind kind(const QXmlNodeModelIndex &ni) const; - virtual QXmlNodeModelIndex::DocumentOrder compareOrder(const QXmlNodeModelIndex &ni1, - const QXmlNodeModelIndex &ni2) const; + QUrl baseUri(const QXmlNodeModelIndex &ni) const override; + QUrl documentUri(const QXmlNodeModelIndex &ni) const override; + QXmlNodeModelIndex::NodeKind kind(const QXmlNodeModelIndex &ni) const override; + QXmlNodeModelIndex::DocumentOrder compareOrder(const QXmlNodeModelIndex &ni1, + const QXmlNodeModelIndex &ni2) const override; /** * @short Returns the root node. @@ -227,24 +227,24 @@ namespace QPatternist * This function does not use @p n, so a default constructed * QXmlNodeModelIndex may be passed. */ - virtual QXmlNodeModelIndex root(const QXmlNodeModelIndex &n) const; + QXmlNodeModelIndex root(const QXmlNodeModelIndex &n) const override; virtual QXmlNodeModelIndex parent(const QXmlNodeModelIndex &ni) const; - virtual QXmlNodeModelIndex::Iterator::Ptr iterate(const QXmlNodeModelIndex &ni, - QXmlNodeModelIndex::Axis axis) const; - virtual QXmlName name(const QXmlNodeModelIndex &ni) const; - virtual QVector<QXmlName> namespaceBindings(const QXmlNodeModelIndex &n) const; - virtual void sendNamespaces(const QXmlNodeModelIndex &n, - QAbstractXmlReceiver *const receiver) const; - virtual QString stringValue(const QXmlNodeModelIndex &n) const; - virtual QVariant typedValue(const QXmlNodeModelIndex &n) const; - virtual Item::Iterator::Ptr sequencedTypedValue(const QXmlNodeModelIndex &n) const; - virtual ItemType::Ptr type(const QXmlNodeModelIndex &ni) const; - virtual QXmlNodeModelIndex elementById(const QXmlName &id) const; - virtual QVector<QXmlNodeModelIndex> nodesByIdref(const QXmlName &idref) const; - virtual void copyNodeTo(const QXmlNodeModelIndex &node, - QAbstractXmlReceiver *const receiver, - const NodeCopySettings &settings) const; + QXmlNodeModelIndex::Iterator::Ptr iterate(const QXmlNodeModelIndex &ni, + QXmlNodeModelIndex::Axis axis) const override; + QXmlName name(const QXmlNodeModelIndex &ni) const override; + QVector<QXmlName> namespaceBindings(const QXmlNodeModelIndex &n) const override; + void sendNamespaces(const QXmlNodeModelIndex &n, + QAbstractXmlReceiver *const receiver) const override; + QString stringValue(const QXmlNodeModelIndex &n) const override; + QVariant typedValue(const QXmlNodeModelIndex &n) const override; + Item::Iterator::Ptr sequencedTypedValue(const QXmlNodeModelIndex &n) const override; + ItemType::Ptr type(const QXmlNodeModelIndex &ni) const override; + QXmlNodeModelIndex elementById(const QXmlName &id) const override; + QVector<QXmlNodeModelIndex> nodesByIdref(const QXmlName &idref) const override; + void copyNodeTo(const QXmlNodeModelIndex &node, + QAbstractXmlReceiver *const receiver, + const NodeCopySettings &settings) const override; friend class AccelTreeBuilder<false>; friend class AccelTreeBuilder<true>; @@ -366,9 +366,9 @@ namespace QPatternist QUrl m_baseURI; protected: - virtual QXmlNodeModelIndex nextFromSimpleAxis(QAbstractXmlNodeModel::SimpleAxis, - const QXmlNodeModelIndex&) const; - virtual QVector<QXmlNodeModelIndex> attributes(const QXmlNodeModelIndex &element) const; + QXmlNodeModelIndex nextFromSimpleAxis(QAbstractXmlNodeModel::SimpleAxis, + const QXmlNodeModelIndex&) const override; + QVector<QXmlNodeModelIndex> attributes(const QXmlNodeModelIndex &element) const override; private: /** diff --git a/src/xmlpatterns/acceltree/qacceltreebuilder_p.h b/src/xmlpatterns/acceltree/qacceltreebuilder_p.h index 4de9984..80fa8ec 100644 --- a/src/xmlpatterns/acceltree/qacceltreebuilder_p.h +++ b/src/xmlpatterns/acceltree/qacceltreebuilder_p.h @@ -103,34 +103,34 @@ namespace QPatternist const NamePool::Ptr &np, ReportContext *const context, Features features = NoneFeature); - virtual void startDocument(); - virtual void endDocument(); - virtual void startElement(const QXmlName &name); + void startDocument() override; + void endDocument() override; + void startElement(const QXmlName &name) override; void startElement(const QXmlName &name, qint64 line, qint64 column); - virtual void endElement(); - virtual void attribute(const QXmlName &name, const QStringRef &value); - virtual void characters(const QStringRef &ch); - virtual void whitespaceOnly(const QStringRef &ch); - virtual void processingInstruction(const QXmlName &target, - const QString &data); - virtual void namespaceBinding(const QXmlName &nb); - virtual void comment(const QString &content); - virtual void item(const Item &it); - - virtual QAbstractXmlNodeModel::Ptr builtDocument(); - virtual NodeBuilder::Ptr create(const QUrl &baseURI) const; - virtual void startOfSequence(); - virtual void endOfSequence(); + void endElement() override; + void attribute(const QXmlName &name, const QStringRef &value) override; + void characters(const QStringRef &ch) override; + void whitespaceOnly(const QStringRef &ch) override; + void processingInstruction(const QXmlName &target, + const QString &data) override; + void namespaceBinding(const QXmlName &nb) override; + void comment(const QString &content) override; + void item(const Item &it) override; + + QAbstractXmlNodeModel::Ptr builtDocument() override; + NodeBuilder::Ptr create(const QUrl &baseURI) const override; + void startOfSequence() override; + void endOfSequence() override; inline AccelTree::Ptr builtDocument() const { return m_document; } - virtual void atomicValue(const QVariant &value); + void atomicValue(const QVariant &value) override; - virtual const SourceLocationReflection *actualReflection() const; - virtual QSourceLocation sourceLocation() const; + const SourceLocationReflection *actualReflection() const override; + QSourceLocation sourceLocation() const override; private: inline void startStructure(); diff --git a/src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h b/src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h index 616409f..f43e6cd 100644 --- a/src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h +++ b/src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h @@ -92,20 +92,20 @@ namespace QPatternist AccelTreeResourceLoader(const NamePool::Ptr &np, const NetworkAccessDelegator::Ptr &networkDelegator, AccelTreeBuilder<true>::Features = AccelTreeBuilder<true>::NoneFeature); - virtual Item openDocument(const QUrl &uri, - const ReportContext::Ptr &context); + Item openDocument(const QUrl &uri, + const ReportContext::Ptr &context) override; virtual Item openDocument(QIODevice *source, const QUrl &documentUri, const ReportContext::Ptr &context); - virtual SequenceType::Ptr announceDocument(const QUrl &uri, const Usage usageHint); - virtual bool isDocumentAvailable(const QUrl &uri); + SequenceType::Ptr announceDocument(const QUrl &uri, const Usage usageHint) override; + bool isDocumentAvailable(const QUrl &uri) override; - virtual bool isUnparsedTextAvailable(const QUrl &uri, - const QString &encoding); + bool isUnparsedTextAvailable(const QUrl &uri, + const QString &encoding) override; - virtual Item openUnparsedText(const QUrl &uri, - const QString &encoding, - const ReportContext::Ptr &context, - const SourceLocationReflection *const where); + Item openUnparsedText(const QUrl &uri, + const QString &encoding, + const ReportContext::Ptr &context, + const SourceLocationReflection *const where) override; /** * @short Helper function that do NetworkAccessDelegator::get(), but @@ -135,9 +135,9 @@ namespace QPatternist * @short Returns the URIs this AccelTreeResourceLoader has loaded * which are for devices through variable bindings. */ - virtual QSet<QUrl> deviceURIs() const; + QSet<QUrl> deviceURIs() const override; - virtual void clear(const QUrl &uri); + void clear(const QUrl &uri) override; private: static bool streamToReceiver(QIODevice *const dev, diff --git a/src/xmlpatterns/data/qabstractfloat_p.h b/src/xmlpatterns/data/qabstractfloat_p.h index 593e400..80ff60c 100644 --- a/src/xmlpatterns/data/qabstractfloat_p.h +++ b/src/xmlpatterns/data/qabstractfloat_p.h @@ -92,7 +92,7 @@ namespace QPatternist * * @returns @c false if the number is 0 or @c NaN, otherwise @c true. */ - bool evaluateEBV(const QExplicitlySharedDataPointer<DynamicContext> &) const; + bool evaluateEBV(const QExplicitlySharedDataPointer<DynamicContext> &) const override; /** * Returns this AbstractFloat represented as an @c xs:string. @@ -105,27 +105,27 @@ namespace QPatternist * @see <a href="http://www.w3.org/TR/xpath-functions/#casting-to-string">XQuery 1.0 * and XPath 2.0 Functions and Operators, 17.1.2 Casting to xs:string and xdt:untypedAtomic</a> */ - virtual QString stringValue() const; + QString stringValue() const override; - virtual xsDouble toDouble() const; - virtual xsInteger toInteger() const; - virtual xsFloat toFloat() const; - virtual xsDecimal toDecimal() const; + xsDouble toDouble() const override; + xsInteger toInteger() const override; + xsFloat toFloat() const override; + xsDecimal toDecimal() const override; - virtual Numeric::Ptr round() const; - virtual Numeric::Ptr roundHalfToEven(const xsInteger scale) const; - virtual Numeric::Ptr floor() const; - virtual Numeric::Ptr ceiling() const; - virtual Numeric::Ptr abs() const; + Numeric::Ptr round() const override; + Numeric::Ptr roundHalfToEven(const xsInteger scale) const override; + Numeric::Ptr floor() const override; + Numeric::Ptr ceiling() const override; + Numeric::Ptr abs() const override; - virtual bool isNaN() const; - virtual bool isInf() const; + bool isNaN() const override; + bool isInf() const override; - virtual ItemType::Ptr type() const; - virtual Item toNegated() const; - virtual qulonglong toUnsignedInteger() const; + ItemType::Ptr type() const override; + Item toNegated() const override; + qulonglong toUnsignedInteger() const override; - virtual bool isSigned() const; + bool isSigned() const override; protected: AbstractFloat(const xsDouble num); diff --git a/src/xmlpatterns/data/qabstractfloatcasters_p.h b/src/xmlpatterns/data/qabstractfloatcasters_p.h index 84ffca6..917f0f2 100644 --- a/src/xmlpatterns/data/qabstractfloatcasters_p.h +++ b/src/xmlpatterns/data/qabstractfloatcasters_p.h @@ -77,8 +77,8 @@ namespace QPatternist class NumericToAbstractFloatCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -91,8 +91,8 @@ namespace QPatternist class StringToAbstractFloatCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -105,8 +105,8 @@ namespace QPatternist class BooleanToAbstractFloatCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; #include "qabstractfloatcasters_tpl_p.h" diff --git a/src/xmlpatterns/data/qabstractfloatmathematician_p.h b/src/xmlpatterns/data/qabstractfloatmathematician_p.h index 395337d..7133335 100644 --- a/src/xmlpatterns/data/qabstractfloatmathematician_p.h +++ b/src/xmlpatterns/data/qabstractfloatmathematician_p.h @@ -76,10 +76,10 @@ namespace QPatternist { } - virtual Item calculate(const Item &o1, - const Operator op, - const Item &o2, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item calculate(const Item &o1, + const Operator op, + const Item &o2, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; #include "qabstractfloatmathematician_tpl_p.h" diff --git a/src/xmlpatterns/data/qanyuri_p.h b/src/xmlpatterns/data/qanyuri_p.h index 2d290fe..aa0ac45 100644 --- a/src/xmlpatterns/data/qanyuri_p.h +++ b/src/xmlpatterns/data/qanyuri_p.h @@ -175,7 +175,7 @@ namespace QPatternist static AnyURI::Ptr resolveURI(const QString &relative, const QString &base); - virtual ItemType::Ptr type() const; + ItemType::Ptr type() const override; /** * @short Returns this @c xs:anyURI value in a QUrl. diff --git a/src/xmlpatterns/data/qatomiccasters_p.h b/src/xmlpatterns/data/qatomiccasters_p.h index ae0f2fc..59448ba 100644 --- a/src/xmlpatterns/data/qatomiccasters_p.h +++ b/src/xmlpatterns/data/qatomiccasters_p.h @@ -82,8 +82,8 @@ namespace QPatternist class ToStringCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override { Q_ASSERT(from); return DerivedString<DerivedType>::fromLexical(context->namePool(), from.stringValue()); @@ -103,8 +103,8 @@ namespace QPatternist class ToUntypedAtomicCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -116,8 +116,8 @@ namespace QPatternist class ToAnyURICaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -129,8 +129,8 @@ namespace QPatternist class HexBinaryToBase64BinaryCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -142,8 +142,8 @@ namespace QPatternist class Base64BinaryToHexBinaryCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -155,8 +155,8 @@ namespace QPatternist class StringToBase64BinaryCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -168,8 +168,8 @@ namespace QPatternist class StringToHexBinaryCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -181,8 +181,8 @@ namespace QPatternist class NumericToBooleanCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -194,8 +194,8 @@ namespace QPatternist class StringToBooleanCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -219,8 +219,8 @@ namespace QPatternist return QtXmlPatterns::tr("When casting to %1 from %2, the source value cannot be %3."); } - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override { const ItemType::Ptr t(from.type()); const Numeric *const num = from.template as<Numeric>(); @@ -253,8 +253,8 @@ namespace QPatternist class StringToDecimalCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -266,8 +266,8 @@ namespace QPatternist class StringToIntegerCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -279,8 +279,8 @@ namespace QPatternist class BooleanToDecimalCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -292,8 +292,8 @@ namespace QPatternist class BooleanToIntegerCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -315,8 +315,8 @@ namespace QPatternist /** * This function simply returns @p from. */ - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -328,8 +328,8 @@ namespace QPatternist class StringToGYearCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -341,8 +341,8 @@ namespace QPatternist class StringToGDayCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -354,8 +354,8 @@ namespace QPatternist class StringToGMonthCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -367,8 +367,8 @@ namespace QPatternist class StringToGYearMonthCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -380,8 +380,8 @@ namespace QPatternist class StringToGMonthDayCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -393,8 +393,8 @@ namespace QPatternist class StringToDateTimeCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -406,8 +406,8 @@ namespace QPatternist class StringToTimeCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -419,8 +419,8 @@ namespace QPatternist class StringToDateCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -432,8 +432,8 @@ namespace QPatternist class StringToDurationCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -445,8 +445,8 @@ namespace QPatternist class StringToDayTimeDurationCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -458,8 +458,8 @@ namespace QPatternist class StringToYearMonthDurationCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; @@ -472,8 +472,8 @@ namespace QPatternist class AbstractDateTimeToGYearCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -485,8 +485,8 @@ namespace QPatternist class AbstractDateTimeToGYearMonthCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -498,8 +498,8 @@ namespace QPatternist class AbstractDateTimeToGMonthCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -511,8 +511,8 @@ namespace QPatternist class AbstractDateTimeToGMonthDayCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -524,8 +524,8 @@ namespace QPatternist class AbstractDateTimeToGDayCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -537,8 +537,8 @@ namespace QPatternist class AbstractDateTimeToDateTimeCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -550,8 +550,8 @@ namespace QPatternist class AbstractDateTimeToDateCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -563,8 +563,8 @@ namespace QPatternist class AbstractDateTimeToTimeCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -576,8 +576,8 @@ namespace QPatternist class AbstractDurationToDurationCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -589,8 +589,8 @@ namespace QPatternist class AbstractDurationToDayTimeDurationCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -602,8 +602,8 @@ namespace QPatternist class AbstractDurationToYearMonthDurationCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -616,9 +616,8 @@ namespace QPatternist class StringToDerivedIntegerCaster : public AtomicCaster { public: - virtual Item - castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override { return DerivedInteger<type>::fromLexical(context->namePool(), from.stringValue()); } @@ -634,9 +633,8 @@ namespace QPatternist class BooleanToDerivedIntegerCaster : public AtomicCaster { public: - virtual Item - castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override { return DerivedInteger<type>::fromValue(context->namePool(), from.template as<AtomicValue>()->evaluateEBV(context) ? 1 : 0); } @@ -652,9 +650,8 @@ namespace QPatternist class AnyToDerivedStringCaster : public AtomicCaster { public: - virtual Item - castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override { return DerivedString<type>::fromLexical(context->namePool(), from.stringValue()); } @@ -670,9 +667,8 @@ namespace QPatternist class NumericToDerivedIntegerCaster : public AtomicCaster { public: - virtual Item - castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override { const ItemType::Ptr t(from.type()); const Numeric *const num = from.template as<Numeric>(); diff --git a/src/xmlpatterns/data/qatomiccomparators_p.h b/src/xmlpatterns/data/qatomiccomparators_p.h index b46d06b..4f23e2e 100644 --- a/src/xmlpatterns/data/qatomiccomparators_p.h +++ b/src/xmlpatterns/data/qatomiccomparators_p.h @@ -82,9 +82,9 @@ namespace QPatternist * @see <a href="http://www.w3.org/TR/xpath-functions/#string-compare">XQuery 1.0 and XPath * 2.0 Functions and Operators, 7.3 ValueComparison::Equality and Comparison of Strings</a> */ - virtual ComparisonResult compare(const Item &op1, - const AtomicComparator::Operator op, - const Item &op2) const; + ComparisonResult compare(const Item &op1, + const AtomicComparator::Operator op, + const Item &op2) const override; /** * Compares two strings, and returns @c true if they are considered equal as per @@ -94,8 +94,8 @@ namespace QPatternist * @see <a href="http://www.w3.org/TR/xpath-functions/#string-compare">XQuery 1.0 and XPath * 2.0 Functions and Operators, 7.3 ValueComparison::Equality and Comparison of Strings</a> */ - virtual bool equals(const Item &op1, - const Item &op2) const; + bool equals(const Item &op1, + const Item &op2) const override; }; /** @@ -111,15 +111,15 @@ namespace QPatternist /** * Converts both string values to upper case and afterwards compare them. */ - virtual ComparisonResult compare(const Item &op1, - const AtomicComparator::Operator op, - const Item &op2) const; + ComparisonResult compare(const Item &op1, + const AtomicComparator::Operator op, + const Item &op2) const override; /** * Converts both string values case insensitively. */ - virtual bool equals(const Item &op1, - const Item &op2) const; + bool equals(const Item &op1, + const Item &op2) const override; }; /** @@ -130,8 +130,8 @@ namespace QPatternist class BinaryDataComparator : public AtomicComparator { public: - virtual bool equals(const Item &op1, - const Item &op2) const; + bool equals(const Item &op1, + const Item &op2) const override; }; /** @@ -144,12 +144,12 @@ namespace QPatternist class BooleanComparator : public AtomicComparator { public: - virtual ComparisonResult compare(const Item &op1, - const AtomicComparator::Operator op, - const Item &op2) const; + ComparisonResult compare(const Item &op1, + const AtomicComparator::Operator op, + const Item &op2) const override; - virtual bool equals(const Item &op1, - const Item &op2) const; + bool equals(const Item &op1, + const Item &op2) const override; }; /** @@ -162,12 +162,12 @@ namespace QPatternist class AbstractFloatComparator : public AtomicComparator { public: - virtual ComparisonResult compare(const Item &op1, - const AtomicComparator::Operator op, - const Item &op2) const; + ComparisonResult compare(const Item &op1, + const AtomicComparator::Operator op, + const Item &op2) const override; - virtual bool equals(const Item &op1, - const Item &op2) const; + bool equals(const Item &op1, + const Item &op2) const override; }; /** @@ -181,9 +181,9 @@ namespace QPatternist class AbstractFloatSortComparator : public AbstractFloatComparator { public: - virtual ComparisonResult compare(const Item &o1, - const AtomicComparator::Operator op, - const Item &o2) const + ComparisonResult compare(const Item &o1, + const AtomicComparator::Operator op, + const Item &o2) const override { Q_ASSERT_X(t_op == OperatorLessThanNaNLeast || t_op == OperatorLessThanNaNGreatest, Q_FUNC_INFO, "Can only be instantiated with those two."); @@ -216,12 +216,12 @@ namespace QPatternist class DecimalComparator : public AtomicComparator { public: - virtual ComparisonResult compare(const Item &op1, - const AtomicComparator::Operator op, - const Item &op2) const; + ComparisonResult compare(const Item &op1, + const AtomicComparator::Operator op, + const Item &op2) const override; - virtual bool equals(const Item &op1, - const Item &op2) const; + bool equals(const Item &op1, + const Item &op2) const override; }; /** @@ -232,12 +232,12 @@ namespace QPatternist class IntegerComparator : public AtomicComparator { public: - virtual ComparisonResult compare(const Item &op1, - const AtomicComparator::Operator op, - const Item &op2) const; + ComparisonResult compare(const Item &op1, + const AtomicComparator::Operator op, + const Item &op2) const override; - virtual bool equals(const Item &op1, - const Item &op2) const; + bool equals(const Item &op1, + const Item &op2) const override; }; /** @@ -248,8 +248,8 @@ namespace QPatternist class QNameComparator : public AtomicComparator { public: - virtual bool equals(const Item &op1, - const Item &op2) const; + bool equals(const Item &op1, + const Item &op2) const override; }; /** @@ -260,11 +260,11 @@ namespace QPatternist class AbstractDateTimeComparator : public AtomicComparator { public: - virtual ComparisonResult compare(const Item &op1, - const AtomicComparator::Operator op, - const Item &op2) const; - virtual bool equals(const Item &op1, - const Item &op2) const; + ComparisonResult compare(const Item &op1, + const AtomicComparator::Operator op, + const Item &op2) const override; + bool equals(const Item &op1, + const Item &op2) const override; }; /** @@ -275,11 +275,11 @@ namespace QPatternist class AbstractDurationComparator : public AtomicComparator { public: - virtual ComparisonResult compare(const Item &op1, - const AtomicComparator::Operator op, - const Item &op2) const; - virtual bool equals(const Item &op1, - const Item &op2) const; + ComparisonResult compare(const Item &op1, + const AtomicComparator::Operator op, + const Item &op2) const override; + bool equals(const Item &op1, + const Item &op2) const override; private: static inline QDateTime addDurationToDateTime(const QDateTime &dateTime, diff --git a/src/xmlpatterns/data/qatomicmathematicians_p.h b/src/xmlpatterns/data/qatomicmathematicians_p.h index c8831ea..c8f8665 100644 --- a/src/xmlpatterns/data/qatomicmathematicians_p.h +++ b/src/xmlpatterns/data/qatomicmathematicians_p.h @@ -76,10 +76,10 @@ namespace QPatternist { } - virtual Item calculate(const Item &o1, - const Operator op, - const Item &o2, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item calculate(const Item &o1, + const Operator op, + const Item &o2, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -96,10 +96,10 @@ namespace QPatternist { } - virtual Item calculate(const Item &o1, - const Operator op, - const Item &o2, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item calculate(const Item &o1, + const Operator op, + const Item &o2, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -117,10 +117,10 @@ namespace QPatternist { } - virtual Item calculate(const Item &o1, - const Operator op, - const Item &o2, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item calculate(const Item &o1, + const Operator op, + const Item &o2, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -133,10 +133,10 @@ namespace QPatternist class DurationDurationDivisor : public AtomicMathematician { public: - virtual Item calculate(const Item &o1, - const Operator op, - const Item &o2, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item calculate(const Item &o1, + const Operator op, + const Item &o2, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -149,10 +149,10 @@ namespace QPatternist class DurationDurationMathematician : public AtomicMathematician { public: - virtual Item calculate(const Item &o1, - const Operator op, - const Item &o2, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item calculate(const Item &o1, + const Operator op, + const Item &o2, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -188,10 +188,10 @@ namespace QPatternist * Switch @p o1 and @p o2, and returns the value from the AtomicMathematician * this OperandSwitcherMathematician represents. */ - virtual Item calculate(const Item &o1, - const Operator op, - const Item &o2, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item calculate(const Item &o1, + const Operator op, + const Item &o2, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; private: const AtomicMathematician::Ptr m_mather; }; @@ -216,10 +216,10 @@ namespace QPatternist * @p o1 is an AbstractDateTime and @p o2 is an AbstractDuration. * */ - virtual Item calculate(const Item &o1, - const Operator op, - const Item &o2, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item calculate(const Item &o1, + const Operator op, + const Item &o2, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -231,10 +231,10 @@ namespace QPatternist class AbstractDateTimeMathematician : public AtomicMathematician { public: - virtual Item calculate(const Item &o1, - const Operator op, - const Item &o2, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item calculate(const Item &o1, + const Operator op, + const Item &o2, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; } diff --git a/src/xmlpatterns/data/qatomicstring_p.h b/src/xmlpatterns/data/qatomicstring_p.h index 82368db..1a16d12 100644 --- a/src/xmlpatterns/data/qatomicstring_p.h +++ b/src/xmlpatterns/data/qatomicstring_p.h @@ -95,14 +95,14 @@ namespace QPatternist * * @returns @c false if the contained string has a zero-length, otherwise @c true. */ - virtual bool evaluateEBV(const QExplicitlySharedDataPointer<DynamicContext> &) const; + bool evaluateEBV(const QExplicitlySharedDataPointer<DynamicContext> &) const override; /** * The string value of a AtomicString instance is the value space. */ - virtual QString stringValue() const; + QString stringValue() const override; - virtual ItemType::Ptr type() const; + ItemType::Ptr type() const override; protected: friend class StringComparator; diff --git a/src/xmlpatterns/data/qbase64binary_p.h b/src/xmlpatterns/data/qbase64binary_p.h index 38db3b1..67ef982 100644 --- a/src/xmlpatterns/data/qbase64binary_p.h +++ b/src/xmlpatterns/data/qbase64binary_p.h @@ -77,8 +77,8 @@ namespace QPatternist static Base64Binary::Ptr fromValue(const QByteArray &data); - virtual QString stringValue() const; - virtual ItemType::Ptr type() const; + QString stringValue() const override; + ItemType::Ptr type() const override; inline const QByteArray &asByteArray() const { return m_value; diff --git a/src/xmlpatterns/data/qboolean_p.h b/src/xmlpatterns/data/qboolean_p.h index 1bcd075..0aa1766 100644 --- a/src/xmlpatterns/data/qboolean_p.h +++ b/src/xmlpatterns/data/qboolean_p.h @@ -80,7 +80,7 @@ namespace QPatternist static bool evaluateEBV(const Item &item, const QExplicitlySharedDataPointer<DynamicContext> &context); - virtual QString stringValue() const; + QString stringValue() const override; /** * @returns a Boolean object instantiating @p value. Use True() or False() @@ -98,9 +98,9 @@ namespace QPatternist * Get the Effective %Boolean Value of this boolean value. For <tt>xs:boolean</tt>, this * is simply the value. */ - virtual bool evaluateEBV(const QExplicitlySharedDataPointer<DynamicContext> &) const; + bool evaluateEBV(const QExplicitlySharedDataPointer<DynamicContext> &) const override; - virtual ItemType::Ptr type() const; + ItemType::Ptr type() const override; inline bool value() const { diff --git a/src/xmlpatterns/data/qcomparisonfactory.cpp b/src/xmlpatterns/data/qcomparisonfactory.cpp index 793f724..13aefd5 100644 --- a/src/xmlpatterns/data/qcomparisonfactory.cpp +++ b/src/xmlpatterns/data/qcomparisonfactory.cpp @@ -95,7 +95,7 @@ public: return flexibleCompare(operand1, operand2, context); } - const SourceLocationReflection *actualReflection() const + const SourceLocationReflection *actualReflection() const override { return m_sourceReflection; } diff --git a/src/xmlpatterns/data/qdate_p.h b/src/xmlpatterns/data/qdate_p.h index 1796f67..1ace503 100644 --- a/src/xmlpatterns/data/qdate_p.h +++ b/src/xmlpatterns/data/qdate_p.h @@ -73,9 +73,9 @@ namespace QPatternist static Date::Ptr fromLexical(const QString &string); static Date::Ptr fromDateTime(const QDateTime &date); - virtual ItemType::Ptr type() const; - virtual QString stringValue() const; - virtual Item fromValue(const QDateTime &dt) const; + ItemType::Ptr type() const override; + QString stringValue() const override; + Item fromValue(const QDateTime &dt) const override; protected: friend class CommonValues; diff --git a/src/xmlpatterns/data/qdaytimeduration_p.h b/src/xmlpatterns/data/qdaytimeduration_p.h index 9c5334f..4b08c19 100644 --- a/src/xmlpatterns/data/qdaytimeduration_p.h +++ b/src/xmlpatterns/data/qdaytimeduration_p.h @@ -89,23 +89,23 @@ namespace QPatternist static DayTimeDuration::Ptr fromSeconds(const SecondCountProperty secs, const MSecondProperty msecs = 0); - virtual ItemType::Ptr type() const; - virtual QString stringValue() const; + ItemType::Ptr type() const override; + QString stringValue() const override; /** * @returns always 0. */ - virtual YearProperty years() const; + YearProperty years() const override; /** * @returns always 0. */ - virtual MonthProperty months() const; - virtual DayCountProperty days() const; - virtual HourProperty hours() const; - virtual MinuteProperty minutes() const; - virtual MSecondProperty mseconds() const; - virtual SecondProperty seconds() const; + MonthProperty months() const override; + DayCountProperty days() const override; + HourProperty hours() const override; + MinuteProperty minutes() const override; + MSecondProperty mseconds() const override; + SecondProperty seconds() const override; /** * @returns the value of this xs:dayTimeDuration @@ -114,7 +114,7 @@ namespace QPatternist * and XPath 2.0 Functions and Operators, 10.3.2.2 Calculating the value of a * xs:dayTimeDuration from the lexical representation</a> */ - virtual Value value() const; + Value value() const override; /** * Creates a DayTimeDuration containing the value @p val. @p val is @@ -122,7 +122,7 @@ namespace QPatternist * * If @p val is zero, is CommonValues::DayTimeDurationZero returned. */ - virtual Item fromValue(const Value val) const; + Item fromValue(const Value val) const override; protected: friend class CommonValues; diff --git a/src/xmlpatterns/data/qdecimal_p.h b/src/xmlpatterns/data/qdecimal_p.h index 68fa573..4cd7c28 100644 --- a/src/xmlpatterns/data/qdecimal_p.h +++ b/src/xmlpatterns/data/qdecimal_p.h @@ -87,40 +87,40 @@ namespace QPatternist * * @returns @c false if the number is 0 or @c NaN, otherwise @c true. */ - bool evaluateEBV(const QExplicitlySharedDataPointer<DynamicContext> &) const; + bool evaluateEBV(const QExplicitlySharedDataPointer<DynamicContext> &) const override; - virtual QString stringValue() const; + QString stringValue() const override; /** * @returns always BuiltinTypes::xsDecimal */ - virtual ItemType::Ptr type() const; + ItemType::Ptr type() const override; - virtual xsDouble toDouble() const; - virtual xsInteger toInteger() const; - virtual xsFloat toFloat() const; - virtual xsDecimal toDecimal() const; - virtual qulonglong toUnsignedInteger() const; + xsDouble toDouble() const override; + xsInteger toInteger() const override; + xsFloat toFloat() const override; + xsDecimal toDecimal() const override; + qulonglong toUnsignedInteger() const override; - virtual Numeric::Ptr round() const; - virtual Numeric::Ptr roundHalfToEven(const xsInteger scale) const; - virtual Numeric::Ptr floor() const; - virtual Numeric::Ptr ceiling() const; - virtual Numeric::Ptr abs() const; + Numeric::Ptr round() const override; + Numeric::Ptr roundHalfToEven(const xsInteger scale) const override; + Numeric::Ptr floor() const override; + Numeric::Ptr ceiling() const override; + Numeric::Ptr abs() const override; /** * @returns always @c false, xs:decimal doesn't have * not-a-number in its value space. */ - virtual bool isNaN() const; + bool isNaN() const override; /** * @returns always @c false, xs:decimal doesn't have * infinity in its value space. */ - virtual bool isInf() const; + bool isInf() const override; - virtual Item toNegated() const; + Item toNegated() const override; /** * Converts @p value into a canonical string representation for @c xs:decimal. This @@ -129,7 +129,7 @@ namespace QPatternist */ static QString toString(const xsDecimal value); - virtual bool isSigned() const; + bool isSigned() const override; protected: diff --git a/src/xmlpatterns/data/qderivedinteger_p.h b/src/xmlpatterns/data/qderivedinteger_p.h index bd700fc..6fe0290 100644 --- a/src/xmlpatterns/data/qderivedinteger_p.h +++ b/src/xmlpatterns/data/qderivedinteger_p.h @@ -472,63 +472,63 @@ namespace QPatternist * * @returns @c false if the number is 0, otherwise @c true. */ - bool evaluateEBV(const QExplicitlySharedDataPointer<DynamicContext> &) const + bool evaluateEBV(const QExplicitlySharedDataPointer<DynamicContext> &) const override { return m_value != 0; } - virtual QString stringValue() const + QString stringValue() const override { return QString::number(m_value); } - virtual ItemType::Ptr type() const + ItemType::Ptr type() const override { return itemType(); } - virtual xsDouble toDouble() const + xsDouble toDouble() const override { return static_cast<xsDouble>(m_value); } - virtual xsInteger toInteger() const + xsInteger toInteger() const override { return m_value; } - virtual xsFloat toFloat() const + xsFloat toFloat() const override { return static_cast<xsFloat>(m_value); } - virtual xsDecimal toDecimal() const + xsDecimal toDecimal() const override { return static_cast<xsDecimal>(m_value); } - virtual Numeric::Ptr round() const + Numeric::Ptr round() const override { /* xs:integerS never have a mantissa. */ return Numeric::Ptr(static_cast<Numeric *>(const_cast<AtomicValue *>(Integer::fromValue(m_value).asAtomicValue()))); } - virtual Numeric::Ptr roundHalfToEven(const xsInteger) const + Numeric::Ptr roundHalfToEven(const xsInteger) const override { return Numeric::Ptr(static_cast<Numeric *>(const_cast<AtomicValue *>(Integer::fromValue(m_value).asAtomicValue()))); } - virtual Numeric::Ptr floor() const + Numeric::Ptr floor() const override { return Numeric::Ptr(static_cast<Numeric *>(const_cast<AtomicValue *>(Integer::fromValue(m_value).asAtomicValue()))); } - virtual Numeric::Ptr ceiling() const + Numeric::Ptr ceiling() const override { return Numeric::Ptr(static_cast<Numeric *>(const_cast<AtomicValue *>(Integer::fromValue(m_value).asAtomicValue()))); } - virtual Numeric::Ptr abs() const + Numeric::Ptr abs() const override { /* We unconditionally create an Integer even if we're a positive * value, because one part of this is the type change to @@ -544,7 +544,7 @@ namespace QPatternist * @returns always @c false, @c xs:DerivedInteger doesn't have * not-a-number in its value space. */ - virtual bool isNaN() const + bool isNaN() const override { return false; } @@ -553,17 +553,17 @@ namespace QPatternist * @returns always @c false, @c xs:DerivedInteger doesn't have * infinity in its value space. */ - virtual bool isInf() const + bool isInf() const override { return false; } - virtual Item toNegated() const + Item toNegated() const override { return Integer::fromValue(-xsInteger(m_value)); } - virtual bool isSigned() const + bool isSigned() const override { switch(DerivedType) { @@ -587,7 +587,7 @@ namespace QPatternist return false; } - virtual qulonglong toUnsignedInteger() const + qulonglong toUnsignedInteger() const override { switch(DerivedType) { diff --git a/src/xmlpatterns/data/qderivedstring_p.h b/src/xmlpatterns/data/qderivedstring_p.h index b37e77e..dea83d2 100644 --- a/src/xmlpatterns/data/qderivedstring_p.h +++ b/src/xmlpatterns/data/qderivedstring_p.h @@ -310,17 +310,17 @@ namespace QPatternist } } - virtual QString stringValue() const + QString stringValue() const override { return m_value; } - virtual bool evaluateEBV(const QExplicitlySharedDataPointer<DynamicContext> &) const + bool evaluateEBV(const QExplicitlySharedDataPointer<DynamicContext> &) const override { return m_value.length() > 0; } - virtual ItemType::Ptr type() const + ItemType::Ptr type() const override { return itemType(); } diff --git a/src/xmlpatterns/data/qduration_p.h b/src/xmlpatterns/data/qduration_p.h index 975aa43..e88da41 100644 --- a/src/xmlpatterns/data/qduration_p.h +++ b/src/xmlpatterns/data/qduration_p.h @@ -80,28 +80,28 @@ namespace QPatternist const SecondProperty seconds, const MSecondProperty mseconds); - virtual ItemType::Ptr type() const; - virtual QString stringValue() const; + ItemType::Ptr type() const override; + QString stringValue() const override; /** * Always results in an assert crash. Calling this function makes no * sense due to that the value space of xs:duration is not well defined. */ - virtual Value value() const; + Value value() const override; /** * Always results in an assert crash. Calling this function makes no * sense due to that the value space of xs:duration is not well defined. */ - virtual Item fromValue(const Value val) const; + Item fromValue(const Value val) const override; - virtual YearProperty years() const; - virtual MonthProperty months() const; - virtual DayCountProperty days() const; - virtual HourProperty hours() const; - virtual MinuteProperty minutes() const; - virtual SecondProperty seconds() const; - virtual MSecondProperty mseconds() const; + YearProperty years() const override; + MonthProperty months() const override; + DayCountProperty days() const override; + HourProperty hours() const override; + MinuteProperty minutes() const override; + SecondProperty seconds() const override; + MSecondProperty mseconds() const override; protected: friend class CommonValues; diff --git a/src/xmlpatterns/data/qgday_p.h b/src/xmlpatterns/data/qgday_p.h index 60b327f..ef5f0b6 100644 --- a/src/xmlpatterns/data/qgday_p.h +++ b/src/xmlpatterns/data/qgday_p.h @@ -73,8 +73,8 @@ namespace QPatternist static GDay::Ptr fromLexical(const QString &string); static GDay::Ptr fromDateTime(const QDateTime &dt); - virtual ItemType::Ptr type() const; - virtual QString stringValue() const; + ItemType::Ptr type() const override; + QString stringValue() const override; protected: friend class CommonValues; diff --git a/src/xmlpatterns/data/qgmonth_p.h b/src/xmlpatterns/data/qgmonth_p.h index 6f8686f..49b4c35 100644 --- a/src/xmlpatterns/data/qgmonth_p.h +++ b/src/xmlpatterns/data/qgmonth_p.h @@ -73,8 +73,8 @@ namespace QPatternist static GMonth::Ptr fromLexical(const QString &string); static GMonth::Ptr fromDateTime(const QDateTime &dt); - virtual ItemType::Ptr type() const; - virtual QString stringValue() const; + ItemType::Ptr type() const override; + QString stringValue() const override; protected: friend class CommonValues; diff --git a/src/xmlpatterns/data/qgmonthday_p.h b/src/xmlpatterns/data/qgmonthday_p.h index a9d8891..5d9e198 100644 --- a/src/xmlpatterns/data/qgmonthday_p.h +++ b/src/xmlpatterns/data/qgmonthday_p.h @@ -73,9 +73,9 @@ namespace QPatternist static GMonthDay::Ptr fromLexical(const QString &string); static GMonthDay::Ptr fromDateTime(const QDateTime &dt); - virtual ItemType::Ptr type() const; + ItemType::Ptr type() const override; - virtual QString stringValue() const; + QString stringValue() const override; protected: friend class CommonValues; diff --git a/src/xmlpatterns/data/qgyear_p.h b/src/xmlpatterns/data/qgyear_p.h index 6d3b5a2..bf0e9cb 100644 --- a/src/xmlpatterns/data/qgyear_p.h +++ b/src/xmlpatterns/data/qgyear_p.h @@ -73,8 +73,8 @@ namespace QPatternist static GYear::Ptr fromLexical(const QString &string); static GYear::Ptr fromDateTime(const QDateTime &dt); - virtual ItemType::Ptr type() const; - virtual QString stringValue() const; + ItemType::Ptr type() const override; + QString stringValue() const override; protected: friend class CommonValues; diff --git a/src/xmlpatterns/data/qgyearmonth_p.h b/src/xmlpatterns/data/qgyearmonth_p.h index 896cf9b..167a6b6 100644 --- a/src/xmlpatterns/data/qgyearmonth_p.h +++ b/src/xmlpatterns/data/qgyearmonth_p.h @@ -73,8 +73,8 @@ namespace QPatternist static GYearMonth::Ptr fromLexical(const QString &string); static GYearMonth::Ptr fromDateTime(const QDateTime &dt); - virtual ItemType::Ptr type() const; - virtual QString stringValue() const; + ItemType::Ptr type() const override; + QString stringValue() const override; protected: friend class CommonValues; diff --git a/src/xmlpatterns/data/qhexbinary_p.h b/src/xmlpatterns/data/qhexbinary_p.h index e10845a..6583de3 100644 --- a/src/xmlpatterns/data/qhexbinary_p.h +++ b/src/xmlpatterns/data/qhexbinary_p.h @@ -74,8 +74,8 @@ namespace QPatternist typedef AtomicValue::Ptr Ptr; - virtual QString stringValue() const; - virtual ItemType::Ptr type() const; + QString stringValue() const override; + ItemType::Ptr type() const override; /** * Creates a @c xs:hexBinary from the lexical representation @p value. diff --git a/src/xmlpatterns/data/qinteger_p.h b/src/xmlpatterns/data/qinteger_p.h index 4f4dbe5..50cc9aa 100644 --- a/src/xmlpatterns/data/qinteger_p.h +++ b/src/xmlpatterns/data/qinteger_p.h @@ -84,44 +84,44 @@ namespace QPatternist * * @returns @c false if the number is 0, otherwise @c true. */ - bool evaluateEBV(const QExplicitlySharedDataPointer<DynamicContext> &) const; + bool evaluateEBV(const QExplicitlySharedDataPointer<DynamicContext> &) const override; - virtual QString stringValue() const; + QString stringValue() const override; /** * @returns always BuiltinTypes::xsInteger */ - virtual ItemType::Ptr type() const; + ItemType::Ptr type() const override; - virtual xsDouble toDouble() const; - virtual xsInteger toInteger() const; - virtual xsFloat toFloat() const; - virtual xsDecimal toDecimal() const; + xsDouble toDouble() const override; + xsInteger toInteger() const override; + xsFloat toFloat() const override; + xsDecimal toDecimal() const override; - virtual Numeric::Ptr round() const; - virtual Numeric::Ptr roundHalfToEven(const xsInteger scale) const; - virtual Numeric::Ptr floor() const; - virtual Numeric::Ptr ceiling() const; - virtual Numeric::Ptr abs() const; - virtual qulonglong toUnsignedInteger() const; + Numeric::Ptr round() const override; + Numeric::Ptr roundHalfToEven(const xsInteger scale) const override; + Numeric::Ptr floor() const override; + Numeric::Ptr ceiling() const override; + Numeric::Ptr abs() const override; + qulonglong toUnsignedInteger() const override; /** * @returns always @c false, @c xs:integer doesn't have * not-a-number in its value space. */ - virtual bool isNaN() const; + bool isNaN() const override; /** * @returns always @c false, @c xs:integer doesn't have * infinity in its value space. */ - virtual bool isInf() const; - virtual Item toNegated() const; + bool isInf() const override; + Item toNegated() const override; /** * @short Returns always @c true. */ - virtual bool isSigned() const; + bool isSigned() const override; protected: Integer(const xsInteger num); diff --git a/src/xmlpatterns/data/qqnamevalue_p.h b/src/xmlpatterns/data/qqnamevalue_p.h index a14dd87..0aa349f 100644 --- a/src/xmlpatterns/data/qqnamevalue_p.h +++ b/src/xmlpatterns/data/qqnamevalue_p.h @@ -85,9 +85,9 @@ namespace QPatternist */ static QNameValue::Ptr fromValue(const NamePool::Ptr &np, const QXmlName name); - virtual QString stringValue() const; + QString stringValue() const override; - virtual ItemType::Ptr type() const; + ItemType::Ptr type() const override; inline QXmlName qName() const { diff --git a/src/xmlpatterns/data/qschemadatetime_p.h b/src/xmlpatterns/data/qschemadatetime_p.h index f8ce36d..a530f9d 100644 --- a/src/xmlpatterns/data/qschemadatetime_p.h +++ b/src/xmlpatterns/data/qschemadatetime_p.h @@ -79,9 +79,9 @@ namespace QPatternist */ static DateTime::Ptr fromLexical(const QString &string); static DateTime::Ptr fromDateTime(const QDateTime &dt); - virtual ItemType::Ptr type() const; - virtual QString stringValue() const; - virtual Item fromValue(const QDateTime &dt) const; + ItemType::Ptr type() const override; + QString stringValue() const override; + Item fromValue(const QDateTime &dt) const override; protected: friend class CommonValues; diff --git a/src/xmlpatterns/data/qschematime_p.h b/src/xmlpatterns/data/qschematime_p.h index 432a890..cc93d8a 100644 --- a/src/xmlpatterns/data/qschematime_p.h +++ b/src/xmlpatterns/data/qschematime_p.h @@ -76,9 +76,9 @@ namespace QPatternist static SchemaTime::Ptr fromLexical(const QString &string); static SchemaTime::Ptr fromDateTime(const QDateTime &dt); - virtual ItemType::Ptr type() const; - virtual QString stringValue() const; - virtual Item fromValue(const QDateTime &dt) const; + ItemType::Ptr type() const override; + QString stringValue() const override; + Item fromValue(const QDateTime &dt) const override; protected: friend class CommonValues; diff --git a/src/xmlpatterns/data/qsorttuple_p.h b/src/xmlpatterns/data/qsorttuple_p.h index 4b9bfae..1b24624 100644 --- a/src/xmlpatterns/data/qsorttuple_p.h +++ b/src/xmlpatterns/data/qsorttuple_p.h @@ -97,7 +97,7 @@ namespace QPatternist * This function is sometimes called by Literal::description(). * This function simply returns "SortTuple". */ - virtual QString stringValue() const; + QString stringValue() const override; /** * @short Always asserts. @@ -117,9 +117,9 @@ namespace QPatternist /** * @short Always asserts. */ - virtual bool hasError() const; + bool hasError() const override; - virtual ItemType::Ptr type() const; + ItemType::Ptr type() const override; inline const Item::Vector &sortKeys() const { diff --git a/src/xmlpatterns/data/quntypedatomic_p.h b/src/xmlpatterns/data/quntypedatomic_p.h index 49816b8..23da577 100644 --- a/src/xmlpatterns/data/quntypedatomic_p.h +++ b/src/xmlpatterns/data/quntypedatomic_p.h @@ -78,7 +78,7 @@ namespace QPatternist */ static UntypedAtomic::Ptr fromValue(const QString &value); - virtual ItemType::Ptr type() const; + ItemType::Ptr type() const override; protected: diff --git a/src/xmlpatterns/data/qvalidationerror_p.h b/src/xmlpatterns/data/qvalidationerror_p.h index f71cac7..bd3054c 100644 --- a/src/xmlpatterns/data/qvalidationerror_p.h +++ b/src/xmlpatterns/data/qvalidationerror_p.h @@ -86,17 +86,17 @@ namespace QPatternist /** * @returns always @c true */ - virtual bool hasError() const; + bool hasError() const override; /** * Always results in an assert crash. */ - virtual ItemType::Ptr type() const; + ItemType::Ptr type() const override; /** * Always results in an assert crash. */ - virtual QString stringValue() const; + QString stringValue() const override; /** * @returns the error code this ValidationError represents. Typically, this diff --git a/src/xmlpatterns/data/qvaluefactory.cpp b/src/xmlpatterns/data/qvaluefactory.cpp index f02d282..a00dac5 100644 --- a/src/xmlpatterns/data/qvaluefactory.cpp +++ b/src/xmlpatterns/data/qvaluefactory.cpp @@ -71,7 +71,7 @@ public: return AtomicValue::Ptr(const_cast<AtomicValue *>(cast(lexicalValue, context).asAtomicValue())); } - const SourceLocationReflection *actualReflection() const + const SourceLocationReflection *actualReflection() const override { return m_sourceReflection; } diff --git a/src/xmlpatterns/data/qyearmonthduration_p.h b/src/xmlpatterns/data/qyearmonthduration_p.h index 7bc9dff..74bb99f 100644 --- a/src/xmlpatterns/data/qyearmonthduration_p.h +++ b/src/xmlpatterns/data/qyearmonthduration_p.h @@ -76,8 +76,8 @@ namespace QPatternist const YearProperty years, const MonthProperty months); - virtual ItemType::Ptr type() const; - virtual QString stringValue() const; + ItemType::Ptr type() const override; + QString stringValue() const override; /** * @returns the value of this @c xs:yearMonthDuration in months. @@ -85,47 +85,47 @@ namespace QPatternist * and XPath 2.0 Functions and Operators, 10.3.2.2 Calculating the value of a * xs:dayTimeDuration from the lexical representation</a> */ - virtual Value value() const; + Value value() const override; /** * If @p val is zero, is CommonValues::YearMonthDurationZero returned. */ - virtual Item fromValue(const Value val) const; + Item fromValue(const Value val) const override; /** * @returns the years component. Always positive. */ - virtual YearProperty years() const; + YearProperty years() const override; /** * @returns the months component. Always positive. */ - virtual MonthProperty months() const; + MonthProperty months() const override; /** * @returns always 0. */ - virtual DayCountProperty days() const; + DayCountProperty days() const override; /** * @returns always 0. */ - virtual HourProperty hours() const; + HourProperty hours() const override; /** * @returns always 0. */ - virtual MinuteProperty minutes() const; + MinuteProperty minutes() const override; /** * @returns always 0. */ - virtual SecondProperty seconds() const; + SecondProperty seconds() const override; /** * @returns always 0. */ - virtual MSecondProperty mseconds() const; + MSecondProperty mseconds() const override; protected: friend class CommonValues; diff --git a/src/xmlpatterns/environment/qcurrentitemcontext_p.h b/src/xmlpatterns/environment/qcurrentitemcontext_p.h index 5422259..a198045 100644 --- a/src/xmlpatterns/environment/qcurrentitemcontext_p.h +++ b/src/xmlpatterns/environment/qcurrentitemcontext_p.h @@ -75,7 +75,7 @@ namespace QPatternist CurrentItemContext(const Item &item, const DynamicContext::Ptr &prevContext); - virtual Item currentItem() const; + Item currentItem() const override; private: const Item m_currentItem; diff --git a/src/xmlpatterns/environment/qdelegatingdynamiccontext_p.h b/src/xmlpatterns/environment/qdelegatingdynamiccontext_p.h index 32d0506..21c44c9 100644 --- a/src/xmlpatterns/environment/qdelegatingdynamiccontext_p.h +++ b/src/xmlpatterns/environment/qdelegatingdynamiccontext_p.h @@ -71,46 +71,46 @@ namespace QPatternist class DelegatingDynamicContext : public DynamicContext { public: - virtual xsInteger contextPosition() const; - virtual Item contextItem() const; - virtual xsInteger contextSize(); - - virtual ItemCacheCell &itemCacheCell(const VariableSlotID slot); - virtual ItemSequenceCacheCell::Vector &itemSequenceCacheCells(const VariableSlotID slot); - - virtual void setRangeVariable(const VariableSlotID slotNumber, - const Item &newValue); - virtual Item rangeVariable(const VariableSlotID slotNumber) const; - - virtual void setExpressionVariable(const VariableSlotID slotNumber, - const Expression::Ptr &newValue); - virtual Expression::Ptr expressionVariable(const VariableSlotID slotNumber) const; - - virtual void setFocusIterator(const Item::Iterator::Ptr &it); - virtual Item::Iterator::Ptr focusIterator() const; - - virtual Item::Iterator::Ptr positionIterator(const VariableSlotID slot) const; - virtual void setPositionIterator(const VariableSlotID slot, - const Item::Iterator::Ptr &newValue); - - virtual QAbstractMessageHandler * messageHandler() const; - virtual QExplicitlySharedDataPointer<DayTimeDuration> implicitTimezone() const; - virtual QDateTime currentDateTime() const; - virtual QAbstractXmlReceiver *outputReceiver() const; - virtual NodeBuilder::Ptr nodeBuilder(const QUrl &baseURI) const; - virtual ResourceLoader::Ptr resourceLoader() const; - virtual ExternalVariableLoader::Ptr externalVariableLoader() const; - virtual NamePool::Ptr namePool() const; - virtual QSourceLocation locationFor(const SourceLocationReflection *const reflection) const; - virtual void addNodeModel(const QAbstractXmlNodeModel::Ptr &nm); - virtual const QAbstractUriResolver *uriResolver() const; - virtual ItemCacheCell &globalItemCacheCell(const VariableSlotID slot); - virtual ItemSequenceCacheCell::Vector &globalItemSequenceCacheCells(const VariableSlotID slot); - virtual Item currentItem() const; - virtual TemplateParameterHash &templateParameterStore(); - - virtual DynamicContext::Ptr previousContext() const; - virtual QExplicitlySharedDataPointer<TemplateMode> currentTemplateMode() const; + xsInteger contextPosition() const override; + Item contextItem() const override; + xsInteger contextSize() override; + + ItemCacheCell &itemCacheCell(const VariableSlotID slot) override; + ItemSequenceCacheCell::Vector &itemSequenceCacheCells(const VariableSlotID slot) override; + + void setRangeVariable(const VariableSlotID slotNumber, + const Item &newValue) override; + Item rangeVariable(const VariableSlotID slotNumber) const override; + + void setExpressionVariable(const VariableSlotID slotNumber, + const Expression::Ptr &newValue) override; + Expression::Ptr expressionVariable(const VariableSlotID slotNumber) const override; + + void setFocusIterator(const Item::Iterator::Ptr &it) override; + Item::Iterator::Ptr focusIterator() const override; + + Item::Iterator::Ptr positionIterator(const VariableSlotID slot) const override; + void setPositionIterator(const VariableSlotID slot, + const Item::Iterator::Ptr &newValue) override; + + QAbstractMessageHandler * messageHandler() const override; + QExplicitlySharedDataPointer<DayTimeDuration> implicitTimezone() const override; + QDateTime currentDateTime() const override; + QAbstractXmlReceiver *outputReceiver() const override; + NodeBuilder::Ptr nodeBuilder(const QUrl &baseURI) const override; + ResourceLoader::Ptr resourceLoader() const override; + ExternalVariableLoader::Ptr externalVariableLoader() const override; + NamePool::Ptr namePool() const override; + QSourceLocation locationFor(const SourceLocationReflection *const reflection) const override; + void addNodeModel(const QAbstractXmlNodeModel::Ptr &nm) override; + const QAbstractUriResolver *uriResolver() const override; + ItemCacheCell &globalItemCacheCell(const VariableSlotID slot) override; + ItemSequenceCacheCell::Vector &globalItemSequenceCacheCells(const VariableSlotID slot) override; + Item currentItem() const override; + TemplateParameterHash &templateParameterStore() override; + + DynamicContext::Ptr previousContext() const override; + QExplicitlySharedDataPointer<TemplateMode> currentTemplateMode() const override; protected: DelegatingDynamicContext(const DynamicContext::Ptr &prevContext); diff --git a/src/xmlpatterns/environment/qdelegatingstaticcontext_p.h b/src/xmlpatterns/environment/qdelegatingstaticcontext_p.h index 35fe7fe..98dddfd 100644 --- a/src/xmlpatterns/environment/qdelegatingstaticcontext_p.h +++ b/src/xmlpatterns/environment/qdelegatingstaticcontext_p.h @@ -69,64 +69,64 @@ namespace QPatternist class Q_AUTOTEST_EXPORT DelegatingStaticContext : public StaticContext { public: - virtual NamespaceResolver::Ptr namespaceBindings() const; - virtual void setNamespaceBindings(const NamespaceResolver::Ptr &); + NamespaceResolver::Ptr namespaceBindings() const override; + void setNamespaceBindings(const NamespaceResolver::Ptr &) override; - virtual FunctionFactory::Ptr functionSignatures() const; - virtual SchemaTypeFactory::Ptr schemaDefinitions() const; - virtual DynamicContext::Ptr dynamicContext() const; + FunctionFactory::Ptr functionSignatures() const override; + SchemaTypeFactory::Ptr schemaDefinitions() const override; + DynamicContext::Ptr dynamicContext() const override; - virtual QUrl baseURI() const; - virtual void setBaseURI(const QUrl &uri); + QUrl baseURI() const override; + void setBaseURI(const QUrl &uri) override; - virtual bool compatModeEnabled() const; - virtual void setCompatModeEnabled(const bool newVal); + bool compatModeEnabled() const override; + void setCompatModeEnabled(const bool newVal) override; - virtual QUrl defaultCollation() const; + QUrl defaultCollation() const override; - virtual QAbstractMessageHandler * messageHandler() const; + QAbstractMessageHandler * messageHandler() const override; - virtual void setDefaultCollation(const QUrl &uri); + void setDefaultCollation(const QUrl &uri) override; - virtual BoundarySpacePolicy boundarySpacePolicy() const; - virtual void setBoundarySpacePolicy(const BoundarySpacePolicy policy); + BoundarySpacePolicy boundarySpacePolicy() const override; + void setBoundarySpacePolicy(const BoundarySpacePolicy policy) override; - virtual ConstructionMode constructionMode() const; - virtual void setConstructionMode(const ConstructionMode mode); + ConstructionMode constructionMode() const override; + void setConstructionMode(const ConstructionMode mode) override; - virtual OrderingMode orderingMode() const; - virtual void setOrderingMode(const OrderingMode mode); - virtual OrderingEmptySequence orderingEmptySequence() const; - virtual void setOrderingEmptySequence(const OrderingEmptySequence ordering); + OrderingMode orderingMode() const override; + void setOrderingMode(const OrderingMode mode) override; + OrderingEmptySequence orderingEmptySequence() const override; + void setOrderingEmptySequence(const OrderingEmptySequence ordering) override; - virtual QString defaultFunctionNamespace() const; - virtual void setDefaultFunctionNamespace(const QString &ns); + QString defaultFunctionNamespace() const override; + void setDefaultFunctionNamespace(const QString &ns) override; - virtual QString defaultElementNamespace() const; - virtual void setDefaultElementNamespace(const QString &ns); + QString defaultElementNamespace() const override; + void setDefaultElementNamespace(const QString &ns) override; - virtual InheritMode inheritMode() const; - virtual void setInheritMode(const InheritMode mode); + InheritMode inheritMode() const override; + void setInheritMode(const InheritMode mode) override; - virtual PreserveMode preserveMode() const; - virtual void setPreserveMode(const PreserveMode mode); + PreserveMode preserveMode() const override; + void setPreserveMode(const PreserveMode mode) override; - virtual ItemType::Ptr contextItemType() const; - virtual ItemType::Ptr currentItemType() const; + ItemType::Ptr contextItemType() const override; + ItemType::Ptr currentItemType() const override; - virtual StaticContext::Ptr copy() const; + StaticContext::Ptr copy() const override; - virtual ExternalVariableLoader::Ptr externalVariableLoader() const; - virtual ResourceLoader::Ptr resourceLoader() const; - virtual NamePool::Ptr namePool() const; - virtual void addLocation(const SourceLocationReflection *const reflection, - const QSourceLocation &location); - virtual LocationHash sourceLocations() const; - virtual QSourceLocation locationFor(const SourceLocationReflection *const reflection) const; - virtual const QAbstractUriResolver *uriResolver() const; + ExternalVariableLoader::Ptr externalVariableLoader() const override; + ResourceLoader::Ptr resourceLoader() const override; + NamePool::Ptr namePool() const override; + void addLocation(const SourceLocationReflection *const reflection, + const QSourceLocation &location) override; + LocationHash sourceLocations() const override; + QSourceLocation locationFor(const SourceLocationReflection *const reflection) const override; + const QAbstractUriResolver *uriResolver() const override; - virtual VariableSlotID currentRangeSlot() const; - virtual VariableSlotID allocateRangeSlot(); + VariableSlotID currentRangeSlot() const override; + VariableSlotID allocateRangeSlot() override; protected: DelegatingStaticContext(const StaticContext::Ptr &context); diff --git a/src/xmlpatterns/environment/qdynamiccontext_p.h b/src/xmlpatterns/environment/qdynamiccontext_p.h index 11ded99..edd8b36 100644 --- a/src/xmlpatterns/environment/qdynamiccontext_p.h +++ b/src/xmlpatterns/environment/qdynamiccontext_p.h @@ -137,7 +137,7 @@ namespace QPatternist virtual NodeBuilder::Ptr nodeBuilder(const QUrl &baseURI) const = 0; virtual ResourceLoader::Ptr resourceLoader() const = 0; virtual ExternalVariableLoader::Ptr externalVariableLoader() const = 0; - virtual NamePool::Ptr namePool() const = 0; + NamePool::Ptr namePool() const override = 0; /** * @short Returns the item that @c fn:current() returns. diff --git a/src/xmlpatterns/environment/qfocus_p.h b/src/xmlpatterns/environment/qfocus_p.h index c37f1bf..945b418 100644 --- a/src/xmlpatterns/environment/qfocus_p.h +++ b/src/xmlpatterns/environment/qfocus_p.h @@ -73,18 +73,18 @@ namespace QPatternist public: Focus(const DynamicContext::Ptr &prevContext); - virtual xsInteger contextPosition() const; - virtual Item contextItem() const; - virtual xsInteger contextSize(); + xsInteger contextPosition() const override; + Item contextItem() const override; + xsInteger contextSize() override; - virtual void setFocusIterator(const Item::Iterator::Ptr &it); - virtual Item::Iterator::Ptr focusIterator() const; + void setFocusIterator(const Item::Iterator::Ptr &it) override; + Item::Iterator::Ptr focusIterator() const override; /** * If there is no top level expression that sets the current item, * the focus should be used. This implementation ensures that. */ - virtual Item currentItem() const; + Item currentItem() const override; private: Item::Iterator::Ptr m_focusIterator; diff --git a/src/xmlpatterns/environment/qgenericdynamiccontext_p.h b/src/xmlpatterns/environment/qgenericdynamiccontext_p.h index bff7c92..820b077 100644 --- a/src/xmlpatterns/environment/qgenericdynamiccontext_p.h +++ b/src/xmlpatterns/environment/qgenericdynamiccontext_p.h @@ -79,53 +79,53 @@ namespace QPatternist QAbstractMessageHandler *const messageHandler, const LocationHash &locations); - virtual xsInteger contextPosition() const; + xsInteger contextPosition() const override; /** * @returns always @c null, the focus is always undefined when an GenericDynamicContext * is used. */ - virtual Item contextItem() const; - virtual xsInteger contextSize(); + Item contextItem() const override; + xsInteger contextSize() override; - virtual void setFocusIterator(const Item::Iterator::Ptr &it); - virtual Item::Iterator::Ptr focusIterator() const; + void setFocusIterator(const Item::Iterator::Ptr &it) override; + Item::Iterator::Ptr focusIterator() const override; - virtual QAbstractMessageHandler * messageHandler() const; - virtual QExplicitlySharedDataPointer<DayTimeDuration> implicitTimezone() const; - virtual QDateTime currentDateTime() const; + QAbstractMessageHandler * messageHandler() const override; + QExplicitlySharedDataPointer<DayTimeDuration> implicitTimezone() const override; + QDateTime currentDateTime() const override; - virtual QAbstractXmlReceiver *outputReceiver() const; + QAbstractXmlReceiver *outputReceiver() const override; void setOutputReceiver(QAbstractXmlReceiver *const receiver); - virtual NodeBuilder::Ptr nodeBuilder(const QUrl &baseURI) const; + NodeBuilder::Ptr nodeBuilder(const QUrl &baseURI) const override; void setNodeBuilder(NodeBuilder::Ptr &builder); - virtual ResourceLoader::Ptr resourceLoader() const; + ResourceLoader::Ptr resourceLoader() const override; void setResourceLoader(const ResourceLoader::Ptr &loader); - virtual ExternalVariableLoader::Ptr externalVariableLoader() const; + ExternalVariableLoader::Ptr externalVariableLoader() const override; void setExternalVariableLoader(const ExternalVariableLoader::Ptr &loader); - virtual NamePool::Ptr namePool() const; - virtual QSourceLocation locationFor(const SourceLocationReflection *const reflection) const; - virtual void addNodeModel(const QAbstractXmlNodeModel::Ptr &nm); - virtual const QAbstractUriResolver *uriResolver() const; - virtual ItemCacheCell &globalItemCacheCell(const VariableSlotID slot); - virtual ItemSequenceCacheCell::Vector &globalItemSequenceCacheCells(const VariableSlotID slot); + NamePool::Ptr namePool() const override; + QSourceLocation locationFor(const SourceLocationReflection *const reflection) const override; + void addNodeModel(const QAbstractXmlNodeModel::Ptr &nm) override; + const QAbstractUriResolver *uriResolver() const override; + ItemCacheCell &globalItemCacheCell(const VariableSlotID slot) override; + ItemSequenceCacheCell::Vector &globalItemSequenceCacheCells(const VariableSlotID slot) override; void setUriResolver(const QAbstractUriResolver *const resolver); /** * We return a null item, we have no focus. */ - virtual Item currentItem() const; + Item currentItem() const override; /** * @short Returns always @c null, since we're always * a top-level context. */ - virtual DynamicContext::Ptr previousContext() const; + DynamicContext::Ptr previousContext() const override; - virtual QExplicitlySharedDataPointer<TemplateMode> currentTemplateMode() const; + QExplicitlySharedDataPointer<TemplateMode> currentTemplateMode() const override; private: QAbstractMessageHandler * m_messageHandler; diff --git a/src/xmlpatterns/environment/qgenericstaticcontext_p.h b/src/xmlpatterns/environment/qgenericstaticcontext_p.h index b80b3e3..cc219e3 100644 --- a/src/xmlpatterns/environment/qgenericstaticcontext_p.h +++ b/src/xmlpatterns/environment/qgenericstaticcontext_p.h @@ -88,79 +88,79 @@ namespace QPatternist const FunctionFactory::Ptr &factory, const QXmlQuery::QueryLanguage lang); - virtual NamespaceResolver::Ptr namespaceBindings() const; - virtual void setNamespaceBindings(const NamespaceResolver::Ptr &); + NamespaceResolver::Ptr namespaceBindings() const override; + void setNamespaceBindings(const NamespaceResolver::Ptr &) override; - virtual FunctionFactory::Ptr functionSignatures() const; - virtual SchemaTypeFactory::Ptr schemaDefinitions() const; + FunctionFactory::Ptr functionSignatures() const override; + SchemaTypeFactory::Ptr schemaDefinitions() const override; /** * Returns a DynamicContext used for evaluation at compile time. * * @bug The DynamicContext isn't stable. It should be cached privately. */ - virtual DynamicContext::Ptr dynamicContext() const; + DynamicContext::Ptr dynamicContext() const override; - virtual QUrl baseURI() const; - virtual void setBaseURI(const QUrl &uri); + QUrl baseURI() const override; + void setBaseURI(const QUrl &uri) override; - virtual bool compatModeEnabled() const; - virtual void setCompatModeEnabled(const bool newVal); + bool compatModeEnabled() const override; + void setCompatModeEnabled(const bool newVal) override; /** * @returns always the Unicode codepoint collation URI */ - virtual QUrl defaultCollation() const; + QUrl defaultCollation() const override; - virtual QAbstractMessageHandler * messageHandler() const; + QAbstractMessageHandler * messageHandler() const override; - virtual void setDefaultCollation(const QUrl &uri); + void setDefaultCollation(const QUrl &uri) override; - virtual BoundarySpacePolicy boundarySpacePolicy() const; - virtual void setBoundarySpacePolicy(const BoundarySpacePolicy policy); + BoundarySpacePolicy boundarySpacePolicy() const override; + void setBoundarySpacePolicy(const BoundarySpacePolicy policy) override; - virtual ConstructionMode constructionMode() const; - virtual void setConstructionMode(const ConstructionMode mode); + ConstructionMode constructionMode() const override; + void setConstructionMode(const ConstructionMode mode) override; - virtual OrderingMode orderingMode() const; - virtual void setOrderingMode(const OrderingMode mode); - virtual OrderingEmptySequence orderingEmptySequence() const; - virtual void setOrderingEmptySequence(const OrderingEmptySequence ordering); + OrderingMode orderingMode() const override; + void setOrderingMode(const OrderingMode mode) override; + OrderingEmptySequence orderingEmptySequence() const override; + void setOrderingEmptySequence(const OrderingEmptySequence ordering) override; - virtual QString defaultFunctionNamespace() const; - virtual void setDefaultFunctionNamespace(const QString &ns); + QString defaultFunctionNamespace() const override; + void setDefaultFunctionNamespace(const QString &ns) override; - virtual QString defaultElementNamespace() const; - virtual void setDefaultElementNamespace(const QString &ns); + QString defaultElementNamespace() const override; + void setDefaultElementNamespace(const QString &ns) override; - virtual InheritMode inheritMode() const; - virtual void setInheritMode(const InheritMode mode); + InheritMode inheritMode() const override; + void setInheritMode(const InheritMode mode) override; - virtual PreserveMode preserveMode() const; - virtual void setPreserveMode(const PreserveMode mode); + PreserveMode preserveMode() const override; + void setPreserveMode(const PreserveMode mode) override; - virtual ItemType::Ptr contextItemType() const; + ItemType::Ptr contextItemType() const override; void setContextItemType(const ItemType::Ptr &type); - virtual ItemType::Ptr currentItemType() const; + ItemType::Ptr currentItemType() const override; - virtual StaticContext::Ptr copy() const; + StaticContext::Ptr copy() const override; - virtual ResourceLoader::Ptr resourceLoader() const; + ResourceLoader::Ptr resourceLoader() const override; void setResourceLoader(const ResourceLoader::Ptr &loader); - virtual ExternalVariableLoader::Ptr externalVariableLoader() const; + ExternalVariableLoader::Ptr externalVariableLoader() const override; void setExternalVariableLoader(const ExternalVariableLoader::Ptr &loader); - virtual NamePool::Ptr namePool() const; + NamePool::Ptr namePool() const override; - virtual void addLocation(const SourceLocationReflection *const reflection, - const QSourceLocation &location); - virtual QSourceLocation locationFor(const SourceLocationReflection *const reflection) const; + void addLocation(const SourceLocationReflection *const reflection, + const QSourceLocation &location) override; + QSourceLocation locationFor(const SourceLocationReflection *const reflection) const override; - virtual LocationHash sourceLocations() const; - virtual QAbstractUriResolver *uriResolver() const; + LocationHash sourceLocations() const override; + QAbstractUriResolver *uriResolver() const override; - virtual VariableSlotID currentRangeSlot() const; - virtual VariableSlotID allocateRangeSlot(); + VariableSlotID currentRangeSlot() const override; + VariableSlotID allocateRangeSlot() override; private: BoundarySpacePolicy m_boundarySpacePolicy; diff --git a/src/xmlpatterns/environment/qreceiverdynamiccontext_p.h b/src/xmlpatterns/environment/qreceiverdynamiccontext_p.h index 96374b8..cdf7c46 100644 --- a/src/xmlpatterns/environment/qreceiverdynamiccontext_p.h +++ b/src/xmlpatterns/environment/qreceiverdynamiccontext_p.h @@ -71,7 +71,7 @@ namespace QPatternist ReceiverDynamicContext(const DynamicContext::Ptr &prevContext, QAbstractXmlReceiver *const receiver); - virtual QAbstractXmlReceiver *outputReceiver() const; + QAbstractXmlReceiver *outputReceiver() const override; private: QAbstractXmlReceiver *const m_receiver; diff --git a/src/xmlpatterns/environment/qstackcontextbase_p.h b/src/xmlpatterns/environment/qstackcontextbase_p.h index 3603dc9..98abbd1 100644 --- a/src/xmlpatterns/environment/qstackcontextbase_p.h +++ b/src/xmlpatterns/environment/qstackcontextbase_p.h @@ -79,21 +79,21 @@ namespace QPatternist */ StackContextBase(const DynamicContext::Ptr &prevContext); - virtual void setRangeVariable(const VariableSlotID slotNumber, - const Item &newValue); - virtual Item rangeVariable(const VariableSlotID slotNumber) const; + void setRangeVariable(const VariableSlotID slotNumber, + const Item &newValue) override; + Item rangeVariable(const VariableSlotID slotNumber) const override; - virtual void setExpressionVariable(const VariableSlotID slotNumber, - const Expression::Ptr &newValue); - virtual Expression::Ptr expressionVariable(const VariableSlotID slotNumber) const; + void setExpressionVariable(const VariableSlotID slotNumber, + const Expression::Ptr &newValue) override; + Expression::Ptr expressionVariable(const VariableSlotID slotNumber) const override; - virtual Item::Iterator::Ptr positionIterator(const VariableSlotID slot) const; - virtual void setPositionIterator(const VariableSlotID slot, - const Item::Iterator::Ptr &newValue); - virtual ItemCacheCell &itemCacheCell(const VariableSlotID slot); - virtual ItemSequenceCacheCell::Vector &itemSequenceCacheCells(const VariableSlotID slot); + Item::Iterator::Ptr positionIterator(const VariableSlotID slot) const override; + void setPositionIterator(const VariableSlotID slot, + const Item::Iterator::Ptr &newValue) override; + ItemCacheCell &itemCacheCell(const VariableSlotID slot) override; + ItemSequenceCacheCell::Vector &itemSequenceCacheCells(const VariableSlotID slot) override; - virtual DynamicContext::TemplateParameterHash &templateParameterStore(); + DynamicContext::TemplateParameterHash &templateParameterStore() override; protected: /** diff --git a/src/xmlpatterns/environment/qstaticbaseuricontext_p.h b/src/xmlpatterns/environment/qstaticbaseuricontext_p.h index 1097c18..01b7d7b 100644 --- a/src/xmlpatterns/environment/qstaticbaseuricontext_p.h +++ b/src/xmlpatterns/environment/qstaticbaseuricontext_p.h @@ -73,7 +73,7 @@ namespace QPatternist StaticBaseURIContext(const QUrl &bURI, const StaticContext::Ptr &prevContext); - virtual QUrl baseURI() const; + QUrl baseURI() const override; private: const QUrl m_baseURI; diff --git a/src/xmlpatterns/environment/qstaticcompatibilitycontext_p.h b/src/xmlpatterns/environment/qstaticcompatibilitycontext_p.h index 46b8a8a..be61412 100644 --- a/src/xmlpatterns/environment/qstaticcompatibilitycontext_p.h +++ b/src/xmlpatterns/environment/qstaticcompatibilitycontext_p.h @@ -71,7 +71,7 @@ namespace QPatternist /** * Returns always @c true. */ - virtual bool compatModeEnabled() const; + bool compatModeEnabled() const override; }; } diff --git a/src/xmlpatterns/environment/qstaticcontext_p.h b/src/xmlpatterns/environment/qstaticcontext_p.h index ba9e0f6..b1506a8 100644 --- a/src/xmlpatterns/environment/qstaticcontext_p.h +++ b/src/xmlpatterns/environment/qstaticcontext_p.h @@ -256,7 +256,7 @@ namespace QPatternist virtual ExternalVariableLoader::Ptr externalVariableLoader() const = 0; virtual ResourceLoader::Ptr resourceLoader() const = 0; - virtual NamePool::Ptr namePool() const = 0; + NamePool::Ptr namePool() const override = 0; /** * @short Adds @p location for @p reflection. diff --git a/src/xmlpatterns/environment/qstaticcurrentcontext_p.h b/src/xmlpatterns/environment/qstaticcurrentcontext_p.h index 5e45483..fcea6f3 100644 --- a/src/xmlpatterns/environment/qstaticcurrentcontext_p.h +++ b/src/xmlpatterns/environment/qstaticcurrentcontext_p.h @@ -72,7 +72,7 @@ namespace QPatternist /** * @returns the type passed in the constructor. */ - virtual ItemType::Ptr currentItemType() const; + ItemType::Ptr currentItemType() const override; private: const ItemType::Ptr m_currentItemType; diff --git a/src/xmlpatterns/environment/qstaticfocuscontext_p.h b/src/xmlpatterns/environment/qstaticfocuscontext_p.h index ea62624..fc8f4fe 100644 --- a/src/xmlpatterns/environment/qstaticfocuscontext_p.h +++ b/src/xmlpatterns/environment/qstaticfocuscontext_p.h @@ -73,7 +73,7 @@ namespace QPatternist /** * @returns the type passed in the constructor. */ - virtual ItemType::Ptr contextItemType() const; + ItemType::Ptr contextItemType() const override; private: const ItemType::Ptr m_contextItemType; diff --git a/src/xmlpatterns/environment/qstaticnamespacecontext_p.h b/src/xmlpatterns/environment/qstaticnamespacecontext_p.h index 3ad3274..7b98831 100644 --- a/src/xmlpatterns/environment/qstaticnamespacecontext_p.h +++ b/src/xmlpatterns/environment/qstaticnamespacecontext_p.h @@ -71,7 +71,7 @@ namespace QPatternist /** * @returns the resolver passed in the constructor. */ - virtual NamespaceResolver::Ptr namespaceBindings() const; + NamespaceResolver::Ptr namespaceBindings() const override; private: const NamespaceResolver::Ptr m_namespaceBindings; diff --git a/src/xmlpatterns/expr/qandexpression_p.h b/src/xmlpatterns/expr/qandexpression_p.h index 6dd0304..27f45b6 100644 --- a/src/xmlpatterns/expr/qandexpression_p.h +++ b/src/xmlpatterns/expr/qandexpression_p.h @@ -73,17 +73,17 @@ namespace QPatternist AndExpression(const Expression::Ptr &operand1, const Expression::Ptr &operand2); - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; /** * @returns always CommonSequenceTypes::ExactlyOneBoolean */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; }; } diff --git a/src/xmlpatterns/expr/qapplytemplate_p.h b/src/xmlpatterns/expr/qapplytemplate_p.h index 63d81c4..8f7cb00 100644 --- a/src/xmlpatterns/expr/qapplytemplate_p.h +++ b/src/xmlpatterns/expr/qapplytemplate_p.h @@ -90,11 +90,11 @@ namespace QPatternist const WithParam::Hash &withParams, const TemplateMode::Ptr &defaultMode); - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; - virtual SequenceType::Ptr staticType() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual Properties properties() const; + SequenceType::Ptr staticType() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + Properties properties() const override; /** * The only reason this function exists, is in order to convert @@ -108,11 +108,11 @@ namespace QPatternist inline TemplateMode::Ptr mode() const; - virtual bool configureRecursion(const CallTargetDescription::Ptr &sign); - virtual Expression::Ptr body() const; - virtual CallTargetDescription::Ptr callTargetDescription() const; + bool configureRecursion(const CallTargetDescription::Ptr &sign) override; + Expression::Ptr body() const override; + CallTargetDescription::Ptr callTargetDescription() const override; - Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; private: typedef QExplicitlySharedDataPointer<const ApplyTemplate> ConstPtr; diff --git a/src/xmlpatterns/expr/qargumentreference_p.h b/src/xmlpatterns/expr/qargumentreference_p.h index 3705f73..f2ffafb 100644 --- a/src/xmlpatterns/expr/qargumentreference_p.h +++ b/src/xmlpatterns/expr/qargumentreference_p.h @@ -71,12 +71,12 @@ namespace QPatternist ArgumentReference(const SequenceType::Ptr &sourceType, const VariableSlotID slot); - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual SequenceType::Ptr staticType() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual ID id() const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + SequenceType::Ptr staticType() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + ID id() const override; private: const SequenceType::Ptr m_type; diff --git a/src/xmlpatterns/expr/qarithmeticexpression.cpp b/src/xmlpatterns/expr/qarithmeticexpression.cpp index f21dbcb..a810041 100644 --- a/src/xmlpatterns/expr/qarithmeticexpression.cpp +++ b/src/xmlpatterns/expr/qarithmeticexpression.cpp @@ -98,7 +98,7 @@ public: { } - virtual const SourceLocationReflection *actualReflection() const + const SourceLocationReflection *actualReflection() const override { return m_reflection; } diff --git a/src/xmlpatterns/expr/qarithmeticexpression_p.h b/src/xmlpatterns/expr/qarithmeticexpression_p.h index e09635b..f2201f7 100644 --- a/src/xmlpatterns/expr/qarithmeticexpression_p.h +++ b/src/xmlpatterns/expr/qarithmeticexpression_p.h @@ -78,14 +78,14 @@ namespace QPatternist const AtomicMathematician::Operator op, const Expression::Ptr &operand2); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; - virtual SequenceType::Ptr staticType() const; - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::Ptr staticType() const override; + SequenceType::List expectedOperandTypes() const override; AtomicMathematician::Operator operatorID() const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; static Item flexiblyCalculate(const Item &op1, const AtomicMathematician::Operator op, @@ -105,7 +105,7 @@ namespace QPatternist const SourceLocationReflection *const reflection, const ReportContext::ErrorCode code = ReportContext::XPTY0004, const bool isCompat = false); - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; protected: diff --git a/src/xmlpatterns/expr/qattributeconstructor_p.h b/src/xmlpatterns/expr/qattributeconstructor_p.h index 317d2be..598f5e1 100644 --- a/src/xmlpatterns/expr/qattributeconstructor_p.h +++ b/src/xmlpatterns/expr/qattributeconstructor_p.h @@ -71,25 +71,25 @@ namespace QPatternist AttributeConstructor(const Expression::Ptr &operand1, const Expression::Ptr &operand2); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; /** * The first operand must be exactly one @c xs:QName, and the second * argument can be zero or more items. */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; /** * @returns always IDAttributeConstructor. */ - virtual ID id() const; + ID id() const override; - virtual Properties properties() const; + Properties properties() const override; private: static inline QString processValue(const QXmlName name, diff --git a/src/xmlpatterns/expr/qattributenamevalidator_p.h b/src/xmlpatterns/expr/qattributenamevalidator_p.h index c61d43b..8a66b2a 100644 --- a/src/xmlpatterns/expr/qattributenamevalidator_p.h +++ b/src/xmlpatterns/expr/qattributenamevalidator_p.h @@ -73,18 +73,18 @@ namespace QPatternist public: AttributeNameValidator(const Expression::Ptr &source); - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; /** * @returns the static type of its operand. This is returned as opposed * CommonSequenceTypes::ExactlyOneQName, since the operand might return a subtype * of @c xs:QName. */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; }; } diff --git a/src/xmlpatterns/expr/qaxisstep_p.h b/src/xmlpatterns/expr/qaxisstep_p.h index 30aa630..68d62e2 100644 --- a/src/xmlpatterns/expr/qaxisstep_p.h +++ b/src/xmlpatterns/expr/qaxisstep_p.h @@ -70,8 +70,8 @@ namespace QPatternist AxisStep(const QXmlNodeModelIndex::Axis axis, const ItemType::Ptr &nodeTest); - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const override; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; /** * Returns @p node if it matches the node test this step is using, otherwise @c null. @@ -79,23 +79,23 @@ namespace QPatternist inline Item mapToItem(const QXmlNodeModelIndex &node, const DynamicContext::Ptr &context) const; - virtual SequenceType::List expectedOperandTypes() const; - virtual SequenceType::Ptr staticType() const; + SequenceType::List expectedOperandTypes() const override; + SequenceType::Ptr staticType() const override; /** * Rewrites to ParentNodeAxis, if possible. */ - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; /** * @returns always BuiltinTypes::node; */ - virtual ItemType::Ptr expectedContextItemType() const; + ItemType::Ptr expectedContextItemType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; - virtual Properties properties() const; + Properties properties() const override; /** * @returns the axis this step is using. @@ -124,8 +124,8 @@ namespace QPatternist */ static QString axisName(const QXmlNodeModelIndex::Axis axis); - virtual ID id() const; - virtual PatternPriority patternPriority() const; + ID id() const override; + PatternPriority patternPriority() const override; inline void setAxis(const QXmlNodeModelIndex::Axis newAxis); diff --git a/src/xmlpatterns/expr/qcalltemplate_p.h b/src/xmlpatterns/expr/qcalltemplate_p.h index 136b8da..17ec7c5 100644 --- a/src/xmlpatterns/expr/qcalltemplate_p.h +++ b/src/xmlpatterns/expr/qcalltemplate_p.h @@ -73,14 +73,14 @@ namespace QPatternist CallTemplate(const QXmlName &name, const WithParam::Hash &withParams); - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; - virtual SequenceType::Ptr staticType() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual Properties properties() const; - virtual Properties dependencies() const; + SequenceType::Ptr staticType() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + Properties properties() const override; + Properties dependencies() const override; /** * This is a bit complicated by that we have two required types, one @@ -91,8 +91,8 @@ namespace QPatternist * @see <a href="http://www.w3.org/TR/xslt20/#with-param">XSL * Transformations (XSLT) Version 2.0, 10.1.1 Passing Parameters to Templates</a> */ - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; inline void setTemplate(const Template::Ptr &templ) @@ -100,9 +100,9 @@ namespace QPatternist m_template = templ; } - virtual bool configureRecursion(const CallTargetDescription::Ptr &sign); - virtual Expression::Ptr body() const; - virtual CallTargetDescription::Ptr callTargetDescription() const; + bool configureRecursion(const CallTargetDescription::Ptr &sign) override; + Expression::Ptr body() const override; + CallTargetDescription::Ptr callTargetDescription() const override; private: Template::Ptr m_template; }; diff --git a/src/xmlpatterns/expr/qcastableas_p.h b/src/xmlpatterns/expr/qcastableas_p.h index eff5618..3412be2 100644 --- a/src/xmlpatterns/expr/qcastableas_p.h +++ b/src/xmlpatterns/expr/qcastableas_p.h @@ -73,7 +73,7 @@ namespace QPatternist CastableAs(const Expression::Ptr &operand, const SequenceType::Ptr &targetType); - virtual bool evaluateEBV(const DynamicContext::Ptr &) const; + bool evaluateEBV(const DynamicContext::Ptr &) const override; /** * Overridden to const fold to @c true when the target type @@ -81,14 +81,14 @@ namespace QPatternist * the type identical to the target type, <tt>xs:string</tt>, * and <tt>xs:untypedAtomic</tt>. */ - virtual Expression::Ptr compress(const StaticContext::Ptr &context); - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr compress(const StaticContext::Ptr &context) override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; - virtual SequenceType::List expectedOperandTypes() const; - virtual SequenceType::Ptr staticType() const; + SequenceType::List expectedOperandTypes() const override; + SequenceType::Ptr staticType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; inline ItemType::Ptr targetType() const { diff --git a/src/xmlpatterns/expr/qcastas_p.h b/src/xmlpatterns/expr/qcastas_p.h index 3aeeef2..66fcf43 100644 --- a/src/xmlpatterns/expr/qcastas_p.h +++ b/src/xmlpatterns/expr/qcastas_p.h @@ -91,9 +91,9 @@ namespace QPatternist CastAs(const Expression::Ptr &source, const SequenceType::Ptr &targetType); - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; /** * @returns a SequenceType where the ItemType is this CastAs's @@ -101,21 +101,21 @@ namespace QPatternist * source operand to reflect whether this CastAs always will evaluate to * exactly-one or zero-or-one values. */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; /** * Overridden in order to check that casting to an abstract type * is not attempted. */ - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; /** * If the target type is the same as the source type, it is rewritten * to the operand. */ - virtual Expression::Ptr compress(const StaticContext::Ptr &context); - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + Expression::Ptr compress(const StaticContext::Ptr &context) override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; inline ItemType::Ptr targetType() const { diff --git a/src/xmlpatterns/expr/qcollationchecker_p.h b/src/xmlpatterns/expr/qcollationchecker_p.h index ed04d43..15431e4 100644 --- a/src/xmlpatterns/expr/qcollationchecker_p.h +++ b/src/xmlpatterns/expr/qcollationchecker_p.h @@ -72,19 +72,19 @@ namespace QPatternist public: CollationChecker(const Expression::Ptr &source); - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; /** * Expects exactly one string. */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; /** * @returns its operand's static type. */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; }; } diff --git a/src/xmlpatterns/expr/qcombinenodes_p.h b/src/xmlpatterns/expr/qcombinenodes_p.h index 8499135..a56621b 100644 --- a/src/xmlpatterns/expr/qcombinenodes_p.h +++ b/src/xmlpatterns/expr/qcombinenodes_p.h @@ -79,16 +79,16 @@ namespace QPatternist const Operator op, const Expression::Ptr &operand2); - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; - virtual SequenceType::Ptr staticType() const; - virtual SequenceType::List expectedOperandTypes() const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; + SequenceType::Ptr staticType() const override; + SequenceType::List expectedOperandTypes() const override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; Operator operatorID() const; - virtual ID id() const; + ID id() const override; /** * Determines the string representation for operator @p op. @@ -98,7 +98,7 @@ namespace QPatternist */ static QString displayName(const Operator op); - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; private: const Operator m_operator; diff --git a/src/xmlpatterns/expr/qcommentconstructor_p.h b/src/xmlpatterns/expr/qcommentconstructor_p.h index 6190a8d..4e7312d 100644 --- a/src/xmlpatterns/expr/qcommentconstructor_p.h +++ b/src/xmlpatterns/expr/qcommentconstructor_p.h @@ -70,19 +70,19 @@ namespace QPatternist public: CommentConstructor(const Expression::Ptr &operand); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; /** * The first operand must be exactly one @c xs:string. */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; - virtual Properties properties() const; + Properties properties() const override; private: inline QString evaluateContent(const DynamicContext::Ptr &context) const; diff --git a/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h b/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h index fa19bec..6d5c1dc 100644 --- a/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h +++ b/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h @@ -70,12 +70,12 @@ namespace QPatternist ComputedNamespaceConstructor(const Expression::Ptr &prefix, const Expression::Ptr &namespaceURI); - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; /** * @returns a list containing one CommonSequenceTypes::ExactlyOneString instance. */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; /** * The static type is exactly one attribute node. It's unclear what @@ -84,10 +84,10 @@ namespace QPatternist * conceptually correct, since a namespace node isn't an attribute * node. */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual Expression::Properties properties() const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + Expression::Properties properties() const override; }; } diff --git a/src/xmlpatterns/expr/qcontextitem_p.h b/src/xmlpatterns/expr/qcontextitem_p.h index 6c48e72..a59837c 100644 --- a/src/xmlpatterns/expr/qcontextitem_p.h +++ b/src/xmlpatterns/expr/qcontextitem_p.h @@ -77,39 +77,39 @@ namespace QPatternist { } - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual SequenceType::Ptr staticType() const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + SequenceType::Ptr staticType() const override; /** * @returns always DisableElimination and RequiresContextItem */ - virtual Expression::Properties properties() const; + Expression::Properties properties() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; /** * Overridden to store a pointer to StaticContext::contextItemType(). */ - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; /** * Overridden to store a pointer to StaticContext::contextItemType(). */ - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; /** * @returns always IDContextItem */ - virtual ID id() const; + ID id() const override; /** * @returns always BuiltinTypes::item; */ - virtual ItemType::Ptr expectedContextItemType() const; + ItemType::Ptr expectedContextItemType() const override; - virtual const SourceLocationReflection *actualReflection() const; - virtual void announceFocusType(const ItemType::Ptr &type); + const SourceLocationReflection *actualReflection() const override; + void announceFocusType(const ItemType::Ptr &type) override; private: ItemType::Ptr m_itemType; diff --git a/src/xmlpatterns/expr/qcopyof_p.h b/src/xmlpatterns/expr/qcopyof_p.h index d481f67..d8148d2 100644 --- a/src/xmlpatterns/expr/qcopyof_p.h +++ b/src/xmlpatterns/expr/qcopyof_p.h @@ -79,28 +79,28 @@ namespace QPatternist const bool inheritNSS, const bool preserveNSS); - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; /** * @returns always the SequenceType passed in the constructor to this class. That is, the * SequenceType that the operand must conform to. */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; /** * @returns a list containing one CommonSequenceTypes::ZeroOrMoreItems */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; inline Item mapToItem(const Item &source, const DynamicContext::Ptr &context) const; - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; - virtual Properties properties() const; - virtual ItemType::Ptr expectedContextItemType() const; + Properties properties() const override; + ItemType::Ptr expectedContextItemType() const override; private: typedef QExplicitlySharedDataPointer<const CopyOf> ConstPtr; diff --git a/src/xmlpatterns/expr/qcurrentitemstore_p.h b/src/xmlpatterns/expr/qcurrentitemstore_p.h index 63bfb4e..7ef9a54 100644 --- a/src/xmlpatterns/expr/qcurrentitemstore_p.h +++ b/src/xmlpatterns/expr/qcurrentitemstore_p.h @@ -69,23 +69,23 @@ namespace QPatternist public: CurrentItemStore(const Expression::Ptr &operand); - virtual bool evaluateEBV(const DynamicContext::Ptr &) const; - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; + bool evaluateEBV(const DynamicContext::Ptr &) const override; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const override; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; - virtual SequenceType::List expectedOperandTypes() const; - virtual Expression::Ptr compress(const StaticContext::Ptr &context); - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + SequenceType::List expectedOperandTypes() const override; + Expression::Ptr compress(const StaticContext::Ptr &context) override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; - virtual Properties properties() const; + Properties properties() const override; /** * @returns the staticType() of its operand. */ - virtual SequenceType::Ptr staticType() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual const SourceLocationReflection *actualReflection() const; + SequenceType::Ptr staticType() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + const SourceLocationReflection *actualReflection() const override; private: static inline StaticContext::Ptr newStaticContext(const StaticContext::Ptr &context); diff --git a/src/xmlpatterns/expr/qdocumentconstructor_p.h b/src/xmlpatterns/expr/qdocumentconstructor_p.h index e3df493..04cad26 100644 --- a/src/xmlpatterns/expr/qdocumentconstructor_p.h +++ b/src/xmlpatterns/expr/qdocumentconstructor_p.h @@ -72,20 +72,20 @@ namespace QPatternist public: DocumentConstructor(const Expression::Ptr &operand); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; /** * The first operand must be exactly one @c xs:string. */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; - virtual Properties properties() const; - virtual SequenceType::Ptr staticType() const; + Properties properties() const override; + SequenceType::Ptr staticType() const override; private: QUrl m_staticBaseURI; diff --git a/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h b/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h index d5fd1dd..17575c1 100644 --- a/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h +++ b/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h @@ -76,27 +76,27 @@ namespace QPatternist const DynamicContext::Ptr &context, const Expression::ConstPtr &expr); - virtual void namespaceBinding(const QXmlName &nb); - virtual void characters(const QStringRef &value); - virtual void comment(const QString &value); + void namespaceBinding(const QXmlName &nb) override; + void characters(const QStringRef &value) override; + void comment(const QString &value) override; - virtual void startElement(const QXmlName &name); + void startElement(const QXmlName &name) override; - virtual void endElement(); + void endElement() override; - virtual void attribute(const QXmlName &name, - const QStringRef &value); + void attribute(const QXmlName &name, + const QStringRef &value) override; - virtual void processingInstruction(const QXmlName &name, - const QString &value); + void processingInstruction(const QXmlName &name, + const QString &value) override; - virtual void item(const Item &item); + void item(const Item &item) override; - virtual void startDocument(); - virtual void endDocument(); - virtual void atomicValue(const QVariant &value); - virtual void startOfSequence(); - virtual void endOfSequence(); + void startDocument() override; + void endDocument() override; + void atomicValue(const QVariant &value) override; + void startOfSequence() override; + void endOfSequence() override; private: QAbstractXmlReceiver *const m_receiver; diff --git a/src/xmlpatterns/expr/qdynamiccontextstore_p.h b/src/xmlpatterns/expr/qdynamiccontextstore_p.h index 66080ca..3845143 100644 --- a/src/xmlpatterns/expr/qdynamiccontextstore_p.h +++ b/src/xmlpatterns/expr/qdynamiccontextstore_p.h @@ -69,17 +69,17 @@ namespace QPatternist DynamicContextStore(const Expression::Ptr &operand, const DynamicContext::Ptr &context); - virtual bool evaluateEBV(const DynamicContext::Ptr &) const; - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; + bool evaluateEBV(const DynamicContext::Ptr &) const override; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const override; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; /** * @returns the staticType() of its operand. */ - virtual SequenceType::Ptr staticType() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual const SourceLocationReflection *actualReflection() const; + SequenceType::Ptr staticType() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + const SourceLocationReflection *actualReflection() const override; private: DynamicContext *m_context; diff --git a/src/xmlpatterns/expr/qelementconstructor_p.h b/src/xmlpatterns/expr/qelementconstructor_p.h index 00492d7..ac63f9d 100644 --- a/src/xmlpatterns/expr/qelementconstructor_p.h +++ b/src/xmlpatterns/expr/qelementconstructor_p.h @@ -74,21 +74,21 @@ namespace QPatternist const Expression::Ptr &operand2, const bool isXSLT); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; /** * The first operand must be exactly one @c xs:QName, and the second * argument can be zero or more items. */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); - virtual Properties properties() const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; + Properties properties() const override; private: QUrl m_staticBaseURI; diff --git a/src/xmlpatterns/expr/qemptycontainer_p.h b/src/xmlpatterns/expr/qemptycontainer_p.h index 5a8c824..18cc0cb 100644 --- a/src/xmlpatterns/expr/qemptycontainer_p.h +++ b/src/xmlpatterns/expr/qemptycontainer_p.h @@ -68,24 +68,24 @@ namespace QPatternist /** * @returns always an empty list. */ - virtual Expression::List operands() const; + Expression::List operands() const override; /** * Does nothing, since sub-classes has no operands. Calling * it makes hence no sense, and it also results in an assert crash. */ - virtual void setOperands(const Expression::List &); + void setOperands(const Expression::List &) override; protected: /** * @returns always @c true */ - virtual bool compressOperands(const StaticContext::Ptr &context); + bool compressOperands(const StaticContext::Ptr &context) override; /** * @returns always an empty list since it has no operands. */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; }; } diff --git a/src/xmlpatterns/expr/qemptysequence_p.h b/src/xmlpatterns/expr/qemptysequence_p.h index e487d3f..8a9a61d 100644 --- a/src/xmlpatterns/expr/qemptysequence_p.h +++ b/src/xmlpatterns/expr/qemptysequence_p.h @@ -92,22 +92,22 @@ namespace QPatternist /** * @returns always an empty iterator, an instance of EmptyIterator. */ - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const override; /** * @returns always @c null. */ - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; /** * Does nothing. */ - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &) const; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &) const override; /** * @returns always @c false. */ - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; /** * @returns always CommonSequenceTypes::Empty @@ -117,11 +117,11 @@ namespace QPatternist /** * @returns always CommonSequenceTypes::Empty */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual ID id() const; - virtual Properties properties() const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + ID id() const override; + Properties properties() const override; }; } diff --git a/src/xmlpatterns/expr/qevaluationcache_p.h b/src/xmlpatterns/expr/qevaluationcache_p.h index d3ac422..c0e7b45 100644 --- a/src/xmlpatterns/expr/qevaluationcache_p.h +++ b/src/xmlpatterns/expr/qevaluationcache_p.h @@ -96,22 +96,22 @@ namespace QPatternist const VariableDeclaration::Ptr &varDecl, const VariableSlotID slot); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + Expression::Ptr compress(const StaticContext::Ptr &context) override; - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; /** * The first operand must be exactly one @c xs:string. */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual Properties properties() const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); - virtual const SourceLocationReflection *actualReflection() const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + Properties properties() const override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; + const SourceLocationReflection *actualReflection() const override; inline VariableSlotID slot() const { diff --git a/src/xmlpatterns/expr/qexpression_p.h b/src/xmlpatterns/expr/qexpression_p.h index 3e15343..9d74f11 100644 --- a/src/xmlpatterns/expr/qexpression_p.h +++ b/src/xmlpatterns/expr/qexpression_p.h @@ -759,12 +759,12 @@ namespace QPatternist /** * @short Returns @c this. */ - virtual const SourceLocationReflection *actualReflection() const; + const SourceLocationReflection *actualReflection() const override; /** * Reimplementation of SourceLocationReflection::description(). */ - virtual QString description() const; + QString description() const override; /** * When this function is called, it signals that the parent will create diff --git a/src/xmlpatterns/expr/qexpressionsequence_p.h b/src/xmlpatterns/expr/qexpressionsequence_p.h index 0818e90..d860296 100644 --- a/src/xmlpatterns/expr/qexpressionsequence_p.h +++ b/src/xmlpatterns/expr/qexpressionsequence_p.h @@ -77,15 +77,15 @@ namespace QPatternist */ ExpressionSequence(const Expression::List &operands); - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const override; /** * Forwards the call to its children. */ - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; - virtual SequenceType::List expectedOperandTypes() const; - virtual SequenceType::Ptr staticType() const; + SequenceType::List expectedOperandTypes() const override; + SequenceType::Ptr staticType() const override; /** * Removes any empty sequences, typically "()", from its list of children. If @@ -96,21 +96,21 @@ namespace QPatternist * optimizations have rewritten themselves into empty sequences. Thus, * saving memory consumption and runtime overhead. */ - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; inline Item::Iterator::Ptr mapToSequence(const Expression::Ptr &, const DynamicContext::Ptr &) const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; /** * @returns Expression::DisableElimination, plus the union * of all this ExpressionSequence's children's properties. If any child * does not have IsEvaluated, it is removed from the result. */ - virtual Expression::Properties properties() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual ID id() const; + Expression::Properties properties() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + ID id() const override; private: typedef QExplicitlySharedDataPointer<const ExpressionSequence> ConstPtr; }; diff --git a/src/xmlpatterns/expr/qexpressionvariablereference_p.h b/src/xmlpatterns/expr/qexpressionvariablereference_p.h index ed4047b..55cb042 100644 --- a/src/xmlpatterns/expr/qexpressionvariablereference_p.h +++ b/src/xmlpatterns/expr/qexpressionvariablereference_p.h @@ -75,15 +75,15 @@ namespace QPatternist ExpressionVariableReference(const VariableSlotID slot, const VariableDeclaration *varDecl); - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); - virtual SequenceType::Ptr staticType() const; - virtual ID id() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; + SequenceType::Ptr staticType() const override; + ID id() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; inline const Expression::Ptr &sourceExpression() const; inline const VariableDeclaration *variableDeclaration() const; diff --git a/src/xmlpatterns/expr/qexternalvariablereference_p.h b/src/xmlpatterns/expr/qexternalvariablereference_p.h index 09c61e8..06a759b 100644 --- a/src/xmlpatterns/expr/qexternalvariablereference_p.h +++ b/src/xmlpatterns/expr/qexternalvariablereference_p.h @@ -73,18 +73,18 @@ namespace QPatternist ExternalVariableReference(const QXmlName &name, const SequenceType::Ptr &type); - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; /** * @returns always DisableElimination */ - virtual Expression::Properties properties() const; + Expression::Properties properties() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; private: const QXmlName m_name; diff --git a/src/xmlpatterns/expr/qfirstitempredicate_p.h b/src/xmlpatterns/expr/qfirstitempredicate_p.h index efdca74..0417433 100644 --- a/src/xmlpatterns/expr/qfirstitempredicate_p.h +++ b/src/xmlpatterns/expr/qfirstitempredicate_p.h @@ -76,30 +76,30 @@ namespace QPatternist /** * @returns the first item, if any, from evaluating the source expression. */ - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; /** * @returns a list containing one CommonSequenceTypes::ZeroOrMoreItems instance. */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; /** * @returns a SequenceType where the item type is the same as the source expression * and where the cardinality is either Cardinality::zeroOrOne() or Cardinality::exactlyOne(), * depending on the source expression. */ - virtual SequenceType::Ptr staticType() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + SequenceType::Ptr staticType() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; /** * Rewrites <tt>expression[1][1]</tt> into <tt>expression[1]</tt>. */ - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; /** * @returns always IDFirstItemPredicate. */ - virtual ID id() const; + ID id() const override; }; } diff --git a/src/xmlpatterns/expr/qforclause_p.h b/src/xmlpatterns/expr/qforclause_p.h index 31ea033..a7369f9 100644 --- a/src/xmlpatterns/expr/qforclause_p.h +++ b/src/xmlpatterns/expr/qforclause_p.h @@ -76,27 +76,27 @@ namespace QPatternist const Expression::Ptr &returnExpression, const VariableSlotID positionSlot); - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; - virtual SequenceType::Ptr staticType() const; - virtual SequenceType::List expectedOperandTypes() const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual QList<QExplicitlySharedDataPointer<OptimizationPass> > optimizationPasses() const; + SequenceType::Ptr staticType() const override; + SequenceType::List expectedOperandTypes() const override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + QList<QExplicitlySharedDataPointer<OptimizationPass> > optimizationPasses() const override; inline Item mapToItem(const Item &item, const DynamicContext::Ptr &context) const; - virtual ID id() const; + ID id() const override; inline Item::Iterator::Ptr mapToSequence(const Item &item, const DynamicContext::Ptr &context) const; /** * Sets m_allowsMany properly. */ - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; private: inline void riggPositionalVariable(const DynamicContext::Ptr &context, diff --git a/src/xmlpatterns/expr/qgeneralcomparison_p.h b/src/xmlpatterns/expr/qgeneralcomparison_p.h index b3fffca..fcd8642 100644 --- a/src/xmlpatterns/expr/qgeneralcomparison_p.h +++ b/src/xmlpatterns/expr/qgeneralcomparison_p.h @@ -82,21 +82,21 @@ namespace QPatternist const bool isBackwardsCompat = false); ~GeneralComparison(); - virtual bool evaluateEBV(const DynamicContext::Ptr &) const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + bool evaluateEBV(const DynamicContext::Ptr &) const override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; - virtual SequenceType::List expectedOperandTypes() const; - virtual SequenceType::Ptr staticType() const; + SequenceType::List expectedOperandTypes() const override; + SequenceType::Ptr staticType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; /** * @returns always IDGeneralComparison */ - virtual ID id() const; + ID id() const override; - virtual QList<QExplicitlySharedDataPointer<OptimizationPass> > optimizationPasses() const; + QList<QExplicitlySharedDataPointer<OptimizationPass> > optimizationPasses() const override; /** * @returns the operator that this GeneralComparison is using. @@ -109,7 +109,7 @@ namespace QPatternist /** * Overridden to optimize case-insensitive compares. */ - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; private: static inline void updateType(ItemType::Ptr &type, diff --git a/src/xmlpatterns/expr/qgenericpredicate_p.h b/src/xmlpatterns/expr/qgenericpredicate_p.h index 37ffeb3..a5a7825 100644 --- a/src/xmlpatterns/expr/qgenericpredicate_p.h +++ b/src/xmlpatterns/expr/qgenericpredicate_p.h @@ -92,28 +92,28 @@ namespace QPatternist * its QAbstractXmlForwardIterator::next() calls, and since the Focus references the same QAbstractXmlForwardIterator, * the focus is automatically moved. */ - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; /** * Doesn't return the first item from calling evaluateSequence(), but does the mapping * manually. This avoid allocating an ItemMappingIterator. */ - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; inline Item mapToItem(const Item &subject, const DynamicContext::Ptr &) const; - virtual SequenceType::List expectedOperandTypes() const; - virtual SequenceType::Ptr staticType() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual ID id() const; + SequenceType::List expectedOperandTypes() const override; + SequenceType::Ptr staticType() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + ID id() const override; /** * @returns always CreatesFocusForLast. */ - virtual Properties properties() const; + Properties properties() const override; - virtual QString description() const; + QString description() const override; protected: @@ -130,7 +130,7 @@ namespace QPatternist /** * @returns the ItemType of the first operand's staticType(). */ - virtual ItemType::Ptr newFocusType() const; + ItemType::Ptr newFocusType() const override; private: typedef QExplicitlySharedDataPointer<const GenericPredicate> ConstPtr; diff --git a/src/xmlpatterns/expr/qifthenclause_p.h b/src/xmlpatterns/expr/qifthenclause_p.h index d26ccb0..8cb1d78 100644 --- a/src/xmlpatterns/expr/qifthenclause_p.h +++ b/src/xmlpatterns/expr/qifthenclause_p.h @@ -71,22 +71,22 @@ namespace QPatternist const Expression::Ptr &then, const Expression::Ptr &el); - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; - virtual SequenceType::List expectedOperandTypes() const; - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + SequenceType::List expectedOperandTypes() const override; + Expression::Ptr compress(const StaticContext::Ptr &context) override; - virtual SequenceType::Ptr staticType() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + SequenceType::Ptr staticType() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; /** * @returns IDIfThenClause */ - virtual ID id() const; - virtual QList<QExplicitlySharedDataPointer<OptimizationPass> > optimizationPasses() const; - //virtual Properties properties() const; + ID id() const override; + QList<QExplicitlySharedDataPointer<OptimizationPass> > optimizationPasses() const override; + //Properties properties() const override; }; } diff --git a/src/xmlpatterns/expr/qinstanceof_p.h b/src/xmlpatterns/expr/qinstanceof_p.h index 519e8d2..13e098d 100644 --- a/src/xmlpatterns/expr/qinstanceof_p.h +++ b/src/xmlpatterns/expr/qinstanceof_p.h @@ -72,12 +72,12 @@ namespace QPatternist InstanceOf(const Expression::Ptr &operand, const SequenceType::Ptr &targetType); - virtual bool evaluateEBV(const DynamicContext::Ptr &) const; + bool evaluateEBV(const DynamicContext::Ptr &) const override; - virtual SequenceType::List expectedOperandTypes() const; - virtual SequenceType::Ptr staticType() const; - virtual Expression::Ptr compress(const StaticContext::Ptr &context); - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + SequenceType::List expectedOperandTypes() const override; + SequenceType::Ptr staticType() const override; + Expression::Ptr compress(const StaticContext::Ptr &context) override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; /** * @returns the SequenceType that this <tt>instance of</tt> Expression diff --git a/src/xmlpatterns/expr/qletclause_p.h b/src/xmlpatterns/expr/qletclause_p.h index f2c8ccf..23ae209 100644 --- a/src/xmlpatterns/expr/qletclause_p.h +++ b/src/xmlpatterns/expr/qletclause_p.h @@ -78,18 +78,18 @@ namespace QPatternist const Expression::Ptr &operand2, const VariableDeclaration::Ptr &decl); - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; - virtual SequenceType::List expectedOperandTypes() const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); - virtual SequenceType::Ptr staticType() const; - virtual Properties properties() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual ID id() const; + SequenceType::List expectedOperandTypes() const override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; + SequenceType::Ptr staticType() const override; + Properties properties() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + ID id() const override; private: inline DynamicContext::Ptr bindVariable(const DynamicContext::Ptr &context) const; diff --git a/src/xmlpatterns/expr/qliteral_p.h b/src/xmlpatterns/expr/qliteral_p.h index 7a16e8d..556b662 100644 --- a/src/xmlpatterns/expr/qliteral_p.h +++ b/src/xmlpatterns/expr/qliteral_p.h @@ -77,19 +77,19 @@ namespace QPatternist */ Literal(const Item &item); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; - void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; - virtual SequenceType::Ptr staticType() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual ID id() const; - virtual QString description() const; + SequenceType::Ptr staticType() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + ID id() const override; + QString description() const override; /** * @returns Expression::DisableElimination and Expression::IsEvaluated */ - virtual Properties properties() const; + Properties properties() const override; /** * Declaring the return value of this function a const reference, leads diff --git a/src/xmlpatterns/expr/qliteralsequence_p.h b/src/xmlpatterns/expr/qliteralsequence_p.h index 0a4bde1..b9ad129 100644 --- a/src/xmlpatterns/expr/qliteralsequence_p.h +++ b/src/xmlpatterns/expr/qliteralsequence_p.h @@ -79,14 +79,14 @@ namespace QPatternist */ LiteralSequence(const Item::List &list); - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual SequenceType::Ptr staticType() const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + SequenceType::Ptr staticType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; - virtual ID id() const; + ID id() const override; - virtual Properties properties() const; + Properties properties() const override; private: const Item::List m_list; diff --git a/src/xmlpatterns/expr/qnamespaceconstructor_p.h b/src/xmlpatterns/expr/qnamespaceconstructor_p.h index 78aceaf..5a89013 100644 --- a/src/xmlpatterns/expr/qnamespaceconstructor_p.h +++ b/src/xmlpatterns/expr/qnamespaceconstructor_p.h @@ -69,12 +69,12 @@ namespace QPatternist NamespaceConstructor(const QXmlName nb); ~NamespaceConstructor(); - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; /** * @returns a list containing one CommonSequenceTypes::ExactlyOneString instance. */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; /** * The static type is exactly one attribute node. It's unclear what @@ -83,17 +83,17 @@ namespace QPatternist * conceptually correct, since a namespace node isn't an attribute * node. */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual Expression::Properties properties() const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + Expression::Properties properties() const override; inline const QXmlName &namespaceBinding() const { return m_binding; } - virtual ID id() const; + ID id() const override; private: const QXmlName m_binding; }; diff --git a/src/xmlpatterns/expr/qncnameconstructor_p.h b/src/xmlpatterns/expr/qncnameconstructor_p.h index dc09003..20e130d 100644 --- a/src/xmlpatterns/expr/qncnameconstructor_p.h +++ b/src/xmlpatterns/expr/qncnameconstructor_p.h @@ -75,16 +75,16 @@ namespace QPatternist NCNameConstructor(const Expression::Ptr &source); - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; /** * Validates @p lexicalNCName as a processing instruction's target diff --git a/src/xmlpatterns/expr/qnodecomparison_p.h b/src/xmlpatterns/expr/qnodecomparison_p.h index 48696e2..37d9c92 100644 --- a/src/xmlpatterns/expr/qnodecomparison_p.h +++ b/src/xmlpatterns/expr/qnodecomparison_p.h @@ -72,24 +72,24 @@ namespace QPatternist const QXmlNodeModelIndex::DocumentOrder op, const Expression::Ptr &operand2); - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; - virtual bool evaluateEBV(const DynamicContext::Ptr &) const; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; + bool evaluateEBV(const DynamicContext::Ptr &) const override; - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; virtual QXmlNodeModelIndex::DocumentOrder operatorID() const; /** * If any operator is the empty sequence, the NodeComparison rewrites * into that, since the empty sequence is always the result in that case. */ - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; /** * @returns either CommonSequenceTypes::ZeroOrOneBoolean or * CommonSequenceTypes::ExactlyOneBoolean depending on the static * cardinality of its operands. */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; /** * Determines the string representation for a node comparison operator. @@ -101,7 +101,7 @@ namespace QPatternist */ static QString displayName(const QXmlNodeModelIndex::DocumentOrder op); - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; private: enum Result { diff --git a/src/xmlpatterns/expr/qnodesort_p.h b/src/xmlpatterns/expr/qnodesort_p.h index 1be2469..8561785 100644 --- a/src/xmlpatterns/expr/qnodesort_p.h +++ b/src/xmlpatterns/expr/qnodesort_p.h @@ -68,12 +68,12 @@ namespace QPatternist public: NodeSortExpression(const Expression::Ptr &operand); - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual SequenceType::Ptr staticType() const; - virtual SequenceType::List expectedOperandTypes() const; - virtual Expression::Ptr compress(const StaticContext::Ptr &context); - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual Properties properties() const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + SequenceType::Ptr staticType() const override; + SequenceType::List expectedOperandTypes() const override; + Expression::Ptr compress(const StaticContext::Ptr &context) override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + Properties properties() const override; /** * Ensures that result delivered from @p operand, is in document order. diff --git a/src/xmlpatterns/expr/qoptimizerblocks_p.h b/src/xmlpatterns/expr/qoptimizerblocks_p.h index 2ed424a..5a00cd5 100644 --- a/src/xmlpatterns/expr/qoptimizerblocks_p.h +++ b/src/xmlpatterns/expr/qoptimizerblocks_p.h @@ -68,7 +68,7 @@ namespace QPatternist { public: ByIDIdentifier(const Expression::ID id); - virtual bool matches(const Expression::Ptr &expr) const; + bool matches(const Expression::Ptr &expr) const override; private: const Expression::ID m_id; }; @@ -100,7 +100,7 @@ namespace QPatternist * the SequenceType passed in the BySequenceTypeIdentifier() * constructor, otherwise @c false. */ - virtual bool matches(const Expression::Ptr &expr) const; + bool matches(const Expression::Ptr &expr) const override; private: const SequenceType::Ptr m_seqType; @@ -135,7 +135,7 @@ namespace QPatternist * @returns @c true, if @p expr is a ValueComparison with the operator * passed in ComparisonIdentifier(). */ - virtual bool matches(const Expression::Ptr &expr) const; + bool matches(const Expression::Ptr &expr) const override; private: const QVector<Expression::ID> m_hosts; @@ -156,7 +156,7 @@ namespace QPatternist { public: IntegerIdentifier(const xsInteger num); - virtual bool matches(const Expression::Ptr &expr) const; + bool matches(const Expression::Ptr &expr) const override; private: const xsInteger m_num; @@ -175,7 +175,7 @@ namespace QPatternist { public: BooleanIdentifier(const bool value); - virtual bool matches(const Expression::Ptr &expr) const; + bool matches(const Expression::Ptr &expr) const override; private: const bool m_value; @@ -198,9 +198,9 @@ namespace QPatternist * of the type that @p id identifies. */ ByIDCreator(const Expression::ID id); - virtual Expression::Ptr create(const Expression::List &operands, - const StaticContext::Ptr &context, - const SourceLocationReflection *const r) const; + Expression::Ptr create(const Expression::List &operands, + const StaticContext::Ptr &context, + const SourceLocationReflection *const r) const override; /** * Creates an expression by id @p id with the arguments @p operands. diff --git a/src/xmlpatterns/expr/qorderby_p.h b/src/xmlpatterns/expr/qorderby_p.h index dcc567b..40a0d20 100644 --- a/src/xmlpatterns/expr/qorderby_p.h +++ b/src/xmlpatterns/expr/qorderby_p.h @@ -147,17 +147,17 @@ namespace QPatternist const Expression::Ptr &operand, ReturnOrderBy *const returnOrderBy); - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual SequenceType::Ptr staticType() const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); - virtual Expression::Ptr compress(const StaticContext::Ptr &context); - virtual SequenceType::List expectedOperandTypes() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + SequenceType::Ptr staticType() const override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; + Expression::Ptr compress(const StaticContext::Ptr &context) override; + SequenceType::List expectedOperandTypes() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; inline Item::Iterator::Ptr mapToSequence(const Item &i, const DynamicContext::Ptr &context) const; - virtual Properties properties() const; + Properties properties() const override; private: /** diff --git a/src/xmlpatterns/expr/qorexpression_p.h b/src/xmlpatterns/expr/qorexpression_p.h index eb2d2bd..3e50886 100644 --- a/src/xmlpatterns/expr/qorexpression_p.h +++ b/src/xmlpatterns/expr/qorexpression_p.h @@ -70,10 +70,10 @@ namespace QPatternist OrExpression(const Expression::Ptr &operand1, const Expression::Ptr &operand2); - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; - virtual Expression::Ptr compress(const StaticContext::Ptr &context); - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + Expression::Ptr compress(const StaticContext::Ptr &context) override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; }; } diff --git a/src/xmlpatterns/expr/qpaircontainer_p.h b/src/xmlpatterns/expr/qpaircontainer_p.h index 7d864a6..ddcd8fd 100644 --- a/src/xmlpatterns/expr/qpaircontainer_p.h +++ b/src/xmlpatterns/expr/qpaircontainer_p.h @@ -66,9 +66,9 @@ namespace QPatternist class PairContainer : public Expression { public: - virtual Expression::List operands() const; - virtual void setOperands(const Expression::List &operands); - virtual bool compressOperands(const StaticContext::Ptr &); + Expression::List operands() const override; + void setOperands(const Expression::List &operands) override; + bool compressOperands(const StaticContext::Ptr &) override; protected: PairContainer(const Expression::Ptr &operand1, const Expression::Ptr &operand2); diff --git a/src/xmlpatterns/expr/qparentnodeaxis_p.h b/src/xmlpatterns/expr/qparentnodeaxis_p.h index cede13b..58dfde1 100644 --- a/src/xmlpatterns/expr/qparentnodeaxis_p.h +++ b/src/xmlpatterns/expr/qparentnodeaxis_p.h @@ -71,24 +71,24 @@ namespace QPatternist class ParentNodeAxis : public EmptyContainer { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; /** * @returns always DisableElimination */ - virtual Expression::Properties properties() const; + Expression::Properties properties() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; /** * @returns always CommonSequenceTypes::ExactlyOneNode; */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; /** * @returns always BuiltinTypes::node; */ - virtual ItemType::Ptr expectedContextItemType() const; + ItemType::Ptr expectedContextItemType() const override; }; } diff --git a/src/xmlpatterns/expr/qpath_p.h b/src/xmlpatterns/expr/qpath_p.h index f3e3b59..cab190d 100644 --- a/src/xmlpatterns/expr/qpath_p.h +++ b/src/xmlpatterns/expr/qpath_p.h @@ -96,35 +96,35 @@ namespace QPatternist const Kind kind = RegularPath); ~Path(); - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; inline Item::Iterator::Ptr mapToSequence(const Item &item, const DynamicContext::Ptr &context) const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; /** * @returns the static type of the last step where the cardinality is multiplied with * the cardinality of the first step's cardinality. */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; - virtual Properties properties() const; + Properties properties() const override; - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; /** * @returns the item type of the last step's static type. */ - virtual ItemType::Ptr newFocusType() const; + ItemType::Ptr newFocusType() const override; - virtual ID id() const; + ID id() const override; inline void setLast(); diff --git a/src/xmlpatterns/expr/qpositionalvariablereference_p.h b/src/xmlpatterns/expr/qpositionalvariablereference_p.h index 91be948..2728892 100644 --- a/src/xmlpatterns/expr/qpositionalvariablereference_p.h +++ b/src/xmlpatterns/expr/qpositionalvariablereference_p.h @@ -69,7 +69,7 @@ namespace QPatternist typedef QExplicitlySharedDataPointer<PositionalVariableReference> Ptr; PositionalVariableReference(const VariableSlotID slot); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; /** * Returns always @c true, since a positional variable is always one or more, and the @@ -77,15 +77,15 @@ namespace QPatternist * * @returns always @c true */ - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; /** * @returns always CommonSequenceTypes::ExactlyOneInteger */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual Properties properties() const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + Properties properties() const override; }; } diff --git a/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h b/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h index 9375104..8593174 100644 --- a/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h +++ b/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h @@ -71,20 +71,20 @@ namespace QPatternist ProcessingInstructionConstructor(const Expression::Ptr &operand1, const Expression::Ptr &operand2); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; /** * Both arguments must of type @c xs:string. It is assumes that the first argument's * lexical space is @c xs:NCName. */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; - virtual Properties properties() const; + Properties properties() const override; private: inline QXmlName evaluateTardata(const DynamicContext::Ptr &context) const; /** diff --git a/src/xmlpatterns/expr/qqnameconstructor_p.h b/src/xmlpatterns/expr/qqnameconstructor_p.h index 6aab322..49fcb07 100644 --- a/src/xmlpatterns/expr/qqnameconstructor_p.h +++ b/src/xmlpatterns/expr/qqnameconstructor_p.h @@ -75,13 +75,13 @@ namespace QPatternist QNameConstructor(const Expression::Ptr &source, const NamespaceResolver::Ptr &nsResolver); - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; /** * Expands @p lexicalQName, which is a lexical representation of a QName such as "x:body", into @@ -121,7 +121,7 @@ namespace QPatternist const StaticContext::Ptr &context, const SourceLocationReflection *const r); - virtual const SourceLocationReflection *actualReflection() const; + const SourceLocationReflection *actualReflection() const override; private: const NamespaceResolver::Ptr m_nsResolver; diff --git a/src/xmlpatterns/expr/qquantifiedexpression_p.h b/src/xmlpatterns/expr/qquantifiedexpression_p.h index b448368..29a9e26 100644 --- a/src/xmlpatterns/expr/qquantifiedexpression_p.h +++ b/src/xmlpatterns/expr/qquantifiedexpression_p.h @@ -78,9 +78,9 @@ namespace QPatternist const Expression::Ptr &inClause, const Expression::Ptr &testExpression); - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; - virtual SequenceType::Ptr staticType() const; - virtual SequenceType::List expectedOperandTypes() const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; + SequenceType::Ptr staticType() const override; + SequenceType::List expectedOperandTypes() const override; Operator operatorID() const; @@ -92,7 +92,7 @@ namespace QPatternist */ static QString displayName(const Operator quantifier); - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; inline Item mapToItem(const Item &item, const DynamicContext::Ptr &context) const; diff --git a/src/xmlpatterns/expr/qrangeexpression_p.h b/src/xmlpatterns/expr/qrangeexpression_p.h index e5c41a1..f26cf5d 100644 --- a/src/xmlpatterns/expr/qrangeexpression_p.h +++ b/src/xmlpatterns/expr/qrangeexpression_p.h @@ -73,20 +73,20 @@ namespace QPatternist public: RangeExpression(const Expression::Ptr &operand1, const Expression::Ptr &operand2); - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const override; /** * It's likely that this function gets called if staticType() inferred * the cardinality to an exact number. In that case, we know that the * first arguments is the same as the second argument. */ - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; /** * @returns always CommonSequenceTypes::ZeroOrMoreIntegers */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; /** * Disables compression for optimization reasons. For example, the @@ -95,9 +95,9 @@ namespace QPatternist * * @returns Expression::DisableElimination */ - virtual Expression::Properties properties() const; + Expression::Properties properties() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; }; } diff --git a/src/xmlpatterns/expr/qrangevariablereference_p.h b/src/xmlpatterns/expr/qrangevariablereference_p.h index 85336c5..406fe20 100644 --- a/src/xmlpatterns/expr/qrangevariablereference_p.h +++ b/src/xmlpatterns/expr/qrangevariablereference_p.h @@ -73,17 +73,17 @@ namespace QPatternist RangeVariableReference(const Expression::Ptr &sourceExpression, const VariableSlotID slot); - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual SequenceType::Ptr staticType() const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + SequenceType::Ptr staticType() const override; /** * @returns IDRangeVariableReference */ - virtual ID id() const; + ID id() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual Properties properties() const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + Properties properties() const override; private: const Expression::Ptr m_sourceExpression; }; diff --git a/src/xmlpatterns/expr/qreturnorderby_p.h b/src/xmlpatterns/expr/qreturnorderby_p.h index 3ea9df9..1f8b2c1 100644 --- a/src/xmlpatterns/expr/qreturnorderby_p.h +++ b/src/xmlpatterns/expr/qreturnorderby_p.h @@ -77,13 +77,13 @@ namespace QPatternist const OrderBy::OrderSpec::Vector &oSpecs, const Expression::List &operands); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; - virtual SequenceType::Ptr staticType() const; - virtual SequenceType::List expectedOperandTypes() const; - virtual Expression::Ptr compress(const StaticContext::Ptr &context); - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual ID id() const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; + SequenceType::Ptr staticType() const override; + SequenceType::List expectedOperandTypes() const override; + Expression::Ptr compress(const StaticContext::Ptr &context) override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + ID id() const override; inline OrderBy::OrderSpec::Vector orderSpecs() const { @@ -107,7 +107,7 @@ namespace QPatternist m_flyAway = !a; } - virtual Properties properties() const; + Properties properties() const override; private: /** * This variable is unfortunately only used at compile time. However, diff --git a/src/xmlpatterns/expr/qsimplecontentconstructor_p.h b/src/xmlpatterns/expr/qsimplecontentconstructor_p.h index 595018f..144d0bd 100644 --- a/src/xmlpatterns/expr/qsimplecontentconstructor_p.h +++ b/src/xmlpatterns/expr/qsimplecontentconstructor_p.h @@ -74,14 +74,14 @@ namespace QPatternist public: SimpleContentConstructor(const Expression::Ptr &operand); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; - virtual SequenceType::List expectedOperandTypes() const; - virtual SequenceType::Ptr staticType() const; + SequenceType::List expectedOperandTypes() const override; + SequenceType::Ptr staticType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; }; } diff --git a/src/xmlpatterns/expr/qsinglecontainer_p.h b/src/xmlpatterns/expr/qsinglecontainer_p.h index 6d016be..ec12f8f 100644 --- a/src/xmlpatterns/expr/qsinglecontainer_p.h +++ b/src/xmlpatterns/expr/qsinglecontainer_p.h @@ -67,10 +67,10 @@ namespace QPatternist public: ~SingleContainer(); - virtual Expression::List operands() const; + Expression::List operands() const override; - virtual void setOperands(const Expression::List &operands); - virtual bool compressOperands(const StaticContext::Ptr &); + void setOperands(const Expression::List &operands) override; + bool compressOperands(const StaticContext::Ptr &) override; protected: SingleContainer(const Expression::Ptr &operand); diff --git a/src/xmlpatterns/expr/qsourcelocationreflection_p.h b/src/xmlpatterns/expr/qsourcelocationreflection_p.h index 3405aac..2030218 100644 --- a/src/xmlpatterns/expr/qsourcelocationreflection_p.h +++ b/src/xmlpatterns/expr/qsourcelocationreflection_p.h @@ -111,8 +111,8 @@ namespace QPatternist Q_ASSERT(r); } - virtual const SourceLocationReflection *actualReflection() const; - virtual QString description() const; + const SourceLocationReflection *actualReflection() const override; + QString description() const override; private: const SourceLocationReflection *const m_r; diff --git a/src/xmlpatterns/expr/qstaticbaseuristore_p.h b/src/xmlpatterns/expr/qstaticbaseuristore_p.h index f0783f2..44d6e78 100644 --- a/src/xmlpatterns/expr/qstaticbaseuristore_p.h +++ b/src/xmlpatterns/expr/qstaticbaseuristore_p.h @@ -74,11 +74,11 @@ namespace QPatternist */ StaticBaseURIStore(const QUrl &baseURI, const Expression::Ptr &operand); - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); - virtual SequenceType::Ptr staticType() const; - virtual SequenceType::List expectedOperandTypes() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; + SequenceType::Ptr staticType() const override; + SequenceType::List expectedOperandTypes() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; private: const QUrl m_baseURI; diff --git a/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h b/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h index e3c8986..c2ba6b1 100644 --- a/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h +++ b/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h @@ -73,11 +73,11 @@ namespace QPatternist * absolute. */ StaticCompatibilityStore(const Expression::Ptr &operand); - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); - virtual SequenceType::Ptr staticType() const; - virtual SequenceType::List expectedOperandTypes() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; + SequenceType::Ptr staticType() const override; + SequenceType::List expectedOperandTypes() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; }; } diff --git a/src/xmlpatterns/expr/qtemplate_p.h b/src/xmlpatterns/expr/qtemplate_p.h index 5ec3ad4..c51f405 100644 --- a/src/xmlpatterns/expr/qtemplate_p.h +++ b/src/xmlpatterns/expr/qtemplate_p.h @@ -97,7 +97,7 @@ namespace QPatternist /** * Returns @c this. */ - virtual const SourceLocationReflection* actualReflection() const; + const SourceLocationReflection* actualReflection() const override; const ImportPrecedence importPrecedence; diff --git a/src/xmlpatterns/expr/qtemplateinvoker_p.h b/src/xmlpatterns/expr/qtemplateinvoker_p.h index c389543..934e546 100644 --- a/src/xmlpatterns/expr/qtemplateinvoker_p.h +++ b/src/xmlpatterns/expr/qtemplateinvoker_p.h @@ -76,7 +76,7 @@ namespace QPatternist class TemplateInvoker : public CallSite { public: - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; inline const WithParam::Hash &withParams() const; WithParam::Hash m_withParams; @@ -90,7 +90,7 @@ namespace QPatternist * @see <a href="http://www.w3.org/TR/xslt20/#with-param">XSL * Transformations (XSLT) Version 2.0, 10.1.1 Passing Parameters to Templates</a> */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; protected: /** * @p withParams may be empty. diff --git a/src/xmlpatterns/expr/qtemplateparameterreference_p.h b/src/xmlpatterns/expr/qtemplateparameterreference_p.h index d9e1722..2441b22 100644 --- a/src/xmlpatterns/expr/qtemplateparameterreference_p.h +++ b/src/xmlpatterns/expr/qtemplateparameterreference_p.h @@ -69,13 +69,13 @@ namespace QPatternist public: TemplateParameterReference(const VariableDeclaration *varDecl); - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; - virtual SequenceType::Ptr staticType() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual Properties properties() const; + SequenceType::Ptr staticType() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + Properties properties() const override; inline const Expression::Ptr &sourceExpression() const; inline const VariableDeclaration *variableDeclaration() const; diff --git a/src/xmlpatterns/expr/qtextnodeconstructor_p.h b/src/xmlpatterns/expr/qtextnodeconstructor_p.h index 7357d04..f021065 100644 --- a/src/xmlpatterns/expr/qtextnodeconstructor_p.h +++ b/src/xmlpatterns/expr/qtextnodeconstructor_p.h @@ -70,19 +70,19 @@ namespace QPatternist public: TextNodeConstructor(const Expression::Ptr &operand); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; /** * The first operand must be exactly one @c xs:string. */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; - virtual Properties properties() const; + Properties properties() const override; }; } diff --git a/src/xmlpatterns/expr/qtreatas_p.h b/src/xmlpatterns/expr/qtreatas_p.h index f9acf69..2d7b541 100644 --- a/src/xmlpatterns/expr/qtreatas_p.h +++ b/src/xmlpatterns/expr/qtreatas_p.h @@ -90,21 +90,21 @@ namespace QPatternist * is verified. Then, the type the <tt>treat as</tt> expression itself must match, @p reqType, * is verified. */ - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; /** * @returns always the SequenceType passed in the constructor to this class. That is, the * SequenceType that the operand must conform to. */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; /** * @returns a list containing one CommonSequenceTypes::ZeroOrMoreItems */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; private: const SequenceType::Ptr m_reqType; diff --git a/src/xmlpatterns/expr/qtriplecontainer_p.h b/src/xmlpatterns/expr/qtriplecontainer_p.h index 3fec57d..9e9f9ab 100644 --- a/src/xmlpatterns/expr/qtriplecontainer_p.h +++ b/src/xmlpatterns/expr/qtriplecontainer_p.h @@ -65,10 +65,10 @@ namespace QPatternist class TripleContainer : public Expression { public: - virtual Expression::List operands() const; - virtual void setOperands(const Expression::List &operands); + Expression::List operands() const override; + void setOperands(const Expression::List &operands) override; - virtual bool compressOperands(const StaticContext::Ptr &); + bool compressOperands(const StaticContext::Ptr &) override; protected: TripleContainer(const Expression::Ptr &operand1, diff --git a/src/xmlpatterns/expr/qtruthpredicate_p.h b/src/xmlpatterns/expr/qtruthpredicate_p.h index 3362c14..d019a0e 100644 --- a/src/xmlpatterns/expr/qtruthpredicate_p.h +++ b/src/xmlpatterns/expr/qtruthpredicate_p.h @@ -96,8 +96,8 @@ namespace QPatternist return CommonValues::emptyIterator; } - virtual SequenceType::List expectedOperandTypes() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + SequenceType::List expectedOperandTypes() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; }; } diff --git a/src/xmlpatterns/expr/qunaryexpression_p.h b/src/xmlpatterns/expr/qunaryexpression_p.h index 77da0c7..83c5870 100644 --- a/src/xmlpatterns/expr/qunaryexpression_p.h +++ b/src/xmlpatterns/expr/qunaryexpression_p.h @@ -96,7 +96,7 @@ namespace QPatternist const Expression::Ptr &operand, const StaticContext::Ptr &context); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; private: Q_DISABLE_COPY(UnaryExpression) diff --git a/src/xmlpatterns/expr/qunlimitedcontainer_p.h b/src/xmlpatterns/expr/qunlimitedcontainer_p.h index e03f6e4..80ce878 100644 --- a/src/xmlpatterns/expr/qunlimitedcontainer_p.h +++ b/src/xmlpatterns/expr/qunlimitedcontainer_p.h @@ -73,14 +73,14 @@ namespace QPatternist */ UnlimitedContainer(const Expression::List &operands = Expression::List()); - virtual void setOperands(const Expression::List &list); + void setOperands(const Expression::List &list) override; - virtual Expression::List operands() const; + Expression::List operands() const override; /** * @note This function cannot be called before setOperands is called. */ - virtual bool compressOperands(const StaticContext::Ptr &); + bool compressOperands(const StaticContext::Ptr &) override; /** * Tells how operandsUnionType() should compute the cardinality of diff --git a/src/xmlpatterns/expr/qunresolvedvariablereference_p.h b/src/xmlpatterns/expr/qunresolvedvariablereference_p.h index 348d73e..aface34 100644 --- a/src/xmlpatterns/expr/qunresolvedvariablereference_p.h +++ b/src/xmlpatterns/expr/qunresolvedvariablereference_p.h @@ -72,12 +72,12 @@ namespace QPatternist public: UnresolvedVariableReference(const QXmlName &name); - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); - virtual SequenceType::List expectedOperandTypes() const; - virtual SequenceType::Ptr staticType() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual ID id() const; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; + SequenceType::List expectedOperandTypes() const override; + SequenceType::Ptr staticType() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + ID id() const override; inline void bindTo(const Expression::Ptr &body); diff --git a/src/xmlpatterns/expr/quserfunctioncallsite_p.h b/src/xmlpatterns/expr/quserfunctioncallsite_p.h index 006540a..5b9bf7d 100644 --- a/src/xmlpatterns/expr/quserfunctioncallsite_p.h +++ b/src/xmlpatterns/expr/quserfunctioncallsite_p.h @@ -81,35 +81,35 @@ namespace QPatternist UserFunctionCallsite(const QXmlName name, const FunctionSignature::Arity arity); - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; /** * We call compress on our body. */ - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; - virtual Expression::Properties properties() const; + Expression::Properties properties() const override; /** * @short Returns the types declared in the function declaration. * * @see CallTemplate::expectedOperandTypes() */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; - virtual SequenceType::Ptr staticType() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + SequenceType::Ptr staticType() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; /** * @returns always IDUserFunctionCallsite. */ - virtual ID id() const; + ID id() const override; /** * If @p slotOffset is -1, it means this function has no arguments. @@ -125,13 +125,13 @@ namespace QPatternist FunctionSignature::Arity arity() const; - inline Expression::Ptr body() const + inline Expression::Ptr body() const override { return m_body; } - virtual bool configureRecursion(const CallTargetDescription::Ptr &sign); - virtual CallTargetDescription::Ptr callTargetDescription() const; + bool configureRecursion(const CallTargetDescription::Ptr &sign) override; + CallTargetDescription::Ptr callTargetDescription() const override; private: /** diff --git a/src/xmlpatterns/expr/qvaluecomparison_p.h b/src/xmlpatterns/expr/qvaluecomparison_p.h index 9566dfb..b2466a7 100644 --- a/src/xmlpatterns/expr/qvaluecomparison_p.h +++ b/src/xmlpatterns/expr/qvaluecomparison_p.h @@ -79,30 +79,30 @@ namespace QPatternist const Expression::Ptr &op2); ~ValueComparison(); - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; /** * @returns always CommonSequenceTypes::ExactlyOneBoolean */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; /** * @returns IDValueComparison */ - virtual ID id() const; + ID id() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual QList<QExplicitlySharedDataPointer<OptimizationPass> > optimizationPasses() const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + QList<QExplicitlySharedDataPointer<OptimizationPass> > optimizationPasses() const override; /** * Overridden to optimize case-insensitive compares. */ - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; /** * @returns the operator that this ValueComparison is using. diff --git a/src/xmlpatterns/expr/qvariablereference_p.h b/src/xmlpatterns/expr/qvariablereference_p.h index 807b55b..ce9c784 100644 --- a/src/xmlpatterns/expr/qvariablereference_p.h +++ b/src/xmlpatterns/expr/qvariablereference_p.h @@ -91,7 +91,7 @@ namespace QPatternist /** * @returns DisableElimination */ - virtual Properties properties() const; + Properties properties() const override; private: /** diff --git a/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h b/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h index afa49df..002fcf9 100644 --- a/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h +++ b/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h @@ -69,10 +69,10 @@ namespace QPatternist { public: XSLTSimpleContentConstructor(const Expression::Ptr &source); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; - virtual SequenceType::List expectedOperandTypes() const; - virtual SequenceType::Ptr staticType() const; + SequenceType::List expectedOperandTypes() const override; + SequenceType::Ptr staticType() const override; private: static inline QString processItem(const Item &item, bool &discard, diff --git a/src/xmlpatterns/functions/qabstractfunctionfactory_p.h b/src/xmlpatterns/functions/qabstractfunctionfactory_p.h index 6a65308..7b634d5 100644 --- a/src/xmlpatterns/functions/qabstractfunctionfactory_p.h +++ b/src/xmlpatterns/functions/qabstractfunctionfactory_p.h @@ -71,12 +71,12 @@ namespace QPatternist class AbstractFunctionFactory : public FunctionFactory { public: - virtual Expression::Ptr createFunctionCall(const QXmlName name, - const Expression::List &arguments, - const StaticContext::Ptr &context, - const SourceLocationReflection *const r); + Expression::Ptr createFunctionCall(const QXmlName name, + const Expression::List &arguments, + const StaticContext::Ptr &context, + const SourceLocationReflection *const r) override; - virtual FunctionSignature::Hash functionSignatures() const; + FunctionSignature::Hash functionSignatures() const override; protected: /** diff --git a/src/xmlpatterns/functions/qaccessorfns_p.h b/src/xmlpatterns/functions/qaccessorfns_p.h index b132d99..052d630 100644 --- a/src/xmlpatterns/functions/qaccessorfns_p.h +++ b/src/xmlpatterns/functions/qaccessorfns_p.h @@ -74,7 +74,7 @@ namespace QPatternist class NodeNameFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -86,7 +86,7 @@ namespace QPatternist class NilledFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -98,9 +98,9 @@ namespace QPatternist class StringFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; }; /** @@ -111,7 +111,7 @@ namespace QPatternist class BaseURIFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -123,7 +123,7 @@ namespace QPatternist class DocumentURIFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; } diff --git a/src/xmlpatterns/functions/qaggregatefns_p.h b/src/xmlpatterns/functions/qaggregatefns_p.h index d1a09ef..cca1bd8 100644 --- a/src/xmlpatterns/functions/qaggregatefns_p.h +++ b/src/xmlpatterns/functions/qaggregatefns_p.h @@ -79,20 +79,20 @@ namespace QPatternist class CountFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; /** * If @p reqType is CommonSequenceTypes::EBV, this function call is rewritten * into a call to <tt>fn:exists()</tt>. Hence, <tt>if(count(X)) then ...</tt> is * rewritten into <tt>if(exists(X)) then ...</tt>. */ - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; /** * If CountFN's operand has a Cardinality that is exact, as per Cardinality::isExact(), * it is rewritten to the Cardinality's count. */ - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; }; /** @@ -104,8 +104,8 @@ namespace QPatternist class AddingAggregate : public FunctionCall { public: - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; protected: AtomicMathematician::Ptr m_mather; }; @@ -119,11 +119,11 @@ namespace QPatternist class AvgFN : public AddingAggregate { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; private: AtomicMathematician::Ptr m_adder; AtomicMathematician::Ptr m_divider; @@ -138,10 +138,10 @@ namespace QPatternist class SumFN : public AddingAggregate { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); - virtual SequenceType::Ptr staticType() const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; + SequenceType::Ptr staticType() const override; }; } diff --git a/src/xmlpatterns/functions/qaggregator_p.h b/src/xmlpatterns/functions/qaggregator_p.h index 81e3a1e..2babae5 100644 --- a/src/xmlpatterns/functions/qaggregator_p.h +++ b/src/xmlpatterns/functions/qaggregator_p.h @@ -79,7 +79,7 @@ namespace QPatternist * @returns a static type where the ItemType is the same as this FunctionCall's first * argument, and the Cardinality is as return from Cardinality::toWithoutMany(). */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; }; } diff --git a/src/xmlpatterns/functions/qassemblestringfns_p.h b/src/xmlpatterns/functions/qassemblestringfns_p.h index 0624e5a..e5ab7ab 100644 --- a/src/xmlpatterns/functions/qassemblestringfns_p.h +++ b/src/xmlpatterns/functions/qassemblestringfns_p.h @@ -76,7 +76,7 @@ namespace QPatternist class CodepointsToStringFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -88,7 +88,7 @@ namespace QPatternist class StringToCodepointsFN : public FunctionCall { public: - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; }; } diff --git a/src/xmlpatterns/functions/qbooleanfns_p.h b/src/xmlpatterns/functions/qbooleanfns_p.h index cefccfb..ffc0589 100644 --- a/src/xmlpatterns/functions/qbooleanfns_p.h +++ b/src/xmlpatterns/functions/qbooleanfns_p.h @@ -77,7 +77,7 @@ namespace QPatternist class TrueFN : public FunctionCall { public: - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; }; /** @@ -91,7 +91,7 @@ namespace QPatternist class FalseFN : public FunctionCall { public: - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; }; /** @@ -103,8 +103,8 @@ namespace QPatternist class NotFN : public FunctionCall { public: - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; - virtual QList<QExplicitlySharedDataPointer<OptimizationPass> > optimizationPasses() const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; + QList<QExplicitlySharedDataPointer<OptimizationPass> > optimizationPasses() const override; }; } diff --git a/src/xmlpatterns/functions/qcomparescaseaware_p.h b/src/xmlpatterns/functions/qcomparescaseaware_p.h index 9dce6bb..1356cef 100644 --- a/src/xmlpatterns/functions/qcomparescaseaware_p.h +++ b/src/xmlpatterns/functions/qcomparescaseaware_p.h @@ -71,7 +71,7 @@ namespace QPatternist */ ComparesCaseAware(); - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; /** * Tells whether the return value of the two operands must be compared diff --git a/src/xmlpatterns/functions/qcomparestringfns_p.h b/src/xmlpatterns/functions/qcomparestringfns_p.h index 56691e0..2af617d 100644 --- a/src/xmlpatterns/functions/qcomparestringfns_p.h +++ b/src/xmlpatterns/functions/qcomparestringfns_p.h @@ -75,7 +75,7 @@ namespace QPatternist class CodepointEqualFN : public ComparesCaseAware { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -87,7 +87,7 @@ namespace QPatternist class CompareFN : public ComparesCaseAware { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; } diff --git a/src/xmlpatterns/functions/qcomparingaggregator_p.h b/src/xmlpatterns/functions/qcomparingaggregator_p.h index 896d2f8..7228c8d 100644 --- a/src/xmlpatterns/functions/qcomparingaggregator_p.h +++ b/src/xmlpatterns/functions/qcomparingaggregator_p.h @@ -88,9 +88,9 @@ namespace QPatternist public CastingPlatform<ComparingAggregator<oper, result>, true> { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; inline AtomicComparator::Operator operatorID() const { diff --git a/src/xmlpatterns/functions/qconstructorfunctionsfactory_p.h b/src/xmlpatterns/functions/qconstructorfunctionsfactory_p.h index 69aadad..00e3958 100644 --- a/src/xmlpatterns/functions/qconstructorfunctionsfactory_p.h +++ b/src/xmlpatterns/functions/qconstructorfunctionsfactory_p.h @@ -72,12 +72,12 @@ namespace QPatternist public: ConstructorFunctionsFactory(const NamePool::Ptr &np, const SchemaTypeFactory::Ptr &); - virtual FunctionSignature::Ptr retrieveFunctionSignature(const NamePool::Ptr &np, const QXmlName name); + FunctionSignature::Ptr retrieveFunctionSignature(const NamePool::Ptr &np, const QXmlName name) override; protected: - virtual Expression::Ptr retrieveExpression(const QXmlName name, - const Expression::List &args, - const FunctionSignature::Ptr &sign) const; + Expression::Ptr retrieveExpression(const QXmlName name, + const Expression::List &args, + const FunctionSignature::Ptr &sign) const override; private: const SchemaTypeFactory::Ptr m_typeFactory; diff --git a/src/xmlpatterns/functions/qcontextfns_p.h b/src/xmlpatterns/functions/qcontextfns_p.h index f3743b3..beaeff7 100644 --- a/src/xmlpatterns/functions/qcontextfns_p.h +++ b/src/xmlpatterns/functions/qcontextfns_p.h @@ -76,7 +76,7 @@ namespace QPatternist class PositionFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -90,7 +90,7 @@ namespace QPatternist class LastFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -104,7 +104,7 @@ namespace QPatternist class ImplicitTimezoneFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -118,7 +118,7 @@ namespace QPatternist class CurrentDateTimeFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -132,7 +132,7 @@ namespace QPatternist class CurrentDateFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -146,7 +146,7 @@ namespace QPatternist class CurrentTimeFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -162,8 +162,8 @@ namespace QPatternist class DefaultCollationFN : public FunctionCall { public: - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; }; /** @@ -179,8 +179,8 @@ namespace QPatternist class StaticBaseURIFN : public FunctionCall { public: - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; }; } diff --git a/src/xmlpatterns/functions/qcurrentfn_p.h b/src/xmlpatterns/functions/qcurrentfn_p.h index 8af5544..cc1ad32 100644 --- a/src/xmlpatterns/functions/qcurrentfn_p.h +++ b/src/xmlpatterns/functions/qcurrentfn_p.h @@ -67,11 +67,11 @@ namespace QPatternist class CurrentFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual Expression::Ptr compress(const StaticContext::Ptr &context); - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); - virtual SequenceType::Ptr staticType() const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + Expression::Ptr compress(const StaticContext::Ptr &context) override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; + SequenceType::Ptr staticType() const override; private: ItemType::Ptr m_itemType; diff --git a/src/xmlpatterns/functions/qdatetimefn_p.h b/src/xmlpatterns/functions/qdatetimefn_p.h index bc40200..986ec89 100644 --- a/src/xmlpatterns/functions/qdatetimefn_p.h +++ b/src/xmlpatterns/functions/qdatetimefn_p.h @@ -67,7 +67,7 @@ namespace QPatternist class DateTimeFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; } diff --git a/src/xmlpatterns/functions/qdatetimefns_p.h b/src/xmlpatterns/functions/qdatetimefns_p.h index 3cb0326..71ff121 100644 --- a/src/xmlpatterns/functions/qdatetimefns_p.h +++ b/src/xmlpatterns/functions/qdatetimefns_p.h @@ -94,7 +94,7 @@ namespace QPatternist * Takes care of the argument handling, and, if applicable, * calls extract() with the value of the operand. */ - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -193,7 +193,7 @@ namespace QPatternist * Takes care of the argument handling, and, if applicable, * calls extract() with the value of the operand. */ - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** diff --git a/src/xmlpatterns/functions/qdeepequalfn_p.h b/src/xmlpatterns/functions/qdeepequalfn_p.h index a578883..1166d98 100644 --- a/src/xmlpatterns/functions/qdeepequalfn_p.h +++ b/src/xmlpatterns/functions/qdeepequalfn_p.h @@ -72,9 +72,9 @@ namespace QPatternist { } - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + bool evaluateEBV(const DynamicContext::Ptr &context) const override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; inline AtomicComparator::Operator operatorID() const { diff --git a/src/xmlpatterns/functions/qdocumentfn_p.h b/src/xmlpatterns/functions/qdocumentfn_p.h index 4be225e..d9750bd 100644 --- a/src/xmlpatterns/functions/qdocumentfn_p.h +++ b/src/xmlpatterns/functions/qdocumentfn_p.h @@ -108,8 +108,8 @@ namespace QPatternist class DocumentFN : public FunctionCall { public: - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; }; } diff --git a/src/xmlpatterns/functions/qelementavailablefn_p.h b/src/xmlpatterns/functions/qelementavailablefn_p.h index 1e2216d..435202b 100644 --- a/src/xmlpatterns/functions/qelementavailablefn_p.h +++ b/src/xmlpatterns/functions/qelementavailablefn_p.h @@ -69,7 +69,7 @@ namespace QPatternist { public: ElementAvailableFN(); - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; private: static QSet<QString> allXSLTInstructions(); diff --git a/src/xmlpatterns/functions/qerrorfn_p.h b/src/xmlpatterns/functions/qerrorfn_p.h index 5105c21..a4df73e 100644 --- a/src/xmlpatterns/functions/qerrorfn_p.h +++ b/src/xmlpatterns/functions/qerrorfn_p.h @@ -75,8 +75,8 @@ namespace QPatternist class ErrorFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual FunctionSignature::Ptr signature() const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + FunctionSignature::Ptr signature() const override; }; } diff --git a/src/xmlpatterns/functions/qfunctionavailablefn_p.h b/src/xmlpatterns/functions/qfunctionavailablefn_p.h index 860055f..57da501 100644 --- a/src/xmlpatterns/functions/qfunctionavailablefn_p.h +++ b/src/xmlpatterns/functions/qfunctionavailablefn_p.h @@ -68,13 +68,13 @@ namespace QPatternist class FunctionAvailableFN : public StaticNamespacesContainer { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; /** * Reimplemented to store data from the @p context which is needed at runtime. */ - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; private: FunctionFactory::Ptr m_functionFactory; diff --git a/src/xmlpatterns/functions/qfunctioncall_p.h b/src/xmlpatterns/functions/qfunctioncall_p.h index 03068c5..474ed3e 100644 --- a/src/xmlpatterns/functions/qfunctioncall_p.h +++ b/src/xmlpatterns/functions/qfunctioncall_p.h @@ -71,20 +71,20 @@ namespace QPatternist public: typedef QExplicitlySharedDataPointer<FunctionCall> Ptr; - virtual SequenceType::List expectedOperandTypes() const; - virtual SequenceType::Ptr staticType() const; + SequenceType::List expectedOperandTypes() const override; + SequenceType::Ptr staticType() const override; virtual void setSignature(const FunctionSignature::Ptr &sign); virtual FunctionSignature::Ptr signature() const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; - virtual Expression::Properties properties() const; + Expression::Properties properties() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; - virtual ID id() const; + ID id() const override; private: FunctionSignature::Ptr m_signature; diff --git a/src/xmlpatterns/functions/qfunctionfactorycollection_p.h b/src/xmlpatterns/functions/qfunctionfactorycollection_p.h index 2adbdc1..056b00b 100644 --- a/src/xmlpatterns/functions/qfunctionfactorycollection_p.h +++ b/src/xmlpatterns/functions/qfunctionfactorycollection_p.h @@ -76,15 +76,15 @@ namespace QPatternist /** * Creates a function call node. */ - virtual Expression::Ptr createFunctionCall(const QXmlName, - const Expression::List &arguments, - const StaticContext::Ptr &context, - const SourceLocationReflection *const r); - virtual bool isAvailable(const NamePool::Ptr &np, const QXmlName name, const xsInteger arity); + Expression::Ptr createFunctionCall(const QXmlName, + const Expression::List &arguments, + const StaticContext::Ptr &context, + const SourceLocationReflection *const r) override; + bool isAvailable(const NamePool::Ptr &np, const QXmlName name, const xsInteger arity) override; - virtual FunctionSignature::Hash functionSignatures() const; + FunctionSignature::Hash functionSignatures() const override; - virtual FunctionSignature::Ptr retrieveFunctionSignature(const NamePool::Ptr &np, const QXmlName name); + FunctionSignature::Ptr retrieveFunctionSignature(const NamePool::Ptr &np, const QXmlName name) override; /** * @return a FunctionFactory containing all core functions and constructor diff --git a/src/xmlpatterns/functions/qgenerateidfn_p.h b/src/xmlpatterns/functions/qgenerateidfn_p.h index 5e4aa1e..8d37de0 100644 --- a/src/xmlpatterns/functions/qgenerateidfn_p.h +++ b/src/xmlpatterns/functions/qgenerateidfn_p.h @@ -68,7 +68,7 @@ namespace QPatternist class GenerateIDFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; } diff --git a/src/xmlpatterns/functions/qnodefns_p.h b/src/xmlpatterns/functions/qnodefns_p.h index cfb1faa..9469953 100644 --- a/src/xmlpatterns/functions/qnodefns_p.h +++ b/src/xmlpatterns/functions/qnodefns_p.h @@ -75,7 +75,7 @@ namespace QPatternist class NameFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -87,7 +87,7 @@ namespace QPatternist class LocalNameFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -99,7 +99,7 @@ namespace QPatternist class NamespaceURIFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -114,15 +114,15 @@ namespace QPatternist public CastingPlatform<NumberFN, false> { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; /** * Overridden in order to call CastingPlatform::prepareCasting(). It also * implements the optimization of rewriting to its operand if its * type is xs:double(since the <tt>fn:number()</tt> call is in that case superflorous). */ - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; /** * @returns always BuiltinTypes::xsDouble. @@ -142,7 +142,7 @@ namespace QPatternist class LangFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; private: static inline bool isLangMatch(const QString &candidate, const QString &toMatch); @@ -157,11 +157,11 @@ namespace QPatternist class RootFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; /** * Infers its cardinality from the argument. */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; }; } diff --git a/src/xmlpatterns/functions/qnumericfns_p.h b/src/xmlpatterns/functions/qnumericfns_p.h index 1f56d84..04f805d 100644 --- a/src/xmlpatterns/functions/qnumericfns_p.h +++ b/src/xmlpatterns/functions/qnumericfns_p.h @@ -75,7 +75,7 @@ namespace QPatternist class FloorFN : public Aggregator { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -87,7 +87,7 @@ namespace QPatternist class AbsFN : public Aggregator { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -99,7 +99,7 @@ namespace QPatternist class RoundFN : public Aggregator { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -111,7 +111,7 @@ namespace QPatternist class CeilingFN : public Aggregator { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -125,7 +125,7 @@ namespace QPatternist class RoundHalfToEvenFN : public Aggregator { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; } diff --git a/src/xmlpatterns/functions/qpatternmatchingfns_p.h b/src/xmlpatterns/functions/qpatternmatchingfns_p.h index f95bb42..cdf4322 100644 --- a/src/xmlpatterns/functions/qpatternmatchingfns_p.h +++ b/src/xmlpatterns/functions/qpatternmatchingfns_p.h @@ -75,7 +75,7 @@ namespace QPatternist { public: MatchesFN(); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -88,11 +88,11 @@ namespace QPatternist { public: ReplaceFN(); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; /** * Overridden to attempt to pre-compile the replacement string. */ - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; private: /** @@ -121,7 +121,7 @@ namespace QPatternist public: TokenizeFN(); inline Item mapToItem(const QString &subject, const DynamicContext::Ptr &) const; - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; private: typedef QExplicitlySharedDataPointer<const TokenizeFN> ConstPtr; diff --git a/src/xmlpatterns/functions/qpatternplatform_p.h b/src/xmlpatterns/functions/qpatternplatform_p.h index 462f016..54838ce 100644 --- a/src/xmlpatterns/functions/qpatternplatform_p.h +++ b/src/xmlpatterns/functions/qpatternplatform_p.h @@ -102,7 +102,7 @@ namespace QPatternist }; typedef QFlags<Flag> Flags; - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; /** * Retrieves the pattern supplied in the arguments, taking care of compiling it, diff --git a/src/xmlpatterns/functions/qqnamefns_p.h b/src/xmlpatterns/functions/qqnamefns_p.h index 9264974..b2b9fcb 100644 --- a/src/xmlpatterns/functions/qqnamefns_p.h +++ b/src/xmlpatterns/functions/qqnamefns_p.h @@ -75,7 +75,7 @@ namespace QPatternist class QNameFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -87,7 +87,7 @@ namespace QPatternist class ResolveQNameFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -99,7 +99,7 @@ namespace QPatternist class PrefixFromQNameFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -111,7 +111,7 @@ namespace QPatternist class LocalNameFromQNameFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -123,7 +123,7 @@ namespace QPatternist class NamespaceURIFromQNameFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -135,7 +135,7 @@ namespace QPatternist class NamespaceURIForPrefixFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -147,7 +147,7 @@ namespace QPatternist class InScopePrefixesFN : public FunctionCall { public: - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; }; } diff --git a/src/xmlpatterns/functions/qresolveurifn_p.h b/src/xmlpatterns/functions/qresolveurifn_p.h index 40271f5..a289c3d 100644 --- a/src/xmlpatterns/functions/qresolveurifn_p.h +++ b/src/xmlpatterns/functions/qresolveurifn_p.h @@ -65,9 +65,9 @@ namespace QPatternist class ResolveURIFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; }; } diff --git a/src/xmlpatterns/functions/qsequencefns_p.h b/src/xmlpatterns/functions/qsequencefns_p.h index 82b430b..16a79a8 100644 --- a/src/xmlpatterns/functions/qsequencefns_p.h +++ b/src/xmlpatterns/functions/qsequencefns_p.h @@ -80,15 +80,15 @@ namespace QPatternist class BooleanFN : public FunctionCall { public: - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; /** * If @p reqType is CommonSequenceTypes::EBV, the type check of * the operand is returned. Hence, this removes redundant calls * to <tt>fn:boolean()</tt>. */ - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; }; /** @@ -105,9 +105,9 @@ namespace QPatternist { } - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; inline AtomicComparator::Operator operatorID() const { @@ -128,7 +128,7 @@ namespace QPatternist class Existence : public FunctionCall { public: - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const + bool evaluateEBV(const DynamicContext::Ptr &context) const override { if(Id == IDExistsFN) return !m_operands.first()->evaluateSequence(context)->isEmpty(); @@ -140,7 +140,7 @@ namespace QPatternist * Attempts to rewrite to @c false or @c true by looking at the static * cardinality of its operand. */ - virtual Expression::Ptr compress(const StaticContext::Ptr &context) + Expression::Ptr compress(const StaticContext::Ptr &context) override { // RVCT doesn't like using template parameter in trinary operator when the trinary operator result is // passed directly into another constructor. @@ -191,14 +191,14 @@ namespace QPatternist { } - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; /** * Performs necessary type checks, but also implements the optimization * of rewriting to its operand if the operand's cardinality is zero-or-one * or exactly-one. */ - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; /** * @returns a type whose item type is the type of the first operand, and * a cardinality which is non-empty if the first operand's type is non-empty @@ -206,7 +206,7 @@ namespace QPatternist * cardinality 2+, since distinct-values possibly removes items from the * source sequence. */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; protected: inline AtomicComparator::Operator operatorID() const @@ -226,8 +226,8 @@ namespace QPatternist class InsertBeforeFN : public FunctionCall { public: - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; /** * Implements the static enferences rules. The function's static item type @@ -238,7 +238,7 @@ namespace QPatternist * @see <a href="http://www.w3.org/TR/xquery-semantics/#sec_fn_insert_before">XQuery 1.0 * and XPath 2.0 Formal Semantics, 7.2.15 The fn:insert-before function</a> */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; }; /** @@ -250,8 +250,8 @@ namespace QPatternist class RemoveFN : public FunctionCall { public: - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; /** * Implements the static enferences rules, "Since one item may be removed @@ -265,7 +265,7 @@ namespace QPatternist * @see <a href="http://www.w3.org/TR/xquery-semantics/#sec_fn_remove">XQuery 1.0 * and XPath 2.0 Formal Semantics, 7.2.11 The fn:remove function</a> */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; }; /** @@ -278,9 +278,9 @@ namespace QPatternist { public: - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; /** * Formally speaking, the type inference is: @@ -293,7 +293,7 @@ statEnv |- (FN-URI,"reverse")(Type) : prime(Type) * quantifier(Type) * and XPath 2.0 Formal Semantics, 7.2.12 The fn:reverse function</a> * @returns the static type of the function's first argument. */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; }; /** @@ -307,18 +307,18 @@ statEnv |- (FN-URI,"reverse")(Type) : prime(Type) * quantifier(Type) { public: SubsequenceFN(); - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; /** * This function implements rewrites the SubsequenceFN instance into an * empty sequence if its third argument, the sequence length argument, is * evaluated and is effectively equal or less than zero. */ - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; /** * Partially implements the static type inference rules. @@ -326,7 +326,7 @@ statEnv |- (FN-URI,"reverse")(Type) : prime(Type) * quantifier(Type) * @see <a href="http://www.w3.org/TR/xquery-semantics/#sec_fn_subsequence">XQuery 1.0 * and XPath 2.0 Formal Semantics, 7.2.13 The fn:subsequence function</a> */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; private: bool m_hasTypeChecked; diff --git a/src/xmlpatterns/functions/qsequencegeneratingfns.cpp b/src/xmlpatterns/functions/qsequencegeneratingfns.cpp index 28c9134..9016911 100644 --- a/src/xmlpatterns/functions/qsequencegeneratingfns.cpp +++ b/src/xmlpatterns/functions/qsequencegeneratingfns.cpp @@ -87,9 +87,9 @@ class StringSplitter : public QAbstractXmlForwardIterator<QString> { public: StringSplitter(const Item::Iterator::Ptr &source); - virtual QString next(); - virtual QString current() const; - virtual qint64 position() const; + QString next() override; + QString current() const override; + qint64 position() const override; private: QString loadNext(); const Item::Iterator::Ptr m_source; diff --git a/src/xmlpatterns/functions/qsequencegeneratingfns_p.h b/src/xmlpatterns/functions/qsequencegeneratingfns_p.h index 30dab9f..83f2ee5 100644 --- a/src/xmlpatterns/functions/qsequencegeneratingfns_p.h +++ b/src/xmlpatterns/functions/qsequencegeneratingfns_p.h @@ -79,13 +79,13 @@ namespace QPatternist IdFN(); typedef QPair<DynamicContext::Ptr, const QAbstractXmlNodeModel *> IDContext; - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; inline Item mapToItem(const QString &id, const IDContext &context) const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; private: typedef QExplicitlySharedDataPointer<const IdFN> ConstPtr; @@ -101,7 +101,7 @@ namespace QPatternist class IdrefFN : public ContextNodeChecker { public: - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; }; /** @@ -113,7 +113,7 @@ namespace QPatternist class DocFN : public StaticBaseUriContainer { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; /** * The implementation of this function is placed in a different compilation unit, @@ -124,9 +124,9 @@ namespace QPatternist * href="http://onesearch.sun.com/search/onesearch/index.jsp?qt=6532605&site=sunsolve&otf=ss&col=support-sunsolve&otf=sunsolve&site=ss&col=search-sunsolve">Sun, * multiply-defined label for template instance, bug 6532605</a> */ - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); - virtual SequenceType::Ptr staticType() const; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; + SequenceType::Ptr staticType() const override; private: SequenceType::Ptr m_type; @@ -141,7 +141,7 @@ namespace QPatternist class DocAvailableFN : public StaticBaseUriContainer { public: - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; }; /** @@ -153,7 +153,7 @@ namespace QPatternist class CollectionFN : public FunctionCall { public: - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; }; } diff --git a/src/xmlpatterns/functions/qstaticbaseuricontainer_p.h b/src/xmlpatterns/functions/qstaticbaseuricontainer_p.h index 0599415..4367391 100644 --- a/src/xmlpatterns/functions/qstaticbaseuricontainer_p.h +++ b/src/xmlpatterns/functions/qstaticbaseuricontainer_p.h @@ -86,8 +86,8 @@ namespace QPatternist * Calls prepareStaticBaseURI(), and return the return value of * FunctionCall::typeCheck(), forwarding the arguments. */ - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType) + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override { prepareStaticBaseURI(context); return FunctionCall::typeCheck(context, reqType); diff --git a/src/xmlpatterns/functions/qstaticnamespacescontainer_p.h b/src/xmlpatterns/functions/qstaticnamespacescontainer_p.h index 2f15b7f..88c515c 100644 --- a/src/xmlpatterns/functions/qstaticnamespacescontainer_p.h +++ b/src/xmlpatterns/functions/qstaticnamespacescontainer_p.h @@ -78,8 +78,8 @@ namespace QPatternist /** * Reimplemented to store data from the @p context. */ - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; protected: /** diff --git a/src/xmlpatterns/functions/qstringvaluefns_p.h b/src/xmlpatterns/functions/qstringvaluefns_p.h index ed8bca9..7367632 100644 --- a/src/xmlpatterns/functions/qstringvaluefns_p.h +++ b/src/xmlpatterns/functions/qstringvaluefns_p.h @@ -77,7 +77,7 @@ namespace QPatternist class ConcatFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -89,14 +89,14 @@ namespace QPatternist class StringJoinFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; /** * Optimization: when the cardinality of the sequence of items to join * cannot be two or more, we have no effect and therefore rewrite * ourselves to our first operand. */ - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; }; /** @@ -108,7 +108,7 @@ namespace QPatternist class SubstringFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -120,7 +120,7 @@ namespace QPatternist class StringLengthFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -132,7 +132,7 @@ namespace QPatternist class NormalizeSpaceFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -152,8 +152,8 @@ namespace QPatternist * Initializes private data. */ NormalizeUnicodeFN(); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + Expression::Ptr compress(const StaticContext::Ptr &context) override; private: int determineNormalizationForm(const DynamicContext::Ptr &context) const; @@ -169,7 +169,7 @@ namespace QPatternist class UpperCaseFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -182,7 +182,7 @@ namespace QPatternist class LowerCaseFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -194,7 +194,7 @@ namespace QPatternist class TranslateFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -212,7 +212,7 @@ namespace QPatternist * is returned. Otherwise, the item's string value is returned percent encoded * as specified in this class's constructor. */ - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; protected: /** diff --git a/src/xmlpatterns/functions/qsubstringfns_p.h b/src/xmlpatterns/functions/qsubstringfns_p.h index d1fcb75..1e6b052 100644 --- a/src/xmlpatterns/functions/qsubstringfns_p.h +++ b/src/xmlpatterns/functions/qsubstringfns_p.h @@ -73,7 +73,7 @@ namespace QPatternist class ContainsFN : public ComparesCaseAware { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -85,7 +85,7 @@ namespace QPatternist class StartsWithFN : public ComparesCaseAware { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -97,7 +97,7 @@ namespace QPatternist class EndsWithFN : public ComparesCaseAware { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -109,7 +109,7 @@ namespace QPatternist class SubstringBeforeFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -121,7 +121,7 @@ namespace QPatternist class SubstringAfterFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; } diff --git a/src/xmlpatterns/functions/qsystempropertyfn_p.h b/src/xmlpatterns/functions/qsystempropertyfn_p.h index cc347f6..8312aa0 100644 --- a/src/xmlpatterns/functions/qsystempropertyfn_p.h +++ b/src/xmlpatterns/functions/qsystempropertyfn_p.h @@ -67,7 +67,7 @@ namespace QPatternist class SystemPropertyFN : public StaticNamespacesContainer { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; private: /** diff --git a/src/xmlpatterns/functions/qtimezonefns_p.h b/src/xmlpatterns/functions/qtimezonefns_p.h index 5c933ed..3c61fd2 100644 --- a/src/xmlpatterns/functions/qtimezonefns_p.h +++ b/src/xmlpatterns/functions/qtimezonefns_p.h @@ -82,7 +82,7 @@ namespace QPatternist class AdjustTimezone : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; protected: virtual Item createValue(const QDateTime &dt) const = 0; @@ -97,7 +97,7 @@ namespace QPatternist class AdjustDateTimeToTimezoneFN : public AdjustTimezone { protected: - virtual Item createValue(const QDateTime &dt) const; + Item createValue(const QDateTime &dt) const override; }; /** @@ -109,7 +109,7 @@ namespace QPatternist class AdjustDateToTimezoneFN : public AdjustTimezone { protected: - virtual Item createValue(const QDateTime &dt) const; + Item createValue(const QDateTime &dt) const override; }; /** @@ -121,7 +121,7 @@ namespace QPatternist class AdjustTimeToTimezoneFN : public AdjustTimezone { protected: - virtual Item createValue(const QDateTime &dt) const; + Item createValue(const QDateTime &dt) const override; }; } diff --git a/src/xmlpatterns/functions/qtracefn_p.h b/src/xmlpatterns/functions/qtracefn_p.h index 2e5a31d..b423402 100644 --- a/src/xmlpatterns/functions/qtracefn_p.h +++ b/src/xmlpatterns/functions/qtracefn_p.h @@ -64,8 +64,8 @@ namespace QPatternist class TraceFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; /** * Formally speaking, the type inference is: @@ -79,7 +79,7 @@ statEnv |- (FN-URI,"trace")(Type) : prime(Type) * quantifier(Type) * an example of where the type inference is used * @returns the static type of the function's first argument. */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; }; } diff --git a/src/xmlpatterns/functions/qtypeavailablefn_p.h b/src/xmlpatterns/functions/qtypeavailablefn_p.h index 6dc57a4..8dd1987 100644 --- a/src/xmlpatterns/functions/qtypeavailablefn_p.h +++ b/src/xmlpatterns/functions/qtypeavailablefn_p.h @@ -68,13 +68,13 @@ namespace QPatternist class TypeAvailableFN : public StaticNamespacesContainer { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; /** * Reimplemented to store data from the @p context which is needed at runtime. */ - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; private: SchemaTypeFactory::Ptr m_schemaTypeFactory; diff --git a/src/xmlpatterns/functions/qunparsedentitypublicidfn_p.h b/src/xmlpatterns/functions/qunparsedentitypublicidfn_p.h index 206cb16..6029202 100644 --- a/src/xmlpatterns/functions/qunparsedentitypublicidfn_p.h +++ b/src/xmlpatterns/functions/qunparsedentitypublicidfn_p.h @@ -67,7 +67,7 @@ namespace QPatternist class UnparsedEntityPublicIDFN : public ContextNodeChecker { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; } diff --git a/src/xmlpatterns/functions/qunparsedentityurifn_p.h b/src/xmlpatterns/functions/qunparsedentityurifn_p.h index eaf51c6..74f73b9 100644 --- a/src/xmlpatterns/functions/qunparsedentityurifn_p.h +++ b/src/xmlpatterns/functions/qunparsedentityurifn_p.h @@ -67,7 +67,7 @@ namespace QPatternist class UnparsedEntityURIFN : public ContextNodeChecker { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; } diff --git a/src/xmlpatterns/functions/qunparsedtextavailablefn_p.h b/src/xmlpatterns/functions/qunparsedtextavailablefn_p.h index eb4d049..6ca320c 100644 --- a/src/xmlpatterns/functions/qunparsedtextavailablefn_p.h +++ b/src/xmlpatterns/functions/qunparsedtextavailablefn_p.h @@ -68,7 +68,7 @@ namespace QPatternist class UnparsedTextAvailableFN : public StaticBaseUriContainer { public: - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; }; } diff --git a/src/xmlpatterns/functions/qunparsedtextfn_p.h b/src/xmlpatterns/functions/qunparsedtextfn_p.h index aa807cb..5899598 100644 --- a/src/xmlpatterns/functions/qunparsedtextfn_p.h +++ b/src/xmlpatterns/functions/qunparsedtextfn_p.h @@ -68,7 +68,7 @@ namespace QPatternist class UnparsedTextFN : public StaticBaseUriContainer { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; } diff --git a/src/xmlpatterns/functions/qxpath10corefunctions_p.h b/src/xmlpatterns/functions/qxpath10corefunctions_p.h index 8a6fcd8..9797229 100644 --- a/src/xmlpatterns/functions/qxpath10corefunctions_p.h +++ b/src/xmlpatterns/functions/qxpath10corefunctions_p.h @@ -75,10 +75,10 @@ namespace QPatternist * createFunctionCall(), once it have been determined the function actually * exists and have the correct arity. */ - virtual Expression::Ptr retrieveExpression(const QXmlName name, - const Expression::List &args, - const FunctionSignature::Ptr &sign) const; - virtual FunctionSignature::Ptr retrieveFunctionSignature(const NamePool::Ptr &np, const QXmlName name); + Expression::Ptr retrieveExpression(const QXmlName name, + const Expression::List &args, + const FunctionSignature::Ptr &sign) const override; + FunctionSignature::Ptr retrieveFunctionSignature(const NamePool::Ptr &np, const QXmlName name) override; }; } diff --git a/src/xmlpatterns/functions/qxpath20corefunctions_p.h b/src/xmlpatterns/functions/qxpath20corefunctions_p.h index 2a78a7c..91d87f2 100644 --- a/src/xmlpatterns/functions/qxpath20corefunctions_p.h +++ b/src/xmlpatterns/functions/qxpath20corefunctions_p.h @@ -76,12 +76,12 @@ namespace QPatternist class XPath20CoreFunctions : public AbstractFunctionFactory { protected: - virtual Expression::Ptr retrieveExpression(const QXmlName name, - const Expression::List &args, - const FunctionSignature::Ptr &sign) const; + Expression::Ptr retrieveExpression(const QXmlName name, + const Expression::List &args, + const FunctionSignature::Ptr &sign) const override; - virtual FunctionSignature::Ptr retrieveFunctionSignature(const NamePool::Ptr &np, - const QXmlName name); + FunctionSignature::Ptr retrieveFunctionSignature(const NamePool::Ptr &np, + const QXmlName name) override; }; } diff --git a/src/xmlpatterns/functions/qxslt20corefunctions_p.h b/src/xmlpatterns/functions/qxslt20corefunctions_p.h index b0dc87c..e68e438 100644 --- a/src/xmlpatterns/functions/qxslt20corefunctions_p.h +++ b/src/xmlpatterns/functions/qxslt20corefunctions_p.h @@ -74,12 +74,12 @@ namespace QPatternist class XSLT20CoreFunctions : public AbstractFunctionFactory { protected: - virtual Expression::Ptr retrieveExpression(const QXmlName name, - const Expression::List &args, - const FunctionSignature::Ptr &sign) const; + Expression::Ptr retrieveExpression(const QXmlName name, + const Expression::List &args, + const FunctionSignature::Ptr &sign) const override; - virtual FunctionSignature::Ptr retrieveFunctionSignature(const NamePool::Ptr &np, - const QXmlName name); + FunctionSignature::Ptr retrieveFunctionSignature(const NamePool::Ptr &np, + const QXmlName name) override; }; } diff --git a/src/xmlpatterns/iterators/qcachingiterator_p.h b/src/xmlpatterns/iterators/qcachingiterator_p.h index 27b29a4..7d54c26 100644 --- a/src/xmlpatterns/iterators/qcachingiterator_p.h +++ b/src/xmlpatterns/iterators/qcachingiterator_p.h @@ -83,10 +83,10 @@ namespace QPatternist const VariableSlotID slot, const DynamicContext::Ptr &context); - virtual Item next(); - virtual Item current() const; - virtual xsInteger position() const; - virtual Item::Iterator::Ptr copy() const; + Item next() override; + Item current() const override; + xsInteger position() const override; + Item::Iterator::Ptr copy() const override; private: Item m_current; diff --git a/src/xmlpatterns/iterators/qdeduplicateiterator_p.h b/src/xmlpatterns/iterators/qdeduplicateiterator_p.h index cc30c7f..c975f63 100644 --- a/src/xmlpatterns/iterators/qdeduplicateiterator_p.h +++ b/src/xmlpatterns/iterators/qdeduplicateiterator_p.h @@ -76,9 +76,9 @@ namespace QPatternist public: DeduplicateIterator(const Item::List &source); - virtual Item next(); - virtual Item::Iterator::Ptr copy() const; - virtual xsInteger count(); + Item next() override; + Item::Iterator::Ptr copy() const override; + xsInteger count() override; private: /** diff --git a/src/xmlpatterns/iterators/qdistinctiterator_p.h b/src/xmlpatterns/iterators/qdistinctiterator_p.h index 1b70307..e639a5a 100644 --- a/src/xmlpatterns/iterators/qdistinctiterator_p.h +++ b/src/xmlpatterns/iterators/qdistinctiterator_p.h @@ -96,11 +96,11 @@ namespace QPatternist const Expression::ConstPtr &expression, const DynamicContext::Ptr &context); - virtual Item next(); - virtual Item current() const; - virtual xsInteger position() const; - virtual Item::Iterator::Ptr copy() const; - virtual const SourceLocationReflection *actualReflection() const; + Item next() override; + Item current() const override; + xsInteger position() const override; + Item::Iterator::Ptr copy() const override; + const SourceLocationReflection *actualReflection() const override; inline AtomicComparator::Operator operatorID() const { diff --git a/src/xmlpatterns/iterators/qemptyiterator_p.h b/src/xmlpatterns/iterators/qemptyiterator_p.h index ad10bbc..2374382 100644 --- a/src/xmlpatterns/iterators/qemptyiterator_p.h +++ b/src/xmlpatterns/iterators/qemptyiterator_p.h @@ -76,7 +76,7 @@ namespace QPatternist /** * @returns always a default constructed value, T(). */ - virtual T next() + T next() override { return T(); } @@ -84,7 +84,7 @@ namespace QPatternist /** * @returns always a default constructed value, T(). */ - virtual T current() const + T current() const override { return T(); } @@ -92,7 +92,7 @@ namespace QPatternist /** * @returns always 0. */ - virtual xsInteger position() const + xsInteger position() const override { return 0; } @@ -100,7 +100,7 @@ namespace QPatternist /** * @returns always @c this, the reverse of <tt>()</tt> is <tt>()</tt>. */ - virtual typename QAbstractXmlForwardIterator<T>::Ptr toReversed() + typename QAbstractXmlForwardIterator<T>::Ptr toReversed() override { return typename QAbstractXmlForwardIterator<T>::Ptr(const_cast<EmptyIterator<T> *>(this)); } @@ -108,7 +108,7 @@ namespace QPatternist /** * @returns always 0 */ - virtual xsInteger count() + xsInteger count() override { return 0; } @@ -116,7 +116,7 @@ namespace QPatternist /** * @returns @c this */ - virtual typename QAbstractXmlForwardIterator<T>::Ptr copy() const + typename QAbstractXmlForwardIterator<T>::Ptr copy() const override { return typename QAbstractXmlForwardIterator<T>::Ptr(const_cast<EmptyIterator *>(this)); } diff --git a/src/xmlpatterns/iterators/qexceptiterator_p.h b/src/xmlpatterns/iterators/qexceptiterator_p.h index 757192c..afd6b2b 100644 --- a/src/xmlpatterns/iterators/qexceptiterator_p.h +++ b/src/xmlpatterns/iterators/qexceptiterator_p.h @@ -73,10 +73,10 @@ namespace QPatternist ExceptIterator(const Item::Iterator::Ptr &it1, const Item::Iterator::Ptr &it2); - virtual Item next(); - virtual Item current() const; - virtual xsInteger position() const; - virtual Item::Iterator::Ptr copy() const; + Item next() override; + Item current() const override; + xsInteger position() const override; + Item::Iterator::Ptr copy() const override; private: inline Item fromFirstOperand(); diff --git a/src/xmlpatterns/iterators/qindexofiterator_p.h b/src/xmlpatterns/iterators/qindexofiterator_p.h index d156821..28714f5 100644 --- a/src/xmlpatterns/iterators/qindexofiterator_p.h +++ b/src/xmlpatterns/iterators/qindexofiterator_p.h @@ -95,17 +95,17 @@ namespace QPatternist const DynamicContext::Ptr &context, const Expression::ConstPtr &expr); - virtual Item next(); - virtual Item current() const; - virtual xsInteger position() const; - virtual Item::Iterator::Ptr copy() const; + Item next() override; + Item current() const override; + xsInteger position() const override; + Item::Iterator::Ptr copy() const override; inline AtomicComparator::Operator operatorID() const { return AtomicComparator::OperatorEqual; } - virtual const SourceLocationReflection *actualReflection() const; + const SourceLocationReflection *actualReflection() const override; private: const Item::Iterator::Ptr m_seq; diff --git a/src/xmlpatterns/iterators/qinsertioniterator_p.h b/src/xmlpatterns/iterators/qinsertioniterator_p.h index ab49132..7372ed8 100644 --- a/src/xmlpatterns/iterators/qinsertioniterator_p.h +++ b/src/xmlpatterns/iterators/qinsertioniterator_p.h @@ -93,11 +93,11 @@ namespace QPatternist const xsInteger position, const Item::Iterator::Ptr &insertIterator); - virtual Item next(); - virtual Item current() const; - virtual xsInteger position() const; - virtual xsInteger count(); - virtual Item::Iterator::Ptr copy() const; + Item next() override; + Item current() const override; + xsInteger position() const override; + xsInteger count() override; + Item::Iterator::Ptr copy() const override; private: const Item::Iterator::Ptr m_target; diff --git a/src/xmlpatterns/iterators/qintersectiterator_p.h b/src/xmlpatterns/iterators/qintersectiterator_p.h index 24977ac..5ebce6b 100644 --- a/src/xmlpatterns/iterators/qintersectiterator_p.h +++ b/src/xmlpatterns/iterators/qintersectiterator_p.h @@ -74,10 +74,10 @@ namespace QPatternist IntersectIterator(const Item::Iterator::Ptr &it1, const Item::Iterator::Ptr &it2); - virtual Item next(); - virtual Item current() const; - virtual xsInteger position() const; - virtual Item::Iterator::Ptr copy() const; + Item next() override; + Item current() const override; + xsInteger position() const override; + Item::Iterator::Ptr copy() const override; private: inline Item closedExit() diff --git a/src/xmlpatterns/iterators/qitemmappingiterator_p.h b/src/xmlpatterns/iterators/qitemmappingiterator_p.h index af48631..9e4f8d3 100644 --- a/src/xmlpatterns/iterators/qitemmappingiterator_p.h +++ b/src/xmlpatterns/iterators/qitemmappingiterator_p.h @@ -111,7 +111,7 @@ namespace QPatternist * @returns the next item in the sequence, or * @c null if the end have been reached. */ - virtual TResult next() + TResult next() override { while (true) { @@ -138,17 +138,17 @@ namespace QPatternist } } - virtual TResult current() const + TResult current() const override { return m_current; } - virtual xsInteger position() const + xsInteger position() const override { return m_position; } - virtual typename QAbstractXmlForwardIterator<TResult>::Ptr copy() const + typename QAbstractXmlForwardIterator<TResult>::Ptr copy() const override { return typename QAbstractXmlForwardIterator<TResult>::Ptr (new ItemMappingIterator<TResult, TSource, TMapper, Context>(m_mapper, m_it->copy(), m_context)); diff --git a/src/xmlpatterns/iterators/qrangeiterator_p.h b/src/xmlpatterns/iterators/qrangeiterator_p.h index 22538cd..14e919c 100644 --- a/src/xmlpatterns/iterators/qrangeiterator_p.h +++ b/src/xmlpatterns/iterators/qrangeiterator_p.h @@ -108,12 +108,12 @@ namespace QPatternist const Direction direction, const xsInteger end); - virtual Item next(); - virtual Item current() const; - virtual xsInteger position() const; - virtual xsInteger count(); - virtual Item::Iterator::Ptr toReversed(); - virtual Item::Iterator::Ptr copy() const; + Item next() override; + Item current() const override; + xsInteger position() const override; + xsInteger count() override; + Item::Iterator::Ptr toReversed() override; + Item::Iterator::Ptr copy() const override; private: xsInteger m_start; diff --git a/src/xmlpatterns/iterators/qremovaliterator_p.h b/src/xmlpatterns/iterators/qremovaliterator_p.h index b2bc453..bf0fb6b 100644 --- a/src/xmlpatterns/iterators/qremovaliterator_p.h +++ b/src/xmlpatterns/iterators/qremovaliterator_p.h @@ -91,17 +91,17 @@ namespace QPatternist RemovalIterator(const Item::Iterator::Ptr &target, const xsInteger position); - virtual Item next(); - virtual Item current() const; - virtual xsInteger position() const; + Item next() override; + Item current() const override; + xsInteger position() const override; /** * The QAbstractXmlForwardIterator's count is computed by subtracting one from the source * QAbstractXmlForwardIterator's count. */ - virtual xsInteger count(); + xsInteger count() override; - virtual Item::Iterator::Ptr copy() const; + Item::Iterator::Ptr copy() const override; private: const Item::Iterator::Ptr m_target; diff --git a/src/xmlpatterns/iterators/qsequencemappingiterator_p.h b/src/xmlpatterns/iterators/qsequencemappingiterator_p.h index e687d8b..045c812 100644 --- a/src/xmlpatterns/iterators/qsequencemappingiterator_p.h +++ b/src/xmlpatterns/iterators/qsequencemappingiterator_p.h @@ -97,16 +97,16 @@ namespace QPatternist const typename QAbstractXmlForwardIterator<TSource>::Ptr &sourceIterator, const DynamicContext::Ptr &context); - virtual TResult next(); - virtual xsInteger count(); - virtual TResult current() const; - virtual xsInteger position() const; + TResult next() override; + xsInteger count() override; + TResult current() const override; + xsInteger position() const override; /** * The reason the implementation is placed in line here, is due to a bug * in MSVC-2005 version 14.00.50727.762. Note that it works with version 14.00.50727.42. */ - virtual typename QAbstractXmlForwardIterator<TResult>::Ptr copy() const + typename QAbstractXmlForwardIterator<TResult>::Ptr copy() const override { return typename QAbstractXmlForwardIterator<TResult>::Ptr (new SequenceMappingIterator<TResult, TSource, TMapper>(m_mapper, diff --git a/src/xmlpatterns/iterators/qsingletoniterator_p.h b/src/xmlpatterns/iterators/qsingletoniterator_p.h index ceccfb5..2e03c17 100644 --- a/src/xmlpatterns/iterators/qsingletoniterator_p.h +++ b/src/xmlpatterns/iterators/qsingletoniterator_p.h @@ -87,7 +87,7 @@ namespace QPatternist Q_ASSERT(!qIsForwardIteratorEnd(item)); } - virtual T next() + T next() override { switch(m_position) { @@ -109,7 +109,7 @@ namespace QPatternist } } - virtual T current() const + T current() const override { if(m_position == 1) return m_item; @@ -117,7 +117,7 @@ namespace QPatternist return T(); } - virtual xsInteger position() const + xsInteger position() const override { return m_position; } @@ -125,7 +125,7 @@ namespace QPatternist /** * @returns a copy of this instance, rewinded to the beginning. */ - virtual typename QAbstractXmlForwardIterator<T>::Ptr toReversed() + typename QAbstractXmlForwardIterator<T>::Ptr toReversed() override { return typename QAbstractXmlForwardIterator<T>::Ptr(new SingletonIterator<T>(m_item)); } @@ -133,12 +133,12 @@ namespace QPatternist /** * @returns always 1 */ - virtual xsInteger count() + xsInteger count() override { return 1; } - virtual typename QAbstractXmlForwardIterator<T>::Ptr copy() const + typename QAbstractXmlForwardIterator<T>::Ptr copy() const override { return typename QAbstractXmlForwardIterator<T>::Ptr(new SingletonIterator(m_item)); } diff --git a/src/xmlpatterns/iterators/qsubsequenceiterator_p.h b/src/xmlpatterns/iterators/qsubsequenceiterator_p.h index b1d40e4..e4984ca 100644 --- a/src/xmlpatterns/iterators/qsubsequenceiterator_p.h +++ b/src/xmlpatterns/iterators/qsubsequenceiterator_p.h @@ -91,10 +91,10 @@ namespace QPatternist const xsInteger start, const xsInteger length); - virtual Item next(); - virtual Item current() const; - virtual xsInteger position() const; - virtual Item::Iterator::Ptr copy() const; + Item next() override; + Item current() const override; + xsInteger position() const override; + Item::Iterator::Ptr copy() const override; private: xsInteger m_position; diff --git a/src/xmlpatterns/iterators/qtocodepointsiterator_p.h b/src/xmlpatterns/iterators/qtocodepointsiterator_p.h index f4ed9da..138c68c 100644 --- a/src/xmlpatterns/iterators/qtocodepointsiterator_p.h +++ b/src/xmlpatterns/iterators/qtocodepointsiterator_p.h @@ -78,11 +78,11 @@ namespace QPatternist * empty. */ ToCodepointsIterator(const QString &string); - virtual Item next(); - virtual Item current() const; - virtual xsInteger position() const; - virtual xsInteger count(); - virtual Item::Iterator::Ptr copy() const; + Item next() override; + Item current() const override; + xsInteger position() const override; + xsInteger count() override; + Item::Iterator::Ptr copy() const override; private: const QString m_string; diff --git a/src/xmlpatterns/iterators/qunioniterator_p.h b/src/xmlpatterns/iterators/qunioniterator_p.h index 7984847..1419655 100644 --- a/src/xmlpatterns/iterators/qunioniterator_p.h +++ b/src/xmlpatterns/iterators/qunioniterator_p.h @@ -73,10 +73,10 @@ namespace QPatternist UnionIterator(const Item::Iterator::Ptr &it1, const Item::Iterator::Ptr &it2); - virtual Item next(); - virtual Item current() const; - virtual xsInteger position() const; - virtual Item::Iterator::Ptr copy() const; + Item next() override; + Item current() const override; + xsInteger position() const override; + Item::Iterator::Ptr copy() const override; private: inline Item nextFromFirstOperand() diff --git a/src/xmlpatterns/janitors/qargumentconverter_p.h b/src/xmlpatterns/janitors/qargumentconverter_p.h index d9fe014..2caaab4 100644 --- a/src/xmlpatterns/janitors/qargumentconverter_p.h +++ b/src/xmlpatterns/janitors/qargumentconverter_p.h @@ -78,13 +78,13 @@ namespace QPatternist ArgumentConverter(const Expression::Ptr &operand, const ItemType::Ptr &reqType); - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; inline Item::Iterator::Ptr mapToSequence(const Item &item, const DynamicContext::Ptr &context) const; - virtual SequenceType::List expectedOperandTypes() const; - virtual SequenceType::Ptr staticType() const; + SequenceType::List expectedOperandTypes() const override; + SequenceType::Ptr staticType() const override; private: typedef QExplicitlySharedDataPointer<const ArgumentConverter> ConstPtr; diff --git a/src/xmlpatterns/janitors/qatomizer_p.h b/src/xmlpatterns/janitors/qatomizer_p.h index 0036b8a..ab78934 100644 --- a/src/xmlpatterns/janitors/qatomizer_p.h +++ b/src/xmlpatterns/janitors/qatomizer_p.h @@ -74,25 +74,25 @@ namespace QPatternist public: Atomizer(const Expression::Ptr &operand); - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const override; - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; - virtual SequenceType::List expectedOperandTypes() const; - virtual const SourceLocationReflection *actualReflection() const; + SequenceType::List expectedOperandTypes() const override; + const SourceLocationReflection *actualReflection() const override; /** * Makes an early compression, by returning the result of * the type checked operand, if the operand has the static type * xs:anyAtomicType(no atomization needed). */ - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; inline Item::Iterator::Ptr mapToSequence(const Item &item, const DynamicContext::Ptr &context) const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; private: typedef QExplicitlySharedDataPointer<const Atomizer> ConstPtr; diff --git a/src/xmlpatterns/janitors/qcardinalityverifier_p.h b/src/xmlpatterns/janitors/qcardinalityverifier_p.h index d083878..b538e99 100644 --- a/src/xmlpatterns/janitors/qcardinalityverifier_p.h +++ b/src/xmlpatterns/janitors/qcardinalityverifier_p.h @@ -72,20 +72,20 @@ namespace QPatternist const Cardinality &card, const ReportContext::ErrorCode code); - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; - virtual SequenceType::List expectedOperandTypes() const; - virtual SequenceType::Ptr staticType() const; + SequenceType::List expectedOperandTypes() const override; + SequenceType::Ptr staticType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; /** * If the static cardinality of the operand is within the required cardinality, * the operand is returned as is, since results will always be valid and hence * is not a CardinalityVerifier necessary. */ - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; /** * A utility function for determining whether the static type of an Expression matches @@ -100,9 +100,9 @@ namespace QPatternist const StaticContext::Ptr &context, const ReportContext::ErrorCode code = ReportContext::XPTY0004); - virtual const SourceLocationReflection *actualReflection() const; + const SourceLocationReflection *actualReflection() const override; - ID id() const; + ID id() const override; private: /** * Centralizes a message string in order to increase consistency and diff --git a/src/xmlpatterns/janitors/qebvextractor_p.h b/src/xmlpatterns/janitors/qebvextractor_p.h index 46cf058..a21f33f 100644 --- a/src/xmlpatterns/janitors/qebvextractor_p.h +++ b/src/xmlpatterns/janitors/qebvextractor_p.h @@ -72,17 +72,17 @@ namespace QPatternist { public: EBVExtractor(const Expression::Ptr &operand); - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; - virtual SequenceType::List expectedOperandTypes() const; - virtual const SourceLocationReflection *actualReflection() const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; + SequenceType::List expectedOperandTypes() const override; + const SourceLocationReflection *actualReflection() const override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; /** * @short Returns always @c xs:boolean. */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; template<typename TSubClass, typename ThisType> static Expression::Ptr typeCheck(const StaticContext::Ptr &context, diff --git a/src/xmlpatterns/janitors/qitemverifier_p.h b/src/xmlpatterns/janitors/qitemverifier_p.h index db46cbb..e708a48 100644 --- a/src/xmlpatterns/janitors/qitemverifier_p.h +++ b/src/xmlpatterns/janitors/qitemverifier_p.h @@ -72,15 +72,15 @@ namespace QPatternist const ItemType::Ptr &reqType, const ReportContext::ErrorCode errorCode); - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const override; - virtual SequenceType::List expectedOperandTypes() const; - virtual SequenceType::Ptr staticType() const; + SequenceType::List expectedOperandTypes() const override; + SequenceType::Ptr staticType() const override; inline Item mapToItem(const Item &, const DynamicContext::Ptr &) const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual const SourceLocationReflection *actualReflection() const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + const SourceLocationReflection *actualReflection() const override; private: typedef QExplicitlySharedDataPointer<const ItemVerifier> ConstPtr; diff --git a/src/xmlpatterns/janitors/quntypedatomicconverter_p.h b/src/xmlpatterns/janitors/quntypedatomicconverter_p.h index 118a14c..285ce0c 100644 --- a/src/xmlpatterns/janitors/quntypedatomicconverter_p.h +++ b/src/xmlpatterns/janitors/quntypedatomicconverter_p.h @@ -81,19 +81,19 @@ namespace QPatternist const ItemType::Ptr &reqType, const ReportContext::ErrorCode code = ReportContext::FORG0001); - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const override; - virtual SequenceType::Ptr staticType() const; - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::Ptr staticType() const override; + SequenceType::List expectedOperandTypes() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; /** * Overridden to call CastingPlatform::typeCheck() */ - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; inline Item mapToItem(const Item &item, const DynamicContext::Ptr &context) const; @@ -103,7 +103,7 @@ namespace QPatternist return m_reqType; } - virtual const SourceLocationReflection *actualReflection() const; + const SourceLocationReflection *actualReflection() const override; private: typedef QExplicitlySharedDataPointer<const UntypedAtomicConverter> ConstPtr; diff --git a/src/xmlpatterns/parser/qparsercontext.cpp b/src/xmlpatterns/parser/qparsercontext.cpp index c59a701..a70e2fa 100644 --- a/src/xmlpatterns/parser/qparsercontext.cpp +++ b/src/xmlpatterns/parser/qparsercontext.cpp @@ -96,7 +96,7 @@ void ParserContext::finalizePushedVariable(const int amount, void ParserContext::handleStackOverflow(const char *, short **yyss, size_t, TokenValue **yyvs, size_t, - YYLTYPE **yyls, size_t, + XPATHLTYPE **yyls, size_t, size_t *yystacksize) { bool isFirstTime = parserStack_yyvs.isEmpty(); diff --git a/src/xmlpatterns/parser/qparsercontext_p.h b/src/xmlpatterns/parser/qparsercontext_p.h index 22371f7..c6e359e 100644 --- a/src/xmlpatterns/parser/qparsercontext_p.h +++ b/src/xmlpatterns/parser/qparsercontext_p.h @@ -215,9 +215,10 @@ namespace QPatternist QVector<qint16> parserStack_yyss; QVector<TokenValue> parserStack_yyvs; - QVector<YYLTYPE> parserStack_yyls; + QVector<XPATHLTYPE> parserStack_yyls; - void handleStackOverflow(const char*, short **yyss, size_t, TokenValue **yyvs, size_t, YYLTYPE **yyls, size_t, size_t *yystacksize); + void handleStackOverflow(const char*, short **yyss, size_t, TokenValue **yyvs, size_t, + XPATHLTYPE **yyls, size_t, size_t *yystacksize); inline VariableSlotID currentPositionSlot() const { diff --git a/src/xmlpatterns/parser/qquerytransformparser.cpp b/src/xmlpatterns/parser/qquerytransformparser.cpp index ea28c69..84cd8f3 100644 --- a/src/xmlpatterns/parser/qquerytransformparser.cpp +++ b/src/xmlpatterns/parser/qquerytransformparser.cpp @@ -47,11 +47,12 @@ // // We mean it. -/* A Bison parser, made by GNU Bison 3.0.2. */ +/* A Bison parser, made by GNU Bison 3.3.2. */ /* Bison implementation for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation, + Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -89,11 +90,14 @@ define necessary library symbols; they are noted "INFRINGES ON USER NAME SPACE" below. */ +/* Undocumented macros, especially those whose name start with YY_, + are private implementation details. Do not rely on them. */ + /* Identify Bison output. */ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "3.0.2" +#define YYBISON_VERSION "3.3.2" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -107,7 +111,9 @@ /* Pull parsers. */ #define YYPULL 1 - +/* Substitute the type names. */ +#define YYSTYPE XPATHSTYPE +#define YYLTYPE XPATHLTYPE /* Substitute the variable and function names. */ #define yyparse XPathparse #define yylex XPathlex @@ -116,8 +122,8 @@ #define yynerrs XPathnerrs -/* Copy the first part of user declarations. */ -#line 44 "querytransformparser.ypp" /* yacc.c:339 */ +/* First part of user prologue. */ +#line 50 "querytransformparser.ypp" /* yacc.c:337 */ /**************************************************************************** ** @@ -379,17 +385,17 @@ public: { } - virtual const SourceLocationReflection *actualReflection() const + const SourceLocationReflection *actualReflection() const override { return this; } - virtual QSourceLocation sourceLocation() const + QSourceLocation sourceLocation() const override { return fromYYLTYPE(m_sl, m_parseInfo); } - virtual QString description() const + QString description() const override { Q_ASSERT(false); return QString(); @@ -1173,13 +1179,16 @@ static Expression::Ptr createReturnOrderBy(const OrderSpecTransfer::List &orderS } -#line 1123 "qquerytransformparser.cpp" /* yacc.c:339 */ - +#line 1134 "qquerytransformparser.cpp" /* yacc.c:337 */ # ifndef YY_NULLPTR -# if defined __cplusplus && 201103L <= __cplusplus -# define YY_NULLPTR nullptr +# if defined __cplusplus +# if 201103L <= __cplusplus +# define YY_NULLPTR nullptr +# else +# define YY_NULLPTR 0 +# endif # else -# define YY_NULLPTR 0 +# define YY_NULLPTR ((void*)0) # endif # endif @@ -1196,17 +1205,25 @@ static Expression::Ptr createReturnOrderBy(const OrderSpecTransfer::List &orderS #ifndef YY_XPATH_QQUERYTRANSFORMPARSER_P_H_INCLUDED # define YY_XPATH_QQUERYTRANSFORMPARSER_P_H_INCLUDED /* Debug traces. */ -#ifndef YYDEBUG -# define YYDEBUG 0 -#endif -#if YYDEBUG +#ifndef XPATHDEBUG +# if defined YYDEBUG +# if YYDEBUG +# define XPATHDEBUG 1 +# else +# define XPATHDEBUG 0 +# endif +# else /* ! defined YYDEBUG */ +# define XPATHDEBUG 0 +# endif /* ! defined YYDEBUG */ +#endif /* ! defined XPATHDEBUG */ +#if XPATHDEBUG extern int XPathdebug; #endif /* Token type. */ -#ifndef YYTOKENTYPE -# define YYTOKENTYPE - enum yytokentype +#ifndef XPATHTOKENTYPE +# define XPATHTOKENTYPE + enum XPathtokentype { T_END_OF_FILE = 0, T_STRING_LITERAL = 258, @@ -1381,17 +1398,17 @@ extern int XPathdebug; /* Value type. */ /* Location type. */ -#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED -typedef struct YYLTYPE YYLTYPE; -struct YYLTYPE +#if ! defined XPATHLTYPE && ! defined XPATHLTYPE_IS_DECLARED +typedef struct XPATHLTYPE XPATHLTYPE; +struct XPATHLTYPE { int first_line; int first_column; int last_line; int last_column; }; -# define YYLTYPE_IS_DECLARED 1 -# define YYLTYPE_IS_TRIVIAL 1 +# define XPATHLTYPE_IS_DECLARED 1 +# define XPATHLTYPE_IS_TRIVIAL 1 #endif @@ -1400,9 +1417,7 @@ int XPathparse (QT_PREPEND_NAMESPACE(QPatternist)::ParserContext *const parseInf #endif /* !YY_XPATH_QQUERYTRANSFORMPARSER_P_H_INCLUDED */ -/* Copy the second part of user declarations. */ -#line 1352 "qquerytransformparser.cpp" /* yacc.c:358 */ #ifdef short # undef short @@ -1423,13 +1438,13 @@ typedef signed char yytype_int8; #ifdef YYTYPE_UINT16 typedef YYTYPE_UINT16 yytype_uint16; #else -typedef unsigned short int yytype_uint16; +typedef unsigned short yytype_uint16; #endif #ifdef YYTYPE_INT16 typedef YYTYPE_INT16 yytype_int16; #else -typedef short int yytype_int16; +typedef short yytype_int16; #endif #ifndef YYSIZE_T @@ -1441,7 +1456,7 @@ typedef short int yytype_int16; # include <stddef.h> /* INFRINGES ON USER NAME SPACE */ # define YYSIZE_T size_t # else -# define YYSIZE_T unsigned int +# define YYSIZE_T unsigned # endif #endif @@ -1477,11 +1492,6 @@ typedef short int yytype_int16; # define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__)) #endif -#if !defined _Noreturn \ - && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112) -# define _Noreturn __declspec (noreturn) -#endif - /* Suppress unused-variable warnings by "using" E. */ #if ! defined lint || defined __GNUC__ # define YYUSE(E) ((void) (E)) @@ -1489,7 +1499,7 @@ typedef short int yytype_int16; # define YYUSE(E) /* empty */ #endif -#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ +#if defined __GNUC__ && ! defined __ICC && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ /* Suppress an incorrect diagnostic about yylval being uninitialized. */ # define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ _Pragma ("GCC diagnostic push") \ @@ -1579,8 +1589,8 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */ #if (! defined yyoverflow \ && (! defined __cplusplus \ - || (defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL \ - && defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) + || (defined XPATHLTYPE_IS_TRIVIAL && XPATHLTYPE_IS_TRIVIAL \ + && defined XPATHSTYPE_IS_TRIVIAL && XPATHSTYPE_IS_TRIVIAL))) /* A type that is properly aligned for any stack member. */ union yyalloc @@ -1653,16 +1663,16 @@ union yyalloc /* YYNSTATES -- Number of states. */ #define YYNSTATES 812 -/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned - by yylex, with out-of-bounds checking. */ #define YYUNDEFTOK 2 #define YYMAXUTOK 423 +/* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM + as returned by yylex, with out-of-bounds checking. */ #define YYTRANSLATE(YYX) \ - ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) + ((unsigned) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) /* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM - as returned by yylex, without out-of-bounds checking. */ + as returned by yylex. */ static const yytype_uint8 yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -1710,62 +1720,62 @@ static const yytype_uint8 yytranslate[] = 165, 166, 167, 168 }; -#if YYDEBUG +#if XPATHDEBUG /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 1420, 1420, 1421, 1423, 1424, 1455, 1456, 1472, 1570, - 1572, 1578, 1580, 1587, 1593, 1599, 1606, 1609, 1613, 1617, - 1637, 1651, 1655, 1649, 1718, 1722, 1739, 1742, 1744, 1749, - 1750, 1754, 1755, 1759, 1763, 1767, 1769, 1770, 1772, 1774, - 1820, 1834, 1839, 1844, 1845, 1847, 1862, 1877, 1887, 1902, - 1906, 1911, 1925, 1929, 1934, 1948, 1953, 1958, 1963, 1968, - 1984, 2007, 2015, 2016, 2017, 2019, 2036, 2037, 2039, 2040, - 2042, 2043, 2045, 2100, 2104, 2110, 2113, 2118, 2132, 2136, - 2142, 2141, 2250, 2253, 2259, 2280, 2286, 2290, 2292, 2297, - 2307, 2308, 2313, 2314, 2323, 2393, 2404, 2405, 2409, 2414, - 2483, 2484, 2488, 2493, 2537, 2538, 2543, 2550, 2556, 2557, - 2558, 2559, 2560, 2561, 2567, 2572, 2578, 2581, 2586, 2592, - 2598, 2602, 2627, 2628, 2632, 2636, 2630, 2677, 2680, 2675, - 2696, 2697, 2698, 2701, 2705, 2713, 2712, 2726, 2725, 2734, - 2735, 2736, 2738, 2746, 2757, 2760, 2762, 2767, 2774, 2781, - 2787, 2807, 2812, 2818, 2821, 2823, 2824, 2831, 2837, 2841, - 2846, 2847, 2850, 2854, 2849, 2864, 2868, 2863, 2876, 2879, - 2883, 2878, 2893, 2897, 2892, 2905, 2907, 2935, 2934, 2946, - 2954, 2945, 2965, 2966, 2969, 2973, 2978, 2983, 2982, 2998, - 3004, 3005, 3011, 3012, 3018, 3019, 3020, 3021, 3023, 3024, - 3030, 3031, 3037, 3038, 3040, 3041, 3047, 3048, 3049, 3050, - 3052, 3053, 3063, 3064, 3070, 3071, 3073, 3077, 3082, 3083, - 3090, 3091, 3097, 3098, 3104, 3105, 3111, 3112, 3118, 3122, - 3127, 3128, 3129, 3131, 3137, 3138, 3139, 3140, 3141, 3142, - 3144, 3149, 3150, 3151, 3152, 3153, 3154, 3156, 3161, 3162, - 3163, 3165, 3179, 3180, 3181, 3183, 3200, 3204, 3209, 3210, - 3212, 3217, 3218, 3220, 3226, 3230, 3236, 3239, 3240, 3244, - 3253, 3258, 3262, 3263, 3268, 3267, 3282, 3290, 3289, 3305, - 3313, 3313, 3322, 3324, 3327, 3332, 3334, 3338, 3404, 3407, - 3413, 3416, 3425, 3429, 3433, 3438, 3439, 3444, 3445, 3448, - 3447, 3477, 3479, 3480, 3482, 3526, 3527, 3528, 3529, 3530, - 3531, 3532, 3533, 3534, 3535, 3536, 3537, 3540, 3539, 3550, - 3561, 3566, 3568, 3573, 3574, 3579, 3583, 3585, 3589, 3598, - 3605, 3606, 3612, 3613, 3614, 3615, 3616, 3617, 3618, 3619, - 3629, 3630, 3635, 3640, 3646, 3652, 3657, 3662, 3667, 3673, - 3678, 3683, 3713, 3717, 3724, 3726, 3730, 3735, 3736, 3737, - 3771, 3780, 3769, 4021, 4025, 4045, 4048, 4054, 4059, 4064, - 4070, 4073, 4083, 4090, 4094, 4100, 4114, 4120, 4137, 4142, - 4155, 4156, 4157, 4158, 4159, 4160, 4161, 4163, 4171, 4170, - 4210, 4213, 4218, 4233, 4238, 4245, 4257, 4261, 4257, 4267, - 4269, 4273, 4275, 4290, 4294, 4303, 4308, 4312, 4318, 4321, - 4326, 4331, 4336, 4337, 4338, 4339, 4341, 4342, 4343, 4344, - 4349, 4385, 4386, 4387, 4388, 4389, 4390, 4391, 4393, 4398, - 4403, 4409, 4410, 4412, 4417, 4422, 4427, 4432, 4448, 4449, - 4451, 4456, 4461, 4465, 4477, 4490, 4500, 4505, 4510, 4515, - 4529, 4543, 4544, 4546, 4556, 4558, 4563, 4570, 4577, 4579, - 4581, 4582, 4584, 4588, 4593, 4594, 4596, 4602, 4604, 4606, - 4610, 4615, 4627 + 0, 1431, 1431, 1432, 1434, 1435, 1466, 1467, 1483, 1581, + 1583, 1589, 1591, 1598, 1604, 1610, 1617, 1620, 1624, 1628, + 1648, 1662, 1666, 1660, 1729, 1733, 1750, 1753, 1755, 1760, + 1761, 1765, 1766, 1770, 1774, 1778, 1780, 1781, 1783, 1785, + 1831, 1845, 1850, 1855, 1856, 1858, 1873, 1888, 1898, 1913, + 1917, 1922, 1936, 1940, 1945, 1959, 1964, 1969, 1974, 1979, + 1995, 2018, 2026, 2027, 2028, 2030, 2047, 2048, 2050, 2051, + 2053, 2054, 2056, 2111, 2115, 2121, 2124, 2129, 2143, 2147, + 2153, 2152, 2261, 2264, 2270, 2291, 2297, 2301, 2303, 2308, + 2318, 2319, 2324, 2325, 2334, 2404, 2415, 2416, 2420, 2425, + 2494, 2495, 2499, 2504, 2548, 2549, 2554, 2561, 2567, 2568, + 2569, 2570, 2571, 2572, 2578, 2583, 2589, 2592, 2597, 2603, + 2609, 2613, 2638, 2639, 2643, 2647, 2641, 2688, 2691, 2686, + 2707, 2708, 2709, 2712, 2716, 2724, 2723, 2737, 2736, 2745, + 2746, 2747, 2749, 2757, 2768, 2771, 2773, 2778, 2785, 2792, + 2798, 2818, 2823, 2829, 2832, 2834, 2835, 2842, 2848, 2852, + 2857, 2858, 2861, 2865, 2860, 2875, 2879, 2874, 2887, 2890, + 2894, 2889, 2904, 2908, 2903, 2916, 2918, 2946, 2945, 2957, + 2965, 2956, 2976, 2977, 2980, 2984, 2989, 2994, 2993, 3009, + 3015, 3016, 3022, 3023, 3029, 3030, 3031, 3032, 3034, 3035, + 3041, 3042, 3048, 3049, 3051, 3052, 3058, 3059, 3060, 3061, + 3063, 3064, 3074, 3075, 3081, 3082, 3084, 3088, 3093, 3094, + 3101, 3102, 3108, 3109, 3115, 3116, 3122, 3123, 3129, 3133, + 3138, 3139, 3140, 3142, 3148, 3149, 3150, 3151, 3152, 3153, + 3155, 3160, 3161, 3162, 3163, 3164, 3165, 3167, 3172, 3173, + 3174, 3176, 3190, 3191, 3192, 3194, 3211, 3215, 3220, 3221, + 3223, 3228, 3229, 3231, 3237, 3241, 3247, 3250, 3251, 3255, + 3264, 3269, 3273, 3274, 3279, 3278, 3293, 3301, 3300, 3316, + 3324, 3324, 3333, 3335, 3338, 3343, 3345, 3349, 3415, 3418, + 3424, 3427, 3436, 3440, 3444, 3449, 3450, 3455, 3456, 3459, + 3458, 3488, 3490, 3491, 3493, 3537, 3538, 3539, 3540, 3541, + 3542, 3543, 3544, 3545, 3546, 3547, 3548, 3551, 3550, 3561, + 3572, 3577, 3579, 3584, 3585, 3590, 3594, 3596, 3600, 3609, + 3616, 3617, 3623, 3624, 3625, 3626, 3627, 3628, 3629, 3630, + 3640, 3641, 3646, 3651, 3657, 3663, 3668, 3673, 3678, 3684, + 3689, 3694, 3724, 3728, 3735, 3737, 3741, 3746, 3747, 3748, + 3782, 3791, 3780, 4032, 4036, 4056, 4059, 4065, 4070, 4075, + 4081, 4084, 4094, 4101, 4105, 4111, 4125, 4131, 4148, 4153, + 4166, 4167, 4168, 4169, 4170, 4171, 4172, 4174, 4182, 4181, + 4221, 4224, 4229, 4244, 4249, 4256, 4268, 4272, 4268, 4278, + 4280, 4284, 4286, 4301, 4305, 4314, 4319, 4323, 4329, 4332, + 4337, 4342, 4347, 4348, 4349, 4350, 4352, 4353, 4354, 4355, + 4360, 4396, 4397, 4398, 4399, 4400, 4401, 4402, 4404, 4409, + 4414, 4420, 4421, 4423, 4428, 4433, 4438, 4443, 4459, 4460, + 4462, 4467, 4472, 4476, 4488, 4501, 4511, 4516, 4521, 4526, + 4540, 4554, 4555, 4557, 4567, 4569, 4574, 4581, 4588, 4590, + 4592, 4593, 4595, 4599, 4604, 4605, 4607, 4613, 4615, 4617, + 4621, 4626, 4638 }; #endif -#if YYDEBUG || YYERROR_VERBOSE || 1 +#if XPATHDEBUG || YYERROR_VERBOSE || 1 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = @@ -2767,22 +2777,22 @@ static const yytype_uint8 yyr2[] = #define YYRECOVERING() (!!yyerrstatus) -#define YYBACKUP(Token, Value) \ -do \ - if (yychar == YYEMPTY) \ - { \ - yychar = (Token); \ - yylval = (Value); \ - YYPOPSTACK (yylen); \ - yystate = *yyssp; \ - goto yybackup; \ - } \ - else \ - { \ - yyerror (&yylloc, parseInfo, YY_("syntax error: cannot back up")); \ - YYERROR; \ - } \ -while (0) +#define YYBACKUP(Token, Value) \ + do \ + if (yychar == YYEMPTY) \ + { \ + yychar = (Token); \ + yylval = (Value); \ + YYPOPSTACK (yylen); \ + yystate = *yyssp; \ + goto yybackup; \ + } \ + else \ + { \ + yyerror (&yylloc, parseInfo, YY_("syntax error: cannot back up")); \ + YYERROR; \ + } \ + while (0) /* Error token number */ #define YYTERROR 1 @@ -2817,7 +2827,7 @@ while (0) /* Enable debugging if requested. */ -#if YYDEBUG +#if XPATHDEBUG # ifndef YYFPRINTF # include <stdio.h> /* INFRINGES ON USER NAME SPACE */ @@ -2836,15 +2846,15 @@ do { \ we won't break user code: when these are the locations we know. */ #ifndef YY_LOCATION_PRINT -# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL +# if defined XPATHLTYPE_IS_TRIVIAL && XPATHLTYPE_IS_TRIVIAL /* Print *YYLOCP on YYO. Private, do not rely on its existence. */ YY_ATTRIBUTE_UNUSED -static unsigned +static int yy_location_print_ (FILE *yyo, YYLTYPE const * const yylocp) { - unsigned res = 0; + int res = 0; int end_col = 0 != yylocp->last_column ? yylocp->last_column - 1 : 0; if (0 <= yylocp->first_line) { @@ -2887,41 +2897,41 @@ do { \ } while (0) -/*----------------------------------------. -| Print this symbol's value on YYOUTPUT. | -`----------------------------------------*/ +/*-----------------------------------. +| Print this symbol's value on YYO. | +`-----------------------------------*/ static void -yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp, QT_PREPEND_NAMESPACE(QPatternist)::ParserContext *const parseInfo) +yy_symbol_value_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp, QT_PREPEND_NAMESPACE(QPatternist)::ParserContext *const parseInfo) { - FILE *yyo = yyoutput; - YYUSE (yyo); + FILE *yyoutput = yyo; + YYUSE (yyoutput); YYUSE (yylocationp); YYUSE (parseInfo); if (!yyvaluep) return; # ifdef YYPRINT if (yytype < YYNTOKENS) - YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); + YYPRINT (yyo, yytoknum[yytype], *yyvaluep); # endif YYUSE (yytype); } -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ +/*---------------------------. +| Print this symbol on YYO. | +`---------------------------*/ static void -yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp, QT_PREPEND_NAMESPACE(QPatternist)::ParserContext *const parseInfo) +yy_symbol_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp, QT_PREPEND_NAMESPACE(QPatternist)::ParserContext *const parseInfo) { - YYFPRINTF (yyoutput, "%s %s (", + YYFPRINTF (yyo, "%s %s (", yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]); - YY_LOCATION_PRINT (yyoutput, *yylocationp); - YYFPRINTF (yyoutput, ": "); - yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp, parseInfo); - YYFPRINTF (yyoutput, ")"); + YY_LOCATION_PRINT (yyo, *yylocationp); + YYFPRINTF (yyo, ": "); + yy_symbol_value_print (yyo, yytype, yyvaluep, yylocationp, parseInfo); + YYFPRINTF (yyo, ")"); } /*------------------------------------------------------------------. @@ -2955,7 +2965,7 @@ do { \ static void yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule, QT_PREPEND_NAMESPACE(QPatternist)::ParserContext *const parseInfo) { - unsigned long int yylno = yyrline[yyrule]; + unsigned long yylno = yyrline[yyrule]; int yynrhs = yyr2[yyrule]; int yyi; YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", @@ -2966,7 +2976,7 @@ yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule YYFPRINTF (stderr, " $%d = ", yyi + 1); yy_symbol_print (stderr, yystos[yyssp[yyi + 1 - yynrhs]], - &(yyvsp[(yyi + 1) - (yynrhs)]) + &yyvsp[(yyi + 1) - (yynrhs)] , &(yylsp[(yyi + 1) - (yynrhs)]) , parseInfo); YYFPRINTF (stderr, "\n"); } @@ -2981,12 +2991,12 @@ do { \ /* Nonzero means print parse trace. It is left uninitialized so that multiple parsers can coexist. */ int yydebug; -#else /* !YYDEBUG */ +#else /* !XPATHDEBUG */ # define YYDPRINTF(Args) # define YY_SYMBOL_PRINT(Title, Type, Value, Location) # define YY_STACK_PRINT(Bottom, Top) # define YY_REDUCE_PRINT(Rule) -#endif /* !YYDEBUG */ +#endif /* !XPATHDEBUG */ /* YYINITDEPTH -- initial size of the parser's stacks. */ @@ -3070,7 +3080,10 @@ yytnamerr (char *yyres, const char *yystr) case '\\': if (*++yyp != '\\') goto do_not_strip_quotes; - /* Fall through. */ + else + goto append; + + append: default: if (yyres) yyres[yyn] = *yyp; @@ -3088,7 +3101,7 @@ yytnamerr (char *yyres, const char *yystr) if (! yyres) return yystrlen (yystr); - return yystpcpy (yyres, yystr) - yyres; + return (YYSIZE_T) (yystpcpy (yyres, yystr) - yyres); } # endif @@ -3166,10 +3179,10 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, yyarg[yycount++] = yytname[yyx]; { YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]); - if (! (yysize <= yysize1 - && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM) + yysize = yysize1; + else return 2; - yysize = yysize1; } } } @@ -3181,6 +3194,7 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, case N: \ yyformat = S; \ break + default: /* Avoid compiler warnings. */ YYCASE_(0, YY_("syntax error")); YYCASE_(1, YY_("syntax error, unexpected %s")); YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s")); @@ -3192,9 +3206,10 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, { YYSIZE_T yysize1 = yysize + yystrlen (yyformat); - if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM) + yysize = yysize1; + else return 2; - yysize = yysize1; } if (*yymsg_alloc < yysize) @@ -3269,7 +3284,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); /* Location data for the lookahead symbol. */ static YYLTYPE yyloc_default -# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL +# if defined XPATHLTYPE_IS_TRIVIAL && XPATHLTYPE_IS_TRIVIAL = { 1, 1, 1, 1 } # endif ; @@ -3346,23 +3361,31 @@ YYLTYPE yylloc = yyloc_default; yylsp[0] = yylloc; goto yysetstate; + /*------------------------------------------------------------. -| yynewstate -- Push a new state, which is found in yystate. | +| yynewstate -- push a new state, which is found in yystate. | `------------------------------------------------------------*/ - yynewstate: +yynewstate: /* In all cases, when you get here, the value and location stacks have just been pushed. So pushing a state here evens the stacks. */ yyssp++; - yysetstate: - *yyssp = yystate; + +/*--------------------------------------------------------------------. +| yynewstate -- set current state (the top of the stack) to yystate. | +`--------------------------------------------------------------------*/ +yysetstate: + *yyssp = (yytype_int16) yystate; if (yyss + yystacksize - 1 <= yyssp) +#if !defined yyoverflow && !defined YYSTACK_RELOCATE + goto yyexhaustedlab; +#else { /* Get the current used size of the three stacks, in elements. */ - YYSIZE_T yysize = yyssp - yyss + 1; + YYSIZE_T yysize = (YYSIZE_T) (yyssp - yyss + 1); -#ifdef yyoverflow +# if defined yyoverflow { /* Give user a chance to reallocate the stack. Use copies of these so that the &'s don't force the real ones into @@ -3380,15 +3403,11 @@ YYLTYPE yylloc = yyloc_default; &yyvs1, yysize * sizeof (*yyvsp), &yyls1, yysize * sizeof (*yylsp), &yystacksize); - - yyls = yyls1; yyss = yyss1; yyvs = yyvs1; + yyls = yyls1; } -#else /* no yyoverflow */ -# ifndef YYSTACK_RELOCATE - goto yyexhaustedlab; -# else +# else /* defined YYSTACK_RELOCATE */ /* Extend the stack our own way. */ if (YYMAXDEPTH <= yystacksize) goto yyexhaustedlab; @@ -3405,23 +3424,23 @@ YYLTYPE yylloc = yyloc_default; YYSTACK_RELOCATE (yyss_alloc, yyss); YYSTACK_RELOCATE (yyvs_alloc, yyvs); YYSTACK_RELOCATE (yyls_alloc, yyls); -# undef YYSTACK_RELOCATE +# undef YYSTACK_RELOCATE if (yyss1 != yyssa) YYSTACK_FREE (yyss1); } # endif -#endif /* no yyoverflow */ yyssp = yyss + yysize - 1; yyvsp = yyvs + yysize - 1; yylsp = yyls + yysize - 1; YYDPRINTF ((stderr, "Stack size increased to %lu\n", - (unsigned long int) yystacksize)); + (unsigned long) yystacksize)); if (yyss + yystacksize - 1 <= yyssp) YYABORT; } +#endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */ YYDPRINTF ((stderr, "Entering state %d\n", yystate)); @@ -3430,11 +3449,11 @@ YYLTYPE yylloc = yyloc_default; goto yybackup; + /*-----------. | yybackup. | `-----------*/ yybackup: - /* Do appropriate processing given the current state. Read a lookahead token if we need one and don't already have one. */ @@ -3507,7 +3526,7 @@ yydefault: /*-----------------------------. -| yyreduce -- Do a reduction. | +| yyreduce -- do a reduction. | `-----------------------------*/ yyreduce: /* yyn is the number of a rule to reduce with. */ @@ -3523,13 +3542,14 @@ yyreduce: GCC warning that YYVAL may be used uninitialized. */ yyval = yyvsp[1-yylen]; - /* Default location. */ + /* Default location. */ YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen); + yyerror_range[1] = yyloc; YY_REDUCE_PRINT (yyn); switch (yyn) { case 5: -#line 1425 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 1436 "querytransformparser.ypp" /* yacc.c:1652 */ { /* Suppress more compiler warnings about unused defines. */ @@ -3559,11 +3579,11 @@ yyreduce: ReportContext::XQST0031, &ryy); } } -#line 3513 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 3534 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 7: -#line 1457 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 1468 "querytransformparser.ypp" /* yacc.c:1652 */ { const QRegExp encNameRegExp(QLatin1String("[A-Za-z][A-Za-z0-9._\\-]*")); @@ -3578,11 +3598,11 @@ yyreduce: ReportContext::XQST0087, fromYYLTYPE((yyloc), parseInfo)); } } -#line 3532 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 3553 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 8: -#line 1473 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 1484 "querytransformparser.ypp" /* yacc.c:1652 */ { /* In XSL-T, we can have dangling variable references, so resolve them * before we proceed with other steps, such as checking circularity. */ @@ -3679,87 +3699,87 @@ yyreduce: else parseInfo->queryBody = (yyvsp[0].expr); } -#line 3633 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 3654 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 10: -#line 1573 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 1584 "querytransformparser.ypp" /* yacc.c:1652 */ { // TODO add to namespace context parseInfo->moduleNamespace = parseInfo->staticContext->namePool()->allocateNamespace((yyvsp[-3].sval)); } -#line 3642 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 3663 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 12: -#line 1581 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 1592 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QXmlQuery::XQuery10, parseInfo, (yyloc)); if(parseInfo->hasSecondPrologPart) parseInfo->staticContext->error(QtXmlPatterns::tr("A default namespace declaration must occur before function, " "variable, and option declarations."), ReportContext::XPST0003, fromYYLTYPE((yyloc), parseInfo)); } -#line 3653 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 3674 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 13: -#line 1588 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 1599 "querytransformparser.ypp" /* yacc.c:1652 */ { if(parseInfo->hasSecondPrologPart) parseInfo->staticContext->error(QtXmlPatterns::tr("A default namespace declaration must occur before function, " "variable, and option declarations."), ReportContext::XPST0003, fromYYLTYPE((yyloc), parseInfo)); } -#line 3663 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 3684 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 14: -#line 1594 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 1605 "querytransformparser.ypp" /* yacc.c:1652 */ { if(parseInfo->hasSecondPrologPart) parseInfo->staticContext->error(QtXmlPatterns::tr("Namespace declarations must occur before function, " "variable, and option declarations."), ReportContext::XPST0003, fromYYLTYPE((yyloc), parseInfo)); } -#line 3673 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 3694 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 15: -#line 1600 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 1611 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QXmlQuery::XQuery10, parseInfo, (yyloc)); if(parseInfo->hasSecondPrologPart) parseInfo->staticContext->error(QtXmlPatterns::tr("Module imports must occur before function, " "variable, and option declarations."), ReportContext::XPST0003, fromYYLTYPE((yyloc), parseInfo)); } -#line 3684 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 3705 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 17: -#line 1610 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 1621 "querytransformparser.ypp" /* yacc.c:1652 */ { parseInfo->hasSecondPrologPart = true; } -#line 3692 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 3713 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 18: -#line 1614 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 1625 "querytransformparser.ypp" /* yacc.c:1652 */ { parseInfo->hasSecondPrologPart = true; } -#line 3700 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 3721 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 19: -#line 1618 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 1629 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QXmlQuery::XQuery10, parseInfo, (yyloc)); parseInfo->hasSecondPrologPart = true; } -#line 3709 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 3730 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 20: -#line 1641 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 1652 "querytransformparser.ypp" /* yacc.c:1652 */ { Template::Ptr temp(create(new Template(parseInfo->currentImportPrecedence, (yyvsp[-2].sequenceType)), (yyloc), parseInfo)); @@ -3768,27 +3788,27 @@ yyreduce: temp->templateParameters = parseInfo->templateParameters; parseInfo->templateParametersHandled(); } -#line 3722 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 3743 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 21: -#line 1651 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 1662 "querytransformparser.ypp" /* yacc.c:1652 */ { parseInfo->isParsingPattern = true; } -#line 3730 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 3751 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 22: -#line 1655 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 1666 "querytransformparser.ypp" /* yacc.c:1652 */ { parseInfo->isParsingPattern = false; } -#line 3738 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 3759 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 23: -#line 1664 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 1675 "querytransformparser.ypp" /* yacc.c:1652 */ { /* In this grammar branch, we're guaranteed to be a template rule, but * may also be a named template. */ @@ -3841,19 +3861,19 @@ yyreduce: mode->templatePatterns.append(ourPatterns.at(t)); } } -#line 3795 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 3816 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 24: -#line 1718 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 1729 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.enums.Double) = std::numeric_limits<xsDouble>::quiet_NaN(); } -#line 3803 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 3824 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 25: -#line 1723 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 1734 "querytransformparser.ypp" /* yacc.c:1652 */ { const AtomicValue::Ptr val(Decimal::fromLexical((yyvsp[0].sval))); if(val->hasError()) @@ -3868,59 +3888,59 @@ yyreduce: else (yyval.enums.Double) = val->as<Numeric>()->toDouble(); } -#line 3822 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 3843 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 26: -#line 1739 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 1750 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.qName) = QXmlName(); } -#line 3830 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 3851 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 28: -#line 1745 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 1756 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.qName) = (yyvsp[0].qName); } -#line 3838 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 3859 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 30: -#line 1751 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 1762 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QXmlQuery::XQuery10, parseInfo, (yyloc)); } -#line 3846 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 3867 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 32: -#line 1756 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 1767 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QXmlQuery::XQuery10, parseInfo, (yyloc)); } -#line 3854 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 3875 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 33: -#line 1760 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 1771 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QXmlQuery::XQuery10, parseInfo, (yyloc)); } -#line 3862 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 3883 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 34: -#line 1764 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 1775 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QXmlQuery::XQuery10, parseInfo, (yyloc)); } -#line 3870 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 3891 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 39: -#line 1775 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 1786 "querytransformparser.ypp" /* yacc.c:1652 */ { if(!(yyvsp[-1].enums.Bool)) allowedIn(QXmlQuery::XQuery10, parseInfo, (yyloc)); @@ -3965,11 +3985,11 @@ yyreduce: } } } -#line 3919 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 3940 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 40: -#line 1821 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 1832 "querytransformparser.ypp" /* yacc.c:1652 */ { if(parseInfo->hasDeclaration(ParserContext::BoundarySpaceDecl)) { @@ -3982,27 +4002,27 @@ yyreduce: parseInfo->registerDeclaration(ParserContext::BoundarySpaceDecl); } } -#line 3936 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 3957 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 41: -#line 1835 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 1846 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.enums.boundarySpacePolicy) = StaticContext::BSPStrip; } -#line 3944 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 3965 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 42: -#line 1840 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 1851 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.enums.boundarySpacePolicy) = StaticContext::BSPPreserve; } -#line 3952 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 3973 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 45: -#line 1849 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 1860 "querytransformparser.ypp" /* yacc.c:1652 */ { if(parseInfo->hasDeclaration(ParserContext::DeclareDefaultElementNamespace)) { @@ -4015,11 +4035,11 @@ yyreduce: parseInfo->registerDeclaration(ParserContext::DeclareDefaultElementNamespace); } } -#line 3969 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 3990 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 46: -#line 1864 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 1875 "querytransformparser.ypp" /* yacc.c:1652 */ { if(parseInfo->hasDeclaration(ParserContext::DeclareDefaultFunctionNamespace)) { @@ -4032,11 +4052,11 @@ yyreduce: parseInfo->registerDeclaration(ParserContext::DeclareDefaultFunctionNamespace); } } -#line 3986 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4007 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 47: -#line 1878 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 1889 "querytransformparser.ypp" /* yacc.c:1652 */ { if((yyvsp[-2].qName).prefix() == StandardPrefixes::empty) { @@ -4045,11 +4065,11 @@ yyreduce: ReportContext::XPST0081, fromYYLTYPE((yyloc), parseInfo)); } } -#line 3999 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4020 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 48: -#line 1888 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 1899 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QXmlQuery::XQuery10, parseInfo, (yyloc)); if(parseInfo->hasDeclaration(ParserContext::OrderingModeDecl)) @@ -4063,27 +4083,27 @@ yyreduce: parseInfo->staticContext->setOrderingMode((yyvsp[-1].enums.orderingMode)); } } -#line 4017 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4038 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 49: -#line 1903 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 1914 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.enums.orderingMode) = StaticContext::Ordered; } -#line 4025 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4046 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 50: -#line 1907 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 1918 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.enums.orderingMode) = StaticContext::Unordered; } -#line 4033 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4054 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 51: -#line 1912 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 1923 "querytransformparser.ypp" /* yacc.c:1652 */ { if(parseInfo->hasDeclaration(ParserContext::EmptyOrderDecl)) { @@ -4096,27 +4116,27 @@ yyreduce: parseInfo->staticContext->setOrderingEmptySequence((yyvsp[-1].enums.orderingEmptySequence)); } } -#line 4050 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4071 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 52: -#line 1926 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 1937 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.enums.orderingEmptySequence) = StaticContext::Least; } -#line 4058 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4079 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 53: -#line 1930 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 1941 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.enums.orderingEmptySequence) = StaticContext::Greatest; } -#line 4066 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4087 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 54: -#line 1936 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 1947 "querytransformparser.ypp" /* yacc.c:1652 */ { if(parseInfo->hasDeclaration(ParserContext::CopyNamespacesDecl)) { @@ -4128,43 +4148,43 @@ yyreduce: parseInfo->registerDeclaration(ParserContext::CopyNamespacesDecl); } } -#line 4082 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4103 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 55: -#line 1949 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 1960 "querytransformparser.ypp" /* yacc.c:1652 */ { parseInfo->preserveNamespacesMode = true; } -#line 4090 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4111 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 56: -#line 1954 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 1965 "querytransformparser.ypp" /* yacc.c:1652 */ { parseInfo->preserveNamespacesMode = false; } -#line 4098 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4119 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 57: -#line 1959 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 1970 "querytransformparser.ypp" /* yacc.c:1652 */ { parseInfo->inheritNamespacesMode = true; } -#line 4106 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4127 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 58: -#line 1964 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 1975 "querytransformparser.ypp" /* yacc.c:1652 */ { parseInfo->inheritNamespacesMode = false; } -#line 4114 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4135 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 59: -#line 1969 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 1980 "querytransformparser.ypp" /* yacc.c:1652 */ { if(parseInfo->hasDeclaration(ParserContext::DefaultCollationDecl)) { @@ -4179,11 +4199,11 @@ yyreduce: parseInfo->staticContext->setDefaultCollation(coll); } } -#line 4133 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4154 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 60: -#line 1985 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 1996 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XSLT20), parseInfo, (yyloc), (yyvsp[-2].enums.Bool)); if(parseInfo->hasDeclaration(ParserContext::BaseURIDecl)) @@ -4205,22 +4225,22 @@ yyreduce: parseInfo->staticContext->setBaseURI(toBeBase); } } -#line 4159 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4180 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 61: -#line 2008 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2019 "querytransformparser.ypp" /* yacc.c:1652 */ { parseInfo->staticContext->error(QtXmlPatterns::tr("The Schema Import feature is not supported, " "and therefore %1 declarations cannot occur.") .arg(formatKeyword("import schema")), ReportContext::XQST0009, fromYYLTYPE((yyloc), parseInfo)); } -#line 4170 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4191 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 65: -#line 2020 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2031 "querytransformparser.ypp" /* yacc.c:1652 */ { if((yyvsp[-2].sval).isEmpty()) { @@ -4236,11 +4256,11 @@ yyreduce: ReportContext::XQST0016, fromYYLTYPE((yyloc), parseInfo)); } } -#line 4190 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4211 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 72: -#line 2047 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2058 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QXmlQuery::XQuery10, parseInfo, (yyloc), (yyvsp[-6].enums.Bool)); if(variableByName((yyvsp[-4].qName), parseInfo)) @@ -4293,43 +4313,43 @@ yyreduce: } } } -#line 4247 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4268 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 73: -#line 2101 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2112 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr).reset(); } -#line 4255 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4276 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 74: -#line 2105 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2116 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr) = (yyvsp[0].expr); } -#line 4263 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4284 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 75: -#line 2110 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2121 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr).reset(); } -#line 4271 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4292 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 76: -#line 2114 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2125 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr) = (yyvsp[0].expr); } -#line 4279 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4300 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 77: -#line 2119 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2130 "querytransformparser.ypp" /* yacc.c:1652 */ { if(parseInfo->hasDeclaration(ParserContext::ConstructionDecl)) { @@ -4342,35 +4362,35 @@ yyreduce: parseInfo->staticContext->setConstructionMode((yyvsp[-1].enums.constructionMode)); } } -#line 4296 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4317 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 78: -#line 2133 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2144 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.enums.constructionMode) = StaticContext::CMStrip; } -#line 4304 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4325 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 79: -#line 2137 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2148 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.enums.constructionMode) = StaticContext::CMPreserve; } -#line 4312 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4333 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 80: -#line 2142 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2153 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.enums.slot) = parseInfo->currentExpressionSlot() - (yyvsp[-1].functionArguments).count(); } -#line 4320 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4341 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 81: -#line 2146 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2157 "querytransformparser.ypp" /* yacc.c:1652 */ { if(!(yyvsp[-8].enums.Bool)) allowedIn(QXmlQuery::XQuery10, parseInfo, (yyloc), (yyvsp[-8].enums.Bool)); @@ -4473,29 +4493,29 @@ yyreduce: ReportContext::XPST0017, fromYYLTYPE((yyloc), parseInfo)); } } -#line 4427 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4448 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 82: -#line 2250 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2261 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.functionArguments) = FunctionArgument::List(); } -#line 4435 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4456 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 83: -#line 2254 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2265 "querytransformparser.ypp" /* yacc.c:1652 */ { FunctionArgument::List l; l.append((yyvsp[0].functionArgument)); (yyval.functionArguments) = l; } -#line 4445 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4466 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 84: -#line 2260 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2271 "querytransformparser.ypp" /* yacc.c:1652 */ { FunctionArgument::List::const_iterator it((yyvsp[-2].functionArguments).constBegin()); const FunctionArgument::List::const_iterator end((yyvsp[-2].functionArguments).constEnd()); @@ -4515,44 +4535,44 @@ yyreduce: (yyvsp[-2].functionArguments).append((yyvsp[0].functionArgument)); (yyval.functionArguments) = (yyvsp[-2].functionArguments); } -#line 4469 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4490 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 85: -#line 2281 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2292 "querytransformparser.ypp" /* yacc.c:1652 */ { pushVariable((yyvsp[-1].qName), (yyvsp[0].sequenceType), Expression::Ptr(), VariableDeclaration::FunctionArgument, (yyloc), parseInfo); (yyval.functionArgument) = FunctionArgument::Ptr(new FunctionArgument((yyvsp[-1].qName), (yyvsp[0].sequenceType))); } -#line 4478 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4499 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 86: -#line 2287 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2298 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr).reset(); } -#line 4486 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4507 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 88: -#line 2293 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2304 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr) = (yyvsp[-1].expr); } -#line 4494 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4515 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 91: -#line 2309 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2320 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr) = create(new CombineNodes((yyvsp[-2].expr), CombineNodes::Union, (yyvsp[0].expr)), (yyloc), parseInfo); } -#line 4502 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4523 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 93: -#line 2315 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2326 "querytransformparser.ypp" /* yacc.c:1652 */ { /* We write this into a node test. The spec says, 5.5.3 The Meaning of a Pattern: * "Similarly, / matches a document node, and only a document node, @@ -4561,11 +4581,11 @@ yyreduce: * document node." */ (yyval.expr) = create(new AxisStep(QXmlNodeModelIndex::AxisSelf, BuiltinTypes::document), (yyloc), parseInfo); } -#line 4515 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4536 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 94: -#line 2324 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2335 "querytransformparser.ypp" /* yacc.c:1652 */ { /* /axis::node-test * => @@ -4635,11 +4655,11 @@ yyreduce: (yyval.expr) = (yyvsp[0].expr); } } -#line 4589 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4610 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 95: -#line 2394 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2405 "querytransformparser.ypp" /* yacc.c:1652 */ { /* //axis::node-test * => @@ -4650,27 +4670,27 @@ yyreduce: (yyval.expr) = create(GenericPredicate::create((yyvsp[0].expr), create(new AxisStep(QXmlNodeModelIndex::AxisParent, BuiltinTypes::node), (yyloc), parseInfo), parseInfo->staticContext, fromYYLTYPE((yylsp[-1]), parseInfo)), (yylsp[-1]), parseInfo); } -#line 4604 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4625 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 97: -#line 2406 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2417 "querytransformparser.ypp" /* yacc.c:1652 */ { createIdPatternPath((yyvsp[-2].expr), (yyvsp[0].expr), QXmlNodeModelIndex::AxisParent, (yylsp[-1]), parseInfo); } -#line 4612 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4633 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 98: -#line 2410 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2421 "querytransformparser.ypp" /* yacc.c:1652 */ { createIdPatternPath((yyvsp[-2].expr), (yyvsp[0].expr), QXmlNodeModelIndex::AxisAncestor, (yylsp[-1]), parseInfo); } -#line 4620 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4641 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 99: -#line 2415 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2426 "querytransformparser.ypp" /* yacc.c:1652 */ { const Expression::List ands((yyvsp[0].expr)->operands()); const FunctionSignature::Ptr signature((yyvsp[0].expr)->as<FunctionCall>()->signature()); @@ -4738,27 +4758,27 @@ yyreduce: (yyval.expr) = (yyvsp[0].expr); } -#line 4692 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4713 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 101: -#line 2485 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2496 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr) = createPatternPath((yyvsp[-2].expr), (yyvsp[0].expr), QXmlNodeModelIndex::AxisParent, (yylsp[-1]), parseInfo); } -#line 4700 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4721 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 102: -#line 2489 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2500 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr) = createPatternPath((yyvsp[-2].expr), (yyvsp[0].expr), QXmlNodeModelIndex::AxisAncestor, (yylsp[-1]), parseInfo); } -#line 4708 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4729 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 103: -#line 2494 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2505 "querytransformparser.ypp" /* yacc.c:1652 */ { const Expression::Ptr expr(findAxisStep((yyvsp[0].expr))); @@ -4801,108 +4821,108 @@ yyreduce: (yyval.expr) = (yyvsp[0].expr); } -#line 4755 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4776 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 105: -#line 2539 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2550 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr) = create(new ExpressionSequence((yyvsp[0].expressionList)), (yyloc), parseInfo); } -#line 4763 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4784 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 106: -#line 2544 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2555 "querytransformparser.ypp" /* yacc.c:1652 */ { Expression::List l; l.append((yyvsp[-2].expr)); l.append((yyvsp[0].expr)); (yyval.expressionList) = l; } -#line 4774 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4795 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 107: -#line 2551 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2562 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyvsp[-2].expressionList).append((yyvsp[0].expr)); (yyval.expressionList) = (yyvsp[-2].expressionList); } -#line 4783 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4804 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 113: -#line 2562 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2573 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr) = createDirAttributeValue((yyvsp[-1].expressionList), parseInfo, (yyloc)); } -#line 4791 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4812 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 114: -#line 2567 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2578 "querytransformparser.ypp" /* yacc.c:1652 */ { QVector<QXmlName> result; result.append(QXmlName(StandardNamespaces::InternalXSLT, StandardLocalNames::Default)); (yyval.qNameVector) = result; } -#line 4801 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4822 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 115: -#line 2573 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2584 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.qNameVector) = (yyvsp[0].qNameVector); } -#line 4809 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4830 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 116: -#line 2578 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2589 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.qName) = QXmlName(StandardNamespaces::InternalXSLT, StandardLocalNames::Default); } -#line 4817 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4838 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 117: -#line 2582 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2593 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.qName) = (yyvsp[0].qName); } -#line 4825 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4846 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 118: -#line 2587 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2598 "querytransformparser.ypp" /* yacc.c:1652 */ { QVector<QXmlName> result; result.append((yyvsp[0].qName)); (yyval.qNameVector) = result; } -#line 4835 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4856 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 119: -#line 2593 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2604 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyvsp[-2].qNameVector).append((yyvsp[0].qName)); (yyval.qNameVector) = (yyvsp[-2].qNameVector); } -#line 4844 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4865 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 120: -#line 2599 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2610 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.qName) = (yyvsp[0].qName); } -#line 4852 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4873 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 121: -#line 2603 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2614 "querytransformparser.ypp" /* yacc.c:1652 */ { if((yyvsp[0].sval) == QLatin1String("#current")) (yyval.qName) = QXmlName(StandardNamespaces::InternalXSLT, StandardLocalNames::current); @@ -4925,31 +4945,31 @@ yyreduce: (yyval.qName) = parseInfo->staticContext->namePool()->allocateQName(StandardNamespaces::empty, (yyvsp[0].sval)); } } -#line 4879 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4900 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 124: -#line 2632 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2643 "querytransformparser.ypp" /* yacc.c:1652 */ { /* We're pushing the range variable here, not the positional. */ (yyval.expr) = pushVariable((yyvsp[-4].qName), quantificationType((yyvsp[-3].sequenceType)), (yyvsp[0].expr), VariableDeclaration::RangeVariable, (yyloc), parseInfo); } -#line 4888 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4909 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 125: -#line 2636 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2647 "querytransformparser.ypp" /* yacc.c:1652 */ { /* It is ok this appears after PositionalVar, because currentRangeSlot() * uses a different "channel" than currentPositionSlot(), so they can't trash * each other. */ (yyval.enums.slot) = parseInfo->staticContext->currentRangeSlot(); } -#line 4899 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4920 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 126: -#line 2643 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2654 "querytransformparser.ypp" /* yacc.c:1652 */ { Q_ASSERT((yyvsp[-3].expr)); Q_ASSERT((yyvsp[0].expr)); @@ -4981,30 +5001,30 @@ yyreduce: if((yyvsp[-5].enums.slot) != -1) /* We also have a positional variable to remove from the scope. */ parseInfo->finalizePushedVariable(); } -#line 4935 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4956 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 127: -#line 2677 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2688 "querytransformparser.ypp" /* yacc.c:1652 */ { pushVariable((yyvsp[-4].qName), quantificationType((yyvsp[-3].sequenceType)), (yyvsp[0].expr), VariableDeclaration::RangeVariable, (yyloc), parseInfo); } -#line 4943 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4964 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 128: -#line 2680 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2691 "querytransformparser.ypp" /* yacc.c:1652 */ { /* It is ok this appears after PositionalVar, because currentRangeSlot() * uses a different "channel" than currentPositionSlot(), so they can't trash * each other. */ (yyval.enums.slot) = parseInfo->staticContext->currentRangeSlot(); } -#line 4954 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4975 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 129: -#line 2687 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2698 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr) = create(new ForClause((yyvsp[-1].enums.slot), (yyvsp[-3].expr), (yyvsp[0].expr), (yyvsp[-5].enums.slot)), (yyloc), parseInfo); @@ -5013,37 +5033,37 @@ yyreduce: if((yyvsp[-5].enums.slot) != -1) /* We also have a positional variable to remove from the scope. */ parseInfo->finalizePushedVariable(); } -#line 4967 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4988 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 133: -#line 2701 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2712 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.enums.slot) = -1; } -#line 4975 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 4996 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 134: -#line 2706 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2717 "querytransformparser.ypp" /* yacc.c:1652 */ { pushVariable((yyvsp[0].qName), CommonSequenceTypes::ExactlyOneInteger, Expression::Ptr(), VariableDeclaration::PositionalVariable, (yyloc), parseInfo); (yyval.enums.slot) = parseInfo->currentPositionSlot(); } -#line 4985 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5006 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 135: -#line 2713 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2724 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr) = pushVariable((yyvsp[-3].qName), quantificationType((yyvsp[-2].sequenceType)), (yyvsp[0].expr), VariableDeclaration::ExpressionVariable, (yyloc), parseInfo); } -#line 4993 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5014 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 136: -#line 2717 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2728 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QXmlQuery::XQuery10, parseInfo, (yyloc), (yyvsp[-7].enums.Bool)); @@ -5051,38 +5071,38 @@ yyreduce: (yyval.expr) = create(new LetClause((yyvsp[-1].expr), (yyvsp[0].expr), parseInfo->variables.top()), (yyloc), parseInfo); parseInfo->finalizePushedVariable(); } -#line 5005 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5026 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 137: -#line 2726 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2737 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr) = pushVariable((yyvsp[-3].qName), quantificationType((yyvsp[-2].sequenceType)), (yyvsp[0].expr), VariableDeclaration::ExpressionVariable, (yyloc), parseInfo);} -#line 5011 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5032 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 138: -#line 2728 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2739 "querytransformparser.ypp" /* yacc.c:1652 */ { Q_ASSERT(parseInfo->variables.top()->name == (yyvsp[-5].qName)); (yyval.expr) = create(new LetClause((yyvsp[-1].expr), (yyvsp[0].expr), parseInfo->variables.top()), (yyloc), parseInfo); parseInfo->finalizePushedVariable(); } -#line 5021 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5042 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 142: -#line 2739 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2750 "querytransformparser.ypp" /* yacc.c:1652 */ { if((yyvsp[-2].orderSpecs).isEmpty()) (yyval.expr) = (yyvsp[0].expr); else (yyval.expr) = createReturnOrderBy((yyvsp[-2].orderSpecs), (yyvsp[0].expr), parseInfo->orderStability.pop(), (yyloc), parseInfo); } -#line 5032 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5053 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 143: -#line 2747 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2758 "querytransformparser.ypp" /* yacc.c:1652 */ { if((yyvsp[-2].orderSpecs).isEmpty()) (yyval.expr) = create(new IfThenClause((yyvsp[-3].expr), (yyvsp[0].expr), create(new EmptySequence, (yyloc), parseInfo)), (yyloc), parseInfo); @@ -5091,56 +5111,56 @@ yyreduce: create(new EmptySequence, (yyloc), parseInfo)), (yyloc), parseInfo); } -#line 5045 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5066 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 144: -#line 2757 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2768 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.orderSpecs) = OrderSpecTransfer::List(); } -#line 5053 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5074 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 146: -#line 2763 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2774 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.orderSpecs) = (yyvsp[0].orderSpecs); } -#line 5061 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5082 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 147: -#line 2768 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2779 "querytransformparser.ypp" /* yacc.c:1652 */ { OrderSpecTransfer::List list; list += (yyvsp[-2].orderSpecs); list.append((yyvsp[0].orderSpec)); (yyval.orderSpecs) = list; } -#line 5072 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5093 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 148: -#line 2775 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2786 "querytransformparser.ypp" /* yacc.c:1652 */ { OrderSpecTransfer::List list; list.append((yyvsp[0].orderSpec)); (yyval.orderSpecs) = list; } -#line 5082 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5103 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 149: -#line 2782 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2793 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.orderSpec) = OrderSpecTransfer((yyvsp[-3].expr), OrderBy::OrderSpec((yyvsp[-2].enums.sortDirection), (yyvsp[-1].enums.orderingEmptySequence))); } -#line 5090 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5111 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 150: -#line 2787 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2798 "querytransformparser.ypp" /* yacc.c:1652 */ { /* Where does the specification state the default value is ascending? * @@ -5160,199 +5180,199 @@ yyreduce: */ (yyval.enums.sortDirection) = OrderBy::OrderSpec::Ascending; } -#line 5114 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5135 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 151: -#line 2808 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2819 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.enums.sortDirection) = OrderBy::OrderSpec::Ascending; } -#line 5122 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5143 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 152: -#line 2813 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2824 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.enums.sortDirection) = OrderBy::OrderSpec::Descending; } -#line 5130 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5151 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 153: -#line 2818 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2829 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.enums.orderingEmptySequence) = parseInfo->staticContext->orderingEmptySequence(); } -#line 5138 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5159 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 156: -#line 2825 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2836 "querytransformparser.ypp" /* yacc.c:1652 */ { if(parseInfo->isXSLT()) resolveAndCheckCollation<ReportContext::XTDE1035>((yyvsp[0].sval), parseInfo, (yyloc)); else resolveAndCheckCollation<ReportContext::XQST0076>((yyvsp[0].sval), parseInfo, (yyloc)); } -#line 5149 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5170 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 157: -#line 2832 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2843 "querytransformparser.ypp" /* yacc.c:1652 */ { /* We do nothing. We don't use collations, and we have this non-terminal * in order to accept expressions. */ } -#line 5158 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5179 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 158: -#line 2838 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2849 "querytransformparser.ypp" /* yacc.c:1652 */ { parseInfo->orderStability.push(OrderBy::StableOrder); } -#line 5166 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5187 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 159: -#line 2842 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2853 "querytransformparser.ypp" /* yacc.c:1652 */ { parseInfo->orderStability.push(OrderBy::UnstableOrder); } -#line 5174 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5195 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 162: -#line 2850 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2861 "querytransformparser.ypp" /* yacc.c:1652 */ { pushVariable((yyvsp[-3].qName), quantificationType((yyvsp[-2].sequenceType)), (yyvsp[0].expr), VariableDeclaration::RangeVariable, (yyloc), parseInfo); } -#line 5183 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5204 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 163: -#line 2854 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2865 "querytransformparser.ypp" /* yacc.c:1652 */ {(yyval.enums.slot) = parseInfo->staticContext->currentRangeSlot();} -#line 5189 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5210 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 164: -#line 2856 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2867 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc)); (yyval.expr) = create(new QuantifiedExpression((yyvsp[-1].enums.slot), QuantifiedExpression::Some, (yyvsp[-3].expr), (yyvsp[0].expr)), (yyloc), parseInfo); parseInfo->finalizePushedVariable(); } -#line 5200 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5221 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 165: -#line 2864 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2875 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr) = pushVariable((yyvsp[-3].qName), quantificationType((yyvsp[-2].sequenceType)), (yyvsp[0].expr), VariableDeclaration::RangeVariable, (yyloc), parseInfo); } -#line 5209 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5230 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 166: -#line 2868 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2879 "querytransformparser.ypp" /* yacc.c:1652 */ {(yyval.enums.slot) = parseInfo->staticContext->currentRangeSlot();} -#line 5215 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5236 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 167: -#line 2870 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2881 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr) = create(new QuantifiedExpression((yyvsp[-1].enums.slot), QuantifiedExpression::Some, (yyvsp[-2].expr), (yyvsp[0].expr)), (yyloc), parseInfo); parseInfo->finalizePushedVariable(); } -#line 5225 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5246 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 169: -#line 2879 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2890 "querytransformparser.ypp" /* yacc.c:1652 */ { pushVariable((yyvsp[-3].qName), quantificationType((yyvsp[-2].sequenceType)), (yyvsp[0].expr), VariableDeclaration::RangeVariable, (yyloc), parseInfo); } -#line 5234 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5255 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 170: -#line 2883 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2894 "querytransformparser.ypp" /* yacc.c:1652 */ {(yyval.enums.slot) = parseInfo->staticContext->currentRangeSlot();} -#line 5240 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5261 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 171: -#line 2885 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2896 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc)); (yyval.expr) = create(new QuantifiedExpression((yyvsp[-1].enums.slot), QuantifiedExpression::Every, (yyvsp[-3].expr), (yyvsp[0].expr)), (yyloc), parseInfo); parseInfo->finalizePushedVariable(); } -#line 5251 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5272 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 172: -#line 2893 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2904 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr) = pushVariable((yyvsp[-3].qName), quantificationType((yyvsp[-2].sequenceType)), (yyvsp[0].expr), VariableDeclaration::RangeVariable, (yyloc), parseInfo); } -#line 5260 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5281 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 173: -#line 2897 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2908 "querytransformparser.ypp" /* yacc.c:1652 */ {(yyval.enums.slot) = parseInfo->staticContext->currentRangeSlot();} -#line 5266 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5287 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 174: -#line 2899 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2910 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr) = create(new QuantifiedExpression((yyvsp[-1].enums.slot), QuantifiedExpression::Every, (yyvsp[-2].expr), (yyvsp[0].expr)), (yyloc), parseInfo); parseInfo->finalizePushedVariable(); } -#line 5276 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5297 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 176: -#line 2908 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2919 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr) = (yyvsp[0].expr); } -#line 5284 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5305 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 177: -#line 2935 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2946 "querytransformparser.ypp" /* yacc.c:1652 */ { parseInfo->typeswitchSource.push((yyvsp[-1].expr)); } -#line 5292 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5313 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 178: -#line 2939 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2950 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QXmlQuery::XQuery10, parseInfo, (yyloc)); parseInfo->typeswitchSource.pop(); (yyval.expr) = (yyvsp[0].expr); } -#line 5302 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5323 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 179: -#line 2946 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2957 "querytransformparser.ypp" /* yacc.c:1652 */ { if(!(yyvsp[-1].qName).isNull()) { @@ -5360,54 +5380,54 @@ yyreduce: VariableDeclaration::ExpressionVariable, (yyloc), parseInfo, false); } } -#line 5314 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5335 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 180: -#line 2954 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2965 "querytransformparser.ypp" /* yacc.c:1652 */ { /* The variable shouldn't be in-scope for other case branches. */ if(!(yyvsp[-4].qName).isNull()) parseInfo->finalizePushedVariable(); } -#line 5324 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5345 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 181: -#line 2960 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2971 "querytransformparser.ypp" /* yacc.c:1652 */ { const Expression::Ptr instanceOf(create(new InstanceOf(parseInfo->typeswitchSource.top(), (yyvsp[-5].sequenceType)), (yyloc), parseInfo)); (yyval.expr) = create(new IfThenClause(instanceOf, (yyvsp[-2].expr), (yyvsp[0].expr)), (yyloc), parseInfo); } -#line 5333 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5354 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 184: -#line 2969 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2980 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.qName) = QXmlName(); } -#line 5341 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5362 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 185: -#line 2974 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2985 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.qName) = (yyvsp[-1].qName); } -#line 5349 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5370 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 186: -#line 2979 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2990 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr) = (yyvsp[0].expr); } -#line 5357 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5378 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 187: -#line 2983 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 2994 "querytransformparser.ypp" /* yacc.c:1652 */ { if(!(yyvsp[0].qName).isNull()) { @@ -5416,111 +5436,111 @@ yyreduce: VariableDeclaration::ExpressionVariable, (yyloc), parseInfo, false); } } -#line 5370 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5391 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 188: -#line 2992 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3003 "querytransformparser.ypp" /* yacc.c:1652 */ { if(!(yyvsp[-3].qName).isNull()) parseInfo->finalizePushedVariable(); (yyval.expr) = (yyvsp[0].expr); } -#line 5380 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5401 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 189: -#line 2999 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3010 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc)); (yyval.expr) = create(new IfThenClause((yyvsp[-5].expr), (yyvsp[-2].expr), (yyvsp[0].expr)), (yyloc), parseInfo); } -#line 5389 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5410 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 191: -#line 3006 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3017 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc)); (yyval.expr) = create(new OrExpression((yyvsp[-2].expr), (yyvsp[0].expr)), (yyloc), parseInfo); } -#line 5398 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5419 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 193: -#line 3013 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3024 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc)); (yyval.expr) = create(new AndExpression((yyvsp[-2].expr), (yyvsp[0].expr)), (yyloc), parseInfo); } -#line 5407 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5428 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 199: -#line 3025 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3036 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc)); (yyval.expr) = create(new RangeExpression((yyvsp[-2].expr), (yyvsp[0].expr)), (yyloc), parseInfo); } -#line 5416 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5437 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 201: -#line 3032 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3043 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc)); (yyval.expr) = create(new ArithmeticExpression((yyvsp[-2].expr), (yyvsp[-1].enums.mathOperator), (yyvsp[0].expr)), (yyloc), parseInfo); } -#line 5425 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5446 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 202: -#line 3037 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3048 "querytransformparser.ypp" /* yacc.c:1652 */ {(yyval.enums.mathOperator) = AtomicMathematician::Add;} -#line 5431 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5452 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 203: -#line 3038 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3049 "querytransformparser.ypp" /* yacc.c:1652 */ {(yyval.enums.mathOperator) = AtomicMathematician::Substract;} -#line 5437 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5458 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 205: -#line 3042 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3053 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc)); (yyval.expr) = create(new ArithmeticExpression((yyvsp[-2].expr), (yyvsp[-1].enums.mathOperator), (yyvsp[0].expr)), (yyloc), parseInfo); } -#line 5446 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5467 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 206: -#line 3047 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3058 "querytransformparser.ypp" /* yacc.c:1652 */ {(yyval.enums.mathOperator) = AtomicMathematician::Multiply;} -#line 5452 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5473 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 207: -#line 3048 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3059 "querytransformparser.ypp" /* yacc.c:1652 */ {(yyval.enums.mathOperator) = AtomicMathematician::Div;} -#line 5458 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5479 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 208: -#line 3049 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3060 "querytransformparser.ypp" /* yacc.c:1652 */ {(yyval.enums.mathOperator) = AtomicMathematician::IDiv;} -#line 5464 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5485 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 209: -#line 3050 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3061 "querytransformparser.ypp" /* yacc.c:1652 */ {(yyval.enums.mathOperator) = AtomicMathematician::Mod;} -#line 5470 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5491 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 211: -#line 3054 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3065 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20 @@ -5529,213 +5549,213 @@ yyreduce: parseInfo, (yyloc)); (yyval.expr) = create(new CombineNodes((yyvsp[-2].expr), CombineNodes::Union, (yyvsp[0].expr)), (yyloc), parseInfo); } -#line 5483 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5504 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 213: -#line 3065 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3076 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc)); (yyval.expr) = create(new CombineNodes((yyvsp[-2].expr), (yyvsp[-1].enums.combinedNodeOp), (yyvsp[0].expr)), (yyloc), parseInfo); } -#line 5492 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5513 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 216: -#line 3074 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3085 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.enums.combinedNodeOp) = CombineNodes::Intersect; } -#line 5500 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5521 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 217: -#line 3078 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3089 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.enums.combinedNodeOp) = CombineNodes::Except; } -#line 5508 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5529 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 219: -#line 3084 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3095 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc)); (yyval.expr) = create(new InstanceOf((yyvsp[-3].expr), SequenceType::Ptr((yyvsp[0].sequenceType))), (yyloc), parseInfo); } -#line 5518 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5539 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 221: -#line 3092 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3103 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc)); (yyval.expr) = create(new TreatAs((yyvsp[-3].expr), (yyvsp[0].sequenceType)), (yyloc), parseInfo); } -#line 5527 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5548 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 223: -#line 3099 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3110 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc)); (yyval.expr) = create(new CastableAs((yyvsp[-3].expr), (yyvsp[0].sequenceType)), (yyloc), parseInfo); } -#line 5536 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5557 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 225: -#line 3106 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3117 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc)); (yyval.expr) = create(new CastAs((yyvsp[-3].expr), (yyvsp[0].sequenceType)), (yyloc), parseInfo); } -#line 5545 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5566 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 227: -#line 3113 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3124 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc)); (yyval.expr) = create(new UnaryExpression((yyvsp[-1].enums.mathOperator), (yyvsp[0].expr), parseInfo->staticContext), (yyloc), parseInfo); } -#line 5554 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5575 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 228: -#line 3119 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3130 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.enums.mathOperator) = AtomicMathematician::Add; } -#line 5562 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5583 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 229: -#line 3123 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3134 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.enums.mathOperator) = AtomicMathematician::Substract; } -#line 5570 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5591 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 233: -#line 3132 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3143 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc)); (yyval.expr) = create(new GeneralComparison((yyvsp[-2].expr), (yyvsp[-1].enums.valueOperator), (yyvsp[0].expr), parseInfo->isBackwardsCompat.top()), (yyloc), parseInfo); } -#line 5579 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5600 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 234: -#line 3137 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3148 "querytransformparser.ypp" /* yacc.c:1652 */ {(yyval.enums.valueOperator) = AtomicComparator::OperatorEqual;} -#line 5585 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5606 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 235: -#line 3138 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3149 "querytransformparser.ypp" /* yacc.c:1652 */ {(yyval.enums.valueOperator) = AtomicComparator::OperatorNotEqual;} -#line 5591 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5612 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 236: -#line 3139 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3150 "querytransformparser.ypp" /* yacc.c:1652 */ {(yyval.enums.valueOperator) = AtomicComparator::OperatorGreaterOrEqual;} -#line 5597 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5618 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 237: -#line 3140 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3151 "querytransformparser.ypp" /* yacc.c:1652 */ {(yyval.enums.valueOperator) = AtomicComparator::OperatorGreaterThan;} -#line 5603 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5624 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 238: -#line 3141 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3152 "querytransformparser.ypp" /* yacc.c:1652 */ {(yyval.enums.valueOperator) = AtomicComparator::OperatorLessOrEqual;} -#line 5609 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5630 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 239: -#line 3142 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3153 "querytransformparser.ypp" /* yacc.c:1652 */ {(yyval.enums.valueOperator) = AtomicComparator::OperatorLessThan;} -#line 5615 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5636 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 240: -#line 3145 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3156 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr) = create(new ValueComparison((yyvsp[-2].expr), (yyvsp[-1].enums.valueOperator), (yyvsp[0].expr)), (yyloc), parseInfo); } -#line 5623 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5644 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 241: -#line 3149 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3160 "querytransformparser.ypp" /* yacc.c:1652 */ {(yyval.enums.valueOperator) = AtomicComparator::OperatorEqual;} -#line 5629 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5650 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 242: -#line 3150 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3161 "querytransformparser.ypp" /* yacc.c:1652 */ {(yyval.enums.valueOperator) = AtomicComparator::OperatorNotEqual;} -#line 5635 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5656 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 243: -#line 3151 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3162 "querytransformparser.ypp" /* yacc.c:1652 */ {(yyval.enums.valueOperator) = AtomicComparator::OperatorGreaterOrEqual;} -#line 5641 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5662 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 244: -#line 3152 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3163 "querytransformparser.ypp" /* yacc.c:1652 */ {(yyval.enums.valueOperator) = AtomicComparator::OperatorGreaterThan;} -#line 5647 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5668 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 245: -#line 3153 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3164 "querytransformparser.ypp" /* yacc.c:1652 */ {(yyval.enums.valueOperator) = AtomicComparator::OperatorLessOrEqual;} -#line 5653 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5674 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 246: -#line 3154 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3165 "querytransformparser.ypp" /* yacc.c:1652 */ {(yyval.enums.valueOperator) = AtomicComparator::OperatorLessThan;} -#line 5659 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5680 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 247: -#line 3157 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3168 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr) = create(new NodeComparison((yyvsp[-2].expr), (yyvsp[-1].enums.nodeOperator), (yyvsp[0].expr)), (yyloc), parseInfo); } -#line 5667 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5688 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 248: -#line 3161 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3172 "querytransformparser.ypp" /* yacc.c:1652 */ {(yyval.enums.nodeOperator) = QXmlNodeModelIndex::Is;} -#line 5673 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5694 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 249: -#line 3162 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3173 "querytransformparser.ypp" /* yacc.c:1652 */ {(yyval.enums.nodeOperator) = QXmlNodeModelIndex::Precedes;} -#line 5679 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5700 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 250: -#line 3163 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3174 "querytransformparser.ypp" /* yacc.c:1652 */ {(yyval.enums.nodeOperator) = QXmlNodeModelIndex::Follows;} -#line 5685 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5706 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 251: -#line 3166 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3177 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QXmlQuery::XQuery10, parseInfo, (yyloc)); parseInfo->staticContext->error(QtXmlPatterns::tr("The Schema Validation Feature is not supported. " @@ -5746,29 +5766,29 @@ yyreduce: $$ = Validate::create($2, $1, parseInfo->staticContext); */ } -#line 5700 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5721 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 252: -#line 3179 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3190 "querytransformparser.ypp" /* yacc.c:1652 */ {(yyval.enums.validationMode) = Validate::Strict;} -#line 5706 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5727 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 253: -#line 3180 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3191 "querytransformparser.ypp" /* yacc.c:1652 */ {(yyval.enums.validationMode) = Validate::Strict;} -#line 5712 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5733 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 254: -#line 3181 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3192 "querytransformparser.ypp" /* yacc.c:1652 */ {(yyval.enums.validationMode) = Validate::Lax;} -#line 5718 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5739 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 255: -#line 3184 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3195 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QXmlQuery::XQuery10, parseInfo, (yyloc)); /* We don't support any pragmas, so we only do the @@ -5784,69 +5804,69 @@ yyreduce: ReportContext::XQST0079, fromYYLTYPE((yyloc), parseInfo)); } } -#line 5738 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5759 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 256: -#line 3201 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3212 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr).reset(); } -#line 5746 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5767 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 257: -#line 3205 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3216 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr) = (yyvsp[-1].expr); } -#line 5754 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5775 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 260: -#line 3213 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3224 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QXmlQuery::XQuery10, parseInfo, (yyloc)); } -#line 5762 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5783 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 263: -#line 3221 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3232 "querytransformparser.ypp" /* yacc.c:1652 */ { /* This is "/step". That is, fn:root(self::node()) treat as document-node()/RelativePathExpr. */ (yyval.expr) = create(new Path(createRootExpression(parseInfo, (yyloc)), (yyvsp[0].expr)), (yyloc), parseInfo); } -#line 5771 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5792 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 264: -#line 3227 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3238 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr) = createSlashSlashPath(createRootExpression(parseInfo, (yyloc)), (yyvsp[0].expr), (yyloc), parseInfo); } -#line 5779 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5800 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 265: -#line 3231 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3242 "querytransformparser.ypp" /* yacc.c:1652 */ { /* This is "/". That is, fn:root(self::node()) treat as document-node(). */ (yyval.expr) = createRootExpression(parseInfo, (yyloc)); } -#line 5788 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5809 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 268: -#line 3241 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3252 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr) = create(new Path((yyvsp[-2].expr), (yyvsp[0].expr), (yyvsp[-1].enums.pathKind)), (yyloc), parseInfo); } -#line 5796 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5817 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 269: -#line 3245 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3256 "querytransformparser.ypp" /* yacc.c:1652 */ { const Expression::Ptr orderBy(createReturnOrderBy((yyvsp[-3].orderSpecs), (yyvsp[-1].expr), parseInfo->orderStability.pop(), (yyloc), parseInfo)); @@ -5855,35 +5875,35 @@ yyreduce: (yyval.expr) = create(new OrderBy(rob->stability(), rob->orderSpecs(), path, rob), (yyloc), parseInfo); } -#line 5809 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5830 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 270: -#line 3254 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3265 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr) = createSlashSlashPath((yyvsp[-2].expr), (yyvsp[0].expr), (yyloc), parseInfo); } -#line 5817 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5838 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 271: -#line 3259 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3270 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr) = NodeSortExpression::wrapAround((yyvsp[0].expr), parseInfo->staticContext); } -#line 5825 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5846 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 273: -#line 3264 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3275 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr) = create(new CurrentItemStore((yyvsp[0].expr)), (yyloc), parseInfo); } -#line 5833 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5854 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 274: -#line 3268 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3279 "querytransformparser.ypp" /* yacc.c:1652 */ { const xsDouble version = (yyvsp[0].sval).toDouble(); @@ -5891,32 +5911,32 @@ yyreduce: (yyval.enums.Double) = version; } -#line 5845 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5866 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 275: -#line 3276 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3287 "querytransformparser.ypp" /* yacc.c:1652 */ { if((yyvsp[-1].enums.Double) < 2) (yyval.expr) = createCompatStore((yyvsp[0].expr), (yyloc), parseInfo); else (yyval.expr) = (yyvsp[0].expr); } -#line 5856 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5877 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 276: -#line 3283 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3294 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QXmlQuery::XSLT20, parseInfo, (yyloc)); Q_ASSERT(!(yyvsp[-3].sval).isEmpty()); (yyval.expr) = create(new StaticBaseURIStore((yyvsp[-3].sval), (yyvsp[-1].expr)), (yyloc), parseInfo); } -#line 5866 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5887 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 277: -#line 3290 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3301 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XSLT20), parseInfo, (yyloc)); parseInfo->resolvers.push(parseInfo->staticContext->namespaceBindings()); @@ -5926,81 +5946,81 @@ yyreduce: parseInfo->staticContext->namePool()->allocatePrefix((yyvsp[-3].sval)))); parseInfo->staticContext->setNamespaceBindings(resolver); } -#line 5880 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5901 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 278: -#line 3301 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3312 "querytransformparser.ypp" /* yacc.c:1652 */ { parseInfo->staticContext->setNamespaceBindings(parseInfo->resolvers.pop()); (yyval.expr) = (yyvsp[-1].expr); } -#line 5889 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5910 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 279: -#line 3306 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3317 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr) = create(new CallTemplate((yyvsp[-3].qName), parseInfo->templateWithParams), (yyloc), parseInfo); parseInfo->templateWithParametersHandled(); parseInfo->templateCalls.append((yyval.expr)); } -#line 5899 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5920 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 280: -#line 3313 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3324 "querytransformparser.ypp" /* yacc.c:1652 */ { parseInfo->startParsingWithParam(); } -#line 5907 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5928 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 281: -#line 3317 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3328 "querytransformparser.ypp" /* yacc.c:1652 */ { parseInfo->endParsingWithParam(); } -#line 5915 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5936 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 282: -#line 3322 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3333 "querytransformparser.ypp" /* yacc.c:1652 */ { } -#line 5922 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5943 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 283: -#line 3325 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3336 "querytransformparser.ypp" /* yacc.c:1652 */ { } -#line 5929 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5950 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 284: -#line 3328 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3339 "querytransformparser.ypp" /* yacc.c:1652 */ { } -#line 5936 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5957 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 285: -#line 3332 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3343 "querytransformparser.ypp" /* yacc.c:1652 */ { } -#line 5943 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5964 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 286: -#line 3335 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3346 "querytransformparser.ypp" /* yacc.c:1652 */ { } -#line 5950 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 5971 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 287: -#line 3339 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3350 "querytransformparser.ypp" /* yacc.c:1652 */ { /* Note, this grammar rule is invoked for @c xsl:param @em and @c * xsl:with-param. */ @@ -6064,84 +6084,84 @@ yyreduce: } } } -#line 6018 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6039 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 288: -#line 3404 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3415 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.enums.Bool) = false; } -#line 6026 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6047 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 289: -#line 3408 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3419 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.enums.Bool) = true; } -#line 6034 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6055 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 290: -#line 3413 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3424 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr) = Expression::Ptr(); } -#line 6042 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6063 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 291: -#line 3417 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3428 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr) = (yyvsp[0].expr); } -#line 6050 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6071 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 292: -#line 3426 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3437 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.enums.pathKind) = Path::RegularPath; } -#line 6058 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6079 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 293: -#line 3430 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3441 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.enums.pathKind) = Path::XSLTForEach; } -#line 6066 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6087 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 294: -#line 3434 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3445 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.enums.pathKind) = Path::ForApplyTemplate; } -#line 6074 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6095 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 296: -#line 3440 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3451 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr) = create(GenericPredicate::create((yyvsp[-3].expr), (yyvsp[-1].expr), parseInfo->staticContext, fromYYLTYPE((yyloc), parseInfo)), (yyloc), parseInfo); } -#line 6082 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6103 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 299: -#line 3448 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3459 "querytransformparser.ypp" /* yacc.c:1652 */ { if((yyvsp[0].enums.axis) == QXmlNodeModelIndex::AxisAttribute) parseInfo->nodeTestSource = BuiltinTypes::attribute; } -#line 6091 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6112 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 300: -#line 3453 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3464 "querytransformparser.ypp" /* yacc.c:1652 */ { if((yyvsp[0].itemType)) { @@ -6166,11 +6186,11 @@ yyreduce: parseInfo->restoreNodeTestSource(); } -#line 6120 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6141 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 304: -#line 3483 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3494 "querytransformparser.ypp" /* yacc.c:1652 */ { if((yyvsp[-1].enums.axis) == QXmlNodeModelIndex::AxisNamespace) { @@ -6213,102 +6233,102 @@ yyreduce: } } } -#line 6167 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6188 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 305: -#line 3526 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3537 "querytransformparser.ypp" /* yacc.c:1652 */ {(yyval.enums.axis) = QXmlNodeModelIndex::AxisAncestorOrSelf ;} -#line 6173 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6194 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 306: -#line 3527 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3538 "querytransformparser.ypp" /* yacc.c:1652 */ {(yyval.enums.axis) = QXmlNodeModelIndex::AxisAncestor ;} -#line 6179 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6200 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 307: -#line 3528 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3539 "querytransformparser.ypp" /* yacc.c:1652 */ {(yyval.enums.axis) = QXmlNodeModelIndex::AxisAttribute ;} -#line 6185 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6206 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 308: -#line 3529 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3540 "querytransformparser.ypp" /* yacc.c:1652 */ {(yyval.enums.axis) = QXmlNodeModelIndex::AxisChild ;} -#line 6191 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6212 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 309: -#line 3530 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3541 "querytransformparser.ypp" /* yacc.c:1652 */ {(yyval.enums.axis) = QXmlNodeModelIndex::AxisDescendantOrSelf;} -#line 6197 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6218 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 310: -#line 3531 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3542 "querytransformparser.ypp" /* yacc.c:1652 */ {(yyval.enums.axis) = QXmlNodeModelIndex::AxisDescendant ;} -#line 6203 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6224 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 311: -#line 3532 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3543 "querytransformparser.ypp" /* yacc.c:1652 */ {(yyval.enums.axis) = QXmlNodeModelIndex::AxisFollowing ;} -#line 6209 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6230 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 312: -#line 3533 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3544 "querytransformparser.ypp" /* yacc.c:1652 */ {(yyval.enums.axis) = QXmlNodeModelIndex::AxisPreceding ;} -#line 6215 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6236 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 313: -#line 3534 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3545 "querytransformparser.ypp" /* yacc.c:1652 */ {(yyval.enums.axis) = QXmlNodeModelIndex::AxisFollowingSibling;} -#line 6221 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6242 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 314: -#line 3535 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3546 "querytransformparser.ypp" /* yacc.c:1652 */ {(yyval.enums.axis) = QXmlNodeModelIndex::AxisPrecedingSibling;} -#line 6227 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6248 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 315: -#line 3536 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3547 "querytransformparser.ypp" /* yacc.c:1652 */ {(yyval.enums.axis) = QXmlNodeModelIndex::AxisParent ;} -#line 6233 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6254 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 316: -#line 3537 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3548 "querytransformparser.ypp" /* yacc.c:1652 */ {(yyval.enums.axis) = QXmlNodeModelIndex::AxisSelf ;} -#line 6239 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6260 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 317: -#line 3540 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3551 "querytransformparser.ypp" /* yacc.c:1652 */ { parseInfo->nodeTestSource = BuiltinTypes::attribute; } -#line 6247 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6268 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 318: -#line 3544 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3555 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XSLT20 | QXmlQuery::XmlSchema11IdentityConstraintField), parseInfo, (yyloc)); (yyval.expr) = create(new AxisStep(QXmlNodeModelIndex::AxisAttribute, (yyvsp[0].itemType)), (yyloc), parseInfo); parseInfo->restoreNodeTestSource(); } -#line 6258 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6279 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 319: -#line 3551 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3562 "querytransformparser.ypp" /* yacc.c:1652 */ { ItemType::Ptr nodeTest; @@ -6319,51 +6339,51 @@ yyreduce: (yyval.expr) = create(new AxisStep(QXmlNodeModelIndex::AxisChild, nodeTest), (yyloc), parseInfo); } -#line 6273 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6294 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 320: -#line 3562 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3573 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr) = create(new AxisStep(QXmlNodeModelIndex::AxisAttribute, (yyvsp[0].itemType)), (yyloc), parseInfo); } -#line 6281 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6302 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 322: -#line 3569 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3580 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr) = create(new AxisStep(QXmlNodeModelIndex::AxisParent, BuiltinTypes::node), (yyloc), parseInfo); } -#line 6289 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6310 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 324: -#line 3575 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3586 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc)); } -#line 6297 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6318 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 325: -#line 3580 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3591 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.itemType) = QNameTest::create(parseInfo->nodeTestSource, (yyvsp[0].qName)); } -#line 6305 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6326 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 327: -#line 3586 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3597 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.itemType) = parseInfo->nodeTestSource; } -#line 6313 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6334 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 328: -#line 3590 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3601 "querytransformparser.ypp" /* yacc.c:1652 */ { const NamePool::Ptr np(parseInfo->staticContext->namePool()); const ReflectYYLTYPE ryy((yyloc), parseInfo); @@ -6372,30 +6392,30 @@ yyreduce: (yyval.itemType) = NamespaceNameTest::create(parseInfo->nodeTestSource, ns); } -#line 6326 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6347 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 329: -#line 3599 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3610 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc)); const QXmlName::LocalNameCode c = parseInfo->staticContext->namePool()->allocateLocalName((yyvsp[0].sval)); (yyval.itemType) = LocalNameTest::create(parseInfo->nodeTestSource, c); } -#line 6336 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6357 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 331: -#line 3607 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3618 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc)); (yyval.expr) = create(GenericPredicate::create((yyvsp[-3].expr), (yyvsp[-1].expr), parseInfo->staticContext, fromYYLTYPE((yylsp[0]), parseInfo)), (yyloc), parseInfo); } -#line 6345 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6366 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 339: -#line 3620 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3631 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr) = create(new ApplyTemplate(parseInfo->modeFor((yyvsp[-3].qName)), parseInfo->templateWithParams, @@ -6404,97 +6424,97 @@ yyreduce: (yylsp[-4]), parseInfo); parseInfo->templateWithParametersHandled(); } -#line 6358 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6379 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 341: -#line 3631 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3642 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr) = create(new Literal(AtomicString::fromValue((yyvsp[0].sval))), (yyloc), parseInfo); } -#line 6366 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6387 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 342: -#line 3636 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3647 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc)); (yyval.expr) = createNumericLiteral<Double>((yyvsp[0].sval), (yyloc), parseInfo); } -#line 6375 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6396 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 343: -#line 3641 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3652 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc)); (yyval.expr) = createNumericLiteral<Numeric>((yyvsp[0].sval), (yyloc), parseInfo); } -#line 6384 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6405 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 344: -#line 3647 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3658 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc)); (yyval.expr) = resolveVariable((yyvsp[0].qName), (yyloc), parseInfo, false); } -#line 6393 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6414 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 345: -#line 3653 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3664 "querytransformparser.ypp" /* yacc.c:1652 */ { /* See: http://www.w3.org/TR/xpath20/#id-variables */ (yyval.qName) = parseInfo->staticContext->namePool()->allocateQName(QString(), (yyvsp[0].sval)); } -#line 6402 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6423 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 346: -#line 3658 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3669 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.qName) = (yyvsp[0].qName); } -#line 6410 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6431 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 347: -#line 3663 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3674 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc)); (yyval.expr) = (yyvsp[-1].expr); } -#line 6419 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6440 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 348: -#line 3668 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3679 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc)); (yyval.expr) = create(new EmptySequence, (yyloc), parseInfo); } -#line 6428 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6449 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 349: -#line 3674 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3685 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr) = create(new ContextItem(), (yyloc), parseInfo); } -#line 6436 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6457 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 350: -#line 3679 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3690 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr) = (yyvsp[0].expr); } -#line 6444 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6465 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 351: -#line 3684 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3695 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc)); if(XPathHelper::isReservedNamespace((yyvsp[-3].qName).namespaceURI()) || (yyvsp[-3].qName).namespaceURI() == StandardNamespaces::InternalXSLT) @@ -6522,46 +6542,46 @@ yyreduce: parseInfo->userFunctionCallsites.append((yyval.expr)); } } -#line 6476 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6497 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 352: -#line 3713 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3724 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expressionList) = Expression::List(); } -#line 6484 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6505 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 353: -#line 3718 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3729 "querytransformparser.ypp" /* yacc.c:1652 */ { Expression::List list; list.append((yyvsp[0].expr)); (yyval.expressionList) = list; } -#line 6494 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6515 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 355: -#line 3727 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3738 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QXmlQuery::XQuery10, parseInfo, (yyloc)); } -#line 6502 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6523 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 360: -#line 3771 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3782 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.enums.tokenizerPosition) = parseInfo->tokenizer->commenceScanOnly(); parseInfo->scanOnlyStack.push(true); } -#line 6511 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6532 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 361: -#line 3780 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3791 "querytransformparser.ypp" /* yacc.c:1652 */ { ++parseInfo->elementConstructorDepth; Expression::List constructors; @@ -6705,11 +6725,11 @@ yyreduce: parseInfo->tokenizer->resumeTokenizationFrom((yyvsp[-1].enums.tokenizerPosition)); } -#line 6659 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6680 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 362: -#line 3926 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 3937 "querytransformparser.ypp" /* yacc.c:1652 */ { /* We add the content constructor after the attribute constructors. This might result * in nested ExpressionSequences, but it will be optimized away later on. */ @@ -6804,19 +6824,19 @@ yyreduce: --parseInfo->elementConstructorDepth; } -#line 6758 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6779 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 363: -#line 4022 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4033 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr) = create(new EmptySequence(), (yyloc), parseInfo); } -#line 6766 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6787 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 364: -#line 4026 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4037 "querytransformparser.ypp" /* yacc.c:1652 */ { if(!(yyvsp[-1].qName).isLexicallyEqual(parseInfo->tagStack.top())) { @@ -6834,60 +6854,60 @@ yyreduce: else (yyval.expr) = create(new ExpressionSequence((yyvsp[-3].expressionList)), (yyloc), parseInfo); } -#line 6788 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6809 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 365: -#line 4045 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4056 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.attributeHolders) = AttributeHolderVector(); } -#line 6796 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6817 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 366: -#line 4049 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4060 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyvsp[-1].attributeHolders).append((yyvsp[0].attributeHolder)); (yyval.attributeHolders) = (yyvsp[-1].attributeHolders); } -#line 6805 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6826 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 367: -#line 4055 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4066 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.attributeHolder) = qMakePair((yyvsp[-2].sval), (yyvsp[0].expr)); } -#line 6813 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6834 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 368: -#line 4060 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4071 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr) = createDirAttributeValue((yyvsp[-1].expressionList), parseInfo, (yyloc)); } -#line 6821 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6842 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 369: -#line 4065 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4076 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr) = createDirAttributeValue((yyvsp[-1].expressionList), parseInfo, (yyloc)); } -#line 6829 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6850 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 370: -#line 4070 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4081 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expressionList) = Expression::List(); } -#line 6837 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6858 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 371: -#line 4074 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4085 "querytransformparser.ypp" /* yacc.c:1652 */ { Expression::Ptr content((yyvsp[-1].expr)); @@ -6897,39 +6917,39 @@ yyreduce: (yyvsp[0].expressionList).prepend(createSimpleContent(content, (yyloc), parseInfo)); (yyval.expressionList) = (yyvsp[0].expressionList); } -#line 6851 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6872 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 372: -#line 4084 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4095 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyvsp[0].expressionList).prepend(create(new Literal(AtomicString::fromValue((yyvsp[-1].sval))), (yyloc), parseInfo)); (yyval.expressionList) = (yyvsp[0].expressionList); } -#line 6860 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6881 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 373: -#line 4090 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4101 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expressionList) = Expression::List(); parseInfo->isPreviousEnclosedExpr = false; } -#line 6869 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6890 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 374: -#line 4095 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4106 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyvsp[-1].expressionList).append((yyvsp[0].expr)); (yyval.expressionList) = (yyvsp[-1].expressionList); parseInfo->isPreviousEnclosedExpr = false; } -#line 6879 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6900 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 375: -#line 4101 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4112 "querytransformparser.ypp" /* yacc.c:1652 */ { if(parseInfo->staticContext->boundarySpacePolicy() == StaticContext::BSPStrip && XPathHelper::isWhitespaceOnly((yyvsp[0].sval))) @@ -6943,21 +6963,21 @@ yyreduce: parseInfo->isPreviousEnclosedExpr = false; } } -#line 6897 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6918 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 376: -#line 4115 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4126 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyvsp[-1].expressionList).append(create(new TextNodeConstructor(create(new Literal(AtomicString::fromValue((yyvsp[0].sval))), (yyloc), parseInfo)), (yyloc), parseInfo)); (yyval.expressionList) = (yyvsp[-1].expressionList); parseInfo->isPreviousEnclosedExpr = false; } -#line 6907 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6928 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 377: -#line 4121 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4132 "querytransformparser.ypp" /* yacc.c:1652 */ { /* We insert a text node constructor that send an empty text node between * the two enclosed expressions, in order to ensure that no space is inserted. @@ -6973,19 +6993,19 @@ yyreduce: (yyvsp[-1].expressionList).append(createCopyOf((yyvsp[0].expr), parseInfo, (yyloc))); (yyval.expressionList) = (yyvsp[-1].expressionList); } -#line 6927 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6948 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 378: -#line 4138 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4149 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr) = create(new CommentConstructor(create(new Literal(AtomicString::fromValue((yyvsp[0].sval))), (yyloc), parseInfo)), (yyloc), parseInfo); } -#line 6935 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6956 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 379: -#line 4143 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4154 "querytransformparser.ypp" /* yacc.c:1652 */ { const ReflectYYLTYPE ryy((yyloc), parseInfo); NCNameConstructor::validateTargetName<StaticContext::Ptr, @@ -6997,30 +7017,30 @@ yyreduce: create(new Literal(AtomicString::fromValue((yyvsp[-1].sval))), (yyloc), parseInfo), create(new Literal(AtomicString::fromValue((yyvsp[0].sval))), (yyloc), parseInfo)), (yyloc), parseInfo); } -#line 6951 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6972 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 387: -#line 4164 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4175 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QXmlQuery::XQuery10, parseInfo, (yyloc), (yyvsp[-1].enums.Bool)); (yyval.expr) = create(new DocumentConstructor((yyvsp[0].expr)), (yyloc), parseInfo); } -#line 6961 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6982 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 388: -#line 4171 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4182 "querytransformparser.ypp" /* yacc.c:1652 */ { /* This value is incremented before the action below is executed. */ ++parseInfo->elementConstructorDepth; } -#line 6970 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 6991 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 389: -#line 4176 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4187 "querytransformparser.ypp" /* yacc.c:1652 */ { Q_ASSERT(5); allowedIn(QXmlQuery::XQuery10, parseInfo, (yyloc), (yyvsp[-3].enums.Bool)); @@ -7053,27 +7073,27 @@ yyreduce: --parseInfo->elementConstructorDepth; (yyval.expr) = create(new ElementConstructor((yyvsp[-2].expr), effExpr, parseInfo->isXSLT()), (yyloc), parseInfo); } -#line 7007 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7028 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 390: -#line 4210 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4221 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.enums.Bool) = false; } -#line 7015 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7036 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 391: -#line 4214 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4225 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.enums.Bool) = true; } -#line 7023 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7044 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 392: -#line 4222 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4233 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QXmlQuery::XQuery10, parseInfo, (yyloc), (yyvsp[-2].enums.Bool)); @@ -7084,29 +7104,29 @@ yyreduce: else (yyval.expr) = create(new AttributeConstructor(name, create(new EmptySequence(), (yyloc), parseInfo)), (yyloc), parseInfo); } -#line 7038 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7059 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 393: -#line 4234 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4245 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr) = create(new TextNodeConstructor(createSimpleContent((yyvsp[0].expr), (yyloc), parseInfo)), (yyloc), parseInfo); } -#line 7046 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7067 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 394: -#line 4239 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4250 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QXmlQuery::XQuery10, parseInfo, (yyloc), (yyvsp[-1].enums.Bool)); (yyval.expr) = create(new CommentConstructor(createSimpleContent((yyvsp[0].expr), (yyloc), parseInfo)), (yyloc), parseInfo); } -#line 7056 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7077 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 395: -#line 4246 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4257 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QXmlQuery::XQuery10, parseInfo, (yyloc), (yyvsp[-1].expr)); @@ -7117,43 +7137,43 @@ yyreduce: else (yyval.expr) = create(new ProcessingInstructionConstructor((yyvsp[-1].expr), create(new EmptySequence(), (yyloc), parseInfo)), (yyloc), parseInfo); } -#line 7071 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7092 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 396: -#line 4257 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4268 "querytransformparser.ypp" /* yacc.c:1652 */ { parseInfo->nodeTestSource = BuiltinTypes::attribute; } -#line 7079 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7100 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 397: -#line 4261 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4272 "querytransformparser.ypp" /* yacc.c:1652 */ { parseInfo->restoreNodeTestSource(); } -#line 7087 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7108 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 398: -#line 4264 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4275 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr) = create(new Literal(toItem(QNameValue::fromValue(parseInfo->staticContext->namePool(), (yyvsp[-1].qName)))), (yyloc), parseInfo); } -#line 7095 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7116 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 400: -#line 4270 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4281 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr) = create(new Literal(toItem(QNameValue::fromValue(parseInfo->staticContext->namePool(), (yyvsp[0].qName)))), (yyloc), parseInfo); } -#line 7103 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7124 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 402: -#line 4276 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4287 "querytransformparser.ypp" /* yacc.c:1652 */ { if(BuiltinTypes::xsQName->xdtTypeMatches((yyvsp[0].expr)->staticType()->itemType())) (yyval.expr) = (yyvsp[0].expr); @@ -7164,115 +7184,115 @@ yyreduce: (yyloc), parseInfo); } } -#line 7118 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7139 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 403: -#line 4291 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4302 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr) = create(new NCNameConstructor(create(new Literal(AtomicString::fromValue((yyvsp[0].sval))), (yyloc), parseInfo)), (yyloc), parseInfo); } -#line 7126 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7147 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 404: -#line 4295 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4306 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr) = create(new NCNameConstructor((yyvsp[0].expr)), (yyloc), parseInfo); } -#line 7134 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7155 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 405: -#line 4304 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4315 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.expr) = create(new ComputedNamespaceConstructor((yyvsp[-1].expr), (yyvsp[0].expr)), (yyloc), parseInfo); } -#line 7142 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7163 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 406: -#line 4309 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4320 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.sequenceType) = makeGenericSequenceType((yyvsp[0].itemType), Cardinality::exactlyOne()); } -#line 7150 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7171 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 407: -#line 4313 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4324 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.sequenceType) = makeGenericSequenceType((yyvsp[-1].itemType), Cardinality::zeroOrOne()); } -#line 7158 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7179 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 408: -#line 4318 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4329 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.sequenceType) = CommonSequenceTypes::ZeroOrMoreItems; } -#line 7166 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7187 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 409: -#line 4322 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4333 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.sequenceType) = (yyvsp[0].sequenceType); } -#line 7174 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7195 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 410: -#line 4327 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4338 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.sequenceType) = makeGenericSequenceType((yyvsp[-1].itemType), (yyvsp[0].cardinality)); } -#line 7182 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7203 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 411: -#line 4332 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4343 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.sequenceType) = CommonSequenceTypes::Empty; } -#line 7190 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7211 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 412: -#line 4336 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4347 "querytransformparser.ypp" /* yacc.c:1652 */ {(yyval.cardinality) = Cardinality::exactlyOne();} -#line 7196 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7217 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 413: -#line 4337 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4348 "querytransformparser.ypp" /* yacc.c:1652 */ {(yyval.cardinality) = Cardinality::oneOrMore();} -#line 7202 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7223 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 414: -#line 4338 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4349 "querytransformparser.ypp" /* yacc.c:1652 */ {(yyval.cardinality) = Cardinality::zeroOrMore();} -#line 7208 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7229 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 415: -#line 4339 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4350 "querytransformparser.ypp" /* yacc.c:1652 */ {(yyval.cardinality) = Cardinality::zeroOrOne();} -#line 7214 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7235 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 419: -#line 4345 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4356 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.itemType) = BuiltinTypes::item; } -#line 7222 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7243 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 420: -#line 4350 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4361 "querytransformparser.ypp" /* yacc.c:1652 */ { const SchemaType::Ptr t(parseInfo->staticContext->schemaDefinitions()->createSchemaType((yyvsp[0].qName))); @@ -7304,68 +7324,68 @@ yyreduce: } } } -#line 7258 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7279 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 428: -#line 4394 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4405 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.itemType) = BuiltinTypes::node; } -#line 7266 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7287 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 429: -#line 4399 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4410 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.itemType) = BuiltinTypes::document; } -#line 7274 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7295 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 430: -#line 4404 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4415 "querytransformparser.ypp" /* yacc.c:1652 */ { // TODO support for document element testing (yyval.itemType) = BuiltinTypes::document; } -#line 7283 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7304 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 433: -#line 4413 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4424 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.itemType) = BuiltinTypes::text; } -#line 7291 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7312 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 434: -#line 4418 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4429 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.itemType) = BuiltinTypes::comment; } -#line 7299 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7320 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 435: -#line 4423 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4434 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.itemType) = BuiltinTypes::pi; } -#line 7307 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7328 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 436: -#line 4428 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4439 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.itemType) = LocalNameTest::create(BuiltinTypes::pi, parseInfo->staticContext->namePool()->allocateLocalName((yyvsp[-1].sval))); } -#line 7315 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7336 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 437: -#line 4433 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4444 "querytransformparser.ypp" /* yacc.c:1652 */ { if(QXmlUtils::isNCName((yyvsp[-1].sval))) { @@ -7380,35 +7400,35 @@ yyreduce: fromYYLTYPE((yyloc), parseInfo)); } } -#line 7334 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7355 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 440: -#line 4452 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4463 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.itemType) = BuiltinTypes::attribute; } -#line 7342 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7363 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 441: -#line 4457 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4468 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.itemType) = BuiltinTypes::attribute; } -#line 7350 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7371 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 442: -#line 4462 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4473 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.itemType) = QNameTest::create(BuiltinTypes::attribute, (yyvsp[-1].qName)); } -#line 7358 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7379 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 443: -#line 4466 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4477 "querytransformparser.ypp" /* yacc.c:1652 */ { const SchemaType::Ptr t(parseInfo->staticContext->schemaDefinitions()->createSchemaType((yyvsp[-1].qName))); @@ -7420,11 +7440,11 @@ yyreduce: ReportContext::XPST0008, fromYYLTYPE((yyloc), parseInfo)); } } -#line 7374 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7395 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 444: -#line 4478 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4489 "querytransformparser.ypp" /* yacc.c:1652 */ { const SchemaType::Ptr t(parseInfo->staticContext->schemaDefinitions()->createSchemaType((yyvsp[-1].qName))); @@ -7436,11 +7456,11 @@ yyreduce: ReportContext::XPST0008, fromYYLTYPE((yyloc), parseInfo)); } } -#line 7390 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7411 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 445: -#line 4491 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4502 "querytransformparser.ypp" /* yacc.c:1652 */ { parseInfo->staticContext->error(QtXmlPatterns::tr("%1 is not in the in-scope attribute " "declarations. Note that the schema import " @@ -7449,35 +7469,35 @@ yyreduce: ReportContext::XPST0008, fromYYLTYPE((yyloc), parseInfo)); (yyval.itemType).reset(); } -#line 7403 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7424 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 446: -#line 4501 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4512 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.itemType) = BuiltinTypes::element; } -#line 7411 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7432 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 447: -#line 4506 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4517 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.itemType) = BuiltinTypes::element; } -#line 7419 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7440 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 448: -#line 4511 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4522 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.itemType) = QNameTest::create(BuiltinTypes::element, (yyvsp[-1].qName)); } -#line 7427 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7448 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 449: -#line 4516 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4527 "querytransformparser.ypp" /* yacc.c:1652 */ { const SchemaType::Ptr t(parseInfo->staticContext->schemaDefinitions()->createSchemaType((yyvsp[-2].qName))); @@ -7490,11 +7510,11 @@ yyreduce: ReportContext::XPST0008, fromYYLTYPE((yyloc), parseInfo)); } } -#line 7444 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7465 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 450: -#line 4530 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4541 "querytransformparser.ypp" /* yacc.c:1652 */ { const SchemaType::Ptr t(parseInfo->staticContext->schemaDefinitions()->createSchemaType((yyvsp[-2].qName))); @@ -7507,11 +7527,11 @@ yyreduce: ReportContext::XPST0008, fromYYLTYPE((yyloc), parseInfo)); } } -#line 7461 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7482 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 453: -#line 4547 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4558 "querytransformparser.ypp" /* yacc.c:1652 */ { parseInfo->staticContext->error(QtXmlPatterns::tr("%1 is not in the in-scope attribute " "declarations. Note that the schema import " @@ -7520,72 +7540,72 @@ yyreduce: ReportContext::XPST0008, fromYYLTYPE((yyloc), parseInfo)); (yyval.itemType).reset(); } -#line 7474 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7495 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 455: -#line 4559 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4570 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.qName) = parseInfo->staticContext->namePool()->allocateQName(StandardNamespaces::empty, (yyvsp[0].sval)); } -#line 7482 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7503 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 457: -#line 4571 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4582 "querytransformparser.ypp" /* yacc.c:1652 */ { if(parseInfo->nodeTestSource == BuiltinTypes::element) (yyval.qName) = parseInfo->staticContext->namePool()->allocateQName(parseInfo->staticContext->namespaceBindings()->lookupNamespaceURI(StandardPrefixes::empty), (yyvsp[0].sval)); else (yyval.qName) = parseInfo->staticContext->namePool()->allocateQName(StandardNamespaces::empty, (yyvsp[0].sval)); } -#line 7493 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7514 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 462: -#line 4585 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4596 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.qName) = parseInfo->staticContext->namePool()->allocateQName(parseInfo->staticContext->defaultFunctionNamespace(), (yyvsp[0].sval)); } -#line 7501 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7522 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 463: -#line 4589 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4600 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.qName) = parseInfo->staticContext->namePool()->allocateQName(StandardNamespaces::InternalXSLT, (yyvsp[0].sval)); } -#line 7509 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7530 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 466: -#line 4597 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4608 "querytransformparser.ypp" /* yacc.c:1652 */ { parseInfo->staticContext->error(QtXmlPatterns::tr("The name of an extension expression must be in " "a namespace."), ReportContext::XPST0081, fromYYLTYPE((yyloc), parseInfo)); } -#line 7519 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7540 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 469: -#line 4607 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4618 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc)); } -#line 7527 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7548 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 470: -#line 4611 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4622 "querytransformparser.ypp" /* yacc.c:1652 */ { allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc)); } -#line 7535 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7556 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 471: -#line 4616 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4627 "querytransformparser.ypp" /* yacc.c:1652 */ { const ReflectYYLTYPE ryy((yyloc), parseInfo); @@ -7597,19 +7617,19 @@ yyreduce: parseInfo->staticContext->namespaceBindings(), &ryy); } -#line 7551 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7572 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; case 472: -#line 4628 "querytransformparser.ypp" /* yacc.c:1646 */ +#line 4639 "querytransformparser.ypp" /* yacc.c:1652 */ { (yyval.qName) = parseInfo->staticContext->namePool()->fromClarkName((yyvsp[0].sval)); } -#line 7559 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7580 "qquerytransformparser.cpp" /* yacc.c:1652 */ break; -#line 7563 "qquerytransformparser.cpp" /* yacc.c:1646 */ +#line 7584 "qquerytransformparser.cpp" /* yacc.c:1652 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -7635,14 +7655,13 @@ yyreduce: /* Now 'shift' the result of the reduction. Determine what state that goes to, based on the state we popped back to and the rule number reduced by. */ - - yyn = yyr1[yyn]; - - yystate = yypgoto[yyn - YYNTOKENS] + *yyssp; - if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp) - yystate = yytable[yystate]; - else - yystate = yydefgoto[yyn - YYNTOKENS]; + { + const int yylhs = yyr1[yyn] - YYNTOKENS; + const int yyi = yypgoto[yylhs] + *yyssp; + yystate = (0 <= yyi && yyi <= YYLAST && yycheck[yyi] == *yyssp + ? yytable[yyi] + : yydefgoto[yylhs]); + } goto yynewstate; @@ -7725,14 +7744,11 @@ yyerrlab: | yyerrorlab -- error raised explicitly by YYERROR. | `---------------------------------------------------*/ yyerrorlab: + /* Pacify compilers when the user code never invokes YYERROR and the + label yyerrorlab therefore never appears in user code. */ + if (0) + YYERROR; - /* Pacify compilers like GCC when the user code never invokes - YYERROR and the label yyerrorlab therefore never appears in user - code. */ - if (/*CONSTCOND*/ 0) - goto yyerrorlab; - - yyerror_range[1] = yylsp[1-yylen]; /* Do not reclaim the symbols of the rule whose action triggered this YYERROR. */ YYPOPSTACK (yylen); @@ -7798,6 +7814,7 @@ yyacceptlab: yyresult = 0; goto yyreturn; + /*-----------------------------------. | yyabortlab -- YYABORT comes here. | `-----------------------------------*/ @@ -7805,6 +7822,7 @@ yyabortlab: yyresult = 1; goto yyreturn; + #if !defined yyoverflow || YYERROR_VERBOSE /*-------------------------------------------------. | yyexhaustedlab -- memory exhaustion comes here. | @@ -7815,6 +7833,10 @@ yyexhaustedlab: /* Fall through. */ #endif + +/*-----------------------------------------------------. +| yyreturn -- parsing is finished, return the result. | +`-----------------------------------------------------*/ yyreturn: if (yychar != YYEMPTY) { @@ -7844,7 +7866,7 @@ yyreturn: #endif return yyresult; } -#line 4632 "querytransformparser.ypp" /* yacc.c:1906 */ +#line 4643 "querytransformparser.ypp" /* yacc.c:1918 */ QString Tokenizer::tokenToString(const Token &token) diff --git a/src/xmlpatterns/parser/qquerytransformparser_p.h b/src/xmlpatterns/parser/qquerytransformparser_p.h index df6cf04..7616086 100644 --- a/src/xmlpatterns/parser/qquerytransformparser_p.h +++ b/src/xmlpatterns/parser/qquerytransformparser_p.h @@ -47,11 +47,12 @@ // // We mean it. -/* A Bison parser, made by GNU Bison 3.0.2. */ +/* A Bison parser, made by GNU Bison 3.3.2. */ /* Bison interface for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation, + Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -79,20 +80,31 @@ This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ +/* Undocumented macros, especially those whose name start with YY_, + are private implementation details. Do not rely on them. */ + #ifndef YY_XPATH_QQUERYTRANSFORMPARSER_P_H_INCLUDED # define YY_XPATH_QQUERYTRANSFORMPARSER_P_H_INCLUDED /* Debug traces. */ -#ifndef YYDEBUG -# define YYDEBUG 0 -#endif +#ifndef XPATHDEBUG +# if defined YYDEBUG #if YYDEBUG +# define XPATHDEBUG 1 +# else +# define XPATHDEBUG 0 +# endif +# else /* ! defined YYDEBUG */ +# define XPATHDEBUG 0 +# endif /* ! defined YYDEBUG */ +#endif /* ! defined XPATHDEBUG */ +#if XPATHDEBUG extern int XPathdebug; #endif /* Token type. */ -#ifndef YYTOKENTYPE -# define YYTOKENTYPE - enum yytokentype +#ifndef XPATHTOKENTYPE +# define XPATHTOKENTYPE + enum XPathtokentype { T_END_OF_FILE = 0, T_STRING_LITERAL = 258, @@ -267,17 +279,17 @@ extern int XPathdebug; /* Value type. */ /* Location type. */ -#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED -typedef struct YYLTYPE YYLTYPE; -struct YYLTYPE +#if ! defined XPATHLTYPE && ! defined XPATHLTYPE_IS_DECLARED +typedef struct XPATHLTYPE XPATHLTYPE; +struct XPATHLTYPE { int first_line; int first_column; int last_line; int last_column; }; -# define YYLTYPE_IS_DECLARED 1 -# define YYLTYPE_IS_TRIVIAL 1 +# define XPATHLTYPE_IS_DECLARED 1 +# define XPATHLTYPE_IS_TRIVIAL 1 #endif diff --git a/src/xmlpatterns/parser/qtokenizer_p.h b/src/xmlpatterns/parser/qtokenizer_p.h index 772c958..385955a 100644 --- a/src/xmlpatterns/parser/qtokenizer_p.h +++ b/src/xmlpatterns/parser/qtokenizer_p.h @@ -63,7 +63,7 @@ * Macro for the data type of semantic values; int by default. * See section Data Types of Semantic Values. */ -#define YYSTYPE QPatternist::TokenValue +#define XPATHSTYPE QPatternist::TokenValue #include <private/qquerytransformparser_p.h> /* This inclusion must be after TokenValue. */ diff --git a/src/xmlpatterns/parser/qtokenrevealer.cpp b/src/xmlpatterns/parser/qtokenrevealer.cpp index 486c40d..a7d8bb1 100644 --- a/src/xmlpatterns/parser/qtokenrevealer.cpp +++ b/src/xmlpatterns/parser/qtokenrevealer.cpp @@ -60,7 +60,7 @@ void TokenRevealer::setParserContext(const ParserContext::Ptr &parseInfo) m_tokenizer->setParserContext(parseInfo); } -Tokenizer::Token TokenRevealer::nextToken(YYLTYPE *const sourceLocator) +Tokenizer::Token TokenRevealer::nextToken(XPATHLTYPE *const sourceLocator) { const Token token(m_tokenizer->nextToken(sourceLocator)); const QString asString(tokenToString(token)); diff --git a/src/xmlpatterns/parser/qtokenrevealer_p.h b/src/xmlpatterns/parser/qtokenrevealer_p.h index e2f73c4..e958534 100644 --- a/src/xmlpatterns/parser/qtokenrevealer_p.h +++ b/src/xmlpatterns/parser/qtokenrevealer_p.h @@ -74,10 +74,10 @@ namespace QPatternist virtual ~TokenRevealer(); - virtual Token nextToken(YYLTYPE *const sourceLocator); - virtual int commenceScanOnly(); - virtual void resumeTokenizationFrom(const int position); - virtual void setParserContext(const ParserContext::Ptr &parseInfo); + Token nextToken(XPATHLTYPE *const sourceLocator) override; + int commenceScanOnly() override; + void resumeTokenizationFrom(const int position) override; + void setParserContext(const ParserContext::Ptr &parseInfo) override; private: const Tokenizer::Ptr m_tokenizer; diff --git a/src/xmlpatterns/parser/qtokensource_p.h b/src/xmlpatterns/parser/qtokensource_p.h index bbad071..267df23 100644 --- a/src/xmlpatterns/parser/qtokensource_p.h +++ b/src/xmlpatterns/parser/qtokensource_p.h @@ -81,7 +81,7 @@ namespace QPatternist * typedef for the enum Bison generates that contains * the token symbols. */ - typedef yytokentype TokenType; + typedef XPathtokentype TokenType; /** * Represents a token by carrying its name and value. @@ -122,8 +122,7 @@ namespace QPatternist /** * @returns the next token. */ - - virtual Token nextToken(YYLTYPE *const sourceLocator) = 0; + virtual Token nextToken(XPATHLTYPE *const sourceLocator) = 0; private: Q_DISABLE_COPY(TokenSource) diff --git a/src/xmlpatterns/parser/qtokenvalue_p.h b/src/xmlpatterns/parser/qtokenvalue_p.h index cc7996b..4562b89 100644 --- a/src/xmlpatterns/parser/qtokenvalue_p.h +++ b/src/xmlpatterns/parser/qtokenvalue_p.h @@ -153,15 +153,15 @@ namespace QPatternist }; } -struct YYLTYPE +struct XPATHLTYPE { int first_line; int first_column; int last_line; int last_column; }; -#ifndef YYLTYPE_IS_DECLARED -# define YYLTYPE_IS_DECLARED +#ifndef XPATHLTYPE_IS_DECLARED +# define XPATHLTYPE_IS_DECLARED #endif QT_END_NAMESPACE diff --git a/src/xmlpatterns/parser/querytransformparser.ypp b/src/xmlpatterns/parser/querytransformparser.ypp index 3a26b0d..658d4b2 100644 --- a/src/xmlpatterns/parser/querytransformparser.ypp +++ b/src/xmlpatterns/parser/querytransformparser.ypp @@ -1107,16 +1107,16 @@ static Expression::Ptr createReturnOrderBy(const OrderSpecTransfer::List &orderS * specified below. This '%require' directive was introduced in Bison 2.2. */ %require "2.3a" -%name-prefix="XPath" +%define api.prefix {XPath} /* Specifies the name of the generated parser. */ -%output="qquerytransformparser.cpp" +%output "qquerytransformparser.cpp" /* Output the .output file. */ %verbose /* Yes, we want descriptive error messages. */ -%error-verbose +%define parse.error verbose /* We'd like to be reentrant/thread-safe */ %pure-parser diff --git a/src/xmlpatterns/parser/qxquerytokenizer.cpp b/src/xmlpatterns/parser/qxquerytokenizer.cpp index ab1cfdc..c5e2c4d 100644 --- a/src/xmlpatterns/parser/qxquerytokenizer.cpp +++ b/src/xmlpatterns/parser/qxquerytokenizer.cpp @@ -2140,7 +2140,7 @@ Tokenizer::Token XQueryTokenizer::attributeAsRaw(const QChar sep, } } -Tokenizer::Token XQueryTokenizer::nextToken(YYLTYPE *const sourceLocator) +Tokenizer::Token XQueryTokenizer::nextToken(XPATHLTYPE *const sourceLocator) { sourceLocator->first_line = m_line; sourceLocator->first_column = m_pos - m_columnOffset + 1; /* Plus 1, since m_pos is 0-based. */ diff --git a/src/xmlpatterns/parser/qxquerytokenizer_p.h b/src/xmlpatterns/parser/qxquerytokenizer_p.h index 33a31a6..edcf178 100644 --- a/src/xmlpatterns/parser/qxquerytokenizer_p.h +++ b/src/xmlpatterns/parser/qxquerytokenizer_p.h @@ -106,14 +106,14 @@ namespace QPatternist const QUrl &location, const State startingState = Default); - virtual Token nextToken(YYLTYPE *const sourceLocator); - virtual int commenceScanOnly(); - virtual void resumeTokenizationFrom(const int position); + Token nextToken(XPATHLTYPE *const sourceLocator) override; + int commenceScanOnly() override; + void resumeTokenizationFrom(const int position) override; /** * Does nothing. */ - virtual void setParserContext(const ParserContext::Ptr &parseInfo); + void setParserContext(const ParserContext::Ptr &parseInfo) override; private: diff --git a/src/xmlpatterns/parser/qxslttokenizer.cpp b/src/xmlpatterns/parser/qxslttokenizer.cpp index 38e0374..39007f2 100644 --- a/src/xmlpatterns/parser/qxslttokenizer.cpp +++ b/src/xmlpatterns/parser/qxslttokenizer.cpp @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE using namespace QPatternist; -Tokenizer::Token SingleTokenContainer::nextToken(YYLTYPE *const location) +Tokenizer::Token SingleTokenContainer::nextToken(XPATHLTYPE *const location) { if(m_hasDelivered) return Tokenizer::Token(T_END_OF_FILE); @@ -777,7 +777,7 @@ void XSLTTokenizer::handleValidationAttributes(const bool isLRE) const validationAttribute); } -Tokenizer::Token XSLTTokenizer::nextToken(YYLTYPE *const sourceLocator) +Tokenizer::Token XSLTTokenizer::nextToken(XPATHLTYPE *const sourceLocator) { Q_UNUSED(sourceLocator); @@ -2687,9 +2687,9 @@ void XSLTTokenizer::insideFunction() * insideSequenceConstructor(). */ } -YYLTYPE XSLTTokenizer::currentSourceLocator() const +XPATHLTYPE XSLTTokenizer::currentSourceLocator() const { - YYLTYPE retval; + XPATHLTYPE retval; retval.first_line = lineNumber(); retval.first_column = columnNumber(); return retval; diff --git a/src/xmlpatterns/parser/qxslttokenizer_p.h b/src/xmlpatterns/parser/qxslttokenizer_p.h index 33155b9..d75bca1 100644 --- a/src/xmlpatterns/parser/qxslttokenizer_p.h +++ b/src/xmlpatterns/parser/qxslttokenizer_p.h @@ -77,19 +77,20 @@ namespace QPatternist { public: inline SingleTokenContainer(const Tokenizer::Token &token, - const YYLTYPE &location); + const XPATHLTYPE &location); - virtual Tokenizer::Token nextToken(YYLTYPE *const sourceLocator); + Tokenizer::Token nextToken(XPATHLTYPE *const sourceLocator) override; private: const Tokenizer::Token m_token; - const YYLTYPE m_location; + const XPATHLTYPE m_location; bool m_hasDelivered; }; SingleTokenContainer::SingleTokenContainer(const Tokenizer::Token &token, - const YYLTYPE &location) : m_token(token) - , m_location(location) - , m_hasDelivered(false) + const XPATHLTYPE &location) + : m_token(token) + , m_location(location) + , m_hasDelivered(false) { } @@ -117,32 +118,32 @@ namespace QPatternist const ReportContext::Ptr &context, const NamePool::Ptr &np); - virtual Token nextToken(YYLTYPE *const sourceLocator); + Token nextToken(XPATHLTYPE *const sourceLocator) override; /** * For XSLT we don't need this mechanism, so we do nothing. */ - virtual int commenceScanOnly(); + int commenceScanOnly() override; /** * For XSLT we don't need this mechanism, so we do nothing. */ - virtual void resumeTokenizationFrom(const int position); + void resumeTokenizationFrom(const int position) override; - virtual void setParserContext(const ParserContext::Ptr &parseInfo); + void setParserContext(const ParserContext::Ptr &parseInfo) override; - virtual QUrl documentURI() const + QUrl documentURI() const override { return queryURI(); } protected: - virtual bool isAnyAttributeAllowed() const; + bool isAnyAttributeAllowed() const override; private: inline void validateElement() const; - YYLTYPE currentSourceLocator() const; + XPATHLTYPE currentSourceLocator() const; enum State { diff --git a/src/xmlpatterns/projection/qdocumentprojector_p.h b/src/xmlpatterns/projection/qdocumentprojector_p.h index c14d6da..95f2eba 100644 --- a/src/xmlpatterns/projection/qdocumentprojector_p.h +++ b/src/xmlpatterns/projection/qdocumentprojector_p.h @@ -68,25 +68,25 @@ namespace QPatternist DocumentProjector(const ProjectedExpression::Vector &paths, QAbstractXmlReceiver *const receiver); - virtual void namespaceBinding(const QXmlName &nb); + void namespaceBinding(const QXmlName &nb) override; - virtual void characters(const QStringRef &value); - virtual void comment(const QString &value); + void characters(const QStringRef &value) override; + void comment(const QString &value) override; - virtual void startElement(const QXmlName &name); + void startElement(const QXmlName &name) override; - virtual void endElement(); + void endElement() override; - virtual void attribute(const QXmlName &name, - const QStringRef &value); + void attribute(const QXmlName &name, + const QStringRef &value) override; - virtual void processingInstruction(const QXmlName &name, - const QString &value); + void processingInstruction(const QXmlName &name, + const QString &value) override; - virtual void item(const Item &item); + void item(const Item &item) override; - virtual void startDocument(); - virtual void endDocument(); + void startDocument() override; + void endDocument() override; ProjectedExpression::Vector m_paths; const int m_pathCount; diff --git a/src/xmlpatterns/projection/qprojectedexpression_p.h b/src/xmlpatterns/projection/qprojectedexpression_p.h index ec45285..996d23c 100644 --- a/src/xmlpatterns/projection/qprojectedexpression_p.h +++ b/src/xmlpatterns/projection/qprojectedexpression_p.h @@ -109,8 +109,8 @@ namespace QPatternist Q_UNUSED(axis); } - virtual Action actionForElement(const QXmlName name, - ProjectedExpression::Ptr &next) const + Action actionForElement(const QXmlName name, + ProjectedExpression::Ptr &next) const override { Q_UNUSED(name); Q_UNUSED(next); @@ -132,8 +132,8 @@ namespace QPatternist Q_UNUSED(right); } - virtual Action actionForElement(const QXmlName name, - ProjectedExpression::Ptr &next) const + Action actionForElement(const QXmlName name, + ProjectedExpression::Ptr &next) const override { ProjectedExpression::Ptr &candidateNext = next; const Action a = m_left->actionForElement(name, candidateNext); diff --git a/src/xmlpatterns/schema/qxsdattributereference_p.h b/src/xmlpatterns/schema/qxsdattributereference_p.h index 544841d..493866a 100644 --- a/src/xmlpatterns/schema/qxsdattributereference_p.h +++ b/src/xmlpatterns/schema/qxsdattributereference_p.h @@ -90,12 +90,12 @@ namespace QPatternist /** * Always returns false, used to avoid dynamic casts. */ - virtual bool isAttributeUse() const; + bool isAttributeUse() const override; /** * Always returns true, used to avoid dynamic casts. */ - virtual bool isReference() const; + bool isReference() const override; /** * Sets the @p type of the attribute reference. diff --git a/src/xmlpatterns/schema/qxsdattributeuse_p.h b/src/xmlpatterns/schema/qxsdattributeuse_p.h index 3559f7c..1d2ccce 100644 --- a/src/xmlpatterns/schema/qxsdattributeuse_p.h +++ b/src/xmlpatterns/schema/qxsdattributeuse_p.h @@ -158,7 +158,7 @@ namespace QPatternist /** * Always returns true, used to avoid dynamic casts. */ - virtual bool isAttributeUse() const; + bool isAttributeUse() const override; /** * Sets the use @p type of the attribute use. diff --git a/src/xmlpatterns/schema/qxsdcomplextype_p.h b/src/xmlpatterns/schema/qxsdcomplextype_p.h index 1e7a027..0059d08 100644 --- a/src/xmlpatterns/schema/qxsdcomplextype_p.h +++ b/src/xmlpatterns/schema/qxsdcomplextype_p.h @@ -242,7 +242,7 @@ namespace QPatternist * * @param namePool The name pool where the type name is stored in. */ - virtual QString displayName(const NamePool::Ptr &namePool) const; + QString displayName(const NamePool::Ptr &namePool) const override; /** * Sets the base type of the complex type. @@ -254,7 +254,7 @@ namespace QPatternist /** * Returns the base type of the complex type. */ - virtual SchemaType::Ptr wxsSuperType() const; + SchemaType::Ptr wxsSuperType() const override; /** * Sets the context @p component of the complex type. @@ -282,7 +282,7 @@ namespace QPatternist /** * Returns the derivation method of the complex type. */ - virtual DerivationMethod derivationMethod() const; + DerivationMethod derivationMethod() const override; /** * Sets whether the complex type is @p abstract. @@ -294,7 +294,7 @@ namespace QPatternist /** * Returns whether the complex type is abstract. */ - virtual bool isAbstract() const; + bool isAbstract() const override; /** * Sets the list of all attribute @p uses of the complex type. @@ -328,7 +328,7 @@ namespace QPatternist /** * Always returns SchemaType::ComplexType */ - virtual TypeCategory category() const; + TypeCategory category() const override; /** * Sets the content @p type of the complex type. @@ -378,7 +378,7 @@ namespace QPatternist /** * Always returns @c true. */ - virtual bool isDefinedBySchema() const; + bool isDefinedBySchema() const override; private: SchemaType::Ptr m_superType; diff --git a/src/xmlpatterns/schema/qxsdelement_p.h b/src/xmlpatterns/schema/qxsdelement_p.h index 12dd12d..d271644 100644 --- a/src/xmlpatterns/schema/qxsdelement_p.h +++ b/src/xmlpatterns/schema/qxsdelement_p.h @@ -236,7 +236,7 @@ namespace QPatternist /** * Always returns @c true, used to avoid dynamic casts. */ - virtual bool isElement() const; + bool isElement() const override; /** * Sets the @p type of the element. diff --git a/src/xmlpatterns/schema/qxsdmodelgroup_p.h b/src/xmlpatterns/schema/qxsdmodelgroup_p.h index 3d07a63..02953ac 100644 --- a/src/xmlpatterns/schema/qxsdmodelgroup_p.h +++ b/src/xmlpatterns/schema/qxsdmodelgroup_p.h @@ -96,7 +96,7 @@ namespace QPatternist /** * Returns always @c true, used to avoid dynamic casts. */ - virtual bool isModelGroup() const; + bool isModelGroup() const override; /** * Sets the @p compositor of the model group. diff --git a/src/xmlpatterns/schema/qxsdreference_p.h b/src/xmlpatterns/schema/qxsdreference_p.h index 4372978..e1a4b03 100644 --- a/src/xmlpatterns/schema/qxsdreference_p.h +++ b/src/xmlpatterns/schema/qxsdreference_p.h @@ -90,7 +90,7 @@ namespace QPatternist /** * Returns always @c true, used to avoid dynamic casts. */ - virtual bool isReference() const; + bool isReference() const override; /** * Sets the @p type of the reference. diff --git a/src/xmlpatterns/schema/qxsdschemacontext_p.h b/src/xmlpatterns/schema/qxsdschemacontext_p.h index 0f11979..b102472 100644 --- a/src/xmlpatterns/schema/qxsdschemacontext_p.h +++ b/src/xmlpatterns/schema/qxsdschemacontext_p.h @@ -94,7 +94,7 @@ namespace QPatternist /** * Returns the name pool of the schema context. */ - virtual NamePool::Ptr namePool() const; + NamePool::Ptr namePool() const override; /** * Sets the base URI for the main schema. @@ -130,12 +130,12 @@ namespace QPatternist * Returns the message handler used by the context for * error reporting. */ - virtual QAbstractMessageHandler* messageHandler() const; + QAbstractMessageHandler* messageHandler() const override; /** * Always returns an empty source location. */ - virtual QSourceLocation locationFor(const SourceLocationReflection *const reflection) const; + QSourceLocation locationFor(const SourceLocationReflection *const reflection) const override; /** * Sets the uri @p resolver that is used for resolving URIs in the @@ -147,7 +147,7 @@ namespace QPatternist * Returns the uri resolver that is used for resolving URIs in the * schema parser. */ - virtual const QAbstractUriResolver* uriResolver() const; + const QAbstractUriResolver* uriResolver() const override; /** * Returns the list of facets for the given simple @p type. diff --git a/src/xmlpatterns/schema/qxsdschemaparser_p.h b/src/xmlpatterns/schema/qxsdschemaparser_p.h index 8095ceb..a8b8da6 100644 --- a/src/xmlpatterns/schema/qxsdschemaparser_p.h +++ b/src/xmlpatterns/schema/qxsdschemaparser_p.h @@ -164,12 +164,12 @@ namespace QPatternist /** * Returns the document URI of the schema to parse. */ - QUrl documentURI() const; + QUrl documentURI() const override; /** * Reimplemented from MaintainingReader, always returns @c false. */ - bool isAnyAttributeAllowed() const; + bool isAnyAttributeAllowed() const override; private: /** diff --git a/src/xmlpatterns/schema/qxsdschematypesfactory_p.h b/src/xmlpatterns/schema/qxsdschematypesfactory_p.h index 4d14484..12b3de4 100644 --- a/src/xmlpatterns/schema/qxsdschematypesfactory_p.h +++ b/src/xmlpatterns/schema/qxsdschematypesfactory_p.h @@ -80,12 +80,12 @@ namespace QPatternist * * @note This does not handle user defined types, only builtin types. */ - virtual SchemaType::Ptr createSchemaType(const QXmlName) const; + SchemaType::Ptr createSchemaType(const QXmlName) const override; /** * Returns a hash of all available types. */ - virtual SchemaType::Hash types() const; + SchemaType::Hash types() const override; private: /** diff --git a/src/xmlpatterns/schema/qxsdsimpletype_p.h b/src/xmlpatterns/schema/qxsdsimpletype_p.h index 7b1a2ea..c0ab9f7 100644 --- a/src/xmlpatterns/schema/qxsdsimpletype_p.h +++ b/src/xmlpatterns/schema/qxsdsimpletype_p.h @@ -83,7 +83,7 @@ namespace QPatternist * * @param namePool The name pool the type name is stored in. */ - virtual QString displayName(const NamePool::Ptr &namePool) const; + QString displayName(const NamePool::Ptr &namePool) const override; /** * Sets the base @p type of the simple type. @@ -96,7 +96,7 @@ namespace QPatternist * Returns the base type of the simple type or an empty pointer if no base type is * set. */ - virtual SchemaType::Ptr wxsSuperType() const; + SchemaType::Ptr wxsSuperType() const override; /** * Sets the context @p component of the simple type. @@ -177,7 +177,7 @@ namespace QPatternist /** * Returns the category (variety) of the simple type. */ - virtual TypeCategory category() const; + TypeCategory category() const override; /** * Sets the derivation @p method of the simple type. @@ -189,12 +189,12 @@ namespace QPatternist /** * Returns the derivation method of the simple type. */ - virtual DerivationMethod derivationMethod() const; + DerivationMethod derivationMethod() const override; /** * Always returns @c true. */ - virtual bool isDefinedBySchema() const; + bool isDefinedBySchema() const override; private: SchemaType::Ptr m_superType; diff --git a/src/xmlpatterns/schema/qxsdtypechecker_p.h b/src/xmlpatterns/schema/qxsdtypechecker_p.h index 3fd6efa..9dcbf6f 100644 --- a/src/xmlpatterns/schema/qxsdtypechecker_p.h +++ b/src/xmlpatterns/schema/qxsdtypechecker_p.h @@ -73,8 +73,8 @@ namespace QPatternist public: XsdSchemaSourceLocationReflection(const QSourceLocation &location); - virtual const SourceLocationReflection *actualReflection() const; - virtual QSourceLocation sourceLocation() const; + const SourceLocationReflection *actualReflection() const override; + QSourceLocation sourceLocation() const override; private: const QSourceLocation m_sourceLocation; diff --git a/src/xmlpatterns/schema/qxsduserschematype_p.h b/src/xmlpatterns/schema/qxsduserschematype_p.h index cf1841c..f7911c8 100644 --- a/src/xmlpatterns/schema/qxsduserschematype_p.h +++ b/src/xmlpatterns/schema/qxsduserschematype_p.h @@ -86,14 +86,14 @@ namespace QPatternist * * @param namePool The pool the name belongs to. */ - virtual QXmlName name(const NamePool::Ptr &namePool) const; + QXmlName name(const NamePool::Ptr &namePool) const override; /** * Returns the display name of the type. * * @param namePool The pool the name belongs to. */ - virtual QString displayName(const NamePool::Ptr &namePool) const; + QString displayName(const NamePool::Ptr &namePool) const override; /** * Sets the derivation @p constraints of the type. @@ -103,7 +103,7 @@ namespace QPatternist /** * Returns the derivation constraints of the type. */ - SchemaType::DerivationConstraints derivationConstraints() const; + SchemaType::DerivationConstraints derivationConstraints() const override; private: QXmlName m_name; diff --git a/src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h b/src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h index e4a0b00..0c5ccdb 100644 --- a/src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h +++ b/src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h @@ -87,24 +87,24 @@ namespace QPatternist */ virtual ~XsdValidatedXmlNodeModel(); - virtual QUrl baseUri(const QXmlNodeModelIndex &ni) const; - virtual QUrl documentUri(const QXmlNodeModelIndex &ni) const; - virtual QXmlNodeModelIndex::NodeKind kind(const QXmlNodeModelIndex &ni) const; - virtual QXmlNodeModelIndex::DocumentOrder compareOrder(const QXmlNodeModelIndex &ni1, const QXmlNodeModelIndex &ni2) const; - virtual QXmlNodeModelIndex root(const QXmlNodeModelIndex &n) const; - virtual QXmlName name(const QXmlNodeModelIndex &ni) const; - virtual QString stringValue(const QXmlNodeModelIndex &n) const; - virtual QVariant typedValue(const QXmlNodeModelIndex &n) const; - virtual QExplicitlySharedDataPointer<QAbstractXmlForwardIterator<QXmlNodeModelIndex> > iterate(const QXmlNodeModelIndex &ni, QXmlNodeModelIndex::Axis axis) const; - virtual QPatternist::ItemIteratorPtr sequencedTypedValue(const QXmlNodeModelIndex &ni) const; - virtual QPatternist::ItemTypePtr type(const QXmlNodeModelIndex &ni) const; - virtual QXmlName::NamespaceCode namespaceForPrefix(const QXmlNodeModelIndex &ni, const QXmlName::PrefixCode prefix) const; - virtual bool isDeepEqual(const QXmlNodeModelIndex &ni1, const QXmlNodeModelIndex &ni2) const; - virtual void sendNamespaces(const QXmlNodeModelIndex &n, QAbstractXmlReceiver *const receiver) const; - virtual QVector<QXmlName> namespaceBindings(const QXmlNodeModelIndex &n) const; - virtual QXmlNodeModelIndex elementById(const QXmlName &NCName) const; - virtual QVector<QXmlNodeModelIndex> nodesByIdref(const QXmlName &NCName) const; - virtual void copyNodeTo(const QXmlNodeModelIndex &node, QAbstractXmlReceiver *const receiver, const NodeCopySettings &) const; + QUrl baseUri(const QXmlNodeModelIndex &ni) const override; + QUrl documentUri(const QXmlNodeModelIndex &ni) const override; + QXmlNodeModelIndex::NodeKind kind(const QXmlNodeModelIndex &ni) const override; + QXmlNodeModelIndex::DocumentOrder compareOrder(const QXmlNodeModelIndex &ni1, const QXmlNodeModelIndex &ni2) const override; + QXmlNodeModelIndex root(const QXmlNodeModelIndex &n) const override; + QXmlName name(const QXmlNodeModelIndex &ni) const override; + QString stringValue(const QXmlNodeModelIndex &n) const override; + QVariant typedValue(const QXmlNodeModelIndex &n) const override; + QExplicitlySharedDataPointer<QAbstractXmlForwardIterator<QXmlNodeModelIndex> > iterate(const QXmlNodeModelIndex &ni, QXmlNodeModelIndex::Axis axis) const override; + QPatternist::ItemIteratorPtr sequencedTypedValue(const QXmlNodeModelIndex &ni) const override; + QPatternist::ItemTypePtr type(const QXmlNodeModelIndex &ni) const override; + QXmlName::NamespaceCode namespaceForPrefix(const QXmlNodeModelIndex &ni, const QXmlName::PrefixCode prefix) const override; + bool isDeepEqual(const QXmlNodeModelIndex &ni1, const QXmlNodeModelIndex &ni2) const override; + void sendNamespaces(const QXmlNodeModelIndex &n, QAbstractXmlReceiver *const receiver) const override; + QVector<QXmlName> namespaceBindings(const QXmlNodeModelIndex &n) const override; + QXmlNodeModelIndex elementById(const QXmlName &NCName) const override; + QVector<QXmlNodeModelIndex> nodesByIdref(const QXmlName &NCName) const override; + void copyNodeTo(const QXmlNodeModelIndex &node, QAbstractXmlReceiver *const receiver, const NodeCopySettings &) const override; /** * Sets the @p element that is assigned to the xml node at @p index. @@ -156,8 +156,8 @@ namespace QPatternist QSet<NamedSchemaComponent::Ptr> idIdRefBindings(const QString &id) const; protected: - virtual QXmlNodeModelIndex nextFromSimpleAxis(SimpleAxis axis, const QXmlNodeModelIndex &origin) const; - virtual QVector<QXmlNodeModelIndex> attributes(const QXmlNodeModelIndex &element) const; + QXmlNodeModelIndex nextFromSimpleAxis(SimpleAxis axis, const QXmlNodeModelIndex &origin) const override; + QVector<QXmlNodeModelIndex> attributes(const QXmlNodeModelIndex &element) const override; private: QExplicitlySharedDataPointer<const QAbstractXmlNodeModel> m_internalModel; diff --git a/src/xmlpatterns/schema/qxsdwildcard_p.h b/src/xmlpatterns/schema/qxsdwildcard_p.h index 8623ee5..96df937 100644 --- a/src/xmlpatterns/schema/qxsdwildcard_p.h +++ b/src/xmlpatterns/schema/qxsdwildcard_p.h @@ -156,7 +156,7 @@ namespace QPatternist /** * Returns always @c true, used to avoid dynamic casts. */ - virtual bool isWildcard() const; + bool isWildcard() const override; /** * Sets the namespace @p constraint of the wildcard. diff --git a/src/xmlpatterns/utils/qdelegatingnamespaceresolver_p.h b/src/xmlpatterns/utils/qdelegatingnamespaceresolver_p.h index 35b608c..a62618a 100644 --- a/src/xmlpatterns/utils/qdelegatingnamespaceresolver_p.h +++ b/src/xmlpatterns/utils/qdelegatingnamespaceresolver_p.h @@ -74,10 +74,10 @@ namespace QPatternist DelegatingNamespaceResolver(const NamespaceResolver::Ptr &ns, const Bindings &overrides); - virtual void addBinding(const QXmlName nb); + void addBinding(const QXmlName nb) override; - virtual QXmlName::NamespaceCode lookupNamespaceURI(const QXmlName::PrefixCode prefix) const; - virtual Bindings bindings() const; + QXmlName::NamespaceCode lookupNamespaceURI(const QXmlName::PrefixCode prefix) const override; + Bindings bindings() const override; private: const NamespaceResolver::Ptr m_nsResolver; diff --git a/src/xmlpatterns/utils/qgenericnamespaceresolver_p.h b/src/xmlpatterns/utils/qgenericnamespaceresolver_p.h index 8ef0513..a6c0659 100644 --- a/src/xmlpatterns/utils/qgenericnamespaceresolver_p.h +++ b/src/xmlpatterns/utils/qgenericnamespaceresolver_p.h @@ -68,9 +68,9 @@ namespace QPatternist { public: GenericNamespaceResolver(const Bindings &list); - virtual void addBinding(const QXmlName nb); + void addBinding(const QXmlName nb) override; - virtual QXmlName::NamespaceCode lookupNamespaceURI(const QXmlName::PrefixCode prefix) const; + QXmlName::NamespaceCode lookupNamespaceURI(const QXmlName::PrefixCode prefix) const override; /** * Returns a GenericNamespaceResolver containing the following bindings: @@ -92,7 +92,7 @@ namespace QPatternist */ static NamespaceResolver::Ptr defaultXSLTBindings(); - virtual Bindings bindings() const; + Bindings bindings() const override; private: /** diff --git a/src/xmlpatterns/utils/qnodenamespaceresolver_p.h b/src/xmlpatterns/utils/qnodenamespaceresolver_p.h index 1348fe7..d74b563 100644 --- a/src/xmlpatterns/utils/qnodenamespaceresolver_p.h +++ b/src/xmlpatterns/utils/qnodenamespaceresolver_p.h @@ -71,9 +71,9 @@ namespace QPatternist public: NodeNamespaceResolver(const Item &item); - virtual void addBinding(const QXmlName nb); - virtual QXmlName::NamespaceCode lookupNamespaceURI(const QXmlName::PrefixCode prefix) const; - virtual Bindings bindings() const; + void addBinding(const QXmlName nb) override; + QXmlName::NamespaceCode lookupNamespaceURI(const QXmlName::PrefixCode prefix) const override; + Bindings bindings() const override; private: const QXmlNodeModelIndex m_node; diff --git a/src/xmlpatterns/utils/qoutputvalidator_p.h b/src/xmlpatterns/utils/qoutputvalidator_p.h index 4d1dfa3..a71a4fc 100644 --- a/src/xmlpatterns/utils/qoutputvalidator_p.h +++ b/src/xmlpatterns/utils/qoutputvalidator_p.h @@ -80,28 +80,28 @@ namespace QPatternist const SourceLocationReflection *const r, const bool isXSLT); - virtual void namespaceBinding(const QXmlName &nb); + void namespaceBinding(const QXmlName &nb) override; - virtual void characters(const QStringRef &value); - virtual void comment(const QString &value); + void characters(const QStringRef &value) override; + void comment(const QString &value) override; - virtual void startElement(const QXmlName &name); + void startElement(const QXmlName &name) override; - virtual void endElement(); + void endElement() override; - virtual void attribute(const QXmlName &name, - const QStringRef &value); + void attribute(const QXmlName &name, + const QStringRef &value) override; - virtual void processingInstruction(const QXmlName &name, - const QString &value); + void processingInstruction(const QXmlName &name, + const QString &value) override; - virtual void item(const Item &item); + void item(const Item &item) override; - virtual void startDocument(); - virtual void endDocument(); - virtual void atomicValue(const QVariant &value); - virtual void endOfSequence(); - virtual void startOfSequence(); + void startDocument() override; + void endDocument() override; + void atomicValue(const QVariant &value) override; + void endOfSequence() override; + void startOfSequence() override; private: bool m_hasReceivedChildren; diff --git a/tests/auto/qxmlquery/tst_qxmlquery.cpp b/tests/auto/qxmlquery/tst_qxmlquery.cpp index 09d3816..d1b125b 100644 --- a/tests/auto/qxmlquery/tst_qxmlquery.cpp +++ b/tests/auto/qxmlquery/tst_qxmlquery.cpp @@ -2595,13 +2595,16 @@ void tst_QXmlQuery::setQueryQUrlFailure() const void tst_QXmlQuery::setQueryQUrlFailure_data() const { + const auto localFileUrl = [](const QString &relPath) { + return QUrl::fromLocalFile(QCoreApplication::applicationFilePath()).resolved(QUrl(relPath)); + }; QTest::addColumn<QUrl>("queryURI"); QTest::newRow("Query via file:// that does not exist.") << QUrl::fromEncoded("file://example.com/does/not/exist"); QTest::newRow("A query via file:// that is completely empty, but readable.") - << QUrl::fromLocalFile(QCoreApplication::applicationFilePath()).resolved(QUrl("../xmlpatterns/queries/completelyEmptyQuery.xq")); + << localFileUrl(QStringLiteral("../xmlpatterns/queries/completelyEmptyQuery.xq")); { const QString name(QLatin1String("nonReadableFile.xq")); @@ -2610,10 +2613,10 @@ void tst_QXmlQuery::setQueryQUrlFailure_data() const outFile.write(QByteArray("1")); outFile.close(); /* On some windows versions, this fails, so we don't check that this works with QVERIFY. */ - outFile.setPermissions(QFile::Permissions(QFile::Permissions())); - - QTest::newRow("Query via file:/ that does not have read permissions.") - << QUrl::fromLocalFile(QCoreApplication::applicationFilePath()).resolved(QUrl("nonReadableFile.xq")); + if (outFile.setPermissions(QFile::Permissions())) { + QTest::newRow("Query via file:/ that does not have read permissions.") + << localFileUrl(name); + } } if(!m_testNetwork) diff --git a/tools/xmlpatterns/main.cpp b/tools/xmlpatterns/main.cpp index 1c6f3cc..1e74227 100644 --- a/tools/xmlpatterns/main.cpp +++ b/tools/xmlpatterns/main.cpp @@ -109,8 +109,8 @@ public: #endif protected: - virtual QVariant convertToValue(const QApplicationArgument &arg, - const QString &input) const + QVariant convertToValue(const QApplicationArgument &arg, + const QString &input) const override { if(arg.name() == QLatin1String("param")) { @@ -161,7 +161,7 @@ protected: return QApplicationArgumentParser::convertToValue(arg, input); } - virtual QString typeToName(const QApplicationArgument &argument) const + QString typeToName(const QApplicationArgument &argument) const override { if(argument.name() == QLatin1String("param")) return QLatin1String("name=value"); @@ -171,7 +171,7 @@ protected: return QApplicationArgumentParser::typeToName(argument); } - virtual QVariant defaultValue(const QApplicationArgument &argument) const + QVariant defaultValue(const QApplicationArgument &argument) const override { if(argument.name() == QLatin1String("output")) { |