From c9ed6ab5a815f3f8c81ebd32da9847c2b8824cab Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Fri, 10 Feb 2023 23:08:31 -0600 Subject: [PATCH] sequences.extras: fix occurrence-count-by rename --- extra/sequences/extras/extras-tests.factor | 11 ++--------- extra/sequences/extras/extras.factor | 2 +- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/extra/sequences/extras/extras-tests.factor b/extra/sequences/extras/extras-tests.factor index 86eaf1a80e..4e1b7fd288 100644 --- a/extra/sequences/extras/extras-tests.factor +++ b/extra/sequences/extras/extras-tests.factor @@ -308,21 +308,14 @@ strings tools.test ; H{ { t 6 } { f 5 } } { 0 0 1 1 2 3 4 2 3 4 5 } } [ - { 2 7 1 8 1 7 1 8 2 8 4 } [ even? ] occurrence-count + { 2 7 1 8 1 7 1 8 2 8 4 } [ even? ] occurrence-count-by ] unit-test { H{ { 8 3 } { 1 3 } { 2 2 } { 4 1 } { 7 2 } } { 0 0 0 0 1 1 2 1 1 2 0 } } [ - { 2 7 1 8 1 7 1 8 2 8 4 } occurrence-count -] unit-test - -{ - H{ { 8 3 } { 1 3 } { 2 2 } { 4 1 } { 7 2 } } - { 0 0 0 0 1 1 2 1 1 2 0 } -} [ - { 2 7 1 8 1 7 1 8 2 8 4 } [ ] occurrence-count + { 2 7 1 8 1 7 1 8 2 8 4 } [ ] occurrence-count-by ] unit-test { diff --git a/extra/sequences/extras/extras.factor b/extra/sequences/extras/extras.factor index 8ad6cd0ab9..77a535100c 100644 --- a/extra/sequences/extras/extras.factor +++ b/extra/sequences/extras/extras.factor @@ -295,7 +295,7 @@ PRIVATE> : 0accumulate ( ... seq quot: ( ... prev elt -- ... next ) -- ... final newseq ) over 0accumulate-as ; inline -: occurrence-count ( seq quot: ( elt -- elt' ) -- hash seq' ) +: occurrence-count-by ( seq quot: ( elt -- elt' ) -- hash seq' ) '[ nip @ over inc-at* drop ] [ H{ } clone ] 2dip 0accumulate ; inline : nth-index ( n obj seq -- i ) -- 2.34.1