From 6f4584275d0d5f4ff43add537ccb2fae4d8d0acc Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sat, 30 Jan 2021 13:17:50 -0600 Subject: [PATCH] factor: More using list cleanup --- basis/calendar/calendar.factor | 4 ++-- basis/calendar/windows/windows.factor | 5 ++--- basis/regexp/ast/ast.factor | 3 +-- basis/regexp/classes/classes.factor | 4 ++-- basis/regexp/combinators/combinators.factor | 4 ++-- basis/regexp/compiler/compiler.factor | 2 +- basis/regexp/dfa/dfa.factor | 4 ++-- basis/regexp/disambiguate/disambiguate.factor | 5 ++--- basis/regexp/minimize/minimize.factor | 6 +++--- basis/regexp/negation/negation.factor | 7 +++---- basis/regexp/nfa/nfa.factor | 4 ++-- basis/regexp/parser/parser.factor | 7 +++---- basis/regexp/regexp.factor | 9 ++++----- basis/regexp/transition-tables/transition-tables.factor | 4 ++-- core/io/encodings/ascii/ascii.factor | 4 ++-- 15 files changed, 33 insertions(+), 39 deletions(-) diff --git a/basis/calendar/calendar.factor b/basis/calendar/calendar.factor index 01811b7c97..054282d6dd 100644 --- a/basis/calendar/calendar.factor +++ b/basis/calendar/calendar.factor @@ -2,8 +2,8 @@ ! See http://factorcode.org/license.txt for BSD license. USING: accessors arrays classes.tuple combinators combinators.short-circuit kernel literals math math.functions -math.intervals math.order math.parser math.statistics sequences -slots.syntax splitting system vocabs vocabs.loader ; +math.intervals math.order math.statistics sequences slots.syntax +system vocabs vocabs.loader ; FROM: math.ranges => [a..b) ; IN: calendar diff --git a/basis/calendar/windows/windows.factor b/basis/calendar/windows/windows.factor index dea9f7257e..0fa3f2ea20 100644 --- a/basis/calendar/windows/windows.factor +++ b/basis/calendar/windows/windows.factor @@ -1,6 +1,5 @@ -USING: calendar namespaces alien.c-types system -windows.kernel32 kernel math combinators windows.errors -accessors classes.struct calendar.format math.functions ; +USING: accessors calendar classes.struct combinators kernel math +math.functions system windows.errors windows.kernel32 ; IN: calendar.windows : timestamp>SYSTEMTIME ( timestamp -- SYSTEMTIME ) diff --git a/basis/regexp/ast/ast.factor b/basis/regexp/ast/ast.factor index 91ad42dd7e..ba206c6dac 100644 --- a/basis/regexp/ast/ast.factor +++ b/basis/regexp/ast/ast.factor @@ -1,7 +1,6 @@ ! Copyright (C) 2008, 2009 Doug Coleman, Daniel Ehrenberg. ! See http://factorcode.org/license.txt for BSD license. -USING: kernel arrays accessors fry sequences regexp.classes -math.ranges math ; +USING: accessors arrays kernel math regexp.classes sequences ; IN: regexp.ast TUPLE: negation term ; diff --git a/basis/regexp/classes/classes.factor b/basis/regexp/classes/classes.factor index 780ba37f93..464f8c03de 100644 --- a/basis/regexp/classes/classes.factor +++ b/basis/regexp/classes/classes.factor @@ -1,8 +1,8 @@ ! Copyright (C) 2008, 2009 Doug Coleman, Daniel Ehrenberg. ! See http://factorcode.org/license.txt for BSD license. USING: accessors arrays assocs classes combinators -combinators.short-circuit combinators.smart fry kernel locals -math math.order sequences sets unicode unicode.data ; +combinators.short-circuit combinators.smart kernel math +math.order sequences sets unicode unicode.data ; FROM: ascii => ascii? ; IN: regexp.classes diff --git a/basis/regexp/combinators/combinators.factor b/basis/regexp/combinators/combinators.factor index 503f0bb1f0..41df5916c8 100644 --- a/basis/regexp/combinators/combinators.factor +++ b/basis/regexp/combinators/combinators.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2009 Daniel Ehrenberg ! See http://factorcode.org/license.txt for BSD license. -USING: regexp sequences kernel regexp.negation regexp.ast -accessors fry regexp.classes strings ; +USING: accessors kernel regexp regexp.ast regexp.classes +sequences strings ; IN: regexp.combinators state-numbers ( table -- assoc ) diff --git a/basis/regexp/negation/negation.factor b/basis/regexp/negation/negation.factor index 1b82b3633a..45e35df1fd 100644 --- a/basis/regexp/negation/negation.factor +++ b/basis/regexp/negation/negation.factor @@ -1,9 +1,8 @@ ! Copyright (C) 2009 Daniel Ehrenberg. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors assocs fry hashtables kernel namespaces -regexp.ast regexp.classes regexp.dfa regexp.disambiguate -regexp.minimize regexp.nfa regexp.transition-tables sequences -sets vectors ; +USING: accessors assocs hashtables kernel namespaces regexp.ast +regexp.classes regexp.dfa regexp.disambiguate regexp.minimize +regexp.nfa regexp.transition-tables sequences sets vectors ; IN: regexp.negation CONSTANT: fail-state -1 diff --git a/basis/regexp/nfa/nfa.factor b/basis/regexp/nfa/nfa.factor index ea4671e883..6912e4d94c 100644 --- a/basis/regexp/nfa/nfa.factor +++ b/basis/regexp/nfa/nfa.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2008, 2009 Doug Coleman, Daniel Ehrenberg. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors arrays assocs combinators.short-circuit fry -kernel locals math memoize namespaces regexp.ast regexp.classes +USING: accessors arrays assocs combinators.short-circuit kernel +math namespaces regexp.ast regexp.classes regexp.transition-tables sequences sets unicode vectors ; IN: regexp.nfa diff --git a/basis/regexp/parser/parser.factor b/basis/regexp/parser/parser.factor index 28b99cfb09..605688b1c6 100644 --- a/basis/regexp/parser/parser.factor +++ b/basis/regexp/parser/parser.factor @@ -1,10 +1,9 @@ ! Copyright (C) 2008, 2009 Doug Coleman, Daniel Ehrenberg. ! See http://factorcode.org/license.txt for BSD license. USING: accessors arrays assocs combinators -combinators.short-circuit interval-maps kernel locals -math.parser memoize multiline peg.ebnf regexp.ast regexp.classes -sequences sets splitting strings unicode unicode.data -unicode.script ; +combinators.short-circuit interval-maps kernel math.parser +multiline peg.ebnf regexp.ast regexp.classes sequences sets +splitting strings unicode unicode.data unicode.script ; IN: regexp.parser : allowed-char? ( ch -- ? ) diff --git a/basis/regexp/regexp.factor b/basis/regexp/regexp.factor index 1e7bbab962..b09810c916 100644 --- a/basis/regexp/regexp.factor +++ b/basis/regexp/regexp.factor @@ -1,9 +1,9 @@ ! Copyright (C) 2008, 2009 Doug Coleman, Daniel Ehrenberg. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors combinators kernel kernel.private math sequences -sequences.private strings sets assocs make lexer namespaces parser -arrays fry locals regexp.parser splitting sorting regexp.ast -regexp.negation regexp.compiler compiler.units words math.ranges ; +USING: accessors arrays compiler.units kernel kernel.private +lexer make math math.ranges namespaces regexp.ast +regexp.compiler regexp.negation regexp.parser sequences +sequences.private splitting strings vocabs.loader words ; IN: regexp TUPLE: regexp @@ -221,6 +221,5 @@ PRIVATE> SYNTAX: R/ parse-regexp ; -USE: vocabs.loader { "prettyprint" "regexp" } "regexp.prettyprint" require-when diff --git a/basis/regexp/transition-tables/transition-tables.factor b/basis/regexp/transition-tables/transition-tables.factor index 4352ba9979..b10da4a50d 100644 --- a/basis/regexp/transition-tables/transition-tables.factor +++ b/basis/regexp/transition-tables/transition-tables.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2008 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors arrays assocs fry hashtables kernel locals -regexp.classes sequences sets vectors ; +USING: accessors arrays assocs hashtables kernel regexp.classes +sequences sets vectors ; IN: regexp.transition-tables TUPLE: transition-table transitions start-state final-states ; diff --git a/core/io/encodings/ascii/ascii.factor b/core/io/encodings/ascii/ascii.factor index ddb0818c82..fde5e51ec6 100644 --- a/core/io/encodings/ascii/ascii.factor +++ b/core/io/encodings/ascii/ascii.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2008 Daniel Ehrenberg. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors byte-arrays io io.encodings -io.encodings.private kernel math sequences strings ; +USING: accessors io io.encodings io.encodings.private kernel +math sequences strings ; IN: io.encodings.ascii SINGLETON: ascii -- 2.34.1