diff options
| author | Erik Verbruggen <erik.verbruggen@digia.com> | 2014-02-07 15:24:30 +0100 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@theqtcompany.com> | 2014-12-18 15:46:22 +0100 |
| commit | 242b3f4110ebbe3882e28b7df75c26768c5f9ecc (patch) | |
| tree | daab9f47f597ab278d97c8e737df68efc54f523f /src/libs/cplusplus/pp-engine.cpp | |
| parent | 16becbd29c44e664904a7fb2d698f79fc08b2731 (diff) | |
| download | qt-creator-242b3f4110ebbe3882e28b7df75c26768c5f9ecc.tar.gz | |
C++: clean up numeric literal parsing and add support for n3472.
Separate the messy pp-number parsing from the numeric literal parsing.
The C/C++ preprocessor makes a grown man cry, but at least we have
"proper" literal parsing when we want it, including C++1y binary
literals.
Next step is digit separators (n3781).
Change-Id: Ia069eef454ed5c056f77694a5b8a595d0b76adc4
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
Diffstat (limited to 'src/libs/cplusplus/pp-engine.cpp')
| -rw-r--r-- | src/libs/cplusplus/pp-engine.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/libs/cplusplus/pp-engine.cpp b/src/libs/cplusplus/pp-engine.cpp index c4ef04dc53..306af0b0de 100644 --- a/src/libs/cplusplus/pp-engine.cpp +++ b/src/libs/cplusplus/pp-engine.cpp @@ -401,6 +401,9 @@ protected: const char *end = spell + len; char *vend = const_cast<char *>(end); _value.set_long(strtol(spell, &vend, 0)); + // TODO: if (vend != end) error(NaN) + // TODO: binary literals + // TODO: float literals ++(*_lex); } else if (isTokenDefined()) { ++(*_lex); @@ -1388,6 +1391,7 @@ void Preprocessor::preprocess(const QString &fileName, const QByteArray &source, m_state.m_lexer = new Lexer(source.constBegin(), source.constEnd()); m_state.m_lexer->setScanKeywords(false); m_state.m_lexer->setScanAngleStringLiteralTokens(false); + m_state.m_lexer->setPreprocessorMode(true); if (m_keepComments) m_state.m_lexer->setScanCommentTokens(true); m_state.m_result = result; @@ -1803,6 +1807,7 @@ const PPToken Preprocessor::evalExpression(PPToken *tk, Value &result) PPToken lastConditionToken; const QByteArray expanded = expand(tk, &lastConditionToken); Lexer lexer(expanded.constData(), expanded.constData() + expanded.size()); + lexer.setPreprocessorMode(true); std::vector<Token> buf; Token t; do { |