diff options
| author | Neil <nyamatongwe@gmail.com> | 2015-07-25 11:25:56 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2015-07-25 11:25:56 +1000 |
| commit | c30768f1167cfe590e0b6a12c4a986e82a210cc3 (patch) | |
| tree | 6048b8f9718abaf80f81ccfde41057d40a9198d2 | |
| parent | 5f7e861ca9e4c776f40eb884a3d6e97362842904 (diff) | |
| download | scintilla-mirror-c30768f1167cfe590e0b6a12c4a986e82a210cc3.tar.gz | |
Use Sci_PositionU/Sci_Position for arguments to functional lexers, folders, and
comment recognizers to allow for future implementation of 64-bit positions.
93 files changed, 226 insertions, 226 deletions
diff --git a/lexers/LexA68k.cxx b/lexers/LexA68k.cxx index 0b600195a..c14797238 100644 --- a/lexers/LexA68k.cxx +++ b/lexers/LexA68k.cxx @@ -115,7 +115,7 @@ static inline bool IsDoxygenChar (const int ch) * Main function, which colourises a 68k source */ -static void ColouriseA68kDoc (unsigned int startPos, int length, int initStyle, WordList *keywordlists[], Accessor &styler) +static void ColouriseA68kDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { // Used to buffer a string, to be able to compare it using built-in functions char Buffer[100]; diff --git a/lexers/LexAPDL.cxx b/lexers/LexAPDL.cxx index 7d65a5615..8289def08 100644 --- a/lexers/LexAPDL.cxx +++ b/lexers/LexAPDL.cxx @@ -43,7 +43,7 @@ static inline bool IsAnOperator(char ch) { return false; } -static void ColouriseAPDLDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], +static void ColouriseAPDLDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { int stringStart = ' '; @@ -184,7 +184,7 @@ static int CheckAPDLFoldPoint(char const *token, int &level) { return 0; } -static void FoldAPDLDoc(unsigned int startPos, int length, int, +static void FoldAPDLDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) { int line = styler.GetLine(startPos); diff --git a/lexers/LexASY.cxx b/lexers/LexASY.cxx index 9e3470cda..722eb2dfa 100644 --- a/lexers/LexASY.cxx +++ b/lexers/LexASY.cxx @@ -23,7 +23,7 @@ using namespace Scintilla; #endif -static void ColouriseAsyDoc(unsigned int startPos, int length, int initStyle, +static void ColouriseAsyDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { WordList &keywords = *keywordlists[0]; @@ -186,7 +186,7 @@ static bool IsASYDrawingLine(int line, Accessor &styler) { return false; } -static void FoldAsyDoc(unsigned int startPos, int length, int initStyle, +static void FoldAsyDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *[], Accessor &styler) { bool foldComment = styler.GetPropertyInt("fold.comment") != 0; bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; diff --git a/lexers/LexAU3.cxx b/lexers/LexAU3.cxx index 68f1798d3..cb3159797 100644 --- a/lexers/LexAU3.cxx +++ b/lexers/LexAU3.cxx @@ -195,8 +195,8 @@ static bool IsContinuationLine(unsigned int szLine, Accessor &styler) // // syntax highlighting logic -static void ColouriseAU3Doc(unsigned int startPos, - int length, int initStyle, +static void ColouriseAU3Doc(Sci_PositionU startPos, + Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { @@ -674,7 +674,7 @@ static int GetStyleFirstWord(unsigned int szLine, Accessor &styler) // -static void FoldAU3Doc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) +static void FoldAU3Doc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) { int endPos = startPos + length; // get settings from the config files for folding comments and preprocessor lines diff --git a/lexers/LexAVE.cxx b/lexers/LexAVE.cxx index 8f5729e3d..ee5149318 100644 --- a/lexers/LexAVE.cxx +++ b/lexers/LexAVE.cxx @@ -59,8 +59,8 @@ inline bool isAveOperator(char ch) { } static void ColouriseAveDoc( - unsigned int startPos, - int length, + Sci_PositionU startPos, + Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { @@ -157,7 +157,7 @@ static void ColouriseAveDoc( sc.Complete(); } -static void FoldAveDoc(unsigned int startPos, int length, int /* initStyle */, WordList *[], +static void FoldAveDoc(Sci_PositionU startPos, Sci_Position length, int /* initStyle */, WordList *[], Accessor &styler) { unsigned int lengthDoc = startPos + length; int visibleChars = 0; diff --git a/lexers/LexAVS.cxx b/lexers/LexAVS.cxx index 82e434579..8599ce952 100644 --- a/lexers/LexAVS.cxx +++ b/lexers/LexAVS.cxx @@ -44,8 +44,8 @@ static inline bool IsANumberChar(int ch) { } static void ColouriseAvsDoc( - unsigned int startPos, - int length, + Sci_PositionU startPos, + Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { @@ -208,8 +208,8 @@ static void ColouriseAvsDoc( } static void FoldAvsDoc( - unsigned int startPos, - int length, + Sci_PositionU startPos, + Sci_Position length, int initStyle, WordList *[], Accessor &styler) { diff --git a/lexers/LexAbaqus.cxx b/lexers/LexAbaqus.cxx index d93aa503d..eba3e59d7 100644 --- a/lexers/LexAbaqus.cxx +++ b/lexers/LexAbaqus.cxx @@ -38,7 +38,7 @@ static inline bool IsASetChar(const int ch) { return (ch < 0x80 && (isalnum(ch) || (ch == '_') || (ch == '.') || (ch == '-'))); } -static void ColouriseABAQUSDoc(unsigned int startPos, int length, int initStyle, WordList*[] /* *keywordlists[] */, +static void ColouriseABAQUSDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList*[] /* *keywordlists[] */, Accessor &styler) { enum localState { KW_LINE_KW, KW_LINE_COMMA, KW_LINE_PAR, KW_LINE_EQ, KW_LINE_VAL, \ DAT_LINE_VAL, DAT_LINE_COMMA,\ @@ -432,7 +432,7 @@ static void SafeSetLevel(int line, int level, Accessor &styler) styler.SetLevel(line, level) ; } -static void FoldABAQUSDoc(unsigned int startPos, int length, int, +static void FoldABAQUSDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) { int startLine = styler.GetLine(startPos) ; int endLine = styler.GetLine(startPos+length-1) ; diff --git a/lexers/LexAda.cxx b/lexers/LexAda.cxx index 7a7dea60f..e03b75f04 100644 --- a/lexers/LexAda.cxx +++ b/lexers/LexAda.cxx @@ -34,8 +34,8 @@ using namespace Scintilla; */ static void ColouriseDocument( - unsigned int startPos, - int length, + Sci_PositionU startPos, + Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler); @@ -222,8 +222,8 @@ static void ColouriseWord(StyleContext& sc, WordList& keywords, bool& apostrophe // static void ColouriseDocument( - unsigned int startPos, - int length, + Sci_PositionU startPos, + Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { diff --git a/lexers/LexAsn1.cxx b/lexers/LexAsn1.cxx index 120b8954b..7c5f48e75 100644 --- a/lexers/LexAsn1.cxx +++ b/lexers/LexAsn1.cxx @@ -47,7 +47,7 @@ static bool isAsn1Char(int ch) // Function determining the color of a given code portion // Based on a "state" // -static void ColouriseAsn1Doc(unsigned int startPos, int length, int initStyle, WordList *keywordLists[], Accessor &styler) +static void ColouriseAsn1Doc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordLists[], Accessor &styler) { // The keywords WordList &Keywords = *keywordLists[0]; @@ -168,7 +168,7 @@ asn1_default: sc.Complete(); } -static void FoldAsn1Doc(unsigned int, int, int, WordList *[], Accessor &styler) +static void FoldAsn1Doc(Sci_PositionU, Sci_Position, int, WordList *[], Accessor &styler) { // No folding enabled, no reason to continue... if( styler.GetPropertyInt("fold") == 0 ) diff --git a/lexers/LexBaan.cxx b/lexers/LexBaan.cxx index 3784f3c31..1421e3797 100644 --- a/lexers/LexBaan.cxx +++ b/lexers/LexBaan.cxx @@ -36,7 +36,7 @@ static inline bool IsAWordStart(const int ch) { return (ch < 0x80) && (isalnum(ch) || ch == '_'); } -static void ColouriseBaanDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], +static void ColouriseBaanDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { WordList &keywords = *keywordlists[0]; @@ -137,7 +137,7 @@ static void ColouriseBaanDoc(unsigned int startPos, int length, int initStyle, W sc.Complete(); } -static void FoldBaanDoc(unsigned int startPos, int length, int initStyle, WordList *[], +static void FoldBaanDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *[], Accessor &styler) { bool foldComment = styler.GetPropertyInt("fold.comment") != 0; bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; diff --git a/lexers/LexBash.cxx b/lexers/LexBash.cxx index a5f0f6e69..4ce937a80 100644 --- a/lexers/LexBash.cxx +++ b/lexers/LexBash.cxx @@ -96,7 +96,7 @@ static int opposite(int ch) { return ch; } -static void ColouriseBashDoc(unsigned int startPos, int length, int initStyle, +static void ColouriseBashDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { WordList &keywords = *keywordlists[0]; @@ -765,7 +765,7 @@ static bool IsCommentLine(int line, Accessor &styler) { return false; } -static void FoldBashDoc(unsigned int startPos, int length, int, WordList *[], +static void FoldBashDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) { bool foldComment = styler.GetPropertyInt("fold.comment") != 0; bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; diff --git a/lexers/LexBatch.cxx b/lexers/LexBatch.cxx index 04448b04a..551a9b58f 100644 --- a/lexers/LexBatch.cxx +++ b/lexers/LexBatch.cxx @@ -462,8 +462,8 @@ static void ColouriseBatchLine( } static void ColouriseBatchDoc( - unsigned int startPos, - int length, + Sci_PositionU startPos, + Sci_Position length, int /*initStyle*/, WordList *keywordlists[], Accessor &styler) { diff --git a/lexers/LexBibTeX.cxx b/lexers/LexBibTeX.cxx index cdbce8d49..bab02842a 100644 --- a/lexers/LexBibTeX.cxx +++ b/lexers/LexBibTeX.cxx @@ -76,7 +76,7 @@ namespace { return IsEntryStart(sc.chPrev, sc.ch); } - void ColorizeBibTeX(unsigned start_pos, int length, int /*init_style*/, WordList* keywordlists[], Accessor& styler) + void ColorizeBibTeX(Sci_PositionU start_pos, Sci_Position length, int /*init_style*/, WordList* keywordlists[], Accessor& styler) { WordList &EntryNames = *keywordlists[0]; bool fold_compact = styler.GetPropertyInt("fold.compact", 1) != 0; diff --git a/lexers/LexBullant.cxx b/lexers/LexBullant.cxx index 51d6bd8f0..8a3dbb46d 100644 --- a/lexers/LexBullant.cxx +++ b/lexers/LexBullant.cxx @@ -58,7 +58,7 @@ static int classifyWordBullant(unsigned int start, unsigned int end, WordList &k return lev; } -static void ColouriseBullantDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], +static void ColouriseBullantDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { WordList &keywords = *keywordlists[0]; diff --git a/lexers/LexCLW.cxx b/lexers/LexCLW.cxx index c1dea607c..0e7242761 100644 --- a/lexers/LexCLW.cxx +++ b/lexers/LexCLW.cxx @@ -174,7 +174,7 @@ inline bool GetNextWordUpper(Accessor &styler, unsigned int uiStartPos, int iLen } // Clarion Language Colouring Procedure -static void ColouriseClarionDoc(unsigned int uiStartPos, int iLength, int iInitStyle, WordList *wlKeywords[], Accessor &accStyler, bool bCaseSensitive) { +static void ColouriseClarionDoc(Sci_PositionU uiStartPos, Sci_Position iLength, int iInitStyle, WordList *wlKeywords[], Accessor &accStyler, bool bCaseSensitive) { int iParenthesesLevel = 0; // Parenthese Level int iColumn1Label = false; // Label starts in Column 1 @@ -521,13 +521,13 @@ static void ColouriseClarionDoc(unsigned int uiStartPos, int iLength, int iInitS } // Clarion Language Case Sensitive Colouring Procedure -static void ColouriseClarionDocSensitive(unsigned int uiStartPos, int iLength, int iInitStyle, WordList *wlKeywords[], Accessor &accStyler) { +static void ColouriseClarionDocSensitive(Sci_PositionU uiStartPos, Sci_Position iLength, int iInitStyle, WordList *wlKeywords[], Accessor &accStyler) { ColouriseClarionDoc(uiStartPos, iLength, iInitStyle, wlKeywords, accStyler, true); } // Clarion Language Case Insensitive Colouring Procedure -static void ColouriseClarionDocInsensitive(unsigned int uiStartPos, int iLength, int iInitStyle, WordList *wlKeywords[], Accessor &accStyler) { +static void ColouriseClarionDocInsensitive(Sci_PositionU uiStartPos, Sci_Position iLength, int iInitStyle, WordList *wlKeywords[], Accessor &accStyler) { ColouriseClarionDoc(uiStartPos, iLength, iInitStyle, wlKeywords, accStyler, false); } @@ -599,7 +599,7 @@ static int ClassifyClarionFoldPoint(int iLevel, const char* szString) { } // Clarion Language Folding Procedure -static void FoldClarionDoc(unsigned int uiStartPos, int iLength, int iInitStyle, WordList *[], Accessor &accStyler) { +static void FoldClarionDoc(Sci_PositionU uiStartPos, Sci_Position iLength, int iInitStyle, WordList *[], Accessor &accStyler) { unsigned int uiEndPos = uiStartPos + iLength; int iLineCurrent = accStyler.GetLine(uiStartPos); diff --git a/lexers/LexCOBOL.cxx b/lexers/LexCOBOL.cxx index a937690d8..bce06623a 100644 --- a/lexers/LexCOBOL.cxx +++ b/lexers/LexCOBOL.cxx @@ -142,7 +142,7 @@ static int classifyWordCOBOL(unsigned int start, unsigned int end, /*WordList &k return ret; } -static void ColouriseCOBOLDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], +static void ColouriseCOBOLDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { styler.StartAt(startPos); @@ -309,7 +309,7 @@ static void ColouriseCOBOLDoc(unsigned int startPos, int length, int initStyle, ColourTo(styler, lengthDoc - 1, state); } -static void FoldCOBOLDoc(unsigned int startPos, int length, int, WordList *[], +static void FoldCOBOLDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) { bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; unsigned int endPos = startPos + length; diff --git a/lexers/LexCSS.cxx b/lexers/LexCSS.cxx index 036bb2e0a..b56aff31b 100644 --- a/lexers/LexCSS.cxx +++ b/lexers/LexCSS.cxx @@ -73,7 +73,7 @@ inline int NestingLevelLookBehind(unsigned int startPos, Accessor &styler) { return nestingLevel; } -static void ColouriseCssDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], Accessor &styler) { +static void ColouriseCssDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { WordList &css1Props = *keywordlists[0]; WordList &pseudoClasses = *keywordlists[1]; WordList &css2Props = *keywordlists[2]; @@ -502,7 +502,7 @@ static void ColouriseCssDoc(unsigned int startPos, int length, int initStyle, Wo sc.Complete(); } -static void FoldCSSDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) { +static void FoldCSSDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) { bool foldComment = styler.GetPropertyInt("fold.comment") != 0; bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; unsigned int endPos = startPos + length; diff --git a/lexers/LexCaml.cxx b/lexers/LexCaml.cxx index f576e3e23..4cc0bd7df 100644 --- a/lexers/LexCaml.cxx +++ b/lexers/LexCaml.cxx @@ -66,18 +66,18 @@ using namespace Scintilla; #endif static void ColouriseCamlDoc( - unsigned int startPos, int length, + Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler); static void FoldCamlDoc( - unsigned int startPos, int length, + Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler); -static void InternalLexOrFold(int lexOrFold, unsigned int startPos, int length, +static void InternalLexOrFold(int lexOrFold, Sci_PositionU startPos, Sci_Position length, int initStyle, char *words[], WindowID window, char *props); static const char* LexerName = "caml"; @@ -109,7 +109,7 @@ long Platform::SendScintillaPointer(WindowID w, unsigned int msg, unsigned long reinterpret_cast<LPARAM>(lParam)); } -void EXT_LEXER_DECL Fold(unsigned int lexer, unsigned int startPos, int length, +void EXT_LEXER_DECL Fold(unsigned int lexer, Sci_PositionU startPos, Sci_Position length, int initStyle, char *words[], WindowID window, char *props) { // below useless evaluation(s) to supress "not used" warnings @@ -138,7 +138,7 @@ void EXT_LEXER_DECL GetLexerName(unsigned int Index, char *name, int buflength) } } -void EXT_LEXER_DECL Lex(unsigned int lexer, unsigned int startPos, int length, +void EXT_LEXER_DECL Lex(unsigned int lexer, Sci_PositionU startPos, Sci_Position length, int initStyle, char *words[], WindowID window, char *props) { // below useless evaluation(s) to supress "not used" warnings @@ -147,7 +147,7 @@ void EXT_LEXER_DECL Lex(unsigned int lexer, unsigned int startPos, int length, InternalLexOrFold(0, startPos, length, initStyle, words, window, props); } -static void InternalLexOrFold(int foldOrLex, unsigned int startPos, int length, +static void InternalLexOrFold(int foldOrLex, Sci_PositionU startPos, Sci_Position length, int initStyle, char *words[], WindowID window, char *props) { // create and initialize a WindowAccessor (including contained PropSet) @@ -180,7 +180,7 @@ static #endif /* BUILD_AS_EXTERNAL_LEXER */ void ColouriseCamlDoc( - unsigned int startPos, int length, + Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) diff --git a/lexers/LexCmake.cxx b/lexers/LexCmake.cxx index fb79abf26..4bfc5adb0 100644 --- a/lexers/LexCmake.cxx +++ b/lexers/LexCmake.cxx @@ -162,7 +162,7 @@ static int classifyWordCmake(unsigned int start, unsigned int end, WordList *key return SCE_CMAKE_DEFAULT; } -static void ColouriseCmakeDoc(unsigned int startPos, int length, int, WordList *keywordLists[], Accessor &styler) +static void ColouriseCmakeDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *keywordLists[], Accessor &styler) { int state = SCE_CMAKE_DEFAULT; if ( startPos > 0 ) @@ -377,7 +377,7 @@ static void ColouriseCmakeDoc(unsigned int startPos, int length, int, WordList * styler.ColourTo(nLengthDoc-1,state); } -static void FoldCmakeDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) +static void FoldCmakeDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) { // No folding enabled, no reason to continue... if ( styler.GetPropertyInt("fold") == 0 ) diff --git a/lexers/LexCoffeeScript.cxx b/lexers/LexCoffeeScript.cxx index 166768321..0cd86e838 100644 --- a/lexers/LexCoffeeScript.cxx +++ b/lexers/LexCoffeeScript.cxx @@ -80,7 +80,7 @@ static bool followsReturnKeyword(StyleContext &sc, Accessor &styler) { return !*s; } -static void ColouriseCoffeeScriptDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], +static void ColouriseCoffeeScriptDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { WordList &keywords = *keywordlists[0]; @@ -281,7 +281,7 @@ static bool IsCommentLine(int line, Accessor &styler) { return false; } -static void FoldCoffeeScriptDoc(unsigned int startPos, int length, int, +static void FoldCoffeeScriptDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) { // A simplified version of FoldPyDoc const int maxPos = startPos + length; diff --git a/lexers/LexConf.cxx b/lexers/LexConf.cxx index 6a1c8c018..f41e623cc 100644 --- a/lexers/LexConf.cxx +++ b/lexers/LexConf.cxx @@ -31,7 +31,7 @@ using namespace Scintilla; #endif -static void ColouriseConfDoc(unsigned int startPos, int length, int, WordList *keywordLists[], Accessor &styler) +static void ColouriseConfDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *keywordLists[], Accessor &styler) { int state = SCE_CONF_DEFAULT; char chNext = styler[startPos]; diff --git a/lexers/LexCrontab.cxx b/lexers/LexCrontab.cxx index ad6668fa7..3bc20f11f 100644 --- a/lexers/LexCrontab.cxx +++ b/lexers/LexCrontab.cxx @@ -29,7 +29,7 @@ using namespace Scintilla; #endif -static void ColouriseNncrontabDoc(unsigned int startPos, int length, int, WordList +static void ColouriseNncrontabDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *keywordLists[], Accessor &styler) { int state = SCE_NNCRONTAB_DEFAULT; diff --git a/lexers/LexCsound.cxx b/lexers/LexCsound.cxx index da5bfeb8c..292eb15c7 100644 --- a/lexers/LexCsound.cxx +++ b/lexers/LexCsound.cxx @@ -51,7 +51,7 @@ static inline bool IsCsoundOperator(char ch) { return false; } -static void ColouriseCsoundDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], +static void ColouriseCsoundDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { WordList &opcode = *keywordlists[0]; @@ -150,7 +150,7 @@ static void ColouriseCsoundDoc(unsigned int startPos, int length, int initStyle, sc.Complete(); } -static void FoldCsoundInstruments(unsigned int startPos, int length, int /* initStyle */, WordList *[], +static void FoldCsoundInstruments(Sci_PositionU startPos, Sci_Position length, int /* initStyle */, WordList *[], Accessor &styler) { unsigned int lengthDoc = startPos + length; int visibleChars = 0; diff --git a/lexers/LexDMAP.cxx b/lexers/LexDMAP.cxx index 431000a4e..8f3706b77 100644 --- a/lexers/LexDMAP.cxx +++ b/lexers/LexDMAP.cxx @@ -38,7 +38,7 @@ 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]; @@ -151,7 +151,7 @@ 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; diff --git a/lexers/LexDiff.cxx b/lexers/LexDiff.cxx index 46e45263a..79062396f 100644 --- a/lexers/LexDiff.cxx +++ b/lexers/LexDiff.cxx @@ -91,7 +91,7 @@ static void ColouriseDiffLine(char *lineBuffer, int endLine, Accessor &styler) { } } -static void ColouriseDiffDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) { +static void ColouriseDiffDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) { char lineBuffer[DIFF_BUFFER_START_SIZE] = ""; styler.StartAt(startPos); styler.StartSegment(startPos); @@ -117,7 +117,7 @@ static void ColouriseDiffDoc(unsigned int startPos, int length, int, WordList *[ } } -static void FoldDiffDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) { +static void FoldDiffDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) { int curLine = styler.GetLine(startPos); int curLineStart = styler.LineStart(curLine); int prevLevel = curLine > 0 ? styler.LevelAt(curLine - 1) : SC_FOLDLEVELBASE; diff --git a/lexers/LexECL.cxx b/lexers/LexECL.cxx index d8065f722..9f47b01a0 100644 --- a/lexers/LexECL.cxx +++ b/lexers/LexECL.cxx @@ -62,7 +62,7 @@ static bool IsSpaceEquiv(int state) { } } -static void ColouriseEclDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], +static void ColouriseEclDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { WordList &keywords0 = *keywordlists[0]; WordList &keywords1 = *keywordlists[1]; @@ -405,7 +405,7 @@ bool MatchNoCase(Accessor & styler, unsigned int & pos, const char *s) { // Store both the current line's fold level and the next lines in the // level store to make it easy to pick up with each increment // and to make it possible to fiddle the current level for "} else {". -static void FoldEclDoc(unsigned int startPos, int length, int initStyle, +static void FoldEclDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *[], Accessor &styler) { bool foldComment = true; bool foldPreprocessor = true; diff --git a/lexers/LexEScript.cxx b/lexers/LexEScript.cxx index 28466bc8e..60fd31da9 100644 --- a/lexers/LexEScript.cxx +++ b/lexers/LexEScript.cxx @@ -37,7 +37,7 @@ static inline bool IsAWordStart(const int ch) { -static void ColouriseESCRIPTDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], +static void ColouriseESCRIPTDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { WordList &keywords = *keywordlists[0]; @@ -176,7 +176,7 @@ static bool IsStreamCommentStyle(int style) { style == SCE_ESCRIPT_COMMENTLINE; } -static void FoldESCRIPTDoc(unsigned int startPos, int length, int initStyle, WordList *[], Accessor &styler) { +static void FoldESCRIPTDoc(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; diff --git a/lexers/LexEiffel.cxx b/lexers/LexEiffel.cxx index 067801ca8..94ebab35b 100644 --- a/lexers/LexEiffel.cxx +++ b/lexers/LexEiffel.cxx @@ -46,8 +46,8 @@ static inline bool IsAWordStart(unsigned int ch) { return (ch < 0x80) && (isalnum(ch) || ch == '_'); } -static void ColouriseEiffelDoc(unsigned int startPos, - int length, +static void ColouriseEiffelDoc(Sci_PositionU startPos, + Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { @@ -118,11 +118,11 @@ static void ColouriseEiffelDoc(unsigned int startPos, sc.Complete(); } -static bool IsEiffelComment(Accessor &styler, int pos, int len) { +static bool IsEiffelComment(Accessor &styler, Sci_Position pos, Sci_Position len) { return len>1 && styler[pos]=='-' && styler[pos+1]=='-'; } -static void FoldEiffelDocIndent(unsigned int startPos, int length, int, +static void FoldEiffelDocIndent(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) { int lengthDoc = startPos + length; @@ -164,7 +164,7 @@ static void FoldEiffelDocIndent(unsigned int startPos, int length, int, } } -static void FoldEiffelDocKeyWords(unsigned int startPos, int length, int /* initStyle */, WordList *[], +static void FoldEiffelDocKeyWords(Sci_PositionU startPos, Sci_Position length, int /* initStyle */, WordList *[], Accessor &styler) { unsigned int lengthDoc = startPos + length; int visibleChars = 0; diff --git a/lexers/LexErlang.cxx b/lexers/LexErlang.cxx index 5f5225859..b4dd6e484 100644 --- a/lexers/LexErlang.cxx +++ b/lexers/LexErlang.cxx @@ -75,7 +75,7 @@ static inline bool IsAWordChar(const int ch) { return (ch < 0x80) && (ch != ' ') && (isalnum(ch) || ch == '_'); } -static void ColouriseErlangDoc(unsigned int startPos, int length, int initStyle, +static void ColouriseErlangDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { StyleContext sc(startPos, length, initStyle, styler); @@ -521,7 +521,7 @@ static int ClassifyErlangFoldPoint( } static void FoldErlangDoc( - unsigned int startPos, int length, int initStyle, + Sci_PositionU startPos, Sci_Position length, int initStyle, WordList** /*keywordlists*/, Accessor &styler ) { unsigned int endPos = startPos + length; diff --git a/lexers/LexErrorList.cxx b/lexers/LexErrorList.cxx index f4a1db270..50fbfdc6e 100644 --- a/lexers/LexErrorList.cxx +++ b/lexers/LexErrorList.cxx @@ -275,7 +275,7 @@ static void ColouriseErrorListLine( } } -static void ColouriseErrorListDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) { +static void ColouriseErrorListDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) { char lineBuffer[10000]; styler.StartAt(startPos); styler.StartSegment(startPos); diff --git a/lexers/LexFlagship.cxx b/lexers/LexFlagship.cxx index b8568b05a..b355423e5 100644 --- a/lexers/LexFlagship.cxx +++ b/lexers/LexFlagship.cxx @@ -37,7 +37,7 @@ static inline bool IsAWordChar(int ch) (isalnum(ch) || ch == '_'); } -static void ColouriseFlagShipDoc(unsigned int startPos, int length, int initStyle, +static void ColouriseFlagShipDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { @@ -302,7 +302,7 @@ static void ColouriseFlagShipDoc(unsigned int startPos, int length, int initStyl sc.Complete(); } -static void FoldFlagShipDoc(unsigned int startPos, int length, int, +static void FoldFlagShipDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) { diff --git a/lexers/LexForth.cxx b/lexers/LexForth.cxx index 7b41aaf8e..9e9c3b540 100644 --- a/lexers/LexForth.cxx +++ b/lexers/LexForth.cxx @@ -39,7 +39,7 @@ static inline bool IsASpaceChar(int ch) { return (ch < 0x80) && isspace(ch); } -static void ColouriseForthDoc(unsigned int startPos, int length, int initStyle, WordList *keywordLists[], +static void ColouriseForthDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordLists[], Accessor &styler) { WordList &control = *keywordLists[0]; diff --git a/lexers/LexFortran.cxx b/lexers/LexFortran.cxx index 387ed84ed..4acf2d7f3 100644 --- a/lexers/LexFortran.cxx +++ b/lexers/LexFortran.cxx @@ -59,7 +59,7 @@ static unsigned int GetContinuedPos(unsigned int pos, Accessor &styler) { } } /***************************************/ -static void ColouriseFortranDoc(unsigned int startPos, int length, int initStyle, +static void ColouriseFortranDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler, bool isFixFormat) { WordList &keywords = *keywordlists[0]; WordList &keywords2 = *keywordlists[1]; @@ -295,7 +295,7 @@ static int classifyFoldPointFortran(const char* s, const char* prevWord, const c } /***************************************/ // Folding the code -static void FoldFortranDoc(unsigned int startPos, int length, int initStyle, +static void FoldFortranDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, Accessor &styler, bool isFixFormat) { // // bool foldComment = styler.GetPropertyInt("fold.comment") != 0; @@ -490,22 +490,22 @@ static const char * const FortranWordLists[] = { 0, }; /***************************************/ -static void ColouriseFortranDocFreeFormat(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], +static void ColouriseFortranDocFreeFormat(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { ColouriseFortranDoc(startPos, length, initStyle, keywordlists, styler, false); } /***************************************/ -static void ColouriseFortranDocFixFormat(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], +static void ColouriseFortranDocFixFormat(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { ColouriseFortranDoc(startPos, length, initStyle, keywordlists, styler, true); } /***************************************/ -static void FoldFortranDocFreeFormat(unsigned int startPos, int length, int initStyle, +static void FoldFortranDocFreeFormat(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *[], Accessor &styler) { FoldFortranDoc(startPos, length, initStyle,styler, false); } /***************************************/ -static void FoldFortranDocFixFormat(unsigned int startPos, int length, int initStyle, +static void FoldFortranDocFixFormat(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *[], Accessor &styler) { FoldFortranDoc(startPos, length, initStyle,styler, true); } diff --git a/lexers/LexGAP.cxx b/lexers/LexGAP.cxx index bc0bc2144..413839c45 100644 --- a/lexers/LexGAP.cxx +++ b/lexers/LexGAP.cxx @@ -48,7 +48,7 @@ static void GetRange(unsigned int start, unsigned int end, Accessor &styler, cha s[i] = '\0'; } -static void ColouriseGAPDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], Accessor &styler) { +static void ColouriseGAPDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { WordList &keywords1 = *keywordlists[0]; WordList &keywords2 = *keywordlists[1]; @@ -197,7 +197,7 @@ static int ClassifyFoldPointGAP(const char* s) { return level; } -static void FoldGAPDoc( unsigned int startPos, int length, int initStyle, WordList** , Accessor &styler) { +static void FoldGAPDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList**, Accessor &styler) { unsigned int endPos = startPos + length; int visibleChars = 0; int lineCurrent = styler.GetLine(startPos); diff --git a/lexers/LexGui4Cli.cxx b/lexers/LexGui4Cli.cxx index 0b33d2d7c..4cba4ceff 100644 --- a/lexers/LexGui4Cli.cxx +++ b/lexers/LexGui4Cli.cxx @@ -119,7 +119,7 @@ static void colorFirstWord(WordList *keywordlists[], Accessor &styler, // Main colorizing function called by Scintilla static void -ColouriseGui4CliDoc(unsigned int startPos, int length, int initStyle, +ColouriseGui4CliDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { styler.StartAt(startPos); @@ -243,7 +243,7 @@ ColouriseGui4CliDoc(unsigned int startPos, int length, int initStyle, } // Main folding function called by Scintilla - (based on props (.ini) files function) -static void FoldGui4Cli(unsigned int startPos, int length, int, +static void FoldGui4Cli(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) { bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; diff --git a/lexers/LexHTML.cxx b/lexers/LexHTML.cxx index 02047930c..ba536c46d 100644 --- a/lexers/LexHTML.cxx +++ b/lexers/LexHTML.cxx @@ -567,7 +567,7 @@ static int FindPhpStringDelimiter(char *phpStringDelimiter, const int phpStringD return j - 1; } -static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], +static void ColouriseHyperTextDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler, bool isXml) { WordList &keywords = *keywordlists[0]; WordList &keywords2 = *keywordlists[1]; @@ -2148,19 +2148,19 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty } } -static void ColouriseXMLDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], +static void ColouriseXMLDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { // Passing in true because we're lexing XML ColouriseHyperTextDoc(startPos, length, initStyle, keywordlists, styler, true); } -static void ColouriseHTMLDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], +static void ColouriseHTMLDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { // Passing in false because we're notlexing XML ColouriseHyperTextDoc(startPos, length, initStyle, keywordlists, styler, false); } -static void ColourisePHPScriptDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], +static void ColourisePHPScriptDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { if (startPos == 0) initStyle = SCE_HPHP_DEFAULT; diff --git a/lexers/LexHex.cxx b/lexers/LexHex.cxx index fe972ffe8..1799624fa 100644 --- a/lexers/LexHex.cxx +++ b/lexers/LexHex.cxx @@ -645,7 +645,7 @@ static int CalcTEHexChecksum(unsigned int recStartPos, Accessor &styler) } -static void ColouriseSrecDoc(unsigned int startPos, int length, int initStyle, WordList *[], Accessor &styler) +static void ColouriseSrecDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *[], Accessor &styler) { StyleContext sc(startPos, length, initStyle, styler); @@ -769,7 +769,7 @@ static void ColouriseSrecDoc(unsigned int startPos, int length, int initStyle, W sc.Complete(); } -static void ColouriseIHexDoc(unsigned int startPos, int length, int initStyle, WordList *[], Accessor &styler) +static void ColouriseIHexDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *[], Accessor &styler) { StyleContext sc(startPos, length, initStyle, styler); @@ -890,7 +890,7 @@ static void ColouriseIHexDoc(unsigned int startPos, int length, int initStyle, W sc.Complete(); } -static void FoldIHexDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) +static void FoldIHexDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) { unsigned int endPos = startPos + length; @@ -933,7 +933,7 @@ static void FoldIHexDoc(unsigned int startPos, int length, int, WordList *[], Ac } } -static void ColouriseTEHexDoc(unsigned int startPos, int length, int initStyle, WordList *[], Accessor &styler) +static void ColouriseTEHexDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *[], Accessor &styler) { StyleContext sc(startPos, length, initStyle, styler); diff --git a/lexers/LexInno.cxx b/lexers/LexInno.cxx index 63fadf0ba..d9b481f2a 100644 --- a/lexers/LexInno.cxx +++ b/lexers/LexInno.cxx @@ -27,7 +27,7 @@ using namespace Scintilla; #endif -static void ColouriseInnoDoc(unsigned int startPos, int length, int, WordList *keywordLists[], Accessor &styler) { +static void ColouriseInnoDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *keywordLists[], Accessor &styler) { int state = SCE_INNO_DEFAULT; char chPrev; char ch = 0; @@ -248,7 +248,7 @@ static const char * const innoWordListDesc[] = { 0 }; -static void FoldInnoDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) { +static void FoldInnoDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) { unsigned int endPos = startPos + length; char chNext = styler[startPos]; diff --git a/lexers/LexKVIrc.cxx b/lexers/LexKVIrc.cxx index 958a2cf67..5aa35cf99 100644 --- a/lexers/LexKVIrc.cxx +++ b/lexers/LexKVIrc.cxx @@ -49,7 +49,7 @@ static inline bool IsAWordStart(int ch) { /* Interface function called by Scintilla to request some text to be syntax highlighted */ -static void ColouriseKVIrcDoc(unsigned int startPos, int length, +static void ColouriseKVIrcDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { @@ -355,7 +355,7 @@ static void ColouriseKVIrcDoc(unsigned int startPos, int length, sc.Complete(); } -static void FoldKVIrcDoc(unsigned int startPos, int length, int /*initStyle - unused*/, +static void FoldKVIrcDoc(Sci_PositionU startPos, Sci_Position length, int /*initStyle - unused*/, WordList *[], Accessor &styler) { /* Based on CMake's folder */ diff --git a/lexers/LexKix.cxx b/lexers/LexKix.cxx index dc509e4ca..82ff9a54b 100644 --- a/lexers/LexKix.cxx +++ b/lexers/LexKix.cxx @@ -37,7 +37,7 @@ static inline bool IsOperator(const int ch) { return (ch == '+' || ch == '-' || ch == '*' || ch == '/' || ch == '&' || ch == '|' || ch == '<' || ch == '>' || ch == '='); } -static void ColouriseKixDoc(unsigned int startPos, int length, int initStyle, +static void ColouriseKixDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { WordList &keywords = *keywordlists[0]; diff --git a/lexers/LexLisp.cxx b/lexers/LexLisp.cxx index 8dd6bd9c4..aba094cfa 100644 --- a/lexers/LexLisp.cxx +++ b/lexers/LexLisp.cxx @@ -74,7 +74,7 @@ static void classifyWordLisp(unsigned int start, unsigned int end, WordList &key } -static void ColouriseLispDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], +static void ColouriseLispDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { WordList &keywords = *keywordlists[0]; @@ -233,7 +233,7 @@ static void ColouriseLispDoc(unsigned int startPos, int length, int initStyle, W styler.ColourTo(lengthDoc - 1, state); } -static void FoldLispDoc(unsigned int startPos, int length, int /* initStyle */, WordList *[], +static void FoldLispDoc(Sci_PositionU startPos, Sci_Position length, int /* initStyle */, WordList *[], Accessor &styler) { unsigned int lengthDoc = startPos + length; int visibleChars = 0; diff --git a/lexers/LexLout.cxx b/lexers/LexLout.cxx index 83eb97ec8..e0458218d 100644 --- a/lexers/LexLout.cxx +++ b/lexers/LexLout.cxx @@ -40,7 +40,7 @@ static inline bool IsAnOther(const int ch) { ch == ']' || ch == '^' || ch == '`' || ch == '|' || ch == '~'); } -static void ColouriseLoutDoc(unsigned int startPos, int length, int initStyle, +static void ColouriseLoutDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { WordList &keywords = *keywordlists[0]; @@ -140,7 +140,7 @@ static void ColouriseLoutDoc(unsigned int startPos, int length, int initStyle, sc.Complete(); } -static void FoldLoutDoc(unsigned int startPos, int length, int, WordList *[], +static void FoldLoutDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) { unsigned int endPos = startPos + length; diff --git a/lexers/LexLua.cxx b/lexers/LexLua.cxx index fd0d70fd4..7ef4a9080 100644 --- a/lexers/LexLua.cxx +++ b/lexers/LexLua.cxx @@ -42,8 +42,8 @@ static int LongDelimCheck(StyleContext &sc) { } static void ColouriseLuaDoc( - unsigned int startPos, - int length, + Sci_PositionU startPos, + Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { @@ -347,7 +347,7 @@ static void ColouriseLuaDoc( sc.Complete(); } -static void FoldLuaDoc(unsigned int startPos, int length, int /* initStyle */, WordList *[], +static void FoldLuaDoc(Sci_PositionU startPos, Sci_Position length, int /* initStyle */, WordList *[], Accessor &styler) { unsigned int lengthDoc = startPos + length; int visibleChars = 0; diff --git a/lexers/LexMMIXAL.cxx b/lexers/LexMMIXAL.cxx index a766d5aad..2a152b8a8 100644 --- a/lexers/LexMMIXAL.cxx +++ b/lexers/LexMMIXAL.cxx @@ -47,7 +47,7 @@ inline bool isMMIXALOperator(char ch) { return false; } -static void ColouriseMMIXALDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], +static void ColouriseMMIXALDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { WordList &opcodes = *keywordlists[0]; diff --git a/lexers/LexMPT.cxx b/lexers/LexMPT.cxx index f3443e1ec..cbb45e3c4 100644 --- a/lexers/LexMPT.cxx +++ b/lexers/LexMPT.cxx @@ -80,7 +80,7 @@ static int GetLotLineState(std::string &line) { } } -static void ColourizeLotDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) { +static void ColourizeLotDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) { styler.StartAt(startPos); styler.StartSegment(startPos); bool atLineStart = true;// Arms the 'at line start' flag @@ -118,7 +118,7 @@ static void ColourizeLotDoc(unsigned int startPos, int length, int, WordList *[] // sections (headed by a set line) // passes (contiguous pass results within a section) // fails (contiguous fail results within a section) -static void FoldLotDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) { +static void FoldLotDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) { bool foldCompact = styler.GetPropertyInt("fold.compact", 0) != 0; unsigned int endPos = startPos + length; int visibleChars = 0; diff --git a/lexers/LexMSSQL.cxx b/lexers/LexMSSQL.cxx index f5b87a0a0..71a9e62e4 100644 --- a/lexers/LexMSSQL.cxx +++ b/lexers/LexMSSQL.cxx @@ -101,7 +101,7 @@ static char classifyWordSQL(unsigned int start, return chAttr; } -static void ColouriseMSSQLDoc(unsigned int startPos, int length, +static void ColouriseMSSQLDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { @@ -277,7 +277,7 @@ static void ColouriseMSSQLDoc(unsigned int startPos, int length, styler.ColourTo(lengthDoc - 1, state); } -static void FoldMSSQLDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) { +static void FoldMSSQLDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) { bool foldComment = styler.GetPropertyInt("fold.comment") != 0; bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; unsigned int endPos = startPos + length; diff --git a/lexers/LexMagik.cxx b/lexers/LexMagik.cxx index 992080dd8..02d457d55 100644 --- a/lexers/LexMagik.cxx +++ b/lexers/LexMagik.cxx @@ -87,7 +87,7 @@ static inline bool IsAlNumSym(int ch) { * \param keywordslists The keywordslists, currently, number 5 is used * \param styler The styler */ -static void ColouriseMagikDoc(unsigned int startPos, int length, int initStyle, +static void ColouriseMagikDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { styler.StartAt(startPos); @@ -359,7 +359,7 @@ static inline int IsFoldingContainer(WordList &keywordslist, char * keyword) { * \param keywordslists The keywordslists, currently, number 5 is used * \param styler The styler */ -static void FoldMagikDoc(unsigned int startPos, int length, int, +static void FoldMagikDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *keywordslists[], Accessor &styler) { bool compact = styler.GetPropertyInt("fold.compact") != 0; diff --git a/lexers/LexMake.cxx b/lexers/LexMake.cxx index 3ab172682..7af782acf 100644 --- a/lexers/LexMake.cxx +++ b/lexers/LexMake.cxx @@ -116,7 +116,7 @@ static void ColouriseMakeLine( } } -static void ColouriseMakeDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) { +static void ColouriseMakeDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) { char lineBuffer[1024]; styler.StartAt(startPos); styler.StartSegment(startPos); diff --git a/lexers/LexMarkdown.cxx b/lexers/LexMarkdown.cxx index c774b736f..a587ca845 100644 --- a/lexers/LexMarkdown.cxx +++ b/lexers/LexMarkdown.cxx @@ -143,7 +143,7 @@ static bool IsValidHrule(const unsigned int endPos, StyleContext &sc) { } } -static void ColorizeMarkdownDoc(unsigned int startPos, int length, int initStyle, +static void ColorizeMarkdownDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList **, Accessor &styler) { unsigned int endPos = startPos + length; int precharCount = 0; diff --git a/lexers/LexMatlab.cxx b/lexers/LexMatlab.cxx index 4dfd512c8..8bf94fe29 100644 --- a/lexers/LexMatlab.cxx +++ b/lexers/LexMatlab.cxx @@ -49,16 +49,16 @@ static bool IsOctaveCommentChar(int c) { return (c == '%' || c == '#') ; } -static bool IsMatlabComment(Accessor &styler, int pos, int len) { +static bool IsMatlabComment(Accessor &styler, Sci_Position pos, Sci_Position len) { return len > 0 && IsMatlabCommentChar(styler[pos]) ; } -static bool IsOctaveComment(Accessor &styler, int pos, int len) { +static bool IsOctaveComment(Accessor &styler, Sci_Position pos, Sci_Position len) { return len > 0 && IsOctaveCommentChar(styler[pos]) ; } static void ColouriseMatlabOctaveDoc( - unsigned int startPos, int length, int initStyle, + Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler, bool (*IsCommentChar)(int), bool ismatlab) { @@ -235,19 +235,19 @@ static void ColouriseMatlabOctaveDoc( sc.Complete(); } -static void ColouriseMatlabDoc(unsigned int startPos, int length, int initStyle, +static void ColouriseMatlabDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { ColouriseMatlabOctaveDoc(startPos, length, initStyle, keywordlists, styler, IsMatlabCommentChar, true); } -static void ColouriseOctaveDoc(unsigned int startPos, int length, int initStyle, +static void ColouriseOctaveDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { ColouriseMatlabOctaveDoc(startPos, length, initStyle, keywordlists, styler, IsOctaveCommentChar, false); } -static void FoldMatlabOctaveDoc(unsigned int startPos, int length, int, +static void FoldMatlabOctaveDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler, - bool (*IsComment)(Accessor&, int, int)) { + bool(*IsComment)(Accessor&, Sci_Position, Sci_Position)) { int endPos = startPos + length; @@ -289,12 +289,12 @@ static void FoldMatlabOctaveDoc(unsigned int startPos, int length, int, } } -static void FoldMatlabDoc(unsigned int startPos, int length, int initStyle, +static void FoldMatlabDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { FoldMatlabOctaveDoc(startPos, length, initStyle, keywordlists, styler, IsMatlabComment); } -static void FoldOctaveDoc(unsigned int startPos, int length, int initStyle, +static void FoldOctaveDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { FoldMatlabOctaveDoc(startPos, length, initStyle, keywordlists, styler, IsOctaveComment); } diff --git a/lexers/LexMetapost.cxx b/lexers/LexMetapost.cxx index d049521cf..8f8da1344 100644 --- a/lexers/LexMetapost.cxx +++ b/lexers/LexMetapost.cxx @@ -119,8 +119,8 @@ static inline bool isMETAPOSTequal(int ch) { } static int CheckMETAPOSTInterface( - unsigned int startPos, - int length, + Sci_PositionU startPos, + Sci_Position length, Accessor &styler, int defaultInterface) { @@ -154,8 +154,8 @@ static int CheckMETAPOSTInterface( } static void ColouriseMETAPOSTDoc( - unsigned int startPos, - int length, + Sci_PositionU startPos, + Sci_Position length, int, WordList *keywordlists[], Accessor &styler) { @@ -351,7 +351,7 @@ static int ParseMetapostWord(unsigned int pos, Accessor &styler, char *word) return length; } -static void FoldMetapostDoc(unsigned int startPos, int length, int, WordList *keywordlists[], Accessor &styler) +static void FoldMetapostDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *keywordlists[], Accessor &styler) { bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; unsigned int endPos = startPos+length; diff --git a/lexers/LexModula.cxx b/lexers/LexModula.cxx index c14d40d90..f2014d0fe 100644 --- a/lexers/LexModula.cxx +++ b/lexers/LexModula.cxx @@ -174,8 +174,8 @@ static inline bool checkKeyIdentOper( return true; } -static void FoldModulaDoc( unsigned int startPos, - int length, +static void FoldModulaDoc( Sci_PositionU startPos, + Sci_Position length, int , WordList *[], Accessor &styler) { @@ -325,8 +325,8 @@ static inline bool skipWhiteSpaces( StyleContext & sc ) { return true; } -static void ColouriseModulaDoc( unsigned int startPos, - int length, +static void ColouriseModulaDoc( Sci_PositionU startPos, + Sci_Position length, int initStyle, WordList *wl[], Accessor &styler ) { diff --git a/lexers/LexMySQL.cxx b/lexers/LexMySQL.cxx index b873ccda1..8d7dc802e 100644 --- a/lexers/LexMySQL.cxx +++ b/lexers/LexMySQL.cxx @@ -105,7 +105,7 @@ static void ForwardDefaultState(StyleContext& sc, int activeState) sc.ForwardSetState(SCE_MYSQL_HIDDENCOMMAND); } -static void ColouriseMySQLDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], +static void ColouriseMySQLDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { StyleContext sc(startPos, length, initStyle, styler, 127); @@ -343,7 +343,7 @@ bool MatchIgnoreCase(Accessor &styler, int currentPos, const char *s) // Store both the current line's fold level and the next lines in the // level store to make it easy to pick up with each increment. -static void FoldMySQLDoc(unsigned int startPos, int length, int initStyle, WordList *[], Accessor &styler) +static void FoldMySQLDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *[], Accessor &styler) { bool foldComment = styler.GetPropertyInt("fold.comment") != 0; bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; diff --git a/lexers/LexNimrod.cxx b/lexers/LexNimrod.cxx index 08b76fe69..e02203e24 100644 --- a/lexers/LexNimrod.cxx +++ b/lexers/LexNimrod.cxx @@ -179,7 +179,7 @@ static int scanNumber(Accessor &styler, int pos) { /* rewritten from scratch, because I couldn't get rid of the bugs... (A character based approach sucks!) */ -static void ColouriseNimrodDoc(unsigned int startPos, int length, int initStyle, +static void ColouriseNimrodDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { int pos = startPos; int max = startPos + length; @@ -283,7 +283,7 @@ static bool IsQuoteLine(int line, Accessor &styler) { } -static void FoldNimrodDoc(unsigned int startPos, int length, +static void FoldNimrodDoc(Sci_PositionU startPos, Sci_Position length, int /*initStyle - unused*/, WordList *[], Accessor &styler) { const int maxPos = startPos + length; diff --git a/lexers/LexNsis.cxx b/lexers/LexNsis.cxx index 970851475..390342c7f 100644 --- a/lexers/LexNsis.cxx +++ b/lexers/LexNsis.cxx @@ -280,7 +280,7 @@ static int classifyWordNsis(unsigned int start, unsigned int end, WordList *keyw return SCE_NSIS_DEFAULT; } -static void ColouriseNsisDoc(unsigned int startPos, int length, int, WordList *keywordLists[], Accessor &styler) +static void ColouriseNsisDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *keywordLists[], Accessor &styler) { int state = SCE_NSIS_DEFAULT; if( startPos > 0 ) @@ -552,7 +552,7 @@ static void ColouriseNsisDoc(unsigned int startPos, int length, int, WordList *k styler.ColourTo(nLengthDoc-1,state); } -static void FoldNsisDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) +static void FoldNsisDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) { // No folding enabled, no reason to continue... if( styler.GetPropertyInt("fold") == 0 ) diff --git a/lexers/LexNull.cxx b/lexers/LexNull.cxx index d5b3b3046..34876775d 100644 --- a/lexers/LexNull.cxx +++ b/lexers/LexNull.cxx @@ -27,7 +27,7 @@ using namespace Scintilla; #endif -static void ColouriseNullDoc(unsigned int startPos, int length, int, WordList *[], +static void ColouriseNullDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) { // Null language means all style bytes are 0 so just mark the end - no need to fill in. if (length > 0) { diff --git a/lexers/LexOScript.cxx b/lexers/LexOScript.cxx index 9daff34d5..d73295292 100644 --- a/lexers/LexOScript.cxx +++ b/lexers/LexOScript.cxx @@ -183,7 +183,7 @@ public: // ------------------------------------------------ // Function colourising an excerpt of OScript code. -static void ColouriseOScriptDoc(unsigned int startPos, int length, +static void ColouriseOScriptDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { // I wonder how whole-line styles ended by EOLN can escape the resetting @@ -451,7 +451,7 @@ static void UpdateKeywordFoldLevel(int &levelCurrent, unsigned int lastStart, // ------------------------------ // Function folding OScript code. -static void FoldOScriptDoc(unsigned int startPos, int length, int initStyle, +static void FoldOScriptDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *[], Accessor &styler) { bool foldComment = styler.GetPropertyInt("fold.comment") != 0; bool foldPreprocessor = styler.GetPropertyInt("fold.preprocessor") != 0; diff --git a/lexers/LexOpal.cxx b/lexers/LexOpal.cxx index df487e63a..9f6b42a0b 100644 --- a/lexers/LexOpal.cxx +++ b/lexers/LexOpal.cxx @@ -408,7 +408,7 @@ inline bool HandleSkip( unsigned int & cur, unsigned int one_too_much, Accessor } } -static void ColouriseOpalDoc( unsigned int startPos, int length, int initStyle, WordList *keywordlists[], Accessor & styler ) +static void ColouriseOpalDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor & styler) { styler.StartAt( startPos ); styler.StartSegment( startPos ); diff --git a/lexers/LexPB.cxx b/lexers/LexPB.cxx index a7b5690eb..217154c27 100644 --- a/lexers/LexPB.cxx +++ b/lexers/LexPB.cxx @@ -83,7 +83,7 @@ bool MatchUpperCase(Accessor &styler, int pos, const char *s) //Same as styler return true; } -static void ColourisePBDoc(unsigned int startPos, int length, int initStyle,WordList *keywordlists[],Accessor &styler) { +static void ColourisePBDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { WordList &keywords = *keywordlists[0]; @@ -185,7 +185,7 @@ static void ColourisePBDoc(unsigned int startPos, int length, int initStyle,Word //GFA Basic which is dead now. After testing the feature of toggling FOR-NEXT loops, WHILE-WEND loops //and so on too I found this is more disturbing then helping (for me). So if You think in another way //you can (or must) write Your own toggling routine ;-) -static void FoldPBDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) +static void FoldPBDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) { // No folding enabled, no reason to continue... if( styler.GetPropertyInt("fold") == 0 ) diff --git a/lexers/LexPLM.cxx b/lexers/LexPLM.cxx index 747d15894..3783508b9 100644 --- a/lexers/LexPLM.cxx +++ b/lexers/LexPLM.cxx @@ -37,8 +37,8 @@ static void GetRange(unsigned int start, s[i] = '\0'; } -static void ColourisePlmDoc(unsigned int startPos, - int length, +static void ColourisePlmDoc(Sci_PositionU startPos, + Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) @@ -125,8 +125,8 @@ static void ColourisePlmDoc(unsigned int startPos, styler.ColourTo(endPos - 1, state); } -static void FoldPlmDoc(unsigned int startPos, - int length, +static void FoldPlmDoc(Sci_PositionU startPos, + Sci_Position length, int initStyle, WordList *[], Accessor &styler) diff --git a/lexers/LexPO.cxx b/lexers/LexPO.cxx index 7b44107cf..d2532cb2e 100644 --- a/lexers/LexPO.cxx +++ b/lexers/LexPO.cxx @@ -35,7 +35,7 @@ using namespace Scintilla; #endif -static void ColourisePODoc(unsigned int startPos, int length, int initStyle, WordList *[], Accessor &styler) { +static void ColourisePODoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *[], Accessor &styler) { StyleContext sc(startPos, length, initStyle, styler); bool escaped = false; int curLine = styler.GetLine(startPos); @@ -158,7 +158,7 @@ static int FindNextNonEmptyLineState(unsigned int startPos, Accessor &styler) { return 0; } -static void FoldPODoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) { +static void FoldPODoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) { if (! styler.GetPropertyInt("fold")) return; bool foldCompact = styler.GetPropertyInt("fold.compact") != 0; diff --git a/lexers/LexPOV.cxx b/lexers/LexPOV.cxx index 353fbbe0f..c837dd03e 100644 --- a/lexers/LexPOV.cxx +++ b/lexers/LexPOV.cxx @@ -53,8 +53,8 @@ static inline bool IsANumberChar(int ch) { } static void ColourisePovDoc( - unsigned int startPos, - int length, + Sci_PositionU startPos, + Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { @@ -226,8 +226,8 @@ static void ColourisePovDoc( } static void FoldPovDoc( - unsigned int startPos, - int length, + Sci_PositionU startPos, + Sci_Position length, int initStyle, WordList *[], Accessor &styler) { diff --git a/lexers/LexPS.cxx b/lexers/LexPS.cxx index 2c8917dae..3df25344b 100644 --- a/lexers/LexPS.cxx +++ b/lexers/LexPS.cxx @@ -64,8 +64,8 @@ static inline bool IsABase85Char(const int ch) { } static void ColourisePSDoc( - unsigned int startPos, - int length, + Sci_PositionU startPos, + Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { @@ -266,7 +266,7 @@ static void ColourisePSDoc( sc.Complete(); } -static void FoldPSDoc(unsigned int startPos, int length, int, WordList *[], +static void FoldPSDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) { bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; bool foldAtElse = styler.GetPropertyInt("fold.at.else", 0) != 0; diff --git a/lexers/LexPascal.cxx b/lexers/LexPascal.cxx index 3d39f5f44..4c24dab96 100644 --- a/lexers/LexPascal.cxx +++ b/lexers/LexPascal.cxx @@ -214,7 +214,7 @@ static void ClassifyPascalWord(WordList *keywordlists[], StyleContext &sc, int & sc.SetState(SCE_PAS_DEFAULT); } -static void ColourisePascalDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], +static void ColourisePascalDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { bool bSmartHighlighting = styler.GetPropertyInt("lexer.pascal.smart.highlighting", 1) != 0; @@ -516,7 +516,7 @@ static void ClassifyPascalWordFoldPoint(int &levelCurrent, int &lineFoldStateCur } } -static void FoldPascalDoc(unsigned int startPos, int length, int initStyle, WordList *[], +static void FoldPascalDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *[], Accessor &styler) { bool foldComment = styler.GetPropertyInt("fold.comment") != 0; bool foldPreprocessor = styler.GetPropertyInt("fold.preprocessor") != 0; diff --git a/lexers/LexPowerPro.cxx b/lexers/LexPowerPro.cxx index e8a7a6689..3e2a1be79 100644 --- a/lexers/LexPowerPro.cxx +++ b/lexers/LexPowerPro.cxx @@ -128,7 +128,7 @@ static bool IsFunction(Accessor &styler, unsigned int currentPos) { return false; } -static void ColourisePowerProDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], +static void ColourisePowerProDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler, bool caseSensitive) { WordList &keywords = *keywordlists[0]; @@ -360,7 +360,7 @@ static void ColourisePowerProDoc(unsigned int startPos, int length, int initStyl sc.Complete(); } -static void FoldPowerProDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) +static void FoldPowerProDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) { //define the character sets CharacterSet setWordStart(CharacterSet::setAlpha, "_@", 0x80, true); @@ -620,7 +620,7 @@ static const char * const powerProWordLists[] = { 0, }; -static void ColourisePowerProDocWrapper(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], +static void ColourisePowerProDocWrapper(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { ColourisePowerProDoc(startPos, length, initStyle, keywordlists, styler, false); } diff --git a/lexers/LexPowerShell.cxx b/lexers/LexPowerShell.cxx index 1b568c087..7e8c8f1af 100644 --- a/lexers/LexPowerShell.cxx +++ b/lexers/LexPowerShell.cxx @@ -32,7 +32,7 @@ static inline bool IsAWordChar(int ch) { return ch >= 0x80 || isalnum(ch) || ch == '-' || ch == '_'; } -static void ColourisePowerShellDoc(unsigned int startPos, int length, int initStyle, +static void ColourisePowerShellDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { WordList &keywords = *keywordlists[0]; @@ -158,7 +158,7 @@ static void ColourisePowerShellDoc(unsigned int startPos, int length, int initSt // Store both the current line's fold level and the next lines in the // level store to make it easy to pick up with each increment // and to make it possible to fiddle the current level for "} else {". -static void FoldPowerShellDoc(unsigned int startPos, int length, int initStyle, +static void FoldPowerShellDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *[], Accessor &styler) { bool foldComment = styler.GetPropertyInt("fold.comment") != 0; bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; diff --git a/lexers/LexProgress.cxx b/lexers/LexProgress.cxx index 2031720a2..acbdaafe3 100644 --- a/lexers/LexProgress.cxx +++ b/lexers/LexProgress.cxx @@ -43,7 +43,7 @@ static inline bool IsAWordStart(int ch) { enum SentenceStart { SetSentenceStart = 0xf, ResetSentenceStart = 0x10}; // true -> bit = 0 -static void Colourise4glDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], +static void Colourise4glDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { WordList &keywords1 = *keywordlists[0]; // regular keywords @@ -205,7 +205,7 @@ static bool IsStreamCommentStyle(int style) { // Store both the current line's fold level and the next lines in the // level store to make it easy to pick up with each increment // and to make it possible to fiddle the current level for "} else {". -static void FoldNoBox4glDoc(unsigned int startPos, int length, int initStyle, +static void FoldNoBox4glDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, Accessor &styler) { bool foldComment = styler.GetPropertyInt("fold.comment") != 0; bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; @@ -265,7 +265,7 @@ static void FoldNoBox4glDoc(unsigned int startPos, int length, int initStyle, } } -static void Fold4glDoc(unsigned int startPos, int length, int initStyle, WordList *[], +static void Fold4glDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *[], Accessor &styler) { FoldNoBox4glDoc(startPos, length, initStyle, styler); } diff --git a/lexers/LexProps.cxx b/lexers/LexProps.cxx index 3a722506f..c676449c4 100644 --- a/lexers/LexProps.cxx +++ b/lexers/LexProps.cxx @@ -80,7 +80,7 @@ static void ColourisePropsLine( } } -static void ColourisePropsDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) { +static void ColourisePropsDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) { char lineBuffer[1024]; styler.StartAt(startPos); styler.StartSegment(startPos); @@ -110,7 +110,7 @@ static void ColourisePropsDoc(unsigned int startPos, int length, int, WordList * // adaption by ksc, using the "} else {" trick of 1.53 // 030721 -static void FoldPropsDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) { +static void FoldPropsDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) { bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; unsigned int endPos = startPos + length; diff --git a/lexers/LexPython.cxx b/lexers/LexPython.cxx index c12810c03..7e1604e79 100644 --- a/lexers/LexPython.cxx +++ b/lexers/LexPython.cxx @@ -43,7 +43,7 @@ enum literalsAllowed { litNone = 0, litU = 1, litB = 2 }; const int indicatorWhitespace = 1; -bool IsPyComment(Accessor &styler, int pos, int len) { +bool IsPyComment(Accessor &styler, Sci_Position pos, Sci_Position len) { return len > 0 && styler[pos] == '#'; } diff --git a/lexers/LexR.cxx b/lexers/LexR.cxx index f4b451b25..7f0442660 100644 --- a/lexers/LexR.cxx +++ b/lexers/LexR.cxx @@ -50,7 +50,7 @@ static inline bool IsAnOperator(const int ch) { return false; } -static void ColouriseRDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], +static void ColouriseRDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { WordList &keywords = *keywordlists[0]; @@ -146,7 +146,7 @@ static void ColouriseRDoc(unsigned int startPos, int length, int initStyle, Word // Store both the current line's fold level and the next lines in the // level store to make it easy to pick up with each increment // and to make it possible to fiddle the current level for "} else {". -static void FoldRDoc(unsigned int startPos, int length, int, WordList *[], +static void FoldRDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) { bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; bool foldAtElse = styler.GetPropertyInt("fold.at.else", 0) != 0; diff --git a/lexers/LexRebol.cxx b/lexers/LexRebol.cxx index 7d000df04..e048a8304 100644 --- a/lexers/LexRebol.cxx +++ b/lexers/LexRebol.cxx @@ -68,7 +68,7 @@ static inline bool IsBinaryStart(const int ch, const int ch2, const int ch3, con } -static void ColouriseRebolDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], Accessor &styler) { +static void ColouriseRebolDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { WordList &keywords = *keywordlists[0]; WordList &keywords2 = *keywordlists[1]; @@ -273,7 +273,7 @@ static void ColouriseRebolDoc(unsigned int startPos, int length, int initStyle, } -static void FoldRebolDoc(unsigned int startPos, int length, int /* initStyle */, WordList *[], +static void FoldRebolDoc(Sci_PositionU startPos, Sci_Position length, int /* initStyle */, WordList *[], Accessor &styler) { unsigned int lengthDoc = startPos + length; int visibleChars = 0; diff --git a/lexers/LexRuby.cxx b/lexers/LexRuby.cxx index 9529ac24e..c06915144 100644 --- a/lexers/LexRuby.cxx +++ b/lexers/LexRuby.cxx @@ -654,7 +654,7 @@ static void synchronizeDocStart(unsigned int &startPos, initStyle = SCE_RB_DEFAULT; } -static void ColouriseRbDoc(unsigned int startPos, int length, int initStyle, +static void ColouriseRbDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { // Lexer for Ruby often has to backtrack to start of current style to determine @@ -1718,7 +1718,7 @@ static bool IsCommentLine(int line, Accessor &styler) { * Later offer to fold POD, here-docs, strings, and blocks of comments */ -static void FoldRbDoc(unsigned int startPos, int length, int initStyle, +static void FoldRbDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *[], Accessor &styler) { const bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; bool foldComment = styler.GetPropertyInt("fold.comment") != 0; diff --git a/lexers/LexSML.cxx b/lexers/LexSML.cxx index 6ab902dc5..6adb86965 100644 --- a/lexers/LexSML.cxx +++ b/lexers/LexSML.cxx @@ -34,7 +34,7 @@ using namespace Scintilla; #endif void ColouriseSMLDoc( - unsigned int startPos, int length, + Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) diff --git a/lexers/LexSTTXT.cxx b/lexers/LexSTTXT.cxx index e1d2d371f..cddb73e3a 100644 --- a/lexers/LexSTTXT.cxx +++ b/lexers/LexSTTXT.cxx @@ -60,7 +60,7 @@ static void ClassifySTTXTWord(WordList *keywordlists[], StyleContext &sc) sc.SetState(SCE_STTXT_DEFAULT); } -static void ColouriseSTTXTDoc (unsigned int startPos, int length, int initStyle, +static void ColouriseSTTXTDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { StyleContext sc(startPos, length, initStyle, styler); @@ -321,7 +321,7 @@ static void ClassifySTTXTWordFoldPoint(int &levelCurrent,unsigned int lastStart, } } -static void FoldSTTXTDoc(unsigned int startPos, int length, int initStyle, WordList *[],Accessor &styler) +static void FoldSTTXTDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *[], Accessor &styler) { bool foldComment = styler.GetPropertyInt("fold.comment") != 0; bool foldPreprocessor = styler.GetPropertyInt("fold.preprocessor") != 0; diff --git a/lexers/LexScriptol.cxx b/lexers/LexScriptol.cxx index 40ef0de58..694755b06 100644 --- a/lexers/LexScriptol.cxx +++ b/lexers/LexScriptol.cxx @@ -109,7 +109,7 @@ static int GetSolStringState(Accessor &styler, int i, int *nextIndex) } -static void ColouriseSolDoc(unsigned int startPos, int length, int initStyle, +static void ColouriseSolDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { @@ -317,7 +317,7 @@ static void ColouriseSolDoc(unsigned int startPos, int length, int initStyle, } } -static void FoldSolDoc(unsigned int startPos, int length, int initStyle, +static void FoldSolDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *[], Accessor &styler) { int lengthDoc = startPos + length; diff --git a/lexers/LexSmalltalk.cxx b/lexers/LexSmalltalk.cxx index 7c7c06769..4c72eb3ad 100644 --- a/lexers/LexSmalltalk.cxx +++ b/lexers/LexSmalltalk.cxx @@ -265,7 +265,7 @@ static void handleLetter(StyleContext& sc, WordList* specialSelectorList) sc.ChangeState(state); } -static void colorizeSmalltalkDoc(unsigned int startPos, int length, int initStyle, WordList *wordLists[], Accessor &styler) +static void colorizeSmalltalkDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *wordLists[], Accessor &styler) { StyleContext sc(startPos, length, initStyle, styler); diff --git a/lexers/LexSorcus.cxx b/lexers/LexSorcus.cxx index ba5588b31..6a138065f 100644 --- a/lexers/LexSorcus.cxx +++ b/lexers/LexSorcus.cxx @@ -61,7 +61,7 @@ static inline bool IsSorcusOperator(const int ch) } -static void ColouriseSorcusDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], +static void ColouriseSorcusDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { diff --git a/lexers/LexSpecman.cxx b/lexers/LexSpecman.cxx index 918edaf98..10721d244 100644 --- a/lexers/LexSpecman.cxx +++ b/lexers/LexSpecman.cxx @@ -40,7 +40,7 @@ static inline bool IsAWordStart(const int ch) { return (ch < 0x80) && (isalnum(ch) || ch == '_' || ch == '`'); } -static void ColouriseSpecmanDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], +static void ColouriseSpecmanDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler, bool caseSensitive) { WordList &keywords = *keywordlists[0]; @@ -200,7 +200,7 @@ static void ColouriseSpecmanDoc(unsigned int startPos, int length, int initStyle // Store both the current line's fold level and the next lines in the // level store to make it easy to pick up with each increment // and to make it possible to fiddle the current level for "} else {". -static void FoldNoBoxSpecmanDoc(unsigned int startPos, int length, int, +static void FoldNoBoxSpecmanDoc(Sci_PositionU startPos, Sci_Position length, int, Accessor &styler) { bool foldComment = styler.GetPropertyInt("fold.comment") != 0; bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; @@ -269,7 +269,7 @@ static void FoldNoBoxSpecmanDoc(unsigned int startPos, int length, int, } } -static void FoldSpecmanDoc(unsigned int startPos, int length, int initStyle, WordList *[], +static void FoldSpecmanDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *[], Accessor &styler) { FoldNoBoxSpecmanDoc(startPos, length, initStyle, styler); } @@ -283,7 +283,7 @@ static const char * const specmanWordLists[] = { 0, }; -static void ColouriseSpecmanDocSensitive(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], +static void ColouriseSpecmanDocSensitive(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { ColouriseSpecmanDoc(startPos, length, initStyle, keywordlists, styler, true); } diff --git a/lexers/LexSpice.cxx b/lexers/LexSpice.cxx index ccc9f6da4..91575ea33 100644 --- a/lexers/LexSpice.cxx +++ b/lexers/LexSpice.cxx @@ -34,8 +34,8 @@ using namespace Scintilla; */ static void ColouriseDocument( - unsigned int startPos, - int length, + Sci_PositionU startPos, + Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler); @@ -136,8 +136,8 @@ static void ColouriseWord(StyleContext& sc, WordList& keywords, WordList& keywor // ColouriseDocument // static void ColouriseDocument( - unsigned int startPos, - int length, + Sci_PositionU startPos, + Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { diff --git a/lexers/LexTACL.cxx b/lexers/LexTACL.cxx index fb7d695fd..274dfd546 100644 --- a/lexers/LexTACL.cxx +++ b/lexers/LexTACL.cxx @@ -122,7 +122,7 @@ static int classifyFoldPointTACL(const char* s) { return lev; } -static void ColouriseTACLDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], +static void ColouriseTACLDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { styler.StartAt(startPos); @@ -280,7 +280,7 @@ static void ColouriseTACLDoc(unsigned int startPos, int length, int initStyle, W ColourTo(styler, lengthDoc - 1, state, bInAsm); } -static void FoldTACLDoc(unsigned int startPos, int length, int initStyle, WordList *[], +static void FoldTACLDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *[], Accessor &styler) { bool foldComment = styler.GetPropertyInt("fold.comment") != 0; bool foldPreprocessor = styler.GetPropertyInt("fold.preprocessor") != 0; diff --git a/lexers/LexTADS3.cxx b/lexers/LexTADS3.cxx index 54cb88ad6..17e3ff45d 100644 --- a/lexers/LexTADS3.cxx +++ b/lexers/LexTADS3.cxx @@ -513,7 +513,7 @@ static void ColouriseTADS3Number(StyleContext &sc) { sc.SetState(endState); } -static void ColouriseTADS3Doc(unsigned int startPos, int length, int initStyle, +static void ColouriseTADS3Doc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { int visibleChars = 0; int bracketLevel = 0; @@ -728,7 +728,7 @@ static char peekAhead(unsigned int startPos, unsigned int endPos, return ' '; } -static void FoldTADS3Doc(unsigned int startPos, int length, int initStyle, +static void FoldTADS3Doc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *[], Accessor &styler) { unsigned int endPos = startPos + length; int lineCurrent = styler.GetLine(startPos); diff --git a/lexers/LexTAL.cxx b/lexers/LexTAL.cxx index 15dc7410c..403a05686 100644 --- a/lexers/LexTAL.cxx +++ b/lexers/LexTAL.cxx @@ -122,7 +122,7 @@ static int classifyFoldPointTAL(const char* s) { return lev; } -static void ColouriseTALDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], +static void ColouriseTALDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { styler.StartAt(startPos); @@ -268,7 +268,7 @@ static void ColouriseTALDoc(unsigned int startPos, int length, int initStyle, Wo ColourTo(styler, lengthDoc - 1, state, bInAsm); } -static void FoldTALDoc(unsigned int startPos, int length, int initStyle, WordList *[], +static void FoldTALDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *[], Accessor &styler) { bool foldComment = styler.GetPropertyInt("fold.comment") != 0; bool foldPreprocessor = styler.GetPropertyInt("fold.preprocessor") != 0; diff --git a/lexers/LexTCL.cxx b/lexers/LexTCL.cxx index dfcab54ea..18334a323 100644 --- a/lexers/LexTCL.cxx +++ b/lexers/LexTCL.cxx @@ -45,7 +45,7 @@ static inline bool IsANumberChar(int ch) { ch == '.' || ch == '-' || ch == '+'); } -static void ColouriseTCLDoc(unsigned int startPos, int length, int , WordList *keywordlists[], Accessor &styler) { +static void ColouriseTCLDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *keywordlists[], Accessor &styler) { #define isComment(s) (s==SCE_TCL_COMMENT || s==SCE_TCL_COMMENTLINE || s==SCE_TCL_COMMENT_BOX || s==SCE_TCL_BLOCK_COMMENT) bool foldComment = styler.GetPropertyInt("fold.comment") != 0; bool commentLevel = false; diff --git a/lexers/LexTCMD.cxx b/lexers/LexTCMD.cxx index 9da760542..7d86db2bc 100644 --- a/lexers/LexTCMD.cxx +++ b/lexers/LexTCMD.cxx @@ -401,7 +401,7 @@ ColorizeArg: styler.ColourTo(endPos, SCE_TCMD_DEFAULT); } -static void ColouriseTCMDDoc( unsigned int startPos, int length, int /*initStyle*/, WordList *keywordlists[], Accessor &styler ) +static void ColouriseTCMDDoc(Sci_PositionU startPos, Sci_Position length, int /*initStyle*/, WordList *keywordlists[], Accessor &styler) { char lineBuffer[16384]; @@ -434,7 +434,7 @@ static void StrUpr(char *s) { } // Folding support (for DO, IFF, SWITCH, TEXT, and command groups) -static void FoldTCMDDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) +static void FoldTCMDDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) { int line = styler.GetLine(startPos); int level = styler.LevelAt(line); diff --git a/lexers/LexTeX.cxx b/lexers/LexTeX.cxx index 062c7abb9..8468f9743 100644 --- a/lexers/LexTeX.cxx +++ b/lexers/LexTeX.cxx @@ -122,8 +122,8 @@ static inline bool isTeXseven(int ch) { // Interface determination static int CheckTeXInterface( - unsigned int startPos, - int length, + Sci_PositionU startPos, + Sci_Position length, Accessor &styler, int defaultInterface) { @@ -170,8 +170,8 @@ static int CheckTeXInterface( } static void ColouriseTeXDoc( - unsigned int startPos, - int length, + Sci_PositionU startPos, + Sci_Position length, int, WordList *keywordlists[], Accessor &styler) { @@ -380,7 +380,7 @@ static bool IsTeXCommentLine(int line, Accessor &styler) { // FoldTeXDoc: borrowed from VisualTeX with modifications -static void FoldTexDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) +static void FoldTexDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) { bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; unsigned int endPos = startPos+length; diff --git a/lexers/LexTxt2tags.cxx b/lexers/LexTxt2tags.cxx index fd4a96c33..2c95a7317 100644 --- a/lexers/LexTxt2tags.cxx +++ b/lexers/LexTxt2tags.cxx @@ -103,7 +103,7 @@ static bool IsValidHrule(const unsigned int endPos, StyleContext &sc) { } } -static void ColorizeTxt2tagsDoc(unsigned int startPos, int length, int initStyle, +static void ColorizeTxt2tagsDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList **, Accessor &styler) { unsigned int endPos = startPos + length; int precharCount = 0; diff --git a/lexers/LexVB.cxx b/lexers/LexVB.cxx index 54050c7bc..a7543fc73 100644 --- a/lexers/LexVB.cxx +++ b/lexers/LexVB.cxx @@ -31,7 +31,7 @@ using namespace Scintilla; #define SCE_B_FILENUMBER SCE_B_DEFAULT+100 -static bool IsVBComment(Accessor &styler, int pos, int len) { +static bool IsVBComment(Accessor &styler, Sci_Position pos, Sci_Position len) { return len > 0 && styler[pos] == '\''; } @@ -58,7 +58,7 @@ static inline bool IsANumberChar(int ch) { ch == '.' || ch == '-' || ch == '+'); } -static void ColouriseVBDoc(unsigned int startPos, int length, int initStyle, +static void ColouriseVBDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler, bool vbScriptSyntax) { WordList &keywords = *keywordlists[0]; @@ -254,7 +254,7 @@ static void ColouriseVBDoc(unsigned int startPos, int length, int initStyle, sc.Complete(); } -static void FoldVBDoc(unsigned int startPos, int length, int, +static void FoldVBDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) { int endPos = startPos + length; @@ -296,12 +296,12 @@ static void FoldVBDoc(unsigned int startPos, int length, int, } } -static void ColouriseVBNetDoc(unsigned int startPos, int length, int initStyle, +static void ColouriseVBNetDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { ColouriseVBDoc(startPos, length, initStyle, keywordlists, styler, false); } -static void ColouriseVBScriptDoc(unsigned int startPos, int length, int initStyle, +static void ColouriseVBScriptDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { ColouriseVBDoc(startPos, length, initStyle, keywordlists, styler, true); } diff --git a/lexers/LexVHDL.cxx b/lexers/LexVHDL.cxx index 56426e43f..746da7222 100644 --- a/lexers/LexVHDL.cxx +++ b/lexers/LexVHDL.cxx @@ -33,8 +33,8 @@ using namespace Scintilla; #endif static void ColouriseVHDLDoc( - unsigned int startPos, - int length, + Sci_PositionU startPos, + Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler); @@ -57,8 +57,8 @@ static inline bool IsABlank(unsigned int ch) { /***************************************/ static void ColouriseVHDLDoc( - unsigned int startPos, - int length, + Sci_PositionU startPos, + Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) @@ -207,8 +207,8 @@ static bool IsCommentStyle(char style) //============================================================================= // Folding the code static void FoldNoBoxVHDLDoc( - unsigned int startPos, - int length, + Sci_PositionU startPos, + Sci_Position length, int, Accessor &styler) { @@ -510,7 +510,7 @@ static void FoldNoBoxVHDLDoc( } //============================================================================= -static void FoldVHDLDoc(unsigned int startPos, int length, int initStyle, WordList *[], +static void FoldVHDLDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *[], Accessor &styler) { FoldNoBoxVHDLDoc(startPos, length, initStyle, styler); } diff --git a/lexers/LexYAML.cxx b/lexers/LexYAML.cxx index 7752d86e3..bb47e12bb 100644 --- a/lexers/LexYAML.cxx +++ b/lexers/LexYAML.cxx @@ -168,7 +168,7 @@ static void ColouriseYAMLLine( styler.ColourTo(endPos, SCE_YAML_DEFAULT); } -static void ColouriseYAMLDoc(unsigned int startPos, int length, int, WordList *keywordLists[], Accessor &styler) { +static void ColouriseYAMLDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *keywordLists[], Accessor &styler) { char lineBuffer[1024] = ""; styler.StartAt(startPos); styler.StartSegment(startPos); @@ -201,7 +201,7 @@ static bool IsCommentLine(int line, Accessor &styler) { return false; } -static void FoldYAMLDoc(unsigned int startPos, int length, int /*initStyle - unused*/, +static void FoldYAMLDoc(Sci_PositionU startPos, Sci_Position length, int /*initStyle - unused*/, WordList *[], Accessor &styler) { const int maxPos = startPos + length; const int maxLines = styler.GetLine(maxPos - 1); // Requested last line diff --git a/lexlib/Accessor.h b/lexlib/Accessor.h index 1bb86c53b..7a58785f3 100644 --- a/lexlib/Accessor.h +++ b/lexlib/Accessor.h @@ -18,7 +18,7 @@ class Accessor; class WordList; class PropSetSimple; -typedef bool (*PFNIsCommentLeader)(Accessor &styler, int pos, int len); +typedef bool(*PFNIsCommentLeader)(Accessor &styler, Sci_Position pos, Sci_Position len); class Accessor : public LexAccessor { public: diff --git a/lexlib/LexerModule.cxx b/lexlib/LexerModule.cxx index 6cefbee77..aab868a41 100644 --- a/lexlib/LexerModule.cxx +++ b/lexlib/LexerModule.cxx @@ -85,13 +85,13 @@ ILexer *LexerModule::Create() const { return new LexerSimple(this); } -void LexerModule::Lex(unsigned int startPos, int lengthDoc, int initStyle, +void LexerModule::Lex(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, WordList *keywordlists[], Accessor &styler) const { if (fnLexer) fnLexer(startPos, lengthDoc, initStyle, keywordlists, styler); } -void LexerModule::Fold(unsigned int startPos, int lengthDoc, int initStyle, +void LexerModule::Fold(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, WordList *keywordlists[], Accessor &styler) const { if (fnFolder) { int lineCurrent = styler.GetLine(startPos); diff --git a/lexlib/LexerModule.h b/lexlib/LexerModule.h index 5993c0fe9..3ca978a53 100644 --- a/lexlib/LexerModule.h +++ b/lexlib/LexerModule.h @@ -15,7 +15,7 @@ namespace Scintilla { class Accessor; class WordList; -typedef void (*LexerFunction)(unsigned int startPos, int lengthDoc, int initStyle, +typedef void(*LexerFunction)(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, WordList *keywordlists[], Accessor &styler); typedef ILexer *(*LexerFactoryFunction)(); @@ -53,9 +53,9 @@ public: ILexer *Create() const; - virtual void Lex(unsigned int startPos, int length, int initStyle, + virtual void Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) const; - virtual void Fold(unsigned int startPos, int length, int initStyle, + virtual void Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) const; friend class Catalogue; diff --git a/lexlib/LexerNoExceptions.h b/lexlib/LexerNoExceptions.h index 2a846884e..ba24a8eb7 100644 --- a/lexlib/LexerNoExceptions.h +++ b/lexlib/LexerNoExceptions.h @@ -21,8 +21,8 @@ public: void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, IDocument *pAccess); void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, IDocument *); - virtual void Lexer(unsigned int startPos, int length, int initStyle, IDocument *pAccess, Accessor &styler) = 0; - virtual void Folder(unsigned int startPos, int length, int initStyle, IDocument *pAccess, Accessor &styler) = 0; + virtual void Lexer(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess, Accessor &styler) = 0; + virtual void Folder(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess, Accessor &styler) = 0; }; #ifdef SCI_NAMESPACE |