Try using the new ldict implementation.
This commit is contained in:
		
							parent
							
								
									fd927e3569
								
							
						
					
					
						commit
						b40cc72281
					
				
					 14 changed files with 25 additions and 34 deletions
				
			
		
							
								
								
									
										33
									
								
								src/Makefile
									
										
									
									
									
								
							
							
						
						
									
										33
									
								
								src/Makefile
									
										
									
									
									
								
							|  | @ -42,7 +42,7 @@ HACKERBASE-DEPS=hackerbase.scm cal-month.import.scm			\ | ||||||
| 	dokuwiki.import.scm | 	dokuwiki.import.scm | ||||||
| 
 | 
 | ||||||
| HACKERBASE-OBJS=hackerbase.o testing.o listing.o cal-month.o		\
 | HACKERBASE-OBJS=hackerbase.o testing.o listing.o cal-month.o		\
 | ||||||
| 	 cal-period.o ansi.o util-dict-list.o command-line.o mbase.o	\
 | 	 cal-period.o ansi.o util-bst-ldict.o command-line.o mbase.o	\
 | ||||||
| 	 primes.o brmember.o configuration.o progress.o			\
 | 	 primes.o brmember.o configuration.o progress.o			\
 | ||||||
| 	 export-cards.o members-print.o members-fees.o mbase-dir.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	\
 | 	 util-csv.o bank-account.o bank-fio.o members-payments.o	\
 | ||||||
|  | @ -70,7 +70,7 @@ GENDOC-SOURCES=gendoc.scm duck-extract.import.scm			\ | ||||||
| GENDOC-OBJS=gendoc.o duck-extract.o util-time.o util-csv.o util-io.o	\
 | 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		\
 | 	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-stdout.o util-parser.o util-list.o util-proc.o		\
 | ||||||
| 	util-format.o racket-kwargs.o util-dict-list.o util-tag.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-set-list.o duck.o util-string.o util-bst.o			\
 | ||||||
| 	util-bst-bdict.o util-bst-ldict.o | 	util-bst-bdict.o util-bst-ldict.o | ||||||
| 
 | 
 | ||||||
|  | @ -136,13 +136,6 @@ LISTING-SOURCES=listing.scm testing.import.scm ansi.import.scm	\ | ||||||
| listing.o: listing.import.scm | listing.o: listing.import.scm | ||||||
| listing.import.scm: $(LISTING-SOURCES) | listing.import.scm: $(LISTING-SOURCES) | ||||||
| 
 | 
 | ||||||
| UTIL-DICT-LIST-SOURCES=util-dict-list.scm testing.import.scm	\
 |  | ||||||
| 	util-tag.import.scm util-proc.import.scm		\
 |  | ||||||
| 	util-set-list.import.scm duck.import.scm |  | ||||||
| 
 |  | ||||||
| util-dict-list.o: util-dict-list.import.scm |  | ||||||
| util-dict-list.import.scm: $(UTIL-DICT-LIST-SOURCES) |  | ||||||
| 
 |  | ||||||
| ANSI-SOURCES=ansi.scm testing.import.scm util-list.import.scm | ANSI-SOURCES=ansi.scm testing.import.scm util-list.import.scm | ||||||
| 
 | 
 | ||||||
| ansi.o: ansi.import.scm | ansi.o: ansi.import.scm | ||||||
|  | @ -154,7 +147,7 @@ COMMAND-LINE-SOURCES=command-line.scm testing.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) | ||||||
| 
 | 
 | ||||||
| MBASE-SOURCES=mbase.scm testing.import.scm util-dict-list.import.scm	\
 | MBASE-SOURCES=mbase.scm testing.import.scm util-bst-ldict.import.scm	\
 | ||||||
| 	 primes.import.scm brmember.import.scm ansi.import.scm		\
 | 	 primes.import.scm brmember.import.scm ansi.import.scm		\
 | ||||||
| 	 cal-period.import.scm cal-month.import.scm			\
 | 	 cal-period.import.scm cal-month.import.scm			\
 | ||||||
