X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Flisp%2Fao_lisp_const.lisp;h=6fbc35b67993fc2798effb659063db749d247c9a;hp=621fefc4f9ecfe3c9798210398a5edcbc6f40b40;hb=daa06c8dedc6dc1cf21936ee2769d9d25f0567bd;hpb=794718abc62f4610495fe2bd535a2b67bc46573c

diff --git a/src/lisp/ao_lisp_const.lisp b/src/lisp/ao_lisp_const.lisp
index 621fefc4..6fbc35b6 100644
--- a/src/lisp/ao_lisp_const.lisp
+++ b/src/lisp/ao_lisp_const.lisp
@@ -1,38 +1,79 @@
-					; basic list accessors
-
+;
+; Copyright © 2016 Keith Packard <keithp@keithp.com>
+;
+; This program is free software; you can redistribute it and/or modify
+; it under the terms of the GNU General Public License as published by
+; the Free Software Foundation, either version 2 of the License, or
+; (at your option) any later version.
+;
+; This program is distributed in the hope that it will be useful, but
+; WITHOUT ANY WARRANTY; without even the implied warranty of
+; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+; General Public License for more details.
+;
+; Lisp code placed in ROM
 
-(setq cadr (lambda (l) (car (cdr l))))
-(setq caddr (lambda (l) (car (cdr (cdr l)))))
-(setq list (lexpr (l) l))
+					; return a list containing all of the arguments
 
-					; evaluate a list of sexprs
+(set (quote list) (lexpr (l) 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 (name val rest)
 		 (list
 		  'progn
 		  (list
 		   'set
-		   (list
-		    'quote
-		    (car def-param))
-		   (cadr def-param)
-		   )
+		   (list 'quote name)
+		   val)
+		  (list 'quote name)
+		  )
+		 )
+      )
+
+					;
+					; A slightly more convenient form
+					; for defining lambdas.
+					;
+					; (defun <name> (<params>) s-exprs)
+					;
+
+(def defun (macro (name args exprs)
 		  (list
-		   'quote
-		   (car def-param)
+		   def
+		   name
+		   (list
+		    'lambda
+		    args
+		    (cond ((cdr exprs)
+			   (cons progn exprs))
+			  ((car exprs))
+			  )
+		    )
 		   )
 		  )
-		 )
      )
+					; basic list accessors
+
+
+(defun cadr (l) (car (cdr l)))
+
+(defun caddr (l) (car (cdr (cdr l))))
+
+(defun nth (list n)
+  (cond ((= n 0) (car list))
+	((nth (cdr list) (1- n)))
+	)
+  )
+
+					; simple math operators
+
+(defun 1+ (x) (+ x 1))
+(defun 1- (x) (- x 1))
 
 					; define a set of local
 					; variables and then evaluate
@@ -52,28 +93,28 @@
 					;
 					; (let ((x 1) (y)) (setq y (+ x 1)) y)
 
-(def let (macro (let-param)
-		((lambda (vars exprs make-names make-exprs make-nils)
+(def let (macro (vars exprs)
+		((lambda (make-names make-exprs make-nils)
 		   (progn
 
 					;
 					; 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))))
 					     )
 				       )
 			  )
-					;
+
 					; the set of expressions is
 					; the list of set expressions
 					; 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,21 +131,22 @@
 					 )
 				       )
 			  )
-		     (set '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))))
 					    )
 				      )
 			  )
-					;
+					; prepend the set operations
+					; to the expressions
+
+		     (setq exprs (make-exprs vars exprs))
+
 					; build the lambda.
-					;
-		     (set 'last-let-value 
+
 		     (cons
 		      (list
 		       'lambda
@@ -116,14 +158,45 @@
 		      (make-nils vars)
 		      )
 		     )
-		     )
-		     
 		   )
-		 (car let-param)
-		 (cdr let-param)
 		 ()
 		 ()
 		 ()
 		 )
 		)
      )
+
+					; boolean operators
+
+(def or (lexpr (l)
+	       (let ((ret nil))
+		 (while l
+		   (cond ((setq ret (car l))
+			  (setq l nil))
+			 ((setq l (cdr l)))))
+		 ret
+		 )
+	       )
+     )
+
+					; execute to resolve macros
+
+(or nil t)
+
+(def and (lexpr (l)
+	       (let ((ret t))
+		 (while l
+		   (cond ((setq ret (car l))
+			  (setq l (cdr l)))
+			 ((setq ret (setq l nil)))
+			 )
+		   )
+		 ret
+		 )
+	       )
+     )
+
+					; execute to resolve macros
+
+(and t nil)
+