From ea1e5c66766b6b22f0e071167f52f3560ad6a606 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Sat, 1 Jan 2022 15:52:34 -0800 Subject: [PATCH] colors: merge colors.constants and colors.hex. --- basis/colors/cmyk/cmyk-tests.factor | 4 +- basis/colors/colors-docs.factor | 48 ++++++++++++++- basis/colors/colors-tests.factor | 20 +++++++ basis/colors/colors.factor | 57 +++++++++++++++++- basis/colors/constants/authors.txt | 1 - basis/colors/constants/constants-docs.factor | 33 ----------- basis/colors/constants/constants-tests.factor | 5 -- basis/colors/constants/constants.factor | 43 -------------- .../constants/prettyprint/prettyprint.factor | 7 --- basis/colors/constants/summary.txt | 1 - basis/colors/constants/tags.txt | 1 - .../colors/{constants => }/factor-colors.txt | 0 basis/colors/hex/authors.txt | 1 - basis/colors/hex/hex-docs.factor | 38 ------------ basis/colors/hex/hex-tests.factor | 19 ------ basis/colors/hex/hex.factor | 30 ---------- .../colors/hex/prettyprint/prettyprint.factor | 6 -- basis/colors/hex/summary.txt | 1 - basis/colors/hex/tags.txt | 1 - basis/colors/hsl/hsl-tests.factor | 4 +- basis/colors/mix/mix-tests.factor | 30 ++++++++-- basis/colors/prettyprint/prettyprint.factor | 4 ++ basis/colors/{constants => }/rgb.txt | 0 basis/colors/ryb/ryb-tests.factor | 4 +- .../{constants => }/solarized-colors.txt | 0 basis/colors/yiq/yiq-tests.factor | 4 +- basis/colors/yuv/yuv-tests.factor | 4 +- basis/core-text/core-text-tests.factor | 6 +- basis/fonts/fonts.factor | 3 +- basis/help/stylesheet/stylesheet.factor | 4 +- basis/help/tips/tips.factor | 2 +- basis/listener/listener.factor | 2 +- basis/opengl/textures/textures.factor | 6 +- basis/prettyprint/prettyprint.factor | 2 +- .../prettyprint/stylesheet/stylesheet.factor | 6 +- basis/tools/completion/completion.factor | 2 +- basis/ui/gadgets/canvas/canvas.factor | 6 +- basis/ui/gadgets/debug/debug.factor | 2 +- basis/ui/gadgets/editors/editors.factor | 14 ++--- basis/ui/gadgets/labeled/labeled-tests.factor | 4 +- basis/ui/gadgets/labels/labels.factor | 2 +- basis/ui/gadgets/status-bar/status-bar.factor | 2 +- basis/ui/gadgets/tabbed/tabbed.factor | 8 +-- basis/ui/gadgets/tables/tables-docs.factor | 2 +- basis/ui/pens/caching/caching-tests.factor | 2 +- basis/ui/pens/gradient/gradient-tests.factor | 2 +- basis/ui/theme/base16/base16.factor | 4 +- basis/ui/theme/theme.factor | 58 +++++++++---------- basis/ui/tools/error-list/error-list.factor | 8 ++- .../listener/completion/completion.factor | 24 ++++---- basis/vocabs/prettyprint/prettyprint.factor | 2 +- basis/windows/uniscribe/uniscribe.factor | 13 +++-- basis/xmode/highlight/highlight.factor | 42 +++++++------- extra/L-system/L-system.factor | 10 ++-- extra/boids/boids.factor | 10 ++-- extra/color-table/color-table.factor | 18 +++--- extra/colors/flex-hex/flex-hex.factor | 4 +- extra/game-of-life/game-of-life.factor | 4 +- extra/game/debug/debug.factor | 10 ++-- extra/game/debug/tests/tests.factor | 10 ++-- .../input/demos/joysticks/joysticks.factor | 11 ++-- extra/gemini/gemini.factor | 2 +- extra/gesture-logger/gesture-logger.factor | 2 +- extra/gml/ui/ui.factor | 2 +- extra/google/charts/charts-tests.factor | 4 +- extra/google/charts/charts.factor | 6 +- extra/google/search/search.factor | 4 +- extra/gopher/gopher.factor | 13 ++--- extra/hacker-news/hacker-news.factor | 18 +++--- .../io/streams/256color/256color-tests.factor | 2 +- extra/jamshred/player/player.factor | 10 ++-- extra/merger/merger.factor | 8 +-- extra/minesweeper/minesweeper.factor | 15 +++-- extra/pdf/canvas/canvas.factor | 4 +- extra/pong/pong.factor | 2 +- extra/processing/shapes/shapes.factor | 8 ++- .../readline-listener.factor | 4 +- extra/reddit/reddit.factor | 11 ++-- .../animate-pendulum/animate-pendulum.factor | 8 ++- extra/rosetta-code/metronome/metronome.factor | 2 +- extra/smalltalk/listener/listener.factor | 2 +- extra/splitting/extras/extras.factor | 4 +- extra/tetris/board/board-tests.factor | 2 +- extra/tetris/gl/gl.factor | 6 +- extra/tetris/tetromino/tetromino.factor | 4 +- extra/trails/trails.factor | 7 +-- extra/ui/gadgets/charts/axes/axes.factor | 2 +- extra/ui/gadgets/charts/demos/demos.factor | 2 +- extra/ui/gadgets/charts/lines/lines.factor | 2 +- extra/ui/render/test/test.factor | 2 +- extra/wikipedia/wikipedia.factor | 6 +- extra/wolfram-alpha/wolfram-alpha.factor | 6 +- misc/fuel/strange-syntax.factor | 7 +-- 93 files changed, 409 insertions(+), 439 deletions(-) create mode 100644 basis/colors/colors-tests.factor delete mode 100644 basis/colors/constants/authors.txt delete mode 100644 basis/colors/constants/constants-docs.factor delete mode 100644 basis/colors/constants/constants-tests.factor delete mode 100644 basis/colors/constants/constants.factor delete mode 100644 basis/colors/constants/prettyprint/prettyprint.factor delete mode 100644 basis/colors/constants/summary.txt delete mode 100644 basis/colors/constants/tags.txt rename basis/colors/{constants => }/factor-colors.txt (100%) delete mode 100644 basis/colors/hex/authors.txt delete mode 100644 basis/colors/hex/hex-docs.factor delete mode 100644 basis/colors/hex/hex-tests.factor delete mode 100644 basis/colors/hex/hex.factor delete mode 100644 basis/colors/hex/prettyprint/prettyprint.factor delete mode 100644 basis/colors/hex/summary.txt delete mode 100644 basis/colors/hex/tags.txt create mode 100644 basis/colors/prettyprint/prettyprint.factor rename basis/colors/{constants => }/rgb.txt (100%) rename basis/colors/{constants => }/solarized-colors.txt (100%) diff --git a/basis/colors/cmyk/cmyk-tests.factor b/basis/colors/cmyk/cmyk-tests.factor index 81bb8224d8..098e104bee 100644 --- a/basis/colors/cmyk/cmyk-tests.factor +++ b/basis/colors/cmyk/cmyk-tests.factor @@ -8,9 +8,7 @@ ranges sequences tools.test ; 0.0 1.0 0.1 [| r | 0.0 1.0 0.1 [| g | 0.0 1.0 0.1 [| b | - r g b 1.0 dup >cmyka >rgba - [ >rgba-components 4array ] bi@ - [ 0.00000001 ~ ] 2all? + r g b 1.0 dup >cmyka color= ] all? ] all? ] all? diff --git a/basis/colors/colors-docs.factor b/basis/colors/colors-docs.factor index 95c9782aa7..dea28c4332 100644 --- a/basis/colors/colors-docs.factor +++ b/basis/colors/colors-docs.factor @@ -1,5 +1,5 @@ +USING: accessors help.markup help.syntax strings ; IN: colors -USING: accessors help.markup help.syntax ; HELP: color { $class-description "The class of colors. Implementations include " { $link rgba } ", " { $vocab-link "colors.gray" } " and " { $vocab-link "colors.hsv" } "." } ; @@ -11,6 +11,43 @@ HELP: >rgba { $values { "color" color } { "rgba" rgba } } { $contract "Converts a color to an RGBA color." } ; +HELP: named-color +{ $values { "name" string } { "color" color } } +{ $description "Outputs a named color from the color database." } +{ $notes "In most cases, " { $link POSTPONE: COLOR: } " should be used instead." } +{ $errors "Throws an error if the color is not listed in " { $snippet "rgb.txt" } ", " { $snippet "factor-colors.txt" } " or " { $snippet "solarized-colors.txt" } "." } ; + +HELP: named-colors +{ $values { "keys" "a sequence of strings" } } +{ $description "Outputs a sequence of all colors in the " { $snippet "rgb.txt" } " database." } ; + +HELP: parse-color +{ $values { "str" string } { "color" color } } +{ $description "Parses a string as a named value or as a hexadecimal value." } +{ $examples + { $example + "USING: colors prettyprint ;" + "COLOR: sky-blue ." + "COLOR: sky-blue" + } + { $example + "USING: colors prettyprint ;" + "COLOR: #336699 ." + "COLOR: #336699" + } +} ; + +HELP: COLOR: +{ $syntax "COLOR: string" } +{ $description "Parses as a " { $link color } " object using " { $link parse-color } "." } +{ $errors "Throws an error if the color is not able to be parsed." } +{ $examples + { $code + "USING: colors io.styles ;" + "\"Hello!\" { { foreground COLOR: cyan } } format nl" + } +} ; + ARTICLE: "colors.protocol" "Color protocol" "Abstract superclass for colors:" { $subsections color } @@ -20,6 +57,15 @@ $nl $nl "Overriding the accessors is purely an optimization, since the default implementations call " { $link >rgba } " and then extract the appropriate component of the result." ; +ARTICLE: "colors.constants" "Standard color database" +"The " { $vocab-link "colors" } " vocabulary bundles the X11 " { $snippet "rgb.txt" } " database and Factor's " { $snippet "factor-colors.txt" } " theme database to provide words for looking up color values by name." +{ $subsections + named-color + named-colors + parse-color + POSTPONE: COLOR: +} ; + ARTICLE: "colors" "Colors" "The " { $vocab-link "colors" } " vocabulary defines a protocol for colors, with a concrete implementation for RGBA colors. This vocabulary is used by " { $vocab-link "io.styles" } ", " { $vocab-link "ui" } " and other vocabularies, but it is independent of them." $nl diff --git a/basis/colors/colors-tests.factor b/basis/colors/colors-tests.factor new file mode 100644 index 0000000000..e8e1763d3b --- /dev/null +++ b/basis/colors/colors-tests.factor @@ -0,0 +1,20 @@ +! Copyright (C) 2009 Slava Pestov. +! See http://factorcode.org/license.txt for BSD license. +USING: accessors colors colors.private literals tools.test ; + +{ t } [ COLOR: light-green value>> rgba? ] unit-test + +{ T{ rgba f 0.0 0.0 0.0 1.0 } } [ COLOR: #000000 value>> ] unit-test +{ T{ rgba f 1.0 1.0 1.0 1.0 } } [ COLOR: #FFFFFF value>> ] unit-test +${ "abcdef" hex>rgba } [ COLOR: #abcdef value>> ] unit-test +${ "ABCDEF" hex>rgba } [ COLOR: #abcdef value>> ] unit-test + +{ T{ rgba f 0.0 0.0 0.0 0.0 } } [ COLOR: #00000000 value>> ] unit-test +{ T{ rgba f 1.0 0.0 0.0 0.0 } } [ COLOR: #FF000000 value>> ] unit-test +{ T{ rgba f 1.0 1.0 0.0 0.0 } } [ COLOR: #FFFF0000 value>> ] unit-test +{ T{ rgba f 1.0 1.0 1.0 0.0 } } [ COLOR: #FFFFFF00 value>> ] unit-test +{ T{ rgba f 1.0 1.0 1.0 1.0 } } [ COLOR: #FFFFFFFF value>> ] unit-test + +${ "cafebabe" hex>rgba } [ COLOR: #cafebabe value>> ] unit-test +${ "112233" hex>rgba } [ COLOR: #112233 value>> ] unit-test +${ "11223344" hex>rgba } [ COLOR: #11223344 value>> ] unit-test diff --git a/basis/colors/colors.factor b/basis/colors/colors.factor index 9e5fef1134..a0acb251a3 100644 --- a/basis/colors/colors.factor +++ b/basis/colors/colors.factor @@ -1,9 +1,12 @@ ! Copyright (C) 2003, 2009 Slava Pestov. ! Copyright (C) 2008 Eduardo Cavazos. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors combinators kernel math ; +USING: accessors ascii arrays assocs combinators grouping +io.encodings.utf8 io.files kernel lexer math math.functions +math.parser sequences splitting vocabs.loader ; IN: colors +! FIXME: replace with MIXIN: color INSTANCE: rgba color TUPLE: color ; TUPLE: rgba < color @@ -31,3 +34,55 @@ CONSTANT: transparent T{ rgba f 0.0 0.0 0.0 0.0 } : inverse-color ( color -- color' ) >rgba-components [ [ 1.0 swap - ] tri@ ] dip ; + +: color= ( color1 color2 -- ? ) + [ >rgba-components 4array ] bi@ [ 0.00000001 ~ ] 2all? ; + +number 255 /f ] tri@ 1.0 ] dip + [ ascii:blank? ] trim-head H{ { CHAR: \s CHAR: - } } substitute swap ; + +: parse-colors ( lines -- assoc ) + [ "!" head? ] reject + [ 11 cut [ " \t" split harvest ] dip suffix ] map + [ parse-color ] H{ } map>assoc ; + +MEMO: colors ( -- assoc ) + "resource:basis/colors/rgb.txt" + "resource:basis/colors/factor-colors.txt" + "resource:basis/colors/solarized-colors.txt" + [ utf8 file-lines parse-colors ] tri@ assoc-union assoc-union ; + +ERROR: invalid-hex-color hex ; + +: hex>rgba ( hex -- rgba ) + dup length { + { 6 [ 2 group [ hex> 255 /f ] map first3 1.0 ] } + { 8 [ 2 group [ hex> 255 /f ] map first4 ] } + { 3 [ [ digit> 15 /f ] { } map-as first3 1.0 ] } + { 4 [ [ digit> 15 /f ] { } map-as first4 ] } + [ drop invalid-hex-color ] + } case ; + +PRIVATE> + +: named-colors ( -- keys ) colors keys ; + +ERROR: no-such-color name ; + +: named-color ( name -- color ) + dup colors at [ ] [ no-such-color ] ?if ; + +: parse-color ( str -- color ) + "#" ?head [ hex>rgba ] [ named-color ] if ; + +TUPLE: parsed-color < color string value ; + +M: parsed-color >rgba value>> >rgba ; + +SYNTAX: COLOR: scan-token dup parse-color parsed-color boa suffix! ; + +{ "colors" "prettyprint" } "colors.prettyprint" require-when diff --git a/basis/colors/constants/authors.txt b/basis/colors/constants/authors.txt deleted file mode 100644 index 1901f27a24..0000000000 --- a/basis/colors/constants/authors.txt +++ /dev/null @@ -1 +0,0 @@ -Slava Pestov diff --git a/basis/colors/constants/constants-docs.factor b/basis/colors/constants/constants-docs.factor deleted file mode 100644 index 14a22d9809..0000000000 --- a/basis/colors/constants/constants-docs.factor +++ /dev/null @@ -1,33 +0,0 @@ -IN: colors.constants -USING: help.markup help.syntax strings colors ; - -HELP: lookup-color -{ $values { "name" string } { "color" color } } -{ $description "Outputs a named color from the color database." } -{ $notes "In most cases, " { $link POSTPONE: COLOR: } " should be used instead." } -{ $errors "Throws an error if the color is not listed in " { $snippet "rgb.txt" } ", " { $snippet "factor-colors.txt" } " or " { $snippet "solarized-colors.txt" } "." } ; - -HELP: named-colors -{ $values { "keys" "a sequence of strings" } } -{ $description "Outputs a sequence of all colors in the " { $snippet "rgb.txt" } " database." } ; - -HELP: COLOR: -{ $syntax "COLOR: name" } -{ $description "Parses as a " { $link color } " object with the given name." } -{ $errors "Throws an error if the color is not listed in " { $snippet "rgb.txt" } "." } -{ $examples - { $code - "USING: colors.constants io.styles ;" - "\"Hello!\" { { foreground COLOR: cyan } } format nl" - } -} ; - -ARTICLE: "colors.constants" "Standard color database" -"The " { $vocab-link "colors.constants" } " vocabulary bundles the X11 " { $snippet "rgb.txt" } " database and Factor's " { $snippet "factor-colors.txt" } " theme database to provide words for looking up color values by name." -{ $subsections - lookup-color - named-colors - POSTPONE: COLOR: -} ; - -ABOUT: "colors.constants" diff --git a/basis/colors/constants/constants-tests.factor b/basis/colors/constants/constants-tests.factor deleted file mode 100644 index 08d4d55e9c..0000000000 --- a/basis/colors/constants/constants-tests.factor +++ /dev/null @@ -1,5 +0,0 @@ -! Copyright (C) 2009 Slava Pestov. -! See http://factorcode.org/license.txt for BSD license. -USING: colors colors.constants tools.test ; - -{ t } [ COLOR: light-green value>> rgba? ] unit-test diff --git a/basis/colors/constants/constants.factor b/basis/colors/constants/constants.factor deleted file mode 100644 index 2d64aa8c77..0000000000 --- a/basis/colors/constants/constants.factor +++ /dev/null @@ -1,43 +0,0 @@ -! Copyright (C) 2009 Slava Pestov. -! See http://factorcode.org/license.txt for BSD license. - -USING: accessors ascii assocs colors io.encodings.utf8 io.files -kernel lexer math math.parser sequences splitting vocabs.loader -; - -IN: colors.constants - -number 255 /f ] tri@ 1.0 ] dip - [ ascii:blank? ] trim-head H{ { CHAR: \s CHAR: - } } substitute swap ; - -: parse-colors ( lines -- assoc ) - [ "!" head? ] reject - [ 11 cut [ " \t" split harvest ] dip suffix ] map - [ parse-color ] H{ } map>assoc ; - -MEMO: colors ( -- assoc ) - "resource:basis/colors/constants/rgb.txt" - "resource:basis/colors/constants/factor-colors.txt" - "resource:basis/colors/constants/solarized-colors.txt" - [ utf8 file-lines parse-colors ] tri@ assoc-union assoc-union ; - -PRIVATE> - -: named-colors ( -- keys ) colors keys ; - -ERROR: no-such-color name ; - -: lookup-color ( name -- color ) - dup colors at [ ] [ no-such-color ] ?if ; - -TUPLE: named-color < color name value ; - -M: named-color >rgba value>> >rgba ; - -SYNTAX: COLOR: scan-token dup lookup-color named-color boa suffix! ; - -{ "colors.constants" "prettyprint" } "colors.constants.prettyprint" require-when diff --git a/basis/colors/constants/prettyprint/prettyprint.factor b/basis/colors/constants/prettyprint/prettyprint.factor deleted file mode 100644 index 65e61af1b7..0000000000 --- a/basis/colors/constants/prettyprint/prettyprint.factor +++ /dev/null @@ -1,7 +0,0 @@ -USING: accessors colors.constants prettyprint.custom -prettyprint.backend prettyprint.sections ; - -IN: colors.constants.prettyprint - -M: named-color pprint* \ COLOR: [ name>> text ] pprint-prefix ; - diff --git a/basis/colors/constants/summary.txt b/basis/colors/constants/summary.txt deleted file mode 100644 index 5551048750..0000000000 --- a/basis/colors/constants/summary.txt +++ /dev/null @@ -1 +0,0 @@ -A utility to look up colors in the X11 rgb.txt color database diff --git a/basis/colors/constants/tags.txt b/basis/colors/constants/tags.txt deleted file mode 100644 index 496c1f77f4..0000000000 --- a/basis/colors/constants/tags.txt +++ /dev/null @@ -1 +0,0 @@ -colors diff --git a/basis/colors/constants/factor-colors.txt b/basis/colors/factor-colors.txt similarity index 100% rename from basis/colors/constants/factor-colors.txt rename to basis/colors/factor-colors.txt diff --git a/basis/colors/hex/authors.txt b/basis/colors/hex/authors.txt deleted file mode 100644 index e091bb8164..0000000000 --- a/basis/colors/hex/authors.txt +++ /dev/null @@ -1 +0,0 @@ -John Benediktsson diff --git a/basis/colors/hex/hex-docs.factor b/basis/colors/hex/hex-docs.factor deleted file mode 100644 index 9f67875da2..0000000000 --- a/basis/colors/hex/hex-docs.factor +++ /dev/null @@ -1,38 +0,0 @@ -! Copyright (C) 2010 John Benediktsson -! See http://factorcode.org/license.txt for BSD license - -USING: colors help.markup help.syntax strings ; - -IN: colors.hex - -HELP: hex>rgba -{ $values { "hex" string } { "rgba" color } } -{ $description "Converts a hexadecimal string value into a " { $link color } "." } -; - -HELP: rgba>hex -{ $values { "rgba" color } { "hex" string } } -{ $description "Converts a " { $link color } " into a hexadecimal string value." } -; - -HELP: HEXCOLOR: -{ $syntax "HEXCOLOR: value" } -{ $description "Parses as a " { $link color } " object with the given hexadecimal value." } -{ $examples - { $code - "USING: colors.hex io.styles ;" - "\"Hello!\" { { foreground HEXCOLOR: 336699 } } format nl" - } -} ; - -ARTICLE: "colors.hex" "HEX colors" -"The " { $vocab-link "colors.hex" } " vocabulary implements colors specified " -"by their hexadecimal value." -{ $subsections - hex>rgba - rgba>hex - POSTPONE: HEXCOLOR: -} -{ $see-also "colors" } ; - -ABOUT: "colors.hex" diff --git a/basis/colors/hex/hex-tests.factor b/basis/colors/hex/hex-tests.factor deleted file mode 100644 index bd79f3e174..0000000000 --- a/basis/colors/hex/hex-tests.factor +++ /dev/null @@ -1,19 +0,0 @@ -! Copyright (C) 2010 John Benediktsson -! See http://factorcode.org/license.txt for BSD license -USING: colors colors.hex tools.test ; - -{ HEXCOLOR: 000000 } [ 0.0 0.0 0.0 1.0 ] unit-test -{ HEXCOLOR: FFFFFF } [ 1.0 1.0 1.0 1.0 ] unit-test -{ HEXCOLOR: abcdef } [ "abcdef" hex>rgba ] unit-test -{ HEXCOLOR: abcdef } [ "ABCDEF" hex>rgba ] unit-test -{ "ABCDEF" } [ HEXCOLOR: abcdef rgba>hex ] unit-test - -{ HEXCOLOR: 00000000 } [ 0.0 0.0 0.0 0.0 ] unit-test -{ HEXCOLOR: FF000000 } [ 1.0 0.0 0.0 0.0 ] unit-test -{ HEXCOLOR: FFFF0000 } [ 1.0 1.0 0.0 0.0 ] unit-test -{ HEXCOLOR: FFFFFF00 } [ 1.0 1.0 1.0 0.0 ] unit-test -{ HEXCOLOR: FFFFFFFF } [ 1.0 1.0 1.0 1.0 ] unit-test - -{ HEXCOLOR: cafebabe } [ "cafebabe" hex>rgba ] unit-test -{ HEXCOLOR: 112233 } [ "123" hex>rgba ] unit-test -{ HEXCOLOR: 11223344 } [ "1234" hex>rgba ] unit-test diff --git a/basis/colors/hex/hex.factor b/basis/colors/hex/hex.factor deleted file mode 100644 index af80ebb955..0000000000 --- a/basis/colors/hex/hex.factor +++ /dev/null @@ -1,30 +0,0 @@ -! Copyright (C) 2010 John Benediktsson -! See http://factorcode.org/license.txt for BSD license - -USING: accessors colors combinators formatting grouping kernel -lexer math math.parser sequences vocabs.loader ; - -IN: colors.hex - -ERROR: invalid-hex-color hex ; - -: hex>rgba ( hex -- rgba ) - dup length { - { 6 [ 2 group [ hex> 255 /f ] map first3 1.0 ] } - { 8 [ 2 group [ hex> 255 /f ] map first4 ] } - { 3 [ [ digit> 15 /f ] { } map-as first3 1.0 ] } - { 4 [ [ digit> 15 /f ] { } map-as first4 ] } - [ drop invalid-hex-color ] - } case ; - -: rgba>hex ( rgba -- hex ) - [ red>> ] [ green>> ] [ blue>> ] tri - [ 255 * >integer ] tri@ "%02X%02X%02X" sprintf ; - -TUPLE: hex-color < color hex value ; - -M: hex-color >rgba value>> >rgba ; - -SYNTAX: HEXCOLOR: scan-token dup hex>rgba hex-color boa suffix! ; - -{ "colors.hex" "prettyprint" } "colors.hex.prettyprint" require-when diff --git a/basis/colors/hex/prettyprint/prettyprint.factor b/basis/colors/hex/prettyprint/prettyprint.factor deleted file mode 100644 index f100ae2974..0000000000 --- a/basis/colors/hex/prettyprint/prettyprint.factor +++ /dev/null @@ -1,6 +0,0 @@ -USING: accessors colors.hex prettyprint.custom -prettyprint.backend prettyprint.sections ; - -IN: colors.hex.prettyprint - -M: hex-color pprint* \ HEXCOLOR: [ hex>> text ] pprint-prefix ; diff --git a/basis/colors/hex/summary.txt b/basis/colors/hex/summary.txt deleted file mode 100644 index 37b6abaac4..0000000000 --- a/basis/colors/hex/summary.txt +++ /dev/null @@ -1 +0,0 @@ -Hexadecimal colors diff --git a/basis/colors/hex/tags.txt b/basis/colors/hex/tags.txt deleted file mode 100644 index 496c1f77f4..0000000000 --- a/basis/colors/hex/tags.txt +++ /dev/null @@ -1 +0,0 @@ -colors diff --git a/basis/colors/hsl/hsl-tests.factor b/basis/colors/hsl/hsl-tests.factor index 07372ac33a..6ca0a5a75a 100644 --- a/basis/colors/hsl/hsl-tests.factor +++ b/basis/colors/hsl/hsl-tests.factor @@ -8,9 +8,7 @@ ranges sequences tools.test ; 0.0 1.0 0.1 [| r | 0.0 1.0 0.1 [| g | 0.0 1.0 0.1 [| b | - r g b 1.0 dup >hsla >rgba - [ >rgba-components 4array ] bi@ - [ 0.00000001 ~ ] 2all? + r g b 1.0 dup >hsla color= ] all? ] all? ] all? diff --git a/basis/colors/mix/mix-tests.factor b/basis/colors/mix/mix-tests.factor index ccddab02dd..34e4702eec 100644 --- a/basis/colors/mix/mix-tests.factor +++ b/basis/colors/mix/mix-tests.factor @@ -1,11 +1,29 @@ -USING: colors.constants colors.mix kernel tools.test ; +USING: colors colors.mix kernel tools.test ; -{ COLOR: blue } [ COLOR: blue COLOR: red 0.0 linear-gradient ] unit-test -{ COLOR: red } [ COLOR: blue COLOR: red 1.0 linear-gradient ] unit-test +{ t } [ + COLOR: blue COLOR: red 0.0 linear-gradient + COLOR: blue color= +] unit-test -{ COLOR: blue } [ { COLOR: blue COLOR: red COLOR: green } 0.0 sample-linear-gradient ] unit-test -{ COLOR: red } [ { COLOR: blue COLOR: red COLOR: green } 0.5 sample-linear-gradient ] unit-test -{ COLOR: green } [ { COLOR: blue COLOR: red COLOR: green } 1.0 sample-linear-gradient ] unit-test +{ t } [ + COLOR: blue COLOR: red 1.0 linear-gradient + COLOR: red color= +] unit-test + +{ t } [ + { COLOR: blue COLOR: red COLOR: green } 0.0 sample-linear-gradient + COLOR: blue color= +] unit-test + +{ t } [ + { COLOR: blue COLOR: red COLOR: green } 0.5 sample-linear-gradient + COLOR: red color= +] unit-test + +{ t } [ + { COLOR: blue COLOR: red COLOR: green } 1.0 sample-linear-gradient + COLOR: green color= +] unit-test { t } [ { COLOR: blue COLOR: red } 0.5 sample-linear-gradient diff --git a/basis/colors/prettyprint/prettyprint.factor b/basis/colors/prettyprint/prettyprint.factor new file mode 100644 index 0000000000..b3f87c6823 --- /dev/null +++ b/basis/colors/prettyprint/prettyprint.factor @@ -0,0 +1,4 @@ +USING: accessors colors prettyprint.custom prettyprint.backend +prettyprint.sections ; + +M: parsed-color pprint* \ COLOR: [ string>> text ] pprint-prefix ; diff --git a/basis/colors/constants/rgb.txt b/basis/colors/rgb.txt similarity index 100% rename from basis/colors/constants/rgb.txt rename to basis/colors/rgb.txt diff --git a/basis/colors/ryb/ryb-tests.factor b/basis/colors/ryb/ryb-tests.factor index c798ed8d3d..6a5bfb698c 100644 --- a/basis/colors/ryb/ryb-tests.factor +++ b/basis/colors/ryb/ryb-tests.factor @@ -8,9 +8,7 @@ ranges sequences tools.test ; 0.0 1.0 0.1 [| r | 0.0 1.0 0.1 [| g | 0.0 1.0 0.1 [| b | - r g b 1.0 dup >ryba >rgba - [ >rgba-components 4array ] bi@ - [ 0.00000001 ~ ] 2all? + r g b 1.0 dup >ryba color= ] all? ] all? ] all? diff --git a/basis/colors/constants/solarized-colors.txt b/basis/colors/solarized-colors.txt similarity index 100% rename from basis/colors/constants/solarized-colors.txt rename to basis/colors/solarized-colors.txt diff --git a/basis/colors/yiq/yiq-tests.factor b/basis/colors/yiq/yiq-tests.factor index 63abda1708..543e41280f 100644 --- a/basis/colors/yiq/yiq-tests.factor +++ b/basis/colors/yiq/yiq-tests.factor @@ -8,9 +8,7 @@ ranges sequences tools.test ; 0.0 1.0 0.1 [| r | 0.0 1.0 0.1 [| g | 0.0 1.0 0.1 [| b | - r g b 1.0 dup >yiqa >rgba - [ >rgba-components 4array ] bi@ - [ 0.00000001 ~ ] 2all? + r g b 1.0 dup >yiqa color= ] all? ] all? ] all? diff --git a/basis/colors/yuv/yuv-tests.factor b/basis/colors/yuv/yuv-tests.factor index cab48d6a05..457f3f870e 100644 --- a/basis/colors/yuv/yuv-tests.factor +++ b/basis/colors/yuv/yuv-tests.factor @@ -8,9 +8,7 @@ ranges sequences tools.test ; 0.0 1.0 0.1 [| r | 0.0 1.0 0.1 [| g | 0.0 1.0 0.1 [| b | - r g b 1.0 dup >yuva >rgba - [ >rgba-components 4array ] bi@ - [ 0.00000001 ~ ] 2all? + r g b 1.0 dup >yuva color= ] all? ] all? ] all? diff --git a/basis/core-text/core-text-tests.factor b/basis/core-text/core-text-tests.factor index e694282faa..e5b0204005 100644 --- a/basis/core-text/core-text-tests.factor +++ b/basis/core-text/core-text-tests.factor @@ -1,9 +1,9 @@ ! Copyright (C) 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: tools.test core-text core-text.fonts core-foundation -core-foundation.dictionaries destructors arrays kernel generalizations -locals math accessors core-foundation.utilities combinators hashtables colors -colors.constants ; +core-foundation.dictionaries destructors arrays kernel +generalizations locals math accessors core-foundation.utilities +combinators hashtables colors ; IN: core-text.tests : test-font ( name -- font ) diff --git a/basis/fonts/fonts.factor b/basis/fonts/fonts.factor index d2f096d774..142dc2c19f 100644 --- a/basis/fonts/fonts.factor +++ b/basis/fonts/fonts.factor @@ -1,7 +1,6 @@ ! Copyright (C) 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors colors.constants combinators kernel math -namespaces ; +USING: accessors colors combinators kernel math namespaces ; IN: fonts CONSTANT: default-serif-font-name "serif" diff --git a/basis/help/stylesheet/stylesheet.factor b/basis/help/stylesheet/stylesheet.factor index 71b9461a82..1d6905ec9c 100644 --- a/basis/help/stylesheet/stylesheet.factor +++ b/basis/help/stylesheet/stylesheet.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2005, 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: assocs colors.constants fonts fry io.styles kernel -literals math math.order namespaces sequences ui.theme ; +USING: assocs colors fonts io.styles kernel literals math +math.order namespaces sequences ui.theme ; IN: help.stylesheet : wrap-margin-full ( -- n ) diff --git a/basis/help/tips/tips.factor b/basis/help/tips/tips.factor index 1b535d8dfa..7e0e16f2ac 100644 --- a/basis/help/tips/tips.factor +++ b/basis/help/tips/tips.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors arrays colors.constants definitions help.markup +USING: accessors arrays colors definitions help.markup help.stylesheet io io.styles kernel literals namespaces parser random sequences ui.theme ; IN: help.tips diff --git a/basis/listener/listener.factor b/basis/listener/listener.factor index 69fb1bc884..59820f7fab 100644 --- a/basis/listener/listener.factor +++ b/basis/listener/listener.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2003, 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors colors colors.constants combinators.short-circuit +USING: accessors colors combinators.short-circuit compiler.units continuations debugger fry io io.styles kernel lexer locals math math.parser namespaces parser parser.notes prettyprint sequences sets source-files.errors system vocabs vocabs.loader diff --git a/basis/opengl/textures/textures.factor b/basis/opengl/textures/textures.factor index 356b410493..8a766daac1 100644 --- a/basis/opengl/textures/textures.factor +++ b/basis/opengl/textures/textures.factor @@ -1,8 +1,8 @@ ! Copyright (C) 2009, 2010 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors alien.data arrays assocs colors.constants -combinators destructors images images.tessellation kernel -literals math math.statistics math.vectors namespaces opengl +USING: accessors alien.data arrays assocs colors 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 ; diff --git a/basis/prettyprint/prettyprint.factor b/basis/prettyprint/prettyprint.factor index 98ecc779a1..746b98e2e8 100644 --- a/basis/prettyprint/prettyprint.factor +++ b/basis/prettyprint/prettyprint.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2003, 2010 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors arrays classes colors.constants combinators +USING: accessors arrays classes colors combinators continuations generic grouping io io.streams.string io.styles kernel make math math.parser namespaces prettyprint.config prettyprint.custom prettyprint.sections sequences strings diff --git a/basis/prettyprint/stylesheet/stylesheet.factor b/basis/prettyprint/stylesheet/stylesheet.factor index 6d7eac5138..432a400cf1 100644 --- a/basis/prettyprint/stylesheet/stylesheet.factor +++ b/basis/prettyprint/stylesheet/stylesheet.factor @@ -1,8 +1,8 @@ ! Copyright (C) 2009 Keith Lazuka, Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: assocs colors colors.constants combinators -combinators.short-circuit hashtables io.styles kernel literals -namespaces sequences words words.symbol ; +USING: assocs colors combinators combinators.short-circuit +hashtables io.styles kernel literals namespaces sequences words +words.symbol ; IN: prettyprint.stylesheet "Hey" content>> gadget? diff --git a/basis/ui/gadgets/labels/labels.factor b/basis/ui/gadgets/labels/labels.factor index 0eab7ae7a8..8d393c7454 100644 --- a/basis/ui/gadgets/labels/labels.factor +++ b/basis/ui/gadgets/labels/labels.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2005, 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors arrays classes colors.constants combinators +USING: accessors arrays classes colors combinators fonts fry kernel make math.functions models namespaces sequences splitting strings ui.baseline-alignment ui.gadgets ui.gadgets.tracks ui.pens.solid ui.render ui.text diff --git a/basis/ui/gadgets/status-bar/status-bar.factor b/basis/ui/gadgets/status-bar/status-bar.factor index 73b763c59f..6424639f7a 100644 --- a/basis/ui/gadgets/status-bar/status-bar.factor +++ b/basis/ui/gadgets/status-bar/status-bar.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2007, 2008 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors calendar colors.constants fonts kernel models +USING: accessors calendar colors fonts kernel models models.arrow models.delay sequences summary ui ui.gadgets.borders ui.gadgets.labels ui.gadgets.tracks ui.gadgets.worlds ui.pens.solid ui.private ui.theme ; diff --git a/basis/ui/gadgets/tabbed/tabbed.factor b/basis/ui/gadgets/tabbed/tabbed.factor index cdd516a7ad..c5a84bf512 100644 --- a/basis/ui/gadgets/tabbed/tabbed.factor +++ b/basis/ui/gadgets/tabbed/tabbed.factor @@ -1,9 +1,9 @@ ! Copyright (C) 2008, 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors colors.constants kernel models sequences -ui.gadgets ui.gadgets.books ui.gadgets.borders -ui.gadgets.buttons ui.gadgets.buttons.private ui.gadgets.icons -ui.gadgets.packs ui.gadgets.tracks ui.pens ui.theme.images ; +USING: accessors colors kernel models sequences ui.gadgets +ui.gadgets.books ui.gadgets.borders ui.gadgets.buttons +ui.gadgets.buttons.private ui.gadgets.icons ui.gadgets.packs +ui.gadgets.tracks ui.pens ui.theme.images ; IN: ui.gadgets.tabbed TUPLE: tabbed-gadget < track tabs book ; diff --git a/basis/ui/gadgets/tables/tables-docs.factor b/basis/ui/gadgets/tables/tables-docs.factor index d99b236cc2..a2e9bf1946 100644 --- a/basis/ui/gadgets/tables/tables-docs.factor +++ b/basis/ui/gadgets/tables/tables-docs.factor @@ -53,7 +53,7 @@ ARTICLE: "ui.gadgets.tables.config" "Table gadget configuration" } ; ARTICLE: "ui.gadgets.tables.example" "Table gadget example" -"The " { $vocab-link "color-table" } " vocabulary implements a simple application which demonstrates table gadgets. It lists all the colors in the " { $snippet "rgb.txt" } " database shipped with " { $vocab-link "colors.constants" } " in a table. Rows are highlighted with their actual color, and columns show the red, green, and blue components. Column titles are supplied." ; +"The " { $vocab-link "color-table" } " vocabulary implements a simple application which demonstrates table gadgets. It lists all the colors in the " { $snippet "rgb.txt" } " database shipped with " { $vocab-link "colors" } " in a table. Rows are highlighted with their actual color, and columns show the red, green, and blue components. Column titles are supplied." ; ARTICLE: "ui.gadgets.tables" "Table gadgets" "The " { $vocab-link "ui.gadgets.tables" } " vocabulary implements table gadgets. Table gadgets display a grid of values, with each row's columns generated by a renderer object." diff --git a/basis/ui/pens/caching/caching-tests.factor b/basis/ui/pens/caching/caching-tests.factor index 024e302ed1..64f25718f2 100644 --- a/basis/ui/pens/caching/caching-tests.factor +++ b/basis/ui/pens/caching/caching-tests.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors alien.c-types colors.constants kernel +USING: accessors alien.c-types colors kernel specialized-arrays tools.test ui.gadgets.labels ui.pens.caching ui.pens.gradient ; diff --git a/basis/ui/pens/gradient/gradient-tests.factor b/basis/ui/pens/gradient/gradient-tests.factor index 9145e33d78..3d9eacb7f3 100644 --- a/basis/ui/pens/gradient/gradient-tests.factor +++ b/basis/ui/pens/gradient/gradient-tests.factor @@ -1,5 +1,5 @@ USING: tools.test ui.pens.gradient ui.pens.gradient.private -colors.constants specialized-arrays alien.c-types ; +colors specialized-arrays alien.c-types ; SPECIALIZED-ARRAY: float { diff --git a/basis/ui/theme/base16/base16.factor b/basis/ui/theme/base16/base16.factor index 8fbcba779d..2b0231d33b 100644 --- a/basis/ui/theme/base16/base16.factor +++ b/basis/ui/theme/base16/base16.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2021 Kevin Cope. ! See http://factorcode.org/license.txt for BSD license. -USING: arrays assocs colors.constants colors.constants.private -io.encodings.utf8 io.files kernel namespaces sequences ui.theme ; +USING: arrays assocs colors colors.private io.encodings.utf8 +io.files kernel namespaces sequences ui.theme ; IN: ui.theme.base16 SYMBOL: base16-theme-name diff --git a/basis/ui/theme/theme.factor b/basis/ui/theme/theme.factor index 6f2e7cf9ee..1fe4e8eaae 100644 --- a/basis/ui/theme/theme.factor +++ b/basis/ui/theme/theme.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2016 Nicolas Pénet. ! See http://factorcode.org/license.txt for BSD license. -USING: colors colors.constants colors.hex delegate namespaces ; +USING: colors delegate namespaces ; IN: ui.theme SYMBOL: theme @@ -132,17 +132,17 @@ M: light-theme popup-color COLOR: yellow2 ; M: light-theme object-color COLOR: aquamarine2 ; M: light-theme contents-color COLOR: orchid2 ; -M: light-theme help-header-background HEXCOLOR: F4EFD9 ; +M: light-theme help-header-background COLOR: #F4EFD9 ; -M: light-theme thread-status-stopped-background HEXCOLOR: F4D9D9 ; -M: light-theme thread-status-suspended-background HEXCOLOR: F4EAD9 ; -M: light-theme thread-status-running-background HEXCOLOR: EDF4D9 ; +M: light-theme thread-status-stopped-background COLOR: #F4D9D9 ; +M: light-theme thread-status-suspended-background COLOR: #F4EAD9 ; +M: light-theme thread-status-running-background COLOR: #EDF4D9 ; -M: light-theme thread-status-stopped-foreground HEXCOLOR: F42300 ; -M: light-theme thread-status-suspended-foreground HEXCOLOR: F37B00 ; -M: light-theme thread-status-running-foreground HEXCOLOR: 3FCA00 ; +M: light-theme thread-status-stopped-foreground COLOR: #F42300 ; +M: light-theme thread-status-suspended-foreground COLOR: #F37B00 ; +M: light-theme thread-status-running-foreground COLOR: #3FCA00 ; -M: light-theme error-summary-background HEXCOLOR: F4D9D9 ; +M: light-theme error-summary-background COLOR: #F4D9D9 ; M: light-theme content-background COLOR: white ; M: light-theme text-color COLOR: black ; @@ -152,10 +152,10 @@ M: light-theme title-color COLOR: gray20 ; M: light-theme heading-color COLOR: FactorDarkSlateBlue ; M: light-theme snippet-color COLOR: DarkOrange4 ; M: light-theme output-color COLOR: DarkOrange4 ; -M: light-theme deprecated-background-color HEXCOLOR: F4EAD9 ; -M: light-theme deprecated-border-color HEXCOLOR: F37B00 ; -M: light-theme warning-background-color HEXCOLOR: F4D9D9 ; -M: light-theme warning-border-color HEXCOLOR: F42300 ; +M: light-theme deprecated-background-color COLOR: #F4EAD9 ; +M: light-theme deprecated-border-color COLOR: #F37B00 ; +M: light-theme warning-background-color COLOR: #F4D9D9 ; +M: light-theme warning-border-color COLOR: #F42300 ; M: light-theme code-background-color COLOR: FactorLightTan ; M: light-theme help-path-border-color COLOR: grey95 ; @@ -184,10 +184,10 @@ M: light-theme table-border-color COLOR: FactorTan ; SINGLETON: dark-theme -M: dark-theme toolbar-background HEXCOLOR: 202124 ; +M: dark-theme toolbar-background COLOR: #202124 ; M: dark-theme toolbar-button-pressed-background COLOR: solarized-base0 ; -M: dark-theme menu-background HEXCOLOR: 202124 ; +M: dark-theme menu-background COLOR: #202124 ; M: dark-theme menu-border-color COLOR: solarized-base01 ; M: dark-theme status-bar-background COLOR: FactorDarkSlateBlue ; @@ -198,7 +198,7 @@ M: dark-theme button-clicked-text-color COLOR: white ; M: dark-theme line-color COLOR: solarized-base01 ; -M: dark-theme column-title-background HEXCOLOR: 2F4D5B ; +M: dark-theme column-title-background COLOR: #2F4D5B ; M: dark-theme roll-button-rollover-border COLOR: gray50 ; M: dark-theme roll-button-selected-background COLOR: dark-gray ; @@ -221,36 +221,36 @@ M: dark-theme popup-color COLOR: solarized-yellow ; M: dark-theme object-color COLOR: solarized-cyan ; M: dark-theme contents-color COLOR: solarized-magenta ; -M: dark-theme help-header-background HEXCOLOR: 2F4D5B ; +M: dark-theme help-header-background COLOR: #2F4D5B ; -M: dark-theme thread-status-stopped-background HEXCOLOR: 492d33 ; -M: dark-theme thread-status-suspended-background HEXCOLOR: 3c4a24 ; -M: dark-theme thread-status-running-background HEXCOLOR: 2c4f24 ; +M: dark-theme thread-status-stopped-background COLOR: #492d33 ; +M: dark-theme thread-status-suspended-background COLOR: #3c4a24 ; +M: dark-theme thread-status-running-background COLOR: #2c4f24 ; M: dark-theme thread-status-stopped-foreground COLOR: solarized-red ; M: dark-theme thread-status-suspended-foreground COLOR: solarized-yellow ; M: dark-theme thread-status-running-foreground COLOR: solarized-green ; -M: dark-theme error-summary-background HEXCOLOR: 6E2E32 ; +M: dark-theme error-summary-background COLOR: #6E2E32 ; -M: dark-theme content-background HEXCOLOR: 202124 ; -M: dark-theme text-color HEXCOLOR: bdc1c6 ; +M: dark-theme content-background COLOR: #202124 ; +M: dark-theme text-color COLOR: #bdc1c6 ; -M: dark-theme link-color HEXCOLOR: 8ab4f8 ; +M: dark-theme link-color COLOR: #8ab4f8 ; M: dark-theme title-color COLOR: grey75 ; M: dark-theme heading-color COLOR: grey75 ; M: dark-theme snippet-color COLOR: solarized-orange ; M: dark-theme output-color COLOR: solarized-orange ; -M: dark-theme deprecated-background-color HEXCOLOR: 3c4a24 ; +M: dark-theme deprecated-background-color COLOR: #3c4a24 ; M: dark-theme deprecated-border-color COLOR: solarized-yellow ; -M: dark-theme warning-background-color HEXCOLOR: 492d33 ; +M: dark-theme warning-background-color COLOR: #492d33 ; M: dark-theme warning-border-color COLOR: solarized-red ; -M: dark-theme code-background-color HEXCOLOR: 2F4D5B ; +M: dark-theme code-background-color COLOR: #2F4D5B ; M: dark-theme help-path-border-color COLOR: solarized-base02 ; -M: dark-theme tip-background-color HEXCOLOR: 2F4D5B ; +M: dark-theme tip-background-color COLOR: #2F4D5B ; -M: dark-theme prompt-background-color HEXCOLOR: 922f31 ; +M: dark-theme prompt-background-color COLOR: #922f31 ; M: dark-theme dim-color COLOR: solarized-cyan ; M: dark-theme highlighted-word-color COLOR: solarized-green ; diff --git a/basis/ui/tools/error-list/error-list.factor b/basis/ui/tools/error-list/error-list.factor index 8c36e84906..0ac48742e5 100644 --- a/basis/ui/tools/error-list/error-list.factor +++ b/basis/ui/tools/error-list/error-list.factor @@ -1,8 +1,9 @@ ! Copyright (C) 2009, 2010 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors arrays assocs calendar colors.constants -combinators combinators.smart compiler.errors debugger editors -init io.pathnames kernel math.parser models models.arrow + +USING: accessors arrays assocs calendar colors combinators +combinators.smart compiler.errors debugger editors init +io.pathnames kernel math.parser models models.arrow models.arrow.smart models.delay models.mapping models.search namespaces prettyprint sequences sorting source-files.errors source-files.errors.debugger summary ui ui.commands ui.gadgets @@ -11,6 +12,7 @@ ui.gadgets.packs ui.gadgets.panes ui.gadgets.scrollers ui.gadgets.status-bar ui.gadgets.tables ui.gadgets.toolbar ui.gadgets.tracks ui.gestures ui.images ui.operations ui.theme ui.tools.browser ui.tools.common ui.tools.inspector ; + IN: ui.tools.error-list CONSTANT: source-file-icon diff --git a/basis/ui/tools/listener/completion/completion.factor b/basis/ui/tools/listener/completion/completion.factor index f3a423e6d9..e3fbbcf966 100644 --- a/basis/ui/tools/listener/completion/completion.factor +++ b/basis/ui/tools/listener/completion/completion.factor @@ -1,16 +1,18 @@ ! Copyright (C) 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors arrays assocs calendar colors colors.constants -combinators combinators.short-circuit definitions.icons -documents documents.elements fonts fry generic help.vocabs -kernel math math.vectors models.arrow models.delay parser -present sequences sets splitting strings tools.completion -ui.commands ui.gadgets ui.gadgets.editors ui.gadgets.glass -ui.gadgets.labeled ui.gadgets.scrollers ui.gadgets.tables -ui.gadgets.tracks ui.gadgets.worlds ui.gadgets.wrappers -ui.gestures ui.images ui.operations ui.pens.solid ui.theme -ui.theme.images ui.tools.common ui.tools.listener.history + +USING: accessors arrays assocs calendar colors combinators +combinators.short-circuit definitions.icons documents +documents.elements fonts generic help.vocabs kernel math +math.vectors models.arrow models.delay parser present sequences +sets splitting strings tools.completion ui.commands ui.gadgets +ui.gadgets.editors ui.gadgets.glass ui.gadgets.labeled +ui.gadgets.scrollers ui.gadgets.tables ui.gadgets.tracks +ui.gadgets.worlds ui.gadgets.wrappers ui.gestures ui.images +ui.operations ui.pens.solid ui.theme ui.theme.images +ui.tools.common ui.tools.listener.history ui.tools.listener.popups unicode.data vocabs words ; + IN: ui.tools.listener.completion ! We don't directly depend on the listener tool but we use a few slots @@ -96,7 +98,7 @@ M: vocab-completion row-color ] [ drop COLOR: dark-gray ] if ; M: color-completion row-color - drop second lookup-color ; + drop second named-color ; : up-to-caret ( caret document -- string ) [ { 0 0 } ] 2dip doc-range ; diff --git a/basis/vocabs/prettyprint/prettyprint.factor b/basis/vocabs/prettyprint/prettyprint.factor index 873bec53c4..43e250ec07 100644 --- a/basis/vocabs/prettyprint/prettyprint.factor +++ b/basis/vocabs/prettyprint/prettyprint.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors assocs colors.constants fry io io.styles kernel +USING: accessors assocs colors io io.styles kernel make namespaces parser prettyprint.backend prettyprint.sections prettyprint.stylesheet sequences sorting vocabs vocabs.parser ; FROM: io.styles => inset ; diff --git a/basis/windows/uniscribe/uniscribe.factor b/basis/windows/uniscribe/uniscribe.factor index 92ec3e5da2..6bf3f18a01 100644 --- a/basis/windows/uniscribe/uniscribe.factor +++ b/basis/windows/uniscribe/uniscribe.factor @@ -1,12 +1,13 @@ ! Copyright (C) 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. + USING: accessors alien.c-types alien.data arrays assocs -byte-arrays cache classes.struct colors colors.constants -combinators destructors fonts images init io.encodings.string -io.encodings.utf16n kernel literals locals math math.bitwise -namespaces sequences specialized-arrays windows.errors -windows.fonts windows.gdi32 windows.offscreen windows.ole32 -windows.types windows.usp10 ; +byte-arrays cache classes.struct colors combinators destructors +fonts images init io.encodings.string io.encodings.utf16n kernel +literals locals math math.bitwise namespaces sequences +specialized-arrays windows.errors windows.fonts windows.gdi32 +windows.offscreen windows.ole32 windows.types windows.usp10 ; + SPECIALIZED-ARRAY: uint32_t IN: windows.uniscribe diff --git a/basis/xmode/highlight/highlight.factor b/basis/xmode/highlight/highlight.factor index bd78f97d1f..4a0caf10a6 100644 --- a/basis/xmode/highlight/highlight.factor +++ b/basis/xmode/highlight/highlight.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2011 John Benediktsson ! See http://factorcode.org/license.txt for BSD license -USING: accessors assocs colors.hex io io.encodings.utf8 io.files +USING: accessors assocs colors io io.encodings.utf8 io.files io.pathnames io.streams.string io.styles kernel locals see sequences splitting strings vocabs vocabs.loader words xmode.catalog xmode.marker ; @@ -11,30 +11,30 @@ IN: xmode.highlight ] +: rgba>hex ( rgba -- hex ) + [ red>> ] [ green>> ] [ blue>> ] tri + [ 255 * >integer ] tri@ "%02X%02X%02X" sprintf ; + PRIVATE> M: color-renderer filled-column @@ -24,7 +28,7 @@ M: color-renderer column-titles M: color-renderer row-columns drop [ full-block-string swap - dup lookup-color { + dup named-color { [ red>> "%.5f" sprintf ] [ green>> "%.5f" sprintf ] [ blue>> "%.5f" sprintf ] @@ -33,10 +37,10 @@ M: color-renderer row-columns ] output>array ; M: color-renderer row-color - drop lookup-color ; + drop named-color ; M: color-renderer row-value - drop lookup-color ; + drop named-color ; : ( -- table ) named-colors { human<=> } sort-by diff --git a/extra/colors/flex-hex/flex-hex.factor b/extra/colors/flex-hex/flex-hex.factor index 57a6a210ef..d1f6a5db01 100644 --- a/extra/colors/flex-hex/flex-hex.factor +++ b/extra/colors/flex-hex/flex-hex.factor @@ -1,8 +1,8 @@ ! Copyright (C) 2013 John Benediktsson ! See http://factorcode.org/license.txt for BSD license -USING: colors colors.hex grouping kernel lexer math math.parser -regexp.classes sequences splitting ; +USING: colors colors.private grouping kernel lexer math +math.parser regexp.classes sequences splitting ; IN: colors.flex-hex diff --git a/extra/game-of-life/game-of-life.factor b/extra/game-of-life/game-of-life.factor index aea776e753..ebe6a605a2 100644 --- a/extra/game-of-life/game-of-life.factor +++ b/extra/game-of-life/game-of-life.factor @@ -2,8 +2,8 @@ ! See http://factorcode.org/license.txt for BSD license USING: accessors arrays assocs bit-arrays byte-arrays calendar -colors.constants combinators fry kernel kernel.private locals -math math.order ranges namespaces opengl random sequences +colors combinators fry kernel kernel.private locals math +math.order ranges namespaces opengl random sequences sequences.private timers ui ui.commands ui.gadgets ui.gadgets.toolbar ui.gadgets.tracks ui.gestures ui.render words ; diff --git a/extra/game/debug/debug.factor b/extra/game/debug/debug.factor index 86d8c50e16..a272a61613 100644 --- a/extra/game/debug/debug.factor +++ b/extra/game/debug/debug.factor @@ -1,10 +1,12 @@ ! Copyright (C) 2010 Erik Charlebois ! See http://factorcode.org/license.txt for BSD license. + USING: accessors alien.c-types alien.data arrays circular colors -colors.constants columns destructors fonts gpu.buffers -gpu.render gpu.shaders gpu.state gpu.textures images kernel -literals locals make math math.constants math.functions -math.vectors sequences specialized-arrays typed ui.text fry ; +columns destructors fonts gpu.buffers gpu.render gpu.shaders +gpu.state gpu.textures images kernel literals locals make math +math.constants math.functions math.vectors sequences +specialized-arrays typed ui.text ; + FROM: alien.c-types => float ; SPECIALIZED-ARRAYS: float uint ; IN: game.debug diff --git a/extra/game/debug/tests/tests.factor b/extra/game/debug/tests/tests.factor index 67f7e7c63a..e1cd5330bd 100644 --- a/extra/game/debug/tests/tests.factor +++ b/extra/game/debug/tests/tests.factor @@ -1,10 +1,10 @@ ! Copyright (C) 2010 Erik Charlebois ! See http://factorcode.org/license.txt for BSD license. -USING: accessors colors.constants game.debug game.loop -game.worlds gpu gpu.framebuffers gpu.util.wasd kernel literals -locals make math math.matrices math.matrices.extras math.parser -math.trig sequences specialized-arrays ui.gadgets.worlds -ui.pixel-formats ; +USING: accessors colors game.debug game.loop game.worlds gpu +gpu.framebuffers gpu.util.wasd kernel literals locals make math +math.matrices math.matrices.extras math.parser math.trig +sequences specialized-arrays ui.gadgets.worlds ui.pixel-formats +; FROM: alien.c-types => float ; SPECIALIZED-ARRAY: float IN: game.debug.tests diff --git a/extra/game/input/demos/joysticks/joysticks.factor b/extra/game/input/demos/joysticks/joysticks.factor index 854f27881d..f90af4be25 100644 --- a/extra/game/input/demos/joysticks/joysticks.factor +++ b/extra/game/input/demos/joysticks/joysticks.factor @@ -1,8 +1,9 @@ -USING: accessors arrays assocs calendar colors.constants -combinators game.input grouping kernel math math.parser -math.vectors sequences threads timers ui ui.gadgets -ui.gadgets.borders ui.gadgets.buttons ui.gadgets.labels -ui.gadgets.packs ui.pens.polygon ui.pens.solid ; +USING: accessors arrays assocs calendar colors combinators +game.input grouping kernel math math.parser math.vectors +sequences threads timers ui ui.gadgets ui.gadgets.borders +ui.gadgets.buttons ui.gadgets.labels ui.gadgets.packs +ui.pens.polygon ui.pens.solid ; + IN: game.input.demos.joysticks CONSTANT: SIZE { 151 151 } diff --git a/extra/gemini/gemini.factor b/extra/gemini/gemini.factor index 7846dbdb94..d32d33c4a7 100644 --- a/extra/gemini/gemini.factor +++ b/extra/gemini/gemini.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2021 John Benediktsson ! See http://factorcode.org/license.txt for BSD license -USING: accessors ascii assocs colors.constants combinators +USING: accessors ascii assocs colors combinators combinators.short-circuit continuations images.loader images.loader.private images.viewer io io.encodings.ascii io.encodings.binary io.encodings.latin1 io.encodings.string diff --git a/extra/gesture-logger/gesture-logger.factor b/extra/gesture-logger/gesture-logger.factor index 3bcf84178e..3d0ffaf45b 100644 --- a/extra/gesture-logger/gesture-logger.factor +++ b/extra/gesture-logger/gesture-logger.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2007, 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors io kernel prettyprint colors.constants ui ui.gadgets +USING: accessors io kernel prettyprint colors ui ui.gadgets ui.gadgets.panes ui.gadgets.scrollers ui.gestures ui.pens.solid ; IN: gesture-logger diff --git a/extra/gml/ui/ui.factor b/extra/gml/ui/ui.factor index 6f896f5ff4..3576b762f3 100644 --- a/extra/gml/ui/ui.factor +++ b/extra/gml/ui/ui.factor @@ -1,5 +1,5 @@ ! Copyright (C) 2010 Slava Pestov. -USING: arrays accessors colors.constants euler.b-rep fry gml +USING: arrays accessors colors euler.b-rep fry gml gml.runtime gml.viewer gml.printer io.directories io.encodings.utf8 io.files io.pathnames io.streams.string kernel locals models namespaces sequences ui ui.gadgets diff --git a/extra/google/charts/charts-tests.factor b/extra/google/charts/charts-tests.factor index a62e681c17..ba704ca993 100644 --- a/extra/google/charts/charts-tests.factor +++ b/extra/google/charts/charts-tests.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2016 Alexander Ilin. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors colors.constants google.charts -google.charts.private kernel math present sequences tools.test ; +USING: accessors colors google.charts google.charts.private +kernel math present sequences tools.test ; ! The order of the constructors below is important, because we ! are testing side-effects. If you remove the clone word from diff --git a/extra/google/charts/charts.factor b/extra/google/charts/charts.factor index 28d40b8240..038c114666 100644 --- a/extra/google/charts/charts.factor +++ b/extra/google/charts/charts.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2011 John Benediktsson ! See http://factorcode.org/license.txt for BSD license -USING: accessors arrays assocs colors.hex combinators formatting +USING: accessors arrays assocs combinators formatting http.client images.http images.loader images.loader.private images.viewer kernel math math.order present sequences splitting urls ; @@ -70,6 +70,10 @@ PRIVATE> hex ( rgba -- hex ) + [ red>> ] [ green>> ] [ blue>> ] tri + [ 255 * >integer ] tri@ "%02X%02X%02X" sprintf ; + : chart>url ( chart -- url ) [ URL" http://chart.googleapis.com/chart" clone ] dip { [ type>> "cht" set-query-param ] diff --git a/extra/google/search/search.factor b/extra/google/search/search.factor index 2bf33e6c2e..66e41a7031 100644 --- a/extra/google/search/search.factor +++ b/extra/google/search/search.factor @@ -2,8 +2,8 @@ ! See http://factorcode.org/license.txt for BSD license USING: accessors arrays assocs assocs.extras classes.tuple -colors.constants combinators formatting fry http.client io -io.styles json.reader kernel sequences urls wrap.strings ; +colors combinators formatting fry http.client io io.styles +json.reader kernel sequences urls wrap.strings ; IN: google.search diff --git a/extra/gopher/gopher.factor b/extra/gopher/gopher.factor index 2fdf6e25a5..c18d4e9e9e 100644 --- a/extra/gopher/gopher.factor +++ b/extra/gopher/gopher.factor @@ -1,13 +1,12 @@ ! Copyright (C) 2014 John Benediktsson ! See http://factorcode.org/license.txt for BSD license -USING: accessors byte-arrays calendar colors.constants -combinators formatting fry images images.loader -images.loader.private images.viewer io io.encodings.binary -io.encodings.string io.encodings.utf8 io.sockets io.styles -io.timeouts kernel make math math.parser namespaces present -prettyprint sequences splitting summary urls urls.encoding -vocabs ; +USING: accessors byte-arrays calendar colors combinators +formatting fry images images.loader images.loader.private +images.viewer io io.encodings.binary io.encodings.string +io.encodings.utf8 io.sockets io.styles io.timeouts kernel make +math math.parser namespaces present prettyprint sequences +splitting summary urls urls.encoding vocabs ; IN: gopher diff --git a/extra/hacker-news/hacker-news.factor b/extra/hacker-news/hacker-news.factor index 53ad7d065a..8d74805b8c 100644 --- a/extra/hacker-news/hacker-news.factor +++ b/extra/hacker-news/hacker-news.factor @@ -2,14 +2,14 @@ ! See http://factorcode.org/license.txt for BSD license. USING: accessors assocs calendar calendar.format -calendar.holidays.us colors.constants colors.hex combinators -concurrency.combinators formatting hashtables http.client io -io.styles json.reader kernel make math sequences ui urls ; +calendar.holidays.us colors combinators concurrency.combinators +formatting hashtables http.client io io.styles json.reader +kernel make math sequences ui urls ; IN: hacker-news -CONSTANT: christmas-red HEXCOLOR: bc2c21 -CONSTANT: christmas-green HEXCOLOR: 376627 +CONSTANT: christmas-red COLOR: #bc2c21 +CONSTANT: christmas-green COLOR: #376627 user-url ( post -- user-url ) "by" of "http://news.ycombinator.com/user?id=" prepend >url ; diff --git a/extra/io/streams/256color/256color-tests.factor b/extra/io/streams/256color/256color-tests.factor index 987ee454e2..5fbf10ca23 100644 --- a/extra/io/streams/256color/256color-tests.factor +++ b/extra/io/streams/256color/256color-tests.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2012 John Benediktsson ! See http://factorcode.org/license.txt for BSD license -USING: colors.constants io.streams.256color +USING: colors io.streams.256color io.streams.256color.private tools.test ; { 16 } [ COLOR: black color>256color ] unit-test diff --git a/extra/jamshred/player/player.factor b/extra/jamshred/player/player.factor index 8601cb231f..0abb77b103 100644 --- a/extra/jamshred/player/player.factor +++ b/extra/jamshred/player/player.factor @@ -1,9 +1,11 @@ ! Copyright (C) 2007, 2008 Alex Chapman ! See http://factorcode.org/license.txt for BSD license. -USING: accessors colors.constants combinators jamshred.log -jamshred.oint jamshred.sound jamshred.tunnel kernel locals math -math.constants math.order ranges math.vectors math.matrices -sequences shuffle specialized-arrays strings system ; + +USING: accessors colors combinators jamshred.log jamshred.oint +jamshred.sound jamshred.tunnel kernel locals math math.constants +math.order ranges math.vectors math.matrices sequences shuffle +specialized-arrays strings system ; + QUALIFIED-WITH: alien.c-types c SPECIALIZED-ARRAY: c:float IN: jamshred.player diff --git a/extra/merger/merger.factor b/extra/merger/merger.factor index f9592093d9..38babc373a 100644 --- a/extra/merger/merger.factor +++ b/extra/merger/merger.factor @@ -1,7 +1,7 @@ -USING: accessors arrays colors.constants file-picker fry -io.directories kernel math.rectangles models sequences sets ui -ui.gadgets ui.gadgets.buttons ui.gadgets.glass -ui.gadgets.labeled ui.gadgets.labels ui.gadgets.tracks ; +USING: accessors arrays colors file-picker fry io.directories +kernel math.rectangles models sequences sets ui ui.gadgets +ui.gadgets.buttons ui.gadgets.glass ui.gadgets.labeled +ui.gadgets.labels ui.gadgets.tracks ; IN: merger MAIN-WINDOW: merger-window { diff --git a/extra/minesweeper/minesweeper.factor b/extra/minesweeper/minesweeper.factor index 481ca7bd06..b54fe8e148 100644 --- a/extra/minesweeper/minesweeper.factor +++ b/extra/minesweeper/minesweeper.factor @@ -1,14 +1,13 @@ ! Copyright (C) 2017 John Benediktsson ! See http://factorcode.org/license.txt for BSD license -USING: accessors arrays assocs calendar circular -colors.constants combinators combinators.short-circuit -combinators.smart destructors formatting fry images.loader -kernel locals math math.order math.parser namespaces opengl -opengl.textures random sequences timers ui ui.commands -ui.gadgets ui.gadgets.toolbar ui.gadgets.tracks -ui.gadgets.worlds ui.gestures ui.pens.solid ui.render -ui.tools.browser words ; +USING: accessors arrays assocs calendar circular colors +combinators combinators.short-circuit combinators.smart +destructors formatting fry images.loader kernel locals math +math.order math.parser namespaces opengl opengl.textures random +sequences timers ui ui.commands ui.gadgets ui.gadgets.toolbar +ui.gadgets.tracks ui.gadgets.worlds ui.gestures ui.pens.solid +ui.render ui.tools.browser words ; IN: minesweeper diff --git a/extra/pdf/canvas/canvas.factor b/extra/pdf/canvas/canvas.factor index f7356140d4..9dd62611e4 100644 --- a/extra/pdf/canvas/canvas.factor +++ b/extra/pdf/canvas/canvas.factor @@ -1,8 +1,8 @@ ! Copyright (C) 2011-2012 John Benediktsson ! See http://factorcode.org/license.txt for BSD license -USING: accessors assocs colors.constants combinators fonts fry -io io.styles kernel math math.order namespaces pdf.text pdf.wrap +USING: accessors assocs colors combinators fonts fry io +io.styles kernel math math.order namespaces pdf.text pdf.wrap sequences ui.text ; IN: pdf.canvas diff --git a/extra/pong/pong.factor b/extra/pong/pong.factor index 1ceedbe45f..170238d326 100644 --- a/extra/pong/pong.factor +++ b/extra/pong/pong.factor @@ -1,4 +1,4 @@ -USING: accessors arrays calendar colors.constants +USING: accessors arrays calendar colors combinators.short-circuit fonts fry kernel literals locals math math.order ranges math.vectors namespaces opengl random sequences timers ui ui.commands ui.gadgets ui.gadgets.worlds diff --git a/extra/processing/shapes/shapes.factor b/extra/processing/shapes/shapes.factor index e11871e5e2..098e70fca1 100644 --- a/extra/processing/shapes/shapes.factor +++ b/extra/processing/shapes/shapes.factor @@ -1,6 +1,8 @@ -USING: alien.c-types alien.data arrays colors.constants grouping -kernel locals math math.vectors namespaces opengl opengl.demo-support -opengl.gl opengl.glu sequences sequences.generalizations shuffle ; +USING: alien.c-types alien.data arrays colors grouping kernel +locals math math.vectors namespaces opengl opengl.demo-support +opengl.gl opengl.glu sequences sequences.generalizations shuffle +; + IN: processing.shapes SYMBOL: fill-color diff --git a/extra/readline-listener/readline-listener.factor b/extra/readline-listener/readline-listener.factor index 3917bf7eea..2c32cf17db 100644 --- a/extra/readline-listener/readline-listener.factor +++ b/extra/readline-listener/readline-listener.factor @@ -1,8 +1,10 @@ ! Copyright (C) 2011 Erik Charlebois. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors assocs colors.constants combinators fry io kernel + +USING: accessors assocs colors combinators fry io kernel listener readline sequences splitting threads tools.completion unicode.data vocabs vocabs.hierarchy ; + IN: readline-listener : write-link ( title url -- ) '[ _ presented ,, - HEXCOLOR: 888888 foreground ,, + COLOR: #888888 foreground ,, ] H{ } make format ; : write-text ( str -- ) - H{ { foreground HEXCOLOR: 888888 } } format ; + H{ { foreground COLOR: #888888 } } format ; PRIVATE> diff --git a/extra/rosetta-code/animate-pendulum/animate-pendulum.factor b/extra/rosetta-code/animate-pendulum/animate-pendulum.factor index 5743dfcafc..b8811f0cdb 100644 --- a/extra/rosetta-code/animate-pendulum/animate-pendulum.factor +++ b/extra/rosetta-code/animate-pendulum/animate-pendulum.factor @@ -1,8 +1,10 @@ ! Copyright (c) 2012 Anonymous ! See http://factorcode.org/license.txt for BSD license. -USING: accessors arrays calendar colors.constants kernel -locals math math.constants math.functions math.rectangles -math.vectors opengl sequences system timers ui ui.gadgets ui.render ; + +USING: accessors arrays calendar colors kernel locals math +math.constants math.functions math.rectangles math.vectors +opengl sequences system timers ui ui.gadgets ui.render ; + IN: rosetta-code.animate-pendulum ! http://rosettacode.org/wiki/Animate_a_pendulum diff --git a/extra/rosetta-code/metronome/metronome.factor b/extra/rosetta-code/metronome/metronome.factor index fe1bcc48a9..6425ce9b2e 100644 --- a/extra/rosetta-code/metronome/metronome.factor +++ b/extra/rosetta-code/metronome/metronome.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2013 Jon Harper. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors calendar circular colors.constants colors.hsv +USING: accessors calendar circular colors colors.hsv command-line continuations io kernel math math.parser namespaces openal.example sequences system timers ui ui.gadgets ui.pens.solid ; diff --git a/extra/smalltalk/listener/listener.factor b/extra/smalltalk/listener/listener.factor index 805d51687b..d5a191a197 100644 --- a/extra/smalltalk/listener/listener.factor +++ b/extra/smalltalk/listener/listener.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: kernel prettyprint io io.styles colors.constants compiler.units +USING: kernel prettyprint io io.styles colors compiler.units fry debugger sequences locals.rewrite smalltalk.ast smalltalk.eval smalltalk.printer smalltalk.listener splitting ; IN: smalltalk.listener diff --git a/extra/splitting/extras/extras.factor b/extra/splitting/extras/extras.factor index 8ce45bac62..e57ecff9b3 100644 --- a/extra/splitting/extras/extras.factor +++ b/extra/splitting/extras/extras.factor @@ -3,7 +3,7 @@ IN: splitting.extras rows>> ] unit-test diff --git a/extra/tetris/gl/gl.factor b/extra/tetris/gl/gl.factor index 561af386f4..f8f6a5a945 100644 --- a/extra/tetris/gl/gl.factor +++ b/extra/tetris/gl/gl.factor @@ -1,8 +1,8 @@ ! Copyright (C) 2006, 2007, 2008 Alex Chapman ! See http://factorcode.org/license.txt for BSD license. -USING: accessors arrays colors colors.constants combinators -kernel math opengl opengl.gl sequences tetris.game tetris.piece -; + +USING: accessors arrays colors combinators kernel math opengl +opengl.gl sequences tetris.game tetris.piece ; IN: tetris.gl diff --git a/extra/tetris/tetromino/tetromino.factor b/extra/tetris/tetromino/tetromino.factor index cec67b9403..f948e2e5b5 100644 --- a/extra/tetris/tetromino/tetromino.factor +++ b/extra/tetris/tetromino/tetromino.factor @@ -1,7 +1,9 @@ ! Copyright (C) 2006, 2007, 2008 Alex Chapman ! See http://factorcode.org/license.txt for BSD license. + USING: kernel arrays namespaces sequences math math.order -math.vectors colors colors.constants random ; +math.vectors colors random ; + IN: tetris.tetromino TUPLE: tetromino states colour ; diff --git a/extra/trails/trails.factor b/extra/trails/trails.factor index 31d4874aac..58d5be8db5 100644 --- a/extra/trails/trails.factor +++ b/extra/trails/trails.factor @@ -1,7 +1,6 @@ -USING: accessors arrays calendar circular colors -colors.constants fry kernel locals math math.order math.vectors -namespaces opengl processing.shapes sequences timers ui -ui.gadgets ui.gestures ui.render ; +USING: accessors arrays calendar circular colors kernel locals +math math.order math.vectors namespaces opengl processing.shapes +sequences timers ui ui.gadgets ui.gestures ui.render ; IN: trails diff --git a/extra/ui/gadgets/charts/axes/axes.factor b/extra/ui/gadgets/charts/axes/axes.factor index fa93951e28..e6097e3f65 100644 --- a/extra/ui/gadgets/charts/axes/axes.factor +++ b/extra/ui/gadgets/charts/axes/axes.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2017 Alexander Ilin. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors arrays colors.constants kernel locals math +USING: accessors arrays colors kernel locals math math.order opengl sequences ui.gadgets ui.gadgets.charts ui.gadgets.charts.lines ui.gadgets.charts.utils ui.render ; IN: ui.gadgets.charts.axes diff --git a/extra/ui/gadgets/charts/demos/demos.factor b/extra/ui/gadgets/charts/demos/demos.factor index cb4529fd07..b310ebe2d9 100644 --- a/extra/ui/gadgets/charts/demos/demos.factor +++ b/extra/ui/gadgets/charts/demos/demos.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2017 Alexander Ilin. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors arrays colors.constants kernel literals locals +USING: accessors arrays colors kernel literals locals math math.constants math.functions sequences ui ui.gadgets ui.gadgets.charts ui.gadgets.charts.axes ui.gadgets.charts.lines ; diff --git a/extra/ui/gadgets/charts/lines/lines.factor b/extra/ui/gadgets/charts/lines/lines.factor index 0e5cc3f5a9..354218d632 100644 --- a/extra/ui/gadgets/charts/lines/lines.factor +++ b/extra/ui/gadgets/charts/lines/lines.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2016-2017 Alexander Ilin. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors arrays assocs binary-search colors.constants +USING: accessors arrays assocs binary-search colors combinators combinators.short-circuit fry kernel locals make math math.order math.statistics math.vectors opengl opengl.gl sequences specialized-arrays splitting.monotonic ui.gadgets diff --git a/extra/ui/render/test/test.factor b/extra/ui/render/test/test.factor index a55b5a6e31..c1659739f6 100644 --- a/extra/ui/render/test/test.factor +++ b/extra/ui/render/test/test.factor @@ -4,7 +4,7 @@ USING: accessors colors arrays kernel sequences math byte-arrays namespaces grouping fry cap images.bitmap ui.gadgets ui.gadgets.packs ui.gadgets.borders ui.gadgets.grids ui.gadgets.grid-lines ui.gadgets.labels ui.gadgets.buttons ui.pens ui.pens.solid ui.render -ui opengl opengl.gl colors.constants images images.loader ; +ui opengl opengl.gl images images.loader ; IN: ui.render.test SINGLETON: line-test diff --git a/extra/wikipedia/wikipedia.factor b/extra/wikipedia/wikipedia.factor index 5778ac7001..b557563b25 100644 --- a/extra/wikipedia/wikipedia.factor +++ b/extra/wikipedia/wikipedia.factor @@ -1,9 +1,9 @@ ! Copyright (C) 2012 John Benediktsson ! See http://factorcode.org/license.txt for BSD license -USING: accessors ascii assocs colors.constants formatting -html.entities html.parser html.parser.analyzer html.parser.printer -http.client io io.styles kernel namespaces sequences splitting urls +USING: accessors ascii assocs colors formatting html.entities +html.parser html.parser.analyzer html.parser.printer http.client +io io.styles kernel namespaces sequences splitting urls wrap.strings xml xml.data xml.traversal ; FROM: xml.data => tag? ; diff --git a/extra/wolfram-alpha/wolfram-alpha.factor b/extra/wolfram-alpha/wolfram-alpha.factor index 14540aa5c7..22453ce270 100644 --- a/extra/wolfram-alpha/wolfram-alpha.factor +++ b/extra/wolfram-alpha/wolfram-alpha.factor @@ -1,9 +1,9 @@ ! Copyright (C) 2011 John Benediktsson ! See http://factorcode.org/license.txt for BSD license -USING: accessors colors.constants formatting http http.client -images.gif images.http io io.styles kernel namespaces sequences -splitting ui urls.encoding xml xml.data xml.traversal ; +USING: accessors colors formatting http http.client images.gif +images.http io io.styles kernel namespaces sequences splitting +ui urls.encoding xml xml.data xml.traversal ; IN: wolfram-alpha diff --git a/misc/fuel/strange-syntax.factor b/misc/fuel/strange-syntax.factor index 5c52c48ea9..32d04f6ee5 100644 --- a/misc/fuel/strange-syntax.factor +++ b/misc/fuel/strange-syntax.factor @@ -1,6 +1,5 @@ -USING: accessors alien.c-types alien.syntax -classes.struct colors.constants colors.hex kernel literals logging -math ; +USING: accessors alien.c-types alien.syntax classes.struct +colors kernel literals logging math ; IN: strange ! FUEL Syntax Demo @@ -96,7 +95,7 @@ FUNCTION: int futimes ( int id, FUNCTION: int booyah ( int x ) FUNCTION-ALIAS: test int bah ( int* ah, int[] eh ) -HEXCOLOR: ffffff COLOR: green NAN: 1234 CHAR: m ALIEN: 93 +COLOR: #ffffff COLOR: green NAN: 1234 CHAR: m ALIEN: 93 2drop 2drop drop PRIMITIVE: one ( a -- b ) -- 2.34.1