| 	 configuration.import.scm progress.import.scm			\
 | 	 configuration.import.scm progress.import.scm			\
 | ||||||
|  | @ -170,7 +163,7 @@ 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) | ||||||
| 
 | 
 | ||||||
| BRMEMBER-SOURCES=brmember.scm util-dict-list.import.scm			\
 | BRMEMBER-SOURCES=brmember.scm util-bst-ldict.import.scm			\
 | ||||||
| 	cal-period.import.scm testing.import.scm cal-month.import.scm	\
 | 	cal-period.import.scm testing.import.scm cal-month.import.scm	\
 | ||||||
| 	configuration.import.scm primes.import.scm			\
 | 	configuration.import.scm primes.import.scm			\
 | ||||||
| 	bank-account.import.scm util-tag.import.scm			\
 | 	bank-account.import.scm util-tag.import.scm			\
 | ||||||
|  | @ -189,14 +182,14 @@ PROGRESS-SOURCES=progress.scm util-time.import.scm | ||||||
| progress.o: progress.import.scm | progress.o: progress.import.scm | ||||||
| progress.import.scm: $(PROGRESS-SOURCES) | progress.import.scm: $(PROGRESS-SOURCES) | ||||||
| 
 | 
 | ||||||
| EXPORT-CARDS-SOURCES=export-cards.scm util-dict-list.import.scm	\
 | EXPORT-CARDS-SOURCES=export-cards.scm util-bst-ldict.import.scm	\
 | ||||||
| 	mbase.import.scm brmember.import.scm | 	mbase.import.scm brmember.import.scm | ||||||
| 
 | 
 | ||||||
| export-cards.o: export-cards.import.scm | export-cards.o: export-cards.import.scm | ||||||
| export-cards.import.scm: $(EXPORT-CARDS-SOURCES) | export-cards.import.scm: $(EXPORT-CARDS-SOURCES) | ||||||
| 
 | 
 | ||||||
| BRMEMBER-PARSER-SOURCES=brmember-parser.scm brmember.import.scm	\
 | BRMEMBER-PARSER-SOURCES=brmember-parser.scm brmember.import.scm	\
 | ||||||
| 	testing.import.scm util-dict-list.import.scm		\
 | 	testing.import.scm util-bst-ldict.import.scm		\
 | ||||||
| 	cal-month.import.scm cal-period.import.scm		\
 | 	cal-month.import.scm cal-period.import.scm		\
 | ||||||
| 	configuration.import.scm util-string.import.scm		\
 | 	configuration.import.scm util-string.import.scm		\
 | ||||||
| 	util-parser.import.scm cal-day.import.scm		\
 | 	util-parser.import.scm cal-day.import.scm		\
 | ||||||
|  | @ -205,7 +198,7 @@ BRMEMBER-PARSER-SOURCES=brmember-parser.scm brmember.import.scm	\ | ||||||
| brmember-parser.o: brmember-parser.import.scm | brmember-parser.o: brmember-parser.import.scm | ||||||
| brmember-parser.import.scm: $(BRMEMBER-PARSER-SOURCES) | brmember-parser.import.scm: $(BRMEMBER-PARSER-SOURCES) | ||||||
| 
 | 
 | ||||||
| MEMBERS-PRINT-SOURCES=members-print.scm util-dict-list.import.scm	\
 | MEMBERS-PRINT-SOURCES=members-print.scm util-bst-ldict.import.scm	\
 | ||||||
| 	brmember.import.scm cal-month.import.scm table.import.scm	\
 | 	brmember.import.scm cal-month.import.scm table.import.scm	\
 | ||||||
| 	listing.import.scm ansi.import.scm cal-period.import.scm	\
 | 	listing.import.scm ansi.import.scm cal-period.import.scm	\
 | ||||||
| 	primes.import.scm mbase.import.scm configuration.import.scm	\
 | 	primes.import.scm mbase.import.scm configuration.import.scm	\
 | ||||||
|  | @ -227,7 +220,7 @@ members-fees.o: members-fees.import.scm | ||||||
| members-fees.import.scm: $(MEMBERS-FEES-SOURCES) | members-fees.import.scm: $(MEMBERS-FEES-SOURCES) | ||||||
| 
 | 
 | ||||||
