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

C++: display enum value in tooltip for simplest case

Browse Source 
If it is possible lets calculate enum value for the simplest case.
Example where it works:
enum
{
  enum_val1, // tooltip = "enum_val1 = 0"
  enum_val2 // tooltip = "enum_val2 = 1"
};

enum
{
  enum_val1=10, // tooltip = "enum_val1 = 10"
  enum_val2 // tooltip = "enum_val2 = 11"
};

enum
{
  enum_val1, // tooltip = "enum_val1 = 0"
  enum_val2=10, // tooltip = "enum_val2 = 10"
  enum_val3 // tooltip = "enum_val3 = 11"
};

Example where it does not work:
enum
{
  enum_val1=10+1, // tooltip = "enum_val1 = 10+1"
  enum_val2 // tooltip = "enum_val2"
};

Task-number: QTCREATORBUG-4529
Change-Id: Idd85ed7304018f73f2b068bf1ac28f1abde02f93
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Przemyslaw Gorszkowski
2014-12-02 10:57:08 +01:00
parent f66ee66595
commit 9e159d87a8
3 changed files with 165 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
tests/auto/cplusplus/semantic/tst_semantic.cpp
View File

@@ -184,6 +184,11 @@ private slots:
void lambda_2();
void diagnostic_error();
void enum_constantValue1();
void enum_constantValue2();
void enum_constantValue3();
void enum_constantValue4();
};
void tst_Semantic::function_declaration_1()
@@ -783,5 +788,107 @@ void tst_Semantic::diagnostic_error()
QCOMPARE(doc->globals->memberCount(), 1U);
}
namespace {
void testEnumaratorDeclarator(Enum *e, int enumDeclIndex, const char *expectedConstantValue)
{
Declaration *enumMemberDeclaration = e->memberAt(enumDeclIndex)->asDeclaration();
QVERIFY(enumMemberDeclaration);
EnumeratorDeclaration *enumeratorDeclaration = enumMemberDeclaration->asEnumeratorDeclarator();
QVERIFY(enumeratorDeclaration);
if (const StringLiteral *constantValue = enumeratorDeclaration->constantValue())
QCOMPARE(constantValue->chars(), expectedConstantValue);
else
QVERIFY(!expectedConstantValue);
}
} // anonymous
void tst_Semantic::enum_constantValue1()
{
QSharedPointer<Document> doc = document("\n"
"enum {\n"
"E1,\n"
"E2,\n"
"E3\n"
"};\n"
);
QCOMPARE(doc->errorCount, 0U);
QCOMPARE(doc->globals->memberCount(), 1U);
Enum *e = doc->globals->memberAt(0)->asEnum();
QVERIFY(e);
QCOMPARE(e->memberCount(), 3U);
testEnumaratorDeclarator(e, 0, "0");
testEnumaratorDeclarator(e, 1, "1");
testEnumaratorDeclarator(e, 2, "2");
}
void tst_Semantic::enum_constantValue2()
{
QSharedPointer<Document> doc = document("\n"
"enum {\n"
"E1=10,\n"
"E2,\n"
"E3\n"
"};\n"
);
QCOMPARE(doc->errorCount, 0U);
QCOMPARE(doc->globals->memberCount(), 1U);
Enum *e = doc->globals->memberAt(0)->asEnum();
QVERIFY(e);
QCOMPARE(e->memberCount(), 3U);
testEnumaratorDeclarator(e, 0, "10");
testEnumaratorDeclarator(e, 1, "11");
testEnumaratorDeclarator(e, 2, "12");
}
void tst_Semantic::enum_constantValue3()
{
QSharedPointer<Document> doc = document("\n"
"enum {\n"
"E1,\n"
"E2=10,\n"
"E3\n"
"};\n"
);
QCOMPARE(doc->errorCount, 0U);
QCOMPARE(doc->globals->memberCount(), 1U);
Enum *e = doc->globals->memberAt(0)->asEnum();
QVERIFY(e);
QCOMPARE(e->memberCount(), 3U);
testEnumaratorDeclarator(e, 0, "0");
testEnumaratorDeclarator(e, 1, "10");
testEnumaratorDeclarator(e, 2, "11");
}
void tst_Semantic::enum_constantValue4()
{
QSharedPointer<Document> doc = document("\n"
"enum {\n"
"E1,\n"
"E2=E1+10,\n"
"E3,\n"
"E4=10,\n"
"E5\n"
"};\n"
);
QCOMPARE(doc->errorCount, 0U);
QCOMPARE(doc->globals->memberCount(), 1U);
Enum *e = doc->globals->memberAt(0)->asEnum();
QVERIFY(e);
QCOMPARE(e->memberCount(), 5U);
testEnumaratorDeclarator(e, 0, "0");
testEnumaratorDeclarator(e, 1, "E1+10");
testEnumaratorDeclarator(e, 2, NULL);
testEnumaratorDeclarator(e, 3, "10");
testEnumaratorDeclarator(e, 4, "11");
}
QTEST_MAIN(tst_Semantic)
#include "tst_semantic.moc"