merged stack continuations combinators and logic vocabularies into kernel vocabulary

library/assoc.factor

@@ -26,10 +26,7 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: lists
-USE: logic
-USE: combinators
 USE: kernel
-USE: stack
 
 ! An association list is a list of conses where the car of each
 ! cons is a key, and the cdr is a value. See the Factor

library/bootstrap/boot-stage2.factor

@@ -26,11 +26,9 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: init
-USE: combinators
 USE: kernel
 USE: lists
 USE: parser
-USE: stack
 USE: stdio
 
 "Cold boot in progress..." print

library/bootstrap/boot.factor

@@ -30,19 +30,18 @@ USE: image
 USE: parser
 USE: namespaces
 USE: stdio
-USE: combinators
 USE: kernel
 USE: vectors
 
 primitives,
 [
     "/version.factor"
-    "/library/kernel.factor"
     "/library/stack.factor"
+    "/library/kernel.factor"
     "/library/types.factor"
+    "/library/combinators.factor"
     "/library/math/math.factor"
     "/library/cons.factor"
-    "/library/combinators.factor"
     "/library/logic.factor"
     "/library/vector-combinators.factor"
     "/library/lists.factor"

library/bootstrap/cross-compiler.factor

@@ -25,7 +25,6 @@
 ! OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-USE: combinators
 USE: errors
 USE: kernel
 USE: lists
@@ -33,12 +32,10 @@ USE: math
 USE: math-internals
 USE: namespaces
 USE: parser
-USE: stack
 USE: stdio
 USE: streams
 USE: strings
 USE: vectors
-USE: vectors
 USE: words
 
 IN: alien
@@ -76,6 +73,19 @@ DEFER: type
 DEFER: size
 DEFER: address
 DEFER: heap-stats
+DEFER: drop
+DEFER: dup
+DEFER: over
+DEFER: pick
+DEFER: swap
+DEFER: >r
+DEFER: r>
+DEFER: ifte
+DEFER: call
+DEFER: datastack
+DEFER: callstack
+DEFER: set-datastack
+DEFER: set-callstack
 
 IN: strings
 DEFER: str=
@@ -394,7 +404,7 @@ IN: image
         heap-stats
         throw
     ] [
-        swap succ tuck f define,
+        USE: stack swap succ tuck f define,
     ] each drop ;
 
 : make-image ( name -- )

library/bootstrap/image.factor

@@ -39,17 +39,14 @@
 ! run platform/native/boot-stage2.factor.
 
 IN: image
-USE: combinators
 USE: errors
 USE: hashtables
 USE: kernel
 USE: lists
-USE: logic
 USE: math
 USE: namespaces
 USE: prettyprint
 USE: random
-USE: stack
 USE: stdio
 USE: streams
 USE: strings
@@ -58,6 +55,10 @@ USE: vectors
 USE: unparser
 USE: words
 
+USE: stack
+USE: combinators
+USE: logic
+
 ! The image being constructed; a vector of word-size integers
 SYMBOL: image
 
@@ -191,7 +192,13 @@ SYMBOL: boot-quot
     dup pooled-object dup [
         nip
     ] [
-        drop "Not in image: " swap word-name cat2 throw
+        drop
+        [
+            "Not in image: " ,
+            dup word-vocabulary ,
+            " " ,
+            word-name ,
+        ] make-string throw
     ] ifte ;
 
 : fixup-words ( -- )

library/bootstrap/init-stage2.factor

@@ -27,7 +27,6 @@
 
 IN: init
 USE: ansi
-USE: combinators
 USE: compiler
 USE: errors
 USE: inference
@@ -38,7 +37,6 @@ USE: math
 USE: namespaces
 USE: parser
 USE: random
-USE: stack
 USE: streams
 USE: stdio
 USE: presentation

library/bootstrap/init.factor

@@ -26,7 +26,6 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: init
-USE: combinators
 USE: compiler
 USE: errors
 USE: kernel

library/cli.factor

@@ -26,9 +26,7 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: init
-USE: combinators
 USE: compiler
-USE: continuations
 USE: errors
 USE: files
 USE: listener
@@ -38,7 +36,6 @@ USE: namespaces
 USE: parser
 USE: prettyprint
 USE: random
-USE: stack
 USE: stdio
 USE: streams
 USE: strings

library/combinators.factor

@@ -25,10 +25,8 @@
 ! OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-IN: combinators
