about summary refs log tree commit diff stats
path: root/shell/data.limg
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2021-04-25 22:19:00 -0700
committerKartik K. Agaram <vc@akkartik.com>2021-04-25 22:19:00 -0700
commit891083c44d91577e1bb29f9c9e46a2db392fa8c6 (patch)
tree9d83e8965a97bb6de7dbdd218bb02d4b4affaeff /shell/data.limg
parentbd9c1e6a79e75b0536e925e452561cf7701fce86 (diff)
downloadmu-891083c44d91577e1bb29f9c9e46a2db392fa8c6.tar.gz
shell: primitives 'and' and 'or'
Diffstat (limited to 'shell/data.limg')
-rw-r--r--shell/data.limg12
1 files changed, 1 insertions, 11 deletions
diff --git a/shell/data.limg b/shell/data.limg
index c54a1229..88adeeee 100644
--- a/shell/data.limg
+++ b/shell/data.limg
@@ -12,16 +12,6 @@
                (hline1 screen y 0 (width screen) color)))
     (vline . (fn () (screen y color)
                (vline1 screen y 0 (height screen) color)))
-    (andf . (fn () (a b)
-              (if a
-                (if b
-                  1
-                  ())
-                ())))
-    (orf . (fn () (a b)
-             (if a
-               a
-               b)))
     (brline . (fn () (screen x0 y0 x1 y1 color)
                  ((fn (dx dy sx sy)
                     ((fn (err)
@@ -32,7 +22,7 @@
                   (sgn (- x1 x0))
                   (sgn (- y1 y0)))))
     (brline1 . (fn () (screen x y xmax ymax dx dy sx sy err color)
-                 (while (orf (< x xmax) (< y ymax))
+                 (while (or (< x xmax) (< y ymax))
                    (pixel screen x y color)
                    ((fn (e2)
                       (if (>= e2 dy)