diff options
author | Adam Strzelecki <ono@java.pl> | 2014-11-02 14:42:23 +0100 |
---|---|---|
committer | Nikolai Kosjar <nikolai.kosjar@theqtcompany.com> | 2015-02-17 09:45:34 +0000 |
commit | 425811291dfd41782cc91f6c1293d41af7b0e4d8 (patch) | |
tree | c730fb107d9b040248230d688790b45a08741be8 /src/libs/3rdparty/cplusplus/Parser.cpp | |
parent | 5699991a2fd4ef35d24720249692612d069d391b (diff) |
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>
Diffstat (limited to 'src/libs/3rdparty/cplusplus/Parser.cpp')
-rw-r--r-- | src/libs/3rdparty/cplusplus/Parser.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/libs/3rdparty/cplusplus/Parser.cpp b/src/libs/3rdparty/cplusplus/Parser.cpp index 75970b1671..19bcd358b5 100644 --- a/src/libs/3rdparty/cplusplus/Parser.cpp +++ b/src/libs/3rdparty/cplusplus/Parser.cpp @@ -1274,6 +1274,14 @@ bool Parser::parseOperator(OperatorAST *&node) // ### FIXME } else if (LA() == T_LBRACKET && LA(2) == T_RBRACKET) { ast->op_token = ast->open_token = consumeToken(); ast->close_token = consumeToken(); + } else if (_languageFeatures.cxx11Enabled && + LA() == T_STRING_LITERAL && LA(2) == T_IDENTIFIER && + !tok().f.userDefinedLiteral && tok().string->size() == 0 && + tok(2).identifier->size() > 1 && tok(2).identifier->chars()[0] == '_') { + // C++11 user-defined literal operator, e.g.: + // int operator"" _abc123(const char *str, size_t size) { ... } + ast->op_token = consumeToken(); + consumeToken(); // consume literal operator identifier } else { return false; } |