altos/lisp: Evaluate macros once, then smash them into place

[fw/altos] / src / lisp / ao_lisp_const.lisp

diff --git a/src/lisp/ao_lisp_const.lisp b/src/lisp/ao_lisp_const.lisp
index 621fefc4f9ecfe3c9798210398a5edcbc6f40b40..9d8af58862e1af43a7fb1c21fe005999cf56178a 100644 (file)
--- a/src/lisp/ao_lisp_const.lisp
+++ b/src/lisp/ao_lisp_const.lisp
@@ -7,16 +7,16 @@
 
                                        ; evaluate a list of sexprs
 
-(setq progn (lexpr (l) (last l)))
+;(setq progn (lexpr (l) (last l)))
 
-                                       ; simple math operators
-
-(setq 1+ (lambda (x) (+ x 1)))
-(setq 1- (lambda (x) (- x 1)))
 
-                                       ; define a variable without returning the value
+                                       ;
+                                       ; Define a variable without returning the value
+                                       ; Useful when defining functions to avoid
+                                       ; having lots of output generated
+                                       ;
 
-(set 'def (macro (def-param)
+(setq def (macro (def-param)
                 (list
                  'progn
                  (list
@@ -60,7 +60,7 @@
                                        ; make the list of names in the let
                                        ;
 
-                    (set 'make-names (lambda (vars)
+                    (setq make-names (lambda (vars)
                                       (cond (vars
                                              (cons (car (car vars))
                                                    (make-names (cdr vars))))
@@ -73,7 +73,7 @@
                                        ; pre-pended to the
                                        ; expressions to evaluate
                                        ;
-                    (set 'make-exprs (lambda (vars exprs)
+                    (setq make-exprs (lambda (vars exprs)
                                       (progn
                                         (cond (vars (cons
                                                      (list set
@@ -90,13 +90,13 @@
                                         )
                                       )
                          )
-                    (set 'exprs (make-exprs vars exprs))
+                    (setq exprs (make-exprs vars exprs))
 
                                        ;
                                        ; the parameters to the lambda is a list
                                        ; of nils of the right length
                                        ;
-                    (set 'make-nils (lambda (vars)
+                    (setq make-nils (lambda (vars)
                                      (cond (vars (cons nil (make-nils (cdr vars))))
                                            )
                                      )
@@ -104,7 +104,6 @@
                                        ;
                                        ; build the lambda.
                                        ;
-                    (set 'last-let-value 
                     (cons
                      (list
                       'lambda
@@ -116,8 +115,6 @@
                      (make-nils vars)
                      )
                     )
-                    )
-                    
                   )
                 (car let-param)
                 (cdr let-param)
@@ -127,3 +124,39 @@
                 )
                )
      )
+
+                                       ;
+                                       ; A slightly more convenient form
+                                       ; for defining lambdas.
+                                       ;
+                                       ; (defun <name> (<params>) s-exprs)
+                                       ;
+
+(def defun (macro (defun-param)
+                   (let ((name (car defun-param))
+                         (args (cadr defun-param))
+                         (exprs (cdr (cdr defun-param))))
+                     (list
+                      def
+                      name
+                      (list
+                       'lambda
+                       args
+                       (cond ((cdr exprs)
+                              (cons progn exprs))
+                             ((car exprs))
+                             )
+                       )
+                      )
+                     )
+                   )
+     )
+
+                                       ; simple math operators
+                                       ;
+                                       ; Do these last to run defun
+                                       ; at least once so the let macro
+                                       ; is resolved
+
+(defun 1+ (x) (+ x 1))
+(defun 1- (x) (- x 1))