X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Futils%2FOrdList.lhs;h=4e0018a85e36957d66496d3df1165d4900d37170;hp=7f22b38e495a0af306f935f7b9aa8fa8a6696cfe;hb=17b297d97d327620ed6bfab942f8992b2446f1bf;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1

diff --git a/compiler/utils/OrdList.lhs b/compiler/utils/OrdList.lhs
index 7f22b38..4e0018a 100644
--- a/compiler/utils/OrdList.lhs
+++ b/compiler/utils/OrdList.lhs
@@ -1,4 +1,5 @@
 %
+% (c) The University of Glasgow 2006
 % (c) The AQUA Project, Glasgow University, 1993-1998
 %
 
@@ -8,6 +9,13 @@ Provide trees (of instructions), so that lists of instructions
 can be appended in linear time.
 
 \begin{code}
+{-# OPTIONS_GHC -w #-}
+-- The above warning supression flag is a temporary kludge.
+-- While working on this module you are encouraged to remove it and fix
+-- any warnings in the module. See
+--     http://hackage.haskell.org/trac/ghc/wiki/WorkingConventions#Warnings
+-- for details
+
 module OrdList (
 	OrdList, 
         nilOL, isNilOL, unitOL, appOL, consOL, snocOL, concatOL,
@@ -19,8 +27,9 @@ infixl 5  `snocOL`
 infixr 5  `consOL`
 
 data OrdList a
-  = Many [a]
-  | Two (OrdList a) (OrdList a)
+  = Many [a]        -- Invariant: non-empty
+  | Two (OrdList a) -- Invariant: non-empty
+        (OrdList a) -- Invariant: non-empty
   | One  a
   | None
 
@@ -35,14 +44,14 @@ concatOL :: [OrdList a] -> OrdList a
 
 nilOL        = None
 unitOL as    = One as
-snocOL as b  = Two as (One b)
-consOL a  bs = Two (One a) bs
-concatOL aas = foldr Two None aas
+snocOL None b    = One b
+snocOL as   b    = Two as (One b)
+consOL a    None = One a
+consOL a    bs   = Two (One a) bs
+concatOL aas = foldr appOL None aas
 
-isNilOL None        = True
-isNilOL (One _)     = False
-isNilOL (Two as bs) = isNilOL as && isNilOL bs
-isNilOL (Many xs)   = null xs
+isNilOL None = True
+isNilOL _    = False
 
 appOL None bs   = bs
 appOL as   None = as
@@ -76,8 +85,9 @@ fromOL ol
         flat None      rest = rest
         flat (One x)   rest = x:rest
         flat (Two a b) rest = flat a (flat b rest)
-	flat (Many xs) rest = xs ++ rest
+        flat (Many xs) rest = xs ++ rest
 
 toOL :: [a] -> OrdList a
+toOL [] = None
 toOL xs = Many xs
 \end{code}