Rename %if -> %when

2 files changed, 3 insertions, 5 deletions

diff --git a/atk16_schasm/macros.scm b/atk16_schasm/macros.scm
index 38aa26b..7ae4cc1 100644
--- a/atk16_schasm/macros.scm
+++ b/atk16_schasm/macros.scm
@@ -70,7 +70,7 @@
        fb
        (def-label sym-end)))))
 
-(define-syntax %if
+(define-syntax %when
   (syntax-rules ()
     ((_ pred body body* ...)
      (let* ((lhs  (eval (car 'pred)))
diff --git a/atk16_schasm/main.scm b/atk16_schasm/main.scm
index a3f16ad..fbae70c 100644
--- a/atk16_schasm/main.scm
+++ b/atk16_schasm/main.scm
@@ -1,5 +1,3 @@
-(import (chicken base))
-
 (load "core.scm")
 (load "macros.scm")
 
@@ -47,13 +45,13 @@
 (def-label 'branch-true
   (emit-word 2))
 
-;; use macros like %if, %while for convenience
+;; use macros like %if-else, %when, %while for convenience
 (let ((x #x5678))
   (%if-else (R1 == R2)
 	    (emit-word #x1234)
 	    (emit-word x)))
 
-(%if (R1 <= (u16 #xFF))
+(%when (R1 <= (u16 #xFF))
      (emit-word #xbeef))
 
 ;; procedure declarations