From ac3dce41a616e6de536ba788c6166a332cc76f0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Pant=C5=AF=C4=8Dek?=
 <dominik.pantucek@trustica.cz>
Date: Sat, 8 Apr 2023 21:05:41 +0200
Subject: [PATCH] Remove old utils module.

---
 src/Makefile                     | 84 ++++++++++++++++++--------------
 src/ansi.scm                     |  2 +-
 src/command-line.scm             |  2 +-
 src/mailman.scm                  |  2 +-
 src/member-parser.scm            |  2 +-
 src/member-record.scm            |  2 +-
 src/members-base.scm             |  2 +-
 src/members-dir.scm              |  2 +-
 src/members-payments.scm         |  2 +-
 src/members-print.scm            |  2 +-
 src/primes.scm                   |  2 +-
 src/table.scm                    |  2 +-
 src/{utils.scm => util-list.scm} |  6 +--
 src/web-static.scm               |  2 +-
 14 files changed, 62 insertions(+), 52 deletions(-)
 rename src/{utils.scm => util-list.scm} (96%)

diff --git a/src/Makefile b/src/Makefile
index 932faff..e486a2b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -34,7 +34,7 @@ CSC=csc
 BBSTOOL-DEPS=bbstool.scm testing.import.scm listing.import.scm		\
 	dictionary.import.scm month.import.scm period.import.scm	\
 	ansi.import.scm command-line.import.scm				\
-	members-base.import.scm utils.import.scm primes.import.scm	\
+	members-base.import.scm primes.import.scm			\
 	member-record.import.scm configuration.import.scm		\
 	progress.import.scm table.import.scm cards.import.scm		\
 	member-parser.import.scm members-print.import.scm		\
@@ -44,15 +44,17 @@ BBSTOOL-DEPS=bbstool.scm testing.import.scm listing.import.scm		\
 	web-static.import.scm environment.import.scm			\
 	mailman.import.scm util-set-list.import.scm			\
 	util-time.import.scm util-tag.import.scm util-io.import.scm	\
-	util-string.import.scm util-io.import.scm
+	util-string.import.scm util-io.import.scm			\
+	util-list.import.scm
 
 BBSTOOL-OBJS=bbstool.o testing.o listing.o month.o period.o ansi.o	\
-	 dictionary.o command-line.o members-base.o utils.o primes.o	\
+	 dictionary.o command-line.o members-base.o primes.o		\
 	 member-record.o configuration.o progress.o table.o cards.o	\
-	 members-print.o member-fees.o members-dir.o util-csv.o	\
+	 members-print.o member-fees.o members-dir.o util-csv.o		\
 	 bank-account.o bank-fio.o members-payments.o member-parser.o	\
 	 web-static.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-time.o util-tag.o util-io.o util-string.o util-io.o	\
+	 util-list.import.scm
 
 .PHONY: imports
 imports: $(BBSTOOL-DEPS)
@@ -108,40 +110,41 @@ PERIOD-SOURCES=period.scm testing.import.scm month.import.scm	\
 period.o: period.import.scm
 period.import.scm: $(PERIOD-SOURCES)
 
-ANSI-SOURCES=ansi.scm testing.import.scm utils.import.scm
+ANSI-SOURCES=ansi.scm testing.import.scm util-list.import.scm
 
 ansi.o: ansi.import.scm
 ansi.import.scm: $(ANSI-SOURCES)
 
 COMMAND-LINE-SOURCES=command-line.scm testing.import.scm	\
-	utils.import.scm
+	util-list.import.scm
 
 command-line.o: command-line.import.scm
 command-line.import.scm: $(COMMAND-LINE-SOURCES)
 
 MEMBERS-BASE-SOURCES=members-base.scm testing.import.scm		\
