From ef2593536608fb5a38dd574b52ddd517fdf3ce09 Mon Sep 17 00:00:00 2001
From: Joe Groff <arcata@gmail.com>
Date: Wed, 28 Oct 2009 13:56:15 -0500
Subject: [PATCH] fix load errors from load-all

---
 .../hashtables/nodes/bitmap/bitmap.factor     | 21 +++++-----
 extra/benchmark/fasta/fasta.factor            | 38 +++++++++++--------
 extra/mongodb/driver/driver.factor            | 18 +++++----
 extra/mongodb/operations/operations.factor    |  4 +-
 4 files changed, 44 insertions(+), 37 deletions(-)

diff --git a/basis/persistent/hashtables/nodes/bitmap/bitmap.factor b/basis/persistent/hashtables/nodes/bitmap/bitmap.factor
index eb8533c186..a8194a127f 100644
--- a/basis/persistent/hashtables/nodes/bitmap/bitmap.factor
+++ b/basis/persistent/hashtables/nodes/bitmap/bitmap.factor
@@ -36,17 +36,16 @@ M:: bitmap-node (new-at) ( shift value key hashcode bitmap-node -- node' added-l
         new-leaf
     ] [
         idx nodes nth :> n
-            shift radix-bits + value key hashcode n (new-at) :> new-leaf :> n'
-            n n' eq? [
-                bitmap-node
-            ] [
-                bitmap
-                n' idx nodes new-nth
-                shift
-                <bitmap-node>
-            ] if
-            new-leaf
-        ]
+        shift radix-bits + value key hashcode n (new-at) :> new-leaf :> n'
+        n n' eq? [
+            bitmap-node
+        ] [
+            bitmap
+            n' idx nodes new-nth
+            shift
+            <bitmap-node>
+        ] if
+        new-leaf
     ] if ;
 
 M:: bitmap-node (pluck-at) ( key hashcode bitmap-node -- node' )
diff --git a/extra/benchmark/fasta/fasta.factor b/extra/benchmark/fasta/fasta.factor
index 4b15eaac7e..7abf5ec5bd 100755
--- a/extra/benchmark/fasta/fasta.factor
+++ b/extra/benchmark/fasta/fasta.factor
@@ -77,28 +77,34 @@ CONSTANT: homo-sapiens
 
 : write-repeat-fasta ( n alu desc id -- )
     write-description
-    0 :> k! :> alu
-    [| len | k len alu make-repeat-fasta k! ] split-lines ; inline
+    [let
+        0 :> k! :> alu
+        [| len | k len alu make-repeat-fasta k! ] split-lines
+    ] ; inline
 
 : fasta ( n out -- )
     homo-sapiens make-cumulative
     IUB make-cumulative
-    :> homo-sapiens-floats
-    :> homo-sapiens-chars
-    :> IUB-floats
-    :> IUB-chars
-    :> out
-    :> n
-    initial-seed :> seed
+    [let
+        :> homo-sapiens-floats
+        :> homo-sapiens-chars
+        :> IUB-floats
+        :> IUB-chars
+        :> out
+        :> n
+        initial-seed :> seed
 
-    out ascii [
-        n 2 * ALU "Homo sapiens alu" "ONE" write-repeat-fasta
+        out ascii [
+            n 2 * ALU "Homo sapiens alu" "ONE" write-repeat-fasta
 
-        initial-seed
-        n 3 * homo-sapiens-chars homo-sapiens-floats "IUB ambiguity codes" "TWO" write-random-fasta
-        n 5 * IUB-chars IUB-floats "Homo sapiens frequency" "THREE" write-random-fasta
-        drop
-    ] with-file-writer ;
+            initial-seed
+            n 3 * homo-sapiens-chars homo-sapiens-floats
+            "IUB ambiguity codes" "TWO" write-random-fasta
+            n 5 * IUB-chars IUB-floats
+            "Homo sapiens frequency" "THREE" write-random-fasta
+            drop
+        ] with-file-writer
+    ] ;
 
 : run-fasta ( -- ) 2500000 reverse-complement-in fasta ;
 
diff --git a/extra/mongodb/driver/driver.factor b/extra/mongodb/driver/driver.factor
index b0242fd067..294672523c 100644
--- a/extra/mongodb/driver/driver.factor
+++ b/extra/mongodb/driver/driver.factor
@@ -151,14 +151,16 @@ M: mdb-collection create-collection
     [ "$cmd" = ] [ "system" head? ] bi or ;
 
 : check-collection ( collection -- fq-collection )
-    mdb-instance :> instance
-    instance name>> :> instance-name
-    dup mdb-collection? [ name>> ] when
-    "." split1 over instance-name =
-    [ nip ] [ drop ] if
-    [ ] [ reserved-namespace? ] bi
-    [ instance (ensure-collection) ] unless
-    [ instance-name ] dip "." glue ; 
+    [let
+        mdb-instance :> instance
+        instance name>> :> instance-name
+        dup mdb-collection? [ name>> ] when
+        "." split1 over instance-name =
+        [ nip ] [ drop ] if
+        [ ] [ reserved-namespace? ] bi
+        [ instance (ensure-collection) ] unless
+        [ instance-name ] dip "." glue
+    ] ;
 
 : fix-query-collection ( mdb-query -- mdb-query )
     [ check-collection ] change-collection ; inline
diff --git a/extra/mongodb/operations/operations.factor b/extra/mongodb/operations/operations.factor
index 69b14cb967..7e99c52aac 100644
--- a/extra/mongodb/operations/operations.factor
+++ b/extra/mongodb/operations/operations.factor
@@ -105,9 +105,9 @@ USE: tools.walker
     ! [ dump-to-file ] keep
     write flush ; inline
 
-: build-query-object ( query -- selector )
+:: build-query-object ( query -- selector )
     H{ } clone :> selector
-    { [ orderby>> [ "orderby" selector set-at ] when* ]
+    query { [ orderby>> [ "orderby" selector set-at ] when* ]
       [ explain>> [ "$explain" selector set-at ] when* ]
       [ hint>> [ "$hint" selector set-at ] when* ] 
       [ query>> "query" selector set-at ]