From 891083c44d91577e1bb29f9c9e46a2db392fa8c6 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Sun, 25 Apr 2021 22:19:00 -0700 Subject: shell: primitives 'and' and 'or' --- shell/data.limg | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'shell/data.limg') 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) -- cgit 1.4.1-2-gfad0