diff options
Diffstat (limited to 'lexers')
| -rw-r--r-- | lexers/LexAsm.cxx | 16 | ||||
| -rw-r--r-- | lexers/LexBasic.cxx | 16 | ||||
| -rw-r--r-- | lexers/LexCPP.cxx | 16 | ||||
| -rw-r--r-- | lexers/LexD.cxx | 16 | ||||
| -rw-r--r-- | lexers/LexDMIS.cxx | 14 | ||||
| -rw-r--r-- | lexers/LexHaskell.cxx | 16 | ||||
| -rw-r--r-- | lexers/LexLaTeX.cxx | 8 | ||||
| -rw-r--r-- | lexers/LexPerl.cxx | 16 | ||||
| -rw-r--r-- | lexers/LexPython.cxx | 16 | ||||
| -rw-r--r-- | lexers/LexRegistry.cxx | 20 | ||||
| -rw-r--r-- | lexers/LexRust.cxx | 16 | ||||
| -rw-r--r-- | lexers/LexSQL.cxx | 14 | ||||
| -rw-r--r-- | lexers/LexVerilog.cxx | 14 | ||||
| -rw-r--r-- | lexers/LexVisualProlog.cxx | 16 |
14 files changed, 107 insertions, 107 deletions
diff --git a/lexers/LexAsm.cxx b/lexers/LexAsm.cxx index 37a4efe35..ded7a4348 100644 --- a/lexers/LexAsm.cxx +++ b/lexers/LexAsm.cxx @@ -172,13 +172,13 @@ public: const char * SCI_METHOD DescribeProperty(const char *name) { return osAsm.DescribeProperty(name); } - int SCI_METHOD PropertySet(const char *key, const char *val); + Sci_Position SCI_METHOD PropertySet(const char *key, const char *val); const char * SCI_METHOD DescribeWordListSets() { return osAsm.DescribeWordListSets(); } - int SCI_METHOD WordListSet(int n, const char *wl); - void SCI_METHOD Lex(unsigned int startPos, int length, int initStyle, IDocument *pAccess); - void SCI_METHOD Fold(unsigned int startPos, int length, int initStyle, IDocument *pAccess); + Sci_Position SCI_METHOD WordListSet(int n, const char *wl); + void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess); + void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess); void * SCI_METHOD PrivateCall(int, void *) { return 0; @@ -193,14 +193,14 @@ public: } }; -int SCI_METHOD LexerAsm::PropertySet(const char *key, const char *val) { +Sci_Position SCI_METHOD LexerAsm::PropertySet(const char *key, const char *val) { if (osAsm.PropertySet(&options, key, val)) { return 0; } return -1; } -int SCI_METHOD LexerAsm::WordListSet(int n, const char *wl) { +Sci_Position SCI_METHOD LexerAsm::WordListSet(int n, const char *wl) { WordList *wordListN = 0; switch (n) { case 0: @@ -240,7 +240,7 @@ int SCI_METHOD LexerAsm::WordListSet(int n, const char *wl) { return firstModification; } -void SCI_METHOD LexerAsm::Lex(unsigned int startPos, int length, int initStyle, IDocument *pAccess) { +void SCI_METHOD LexerAsm::Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) { LexAccessor styler(pAccess); // Do not leak onto next line @@ -371,7 +371,7 @@ void SCI_METHOD LexerAsm::Lex(unsigned int startPos, int length, int initStyle, // level store to make it easy to pick up with each increment // and to make it possible to fiddle the current level for "else". -void SCI_METHOD LexerAsm::Fold(unsigned int startPos, int length, int initStyle, IDocument *pAccess) { +void SCI_METHOD LexerAsm::Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) { if (!options.fold) return; diff --git a/lexers/LexBasic.cxx b/lexers/LexBasic.cxx index b73fac8b6..94d350b42 100644 --- a/lexers/LexBasic.cxx +++ b/lexers/LexBasic.cxx @@ -255,13 +255,13 @@ public: const char * SCI_METHOD DescribeProperty(const char *name) { return osBasic.DescribeProperty(name); } - int SCI_METHOD PropertySet(const char *key, const char *val); + Sci_Position SCI_METHOD PropertySet(const char *key, const char *val); const char * SCI_METHOD DescribeWordListSets() { return osBasic.DescribeWordListSets(); } - int SCI_METHOD WordListSet(int n, const char *wl); - void SCI_METHOD Lex(unsigned int startPos, int length, int initStyle, IDocument *pAccess); - void SCI_METHOD Fold(unsigned int startPos, int length, int initStyle, IDocument *pAccess); + Sci_Position SCI_METHOD WordListSet(int n, const char *wl); + void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess); + void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess); void * SCI_METHOD PrivateCall(int, void *) { return 0; @@ -277,14 +277,14 @@ public: } }; -int SCI_METHOD LexerBasic::PropertySet(const char *key, const char *val) { +Sci_Position SCI_METHOD LexerBasic::PropertySet(const char *key, const char *val) { if (osBasic.PropertySet(&options, key, val)) { return 0; } return -1; } -int SCI_METHOD LexerBasic::WordListSet(int n, const char *wl) { +Sci_Position SCI_METHOD LexerBasic::WordListSet(int n, const char *wl) { WordList *wordListN = 0; switch (n) { case 0: @@ -312,7 +312,7 @@ int SCI_METHOD LexerBasic::WordListSet(int n, const char *wl) { return firstModification; } -void SCI_METHOD LexerBasic::Lex(unsigned int startPos, int length, int initStyle, IDocument *pAccess) { +void SCI_METHOD LexerBasic::Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) { LexAccessor styler(pAccess); bool wasfirst = true, isfirst = true; // true if first token in a line @@ -471,7 +471,7 @@ void SCI_METHOD LexerBasic::Lex(unsigned int startPos, int length, int initStyle } -void SCI_METHOD LexerBasic::Fold(unsigned int startPos, int length, int /* initStyle */, IDocument *pAccess) { +void SCI_METHOD LexerBasic::Fold(Sci_PositionU startPos, Sci_Position length, int /* initStyle */, IDocument *pAccess) { if (!options.fold) return; diff --git a/lexers/LexCPP.cxx b/lexers/LexCPP.cxx index 1d9e40d17..da558b357 100644 --- a/lexers/LexCPP.cxx +++ b/lexers/LexCPP.cxx @@ -495,13 +495,13 @@ public: const char * SCI_METHOD DescribeProperty(const char *name) { return osCPP.DescribeProperty(name); } - int SCI_METHOD PropertySet(const char *key, const char *val); + Sci_Position SCI_METHOD PropertySet(const char *key, const char *val); const char * SCI_METHOD DescribeWordListSets() { return osCPP.DescribeWordListSets(); } - int SCI_METHOD WordListSet(int n, const char *wl); - void SCI_METHOD Lex(unsigned int startPos, int length, int initStyle, IDocument *pAccess); - void SCI_METHOD Fold(unsigned int startPos, int length, int initStyle, IDocument *pAccess); + Sci_Position SCI_METHOD WordListSet(int n, const char *wl); + void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess); + void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess); void * SCI_METHOD PrivateCall(int, void *) { return 0; @@ -555,7 +555,7 @@ public: bool EvaluateExpression(const std::string &expr, const SymbolTable &preprocessorDefinitions); }; -int SCI_METHOD LexerCPP::PropertySet(const char *key, const char *val) { +Sci_Position SCI_METHOD LexerCPP::PropertySet(const char *key, const char *val) { if (osCPP.PropertySet(&options, key, val)) { if (strcmp(key, "lexer.cpp.allow.dollars") == 0) { setWord = CharacterSet(CharacterSet::setAlphaNum, "._", 0x80, true); @@ -568,7 +568,7 @@ int SCI_METHOD LexerCPP::PropertySet(const char *key, const char *val) { return -1; } -int SCI_METHOD LexerCPP::WordListSet(int n, const char *wl) { +Sci_Position SCI_METHOD LexerCPP::WordListSet(int n, const char *wl) { WordList *wordListN = 0; switch (n) { case 0: @@ -637,7 +637,7 @@ struct After { } }; -void SCI_METHOD LexerCPP::Lex(unsigned int startPos, int length, int initStyle, IDocument *pAccess) { +void SCI_METHOD LexerCPP::Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) { LexAccessor styler(pAccess); CharacterSet setOKBeforeRE(CharacterSet::setNone, "([{=,:;!%^&*|?~+-"); @@ -1279,7 +1279,7 @@ void SCI_METHOD LexerCPP::Lex(unsigned int startPos, int length, int initStyle, // level store to make it easy to pick up with each increment // and to make it possible to fiddle the current level for "} else {". -void SCI_METHOD LexerCPP::Fold(unsigned int startPos, int length, int initStyle, IDocument *pAccess) { +void SCI_METHOD LexerCPP::Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) { if (!options.fold) return; diff --git a/lexers/LexD.cxx b/lexers/LexD.cxx index 045c4cb73..4d699da61 100644 --- a/lexers/LexD.cxx +++ b/lexers/LexD.cxx @@ -177,13 +177,13 @@ public: const char * SCI_METHOD DescribeProperty(const char *name) { return osD.DescribeProperty(name); } - int SCI_METHOD PropertySet(const char *key, const char *val); + Sci_Position SCI_METHOD PropertySet(const char *key, const char *val); const char * SCI_METHOD DescribeWordListSets() { return osD.DescribeWordListSets(); } - int SCI_METHOD WordListSet(int n, const char *wl); - void SCI_METHOD Lex(unsigned int startPos, int length, int initStyle, IDocument *pAccess); - void SCI_METHOD Fold(unsigned int startPos, int length, int initStyle, IDocument *pAccess); + Sci_Position SCI_METHOD WordListSet(int n, const char *wl); + void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess); + void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess); void * SCI_METHOD PrivateCall(int, void *) { return 0; @@ -197,14 +197,14 @@ public: } }; -int SCI_METHOD LexerD::PropertySet(const char *key, const char *val) { +Sci_Position SCI_METHOD LexerD::PropertySet(const char *key, const char *val) { if (osD.PropertySet(&options, key, val)) { return 0; } return -1; } -int SCI_METHOD LexerD::WordListSet(int n, const char *wl) { +Sci_Position SCI_METHOD LexerD::WordListSet(int n, const char *wl) { WordList *wordListN = 0; switch (n) { case 0: @@ -241,7 +241,7 @@ int SCI_METHOD LexerD::WordListSet(int n, const char *wl) { return firstModification; } -void SCI_METHOD LexerD::Lex(unsigned int startPos, int length, int initStyle, IDocument *pAccess) { +void SCI_METHOD LexerD::Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) { LexAccessor styler(pAccess); int styleBeforeDCKeyword = SCE_D_DEFAULT; @@ -471,7 +471,7 @@ void SCI_METHOD LexerD::Lex(unsigned int startPos, int length, int initStyle, ID // level store to make it easy to pick up with each increment // and to make it possible to fiddle the current level for "} else {". -void SCI_METHOD LexerD::Fold(unsigned int startPos, int length, int initStyle, IDocument *pAccess) { +void SCI_METHOD LexerD::Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) { if (!options.fold) return; diff --git a/lexers/LexDMIS.cxx b/lexers/LexDMIS.cxx index a903e9da6..39d40b6cc 100644 --- a/lexers/LexDMIS.cxx +++ b/lexers/LexDMIS.cxx @@ -76,11 +76,11 @@ class LexerDMIS : public ILexer return NULL; } - int SCI_METHOD PropertySet(const char *, const char *) { + Sci_Position SCI_METHOD PropertySet(const char *, const char *) { return -1; } - int SCI_METHOD WordListSet(int n, const char *wl); + Sci_Position SCI_METHOD WordListSet(int n, const char *wl); void * SCI_METHOD PrivateCall(int, void *) { return NULL; @@ -91,8 +91,8 @@ class LexerDMIS : public ILexer } const char * SCI_METHOD DescribeWordListSets(); - void SCI_METHOD Lex(unsigned int startPos, int lengthDoc, int initStyle, IDocument *pAccess); - void SCI_METHOD Fold(unsigned int startPos, int lengthDoc, int initStyle, IDocument *pAccess); + 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 *pAccess); }; @@ -145,7 +145,7 @@ LexerDMIS::~LexerDMIS(void) { delete[] this->m_wordListSets; } -int SCI_METHOD LexerDMIS::WordListSet(int n, const char *wl) +Sci_Position SCI_METHOD LexerDMIS::WordListSet(int n, const char *wl) { switch (n) { case 0: @@ -185,7 +185,7 @@ const char * SCI_METHOD LexerDMIS::DescribeWordListSets() return this->m_wordListSets; } -void SCI_METHOD LexerDMIS::Lex(unsigned int startPos, int lengthDoc, int initStyle, IDocument *pAccess) +void SCI_METHOD LexerDMIS::Lex(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, IDocument *pAccess) { const unsigned int MAX_STR_LEN = 100; @@ -281,7 +281,7 @@ void SCI_METHOD LexerDMIS::Lex(unsigned int startPos, int lengthDoc, int initSty scCTX.Complete(); } -void SCI_METHOD LexerDMIS::Fold(unsigned int startPos, int lengthDoc, int, IDocument *pAccess) +void SCI_METHOD LexerDMIS::Fold(Sci_PositionU startPos, Sci_Position lengthDoc, int, IDocument *pAccess) { const int MAX_STR_LEN = 100; diff --git a/lexers/LexHaskell.cxx b/lexers/LexHaskell.cxx index 24355fa4e..18ac15db9 100644 --- a/lexers/LexHaskell.cxx +++ b/lexers/LexHaskell.cxx @@ -416,17 +416,17 @@ public: return osHaskell.DescribeProperty(name); } - int SCI_METHOD PropertySet(const char *key, const char *val); + Sci_Position SCI_METHOD PropertySet(const char *key, const char *val); const char * SCI_METHOD DescribeWordListSets() { return osHaskell.DescribeWordListSets(); } - int SCI_METHOD WordListSet(int n, const char *wl); + Sci_Position SCI_METHOD WordListSet(int n, const char *wl); - void SCI_METHOD Lex(unsigned int startPos, int length, int initStyle, IDocument *pAccess); + void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess); - void SCI_METHOD Fold(unsigned int startPos, int length, int initStyle, IDocument *pAccess); + void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess); void * SCI_METHOD PrivateCall(int, void *) { return 0; @@ -441,14 +441,14 @@ public: } }; -int SCI_METHOD LexerHaskell::PropertySet(const char *key, const char *val) { +Sci_Position SCI_METHOD LexerHaskell::PropertySet(const char *key, const char *val) { if (osHaskell.PropertySet(&options, key, val)) { return 0; } return -1; } -int SCI_METHOD LexerHaskell::WordListSet(int n, const char *wl) { +Sci_Position SCI_METHOD LexerHaskell::WordListSet(int n, const char *wl) { WordList *wordListN = 0; switch (n) { case 0: @@ -473,7 +473,7 @@ int SCI_METHOD LexerHaskell::WordListSet(int n, const char *wl) { return firstModification; } -void SCI_METHOD LexerHaskell::Lex(unsigned int startPos, int length, int initStyle +void SCI_METHOD LexerHaskell::Lex(Sci_PositionU startPos, Sci_Position length, int initStyle ,IDocument *pAccess) { LexAccessor styler(pAccess); @@ -961,7 +961,7 @@ void SCI_METHOD LexerHaskell::Lex(unsigned int startPos, int length, int initSty sc.Complete(); } -void SCI_METHOD LexerHaskell::Fold(unsigned int startPos, int length, int // initStyle +void SCI_METHOD LexerHaskell::Fold(Sci_PositionU startPos, Sci_Position length, int // initStyle ,IDocument *pAccess) { if (!options.fold) return; diff --git a/lexers/LexLaTeX.cxx b/lexers/LexLaTeX.cxx index f8af1e7dc..d2ab191fa 100644 --- a/lexers/LexLaTeX.cxx +++ b/lexers/LexLaTeX.cxx @@ -81,8 +81,8 @@ public: static ILexer *LexerFactoryLaTeX() { return new LexerLaTeX(); } - void SCI_METHOD Lex(unsigned int startPos, int length, int initStyle, IDocument *pAccess); - void SCI_METHOD Fold(unsigned int startPos, int length, int initStyle, IDocument *pAccess); + void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess); + void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess); }; static bool latexIsSpecial(int ch) { @@ -184,7 +184,7 @@ static inline void latexStateReset(int &mode, int &state) { // There are cases not handled correctly, like $abcd\textrm{what is $x+y$}z+w$. // But I think it's already good enough. -void SCI_METHOD LexerLaTeX::Lex(unsigned int startPos, int length, int initStyle, IDocument *pAccess) { +void SCI_METHOD LexerLaTeX::Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) { // startPos is assumed to be the first character of a line Accessor styler(pAccess, &props); styler.StartAt(startPos); @@ -470,7 +470,7 @@ static int latexFoldSaveToInt(const latexFoldSave &save) { // Change folding state while processing a line // Return the level before the first relevant command -void SCI_METHOD LexerLaTeX::Fold(unsigned int startPos, int length, int, IDocument *pAccess) { +void SCI_METHOD LexerLaTeX::Fold(Sci_PositionU startPos, Sci_Position length, int, IDocument *pAccess) { const char *structWords[7] = {"part", "chapter", "section", "subsection", "subsubsection", "paragraph", "subparagraph"}; Accessor styler(pAccess, &props); diff --git a/lexers/LexPerl.cxx b/lexers/LexPerl.cxx index b4a2dd12e..c81dc2663 100644 --- a/lexers/LexPerl.cxx +++ b/lexers/LexPerl.cxx @@ -367,13 +367,13 @@ public: const char *SCI_METHOD DescribeProperty(const char *name) { return osPerl.DescribeProperty(name); } - int SCI_METHOD PropertySet(const char *key, const char *val); + Sci_Position SCI_METHOD PropertySet(const char *key, const char *val); const char *SCI_METHOD DescribeWordListSets() { return osPerl.DescribeWordListSets(); } - int SCI_METHOD WordListSet(int n, const char *wl); - void SCI_METHOD Lex(unsigned int startPos, int length, int initStyle, IDocument *pAccess); - void SCI_METHOD Fold(unsigned int startPos, int length, int initStyle, IDocument *pAccess); + Sci_Position SCI_METHOD WordListSet(int n, const char *wl); + void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess); + void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess); void *SCI_METHOD PrivateCall(int, void *) { return 0; @@ -386,14 +386,14 @@ public: void InterpolateSegment(StyleContext &sc, int maxSeg, bool isPattern=false); }; -int SCI_METHOD LexerPerl::PropertySet(const char *key, const char *val) { +Sci_Position SCI_METHOD LexerPerl::PropertySet(const char *key, const char *val) { if (osPerl.PropertySet(&options, key, val)) { return 0; } return -1; } -int SCI_METHOD LexerPerl::WordListSet(int n, const char *wl) { +Sci_Position SCI_METHOD LexerPerl::WordListSet(int n, const char *wl) { WordList *wordListN = 0; switch (n) { case 0: @@ -515,7 +515,7 @@ void LexerPerl::InterpolateSegment(StyleContext &sc, int maxSeg, bool isPattern) sc.SetState(sc.state - INTERPOLATE_SHIFT); } -void SCI_METHOD LexerPerl::Lex(unsigned int startPos, int length, int initStyle, IDocument *pAccess) { +void SCI_METHOD LexerPerl::Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) { LexAccessor styler(pAccess); // keywords that forces /PATTERN/ at all times; should track vim's behaviour @@ -1557,7 +1557,7 @@ void SCI_METHOD LexerPerl::Lex(unsigned int startPos, int length, int initStyle, #define PERL_HEADFOLD_SHIFT 4 #define PERL_HEADFOLD_MASK 0xF0 -void SCI_METHOD LexerPerl::Fold(unsigned int startPos, int length, int /* initStyle */, IDocument *pAccess) { +void SCI_METHOD LexerPerl::Fold(Sci_PositionU startPos, Sci_Position length, int /* initStyle */, IDocument *pAccess) { if (!options.fold) return; diff --git a/lexers/LexPython.cxx b/lexers/LexPython.cxx index 76e1530f1..c12810c03 100644 --- a/lexers/LexPython.cxx +++ b/lexers/LexPython.cxx @@ -225,13 +225,13 @@ public: const char * SCI_METHOD DescribeProperty(const char *name) { return osPython.DescribeProperty(name); } - int SCI_METHOD PropertySet(const char *key, const char *val); + Sci_Position SCI_METHOD PropertySet(const char *key, const char *val); const char * SCI_METHOD DescribeWordListSets() { return osPython.DescribeWordListSets(); } - int SCI_METHOD WordListSet(int n, const char *wl); - void SCI_METHOD Lex(unsigned int startPos, int length, int initStyle, IDocument *pAccess); - void SCI_METHOD Fold(unsigned int startPos, int length, int initStyle, IDocument *pAccess); + Sci_Position SCI_METHOD WordListSet(int n, const char *wl); + void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess); + void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess); void * SCI_METHOD PrivateCall(int, void *) { return 0; @@ -275,14 +275,14 @@ public: } }; -int SCI_METHOD LexerPython::PropertySet(const char *key, const char *val) { +Sci_Position SCI_METHOD LexerPython::PropertySet(const char *key, const char *val) { if (osPython.PropertySet(&options, key, val)) { return 0; } return -1; } -int SCI_METHOD LexerPython::WordListSet(int n, const char *wl) { +Sci_Position SCI_METHOD LexerPython::WordListSet(int n, const char *wl) { WordList *wordListN = 0; switch (n) { case 0: @@ -304,7 +304,7 @@ int SCI_METHOD LexerPython::WordListSet(int n, const char *wl) { return firstModification; } -void SCI_METHOD LexerPython::Lex(unsigned int startPos, int length, int initStyle, IDocument *pAccess) { +void SCI_METHOD LexerPython::Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) { Accessor styler(pAccess, NULL); const int endPos = startPos + length; @@ -595,7 +595,7 @@ static bool IsQuoteLine(int line, Accessor &styler) { } -void SCI_METHOD LexerPython::Fold(unsigned int startPos, int length, int /*initStyle - unused*/, IDocument *pAccess) { +void SCI_METHOD LexerPython::Fold(Sci_PositionU startPos, Sci_Position length, int /*initStyle - unused*/, IDocument *pAccess) { if (!options.fold) return; diff --git a/lexers/LexRegistry.cxx b/lexers/LexRegistry.cxx index 0f401fa4b..22fdd111e 100644 --- a/lexers/LexRegistry.cxx +++ b/lexers/LexRegistry.cxx @@ -179,13 +179,13 @@ public: virtual const char *SCI_METHOD DescribeProperty(const char *name) { return optSetRegistry.DescribeProperty(name); } - virtual int SCI_METHOD PropertySet(const char *key, const char *val) { + virtual Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) { if (optSetRegistry.PropertySet(&options, key, val)) { return 0; } return -1; } - virtual int SCI_METHOD WordListSet(int, const char *) { + virtual Sci_Position SCI_METHOD WordListSet(int, const char *) { return -1; } virtual void *SCI_METHOD PrivateCall(int, void *) { @@ -197,18 +197,18 @@ public: virtual const char *SCI_METHOD DescribeWordListSets() { return optSetRegistry.DescribeWordListSets(); } - virtual void SCI_METHOD Lex(unsigned startPos, - int length, + virtual void SCI_METHOD Lex(Sci_PositionU startPos, + Sci_Position length, int initStyle, IDocument *pAccess); - virtual void SCI_METHOD Fold(unsigned startPos, - int length, + virtual void SCI_METHOD Fold(Sci_PositionU startPos, + Sci_Position length, int initStyle, IDocument *pAccess); }; -void SCI_METHOD LexerRegistry::Lex(unsigned startPos, - int length, +void SCI_METHOD LexerRegistry::Lex(Sci_PositionU startPos, + Sci_Position length, int initStyle, IDocument *pAccess) { int beforeGUID = SCE_REG_DEFAULT; @@ -352,8 +352,8 @@ void SCI_METHOD LexerRegistry::Lex(unsigned startPos, } // Folding similar to that of FoldPropsDoc in LexOthers -void SCI_METHOD LexerRegistry::Fold(unsigned startPos, - int length, +void SCI_METHOD LexerRegistry::Fold(Sci_PositionU startPos, + Sci_Position length, int, IDocument *pAccess) { if (!options.fold) { diff --git a/lexers/LexRust.cxx b/lexers/LexRust.cxx index 80ec014ca..398b6bf32 100644 --- a/lexers/LexRust.cxx +++ b/lexers/LexRust.cxx @@ -138,13 +138,13 @@ public: const char * SCI_METHOD DescribeProperty(const char *name) { return osRust.DescribeProperty(name); } - int SCI_METHOD PropertySet(const char *key, const char *val); + Sci_Position SCI_METHOD PropertySet(const char *key, const char *val); const char * SCI_METHOD DescribeWordListSets() { return osRust.DescribeWordListSets(); } - int SCI_METHOD WordListSet(int n, const char *wl); - void SCI_METHOD Lex(unsigned int startPos, int length, int initStyle, IDocument *pAccess); - void SCI_METHOD Fold(unsigned int startPos, int length, int initStyle, IDocument *pAccess); + Sci_Position SCI_METHOD WordListSet(int n, const char *wl); + void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess); + void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess); void * SCI_METHOD PrivateCall(int, void *) { return 0; } @@ -153,14 +153,14 @@ public: } }; -int SCI_METHOD LexerRust::PropertySet(const char *key, const char *val) { +Sci_Position SCI_METHOD LexerRust::PropertySet(const char *key, const char *val) { if (osRust.PropertySet(&options, key, val)) { return 0; } return -1; } -int SCI_METHOD LexerRust::WordListSet(int n, const char *wl) { +Sci_Position SCI_METHOD LexerRust::WordListSet(int n, const char *wl) { int firstModification = -1; if (n < NUM_RUST_KEYWORD_LISTS) { WordList *wordListN = &keywords[n]; @@ -643,7 +643,7 @@ static void ScanRawString(Accessor &styler, int& pos, int max, bool ascii_only) } } -void SCI_METHOD LexerRust::Lex(unsigned int startPos, int length, int initStyle, IDocument *pAccess) { +void SCI_METHOD LexerRust::Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) { PropSetSimple props; Accessor styler(pAccess, &props); int pos = startPos; @@ -716,7 +716,7 @@ void SCI_METHOD LexerRust::Lex(unsigned int startPos, int length, int initStyle, styler.Flush(); } -void SCI_METHOD LexerRust::Fold(unsigned int startPos, int length, int initStyle, IDocument *pAccess) { +void SCI_METHOD LexerRust::Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) { if (!options.fold) return; diff --git a/lexers/LexSQL.cxx b/lexers/LexSQL.cxx index 176c92c32..82236e55f 100644 --- a/lexers/LexSQL.cxx +++ b/lexers/LexSQL.cxx @@ -328,7 +328,7 @@ public : return osSQL.DescribeProperty(name); } - int SCI_METHOD PropertySet(const char *key, const char *val) { + Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) { if (osSQL.PropertySet(&options, key, val)) { return 0; } @@ -339,9 +339,9 @@ public : return osSQL.DescribeWordListSets(); } - int SCI_METHOD WordListSet(int n, const char *wl); - void SCI_METHOD Lex (unsigned int startPos, int lengthDoc, int initStyle, IDocument *pAccess); - void SCI_METHOD Fold(unsigned int startPos, int lengthDoc, int initStyle, IDocument *pAccess); + Sci_Position SCI_METHOD WordListSet(int n, const char *wl); + 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 *pAccess); void * SCI_METHOD PrivateCall(int, void *) { return 0; @@ -400,7 +400,7 @@ private: WordList kw_user4; }; -int SCI_METHOD LexerSQL::WordListSet(int n, const char *wl) { +Sci_Position SCI_METHOD LexerSQL::WordListSet(int n, const char *wl) { WordList *wordListN = 0; switch (n) { case 0: @@ -439,7 +439,7 @@ int SCI_METHOD LexerSQL::WordListSet(int n, const char *wl) { return firstModification; } -void SCI_METHOD LexerSQL::Lex(unsigned int startPos, int length, int initStyle, IDocument *pAccess) { +void SCI_METHOD LexerSQL::Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) { LexAccessor styler(pAccess); StyleContext sc(startPos, length, initStyle, styler); int styleBeforeDCKeyword = SCE_SQL_DEFAULT; @@ -628,7 +628,7 @@ void SCI_METHOD LexerSQL::Lex(unsigned int startPos, int length, int initStyle, sc.Complete(); } -void SCI_METHOD LexerSQL::Fold(unsigned int startPos, int length, int initStyle, IDocument *pAccess) { +void SCI_METHOD LexerSQL::Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) { if (!options.fold) return; LexAccessor styler(pAccess); diff --git a/lexers/LexVerilog.cxx b/lexers/LexVerilog.cxx index 55dfa06c7..cee736492 100644 --- a/lexers/LexVerilog.cxx +++ b/lexers/LexVerilog.cxx @@ -232,15 +232,15 @@ public: const char* SCI_METHOD DescribeProperty(const char* name) { return osVerilog.DescribeProperty(name); } - int SCI_METHOD PropertySet(const char* key, const char* val) { + Sci_Position SCI_METHOD PropertySet(const char* key, const char* val) { return osVerilog.PropertySet(&options, key, val); } const char* SCI_METHOD DescribeWordListSets() { return osVerilog.DescribeWordListSets(); } - int SCI_METHOD WordListSet(int n, const char* wl); - void SCI_METHOD Lex(unsigned int startPos, int length, int initStyle, IDocument *pAccess); - void SCI_METHOD Fold(unsigned int startPos, int length, int initStyle, IDocument *pAccess); + Sci_Position SCI_METHOD WordListSet(int n, const char* wl); + void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess); + void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess); void* SCI_METHOD PrivateCall(int, void*) { return 0; } @@ -285,7 +285,7 @@ public: std::vector<std::string> Tokenize(const std::string &expr) const; }; -int SCI_METHOD LexerVerilog::WordListSet(int n, const char *wl) { +Sci_Position SCI_METHOD LexerVerilog::WordListSet(int n, const char *wl) { WordList *wordListN = 0; switch (n) { case 0: @@ -391,7 +391,7 @@ static bool IsSpaceOrTab(int ch) { return ch == ' ' || ch == '\t'; } -void SCI_METHOD LexerVerilog::Lex(unsigned int startPos, int length, int initStyle, IDocument *pAccess) +void SCI_METHOD LexerVerilog::Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) { LexAccessor styler(pAccess); @@ -784,7 +784,7 @@ static bool IsCommentLine(int line, LexAccessor &styler) { // 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 {". -void SCI_METHOD LexerVerilog::Fold(unsigned int startPos, int length, int initStyle, IDocument *pAccess) +void SCI_METHOD LexerVerilog::Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) { LexAccessor styler(pAccess); bool foldAtBrace = 1; diff --git a/lexers/LexVisualProlog.cxx b/lexers/LexVisualProlog.cxx index 24e19e24e..7d6851872 100644 --- a/lexers/LexVisualProlog.cxx +++ b/lexers/LexVisualProlog.cxx @@ -91,13 +91,13 @@ public: const char * SCI_METHOD DescribeProperty(const char *name) { return osVisualProlog.DescribeProperty(name); } - int SCI_METHOD PropertySet(const char *key, const char *val); + Sci_Position SCI_METHOD PropertySet(const char *key, const char *val); const char * SCI_METHOD DescribeWordListSets() { return osVisualProlog.DescribeWordListSets(); } - int SCI_METHOD WordListSet(int n, const char *wl); - void SCI_METHOD Lex(unsigned int startPos, int length, int initStyle, IDocument *pAccess); - void SCI_METHOD Fold(unsigned int startPos, int length, int initStyle, IDocument *pAccess); + Sci_Position SCI_METHOD WordListSet(int n, const char *wl); + void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess); + void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess); void * SCI_METHOD PrivateCall(int, void *) { return 0; @@ -108,14 +108,14 @@ public: } }; -int SCI_METHOD LexerVisualProlog::PropertySet(const char *key, const char *val) { +Sci_Position SCI_METHOD LexerVisualProlog::PropertySet(const char *key, const char *val) { if (osVisualProlog.PropertySet(&options, key, val)) { return 0; } return -1; } -int SCI_METHOD LexerVisualProlog::WordListSet(int n, const char *wl) { +Sci_Position SCI_METHOD LexerVisualProlog::WordListSet(int n, const char *wl) { WordList *wordListN = 0; switch (n) { case 0: @@ -244,7 +244,7 @@ static void forwardEscapeLiteral(StyleContext &sc, int EscapeState) { } } -void SCI_METHOD LexerVisualProlog::Lex(unsigned int startPos, int length, int initStyle, IDocument *pAccess) { +void SCI_METHOD LexerVisualProlog::Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) { LexAccessor styler(pAccess); CharacterSet setDoxygen(CharacterSet::setAlpha, ""); CharacterSet setNumber(CharacterSet::setNone, "+-.0123456789abcdefABCDEFxoXO"); @@ -446,7 +446,7 @@ void SCI_METHOD LexerVisualProlog::Lex(unsigned int startPos, int length, int in // level store to make it easy to pick up with each increment // and to make it possible to fiddle the current level for "} else {". -void SCI_METHOD LexerVisualProlog::Fold(unsigned int startPos, int length, int initStyle, IDocument *pAccess) { +void SCI_METHOD LexerVisualProlog::Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) { LexAccessor styler(pAccess); |