Remove old utils module.
This commit is contained in:
parent
64cd360c0d
commit
ac3dce41a6
14 changed files with 62 additions and 52 deletions
74
src/Makefile
74
src/Makefile
|
@ -34,7 +34,7 @@ CSC=csc
|
||||||
BBSTOOL-DEPS=bbstool.scm testing.import.scm listing.import.scm \
|
BBSTOOL-DEPS=bbstool.scm testing.import.scm listing.import.scm \
|
||||||
dictionary.import.scm month.import.scm period.import.scm \
|
dictionary.import.scm month.import.scm period.import.scm \
|
||||||
ansi.import.scm command-line.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 \
|
member-record.import.scm configuration.import.scm \
|
||||||
progress.import.scm table.import.scm cards.import.scm \
|
progress.import.scm table.import.scm cards.import.scm \
|
||||||
member-parser.import.scm members-print.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 \
|
web-static.import.scm environment.import.scm \
|
||||||
mailman.import.scm util-set-list.import.scm \
|
mailman.import.scm util-set-list.import.scm \
|
||||||
util-time.import.scm util-tag.import.scm util-io.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 \
|
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 \
|
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 \
|
bank-account.o bank-fio.o members-payments.o member-parser.o \
|
||||||
web-static.o environment.o mailman.o util-set-list.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
|
.PHONY: imports
|
||||||
imports: $(BBSTOOL-DEPS)
|
imports: $(BBSTOOL-DEPS)
|
||||||
|
@ -108,40 +110,41 @@ PERIOD-SOURCES=period.scm testing.import.scm month.import.scm \
|
||||||
period.o: period.import.scm
|
period.o: period.import.scm
|
||||||
period.import.scm: $(PERIOD-SOURCES)
|
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.o: ansi.import.scm
|
||||||
ansi.import.scm: $(ANSI-SOURCES)
|
ansi.import.scm: $(ANSI-SOURCES)
|
||||||
|
|
||||||
COMMAND-LINE-SOURCES=command-line.scm testing.import.scm \
|
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.o: command-line.import.scm
|
||||||
command-line.import.scm: $(COMMAND-LINE-SOURCES)
|
command-line.import.scm: $(COMMAND-LINE-SOURCES)
|
||||||
|
|
||||||
MEMBERS-BASE-SOURCES=members-base.scm testing.import.scm \
|
MEMBERS-BASE-SOURCES=members-base.scm testing.import.scm \
|
||||||
utils.import.scm dictionary.import.scm primes.import.scm \
|
dictionary.import.scm primes.import.scm \
|
||||||
member-record.import.scm ansi.import.scm period.import.scm \
|
member-record.import.scm ansi.import.scm period.import.scm \
|
||||||
month.import.scm configuration.import.scm progress.import.scm \
|
month.import.scm configuration.import.scm \
|
||||||
table.import.scm members-dir.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.o: members-base.import.scm
|
||||||
members-base.import.scm: $(MEMBERS-BASE-SOURCES)
|
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
|
util-list.o: util-list.import.scm
|
||||||
utils.import.scm: $(UTILS-SOURCES)
|
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.o: primes.import.scm
|
||||||
primes.import.scm: $(PRIMES-SOURCES)
|
primes.import.scm: $(PRIMES-SOURCES)
|
||||||
|
|
||||||
MEMBER-RECORD-SOURCES=member-record.scm dictionary.import.scm \
|
MEMBER-RECORD-SOURCES=member-record.scm dictionary.import.scm \
|
||||||
period.import.scm testing.import.scm month.import.scm \
|
period.import.scm testing.import.scm month.import.scm \
|
||||||
configuration.import.scm primes.import.scm utils.import.scm \
|
configuration.import.scm primes.import.scm \
|
||||||
bank-account.import.scm
|
bank-account.import.scm util-list.import.scm
|
||||||
|
|
||||||
member-record.o: member-record.import.scm
|
member-record.o: member-record.import.scm
|
||||||
member-record.import.scm: $(MEMBER-RECORD-SOURCES)
|
member-record.import.scm: $(MEMBER-RECORD-SOURCES)
|
||||||
|
@ -157,7 +160,7 @@ progress.o: progress.import.scm
|
||||||
progress.import.scm: $(PROGRESS-SOURCES)
|
progress.import.scm: $(PROGRESS-SOURCES)
|
||||||
|
|
||||||
TABLE-SOURCES=table.scm ansi.import.scm testing.import.scm \
|
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.o: table.import.scm
|
||||||
table.import.scm: $(TABLE-SOURCES)
|
table.import.scm: $(TABLE-SOURCES)
|
||||||
|
@ -170,18 +173,19 @@ cards.import.scm: $(CARDS-SOURCES)
|
||||||
|
|
||||||
MEMBER-PARSER-SOURCES=member-parser.scm member-record.import.scm \
|
MEMBER-PARSER-SOURCES=member-parser.scm member-record.import.scm \
|
||||||
testing.import.scm dictionary.import.scm month.import.scm \
|
testing.import.scm dictionary.import.scm month.import.scm \
|
||||||
period.import.scm utils.import.scm configuration.import.scm \
|
period.import.scm configuration.import.scm \
|
||||||
util-string.import.scm
|
util-string.import.scm util-list.import.scm
|
||||||
|
|
||||||
member-parser.o: member-parser.import.scm
|
member-parser.o: member-parser.import.scm
|
||||||
member-parser.import.scm: $(MEMBER-PARSER-SOURCES)
|
member-parser.import.scm: $(MEMBER-PARSER-SOURCES)
|
||||||
|
|
||||||
MEMBERS-PRINT-SOURCES=members-print.scm dictionary.import.scm \
|
MEMBERS-PRINT-SOURCES=members-print.scm dictionary.import.scm \
|
||||||
member-record.import.scm month.import.scm utils.import.scm \
|
member-record.import.scm month.import.scm table.import.scm \
|
||||||
table.import.scm listing.import.scm ansi.import.scm \
|
listing.import.scm ansi.import.scm period.import.scm \
|
||||||
period.import.scm primes.import.scm members-base.import.scm \
|
primes.import.scm members-base.import.scm \
|
||||||
configuration.import.scm bank-account.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.o: members-print.import.scm
|
||||||
members-print.import.scm: $(MEMBERS-PRINT-SOURCES)
|
members-print.import.scm: $(MEMBERS-PRINT-SOURCES)
|
||||||
|
@ -194,8 +198,8 @@ member-fees.o: member-fees.import.scm
|
||||||
member-fees.import.scm: $(MEMBER-FEES-SOURCES)
|
member-fees.import.scm: $(MEMBER-FEES-SOURCES)
|
||||||
|
|
||||||
MEMBERS-DIR-SOURCES=members-dir.scm testing.import.scm \
|
MEMBERS-DIR-SOURCES=members-dir.scm testing.import.scm \
|
||||||
dictionary.import.scm utils.import.scm \
|
dictionary.import.scm member-record.import.scm \
|
||||||
member-record.import.scm member-parser.import.scm
|
member-parser.import.scm util-list.import.scm
|
||||||
|
|
||||||
members-dir.o: members-dir.import.scm
|
members-dir.o: members-dir.import.scm
|
||||||
members-dir.import.scm: $(MEMBERS-DIR-SOURCES)
|
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 \
|
MEMBERS-PAYMENTS-SOURCES=members-payments.scm bank-account.import.scm \
|
||||||
dictionary.import.scm member-fees.import.scm \
|
dictionary.import.scm member-fees.import.scm \
|
||||||
period.import.scm configuration.import.scm utils.import.scm \
|
period.import.scm configuration.import.scm \
|
||||||
progress.import.scm bank-fio.import.scm
|
progress.import.scm bank-fio.import.scm util-list.import.scm
|
||||||
|
|
||||||
members-payments.o: members-payments.import.scm
|
members-payments.o: members-payments.import.scm
|
||||||
members-payments.import.scm: $(MEMBERS-PAYMENTS-SOURCES)
|
members-payments.import.scm: $(MEMBERS-PAYMENTS-SOURCES)
|
||||||
|
|
||||||
WEB-STATIC-SOURCES=web-static.scm member-record.import.scm \
|
WEB-STATIC-SOURCES=web-static.scm member-record.import.scm \
|
||||||
utils.import.scm configuration.import.scm \
|
configuration.import.scm members-payments.import.scm \
|
||||||
members-payments.import.scm members-base.import.scm \
|
members-base.import.scm util-io.import.scm \
|
||||||
util-io.import.scm
|
util-list.import.scm
|
||||||
|
|
||||||
web-static.o: web-static.import.scm
|
web-static.o: web-static.import.scm
|
||||||
web-static.import.scm: $(WEB-STATIC-SOURCES)
|
web-static.import.scm: $(WEB-STATIC-SOURCES)
|
||||||
|
@ -238,14 +242,15 @@ ENVIRONMENT-SOURCES=environment.scm ansi.import.scm
|
||||||
environment.o: environment.import.scm
|
environment.o: environment.import.scm
|
||||||
environment.import.scm: $(ENVIRONMENT-SOURCES)
|
environment.import.scm: $(ENVIRONMENT-SOURCES)
|
||||||
|
|
||||||
MAILMAN-SOURCES=mailman.scm utils.import.scm progress.import.scm \
|
MAILMAN-SOURCES=mailman.scm progress.import.scm \
|
||||||
util-set-list.import.scm util-io.import.scm
|
util-set-list.import.scm util-io.import.scm \
|
||||||
|
util-list.import.scm
|
||||||
|
|
||||||
mailman.o: mailman.import.scm
|
mailman.o: mailman.import.scm
|
||||||
mailman.import.scm: $(MAILMAN-SOURCES)
|
mailman.import.scm: $(MAILMAN-SOURCES)
|
||||||
|
|
||||||
UTIL-SET-LIST-SOURCES=util-set-list.scm testing.import.scm \
|
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.o: util-set-list.import.scm
|
||||||
util-set-list.import.scm: $(UTIL-SET-LIST-SOURCES)
|
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.o: util-io.import.scm
|
||||||
util-io.import.scm: $(UTIL-IO-SOURCES)
|
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)
|
||||||
|
|
|
@ -49,7 +49,7 @@
|
||||||
(chicken irregex)
|
(chicken irregex)
|
||||||
(chicken keyword)
|
(chicken keyword)
|
||||||
testing
|
testing
|
||||||
utils)
|
util-list)
|
||||||
|
|
||||||
;; Only basic ANSI colors and bold attribute support.
|
;; Only basic ANSI colors and bold attribute support.
|
||||||
(define colors
|
(define colors
|
||||||
|
|
|
@ -38,7 +38,7 @@
|
||||||
(chicken base)
|
(chicken base)
|
||||||
(chicken process-context)
|
(chicken process-context)
|
||||||
(chicken format)
|
(chicken format)
|
||||||
utils
|
util-list
|
||||||
testing)
|
testing)
|
||||||
|
|
||||||
;; Consumes given number of arguments from the list and returns the
|
;; Consumes given number of arguments from the list and returns the
|
||||||
|
|
|
@ -59,7 +59,7 @@
|
||||||
(chicken string)
|
(chicken string)
|
||||||
(chicken sort)
|
(chicken sort)
|
||||||
(chicken format)
|
(chicken format)
|
||||||
utils
|
util-list
|
||||||
progress
|
progress
|
||||||
util-set-list
|
util-set-list
|
||||||
util-io)
|
util-io)
|
||||||
|
|
|
@ -41,7 +41,7 @@
|
||||||
dictionary
|
dictionary
|
||||||
month
|
month
|
||||||
period
|
period
|
||||||
utils
|
util-list
|
||||||
configuration
|
configuration
|
||||||
util-string)
|
util-string)
|
||||||
|
|
||||||
|
|
|
@ -86,7 +86,7 @@
|
||||||
period
|
period
|
||||||
configuration
|
configuration
|
||||||
primes
|
primes
|
||||||
utils
|
util-list
|
||||||
bank-account)
|
bank-account)
|
||||||
|
|
||||||
;; Checks whether given string is a 4-digit decimal number.
|
;; Checks whether given string is a 4-digit decimal number.
|
||||||
|
|
|
@ -53,7 +53,7 @@
|
||||||
(chicken random)
|
(chicken random)
|
||||||
(chicken sort)
|
(chicken sort)
|
||||||
testing
|
testing
|
||||||
utils
|
util-list
|
||||||
dictionary
|
dictionary
|
||||||
primes
|
primes
|
||||||
member-record
|
member-record
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
(chicken irregex)
|
(chicken irregex)
|
||||||
testing
|
testing
|
||||||
dictionary
|
dictionary
|
||||||
utils
|
util-list
|
||||||
member-record
|
member-record
|
||||||
member-parser)
|
member-parser)
|
||||||
|
|
||||||
|
|
|
@ -51,7 +51,7 @@
|
||||||
member-fees
|
member-fees
|
||||||
period
|
period
|
||||||
configuration
|
configuration
|
||||||
utils
|
util-list
|
||||||
progress)
|
progress)
|
||||||
|
|
||||||
;; Exchange rates
|
;; Exchange rates
|
||||||
|
|
|
@ -49,7 +49,7 @@
|
||||||
dictionary
|
dictionary
|
||||||
member-record
|
member-record
|
||||||
month
|
month
|
||||||
utils
|
util-list
|
||||||
table
|
table
|
||||||
listing
|
listing
|
||||||
ansi
|
ansi
|
||||||
|
|
|
@ -36,7 +36,7 @@
|
||||||
(import scheme
|
(import scheme
|
||||||
(chicken base)
|
(chicken base)
|
||||||
testing
|
testing
|
||||||
utils)
|
util-list)
|
||||||
|
|
||||||
;; Checks whether given number is prime by checking the remainder of
|
;; Checks whether given number is prime by checking the remainder of
|
||||||
;; the division by all primes less than square root of the number in
|
;; the division by all primes less than square root of the number in
|
||||||
|
|
|
@ -41,7 +41,7 @@
|
||||||
(chicken irregex)
|
(chicken irregex)
|
||||||
ansi
|
ansi
|
||||||
testing
|
testing
|
||||||
utils
|
util-list
|
||||||
util-string)
|
util-string)
|
||||||
|
|
||||||
;; Default table border style to use if not explicitly specified.
|
;; Default table border style to use if not explicitly specified.
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
;;
|
;;
|
||||||
;; utils.scm
|
;; util-list.scm
|
||||||
;;
|
;;
|
||||||
;; Various utilities so that no external libraries are needed.
|
;; Various utilities so that no external libraries are needed.
|
||||||
;;
|
;;
|
||||||
|
@ -23,10 +23,10 @@
|
||||||
;; CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
;; CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
;;
|
;;
|
||||||
|
|
||||||
(declare (unit utils))
|
(declare (unit util-list))
|
||||||
|
|
||||||
(module
|
(module
|
||||||
utils
|
util-list
|
||||||
(
|
(
|
||||||
filter
|
filter
|
||||||
utils-tests!
|
utils-tests!
|
|
@ -41,7 +41,7 @@
|
||||||
(chicken file)
|
(chicken file)
|
||||||
(chicken file posix)
|
(chicken file posix)
|
||||||
member-record
|
member-record
|
||||||
utils
|
util-list
|
||||||
configuration
|
configuration
|
||||||
members-payments
|
members-payments
|
||||||
members-base
|
members-base
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue