Miroirs/planckforth
1
0
Fork 0
mirror of https://github.com/nineties/planckforth synced 2024-12-27 21:58:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add table-keys and table-values

Browse source
This commit is contained in:
Koichi Nakamura 2021-12-04 20:15:28 +09:00
parent e25c3c3a39
commit c4948e468f
1 changed files with 35 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
lib/table.fs
View file

@ -33,8 +33,10 @@ struct
int% field entry>hash ( the hash value ) int% field entry>hash ( the hash value )
end-struct entry% end-struct entry%
\ Number of elments in the table
: table-size ( tbl -- n ) table>size @ ; export : table-size ( tbl -- n ) table>size @ ; export
\ Make hashtable considering given size hint
: make-table-with-hint ( hash equal n -- tbl ) : make-table-with-hint ( hash equal n -- tbl )
bitscan-reverse cells prime_numbers + @ ( n to bucket size ) bitscan-reverse cells prime_numbers + @ ( n to bucket size )
make-array ( allocate bucket ) make-array ( allocate bucket )
@ -50,6 +52,9 @@ end-struct entry%
10 constant DEFAULT_TABLE_SIZE_HINT 10 constant DEFAULT_TABLE_SIZE_HINT
\ Make hashtable. It takes two functions.
\ hash ( w -- n ) : compute hash value of w
\ equal ( w1 w2 -- n ) : compute equality of w1 and w2
: make-table ( hash equal -- tbl ) : make-table ( hash equal -- tbl )
DEFAULT_TABLE_SIZE_HINT make-table-with-hint DEFAULT_TABLE_SIZE_HINT make-table-with-hint
; export ; export
@ -80,6 +85,8 @@ end-struct entry%
2drop 0 2drop 0
; ;
\ Lookup table entry. KEY-NOT-FOUND exception is raised
\ when there is no corresponding entry.
: table@ ( key tbl -- val ) : table@ ( key tbl -- val )
2dup 2dup
2dup table>hash @ execute 2dup table>hash @ execute
@ -90,11 +97,13 @@ end-struct entry%
then then
; export ; export
\ Returns true when the key is in the table
: ?table-in ( key tbl -- n ) : ?table-in ( key tbl -- n )
2dup table>hash @ execute 2dup table>hash @ execute
find-entry 0 <> find-entry 0 <>
; export ; export
\ Store key-value pair to the table
: table! ( val key tbl -- ) : table! ( val key tbl -- )
2dup 2dup
2dup table>hash @ execute 2dup table>hash @ execute
@ -137,7 +146,25 @@ end-struct entry%
then then
; export ; export
( tables for major builtin types ) \ Returns cons-list of keys
: table-keys ( tbl -- list )
0 swap table>entries @
begin ?dup while
tuck entry>key @ swap cons swap
entry>next @
repeat
; export
\ Returns cons-list of values
: table-values ( tbl -- list )
0 swap table>entries @
begin ?dup while
tuck entry>value @ swap cons swap
entry>next @
repeat
; export
( === tables for major builtin types === )
: hash-next ( n1 n2 -- n3 ) : hash-next ( n1 n2 -- n3 )
+ 6122117 * 1627577 + + 6122117 * 1627577 +
; ;
@ -172,3 +199,10 @@ T{ :noname 100 0 do i 1 + i A table! loop ; execute -> }T
loop loop
; execute ; execute
T{ A table-size -> 100 }T T{ A table-size -> 100 }T
T{ A table-keys car -> 0 }T
T{ A table-keys cdr car -> 1 }T
T{ A table-keys cdr cdr car -> 2 }T
T{ A table-values car -> 1 }T
T{ A table-values cdr car -> 2 }T
T{ A table-values cdr cdr car -> 3 }T