diff options
| -rw-r--r-- | src/Document.cxx | 6 | ||||
| -rw-r--r-- | src/RESearch.cxx | 6 | ||||
| -rw-r--r-- | src/RESearch.h | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/Document.cxx b/src/Document.cxx index 7da62ff8f..08efa9ec2 100644 --- a/src/Document.cxx +++ b/src/Document.cxx @@ -2590,7 +2590,7 @@ public: ~DocumentIndexer() override { } - char CharAt(Sci::Position index) override { + char CharAt(Sci::Position index) const override { if (index < 0 || index >= end) return 0; else @@ -3008,7 +3008,7 @@ long BuiltinRegex::FindText(Document *doc, Sci::Position minPos, Sci::Position m } } - DocumentIndexer di(doc, endOfLine); + const DocumentIndexer di(doc, endOfLine); int success = search.Execute(di, startOfLine, endOfLine); if (success) { pos = search.bopat[0]; @@ -3040,7 +3040,7 @@ long BuiltinRegex::FindText(Document *doc, Sci::Position minPos, Sci::Position m const char *BuiltinRegex::SubstituteByPosition(Document *doc, const char *text, Sci::Position *length) { substituted.clear(); - DocumentIndexer di(doc, static_cast<Sci::Position>(doc->Length())); + const DocumentIndexer di(doc, static_cast<Sci::Position>(doc->Length())); search.GrabMatches(di); for (int j = 0; j < *length; j++) { if (text[j] == '\\') { diff --git a/src/RESearch.cxx b/src/RESearch.cxx index 0603b5870..31ee9aaac 100644 --- a/src/RESearch.cxx +++ b/src/RESearch.cxx @@ -272,7 +272,7 @@ void RESearch::Clear() { } } -void RESearch::GrabMatches(CharacterIndexer &ci) { +void RESearch::GrabMatches(const CharacterIndexer &ci) { for (unsigned int i = 0; i < MAXTAG; i++) { if ((bopat[i] != NOTFOUND) && (eopat[i] != NOTFOUND)) { Sci::Position len = eopat[i] - bopat[i]; @@ -753,7 +753,7 @@ const char *RESearch::Compile(const char *pattern, Sci::Position length, bool ca * respectively. * */ -int RESearch::Execute(CharacterIndexer &ci, Sci::Position lp, Sci::Position endp) { +int RESearch::Execute(const CharacterIndexer &ci, Sci::Position lp, Sci::Position endp) { unsigned char c; Sci::Position ep = NOTFOUND; char *ap = nfa; @@ -845,7 +845,7 @@ static inline int isinset(const char *ap, unsigned char c) { #define CHRSKIP 3 /* [CLO] CHR chr END */ #define CCLSKIP 34 /* [CLO] CCL 32 bytes END */ -Sci::Position RESearch::PMatch(CharacterIndexer &ci, Sci::Position lp, Sci::Position endp, char *ap) { +Sci::Position RESearch::PMatch(const CharacterIndexer &ci, Sci::Position lp, Sci::Position endp, char *ap) { int op, c, n; Sci::Position e; /* extra pointer for CLO */ Sci::Position bp; /* beginning of subpat... */ diff --git a/src/RESearch.h b/src/RESearch.h index 83a20c5b5..285c9dc62 100644 --- a/src/RESearch.h +++ b/src/RESearch.h @@ -21,7 +21,7 @@ namespace Scintilla { class CharacterIndexer { public: - virtual char CharAt(Sci::Position index)=0; + virtual char CharAt(Sci::Position index) const=0; virtual ~CharacterIndexer() { } }; @@ -33,9 +33,9 @@ public: // No dynamic allocation so default copy constructor and assignment operator are OK. ~RESearch(); void Clear(); - void GrabMatches(CharacterIndexer &ci); + void GrabMatches(const CharacterIndexer &ci); const char *Compile(const char *pattern, Sci::Position length, bool caseSensitive, bool posix); - int Execute(CharacterIndexer &ci, Sci::Position lp, Sci::Position endp); + int Execute(const CharacterIndexer &ci, Sci::Position lp, Sci::Position endp); enum { MAXTAG=10 }; enum { MAXNFA=4096 }; @@ -50,7 +50,7 @@ private: void ChSetWithCase(unsigned char c, bool caseSensitive); int GetBackslashExpression(const char *pattern, int &incr); - Sci::Position PMatch(CharacterIndexer &ci, Sci::Position lp, Sci::Position endp, char *ap); + Sci::Position PMatch(const CharacterIndexer &ci, Sci::Position lp, Sci::Position endp, char *ap); Sci::Position bol; Sci::Position tagstk[MAXTAG]; /* subpat tag stack */ |