feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

AbstractMacroExpander: expand macros recursively

Browse Source 
Started-by: Tobias Hunger <tobias.hunger@digia.com>
Change-Id: Id2e88efbb475221cd7c0347f7d5e7009e4372eec
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Oswald Buddenhagen
2014-09-12 19:14:54 +02:00
committed by Tobias Hunger
parent 1b11f9b3c0
commit 62da66a0aa
3 changed files with 58 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests/auto/utils_stringutils/tst_stringutils.cpp
View File

@@ -38,12 +38,20 @@ class TestMacroExpander : public Utils::AbstractMacroExpander
public:
virtual bool resolveMacro(const QString &name, QString *ret)
{
if (name == QLatin1String("foo")) {
*ret = QLatin1String("a");
return true;
}
if (name == QLatin1String("a")) {
*ret = QLatin1String("hi");
return true;
}
if (name == QLatin1String("foo")) {
*ret = QLatin1String("a");
if (name == QLatin1String("hi")) {
*ret = QLatin1String("ho");
return true;
}
if (name == QLatin1String("hihi")) {
*ret = QLatin1String("bar");
return true;
}
return false;
@@ -116,7 +124,15 @@ void tst_StringUtils::testMacroExpander_data()
{ "%{a}text%{a}", "hitexthi" },
{ "%{foo}%{a}text%{a}", "ahitexthi" },
{ "%{}{a}", "%{a}" },
{ "%{abc", "%{abc" }
{ "%{}", "%" },
{ "test%{}", "test%" },
{ "%{}test", "%test" },
{ "%{abc", "%{abc" },
{ "%{%{a}", "%{hi" },
{ "%{%{a}}", "ho" },
{ "%{%{a}}}post", "ho}post" },
{ "%{hi%{a}}", "bar" },
{ "%{hi%{%{foo}}}", "bar" },
};
for (unsigned i = 0; i < sizeof(vals)/sizeof(vals[0]); i++)