Remove old utils module.

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)

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

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

src/mailman.scm

@@ -59,7 +59,7 @@
 	 (chicken string)
 	 (chicken sort)
 	 (chicken format)
-	 utils
+	 util-list
 	 progress
 	 util-set-list
 	 util-io)

src/member-parser.scm

@@ -41,7 +41,7 @@
 	 dictionary
 	 month
 	 period
-	 utils
+	 util-list
 	 configuration
 	 util-string)
 

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.

src/members-base.scm

@@ -53,7 +53,7 @@
 	 (chicken random)
 	 (chicken sort)
 	 testing
-	 utils
+	 util-list
 	 dictionary
 	 primes
 	 member-record

src/members-dir.scm

@@ -42,7 +42,7 @@
 	 (chicken irregex)
 	 testing
 	 dictionary
-	 utils
+	 util-list
 	 member-record
 	 member-parser)
 

src/members-payments.scm

@@ -51,7 +51,7 @@
 	 member-fees
 	 period
 	 configuration
-	 utils
+	 util-list
 	 progress)
 
  ;; Exchange rates

src/members-print.scm

@@ -49,7 +49,7 @@
 	 dictionary
 	 member-record
 	 month
-	 utils
+	 util-list
 	 table
 	 listing
 	 ansi

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

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.

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!

src/web-static.scm

@@ -41,7 +41,7 @@
 	 (chicken file)
 	 (chicken file posix)
 	 member-record
-	 utils
+	 util-list
 	 configuration
 	 members-payments
 	 members-base