diff --git a/basis/io/encodings/korean/korean-docs.factor b/basis/io/encodings/korean/korean-docs.factor deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/basis/linked-assocs/linked-assocs-tests.factor b/basis/linked-assocs/linked-assocs-tests.factor index 7a259ee59a..5030e93abc 100644 --- a/basis/linked-assocs/linked-assocs-tests.factor +++ b/basis/linked-assocs/linked-assocs-tests.factor @@ -54,4 +54,12 @@ IN: linked-assocs.test { [ [ 1- ] bi@ ] [ 2 / ] } "second" pick set-at 4 6 pick values [ first call ] each + swap values [ second call ] each +] unit-test + +{ V{ { "az" 1 } { "by" 2 } { "cx" 3 } } } [ + + 1 "az" pick set-at + 2 "by" pick set-at + 3 "cx" pick set-at + >alist ] unit-test \ No newline at end of file diff --git a/basis/math/rectangles/positioning/positioning-docs.factor b/basis/math/rectangles/positioning/positioning-docs.factor deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/basis/nibble-arrays/nibble-arrays.factor b/basis/nibble-arrays/nibble-arrays.factor index d1ab0a34c1..22a1515908 100644 --- a/basis/nibble-arrays/nibble-arrays.factor +++ b/basis/nibble-arrays/nibble-arrays.factor @@ -10,7 +10,7 @@ TUPLE: nibble-array bytes ( m -- n ) 1 + 2/ ; inline diff --git a/basis/ui/operations/operations.factor b/basis/ui/operations/operations.factor index b938c2dc95..aa81899462 100644 --- a/basis/ui/operations/operations.factor +++ b/basis/ui/operations/operations.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: accessors arrays definitions kernel ui.commands ui.gestures sequences strings math words generic namespaces -hashtables help.markup quotations assocs fry call ; +hashtables help.markup quotations assocs fry call linked-assocs ; IN: ui.operations SYMBOL: +keyboard+ @@ -33,8 +33,11 @@ M: operation command-word command>> command-word ; SYMBOL: operations +operations [ ] initialize + : object-operations ( obj -- operations ) - operations get [ predicate>> call( obj -- ? ) ] with filter ; + operations get values + [ predicate>> call( obj -- ? ) ] with filter ; : gesture>operation ( gesture object -- operation/f ) object-operations [ operation-gesture = ] with find nip ; @@ -53,10 +56,14 @@ SYMBOL: operations : default-flags ( -- assoc ) H{ { +keyboard+ f } { +primary+ f } { +secondary+ f } } ; +: (define-operation) ( operation -- ) + dup [ command>> ] [ predicate>> ] bi + 2array operations get set-at ; + : define-operation ( pred command flags -- ) default-flags swap assoc-union dupd define-command - operations get push ; + (define-operation) ; : modify-operation ( translator operation -- operation ) clone diff --git a/basis/ui/tools/operations/operations.factor b/basis/ui/tools/operations/operations.factor index 5000364dad..ac95ebfef7 100644 --- a/basis/ui/tools/operations/operations.factor +++ b/basis/ui/tools/operations/operations.factor @@ -12,8 +12,6 @@ ui.commands ui.gadgets.editors ui.gestures ui.operations ui.tools.deploy models ; IN: ui.tools.operations -V{ } clone operations set-global - ! Objects [ drop t ] \ inspector H{ { +primary+ t } diff --git a/core/io/streams/null/null-tests.factor b/core/io/streams/null/null-tests.factor deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/extra/serial/windows/authors.txt b/extra/serial/windows/authors.txt index e69de29bb2..7c1b2f2279 100755 --- a/extra/serial/windows/authors.txt +++ b/extra/serial/windows/authors.txt @@ -0,0 +1 @@ +Doug Coleman