From 180aeea68d96aaa1739139ddd0b00c847fe02693 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Thu, 18 Dec 2008 18:40:01 -0600 Subject: [PATCH 01/17] fix using. add --- basis/io/files/links/links.factor | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/basis/io/files/links/links.factor b/basis/io/files/links/links.factor index 8d13de723c..21cab64a2f 100644 --- a/basis/io/files/links/links.factor +++ b/basis/io/files/links/links.factor @@ -1,8 +1,7 @@ ! Copyright (C) 2008 Slava Pestov, Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors io.backend io.files.info -io.files.links.private io.files.types io.pathnames kernel math -namespaces system unix vocabs.loader ; +USING: accessors io.backend io.files.info io.files.types +io.pathnames kernel math namespaces system unix vocabs.loader ; IN: io.files.links HOOK: make-link os ( target symlink -- ) From a326943f8bfad933cf2508e5607caf45b47ed3f6 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Thu, 18 Dec 2008 18:42:05 -0600 Subject: [PATCH 02/17] better related-words for follow-links. add --- basis/io/files/links/links-docs.factor | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/basis/io/files/links/links-docs.factor b/basis/io/files/links/links-docs.factor index 4d448e5372..8419399c92 100644 --- a/basis/io/files/links/links-docs.factor +++ b/basis/io/files/links/links-docs.factor @@ -13,8 +13,6 @@ HELP: copy-link { $values { "target" "a path to an existing symlink" } { "symlink" "a path to a new symbolic link" } } { $description "Copies a symbolic link without following the link." } ; -{ make-link read-link copy-link } related-words - HELP: follow-link { $values { "path" "a pathname string" } @@ -29,6 +27,8 @@ HELP: follow-links } { $description "Follows a chain of symlinks up to " { $link symlink-depth } "." } ; +{ read-link follow-link follow-links } related-words + HELP: symlink-depth { $values { "value" integer } From 513b4b37084125c522924d3d124907bbd9d223e5 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Thu, 18 Dec 2008 19:32:09 -0600 Subject: [PATCH 03/17] use read-link instead, remove dependency on unix. oops --- basis/io/files/links/links.factor | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/basis/io/files/links/links.factor b/basis/io/files/links/links.factor index 21cab64a2f..1212d579db 100644 --- a/basis/io/files/links/links.factor +++ b/basis/io/files/links/links.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2008 Slava Pestov, Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. USING: accessors io.backend io.files.info io.files.types -io.pathnames kernel math namespaces system unix vocabs.loader ; +io.pathnames kernel math namespaces system vocabs.loader ; IN: io.files.links HOOK: make-link os ( target symlink -- ) @@ -14,7 +14,7 @@ HOOK: read-link os ( symlink -- path ) os unix? [ "io.files.links.unix" require ] when : follow-link ( path -- path' ) - [ parent-directory ] [ read-symbolic-link ] bi append-path ; + [ parent-directory ] [ read-link ] bi append-path ; SYMBOL: symlink-depth 10 symlink-depth set-global From 4f1aefd3fe23c9a377bf49706780293bcac8fbad Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Thu, 18 Dec 2008 19:57:21 -0600 Subject: [PATCH 04/17] fix bootstrap --- basis/io/files/info/unix/linux/linux.factor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/basis/io/files/info/unix/linux/linux.factor b/basis/io/files/info/unix/linux/linux.factor index 69a5597dd4..60313b3306 100644 --- a/basis/io/files/info/unix/linux/linux.factor +++ b/basis/io/files/info/unix/linux/linux.factor @@ -3,7 +3,7 @@ USING: accessors alien.c-types alien.syntax combinators csv io.backend io.encodings.utf8 io.files io.files.info io.streams.string io.files.unix kernel math.order namespaces sequences sorting -system unix unix.statfs.linux unix.statvfs.linux io.files.links.unix +system unix unix.statfs.linux unix.statvfs.linux io.files.links specialized-arrays.direct.uint arrays io.files.info.unix assocs io.pathnames ; IN: io.files.info.unix.linux From 88ec8786fd50ada80ce22c0876856857f264b3c4 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Thu, 18 Dec 2008 20:31:22 -0600 Subject: [PATCH 05/17] add using --- basis/io/files/links/links-tests.factor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/basis/io/files/links/links-tests.factor b/basis/io/files/links/links-tests.factor index 55caccb3ae..2d142ce900 100644 --- a/basis/io/files/links/links-tests.factor +++ b/basis/io/files/links/links-tests.factor @@ -1,5 +1,5 @@ USING: io.directories io.files.links tools.test -io.files.unique tools.files ; +io.files.unique tools.files fry ; IN: io.files.links.tests : make-test-links ( n path -- ) From 7836b2c6f461b40db041db3e85fce53bc2e717e0 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Thu, 18 Dec 2008 21:02:46 -0600 Subject: [PATCH 06/17] / >fixnum should be /i --- basis/ui/gadgets/editors/editors.factor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/basis/ui/gadgets/editors/editors.factor b/basis/ui/gadgets/editors/editors.factor index 72d5900c28..67386c1807 100755 --- a/basis/ui/gadgets/editors/editors.factor +++ b/basis/ui/gadgets/editors/editors.factor @@ -107,7 +107,7 @@ M: editor ungraft* editor-font* "" string-height ; : y>line ( y editor -- line# ) - line-height / >fixnum ; + line-height /i ; :: point>loc ( point editor -- loc ) point second editor y>line { From 74df92d12dee0a905b132cef6e4bcc421c8fb550 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Thu, 18 Dec 2008 21:17:24 -0600 Subject: [PATCH 07/17] Fix --- basis/struct-arrays/struct-arrays-tests.factor | 12 +++++++++++- basis/struct-arrays/struct-arrays.factor | 4 ++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/basis/struct-arrays/struct-arrays-tests.factor b/basis/struct-arrays/struct-arrays-tests.factor index d2bf583b5a..6f77e66cd2 100755 --- a/basis/struct-arrays/struct-arrays-tests.factor +++ b/basis/struct-arrays/struct-arrays-tests.factor @@ -1,6 +1,7 @@ IN: struct-arrays.tests USING: struct-arrays tools.test kernel math sequences -alien.syntax alien.c-types destructors libc accessors ; +alien.syntax alien.c-types destructors libc accessors +destructors ; C-STRUCT: test-struct { "int" "x" } @@ -27,3 +28,12 @@ C-STRUCT: test-struct 0 [ [ test-struct-x ] [ test-struct-y ] bi / + ] reduce ] with-destructors ] unit-test + +[ ] [ ALIEN: 123 10 "test-struct" drop ] unit-test + +[ ] [ + [ + 10 "test-struct" malloc-struct-array + underlying>> &free drop + ] with-destructors +] unit-test \ No newline at end of file diff --git a/basis/struct-arrays/struct-arrays.factor b/basis/struct-arrays/struct-arrays.factor index 33a469d0c8..ba0524009f 100755 --- a/basis/struct-arrays/struct-arrays.factor +++ b/basis/struct-arrays/struct-arrays.factor @@ -32,9 +32,9 @@ ERROR: bad-byte-array-length byte-array ; ] keep struct-array boa ; inline : ( alien length c-type -- struct-array ) - struct-array boa ; inline + heap-size struct-array boa ; inline : malloc-struct-array ( length c-type -- struct-array ) - heap-size [ calloc ] 2keep ; + [ heap-size calloc ] 2keep ; INSTANCE: struct-array sequence From 41d3b13f7c971039a6c63ea7bf4e3a254e24a7b2 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Thu, 18 Dec 2008 21:17:33 -0600 Subject: [PATCH 08/17] f print-topic no longer prints an error --- basis/help/help-tests.factor | 1 + basis/help/help.factor | 1 + 2 files changed, 2 insertions(+) diff --git a/basis/help/help-tests.factor b/basis/help/help-tests.factor index e38f2fc15d..e091278359 100644 --- a/basis/help/help-tests.factor +++ b/basis/help/help-tests.factor @@ -3,3 +3,4 @@ USING: tools.test help kernel ; [ 3 throw ] must-fail [ ] [ :help ] unit-test +[ ] [ f print-topic ] unit-test \ No newline at end of file diff --git a/basis/help/help.factor b/basis/help/help.factor index cd80a73dad..272bdc1db3 100644 --- a/basis/help/help.factor +++ b/basis/help/help.factor @@ -112,6 +112,7 @@ M: word set-article-parent swap "help-parent" set-word-prop ; ] with-style nl ; : print-topic ( topic -- ) + >link last-element off dup $title article-content print-content nl ; From 28b3b4b97abf11ee8cd13643b1780d84f5c84759 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Thu, 18 Dec 2008 23:44:14 -0600 Subject: [PATCH 09/17] add a lot more to the using list --- basis/io/files/links/links-tests.factor | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/basis/io/files/links/links-tests.factor b/basis/io/files/links/links-tests.factor index 2d142ce900..bc03e42f92 100644 --- a/basis/io/files/links/links-tests.factor +++ b/basis/io/files/links/links-tests.factor @@ -1,5 +1,6 @@ -USING: io.directories io.files.links tools.test -io.files.unique tools.files fry ; +USING: io.directories io.files.links tools.test sequences +io.files.unique tools.files fry math kernel math.parser +io.pathnames namespaces ; IN: io.files.links.tests : make-test-links ( n path -- ) From 766fccaeccadeb3429f9ab0aaef2f9ab4d7df228 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Thu, 18 Dec 2008 23:56:16 -0600 Subject: [PATCH 10/17] Compose model fires less unnecessary notifications --- basis/models/compose/compose-tests.factor | 24 ++++++++++++++++++++++- basis/models/compose/compose.factor | 3 ++- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/basis/models/compose/compose-tests.factor b/basis/models/compose/compose-tests.factor index 16a5ab339c..0644bb6841 100644 --- a/basis/models/compose/compose-tests.factor +++ b/basis/models/compose/compose-tests.factor @@ -1,5 +1,5 @@ USING: arrays generic kernel math models namespaces sequences assocs -tools.test models.compose accessors ; +tools.test models.compose accessors locals ; IN: models.compose.tests ! Test compose @@ -22,3 +22,25 @@ IN: models.compose.tests [ { 4 5 } ] [ "c" get value>> ] unit-test [ ] [ "c" get deactivate-model ] unit-test + +TUPLE: an-observer { i integer } ; + +M: an-observer model-changed nip [ 1+ ] change-i drop ; + +[ 1 0 ] [ + [let* | m1 [ 1 ] + m2 [ 2 ] + c [ { m1 m2 } ] + o1 [ an-observer new ] + o2 [ an-observer new ] | + + o1 m1 add-connection + o2 m2 add-connection + + c activate-model + + "OH HAI" m1 set-model + o1 i>> + o2 i>> + ] +] unit-test \ No newline at end of file diff --git a/basis/models/compose/compose.factor b/basis/models/compose/compose.factor index a2c3385248..386a06781d 100644 --- a/basis/models/compose/compose.factor +++ b/basis/models/compose/compose.factor @@ -18,7 +18,8 @@ TUPLE: compose < model ; M: compose model-changed nip - [ [ value>> ] composed-value ] keep set-model ; + dup [ value>> ] composed-value >>value + notify-connections ; M: compose model-activated dup model-changed ; From 69c64ba803f8360182ccc42fec1132d843592351 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Thu, 18 Dec 2008 23:56:41 -0600 Subject: [PATCH 11/17] Refactor operations-menu code to make it independent of presentations --- basis/ui/gadgets/menus/menus.factor | 8 ++++++- .../presentations/presentations.factor | 21 +++++++------------ 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/basis/ui/gadgets/menus/menus.factor b/basis/ui/gadgets/menus/menus.factor index 2aef0b8417..c482f31896 100644 --- a/basis/ui/gadgets/menus/menus.factor +++ b/basis/ui/gadgets/menus/menus.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2005, 2008 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: locals accessors arrays ui.commands ui.gadgets +USING: locals accessors arrays ui.commands ui.operations ui.gadgets ui.gadgets.buttons ui.gadgets.worlds ui.gestures generic hashtables kernel math models namespaces opengl sequences math.vectors ui.gadgets.theme ui.gadgets.packs @@ -54,3 +54,9 @@ M: menu-glass layout* gadget-child prefer ; : show-commands-menu ( target commands -- ) [ dup [ ] ] dip show-menu ; + +: ( target hook -- menu ) + over object-operations ; + +: show-operations-menu ( gadget target -- ) + [ ] show-menu ; \ No newline at end of file diff --git a/basis/ui/gadgets/presentations/presentations.factor b/basis/ui/gadgets/presentations/presentations.factor index 61a55e926b..f05ea5ae5d 100644 --- a/basis/ui/gadgets/presentations/presentations.factor +++ b/basis/ui/gadgets/presentations/presentations.factor @@ -11,8 +11,8 @@ IN: ui.gadgets.presentations TUPLE: presentation < button object hook ; : invoke-presentation ( presentation command -- ) - over dup hook>> call - [ object>> ] dip invoke-command ; + [ [ dup hook>> call ] [ object>> ] bi ] dip + invoke-command ; : invoke-primary ( presentation -- ) dup object>> primary-operation @@ -23,7 +23,7 @@ TUPLE: presentation < button object hook ; invoke-presentation ; : show-mouse-help ( presentation -- ) - dup object>> over show-summary button-update ; + [ [ object>> ] keep show-summary ] [ button-update ] bi ; : ( label object -- button ) swap [ invoke-primary ] presentation new-button @@ -35,18 +35,13 @@ M: presentation ungraft* dup hand-gadget get-global child? [ dup hide-status ] when call-next-method ; -: ( presentation -- menu ) - [ object>> ] - [ dup hook>> curry ] - [ object>> object-operations ] - tri ; - -: operations-menu ( presentation -- ) - dup show-menu ; +: show-operations-menu ( presentation -- ) + [ ] [ object>> ] [ dup hook>> curry ] tri + show-menu ; presentation H{ - { T{ button-down f f 3 } [ operations-menu ] } - { T{ mouse-leave } [ dup hide-status button-update ] } + { T{ button-down f f 3 } [ show-operations-menu ] } + { T{ mouse-leave } [ [ hide-status ] [ button-update ] bi ] } { T{ mouse-enter } [ show-mouse-help ] } ! Responding to motion too allows nested presentations to ! display status help properly, when the mouse leaves a From 84cafde43a30130ec4ea03b52dc282f553697922 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Fri, 19 Dec 2008 00:13:12 -0600 Subject: [PATCH 12/17] Fix load error --- basis/ui/gadgets/presentations/presentations-docs.factor | 2 -- 1 file changed, 2 deletions(-) diff --git a/basis/ui/gadgets/presentations/presentations-docs.factor b/basis/ui/gadgets/presentations/presentations-docs.factor index c651e849a2..005fa1e7fe 100644 --- a/basis/ui/gadgets/presentations/presentations-docs.factor +++ b/basis/ui/gadgets/presentations/presentations-docs.factor @@ -35,8 +35,6 @@ HELP: {