seq-diff -> diff

seq-intersect -> intersect

diff --git a/core/bootstrap/stage2.factor b/core/bootstrap/stage2.factor
index a75b111e78a944394bb3931bdef6b7306717305a..f6c7146c5ae8fa5c00162999d2bfd9cb788dc1b8 100755 (executable)
--- a/core/bootstrap/stage2.factor
+++ b/core/bootstrap/stage2.factor
@@ -24,7 +24,7 @@ SYMBOL: bootstrap-time
 : load-components ( -- )
     "exclude" "include"
     [ get-global " " split [ empty? not ] subset ] bi@
-    seq-diff
+    diff
     [ "bootstrap." prepend require ] each ;
 
 ! : compile-remaining ( -- )

diff --git a/core/dlists/dlists-tests.factor b/core/dlists/dlists-tests.factor
index 28db6e1cbdde52a27604c4d63835ed936d2b7582..c995dbb77f8f4dfb0af61ef80de1598705ba2fb7 100755 (executable)
--- a/core/dlists/dlists-tests.factor
+++ b/core/dlists/dlists-tests.factor
@@ -79,7 +79,7 @@ IN: dlists.tests
         [ dlist-push-all ] keep
         [ dlist-delete-all ] keep
         dlist>array
-    ] 2keep seq-diff assert-same-elements
+    ] 2keep diff assert-same-elements
 ] unit-test
 
 [ ] [

diff --git a/core/generator/registers/registers.factor b/core/generator/registers/registers.factor
index b332d873c985a348cafda57a781df734f6216ce5..26f8d23956a4b1bc29990257ffe6e1d9f7fcd42a 100755 (executable)
--- a/core/generator/registers/registers.factor
+++ b/core/generator/registers/registers.factor
@@ -381,7 +381,7 @@ M: value (lazy-load)
 : (compute-free-vregs) ( used class -- vector )
     #! Find all vregs in 'class' which are not in 'used'.
     [ vregs length reverse ] keep
-    [ <vreg> ] curry map seq-diff
+    [ <vreg> ] curry map diff
     >vector ;
 
 : compute-free-vregs ( -- )

diff --git a/core/parser/parser.factor b/core/parser/parser.factor
index 65abd6c83cfea1c48c3a500bad57fff50887a49a..7572151b2549e21b5fc4c21da1250b1e858b5c60 100755 (executable)
--- a/core/parser/parser.factor
+++ b/core/parser/parser.factor
@@ -288,7 +288,7 @@ M: no-word-error summary
     scan-word bootstrap-word scan-word create-method-in ;
 
 : shadowed-slots ( superclass slots -- shadowed )
-    >r all-slot-names r> seq-intersect ;
+    >r all-slot-names r> intersect ;
 
 : check-slot-shadowing ( class superclass slots -- )
     shadowed-slots [

diff --git a/core/sequences/sequences-docs.factor b/core/sequences/sequences-docs.factor
index b7ad22996f5f63cae664e508cdf5f88b513a9197..215a140724d8fa6cbdbe1bbd78f4575c18528ad0 100755 (executable)
--- a/core/sequences/sequences-docs.factor
+++ b/core/sequences/sequences-docs.factor
@@ -65,7 +65,7 @@ ARTICLE: "sequences-add-remove" "Adding and removing sequence elements"
 { $subsection suffix }
 "Removing elements:"
 { $subsection remove }
-{ $subsection seq-diff } ;
+{ $subsection diff } ;
 
 ARTICLE: "sequences-reshape" "Reshaping sequences"
 "A " { $emphasis "repetition" } " is a virtual sequence consisting of a single element repeated multiple times:"
@@ -660,7 +660,7 @@ HELP: prefix
 { $example "USING: prettyprint sequences ;" "{ 1 2 3 } 0 prefix ." "{ 0 1 2 3 }" }
 } ;
 
-HELP: seq-diff
+HELP: diff
 { $values { "seq1" sequence } { "seq2" sequence } { "newseq" sequence } }
 { $description "Outputs a sequence consisting of elements present in " { $snippet "seq2" } " but not " { $snippet "seq1" } ", comparing elements for equality." } ;
 

diff --git a/core/sequences/sequences-tests.factor b/core/sequences/sequences-tests.factor
index 8d0a91e384e9046b69508924c77d579c925e99f4..e8db18b3d03872beb3ba6e5ff6cf18683e0cff68 100755 (executable)
--- a/core/sequences/sequences-tests.factor
+++ b/core/sequences/sequences-tests.factor
@@ -241,7 +241,7 @@ unit-test
 [ ?{ f t } ] [ 0 2 ?{ f t f } subseq ] unit-test
 
 [ V{ f f f } ] [ 3 V{ } new-sequence ] unit-test
-[ SBUF" \0\0\0" ] [ 3 SBUF" " new ] unit-test
+[ SBUF" \0\0\0" ] [ 3 SBUF" " new-sequence ] unit-test
 
 [ 0 ] [ f length ] unit-test
 [ f first ] must-fail

diff --git a/core/sequences/sequences.factor b/core/sequences/sequences.factor
index c87b1b68a5d550d366b916ee50d6367747c1b894..a4ef3abb04f13a27554f821c9cb2c231a04b0904 100755 (executable)
--- a/core/sequences/sequences.factor
+++ b/core/sequences/sequences.factor
@@ -444,7 +444,7 @@ PRIVATE>
 : memq? ( obj seq -- ? )
     [ eq? ] with contains? ;
 
-: seq-intersect ( seq1 seq2 -- seq1/\seq2 )
+: intersect ( seq1 seq2 -- seq1/\seq2 )
     swap [ member? ] curry subset ;
 
 : remove ( obj seq -- newseq )
@@ -512,7 +512,7 @@ M: slice equal? over slice? [ sequence= ] [ 2drop f ] if ;
         [ 0 swap copy ] keep
     ] new-like ;
 
