From 53db40ba1373ce4c27defa711844d20a57fdfa11 Mon Sep 17 00:00:00 2001
From: "U-SLAVA-DFB8FF805\\Slava" <Slava@slava-dfb8ff805.(none)>
Date: Sat, 13 Dec 2008 05:06:28 -0600
Subject: [PATCH] Add more stack declarations

---
 basis/concurrency/combinators/combinators.factor |  3 ++-
 basis/io/backend/windows/nt/nt.factor            |  3 +++
 basis/io/files/windows/nt/nt.factor              | 15 ++++++---------
 basis/math/bitwise/bitwise.factor                |  2 +-
 basis/ui/gadgets/grid-lines/grid-lines.factor    |  2 +-
 core/math/math.factor                            |  6 +++---
 6 files changed, 16 insertions(+), 15 deletions(-)
 mode change 100644 => 100755 basis/concurrency/combinators/combinators.factor
 mode change 100644 => 100755 basis/math/bitwise/bitwise.factor
 mode change 100644 => 100755 core/math/math.factor

diff --git a/basis/concurrency/combinators/combinators.factor b/basis/concurrency/combinators/combinators.factor
old mode 100644
new mode 100755
index 932605fc36..3d18b9e029
--- a/basis/concurrency/combinators/combinators.factor
+++ b/basis/concurrency/combinators/combinators.factor
@@ -28,7 +28,8 @@ PRIVATE>
 
 : [future] ( quot -- quot' ) '[ _ curry future ] ; inline
 
-: future-values dup [ ?future ] change-each ; inline
+: future-values ( futures -- futures )
+    dup [ ?future ] change-each ; inline
 
 PRIVATE>
 
diff --git a/basis/io/backend/windows/nt/nt.factor b/basis/io/backend/windows/nt/nt.factor
index bb8175b35c..b8887debed 100755
--- a/basis/io/backend/windows/nt/nt.factor
+++ b/basis/io/backend/windows/nt/nt.factor
@@ -21,6 +21,9 @@ C: <io-callback> io-callback
     [ (make-overlapped) ] dip
     handle>> ptr>> [ over set-OVERLAPPED-offset ] when* ;
 
+M: winnt FileArgs-overlapped ( port -- overlapped )
+    make-overlapped ;
+
 : <completion-port> ( handle existing -- handle )
      f 1 CreateIoCompletionPort dup win32-error=0/f ;
 
diff --git a/basis/io/files/windows/nt/nt.factor b/basis/io/files/windows/nt/nt.factor
index 37c6e3190a..d0d9d5174a 100755
--- a/basis/io/files/windows/nt/nt.factor
+++ b/basis/io/files/windows/nt/nt.factor
@@ -1,10 +1,10 @@
 USING: continuations destructors io.buffers io.files io.backend
-io.timeouts io.ports io.pathnames io.files.private io.backend.windows
-io.files.windows io.backend.windows.nt io.encodings.utf16n
-windows windows.kernel32 kernel libc math threads system
-environment alien.c-types alien.arrays alien.strings sequences
-combinators combinators.short-circuit ascii splitting alien
-strings assocs namespaces make accessors tr ;
+io.timeouts io.ports io.pathnames io.files.private
+io.backend.windows io.files.windows io.encodings.utf16n windows
+windows.kernel32 kernel libc math threads system environment
+alien.c-types alien.arrays alien.strings sequences combinators
+combinators.short-circuit ascii splitting alien strings assocs
+namespaces make accessors tr ;
 IN: io.files.windows.nt
 
 M: winnt cwd
@@ -44,9 +44,6 @@ M: winnt normalize-path ( string -- string' )
 M: winnt CreateFile-flags ( DWORD -- DWORD )
     FILE_FLAG_OVERLAPPED bitor ;
 
-M: winnt FileArgs-overlapped ( port -- overlapped )
-    make-overlapped ;
-
 M: winnt open-append
     0 ! [ dup file-info size>> ] [ drop 0 ] recover
     [ (open-append) ] dip >>ptr ;
diff --git a/basis/math/bitwise/bitwise.factor b/basis/math/bitwise/bitwise.factor
old mode 100644
new mode 100755
index 11a623113a..2c03164ae7
--- a/basis/math/bitwise/bitwise.factor
+++ b/basis/math/bitwise/bitwise.factor
@@ -67,7 +67,7 @@ DEFER: byte-bit-count
 256 [
     0 swap [ [ 1+ ] when ] each-bit
 ] B{ } map-as '[ HEX: ff bitand _ nth-unsafe ]
-(( -- table )) define-declared
+(( byte -- table )) define-declared
 
 \ byte-bit-count make-inline
 
diff --git a/basis/ui/gadgets/grid-lines/grid-lines.factor b/basis/ui/gadgets/grid-lines/grid-lines.factor
index 8d79c9e07c..03e2e64d95 100755
--- a/basis/ui/gadgets/grid-lines/grid-lines.factor
+++ b/basis/ui/gadgets/grid-lines/grid-lines.factor
@@ -11,7 +11,7 @@ C: <grid-lines> grid-lines
 
 SYMBOL: grid-dim
 
-: half-gap grid get gap>> [ 2/ ] map ; inline
+: half-gap ( -- gap ) grid get gap>> [ 2/ ] map ; inline
 
 : grid-line-from/to ( orientation point -- from to )
     half-gap v-
diff --git a/core/math/math.factor b/core/math/math.factor
old mode 100644
new mode 100755
index 2434bf8ec6..03be2208c2
--- a/core/math/math.factor
+++ b/core/math/math.factor
@@ -114,15 +114,15 @@ M: float fp-infinity? ( float -- ? )
 
 <PRIVATE
 
-: iterate-prep 0 -rot ; inline
+: iterate-prep ( n quot -- i n quot ) 0 -rot ; inline
 
-: if-iterate? [ 2over < ] 2dip if ; inline
+: if-iterate? ( i n true false -- ) [ 2over < ] 2dip if ; inline
 
 : iterate-step ( i n quot -- i n quot )
     #! Apply quot to i, keep i and quot, hide n.
     swap [ 2dup 2slip ] dip swap ; inline
 
-: iterate-next [ 1+ ] 2dip ; inline
+: iterate-next ( i n quot -- i' n quot ) [ 1+ ] 2dip ; inline
 
 PRIVATE>