fuel.eval: using a local fuel-eval-error symbol. Fixes #142.

diff --git a/extra/fuel/eval/eval.factor b/extra/fuel/eval/eval.factor
index 7c83fc6e902a6aef0432e52f4c2547fc11f14b21..3bd80e9be372ad1959df5e95d53f222dc2aaf7a1 100644 (file)
--- a/extra/fuel/eval/eval.factor
+++ b/extra/fuel/eval/eval.factor
@@ -11,6 +11,9 @@ TUPLE: fuel-status manifest restarts ;
 SYMBOL: fuel-status-stack
 V{ } clone fuel-status-stack set-global
 
+SYMBOL: fuel-eval-error
+f fuel-eval-error set-global
+
 SYMBOL: fuel-eval-result
 f fuel-eval-result set-global
 
@@ -39,15 +42,17 @@ t fuel-eval-res-flag set-global
         bi
     ] unless ;
 
-: fuel-forget-error ( -- ) f error set-global ;
+: fuel-forget-error ( -- ) f fuel-eval-error set-global ;
 : fuel-forget-result ( -- ) f fuel-eval-result set-global ;
 : fuel-forget-output ( -- ) f fuel-eval-output set-global ;
 : fuel-forget-status ( -- )
     fuel-forget-error fuel-forget-result fuel-forget-output ;
 
 : fuel-send-retort ( -- )
-    error get fuel-eval-result get-global fuel-eval-output get-global
-    3array fuel-pprint flush nl "<~FUEL~>" write nl flush ;
+    fuel-eval-error get-global
+    fuel-eval-result get-global
+    fuel-eval-output get-global 3array
+    fuel-pprint flush nl "<~FUEL~>" write nl flush ;
 
 : (fuel-begin-eval) ( -- )
     fuel-push-status fuel-forget-status ;
@@ -57,7 +62,7 @@ t fuel-eval-res-flag set-global
 
 : (fuel-eval) ( lines -- )
     [ [ parse-lines ] with-compilation-unit call( -- ) ] curry
-    [ print-error ] recover ;
+    [ [ fuel-eval-error set-global ] [ print-error ] bi ] recover ;
 
 : (fuel-eval-usings) ( usings -- )
     [ [ use-vocab ] curry [ drop ] recover ] each