! Copyright (C) 2008, 2010 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license.
USING: accessors arrays assocs classes classes.private
-classes.tuple classes.tuple.private continuations definitions
-generic init kernel kernel.private math namespaces sequences
+classes.tuple.private continuations definitions generic
+hash-sets kernel kernel.private math namespaces sequences
sets source-files.errors vocabs words ;
-FROM: namespaces => set ;
-FROM: sets => members ;
IN: compiler.units
+PRIMITIVE: modify-code-heap ( alist update-existing? reset-pics? -- )
+
SYMBOL: old-definitions
SYMBOL: new-definitions
TUPLE: redefine-error def ;
-: redefine-error ( definition -- )
- \ redefine-error boa throw-continue ;
+: throw-redefine-error ( definition -- )
+ redefine-error boa throw-continue ;
<PRIVATE
-: add-once ( key assoc -- )
- 2dup key? [ over redefine-error ] when conjoin ;
+: add-once ( key set -- )
+ dupd ?adjoin [ drop ] [ throw-redefine-error ] if ;
-: (remember-definition) ( definition loc assoc -- )
+: (remember-definition) ( definition loc set -- )
[ over set-where ] dip add-once ;
PRIVATE>
new-definitions get first (remember-definition) ;
: fake-definition ( definition -- )
- old-definitions get [ delete-at ] with each ;
+ old-definitions get [ delete ] with each ;
: remember-class ( class loc -- )
- [ dup new-definitions get first key? [ dup redefine-error ] when ] dip
- new-definitions get second (remember-definition) ;
+ new-definitions get first2
+ [ dupd in? [ dup throw-redefine-error ] when ]
+ [ (remember-definition) ] bi-curry* bi* ;
: forward-reference? ( word -- ? )
- dup old-definitions get assoc-stack
- [ new-definitions get assoc-stack not ]
- [ drop f ] if ;
+ dup old-definitions get [ in? ] with any? [
+ new-definitions get [ in? ] with none?
+ ] [ drop f ] if ;
SYMBOL: compiler-impl
: changed-call-sites ( class generic -- )
update-call-sites [ changed-definition ] each ;
-M: generic update-generic ( class generic -- )
+M: generic update-generic
[ changed-call-sites ]
[ remake-generic drop ]
[ changed-conditionally drop ]
2tri ;
-M: sequence update-methods ( class seq -- )
+M: sequence update-methods
implementors [ update-generic ] with each ;
HOOK: recompile compiler-impl ( words -- alist )
: compile ( words -- )
recompile t f modify-code-heap ;
+: filter-word-defs ( defset -- words )
+ members [ word? ] filter ;
+
! Non-optimizing compiler
M: f update-call-sites
2drop { } ;
M: f to-recompile
- changed-definitions get [ drop word? ] assoc-filter keys ;
+ changed-definitions get filter-word-defs ;
M: f recompile
- [ dup def>> ] { } map>assoc ;
+ [ def>> ] zip-with ;
M: f process-forgotten-words drop ;
: without-optimizer ( quot -- )
[ f compiler-impl ] dip with-variable ; inline
-: <definitions> ( -- pair ) { H{ } H{ } } [ clone ] map ;
+: <definitions> ( -- pair ) { HS{ } HS{ } } [ clone ] map ;
SYMBOL: definition-observers
GENERIC: definitions-changed ( set obj -- )
-[ V{ } clone definition-observers set-global ]
-"compiler.units" add-startup-hook
+STARTUP-HOOK: [
+ V{ } clone definition-observers set-global
-! This goes here because vocabs cannot depend on init
-[ V{ } clone vocab-observers set-global ]
-"vocabs" add-startup-hook
+ ! This goes here because vocabs cannot depend on init
+ V{ } clone vocab-observers set-global
+]
: add-definition-observer ( obj -- )
definition-observers get push ;
<PRIVATE
: changed-vocabs ( set -- vocabs )
- members [ word? ] filter
- [ vocabulary>> dup [ lookup-vocab ] when ] map ;
+ filter-word-defs [ vocabulary>> dup [ lookup-vocab ] when ] map ;
: updated-definitions ( -- set )
HS{ } clone
- forgotten-definitions get keys over adjoin-all
- new-definitions get first keys over adjoin-all
- new-definitions get second keys over adjoin-all
- changed-definitions get keys over adjoin-all
- maybe-changed get keys over adjoin-all
+ forgotten-definitions get union!
+ new-definitions get first union!
+ new-definitions get second union!
+ changed-definitions get union!
+ maybe-changed get union!
dup changed-vocabs over adjoin-all ;
-: process-forgotten-definitions ( -- )
- forgotten-definitions get keys
+: process-forgotten-definitions ( forgotten-definitions -- )
+ members
[ [ word? ] filter process-forgotten-words ]
[ [ delete-definition-errors ] each ]
bi ;
: bump-effect-counter? ( -- ? )
- changed-effects get
- maybe-changed get
- changed-definitions get [ drop always-bump-effect-counter? ] assoc-filter
- 3array assoc-combine new-words get assoc-diff assoc-empty? not ;
+ changed-effects get members
+ maybe-changed get members
+ changed-definitions get members
+ [ always-bump-effect-counter? ] filter
+ 3array union-all new-words get [ in? not ] curry any? ;
: bump-effect-counter ( -- )
bump-effect-counter? [
] when ;
: notify-observers ( -- )
- updated-definitions dup null?
- [ drop ] [ notify-definition-observers notify-error-observers ] if ;
+ updated-definitions notify-definition-observers
+ notify-error-observers ;
: update-existing? ( defs -- ? )
- new-words get keys diff empty? not ;
+ new-words get [ in? not ] curry any? ;
: reset-pics? ( -- ? )
- outdated-generics get assoc-empty? not ;
+ outdated-generics get null? not ;
: finish-compilation-unit ( -- )
[ ] [
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
] if-bootstrapping ;
-TUPLE: nesting-observer new-words ;
+TUPLE: nesting-observer { new-words hash-set } ;
M: nesting-observer definitions-changed
- [ members ] dip new-words>> [ delete-at ] curry each ;
+ [ members ] dip new-words>> [ delete ] curry each ;
: add-nesting-observer ( -- )
new-words get nesting-observer boa
- [ nesting-observer set ] [ add-definition-observer ] bi ;
+ [ nesting-observer namespaces:set ] [ add-definition-observer ] bi ;
: remove-nesting-observer ( -- )
nesting-observer get remove-definition-observer ;
PRIVATE>
: with-nested-compilation-unit ( quot -- )
- [
- H{ } clone changed-definitions set
- H{ } clone maybe-changed set
- H{ } clone changed-effects set
- H{ } clone outdated-generics set
- H{ } clone outdated-tuples set
- H{ } clone new-words set
+ H{ } clone
+ HS{ } clone changed-definitions pick set-at
+ HS{ } clone maybe-changed pick set-at
+ HS{ } clone changed-effects pick set-at
+ HS{ } clone outdated-generics pick set-at
+ H{ } clone outdated-tuples pick set-at
+ HS{ } clone new-words pick set-at [
add-nesting-observer
[
remove-nesting-observer
finish-compilation-unit
- ] [ ] cleanup
- ] with-scope ; inline
+ ] finally
+ ] with-variables ; inline
: with-compilation-unit ( quot -- )
- [
- <definitions> new-definitions set
- <definitions> old-definitions set
- H{ } clone forgotten-definitions set
+ H{ } clone
+ <definitions> new-definitions pick set-at
+ <definitions> old-definitions pick set-at
+ HS{ } clone forgotten-definitions pick set-at [
with-nested-compilation-unit
- ] with-scope ; inline
+ ] with-variables ; inline
projects / factor.git / blobdiff