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

bootstrap.image: Use error syntax.

db4
Doug Coleman 2013-03-29 09:35:13 -07:00
parent 5793229dae
commit 9af269a864
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
basis/bootstrap/image/image.factor
View File

@ -360,15 +360,14 @@ M: f ' drop \ f type-number ;
\ word [ emit-seq ] emit-object \ word [ emit-seq ] emit-object
] keep put-object ; ] keep put-object ;
: word-error ( word msg -- * ) ERROR: not-in-image vocabulary word ;
[ % dup vocabulary>> % " " % name>> % ] "" make throw ;
: transfer-word ( word -- word ) : transfer-word ( word -- word )
[ target-word ] keep or ; [ target-word ] keep or ;
: fixup-word ( word -- offset ) : fixup-word ( word -- offset )
transfer-word dup lookup-object transfer-word dup lookup-object
[ ] [ "Not in image: " word-error ] ?if ; [ ] [ [ vocabulary>> ] [ name>> ] bi not-in-image ] ?if ;
: fixup-words ( -- ) : fixup-words ( -- )
image get [ dup word? [ fixup-word ] when ] map! drop ; image get [ dup word? [ fixup-word ] when ] map! drop ;