sequences.deep: deep-subseq? -> deep-subsequence?

swapped the stack args...

diff --git a/basis/fixups/fixups.factor b/basis/fixups/fixups.factor
index e87b0b643446c8df7edcc57beced1b1526f8b475..77e69dc0344c61b0202d4b5123ded9bdfe101001 100644 (file)
--- a/basis/fixups/fixups.factor
+++ b/basis/fixups/fixups.factor
@@ -48,6 +48,7 @@ CONSTANT: word-renames {
     { "(all-integers?)" { "all-integers-from?" "0.99" } }
     { "short" { "bound" "0.99" } }
     { "map-integers" { "map-integers-as" "0.99" } }
+    { "deep-subseq?" { "deep-subsequence?" "0.99" } }
 }
 
 : compute-assoc-fixups ( continuation name assoc -- seq )

diff --git a/basis/sequences/deep/deep-tests.factor b/basis/sequences/deep/deep-tests.factor
index 95f447a9576f783a1baa4f11aea106d2bb87ec67..86ace723941e7910c526aaffd397c3e093241c80 100644 (file)
--- a/basis/sequences/deep/deep-tests.factor
+++ b/basis/sequences/deep/deep-tests.factor
@@ -34,13 +34,13 @@ IN: sequences.deep.tests
 [ { { 1 2 3 } 4 } { { { 1 2 3 } 4 } 2 } deep-member? ] unit-test
 
 { f }
-[ { 1 2 3 4 } { 1 2 3 { 4 } } deep-subseq? ] unit-test
+[ { 1 2 3 { 4 } } { 1 2 3 4 } deep-subsequence? ] unit-test
 
 { t }
-[ { 1 2 3 4 } { 1 2 3 4 } deep-subseq? ] unit-test
+[ { 1 2 3 4 } { 1 2 3 4 } deep-subsequence? ] unit-test
 
 { t }
-[ { 1 2 3 4 } { { 1 2 3 4 } } deep-subseq? ] unit-test
+[ { { 1 2 3 4 } } { 1 2 3 4 } deep-subsequence? ] unit-test
 
 { 3 } [
     { 1 { 2 3 { 4 } } 5 { { 6 } 7 } } 0 [

diff --git a/basis/sequences/deep/deep.factor b/basis/sequences/deep/deep.factor
index 53910bb776a5636375f2a7e020c7326679a3f2ae..b376bc116f882b131cfa005c1b1aa324f913ac7b 100644 (file)
--- a/basis/sequences/deep/deep.factor
+++ b/basis/sequences/deep/deep.factor
@@ -54,8 +54,8 @@ M: object branch? drop f ;
         _ swap dup branch? [ member? ] [ 2drop f ] if
     ] deep-find >boolean ;
 
-: deep-subseq? ( subseq seq -- ? )
-    swap '[
+: deep-subsequence? ( seq subseq -- ? )
+   '[
         _ over branch? [ subsequence? ] [ 2drop f ] if
     ] deep-find >boolean ;