Merge mod!:s functionality into set!

3 files changed, 10 insertions, 6 deletions

diff --git a/tests/recurrence.scm b/tests/recurrence.scm
index a3720ce8..e73aa836 100644
--- a/tests/recurrence.scm
+++ b/tests/recurrence.scm
@@ -12,8 +12,7 @@
  ((vcomponent base) make-vcomponent prop prop* extract)
  ((datetime) parse-ics-datetime datetime time date
   datetime->string)
- ((util) -> mod!)
- ((guile) set!)
+ ((util) -> set!)
  ((srfi srfi-41) stream->list)
  ((srfi srfi-88) keyword->string))
 
@@ -51,7 +50,7 @@
             [else (cadr rem)]))
         ;; hack for multi valued fields
         (when (eq? symb 'EXDATE)
-          (mod! (prop* v symb) list)))
+          (set! (prop* v symb) = list)))
       (loop (cddr rem))))
 
   v)
diff --git a/tests/termios.scm b/tests/termios.scm
index f07d20a0..3fed5da3 100755
--- a/tests/termios.scm
+++ b/tests/termios.scm
@@ -7,7 +7,7 @@
 
 ;;; Code:
 
-(((util) mod!)
+(((util) set!)
  ((vulgar termios)
   make-termios copy-termios
   lflag
@@ -22,7 +22,7 @@
 (define tty (open-input-file "/dev/tty"))
 
 (define-syntax-rule (&= lvalue val)
-  (mod! lvalue (lambda (v) (& v val))))
+  (set! lvalue = ((lambda (v) (& v val)))))
 
 (define t (make-termios))
 
diff --git a/tests/util.scm b/tests/util.scm
index 33ebdcf6..6ad58a24 100644
--- a/tests/util.scm
+++ b/tests/util.scm
@@ -1,5 +1,10 @@
-(((util) filter-sorted))
+(((util) filter-sorted set/r!))
 
 (test-equal "Filter sorted"
   '(3 4 5)
   (filter-sorted (lambda (x) (<= 3 x 5)) (iota 10)))
+
+(test-equal "set/r! single"
+  #f
+  (let ((x #t))
+    (set/r! x = not)))