From 4944bc29f2a7445c987a118f267d1dcbf9dd7d61 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Mon, 16 Feb 2009 21:23:10 -0600 Subject: [PATCH 1/7] use CONSTANT: --- basis/nibble-arrays/nibble-arrays.factor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From bff66cd47b77c27a1843ce8dda864e7eea05dbaa Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Mon, 16 Feb 2009 21:27:32 -0600 Subject: [PATCH 2/7] remove empty file --- basis/math/rectangles/positioning/positioning-docs.factor | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 basis/math/rectangles/positioning/positioning-docs.factor 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 From 53224ebce09920e6d7a1523634a61dabb87a978a Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Mon, 16 Feb 2009 21:29:13 -0600 Subject: [PATCH 3/7] remove empty file --- core/io/streams/null/null-tests.factor | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 core/io/streams/null/null-tests.factor 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 From f1cc9e7ebbaf1452f1a97dcbf6cf7f1514bcb2ff Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Mon, 16 Feb 2009 21:29:28 -0600 Subject: [PATCH 4/7] add author --- extra/serial/windows/authors.txt | 1 + 1 file changed, 1 insertion(+) 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 From f79f49a349a002bfe429c0d5c6397d6c8152701b Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Mon, 16 Feb 2009 21:30:22 -0600 Subject: [PATCH 5/7] remove empty file --- basis/io/encodings/korean/korean-docs.factor | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 basis/io/encodings/korean/korean-docs.factor 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 From 13d96df8b65a1863f149dcc578fdf4d2588a06ad Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Mon, 16 Feb 2009 21:42:09 -0600 Subject: [PATCH 6/7] Add unit test for >alist on linked-assocs --- basis/linked-assocs/linked-assocs-tests.factor | 8 ++++++++ 1 file changed, 8 insertions(+) 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 From be46168a24c0665d2f3e46821624b8636010723d Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Mon, 16 Feb 2009 21:42:47 -0600 Subject: [PATCH 7/7] define-operation doesn't add duplicate operations anymore; ui.operations initializes operations global variable automatically --- basis/ui/operations/operations.factor | 15 +++++++++++---- basis/ui/tools/operations/operations.factor | 2 -- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/basis/ui/operations/operations.factor b/basis/ui/operations/operations.factor index bcfca946dd..8ba0e5dac7 100644 --- a/basis/ui/operations/operations.factor +++ b/basis/ui/operations/operations.factor @@ -1,8 +1,8 @@ -! Copyright (C) 2006, 2008 Slava Pestov. +! Copyright (C) 2006, 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: accessors arrays definitions kernel ui.commands ui.gestures sequences strings math words generic namespaces make -hashtables help.markup quotations assocs fry ; +hashtables help.markup quotations assocs fry linked-assocs ; IN: ui.operations SYMBOL: +keyboard+ @@ -34,8 +34,11 @@ M: operation command-word command>> command-word ; SYMBOL: operations +operations [ ] initialize + : object-operations ( obj -- operations ) - operations get [ predicate>> call ] with filter ; + operations get values + [ predicate>> call ] with filter ; : find-operation ( obj quot -- command ) [ object-operations ] dip find-last nip ; inline @@ -51,10 +54,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 ( hook translator operation -- operation ) clone diff --git a/basis/ui/tools/operations/operations.factor b/basis/ui/tools/operations/operations.factor index a9405424dc..d8802d66c9 100644 --- a/basis/ui/tools/operations/operations.factor +++ b/basis/ui/tools/operations/operations.factor @@ -12,8 +12,6 @@ sequences tools.vocabs classes compiler.units accessors vocabs.parser ; IN: ui.tools.operations -V{ } clone operations set-global - ! Objects [ drop t ] \ inspect H{ { +primary+ t }