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

Fix bogus error message

db4
Slava Pestov 2008-11-02 03:10:27 -06:00
parent 866f798c00
commit 673fda2281
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/compiler/units/units.factor
View File

@ -18,13 +18,13 @@ TUPLE: redefine-error def ;
2dup key? [ over redefine-error ] when conjoin ; 2dup key? [ over redefine-error ] when conjoin ;
: (remember-definition) ( definition loc assoc -- ) : (remember-definition) ( definition loc assoc -- )
>r over set-where r> add-once ; [ over set-where ] dip add-once ;
: remember-definition ( definition loc -- ) : remember-definition ( definition loc -- )
new-definitions get first (remember-definition) ; new-definitions get first (remember-definition) ;
: remember-class ( class loc -- ) : remember-class ( class loc -- )
over new-definitions get first key? [ dup redefine-error ] when [ dup new-definitions get first key? [ dup redefine-error ] when ] dip
new-definitions get second (remember-definition) ; new-definitions get second (remember-definition) ;
: forward-reference? ( word -- ? ) : forward-reference? ( word -- ? )

6
core/parser/parser-tests.factor
View File

@ -490,3 +490,9 @@ must-fail-with
] [ ] [
error>> staging-violation? error>> staging-violation?
] must-fail-with ] must-fail-with
! Bogus error message
DEFER: blah
[ "IN: parser.tests USE: kernel TUPLE: blah < tuple ; : blah ; TUPLE: blah < tuple ; : blah ;" eval ]
[ error>> error>> def>> \ blah eq? ] must-fail-with