From b5dc709c025957c32370c4f40778d15c682f379f Mon Sep 17 00:00:00 2001
From: Joe Groff <arcata@gmail.com>
Date: Sun, 6 Jul 2008 08:37:16 -0700
Subject: [PATCH] Rewrite integer>bit-array to use locals

---
 extra/bit-arrays/bit-arrays.factor | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/extra/bit-arrays/bit-arrays.factor b/extra/bit-arrays/bit-arrays.factor
index 96d7cf9905..3d699a2623 100755
--- a/extra/bit-arrays/bit-arrays.factor
+++ b/extra/bit-arrays/bit-arrays.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien.c-types accessors math alien.accessors kernel
-kernel.private sequences sequences.private byte-arrays
+kernel.private locals sequences sequences.private byte-arrays
 parser prettyprint.backend ;
 IN: bit-arrays
 
@@ -72,14 +72,16 @@ M: bit-array byte-length length 7 + -3 shift ;
 : ?{ ( parsed -- parsed )
     \ } [ >bit-array ] parse-literal ; parsing
 
-: integer>bit-array ( int -- bit-array ) 
-    dup zero? [ drop 0 <bit-array> ] [
-        [ log2 1+ <bit-array> 0 ] keep
-        [ dup zero? not ] [
-            [ -8 shift ] [ 255 bitand ] bi
-            -roll [ [ set-alien-unsigned-1 ] 2keep 1+ ] dip
-        ] [ ] while
-        2drop
+:: integer>bit-array ( n -- bit-array ) 
+    n zero? [ 0 <bit-array> ] [
+        [let | out [ n log2 1+ <bit-array> ] i! [ 0 ] n'! [ n ] |
+            [ n' zero? not ] [
+                n' out underlying>> i 255 bitand set-alien-unsigned-1
+                n' -8 shift n'!
+                i 1+ i!
+            ] [ ] while
+            out
+        ]
     ] if ;
 
 : bit-array>integer ( bit-array -- int )