From 82f62a0f728eb57c22776424521564da7de7cc22 Mon Sep 17 00:00:00 2001
From: Curtis McEnroe <june@causal.agency>
Date: Fri, 23 Nov 2018 15:27:26 -0500
Subject: Replace tableUpdate with tableReplace

---
 bin/edi/edi.h   |  3 +--
 bin/edi/table.c | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 14 deletions(-)

(limited to 'bin')

diff --git a/bin/edi/edi.h b/bin/edi/edi.h
index 819b0a36..be7bf681 100644
--- a/bin/edi/edi.h
+++ b/bin/edi/edi.h
@@ -51,15 +51,14 @@ void bufferTruncate(struct Buffer *buf, size_t len);
 
 static const struct Table {
 	size_t cap, len;
-	size_t ins;
 	struct Slice *slices;
 } TableEmpty;
 struct Table tableAlloc(size_t cap);
 void tableFree(struct Table *table);
 void tablePush(struct Table *table, struct Slice slice);
+void tableReplace(struct Table *table, struct Slice old, struct Slice new);
 struct Table tableInsert(const struct Table *prev, size_t at, struct Slice ins);
 struct Table tableDelete(const struct Table *prev, struct Span del);
-void tableUpdate(struct Table *table, struct Slice ins);
 
 struct Iter {
 	const struct Table *table;
diff --git a/bin/edi/table.c b/bin/edi/table.c
index 2410ceec..6540581e 100644
--- a/bin/edi/table.c
+++ b/bin/edi/table.c
@@ -43,20 +43,29 @@ void tablePush(struct Table *table, struct Slice slice) {
 	table->slices[table->len++] = slice;
 }
 
+void tableReplace(struct Table *table, struct Slice old, struct Slice new) {
+	for (size_t i = 0; i < table->len; ++i) {
+		if (table->slices[i].ptr != old.ptr) continue;
+		if (table->slices[i].len != old.len) continue;
+		table->slices[i] = new;
+		break;
+	}
+}
+
 struct Table tableInsert(const struct Table *prev, size_t at, struct Slice ins) {
 	struct Table next = tableAlloc(prev->len + 2);
 	struct Span span = { 0, 0 };
 	for (size_t i = 0; i < prev->len; ++i) {
 		span = spanNext(span, prev->slices[i].len);
 		if (span.at == at) {
-			next.slices[next.ins = next.len++] = ins;
+			next.slices[next.len++] = ins;
 			next.slices[next.len++] = prev->slices[i];
 		} else if (span.at < at && span.to > at) {
 			next.slices[next.len++] = (struct Slice) {
 				prev->slices[i].ptr,
 				at - span.at,
 			};
-			next.slices[next.ins = next.len++] = ins;
+			next.slices[next.len++] = ins;
 			next.slices[next.len++] = (struct Slice) {
 				&prev->slices[i].ptr[at - span.at],
 				prev->slices[i].len - (at - span.at),
@@ -66,15 +75,11 @@ struct Table tableInsert(const struct Table *prev, size_t at, struct Slice ins)
 		}
 	}
 	if (span.to == at) {
-		next.slices[next.ins = next.len++] = ins;
+		next.slices[next.len++] = ins;
 	}
 	return next;
 }
 
-void tableUpdate(struct Table *table, struct Slice ins) {
-	if (table->ins < table->len) table->slices[table->ins] = ins;
-}
-
 struct Table tableDelete(const struct Table *prev, struct Span del) {
 	struct Table next = tableAlloc(prev->len + 1);
 	struct Span span = { 0, 0 };
@@ -105,7 +110,6 @@ struct Table tableDelete(const struct Table *prev, struct Span del) {
 			next.slices[next.len++] = prev->slices[i];
 		}
 	}
-	next.ins = next.len;
 	return next;
 }
 
@@ -142,10 +146,6 @@ int main() {
 	assert(eq(L"ABCD", &abcd));
 	assert(eq(L"ADBC", &adbc));
 
-	assert(L'D' == dabc.slices[dabc.ins].ptr[0]);
-	assert(L'D' == abcd.slices[abcd.ins].ptr[0]);
-	assert(L'D' == adbc.slices[adbc.ins].ptr[0]);
-
 	tableFree(&dabc);
 	tableFree(&abcd);
 	tableFree(&adbc);
-- 
cgit 1.4.1