diff options
author | Neil <nyamatongwe@gmail.com> | 2015-07-20 10:04:16 +1000 |
---|---|---|
committer | Neil <nyamatongwe@gmail.com> | 2015-07-20 10:04:16 +1000 |
commit | 2d3f2f707a4c4faf5255f3ae13634a82cef8c581 (patch) | |
tree | 7b38a49cba346268eae7dda732f63e53c386a2b7 /lexers/LexCPP.cxx | |
parent | 352a0a6f24892a06755c132c22d16bfb9361f047 (diff) | |
download | scintilla-mirror-2d3f2f707a4c4faf5255f3ae13634a82cef8c581.tar.gz |
Use Sci_Position when required to implement interfaces.
Diffstat (limited to 'lexers/LexCPP.cxx')
-rw-r--r-- | lexers/LexCPP.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
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; |