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

Revert "C++: fix support for typedef of templated typedefs"

Browse Source 
Infinite recursion in the lookup of:
struct common_type {
public:
typedef typename common_type<typename common_type<_Tp, _Up>::type,
                             V>::type type;
};

This reverts commit 9a56ce4e85bec81c521258f44e9076d0bc9cce92

Change-Id: I675fe39018789cd04127d105eb983d2cb7798ca5
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Erik Verbruggen
2013-04-19 14:04:13 +02:00
parent 5658eb69aa
commit 8b8a5db129
5 changed files with 5 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/plugins/cpptools/cppcompletion_test.cpp
View File

@@ -1882,77 +1882,3 @@ void CppToolsPlugin::test_completion_QTCREATORBUG9098()
QVERIFY(completions.contains(QLatin1String("c")));
QVERIFY(completions.contains(QLatin1String("B")));
}
void CppToolsPlugin::test_completion_typedef_of_templated_typedef_QTCREATORBUG8375()
{
TestData data;
data.srcText =
"struct Foo\n"
"{ void bar(); };\n"
"struct A\n"
"{ typedef Foo AFoo; };\n"
"template <class T>\n"
"struct B\n"
"{ typedef typename T::AFoo BFoo; };\n"
"struct C : public B<A>\n"
"{\n"
" void test()\n"
" {\n"
" BFoo foo;\n"
" @\n"
" // padding so we get the scope right\n"
" }\n"
"};\n"
;
setup(&data);
Utils::ChangeSet change;
QString txt = QLatin1String("foo.");
change.insert(data.pos, txt);
QTextCursor cursor(data.doc);
change.apply(&cursor);
data.pos += txt.length();
QStringList completions = getCompletions(data);
QCOMPARE(completions.size(), 2);
QVERIFY(completions.contains(QLatin1String("Foo")));
QVERIFY(completions.contains(QLatin1String("bar")));
}
void CppToolsPlugin::test_completion_typedef_with_the_same_base_name_and_new_type_name()
{
TestData data;
data.srcText =
"namespace A\n"
"{\n"
"struct A { int aa; };\n"
"}\n"
"struct S\n"
"{\n"
" typedef A::A A;\n"
" A a;\n"
"};\n"
"void fun()\n"
"{\n"
" S s;\n"
" @\n"
" // padding so we get the scope right\n"
"};\n"
;
setup(&data);
Utils::ChangeSet change;
QString txt = QLatin1String("s.a.");
change.insert(data.pos, txt);
QTextCursor cursor(data.doc);
change.apply(&cursor);
data.pos += txt.length();
QStringList completions = getCompletions(data);
QCOMPARE(completions.size(), 2);
QVERIFY(completions.contains(QLatin1String("A")));
QVERIFY(completions.contains(QLatin1String("aa")));
}

2
src/plugins/cpptools/cpptoolsplugin.h
View File

@@ -124,8 +124,6 @@ private slots:
void test_completion_typedef_using_templates2();
void test_completion_namespace_alias_with_many_namespace_declarations();
void test_completion_QTCREATORBUG9098();
void test_completion_typedef_of_templated_typedef_QTCREATORBUG8375();
void test_completion_typedef_with_the_same_base_name_and_new_type_name();
void test_format_pointerdeclaration_in_simpledeclarations();
void test_format_pointerdeclaration_in_simpledeclarations_data();