diff options
author | Joe Mueller <devnull@localhost> | 2015-07-30 14:35:17 +1000 |
---|---|---|
committer | Joe Mueller <devnull@localhost> | 2015-07-30 14:35:17 +1000 |
commit | 96229bb5f01e86efe382523e1ee79ff23bdcc8e0 (patch) | |
tree | 5aa3c8becad92a397b02445001383e188070f287 /lexers/LexSML.cxx | |
parent | 7604a6b2a98fc2250408368eb51f8f6827d888c8 (diff) | |
download | scintilla-mirror-96229bb5f01e86efe382523e1ee79ff23bdcc8e0.tar.gz |
Use Sci_Position / Sci_PositionU for variables in lexers that represent
positions and line numbers and may be widened to 64-bits in a future release.
Diffstat (limited to 'lexers/LexSML.cxx')
-rw-r--r-- | lexers/LexSML.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lexers/LexSML.cxx b/lexers/LexSML.cxx index 6adb86965..c380ac18b 100644 --- a/lexers/LexSML.cxx +++ b/lexers/LexSML.cxx @@ -46,7 +46,8 @@ void ColouriseSMLDoc( if (sc.state >= SCE_SML_COMMENT) nesting = (sc.state & 0x0f) - SCE_SML_COMMENT; - int chBase = 0, chToken = 0, chLit = 0; + Sci_PositionU chToken = 0; + int chBase = 0, chLit = 0; WordList& keywords = *keywordlists[0]; WordList& keywords2 = *keywordlists[1]; WordList& keywords3 = *keywordlists[2]; @@ -54,7 +55,7 @@ void ColouriseSMLDoc( while (sc.More()) { int state2 = -1; - int chColor = sc.currentPos - 1; + Sci_Position chColor = sc.currentPos - 1; bool advance = true; switch (sc.state & 0x0f) { @@ -89,10 +90,10 @@ void ColouriseSMLDoc( case SCE_SML_IDENTIFIER: if (!(issml(sc.ch) || sc.Match('\''))) { - const int n = sc.currentPos - chToken; + const Sci_Position n = sc.currentPos - chToken; if (n < 24) { char t[24]; - for (int i = -n; i < 0; i++) + for (Sci_Position i = -n; i < 0; i++) t[n + i] = static_cast<char>(sc.GetRelative(i)); t[n] = '\0'; if ((n == 1 && sc.chPrev == '_') || keywords.InList(t)) @@ -205,7 +206,7 @@ void ColouriseSMLDoc( } void FoldSMLDoc( - unsigned int, int, + Sci_PositionU, Sci_Position, int, WordList *[], Accessor &) |