basis: fix bootstrap.

fixups can't depend on formatting because of circularity

diff --git a/basis/debugger/debugger.factor b/basis/debugger/debugger.factor
index ad70b533512b3cfd1263e809d134030c4f4ab86f..cfeeac6c0a861f6e717f830fa38b84e9830776ed 100644 (file)
--- a/basis/debugger/debugger.factor
+++ b/basis/debugger/debugger.factor
@@ -1,16 +1,15 @@
 ! Copyright (C) 2004, 2011 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien alien.strings arrays assocs classes
-classes.builtin classes.mixin classes.tuple classes.tuple.parser
-combinators combinators.short-circuit compiler.errors
-compiler.units continuations definitions destructors
-effects.parser fixups fry generic generic.math generic.parser
-generic.single grouping io io.encodings io.styles kernel
-kernel.private lexer libc make math math.order math.parser
-math.ratios namespaces parser prettyprint sequences
-sequences.private slots source-files.errors strings
-strings.parser summary system vocabs vocabs.loader vocabs.parser
-words ;
+classes.builtin classes.tuple classes.tuple.parser combinators
+combinators.short-circuit compiler.errors compiler.units
+continuations definitions destructors effects.parser fixups
+generic generic.math generic.parser generic.single grouping io
+io.encodings io.styles kernel kernel.private lexer libc make
+math math.order math.parser math.ratios namespaces parser
+prettyprint sequences sequences.private slots
+source-files.errors strings strings.parser summary system vocabs
+vocabs.loader vocabs.parser words ;
 IN: debugger
 
 GENERIC: error-help ( error -- topic )

diff --git a/basis/fixups/fixups.factor b/basis/fixups/fixups.factor
index 7ef97d84f448464f14bbc9b0be57e61790fc682d..208e2a284f2cd628cd34990e8a811518ed7f04f5 100644 (file)
--- a/basis/fixups/fixups.factor
+++ b/basis/fixups/fixups.factor
@@ -1,13 +1,13 @@
 ! Copyright (C) 2021 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors assocs continuations formatting kernel
-sequences vocabs vocabs.parser ;
+USING: accessors assocs continuations kernel sequences
+vocabs vocabs.parser ;
 IN: fixups
 
 CONSTANT: vocab-renames {
     { "math.intervals" { "intervals" "0.99" } }
     { "math.ranges" { "ranges" "0.99" } }
-    { "asdfasdf" { "asdfasdf2" "0.99" } }
+    { "unicode.collation" { "unicode" "0.99" } }
 }
 
 CONSTANT: word-renames {
@@ -42,7 +42,8 @@ CONSTANT: word-renames {
         drop { }
     ] [
         swap '[
-            first2 dupd first2 "Fixup: %s renamed to %s in Factor %s" sprintf
+            first2 dupd first2
+            " in Factor " glue " renamed to " glue "Fixup: " prepend
             swap drop no-op-restart
             _ <restart>
         ] map

diff --git a/basis/ui/tools/debugger/debugger-docs.factor b/basis/ui/tools/debugger/debugger-docs.factor
index 180a8e0fa535741c7ed00cd94f51e614193f9945..ace26f09a642c26e3b86d7bbfc1ce6282eef687a 100644 (file)
--- a/basis/ui/tools/debugger/debugger-docs.factor
+++ b/basis/ui/tools/debugger/debugger-docs.factor
@@ -1,5 +1,4 @@
-USING: ui.gadgets help.markup help.syntax kernel quotations
-continuations debugger ui ;
+USING: continuations help.markup help.syntax ;
 IN: ui.tools.debugger
 
 HELP: <debugger>

diff --git a/basis/ui/tools/debugger/debugger.factor b/basis/ui/tools/debugger/debugger.factor
index 0b2b5e5a6c8985fcafca09f5f74b3a4c0a294c38..124fe2e998732664cdd4c5f4ed11023311fcb0ba 100644 (file)
--- a/basis/ui/tools/debugger/debugger.factor
+++ b/basis/ui/tools/debugger/debugger.factor
@@ -1,16 +1,12 @@
 ! Copyright (C) 2006, 2011 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays hashtables io kernel math models
-colors.constants namespaces sequences words continuations
-debugger prettyprint help editors fonts ui ui.commands
-ui.debugger ui.gestures ui.gadgets ui.pens.solid
-ui.gadgets.worlds ui.gadgets.packs ui.gadgets.buttons
-ui.gadgets.labels ui.gadgets.presentations ui.gadgets.panes
-ui.gadgets.viewports ui.gadgets.tables ui.theme
-ui.gadgets.tracks ui.gadgets.toolbar ui.gadgets.scrollers
-ui.gadgets.borders ui.gadgets.status-bar ui.theme.images
-ui.tools.traceback ui.tools.inspector ui.tools.browser
-ui.tools.common ;
+USING: accessors arrays continuations debugger editors kernel
+models namespaces sequences ui.commands ui.debugger ui.gadgets
+ui.gadgets.labels ui.gadgets.packs ui.gadgets.panes
+ui.gadgets.scrollers ui.gadgets.status-bar ui.gadgets.tables
+ui.gadgets.toolbar ui.gadgets.tracks ui.gadgets.worlds
+ui.gestures ui.tools.browser ui.tools.common ui.tools.inspector
+ui.tools.traceback ;
 IN: ui.tools.debugger
 
 TUPLE: debugger < track error restarts restart-hook restart-list continuation ;