Rename the mbase-dir module.

src/Makefile

@@ -43,7 +43,7 @@ HACKERBASE-DEPS=hackerbase.scm month.import.scm				\
 HACKERBASE-OBJS=hackerbase.o testing.o listing.o month.o period.o	\
 	 ansi.o util-dict-list.o command-line.o mbase.o		\
 	 primes.o brmember.o configuration.o progress.o table.o	\
-	 cards.o members-print.o members-fees.o members-dir.o		\
+	 cards.o members-print.o members-fees.o mbase-dir.o		\
 	 util-csv.o bank-account.o bank-fio.o members-payments.o	\
 	 brmember-parser.o web-static.o environment.o mailman.o		\
 	 util-set-list.o util-time.o util-tag.o util-io.o		\
@@ -121,12 +121,11 @@ COMMAND-LINE-SOURCES=command-line.scm testing.import.scm	\
 command-line.o: command-line.import.scm
 command-line.import.scm: $(COMMAND-LINE-SOURCES)
 
-MBASE-SOURCES=mbase.scm testing.import.scm		\
+MBASE-SOURCES=mbase.scm testing.import.scm util-dict-list.import.scm	\
-	 util-dict-list.import.scm primes.import.scm			\
+	 primes.import.scm brmember.import.scm ansi.import.scm		\
-	 brmember.import.scm ansi.import.scm period.import.scm	\
+	 period.import.scm month.import.scm configuration.import.scm	\
-	 month.import.scm configuration.import.scm			\
+	 progress.import.scm table.import.scm mbase-dir.import.scm	\
-	 progress.import.scm table.import.scm members-dir.import.scm	\
+	 util-list.import.scm util-tag.import.scm
-	 util-list.import.scm
 
 mbase.o: mbase.import.scm
 mbase.import.scm: $(MBASE-SOURCES)
@@ -201,12 +200,12 @@ MEMBERS-FEES-SOURCES=members-fees.scm configuration.import.scm	\
 members-fees.o: members-fees.import.scm
 members-fees.import.scm: $(MEMBERS-FEES-SOURCES)
 
-MEMBERS-DIR-SOURCES=members-dir.scm testing.import.scm	\
+MBASE-DIR-SOURCES=mbase-dir.scm testing.import.scm	\
 	util-dict-list.import.scm brmember.import.scm	\
 	brmember-parser.import.scm util-list.import.scm
 
-members-dir.o: members-dir.import.scm
+mbase-dir.o: mbase-dir.import.scm
-members-dir.import.scm: $(MEMBERS-DIR-SOURCES)
+mbase-dir.import.scm: $(MBASE-DIR-SOURCES)
 
 UTIL-CSV-SOURCES=util-csv.scm testing.import.scm	\
 	progress.import.scm util-io.import.scm
@@ -303,7 +302,7 @@ texts.import.scm: $(TEXTS-SOURCES)
 TESTS-SOURCES=tests.scm listing.import.scm util-dict-list.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			\
+	mbase-dir.import.scm primes.import.scm			\
 	brmember.import.scm table.import.scm util-csv.import.scm	\
 	util-set-list.import.scm util-parser.import.scm			\
 	util-string.import.scm

src/brmember.scm

@@ -33,6 +33,8 @@
 
   make-brmember
 
+  brmember?
+
   brmember-file-name
   brmember-file-path
   brmember-input-file
@@ -91,7 +93,7 @@
 	 util-tag)
 
  ;; Unique tag
- (define TAG-BRMEMBER (make-tag BRMEMBER))
+ (define TAG-BRMEMBER (make-tag brmember))
 
  ;; Checks whether given string is a 4-digit decimal number.
  (define (is-4digit-string? s)
@@ -136,6 +138,11 @@
 				   (cadr args))
 			     pairs)))))))
 
+ ;; Predicate
+ (define (brmember? v)
+   (and (ldict? v)
+	(eq? (ldict-ref v 'TAG #f) TAG-BRMEMBER)))
+
  ;; File name without directory
  (define (brmember-file-name mr)
    (ldict-ref mr 'file-name))

src/mbase-dir.scm

@@ -1,5 +1,5 @@
 ;;
-;; members-dir.scm
+;; mbase-dir.scm
 ;;
 ;; Storage for member files.
 ;;
@@ -23,10 +23,10 @@
 ;; CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ;;
 
-(declare (unit members-dir))
+(declare (unit mbase-dir))
 
 (module
- members-dir
+ mbase-dir
  (
   load-members-dir
   members-dir-load-member

src/mbase.scm

@@ -28,8 +28,12 @@
 (module
  mbase
  (
+  TAG-MBASE
+
   load-mbase
 
+  mbase?
+  
   mbase-members
 
   find-member-by-predicate
@@ -73,8 +77,11 @@
 	 month
 	 configuration
 	 progress
-	 members-dir)
+	 mbase-dir
+	 util-tag)
 
+ ;; Constant unique tag
+ (define TAG-MBASE (make-tag mbase))
 
  ;; Loads members database, if the second argument is true, shows
  ;; progress. Members database is a dictionary with id being the key
@@ -83,7 +90,8 @@
    (let ((progress? (and (not (null? opts))
 			 (car opts))))
      (make-ldict
-      `((members
+      `((TAG . ,TAG-MBASE)
+	(members
 	 .
 	 ,(with-progress%
 	   progress? "members"
@@ -106,6 +114,11 @@
 				    mb1)))
 	     mb)))))))
 
+ ;; Predicate
+ (define (mbase? v)
+   (and (ldict? v)
+	(eq? (ldict-ref v 'TAG #f) TAG-MBASE)))
+
  ;; Returns the internal members list
  (define (mbase-members mb)
    (ldict-ref mb 'members))

src/tests.scm

@@ -39,7 +39,7 @@
 	 util-list
 	 ansi
 	 command-line
-	 members-dir
+	 mbase-dir
 	 primes
 	 brmember
 	 table