From 83660984fd8e44104b3b96dfd2a0f6d0de680902 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Fri, 29 Jul 2022 17:42:31 -0500 Subject: [PATCH] sequences.deep: deep-subseq? -> deep-subsequence? swapped the stack args... --- basis/fixups/fixups.factor | 1 + basis/sequences/deep/deep-tests.factor | 6 +++--- basis/sequences/deep/deep.factor | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/basis/fixups/fixups.factor b/basis/fixups/fixups.factor index e87b0b6434..77e69dc034 100644 --- 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 95f447a957..86ace72394 100644 --- 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 53910bb776..b376bc116f 100644 --- 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 ; -- 2.34.1