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

issue #358: fix a couple compiler errors

db4
Doug Coleman 2012-06-21 00:19:45 -07:00
parent 9f370ec639
commit 7c77597b09
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
basis/compiler/cfg/builder/alien/alien.factor
View File

@ -10,7 +10,7 @@ compiler.cfg.builder compiler.cfg.builder.alien.params
compiler.cfg.builder.alien.boxing compiler.cfg.builder.blocks
compiler.cfg.instructions compiler.cfg.stack-frame
compiler.cfg.stacks compiler.cfg.stacks.local
compiler.cfg.registers compiler.cfg.hats ;
compiler.cfg.registers compiler.cfg.hats compiler.errors ;
FROM: compiler.errors => no-such-symbol no-such-library ;
IN: compiler.cfg.builder.alien
@ -71,10 +71,10 @@ M: array dlsym-valid? '[ _ dlsym ] any? ;
{
{ [ dup library-dll dll-valid? not ] [
[ library-dll dll-path ] [ dlerror>> ] bi
cfg get word>> no-such-library drop
cfg get word>> no-such-library-error drop
] }
{ [ 2dup library-dll dlsym-valid? not ] [
drop dlerror cfg get word>> no-such-symbol
drop dlerror cfg get word>> no-such-symbol-error
] }
[ 2drop ]
} cond ;

2
basis/compiler/compiler.factor
View File

@ -92,7 +92,7 @@ M: word combinator? inline? ;
drop [ clear-compiler-error ] [ deoptimize* ] bi ;
: remember-error ( word error -- * )
[ swap <compiler-error> compiler-error ]
[ swap <compiler-error> save-compiler-error ]
[ [ drop ] [ not-compiled-def ] 2bi deoptimize-with ]
2bi ;

6
basis/compiler/errors/errors.factor
View File

@ -26,7 +26,7 @@ M: linkage-error error-type drop +linkage-error+ ;
compiler-errors linkage-errors
[ get-global delete-at ] bi-curry@ bi ;
: compiler-error ( error -- )
: save-compiler-error ( error -- )
dup asset>> compiler-errors get-global set-at ;
T{ error-type
@ -61,13 +61,13 @@ TUPLE: no-such-library name message ;
M: no-such-library summary drop "Library not found" ;
: no-such-library ( name message word -- ) \ no-such-library linkage-error ;
: no-such-library-error ( name message word -- ) \ no-such-library linkage-error ;
TUPLE: no-such-symbol name message ;
M: no-such-symbol summary drop "Symbol not found" ;
: no-such-symbol ( name message word -- ) \ no-such-symbol linkage-error ;
: no-such-symbol-error ( name message word -- ) \ no-such-symbol linkage-error ;
ERROR: not-compiled word error ;