diff options
| author | mitchell <unknown> | 2018-05-05 21:09:21 -0400 |
|---|---|---|
| committer | mitchell <unknown> | 2018-05-05 21:09:21 -0400 |
| commit | c60d0059738eb49622dfe94e69d371856748ec18 (patch) | |
| tree | 05661173868a8404e68720bdacec575292a7a896 /lexlib | |
| parent | 50e62c7c057261b8d1bd10c05216486549a9b604 (diff) | |
| download | scintilla-mirror-c60d0059738eb49622dfe94e69d371856748ec18.tar.gz | |
Backport: Make some changes recommended by clang-tidy.
Backport of changeset 6687:4cbf987c7590.
Diffstat (limited to 'lexlib')
| -rw-r--r-- | lexlib/LexerSimple.h | 6 | ||||
| -rw-r--r-- | lexlib/PropSetSimple.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lexlib/LexerSimple.h b/lexlib/LexerSimple.h index 0edeabe8f..87882eaeb 100644 --- a/lexlib/LexerSimple.h +++ b/lexlib/LexerSimple.h @@ -16,9 +16,9 @@ class LexerSimple : public LexerBase { std::string wordLists; public: explicit LexerSimple(const LexerModule *module_); - const char * SCI_METHOD DescribeWordListSets(); - void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, IDocument *pAccess); - void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, IDocument *pAccess); + const char * SCI_METHOD DescribeWordListSets() override; + void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, IDocument *pAccess) override; + void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, IDocument *pAccess) override; }; } diff --git a/lexlib/PropSetSimple.cxx b/lexlib/PropSetSimple.cxx index e8f0364fa..ed473bc3b 100644 --- a/lexlib/PropSetSimple.cxx +++ b/lexlib/PropSetSimple.cxx @@ -100,7 +100,7 @@ struct VarChain { static int ExpandAllInPlace(const PropSetSimple &props, std::string &withVars, int maxExpands, const VarChain &blankVars) { size_t varStart = withVars.find("$("); while ((varStart != std::string::npos) && (maxExpands > 0)) { - const size_t varEnd = withVars.find(")", varStart+2); + const size_t varEnd = withVars.find(')', varStart+2); if (varEnd == std::string::npos) { break; } |