forked from qt-creator/qt-creator
C++: Basic support for C++11 user-defined literals
1. Extends lexer so digit or string can be followed by underscore '_' and alphanumeric defining literal. 2. Extends parser so it accepts operator"" _abc(...) user-defined literal definition. 3. Adds Token::Flags.userDefinedLiteral bool flag field representing if token carries user-defined literal. 4. Adds C++11 auto tests case with: 12_km, 0.5_Pa, 'c'_X, "abd"_L, u"xyz"_M 5. All optional suffix scanning methods now return boolean if the suffix was found. 6. Adds C++ Lexer tests for user-defined literals with C++11 feature enabled. This change however does not make QtCreator understand user-defined literal semantics, e.g. properly resolve type when applying custom literal operator. Change-Id: I30e62f025ec9fb11c39261985ea4d772b1a80949 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
This commit is contained in:
committed by
Nikolai Kosjar
parent
5699991a2f
commit
425811291d
@@ -0,0 +1,7 @@
|
||||
constexpr long double operator"" _inv(long double value) {
|
||||
return 1.0 / value;
|
||||
}
|
||||
int main() {
|
||||
auto foo = operator"" _inv(2.3);
|
||||
return 12_km + 0.5_Pa + 'c'_X + "abd"_L + u"xyz"_M;
|
||||
}
|
@@ -197,6 +197,7 @@ void tst_cxx11::parse_data()
|
||||
QTest::newRow("threadLocal.1") << "threadLocal.1.cpp" << "";
|
||||
QTest::newRow("trailingtypespec.1") << "trailingtypespec.1.cpp" << "";
|
||||
QTest::newRow("lambda.2") << "lambda.2.cpp" << "";
|
||||
QTest::newRow("userDefinedLiterals.1") << "userDefinedLiterals.1.cpp" << "";
|
||||
}
|
||||
|
||||
void tst_cxx11::parse()
|
||||
|
@@ -61,7 +61,8 @@ public:
|
||||
CompareBytesEnd = 1 << 4,
|
||||
CompareUtf16Chars = 1 << 5,
|
||||
CompareUtf16CharsBegin = 1 << 6,
|
||||
CompareUtf16CharsEnd = 1 << 7
|
||||
CompareUtf16CharsEnd = 1 << 7,
|
||||
CompareUserDefinedLiteral = 1 << 8
|
||||
};
|
||||
Q_DECLARE_FLAGS(TokenCompareFlags, TokenCompareFlag)
|
||||
|
||||
@@ -77,6 +78,8 @@ private slots:
|
||||
|
||||
void bytes_and_utf16chars();
|
||||
void bytes_and_utf16chars_data();
|
||||
void user_defined_literals();
|
||||
void user_defined_literals_data();
|
||||
void offsets();
|
||||
void offsets_data();
|
||||
|
||||
@@ -87,7 +90,8 @@ private:
|
||||
const Tokens &expectedTokens,
|
||||
bool preserveState,
|
||||
TokenCompareFlags compareFlags,
|
||||
bool preprocessorMode = false);
|
||||
bool preprocessorMode = false,
|
||||
const LanguageFeatures &extraLanguageFeatures = LanguageFeatures());
|
||||
|
||||
int _state;
|
||||
};
|
||||
@@ -109,12 +113,18 @@ void tst_SimpleLexer::run(const QByteArray &source,
|
||||
const Tokens &expectedTokens,
|
||||
bool preserveState,
|
||||
TokenCompareFlags compareFlags,
|
||||
bool preprocessorMode)
|
||||
bool preprocessorMode,
|
||||
const LanguageFeatures &extraLanguageFeatures)
|
||||
{
|
||||
QVERIFY(compareFlags);
|
||||
|
||||
SimpleLexer lexer;
|
||||
lexer.setPreprocessorMode(preprocessorMode);
|
||||
if (extraLanguageFeatures.flags) {
|
||||
LanguageFeatures languageFeatures = lexer.languageFeatures();
|
||||
languageFeatures.flags |= extraLanguageFeatures.flags;
|
||||
lexer.setLanguageFeatures(languageFeatures);
|
||||
}
|
||||
const Tokens tokens = lexer(source, preserveState ? _state : 0);
|
||||
if (preserveState)
|
||||
_state = lexer.state();
|
||||
@@ -146,6 +156,8 @@ void tst_SimpleLexer::run(const QByteArray &source,
|
||||
QCOMPARE(token.utf16charsBegin(), expectedToken.utf16charsBegin());
|
||||
if (compareFlags & CompareUtf16CharsEnd)
|
||||
QCOMPARE(token.utf16charsEnd(), expectedToken.utf16charsEnd());
|
||||
if (compareFlags & CompareUserDefinedLiteral)
|
||||
QCOMPARE(token.userDefinedLiteral(), expectedToken.userDefinedLiteral());
|
||||
}
|
||||
|
||||
QString msg = QLatin1String("Less tokens than expected: got %1, expected %2.");
|
||||
@@ -364,12 +376,14 @@ void tst_SimpleLexer::bytes_and_utf16chars()
|
||||
run(source, expectedTokens, false, compareFlags);
|
||||
}
|
||||
|
||||
static Tokens createToken(unsigned kind, unsigned bytes, unsigned utf16chars)
|
||||
static Tokens createToken(unsigned kind, unsigned bytes, unsigned utf16chars,
|
||||
bool userDefinedLiteral = false)
|
||||
{
|
||||
Token t;
|
||||
t.f.kind = kind;
|
||||
t.f.bytes = bytes;
|
||||
t.f.utf16chars = utf16chars;
|
||||
t.f.userDefinedLiteral = userDefinedLiteral;
|
||||
return Tokens() << t;
|
||||
}
|
||||
|
||||
@@ -445,6 +459,43 @@ void tst_SimpleLexer::bytes_and_utf16chars_data()
|
||||
<< _("\"" UC_U00FC UC_U4E8C UC_U10302 "\"") << createToken(T_STRING_LITERAL, 11, 6);
|
||||
}
|
||||
|
||||
void tst_SimpleLexer::user_defined_literals()
|
||||
{
|
||||
QFETCH(QByteArray, source);
|
||||
QFETCH(Tokens, expectedTokens);
|
||||
|
||||
const TokenCompareFlags compareFlags = CompareKind | CompareBytes | CompareUtf16Chars | CompareUserDefinedLiteral;
|
||||
LanguageFeatures languageFeatures;
|
||||
languageFeatures.cxx11Enabled = true;
|
||||
run(source, expectedTokens, false, compareFlags, false, languageFeatures);
|
||||
}
|
||||
|
||||
void tst_SimpleLexer::user_defined_literals_data()
|
||||
{
|
||||
QTest::addColumn<QByteArray>("source");
|
||||
QTest::addColumn<Tokens>("expectedTokens");
|
||||
|
||||
typedef QByteArray _;
|
||||
|
||||
// String User-defined Literals
|
||||
QTest::newRow("latin1 string non-user-defined literal")
|
||||
<< _("\"hello\"") << createToken(T_STRING_LITERAL, 7, 7, false);
|
||||
QTest::newRow("latin1 string user-defined literal")
|
||||
<< _("\"hello\"_udl") << createToken(T_STRING_LITERAL, 11, 11, true);
|
||||
|
||||
// Numeric User-defined Literals
|
||||
QTest::newRow("numeric non user-defined literal with integer suffix")
|
||||
<< _("11LL") << createToken(T_NUMERIC_LITERAL, 4, 4, false);
|
||||
QTest::newRow("numeric non user-defined literal with decimal part")
|
||||
<< _("11.1") << createToken(T_NUMERIC_LITERAL, 4, 4, false);
|
||||
QTest::newRow("numeric non user-defined literal with float suffix")
|
||||
<< _("11.1f") << createToken(T_NUMERIC_LITERAL, 5, 5, false);
|
||||
QTest::newRow("numeric user-defined literal without decimal part")
|
||||
<< _("11_udl") << createToken(T_NUMERIC_LITERAL, 6, 6, true);
|
||||
QTest::newRow("numeric user-defined literal with decimal part")
|
||||
<< _("11.1_udl") << createToken(T_NUMERIC_LITERAL, 8, 8, true);
|
||||
}
|
||||
|
||||
static Token createToken(unsigned kind, unsigned byteOffset, unsigned bytes,
|
||||
unsigned utf16charsOffset, unsigned utf16chars)
|
||||
{
|
||||
|
Reference in New Issue
Block a user