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, 7 insertions, 6 deletions

diff --git a/lexers/LexGui4Cli.cxx b/lexers/LexGui4Cli.cxx
index 4cba4ceff..c1625160a 100644
--- a/lexers/LexGui4Cli.cxx
+++ b/lexers/LexGui4Cli.cxx
@@ -68,9 +68,9 @@ inline bool isGCOperator(int ch)
 #define isFoldPoint(x)  ((styler.LevelAt(x) & SC_FOLDLEVELNUMBERMASK) == 1024)
 
 static void colorFirstWord(WordList *keywordlists[], Accessor &styler,
-									StyleContext *sc, char *buff, int length, int)
+									StyleContext *sc, char *buff, Sci_Position length, int)
 {
-	int c = 0;
+	Sci_Position c = 0;
 	while (sc->More() && isSpaceOrNL(sc->ch))
 	{	sc->Forward();
 	}
@@ -124,7 +124,8 @@ ColouriseGui4CliDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
 {
 	styler.StartAt(startPos);
 
-	int quotestart = 0, oldstate, currentline = styler.GetLine(startPos);
+	Sci_Position currentline = styler.GetLine(startPos);
+	int quotestart = 0, oldstate;
 	styler.StartSegment(startPos);
 	bool noforward;
 	char buff[BUFFSIZE+1];	// buffer for command name
@@ -248,15 +249,15 @@ static void FoldGui4Cli(Sci_PositionU startPos, Sci_Position length, int,
 {
 	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
 
-	unsigned int endPos = startPos + length;
+	Sci_PositionU endPos = startPos + length;
 	int visibleChars = 0;
-	int lineCurrent = styler.GetLine(startPos);
+	Sci_Position lineCurrent = styler.GetLine(startPos);
 
 	char chNext = styler[startPos];
 	int styleNext = styler.StyleAt(startPos);
 	bool headerPoint = false;
 
-	for (unsigned int i = startPos; i < endPos; i++)
+	for (Sci_PositionU i = startPos; i < endPos; i++)
 	{
 		char ch = chNext;
 		chNext = styler[i+1];