diff options
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/data.limg | 62 |
1 files changed, 32 insertions, 30 deletions
diff --git a/shell/data.limg b/shell/data.limg index f78db0d4..e9df2901 100644 --- a/shell/data.limg +++ b/shell/data.limg @@ -2,24 +2,26 @@ (globals . ( (mac . [(define mac (litmac litfn () (name params . body) `(define ,name (litmac litfn () ,params ,@body))))]) + (mac . [(define def (litmac litfn () ((name . params) . body) + `(define ,name (fn ,params ,@body))))]) (do . [(mac do body `((fn () ,@body)))]) (let . [(mac let (var val . body) `((fn (,var) ,@body) ,val))]) (when . [(mac when (cond . body) `(if ,cond (do ,@body) ()))]) - (hline1 . [(define hline1 (fn (screen y x xmax color) + (hline1 . [(def (hline1 screen y x xmax color) (while (< x xmax) (pixel screen x y color) - (set x (+ x 1)))))]) - (vline1 . [(define vline1 (fn (screen x y ymax color) + (set x (+ x 1))))]) + (vline1 . [(def (vline1 screen x y ymax color) (while (< y ymax) (pixel screen x y color) - (set y (+ y 1)))))]) - (hline . [(define hline (fn (screen y color) - (hline1 screen y 0 (width screen) color)))]) - (vline . [(define vline (fn (screen x color) - (vline1 screen x 0 (height screen) color)))]) - (line . [(define line (fn (screen x0 y0 x1 y1 color) + (set y (+ y 1))))]) + (hline . [(def (hline screen y color) + (hline1 screen y 0 (width screen) color))]) + (vline . [(def (vline screen x color) + (vline1 screen x 0 (height screen) color))]) + (line . [(def (line screen x0 y0 x1 y1 color) (let (x y) `(,x0 ,y0) (let dx (abs (- x1 x0)) (let dy (- 0 (abs (- y1 y0))) @@ -41,25 +43,25 @@ 0) (if (<= e2 dx) dx - 0))))))))))))))]) - (read_line . [(define read_line (fn (keyboard) + 0)))))))))))))]) + (read_line . [(def (read_line keyboard) (let str (stream) (let c (key keyboard) (while (not (or (= c 0) (= c 10))) (write str c) (set c (key keyboard)))) - str)))]) - (fill_rect . [(define fill_rect (fn (screen x1 y1 x2 y2 color) + str))]) + (fill_rect . [(def (fill_rect screen x1 y1 x2 y2 color) (while (< y1 y2) (hline1 screen y1 x1 x2 color) - (set y1 (+ y1 1)))))]) - (chessboard_row . [(define chessboard_row (fn (screen px y x xmax) + (set y1 (+ y1 1))))]) + (chessboard_row . [(def (chessboard_row screen px y x xmax) (while (< x xmax) (fill_rect screen x y (+ x px) (+ y px) 15) - (set x (+ x (* px 2))))))]) - (chessboard . [(define chessboard (fn (screen px) + (set x (+ x (* px 2)))))]) + (chessboard . [(def (chessboard screen px) (clear screen) (let xmax (width screen) (let ymax (height screen) @@ -68,8 +70,8 @@ (chessboard_row screen px y 0 xmax) (set y (+ y px)) (chessboard_row screen px y px xmax) - (set y (+ y px))))))))]) - (circle . [(define circle (fn (screen cx cy r clr) + (set y (+ y px)))))))]) + (circle . [(def (circle screen cx cy r clr) (let x (- 0 r) (let y 0 (let err (- 2 (* 2 r)) @@ -90,13 +92,13 @@ (set err (+ err (+ 1 (* 2 x))))) - (set continue (< x 0)))))))))]) - (ring . [(define ring (fn(screen cx cy r w clr) + (set continue (< x 0))))))))]) + (ring . [(def (ring screen cx cy r w clr) (let rmax (+ r w) (while (< r rmax) (circle screen cx cy r clr) - (set r (+ r 1))))))]) - (circle_rainbow . [(define circle_rainbow (fn(scr cx cy r w) + (set r (+ r 1)))))]) + (circle_rainbow . [(def (circle_rainbow scr cx cy r w) (ring scr cx cy r w 37) (set r (+ r w)) (ring scr cx cy r w 33) @@ -115,8 +117,8 @@ (set r (+ r w)) (ring scr cx cy r w 41) (set r (+ r w)) - (ring scr cx cy r w 40)))]) - (bowboard . [(define bowboard (fn (screen side) + (ring scr cx cy r w 40))]) + (bowboard . [(def (bowboard screen side) (let xmax (width screen) (let ymax (height screen) (let y side @@ -125,11 +127,11 @@ (while (< x xmax) (circle_rainbow screen x y (- side 100) 10) (set x (+ x (* 2 side))))) - (set y (+ y (* 2 side)))))))))]) - (main . [(define main (fn (screen keyboard) - (circle_rainbow screen 90 90 8 1)))]) - (task . [(define task (fn (screen) - (circle_rainbow screen 32 24 8 1)))]) + (set y (+ y (* 2 side))))))))]) + (main . [(def (main screen keyboard) + (circle_rainbow screen 90 90 8 1))]) + (task . [(def (task screen) + (circle_rainbow screen 32 24 8 1))]) )) (sandbox . (+ 3 4)) ) |