From b87eee4d746dfe13ca8a8180389d79ded1bf4695 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Tue, 10 Jun 2008 21:06:36 -0500
Subject: [PATCH] more short-circuit updates

---
 extra/inverse/inverse.factor | 2 +-
 extra/lisp/lisp.factor       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/extra/inverse/inverse.factor b/extra/inverse/inverse.factor
index 705c2d070b..ef1f575972 100755
--- a/extra/inverse/inverse.factor
+++ b/extra/inverse/inverse.factor
@@ -77,7 +77,7 @@ UNION: explicit-inverse normal-inverse math-inverse pop-inverse ;
     { [ word? ] [ primitive? not ] [
         { "inverse" "math-inverse" "pop-inverse" }
         [ word-prop ] with contains? not
-    ] } <-&& ; 
+    ] } 1&& ; 
 
 : (flatten) ( quot -- )
     [ dup flattenable? [ word-def (flatten) ] [ , ] if ] each ;
diff --git a/extra/lisp/lisp.factor b/extra/lisp/lisp.factor
index 425ee27bb7..809b9498d2 100644
--- a/extra/lisp/lisp.factor
+++ b/extra/lisp/lisp.factor
@@ -64,12 +64,12 @@ PRIVATE>
     
 <PRIVATE    
 : quasiquote-unquote ( cons -- newcons )
-    [ { [ dup list? ] [ car dup lisp-symbol? ] [ name>> "unquote" equal? dup ] } && nip ]
+    [ { [ dup list? ] [ car dup lisp-symbol? ] [ name>> "unquote" equal? dup ] } 0&& nip ]
     [ cadr ] traverse ;
     
 : quasiquote-unquote-splicing ( cons -- newcons )    
     [ { [ dup list? ] [ dup cdr [ cons? ] [ car cons? ] bi and ]
-        [ dup cadr car lisp-symbol? ] [ cadr car name>> "unquote-splicing" equal? dup ] } && nip ]
+        [ dup cadr car lisp-symbol? ] [ cadr car name>> "unquote-splicing" equal? dup ] } 0&& nip ]
     [ dup cadr cdr >>cdr ] traverse ;
 PRIVATE>