+IN: kernel
-USE: kernel
 USE: lists
-USE: stack
 
 : slip ( quot x -- x )
     >r call r> ; inline

library/compiler/alien-macros.factor

@@ -26,13 +26,11 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: alien
-USE: combinators
 USE: compiler
 USE: kernel
 USE: lists
 USE: math
 USE: namespaces
-USE: stack
 
 : UNBOX ( name -- )
     #! Move top of datastack to C stack.

library/compiler/alien-types.factor

@@ -26,17 +26,14 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: alien
-USE: combinators
 USE: compiler
 USE: errors
 USE: hashtables
 USE: kernel
 USE: lists
-USE: logic
 USE: math
 USE: namespaces
 USE: parser
-USE: stack
 USE: strings
 USE: words
 

library/compiler/alien.factor

@@ -26,14 +26,13 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: alien
-USE: combinators
 USE: compiler
 USE: errors
+USE: kernel
 USE: lists
 USE: math
 USE: namespaces
 USE: parser
-USE: stack
 USE: words
 
 : BEGIN-ENUM:

library/compiler/assembler.factor

@@ -26,10 +26,8 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: compiler
-USE: combinators
 USE: math
 USE: kernel
-USE: stack
 
 : cell 4 ;
 : literal-table 1024 cell * ;

library/compiler/assembly-x86.factor

@@ -29,8 +29,6 @@ IN: compiler
 USE: kernel
 USE: compiler
 USE: math
-USE: stack
-USE: combinators
 
 : EAX 0 ;
 : ECX 1 ;

library/compiler/compiler.factor

@@ -26,18 +26,15 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: compiler
-USE: combinators
 USE: inference
 USE: errors
 USE: hashtables
 USE: kernel
 USE: lists
-USE: logic
 USE: math
 USE: namespaces
 USE: parser
 USE: prettyprint
-USE: stack
 USE: stdio
 USE: strings
 USE: unparser

library/compiler/generator-x86.factor

@@ -27,15 +27,12 @@
 
 IN: compiler
 USE: alien
-USE: combinators
 USE: inference
 USE: errors
 USE: kernel
 USE: lists
-USE: logic
 USE: math
 USE: namespaces
-USE: stack
 USE: strings
 USE: words
 USE: vectors

library/compiler/generator.factor

@@ -26,13 +26,12 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: compiler
-USE: combinators
 USE: inference
 USE: errors
+USE: kernel
 USE: lists
 USE: math
 USE: namespaces
-USE: stack
 USE: strings
 USE: words
 

library/compiler/linearizer.factor

@@ -26,15 +26,12 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: compiler
-USE: lists
-USE: words
-USE: stack
-USE: namespaces
 USE: inference
-USE: combinators
-USE: math
-USE: logic
 USE: kernel
+USE: lists
+USE: math
+USE: namespaces
+USE: words
 
 ! The linear IR is close to assembly language. It also resembles
 ! Forth code in some sense. It exists so that pattern matching

library/compiler/optimizer.factor

@@ -27,14 +27,11 @@
 
 IN: compiler
 USE: lists
-USE: stack
-USE: combinators
 USE: namespaces
 USE: kernel
 USE: inference
 USE: words
 USE: prettyprint
-USE: logic
 
 ! The optimizer transforms dataflow IR to dataflow IR. Currently
 ! it removes literals that are eventually dropped, and never

library/compiler/xt.factor

@@ -26,18 +26,15 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: compiler
-USE: combinators
 USE: inference
 USE: errors
 USE: hashtables
 USE: kernel
 USE: lists
-USE: logic
 USE: math
 USE: namespaces
 USE: parser
 USE: prettyprint
-USE: stack
 USE: stdio
 USE: strings
 USE: unparser

library/cons.factor

@@ -25,7 +25,8 @@
 ! OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-IN: lists USE: kernel USE: stack
+IN: lists
+USE: kernel
 
 : swons ( cdr car -- [ car | cdr ] )
     #! Push a new cons cell. If the cdr is f or a proper list,

library/continuations.factor

@@ -25,13 +25,11 @@
 ! OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-IN: continuations
+IN: kernel
-USE: combinators
 USE: errors
 USE: kernel
 USE: lists
 USE: namespaces
-USE: stack
 USE: vectors
 
 : reify ( quot -- )

library/errors.factor

@@ -26,13 +26,10 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: errors
-USE: combinators
-USE: continuations
 USE: kernel
 USE: lists
 USE: math
 USE: namespaces
