aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Partitioning.h
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2019-12-01 19:53:48 +1100
committerNeil <nyamatongwe@gmail.com>2019-12-01 19:53:48 +1100
commit1e5534dde930d2b7eb2580f2c459d1553f3a5971 (patch)
tree23dff96fa1a4b856388ce42f420ed4a9797b7108 /src/Partitioning.h
parent7daa6e47979594525c3dd82bb1afce44ac28b246 (diff)
downloadscintilla-mirror-1e5534dde930d2b7eb2580f2c459d1553f3a5971.tar.gz
Fix a bug with deleting the first element in SparseVector that left an extra
empty partition. Add extra checking to Partitioning and turn on checking for UnitTester.
Diffstat (limited to 'src/Partitioning.h')
-rw-r--r--src/Partitioning.h32
1 files changed, 32 insertions, 0 deletions
diff --git a/src/Partitioning.h b/src/Partitioning.h
index c6951388e..608a3a58c 100644
--- a/src/Partitioning.h
+++ b/src/Partitioning.h
@@ -110,6 +110,10 @@ public:
return static_cast<T>(body->Length())-1;
}
+ T Length() const noexcept {
+ return PositionFromPartition(Partitions());
+ }
+
void InsertPartition(T partition, T pos) {
if (stepPartition < partition) {
ApplyStep(partition);
@@ -196,6 +200,34 @@ public:
void DeleteAll() {
Allocate(body->GetGrowSize());
}
+
+ void Check() const {
+#ifdef CHECK_CORRECTNESS
+ if (Length() < 0) {
+ throw std::runtime_error("Partitioning: Length can not be negative.");
+ }
+ if (Partitions() < 1) {
+ throw std::runtime_error("Partitioning: Must always have 1 or more partitions.");
+ }
+ if (Length() == 0) {
+ if ((PositionFromPartition(0) != 0) || (PositionFromPartition(1) != 0)) {
+ throw std::runtime_error("Partitioning: Invalid empty partitioning.");
+ }
+ } else {
+ // Positions should be a strictly ascending sequence
+ for (T i = 0; i < Partitions(); i++) {
+ const T pos = PositionFromPartition(i);
+ const T posNext = PositionFromPartition(i+1);
+ if (pos > posNext) {
+ throw std::runtime_error("Partitioning: Negative partition.");
+ } else if (pos == posNext) {
+ throw std::runtime_error("Partitioning: Empty partition.");
+ }
+ }
+ }
+#endif
+ }
+
};