diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-12-10 09:58:18 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-12-10 09:58:18 +0100 |
commit | c5ea60cb84fc7af57a85389a20d91e8397cce1a8 (patch) | |
tree | 6f9394b540efb6b0319b6b649d728de84e6d4af0 /tests/auto/xmlpatternssdk/DebugExpressionFactory.cpp | |
parent | 944129e3022a28a5cb969c6adaf01378b4555375 (diff) | |
parent | 8ba610490e2d93526c165584e2f52c7ae8e9edc0 (diff) | |
download | qtxmlpatterns-c5ea60cb84fc7af57a85389a20d91e8397cce1a8.tar.gz |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: Iaf57c1b0beffdceb3f0533aa77ba536ec4c373a9
Diffstat (limited to 'tests/auto/xmlpatternssdk/DebugExpressionFactory.cpp')
-rw-r--r-- | tests/auto/xmlpatternssdk/DebugExpressionFactory.cpp | 82 |
1 files changed, 32 insertions, 50 deletions
diff --git a/tests/auto/xmlpatternssdk/DebugExpressionFactory.cpp b/tests/auto/xmlpatternssdk/DebugExpressionFactory.cpp index 830b25f..92c4a6a 100644 --- a/tests/auto/xmlpatternssdk/DebugExpressionFactory.cpp +++ b/tests/auto/xmlpatternssdk/DebugExpressionFactory.cpp @@ -179,35 +179,25 @@ void DebugExpressionFactory::processTemplateRule(const Expression::Ptr &body, const QXmlName &mode, const TemplateCompilationStage stage) { - const char * title; - - switch(stage) - { - case TemplateInitial: - { - title = "Initial Build"; - break; - } - case TemplateTypeCheck: - { - title = "Type Check"; - break; - } - case TemplateCompress: - { - title = "Compression"; - break; - } + QString title = QLatin1String("T-Rule "); + + switch (stage) { + case TemplateInitial: + title += QLatin1String("Initial Build"); + break; + case TemplateTypeCheck: + title += QLatin1String("Type Check"); + break; + case TemplateCompress: + title += QLatin1String("Compression"); + break; } + title += QLatin1String(" mode: ") + + Global::namePool()->displayName(mode) + + QLatin1String(" priority: ") + + QString::number(pattern->priority()); - const QString modeName(Global::namePool()->displayName(mode)); - Q_ASSERT(title); - ASTItem *const newChild = new ASTItem(m_ast, QLatin1String("T-Rule ") - + QLatin1String(title) - + QLatin1String(" mode: ") - + modeName - + QLatin1String(" priority: ") - + QString::number(pattern->priority())); + ASTItem *const newChild = new ASTItem(m_ast, title); m_ast->appendChild(newChild); newChild->appendChild(buildASTTree(pattern->matchPattern(), newChild, QPatternist::SequenceType::Ptr())); @@ -218,31 +208,23 @@ void DebugExpressionFactory::processNamedTemplate(const QXmlName &name, const Expression::Ptr &body, const TemplateCompilationStage stage) { - const char * title; - - switch(stage) - { - case TemplateInitial: - { - title = "Named Template Initial Build"; - break; - } - case TemplateTypeCheck: - { - title = "Named Template Type Check"; - break; - } - case TemplateCompress: - { - title = "Named Template Compression"; - break; - } + QString title; + + switch (stage) { + case TemplateInitial: + title += QLatin1String("Named Template Initial Build"); + break; + case TemplateTypeCheck: + title += QLatin1String("Named Template Type Check"); + break; + case TemplateCompress: + title += QLatin1String("Named Template Compression"); + break; } - Q_ASSERT(title); - ASTItem *const newChild = new ASTItem(m_ast, QLatin1String(title) - + QLatin1String(": ") - + Global::namePool()->displayName(name)); + title += QLatin1String(": ") + Global::namePool()->displayName(name); + + ASTItem *const newChild = new ASTItem(m_ast, title); m_ast->appendChild(newChild); newChild->appendChild(buildASTTree(body, newChild, QPatternist::SequenceType::Ptr())); |