From 2371c5b033640d152658cbbf6f20f04ed41b0e6b Mon Sep 17 00:00:00 2001
From: Daniel Fischer <daniel.is.fischer@googlemail.com>
Date: Sat, 3 Sep 2011 23:11:15 +0200
Subject: Fixed imports

Removed some redundant imports and changed others from H98 to hierarchical modules.
---
 testsuite/tests/programs/galois_raytrace/Data.hs          | 2 +-
 testsuite/tests/programs/galois_raytrace/Eval.hs          | 2 +-
 testsuite/tests/programs/galois_raytrace/Geometry.hs      | 2 --
 testsuite/tests/programs/galois_raytrace/Illumination.hs  | 6 +++---
 testsuite/tests/programs/galois_raytrace/Intersections.hs | 2 +-
 testsuite/tests/programs/galois_raytrace/Main.hs          | 2 --
 testsuite/tests/programs/galois_raytrace/Parse.hs         | 2 +-
 testsuite/tests/programs/galois_raytrace/Pixmap.hs        | 6 +++---
 8 files changed, 10 insertions(+), 14 deletions(-)

(limited to 'testsuite/tests/programs/galois_raytrace')

diff --git a/testsuite/tests/programs/galois_raytrace/Data.hs b/testsuite/tests/programs/galois_raytrace/Data.hs
index cb0b2bfbb7..d103766a57 100644
--- a/testsuite/tests/programs/galois_raytrace/Data.hs
+++ b/testsuite/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/testsuite/tests/programs/galois_raytrace/Eval.hs b/testsuite/tests/programs/galois_raytrace/Eval.hs
index 675612c312..3ce24e4b3b 100644
--- a/testsuite/tests/programs/galois_raytrace/Eval.hs
+++ b/testsuite/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/testsuite/tests/programs/galois_raytrace/Geometry.hs b/testsuite/tests/programs/galois_raytrace/Geometry.hs
index 0bb90ed45a..de9d960450 100644
--- a/testsuite/tests/programs/galois_raytrace/Geometry.hs
+++ b/testsuite/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/testsuite/tests/programs/galois_raytrace/Illumination.hs b/testsuite/tests/programs/galois_raytrace/Illumination.hs
index ddb8e4766f..b68eea8bf2 100644
--- a/testsuite/tests/programs/galois_raytrace/Illumination.hs
+++ b/testsuite/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/testsuite/tests/programs/galois_raytrace/Intersections.hs b/testsuite/tests/programs/galois_raytrace/Intersections.hs
index c0f282d408..58210c30f9 100644
--- a/testsuite/tests/programs/galois_raytrace/Intersections.hs
+++ b/testsuite/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/testsuite/tests/programs/galois_raytrace/Main.hs b/testsuite/tests/programs/galois_raytrace/Main.hs
index 4ef9fe3e95..e8c88ad090 100644
--- a/testsuite/tests/programs/galois_raytrace/Main.hs
+++ b/testsuite/tests/programs/galois_raytrace/Main.hs
@@ -7,8 +7,6 @@
 
 module Main where
 
-import System
-
 import Parse
 import Eval
 
diff --git a/testsuite/tests/programs/galois_raytrace/Parse.hs b/testsuite/tests/programs/galois_raytrace/Parse.hs
index 8a8c0e1912..26aeb05427 100644
--- a/testsuite/tests/programs/galois_raytrace/Parse.hs
+++ b/testsuite/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/testsuite/tests/programs/galois_raytrace/Pixmap.hs b/testsuite/tests/programs/galois_raytrace/Pixmap.hs
index db6a91986a..edb75af4fa 100644
--- a/testsuite/tests/programs/galois_raytrace/Pixmap.hs
+++ b/testsuite/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
-- 
cgit v1.2.1