From e1fb4842bf05c8c5fc66d00b61cb50acbcb783e5 Mon Sep 17 00:00:00 2001 From: June McEnroe 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/edi') diff --git a/bin/edi/edi.h b/bin/edi/edi.h index c7345e37..ed03bf21 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 7905d7d7..5f7e963e 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 msg'> Works properly for weird paths, etc. 2020-10-27Allow cd host:path over sshJune McEnroe Requires AcceptEnv SSH_CD in the remote sshd_config. 2020-10-07Use mandoc -T utf8 for text.June McEnroe Don't depend on LANG being set. 2020-09-20Add The Awakened KingdomJune McEnroe A cute extra novella. Finally finished this series. 2020-09-12Move /opt/local back, cheat port select to use system manJune McEnroe This is not really how you're supposed to use the select system, I don't think, since the mandoc package actually creates those files, but it does work. This lets me actually use the git installed by MacPorts. 2020-09-12Move /opt/local behind /usr againJune McEnroe The reason I did this with pkgsrc was because I actually don't want the man(1) from mandoc, since it won't follow MANSECT. Same applies to MacPorts. I wish I could disable its man(1) with a variant or whatever. 2020-09-12Enable toc in cgit renderings of man pagesJune McEnroe But keep it disabled for READMEs since they always use non-standard sections and the TOC is just distracting there, I think. Also add the style so its h1 is the same size as the ones inside sections... 2020-09-11Install mandoc on macOSJune McEnroe 2020-09-11Rewrite install script yet againJune McEnroe 2020-09-11Remove NetBSD from install scriptJune McEnroe I never use it. 2020-09-11Use MacPorts rather than pkgsrcJune McEnroe My system is probably such a mess now... 2020-09-11Add debian VM name to sshJune McEnroe 2020-09-11Add influencer tweetJune McEnroe 2020-09-10Add The Kingdom of GodsJune McEnroe Reading has really slowed down :( 2020-09-07Add SunglassesJune McEnroe An IRC find. 2020-09-06Add Between the BreathsJune McEnroe One of those good songs from a soundtrack of a film that probably isn't? The summary sounds a lot more interesting than the title implies, at least. 2020-09-04Open /dev/tty in nudgeJune McEnroe This makes it work even when it's run connected to a pipe, i.e. as the notify command of catgirl... 2020-09-04Add nudgeJune McEnroe 2020-09-03Build fbclock with -lzJune McEnroe I guess this got lost somewhere, long ago... 2020-08-29Add tweets from retweetsJune McEnroe