From d17eba9d34f412e592c3b049c6c14fd9ccada87b Mon Sep 17 00:00:00 2001 From: "David E. Narvaez" Date: Sun, 21 Jun 2015 22:24:39 -0400 Subject: Iterate Over the Items (Not the Operands) of a Literal Sequence The current code iterates over the (empty) list of operands of a Literal Sequence, ignoring any items in it, so Literal Sequences are always ignored in the ExpressionSequence. Task-number: QTBUG-35897 Change-Id: I60341ac21c8e3b77bf6d8dfeebdbafe010844406 Reviewed-by: Erik Verbruggen --- src/xmlpatterns/expr/qexpressionsequence.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/xmlpatterns/expr/qexpressionsequence.cpp') diff --git a/src/xmlpatterns/expr/qexpressionsequence.cpp b/src/xmlpatterns/expr/qexpressionsequence.cpp index 4ff8082..c71beb9 100644 --- a/src/xmlpatterns/expr/qexpressionsequence.cpp +++ b/src/xmlpatterns/expr/qexpressionsequence.cpp @@ -34,6 +34,8 @@ #include "qcardinalityverifier_p.h" #include "qcommonsequencetypes_p.h" #include "qemptysequence_p.h" +#include "qabstractxmlforwarditerator_p.h" +#include "qliteral_p.h" #include "qsequencemappingiterator_p.h" #include "qexpressionsequence_p.h" @@ -106,6 +108,13 @@ Expression::Ptr ExpressionSequence::compress(const StaticContext::Ptr &context) for(; seqIt != seqEnd; ++seqIt) result.append(*seqIt); + } else if (Id == IDLiteralSequence) { + /* Rewrite "(1, (2, 3), 4)" into "(1, 2, 3, 4)" */ + // Note: LiteralSequence does not use the dynamic context, so we pass in a nullptr. + Item::Iterator::Ptr seqIt = (*it)->evaluateSequence(DynamicContext::Ptr(Q_NULLPTR)); + + while (!seqIt->next().isNull()) + result.append(Literal::Ptr(new Literal(seqIt->current()))); } else result.append(*it); -- cgit v1.2.1