From f5a0a8b6e195dab0acb30fb6711064be739710ae Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Tue, 27 Oct 2009 23:25:35 -0500 Subject: [PATCH] delete -> remove! --- basis/documents/documents.factor | 2 +- basis/http/http.factor | 2 +- basis/models/models.factor | 4 ++-- basis/prettyprint/prettyprint-tests.factor | 2 +- basis/ui/backend/windows/windows.factor | 6 +++--- basis/ui/gadgets/gadgets.factor | 2 +- basis/ui/gestures/gestures.factor | 2 +- basis/windows/com/wrapper/wrapper.factor | 2 +- core/sequences/sequences-docs.factor | 12 ++++++------ core/sequences/sequences-tests.factor | 10 +++++----- core/sequences/sequences.factor | 4 ++-- core/sets/sets.factor | 2 +- core/vocabs/parser/parser.factor | 2 +- extra/digraphs/digraphs.factor | 4 ++-- 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/basis/documents/documents.factor b/basis/documents/documents.factor index b05c86c365..aef4f4de78 100644 --- a/basis/documents/documents.factor +++ b/basis/documents/documents.factor @@ -34,7 +34,7 @@ TUPLE: document < model locs undos redos inside-undo? ; : add-loc ( loc document -- ) locs>> push ; -: remove-loc ( loc document -- ) locs>> delete ; +: remove-loc ( loc document -- ) locs>> remove! drop ; : update-locs ( loc document -- ) locs>> [ set-model ] with each ; diff --git a/basis/http/http.factor b/basis/http/http.factor index 4c32954eee..4bcfbeb76d 100755 --- a/basis/http/http.factor +++ b/basis/http/http.factor @@ -193,7 +193,7 @@ M: response clone [ cookies>> ] dip '[ [ _ ] dip name>> = ] find nip ; : delete-cookie ( request/response name -- ) - over cookies>> [ get-cookie ] dip delete ; + over cookies>> [ get-cookie ] dip remove! drop ; : put-cookie ( request/response cookie -- request/response ) [ name>> dupd get-cookie [ dupd delete-cookie ] when* ] keep diff --git a/basis/models/models.factor b/basis/models/models.factor index 27504bc0fa..1c03bb224c 100644 --- a/basis/models/models.factor +++ b/basis/models/models.factor @@ -23,7 +23,7 @@ M: model hashcode* drop model hashcode* ; dependencies>> push ; : remove-dependency ( dep model -- ) - dependencies>> delete ; + dependencies>> remove! drop ; DEFER: add-connection @@ -63,7 +63,7 @@ GENERIC: model-changed ( model observer -- ) connections>> push ; : remove-connection ( observer model -- ) - [ connections>> delete ] keep + [ connections>> remove! drop ] keep dup connections>> empty? [ dup deactivate-model ] when drop ; diff --git a/basis/prettyprint/prettyprint-tests.factor b/basis/prettyprint/prettyprint-tests.factor index db3331305e..8ba6e94a49 100644 --- a/basis/prettyprint/prettyprint-tests.factor +++ b/basis/prettyprint/prettyprint-tests.factor @@ -196,7 +196,7 @@ DEFER: parse-error-file " {" " { [ dup continuation? ] [ append ] }" " { [ dup not ] [ drop reverse ] }" - " { [ dup pair? ] [ [ delete ] keep ] }" + " { [ dup pair? ] [ [ remove! drop ] keep ] }" " } cond ;" } ; diff --git a/basis/ui/backend/windows/windows.factor b/basis/ui/backend/windows/windows.factor index 7dbe3a3c48..b099917e7c 100755 --- a/basis/ui/backend/windows/windows.factor +++ b/basis/ui/backend/windows/windows.factor @@ -470,7 +470,7 @@ SYMBOL: nc-buttons : handle-wm-ncbutton ( hWnd uMsg wParam lParam -- ) 2drop nip message>button nc-buttons get - swap [ push ] [ delete ] if ; + swap [ push ] [ remove! drop ] if ; : mouse-wheel ( wParam -- array ) >lo-hi [ sgn neg ] map ; @@ -498,13 +498,13 @@ SYMBOL: nc-buttons : handle-wm-buttondown ( hWnd uMsg wParam lParam -- ) [ over set-capture - dup message>button drop nc-buttons get delete + dup message>button drop nc-buttons get remove! drop ] 2dip prepare-mouse send-button-down ; : handle-wm-buttonup ( hWnd uMsg wParam lParam -- ) mouse-captured get [ release-capture ] when pick message>button drop dup nc-buttons get member? [ - nc-buttons get delete 4drop + nc-buttons get remove! drop 4drop ] [ drop prepare-mouse send-button-up ] if ; diff --git a/basis/ui/gadgets/gadgets.factor b/basis/ui/gadgets/gadgets.factor index e4a0e672d2..12d0ef580d 100644 --- a/basis/ui/gadgets/gadgets.factor +++ b/basis/ui/gadgets/gadgets.factor @@ -306,7 +306,7 @@ M: gadget remove-gadget 2drop ; [ remove-gadget ] [ over (unparent) [ unfocus-gadget ] - [ children>> delete ] + [ children>> remove! drop ] [ nip relayout ] 2tri ] 2bi diff --git a/basis/ui/gestures/gestures.factor b/basis/ui/gestures/gestures.factor index 26eb45c8d0..8e982f8e45 100644 --- a/basis/ui/gestures/gestures.factor +++ b/basis/ui/gestures/gestures.factor @@ -297,7 +297,7 @@ SYMBOL: drag-timer : send-button-up ( gesture loc world -- ) move-hand - dup #>> hand-buttons get-global delete + dup #>> hand-buttons get-global remove! drop stop-drag-timer button-gesture ; diff --git a/basis/windows/com/wrapper/wrapper.factor b/basis/windows/com/wrapper/wrapper.factor index 27672df833..39f5ce1dad 100755 --- a/basis/windows/com/wrapper/wrapper.factor +++ b/basis/windows/com/wrapper/wrapper.factor @@ -159,7 +159,7 @@ PRIVATE> M: com-wrapper dispose* [ [ free ] each f ] change-vtbls - +live-wrappers+ get-global delete ; + +live-wrappers+ get-global remove! drop ; : com-wrap ( object wrapper -- wrapped-object ) [ vtbls>> ] [ (malloc-wrapped-object) ] bi diff --git a/core/sequences/sequences-docs.factor b/core/sequences/sequences-docs.factor index b74d24f90d..5a301256b0 100755 --- a/core/sequences/sequences-docs.factor +++ b/core/sequences/sequences-docs.factor @@ -491,9 +491,9 @@ HELP: move { $description "Sets the element with index " { $snippet "m" } " to the element with index " { $snippet "n" } "." } { $side-effects "seq" } ; -HELP: delete -{ $values { "elt" object } { "seq" "a resizable mutable sequence" } } -{ $description "Removes all elements equal to " { $snippet "elt" } " from " { $snippet "seq" } "." } +HELP: remove! +{ $values { "elt" object } { "seq" "a resizable mutable sequence" } { "elt" object } } +{ $description "Removes all elements equal to " { $snippet "elt" } " from " { $snippet "seq" } " and returns " { $snippet "seq" } "." } { $notes "This word uses equality comparison (" { $link = } ")." } { $side-effects "seq" } ; @@ -861,7 +861,7 @@ HELP: tail? { $values { "seq" sequence } { "end" sequence } { "?" "a boolean" } } { $description "Tests if " { $snippet "seq" } " ends with " { $snippet "end" } ". If " { $snippet "end" } " is longer than " { $snippet "seq" } ", this word outputs " { $link f } "." } ; -{ remove remove-nth remq delq delete delete-nth } related-words +{ remove remove-nth remq delq remove! delete-nth } related-words HELP: cut-slice { $values { "seq" sequence } { "n" "a non-negative integer" } { "before-slice" sequence } { "after-slice" "a slice" } } @@ -1593,7 +1593,7 @@ ARTICLE: "sequences-destructive" "Destructive operations" { $subsections map! change-nth } "Deleting elements:" { $subsections - delete + remove! delq delete-nth delete-slice @@ -1614,7 +1614,7 @@ ARTICLE: "sequences-destructive" "Destructive operations" { { $link suffix } { $link push } } { { $link but-last } { $link pop* } } { { $link unclip-last } { $link pop } } - { { $link remove } { $link delete } } + { { $link remove } { $link remove! } } { { $link remq } { $link delq } } { { $link remove-nth } { $link delete-nth } } { { $link reverse } { $link reverse-here } } diff --git a/core/sequences/sequences-tests.factor b/core/sequences/sequences-tests.factor index 897af3599b..48dee92457 100644 --- a/core/sequences/sequences-tests.factor +++ b/core/sequences/sequences-tests.factor @@ -126,11 +126,11 @@ unit-test [ 4 [ CHAR: a ] map ] unit-test -[ V{ } ] [ "f" V{ } clone [ delete ] keep ] unit-test -[ V{ } ] [ "f" V{ "f" } clone [ delete ] keep ] unit-test -[ V{ } ] [ "f" V{ "f" "f" } clone [ delete ] keep ] unit-test -[ V{ "x" } ] [ "f" V{ "f" "x" "f" } clone [ delete ] keep ] unit-test -[ V{ "y" "x" } ] [ "f" V{ "y" "f" "x" "f" } clone [ delete ] keep ] unit-test +[ V{ } ] [ "f" V{ } clone remove! ] unit-test +[ V{ } ] [ "f" V{ "f" } clone remove! ] unit-test +[ V{ } ] [ "f" V{ "f" "f" } clone remove! ] unit-test +[ V{ "x" } ] [ "f" V{ "f" "x" "f" } clone remove! ] unit-test +[ V{ "y" "x" } ] [ "f" V{ "y" "f" "x" "f" } clone remove! ] unit-test [ V{ 0 1 4 5 } ] [ 6 >vector 2 4 pick delete-slice ] unit-test diff --git a/core/sequences/sequences.factor b/core/sequences/sequences.factor index c9f652c58a..236d38bfd5 100755 --- a/core/sequences/sequences.factor +++ b/core/sequences/sequences.factor @@ -632,8 +632,8 @@ PRIVATE> : filter-here ( seq quot -- ) swap [ 0 0 ] dip (filter-here) ; inline -: delete ( elt seq -- ) - [ = not ] with filter-here ; +: remove! ( elt seq -- seq ) + [ [ = not ] with filter-here ] keep ; : delq ( elt seq -- ) [ eq? not ] with filter-here ; diff --git a/core/sets/sets.factor b/core/sets/sets.factor index c7b834297a..38c1f73bb3 100755 --- a/core/sets/sets.factor +++ b/core/sets/sets.factor @@ -3,7 +3,7 @@ USING: assocs hashtables kernel sequences vectors ; IN: sets -: adjoin ( elt seq -- ) [ delete ] [ push ] 2bi ; +: adjoin ( elt seq -- ) [ remove! drop ] [ push ] 2bi ; : conjoin ( elt assoc -- ) dupd set-at ; diff --git a/core/vocabs/parser/parser.factor b/core/vocabs/parser/parser.factor index 2fc9d05d79..26655e728e 100755 --- a/core/vocabs/parser/parser.factor +++ b/core/vocabs/parser/parser.factor @@ -172,7 +172,7 @@ TUPLE: rename word vocab words ; : use-words ( assoc -- ) (use-words) push ; -: unuse-words ( assoc -- ) (use-words) delete ; +: unuse-words ( assoc -- ) (use-words) remove! drop ; TUPLE: ambiguous-use-error words ; diff --git a/extra/digraphs/digraphs.factor b/extra/digraphs/digraphs.factor index 5ccc0d5a60..2b3379861f 100755 --- a/extra/digraphs/digraphs.factor +++ b/extra/digraphs/digraphs.factor @@ -21,10 +21,10 @@ TUPLE: vertex value edges ; : @edges ( from to digraph -- to edges ) swapd at edges>> ; : add-edge ( from to digraph -- ) @edges push ; -: delete-edge ( from to digraph -- ) @edges delete ; +: delete-edge ( from to digraph -- ) @edges remove! drop ; : delete-to-edges ( to digraph -- ) - [ nip dupd edges>> delete ] assoc-each drop ; + [ nip dupd edges>> remove! drop ] assoc-each drop ; : delete-vertex ( key digraph -- ) 2dup delete-at delete-to-edges ;