diff --git a/src/Makefile b/src/Makefile index 72fabc4..cc7694a 100644 --- a/src/Makefile +++ b/src/Makefile @@ -195,9 +195,9 @@ MEMBERS-PRINT-SOURCES=members-print.scm util-dict-list.import.scm \ members-print.o: members-print.import.scm members-print.import.scm: $(MEMBERS-PRINT-SOURCES) -MEMBERS-FEES-SOURCES=members-fees.scm configuration.import.scm \ +MEMBERS-FEES-SOURCES=members-fees.scm configuration.import.scm \ brmember.import.scm month.import.scm table.import.scm \ - members-base.import.scm + members-base.import.scm specification.import.scm members-fees.o: members-fees.import.scm members-fees.import.scm: $(MEMBERS-FEES-SOURCES) @@ -346,7 +346,7 @@ LOGGING-SOURCES=logging.scm util-string.import.scm logging.o: logging.import.scm logging.import.scm: $(LOGGING-SOURCES) -SPECIFICATION-SOURCES=specification.scm +SPECIFICATION-SOURCES=specification.scm period.import.scm specification.o: specification.import.scm specification.import.scm: $(SPECIFICATION-SOURCES) diff --git a/src/members-fees.scm b/src/members-fees.scm index d519669..5547b47 100644 --- a/src/members-fees.scm +++ b/src/members-fees.scm @@ -50,12 +50,8 @@ ansi table members-base - period) - - ;; Convert into lookups - a list of (list period regular student) - (define member-fees-lookup-table - (make-period-lookup-table - '(((2010 1) 500 250)))) + period + specification) ;; Returns a matching list of (list regular student) (define (lookup-member-fees) diff --git a/src/specification.scm b/src/specification.scm index 62f59a7..e5b72a3 100644 --- a/src/specification.scm +++ b/src/specification.scm @@ -28,8 +28,15 @@ (module specification ( + member-fees-lookup-table ) - (import scheme) + (import scheme + period) + + ;; Convert into lookups - a list of (list period regular student) + (define member-fees-lookup-table + (make-period-lookup-table + '(((2010 1) 500 250)))) )