delete -> remove!

diff --git a/basis/documents/documents.factor b/basis/documents/documents.factor
index b05c86c36556a7bdca5bff8e6d5aef42a5649099..aef4f4de784bca14664ccfddc1941a9e098c5775 100644 (file)
--- 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 4c32954eee29cddac0b1de331530209bb6ec3e02..4bcfbeb76d47cf084d08cf6720648899b899cdcd 100755 (executable)
--- 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 27504bc0fa769d7e9b014aa6c9a424f286abbee2..1c03bb224c0e5a57850efe78e558d6de3bcffde2 100644 (file)
--- 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 db3331305ee2dbc1e1b49b560a6a024610188e7e..8ba6e94a49539aed5f863d6af48059529a1728d0 100644 (file)
--- 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 7dbe3a3c48ed3d6a98bb686b883e3094b5a9c0bc..b099917e7ce7836ec484038d79f16b5a2cb1da1a 100755 (executable)
--- 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 e4a0e672d231e96b9aa95b0c75668c1eea60cb01..12d0ef580d68419d06625a5a50e0a4109f34016d 100644 (file)
--- 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 26eb45c8d02196b2a5f20911057866de39abcbe2..8e982f8e4596e7322d361117997989fe878aff98 100644 (file)
--- 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 27672df83317f587ffbcfe05f7a3fdd85751a83d..39f5ce1dad71753051489e3900164c4adf4d042e 100755 (executable)
--- 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 b74d24f90d56438b789487dff1061c0e4ac92816..5a301256b05c82f2b1637a5ec5394b62ead324d9 100755 (executable)
--- 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 897af3599ba36eab38115b43e42ad212fbd7808a..48dee92457971ea45fa01333193453c6871694d1 100644 (file)
--- a/core/sequences/sequences-tests.factor
+++ b/core/sequences/sequences-tests.factor
@@ -126,11 +126,11 @@ unit-test
 [ 4 [ CHAR: a <string> ] 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 c9f652c58acbe5a0d515c00ff849777d3bc0237c..236d38bfd54471c1dcf57eaa2d226dae7d0f11a4 100755 (executable)
--- 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 c7b834297adab9ebce2bf0e973bfea68fc4dc29d..38c1f73bb372eca032898c05a90349bbfea3d00e 100755 (executable)
--- 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 2fc9d05d79e13a5910c49e8f4c427311492ae2b1..26655e728e663d830c3af637209a5d7ea657955d 100755 (executable)
--- 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 5ccc0d5a607653692df57529226e3ef4ed425563..2b3379861f3c3c7752bbd892df61eea2a035e250 100755 (executable)
--- 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 ;