-USE: stack
 USE: strings
 USE: vectors
 

library/eval-catch.factor

@@ -26,9 +26,8 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: parser
+USE: kernel
 USE: errors
-USE: stack
-USE: combinators
 USE: stdio
 
 : eval-catch ( str -- )

library/format.factor

@@ -26,12 +26,10 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: format
-USE: combinators
 USE: kernel
 USE: math
 USE: namespaces
 USE: strings
-USE: stack
 
 : decimal-split ( string -- string string )
     #! Split a string before and after the decimal point.

library/generic.factor

@@ -27,14 +27,12 @@
 
 IN: generic
 
-USE: combinators
 USE: errors
 USE: hashtables
 USE: kernel
 USE: lists
 USE: namespaces
 USE: parser
-USE: stack
 USE: strings
 USE: words
 USE: vectors

library/gensym.factor

@@ -26,9 +26,9 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: words
+USE: kernel
 USE: math
 USE: namespaces
-USE: stack
 USE: strings
 USE: unparser
 

library/hashtables.factor

@@ -26,11 +26,9 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: hashtables
-USE: combinators
 USE: kernel
 USE: lists
 USE: math
-USE: stack
 USE: vectors
 
 ! Note that the length of a hashtable vector must not change

library/httpd/default-responders.factor

@@ -27,8 +27,8 @@
 
 IN: httpd-responder
 USE: httpd
+USE: kernel
 USE: namespaces
-USE: stack
 USE: strings
 
 USE: test-responder

library/httpd/file-responder.factor

@@ -26,7 +26,6 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: file-responder
-USE: combinators
 USE: errors
 USE: files
 USE: html
@@ -37,7 +36,6 @@ USE: lists
 USE: logging
 USE: namespaces
 USE: parser
-USE: stack
 USE: stdio
 USE: streams
 USE: strings

library/httpd/html-tags.factor

@@ -27,12 +27,10 @@ IN: html
 USE: strings
 USE: lists
 USE: format
-USE: stack
+USE: kernel
-USE: combinators
 USE: stdio
 USE: namespaces
 USE: words
-USE: logic
 
 ! These words are used to provide a means of writing
 ! formatted HTML to standard output with a familiar 'html' look

library/httpd/html.factor

@@ -26,13 +26,10 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: html
-USE: combinators
 USE: format
 USE: lists
-USE: logic
 USE: kernel
 USE: namespaces
-USE: stack
 USE: stdio
 USE: streams
 USE: strings

library/httpd/http-common.factor

@@ -27,14 +27,12 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: httpd
-USE: combinators
 USE: format
 USE: kernel
 USE: lists
 USE: logging
 USE: namespaces
 USE: parser
-USE: stack
 USE: stdio
 USE: streams
 USE: strings

library/httpd/httpd.factor

@@ -26,15 +26,12 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: httpd
-USE: combinators
 USE: errors
 USE: httpd-responder
 USE: kernel
 USE: lists
 USE: logging
-USE: logic
 USE: namespaces
-USE: stack
 USE: stdio
 USE: streams
 USE: strings

library/httpd/inspect-responder.factor

@@ -29,7 +29,7 @@ IN: inspect-responder
 USE: html
 USE: inspector
 USE: namespaces
-USE: stack
+USE: kernel
 
 USE: httpd
 USE: httpd-responder

library/httpd/quit-responder.factor

@@ -26,11 +26,10 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: quit-responder
-USE: combinators
 USE: httpd
 USE: httpd-responder
 USE: namespaces
-USE: stack
+USE: kernel
 USE: stdio
 USE: streams
 

library/httpd/resource-responder.factor

@@ -26,16 +26,13 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: resource-responder
-USE: combinators
 USE: files
 USE: httpd
 USE: httpd-responder
 USE: kernel
 USE: lists
-USE: logic
 USE: namespaces
 USE: parser
-USE: stack
 USE: stdio
 USE: streams
 USE: strings

library/httpd/responder.factor

@@ -27,7 +27,6 @@
 
 IN: httpd-responder
 
-USE: combinators
 USE: hashtables
 USE: httpd
 USE: kernel
@@ -35,7 +34,6 @@ USE: lists
 USE: logging
 USE: namespaces
 USE: stdio
-USE: stack
 USE: streams
 USE: strings
 

library/httpd/test-responder.factor

