steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

heaps: bring back data-compare as heapdata-compare 

It is useful in several places. Change the name because
0d7233f2da changed the convention and data-* words now
operate on the data directly
freebsd-work
Jon Harper 2019-01-09 20:18:30 +01:00
parent e4579d02e7
commit 2a8643e936
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
basis/heaps/heaps.factor
View File

@ -70,6 +70,12 @@ M: min-heap heap-compare
M: max-heap heap-compare M: max-heap heap-compare
drop { entry entry } declare [ key>> ] bi@ before? ; inline drop { entry entry } declare [ key>> ] bi@ before? ; inline
: (heapdata-compare) ( m n data heap -- ? )
[ '[ _ data-nth ] bi@ ] [ heap-compare ] bi* ; inline
: heapdata-compare ( m n heap -- ? )
[ data>> ] keep (heapdata-compare) ; inline
PRIVATE> PRIVATE>
: >entry< ( entry -- value key ) : >entry< ( entry -- value key )
@ -117,7 +123,7 @@ M: heap heap-push*
n dup left [ dup end < ] [ n dup left [ dup end < ] [
dup 1 fixnum+fast dup 1 fixnum+fast
dup end < [ dup end < [
2dup [ data data-nth ] bi@ heap heap-compare 2dup data heap (heapdata-compare)
] [ f ] if ] [ f ] if
[ nip ] [ drop ] if [ nip ] [ drop ] if
[ data data-nth swap data data-set-nth ] [ data data-nth swap data data-set-nth ]