diff options
Diffstat (limited to 'src/Document.h')
| -rw-r--r-- | src/Document.h | 67 | 
1 files changed, 34 insertions, 33 deletions
| diff --git a/src/Document.h b/src/Document.h index d4a950ea5..ee0024f38 100644 --- a/src/Document.h +++ b/src/Document.h @@ -246,11 +246,11 @@ private:  	// ldSize is not real data - it is for dimensions and loops  	enum lineData { ldMarkers, ldLevels, ldState, ldMargin, ldAnnotation, ldSize };  	std::unique_ptr<PerLine> perLineData[ldSize]; -	LineMarkers *Markers() const; -	LineLevels *Levels() const; -	LineState *States() const; -	LineAnnotation *Margins() const; -	LineAnnotation *Annotations() const; +	LineMarkers *Markers() const noexcept; +	LineLevels *Levels() const noexcept; +	LineState *States() const noexcept; +	LineAnnotation *Margins() const noexcept; +	LineAnnotation *Annotations() const noexcept;  	bool matchesValid;  	std::unique_ptr<RegexSearchBase> regex; @@ -302,9 +302,9 @@ public:  	int LineEndTypesSupported() const;  	bool SetDBCSCodePage(int dbcsCodePage_); -	int GetLineEndTypesAllowed() const { return cb.GetLineEndTypes(); } +	int GetLineEndTypesAllowed() const noexcept { return cb.GetLineEndTypes(); }  	bool SetLineEndTypesAllowed(int lineEndBitSet_); -	int GetLineEndTypesActive() const { return cb.GetLineEndTypes(); } +	int GetLineEndTypesActive() const noexcept { return cb.GetLineEndTypes(); }  	int SCI_METHOD Version() const override {  		return dvRelease4; @@ -314,18 +314,18 @@ public:  	Sci_Position SCI_METHOD LineFromPosition(Sci_Position pos) const override;  	Sci::Line SciLineFromPosition(Sci::Position pos) const noexcept;	// Avoids casting LineFromPosition -	Sci::Position ClampPositionIntoDocument(Sci::Position pos) const; -	bool ContainsLineEnd(const char *s, Sci::Position length) const { return cb.ContainsLineEnd(s, length); } -	bool IsCrLf(Sci::Position pos) const; -	int LenChar(Sci::Position pos); +	Sci::Position ClampPositionIntoDocument(Sci::Position pos) const noexcept; +	bool ContainsLineEnd(const char *s, Sci::Position length) const noexcept { return cb.ContainsLineEnd(s, length); } +	bool IsCrLf(Sci::Position pos) const noexcept; +	int LenChar(Sci::Position pos) const noexcept;  	bool InGoodUTF8(Sci::Position pos, Sci::Position &start, Sci::Position &end) const noexcept; -	Sci::Position MovePositionOutsideChar(Sci::Position pos, Sci::Position moveDir, bool checkLineEnd=true) const; +	Sci::Position MovePositionOutsideChar(Sci::Position pos, Sci::Position moveDir, bool checkLineEnd=true) const noexcept;  	Sci::Position NextPosition(Sci::Position pos, int moveDir) const noexcept;  	bool NextCharacter(Sci::Position &pos, int moveDir) const noexcept;	// Returns true if pos changed -	Document::CharacterExtracted CharacterAfter(Sci::Position position) const; -	Document::CharacterExtracted CharacterBefore(Sci::Position position) const; +	Document::CharacterExtracted CharacterAfter(Sci::Position position) const noexcept; +	Document::CharacterExtracted CharacterBefore(Sci::Position position) const noexcept;  	Sci_Position SCI_METHOD GetRelativePosition(Sci_Position positionStart, Sci_Position characterOffset) const override; -	Sci::Position GetRelativePositionUTF16(Sci::Position positionStart, Sci::Position characterOffset) const; +	Sci::Position GetRelativePositionUTF16(Sci::Position positionStart, Sci::Position characterOffset) const noexcept;  	int SCI_METHOD GetCharacterAndWidth(Sci_Position position, Sci_Position *pWidth) const override;  	int SCI_METHOD CodePage() const override;  	bool SCI_METHOD IsDBCSLeadByte(char ch) const override; @@ -346,42 +346,42 @@ public:  	void * SCI_METHOD ConvertToDocument() override;  	Sci::Position Undo();  	Sci::Position Redo(); -	bool CanUndo() const { return cb.CanUndo(); } -	bool CanRedo() const { return cb.CanRedo(); } +	bool CanUndo() const noexcept { return cb.CanUndo(); } +	bool CanRedo() const noexcept { return cb.CanRedo(); }  	void DeleteUndoHistory() { cb.DeleteUndoHistory(); }  	bool SetUndoCollection(bool collectUndo) {  		return cb.SetUndoCollection(collectUndo);  	} -	bool IsCollectingUndo() const { return cb.IsCollectingUndo(); } +	bool IsCollectingUndo() const noexcept { return cb.IsCollectingUndo(); }  	void BeginUndoAction() { cb.BeginUndoAction(); }  	void EndUndoAction() { cb.EndUndoAction(); }  	void AddUndoAction(Sci::Position token, bool mayCoalesce) { cb.AddUndoAction(token, mayCoalesce); }  	void SetSavePoint(); -	bool IsSavePoint() const { return cb.IsSavePoint(); } +	bool IsSavePoint() const noexcept { return cb.IsSavePoint(); }  	void TentativeStart() { cb.TentativeStart(); }  	void TentativeCommit() { cb.TentativeCommit(); }  	void TentativeUndo(); -	bool TentativeActive() const { return cb.TentativeActive(); } +	bool TentativeActive() const noexcept { return cb.TentativeActive(); }  	const char * SCI_METHOD BufferPointer() override { return cb.BufferPointer(); }  	const char *RangePointer(Sci::Position position, Sci::Position rangeLength) { return cb.RangePointer(position, rangeLength); } -	Sci::Position GapPosition() const { return cb.GapPosition(); } +	Sci::Position GapPosition() const noexcept { return cb.GapPosition(); }  	int SCI_METHOD GetLineIndentation(Sci_Position line) override;  	Sci::Position SetLineIndentation(Sci::Line line, Sci::Position indent);  	Sci::Position GetLineIndentPosition(Sci::Line line) const;  	Sci::Position GetColumn(Sci::Position pos); -	Sci::Position CountCharacters(Sci::Position startPos, Sci::Position endPos) const; -	Sci::Position CountUTF16(Sci::Position startPos, Sci::Position endPos) const; +	Sci::Position CountCharacters(Sci::Position startPos, Sci::Position endPos) const noexcept; +	Sci::Position CountUTF16(Sci::Position startPos, Sci::Position endPos) const noexcept;  	Sci::Position FindColumn(Sci::Line line, Sci::Position column);  	void Indent(bool forwards, Sci::Line lineBottom, Sci::Line lineTop);  	static std::string TransformLineEnds(const char *s, size_t len, int eolModeWanted);  	void ConvertLineEnds(int eolModeSet);  	void SetReadOnly(bool set) { cb.SetReadOnly(set); } -	bool IsReadOnly() const { return cb.IsReadOnly(); } -	bool IsLarge() const { return cb.IsLarge(); } -	int Options() const; +	bool IsReadOnly() const noexcept { return cb.IsReadOnly(); } +	bool IsLarge() const noexcept { return cb.IsLarge(); } +	int Options() const noexcept;  	void DelChar(Sci::Position pos);  	void DelCharBack(Sci::Position pos); @@ -395,7 +395,7 @@ public:  	void GetStyleRange(unsigned char *buffer, Sci::Position position, Sci::Position lengthRetrieve) const {  		cb.GetStyleRange(buffer, position, lengthRetrieve);  	} -	int GetMark(Sci::Line line) const; +	int GetMark(Sci::Line line) const noexcept;  	Sci::Line MarkerNext(Sci::Line lineStart, int mask) const;  	int AddMark(Sci::Line line, int markerNum);  	void AddMarkSet(Sci::Line line, int valueSet); @@ -410,8 +410,8 @@ public:  	bool IsLineEndPosition(Sci::Position position) const;  	bool IsPositionInLineEnd(Sci::Position position) const;  	Sci::Position VCHomePosition(Sci::Position position) const; -	Sci::Position IndexLineStart(Sci::Line line, int lineCharacterIndex) const; -	Sci::Line LineFromPositionIndex(Sci::Position pos, int lineCharacterIndex) const; +	Sci::Position IndexLineStart(Sci::Line line, int lineCharacterIndex) const noexcept; +	Sci::Line LineFromPositionIndex(Sci::Position pos, int lineCharacterIndex) const noexcept;  	int SCI_METHOD SetLevel(Sci_Position line, int level) override;  	int SCI_METHOD GetLevel(Sci_Position line) const override; @@ -424,6 +424,7 @@ public:  	Sci::Position NextWordStart(Sci::Position pos, int delta) const;  	Sci::Position NextWordEnd(Sci::Position pos, int delta) const;  	Sci_Position SCI_METHOD Length() const override { return cb.Length(); } +	Sci::Position LengthNoExcept() const noexcept { return cb.Length(); }  	void Allocate(Sci::Position newSize) { cb.Allocate(newSize); }  	CharacterExtracted ExtractCharacter(Sci::Position position) const noexcept; @@ -434,10 +435,10 @@ public:  	bool MatchesWordOptions(bool word, bool wordStart, Sci::Position pos, Sci::Position length) const;  	bool HasCaseFolder() const noexcept; -	void SetCaseFolder(CaseFolder *pcf_); +	void SetCaseFolder(CaseFolder *pcf_) noexcept;  	Sci::Position FindText(Sci::Position minPos, Sci::Position maxPos, const char *search, int flags, Sci::Position *length);  	const char *SubstituteByPosition(const char *text, Sci::Position *length); -	int LineCharacterIndex() const; +	int LineCharacterIndex() const noexcept;  	void AllocateLineCharacterIndex(int lineCharacterIndex);  	void ReleaseLineCharacterIndex(int lineCharacterIndex);  	Sci::Line LinesTotal() const noexcept; @@ -486,12 +487,12 @@ public:  	bool IsWordPartSeparator(unsigned int ch) const;  	Sci::Position WordPartLeft(Sci::Position pos) const;  	Sci::Position WordPartRight(Sci::Position pos) const; -	Sci::Position ExtendStyleRange(Sci::Position pos, int delta, bool singleLine = false); +	Sci::Position ExtendStyleRange(Sci::Position pos, int delta, bool singleLine) noexcept;  	bool IsWhiteLine(Sci::Line line) const;  	Sci::Position ParaUp(Sci::Position pos) const;  	Sci::Position ParaDown(Sci::Position pos) const;  	int IndentSize() const noexcept { return actualIndentInChars; } -	Sci::Position BraceMatch(Sci::Position position, Sci::Position maxReStyle); +	Sci::Position BraceMatch(Sci::Position position, Sci::Position maxReStyle) noexcept;  private:  	void NotifyModifyAttempt(); | 