| MBASE-DIR-SOURCES=mbase-dir.scm testing.import.scm	\
 | MBASE-DIR-SOURCES=mbase-dir.scm testing.import.scm	\
 | ||||||
| 	util-dict-list.import.scm brmember.import.scm	\
 | 	util-bst-ldict.import.scm brmember.import.scm	\
 | ||||||
| 	brmember-parser.import.scm util-list.import.scm | 	brmember-parser.import.scm util-list.import.scm | ||||||
| 
 | 
 | ||||||
| mbase-dir.o: mbase-dir.import.scm | mbase-dir.o: mbase-dir.import.scm | ||||||
|  | @ -251,7 +244,7 @@ bank-fio.o: bank-fio.import.scm | ||||||
| bank-fio.import.scm: $(BANK-FIO-SOURCES) | 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	\
 | ||||||
| 	util-dict-list.import.scm members-fees.import.scm		\
 | 	util-bst-ldict.import.scm members-fees.import.scm		\
 | ||||||
| 	cal-period.import.scm configuration.import.scm			\
 | 	cal-period.import.scm configuration.import.scm			\
 | ||||||
| 	progress.import.scm bank-fio.import.scm				\
 | 	progress.import.scm bank-fio.import.scm				\
 | ||||||
| 	specification.import.scm util-list.import.scm | 	specification.import.scm util-list.import.scm | ||||||
|  | @ -314,7 +307,7 @@ TEXTS-SOURCES=texts.scm | ||||||
| texts.o: texts.import.scm | texts.o: texts.import.scm | ||||||
| texts.import.scm: $(TEXTS-SOURCES) | texts.import.scm: $(TEXTS-SOURCES) | ||||||
| 
 | 
 | ||||||
| TESTS-SOURCES=tests.scm listing.import.scm util-dict-list.import.scm	\
 | TESTS-SOURCES=tests.scm listing.import.scm util-bst-ldict.import.scm	\
 | ||||||
| 	cal-month.import.scm cal-period.import.scm ansi.import.scm	\
 | 	cal-month.import.scm cal-period.import.scm ansi.import.scm	\
 | ||||||
| 	command-line.import.scm mbase-dir.import.scm			\
 | 	command-line.import.scm mbase-dir.import.scm			\
 | ||||||
| 	primes.import.scm brmember.import.scm util-csv.import.scm	\
 | 	primes.import.scm brmember.import.scm util-csv.import.scm	\
 | ||||||
|  | @ -341,7 +334,7 @@ util-mail.o: util-mail.import.scm | ||||||
| util-mail.import.scm: $(UTIL-MAIL-SOURCES) | util-mail.import.scm: $(UTIL-MAIL-SOURCES) | ||||||
| 
 | 
 | ||||||
| NOTIFICATIONS-SOURCES=notifications.scm brmember.import.scm		\
 | NOTIFICATIONS-SOURCES=notifications.scm brmember.import.scm		\
 | ||||||
| 	util-mail.import.scm util-dict-list.import.scm			\
 | 	util-mail.import.scm util-bst-ldict.import.scm			\
 | ||||||
| 	members-payments.import.scm util-format.import.scm		\
 | 	members-payments.import.scm util-format.import.scm		\
 | ||||||
| 	brmember-format.import.scm configuration.import.scm		\
 | 	brmember-format.import.scm configuration.import.scm		\
 | ||||||
| 	util-time.import.scm members-fees.import.scm mbase.import.scm	\
 | 	util-time.import.scm members-fees.import.scm mbase.import.scm	\
 | ||||||
|  | @ -356,7 +349,7 @@ UTIL-FORMAT-SOURCES=util-format.scm duck.import.scm | ||||||
| util-format.o: util-format.import.scm | util-format.o: util-format.import.scm | ||||||
| util-format.import.scm: $(UTIL-FORMAT-SOURCES) | util-format.import.scm: $(UTIL-FORMAT-SOURCES) | ||||||
| 
 | 
 | ||||||
