[commit: testsuite] master: Fixed imports (ae389cd)

[Daniel Fischer]

Repository : ssh://darcs.haskell.org//srv/darcs/testsuite

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/ae389cd7c9903f899d3e85bcef4a16a312e188ac

>---------------------------------------------------------------

commit ae389cd7c9903f899d3e85bcef4a16a312e188ac
Author: Daniel Fischer <daniel.is.fischer at googlemail.com>
Date:   Sat Sep 3 23:11:15 2011 +0200

    Fixed imports
    
    Removed some redundant imports and changed others from H98 to hierarchical modules.

>---------------------------------------------------------------

 tests/programs/galois_raytrace/Data.hs          |    2 +-
 tests/programs/galois_raytrace/Eval.hs          |    2 +-
 tests/programs/galois_raytrace/Geometry.hs      |    2 --
 tests/programs/galois_raytrace/Illumination.hs  |    6 +++---
 tests/programs/galois_raytrace/Intersections.hs |    2 +-
 tests/programs/galois_raytrace/Main.hs          |    2 --
 tests/programs/galois_raytrace/Parse.hs         |    2 +-
 tests/programs/galois_raytrace/Pixmap.hs        |    6 +++---
 8 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/tests/programs/galois_raytrace/Data.hs b/tests/programs/galois_raytrace/Data.hs
index cb0b2bf..d103766 100644
--- a/tests/programs/galois_raytrace/Data.hs
+++ b/tests/programs/galois_raytrace/Data.hs
@@ -5,7 +5,7 @@
 
 module Data where
 
-import Array
+import Data.Array
 
 import CSG
 import Geometry
diff --git a/tests/programs/galois_raytrace/Eval.hs b/tests/programs/galois_raytrace/Eval.hs
index 675612c..3ce24e4 100644
--- a/tests/programs/galois_raytrace/Eval.hs
+++ b/tests/programs/galois_raytrace/Eval.hs
@@ -5,7 +5,7 @@
 
 module Eval where
 
-import Array
+import Data.Array
 
 import Geometry
 import CSG
diff --git a/tests/programs/galois_raytrace/Geometry.hs b/tests/programs/galois_raytrace/Geometry.hs
index 0bb90ed..de9d960 100644
--- a/tests/programs/galois_raytrace/Geometry.hs
+++ b/tests/programs/galois_raytrace/Geometry.hs
@@ -61,8 +61,6 @@ module Geometry
     , clampf
     ) where
 
-import List
-
 type Coords = (Double,Double,Double)
 
 type Ray = (Point,Vector)    -- origin of ray, and unit vector giving direction
diff --git a/tests/programs/galois_raytrace/Illumination.hs b/tests/programs/galois_raytrace/Illumination.hs
index ddb8e47..b68eea8 100644
--- a/tests/programs/galois_raytrace/Illumination.hs
+++ b/tests/programs/galois_raytrace/Illumination.hs
@@ -12,9 +12,9 @@ module Illumination
     , render
     ) where
 
-import Array
-import Char(chr)
-import Maybe
+import Data.Array
+import Data.Char(chr)
+import Data.Maybe
 
 import Geometry
 import CSG
diff --git a/tests/programs/galois_raytrace/Intersections.hs b/tests/programs/galois_raytrace/Intersections.hs
index c0f282d..58210c3 100644
--- a/tests/programs/galois_raytrace/Intersections.hs
+++ b/tests/programs/galois_raytrace/Intersections.hs
@@ -8,7 +8,7 @@ module Intersections
       quadratic
     ) where
 
-import Maybe(isJust)
+import Data.Maybe(isJust)
 
 import Construct
 import Geometry
diff --git a/tests/programs/galois_raytrace/Main.hs b/tests/programs/galois_raytrace/Main.hs
index 4ef9fe3..e8c88ad 100644
--- a/tests/programs/galois_raytrace/Main.hs
+++ b/tests/programs/galois_raytrace/Main.hs
@@ -7,8 +7,6 @@
 
 module Main where
 
-import System
-
 import Parse
 import Eval
 
diff --git a/tests/programs/galois_raytrace/Parse.hs b/tests/programs/galois_raytrace/Parse.hs
index 8a8c0e1..26aeb05 100644
--- a/tests/programs/galois_raytrace/Parse.hs
+++ b/tests/programs/galois_raytrace/Parse.hs
@@ -5,7 +5,7 @@
 
 module Parse where
 
-import Char
+import Data.Char
 import Text.ParserCombinators.Parsec hiding (token)
 
 import Data
diff --git a/tests/programs/galois_raytrace/Pixmap.hs b/tests/programs/galois_raytrace/Pixmap.hs
index db6a919..edb75af 100644
--- a/tests/programs/galois_raytrace/Pixmap.hs
+++ b/tests/programs/galois_raytrace/Pixmap.hs
@@ -5,9 +5,9 @@
 
 module Pixmap where
 
-import Char
-import IO hiding (try)
-import Parsec
+import Data.Char
+import System.IO hiding (try)
+import Text.ParserCombinators.Parsec
 
 readPPM f
   = do  h <- openFile f ReadMode