From e422187be13adb33915d71becd15e33014b62c0f Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Sun, 18 Sep 2011 20:35:16 -0700 Subject: [PATCH] fuel.eval: some minor cleanup. --- extra/fuel/eval/eval.factor | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/extra/fuel/eval/eval.factor b/extra/fuel/eval/eval.factor index 3bd80e9be3..1620ce345e 100644 --- a/extra/fuel/eval/eval.factor +++ b/extra/fuel/eval/eval.factor @@ -35,12 +35,12 @@ t fuel-eval-res-flag set-global fuel-eval-restartable? [ drop ] [ clone restarts set-global ] if ; : fuel-pop-status ( -- ) - fuel-status-stack get empty? [ - fuel-status-stack get pop + fuel-status-stack get [ + pop [ manifest>> clone manifest set ] [ restarts>> fuel-pop-restarts ] bi - ] unless ; + ] unless-empty ; : fuel-forget-error ( -- ) f fuel-eval-error set-global ; : fuel-forget-result ( -- ) f fuel-eval-result set-global ; @@ -65,8 +65,7 @@ t fuel-eval-res-flag set-global [ [ fuel-eval-error set-global ] [ print-error ] bi ] recover ; : (fuel-eval-usings) ( usings -- ) - [ [ use-vocab ] curry [ drop ] recover ] each - fuel-forget-error fuel-forget-output ; + [ [ use-vocab ] curry [ drop ] recover ] each ; : (fuel-eval-in) ( in -- ) [ set-current-vocab ] when* ;