summaryrefslogtreecommitdiffstats
path: root/scintilla/lexers/LexDMAP.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'scintilla/lexers/LexDMAP.cxx')
-rw-r--r--scintilla/lexers/LexDMAP.cxx20
1 files changed, 10 insertions, 10 deletions
diff --git a/scintilla/lexers/LexDMAP.cxx b/scintilla/lexers/LexDMAP.cxx
index 431000a..eb43cde 100644
--- a/scintilla/lexers/LexDMAP.cxx
+++ b/scintilla/lexers/LexDMAP.cxx
@@ -38,14 +38,14 @@ static inline bool IsAWordStart(const int ch) {
return (ch < 0x80) && (isalnum(ch));
}
/***************************************/
-static void ColouriseDMAPDoc(unsigned int startPos, int length, int initStyle,
+static void ColouriseDMAPDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
WordList *keywordlists[], Accessor &styler) {
WordList &keywords = *keywordlists[0];
WordList &keywords2 = *keywordlists[1];
WordList &keywords3 = *keywordlists[2];
/***************************************/
- int posLineStart = 0, numNonBlank = 0;
- int endPos = startPos + length;
+ Sci_Position posLineStart = 0, numNonBlank = 0;
+ Sci_Position endPos = startPos + length;
/***************************************/
// backtrack to the nearest keyword
while ((startPos > 1) && (styler.StyleAt(startPos) != SCE_DMAP_WORD)) {
@@ -65,7 +65,7 @@ static void ColouriseDMAPDoc(unsigned int startPos, int length, int initStyle,
if (!IsASpaceOrTab(sc.ch)) numNonBlank ++;
/***********************************************/
// Handle data appearing after column 72; it is ignored
- int toLineStart = sc.currentPos - posLineStart;
+ Sci_Position toLineStart = sc.currentPos - posLineStart;
if (toLineStart >= 72 || sc.ch == '$') {
sc.SetState(SCE_DMAP_COMMENT);
while (!sc.atLineEnd && sc.More()) sc.Forward(); // Until line end
@@ -151,26 +151,26 @@ static int classifyFoldPointDMAP(const char* s, const char* prevWord) {
return lev;
}
// Folding the code
-static void FoldDMAPDoc(unsigned int startPos, int length, int initStyle,
+static void FoldDMAPDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
WordList *[], Accessor &styler) {
//
// bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
// 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 levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
int levelCurrent = levelPrev;
char chNext = styler[startPos];
int styleNext = styler.StyleAt(startPos);
int style = initStyle;
/***************************************/
- 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);
int stylePrev = style;
@@ -186,7 +186,7 @@ static void FoldDMAPDoc(unsigned int startPos, int length, int initStyle,
if (style == SCE_DMAP_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]));
}