diff options
Diffstat (limited to 'lexers/LexFortran.cxx')
| -rw-r--r-- | lexers/LexFortran.cxx | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/lexers/LexFortran.cxx b/lexers/LexFortran.cxx index 4acf2d7f3..37e0b45c5 100644 --- a/lexers/LexFortran.cxx +++ b/lexers/LexFortran.cxx @@ -46,7 +46,7 @@ static inline bool IsALineEnd(char ch) { return ((ch == '\n') || (ch == '\r')) ; } /***************************************/ -static unsigned int GetContinuedPos(unsigned int pos, Accessor &styler) { +static Sci_PositionU GetContinuedPos(Sci_PositionU pos, Accessor &styler) { while (!IsALineEnd(styler.SafeGetCharAt(pos++))) continue; if (styler.SafeGetCharAt(pos) == '\n') pos++; while (IsABlank(styler.SafeGetCharAt(pos++))) continue; @@ -65,8 +65,9 @@ static void ColouriseFortranDoc(Sci_PositionU startPos, Sci_Position length, int WordList &keywords2 = *keywordlists[1]; WordList &keywords3 = *keywordlists[2]; /***************************************/ - int posLineStart = 0, numNonBlank = 0, prevState = 0; - int endPos = startPos + length; + Sci_Position posLineStart = 0; + int numNonBlank = 0, prevState = 0; + Sci_Position endPos = startPos + length; /***************************************/ // backtrack to the nearest keyword while ((startPos > 1) && (styler.StyleAt(startPos) != SCE_F_WORD)) { @@ -86,7 +87,7 @@ static void ColouriseFortranDoc(Sci_PositionU startPos, Sci_Position length, int if (!IsASpaceOrTab(sc.ch)) numNonBlank ++; /***********************************************/ // Handle the fix format generically - int toLineStart = sc.currentPos - posLineStart; + Sci_Position toLineStart = sc.currentPos - posLineStart; if (isFixFormat && (toLineStart < 6 || toLineStart >= 72)) { if ((toLineStart == 0 && (tolower(sc.ch) == 'c' || sc.ch == '*')) || sc.ch == '!') { if (sc.MatchIgnoreCase("cdec$") || sc.MatchIgnoreCase("*dec$") || sc.MatchIgnoreCase("!dec$") || @@ -130,7 +131,7 @@ static void ColouriseFortranDoc(Sci_PositionU startPos, Sci_Position length, int // Handle line continuation generically. if (!isFixFormat && sc.ch == '&' && sc.state != SCE_F_COMMENT) { char chTemp = ' '; - int j = 1; + Sci_Position j = 1; while (IsABlank(chTemp) && j<132) { chTemp = static_cast<char>(sc.GetRelative(j)); j++; @@ -302,9 +303,9 @@ static void FoldFortranDoc(Sci_PositionU startPos, Sci_Position length, int init // Do not know how to fold the comment at the moment. // 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); int levelCurrent; bool isPrevLine; if (lineCurrent > 0) { @@ -321,10 +322,10 @@ static void FoldFortranDoc(Sci_PositionU startPos, Sci_Position length, int init int style = initStyle; int levelDeltaNext = 0; /***************************************/ - int lastStart = 0; + Sci_Position lastStart = 0; char prevWord[32] = ""; /***************************************/ - for (unsigned int i = startPos; i < endPos; i++) { + for (Sci_PositionU i = startPos; i < endPos; i++) { char ch = chNext; chNext = styler.SafeGetCharAt(i + 1); char chNextNonBlank = chNext; @@ -332,7 +333,7 @@ static void FoldFortranDoc(Sci_PositionU startPos, Sci_Position length, int init if (IsALineEnd(chNextNonBlank)) { nextEOL = true; } - unsigned int j=i+1; + Sci_PositionU j=i+1; while(IsABlank(chNextNonBlank) && j<endPos) { j ++ ; chNextNonBlank = styler.SafeGetCharAt(j); @@ -357,7 +358,7 @@ static void FoldFortranDoc(Sci_PositionU startPos, Sci_Position length, int init if (style == SCE_F_WORD) { if(iswordchar(ch) && !iswordchar(chNext)) { char s[32]; - unsigned int k; + Sci_PositionU k; for(k=0; (k<31 ) && (k<i-lastStart+1 ); k++) { s[k] = static_cast<char>(tolower(styler[lastStart+k])); } @@ -386,7 +387,7 @@ static void FoldFortranDoc(Sci_PositionU startPos, Sci_Position length, int init if (depth == 0) break; } } - int tmpLineCurrent = lineCurrent; + Sci_Position tmpLineCurrent = lineCurrent; while (j<endPos) { j++; chAtPos = styler.SafeGetCharAt(j); |