summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraarne <aarne@cs.chalmers.se>2008-06-27 06:50:50 +0000
committeraarne <aarne@cs.chalmers.se>2008-06-27 06:50:50 +0000
commite8dc8c3ef5fa82c6bbab7ae8c7a4c75003af48c9 (patch)
tree21ae3c291480c359de099303cf111adff236bc12
parent757ea827e66ade735f6eb52fc069e4b3e17723b6 (diff)
interrupt in proper place in GFI
-rw-r--r--src/GFI.hs5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/GFI.hs b/src/GFI.hs
index 6165a54aa..ee4d8809f 100644
--- a/src/GFI.hs
+++ b/src/GFI.hs
@@ -48,7 +48,7 @@ loop opts gfenv0 = do
let loopNewCPU gfenv' = do
cpu' <- getCPUTime
putStrLnFlush (show ((cpu' - cputime gfenv') `div` 1000000000) ++ " msec")
- loop opts $ gfenv' {cputime = cpu'}
+ return $ gfenv' {cputime = cpu'}
let
enc = encode gfenv
s = decode gfenv s0
@@ -118,7 +118,8 @@ loop opts gfenv0 = do
interpretCommandLine enc env s
loopNewCPU gfenv
gfenv' <- return $ either (const gfenv) id r
- loopNewCPU gfenv'
+ e <- loopNewCPU gfenv'
+ loop opts e
importInEnv :: GFEnv -> Options -> [FilePath] -> IO GFEnv
importInEnv gfenv opts files