diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/Decoration.cxx | 40 | ||||
-rw-r--r-- | src/Decoration.h | 28 |
2 files changed, 34 insertions, 34 deletions
diff --git a/src/Decoration.cxx b/src/Decoration.cxx index 91a2a6c6b..abf15f7e6 100644 --- a/src/Decoration.cxx +++ b/src/Decoration.cxx @@ -40,22 +40,22 @@ public: ~Decoration() override { } - bool Empty() const override { + bool Empty() const noexcept override { return (rs.Runs() == 1) && (rs.AllSameAs(0)); } - int Indicator() const override { + int Indicator() const noexcept override { return indicator; } - Sci::Position Length() const override { + Sci::Position Length() const noexcept override { return rs.Length(); } - int ValueAt(Sci::Position position) const override { + int ValueAt(Sci::Position position) const noexcept override { return rs.ValueAt(static_cast<POS>(position)); } - Sci::Position StartRun(Sci::Position position) const override { + Sci::Position StartRun(Sci::Position position) const noexcept override { return rs.StartRun(static_cast<POS>(position)); } - Sci::Position EndRun(Sci::Position position) const override { + Sci::Position EndRun(Sci::Position position) const noexcept override { return rs.EndRun(static_cast<POS>(position)); } void SetValueAt(Sci::Position position, int value) override { @@ -64,7 +64,7 @@ public: void InsertSpace(Sci::Position position, Sci::Position insertLength) override { rs.InsertSpace(static_cast<POS>(position), static_cast<POS>(insertLength)); } - Sci::Position Runs() const override { + Sci::Position Runs() const noexcept override { return rs.Runs(); } }; @@ -80,7 +80,7 @@ class DecorationList : public IDecorationList { std::vector<const IDecoration*> decorationView; // Read-only view of decorationList bool clickNotified; - Decoration<POS> *DecorationFromIndicator(int indicator); + Decoration<POS> *DecorationFromIndicator(int indicator) noexcept; Decoration<POS> *Create(int indicator, Sci::Position length); void Delete(int indicator); void DeleteAnyEmpty(); @@ -90,15 +90,15 @@ public: DecorationList(); ~DecorationList() override; - const std::vector<const IDecoration*> &View() const override { + const std::vector<const IDecoration*> &View() const noexcept override { return decorationView; } void SetCurrentIndicator(int indicator) override; - int GetCurrentIndicator() const override { return currentIndicator; } + int GetCurrentIndicator() const noexcept override { return currentIndicator; } void SetCurrentValue(int value) override; - int GetCurrentValue() const override { return currentValue; } + int GetCurrentValue() const noexcept override { return currentValue; } // Returns changed=true if some values may have changed FillResult<Sci::Position> FillRange(Sci::Position position, int value, Sci::Position fillLength) override; @@ -108,10 +108,10 @@ public: void DeleteLexerDecorations() override; - int AllOnFor(Sci::Position position) const override; - int ValueAt(int indicator, Sci::Position position) override; - Sci::Position Start(int indicator, Sci::Position position) override; - Sci::Position End(int indicator, Sci::Position position) override; + int AllOnFor(Sci::Position position) const noexcept override; + int ValueAt(int indicator, Sci::Position position) noexcept override; + Sci::Position Start(int indicator, Sci::Position position) noexcept override; + Sci::Position End(int indicator, Sci::Position position) noexcept override; bool ClickNotified() const override { return clickNotified; @@ -132,7 +132,7 @@ DecorationList<POS>::~DecorationList() { } template <typename POS> -Decoration<POS> *DecorationList<POS>::DecorationFromIndicator(int indicator) { +Decoration<POS> *DecorationList<POS>::DecorationFromIndicator(int indicator) noexcept { for (const std::unique_ptr<Decoration<POS>> &deco : decorationList) { if (deco->Indicator() == indicator) { return deco.get(); @@ -256,7 +256,7 @@ void DecorationList<POS>::SetView() { } template <typename POS> -int DecorationList<POS>::AllOnFor(Sci::Position position) const { +int DecorationList<POS>::AllOnFor(Sci::Position position) const noexcept { int mask = 0; for (const std::unique_ptr<Decoration<POS>> &deco : decorationList) { if (deco->rs.ValueAt(static_cast<POS>(position))) { @@ -269,7 +269,7 @@ int DecorationList<POS>::AllOnFor(Sci::Position position) const { } template <typename POS> -int DecorationList<POS>::ValueAt(int indicator, Sci::Position position) { +int DecorationList<POS>::ValueAt(int indicator, Sci::Position position) noexcept { const Decoration<POS> *deco = DecorationFromIndicator(indicator); if (deco) { return deco->rs.ValueAt(static_cast<POS>(position)); @@ -278,7 +278,7 @@ int DecorationList<POS>::ValueAt(int indicator, Sci::Position position) { } template <typename POS> -Sci::Position DecorationList<POS>::Start(int indicator, Sci::Position position) { +Sci::Position DecorationList<POS>::Start(int indicator, Sci::Position position) noexcept { const Decoration<POS> *deco = DecorationFromIndicator(indicator); if (deco) { return deco->rs.StartRun(static_cast<POS>(position)); @@ -287,7 +287,7 @@ Sci::Position DecorationList<POS>::Start(int indicator, Sci::Position position) } template <typename POS> -Sci::Position DecorationList<POS>::End(int indicator, Sci::Position position) { +Sci::Position DecorationList<POS>::End(int indicator, Sci::Position position) noexcept { const Decoration<POS> *deco = DecorationFromIndicator(indicator); if (deco) { return deco->rs.EndRun(static_cast<POS>(position)); diff --git a/src/Decoration.h b/src/Decoration.h index 1461f2f98..923b0ce15 100644 --- a/src/Decoration.h +++ b/src/Decoration.h @@ -12,28 +12,28 @@ namespace Scintilla { class IDecoration { public: virtual ~IDecoration() {} - virtual bool Empty() const = 0; - virtual int Indicator() const = 0; - virtual Sci::Position Length() const = 0; - virtual int ValueAt(Sci::Position position) const = 0; - virtual Sci::Position StartRun(Sci::Position position) const = 0; - virtual Sci::Position EndRun(Sci::Position position) const = 0; + virtual bool Empty() const noexcept = 0; + virtual int Indicator() const noexcept = 0; + virtual Sci::Position Length() const noexcept = 0; + virtual int ValueAt(Sci::Position position) const noexcept = 0; + virtual Sci::Position StartRun(Sci::Position position) const noexcept = 0; + virtual Sci::Position EndRun(Sci::Position position) const noexcept = 0; virtual void SetValueAt(Sci::Position position, int value) = 0; virtual void InsertSpace(Sci::Position position, Sci::Position insertLength) = 0; - virtual Sci::Position Runs() const = 0; + virtual Sci::Position Runs() const noexcept = 0; }; class IDecorationList { public: virtual ~IDecorationList() {} - virtual const std::vector<const IDecoration*> &View() const =0; + virtual const std::vector<const IDecoration*> &View() const noexcept = 0; virtual void SetCurrentIndicator(int indicator) = 0; - virtual int GetCurrentIndicator() const = 0; + virtual int GetCurrentIndicator() const noexcept = 0; virtual void SetCurrentValue(int value) = 0; - virtual int GetCurrentValue() const = 0; + virtual int GetCurrentValue() const noexcept = 0; // Returns with changed=true if some values may have changed virtual FillResult<Sci::Position> FillRange(Sci::Position position, int value, Sci::Position fillLength) = 0; @@ -41,10 +41,10 @@ public: virtual void DeleteRange(Sci::Position position, Sci::Position deleteLength) = 0; virtual void DeleteLexerDecorations() = 0; - virtual int AllOnFor(Sci::Position position) const = 0; - virtual int ValueAt(int indicator, Sci::Position position) = 0; - virtual Sci::Position Start(int indicator, Sci::Position position) = 0; - virtual Sci::Position End(int indicator, Sci::Position position) = 0; + virtual int AllOnFor(Sci::Position position) const noexcept = 0; + virtual int ValueAt(int indicator, Sci::Position position) noexcept = 0; + virtual Sci::Position Start(int indicator, Sci::Position position) noexcept = 0; + virtual Sci::Position End(int indicator, Sci::Position position) noexcept = 0; virtual bool ClickNotified() const = 0; virtual void SetClickNotified(bool notified) = 0; |