From 7c77597b09a47f48933fb866418dd6f95bc61243 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Thu, 21 Jun 2012 00:19:45 -0700
Subject: [PATCH] issue #358: fix a couple compiler errors

---
 basis/compiler/cfg/builder/alien/alien.factor | 6 +++---
 basis/compiler/compiler.factor                | 2 +-
 basis/compiler/errors/errors.factor           | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/basis/compiler/cfg/builder/alien/alien.factor b/basis/compiler/cfg/builder/alien/alien.factor
index 572b4f189f..3d2d3cc0ca 100644
--- a/basis/compiler/cfg/builder/alien/alien.factor
+++ b/basis/compiler/cfg/builder/alien/alien.factor
@@ -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 ;
diff --git a/basis/compiler/compiler.factor b/basis/compiler/compiler.factor
index 797d5f2143..2a9ec48e0e 100644
--- a/basis/compiler/compiler.factor
+++ b/basis/compiler/compiler.factor
@@ -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 ;
 
diff --git a/basis/compiler/errors/errors.factor b/basis/compiler/errors/errors.factor
index 04d7958db8..0588539e4a 100644
--- a/basis/compiler/errors/errors.factor
+++ b/basis/compiler/errors/errors.factor
@@ -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 ;