From: Jose A. Ortega Ruiz <jao@gnu.org>
Date: Sun, 19 Apr 2009 19:04:07 +0000 (+0200)
Subject: FUEL: conflict resolution
X-Git-Tag: 0.94~2132^2~3^2
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=954f1abeb1307dc9f849ca62d1c08f95ac8ff9ad

FUEL: conflict resolution
---

954f1abeb1307dc9f849ca62d1c08f95ac8ff9ad
diff --cc extra/fuel/eval/eval.factor
index 26d3999380,019b9105bc..3f7ce863c7
--- a/extra/fuel/eval/eval.factor
+++ b/extra/fuel/eval/eval.factor
@@@ -59,15 -59,12 +59,12 @@@ t fuel-eval-res-flag set-globa
      [ [ parse-lines ] with-compilation-unit call( -- ) ] curry
      [ print-error ] recover ;
  
- : (fuel-eval-each) ( lines -- )
-     [ (fuel-eval) ] each ;
- 
  : (fuel-eval-usings) ( usings -- )
 -    [ "USE: " prepend ] map
 -    (fuel-eval) fuel-forget-error fuel-forget-output ;
 +    [ [ use+ ] curry [ drop ] recover ] each
 +    fuel-forget-error fuel-forget-output ;
  
  : (fuel-eval-in) ( in -- )
 -    [ dup "IN: " prepend 1array (fuel-eval) in set ] when* ;
 +    [ in set ] when* ;
  
  : (fuel-eval-in-context) ( lines in usings -- )
      (fuel-begin-eval)