From 5a1d5ee8413786cd38f3df181b00d3fad3e748de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Pant=C5=AF=C4=8Dek?= Date: Fri, 7 Jul 2023 12:52:32 +0200 Subject: [PATCH] Use new BST-backet lset implementation. --- doc/d-utils.md | 6 ++++++ src/Makefile | 34 ++++++++++++++-------------------- src/gendoc.scm | 1 + src/mailman.scm | 2 +- 4 files changed, 22 insertions(+), 21 deletions(-) diff --git a/doc/d-utils.md b/doc/d-utils.md index d74dbec..2aeea13 100644 --- a/doc/d-utils.md +++ b/doc/d-utils.md @@ -590,3 +590,9 @@ Reimplementation of old number-only BST dictionary. (import util-bst-ldict) Reimplementation of old list-based symbol dictionary using new BST backend. + +## util-bst-lset [module] + + (import util-bst-lset) + +Reimplementation of old lset using new BST backend. diff --git a/src/Makefile b/src/Makefile index a09ff54..ce018ea 100644 --- a/src/Makefile +++ b/src/Makefile @@ -46,17 +46,17 @@ HACKERBASE-OBJS=hackerbase.o testing.o listing.o cal-month.o \ primes.o brmember.o configuration.o progress.o \ export-cards.o members-print.o members-fees.o mbase-dir.o \ util-csv.o bank-account.o bank-fio.o members-payments.o \ - brmember-parser.o environment.o mailman.o util-set-list.o \ - util-time.o util-tag.o util-io.o util-string.o util-io.o \ - util-parser.o texts.o tests.o util-proc.o util-mail.o \ - notifications.o util-format.o brmember-format.o logging.o \ - specification.o util-git.o cal-day.o util-stdout.o \ - cal-format.o table.o sgr-list.o sgr-block.o \ - table-processor.o table-border.o table-style.o sgr-state.o \ - util-utf8.o sgr-cell.o template-list-expander.o \ - box-drawing.o util-list.o export-web-static.o util-dir.o \ - dokuwiki.o racket-kwargs.o duck.o util-bst.o \ - util-bst-bdict.o util-bst-ldict.o util-bst-lset.o + brmember-parser.o environment.o mailman.o util-time.o \ + util-tag.o util-io.o util-string.o util-io.o util-parser.o \ + texts.o tests.o util-proc.o util-mail.o notifications.o \ + util-format.o brmember-format.o logging.o specification.o \ + util-git.o cal-day.o util-stdout.o cal-format.o table.o \ + sgr-list.o sgr-block.o table-processor.o table-border.o \ + table-style.o sgr-state.o util-utf8.o sgr-cell.o \ + template-list-expander.o box-drawing.o util-list.o \ + export-web-static.o util-dir.o dokuwiki.o racket-kwargs.o \ + duck.o util-bst.o util-bst-bdict.o util-bst-ldict.o \ + util-bst-lset.o GENDOC-SOURCES=gendoc.scm duck-extract.import.scm \ util-time.import.scm util-csv.import.scm util-git.import.scm \ @@ -71,8 +71,8 @@ GENDOC-OBJS=gendoc.o duck-extract.o util-time.o util-csv.o util-io.o \ progress.o testing.o util-proc.o util-git.o util-io.o \ util-stdout.o util-parser.o util-list.o util-proc.o \ util-format.o racket-kwargs.o util-bst-ldict.o util-tag.o \ - util-set-list.o duck.o util-string.o util-bst.o \ - util-bst-bdict.o util-bst-ldict.o + duck.o util-string.o util-bst.o util-bst-bdict.o \ + util-bst-ldict.o .PHONY: imports imports: $(HACKERBASE-DEPS) @@ -258,18 +258,12 @@ environment.o: environment.import.scm environment.import.scm: $(ENVIRONMENT-SOURCES) MAILMAN-SOURCES=mailman.scm progress.import.scm \ - util-set-list.import.scm util-io.import.scm \ + util-bst-lset.import.scm util-io.import.scm \ util-list.import.scm mailman.o: mailman.import.scm mailman.import.scm: $(MAILMAN-SOURCES) -UTIL-SET-LIST-SOURCES=util-set-list.scm testing.import.scm \ - util-tag.import.scm - -util-set-list.o: util-set-list.import.scm -util-set-list.import.scm: $(UTIL-SET-LIST-SOURCES) - UTIL-TIME-SOURCES=util-time.scm duck.import.scm util-time.o: util-time.import.scm diff --git a/src/gendoc.scm b/src/gendoc.scm index 77aa588..4ca7c93 100644 --- a/src/gendoc.scm +++ b/src/gendoc.scm @@ -35,4 +35,5 @@ util-bst util-bst-bdict util-bst-ldict + util-bst-lset ) diff --git a/src/mailman.scm b/src/mailman.scm index ffca256..62acc3a 100644 --- a/src/mailman.scm +++ b/src/mailman.scm @@ -61,7 +61,7 @@ (chicken format) util-list progress - util-set-list + util-bst-lset util-io) ;; Where does the mailman binaries reside