X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Flisp%2Fao_lisp_const.lisp;h=13bb81391fd570e95a41544a1a4e921a65705c4d;hb=2ce7ab37df07b3c1ea1ca9befc06477e3b6cdeac;hp=4dc63bbf8e82c88daf93493c8557f3ba8f159c64;hpb=ac0f7768659e288338bf452b4248ae3572ea2f7d;p=fw%2Faltos

diff --git a/src/lisp/ao_lisp_const.lisp b/src/lisp/ao_lisp_const.lisp
index 4dc63bbf..13bb8139 100644
--- a/src/lisp/ao_lisp_const.lisp
+++ b/src/lisp/ao_lisp_const.lisp
@@ -49,9 +49,12 @@
 		   (list
 		    'lambda
 		    args
-		    (cond ((cdr exprs)
-			   (cons progn exprs))
-			  ((car exprs))
+		    (cond (exprs
+			   (cond ((cdr exprs)
+				  (cons progn exprs))
+				 ((car exprs))
+				 )
+			   )
 			  )
 		    )
 		   )
@@ -75,32 +78,6 @@
 (defun 1+ (x) (+ x 1))
 (defun 1- (x) (- x 1))
 
-					; boolean operators
-
-(def or (lexpr (l)
-	       (let ((ret nil))
-		 (while l
-		   (cond ((setq ret (car l))
-			  (setq l nil))
-			 ((setq l (cdr l)))))
-		 ret
-		 )
-	       )
-     )
-
-(def and (lexpr (l)
-	       (let ((ret t))
-		 (while l
-		   (cond ((setq ret (car l))
-			  (setq l (cdr l)))
-			 ((setq ret (setq l nil)))
-			 )
-		   )
-		 ret
-		 )
-	       )
-     )
-
 					; define a set of local
 					; variables and then evaluate
 					; a list of sexprs
@@ -192,9 +169,37 @@
 		)
      )
 
-					; run the let macro once to
-					; evaluate all of the internal
-					; macro calls
+					; 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
 
-(let ((let-param 1)))
+(and t nil)