From fc0d87cbddbefb14e3de0471dac652dc585e5e77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Pant=C5=AF=C4=8Dek?=
 <dominik.pantucek@trustica.cz>
Date: Thu, 22 Jun 2023 21:51:08 +0200
Subject: [PATCH] Use new current month/day forms.

---
 src/brmember.scm         | 82 +++++++++++++++++++++-------------------
 src/mbase.scm            |  4 +-
 src/members-fees.scm     |  6 +--
 src/members-payments.scm |  4 +-
 4 files changed, 51 insertions(+), 45 deletions(-)

diff --git a/src/brmember.scm b/src/brmember.scm
index d323cc0..e73724f 100644
--- a/src/brmember.scm
+++ b/src/brmember.scm
@@ -451,19 +451,21 @@
 		(make-ldict
 		 '((highlights . ((123 "Interesting..." 0 info)))))))
     (test-true brmember-destroyed?
-	       (parameterize ((*current-month* (make-cal-month 2023 2)))
+	       (with-current-month
+		(make-cal-month 2023 2)
+		(brmember-destroyed?
+		 (make-ldict `((info . ,(make-ldict
+					 `((member . (,(make-cal-period
+							(make-cal-month 2010 1)
+							(make-cal-month 2010 5))))))))))))
+    (test-false brmember-destroyed?
+		(with-current-month
+		 (make-cal-month 2009 2)
 		 (brmember-destroyed?
 		  (make-ldict `((info . ,(make-ldict
 					  `((member . (,(make-cal-period
-							 (make-cal-month 2010 1)
+							 (make-cal-month 2001 1)
 							 (make-cal-month 2010 5))))))))))))
-    (test-false brmember-destroyed?
-		(parameterize ((*current-month* (make-cal-month 2009 2)))
-		  (brmember-destroyed?
-		   (make-ldict `((info . ,(make-ldict
-					   `((member . (,(make-cal-period
-							  (make-cal-month 2001 1)
-							  (make-cal-month 2010 5))))))))))))
     (test-false brmember-suspended?
 		(brmember-suspended?
 		 (make-ldict `((info . ,(make-ldict
@@ -471,27 +473,30 @@
 							(make-cal-month 2015 1)
 							#f))))))))))
     (test-true brmember-suspended?
-	       (parameterize ((*current-month* (make-cal-month 2015 2)))
-		 (brmember-suspended?
-		  (make-ldict `((info . ,(make-ldict
-					  `((member . (,(make-cal-period
-							 (make-cal-month 2015 1)
-							 #f)))
-					    (suspend ,(make-cal-period
-						       (make-cal-month 2010 1)
-						       (make-cal-month 2022 4) #f #f))))))))))
-    (test-true brmember-suspended?
-	       (parameterize ((*current-month* (make-cal-month 2015 2)))
-		 (brmember-suspended?
-		  (make-ldict `((info . ,(make-ldict
-					  `((member . (,(make-cal-period
-							 (make-cal-month 2015 1)
-							 #f)))
-					    (suspend (make-cal-period
+	       (with-current-month
+		(make-cal-month 2015 2)
+		(brmember-suspended?
+		 (make-ldict `((info . ,(make-ldict
+					 `((member . (,(make-cal-period
+							(make-cal-month 2015 1)
+							#f)))
+					   (suspend ,(make-cal-period
 						      (make-cal-month 2010 1)
-						      #f #f #f))))))))))
+						      (make-cal-month 2022 4) #f #f))))))))))
+    (test-true brmember-suspended?
+	       (with-current-month
+		(make-cal-month 2015 2)
+		(brmember-suspended?
+		 (make-ldict `((info . ,(make-ldict
+					 `((member . (,(make-cal-period
+							(make-cal-month 2015 1)
+							#f)))
+					   (suspend (make-cal-period
+						     (make-cal-month 2010 1)
+						     #f #f #f))))))))))
     (test-false brmember-suspended?
-		(parameterize ((*current-month* (make-cal-month 2023 2)))
+		(with-current-month
+		 (make-cal-month 2023 2)
 		  (brmember-suspended?
 		   (make-ldict `((info . ,(make-ldict
 					   `((member . (,(make-cal-period
@@ -501,16 +506,17 @@
 							(make-cal-month 2022 4)
 							#f #f))))))))))
     (test-true brmember-active?
-	       (parameterize ((*current-month* (make-cal-month 2023 2)))
-		 (brmember-active?
-		  (make-ldict `((info . ,(make-ldict
-					  `((member . (,(make-cal-period
-							 (make-cal-month 2015 1)
-							 #f)))
-					    (suspend ,(make-cal-period
-						       (make-cal-month 2010 1)
-						       (make-cal-month 2022 4)
-						       #f #f))))))))))
+	       (with-current-month
+		(make-cal-month 2023 2)
+		(brmember-active?
+		 (make-ldict `((info . ,(make-ldict
+					 `((member . (,(make-cal-period
+							(make-cal-month 2015 1)
+							#f)))
+					   (suspend ,(make-cal-period
+						      (make-cal-month 2010 1)
+						      (make-cal-month 2022 4)
+						      #f #f))))))))))
     ))
 
  )
diff --git a/src/mbase.scm b/src/mbase.scm
index 1303dbe..2466bdf 100644
--- a/src/mbase.scm
+++ b/src/mbase.scm
@@ -236,8 +236,8 @@
      (let mloop ((data '())
 		 (month (members-base-oldest-month mb)))
        (if (cal-month<? month (*current-month*))
-	   (let ((bi (parameterize ((*current-month* month))
-		       (mbase-info mb))))
+	   (let ((bi (with-current-month month
+					 (mbase-info mb))))
 	     (let kloop ((row (list (ldict-ref bi 'month)))
 			 (keys (cdr keys)))
 	       (if (null? keys)
diff --git a/src/members-fees.scm b/src/members-fees.scm
index c5c350d..c0a16aa 100644
--- a/src/members-fees.scm
+++ b/src/members-fees.scm
@@ -83,9 +83,9 @@
 	   (reverse cal)
 	   (loop (cal-month-add cm)
 		 (cons (list cm
-			     (parameterize ((*current-month* cm)
-					    (*current-day* (cal-ensure-day cm)))
-			       (brmember-flags mr)))
+			     (with-current-month
+			      cm
+			      (brmember-flags mr)))
 		       cal))))))
 
  ;; Returns the first month of the calendar
diff --git a/src/members-payments.scm b/src/members-payments.scm
index 183f443..31c5ce0 100644
--- a/src/members-payments.scm
+++ b/src/members-payments.scm
@@ -268,8 +268,8 @@
 		  (bank-transaction-message bt)
 		  (if (eq? curr 'CZK)
 		      amt
-		      (parameterize ((*current-month* (cal-ensure-month day)))
-			(* amt (lookup-eur-rate))))
+		      (with-current-day day
+					(* amt (lookup-eur-rate))))
 		  "Payment")))
 	bts))