From f20b4e5607d74f7f1a69e2c3568b3ca7823723ba Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Thu, 4 Feb 2010 17:40:18 +1300 Subject: [PATCH] tools.deploy.shaker: don't try to intern all word props anymore --- basis/tools/deploy/shaker/shaker.factor | 18 ++++++------------ basis/tools/memory/memory.factor | 2 -- core/classes/tuple/tuple-tests.factor | 8 -------- 3 files changed, 6 insertions(+), 22 deletions(-) diff --git a/basis/tools/deploy/shaker/shaker.factor b/basis/tools/deploy/shaker/shaker.factor index c9485a458c..5897712a02 100755 --- a/basis/tools/deploy/shaker/shaker.factor +++ b/basis/tools/deploy/shaker/shaker.factor @@ -106,18 +106,12 @@ IN: tools.deploy.shaker : strip-word-props ( stripped-props words -- ) "Stripping word properties" show - [ - swap '[ - [ - [ drop _ member? not ] assoc-filter sift-assoc - >alist f like - ] change-props drop - ] each - ] [ - H{ } clone '[ - [ [ _ [ ] cache ] map ] change-props drop - ] each - ] bi ; + swap '[ + [ + [ drop _ member? not ] assoc-filter sift-assoc + >alist f like + ] change-props drop + ] each ; : stripped-word-props ( -- seq ) [ diff --git a/basis/tools/memory/memory.factor b/basis/tools/memory/memory.factor index 69b19899b8..0c55612466 100644 --- a/basis/tools/memory/memory.factor +++ b/basis/tools/memory/memory.factor @@ -242,8 +242,6 @@ M: code-blocks nth-unsafe [ cache>> ] [ blocks>> ] bi '[ _ nth-unsafe ] cache ; inline -M: code-blocks hashcode* 2drop 0 ; - INSTANCE: code-blocks immutable-sequence : code-blocks ( -- blocks ) diff --git a/core/classes/tuple/tuple-tests.factor b/core/classes/tuple/tuple-tests.factor index c4c2e83e95..fe55365f46 100644 --- a/core/classes/tuple/tuple-tests.factor +++ b/core/classes/tuple/tuple-tests.factor @@ -706,14 +706,6 @@ ERROR: derived-error < base-error z ; [ (( x y z -- * )) ] [ \ derived-error stack-effect ] unit-test -USE: classes.struct - -[ { } ] [ - classes - [ "prototype" word-prop ] map - [ '[ _ hashcode drop f ] [ drop t ] recover ] filter -] unit-test - ! Make sure that tuple reshaping updates code heap roots TUPLE: code-heap-ref ;