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

Merge branch 'master' of git://factorcode.org/git/factor

db4
Doug Coleman 2009-03-13 01:25:50 -05:00
parent db19b48c3b 091468479d
commit 68b113d653
4 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
basis/stack-checker/stack-checker-tests.factor
View File

@ -7,7 +7,7 @@ sorting assocs definitions prettyprint io inspector
classes.tuple classes.union classes.predicate debugger classes.tuple classes.union classes.predicate debugger
threads.private io.streams.string io.timeouts io.thread threads.private io.streams.string io.timeouts io.thread
sequences.private destructors combinators eval locals.backend sequences.private destructors combinators eval locals.backend
system ; system compiler.units ;
IN: stack-checker.tests IN: stack-checker.tests
\ infer. must-infer \ infer. must-infer
@ -581,3 +581,10 @@ DEFER: eee'
[ [ ] debugging-curry-folding ] must-infer [ [ ] debugging-curry-folding ] must-infer
[ [ exit ] [ 1 2 3 ] if ] must-infer [ [ exit ] [ 1 2 3 ] if ] must-infer
! Stack effects are required now but FORGET: clears them...
: forget-test ( -- ) ;
[ forget-test ] must-infer
[ ] [ [ \ forget-test forget ] with-compilation-unit ] unit-test
[ forget-test ] must-infer

5
core/classes/classes.factor
View File

@ -42,8 +42,11 @@ PREDICATE: class < word "class" word-prop ;
PREDICATE: predicate < word "predicating" word-prop >boolean ; PREDICATE: predicate < word "predicating" word-prop >boolean ;
M: predicate forget*
[ call-next-method ] [ f "predicating" set-word-prop ] bi ;
M: predicate reset-word M: predicate reset-word
[ call-next-method ] [ { "predicating" } reset-props ] bi ; [ call-next-method ] [ f "predicating" set-word-prop ] bi ;
: define-predicate ( class quot -- ) : define-predicate ( class quot -- )
[ "predicate" word-prop first ] dip [ "predicate" word-prop first ] dip

14
core/words/words-tests.factor
View File

@ -55,18 +55,18 @@ GENERIC: testing
[ f ] [ \ testing generic? ] unit-test [ f ] [ \ testing generic? ] unit-test
: forgotten ; : forgotten ( -- ) ;
: another-forgotten ; : another-forgotten ( -- ) ;
FORGET: forgotten FORGET: forgotten
FORGET: another-forgotten FORGET: another-forgotten
: another-forgotten ; : another-forgotten ( -- ) ;
! I forgot remove-crossref calls! ! I forgot remove-crossref calls!
: fee ; : fee ( -- ) ;
: foe fee ; : foe ( -- ) fee ;
: fie foe ; : fie ( -- ) foe ;
[ t ] [ \ fee usage [ word? ] filter empty? ] unit-test [ t ] [ \ fee usage [ word? ] filter empty? ] unit-test
[ t ] [ \ foe usage empty? ] unit-test [ t ] [ \ foe usage empty? ] unit-test
@ -97,7 +97,7 @@ DEFER: calls-a-gensym
! more xref buggery ! more xref buggery
[ f ] [ [ f ] [
GENERIC: xyzzle ( x -- x ) GENERIC: xyzzle ( x -- x )
: a ; \ a : a ( -- ) ; \ a
M: integer xyzzle a ; M: integer xyzzle a ;
FORGET: a FORGET: a
M: object xyzzle ; M: object xyzzle ;

2
core/words/words.factor
View File

@ -248,7 +248,7 @@ M: word forget*
dup "forgotten" word-prop [ drop ] [ dup "forgotten" word-prop [ drop ] [
[ delete-xref ] [ delete-xref ]
[ [ name>> ] [ vocabulary>> vocab-words ] bi delete-at ] [ [ name>> ] [ vocabulary>> vocab-words ] bi delete-at ]
[ [ reset-word ] [ t "forgotten" set-word-prop ] bi ] [ t "forgotten" set-word-prop ]
tri tri
] if ; ] if ;