From cce570a039b75c028a5e69533faeac056b5cdc75 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Thu, 28 Jan 2021 08:59:37 -0600 Subject: [PATCH] factor: trim using lists Searched for ``fry``, delete the imports, reload with auto-use, replace the imports --- basis/alien/arrays/arrays.factor | 2 +- basis/alien/data/data.factor | 6 +++--- basis/alien/enums/enums.factor | 3 +-- basis/alien/libraries/libraries.factor | 6 +++--- basis/alien/parser/parser.factor | 7 ++++--- basis/base64/base64.factor | 4 ++-- basis/bit-arrays/bit-arrays.factor | 4 ++-- basis/bit-sets/bit-sets.factor | 4 ++-- basis/bitstreams/bitstreams.factor | 4 ++-- basis/bootstrap/image/upload/upload.factor | 2 +- basis/cache/cache.factor | 4 ++-- basis/logging/logging.factor | 12 ++++++------ basis/math/bitwise/bitwise.factor | 5 +++-- basis/math/combinatorics/combinatorics.factor | 7 +++---- basis/math/functions/functions.factor | 4 ++-- basis/math/vectors/vectors.factor | 5 ++--- basis/mirrors/mirrors.factor | 6 +++--- basis/models/models.factor | 3 +-- basis/models/search/search.factor | 2 +- basis/opengl/opengl.factor | 6 +++--- basis/opengl/textures/textures.factor | 10 +++++----- basis/pack/pack.factor | 4 ++-- basis/peg/ebnf/ebnf.factor | 6 +++--- basis/prettyprint/backend/backend.factor | 2 +- basis/stack-checker/transforms/transforms.factor | 4 ++-- basis/strings/tables/tables.factor | 2 +- core/alien/alien-tests.factor | 2 +- core/combinators/short-circuit/short-circuit.factor | 2 +- core/generalizations/generalizations-tests.factor | 4 ++-- core/generalizations/generalizations.factor | 2 +- core/hash-sets/hash-sets-tests.factor | 2 +- core/hashtables/hashtables-tests.factor | 2 +- core/io/files/files-tests.factor | 2 +- core/locals/macros/macros.factor | 2 +- core/locals/parser/parser.factor | 2 +- core/locals/rewrite/point-free/point-free.factor | 5 ++--- core/macros/expander/expander.factor | 5 ++--- core/macros/macros.factor | 2 +- core/memoize/memoize.factor | 5 ++--- .../generalizations/generalizations-tests.factor | 4 ++-- .../sequences/generalizations/generalizations.factor | 5 ++--- core/sets/sets.factor | 2 +- 42 files changed, 83 insertions(+), 89 deletions(-) diff --git a/basis/alien/arrays/arrays.factor b/basis/alien/arrays/arrays.factor index a4a2838043..ec35625109 100644 --- a/basis/alien/arrays/arrays.factor +++ b/basis/alien/arrays/arrays.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2008, 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: accessors alien.accessors alien.c-types alien.strings -arrays compiler.units cpu.architecture fry io.encodings.binary +arrays compiler.units cpu.architecture io.encodings.binary io.encodings.utf8 kernel math sequences words ; IN: alien.arrays diff --git a/basis/alien/data/data.factor b/basis/alien/data/data.factor index 6e18c3d531..37c86bc248 100644 --- a/basis/alien/data/data.factor +++ b/basis/alien/data/data.factor @@ -2,9 +2,9 @@ ! See http://factorcode.org/license.txt for BSD license. USING: accessors alien alien.arrays alien.c-types alien.strings arrays byte-arrays combinators combinators.short-circuit -cpu.architecture fry generalizations io io.streams.memory kernel -libc locals macros math math.functions parser sequences -stack-checker.dependencies summary words ; +cpu.architecture generalizations io io.streams.memory kernel +libc math parser sequences stack-checker.dependencies summary +words ; IN: alien.data : ( value c-type -- c-ptr ) diff --git a/basis/alien/enums/enums.factor b/basis/alien/enums/enums.factor index 65ae997655..109bcae1e8 100644 --- a/basis/alien/enums/enums.factor +++ b/basis/alien/enums/enums.factor @@ -1,8 +1,7 @@ ! Copyright (C) 2010 Joe Groff, Erik Charlebois. ! See http://factorcode.org/license.txt for BSD license. USING: accessors alien.c-types arrays assocs classes.singleton -combinators delegate fry kernel macros math parser sequences -words ; +combinators delegate kernel math parser sequences words ; IN: alien.enums ( values search quot -- model ) diff --git a/basis/opengl/opengl.factor b/basis/opengl/opengl.factor index b261d59c58..170b94fa2d 100644 --- a/basis/opengl/opengl.factor +++ b/basis/opengl/opengl.factor @@ -3,9 +3,9 @@ ! Portions copyright (C) 2008 Joe Groff. ! See http://factorcode.org/license.txt for BSD license. USING: alien alien.c-types alien.data assocs colors -combinators.smart continuations fry init io kernel locals macros -math math.parser namespaces opengl.gl sequences -sequences.generalizations specialized-arrays system words ; +combinators.smart continuations init io kernel math math.parser +namespaces opengl.gl sequences sequences.generalizations +specialized-arrays system words ; FROM: alien.c-types => float ; SPECIALIZED-ARRAY: float SPECIALIZED-ARRAY: uint diff --git a/basis/opengl/textures/textures.factor b/basis/opengl/textures/textures.factor index da08270c4a..356b410493 100644 --- a/basis/opengl/textures/textures.factor +++ b/basis/opengl/textures/textures.factor @@ -1,10 +1,10 @@ ! Copyright (C) 2009, 2010 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors alien.data assocs cache colors.constants -destructors kernel opengl opengl.gl opengl.capabilities -combinators images images.tessellation grouping sequences math -math.statistics math.vectors generalizations fry arrays -namespaces system locals literals specialized-arrays ; +USING: accessors alien.data arrays assocs colors.constants +combinators destructors images images.tessellation kernel +literals math math.statistics math.vectors namespaces opengl +opengl.capabilities opengl.gl sequences specialized-arrays +system ; FROM: alien.c-types => int float ; SPECIALIZED-ARRAY: float IN: opengl.textures diff --git a/basis/pack/pack.factor b/basis/pack/pack.factor index 438b572db1..e254563458 100644 --- a/basis/pack/pack.factor +++ b/basis/pack/pack.factor @@ -1,8 +1,8 @@ ! Copyright (C) 2009 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. USING: alien.c-types ascii assocs combinators combinators.smart -endian fry io kernel macros math math.statistics math.vectors -sequences strings ; +endian io kernel math math.statistics math.vectors sequences +strings ; IN: pack GENERIC: >n-byte-array ( obj n -- byte-array ) diff --git a/basis/peg/ebnf/ebnf.factor b/basis/peg/ebnf/ebnf.factor index f28a22fa4d..859784a27e 100644 --- a/basis/peg/ebnf/ebnf.factor +++ b/basis/peg/ebnf/ebnf.factor @@ -1,9 +1,9 @@ ! Copyright (C) 2007 Chris Double. ! See http://factorcode.org/license.txt for BSD license. USING: accessors assocs combinators combinators.short-circuit -effects fry kernel make math math.parser multiline namespaces -parser peg peg.parsers quotations sequences sequences.deep -splitting stack-checker strings strings.parser summary unicode +effects kernel make math.parser multiline namespaces parser peg +peg.parsers quotations sequences sequences.deep splitting +stack-checker strings strings.parser summary unicode vocabs.parser words ; FROM: vocabs.parser => search ; FROM: peg.search => replace ; diff --git a/basis/prettyprint/backend/backend.factor b/basis/prettyprint/backend/backend.factor index d285ee337a..741ae42e7d 100644 --- a/basis/prettyprint/backend/backend.factor +++ b/basis/prettyprint/backend/backend.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: accessors arrays assocs byte-arrays byte-vectors classes classes.algebra.private classes.maybe classes.private -classes.tuple combinators continuations effects fry generic +classes.tuple combinators continuations effects generic hash-sets hashtables io.pathnames io.styles kernel lists make math math.order math.parser namespaces prettyprint.config prettyprint.custom prettyprint.sections prettyprint.stylesheet diff --git a/basis/stack-checker/transforms/transforms.factor b/basis/stack-checker/transforms/transforms.factor index b5d087098f..c7e65ce4f5 100644 --- a/basis/stack-checker/transforms/transforms.factor +++ b/basis/stack-checker/transforms/transforms.factor @@ -1,8 +1,8 @@ ! Copyright (C) 2007, 2009 Slava Pestov, Daniel Ehrenberg. ! See http://factorcode.org/license.txt for BSD license. USING: accessors classes.tuple classes.tuple.private combinators -combinators.short-circuit continuations fry generic kernel -locals namespaces quotations sequences stack-checker.backend +combinators.short-circuit continuations generic kernel +namespaces quotations sequences stack-checker.backend stack-checker.dependencies stack-checker.errors stack-checker.recursive-state stack-checker.values stack-checker.visitor words ; diff --git a/basis/strings/tables/tables.factor b/basis/strings/tables/tables.factor index aa914885ef..8fe5710102 100644 --- a/basis/strings/tables/tables.factor +++ b/basis/strings/tables/tables.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2009, 2010 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: kernel sequences fry math.order math.ranges splitting ; +USING: kernel sequences splitting ; IN: strings.tables assoc ] unit-test diff --git a/core/io/files/files-tests.factor b/core/io/files/files-tests.factor index 6893424f17..f87cd6eb82 100644 --- a/core/io/files/files-tests.factor +++ b/core/io/files/files-tests.factor @@ -1,5 +1,5 @@ USING: alien alien.c-types alien.data arrays classes.struct -compiler.units continuations destructors fry generic.single io +compiler.units continuations destructors generic.single io io.backend io.directories io.encodings io.encodings.ascii io.encodings.binary io.encodings.latin1 io.encodings.string io.encodings.utf16 io.encodings.utf8 io.files io.files.private diff --git a/core/locals/macros/macros.factor b/core/locals/macros/macros.factor index 1f9525e5eb..4b53cff264 100644 --- a/core/locals/macros/macros.factor +++ b/core/locals/macros/macros.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2007, 2009 Slava Pestov, Eduardo Cavazos. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors assocs kernel locals.types macros.expander fry ; +USING: accessors kernel locals.types macros.expander ; IN: locals.macros M: lambda expand-macros clone [ expand-macros ] change-body ; diff --git a/core/locals/parser/parser.factor b/core/locals/parser/parser.factor index 84e02fdf5f..45dfaa815f 100644 --- a/core/locals/parser/parser.factor +++ b/core/locals/parser/parser.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2007, 2009 Slava Pestov, Eduardo Cavazos. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors arrays assocs effects.parser fry generic.parser +USING: accessors arrays assocs effects.parser generic.parser kernel lexer locals.errors locals.rewrite.closures locals.types make namespaces parser quotations sequences splitting vocabs.parser words ; diff --git a/core/locals/rewrite/point-free/point-free.factor b/core/locals/rewrite/point-free/point-free.factor index 283a3bbd5a..f9e026d262 100644 --- a/core/locals/rewrite/point-free/point-free.factor +++ b/core/locals/rewrite/point-free/point-free.factor @@ -1,8 +1,7 @@ ! Copyright (C) 2007, 2008 Slava Pestov, Eduardo Cavazos. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors arrays fry kernel math quotations sequences -words combinators make locals.backend locals.types -locals.errors ; +USING: accessors arrays combinators kernel locals.backend +locals.errors locals.types make math quotations sequences words ; IN: locals.rewrite.point-free ! Step 3: rewrite locals usage within a single quotation into diff --git a/core/macros/expander/expander.factor b/core/macros/expander/expander.factor index 8ab0f5a213..69f7c5c8c7 100644 --- a/core/macros/expander/expander.factor +++ b/core/macros/expander/expander.factor @@ -1,9 +1,8 @@ ! Copyright (C) 2008, 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: accessors arrays combinators combinators.short-circuit -continuations effects fry generalizations kernel make math -namespaces quotations sequences sequences.private vectors words -; +continuations effects generalizations kernel make math +namespaces quotations sequences sequences.private vectors words ; IN: macros.expander GENERIC: expand-macros ( quot -- quot' ) diff --git a/core/macros/macros.factor b/core/macros/macros.factor index 2d0424415c..435edd92d5 100644 --- a/core/macros/macros.factor +++ b/core/macros/macros.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2007, 2010 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: accessors combinators compiler.units definitions effects -effects.parser fry kernel memoize words ; +kernel memoize words ; IN: macros