forked from qt-creator/qt-creator
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>
This commit is contained in:
committed by
Nikolai Kosjar
parent
16becbd29c
commit
242b3f4110
9
src/libs/3rdparty/cplusplus/Lexer.h
vendored
9
src/libs/3rdparty/cplusplus/Lexer.h
vendored
@@ -61,6 +61,9 @@ public:
|
||||
LanguageFeatures languageFeatures() const { return _languageFeatures; }
|
||||
void setLanguageFeatures(LanguageFeatures features) { _languageFeatures = features; }
|
||||
|
||||
void setPreprocessorMode(bool onoff)
|
||||
{ f._ppMode = onoff; }
|
||||
|
||||
public:
|
||||
static void yyinp_utf8(const char *¤tSourceChar, unsigned char &yychar,
|
||||
unsigned &utf16charCounter)
|
||||
@@ -95,7 +98,12 @@ private:
|
||||
void scanRawStringLiteral(Token *tok, unsigned char hint = 0);
|
||||
void scanCharLiteral(Token *tok, unsigned char hint = 0);
|
||||
void scanUntilQuote(Token *tok, unsigned char quote);
|
||||
bool scanDigitSequence();
|
||||
bool scanExponentPart();
|
||||
void scanOptionalFloatingSuffix();
|
||||
void scanOptionalIntegerSuffix(bool allowU = true);
|
||||
void scanNumericLiteral(Token *tok);
|
||||
void scanPreprocessorNumber(Token *tok, bool dotAlreadySkipped);
|
||||
void scanIdentifier(Token *tok, unsigned extraProcessedChars = 0);
|
||||
void scanBackslash(Kind type);
|
||||
void scanCppComment(Kind type);
|
||||
@@ -115,6 +123,7 @@ private:
|
||||
unsigned _scanCommentTokens: 1;
|
||||
unsigned _scanKeywords: 1;
|
||||
unsigned _scanAngleStringLiteralTokens: 1;
|
||||
unsigned _ppMode: 1;
|
||||
};
|
||||
|
||||
struct State {
|
||||
|
||||
Reference in New Issue
Block a user