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

C++: Store lambda captures in the code model.

Browse Source 
Done-with: Erik Verbruggen
Task-number: QTCREATORBUG-7968
Task-number: QTCREATORBUG-7949

Change-Id: I0cf727052d0a3536ed96ee894b18768c9538c213
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Nikolai Kosjar
2012-10-25 16:22:42 +02:00
parent be516c7c6e
commit 9f38f7bfbc
12 changed files with 103 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
tests/auto/cplusplus/findusages/tst_findusages.cpp
View File

@@ -77,7 +77,8 @@ class tst_FindUsages: public QObject
private Q_SLOTS:
void inlineMethod();
// void lambdaArg();
void lambdaCaptureByValue();
void lambdaCaptureByReference();
// Qt keywords
void qproperty_1();
@@ -124,15 +125,46 @@ void tst_FindUsages::inlineMethod()
QCOMPARE(findUsages.references().size(), 2);
}
#if 0 /* see QTCREATORBUG-7968 */
void tst_FindUsages::lambdaArg()
void tst_FindUsages::lambdaCaptureByValue()
{
const QByteArray src = "\n"
"void f() {\n"
" int test;\n"
" [test] { ++test; };\n"
"}\n";
Document::Ptr doc = Document::create("lambdaArg");
Document::Ptr doc = Document::create("lambdaCaptureByValue");
doc->setUtf8Source(src);
doc->parse();
doc->check();
QVERIFY(doc->diagnosticMessages().isEmpty());
QCOMPARE(doc->globalSymbolCount(), 1U);
Snapshot snapshot;
snapshot.insert(doc);
Function *f = doc->globalSymbolAt(0)->asFunction();
QVERIFY(f);
QCOMPARE(f->memberCount(), 1U);
Block *b = f->memberAt(0)->asBlock();
QCOMPARE(b->memberCount(), 2U);
Declaration *d = b->memberAt(0)->asDeclaration();
QVERIFY(d);
QCOMPARE(d->name()->identifier()->chars(), "test");
FindUsages findUsages(src, doc, snapshot);
findUsages(d);
QCOMPARE(findUsages.usages().size(), 3);
}
void tst_FindUsages::lambdaCaptureByReference()
{
const QByteArray src = "\n"
"void f() {\n"
" int test;\n"
" [&test] { ++test; };\n"
"}\n";
Document::Ptr doc = Document::create("lambdaCaptureByReference");
doc->setUtf8Source(src);
doc->parse();
doc->check();
@@ -156,7 +188,6 @@ void tst_FindUsages::lambdaArg()
findUsages(d);
QCOMPARE(findUsages.usages().size(), 3);
}
#endif
#if 0
@interface Clazz {} +(void)method:(int)arg; @end