From 18c2f11d0603940472a0babcdab30c0d73934106 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Sat, 19 Apr 2008 22:56:28 -0500 Subject: [PATCH] Move columns, bit-vectors, byte-vectors, float-vectors to extra --- core/prettyprint/backend/backend.factor | 14 +++----- core/sequences/sequences-docs.factor | 22 +------------ core/sequences/sequences-tests.factor | 7 ---- core/sequences/sequences.factor | 14 +------- core/syntax/syntax-docs.factor | 33 ------------------- core/syntax/syntax.factor | 3 -- extra/benchmark/dispatch2/dispatch2.factor | 2 +- extra/benchmark/dispatch3/dispatch3.factor | 2 +- .../spectral-norm/spectral-norm.factor | 4 +-- .../bit-vectors/bit-vectors-docs.factor | 9 +++++ .../bit-vectors/bit-vectors-tests.factor | 0 .../bit-vectors/bit-vectors.factor | 7 +++- {core => extra}/bit-vectors/summary.txt | 0 {core => extra}/bit-vectors/tags.txt | 0 .../byte-vectors/byte-vectors-docs.factor | 10 +++++- .../byte-vectors/byte-vectors-tests.factor | 0 .../byte-vectors/byte-vectors.factor | 7 +++- {core => extra}/byte-vectors/summary.txt | 0 {core => extra}/byte-vectors/tags.txt | 0 .../float-vectors/float-vectors-docs.factor | 8 +++++ .../float-vectors/float-vectors-tests.factor | 0 .../float-vectors/float-vectors.factor | 7 +++- {core => extra}/float-vectors/summary.txt | 0 {core => extra}/float-vectors/tags.txt | 0 extra/help/handbook/handbook.factor | 6 ++-- extra/help/help.factor | 2 +- extra/math/fft/fft.factor | 2 +- extra/math/haar/haar.factor | 2 +- extra/sudoku/sudoku.factor | 2 +- extra/ui/gadgets/grids/grids.factor | 2 +- extra/ui/gestures/gestures.factor | 2 +- 31 files changed, 64 insertions(+), 103 deletions(-) rename {core => extra}/bit-vectors/bit-vectors-docs.factor (82%) rename {core => extra}/bit-vectors/bit-vectors-tests.factor (100%) rename {core => extra}/bit-vectors/bit-vectors.factor (79%) rename {core => extra}/bit-vectors/summary.txt (100%) rename {core => extra}/bit-vectors/tags.txt (100%) rename {core => extra}/byte-vectors/byte-vectors-docs.factor (79%) rename {core => extra}/byte-vectors/byte-vectors-tests.factor (100%) rename {core => extra}/byte-vectors/byte-vectors.factor (79%) rename {core => extra}/byte-vectors/summary.txt (100%) rename {core => extra}/byte-vectors/tags.txt (100%) rename {core => extra}/float-vectors/float-vectors-docs.factor (83%) rename {core => extra}/float-vectors/float-vectors-tests.factor (100%) rename {core => extra}/float-vectors/float-vectors.factor (80%) rename {core => extra}/float-vectors/summary.txt (100%) rename {core => extra}/float-vectors/tags.txt (100%) diff --git a/core/prettyprint/backend/backend.factor b/core/prettyprint/backend/backend.factor index c9019b029d..7ae03443a7 100755 --- a/core/prettyprint/backend/backend.factor +++ b/core/prettyprint/backend/backend.factor @@ -1,11 +1,10 @@ ! Copyright (C) 2003, 2008 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: arrays byte-arrays byte-vectors bit-arrays bit-vectors -generic hashtables io assocs kernel math namespaces sequences -strings sbufs io.styles vectors words prettyprint.config -prettyprint.sections quotations io io.files math.parser effects -classes.tuple classes.tuple.private classes float-arrays -float-vectors ; +USING: arrays byte-arrays bit-arrays generic hashtables io +assocs kernel math namespaces sequences strings sbufs io.styles +vectors words prettyprint.config prettyprint.sections quotations +io io.files math.parser effects classes.tuple +classes.tuple.private classes float-arrays ; IN: prettyprint.backend GENERIC: pprint* ( obj -- ) @@ -140,11 +139,8 @@ M: curry pprint-delims drop \ [ \ ] ; M: compose pprint-delims drop \ [ \ ] ; M: array pprint-delims drop \ { \ } ; M: byte-array pprint-delims drop \ B{ \ } ; -M: byte-vector pprint-delims drop \ BV{ \ } ; M: bit-array pprint-delims drop \ ?{ \ } ; -M: bit-vector pprint-delims drop \ ?V{ \ } ; M: float-array pprint-delims drop \ F{ \ } ; -M: float-vector pprint-delims drop \ FV{ \ } ; M: vector pprint-delims drop \ V{ \ } ; M: hashtable pprint-delims drop \ H{ \ } ; M: tuple pprint-delims drop \ T{ \ } ; diff --git a/core/sequences/sequences-docs.factor b/core/sequences/sequences-docs.factor index bb3dc9337e..0dea0f43d9 100755 --- a/core/sequences/sequences-docs.factor +++ b/core/sequences/sequences-docs.factor @@ -76,10 +76,7 @@ ARTICLE: "sequences-reshape" "Reshaping sequences" { $subsection reversed } { $subsection } "Transposing a matrix:" -{ $subsection flip } -"A " { $emphasis "column" } " presents a column of a matrix represented as a sequence of rows:" -{ $subsection column } -{ $subsection } ; +{ $subsection flip } ; ARTICLE: "sequences-appending" "Appending sequences" { $subsection append } @@ -785,23 +782,6 @@ HELP: { subseq } related-words -HELP: column -{ $class-description "A virtual sequence which presents a fixed column of a matrix represented as a sequence of rows. New instances can be created by calling " { $link } "." } ; - -HELP: ( seq n -- column ) -{ $values { "seq" sequence } { "n" "a non-negative integer" } { "column" column } } -{ $description "Outputs a new virtual sequence which presents a fixed column of a matrix represented as a sequence of rows." "The " { $snippet "i" } "th element of a column is the " { $snippet "n" } "th element of the " { $snippet "i" } "th element of" { $snippet "seq" } ". Every element of " { $snippet "seq" } " must be a sequence, and all sequences must have equal length." } -{ $examples - { $example - "USING: arrays prettyprint sequences ;" - "{ { 1 2 3 } { 4 5 6 } { 7 8 9 } } 0 >array ." - "{ 1 4 7 }" - } -} -{ $notes - "In the same sense that " { $link } " is a virtual variant of " { $link reverse } ", " { $link } " is a virtual variant of " { $snippet "swap [ nth ] curry map" } "." -} ; - HELP: repetition { $class-description "A virtual sequence consisting of " { $link repetition-elt } " repeated " { $link repetition-len } " times. Repetitions are created by calling " { $link } "." } ; diff --git a/core/sequences/sequences-tests.factor b/core/sequences/sequences-tests.factor index e8db18b3d0..100184798c 100755 --- a/core/sequences/sequences-tests.factor +++ b/core/sequences/sequences-tests.factor @@ -224,13 +224,6 @@ unit-test [ V{ 1 2 3 } ] [ 3 V{ 1 3 2 } clone [ push-new ] keep ] unit-test -! Columns -{ { 1 2 3 } { 4 5 6 } { 7 8 9 } } [ clone ] map "seq" set - -[ { 1 4 7 } ] [ "seq" get 0 >array ] unit-test -[ ] [ "seq" get 1 [ sq ] change-each ] unit-test -[ { 4 25 64 } ] [ "seq" get 1 >array ] unit-test - ! erg's random tester found this one [ SBUF" 12341234" ] [ 9 dup "1234" swap push-all dup dup swap push-all diff --git a/core/sequences/sequences.factor b/core/sequences/sequences.factor index 252df54391..924d9a05cb 100755 --- a/core/sequences/sequences.factor +++ b/core/sequences/sequences.factor @@ -215,18 +215,6 @@ M: slice length dup slice-to swap slice-from - ; INSTANCE: slice virtual-sequence -! A column of a matrix -TUPLE: column seq col ; - -C: column - -M: column virtual-seq column-seq ; -M: column virtual@ - dup column-col -rot column-seq nth bounds-check ; -M: column length column-seq length ; - -INSTANCE: column virtual-sequence - ! One element repeated many times TUPLE: repetition len elt ; @@ -703,5 +691,5 @@ PRIVATE> : flip ( matrix -- newmatrix ) dup empty? [ dup [ length ] map infimum - [ dup like ] with map + swap [ [ nth-unsafe ] with { } map-as ] curry { } map-as ] unless ; diff --git a/core/syntax/syntax-docs.factor b/core/syntax/syntax-docs.factor index c2eb411f0a..a2d15d2981 100755 --- a/core/syntax/syntax-docs.factor +++ b/core/syntax/syntax-docs.factor @@ -150,18 +150,6 @@ ARTICLE: "syntax-byte-arrays" "Byte array syntax" { $subsection POSTPONE: B{ } "Byte arrays are documented in " { $link "byte-arrays" } "." ; -ARTICLE: "syntax-bit-vectors" "Bit vector syntax" -{ $subsection POSTPONE: ?V{ } -"Bit vectors are documented in " { $link "bit-vectors" } "." ; - -ARTICLE: "syntax-float-vectors" "Float vector syntax" -{ $subsection POSTPONE: FV{ } -"Float vectors are documented in " { $link "float-vectors" } "." ; - -ARTICLE: "syntax-byte-vectors" "Byte vector syntax" -{ $subsection POSTPONE: BV{ } -"Byte vectors are documented in " { $link "byte-vectors" } "." ; - ARTICLE: "syntax-pathnames" "Pathname syntax" { $subsection POSTPONE: P" } "Pathnames are documented in " { $link "pathnames" } "." ; @@ -182,9 +170,6 @@ $nl { $subsection "syntax-float-arrays" } { $subsection "syntax-vectors" } { $subsection "syntax-sbufs" } -{ $subsection "syntax-bit-vectors" } -{ $subsection "syntax-byte-vectors" } -{ $subsection "syntax-float-vectors" } { $subsection "syntax-hashtables" } { $subsection "syntax-tuples" } { $subsection "syntax-pathnames" } ; @@ -291,30 +276,12 @@ HELP: B{ { $description "Marks the beginning of a literal byte array. Literal byte arrays are terminated by " { $link POSTPONE: } } "." } { $examples { $code "B{ 1 2 3 }" } } ; -HELP: BV{ -{ $syntax "BV{ elements... }" } -{ $values { "elements" "a list of bytes" } } -{ $description "Marks the beginning of a literal byte vector. Literal byte vectors are terminated by " { $link POSTPONE: } } "." } -{ $examples { $code "BV{ 1 2 3 12 }" } } ; - HELP: ?{ { $syntax "?{ elements... }" } { $values { "elements" "a list of booleans" } } { $description "Marks the beginning of a literal bit array. Literal bit arrays are terminated by " { $link POSTPONE: } } "." } { $examples { $code "?{ t f t }" } } ; -HELP: ?V{ -{ $syntax "?V{ elements... }" } -{ $values { "elements" "a list of booleans" } } -{ $description "Marks the beginning of a literal bit vector. Literal bit vectors are terminated by " { $link POSTPONE: } } "." } -{ $examples { $code "?V{ t f t }" } } ; - -HELP: FV{ -{ $syntax "FV{ elements... }" } -{ $values { "elements" "a list of real numbers" } } -{ $description "Marks the beginning of a literal float vector. Literal float vectors are terminated by " { $link POSTPONE: } } "." } -{ $examples { $code "FV{ 1.0 2.0 3.0 }" } } ; - HELP: F{ { $syntax "F{ elements... }" } { $values { "elements" "a list of real numbers" } } diff --git a/core/syntax/syntax.factor b/core/syntax/syntax.factor index eaf5ffea05..f6252a3e16 100755 --- a/core/syntax/syntax.factor +++ b/core/syntax/syntax.factor @@ -79,11 +79,8 @@ IN: bootstrap.syntax "{" [ \ } [ >array ] parse-literal ] define-syntax "V{" [ \ } [ >vector ] parse-literal ] define-syntax "B{" [ \ } [ >byte-array ] parse-literal ] define-syntax - "BV{" [ \ } [ >byte-vector ] parse-literal ] define-syntax "?{" [ \ } [ >bit-array ] parse-literal ] define-syntax - "?V{" [ \ } [ >bit-vector ] parse-literal ] define-syntax "F{" [ \ } [ >float-array ] parse-literal ] define-syntax - "FV{" [ \ } [ >float-vector ] parse-literal ] define-syntax "H{" [ \ } [ >hashtable ] parse-literal ] define-syntax "T{" [ \ } [ >tuple ] parse-literal ] define-syntax "W{" [ \ } [ first ] parse-literal ] define-syntax diff --git a/extra/benchmark/dispatch2/dispatch2.factor b/extra/benchmark/dispatch2/dispatch2.factor index d51a723cbd..53e9c9a14c 100644 --- a/extra/benchmark/dispatch2/dispatch2.factor +++ b/extra/benchmark/dispatch2/dispatch2.factor @@ -1,4 +1,4 @@ -USING: namespaces math sequences splitting kernel ; +USING: namespaces math sequences splitting kernel columns ; IN: benchmark.dispatch2 : sequences diff --git a/extra/benchmark/dispatch3/dispatch3.factor b/extra/benchmark/dispatch3/dispatch3.factor index bb4c5ba904..409d6d4a0f 100644 --- a/extra/benchmark/dispatch3/dispatch3.factor +++ b/extra/benchmark/dispatch3/dispatch3.factor @@ -1,5 +1,5 @@ USING: sequences math mirrors splitting kernel namespaces -assocs alien.syntax ; +assocs alien.syntax columns ; IN: benchmark.dispatch3 GENERIC: g ( obj -- str ) diff --git a/extra/benchmark/spectral-norm/spectral-norm.factor b/extra/benchmark/spectral-norm/spectral-norm.factor index 7eddeefc1b..2c7dc1e80d 100644 --- a/extra/benchmark/spectral-norm/spectral-norm.factor +++ b/extra/benchmark/spectral-norm/spectral-norm.factor @@ -19,7 +19,7 @@ IN: benchmark.spectral-norm pick 0.0 [ swap >r >r 2dup r> (eval-A-times-u) r> + ] reduce nip - ] F{ } map-as 2nip ; inline + ] F{ } map-as { float-array } declare 2nip ; inline : (eval-At-times-u) ( u i j -- x ) tuck swap eval-A >r swap nth-unsafe r> * ; inline @@ -29,7 +29,7 @@ IN: benchmark.spectral-norm pick 0.0 [ swap >r >r 2dup r> (eval-At-times-u) r> + ] reduce nip - ] F{ } map-as 2nip ; inline + ] F{ } map-as { float-array } declare 2nip ; inline : eval-AtA-times-u ( n u -- seq ) dupd eval-A-times-u eval-At-times-u ; inline diff --git a/core/bit-vectors/bit-vectors-docs.factor b/extra/bit-vectors/bit-vectors-docs.factor similarity index 82% rename from core/bit-vectors/bit-vectors-docs.factor rename to extra/bit-vectors/bit-vectors-docs.factor index f2f5c4da2c..9ceb2df342 100755 --- a/core/bit-vectors/bit-vectors-docs.factor +++ b/extra/bit-vectors/bit-vectors-docs.factor @@ -11,6 +11,8 @@ $nl "Creating bit vectors:" { $subsection >bit-vector } { $subsection } +"Literal syntax:" +{ $subsection POSTPONE: ?V{ } "If you don't care about initial capacity, a more elegant way to create a new bit vector is to write:" { $code "?V{ } clone" } ; @@ -31,3 +33,10 @@ HELP: bit-array>vector { $values { "bit-array" "an array" } { "length" "a non-negative integer" } { "bit-vector" bit-vector } } { $description "Creates a new bit vector using the array for underlying storage with the specified initial length." } { $warning "This word is in the " { $vocab-link "bit-vectors.private" } " vocabulary because it does not perform type or bounds checks. User code should call " { $link >bit-vector } " instead." } ; + +HELP: ?V{ +{ $syntax "?V{ elements... }" } +{ $values { "elements" "a list of booleans" } } +{ $description "Marks the beginning of a literal bit vector. Literal bit vectors are terminated by " { $link POSTPONE: } } "." } +{ $examples { $code "?V{ t f t }" } } ; + diff --git a/core/bit-vectors/bit-vectors-tests.factor b/extra/bit-vectors/bit-vectors-tests.factor similarity index 100% rename from core/bit-vectors/bit-vectors-tests.factor rename to extra/bit-vectors/bit-vectors-tests.factor diff --git a/core/bit-vectors/bit-vectors.factor b/extra/bit-vectors/bit-vectors.factor similarity index 79% rename from core/bit-vectors/bit-vectors.factor rename to extra/bit-vectors/bit-vectors.factor index db941ac6f7..a6e8ebe90a 100755 --- a/core/bit-vectors/bit-vectors.factor +++ b/extra/bit-vectors/bit-vectors.factor @@ -1,7 +1,8 @@ ! Copyright (C) 2008 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: arrays kernel kernel.private math sequences -sequences.private growable bit-arrays ; +sequences.private growable bit-arrays prettyprint.backend +parser ; IN: bit-vectors ; INSTANCE: bit-vector growable + +: ?V \ } [ >bit-vector ] parse-literal ; parsing + +M: bit-vector pprint-delims drop \ ?V{ \ } ; diff --git a/core/bit-vectors/summary.txt b/extra/bit-vectors/summary.txt similarity index 100% rename from core/bit-vectors/summary.txt rename to extra/bit-vectors/summary.txt diff --git a/core/bit-vectors/tags.txt b/extra/bit-vectors/tags.txt similarity index 100% rename from core/bit-vectors/tags.txt rename to extra/bit-vectors/tags.txt diff --git a/core/byte-vectors/byte-vectors-docs.factor b/extra/byte-vectors/byte-vectors-docs.factor similarity index 79% rename from core/byte-vectors/byte-vectors-docs.factor rename to extra/byte-vectors/byte-vectors-docs.factor index 0f1054ee5e..f34bc20219 100755 --- a/core/byte-vectors/byte-vectors-docs.factor +++ b/extra/byte-vectors/byte-vectors-docs.factor @@ -3,7 +3,7 @@ byte-vectors.private combinators ; IN: byte-vectors ARTICLE: "byte-vectors" "Byte vectors" -"A byte vector is a resizable mutable sequence of unsigned bytes. The literal syntax is covered in " { $link "syntax-byte-vectors" } ". Byte vector words are found in the " { $vocab-link "byte-vectors" } " vocabulary." +"A byte vector is a resizable mutable sequence of unsigned bytes. Byte vector words are found in the " { $vocab-link "byte-vectors" } " vocabulary." $nl "Byte vectors form a class:" { $subsection byte-vector } @@ -11,6 +11,8 @@ $nl "Creating byte vectors:" { $subsection >byte-vector } { $subsection } +"Literal syntax:" +{ $subsection POSTPONE: BV{ } "If you don't care about initial capacity, a more elegant way to create a new byte vector is to write:" { $code "BV{ } clone" } ; @@ -32,3 +34,9 @@ HELP: byte-array>vector { $values { "byte-array" "an array" } { "length" "a non-negative integer" } { "byte-vector" byte-vector } } { $description "Creates a new byte vector using the array for underlying storage with the specified initial length." } { $warning "This word is in the " { $vocab-link "byte-vectors.private" } " vocabulary because it does not perform type or bounds checks. User code should call " { $link >byte-vector } " instead." } ; + +HELP: BV{ +{ $syntax "BV{ elements... }" } +{ $values { "elements" "a list of bytes" } } +{ $description "Marks the beginning of a literal byte vector. Literal byte vectors are terminated by " { $link POSTPONE: } } "." } +{ $examples { $code "BV{ 1 2 3 12 }" } } ; diff --git a/core/byte-vectors/byte-vectors-tests.factor b/extra/byte-vectors/byte-vectors-tests.factor similarity index 100% rename from core/byte-vectors/byte-vectors-tests.factor rename to extra/byte-vectors/byte-vectors-tests.factor diff --git a/core/byte-vectors/byte-vectors.factor b/extra/byte-vectors/byte-vectors.factor similarity index 79% rename from core/byte-vectors/byte-vectors.factor rename to extra/byte-vectors/byte-vectors.factor index 206a23f43b..4d998bdfd6 100755 --- a/core/byte-vectors/byte-vectors.factor +++ b/extra/byte-vectors/byte-vectors.factor @@ -1,7 +1,8 @@ ! Copyright (C) 2008 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: arrays kernel kernel.private math sequences -sequences.private growable byte-arrays ; +sequences.private growable byte-arrays prettyprint.backend +parser ; IN: byte-vectors ; INSTANCE: byte-vector growable + +: BV{ \ } [ >byte-vector ] parse-literal ; parsing + +M: byte-vector pprint-delims drop \ BV{ \ } ; diff --git a/core/byte-vectors/summary.txt b/extra/byte-vectors/summary.txt similarity index 100% rename from core/byte-vectors/summary.txt rename to extra/byte-vectors/summary.txt diff --git a/core/byte-vectors/tags.txt b/extra/byte-vectors/tags.txt similarity index 100% rename from core/byte-vectors/tags.txt rename to extra/byte-vectors/tags.txt diff --git a/core/float-vectors/float-vectors-docs.factor b/extra/float-vectors/float-vectors-docs.factor similarity index 83% rename from core/float-vectors/float-vectors-docs.factor rename to extra/float-vectors/float-vectors-docs.factor index ef0645a0af..8d25da54be 100755 --- a/core/float-vectors/float-vectors-docs.factor +++ b/extra/float-vectors/float-vectors-docs.factor @@ -11,6 +11,8 @@ $nl "Creating float vectors:" { $subsection >float-vector } { $subsection } +"Literal syntax:" +{ $subsection POSTPONE: FV{ } "If you don't care about initial capacity, a more elegant way to create a new float vector is to write:" { $code "FV{ } clone" } ; @@ -32,3 +34,9 @@ HELP: float-array>vector { $values { "float-array" "an array" } { "length" "a non-negative integer" } { "float-vector" float-vector } } { $description "Creates a new float vector using the array for underlying storage with the specified initial length." } { $warning "This word is in the " { $vocab-link "float-vectors.private" } " vocabulary because it does not perform type or bounds checks. User code should call " { $link >float-vector } " instead." } ; + +HELP: FV{ +{ $syntax "FV{ elements... }" } +{ $values { "elements" "a list of real numbers" } } +{ $description "Marks the beginning of a literal float vector. Literal float vectors are terminated by " { $link POSTPONE: } } "." } +{ $examples { $code "FV{ 1.0 2.0 3.0 }" } } ; diff --git a/core/float-vectors/float-vectors-tests.factor b/extra/float-vectors/float-vectors-tests.factor similarity index 100% rename from core/float-vectors/float-vectors-tests.factor rename to extra/float-vectors/float-vectors-tests.factor diff --git a/core/float-vectors/float-vectors.factor b/extra/float-vectors/float-vectors.factor similarity index 80% rename from core/float-vectors/float-vectors.factor rename to extra/float-vectors/float-vectors.factor index 7f62f6f95c..f3f6b12090 100755 --- a/core/float-vectors/float-vectors.factor +++ b/extra/float-vectors/float-vectors.factor @@ -1,7 +1,8 @@ ! Copyright (C) 2008 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: arrays kernel kernel.private math sequences -sequences.private growable float-arrays ; +sequences.private growable float-arrays prettyprint.backend +parser ; IN: float-vectors ; INSTANCE: float-vector growable + +: FV{ \ } [ >float-vector ] parse-literal ; parsing + +M: float-vector pprint-delims drop \ FV{ \ } ; diff --git a/core/float-vectors/summary.txt b/extra/float-vectors/summary.txt similarity index 100% rename from core/float-vectors/summary.txt rename to extra/float-vectors/summary.txt diff --git a/core/float-vectors/tags.txt b/extra/float-vectors/tags.txt similarity index 100% rename from core/float-vectors/tags.txt rename to extra/float-vectors/tags.txt diff --git a/extra/help/handbook/handbook.factor b/extra/help/handbook/handbook.factor index 4e6bfe4888..d5bc1875e4 100755 --- a/extra/help/handbook/handbook.factor +++ b/extra/help/handbook/handbook.factor @@ -145,9 +145,9 @@ ARTICLE: "collections" "Collections" { $subsection "vectors" } "Resizable specialized sequences:" { $subsection "sbufs" } -{ $subsection "bit-vectors" } -{ $subsection "byte-vectors" } -{ $subsection "float-vectors" } +{ $vocab-subsection "Bit vectors" "bit-vectors" } +{ $vocab-subsection "Byte vectors" "byte-vectors" } +{ $vocab-subsection "Float vectors" "float-vectors" } { $heading "Associative mappings" } { $subsection "assocs" } { $subsection "namespaces" } diff --git a/extra/help/help.factor b/extra/help/help.factor index aa2704a799..e0b2709932 100755 --- a/extra/help/help.factor +++ b/extra/help/help.factor @@ -38,7 +38,7 @@ M: predicate word-help* drop \ $predicate ; \ $error-description swap word-help elements empty? not ; : sort-articles ( seq -- newseq ) - [ dup article-title ] { } map>assoc sort-values 0 ; + [ dup article-title ] { } map>assoc sort-values keys ; : all-errors ( -- seq ) all-words [ error? ] subset sort-articles ; diff --git a/extra/math/fft/fft.factor b/extra/math/fft/fft.factor index 625be534ce..4d4068158e 100644 --- a/extra/math/fft/fft.factor +++ b/extra/math/fft/fft.factor @@ -1,7 +1,7 @@ ! Fast Fourier Transform, copyright (C) 2007 Hans Schmid ! http://dressguardmeister.blogspot.com/2007/01/fft.html USING: arrays sequences math math.vectors math.constants -math.functions kernel splitting ; +math.functions kernel splitting columns ; IN: math.fft : n^v ( n v -- w ) [ ^ ] with map ; diff --git a/extra/math/haar/haar.factor b/extra/math/haar/haar.factor index 91d9fd8ece..9254fd0ce7 100644 --- a/extra/math/haar/haar.factor +++ b/extra/math/haar/haar.factor @@ -1,5 +1,5 @@ ! Haar wavelet transform -- http://dmr.ath.cx/gfx/haar/ -USING: sequences math kernel splitting ; +USING: sequences math kernel splitting columns ; IN: math.haar : averages ( seq -- seq ) diff --git a/extra/sudoku/sudoku.factor b/extra/sudoku/sudoku.factor index b0ba85c97f..1cb82253b1 100644 --- a/extra/sudoku/sudoku.factor +++ b/extra/sudoku/sudoku.factor @@ -1,6 +1,6 @@ ! Based on http://www.ffconsultancy.com/ocaml/sudoku/index.html USING: sequences namespaces kernel math math.parser io -io.styles combinators ; +io.styles combinators columns ; IN: sudoku SYMBOL: solutions diff --git a/extra/ui/gadgets/grids/grids.factor b/extra/ui/gadgets/grids/grids.factor index 342c360c83..9951256249 100644 --- a/extra/ui/gadgets/grids/grids.factor +++ b/extra/ui/gadgets/grids/grids.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2006 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: arrays kernel math namespaces sequences words io -io.streams.string math.vectors ui.gadgets ; +io.streams.string math.vectors ui.gadgets columns ; IN: ui.gadgets.grids TUPLE: grid children gap fill? ; diff --git a/extra/ui/gestures/gestures.factor b/extra/ui/gestures/gestures.factor index f68a70c2bd..ed0f38b743 100755 --- a/extra/ui/gestures/gestures.factor +++ b/extra/ui/gestures/gestures.factor @@ -3,7 +3,7 @@ USING: arrays assocs kernel math models namespaces sequences words strings system hashtables math.parser math.vectors classes.tuple classes ui.gadgets boxes -calendar alarms symbols combinators sets ; +calendar alarms symbols combinators sets columns ; IN: ui.gestures : set-gestures ( class hash -- ) "gestures" set-word-prop ; -- 2.34.1