23 files changed, 315 insertions, 167 deletions

diff --git a/TODO b/TODO
index eafb3252..4faa9de5 100644
--- a/TODO
+++ b/TODO
@@ -85,14 +85,16 @@ done:
 - don't overnormalize (String => [Char])
 - compiler: support function recognition
 - backend: generate functions in shaders
-
-next:
+- backend: remove duplicate programs
 - support local pattern matching functions
 - support recursive local definitions
+
+next:
 - mutual recursion (inference & reduction)
 - compiler optimization: irrelevance + erasure
 - re-enable ambiguity checks
 - show desugared source code on a tab in the editor
+- names should have unique identifiers
 
 - testenv: performance benchmarks (time and memory consumption)
     done - create benchmark test set (pipeline codegen and error report)
diff --git a/src/LambdaCube/Compiler/CoreToIR.hs b/src/LambdaCube/Compiler/CoreToIR.hs
index 42d7f3d3..80bc07cc 100644
--- a/src/LambdaCube/Compiler/CoreToIR.hs
+++ b/src/LambdaCube/Compiler/CoreToIR.hs
@@ -6,6 +6,7 @@
 {-# LANGUAGE TypeSynonymInstances #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE RecursiveDo #-}
+{-# LANGUAGE TupleSections #-}
 {-# OPTIONS_GHC -fno-warn-unused-binds #-}  -- TODO: remove
 module LambdaCube.Compiler.CoreToIR
     ( compilePipeline
@@ -53,20 +54,21 @@ compilePipeline backend exp = IR.Pipeline
     }
   where
     ((subCmds,cmds), (streams, programs, targets, slots, textures))
-        = flip runState ((0, mempty), mempty, (0, mempty), mempty, (0, mempty))
-        $ getCommands backend $ toExp exp
+        = flip runState ((0, mempty), mempty, (0, mempty), mempty, (0, mempty)) $ case toExp exp of
+            A1 "ScreenOut" a -> addTarget backend a [IR.TargetItem s $ Just $ IR.Framebuffer s | s <- getSemantics a]
+            x -> error $ "ScreenOut expected inststead of " ++ ppShow x
 
 type CG = State (List IR.StreamData, Map IR.Program Int, List IR.RenderTarget, Map String (Int, IR.Slot), List IR.TextureDescriptor)
 
 type List a = (Int, [a])
 
-streamLens  = (\(a,b,c,d,e) -> a, \x (a,b,c,d,e) -> (x,b,c,d,e))
-programLens = (\(a,b,c,d,e) -> b, \x (a,b,c,d,e) -> (a,x,c,d,e))
-targetLens  = (\(a,b,c,d,e) -> c, \x (a,b,c,d,e) -> (a,b,x,d,e))
-slotLens    = (\(a,b,c,d,e) -> d, \x (a,b,c,d,e) -> (a,b,c,x,e))
-textureLens = (\(a,b,c,d,e) -> e, \x (a,b,c,d,e) -> (a,b,c,d,x))
+streamLens  f (a,b,c,d,e) = f (,b,c,d,e) a
+programLens f (a,b,c,d,e) = f (a,,c,d,e) b
+targetLens  f (a,b,c,d,e) = f (a,b,,d,e) c
+slotLens    f (a,b,c,d,e) = f (a,b,c,,e) d
+textureLens f (a,b,c,d,e) = f (a,b,c,d,) e
 
-modL (g, s) f = state $ \st -> second (`s` st) $ f (g st)
+modL gs f = state $ gs $ \fx -> second fx . f
 
 addL' l p f x = modL l $ \sv -> maybe (length sv, Map.insert p (length sv, x) sv) (\(i, x') -> (i, Map.insert p (i, f x x') sv)) $ Map.lookup p sv
 addL l x = modL l $ \(i, sv) -> (i, (i+1, x: sv))
@@ -74,14 +76,18 @@ addLEq l x = modL l $ \sv -> maybe (let i = length sv in i `seq` (i, Map.insert
 
 ---------------------------------------------------------
 
-getCommands :: Backend -> ExpTV -> CG ([IR.Command],[IR.Command])
+addTarget backend a tl = do
+    rt <- addL targetLens $ IR.RenderTarget $ Vector.fromList tl
+    second (IR.SetRenderTarget rt:) <$> getCommands backend a
+
+getCommands :: Backend -> ExpTV{-FrameBuffer-} -> CG ([IR.Command],[IR.Command])
 getCommands backend e = case e of
 
-    A1 "ScreenOut" a -> addTarget a [IR.TargetItem s $ Just $ IR.Framebuffer s | s <- getSemantics a]
+    A1 "FrameBuffer" a -> return ([], [IR.ClearRenderTarget $ Vector.fromList $ map compFrameBuffer $ eTuple a])
 
-    A1 "FrameBuffer" a -> return ([], [IR.ClearRenderTarget $ Vector.fromList $ map (uncurry IR.ClearImage) $ compFrameBuffer a])
+    A3 "Accumulate" actx (getFragmentShader -> (frag, getFragFilter -> (ffilter, x1))) fbuf -> case x1 of
 
-    A3 "Accumulate" actx (getFragmentShader -> (frag, getFragFilter -> (ffilter, A3 "foldr" (A0 "++") (A0 "Nil") (A2 "map" (EtaPrim3 "rasterizePrimitive" ints rctx) (getVertexShader -> (vert, input_)))))) fbuf -> mdo
+      A3 "foldr" (A0 "++") (A0 "Nil") (A2 "map" (EtaPrim3 "rasterizePrimitive" ints rctx) (getVertexShader -> (vert, input_))) -> mdo
 
         let 
             (vertexInput, pUniforms, vertSrc, fragSrc) = genGLSLs backend (compRC' rctx) ints vert frag ffilter
@@ -148,7 +154,8 @@ getCommands backend e = case e of
 
         (<> (txtCmds, cmds)) <$> getCommands backend fbuf
 
-    x -> error $ "getCommands " ++ ppShow x
+      x -> error $ "getCommands': " ++ ppShow x
+    x -> error $ "getCommands: " ++ ppShow x
   where
     getRenderTextureCommands :: String -> Uniform -> CG ([SamplerBinding],[IR.Command])
     getRenderTextureCommands n = \case
@@ -178,15 +185,11 @@ getCommands backend e = case e of
                     , IR.textureMaxLevel  = 0
                     }
                 return $ IR.TargetItem semantic $ Just $ IR.TextureImage texture 0 Nothing
-            (subCmds, cmds) <- addTarget a tl
+            (subCmds, cmds) <- addTarget backend a tl
             let (IR.TargetItem IR.Color (Just tx)) = tf tl
             return ([(n, tx)], subCmds ++ cmds)
         _ -> return mempty
 
-    addTarget a tl = do
-        rt <- addL targetLens $ IR.RenderTarget $ Vector.fromList tl
-        second (IR.SetRenderTarget rt: ) <$> getCommands backend a
-
 type SamplerBinding = (IR.UniformName,IR.ImageRef)
 
 ----------------------------------------------------------------
@@ -200,9 +203,13 @@ getFragFilter (A2 "map" (EtaPrim2 "filterFragment" p) x) = (Just p, x)
 getFragFilter x = (Nothing, x)
 
 getVertexShader (A2 "map" (EtaPrim2 "mapPrimitive" f@(etaRed -> Just (_, o))) x) = ((Just f, tyOf o), x)
+--getVertexShader (A2 "map" (EtaPrim2 "mapPrimitive" f) x) = error $ "gff: " ++ show (case f of ExpTV x _ _ -> x) --ppShow (mapVal unFunc' f)
+--getVertexShader x = error $ "gf: " ++ ppShow x
 getVertexShader x = ((Nothing, getPrim' $ tyOf x), x)
 
-getFragmentShader (A2 "map" (EtaPrim2 "mapFragment" f@(etaRed -> Just (_, frago))) x) = ((Just f, tyOf frago), x)
+getFragmentShader (A2 "map" (EtaPrim2 "mapFragment" f@(etaRed -> Just (_, o))) x) = ((Just f, tyOf o), x)
+--getFragmentShader (A2 "map" (EtaPrim2 "mapFragment" f) x) = error $ "gff: " ++ ppShow f
+--getFragmentShader x = error $ "gf: " ++ ppShow x
 getFragmentShader x = ((Nothing, getPrim'' $ tyOf x), x)
 
 getPrim (A1 "List" (A2 "Primitive" _ p)) = p
@@ -210,18 +217,17 @@ getPrim' (A1 "List" (A2 "Primitive" a _)) = a
 getPrim'' (A1 "List" (A2 "Vector" _ (A1 "Maybe" (A1 "SimpleFragment" a)))) = a
 getPrim'' x = error $ "getPrim'':" ++ ppShow x
 
-compFrameBuffer x = case x of
-  ETuple a -> concatMap compFrameBuffer a
-  A1 "DepthImage" a -> [(IR.Depth, compValue a)]
-  A1 "ColorImage" a -> [(IR.Color, compValue a)]
+compFrameBuffer = \case
+  A1 "DepthImage" a -> IR.ClearImage IR.Depth $ compValue a
+  A1 "ColorImage" a -> IR.ClearImage IR.Color $ compValue a
   x -> error $ "compFrameBuffer " ++ ppShow x
 
-compSemantics x = case x of
+compSemantics = \case
   A2 "Cons" a b -> compSemantic a: compSemantics b
   A0 "Nil" -> []
   x -> error $ "compSemantics: " ++ ppShow x
 
-compSemantic x = case x of
+compSemantic = \case
   A1 "Depth" _   -> IR.Depth
   A1 "Stencil" _ -> IR.Stencil
   A1 "Color" _   -> IR.Color
@@ -553,6 +559,7 @@ genGLSLs backend
     vertOutNamesWithPosition = "gl_Position": vertOutNames
 
     red (etaRed -> Just (ps, o)) = (ps, o)
+    red x = error $ "red: " ++ ppShow x
     genGLSL' vertOuts (ps, o)
         | length ps == length vertOuts = genGLSL (reverse vertOuts) o
         | otherwise = error $ "makeSubst illegal input " ++ show ps ++ "\n" ++ show vertOuts
@@ -741,6 +748,7 @@ genGLSL dns e = case e of
     n | n `elem` ["primIntToWord", "primIntToFloat", "primCompareInt", "primCompareWord", "primCompareFloat"] -> error $ "WebGL 1 does not support: " ++ ppShow e
     n | n `elem` ["M23F", "M24F", "M32F", "M34F", "M42F", "M43F"] -> error "WebGL 1 does not support matrices with this dimension"
     (tupName -> Just n) -> pure $ error "GLSL codegen for tuple is not supported yet"
+    x -> error $ "GLSL codegen - unsupported function: " ++ ppShow x
 
   x -> error $ "GLSL codegen - unsupported expression: " ++ ppShow x
   where
@@ -799,14 +807,16 @@ type Ty = ExpTV
 tyOf :: ExpTV -> Ty
 tyOf (ExpTV _ t vs) = t .@ vs
 
+mapVal f (ExpTV a b c) = ExpTV (f a) b c
+
 toExp :: ExpType -> ExpTV
 toExp (x, xt) = ExpTV x xt []
 
-pattern Pi h a b    <- (mkPi  -> Just (h, a, b))
-pattern Lam h a b   <- (mkLam -> Just (h, a, b))
-pattern Con h b     <- (mkCon -> Just (h, b))
-pattern App a b     <- (mkApp -> Just (a, b))
-pattern Var a b     <- (mkVar -> Just (a, b))
+pattern Pi h a b    <- (mkPi . mapVal unLab'  -> Just (h, a, b))
+pattern Lam h a b   <- (mkLam . mapVal unFunc' -> Just (h, a, b))
+pattern Con h b     <- (mkCon . mapVal unLab' -> Just (h, b))
+pattern App a b     <- (mkApp . mapVal unLab' -> Just (a, b))
+pattern Var a b     <- (mkVar . mapVal unLab' -> Just (a, b))
 pattern ELit l      <- ExpTV (I.ELit l) _ _
 pattern TType       <- ExpTV (unLab' -> I.TType) _ _
 pattern Func fn def ty xs <- (mkFunc -> Just (fn, def, ty, xs))
@@ -818,23 +828,23 @@ pattern EInt s    <- ELit (LInt s)
 t .@ vs = ExpTV t I.TType vs
 infix 1 .@
 
-mkVar (ExpTV (unLab' -> I.Var i) t vs) = Just (i, t .@ vs)
+mkVar (ExpTV (I.Var i) t vs) = Just (i, t .@ vs)
 mkVar _ = Nothing
 
-mkPi (ExpTV (unLab' -> I.Pi b x y) _ vs) = Just (b, x .@ vs, y .@ addToEnv x vs)
+mkPi (ExpTV (I.Pi b x y) _ vs) = Just (b, x .@ vs, y .@ addToEnv x vs)
 mkPi _ = Nothing
 
-mkLam (ExpTV (unLab' -> I.Lam y) (I.Pi b x yt) vs) = Just (b, x .@ vs, ExpTV y yt $ addToEnv x vs)
+mkLam (ExpTV (I.Lam y) (I.Pi b x yt) vs) = Just (b, x .@ vs, ExpTV y yt $ addToEnv x vs)
 mkLam _ = Nothing
 
-mkCon (ExpTV (unLab' -> I.Con s n xs) et vs) = Just (untick $ show s, chain vs (conType et s) $ mkConPars n et ++ xs)
-mkCon (ExpTV (unLab' -> TyCon s xs) et vs) = Just (untick $ show s, chain vs (nType s) xs)
-mkCon (ExpTV (unLab' -> Neut (I.Fun s i (reverse -> xs) def)) et vs) = Just (untick $ show s, chain vs (nType s) xs)
-mkCon (ExpTV (unLab' -> CaseFun s xs n) et vs) = Just (untick $ show s, chain vs (nType s) $ makeCaseFunPars' (mkEnv vs) n ++ xs ++ [Neut n])
-mkCon (ExpTV (unLab' -> TyCaseFun s [m, t, f] n) et vs) = Just (untick $ show s, chain vs (nType s) [m, t, Neut n, f])
+mkCon (ExpTV (I.Con s n xs) et vs) = Just (untick $ show s, chain vs (conType et s) $ mkConPars n et ++ xs)
+mkCon (ExpTV (TyCon s xs) et vs) = Just (untick $ show s, chain vs (nType s) xs)
+mkCon (ExpTV (Neut (I.Fun s i (reverse -> xs) def)) et vs) = Just (untick $ show s, chain vs (nType s) xs)
+mkCon (ExpTV (CaseFun s xs n) et vs) = Just (untick $ show s, chain vs (nType s) $ makeCaseFunPars' (mkEnv vs) n ++ xs ++ [Neut n])
+mkCon (ExpTV (TyCaseFun s [m, t, f] n) et vs) = Just (untick $ show s, chain vs (nType s) [m, t, Neut n, f])
 mkCon _ = Nothing
 
-mkApp (ExpTV (unLab' -> Neut (I.App_ a b)) et vs) = Just (ExpTV (Neut a) t vs, head $ chain vs t [b])
+mkApp (ExpTV (Neut (I.App_ a b)) et vs) = Just (ExpTV (Neut a) t vs, head $ chain vs t [b])
   where t = neutType' (mkEnv vs) a
 mkApp _ = Nothing
 
@@ -854,7 +864,14 @@ chain' vs t _ = error $ "chain: " ++ show t
 
 mkTVar i (ExpTV t _ vs) = ExpTV (I.Var i) t vs
 
-unLab' = unfixlabel
+unLab' (FL x) = unLab' x
+unLab' (LabelEnd x) = unLab' x
+unLab' x = x
+
+unFunc' (FL x) = unFunc' x   -- todo: remove?
+unFunc' (UFL x) = unFunc' x
+unFunc' (LabelEnd x) = unFunc' x
+unFunc' x = x
 
 instance Subst Exp ExpTV where
     subst i0 x (ExpTV a at vs) = ExpTV (subst i0 x a) (subst i0 x at) (zipWith (\i -> subst (i0+i) $ up i x{-todo: review-}) [1..] vs)
@@ -887,6 +904,7 @@ removeLams i (Lam Hidden _ x) = removeLams i x
 etaRed (ELam _ (App (down 0 -> Just f) (EVar 0))) = etaRed f
 etaRed (ELam _ (A3 (tupCaseName -> Just k) _ (down 0 -> Just x) (EVar 0))) = Just $ getPats k x
 etaRed (ELam p i) = Just (getPVars p, i)
+--etaRed x | Pi Visible a b <- tyOf x = Just ([mkTVar 0 a], App x $ mkTVar 0 a)
 etaRed x = Nothing
 
 getPVars = \case
diff --git a/src/LambdaCube/Compiler/Infer.hs b/src/LambdaCube/Compiler/Infer.hs
index ee78422d..79a97a09 100644
--- a/src/LambdaCube/Compiler/Infer.hs
+++ b/src/LambdaCube/Compiler/Infer.hs
@@ -18,7 +18,7 @@ module LambdaCube.Compiler.Infer
     ( Binder (..), SName, Lit(..), Visibility(..)
     , Exp (..), Neutral (..), ExpType, GlobalEnv
     , pattern Var, pattern CaseFun, pattern TyCaseFun, pattern App_
-    , pattern Con, pattern TyCon, pattern Pi, pattern Lam, pattern Fun, pattern ELit, pattern Func, pattern LabelEnd
+    , pattern Con, pattern TyCon, pattern Pi, pattern Lam, pattern Fun, pattern ELit, pattern Func, pattern LabelEnd, pattern FL, pattern UFL, unFunc_
     , outputType, boolType, trueExp
     , down, Subst (..), free
     , initEnv, Env(..), pattern EBind2
@@ -108,8 +108,9 @@ pattern NoLE <- (isNoLabelEnd -> True)
 isNoLabelEnd (LabelEnd_ _) = False
 isNoLabelEnd _ = True
 
-pattern Fun f i xs n <- Fun_ _ f _ i xs n where Fun f i xs n = Fun_ (foldMap maxDB_ xs {- <> iterateN i lowerDB (maxDB_ n)-}) f [] i xs n
-pattern UTFun a t b <- Neut (Fun (FunName a _ t) _ (reverse -> b) NoLE)
+pattern Fun' f vs i xs n <- Fun_ _ f vs i xs n where Fun' f vs i xs n = Fun_ (foldMap maxDB_ vs <> foldMap maxDB_ xs {- <> iterateN i lowerDB (maxDB_ n)-}) f vs i xs n
+pattern Fun f i xs n = Fun' f [] i xs n
+pattern UTFun a t b <- (unfixlabel -> Neut (Fun (FunName a _ t) _ (reverse -> b) NoLE))
 pattern UFunN a b <- UTFun a _ b
 pattern DFun_ fn xs <- Fun fn 0 (reverse -> xs) (Delta _) where
     DFun_ fn@(FunName n _ _) xs = Fun fn 0 (reverse xs) d where
@@ -152,7 +153,7 @@ pattern Pi v x y <- Pi_ _ v x y where Pi v x y = Pi_ (maxDB_ x <> lowerDB (maxDB
 pattern TyConN s a <- TyCon (TyConName s _ _ _ _) a
 pattern TTyCon s t a <- TyCon (TyConName s _ t _ _) a
 tTyCon s t a cs = TyCon (TyConName s (error "todo: inum") t (map ((,) (error "tTyCon")) cs) $ CaseFunName (error "TTyCon-A") (error "TTyCon-B") $ length a) a
-pattern TTyCon0 s  <- TyCon (TyConName s _ TType _ _) []
+pattern TTyCon0 s  <- (unfixlabel -> TyCon (TyConName s _ TType _ _) [])
 tTyCon0 s cs = Closed $ TyCon (TyConName s 0 TType (map ((,) (error "tTyCon0")) cs) $ CaseFunName (error "TTyCon0-A") (error "TTyCon0-B") 0) []
 pattern a :~> b = Pi Visible a b
 
@@ -238,13 +239,13 @@ trueExp = EBool True
 
 pattern LabelEnd x = Neut (LabelEnd_ x)
 
-pmLabel' :: FunName -> Int -> [Exp] -> Exp -> Exp
-pmLabel' (FunName _ _ _) 0 as (Neut (Delta (SData f))) = f $ reverse as
-pmLabel' f i xs (unfixlabel -> Neut y) = Neut $ Fun f i xs y
-pmLabel' f i xs y = error $ "pmLabel: " ++ show (f, i, length xs, y)
+pmLabel' :: FunName -> [Exp] -> Int -> [Exp] -> Exp -> Exp
+pmLabel' (FunName _ _ _) _ 0 as (Neut (Delta (SData f))) = f $ reverse as
+pmLabel' f vs i xs (unfixlabel -> Neut y) = Neut $ Fun' f vs i xs y
+pmLabel' f _ i xs y = error $ "pmLabel: " ++ show (f, i, length xs, y)
 
-pmLabel :: FunName -> Int -> [Exp] -> Exp -> Exp
-pmLabel f i xs e = pmLabel' f (i + numLams e) xs (Neut $ dropLams e)
+pmLabel :: FunName -> [Exp] -> Int -> [Exp] -> Exp -> Exp
+pmLabel f vs i xs e = pmLabel' f vs (i + numLams e) xs (Neut $ dropLams e)
 
 dropLams (unfixlabel -> Lam x) = dropLams x
 dropLams (unfixlabel -> Neut x) = x
@@ -252,7 +253,7 @@ dropLams (unfixlabel -> Neut x) = x
 numLams (unfixlabel -> Lam x) = 1 + numLams x
 numLams x = 0
 
-pattern FL' y <- Fun f 0 xs (LabelEnd_ y)
+pattern FL' y <- Fun' f _ 0 xs (LabelEnd_ y)
 pattern FL y <- Neut (FL' y)
 
 pattern Func n def ty xs <- (mkFunc -> Just (n, def, ty, xs))
@@ -264,6 +265,14 @@ removeLams 0 (LabelEnd x) = Just x
 removeLams n (Lam x) | n > 0 = Lam <$> removeLams (n-1) x
 removeLams _ _ = Nothing
 
+pattern UFL y <- (unFunc -> Just y)
+
+unFunc (Neut (Fun' (FunName _ (Just def) _) _ n xs y)) = Just $ iterateN n Lam $ Neut y
+unFunc _ = Nothing
+
+unFunc_ (Neut (Fun' _ _ n xs y)) = Just $ iterateN n Lam $ Neut y
+unFunc_ _ = Nothing
+
 unfixlabel (FL y) = unfixlabel y
 unfixlabel a = a
 
@@ -289,7 +298,7 @@ instance Eq Exp where
     _ == _ = False
 
 instance Eq Neutral where
-    Fun f i a _ == Fun f' i' a' _ = (f, i, a) == (f', i', a')
+    Fun' f vs i a _ == Fun' f' vs' i' a' _ = (f, vs, i, a) == (f', vs', i', a')
     FL' a == a' = a == Neut a'
     a == FL' a' = Neut a == a'
     LabelEnd_ a == LabelEnd_ a' = a == a'
@@ -356,7 +365,7 @@ instance Subst Exp Exp where
                 CaseFun_ s as n -> evalCaseFun s (f i <$> as) (substNeut n)
                 TyCaseFun_ s as n -> evalTyCaseFun s (f i <$> as) (substNeut n)
                 App_ a b  -> app_ (substNeut a) (f i b)
-                Fun fn c xs v -> pmLabel' fn c (f i <$> xs) $ f (i + c) $ Neut v
+                Fun' fn vs c xs v -> pmLabel' fn (f i <$> vs) c (f i <$> xs) $ f (i + c) $ Neut v
                 LabelEnd_ a -> LabelEnd $ f i a
                 d@Delta{} -> Neut d
         f i e | cmpDB i e = e
@@ -376,7 +385,7 @@ instance Up Neutral where
             CaseFun__ md s as ne -> CaseFun__ (upDB n md) s (up_ n i <$> as) (up_ n i ne)
             TyCaseFun__ md s as ne -> TyCaseFun__ (upDB n md) s (up_ n i <$> as) (up_ n i ne)
             App__ md a b -> App__ (upDB n md) (up_ n i a) (up_ n i b)
-            Fun fn c x y -> Fun fn c (up_ n i <$> x) $ up_ n (i + c) y
+            Fun' fn vs c x y -> Fun' fn (up_ n i <$> vs) c (up_ n i <$> x) $ up_ n (i + c) y
             LabelEnd_ x -> LabelEnd_ $ up_ n i x
             d@Delta{} -> d
 
@@ -389,7 +398,7 @@ instance Up Neutral where
         CaseFun_ _ as n -> foldMap (fold f i) as <> fold f i n
         TyCaseFun_ _ as n -> foldMap (fold f i) as <> fold f i n
         App_ a b -> fold f i a <> fold f i b
-        Fun _ j x d -> foldMap (fold f i) x -- <> fold f (i+j) d
+        Fun' _ vs j x d -> foldMap (fold f i) vs <> foldMap (fold f i) x -- <> fold f (i+j) d
         LabelEnd_ x -> fold f i x
         Delta{} -> mempty
 
@@ -511,7 +520,7 @@ getFunDef s f = case s of
 
 cstr = f []
   where
-    f _ _ a a' | a == a' = Unit
+    f _ _ a a' | unfixlabel a == unfixlabel a' = Unit
     f ns typ (LabelEnd a) (LabelEnd a') = f ns typ a a'
     f ns typ (FL a) a' = f ns typ a a'
     f ns typ a (FL a') = f ns typ a a'
@@ -597,7 +606,7 @@ app_ (TyCon s xs) a = TyCon s (xs ++ [a])
 app_ (Neut f) a = neutApp f a
   where
     neutApp (FL' x) a = app_ x a    -- ???
-    neutApp (Fun f i xs e) a | i > 0 = pmLabel f (i-1) (a: xs) (subst (i-1) (up (i-1) a) $ Neut e)
+    neutApp (Fun' f vs i xs e) a | i > 0 = pmLabel f vs (i-1) (a: xs) (subst (i-1) (up (i-1) a) $ Neut e)
     neutApp f a = Neut $ App_ f a
 
 -------------------------------------------------------------------------------- constraints env
@@ -650,8 +659,8 @@ data Env
     | EBind2_ SI Binder Type Env             -- zoom into second parameter of SBind
     | EApp1 SI Visibility Env SExp2
     | EApp2 SI Visibility ExpType Env
-    | ELet1 LI Env SExp2
-    | ELet2 LI ExpType Env
+    | ELet1 SIName Env SExp2
+    | ELet2 SIName ExpType Env
     | EGlobal
     | ELabelEnd Env
 
@@ -679,7 +688,15 @@ parent = \case
     CheckAppType _ _ _ x _ -> Right x
     ELabelEnd x          -> Right x
     EGlobal              -> Left ()
-
+{-
+freeVars = \case
+    EGlobal -> []
+    EAssign i _ x -> [Var $ if j > i then j-1 else j | Var j <- freeVars x, j /= i]
+    EBind2 _ _ x -> Var 0: (up 1 <$> freeVars x)
+    ELet2 _ _ x -> Var 0: (up 1 <$> freeVars x)
+    x | Right y <- parent x -> freeVars y
+    x -> error $ "freeVars: " ++ show x
+-}
 -------------------------------------------------------------------------------- simple typing
 
 litType = \case
@@ -702,14 +719,14 @@ neutType te = \case
     Var_ i          -> snd $ varType "C" i te
     CaseFun_ s ts n -> appTy (foldl appTy (nType s) $ makeCaseFunPars te n ++ ts) (Neut n)
     TyCaseFun_ s [m, t, f] n -> foldl appTy (nType s) [m, t, Neut n, f]
-    Fun s _ a _ -> foldlrev appTy (nType s) a
+    Fun' s _ _ a _ -> foldlrev appTy (nType s) a
 
 neutType' te = \case
     App_ f x        -> appTy (neutType' te f) x
     Var_ i          -> varType' i te
     CaseFun_ s ts n -> appTy (foldl appTy (nType s) $ makeCaseFunPars' te n ++ ts) (Neut n)
     TyCaseFun_ s [m, t, f] n -> foldl appTy (nType s) [m, t, Neut n, f]
-    Fun s _ a _     -> foldlrev appTy (nType s) a
+    Fun' s _ _ a _     -> foldlrev appTy (nType s) a
 
 mkExpTypes t [] = []
 mkExpTypes t@(Pi _ a _) (x: xs) = (x, t): mkExpTypes (appTy t x) xs
@@ -868,7 +885,7 @@ inferN_ tellTrace = infer  where
             | otherwise -> infer (CheckType_ (sourceInfo b) (Var 2) $ cstr' h (up 2 et) (Pi Visible (Var 1) (Var 1)) (up 2 e) $ EBind2_ (sourceInfo b) BMeta TType $ EBind2_ (sourceInfo b) BMeta TType te) (up 3 b)
           where
             cstr' h x y e = EApp2 mempty h (evalCoe (up 1 x) (up 1 y) (Var 0) (up 1 e), up 1 y) . EBind2_ (sourceInfo b) BMeta (cstr TType x y)
-        ELet2 le (x{-let-}, xt) te -> focus_ te $ subst 0 (mkELet le x xt){-let-} eet{-in-}
+        ELet2 ln (x{-let-}, xt) te -> focus_ te $ subst 0 (mkELet ln x xt){-let-} eet{-in-}
         CheckIType x te -> checkN te x e
         CheckType_ si t te
             | hArgs et > hArgs t
@@ -1007,7 +1024,9 @@ recheck' msg' e (x, xt) = (recheck_ "main" (checkEnv e) (x, xt), xt)
         (TyCon s as, zt)      -> checkApps (show s) [] zt (TyCon s) te (nType s) as
         (CaseFun s@(CaseFunName _ t pars) as n, zt) -> checkApps (show s) [] zt (\xs -> evalCaseFun s (init $ drop pars xs) (last xs)) te (nType s) (makeCaseFunPars te n ++ as ++ [Neut n])
         (TyCaseFun s [m, t, f] n, zt)  -> checkApps (show s) [] zt (\[m, t, n, f] -> evalTyCaseFun s [m, t, f] n) te (nType s) [m, t, Neut n, f]
-        (Neut (Fun f i a x), zt) -> checkApps "lab" [] zt (\xs -> Neut $ Fun f i (reverse xs) x) te (nType f) $ reverse a   -- TODO: recheck x
+        (Neut (Fun' f vs@[] i a x), zt) -> checkApps "lab" [] zt (\xs -> Neut $ Fun' f vs i (reverse xs) x) te (nType f) $ reverse a   -- TODO: recheck x
+        -- TODO
+        (r@(Neut (Fun' f vs i a x)), zt) -> r
         (LabelEnd x, zt) -> LabelEnd $ recheck_ msg te (x, zt)
         (Neut d@Delta{}, zt) -> Neut d
       where
@@ -1146,7 +1165,7 @@ handleStmt defs = \case
         let t__ = maybe id (flip SAnn . af) mt t_
         (x, t) <- inferTerm (snd n) $ trSExp' $ if usedS n t__ then SBuiltin "primFix" `SAppV` SLamV (substSG0 n t__) else t__
         tellType (fst n) t
-        addToEnv n mf (mkELet (True, n) x t, t)
+        addToEnv n mf (mkELet n x t, t)
 {-        -- hack
         when (snd (getParams t) == TType) $ do
             let ps' = fst $ getParams t
@@ -1218,15 +1237,15 @@ handleStmt defs = \case
 
 withEnv e = local $ second (<> e)
 
-mkELet (False, n) x xt = x
-mkELet (True, n) x xt = term
+mkELet n x xt = {-(if null vs then id else trace_ $ "mkELet " ++ show (length vs) ++ " " ++ show n)-} term
   where
+    vs = [Var i | i <- Set.toList $ free x <> free xt]
     fn = FunName (snd n) (Just x) xt
 
-    term = pmLabel fn 0 [] $ getFix x 0
+    term = pmLabel fn vs 0 [] $ getFix x 0
 
     getFix (Lam z) i = Lam $ getFix z (i+1)
-    getFix (TFun "primFix" _ [t, Lam f]) i = subst 0 (foldl app_ term (downTo 0 i)) f
+    getFix (TFun "primFix" _ [t, Lam f]) i = (if null vs then id else trace_ "!local rec") $ subst 0 (foldl app_ term (downTo 0 i)) f
     getFix x _ = x
 
 
@@ -1401,7 +1420,7 @@ instance MkDoc Neutral where
         g = mkDoc ts
         f = \case
             CstrT' t a b     -> shCstr <$> g (a, t) <*> g (b, t)
-            Fun s i (mkExpTypes (nType s) . reverse -> xs) _ -> foldl (shApp Visible) (shAtom_ $ show s) <$> mapM g xs
+            Fun' s vs i (mkExpTypes (nType s) . reverse -> xs) _ -> foldl (shApp Visible) (shAtom_ $ show s) <$> mapM g xs
             Var_ k           -> shAtom <$> shVar k
             App_ a b         -> shApp Visible <$> g a <*> g b
             CaseFun_ s xs n  -> foldl (shApp Visible) (shAtom_ $ show s) <$> mapM g ({-mkExpTypes (nType s) $ makeCaseFunPars te n ++ -} xs ++ [Neut n])
diff --git a/src/LambdaCube/Compiler/Parser.hs b/src/LambdaCube/Compiler/Parser.hs
index 1bdf19f2..283638de 100644
--- a/src/LambdaCube/Compiler/Parser.hs
+++ b/src/LambdaCube/Compiler/Parser.hs
@@ -15,7 +15,7 @@ module LambdaCube.Compiler.Parser
     , pattern SVar, pattern SType, pattern Wildcard, pattern SAppV, pattern SLamV, pattern SAnn
     , pattern SBuiltin, pattern SPi, pattern Primitive, pattern SLabelEnd, pattern SLam
     , pattern TyType, pattern Wildcard_
-    , debug, LI, isPi, varDB, lowerDB, justDB, upDB, cmpDB, MaxDB (..), iterateN, traceD
+    , debug, isPi, varDB, lowerDB, justDB, upDB, cmpDB, MaxDB (..), iterateN, traceD
     , parseLC, runDefParser
     , getParamsS, addParamsS, getApps, apps', downToS, addForalls
     , mkDesugarInfo, joinDesugarInfo
@@ -94,15 +94,12 @@ data SExp' a
     = SGlobal SIName
     | SBind SI Binder (SData SIName{-parameter's name-}) (SExp' a) (SExp' a)
     | SApp SI Visibility (SExp' a) (SExp' a)
-    | SLet LI (SExp' a) (SExp' a)    -- let x = e in f   -->  SLet e f{-x is Var 0-}
+    | SLet SIName (SExp' a) (SExp' a)    -- let x = e in f   -->  SLet e f{-x is Var 0-}
     | SVar_ (SData SIName) !Int
     | SLit SI Lit
     | STyped SI a
   deriving (Eq, Show)
 
--- let info
-type LI = (Bool, SIName)
-
 pattern SVar a b = SVar_ (SData a) b
 
 data Binder
@@ -379,7 +376,7 @@ parseTerm prec = setSI' {-TODO: remove, slow-} $ case prec of
             ) <|> mkList <$> namespace <*> pure [])
      <|> mkTuple <$> namespace <*> parens (commaSep $ parseTerm PrecLam)
      <|> mkRecord <$> braces (commaSep $ (,) <$> lowerCase <* symbol ":" <*> parseTerm PrecLam)
-     <|> mkLets True <$ reserved "let" <*> dsInfo <*> parseDefs xSLabelEnd <* reserved "in" <*> parseTerm PrecLam
+     <|> mkLets <$ reserved "let" <*> dsInfo <*> parseDefs <* reserved "in" <*> parseTerm PrecLam
   where
     level pr f = parseTerm pr >>= \t -> option t $ f t
 
@@ -462,7 +459,7 @@ parseTerm prec = setSI' {-TODO: remove, slow-} $ case prec of
                     ])
          `SAppV` exp
 
-    letdecl = mkLets False <$ reserved "let" <*> dsInfo <*> (compileFunAlts' id =<< valueDef)
+    letdecl = mkLets <$ reserved "let" <*> dsInfo <*> (compileFunAlts' SLabelEnd =<< valueDef)
 
     boolExpression = (\pred e -> SBuiltin "primIfThenElse" `SAppV` pred `SAppV` e `SAppV` SBuiltin "Nil") <$> parseTerm PrecLam
 
@@ -813,10 +810,10 @@ parseRHS fe tok = fmap (fmap (fe *** fe) +++ fe) $ do
   <|> do
     reservedOp tok
     rhs <- parseTerm PrecLam
-    f <- option id $ mkLets True <$ reserved "where" <*> dsInfo <*> parseDefs xSLabelEnd
+    f <- option id $ mkLets <$ reserved "where" <*> dsInfo <*> parseDefs
     return $ Right $ f rhs
 
-parseDefs lend = indentMS True parseDef >>= compileFunAlts' lend . concat
+parseDefs = indentMS True parseDef >>= compileFunAlts' SLabelEnd . concat
 
 funAltDef parseName = do   -- todo: use ns to determine parseName
     (n, (fee, tss)) <-
@@ -864,16 +861,14 @@ parseSomeGuards f = do
     f <$> ((map (dbfGT e') <$> parseSomeGuards (> pos)) <|> (:[]) . GuardLeaf <$ reservedOp "->" <*> (dbf' e' <$> parseETerm PrecLam))
       <*> option [] (parseSomeGuards (== pos))
 -}
-mkLets :: Bool -> DesugarInfo -> [Stmt]{-where block-} -> SExp{-main expression-} -> SExp{-big let with lambdas; replaces global names with de bruijn indices-}
-mkLets a ds = mkLets' a ds . sortDefs ds where
-    mkLets' _ _ [] e = e
-    mkLets' False ge (Let n _ mt x: ds) e | not $ usedS n x
-        = SLet (False, n) (maybe id (flip SAnn . addForalls {-todo-}[] []) mt x) (substSG0 n $ mkLets' False ge ds e)
-    mkLets' True ge (Let n _ mt x: ds) e | not $ usedS n x
-        = SLet (False, n) (maybe id (flip SAnn . addForalls {-todo-}[] []) mt x) (substSG0 n $ mkLets' True ge ds e)
-    mkLets' _ _ (x: ds) e = error $ "mkLets: " ++ show x
-
-xSLabelEnd = id --SLabelEnd
+mkLets :: DesugarInfo -> [Stmt]{-where block-} -> SExp{-main expression-} -> SExp{-big let with lambdas; replaces global names with de bruijn indices-}
+mkLets ds = mkLets' . sortDefs ds where
+    mkLets' [] e = e
+    mkLets' (Let n _ mt x: ds) e
+        = SLet n (maybe id (flip SAnn . addForalls {-todo-}[] []) mt x') (substSG0 n $ mkLets' ds e)
+      where
+        x' = if usedS n x then SBuiltin "primFix" `SAppV` SLamV (substSG0 n x) else x
+    mkLets' (x: ds) e = error $ "mkLets: " ++ show x
 
 addForalls :: Up a => Extensions -> [SName] -> SExp' a -> SExp' a
 addForalls exs defined x = foldl f x [v | v@(_, vh:_) <- reverse $ freeS x, snd v `notElem'` ("fromInt"{-todo: remove-}: defined), isLower vh || NoConstructorNamespace `elem` exs]
@@ -1081,7 +1076,7 @@ parseModule f str = do
       { extensions    = exts
       , moduleImports = [((mempty, "Prelude"), ImportAllBut []) | NoImplicitPrelude `notElem` exts] ++ idefs
       , moduleExports = join $ snd <$> header
-      , definitions   = \ge -> first snd $ runP' (ge, ns) f (parseDefs SLabelEnd <* eof) st
+      , definitions   = \ge -> first snd $ runP' (ge, ns) f (parseDefs <* eof) st
       }
 
 parseLC :: FilePath -> String -> Either ParseError Module
diff --git a/test/runTests.hs b/test/runTests.hs
index a175bc7e..dacd0002 100644
--- a/test/runTests.hs
+++ b/test/runTests.hs
@@ -195,7 +195,7 @@ doTest Config{..} (i, fn) = do
     liftIO $ putStrLn msg
     return (runtime, result)
   where
-    (splitMPath -> (pa, mn', mn), exts) = splitExtensions' $ dropExtension fn
+    (splitMPath -> (pa, mn', mn), reverse -> exts) = splitExtensions' $ dropExtension fn
 
     getMain = do
         r@(fname, x, _) <- local (const $ ioFetch [pa]) $ getDef (mn' ++ concat exts ++ ".lc") "main" Nothing
diff --git a/testdata/Graphics.out b/testdata/Graphics.out
index fc891b27..cea97671 100644
--- a/testdata/Graphics.out
+++ b/testdata/Graphics.out
@@ -38,6 +38,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi2;
@@ -82,6 +84,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vec4 ((vi2).x,(vi2).y,(vi2).z,0.5);
@@ -136,6 +140,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi4;
@@ -194,6 +200,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -253,6 +261,9 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              float time = time;
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = (((vi3) + ((vec2 (0.0,1.0)) * (time))) + ((sin (vec2
@@ -314,6 +325,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -372,6 +385,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -432,6 +447,9 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              float time = time;
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = (((vi3) + ((vec2 (0.0,1.0)) * (time))) + ((sin (vec2
@@ -494,6 +512,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi4;
@@ -554,6 +574,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -614,6 +636,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -674,6 +698,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -733,6 +759,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -793,6 +821,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -853,6 +883,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -913,6 +945,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -973,6 +1007,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -1033,6 +1069,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -1093,6 +1131,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -1153,6 +1193,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -1213,6 +1255,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -1273,6 +1317,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -1333,6 +1379,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -1393,6 +1441,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -1453,6 +1503,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -1513,6 +1565,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -1573,6 +1627,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -1632,6 +1688,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -1692,6 +1750,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -1752,6 +1812,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -1812,6 +1874,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -1872,6 +1936,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -1932,6 +1998,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -1992,6 +2060,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -2052,6 +2122,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -2112,6 +2184,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -2172,6 +2246,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -2232,6 +2308,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -2292,6 +2370,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -2352,6 +2432,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -2412,6 +2494,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -2472,6 +2556,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -2532,6 +2618,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -2591,6 +2679,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -2651,6 +2741,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -2711,6 +2803,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -2771,6 +2865,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -2831,6 +2927,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -2891,6 +2989,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -2951,6 +3051,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -3011,6 +3113,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -3071,6 +3175,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -3131,6 +3237,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -3191,6 +3299,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -3251,6 +3361,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -3311,6 +3423,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
diff --git a/testdata/HyperbolicParaboloic.out b/testdata/HyperbolicParaboloic.out
index 28548feb..7b9b420d 100644
--- a/testdata/HyperbolicParaboloic.out
+++ b/testdata/HyperbolicParaboloic.out
@@ -36,17 +36,15 @@ Pipeline
               vec4 scale(float z0,vec4 z1) {
                   return (z1) * (vec4 (z0,z0,z0,1.0));
               }
-              vec4 v3FToV4F(vec3 z0) {
-                  return vec4 ((z0).x,(z0).y,(z0).z,1.0);
-              }
+              float t = (m).y;
               void main() {
                   gl_Position = scale
                       (0.1
-                      ,(MVP) * (vec4 (((m).y) * ((vi1).x)
+                      ,(MVP) * (vec4 ((t) * ((vi1).x)
                                      ,(((0.5) * ((m).x)) * ((vi1).x)) * ((vi1).y)
-                                     ,((m).y) * ((vi1).y)
+                                     ,(t) * ((vi1).y)
                                      ,1.0)));
-                  vo1 = v3FToV4F (vi1);
+                  vo1 = vec4 ((vi1).x,(vi1).y,(vi1).z,1.0);
               }
               """
           , geometryShader = Nothing
diff --git a/testdata/Hyperboloid.lc b/testdata/Hyperboloid.lc
index d3f8dc7e..e6ae104a 100644
--- a/testdata/Hyperboloid.lc
+++ b/testdata/Hyperboloid.lc
@@ -14,9 +14,9 @@ mapFragments22 s fs = accumulate colorFragmentCtx (\a -> fs a) s clear
 transform s f = mapPrimitives (\(p) -> let v = v3FToV4F p in (f v, v)) s
 
 trans :: Vec 4 Float -> Vec 4 Float
-trans (V4 x y _ _) = V4 (k *! sin (s *! x +! r *! y)) y (k *! cos (s *! x +! r *! y)) 1.0
+trans (V4 x y _ _) = V4 (k * sin (s * x + r * y)) y (k * cos (s * x + r * y)) 1.0
     where 
-          k = 2 *! m%y
+          k = 2 * m%y
           s = 0.7
           r = m%x
 
diff --git a/testdata/Hyperboloid.out b/testdata/Hyperboloid.out
index 3eea868f..bf3367bb 100644
--- a/testdata/Hyperboloid.out
+++ b/testdata/Hyperboloid.out
@@ -33,22 +33,19 @@ Pipeline
               in vec3 vi1;
               smooth out vec4 vo1;
               vec2 m = Mouse;
+              float k = (2.0) * ((m).y);
+              float r = (m).x;
               vec4 scale(float z0,vec4 z1) {
                   return (z1) * (vec4 (z0,z0,z0,1.0));
               }
-              vec4 v3FToV4F(vec3 z0) {
-                  return vec4 ((z0).x,(z0).y,(z0).z,1.0);
-              }
               void main() {
-                  gl_Position = scale
-                      (0.1
-                      ,(MVP) * (vec4 (((2.0) * ((m).y)) * (sin
-                                     (((0.7) * ((vi1).x)) + (((m).x) * ((vi1).y))))
-                                     ,(vi1).y
-                                     ,((2.0) * ((m).y)) * (cos
-                                     (((0.7) * ((vi1).x)) + (((m).x) * ((vi1).y))))
-                                     ,1.0)));
-                  vo1 = v3FToV4F (vi1);
+                  gl_Position = scale (0.1
+                                      ,(MVP) * (vec4
+                                      ((k) * (sin (((0.7) * ((vi1).x)) + ((r) * ((vi1).y))))
+                                      ,(vi1).y
+                                      ,(k) * (cos (((0.7) * ((vi1).x)) + ((r) * ((vi1).y))))
+                                      ,1.0)));
+                  vo1 = vec4 ((vi1).x,(vi1).y,(vi1).z,1.0);
               }
               """
           , geometryShader = Nothing
diff --git a/testdata/Spiral.out b/testdata/Spiral.out
index 0364685f..d4922494 100644
--- a/testdata/Spiral.out
+++ b/testdata/Spiral.out
@@ -36,9 +36,6 @@ Pipeline
               vec4 scale(float z0,vec4 z1) {
                   return (z1) * (vec4 (z0,z0,z0,1.0));
               }
-              vec4 v3FToV4F(vec3 z0) {
-                  return vec4 ((z0).x,(z0).y,(z0).z,1.0);
-              }
               void main() {
                   gl_Position = scale
                       (0.5
@@ -48,7 +45,7 @@ Pipeline
                                      ((0.9) * ((vi1).x)))
                                      ,((m).y) * ((0.9) * ((vi1).x))
                                      ,1.0)));
-                  vo1 = v3FToV4F (vi1);
+                  vo1 = vec4 ((vi1).x,(vi1).y,(vi1).z,1.0);
               }
               """
           , geometryShader = Nothing
diff --git a/testdata/editor-examples/Heartbeat.out b/testdata/editor-examples/Heartbeat.out
index 81eec655..435db6b7 100644
--- a/testdata/editor-examples/Heartbeat.out
+++ b/testdata/editor-examples/Heartbeat.out
@@ -108,6 +108,7 @@ Pipeline
               }
               vec4 blue = rgb (0.0,0.0,1.0);
               vec4 navy = rgb (0.0,0.0,0.5);
+              float ti = abs ((sin ((time) * (4.0))) - (0.37));
               float time = Time;
               vec4 white = rgb (1.0,1.0,1.0);
               vec4 yellow = rgb (1.0,1.0,0.0);
@@ -116,18 +117,13 @@ Pipeline
                       ((((((vo1).x) - (0.85)) * (((vo1).x) - (0.85))) + ((((vo1).y) - (0.85)) * (((vo1).y) - (0.85)))) + ((5.0e-4) * (sin
                       (((3.0) * (atan
                       (((vo1).x) - (0.85)
-                      ,((vo1).y) - (0.85)))) + ((15.0) * (time)))))) < ((5.0e-3) * (abs
-                      ((sin
-                      ((time) * (4.0))) - (0.37)))) ? navy : ((((((vo1).x) - (0.85)) * (((vo1).x) - (0.85))) + ((((vo1).y) - (0.85)) * (((vo1).y) - (0.85)))) + ((2.0e-3) * (sin
+                      ,((vo1).y) - (0.85)))) + ((15.0) * (time)))))) < ((5.0e-3) * (ti)) ? navy : ((((((vo1).x) - (0.85)) * (((vo1).x) - (0.85))) + ((((vo1).y) - (0.85)) * (((vo1).y) - (0.85)))) + ((2.0e-3) * (sin
                       (((5.0) * (atan
                       (((vo1).x) - (0.85)
-                      ,((vo1).y) - (0.85)))) - ((5.0) * (time)))))) < ((2.0e-2) * (abs
-                      ((sin
-                      ((time) * (4.0))) - (0.37)))) ? blue : ((((((vo1).x) - (0.85)) * (((vo1).x) - (0.85))) + ((((vo1).y) - (0.85)) * (((vo1).y) - (0.85)))) + ((2.0e-3) * (sin
+                      ,((vo1).y) - (0.85)))) - ((5.0) * (time)))))) < ((2.0e-2) * (ti)) ? blue : ((((((vo1).x) - (0.85)) * (((vo1).x) - (0.85))) + ((((vo1).y) - (0.85)) * (((vo1).y) - (0.85)))) + ((2.0e-3) * (sin
                       (((7.0) * (atan
                       (((vo1).x) - (0.85)
-                      ,((vo1).y) - (0.85)))) + ((3.0) * (time)))))) < ((5.0e-2) * (abs
-                      ((sin ((time) * (4.0))) - (0.37)))) ? white : yellow;
+                      ,((vo1).y) - (0.85)))) + ((3.0) * (time)))))) < ((5.0e-2) * (ti)) ? white : yellow;
               }
               """
           }
diff --git a/testdata/fetcharrays01.out b/testdata/fetcharrays01.out
index aa49e5fd..06db8806 100644
--- a/testdata/fetcharrays01.out
+++ b/testdata/fetcharrays01.out
@@ -36,12 +36,10 @@ Pipeline
               vec4 scale(float z0,vec4 z1) {
                   return (z1) * (vec4 (z0,z0,z0,1.0));
               }
-              vec4 v3FToV4F(vec3 z0) {
-                  return vec4 ((z0).x,(z0).y,(z0).z,1.0);
-              }
               void main() {
-                  gl_Position = scale (0.5,(MVP) * (v3FToV4F (vi1)));
-                  vo1 = v3FToV4F (vi1);
+                  gl_Position = scale
+                      (0.5,(MVP) * (vec4 ((vi1).x,(vi1).y,(vi1).z,1.0)));
+                  vo1 = vec4 ((vi1).x,(vi1).y,(vi1).z,1.0);
               }
               """
           , geometryShader = Nothing
diff --git a/testdata/gfx03.out b/testdata/gfx03.out
index b3c238b4..1462c801 100644
--- a/testdata/gfx03.out
+++ b/testdata/gfx03.out
@@ -28,11 +28,10 @@ Pipeline
               }
               uniform mat4 MVP2;
               in vec3 vi1;
-              vec4 v3FToV4F(vec3 z0) {
-                  return vec4 ((z0).x,(z0).y,(z0).z,1.0);
-              }
+              mat4 modelViewProj = MVP2;
               void main() {
-                  gl_Position = (MVP2) * (v3FToV4F (vi1));
+                  gl_Position = (modelViewProj) * (vec4
+                      ((vi1).x,(vi1).y,(vi1).z,1.0));
               }
               """
           , geometryShader = Nothing
@@ -63,12 +62,11 @@ Pipeline
               uniform mat4 MVP2;
               in vec3 vi1;
               smooth out vec4 vo1;
-              vec4 v3FToV4F(vec3 z0) {
-                  return vec4 ((z0).x,(z0).y,(z0).z,1.0);
-              }
+              mat4 modelViewProj = MVP2;
               void main() {
-                  gl_Position = (MVP2) * (v3FToV4F (vi1));
-                  vo1 = v3FToV4F (vi1);
+                  gl_Position = (modelViewProj) * (vec4
+                      ((vi1).x,(vi1).y,(vi1).z,1.0));
+                  vo1 = vec4 ((vi1).x,(vi1).y,(vi1).z,1.0);
               }
               """
           , geometryShader = Nothing
@@ -101,8 +99,9 @@ Pipeline
               uniform mat4 MVP;
               in vec4 vi1;
               flat out vec4 vo1;
+              mat4 modelViewProj = MVP;
               void main() {
-                  gl_Position = (MVP) * (vi1);
+                  gl_Position = (modelViewProj) * (vi1);
                   vo1 = vi1;
               }
               """
diff --git a/testdata/gfx04.out b/testdata/gfx04.out
index b39f1a1c..e17394f1 100644
--- a/testdata/gfx04.out
+++ b/testdata/gfx04.out
@@ -33,11 +33,12 @@ Pipeline
               in vec3 vi1;
               in vec3 vi2;
               smooth out vec4 vo1;
+              mat4 modelViewProj = MVP;
               vec4 v3FToV4F(vec3 z0) {
                   return vec4 ((z0).x,(z0).y,(z0).z,1.0);
               }
               void main() {
-                  gl_Position = (MVP) * (v3FToV4F (vi1));
+                  gl_Position = (modelViewProj) * (v3FToV4F (vi1));
                   vo1 = v3FToV4F (vi2);
               }
               """
diff --git a/testdata/gfx05.out b/testdata/gfx05.out
index aaa1ce3d..a06d0612 100644
--- a/testdata/gfx05.out
+++ b/testdata/gfx05.out
@@ -81,11 +81,10 @@ Pipeline
               }
               uniform mat4 MVP2;
               in vec3 vi1;
-              vec4 v3FToV4F(vec3 z0) {
-                  return vec4 ((z0).x,(z0).y,(z0).z,1.0);
-              }
+              mat4 modelViewProj = MVP2;
               void main() {
-                  gl_Position = (MVP2) * (v3FToV4F (vi1));
+                  gl_Position = (modelViewProj) * (vec4
+                      ((vi1).x,(vi1).y,(vi1).z,1.0));
               }
               """
           , geometryShader = Nothing
@@ -116,12 +115,11 @@ Pipeline
               uniform mat4 MVP2;
               in vec3 vi1;
               smooth out vec4 vo1;
-              vec4 v3FToV4F(vec3 z0) {
-                  return vec4 ((z0).x,(z0).y,(z0).z,1.0);
-              }
+              mat4 modelViewProj = MVP2;
               void main() {
-                  gl_Position = (MVP2) * (v3FToV4F (vi1));
-                  vo1 = v3FToV4F (vi1);
+                  gl_Position = (modelViewProj) * (vec4
+                      ((vi1).x,(vi1).y,(vi1).z,1.0));
+                  vo1 = vec4 ((vi1).x,(vi1).y,(vi1).z,1.0);
               }
               """
           , geometryShader = Nothing
@@ -157,8 +155,9 @@ Pipeline
               in vec4 vi1;
               in vec2 vi2;
               smooth out vec2 vo1;
+              mat4 modelViewProj = MVP;
               void main() {
-                  gl_Position = (MVP) * (vi1);
+                  gl_Position = (modelViewProj) * (vi1);
                   vo1 = vi2;
               }
               """
diff --git a/testdata/heartbeat01.out b/testdata/heartbeat01.out
index 70857c9b..35528cae 100644
--- a/testdata/heartbeat01.out
+++ b/testdata/heartbeat01.out
@@ -108,6 +108,7 @@ Pipeline
               }
               vec4 blue = rgb (0.0,0.0,1.0);
               vec4 navy = rgb (0.0,0.0,0.5);
+              float ti = abs ((sin ((time) * (4.0))) - (0.37));
               float time = Time;
               vec4 white = rgb (1.0,1.0,1.0);
               vec4 yellow = rgb (1.0,1.0,0.0);
@@ -116,18 +117,13 @@ Pipeline
                       ((((((vo1).x) - (0.85)) * (((vo1).x) - (0.85))) + ((((vo1).y) - (0.85)) * (((vo1).y) - (0.85)))) + ((5.0e-4) * (sin
                       (((3.0) * (atan
                       (((vo1).x) - (0.85)
-                      ,((vo1).y) - (0.85)))) + ((15.0) * (time)))))) < ((5.0e-3) * (abs
-                      ((sin
-                      ((time) * (4.0))) - (0.37)))) ? navy : ((((((vo1).x) - (0.85)) * (((vo1).x) - (0.85))) + ((((vo1).y) - (0.85)) * (((vo1).y) - (0.85)))) + ((2.0e-3) * (sin
+                      ,((vo1).y) - (0.85)))) + ((15.0) * (time)))))) < ((5.0e-3) * (ti)) ? navy : ((((((vo1).x) - (0.85)) * (((vo1).x) - (0.85))) + ((((vo1).y) - (0.85)) * (((vo1).y) - (0.85)))) + ((2.0e-3) * (sin
                       (((5.0) * (atan
                       (((vo1).x) - (0.85)
-                      ,((vo1).y) - (0.85)))) - ((5.0) * (time)))))) < ((2.0e-2) * (abs
-                      ((sin
-                      ((time) * (4.0))) - (0.37)))) ? blue : ((((((vo1).x) - (0.85)) * (((vo1).x) - (0.85))) + ((((vo1).y) - (0.85)) * (((vo1).y) - (0.85)))) + ((2.0e-3) * (sin
+                      ,((vo1).y) - (0.85)))) - ((5.0) * (time)))))) < ((2.0e-2) * (ti)) ? blue : ((((((vo1).x) - (0.85)) * (((vo1).x) - (0.85))) + ((((vo1).y) - (0.85)) * (((vo1).y) - (0.85)))) + ((2.0e-3) * (sin
                       (((7.0) * (atan
                       (((vo1).x) - (0.85)
-                      ,((vo1).y) - (0.85)))) + ((3.0) * (time)))))) < ((5.0e-2) * (abs
-                      ((sin ((time) * (4.0))) - (0.37)))) ? white : yellow;
+                      ,((vo1).y) - (0.85)))) + ((3.0) * (time)))))) < ((5.0e-2) * (ti)) ? white : yellow;
               }
               """
           }
diff --git a/testdata/language-features/recursion/simplerec02.wip.lc b/testdata/language-features/recursion/simplerec02.lc
index 71f046fd..71f046fd 100644
--- a/testdata/language-features/recursion/simplerec02.wip.lc
+++ b/testdata/language-features/recursion/simplerec02.lc
diff --git a/testdata/language-features/recursion/simplerec02.out b/testdata/language-features/recursion/simplerec02.out
new file mode 100644
index 00000000..5f8d48b2
--- /dev/null
+++ b/testdata/language-features/recursion/simplerec02.out
@@ -0,0 +1,9 @@
+main is not found
+------------ trace
+value :: 'Tuple0
+------------ tooltips
+testdata/language-features/recursion/simplerec02.lc 1:1-1:6  Tuple0
+testdata/language-features/recursion/simplerec02.lc 1:21-1:24  Char
+testdata/language-features/recursion/simplerec02.lc 1:21-2:26  Bool->Char | V0->V1
+testdata/language-features/recursion/simplerec02.lc 2:21-2:24  V4
+testdata/language-features/recursion/simplerec02.lc 3:12-3:14  Tuple0
diff --git a/testdata/language-features/recursion/simplerec03.wip.lc b/testdata/language-features/recursion/simplerec03.lc
index 5f602a04..5f602a04 100644
--- a/testdata/language-features/recursion/simplerec03.wip.lc
+++ b/testdata/language-features/recursion/simplerec03.lc
diff --git a/testdata/language-features/recursion/simplerec03.out b/testdata/language-features/recursion/simplerec03.out
new file mode 100644
index 00000000..16802cb7
--- /dev/null
+++ b/testdata/language-features/recursion/simplerec03.out
@@ -0,0 +1,9 @@
+main is not found
+------------ trace
+value :: 'Tuple0
+------------ tooltips
+testdata/language-features/recursion/simplerec03.lc 1:1-1:6  Tuple0
+testdata/language-features/recursion/simplerec03.lc 1:9-1:11  Tuple0
+testdata/language-features/recursion/simplerec03.lc 3:13-3:16  Char
+testdata/language-features/recursion/simplerec03.lc 3:13-4:18  Bool->Char | V0->V1
+testdata/language-features/recursion/simplerec03.lc 4:13-4:16  V4
diff --git a/testdata/line01.out b/testdata/line01.out
index 67124a52..a19722c6 100644
--- a/testdata/line01.out
+++ b/testdata/line01.out
@@ -33,12 +33,10 @@ Pipeline
               vec4 scale(float z0,vec4 z1) {
                   return (z1) * (vec4 (z0,z0,z0,1.0));
               }
-              vec4 v3FToV4F(vec3 z0) {
-                  return vec4 ((z0).x,(z0).y,(z0).z,1.0);
-              }
               void main() {
-                  gl_Position = scale (0.5,(MVP) * (v3FToV4F (vi1)));
-                  vo1 = v3FToV4F (vi1);
+                  gl_Position = scale
+                      (0.5,(MVP) * (vec4 ((vi1).x,(vi1).y,(vi1).z,1.0)));
+                  vo1 = vec4 ((vi1).x,(vi1).y,(vi1).z,1.0);
               }
               """
           , geometryShader = Nothing
diff --git a/testdata/simple02.out b/testdata/simple02.out
index faf41dea..63f86974 100644
--- a/testdata/simple02.out
+++ b/testdata/simple02.out
@@ -30,8 +30,9 @@ Pipeline
               uniform mat4 MVP;
               in vec4 vi1;
               smooth out vec4 vo1;
+              mat4 modelViewProj = MVP;
               void main() {
-                  gl_Position = (MVP) * (vi1);
+                  gl_Position = (modelViewProj) * (vi1);
                   vo1 = vi1;
               }
               """
diff --git a/testdata/simple03.out b/testdata/simple03.out
index dc2dcca3..79bc503a 100644
--- a/testdata/simple03.out
+++ b/testdata/simple03.out
@@ -33,11 +33,12 @@ Pipeline
               in vec3 vi1;
               in vec3 vi2;
               smooth out vec4 vo1;
+              mat4 modelViewProj = viewProj;
               vec4 v3FToV4F(vec3 z0) {
                   return vec4 ((z0).x,(z0).y,(z0).z,1.0);
               }
               void main() {
-                  gl_Position = (viewProj) * (v3FToV4F (vi1));
+                  gl_Position = (modelViewProj) * (v3FToV4F (vi1));
                   vo1 = v3FToV4F (vi2);
               }
               """
@@ -74,11 +75,12 @@ Pipeline
               in vec3 vi1;
               in vec3 vi2;
               smooth out vec4 vo1;
+              mat4 modelViewProj = viewProj;
               vec4 v3FToV4F(vec3 z0) {
                   return vec4 ((z0).x,(z0).y,(z0).z,1.0);
               }
               void main() {
-                  gl_Position = (viewProj) * (v3FToV4F (vi1));
+                  gl_Position = (modelViewProj) * (v3FToV4F (vi1));
                   vo1 = v3FToV4F (vi2);
               }
               """