diff --git a/core/classes/tuple/tuple.factor b/core/classes/tuple/tuple.factor index 21f166cf32..0f0f359657 100644 --- a/core/classes/tuple/tuple.factor +++ b/core/classes/tuple/tuple.factor @@ -228,8 +228,7 @@ SYMBOL: outdated-tuples [ drop class-of "forgotten" word-prop not ] 2bi and ; -: update-tuples ( -- ) - outdated-tuples get +: update-tuples ( outdated-tuples -- ) dup assoc-empty? [ drop ] [ [ [ tuple? ] instances ] dip [ outdated-tuple? ] curry filter dup [ update-tuple ] map become diff --git a/core/compiler/units/units.factor b/core/compiler/units/units.factor index d42fe860d6..ec3d392e0a 100644 --- a/core/compiler/units/units.factor +++ b/core/compiler/units/units.factor @@ -129,8 +129,8 @@ M: object always-bump-effect-counter? drop f ; maybe-changed get union! dup changed-vocabs over adjoin-all ; -: process-forgotten-definitions ( -- ) - forgotten-definitions get members +: process-forgotten-definitions ( forgotten-definitions -- ) + members [ [ word? ] filter process-forgotten-words ] [ [ delete-definition-errors ] each ] bi ; @@ -138,7 +138,8 @@ M: object always-bump-effect-counter? drop f ; : bump-effect-counter? ( -- ? ) changed-effects get members maybe-changed get members - changed-definitions get members [ always-bump-effect-counter? ] filter + changed-definitions get members + [ always-bump-effect-counter? ] filter 3array combine new-words get [ in? not ] curry any? ; : bump-effect-counter ( -- ) @@ -162,8 +163,8 @@ M: object always-bump-effect-counter? drop f ; remake-generics to-recompile [ recompile - update-tuples - process-forgotten-definitions + outdated-tuples get update-tuples + forgotten-definitions get process-forgotten-definitions ] keep update-existing? reset-pics? modify-code-heap bump-effect-counter notify-observers