-	utils.import.scm dictionary.import.scm primes.import.scm	\
-	member-record.import.scm ansi.import.scm period.import.scm	\
-	month.import.scm configuration.import.scm progress.import.scm	\
-	table.import.scm members-dir.import.scm
+	 dictionary.import.scm primes.import.scm			\
+	 member-record.import.scm ansi.import.scm period.import.scm	\
+	 month.import.scm configuration.import.scm			\
+	 progress.import.scm table.import.scm members-dir.import.scm	\
+	 util-list.import.scm
 
 members-base.o: members-base.import.scm
 members-base.import.scm: $(MEMBERS-BASE-SOURCES)
 
-UTILS-SOURCES=utils.scm testing.import.scm
+UTIL-LIST-SOURCES=util-list.scm testing.import.scm
 
-utils.o: utils.import.scm
-utils.import.scm: $(UTILS-SOURCES)
+util-list.o: util-list.import.scm
+util-list.import.scm: $(UTIL-LIST-SOURCES)
 
-PRIMES-SOURCES=primes.scm testing.import.scm utils.import.scm
+PRIMES-SOURCES=primes.scm testing.import.scm util-list.import.scm
 
 primes.o: primes.import.scm
 primes.import.scm: $(PRIMES-SOURCES)
 
-MEMBER-RECORD-SOURCES=member-record.scm dictionary.import.scm		\
-	period.import.scm testing.import.scm month.import.scm		\
-	configuration.import.scm primes.import.scm utils.import.scm	\
-	bank-account.import.scm
+MEMBER-RECORD-SOURCES=member-record.scm dictionary.import.scm	\
+	period.import.scm testing.import.scm month.import.scm	\
+	configuration.import.scm primes.import.scm		\
+	bank-account.import.scm util-list.import.scm
 
 member-record.o: member-record.import.scm
 member-record.import.scm: $(MEMBER-RECORD-SOURCES)
@@ -157,7 +160,7 @@ progress.o: progress.import.scm
 progress.import.scm: $(PROGRESS-SOURCES)
 
 TABLE-SOURCES=table.scm ansi.import.scm testing.import.scm	\
-	utils.import.scm util-string.import.scm
+	 util-string.import.scm util-list.import.scm
 
 table.o: table.import.scm
 table.import.scm: $(TABLE-SOURCES)
@@ -170,18 +173,19 @@ cards.import.scm: $(CARDS-SOURCES)
 
 MEMBER-PARSER-SOURCES=member-parser.scm member-record.import.scm	\
 	testing.import.scm dictionary.import.scm month.import.scm	\
-	period.import.scm utils.import.scm configuration.import.scm	\
-	util-string.import.scm
+	period.import.scm configuration.import.scm			\
+	util-string.import.scm util-list.import.scm
 
 member-parser.o: member-parser.import.scm
 member-parser.import.scm: $(MEMBER-PARSER-SOURCES)
 
 MEMBERS-PRINT-SOURCES=members-print.scm dictionary.import.scm		\
-	member-record.import.scm month.import.scm utils.import.scm	\
-	table.import.scm listing.import.scm ansi.import.scm		\
-	period.import.scm primes.import.scm members-base.import.scm	\
+	member-record.import.scm month.import.scm table.import.scm	\
+	listing.import.scm ansi.import.scm period.import.scm		\
+	primes.import.scm members-base.import.scm			\
 	configuration.import.scm bank-account.import.scm		\
-	member-fees.import.scm members-payments.import.scm
+	member-fees.import.scm members-payments.import.scm		\
+	util-list.import.scm
 
 members-print.o: members-print.import.scm
 members-print.import.scm: $(MEMBERS-PRINT-SOURCES)
@@ -193,9 +197,9 @@ MEMBER-FEES-SOURCES=member-fees.scm configuration.import.scm		\
 member-fees.o: member-fees.import.scm
 member-fees.import.scm: $(MEMBER-FEES-SOURCES)
 
