diff options
author | Neil <nyamatongwe@gmail.com> | 2014-05-13 08:55:46 +1000 |
---|---|---|
committer | Neil <nyamatongwe@gmail.com> | 2014-05-13 08:55:46 +1000 |
commit | bdb2e90dd86303411c261b8cb8a8410f81a0f592 (patch) | |
tree | e7ad8adafc95f228723804d66cc6fc3a1411988c | |
parent | cc7a97b5aebb0eaa7b80b4544b5ffb8dddfb7e03 (diff) | |
download | scintilla-mirror-bdb2e90dd86303411c261b8cb8a8410f81a0f592.tar.gz |
Feature [feature-requests:#1051]. Fixed shadowed local variable.
-rw-r--r-- | lexers/LexCPP.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lexers/LexCPP.cxx b/lexers/LexCPP.cxx index fbe8748ca..d884c212f 100644 --- a/lexers/LexCPP.cxx +++ b/lexers/LexCPP.cxx @@ -1437,13 +1437,13 @@ void LexerCPP::EvaluateTokens(std::vector<std::string> &tokens, const SymbolTabl tokens.erase(tokens.begin() + i, tokens.begin() + tok + 1); // Substitute values into macro - std::vector<std::string> macroTokens = Tokenize(it->second.value); macroTokens.erase(std::remove_if(macroTokens.begin(), macroTokens.end(), OnlySpaceOrTab), macroTokens.end()); for (size_t iMacro = 0; iMacro < macroTokens.size();) { if (setWordStart.Contains(static_cast<unsigned char>(macroTokens[iMacro][0]))) { std::map<std::string, std::string>::const_iterator itFind = arguments.find(macroTokens[iMacro]); if (itFind != arguments.end()) { + // TODO: Possible that value will be expression so should insert tokenized form macroTokens[iMacro] = itFind->second; } } |