Rename functions

diff --git a/compiler/vectorise/VectCore.hs b/compiler/vectorise/VectCore.hs
index 23fe0e4..1ccc381 100644 (file)
--- a/compiler/vectorise/VectCore.hs
+++ b/compiler/vectorise/VectCore.hs
@@ -7,8 +7,7 @@ module VectCore (
   vNonRec, vRec,
 
   vVar, vType, vNote, vLet,
-  vLams,
-  mkVLams, mkVVarApps
+  vLams, vLamsWithoutLC, vVarApps
 ) where
 
 #include "HsVersions.h"
@@ -60,13 +59,13 @@ vLams lc vs (ve, le) = (mkLams vvs ve, mkLams (lc:lvs) le)
   where
     (vvs,lvs) = unzip vs
 
-mkVLams :: [VVar] -> VExpr -> VExpr
-mkVLams vvs (ve,le) = (mkLams vs ve, mkLams ls le)
+vLamsWithoutLC :: [VVar] -> VExpr -> VExpr
+vLamsWithoutLC vvs (ve,le) = (mkLams vs ve, mkLams ls le)
   where
     (vs,ls) = unzip vvs
 
-mkVVarApps :: Var -> VExpr -> [VVar] -> VExpr
-mkVVarApps lc (ve, le) vvs = (ve `mkVarApps` vs, le `mkVarApps` (lc : ls))
+vVarApps :: Var -> VExpr -> [VVar] -> VExpr
+vVarApps lc (ve, le) vvs = (ve `mkVarApps` vs, le `mkVarApps` (lc : ls))
   where
     (vs,ls) = unzip vvs 
 

diff --git a/compiler/vectorise/VectUtils.hs b/compiler/vectorise/VectUtils.hs
index 73c986b..3abbe44 100644 (file)
--- a/compiler/vectorise/VectUtils.hs
+++ b/compiler/vectorise/VectUtils.hs
@@ -243,8 +243,8 @@ buildClosure tvs lv vars arg_ty res_ty mk_body
           $ do
               body  <- mk_body
               body' <- bind (vVar env_bndr)
-                            (mkVVarApps lv body (vars ++ [arg_bndr]))
-              return (mkVLams [env_bndr, arg_bndr] body')
+                            (vVarApps lv body (vars ++ [arg_bndr]))
+              return (vLamsWithoutLC [env_bndr, arg_bndr] body')
 
       mkClosure arg_ty res_ty env_ty fn env