-MEMBERS-DIR-SOURCES=members-dir.scm testing.import.scm		\
-	dictionary.import.scm utils.import.scm			\
-	member-record.import.scm member-parser.import.scm
+MEMBERS-DIR-SOURCES=members-dir.scm testing.import.scm	\
+	dictionary.import.scm member-record.import.scm	\
+	member-parser.import.scm util-list.import.scm
 
 members-dir.o: members-dir.import.scm
 members-dir.import.scm: $(MEMBERS-DIR-SOURCES)
@@ -219,16 +223,16 @@ bank-fio.import.scm: $(BANK-FIO-SOURCES)
 
 MEMBERS-PAYMENTS-SOURCES=members-payments.scm bank-account.import.scm	\
 	dictionary.import.scm member-fees.import.scm			\
-	period.import.scm configuration.import.scm utils.import.scm	\
-	progress.import.scm bank-fio.import.scm
+	period.import.scm configuration.import.scm			\
+	progress.import.scm bank-fio.import.scm util-list.import.scm
 
 members-payments.o: members-payments.import.scm
 members-payments.import.scm: $(MEMBERS-PAYMENTS-SOURCES)
 
 WEB-STATIC-SOURCES=web-static.scm member-record.import.scm	\
-	utils.import.scm configuration.import.scm		\
-	members-payments.import.scm members-base.import.scm	\
-	util-io.import.scm
+	 configuration.import.scm members-payments.import.scm	\
+	 members-base.import.scm util-io.import.scm		\
+	 util-list.import.scm
 
 web-static.o: web-static.import.scm
 web-static.import.scm: $(WEB-STATIC-SOURCES)
@@ -238,14 +242,15 @@ ENVIRONMENT-SOURCES=environment.scm ansi.import.scm
 environment.o: environment.import.scm
 environment.import.scm: $(ENVIRONMENT-SOURCES)
 
-MAILMAN-SOURCES=mailman.scm utils.import.scm progress.import.scm	\
-	util-set-list.import.scm util-io.import.scm
+MAILMAN-SOURCES=mailman.scm progress.import.scm		\
+	util-set-list.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 utils.import.scm
+	util-tag.import.scm
 
 util-set-list.o: util-set-list.import.scm
 util-set-list.import.scm: $(UTIL-SET-LIST-SOURCES)
@@ -274,3 +279,8 @@ UTIL-IO-SOURCES=util-io.scm
 
 util-io.o: util-io.import.scm
 util-io.import.scm: $(UTIL-IO-SOURCES)
+
+UTIL-LIST-SOURCES=util-list.scm
+
+util-list.o: util-list.import.scm
+util-list.import.scm: $(UTIL-LIST-SOURCES)
diff --git a/src/ansi.scm b/src/ansi.scm
index 67007b8..41f330f 100644
--- a/src/ansi.scm
+++ b/src/ansi.scm
@@ -49,7 +49,7 @@
 	 (chicken irregex)
 	 (chicken keyword)
 	 testing
-	 utils)
+	 util-list)
 
  ;; Only basic ANSI colors and bold attribute support.
  (define colors
diff --git a/src/command-line.scm b/src/command-line.scm
index c0c24ad..14d876e 100644
--- a/src/command-line.scm
+++ b/src/command-line.scm
@@ -38,7 +38,7 @@
 	 (chicken base)
 	 (chicken process-context)
 	 (chicken format)
-	 utils
+	 util-list
 	 testing)
 
  ;; Consumes given number of arguments from the list and returns the
diff --git a/src/mailman.scm b/src/mailman.scm
index 7fef9f1..6e13080 100644
--- a/src/mailman.scm
+++ b/src/mailman.scm
@@ -59,7 +59,7 @@
 	 (chicken string)
 	 (chicken sort)
 	 (chicken format)
-	 utils
+	 util-list
 	 progress
 	 util-set-list
 	 util-io)