| BRMEMBER-FORMAT-SOURCES=brmember-format.scm util-dict-list.import.scm	\
 | BRMEMBER-FORMAT-SOURCES=brmember-format.scm util-bst-ldict.import.scm	\
 | ||||||
| 	brmember.import.scm bank-account.import.scm			\
 | 	brmember.import.scm bank-account.import.scm			\
 | ||||||
| 	members-fees.import.scm members-payments.import.scm | 	members-fees.import.scm members-payments.import.scm | ||||||
| 
 | 
 | ||||||
|  | @ -374,7 +367,7 @@ specification.o: specification.import.scm | ||||||
| specification.import.scm: $(SPECIFICATION-SOURCES) | specification.import.scm: $(SPECIFICATION-SOURCES) | ||||||
| 
 | 
 | ||||||
| UTIL-GIT-SOURCES=util-git.scm util-io.import.scm			\
 | UTIL-GIT-SOURCES=util-git.scm util-io.import.scm			\
 | ||||||
| 	util-dict-list.import.scm util-parser.import.scm		\
 | 	util-bst-ldict.import.scm util-parser.import.scm		\
 | ||||||
| 	util-time.import.scm duck.import.scm racket-kwargs.import.scm | 	util-time.import.scm duck.import.scm racket-kwargs.import.scm | ||||||
| 
 | 
 | ||||||
| util-git.o: util-git.import.scm | util-git.o: util-git.import.scm | ||||||
|  |  | ||||||
|  | @ -35,7 +35,7 @@ | ||||||
|  (import scheme |  (import scheme | ||||||
| 	 (chicken string) | 	 (chicken string) | ||||||
| 	 (chicken format) | 	 (chicken format) | ||||||
| 	 util-dict-list | 	 util-bst-ldict | ||||||
| 	 brmember | 	 brmember | ||||||
| 	 bank-account | 	 bank-account | ||||||
| 	 members-fees | 	 members-fees | ||||||
|  |  | ||||||
|  | @ -39,7 +39,7 @@ | ||||||
| 	 util-list | 	 util-list | ||||||
| 	 brmember | 	 brmember | ||||||
| 	 testing | 	 testing | ||||||
| 	 util-dict-list | 	 util-bst-ldict | ||||||
| 	 cal-month | 	 cal-month | ||||||
| 	 cal-period | 	 cal-period | ||||||
| 	 configuration | 	 configuration | ||||||
|  |  | ||||||
|  | @ -95,7 +95,7 @@ | ||||||
| 	 (chicken string) | 	 (chicken string) | ||||||
| 	 (chicken format) | 	 (chicken format) | ||||||
| 	 util-list | 	 util-list | ||||||
| 	 util-dict-list | 	 util-bst-ldict | ||||||
| 	 testing | 	 testing | ||||||
| 	 cal-month | 	 cal-month | ||||||
| 	 cal-period | 	 cal-period | ||||||
|  |  | ||||||
|  | @ -36,7 +36,7 @@ | ||||||
| 	 (chicken sort) | 	 (chicken sort) | ||||||
| 	 (chicken format) | 	 (chicken format) | ||||||
| 	 (chicken irregex) | 	 (chicken irregex) | ||||||
| 	 util-dict-list | 	 util-bst-ldict | ||||||
| 	 mbase | 	 mbase | ||||||
| 	 brmember) | 	 brmember) | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -43,7 +43,7 @@ | ||||||
| 	cal-month | 	cal-month | ||||||
| 	cal-day | 	cal-day | ||||||
| 	util-git | 	util-git | ||||||
| 	util-dict-list | 	util-bst-ldict | ||||||
| 	util-stdout | 	util-stdout | ||||||
| 	table | 	table | ||||||
| 	export-web-static | 	export-web-static | ||||||
|  |  | ||||||
|  | @ -40,7 +40,7 @@ | ||||||
| 	 testing | 	 testing | ||||||
| 	 ansi | 	 ansi | ||||||
| 	 racket-kwargs | 	 racket-kwargs | ||||||
| 	 util-dict-list | 	 util-bst-ldict | ||||||
| 	 table) | 	 table) | ||||||
| 
 | 
 | ||||||
