diff --git a/basis/bootstrap/assembler/x86.32.factor b/basis/bootstrap/assembler/x86.32.factor index 6e48bed5ba..a85d1c00f7 100644 --- a/basis/bootstrap/assembler/x86.32.factor +++ b/basis/bootstrap/assembler/x86.32.factor @@ -1,10 +1,9 @@ ! Copyright (C) 2007, 2011 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: bootstrap.image.private kernel kernel.private namespaces -system cpu.x86.assembler cpu.x86.assembler.operands layouts -vocabs parser compiler.constants compiler.codegen.relocation -sequences math math.private generic.single.private -threads.private locals ; +USING: bootstrap.image.private compiler.codegen.relocation +compiler.constants cpu.x86.assembler cpu.x86.assembler.operands +generic.single.private kernel kernel.private layouts locals math +math.private namespaces threads.private ; IN: bootstrap.x86 4 \ cell set diff --git a/basis/bootstrap/assembler/x86.32.windows.factor b/basis/bootstrap/assembler/x86.32.windows.factor index fb3efc8df2..30c02eccc9 100644 --- a/basis/bootstrap/assembler/x86.32.windows.factor +++ b/basis/bootstrap/assembler/x86.32.windows.factor @@ -1,9 +1,8 @@ ! Copyright (C) 2010 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: bootstrap.image.private compiler.constants -compiler.codegen.relocation cpu.x86.assembler -cpu.x86.assembler.operands kernel layouts locals parser -sequences ; +USING: compiler.codegen.relocation compiler.constants +cpu.x86.assembler cpu.x86.assembler.operands kernel layouts +locals parser sequences ; IN: bootstrap.x86 : tib-segment ( -- ) FS ; diff --git a/basis/bootstrap/assembler/x86.64.factor b/basis/bootstrap/assembler/x86.64.factor index f2b844dd5a..9174cd6f42 100644 --- a/basis/bootstrap/assembler/x86.64.factor +++ b/basis/bootstrap/assembler/x86.64.factor @@ -1,10 +1,9 @@ ! Copyright (C) 2007, 2011 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: bootstrap.image.private kernel kernel.private layouts locals namespaces -vocabs parser compiler.constants -compiler.codegen.relocation math math.private cpu.x86.assembler -cpu.x86.assembler.operands sequences generic.single.private -threads.private ; +USING: bootstrap.image.private compiler.codegen.relocation +compiler.constants cpu.x86.assembler cpu.x86.assembler.operands +generic.single.private kernel kernel.private layouts locals math +math.private namespaces threads.private ; IN: bootstrap.x86 8 \ cell set diff --git a/basis/bootstrap/assembler/x86.64.unix.factor b/basis/bootstrap/assembler/x86.64.unix.factor index 2b665555c7..2ae65d2029 100644 --- a/basis/bootstrap/assembler/x86.64.unix.factor +++ b/basis/bootstrap/assembler/x86.64.unix.factor @@ -1,8 +1,7 @@ ! Copyright (C) 2008 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: bootstrap.image.private cpu.x86.assembler -cpu.x86.assembler.operands kernel layouts namespaces parser -sequences system vocabs ; +USING: cpu.x86.assembler.operands kernel layouts parser +sequences ; IN: bootstrap.x86 : leaf-stack-frame-size ( -- n ) 2 bootstrap-cells ; diff --git a/basis/bootstrap/assembler/x86.64.windows.factor b/basis/bootstrap/assembler/x86.64.windows.factor index 6cec39ec17..c353109211 100644 --- a/basis/bootstrap/assembler/x86.64.windows.factor +++ b/basis/bootstrap/assembler/x86.64.windows.factor @@ -1,8 +1,7 @@ ! Copyright (C) 2008 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: bootstrap.image.private kernel namespaces system layouts -vocabs sequences cpu.x86.assembler parser -cpu.x86.assembler.operands ; +USING: cpu.x86.assembler cpu.x86.assembler.operands kernel +layouts parser sequences ; IN: bootstrap.x86 DEFER: stack-reg diff --git a/basis/bootstrap/assembler/x86.factor b/basis/bootstrap/assembler/x86.factor index bf8d3465fd..2bd0ba7d03 100644 --- a/basis/bootstrap/assembler/x86.factor +++ b/basis/bootstrap/assembler/x86.factor @@ -1,9 +1,9 @@ ! Copyright (C) 2007, 2011 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: bootstrap.image.private compiler.constants -compiler.codegen.relocation compiler.units cpu.x86.assembler -cpu.x86.assembler.operands kernel kernel.private layouts -locals locals.backend make math math.private namespaces sequences +USING: bootstrap.image.private compiler.codegen.relocation +compiler.constants compiler.units cpu.x86.assembler +cpu.x86.assembler.operands kernel kernel.private layouts locals +locals.backend math math.private namespaces sequences slots.private strings.private vocabs ; IN: bootstrap.x86 diff --git a/basis/bootstrap/assembler/x86.windows.factor b/basis/bootstrap/assembler/x86.windows.factor index b81c1eb604..abc6cfa34f 100644 --- a/basis/bootstrap/assembler/x86.windows.factor +++ b/basis/bootstrap/assembler/x86.windows.factor @@ -1,8 +1,7 @@ ! Copyright (C) 2010 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: bootstrap.image.private compiler.constants -cpu.x86.assembler cpu.x86.assembler.operands kernel layouts -locals parser sequences ; +USING: compiler.constants cpu.x86.assembler +cpu.x86.assembler.operands layouts locals ; IN: bootstrap.x86 : tib-exception-list-offset ( -- n ) 0 bootstrap-cells ; diff --git a/basis/bootstrap/compiler/compiler.factor b/basis/bootstrap/compiler/compiler.factor index dd6ef784cb..7b7692ef70 100644 --- a/basis/bootstrap/compiler/compiler.factor +++ b/basis/bootstrap/compiler/compiler.factor @@ -1,12 +1,11 @@ ! Copyright (C) 2007, 2010 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors cpu.architecture vocabs system -sequences namespaces parser kernel kernel.private classes -classes.private arrays hashtables vectors classes.tuple sbufs -hashtables.private sequences.private math classes.tuple.private -growable namespaces.private assocs words command-line io -io.encodings.string libc splitting math.parser memory compiler.units -math.order quotations quotations.private assocs.private vocabs.loader ; +USING: accessors arrays assocs assocs.private classes +classes.tuple.private compiler.units hashtables +hashtables.private io kernel libc math math.parser memory +namespaces namespaces.private quotations quotations.private +sbufs sequences sequences.private splitting system vectors +vocabs vocabs.loader words ; FROM: compiler => enable-optimizer ; IN: bootstrap.compiler diff --git a/basis/bootstrap/io/io.factor b/basis/bootstrap/io/io.factor index 789bb1556b..7bd8d4a074 100644 --- a/basis/bootstrap/io/io.factor +++ b/basis/bootstrap/io/io.factor @@ -1,5 +1,5 @@ -USING: system vocabs vocabs.loader kernel combinators -namespaces sequences io.backend accessors ; +USING: accessors combinators namespaces sequences system vocabs +; IN: bootstrap.io "bootstrap.compiler" require