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

combinators: moving M\ iota hashcode* back since each-integer has hints.

db4
John Benediktsson 2013-03-04 17:46:46 -08:00
parent 8043b7b4ba
commit 2c33fe56a4
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/combinators/combinators.factor
View File

@ -201,6 +201,11 @@ M: reversed hashcode* [ sequence-hashcode ] recursive-hashcode ;
M: slice hashcode* [ sequence-hashcode ] recursive-hashcode ; M: slice hashcode* [ sequence-hashcode ] recursive-hashcode ;
M: iota hashcode*
over 0 <= [ 2drop 0 ] [
nip length 0 swap [ sequence-hashcode-step ] each-integer
] if ;
M: hashtable hashcode* M: hashtable hashcode*
[ [
dup assoc-size 1 eq? dup assoc-size 1 eq?

13
core/layouts/layouts.factor
View File

@ -91,17 +91,4 @@ M: real >integer
dup most-negative-fixnum most-positive-fixnum between? dup most-negative-fixnum most-positive-fixnum between?
[ >fixnum ] [ >bignum ] if ; inline [ >fixnum ] [ >bignum ] if ; inline
! we put this here so that it can use the references to
! most-positive-fixnum otherwise would be in combinatrs
M: iota hashcode*
over 0 <= [ 2drop 0 ] [
nip length [
0 most-positive-fixnum clamp integer>fixnum
0 swap [ sequence-hashcode-step ] each-integer
] [
most-positive-fixnum swap
[ sequence-hashcode-step ] (each-integer)
] bi
] if ;
UNION: immediate fixnum POSTPONE: f ; UNION: immediate fixnum POSTPONE: f ;