[movitz-cvs] CVS update: movitz/losp/muerte/eval.lisp

[Frode Vatvedt Fjeld]

Update of /project/movitz/cvsroot/movitz/losp/muerte
In directory common-lisp.net:/tmp/cvs-serv27155

Modified Files:
	eval.lisp 
Log Message:
Added when and unless. I really should add proper macros soon.

Date: Wed Jun 16 00:37:17 2004
Author: ffjeld

Index: movitz/losp/muerte/eval.lisp
diff -u movitz/losp/muerte/eval.lisp:1.8 movitz/losp/muerte/eval.lisp:1.9
--- movitz/losp/muerte/eval.lisp:1.8	Fri Apr 23 06:00:30 2004
+++ movitz/losp/muerte/eval.lisp	Wed Jun 16 00:37:17 2004
@@ -10,7 +10,7 @@
 ;;;; Author:        Frode Vatvedt Fjeld <frodef at acm.org>
 ;;;; Created at:    Fri Oct 19 21:15:12 2001
 ;;;;                
-;;;; $Id: eval.lisp,v 1.8 2004/04/23 13:00:30 ffjeld Exp $
+;;;; $Id: eval.lisp,v 1.9 2004/06/16 07:37:17 ffjeld Exp $
 ;;;;                
 ;;;;------------------------------------------------------------------
 
@@ -72,6 +72,10 @@
   (case (car form)
     (quote (cadr form))
     (function (eval-function (second form) env))
+    (when (when (eval-form (second form) env)
+	    (eval-progn (cddr form) env)))
+    (unless (unless (eval-form (second form) env)
+	      (eval-progn (cddr form) env)))
     (if (if (eval-form (second form) env)
 	    (eval-form (third form) env)
 	  (eval-form (fourth form) env)))