Break everything with beginning of migration to ldict.

src/Makefile

@@ -40,7 +40,7 @@ HACKERBASE-DEPS=hackerbase.scm month.import.scm				\
 	tests.import.scm
 
 HACKERBASE-OBJS=hackerbase.o testing.o listing.o month.o period.o ansi.o	\
-	 dictionary.o command-line.o members-base.o primes.o		\
+	 util-dict.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		\
 	 bank-account.o bank-fio.o members-payments.o member-parser.o	\
@@ -90,10 +90,10 @@ LISTING-SOURCES=listing.scm testing.import.scm ansi.import.scm
 listing.o: listing.import.scm
 listing.import.scm: $(LISTING-SOURCES)
 
-DICTIONARY-SOURCES=dictionary.scm testing.import.scm
+UTIL-DICT-SOURCES=util-dict.scm testing.import.scm
 
-dictionary.o: dictionary.import.scm
+util-dict.o: util-dict.import.scm
-dictionary.import.scm: $(DICTIONARY-SOURCES)
+util-dict.import.scm: $(UTIL-DICT-SOURCES)
 
 MONTH-SOURCES=month.scm testing.import.scm
 
@@ -118,7 +118,7 @@ command-line.o: command-line.import.scm
 command-line.import.scm: $(COMMAND-LINE-SOURCES)
 
 MEMBERS-BASE-SOURCES=members-base.scm testing.import.scm		\
-	 dictionary.import.scm primes.import.scm			\
+	 util-dict.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	\
@@ -137,7 +137,7 @@ 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	\
+MEMBER-RECORD-SOURCES=member-record.scm util-dict.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
@@ -162,14 +162,14 @@ TABLE-SOURCES=table.scm ansi.import.scm testing.import.scm	\
 table.o: table.import.scm
 table.import.scm: $(TABLE-SOURCES)
 
-CARDS-SOURCES=cards.scm dictionary.import.scm members-base.import.scm	\
+CARDS-SOURCES=cards.scm util-dict.import.scm members-base.import.scm	\
 	member-record.import.scm
 
 cards.o: cards.import.scm
 cards.import.scm: $(CARDS-SOURCES)
 
 MEMBER-PARSER-SOURCES=member-parser.scm member-record.import.scm	\
-	testing.import.scm dictionary.import.scm month.import.scm	\
+	testing.import.scm util-dict.import.scm month.import.scm	\
 	period.import.scm configuration.import.scm			\
 	util-string.import.scm util-list.import.scm			\
 	util-parser.import.scm
@@ -177,7 +177,7 @@ MEMBER-PARSER-SOURCES=member-parser.scm member-record.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		\
+MEMBERS-PRINT-SOURCES=members-print.scm util-dict.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			\
@@ -196,7 +196,7 @@ 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 member-record.import.scm	\
+	util-dict.import.scm member-record.import.scm	\
 	member-parser.import.scm util-list.import.scm
 
 members-dir.o: members-dir.import.scm
@@ -220,7 +220,7 @@ bank-fio.o: bank-fio.import.scm
 bank-fio.import.scm: $(BANK-FIO-SOURCES)
 
 MEMBERS-PAYMENTS-SOURCES=members-payments.scm bank-account.import.scm	\
-	dictionary.import.scm member-fees.import.scm			\
+	util-dict.import.scm member-fees.import.scm			\
 	period.import.scm configuration.import.scm			\
 	progress.import.scm bank-fio.import.scm util-list.import.scm
 
@@ -293,7 +293,7 @@ TEXTS-SOURCES=texts.scm
 texts.o: texts.import.scm
 texts.import.scm: $(TEXTS-SOURCES)
 
-TESTS-SOURCES=tests.scm listing.import.scm dictionary.import.scm	\
+TESTS-SOURCES=tests.scm listing.import.scm util-dict.import.scm	\
 	month.import.scm period.import.scm util-list.import.scm		\
 	ansi.import.scm command-line.import.scm				\
 	members-dir.import.scm primes.import.scm			\

src/util-dict.scm

@@ -1,7 +1,7 @@
 ;;
-;; dictionary.scm
+;; util-dict-list.scm
 ;;
-;; Simple dictionary implementation using assq lists.
+;; Simple dictionary implementation using list backend.
 ;;
 ;; ISC License
 ;;
@@ -23,22 +23,22 @@
 ;; CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ;;
 
-(declare (unit dictionary))
+(declare (unit util-dict-list))
 
 (module
- dictionary
+ util-dict-list
  (
-  make-dict
+  make-ldict
-  dict-has-key?
+  ldict-has-key?
-  dict-ref
+  ldict-ref
-  dict-remove
+  ldict-remove
-  dict-set
+  ldict-set
-  dict-keys
+  ldict-keys
-  dict-map
+  ldict-map
-  dict-filter
+  ldict-filter
-  dict-reduce
+  ldict-reduce
-  dict-update
+  ldict-update
-  dictionary-tests!
+  ldict-tests!
   )
 
  (import scheme
@@ -152,7 +152,7 @@
 	     (proc (apply dict-ref d k dfls))))
 
  ;; Performs self-tests of the dictionary module.
- (define (dictionary-tests!)
+ (define (ldict-tests!)
    (run-tests
     dict
    (test-true make-dict (null? (make-dict)))