diff options
| author | Neil Hodgson <nyamatongwe@gmail.com> | 2017-07-17 15:18:31 +1000 |
|---|---|---|
| committer | Neil Hodgson <nyamatongwe@gmail.com> | 2017-07-17 15:18:31 +1000 |
| commit | 46d35a2e30079cb7ce690cd60aece17cc00f1de1 (patch) | |
| tree | 586b2d92f94d0dbf09329bde04caa9f2736d71c3 /lexers/LexPython.cxx | |
| parent | 5d888154b02ae8665464bcdfaf89e0be3a582320 (diff) | |
| download | scintilla-mirror-46d35a2e30079cb7ce690cd60aece17cc00f1de1.tar.gz | |
Backport: Update types for Unix LP64 after changes to Sci_Position/Sci_PositionU.
Backport of changeset 6352:df1416e3ff3a.
Diffstat (limited to 'lexers/LexPython.cxx')
| -rw-r--r-- | lexers/LexPython.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lexers/LexPython.cxx b/lexers/LexPython.cxx index 567c44d05..a768b4086 100644 --- a/lexers/LexPython.cxx +++ b/lexers/LexPython.cxx @@ -342,7 +342,7 @@ class LexerPython : public DefaultLexer { OptionSetPython osPython; enum { ssIdentifier }; SubStyles subStyles; - std::map<int, std::vector<SingleFStringExpState> > ftripleStateAtEol; + std::map<Sci_Position, std::vector<SingleFStringExpState> > ftripleStateAtEol; public: explicit LexerPython() : DefaultLexer(lexicalClasses, ELEMENTS(lexicalClasses)), @@ -466,7 +466,7 @@ void LexerPython::ProcessLineEnd(StyleContext &sc, std::vector<SingleFStringExpS } } if (!fstringStateStack.empty()) { - std::pair<int, std::vector<SingleFStringExpState> > val; + std::pair<Sci_Position, std::vector<SingleFStringExpState> > val; val.first = sc.currentLine; val.second = fstringStateStack; @@ -529,7 +529,7 @@ void SCI_METHOD LexerPython::Lex(Sci_PositionU startPos, Sci_Position length, in } // Set up fstate stack from last line and remove any subsequent ftriple at eol states - std::map<int, std::vector<SingleFStringExpState> >::iterator it; + std::map<Sci_Position, std::vector<SingleFStringExpState> >::iterator it; it = ftripleStateAtEol.find(lineCurrent - 1); if (it != ftripleStateAtEol.end() && !it->second.empty()) { fstringStateStack = it->second; |