@@ -29,7 +29,7 @@ IN: test-responder
 USE: html
 USE: httpd
 USE: httpd-responder
-USE: stack
+USE: kernel
 USE: test
 
 : test-responder ( argument -- )

library/httpd/url-encoding.factor

@@ -26,15 +26,12 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: url-encoding
-USE: combinators
 USE: errors
 USE: kernel
 USE: lists
-USE: logic
 USE: format
 USE: math
 USE: parser
-USE: stack
 USE: strings
 USE: unparser
 

library/in-thread.factor

@@ -26,13 +26,10 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: threads
-USE: combinators
-USE: continuations
 USE: errors
 USE: io-internals
 USE: kernel
 USE: lists
-USE: stack
 
 : in-thread ( quot -- )
     #! Execute a quotation in a co-operative thread. The

library/inference/branches.factor

@@ -26,16 +26,13 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: inference
-USE: combinators
 USE: errors
 USE: generic
 USE: interpreter
 USE: kernel
 USE: lists
-USE: logic
 USE: math
 USE: namespaces
-USE: stack
 USE: strings
 USE: vectors
 USE: words

library/inference/dataflow.factor

@@ -27,12 +27,11 @@
 
 IN: inference
 USE: interpreter
+USE: kernel
 USE: lists
 USE: math
 USE: namespaces
-USE: stack
 USE: words
-USE: combinators
 USE: vectors
 
 ! We build a dataflow graph for the compiler.

library/inference/inference.factor

@@ -26,15 +26,12 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: inference
-USE: combinators
 USE: errors
 USE: interpreter
 USE: kernel
 USE: lists
-USE: logic
 USE: math
 USE: namespaces
-USE: stack
 USE: strings
 USE: vectors
 USE: words

library/inference/stack.factor

@@ -27,10 +27,10 @@
 
 IN: inference
 USE: interpreter
-USE: stack
+USE: kernel
-USE: words
 USE: lists
 USE: namespaces
+USE: words
 
 \ >r [
     f #>r dataflow, [ 1 0 node-inputs ] extend

library/inference/words.factor

@@ -26,15 +26,12 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: inference
-USE: combinators
 USE: errors
 USE: interpreter
 USE: kernel
 USE: lists
-USE: logic
 USE: math
 USE: namespaces
-USE: stack
 USE: strings
 USE: vectors
 USE: words

library/io/ansi.factor

@@ -26,12 +26,10 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: ansi
-USE: combinators
 USE: lists
 USE: kernel
 USE: format
 USE: namespaces
-USE: stack
 USE: stdio
 USE: streams
 USE: strings

library/io/files.factor

@@ -26,13 +26,11 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: files
-USE: combinators
+USE: kernel
 USE: hashtables
 USE: lists
-USE: logic
 USE: namespaces
 USE: presentation
-USE: stack
 USE: stdio
 USE: strings
 

library/io/io-internals.factor

@@ -26,11 +26,8 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: io-internals
-USE: combinators
-USE: continuations
 USE: kernel
 USE: namespaces
-USE: stack
 USE: strings
 USE: threads
 

library/io/logging.factor

@@ -27,10 +27,9 @@
 
 IN: logging
 
-USE: combinators
 USE: hashtables
+USE: kernel
 USE: namespaces
-USE: stack
 USE: stdio
 USE: streams
 USE: strings

library/io/network.factor

@@ -26,14 +26,10 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: streams
-USE: combinators
-USE: continuations
 USE: io-internals
 USE: errors
 USE: hashtables
 USE: kernel
-USE: logic
-USE: stack
 USE: stdio
 USE: strings
 USE: namespaces

library/io/presentation.factor

@@ -26,12 +26,10 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: presentation
-USE: combinators
 USE: hashtables
 USE: kernel
 USE: lists
 USE: namespaces
-USE: stack
 USE: strings
 USE: unparser
 

library/io/stdio-binary.factor

@@ -26,8 +26,8 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: stdio
+USE: kernel
 USE: math
-USE: stack
 USE: streams
 USE: strings
 

library/io/stdio.factor

@@ -26,12 +26,10 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: stdio
-USE: combinators
 USE: errors
 USE: kernel
 USE: lists
 USE: namespaces
-USE: stack
 USE: streams
 USE: generic
 USE: strings

library/io/stream-impl.factor

@@ -29,14 +29,10 @@ IN: stdio
 DEFER: stdio
 
 IN: streams
-USE: combinators
-USE: continuations
 USE: io-internals
 USE: errors
 USE: hashtables
 USE: kernel
-USE: logic
-USE: stack
 USE: stdio
 USE: strings
 USE: namespaces

library/io/stream.factor

@@ -26,11 +26,9 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: streams
-USE: combinators
 USE: errors
 USE: kernel
 USE: namespaces
-USE: stack
 USE: strings
 USE: generic
 

library/io/vocabulary-style.factor

@@ -26,12 +26,10 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: presentation
-USE: combinators
 USE: hashtables
 USE: lists
 USE: kernel
 USE: namespaces
-USE: stack
 USE: words
 
 : vocab-style ( vocab -- style )
@@ -51,14 +49,6 @@ USE: words
     [ "ansi-fg" | "1" ]
     [ "fg" | [ 204 0 0 ] ]
 ] "arithmetic" set-vocab-style
