From f36a3c47133798232a5d55ccec45c7a3349ccbb6 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@shill.internal.stack-effects.com>
Date: Fri, 17 Apr 2009 20:49:36 -0500
Subject: [PATCH] fuel: Fix compiler warnings

---
 extra/fuel/eval/eval.factor | 15 +++++++--------
 extra/fuel/fuel.factor      |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/extra/fuel/eval/eval.factor b/extra/fuel/eval/eval.factor
index c3b1a8a3f2..b4a138459f 100644
--- a/extra/fuel/eval/eval.factor
+++ b/extra/fuel/eval/eval.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays compiler.units continuations debugger
 fuel.pprint io io.streams.string kernel namespaces parser sequences
-vectors vocabs.parser ;
+vectors vocabs.parser eval fry ;
 
 IN: fuel.eval
 
@@ -55,21 +55,20 @@ t fuel-eval-res-flag set-global
 : (fuel-end-eval) ( output -- )
     fuel-eval-output set-global fuel-send-retort fuel-pop-status ; inline
 
-: (fuel-eval) ( lines -- )
-    [ [ parse-lines ] with-compilation-unit call ] curry
-    [ print-error ] recover ; inline
+: (fuel-eval) ( string -- )
+    '[ _ eval( -- ) ] try ;
 
 : (fuel-eval-each) ( lines -- )
-    [ 1vector (fuel-eval) ] each ; inline
+    [ (fuel-eval) ] each ;
 
 : (fuel-eval-usings) ( usings -- )
-    [ "USING: " prepend " ;" append ] map
+    [ "USE: " prepend ] map
     (fuel-eval-each) fuel-forget-error fuel-forget-output ;
 
 : (fuel-eval-in) ( in -- )
-    [ dup "IN: " prepend 1vector (fuel-eval) in set ] when* ; inline
+    [ dup "IN: " prepend (fuel-eval) in set ] when* ;
 
 : (fuel-eval-in-context) ( lines in usings -- )
     (fuel-begin-eval)
-    [ (fuel-eval-usings) (fuel-eval-in) (fuel-eval) ] with-string-writer
+    [ (fuel-eval-usings) (fuel-eval-in) "\n" join (fuel-eval) ] with-string-writer
     (fuel-end-eval) ;
diff --git a/extra/fuel/fuel.factor b/extra/fuel/fuel.factor
index 403708e880..413aefdc76 100644
--- a/extra/fuel/fuel.factor
+++ b/extra/fuel/fuel.factor
@@ -104,7 +104,7 @@ PRIVATE>
 : fuel-vocab-summary ( name -- )
     (fuel-vocab-summary) fuel-eval-set-result ;
 
-: fuel-index ( quot -- ) call format-index fuel-eval-set-result ;
+: fuel-index ( quot -- ) call( -- seq ) format-index fuel-eval-set-result ;
 
 : fuel-get-vocabs/tag ( tag -- )
     (fuel-get-vocabs/tag) fuel-eval-set-result ;