diff --git a/src/member-parser.scm b/src/member-parser.scm
index a2f089e..35d7a69 100644
--- a/src/member-parser.scm
+++ b/src/member-parser.scm
@@ -41,7 +41,7 @@
 	 dictionary
 	 month
 	 period
-	 utils
+	 util-list
 	 configuration
 	 util-string)
 
diff --git a/src/member-record.scm b/src/member-record.scm
index 2ac32e9..d350b19 100644
--- a/src/member-record.scm
+++ b/src/member-record.scm
@@ -86,7 +86,7 @@
 	 period
 	 configuration
 	 primes
-	 utils
+	 util-list
 	 bank-account)
 
  ;; Checks whether given string is a 4-digit decimal number.
diff --git a/src/members-base.scm b/src/members-base.scm
index 0bcbd1f..dc50459 100644
--- a/src/members-base.scm
+++ b/src/members-base.scm
@@ -53,7 +53,7 @@
 	 (chicken random)
 	 (chicken sort)
 	 testing
-	 utils
+	 util-list
 	 dictionary
 	 primes
 	 member-record
diff --git a/src/members-dir.scm b/src/members-dir.scm
index cb4d72d..bb15cb0 100644
--- a/src/members-dir.scm
+++ b/src/members-dir.scm
@@ -42,7 +42,7 @@
 	 (chicken irregex)
 	 testing
 	 dictionary
-	 utils
+	 util-list
 	 member-record
 	 member-parser)
 
diff --git a/src/members-payments.scm b/src/members-payments.scm
index 710e0e5..0544230 100644
--- a/src/members-payments.scm
+++ b/src/members-payments.scm
@@ -51,7 +51,7 @@
 	 member-fees
 	 period
 	 configuration
-	 utils
+	 util-list
 	 progress)
 
  ;; Exchange rates
diff --git a/src/members-print.scm b/src/members-print.scm
index 24d87e0..cf93e19 100644
--- a/src/members-print.scm
+++ b/src/members-print.scm
@@ -49,7 +49,7 @@
 	 dictionary
 	 member-record
 	 month
-	 utils
+	 util-list
 	 table
 	 listing
 	 ansi
diff --git a/src/primes.scm b/src/primes.scm
index 1427504..9f1ab6c 100644
--- a/src/primes.scm
+++ b/src/primes.scm
@@ -36,7 +36,7 @@
  (import scheme
 	 (chicken base)
 	 testing
-	 utils)
+	 util-list)
 
  ;; Checks whether given number is prime by checking the remainder of
  ;; the division by all primes less than square root of the number in
diff --git a/src/table.scm b/src/table.scm
index f0604f1..7148de3 100644
--- a/src/table.scm
+++ b/src/table.scm
@@ -41,7 +41,7 @@
 	 (chicken irregex)
 	 ansi
 	 testing
-	 utils
+	 util-list
 	 util-string)
 
  ;; Default table border style to use if not explicitly specified.
diff --git a/src/utils.scm b/src/util-list.scm
similarity index 96%
rename from src/utils.scm
rename to src/util-list.scm
index 7db6eab..8a2c7a6 100644
--- a/src/utils.scm
+++ b/src/util-list.scm
@@ -1,5 +1,5 @@
 ;;
-;; utils.scm
+;; util-list.scm
 ;;
 ;; Various utilities so that no external libraries are needed.
 ;;
@@ -23,10 +23,10 @@
 ;; CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ;;
 
-(declare (unit utils))
+(declare (unit util-list))
 
 (module
- utils
+ util-list
  (
   filter
   utils-tests!
diff --git a/src/web-static.scm b/src/web-static.scm
index 86bfc5f..c68a676 100644
--- a/src/web-static.scm
+++ b/src/web-static.scm
@@ -41,7 +41,7 @@
 	 (chicken file)
 	 (chicken file posix)
 	 member-record
-	 utils
+	 util-list
 	 configuration
 	 members-payments
 	 members-base