|  ;; Returns the number of digits required to represent a given number |  ;; Returns the number of digits required to represent a given number | ||||||
|  |  | ||||||
|  | @ -42,7 +42,7 @@ | ||||||
| 	 (chicken irregex) | 	 (chicken irregex) | ||||||
| 	 util-list | 	 util-list | ||||||
| 	 testing | 	 testing | ||||||
| 	 util-dict-list | 	 util-bst-ldict | ||||||
| 	 brmember | 	 brmember | ||||||
| 	 brmember-parser) | 	 brmember-parser) | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -71,7 +71,7 @@ | ||||||
| 	 (chicken sort) | 	 (chicken sort) | ||||||
| 	 util-list | 	 util-list | ||||||
| 	 testing | 	 testing | ||||||
| 	 util-dict-list | 	 util-bst-ldict | ||||||
| 	 primes | 	 primes | ||||||
| 	 brmember | 	 brmember | ||||||
| 	 ansi | 	 ansi | ||||||
|  |  | ||||||
|  | @ -53,7 +53,7 @@ | ||||||
| 	 brmember | 	 brmember | ||||||
| 	 mbase | 	 mbase | ||||||
| 	 bank-fio | 	 bank-fio | ||||||
| 	 util-dict-list | 	 util-bst-ldict | ||||||
| 	 members-fees | 	 members-fees | ||||||
| 	 cal-period | 	 cal-period | ||||||
| 	 configuration | 	 configuration | ||||||
|  |  | ||||||
|  | @ -49,7 +49,7 @@ | ||||||
| 	 (chicken sort) | 	 (chicken sort) | ||||||
| 	 (chicken format) | 	 (chicken format) | ||||||
| 	 util-list | 	 util-list | ||||||
| 	 util-dict-list | 	 util-bst-ldict | ||||||
| 	 brmember | 	 brmember | ||||||
| 	 cal-month | 	 cal-month | ||||||
| 	 table | 	 table | ||||||
|  |  | ||||||
|  | @ -42,7 +42,7 @@ | ||||||
| 	 (chicken sort) | 	 (chicken sort) | ||||||
| 	 brmember | 	 brmember | ||||||
| 	 util-mail | 	 util-mail | ||||||
| 	 util-dict-list | 	 util-bst-ldict | ||||||
| 	 members-payments | 	 members-payments | ||||||
| 	 util-format | 	 util-format | ||||||
| 	 brmember-format | 	 brmember-format | ||||||
|  |  | ||||||
|  | @ -33,7 +33,6 @@ | ||||||
| 
 | 
 | ||||||
|  (import scheme |  (import scheme | ||||||
| 	 listing | 	 listing | ||||||
| 	 util-dict-list |  | ||||||
| 	 cal-month | 	 cal-month | ||||||
| 	 cal-period | 	 cal-period | ||||||
| 	 cal-day | 	 cal-day | ||||||
|  | @ -58,7 +57,6 @@ | ||||||
|  (define (run-all-tests!) |  (define (run-all-tests!) | ||||||
|    (listing-tests!) |    (listing-tests!) | ||||||
|    (lset-tests!) |    (lset-tests!) | ||||||
|    (ldict-tests!) |  | ||||||
|    (util-bst-tests!) |    (util-bst-tests!) | ||||||
|    (cal-month-tests!) |    (cal-month-tests!) | ||||||
|    (cal-period-tests!) |    (cal-period-tests!) | ||||||
|  |  | ||||||
|  | @ -40,7 +40,7 @@ | ||||||
| 	 (chicken base) | 	 (chicken base) | ||||||
| 	 (chicken string) | 	 (chicken string) | ||||||
| 	 util-io | 	 util-io | ||||||
| 	 util-dict-list | 	 util-bst-ldict | ||||||
| 	 util-parser | 	 util-parser | ||||||
| 	 util-time | 	 util-time | ||||||
| 	 racket-kwargs) | 	 racket-kwargs) | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue