X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcGenDeriv.lhs;h=eecf43bdd2f5f147140458ff40178eba7a7c0fac;hb=4a305e63d409e00417ee68912b564ab7887d653b;hp=6d9fc55e5942a52d113500dd0dffe1424038413e;hpb=1c8e62f6c68882f65140e3ed3049ac626cf3cb61;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcGenDeriv.lhs b/compiler/typecheck/TcGenDeriv.lhs
index 6d9fc55..eecf43b 100644
--- a/compiler/typecheck/TcGenDeriv.lhs
+++ b/compiler/typecheck/TcGenDeriv.lhs
@@ -730,7 +730,11 @@ gen_Ix_binds tycon
       = mk_easy_FunBind tycon_loc unsafeIndex_RDR 
 		[nlTuplePat [con_pat as_needed, con_pat bs_needed] Boxed, 
 		 con_pat cs_needed] 
-		(mk_index (zip3 as_needed bs_needed cs_needed))
+        -- We need to reverse the order we consider the components in
+        -- so that
+        --     range (l,u) !! index (l,u) i == i   -- when i is in range
+        -- (from http://haskell.org/onlinereport/ix.html) holds.
+		(mk_index (reverse $ zip3 as_needed bs_needed cs_needed))
       where
 	-- index (l1,u1) i1 + rangeSize (l1,u1) * (index (l2,u2) i2 + ...)
 	mk_index [] 	   = nlHsIntLit 0
@@ -1233,15 +1237,15 @@ gen_Data_binds fix_env tycon
 	  fixity | is_infix  = infix_RDR
 		 | otherwise = prefix_RDR
 
-gfoldl_RDR     = varQual_RDR gENERICS FSLIT("gfoldl")
-gunfold_RDR    = varQual_RDR gENERICS FSLIT("gunfold")
-toConstr_RDR   = varQual_RDR gENERICS FSLIT("toConstr")
-dataTypeOf_RDR = varQual_RDR gENERICS FSLIT("dataTypeOf")
-mkConstr_RDR   = varQual_RDR gENERICS FSLIT("mkConstr")
-mkDataType_RDR = varQual_RDR gENERICS FSLIT("mkDataType")
-conIndex_RDR   = varQual_RDR gENERICS FSLIT("constrIndex")
-prefix_RDR     = dataQual_RDR gENERICS FSLIT("Prefix")
-infix_RDR      = dataQual_RDR gENERICS FSLIT("Infix")
+gfoldl_RDR     = varQual_RDR gENERICS (fsLit "gfoldl")
+gunfold_RDR    = varQual_RDR gENERICS (fsLit "gunfold")
+toConstr_RDR   = varQual_RDR gENERICS (fsLit "toConstr")
+dataTypeOf_RDR = varQual_RDR gENERICS (fsLit "dataTypeOf")
+mkConstr_RDR   = varQual_RDR gENERICS (fsLit "mkConstr")
+mkDataType_RDR = varQual_RDR gENERICS (fsLit "mkDataType")
+conIndex_RDR   = varQual_RDR gENERICS (fsLit "constrIndex")
+prefix_RDR     = dataQual_RDR gENERICS (fsLit "Prefix")
+infix_RDR      = dataQual_RDR gENERICS (fsLit "Infix")
 \end{code}
 
 %************************************************************************
@@ -1507,17 +1511,17 @@ genOpApp e1 op e2 = nlHsPar (nlHsOpApp e1 op e2)
 \end{code}
 
 \begin{code}
-a_RDR		= mkVarUnqual FSLIT("a")
-b_RDR		= mkVarUnqual FSLIT("b")
-c_RDR		= mkVarUnqual FSLIT("c")
-d_RDR		= mkVarUnqual FSLIT("d")
-k_RDR		= mkVarUnqual FSLIT("k")
-z_RDR		= mkVarUnqual FSLIT("z")
-ah_RDR		= mkVarUnqual FSLIT("a#")
-bh_RDR		= mkVarUnqual FSLIT("b#")
-ch_RDR		= mkVarUnqual FSLIT("c#")
-dh_RDR		= mkVarUnqual FSLIT("d#")
-cmp_eq_RDR	= mkVarUnqual FSLIT("cmp_eq")
+a_RDR		= mkVarUnqual (fsLit "a")
+b_RDR		= mkVarUnqual (fsLit "b")
+c_RDR		= mkVarUnqual (fsLit "c")
+d_RDR		= mkVarUnqual (fsLit "d")
+k_RDR		= mkVarUnqual (fsLit "k")
+z_RDR		= mkVarUnqual (fsLit "z")
+ah_RDR		= mkVarUnqual (fsLit "a#")
+bh_RDR		= mkVarUnqual (fsLit "b#")
+ch_RDR		= mkVarUnqual (fsLit "c#")
+dh_RDR		= mkVarUnqual (fsLit "d#")
+cmp_eq_RDR	= mkVarUnqual (fsLit "cmp_eq")
 
 as_RDRs		= [ mkVarUnqual (mkFastString ("a"++show i)) | i <- [(1::Int) .. ] ]
 bs_RDRs		= [ mkVarUnqual (mkFastString ("b"++show i)) | i <- [(1::Int) .. ] ]