From 1b9b27213d8246828a547e15148ba0aba278370c Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Sun, 24 May 2009 15:42:57 +0200
Subject: [PATCH] Do not create an extra scope in "if-amb"

---
 extra/backtrack/backtrack.factor | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/extra/backtrack/backtrack.factor b/extra/backtrack/backtrack.factor
index 9bef16d609..48bae97699 100755
--- a/extra/backtrack/backtrack.factor
+++ b/extra/backtrack/backtrack.factor
@@ -29,6 +29,10 @@ MACRO: checkpoint ( quot -- quot' )
 
 <PRIVATE
 
+: preserve ( quot var -- ) [ get [ call ] dip ] keep set ; inline
+
+: amb-preserve ( quot -- ) failure preserve ; inline
+
 : unsafe-number-from-to ( to from -- to from+n )
     2dup = [ [ 1 + unsafe-number-from-to ] checkpoint ] unless ;
 
@@ -57,13 +61,13 @@ MACRO: amb-execute ( seq -- quot )
     [ length 1 - ] [ <enum> [ 1quotation ] assoc-map ] bi
     '[ _ 0 unsafe-number-from-to nip _ case ] ;
 
-: if-amb ( true false -- )
+: if-amb ( true false -- ? )
     [
         [ { t f } amb ]
         [ '[ @ require t ] ]
         [ '[ @ f ] ]
         tri* if
-    ] with-scope ; inline
+    ] amb-preserve ; inline
 
 : cut-amb ( -- )
     f failure set ;
-- 
2.34.1