-[
-    [ "ansi-fg" | "3" ]
-    [ "fg" | [ 255 132 0 ] ]
-] "combinators" set-vocab-style
-[
-    [ "ansi-fg" | "5" ]
-    [ "fg" | [ 102 0 204 ] ]
-] "continuations" set-vocab-style
 [
     [ "ansi-fg" | "1" ]
     [ "fg" | [ 255 0 0 ] ]
@@ -71,10 +61,6 @@ USE: words
     [ "ansi-fg" | "2" ]
     [ "fg" | [ 0 102 153 ] ]
 ] "lists" set-vocab-style
-[
-    [ "ansi-fg" | "6" ]
-    [ "fg" | [ 0 153 102 ] ]
-] "logic" set-vocab-style
 [
     [ "ansi-fg" | "1" ]
     [ "fg" | [ 204 0 0 ] ]

library/kernel.factor

@@ -30,12 +30,9 @@ DEFER: vector=
 DEFER: vector-hashcode
 
 IN: kernel
-
-USE: combinators
 USE: lists
 USE: math
 USE: math-internals
-USE: stack
 USE: strings
 USE: vectors
 USE: words

library/list-namespaces.factor

@@ -26,10 +26,8 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: lists
-USE: combinators
 USE: kernel
 USE: namespaces
-USE: stack
 USE: math
 
 : cons@ ( x var -- )

library/lists.factor

@@ -26,11 +26,8 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: lists
-USE: combinators
 USE: kernel
-USE: logic
 USE: math
-USE: stack
 USE: vectors
 
 : 2list ( a b -- [ a b ] )

library/logic.factor

@@ -25,10 +25,7 @@
 ! OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-IN: logic
+IN: kernel
-USE: combinators
-USE: kernel
-USE: stack
 
 : ? ( cond t f -- t/f )
     #! Push t if cond is true, otherwise push f.

library/math/arc-trig-hyp.factor

@@ -26,10 +26,9 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: math
-USE: combinators
+USE: kernel
 USE: math
 USE: math-internals
-USE: stack
 
 ! Inverse trigonometric functions:
 !    acos asec asin acosec atan acot

library/math/arithmetic.factor

@@ -26,10 +26,7 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: math
-USE: combinators
 USE: kernel
-USE: logic
-USE: stack
 
 : integer? dup fixnum? swap bignum? or ;
 : rational? dup integer? swap ratio? or ;

library/math/generic.factor

@@ -26,11 +26,9 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: math
-USE: combinators
 USE: errors
 USE: generic
 USE: kernel
-USE: stack
 USE: vectors
 USE: words
 

library/math/math-combinators.factor

@@ -26,9 +26,7 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: math
-USE: combinators
 USE: kernel
-USE: stack
 
 : times ( n quot -- )
     #! Evaluate a quotation n times.

library/math/math.factor

@@ -26,12 +26,9 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: math
-USE: combinators
 USE: kernel
-USE: logic
 USE: math
 USE: math-internals
-USE: stack
 
 : fac ( n -- n! )
     ! This is the naive implementation, for benchmarking purposes.

library/math/namespace-math.factor

@@ -26,10 +26,8 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: math
-USE: combinators
+USE: kernel
-USE: logic
 USE: namespaces
-USE: stack
 
 : +@ ( num var -- ) tuck get + put ;
 : -@ ( num var -- ) tuck get swap - put ;

library/math/pow.factor

@@ -26,12 +26,9 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: math
-USE: combinators
 USE: math
 USE: math-internals
 USE: kernel
-USE: logic
-USE: stack
 
 ! Power-related functions:
 !     exp log sqrt pow

library/math/trig-hyp.factor

@@ -26,11 +26,9 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: math
-USE: combinators
 USE: kernel
 USE: math
 USE: math-internals
-USE: stack
 
 ! Trigonometric functions:
 !    cos sec sin cosec tan cot

library/namespaces.factor

@@ -26,12 +26,9 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: namespaces
-USE: combinators
 USE: hashtables
 USE: kernel
 USE: lists
-USE: logic
-USE: stack
 USE: strings
 USE: vectors
 

library/primitives.factor

@@ -25,7 +25,6 @@
 ! OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-USE: combinators
 USE: alien
 USE: compiler
 USE: errors
@@ -38,7 +37,6 @@ USE: math-internals
 USE: parser
 USE: profiler
 USE: random
-USE: stack
 USE: strings
 USE: unparser
 USE: vectors

library/random.factor

@@ -26,11 +26,9 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: random
-USE: combinators
 USE: kernel
 USE: lists
 USE: math
-USE: stack
 
 : power-of-2? ( n -- ? )
     dup dup neg bitand = ;

library/sbuf.factor

@@ -26,13 +26,11 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: strings
-USE: combinators
 USE: kernel
 USE: lists
 USE: math
 USE: namespaces
 USE: strings
-USE: stack
 
 : make-string ( quot -- string )
     #! Call a quotation. The quotation can call , to prepend

library/sdl/hsv.factor

@@ -7,12 +7,10 @@
 ! Translated to Factor by Slava Pestov.
 
 IN: sdl
-USE: combinators
 USE: kernel
 USE: lists
 USE: math
 USE: namespaces
-USE: stack
 
 : f_ ( h s v i -- f ) >r transp >r 2dup r> 6 * r> - ;
 : p ( v s x -- v p x ) >r dupd neg succ * r> ;

library/sdl/sdl-utils.factor

@@ -29,15 +29,12 @@ IN: sdl
 USE: alien
 USE: math
 USE: namespaces
-USE: stack
 USE: compiler
 USE: words
 USE: parser
 USE: kernel
 USE: errors
-USE: combinators
 USE: lists
-USE: logic
 USE: prettyprint
 USE: sdl-event
 USE: sdl-gfx

library/sdl/sdl-video.factor

@@ -27,12 +27,9 @@
 
 IN: sdl-video
 USE: alien
-USE: combinators
 USE: compiler
 USE: kernel
-USE: logic
 USE: math
-USE: stack
 
 ! These are the currently supported flags for the SDL_surface
 ! Available for SDL_CreateRGBSurface() or SDL_SetVideoMode()

library/stack.factor

@@ -25,7 +25,7 @@
 ! OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-IN: stack
+IN: kernel
 USE: vectors
 
 : nop ( -- ) ;

library/strings.factor

@@ -26,12 +26,9 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: strings
-USE: combinators
 USE: kernel
 USE: lists
-USE: logic
 USE: math
-USE: stack
 
 : f-or-"" ( obj -- ? )
     dup not swap "" = or ;

library/syntax/parse-numbers.factor

@@ -26,14 +26,11 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: parser
-USE: combinators
 USE: errors
 USE: kernel
 USE: lists
-USE: logic
 USE: math
 USE: namespaces
-USE: stack
 USE: strings
 USE: words
 USE: unparser

library/syntax/parse-stream.factor

@@ -26,13 +26,11 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: parser
-USE: combinators
 USE: errors
 USE: kernel
 USE: lists
 USE: math
 USE: namespaces
-USE: stack
 USE: stdio
 USE: streams
 USE: strings

library/syntax/parse-syntax.factor

@@ -27,15 +27,12 @@
 
 IN: parser
 
-USE: combinators
 USE: errors
 USE: hashtables
 USE: kernel
 USE: lists
-USE: logic
 USE: math
 USE: namespaces
-USE: stack
 USE: strings
 USE: words
 USE: vectors

library/syntax/parser.factor

@@ -26,14 +26,11 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: parser
-USE: combinators
 USE: errors
 USE: kernel
 USE: lists
-USE: logic
 USE: math
 USE: namespaces
-USE: stack
 USE: strings
 USE: words
 USE: unparser

library/syntax/prettyprint.factor

@@ -26,15 +26,12 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: prettyprint
-USE: combinators
 USE: errors
 USE: format
 USE: kernel
-USE: logic
 USE: lists
 USE: math
 USE: namespaces
-USE: stack
 USE: stdio
 USE: strings
 USE: presentation

library/syntax/see.factor

@@ -26,10 +26,9 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: prettyprint
-USE: combinators
+USE: kernel
 USE: lists
 USE: math
-USE: stack
 USE: stdio
 USE: strings
 USE: presentation

library/syntax/unparser.factor

@@ -26,15 +26,12 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: unparser
-USE: combinators
 USE: kernel
 USE: format
 USE: lists
-USE: logic
 USE: math
 USE: namespaces
 USE: parser
-USE: stack
 USE: stdio
 USE: strings
 USE: words

library/test/benchmark/ack.factor

@@ -1,7 +1,5 @@
-USE: stack
 USE: math
 USE: kernel
-USE: combinators
 USE: compiler
 USE: test
 

library/test/benchmark/continuations.factor

@@ -1,6 +1,5 @@
 IN: scratchpad
-USE: combinators
+USE: kernel
-USE: continuations
 USE: math
 USE: test
 

library/test/benchmark/empty-loop.factor

@@ -1,6 +1,7 @@
 IN: scratchpad
+USE: compiler
+USE: kernel
 USE: math
-USE: stack
 USE: test
 
 : empty-loop-1 ( n -- )

library/test/benchmark/fac.factor

@@ -1,6 +1,5 @@
 IN: scratchpad
 USE: math
-USE: stack
 USE: test
 
 [ 1 ] [ 10000 fac 10000 [ succ / ] times* ] unit-test

library/test/benchmark/fib.factor

@@ -1,9 +1,8 @@
 IN: scratchpad
 USE: compiler
+USE: kernel
 USE: math
-USE: stack
 USE: test
-USE: combinators
 
 : fib ( n -- nth fibonacci number )
     dup 1 <= [ drop 1 ] [ pred dup fib swap pred fib + ] ifte ;

library/test/benchmark/hashtables.factor

@@ -1,7 +1,6 @@
-USE: stack
 USE: strings
+USE: kernel
 USE: math
-USE: combinators
 USE: test
 USE: unparser
 USE: hashtables

library/test/benchmark/sort.factor

@@ -1,8 +1,8 @@
 IN: scratchpad
 USE: lists
+USE: kernel
 USE: math
 USE: random
-USE: stack
 USE: test
 
 [ ] [ [ 100000 [ 0 10000 random-int , ] times ] make-list num-sort drop ] unit-test

library/test/benchmark/strings.factor

@@ -1,7 +1,6 @@
-USE: stack
 USE: strings
+USE: kernel
 USE: math
-USE: combinators
 USE: test
 USE: lists
 

library/test/benchmark/vectors.factor

@@ -1,5 +1,5 @@
 USE: vectors
-USE: stack
+USE: kernel
 USE: math
 USE: compiler
 USE: test

library/test/combinators.factor

@@ -1,8 +1,6 @@
 IN: scratchpad
-USE: combinators
 USE: kernel
 USE: math
-USE: stack
 USE: test
 
 [ slip ] unit-test-fails

library/test/compiler/asm-test.factor

@@ -1,6 +1,5 @@
 IN: scratchpad
 USE: compiler
-USE: stack
 
 0 EAX I>R
 0 ECX I>R

library/test/compiler/bail-out.factor

@@ -1,11 +1,9 @@
 IN: scratchpad
-USE: combinators
 USE: compiler
 USE: errors
-USE: logic
 USE: math
-USE: stack
 USE: test
+USE: kernel
 
 : bail-out call + ;
 

library/test/compiler/generic.factor

@@ -2,10 +2,7 @@ IN: scratchpad
 USE: compiler
 USE: test
 USE: math
-USE: stack
 USE: kernel
-USE: logic
-USE: combinators
 USE: words
 
 : generic-test

library/test/compiler/ifte.factor

@@ -2,11 +2,9 @@ IN: scratchpad
 USE: compiler
 USE: test
 USE: math
-USE: stack
 USE: kernel
-USE: logic
-USE: combinators
 USE: words
+USE: math-internals
 
 : dummy-ifte-1 t [ ] [ ] ifte ; compiled
 

library/test/compiler/optimizer.factor

@@ -4,7 +4,7 @@ USE: compiler
 USE: inference
 USE: words
 USE: math
-USE: combinators
+USE: kernel
 
 : foo 1 2 3 ;