From 5edf8b0cb4c70101f47d5c25f3757cc2f0cffb93 Mon Sep 17 00:00:00 2001
From: "U-SLAVA-DFB8FF805\\Slava" <Slava@slava-dfb8ff805.(none)>
Date: Wed, 27 Aug 2008 11:52:46 -0500
Subject: [PATCH] Fix Windows bootstrap

---
 basis/io/windows/files/files.factor       | 2 +-
 basis/io/windows/launcher/launcher.factor | 8 +++-----
 extra/classes/tuple/lib/lib.factor        | 5 +++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/basis/io/windows/files/files.factor b/basis/io/windows/files/files.factor
index e25be71872..1377f82ced 100755
--- a/basis/io/windows/files/files.factor
+++ b/basis/io/windows/files/files.factor
@@ -123,7 +123,7 @@ SYMBOLS: +read-only+ +hidden+ +system+
 +not-content-indexed+ +encrypted+ ;
 
 : win32-file-attribute ( n attr symbol -- n )
-    >r dupd mask? [ r> , ] [ r> drop ] if ;
+    >r dupd mask? r> swap [ , ] [ drop ] if ;
 
 : win32-file-attributes ( n -- seq )
     [
diff --git a/basis/io/windows/launcher/launcher.factor b/basis/io/windows/launcher/launcher.factor
index 1cfb91d716..9442fa9a72 100755
--- a/basis/io/windows/launcher/launcher.factor
+++ b/basis/io/windows/launcher/launcher.factor
@@ -33,11 +33,9 @@ TUPLE: CreateProcess-args
     CreateProcess-args >tuple< CreateProcess win32-error=0/f ;
 
 : count-trailing-backslashes ( str n -- str n )
-    >r "\\" ?tail [
-        r> 1+ count-trailing-backslashes
-    ] [
-        r>
-    ] if ;
+    >r "\\" ?tail r> swap [
+        1+ count-trailing-backslashes
+    ] when ;
 
 : fix-trailing-backslashes ( str -- str' )
     0 count-trailing-backslashes
diff --git a/extra/classes/tuple/lib/lib.factor b/extra/classes/tuple/lib/lib.factor
index fbc3afe76c..509843b9cd 100755
--- a/extra/classes/tuple/lib/lib.factor
+++ b/extra/classes/tuple/lib/lib.factor
@@ -1,10 +1,11 @@
 ! Copyright (C) 2007 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel macros sequences slots words classes.tuple ;
+USING: kernel macros sequences slots words classes.tuple
+quotations combinators ;
 IN: classes.tuple.lib
 
 : reader-slots ( seq -- quot )
-    [ slot-spec-reader ] map [ get-slots ] curry ;
+    [ slot-spec-reader 1quotation ] map [ cleave ] curry ;
 
 MACRO: >tuple< ( class -- )
     all-slots rest-slice reader-slots ;