summary refs log tree commit diff
diff options
context:
space:
mode:
authorChris Marusich <cmmarusich@gmail.com>2017-04-06 02:28:34 -0700
committerLudovic Courtès <ludo@gnu.org>2017-04-08 14:40:50 +0200
commitd922c8e4b773407ca525360e8c564484db34db07 (patch)
tree4cc81978916f2a139e0b691dbe259631549bacc4
parent1d65b5379b33951298cb8a763e0140bb1ec43404 (diff)
downloadguix-d922c8e4b773407ca525360e8c564484db34db07.tar.gz
monads: Use intent-revealing parameter names.
* guix/monads.scm (mwhen, munless): Rename parameters from 'exp0' and 'exp' to
  'mexp0' and 'mexp', respectively.  This makes it more obvious that these
  expressions must be monadic expressions.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
-rw-r--r--guix/monads.scm12
1 files changed, 6 insertions, 6 deletions
diff --git a/guix/monads.scm b/guix/monads.scm
index 0b0ad239de..6933f7f151 100644
--- a/guix/monads.scm
+++ b/guix/monads.scm
@@ -204,23 +204,23 @@ the last one."
 
 (define-syntax mwhen
   (syntax-rules ()
-    "When CONDITION is true, evaluate EXP0..EXP* as in an 'mbegin'.  When
+    "When CONDITION is true, evaluate MEXP0..MEXP* as in an 'mbegin'.  When
 CONDITION is false, return *unspecified* in the current monad."
-    ((_ condition exp0 exp* ...)
+    ((_ condition mexp0 mexp* ...)
      (if condition
          (mbegin %current-monad
-           exp0 exp* ...)
+           mexp0 mexp* ...)
          (return *unspecified*)))))
 
 (define-syntax munless
   (syntax-rules ()
-    "When CONDITION is false, evaluate EXP0..EXP* as in an 'mbegin'.  When
+    "When CONDITION is false, evaluate MEXP0..MEXP* as in an 'mbegin'.  When
 CONDITION is true, return *unspecified* in the current monad."
-    ((_ condition exp0 exp* ...)
+    ((_ condition mexp0 mexp* ...)
      (if condition
          (return *unspecified*)
          (mbegin %current-monad
-           exp0 exp* ...)))))
+           mexp0 mexp* ...)))))
 
 (define-syntax define-lift
   (syntax-rules ()