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.

1 files changed, 10 insertions, 10 deletions

diff --git a/lexers/LexVisualProlog.cxx b/lexers/LexVisualProlog.cxx
index 7d6851872..5166ab2ae 100644
--- a/lexers/LexVisualProlog.cxx
+++ b/lexers/LexVisualProlog.cxx
@@ -131,7 +131,7 @@ Sci_Position SCI_METHOD LexerVisualProlog::WordListSet(int n, const char *wl) {
         wordListN = &docKeywords;
         break;
     }
-    int firstModification = -1;
+    Sci_Position firstModification = -1;
     if (wordListN) {
         WordList wlNew;
         wlNew.Set(wl);
@@ -145,8 +145,8 @@ Sci_Position SCI_METHOD LexerVisualProlog::WordListSet(int n, const char *wl) {
 
 // Functor used to truncate history
 struct After {
-    int line;
-    After(int line_) : line(line_) {}
+    Sci_Position line;
+    After(Sci_Position line_) : line(line_) {}
 };
 
 static bool isLowerLetter(int ch){
@@ -208,13 +208,13 @@ static bool isOpenStringVerbatim(int next, int &closingQuote){
 }
 
 // Look ahead to see which colour "end" should have (takes colour after the following keyword)
-static void endLookAhead(char s[], LexAccessor &styler, int start) {
+static void endLookAhead(char s[], LexAccessor &styler, Sci_Position start) {
     char ch = styler.SafeGetCharAt(start, '\n');
     while (' ' == ch) {
         start++;
         ch = styler.SafeGetCharAt(start, '\n');
     }
-    int i = 0;
+    Sci_Position i = 0;
     while (i < 100 && isLowerLetter(ch)){
         s[i] = ch;
         i++;
@@ -252,7 +252,7 @@ void SCI_METHOD LexerVisualProlog::Lex(Sci_PositionU startPos, Sci_Position leng
     StyleContext sc(startPos, length, initStyle, styler, 0x7f);
 
     int styleBeforeDocKeyword = SCE_VISUALPROLOG_DEFAULT;
-    int currentLine = styler.GetLine(startPos);
+    Sci_Position currentLine = styler.GetLine(startPos);
 
     int closingQuote = '"';
     int nestLevel = 0;
@@ -450,9 +450,9 @@ void SCI_METHOD LexerVisualProlog::Fold(Sci_PositionU startPos, Sci_Position len
 
     LexAccessor styler(pAccess);
 
-    unsigned int endPos = startPos + length;
+    Sci_PositionU endPos = startPos + length;
     int visibleChars = 0;
-    int currentLine = styler.GetLine(startPos);
+    Sci_Position currentLine = styler.GetLine(startPos);
     int levelCurrent = SC_FOLDLEVELBASE;
     if (currentLine > 0)
         levelCurrent = styler.LevelAt(currentLine-1) >> 16;
@@ -461,7 +461,7 @@ void SCI_METHOD LexerVisualProlog::Fold(Sci_PositionU startPos, Sci_Position len
     char chNext = styler[startPos];
     int styleNext = styler.StyleAt(startPos);
     int style = initStyle;
-    for (unsigned int i = startPos; i < endPos; i++) {
+    for (Sci_PositionU i = startPos; i < endPos; i++) {
         char ch = chNext;
         chNext = styler.SafeGetCharAt(i + 1);
         style = styleNext;
@@ -492,7 +492,7 @@ void SCI_METHOD LexerVisualProlog::Fold(Sci_PositionU startPos, Sci_Position len
             currentLine++;
             levelCurrent = levelNext;
             levelMinCurrent = levelCurrent;
-            if (atEOL && (i == static_cast<unsigned int>(styler.Length()-1))) {
+            if (atEOL && (i == static_cast<Sci_PositionU>(styler.Length()-1))) {
                 // There is an empty line at end of file so give it same level and empty
                 styler.SetLevel(currentLine, (levelCurrent | levelCurrent << 16) | SC_FOLDLEVELWHITEFLAG);
             }