diff options
| author | Jannick <unknown> | 2017-08-28 17:07:27 +1000 |
|---|---|---|
| committer | Jannick <unknown> | 2017-08-28 17:07:27 +1000 |
| commit | b634b3d5f34edc335a25239e833f9054620c6094 (patch) | |
| tree | 9421700a1b827d93c5a205ded108022ea40e2070 | |
| parent | 16d18724972298c4bf5fb59925649f869118fbac (diff) | |
| download | scintilla-mirror-b634b3d5f34edc335a25239e833f9054620c6094.tar.gz | |
Bug [#1966]. "defined A" removes "A" before replacing "defined" with value.
| -rw-r--r-- | doc/ScintillaHistory.html | 7 | ||||
| -rw-r--r-- | lexers/LexCPP.cxx | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index a6ea45827..faa16e696 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -533,9 +533,10 @@ Released 16 August 2017. </li> <li> - The C++ lexer improved preprocessor conformance. - Default value of 0 for undefined preprocessor symbols. - #define A is treated as #define A 1. + The C++ lexer improved preprocessor conformance.<br /> + Default value of 0 for undefined preprocessor symbols.<br /> + #define A is treated as #define A 1.<br /> + "defined A" removes "A" before replacing "defined" with value. <a href="http://sourceforge.net/p/scintilla/bugs/1966/">Bug #1966</a>. </li> <li> diff --git a/lexers/LexCPP.cxx b/lexers/LexCPP.cxx index 3fa925b40..840d3c8b9 100644 --- a/lexers/LexCPP.cxx +++ b/lexers/LexCPP.cxx @@ -1522,6 +1522,7 @@ void LexerCPP::EvaluateTokens(std::vector<std::string> &tokens, const SymbolTabl if (it != preprocessorDefinitions.end()) { val = "1"; } + tokens.erase(tokens.begin() + i + 1, tokens.begin() + i + 2); } tokens[i] = val; } else { |