From 8529126a1bae9b5ee55e109de0517402feb76da5 Mon Sep 17 00:00:00 2001 From: simonmar Date: Tue, 11 Apr 2000 11:06:34 +0000 Subject: [PATCH] [project @ 2000-04-11 11:06:34 by simonmar] Update for Haskell 1.4 (!!!) and update expected output. --- ghc/tests/io/should_run/io030.hs | 8 ++++---- ghc/tests/io/should_run/io030.stdout | 36 +++++++++++++++++----------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/ghc/tests/io/should_run/io030.hs b/ghc/tests/io/should_run/io030.hs index 0be0d34..987f562 100644 --- a/ghc/tests/io/should_run/io030.hs +++ b/ghc/tests/io/should_run/io030.hs @@ -2,7 +2,7 @@ module Main(main) where import IO -import Monad ( accumulate ) +import Monad ( sequence ) testPosns :: Handle -> BufferMode -> IO () testPosns hdl bmo = do @@ -27,19 +27,19 @@ testPositioning hdl = do putStrLn ls -- go to the end hSeek hdl SeekFromEnd 0 - ls <- accumulate (map (\ p -> hSetPosn p >> hGetChar hdl) ps) + ls <- sequence (map (\ p -> hSetPosn p >> hGetChar hdl) ps) putStr "First ten chars: " putStrLn ls -- position ourselves in the middle. sz <- hFileSize hdl hSeek hdl AbsoluteSeek (sz `div` 2) - ls <- accumulate (map (\ p -> hSetPosn p >> hGetChar hdl) ps) + ls <- sequence (map (\ p -> hSetPosn p >> hGetChar hdl) ps) putStr "First ten chars: " putStrLn ls hGetChars :: Int -> Handle -> IO String -hGetChars n h = accumulate (replicate n (hGetChar h)) +hGetChars n h = sequence (replicate n (hGetChar h)) getFilePosns :: Int -> Handle -> IO [HandlePosn] getFilePosns 0 h = return [] diff --git a/ghc/tests/io/should_run/io030.stdout b/ghc/tests/io/should_run/io030.stdout index 9a24d34..7c765c5 100644 --- a/ghc/tests/io/should_run/io030.stdout +++ b/ghc/tests/io/should_run/io030.stdout @@ -1,24 +1,24 @@ Testing positioning with buffer mode set to: NoBuffering -First ten chars: --!!! file -First ten chars: --!!! file -First ten chars: --!!! file +First ten chars: -- !!! fil +First ten chars: -- !!! fil +First ten chars: -- !!! fil Testing positioning with buffer mode set to: LineBuffering -First ten chars: --!!! file -First ten chars: --!!! file -First ten chars: --!!! file +First ten chars: -- !!! fil +First ten chars: -- !!! fil +First ten chars: -- !!! fil Testing positioning with buffer mode set to: BlockBuffering Nothing -First ten chars: --!!! file -First ten chars: --!!! file -First ten chars: --!!! file +First ten chars: -- !!! fil +First ten chars: -- !!! fil +First ten chars: -- !!! fil Testing positioning with buffer mode set to: BlockBuffering (Just 511) -First ten chars: --!!! file -First ten chars: --!!! file -First ten chars: --!!! file +First ten chars: -- !!! fil +First ten chars: -- !!! fil +First ten chars: -- !!! fil Testing positioning with buffer mode set to: BlockBuffering (Just 3) -First ten chars: --!!! file -First ten chars: --!!! file -First ten chars: --!!! file +First ten chars: -- !!! fil +First ten chars: -- !!! fil +First ten chars: -- !!! fil Testing positioning with buffer mode set to: BlockBuffering (Just 11) -First ten chars: --!!! file -First ten chars: --!!! file -First ten chars: --!!! file +First ten chars: -- !!! fil +First ten chars: -- !!! fil +First ten chars: -- !!! fil -- 1.7.10.4