mirror of
https://github.com/notepad-plus-plus/notepad-plus-plus.git
synced 2025-11-04 13:34:00 +01:00
a61b03ea88
Update with https://www.scintilla.org/scintilla521.zip https://www.scintilla.org/lexilla515.zip - fix setting to bring Scintilla::PositionCR from ScintillaStructures.h inline with Sci_Position.h Sci_PositionCR - add workaround to enable lexer for searchResult commented out SCI_SETILEXER call on searchResult to get one result which is correctly handled by the lexer, added comment about the current problem with property @MarkingsStruct which seems to disappear after call to SCI_SETILEXER or CreateLexer - corrected usage of ObjC lexer - removed unnecessary filter stuff - use own sections for scintilla and lexilla build targets and allow parallel builds - as libscilex is no longer existing, changed to libscintilla - adapt makefiles and cmake - use VS2019 - started simple changes for createlexer adaptations, nullpointercheck missing on return of lexer name from deprecated LexerNameFromID -> undefined behaviour - movement from id -> lexer name, mostly done via LexerNameFromID + switching off corresponding compiler warning - changed to SCI_SETILEXER from SCI_SETLEXER, SCI_SETLEXERLANGUAGE needs to be corrected, see Scintilla5Migration.html - just commented out: SCI_LOADLEXERLIBRARY Fix #10504, close #11419
94 lines
2.3 KiB
C++
94 lines
2.3 KiB
C++
// This file is part of Notepad++ project
|
|
// Copyright (C) 2021 Notepad++ authors.
|
|
|
|
// This program is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// at your option any later version.
|
|
//
|
|
// This program is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
#ifndef UTF8DOCUMENTITERATOR_H_3452843291318441149
|
|
#define UTF8DOCUMENTITERATOR_H_3452843291318441149
|
|
|
|
#include <stdlib.h>
|
|
#include <vector>
|
|
#include <memory>
|
|
#include "Position.h"
|
|
|
|
namespace Scintilla::Internal {
|
|
|
|
class Document;
|
|
|
|
class UTF8DocumentIterator
|
|
{
|
|
public:
|
|
using iterator_category = std::bidirectional_iterator_tag;
|
|
using value_type = wchar_t;
|
|
using difference_type = ptrdiff_t;
|
|
using pointer = wchar_t*;
|
|
using reference = wchar_t&;
|
|
|
|
UTF8DocumentIterator() {};
|
|
|
|
UTF8DocumentIterator(Document* doc, Sci::Position pos, Sci::Position end);
|
|
UTF8DocumentIterator(const UTF8DocumentIterator& copy);
|
|
|
|
bool operator == (const UTF8DocumentIterator& other) const
|
|
{
|
|
return (ended() == other.ended()) && (m_doc == other.m_doc) && (m_pos == other.m_pos);
|
|
}
|
|
|
|
bool operator != (const UTF8DocumentIterator& other) const
|
|
{
|
|
return !(*this == other);
|
|
}
|
|
|
|
wchar_t operator * () const
|
|
{
|
|
return m_character[m_characterIndex];
|
|
}
|
|
|
|
UTF8DocumentIterator& operator = (Sci::Position other)
|
|
{
|
|
m_pos = other;
|
|
return *this;
|
|
}
|
|
|
|
UTF8DocumentIterator& operator ++ ();
|
|
UTF8DocumentIterator& operator -- ();
|
|
|
|
Sci::Position pos() const
|
|
{
|
|
return m_pos;
|
|
}
|
|
|
|
private:
|
|
void readCharacter();
|
|
|
|
|
|
bool ended() const
|
|
{
|
|
return m_pos >= m_end;
|
|
}
|
|
|
|
Sci::Position m_pos = 0;
|
|
wchar_t m_character[2];
|
|
Sci::Position m_end = 0;
|
|
int m_characterIndex = 0;
|
|
int m_utf8Length = 0;
|
|
int m_utf16Length = 0;
|
|
Document* m_doc = nullptr;
|
|
static const unsigned char m_firstByteMask[];
|
|
};
|
|
|
|
}
|
|
|
|
#endif // UTF8DOCUMENTITERATOR_H_3452843291318441149
|