-: seq-diff ( seq1 seq2 -- newseq )
+: diff ( seq1 seq2 -- newseq )
     swap [ member? not ] curry subset ;
 
 : peek ( seq -- elt ) dup length 1- swap nth ;

diff --git a/core/splitting/splitting.factor b/core/splitting/splitting.factor
index 08beb70237c80c79f857f4eb5a9da276728c643e..4d35e5c2588966f4ca87460b0211801ab7af54f6 100755 (executable)
--- a/core/splitting/splitting.factor
+++ b/core/splitting/splitting.factor
@@ -69,7 +69,7 @@ INSTANCE: groups sequence
 : split ( seq separators -- pieces ) [ split, ] { } make ;
 
 : string-lines ( str -- seq )
-    dup "\r\n" seq-intersect empty? [
+    dup "\r\n" intersect empty? [
         1array
     ] [
         "\n" split [

diff --git a/extra/delegate/delegate.factor b/extra/delegate/delegate.factor
index f8e238b7db2c0e9da7ec5feb870c5e3608313600..261617da6bbb88bc5ef3dc9f20d3c9b31e0c2b4e 100755 (executable)
--- a/extra/delegate/delegate.factor
+++ b/extra/delegate/delegate.factor
@@ -23,7 +23,7 @@ IN: delegate
 
 : forget-old-definitions ( protocol new-wordlist -- )
     >r users-and-words r>
-    seq-diff forget-all-methods ;
+    diff forget-all-methods ;
 
 : define-protocol ( protocol wordlist -- )
     ! 2dup forget-old-definitions

diff --git a/extra/http/http.factor b/extra/http/http.factor
index d894059b6fd8532dd5fa1539b118fe055c166875..e2e7f6ff77d8adb4f099e94df3f251f96f4d66de 100755 (executable)
--- a/extra/http/http.factor
+++ b/extra/http/http.factor
@@ -94,7 +94,7 @@ IN: http
 
 : check-header-string ( str -- str )
     #! http://en.wikipedia.org/wiki/HTTP_Header_Injection
-    dup "\r\n" seq-intersect empty?
+    dup "\r\n" intersect empty?
     [ "Header injection attack" throw ] unless ;
 
 : write-header ( assoc -- )

diff --git a/extra/http/server/validators/validators.factor b/extra/http/server/validators/validators.factor
index 32a1125809ae71f43b06cecf3f6a430c74d29887..d267076ff0040f2aaf2006223a5cce83a465844d 100755 (executable)
--- a/extra/http/server/validators/validators.factor
+++ b/extra/http/server/validators/validators.factor
@@ -70,7 +70,7 @@ C: <validation-error> validation-error
     dup empty? [ "must remain blank" throw ] unless ;
 
 : v-one-line ( str -- str )
-    dup "\r\n" seq-intersect empty?
+    dup "\r\n" intersect empty?
     [ "must be a single line" throw ] unless ;
 
 : v-one-word ( str -- str )

diff --git a/extra/locals/locals.factor b/extra/locals/locals.factor
index a961dec3bde2916a710120bdd68a0c460ec172bd..a936d8c1ee69c31e20e0277aa44a4acb7480ac97 100755 (executable)
--- a/extra/locals/locals.factor
+++ b/extra/locals/locals.factor
@@ -140,7 +140,7 @@ M: object free-vars drop { } ;
 M: quotation free-vars { } [ add-if-free ] reduce ;
 
 M: lambda free-vars
-    dup vars>> swap body>> free-vars seq-diff ;
+    dup vars>> swap body>> free-vars diff ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ! lambda-rewrite

diff --git a/extra/opengl/capabilities/capabilities.factor b/extra/opengl/capabilities/capabilities.factor
index d27df4965db5bde233a99dd3a27b8f51f7a06294..c3a40cc23ee94f9072d20881d8a4bb051c429c19 100755 (executable)
--- a/extra/opengl/capabilities/capabilities.factor
+++ b/extra/opengl/capabilities/capabilities.factor
@@ -15,7 +15,7 @@ IN: opengl.capabilities
 : has-gl-extensions? ( extensions -- ? )
     gl-extensions swap [ over member? ] all? nip ;
 : (make-gl-extensions-error) ( required-extensions -- )
-    gl-extensions swap seq-diff
+    gl-extensions swap diff
     "Required OpenGL extensions not supported:\n" %
     [ "    " % % "\n" % ] each ;
 : require-gl-extensions ( extensions -- )

diff --git a/extra/project-euler/023/023.factor b/extra/project-euler/023/023.factor
index 526bb4c4464e716afb6023c7c285529354071914..1219af1f1541ae8243527c6e0a4956266fde9672 100644 (file)
--- a/extra/project-euler/023/023.factor
+++ b/extra/project-euler/023/023.factor
@@ -51,7 +51,7 @@ IN: project-euler.023
 PRIVATE>
 
 : euler023 ( -- answer )
-    20161 abundants-upto possible-sums source-023 seq-diff sum ;
+    20161 abundants-upto possible-sums source-023 diff sum ;
 
 ! TODO: solution is still too slow, although it takes under 1 minute
 

diff --git a/extra/project-euler/035/035.factor b/extra/project-euler/035/035.factor
index 9873abf05ca727127cc3630c28dd4dc4ed7e7fd4..63b80b6d6340d53a6241721c397f033b29b9d3d3 100755 (executable)
--- a/extra/project-euler/035/035.factor
+++ b/extra/project-euler/035/035.factor
@@ -28,7 +28,7 @@ IN: project-euler.035
 
 : possible? ( seq -- ? )
     dup length 1 > [
-        dup { 0 2 4 5 6 8 } swap seq-diff =
+        dup { 0 2 4 5 6 8 } swap diff =
     ] [
         drop t
     ] if ;

diff --git a/extra/project-euler/043/043.factor b/extra/project-euler/043/043.factor
index cf09277f31ba09c0314b2fe0dd1b4baf05a41f54..37963d6bd355f7e5a97897471e7c0b4f90ded605 100644 (file)
--- a/extra/project-euler/043/043.factor
+++ b/extra/project-euler/043/043.factor
@@ -79,7 +79,7 @@ PRIVATE>
     [ unclip 1 head prefix concat ] map [ all-unique? ] subset ;
 
 : add-missing-digit ( seq -- seq )
-    dup natural-sort 10 seq-diff first prefix ;
+    dup natural-sort 10 diff first prefix ;
 
 : interesting-pandigitals ( -- seq )
     17 candidates { 13 11 7 5 3 2 } [

diff --git a/extra/project-euler/079/079.factor b/extra/project-euler/079/079.factor
index b4cbd6dbcbcf45d7580307579e33358a6468fb6c..6f9191234bacd1170b509c9dd5c9a0bf489002e2 100644 (file)
--- a/extra/project-euler/079/079.factor
+++ b/extra/project-euler/079/079.factor
@@ -35,7 +35,7 @@ IN: project-euler.079
     ] { } make ;
 
 : find-source ( seq -- elt )
-    dup values swap keys [ prune ] bi@ seq-diff
+    dup values swap keys [ prune ] bi@ diff
     dup empty? [ "Topological sort failed" throw ] [ first ] if ;
 
 : remove-source ( seq elt -- seq )
@@ -52,7 +52,7 @@ PRIVATE>
 
 : topological-sort ( seq -- seq )
     [ [ (topological-sort) ] { } make ] keep
-    concat prune dupd seq-diff append ;
+    concat prune dupd diff append ;
 
 : euler079 ( -- answer )
     source-079 >edges topological-sort 10 digits>integer ;
@@ -60,7 +60,7 @@ PRIVATE>
 ! [ euler079 ] 100 ave-time
 ! 2 ms run / 0 ms GC ave time - 100 trials
 
-! TODO: prune and seq-diff are relatively slow; topological sort could be
+! TODO: prune and diff are relatively slow; topological sort could be
 ! cleaned up and generalized much better, but it works for this problem
 
 MAIN: euler079

diff --git a/extra/qualified/qualified.factor b/extra/qualified/qualified.factor
index c6f8dd8c89065f800ae85b0d5940d142b06efcfa..c10a102c58b1669d7d62556231bb2ae7ce772b6b 100644 (file)
--- a/extra/qualified/qualified.factor
+++ b/extra/qualified/qualified.factor
@@ -23,7 +23,7 @@ IN: qualified
     ] curry map zip ;
 
 : partial-vocab-ignoring ( words name -- assoc )
-    [ vocab-words keys seq-diff ] keep partial-vocab ;
+    [ vocab-words keys diff ] keep partial-vocab ;
 
 : EXCLUDE:
     #! Syntax: EXCLUDE: vocab => words ... ;

diff --git a/extra/smtp/smtp.factor b/extra/smtp/smtp.factor
index 8e84f99fe14b78bf80b45b40f9596928ec610ae1..f42c133ab7e2c19639850a37dc29047e4e4adfa8 100755 (executable)
--- a/extra/smtp/smtp.factor
+++ b/extra/smtp/smtp.factor
@@ -32,7 +32,7 @@ LOG: log-smtp-connection NOTICE ( addrspec -- )
 
 : validate-address ( string -- string' )
     #! Make sure we send funky stuff to the server by accident.
-    dup "\r\n>" seq-intersect empty?
+    dup "\r\n>" intersect empty?
     [ "Bad e-mail address: " prepend throw ] unless ;
 
 : mail-from ( fromaddr -- )
@@ -90,7 +90,7 @@ LOG: smtp-response DEBUG
 : get-ok ( -- ) receive-response check-response ;
 
 : validate-header ( string -- string' )
-    dup "\r\n" seq-intersect empty?
+    dup "\r\n" intersect empty?
     [ "Invalid header string: " prepend throw ] unless ;
 
 : write-header ( key value -- )

diff --git a/extra/tools/deploy/shaker/shaker.factor b/extra/tools/deploy/shaker/shaker.factor
index 72e1c33a26e88aef7cfdeab966216b997aaa5f3a..cbab0d13dd1e9b87a6fb4492ad985016c6354c4d 100755 (executable)
--- a/extra/tools/deploy/shaker/shaker.factor
+++ b/extra/tools/deploy/shaker/shaker.factor
@@ -104,7 +104,7 @@ IN: tools.deploy.shaker
     set-global ;
 
 : strip-vocab-globals ( except names -- words )
-    [ child-vocabs [ words ] map concat ] map concat seq-diff ;
+    [ child-vocabs [ words ] map concat ] map concat diff ;
 
 : stripped-globals ( -- seq )
     [

diff --git a/extra/tools/vocabs/vocabs.factor b/extra/tools/vocabs/vocabs.factor
index 484d401769bd75e05a0e1c1b4cc953f516f2b54a..46936af92c1b2bc20ca3bd4e88928c780a895bf0 100755 (executable)
--- a/extra/tools/vocabs/vocabs.factor
+++ b/extra/tools/vocabs/vocabs.factor
@@ -126,7 +126,7 @@ SYMBOL: modified-docs
             modified-sources get\r
             modified-docs get\r
         ]\r
-        [ modified-sources get modified-docs get append swap seq-diff ] bi\r
+        [ modified-sources get modified-docs get append swap diff ] bi\r
     ] with-scope ;\r
 \r
 : do-refresh ( modified-sources modified-docs unchanged -- )\r

diff --git a/extra/units/units.factor b/extra/units/units.factor
index 6c75397ec701d9f9298d21a7920fabf84e9738e7..d556b5b8696ea19c5fae85be8e2a592e3e09d048 100755 (executable)
--- a/extra/units/units.factor
+++ b/extra/units/units.factor
@@ -19,7 +19,7 @@ M: dimensions-not-equal summary drop "Dimensions do not match" ;
     [ remove-one ] curry bi@ ;
 
 : symbolic-reduce ( seq seq -- seq seq )
-    2dup seq-intersect dup empty?
+    2dup intersect dup empty?
     [ drop ] [ first 2remove-one symbolic-reduce ] if ;
 
 : <dimensioned> ( n top bot -- obj )

diff --git a/extra/xml/tokenize/tokenize.factor b/extra/xml/tokenize/tokenize.factor
index de35f469cc04d494e466dec6f1ce168f5ecf1750..de6ffed06b15ffc89723f0c8cc35a0106b5dc03a 100644 (file)
--- a/extra/xml/tokenize/tokenize.factor
+++ b/extra/xml/tokenize/tokenize.factor
@@ -162,7 +162,7 @@ SYMBOL: ns-stack
         T{ name f "" "version" f }
         T{ name f "" "encoding" f }
         T{ name f "" "standalone" f }
-    } swap seq-diff
+    } swap diff
     dup empty? [ drop ] [ <extra-attrs> throw ] if ; 
 
 : good-version ( version -- version )

diff --git a/extra/xmode/loader/loader.factor b/extra/xmode/loader/loader.factor
index 096b83e22effb3797a0092f51ce1b2f0902251a5..68b2c85a7db0207e704d0f7ecb42b52e97993406 100755 (executable)
--- a/extra/xmode/loader/loader.factor
+++ b/extra/xmode/loader/loader.factor
@@ -71,7 +71,7 @@ TAGS>
     ] keep ;
 
 : merge-rule-set-props ( props rule-set -- )
-    [ rule-set-props union ] keep set-rule-set-props ;
+    [ rule-set-props assoc-union ] keep set-rule-set-props ;
 
 ! Top-level entry points
 : parse-mode-tag ( tag -- rule-sets )