From 9760eb4fb197d265eb04a8c1a00432987c3153f2 Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Fri, 28 Dec 2007 14:17:31 +0100
Subject: [PATCH] Update collect-benchmarks so that it does not rely onto
 computed stack effect

---
 extra/project-euler/ave-time/ave-time.factor | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/extra/project-euler/ave-time/ave-time.factor b/extra/project-euler/ave-time/ave-time.factor
index d481b30c84..b908dbd7b0 100644
--- a/extra/project-euler/ave-time/ave-time.factor
+++ b/extra/project-euler/ave-time/ave-time.factor
@@ -1,23 +1,21 @@
 ! Copyright (c) 2007 Aaron Schaefer
 ! See http://factorcode.org/license.txt for BSD license.
-USING: arrays effects inference io kernel math math.functions math.parser
+USING: arrays combinators io kernel math math.functions math.parser
     math.statistics namespaces sequences tools.time ;
 IN: project-euler.ave-time
 
 <PRIVATE
 
-: clean-stack ( quot -- )
-    infer dup effect-out swap effect-in - [ drop ] times ;
-
 : ave-benchmarks ( seq -- pair )
     flip [ mean round ] map ;
 
 PRIVATE>
 
 : collect-benchmarks ( quot n -- seq )
-    [
-        1- [ [ benchmark ] keep -rot 2array , [ clean-stack ] keep ] times
-    ] curry { } make >r benchmark 2array r> swap add ; inline
+  [
+    >r >r datastack r> [ benchmark 2array , ] curry tuck
+    [ with-datastack drop ] 2curry r> swap times call
+  ] { } make ;
 
 : ave-time ( quot n -- )
     [ collect-benchmarks ] keep swap ave-benchmarks [