refactoring

39 files changed, 1465 insertions, 1314 deletions

diff --git a/src/LambdaCube/Compiler/CoreToIR.hs b/src/LambdaCube/Compiler/CoreToIR.hs
index 17e2133d..ee8013ac 100644
--- a/src/LambdaCube/Compiler/CoreToIR.hs
+++ b/src/LambdaCube/Compiler/CoreToIR.hs
@@ -26,7 +26,7 @@ import qualified LambdaCube.IR as IR
 import qualified LambdaCube.Linear as IR
 
 import LambdaCube.Compiler.Pretty
-import Text.PrettyPrint.Compact (nest)
+import Text.PrettyPrint.Compact (nest, indent)
 import LambdaCube.Compiler.Infer hiding (Con, Lam, Pi, TType, Var, ELit)
 import qualified LambdaCube.Compiler.Infer as I
 import LambdaCube.Compiler.Parser (up, Up (..))
@@ -196,9 +196,9 @@ getCommands e = case e of
         , IR.programStreams     = Map.fromList $ zip vertexInput $ map (uncurry IR.Parameter) input
         , IR.programInTextures  = snd <$> Map.filter ((\case UUniform{} -> False; _ -> True) . fst) pUniforms
         , IR.programOutput      = pure $ IR.Parameter "f0" IR.V4F -- TODO
-        , IR.vertexShader       = unlines vertSrc
+        , IR.vertexShader       = show vertSrc
         , IR.geometryShader     = mempty -- TODO
-        , IR.fragmentShader     = unlines fragSrc
+        , IR.fragmentShader     = show fragSrc
         }
     pv <- gets IR.programs
     modify (\s -> s {IR.programs = pv <> pure prg})
@@ -513,62 +513,59 @@ genGLSLs backend
     (frag, tfrag)       -- fragment shader
     ffilter             -- fragment filter
     = ( -- vertex input
-        vertIn
+        vertInNames
 
       , -- uniforms
         fmap (second fst) $ vertUniforms <> fragUniforms
 
       , -- vertex shader code
-           shaderHeader backend
-        <> [unwords ["uniform", t, n, ";"] | (n, t) <- Map.toList $ snd . snd <$> vertUniforms]
-        <> [unwords [inputDef backend, toGLSLType "3" t, n, ";"] | (n, t) <- zip vertIn verti]
-        <> [unwords $ varyingOut backend i ++ [t, n, ";"] | (n, (i, t)) <- zip vertOut'' vertOut]
-        <> ["void main() {"]
-        <> [showNest $ text n <+> "=" </> x <> ";" | (n, x) <- zip vertOut''WithPosition vertGLSL]
-        <> [showNest $ "gl_PointSize" <+> "=" </> x <> ";" | Just x <- [ptGLSL]]
-        <> ["}"]
+        shader backend $
+           [shaderDecl "uniform" (text t) (text n) | (n, t) <- Map.toList $ snd . snd <$> vertUniforms]
+        <> [shaderDecl (inputDef backend) (toGLSLType "3" t) (text n) | (n, t) <- zip vertInNames vertIns]
+        <> [shaderDecl (varyingOut backend i) (text t) (text n) | (n, (i, t)) <- zip vertOutNames vertOuts]
+        <> [mainFunc $
+               [shaderLet (text n) x | (n, x) <- zip vertOutNamesWithPosition vertGLSL]
+            <> [shaderLet "gl_PointSize" x | Just x <- [ptGLSL]]
+           ]
 
       , -- fragment shader code
-           shaderHeader backend
-        <> [unwords ["uniform", t, n, ";"] | (n, t) <- Map.toList $ snd . snd <$> fragUniforms]
-        <> [unwords $ varyingIn backend i ++ [t, n, ";"] | (n, (i, t)) <- zip vertOut'' vertOut]
-        <> [unwords ["out", toGLSLType "4" tfrag,fragColorName backend,";"] | noUnit tfrag, backend == OpenGL33]
-        <> ["void main() {"]
-        <> [showNest $ "if" <+> parens ("!" <> parens filt) <+> "discard" <> ";" | Just filt <- [filtGLSL]]
-        <> [showNest $ text (fragColorName backend) <+> "=" <+> fromMaybe (text $ head vertOut'') fragGLSL <> ";" | noUnit tfrag]
-        <> ["}"]
+        shader backend $
+           [shaderDecl "uniform" (text t) (text n) | (n, t) <- Map.toList $ snd . snd <$> fragUniforms]
+        <> [shaderDecl (varyingIn backend i) (text t) (text n) | (n, (i, t)) <- zip vertOutNames vertOuts]
+        <> [shaderDecl "out" (toGLSLType "4" tfrag) (fragColorName backend) | noUnit tfrag, backend == OpenGL33]
+        <> [mainFunc $
+               [shaderStmt $ "if" <+> parens ("!" <> parens filt) <+> "discard" | Just filt <- [filtGLSL]]
+            <> [shaderLet (fragColorName backend) $ fromMaybe (text $ head vertOutNames) fragGLSL | noUnit tfrag]
+           ]
       )
   where
-    showNest = show . nest 4
-
-    (verti, verts) = case vert of
-        Just (etaRed -> Just (verti, verts)) -> (verti, eTuple verts)
+    (vertIns, verts) = case vert of
+        Just (etaRed -> Just (vertIns, verts)) -> (vertIns, eTuple verts)
         Nothing      -> ([], [mkTVar 0 tvert])
 
     freshTypeVars = map (("s" ++) . show) [0..]
 
     (((vertGLSL, ptGLSL), vertUniforms), ((filtGLSL, fragGLSL), fragUniforms)) = flip evalState freshTypeVars $ (,)
         <$> runWriterT ((,)
-            <$> traverse (genGLSL' vertIn . (,) verti) verts
-            <*> traverse (genGLSL' vertOut''WithPosition . red) rp)
+            <$> traverse (genGLSL' vertInNames . (,) vertIns) verts
+            <*> traverse (genGLSL' vertOutNamesWithPosition . red) rp)
         <*> runWriterT ((,)
-            <$> traverse (genGLSL' (vertOut'') . red) ffilter
-            <*> traverse (genGLSL' (vertOut'') . red) frag)
-
-    vertOut'' = map (("vo" ++) . show) [1..length vertOut]
-    vertOut''WithPosition = "gl_Position": vertOut''
+            <$> traverse (genGLSL' vertOutNames . red) ffilter
+            <*> traverse (genGLSL' vertOutNames . red) frag)
 
-    vertIn = map (("vi" ++) . show) [1..length verti]
+    vertInNames  = map (("vi" ++) . show) [1..length vertIns]
+    vertOutNames = map (("vo" ++) . show) [1..length vertOuts]
+    vertOutNamesWithPosition = "gl_Position": vertOutNames
 
     red (etaRed -> Just (ps, o)) = (ps, o)
-    genGLSL' vertOut (ps, o)
-        | length ps == length vertOut = genGLSL (reverse vertOut) o
-        | otherwise = error $ "makeSubst illegal input " ++ show ps ++ "\n" ++ show vertOut
+    genGLSL' vertOuts (ps, o)
+        | length ps == length vertOuts = genGLSL (reverse vertOuts) o
+        | otherwise = error $ "makeSubst illegal input " ++ show ps ++ "\n" ++ show vertOuts
 
     noUnit TTuple0 = False
     noUnit _ = True
 
-    vertOut = zipWith go (eTuple ints) $ tail verts
+    vertOuts = zipWith go (eTuple ints) $ tail verts
       where
         go (A0 n) e = (interpName n, toGLSLType "3" $ tyOf e)
 
@@ -576,13 +573,22 @@ genGLSLs backend
     interpName "Flat"   = "flat"
     interpName "NoPerspective" = "noperspective"
 
-    shaderHeader WebGL1 =
+    shader WebGL1 xs = vcat $
          ["#version 100"]
       <> ["precision highp float;"]
       <> ["precision highp int;"]
-    shaderHeader OpenGL33 =
+      <> xs
+    shader OpenGL33 xs = vcat $
          ["#version 330 core"]
-      <> ["vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}"]
+      <> [shaderFunc "vec4" "texture2D" ["sampler2D s", "vec2 uv"] [shaderReturn "texture(s,uv)"]]
+      <> xs
+
+    shaderFunc outtype name pars body = outtype <+> name <> tupled pars <+> "{" <$$> indent 4 (vcat body) <$$> "}"
+    mainFunc xs = shaderFunc "void" "main" [] xs
+    shaderStmt xs = nest 4 $ xs <> ";"
+    shaderReturn xs = shaderStmt $ "return" <+> xs
+    shaderLet a b = shaderStmt $ a <+> "=" </> b
+    shaderDecl a b c = shaderStmt $ a <+> b <+> c
 
     fragColorName WebGL1   = "gl_FragColor"
     fragColorName OpenGL33 = "f0"
@@ -590,11 +596,11 @@ genGLSLs backend
     inputDef WebGL1   = "attribute"
     inputDef OpenGL33 = "in"
 
-    varyingIn WebGL1 _   = ["varying"]
-    varyingIn OpenGL33 i = [i, "in"]
+    varyingIn WebGL1 _   = "varying"
+    varyingIn OpenGL33 i = text i <+> "in"
 
-    varyingOut WebGL1   _ = ["varying"]
-    varyingOut OpenGL33 i = [i, "out"]
+    varyingOut WebGL1   _ = "varying"
+    varyingOut OpenGL33 i = text i <+> "out"
 
 eTuple (ETuple l) = l
 eTuple x = [x]
diff --git a/testdata/HyperbolicParaboloic.out b/testdata/HyperbolicParaboloic.out
index 67b1a1f6..3697902a 100644
--- a/testdata/HyperbolicParaboloic.out
+++ b/testdata/HyperbolicParaboloic.out
@@ -25,31 +25,34 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 MVP ;
-              uniform vec2 Mouse ;
-              in vec3 vi1 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 MVP;
+              uniform vec2 Mouse;
+              in vec3 vi1;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = ((MVP) * (vec4 (((Mouse).y) * ((vi1).x)
-                                           ,(((0.5) * ((Mouse).x)) * ((vi1).x)) * ((vi1).y)
-                                           ,((Mouse).y) * ((vi1).y)
-                                           ,1.0))) * (vec4 (0.1,0.1,0.1,1.0));
-              vo1 = vec4 ((vi1).x,(vi1).y,(vi1).z,1.0);
+                  gl_Position = ((MVP) * (vec4
+                      (((Mouse).y) * ((vi1).x)
+                      ,(((0.5) * ((Mouse).x)) * ((vi1).x)) * ((vi1).y)
+                      ,((Mouse).y) * ((vi1).y)
+                      ,1.0))) * (vec4 (0.1,0.1,0.1,1.0));
+                  vo1 = vec4 ((vi1).x,(vi1).y,(vi1).z,1.0);
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              f0 = vo1;
+                  f0 = vo1;
               }
-              
               """
           }
       ]
diff --git a/testdata/Hyperboloid.out b/testdata/Hyperboloid.out
index b56b5c60..ec08e25e 100644
--- a/testdata/Hyperboloid.out
+++ b/testdata/Hyperboloid.out
@@ -25,33 +25,36 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 MVP ;
-              uniform vec2 Mouse ;
-              in vec3 vi1 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 MVP;
+              uniform vec2 Mouse;
+              in vec3 vi1;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = ((MVP) * (vec4 (((2.0) * ((Mouse).y)) * (sin
-                                           (((0.7) * ((vi1).x)) + (((Mouse).x) * ((vi1).y))))
-                                           ,(vi1).y
-                                           ,((2.0) * ((Mouse).y)) * (cos
-                                           (((0.7) * ((vi1).x)) + (((Mouse).x) * ((vi1).y))))
-                                           ,1.0))) * (vec4 (0.1,0.1,0.1,1.0));
-              vo1 = vec4 ((vi1).x,(vi1).y,(vi1).z,1.0);
+                  gl_Position = ((MVP) * (vec4
+                      (((2.0) * ((Mouse).y)) * (sin
+                      (((0.7) * ((vi1).x)) + (((Mouse).x) * ((vi1).y))))
+                      ,(vi1).y
+                      ,((2.0) * ((Mouse).y)) * (cos
+                      (((0.7) * ((vi1).x)) + (((Mouse).x) * ((vi1).y))))
+                      ,1.0))) * (vec4 (0.1,0.1,0.1,1.0));
+                  vo1 = vec4 ((vi1).x,(vi1).y,(vi1).z,1.0);
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              f0 = vo1;
+                  f0 = vo1;
               }
-              
               """
           }
       ]
diff --git a/testdata/NewStyle.out b/testdata/NewStyle.out
index 70e7cdc5..34940a54 100644
--- a/testdata/NewStyle.out
+++ b/testdata/NewStyle.out
@@ -24,27 +24,29 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 MVP ;
-              in vec4 vi1 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 MVP;
+              in vec4 vi1;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = ((MVP) * (vi1)) * (vec4 (0.5,0.5,0.5,1.0));
-              vo1 = vi1;
+                  gl_Position = ((MVP) * (vi1)) * (vec4 (0.5,0.5,0.5,1.0));
+                  vo1 = vi1;
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              f0 = vo1;
+                  f0 = vo1;
               }
-              
               """
           }
       ]
diff --git a/testdata/PrimReduce.out b/testdata/PrimReduce.out
index b25cdf42..e984694d 100644
--- a/testdata/PrimReduce.out
+++ b/testdata/PrimReduce.out
@@ -22,27 +22,29 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              in vec4 vi1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              in vec4 vi1;
               void main() {
-              gl_Position = ((mat4
-                  (vec4 (cos (3.0),(0.0) - (sin (3.0)),0.0,0.0)
-                  ,vec4 (sin (3.0),cos (3.0),0.0,0.0)
-                  ,vec4 (0.0,0.0,1.0,0.0)
-                  ,vec4 (0.0,0.0,0.0,1.0))) * (vi1)) * (vec4 (0.1,0.1,0.1,1.0));
+                  gl_Position = ((mat4
+                      (vec4 (cos (3.0),(0.0) - (sin (3.0)),0.0,0.0)
+                      ,vec4 (sin (3.0),cos (3.0),0.0,0.0)
+                      ,vec4 (0.0,0.0,1.0,0.0)
+                      ,vec4 (0.0,0.0,0.0,1.0))) * (vi1)) * (vec4 (0.1,0.1,0.1,1.0));
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              out vec4 f0;
               void main() {
-              f0 = vec4 (0.0,0.0,1.0,1.0);
+                  f0 = vec4 (0.0,0.0,1.0,1.0);
               }
-              
               """
           }
       ]
diff --git a/testdata/Spiral.out b/testdata/Spiral.out
index 74973803..8bf07994 100644
--- a/testdata/Spiral.out
+++ b/testdata/Spiral.out
@@ -25,34 +25,36 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 MVP ;
-              uniform vec2 Mouse ;
-              in vec3 vi1 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 MVP;
+              uniform vec2 Mouse;
+              in vec3 vi1;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = ((MVP) * (vec4
-                  ((exp ((((Mouse).x) - (0.5)) * ((vi1).x))) * (sin
-                  ((0.9) * ((vi1).x)))
-                  ,(exp ((((Mouse).x) - (0.5)) * ((vi1).x))) * (cos
-                  ((0.9) * ((vi1).x)))
-                  ,((Mouse).y) * ((0.9) * ((vi1).x))
-                  ,1.0))) * (vec4 (0.5,0.5,0.5,1.0));
-              vo1 = vec4 ((vi1).x,(vi1).y,(vi1).z,1.0);
+                  gl_Position = ((MVP) * (vec4
+                      ((exp ((((Mouse).x) - (0.5)) * ((vi1).x))) * (sin
+                      ((0.9) * ((vi1).x)))
+                      ,(exp ((((Mouse).x) - (0.5)) * ((vi1).x))) * (cos
+                      ((0.9) * ((vi1).x)))
+                      ,((Mouse).y) * ((0.9) * ((vi1).x))
+                      ,1.0))) * (vec4 (0.5,0.5,0.5,1.0));
+                  vo1 = vec4 ((vi1).x,(vi1).y,(vi1).z,1.0);
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              f0 = vo1;
+                  f0 = vo1;
               }
-              
               """
           }
       ]
diff --git a/testdata/editor-examples/Cube.out b/testdata/editor-examples/Cube.out
index 7c4593ef..a0fb077f 100644
--- a/testdata/editor-examples/Cube.out
+++ b/testdata/editor-examples/Cube.out
@@ -24,27 +24,29 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 MVP ;
-              in vec4 vi1 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 MVP;
+              in vec4 vi1;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = ((MVP) * (vi1)) * (vec4 (0.5,0.5,0.5,1.0));
-              vo1 = vi1;
+                  gl_Position = ((MVP) * (vi1)) * (vec4 (0.5,0.5,0.5,1.0));
+                  vo1 = vi1;
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              f0 = vo1;
+                  f0 = vo1;
               }
-              
               """
           }
       ]
diff --git a/testdata/editor-examples/Heartbeat.out b/testdata/editor-examples/Heartbeat.out
index 6cfc3728..99d469b1 100644
--- a/testdata/editor-examples/Heartbeat.out
+++ b/testdata/editor-examples/Heartbeat.out
@@ -79,49 +79,52 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              in vec4 vi1 ;
-              in vec2 vi2 ;
-              smooth out vec2 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              in vec4 vi1;
+              in vec2 vi2;
+              smooth out vec2 vo1;
               void main() {
-              gl_Position = (vi1) * (vec4 (1.0,1.0,1.0,1.0));
-              vo1 = vec2 ((vi2).x,(1.0) - ((vi2).y));
+                  gl_Position = (vi1) * (vec4 (1.0,1.0,1.0,1.0));
+                  vo1 = vec2 ((vi2).x,(1.0) - ((vi2).y));
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform float Time ;
-              smooth in vec2 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform float Time;
+              smooth in vec2 vo1;
+              out vec4 f0;
               void main() {
-              f0 = ((((((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)))) ? vec4
-                  (0.0
-                  ,0.0
-                  ,0.5
-                  ,1.0) : ((((((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)))) ? vec4
-                  (0.0
-                  ,0.0
-                  ,1.0
-                  ,1.0) : ((((((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)))) ? vec4
-                  (1.0,1.0,1.0,1.0) : vec4 (1.0,1.0,0.0,1.0);
+                  f0 =
+                      ((((((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)))) ? vec4
+                      (0.0
+                      ,0.0
+                      ,0.5
+                      ,1.0) : ((((((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)))) ? vec4
+                      (0.0
+                      ,0.0
+                      ,1.0
+                      ,1.0) : ((((((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)))) ? vec4
+                      (1.0,1.0,1.0,1.0) : vec4 (1.0,1.0,0.0,1.0);
               }
-              
               """
           }
       , Program
@@ -136,29 +139,31 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 MVP ;
-              in vec4 vi1 ;
-              in vec2 vi2 ;
-              smooth out vec2 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 MVP;
+              in vec4 vi1;
+              in vec2 vi2;
+              smooth out vec2 vo1;
               void main() {
-              gl_Position = ((MVP) * (vi1)) * (vec4 (0.5,0.5,0.5,1.0));
-              vo1 = vi2;
+                  gl_Position = ((MVP) * (vi1)) * (vec4 (0.5,0.5,0.5,1.0));
+                  vo1 = vi2;
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform sampler2D s0 ;
-              smooth in vec2 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform sampler2D s0;
+              smooth in vec2 vo1;
+              out vec4 f0;
               void main() {
-              f0 = texture2D (s0,vo1);
+                  f0 = texture2D (s0,vo1);
               }
-              
               """
           }
       ]
diff --git a/testdata/editor-examples/LambdaCube.out b/testdata/editor-examples/LambdaCube.out
index 1211e5bd..1e68a1ea 100644
--- a/testdata/editor-examples/LambdaCube.out
+++ b/testdata/editor-examples/LambdaCube.out
@@ -24,86 +24,88 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform float Time ;
-              in vec4 vi1 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform float Time;
+              in vec4 vi1;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = ((mat4
-                  (vec4 (cos ((4.1) + ((((fract ((Time) * (0.2))) * (fract
-                        ((Time) * (0.2)))) * ((3.0) - ((2.0) * (fract
-                        ((Time) * (0.2)))))) * (6.28318530718)))
-                        ,0.0
-                        ,(0.0) - (sin ((4.1) + ((((fract ((Time) * (0.2))) * (fract
-                        ((Time) * (0.2)))) * ((3.0) - ((2.0) * (fract
-                        ((Time) * (0.2)))))) * (6.28318530718))))
-                        ,0.0)
-                  ,vec4 (0.0,1.0,0.0,0.0)
-                  ,vec4 (sin ((4.1) + ((((fract ((Time) * (0.2))) * (fract
-                        ((Time) * (0.2)))) * ((3.0) - ((2.0) * (fract
-                        ((Time) * (0.2)))))) * (6.28318530718)))
-                        ,0.0
-                        ,cos ((4.1) + ((((fract ((Time) * (0.2))) * (fract
-                        ((Time) * (0.2)))) * ((3.0) - ((2.0) * (fract
-                        ((Time) * (0.2)))))) * (6.28318530718)))
-                        ,0.0)
-                  ,vec4 (0.0,0.0,0.0,1.0))) * ((mat4
-                  (vec4 (cos (2.35619449017),sin (2.35619449017),0.0,0.0)
-                  ,vec4
-                  ((0.0) - (sin (2.35619449017)),cos (2.35619449017),0.0,0.0)
-                  ,vec4 (0.0,0.0,1.0,0.0)
-                  ,vec4 (0.0,0.0,0.0,1.0))) * (vi1))) * (vec4
-                  ((0.2) + ((abs ((0.5) - (((fract ((Time) * (0.2))) * (fract
-                  ((Time) * (0.2)))) * ((3.0) - ((2.0) * (fract
-                  ((Time) * (0.2)))))))) * (0.6))
-                  ,(0.2) + ((abs ((0.5) - (((fract ((Time) * (0.2))) * (fract
-                  ((Time) * (0.2)))) * ((3.0) - ((2.0) * (fract
-                  ((Time) * (0.2)))))))) * (0.6))
-                  ,(0.2) + ((abs ((0.5) - (((fract ((Time) * (0.2))) * (fract
-                  ((Time) * (0.2)))) * ((3.0) - ((2.0) * (fract
-                  ((Time) * (0.2)))))))) * (0.6))
-                  ,1.0));
-              vo1 = vi1;
+                  gl_Position = ((mat4
+                      (vec4 (cos ((4.1) + ((((fract ((Time) * (0.2))) * (fract
+                            ((Time) * (0.2)))) * ((3.0) - ((2.0) * (fract
+                            ((Time) * (0.2)))))) * (6.28318530718)))
+                            ,0.0
+                            ,(0.0) - (sin ((4.1) + ((((fract ((Time) * (0.2))) * (fract
+                            ((Time) * (0.2)))) * ((3.0) - ((2.0) * (fract
+                            ((Time) * (0.2)))))) * (6.28318530718))))
+                            ,0.0)
+                      ,vec4 (0.0,1.0,0.0,0.0)
+                      ,vec4 (sin ((4.1) + ((((fract ((Time) * (0.2))) * (fract
+                            ((Time) * (0.2)))) * ((3.0) - ((2.0) * (fract
+                            ((Time) * (0.2)))))) * (6.28318530718)))
+                            ,0.0
+                            ,cos ((4.1) + ((((fract ((Time) * (0.2))) * (fract
+                            ((Time) * (0.2)))) * ((3.0) - ((2.0) * (fract
+                            ((Time) * (0.2)))))) * (6.28318530718)))
+                            ,0.0)
+                      ,vec4 (0.0,0.0,0.0,1.0))) * ((mat4
+                      (vec4 (cos (2.35619449017),sin (2.35619449017),0.0,0.0)
+                      ,vec4
+                      ((0.0) - (sin (2.35619449017)),cos (2.35619449017),0.0,0.0)
+                      ,vec4 (0.0,0.0,1.0,0.0)
+                      ,vec4 (0.0,0.0,0.0,1.0))) * (vi1))) * (vec4
+                      ((0.2) + ((abs ((0.5) - (((fract ((Time) * (0.2))) * (fract
+                      ((Time) * (0.2)))) * ((3.0) - ((2.0) * (fract
+                      ((Time) * (0.2)))))))) * (0.6))
+                      ,(0.2) + ((abs ((0.5) - (((fract ((Time) * (0.2))) * (fract
+                      ((Time) * (0.2)))) * ((3.0) - ((2.0) * (fract
+                      ((Time) * (0.2)))))))) * (0.6))
+                      ,(0.2) + ((abs ((0.5) - (((fract ((Time) * (0.2))) * (fract
+                      ((Time) * (0.2)))) * ((3.0) - ((2.0) * (fract
+                      ((Time) * (0.2)))))))) * (0.6))
+                      ,1.0));
+                  vo1 = vi1;
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              f0 = (abs ((vo1).x)) > (0.99999) ? vec4
-                  (((((((vo1).yz) * (sign
-                  ((vo1).x))) * (0.5)) + (0.5)).x) * ((((((vo1).yz) * (sign
-                  ((vo1).x))) * (0.5)) + (0.5)).x)
-                  ,1.0
-                  ,((1.0) - ((((((vo1).yz) * (sign
-                  ((vo1).x))) * (0.5)) + (0.5)).x)) * ((1.0) - ((((((vo1).yz) * (sign
-                  ((vo1).x))) * (0.5)) + (0.5)).x))
-                  ,((((((vo1).yz) * (sign
-                  ((vo1).x))) * (0.5)) + (0.5)).y) > (0.75) ? 0.0 : 1.0) : (abs
-                  ((vo1).y)) > (0.99999) ? vec4
-                  ((dot (((((vo1).zx) * (sign ((vo1).y))) * (0.5)) + (0.5)
-                        ,vec2 (-0.5,0.5))) + (0.4)
-                  ,1.0
-                  ,0.0
-                  ,((dot (((((vo1).zx) * (sign ((vo1).y))) * (0.5)) + (0.5)
-                         ,vec2 (1.0,-1.0))) > (-0.25)) && ((dot
-                  (((((vo1).zx) * (sign ((vo1).y))) * (0.5)) + (0.5)
-                  ,vec2 (1.0,-1.0))) < (0.0)) ? 0.0 : 1.0) : (abs
-                  ((vo1).z)) > (0.99999) ? vec4
-                  (0.0
-                  ,1.0
-                  ,(dot (((((vo1).xy) * (sign ((vo1).z))) * (0.5)) + (0.5)
-                        ,vec2 (0.5,-0.5))) + (0.4)
-                  ,((((((vo1).xy) * (sign
-                  ((vo1).z))) * (0.5)) + (0.5)).y) > (0.75) ? 0.0 : 1.0) : vec4
-                  (0.0,0.0,0.0,1.0);
+                  f0 = (abs ((vo1).x)) > (0.99999) ? vec4
+                      (((((((vo1).yz) * (sign
+                      ((vo1).x))) * (0.5)) + (0.5)).x) * ((((((vo1).yz) * (sign
+                      ((vo1).x))) * (0.5)) + (0.5)).x)
+                      ,1.0
+                      ,((1.0) - ((((((vo1).yz) * (sign
+                      ((vo1).x))) * (0.5)) + (0.5)).x)) * ((1.0) - ((((((vo1).yz) * (sign
+                      ((vo1).x))) * (0.5)) + (0.5)).x))
+                      ,((((((vo1).yz) * (sign
+                      ((vo1).x))) * (0.5)) + (0.5)).y) > (0.75) ? 0.0 : 1.0) : (abs
+                      ((vo1).y)) > (0.99999) ? vec4
+                      ((dot (((((vo1).zx) * (sign ((vo1).y))) * (0.5)) + (0.5)
+                            ,vec2 (-0.5,0.5))) + (0.4)
+                      ,1.0
+                      ,0.0
+                      ,((dot (((((vo1).zx) * (sign ((vo1).y))) * (0.5)) + (0.5)
+                             ,vec2 (1.0,-1.0))) > (-0.25)) && ((dot
+                      (((((vo1).zx) * (sign ((vo1).y))) * (0.5)) + (0.5)
+                      ,vec2 (1.0,-1.0))) < (0.0)) ? 0.0 : 1.0) : (abs
+                      ((vo1).z)) > (0.99999) ? vec4
+                      (0.0
+                      ,1.0
+                      ,(dot (((((vo1).xy) * (sign ((vo1).z))) * (0.5)) + (0.5)
+                            ,vec2 (0.5,-0.5))) + (0.4)
+                      ,((((((vo1).xy) * (sign
+                      ((vo1).z))) * (0.5)) + (0.5)).y) > (0.75) ? 0.0 : 1.0) : vec4
+                      (0.0,0.0,0.0,1.0);
               }
-              
               """
           }
       ]
diff --git a/testdata/editor-examples/LambdaCube2.out b/testdata/editor-examples/LambdaCube2.out
index a575bb72..ca24e47c 100644
--- a/testdata/editor-examples/LambdaCube2.out
+++ b/testdata/editor-examples/LambdaCube2.out
@@ -25,37 +25,39 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 MVP ;
-              in vec4 vi1 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 MVP;
+              in vec4 vi1;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = ((MVP) * (vi1)) * (vec4 (0.5,0.5,0.5,1.0));
-              vo1 = vi1;
+                  gl_Position = ((MVP) * (vi1)) * (vec4 (0.5,0.5,0.5,1.0));
+                  vo1 = vi1;
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform float Time ;
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform float Time;
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              if (!(((((((vo1).y) + ((vo1).x)) + ((vo1).z)) > (1.0)) || ((abs
-                  (((((vo1).y) - ((vo1).x)) + ((vo1).z)) - (1.0))) > (0.25))) && (((((((vo1).y) + ((vo1).x)) - ((vo1).z)) > (1.0)) || ((abs
-                  (((((vo1).y) + ((vo1).x)) + ((vo1).z)) - (1.0))) > (0.25))) && (((((((vo1).y) - ((vo1).x)) - ((vo1).z)) > (1.0)) || ((abs
-                  (((((vo1).y) + ((vo1).x)) - ((vo1).z)) - (1.0))) > (0.25))) && (((((((vo1).y) - ((vo1).x)) + ((vo1).z)) > (1.0)) || ((abs
-                  (((((vo1).y) - ((vo1).x)) - ((vo1).z)) - (1.0))) > (0.25))) && ((((((sin
-                  ((vo1) * (20.0))).x) * ((sin ((vo1) * (20.0))).x)) + (((sin
-                  ((vo1) * (20.0))).y) * ((sin ((vo1) * (20.0))).y))) + (((sin
-                  ((vo1) * (20.0))).z) * ((sin ((vo1) * (20.0))).z))) > (abs
-                  ((3.0) * (sin ((1.0) * (Time))))))))))) discard;
-              f0 = vo1;
+                  if (!(((((((vo1).y) + ((vo1).x)) + ((vo1).z)) > (1.0)) || ((abs
+                      (((((vo1).y) - ((vo1).x)) + ((vo1).z)) - (1.0))) > (0.25))) && (((((((vo1).y) + ((vo1).x)) - ((vo1).z)) > (1.0)) || ((abs
+                      (((((vo1).y) + ((vo1).x)) + ((vo1).z)) - (1.0))) > (0.25))) && (((((((vo1).y) - ((vo1).x)) - ((vo1).z)) > (1.0)) || ((abs
+                      (((((vo1).y) + ((vo1).x)) - ((vo1).z)) - (1.0))) > (0.25))) && (((((((vo1).y) - ((vo1).x)) + ((vo1).z)) > (1.0)) || ((abs
+                      (((((vo1).y) - ((vo1).x)) - ((vo1).z)) - (1.0))) > (0.25))) && ((((((sin
+                      ((vo1) * (20.0))).x) * ((sin ((vo1) * (20.0))).x)) + (((sin
+                      ((vo1) * (20.0))).y) * ((sin ((vo1) * (20.0))).y))) + (((sin
+                      ((vo1) * (20.0))).z) * ((sin ((vo1) * (20.0))).z))) > (abs
+                      ((3.0) * (sin ((1.0) * (Time))))))))))) discard;
+                  f0 = vo1;
               }
-              
               """
           }
       ]
diff --git a/testdata/editor-examples/Stripes.out b/testdata/editor-examples/Stripes.out
index 547878a3..b3e3724a 100644
--- a/testdata/editor-examples/Stripes.out
+++ b/testdata/editor-examples/Stripes.out
@@ -24,37 +24,39 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              in vec4 vi1 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              in vec4 vi1;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = (vi1) * (vec4 (1.0,1.0,1.0,1.0));
-              vo1 = vi1;
+                  gl_Position = (vi1) * (vec4 (1.0,1.0,1.0,1.0));
+                  vo1 = vi1;
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform float Time ;
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform float Time;
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              if (!((sin ((10.0) * (((mat4
-                  (vec4 (cos (Time),0.0,(0.0) - (sin (Time)),0.0)
-                  ,vec4 (0.0,1.0,0.0,0.0)
-                  ,vec4 (sin (Time),0.0,cos (Time),0.0)
-                  ,vec4 (0.0,0.0,0.0,1.0))) * ((mat4
-                  (vec4 (cos ((Time) * (1.0)),sin ((Time) * (1.0)),0.0,0.0)
-                  ,vec4
-                  ((0.0) - (sin ((Time) * (1.0))),cos ((Time) * (1.0)),0.0,0.0)
-                  ,vec4 (0.0,0.0,1.0,0.0)
-                  ,vec4 (0.0,0.0,0.0,1.0))) * (vo1))).x))) > (0.5))) discard;
-              f0 = vec4 (0.0,0.0,0.0,1.0);
-              }
-              
+                  if (!((sin ((10.0) * (((mat4
+                      (vec4 (cos (Time),0.0,(0.0) - (sin (Time)),0.0)
+                      ,vec4 (0.0,1.0,0.0,0.0)
+                      ,vec4 (sin (Time),0.0,cos (Time),0.0)
+                      ,vec4 (0.0,0.0,0.0,1.0))) * ((mat4
+                      (vec4 (cos ((Time) * (1.0)),sin ((Time) * (1.0)),0.0,0.0)
+                      ,vec4
+                      ((0.0) - (sin ((Time) * (1.0))),cos ((Time) * (1.0)),0.0,0.0)
+                      ,vec4 (0.0,0.0,1.0,0.0)
+                      ,vec4 (0.0,0.0,0.0,1.0))) * (vo1))).x))) > (0.5))) discard;
+                  f0 = vec4 (0.0,0.0,0.0,1.0);
+              }
               """
           }
       , Program
@@ -67,40 +69,42 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              in vec4 vi1 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              in vec4 vi1;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = (vi1) * (vec4 (0.9,0.9,0.9,1.0));
-              vo1 = vi1;
+                  gl_Position = (vi1) * (vec4 (0.9,0.9,0.9,1.0));
+                  vo1 = vi1;
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform float Time ;
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform float Time;
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              if (!((sin ((10.0) * (((mat4
-                  (vec4 (cos (Time),0.0,(0.0) - (sin (Time)),0.0)
-                  ,vec4 (0.0,1.0,0.0,0.0)
-                  ,vec4 (sin (Time),0.0,cos (Time),0.0)
-                  ,vec4 (0.0,0.0,0.0,1.0))) * ((mat4
-                  (vec4 (cos ((Time) * (0.9)),sin ((Time) * (0.9)),0.0,0.0)
-                  ,vec4
-                  ((0.0) - (sin ((Time) * (0.9))),cos ((Time) * (0.9)),0.0,0.0)
-                  ,vec4 (0.0,0.0,1.0,0.0)
-                  ,vec4 (0.0,0.0,0.0,1.0))) * (vo1))).x))) > (0.5))) discard;
-              f0 = vec4 (9.999999999999998e-2
-                        ,9.999999999999998e-2
-                        ,9.999999999999998e-2
-                        ,1.0);
-              }
-              
+                  if (!((sin ((10.0) * (((mat4
+                      (vec4 (cos (Time),0.0,(0.0) - (sin (Time)),0.0)
+                      ,vec4 (0.0,1.0,0.0,0.0)
+                      ,vec4 (sin (Time),0.0,cos (Time),0.0)
+                      ,vec4 (0.0,0.0,0.0,1.0))) * ((mat4
+                      (vec4 (cos ((Time) * (0.9)),sin ((Time) * (0.9)),0.0,0.0)
+                      ,vec4
+                      ((0.0) - (sin ((Time) * (0.9))),cos ((Time) * (0.9)),0.0,0.0)
+                      ,vec4 (0.0,0.0,1.0,0.0)
+                      ,vec4 (0.0,0.0,0.0,1.0))) * (vo1))).x))) > (0.5))) discard;
+                  f0 = vec4 (9.999999999999998e-2
+                            ,9.999999999999998e-2
+                            ,9.999999999999998e-2
+                            ,1.0);
+              }
               """
           }
       , Program
@@ -113,40 +117,42 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              in vec4 vi1 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              in vec4 vi1;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = (vi1) * (vec4 (0.8,0.8,0.8,1.0));
-              vo1 = vi1;
+                  gl_Position = (vi1) * (vec4 (0.8,0.8,0.8,1.0));
+                  vo1 = vi1;
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform float Time ;
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform float Time;
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              if (!((sin ((10.0) * (((mat4
-                  (vec4 (cos (Time),0.0,(0.0) - (sin (Time)),0.0)
-                  ,vec4 (0.0,1.0,0.0,0.0)
-                  ,vec4 (sin (Time),0.0,cos (Time),0.0)
-                  ,vec4 (0.0,0.0,0.0,1.0))) * ((mat4
-                  (vec4 (cos ((Time) * (0.8)),sin ((Time) * (0.8)),0.0,0.0)
-                  ,vec4
-                  ((0.0) - (sin ((Time) * (0.8))),cos ((Time) * (0.8)),0.0,0.0)
-                  ,vec4 (0.0,0.0,1.0,0.0)
-                  ,vec4 (0.0,0.0,0.0,1.0))) * (vo1))).x))) > (0.5))) discard;
-              f0 = vec4 (0.19999999999999996
-                        ,0.19999999999999996
-                        ,0.19999999999999996
-                        ,1.0);
-              }
-              
+                  if (!((sin ((10.0) * (((mat4
+                      (vec4 (cos (Time),0.0,(0.0) - (sin (Time)),0.0)
+                      ,vec4 (0.0,1.0,0.0,0.0)
+                      ,vec4 (sin (Time),0.0,cos (Time),0.0)
+                      ,vec4 (0.0,0.0,0.0,1.0))) * ((mat4
+                      (vec4 (cos ((Time) * (0.8)),sin ((Time) * (0.8)),0.0,0.0)
+                      ,vec4
+                      ((0.0) - (sin ((Time) * (0.8))),cos ((Time) * (0.8)),0.0,0.0)
+                      ,vec4 (0.0,0.0,1.0,0.0)
+                      ,vec4 (0.0,0.0,0.0,1.0))) * (vo1))).x))) > (0.5))) discard;
+                  f0 = vec4 (0.19999999999999996
+                            ,0.19999999999999996
+                            ,0.19999999999999996
+                            ,1.0);
+              }
               """
           }
       , Program
@@ -159,40 +165,42 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              in vec4 vi1 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              in vec4 vi1;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = (vi1) * (vec4 (0.7,0.7,0.7,1.0));
-              vo1 = vi1;
+                  gl_Position = (vi1) * (vec4 (0.7,0.7,0.7,1.0));
+                  vo1 = vi1;
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform float Time ;
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform float Time;
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              if (!((sin ((10.0) * (((mat4
-                  (vec4 (cos (Time),0.0,(0.0) - (sin (Time)),0.0)
-                  ,vec4 (0.0,1.0,0.0,0.0)
-                  ,vec4 (sin (Time),0.0,cos (Time),0.0)
-                  ,vec4 (0.0,0.0,0.0,1.0))) * ((mat4
-                  (vec4 (cos ((Time) * (0.7)),sin ((Time) * (0.7)),0.0,0.0)
-                  ,vec4
-                  ((0.0) - (sin ((Time) * (0.7))),cos ((Time) * (0.7)),0.0,0.0)
-                  ,vec4 (0.0,0.0,1.0,0.0)
-                  ,vec4 (0.0,0.0,0.0,1.0))) * (vo1))).x))) > (0.5))) discard;
-              f0 = vec4 (0.30000000000000004
-                        ,0.30000000000000004
-                        ,0.30000000000000004
-                        ,1.0);
-              }
-              
+                  if (!((sin ((10.0) * (((mat4
+                      (vec4 (cos (Time),0.0,(0.0) - (sin (Time)),0.0)
+                      ,vec4 (0.0,1.0,0.0,0.0)
+                      ,vec4 (sin (Time),0.0,cos (Time),0.0)
+                      ,vec4 (0.0,0.0,0.0,1.0))) * ((mat4
+                      (vec4 (cos ((Time) * (0.7)),sin ((Time) * (0.7)),0.0,0.0)
+                      ,vec4
+                      ((0.0) - (sin ((Time) * (0.7))),cos ((Time) * (0.7)),0.0,0.0)
+                      ,vec4 (0.0,0.0,1.0,0.0)
+                      ,vec4 (0.0,0.0,0.0,1.0))) * (vo1))).x))) > (0.5))) discard;
+                  f0 = vec4 (0.30000000000000004
+                            ,0.30000000000000004
+                            ,0.30000000000000004
+                            ,1.0);
+              }
               """
           }
       , Program
@@ -205,37 +213,39 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              in vec4 vi1 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              in vec4 vi1;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = (vi1) * (vec4 (0.6,0.6,0.6,1.0));
-              vo1 = vi1;
+                  gl_Position = (vi1) * (vec4 (0.6,0.6,0.6,1.0));
+                  vo1 = vi1;
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform float Time ;
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform float Time;
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              if (!((sin ((10.0) * (((mat4
-                  (vec4 (cos (Time),0.0,(0.0) - (sin (Time)),0.0)
-                  ,vec4 (0.0,1.0,0.0,0.0)
-                  ,vec4 (sin (Time),0.0,cos (Time),0.0)
-                  ,vec4 (0.0,0.0,0.0,1.0))) * ((mat4
-                  (vec4 (cos ((Time) * (0.6)),sin ((Time) * (0.6)),0.0,0.0)
-                  ,vec4
-                  ((0.0) - (sin ((Time) * (0.6))),cos ((Time) * (0.6)),0.0,0.0)
-                  ,vec4 (0.0,0.0,1.0,0.0)
-                  ,vec4 (0.0,0.0,0.0,1.0))) * (vo1))).x))) > (0.5))) discard;
-              f0 = vec4 (0.4,0.4,0.4,1.0);
-              }
-              
+                  if (!((sin ((10.0) * (((mat4
+                      (vec4 (cos (Time),0.0,(0.0) - (sin (Time)),0.0)
+                      ,vec4 (0.0,1.0,0.0,0.0)
+                      ,vec4 (sin (Time),0.0,cos (Time),0.0)
+                      ,vec4 (0.0,0.0,0.0,1.0))) * ((mat4
+                      (vec4 (cos ((Time) * (0.6)),sin ((Time) * (0.6)),0.0,0.0)
+                      ,vec4
+                      ((0.0) - (sin ((Time) * (0.6))),cos ((Time) * (0.6)),0.0,0.0)
+                      ,vec4 (0.0,0.0,1.0,0.0)
+                      ,vec4 (0.0,0.0,0.0,1.0))) * (vo1))).x))) > (0.5))) discard;
+                  f0 = vec4 (0.4,0.4,0.4,1.0);
+              }
               """
           }
       , Program
@@ -248,37 +258,39 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              in vec4 vi1 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              in vec4 vi1;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = (vi1) * (vec4 (0.5,0.5,0.5,1.0));
-              vo1 = vi1;
+                  gl_Position = (vi1) * (vec4 (0.5,0.5,0.5,1.0));
+                  vo1 = vi1;
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform float Time ;
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform float Time;
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              if (!((sin ((10.0) * (((mat4
-                  (vec4 (cos (Time),0.0,(0.0) - (sin (Time)),0.0)
-                  ,vec4 (0.0,1.0,0.0,0.0)
-                  ,vec4 (sin (Time),0.0,cos (Time),0.0)
-                  ,vec4 (0.0,0.0,0.0,1.0))) * ((mat4
-                  (vec4 (cos ((Time) * (0.5)),sin ((Time) * (0.5)),0.0,0.0)
-                  ,vec4
-                  ((0.0) - (sin ((Time) * (0.5))),cos ((Time) * (0.5)),0.0,0.0)
-                  ,vec4 (0.0,0.0,1.0,0.0)
-                  ,vec4 (0.0,0.0,0.0,1.0))) * (vo1))).x))) > (0.5))) discard;
-              f0 = vec4 (0.5,0.5,0.5,1.0);
-              }
-              
+                  if (!((sin ((10.0) * (((mat4
+                      (vec4 (cos (Time),0.0,(0.0) - (sin (Time)),0.0)
+                      ,vec4 (0.0,1.0,0.0,0.0)
+                      ,vec4 (sin (Time),0.0,cos (Time),0.0)
+                      ,vec4 (0.0,0.0,0.0,1.0))) * ((mat4
+                      (vec4 (cos ((Time) * (0.5)),sin ((Time) * (0.5)),0.0,0.0)
+                      ,vec4
+                      ((0.0) - (sin ((Time) * (0.5))),cos ((Time) * (0.5)),0.0,0.0)
+                      ,vec4 (0.0,0.0,1.0,0.0)
+                      ,vec4 (0.0,0.0,0.0,1.0))) * (vo1))).x))) > (0.5))) discard;
+                  f0 = vec4 (0.5,0.5,0.5,1.0);
+              }
               """
           }
       , Program
@@ -291,37 +303,39 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              in vec4 vi1 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              in vec4 vi1;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = (vi1) * (vec4 (0.4,0.4,0.4,1.0));
-              vo1 = vi1;
+                  gl_Position = (vi1) * (vec4 (0.4,0.4,0.4,1.0));
+                  vo1 = vi1;
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform float Time ;
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform float Time;
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              if (!((sin ((10.0) * (((mat4
-                  (vec4 (cos (Time),0.0,(0.0) - (sin (Time)),0.0)
-                  ,vec4 (0.0,1.0,0.0,0.0)
-                  ,vec4 (sin (Time),0.0,cos (Time),0.0)
-                  ,vec4 (0.0,0.0,0.0,1.0))) * ((mat4
-                  (vec4 (cos ((Time) * (0.4)),sin ((Time) * (0.4)),0.0,0.0)
-                  ,vec4
-                  ((0.0) - (sin ((Time) * (0.4))),cos ((Time) * (0.4)),0.0,0.0)
-                  ,vec4 (0.0,0.0,1.0,0.0)
-                  ,vec4 (0.0,0.0,0.0,1.0))) * (vo1))).x))) > (0.5))) discard;
-              f0 = vec4 (0.6,0.6,0.6,1.0);
-              }
-              
+                  if (!((sin ((10.0) * (((mat4
+                      (vec4 (cos (Time),0.0,(0.0) - (sin (Time)),0.0)
+                      ,vec4 (0.0,1.0,0.0,0.0)
+                      ,vec4 (sin (Time),0.0,cos (Time),0.0)
+                      ,vec4 (0.0,0.0,0.0,1.0))) * ((mat4
+                      (vec4 (cos ((Time) * (0.4)),sin ((Time) * (0.4)),0.0,0.0)
+                      ,vec4
+                      ((0.0) - (sin ((Time) * (0.4))),cos ((Time) * (0.4)),0.0,0.0)
+                      ,vec4 (0.0,0.0,1.0,0.0)
+                      ,vec4 (0.0,0.0,0.0,1.0))) * (vo1))).x))) > (0.5))) discard;
+                  f0 = vec4 (0.6,0.6,0.6,1.0);
+              }
               """
           }
       , Program
@@ -334,37 +348,39 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              in vec4 vi1 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              in vec4 vi1;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = (vi1) * (vec4 (0.3,0.3,0.3,1.0));
-              vo1 = vi1;
+                  gl_Position = (vi1) * (vec4 (0.3,0.3,0.3,1.0));
+                  vo1 = vi1;
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform float Time ;
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform float Time;
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              if (!((sin ((10.0) * (((mat4
-                  (vec4 (cos (Time),0.0,(0.0) - (sin (Time)),0.0)
-                  ,vec4 (0.0,1.0,0.0,0.0)
-                  ,vec4 (sin (Time),0.0,cos (Time),0.0)
-                  ,vec4 (0.0,0.0,0.0,1.0))) * ((mat4
-                  (vec4 (cos ((Time) * (0.3)),sin ((Time) * (0.3)),0.0,0.0)
-                  ,vec4
-                  ((0.0) - (sin ((Time) * (0.3))),cos ((Time) * (0.3)),0.0,0.0)
-                  ,vec4 (0.0,0.0,1.0,0.0)
-                  ,vec4 (0.0,0.0,0.0,1.0))) * (vo1))).x))) > (0.5))) discard;
-              f0 = vec4 (0.7,0.7,0.7,1.0);
-              }
-              
+                  if (!((sin ((10.0) * (((mat4
+                      (vec4 (cos (Time),0.0,(0.0) - (sin (Time)),0.0)
+                      ,vec4 (0.0,1.0,0.0,0.0)
+                      ,vec4 (sin (Time),0.0,cos (Time),0.0)
+                      ,vec4 (0.0,0.0,0.0,1.0))) * ((mat4
+                      (vec4 (cos ((Time) * (0.3)),sin ((Time) * (0.3)),0.0,0.0)
+                      ,vec4
+                      ((0.0) - (sin ((Time) * (0.3))),cos ((Time) * (0.3)),0.0,0.0)
+                      ,vec4 (0.0,0.0,1.0,0.0)
+                      ,vec4 (0.0,0.0,0.0,1.0))) * (vo1))).x))) > (0.5))) discard;
+                  f0 = vec4 (0.7,0.7,0.7,1.0);
+              }
               """
           }
       , Program
@@ -377,37 +393,39 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              in vec4 vi1 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              in vec4 vi1;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = (vi1) * (vec4 (0.2,0.2,0.2,1.0));
-              vo1 = vi1;
+                  gl_Position = (vi1) * (vec4 (0.2,0.2,0.2,1.0));
+                  vo1 = vi1;
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform float Time ;
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform float Time;
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              if (!((sin ((10.0) * (((mat4
-                  (vec4 (cos (Time),0.0,(0.0) - (sin (Time)),0.0)
-                  ,vec4 (0.0,1.0,0.0,0.0)
-                  ,vec4 (sin (Time),0.0,cos (Time),0.0)
-                  ,vec4 (0.0,0.0,0.0,1.0))) * ((mat4
-                  (vec4 (cos ((Time) * (0.2)),sin ((Time) * (0.2)),0.0,0.0)
-                  ,vec4
-                  ((0.0) - (sin ((Time) * (0.2))),cos ((Time) * (0.2)),0.0,0.0)
-                  ,vec4 (0.0,0.0,1.0,0.0)
-                  ,vec4 (0.0,0.0,0.0,1.0))) * (vo1))).x))) > (0.5))) discard;
-              f0 = vec4 (0.8,0.8,0.8,1.0);
-              }
-              
+                  if (!((sin ((10.0) * (((mat4
+                      (vec4 (cos (Time),0.0,(0.0) - (sin (Time)),0.0)
+                      ,vec4 (0.0,1.0,0.0,0.0)
+                      ,vec4 (sin (Time),0.0,cos (Time),0.0)
+                      ,vec4 (0.0,0.0,0.0,1.0))) * ((mat4
+                      (vec4 (cos ((Time) * (0.2)),sin ((Time) * (0.2)),0.0,0.0)
+                      ,vec4
+                      ((0.0) - (sin ((Time) * (0.2))),cos ((Time) * (0.2)),0.0,0.0)
+                      ,vec4 (0.0,0.0,1.0,0.0)
+                      ,vec4 (0.0,0.0,0.0,1.0))) * (vo1))).x))) > (0.5))) discard;
+                  f0 = vec4 (0.8,0.8,0.8,1.0);
+              }
               """
           }
       , Program
@@ -420,37 +438,39 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              in vec4 vi1 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              in vec4 vi1;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = (vi1) * (vec4 (0.1,0.1,0.1,1.0));
-              vo1 = vi1;
+                  gl_Position = (vi1) * (vec4 (0.1,0.1,0.1,1.0));
+                  vo1 = vi1;
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform float Time ;
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform float Time;
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              if (!((sin ((10.0) * (((mat4
-                  (vec4 (cos (Time),0.0,(0.0) - (sin (Time)),0.0)
-                  ,vec4 (0.0,1.0,0.0,0.0)
-                  ,vec4 (sin (Time),0.0,cos (Time),0.0)
-                  ,vec4 (0.0,0.0,0.0,1.0))) * ((mat4
-                  (vec4 (cos ((Time) * (0.1)),sin ((Time) * (0.1)),0.0,0.0)
-                  ,vec4
-                  ((0.0) - (sin ((Time) * (0.1))),cos ((Time) * (0.1)),0.0,0.0)
-                  ,vec4 (0.0,0.0,1.0,0.0)
-                  ,vec4 (0.0,0.0,0.0,1.0))) * (vo1))).x))) > (0.5))) discard;
-              f0 = vec4 (0.9,0.9,0.9,1.0);
-              }
-              
+                  if (!((sin ((10.0) * (((mat4
+                      (vec4 (cos (Time),0.0,(0.0) - (sin (Time)),0.0)
+                      ,vec4 (0.0,1.0,0.0,0.0)
+                      ,vec4 (sin (Time),0.0,cos (Time),0.0)
+                      ,vec4 (0.0,0.0,0.0,1.0))) * ((mat4
+                      (vec4 (cos ((Time) * (0.1)),sin ((Time) * (0.1)),0.0,0.0)
+                      ,vec4
+                      ((0.0) - (sin ((Time) * (0.1))),cos ((Time) * (0.1)),0.0,0.0)
+                      ,vec4 (0.0,0.0,1.0,0.0)
+                      ,vec4 (0.0,0.0,0.0,1.0))) * (vo1))).x))) > (0.5))) discard;
+                  f0 = vec4 (0.9,0.9,0.9,1.0);
+              }
               """
           }
       ]
diff --git a/testdata/editor-examples/Tetrahedron.out b/testdata/editor-examples/Tetrahedron.out
index a56a18d1..77fe2a7e 100644
--- a/testdata/editor-examples/Tetrahedron.out
+++ b/testdata/editor-examples/Tetrahedron.out
@@ -25,38 +25,40 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 MVP ;
-              in vec4 vi1 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 MVP;
+              in vec4 vi1;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = ((MVP) * (vi1)) * (vec4 (0.5,0.5,0.5,1.0));
-              vo1 = vi1;
+                  gl_Position = ((MVP) * (vi1)) * (vec4 (0.5,0.5,0.5,1.0));
+                  vo1 = vi1;
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform float Time ;
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform float Time;
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              if (!(true)) discard;
-              f0 = ((mat4 (vec4 (cos (Time),sin (Time),0.0,0.0)
-                          ,vec4 ((0.0) - (sin (Time)),cos (Time),0.0,0.0)
-                          ,vec4 (0.0,0.0,1.0,0.0)
-                          ,vec4 (0.0,0.0,0.0,1.0))) * ((mat4
-                  (vec4 (cos (Time),0.0,(0.0) - (sin (Time)),0.0)
-                  ,vec4 (0.0,1.0,0.0,0.0)
-                  ,vec4 (sin (Time),0.0,cos (Time),0.0)
-                  ,vec4 (0.0,0.0,0.0,1.0))) * (vo1))) * ((mod
-                  (((Time) + (sin (Time))) + (sin ((1.1) * (Time)))
-                  ,4.0)) * (2.0));
+                  if (!(true)) discard;
+                  f0 = ((mat4 (vec4 (cos (Time),sin (Time),0.0,0.0)
+                              ,vec4 ((0.0) - (sin (Time)),cos (Time),0.0,0.0)
+                              ,vec4 (0.0,0.0,1.0,0.0)
+                              ,vec4 (0.0,0.0,0.0,1.0))) * ((mat4
+                      (vec4 (cos (Time),0.0,(0.0) - (sin (Time)),0.0)
+                      ,vec4 (0.0,1.0,0.0,0.0)
+                      ,vec4 (sin (Time),0.0,cos (Time),0.0)
+                      ,vec4 (0.0,0.0,0.0,1.0))) * (vo1))) * ((mod
+                      (((Time) + (sin (Time))) + (sin ((1.1) * (Time)))
+                      ,4.0)) * (2.0));
               }
-              
               """
           }
       ]
diff --git a/testdata/editor-examples/Texturing.out b/testdata/editor-examples/Texturing.out
index 305c4a1c..776af2b9 100644
--- a/testdata/editor-examples/Texturing.out
+++ b/testdata/editor-examples/Texturing.out
@@ -27,29 +27,31 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 MVP ;
-              in vec4 vi1 ;
-              in vec2 vi2 ;
-              smooth out vec2 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 MVP;
+              in vec4 vi1;
+              in vec2 vi2;
+              smooth out vec2 vo1;
               void main() {
-              gl_Position = ((MVP) * (vi1)) * (vec4 (0.5,0.5,0.5,1.0));
-              vo1 = vi2;
+                  gl_Position = ((MVP) * (vi1)) * (vec4 (0.5,0.5,0.5,1.0));
+                  vo1 = vi2;
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform sampler2D Diffuse ;
-              smooth in vec2 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform sampler2D Diffuse;
+              smooth in vec2 vo1;
+              out vec4 f0;
               void main() {
-              f0 = texture2D (Diffuse,vo1);
+                  f0 = texture2D (Diffuse,vo1);
               }
-              
               """
           }
       ]
diff --git a/testdata/example06.out b/testdata/example06.out
index 9c7657de..c75cf074 100644
--- a/testdata/example06.out
+++ b/testdata/example06.out
@@ -24,27 +24,29 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 MVP ;
-              in vec4 vi1 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 MVP;
+              in vec4 vi1;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = ((MVP) * (vi1)) * (vec4 (0.5,0.5,0.5,1.0));
-              vo1 = vi1;
+                  gl_Position = ((MVP) * (vi1)) * (vec4 (0.5,0.5,0.5,1.0));
+                  vo1 = vi1;
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              f0 = vo1;
+                  f0 = vo1;
               }
-              
               """
           }
       ]
diff --git a/testdata/example07.out b/testdata/example07.out
index a7c17a3d..0b0b1166 100644
--- a/testdata/example07.out
+++ b/testdata/example07.out
@@ -24,28 +24,30 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 MVP ;
-              in vec4 vi1 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 MVP;
+              in vec4 vi1;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = ((MVP) * (vi1)) * (vec4 (0.5,0.5,0.5,1.0));
-              vo1 = vi1;
+                  gl_Position = ((MVP) * (vi1)) * (vec4 (0.5,0.5,0.5,1.0));
+                  vo1 = vi1;
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              f0 = ((vo1).x) < (0.5) ? vec4 (0.0,0.0,1.0,1.0) : vec4
-                  (1.0,0.0,0.0,1.0);
+                  f0 = ((vo1).x) < (0.5) ? vec4 (0.0,0.0,1.0,1.0) : vec4
+                      (1.0,0.0,0.0,1.0);
               }
-              
               """
           }
       ]
diff --git a/testdata/example08.out b/testdata/example08.out
index ff764f08..2b9339c8 100644
--- a/testdata/example08.out
+++ b/testdata/example08.out
@@ -25,45 +25,47 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 MVP ;
-              uniform float Time ;
-              in vec4 vi1 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 MVP;
+              uniform float Time;
+              in vec4 vi1;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = (mat4
-                  (vec4 (cos ((Time) * (2.0)),sin ((Time) * (2.0)),0.0,0.0)
-                  ,vec4
-                  ((0.0) - (sin ((Time) * (2.0))),cos ((Time) * (2.0)),0.0,0.0)
-                  ,vec4 (0.0,0.0,1.0,0.0)
-                  ,vec4 (0.0,0.0,0.0,1.0))) * ((MVP) * ((vec4
-                  ((1.0) + ((sin (Time)) * (0.1)),0.0,0.0,0.0)) + (((mat4
-                  (vec4 (1.0,0.0,0.0,0.0)
-                  ,vec4 (0.0
-                        ,cos (((Time) * (2.0)) * (2.0))
-                        ,sin (((Time) * (2.0)) * (2.0))
-                        ,0.0)
-                  ,vec4 (0.0
-                        ,(0.0) - (sin (((Time) * (2.0)) * (2.0)))
-                        ,cos (((Time) * (2.0)) * (2.0))
-                        ,0.0)
-                  ,vec4 (0.0,0.0,0.0,1.0))) * (vi1)) * (vec4
-                  (4.0e-2,4.0e-2,4.0e-2,1.0)))));
-              vo1 = vi1;
-              }
-              
+                  gl_Position = (mat4
+                      (vec4 (cos ((Time) * (2.0)),sin ((Time) * (2.0)),0.0,0.0)
+                      ,vec4
+                      ((0.0) - (sin ((Time) * (2.0))),cos ((Time) * (2.0)),0.0,0.0)
+                      ,vec4 (0.0,0.0,1.0,0.0)
+                      ,vec4 (0.0,0.0,0.0,1.0))) * ((MVP) * ((vec4
+                      ((1.0) + ((sin (Time)) * (0.1)),0.0,0.0,0.0)) + (((mat4
+                      (vec4 (1.0,0.0,0.0,0.0)
+                      ,vec4 (0.0
+                            ,cos (((Time) * (2.0)) * (2.0))
+                            ,sin (((Time) * (2.0)) * (2.0))
+                            ,0.0)
+                      ,vec4 (0.0
+                            ,(0.0) - (sin (((Time) * (2.0)) * (2.0)))
+                            ,cos (((Time) * (2.0)) * (2.0))
+                            ,0.0)
+                      ,vec4 (0.0,0.0,0.0,1.0))) * (vi1)) * (vec4
+                      (4.0e-2,4.0e-2,4.0e-2,1.0)))));
+                  vo1 = vi1;
+              }
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              f0 = vo1;
+                  f0 = vo1;
               }
-              
               """
           }
       , Program
@@ -77,45 +79,47 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 MVP ;
-              uniform float Time ;
-              in vec4 vi1 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 MVP;
+              uniform float Time;
+              in vec4 vi1;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = (mat4
-                  (vec4 (cos ((Time) * (1.0)),sin ((Time) * (1.0)),0.0,0.0)
-                  ,vec4
-                  ((0.0) - (sin ((Time) * (1.0))),cos ((Time) * (1.0)),0.0,0.0)
-                  ,vec4 (0.0,0.0,1.0,0.0)
-                  ,vec4 (0.0,0.0,0.0,1.0))) * ((MVP) * ((vec4
-                  ((0.5) + ((sin (Time)) * (0.1)),0.0,0.0,0.0)) + (((mat4
-                  (vec4 (1.0,0.0,0.0,0.0)
-                  ,vec4 (0.0
-                        ,cos (((Time) * (2.0)) * (1.0))
-                        ,sin (((Time) * (2.0)) * (1.0))
-                        ,0.0)
-                  ,vec4 (0.0
-                        ,(0.0) - (sin (((Time) * (2.0)) * (1.0)))
-                        ,cos (((Time) * (2.0)) * (1.0))
-                        ,0.0)
-                  ,vec4 (0.0,0.0,0.0,1.0))) * (vi1)) * (vec4
-                  (4.0e-2,4.0e-2,4.0e-2,1.0)))));
-              vo1 = vi1;
-              }
-              
+                  gl_Position = (mat4
+                      (vec4 (cos ((Time) * (1.0)),sin ((Time) * (1.0)),0.0,0.0)
+                      ,vec4
+                      ((0.0) - (sin ((Time) * (1.0))),cos ((Time) * (1.0)),0.0,0.0)
+                      ,vec4 (0.0,0.0,1.0,0.0)
+                      ,vec4 (0.0,0.0,0.0,1.0))) * ((MVP) * ((vec4
+                      ((0.5) + ((sin (Time)) * (0.1)),0.0,0.0,0.0)) + (((mat4
+                      (vec4 (1.0,0.0,0.0,0.0)
+                      ,vec4 (0.0
+                            ,cos (((Time) * (2.0)) * (1.0))
+                            ,sin (((Time) * (2.0)) * (1.0))
+                            ,0.0)
+                      ,vec4 (0.0
+                            ,(0.0) - (sin (((Time) * (2.0)) * (1.0)))
+                            ,cos (((Time) * (2.0)) * (1.0))
+                            ,0.0)
+                      ,vec4 (0.0,0.0,0.0,1.0))) * (vi1)) * (vec4
+                      (4.0e-2,4.0e-2,4.0e-2,1.0)))));
+                  vo1 = vi1;
+              }
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              f0 = vo1;
+                  f0 = vo1;
               }
-              
               """
           }
       , Program
@@ -129,45 +133,47 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 MVP ;
-              uniform float Time ;
-              in vec4 vi1 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 MVP;
+              uniform float Time;
+              in vec4 vi1;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = (mat4
-                  (vec4 (cos ((Time) * (0.0)),sin ((Time) * (0.0)),0.0,0.0)
-                  ,vec4
-                  ((0.0) - (sin ((Time) * (0.0))),cos ((Time) * (0.0)),0.0,0.0)
-                  ,vec4 (0.0,0.0,1.0,0.0)
-                  ,vec4 (0.0,0.0,0.0,1.0))) * ((MVP) * ((vec4
-                  ((0.0) + ((sin (Time)) * (0.1)),0.0,0.0,0.0)) + (((mat4
-                  (vec4 (1.0,0.0,0.0,0.0)
-                  ,vec4 (0.0
-                        ,cos (((Time) * (2.0)) * (0.0))
-                        ,sin (((Time) * (2.0)) * (0.0))
-                        ,0.0)
-                  ,vec4 (0.0
-                        ,(0.0) - (sin (((Time) * (2.0)) * (0.0)))
-                        ,cos (((Time) * (2.0)) * (0.0))
-                        ,0.0)
-                  ,vec4 (0.0,0.0,0.0,1.0))) * (vi1)) * (vec4
-                  (4.0e-2,4.0e-2,4.0e-2,1.0)))));
-              vo1 = vi1;
-              }
-              
+                  gl_Position = (mat4
+                      (vec4 (cos ((Time) * (0.0)),sin ((Time) * (0.0)),0.0,0.0)
+                      ,vec4
+                      ((0.0) - (sin ((Time) * (0.0))),cos ((Time) * (0.0)),0.0,0.0)
+                      ,vec4 (0.0,0.0,1.0,0.0)
+                      ,vec4 (0.0,0.0,0.0,1.0))) * ((MVP) * ((vec4
+                      ((0.0) + ((sin (Time)) * (0.1)),0.0,0.0,0.0)) + (((mat4
+                      (vec4 (1.0,0.0,0.0,0.0)
+                      ,vec4 (0.0
+                            ,cos (((Time) * (2.0)) * (0.0))
+                            ,sin (((Time) * (2.0)) * (0.0))
+                            ,0.0)
+                      ,vec4 (0.0
+                            ,(0.0) - (sin (((Time) * (2.0)) * (0.0)))
+                            ,cos (((Time) * (2.0)) * (0.0))
+                            ,0.0)
+                      ,vec4 (0.0,0.0,0.0,1.0))) * (vi1)) * (vec4
+                      (4.0e-2,4.0e-2,4.0e-2,1.0)))));
+                  vo1 = vi1;
+              }
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              f0 = vo1;
+                  f0 = vo1;
               }
-              
               """
           }
       , Program
@@ -181,45 +187,47 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 MVP ;
-              uniform float Time ;
-              in vec4 vi1 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 MVP;
+              uniform float Time;
+              in vec4 vi1;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = (mat4
-                  (vec4 (cos ((Time) * (-1.0)),sin ((Time) * (-1.0)),0.0,0.0)
-                  ,vec4
-                  ((0.0) - (sin ((Time) * (-1.0))),cos ((Time) * (-1.0)),0.0,0.0)
-                  ,vec4 (0.0,0.0,1.0,0.0)
-                  ,vec4 (0.0,0.0,0.0,1.0))) * ((MVP) * ((vec4
-                  ((-0.5) + ((sin (Time)) * (0.1)),0.0,0.0,0.0)) + (((mat4
-                  (vec4 (1.0,0.0,0.0,0.0)
-                  ,vec4 (0.0
-                        ,cos (((Time) * (2.0)) * (-1.0))
-                        ,sin (((Time) * (2.0)) * (-1.0))
-                        ,0.0)
-                  ,vec4 (0.0
-                        ,(0.0) - (sin (((Time) * (2.0)) * (-1.0)))
-                        ,cos (((Time) * (2.0)) * (-1.0))
-                        ,0.0)
-                  ,vec4 (0.0,0.0,0.0,1.0))) * (vi1)) * (vec4
-                  (4.0e-2,4.0e-2,4.0e-2,1.0)))));
-              vo1 = vi1;
-              }
-              
+                  gl_Position = (mat4
+                      (vec4 (cos ((Time) * (-1.0)),sin ((Time) * (-1.0)),0.0,0.0)
+                      ,vec4
+                      ((0.0) - (sin ((Time) * (-1.0))),cos ((Time) * (-1.0)),0.0,0.0)
+                      ,vec4 (0.0,0.0,1.0,0.0)
+                      ,vec4 (0.0,0.0,0.0,1.0))) * ((MVP) * ((vec4
+                      ((-0.5) + ((sin (Time)) * (0.1)),0.0,0.0,0.0)) + (((mat4
+                      (vec4 (1.0,0.0,0.0,0.0)
+                      ,vec4 (0.0
+                            ,cos (((Time) * (2.0)) * (-1.0))
+                            ,sin (((Time) * (2.0)) * (-1.0))
+                            ,0.0)
+                      ,vec4 (0.0
+                            ,(0.0) - (sin (((Time) * (2.0)) * (-1.0)))
+                            ,cos (((Time) * (2.0)) * (-1.0))
+                            ,0.0)
+                      ,vec4 (0.0,0.0,0.0,1.0))) * (vi1)) * (vec4
+                      (4.0e-2,4.0e-2,4.0e-2,1.0)))));
+                  vo1 = vi1;
+              }
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              f0 = vo1;
+                  f0 = vo1;
               }
-              
               """
           }
       , Program
@@ -233,45 +241,47 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 MVP ;
-              uniform float Time ;
-              in vec4 vi1 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 MVP;
+              uniform float Time;
+              in vec4 vi1;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = (mat4
-                  (vec4 (cos ((Time) * (0.75)),sin ((Time) * (0.75)),0.0,0.0)
-                  ,vec4
-                  ((0.0) - (sin ((Time) * (0.75))),cos ((Time) * (0.75)),0.0,0.0)
-                  ,vec4 (0.0,0.0,1.0,0.0)
-                  ,vec4 (0.0,0.0,0.0,1.0))) * ((MVP) * ((vec4
-                  ((0.375) + ((sin (Time)) * (0.1)),0.0,0.0,0.0)) + (((mat4
-                  (vec4 (1.0,0.0,0.0,0.0)
-                  ,vec4 (0.0
-                        ,cos (((Time) * (2.0)) * (0.75))
-                        ,sin (((Time) * (2.0)) * (0.75))
-                        ,0.0)
-                  ,vec4 (0.0
-                        ,(0.0) - (sin (((Time) * (2.0)) * (0.75)))
-                        ,cos (((Time) * (2.0)) * (0.75))
-                        ,0.0)
-                  ,vec4 (0.0,0.0,0.0,1.0))) * (vi1)) * (vec4
-                  (4.0e-2,4.0e-2,4.0e-2,1.0)))));
-              vo1 = vi1;
-              }
-              
+                  gl_Position = (mat4
+                      (vec4 (cos ((Time) * (0.75)),sin ((Time) * (0.75)),0.0,0.0)
+                      ,vec4
+                      ((0.0) - (sin ((Time) * (0.75))),cos ((Time) * (0.75)),0.0,0.0)
+                      ,vec4 (0.0,0.0,1.0,0.0)
+                      ,vec4 (0.0,0.0,0.0,1.0))) * ((MVP) * ((vec4
+                      ((0.375) + ((sin (Time)) * (0.1)),0.0,0.0,0.0)) + (((mat4
+                      (vec4 (1.0,0.0,0.0,0.0)
+                      ,vec4 (0.0
+                            ,cos (((Time) * (2.0)) * (0.75))
+                            ,sin (((Time) * (2.0)) * (0.75))
+                            ,0.0)
+                      ,vec4 (0.0
+                            ,(0.0) - (sin (((Time) * (2.0)) * (0.75)))
+                            ,cos (((Time) * (2.0)) * (0.75))
+                            ,0.0)
+                      ,vec4 (0.0,0.0,0.0,1.0))) * (vi1)) * (vec4
+                      (4.0e-2,4.0e-2,4.0e-2,1.0)))));
+                  vo1 = vi1;
+              }
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              f0 = vo1;
+                  f0 = vo1;
               }
-              
               """
           }
       , Program
@@ -285,45 +295,47 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 MVP ;
-              uniform float Time ;
-              in vec4 vi1 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 MVP;
+              uniform float Time;
+              in vec4 vi1;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = (mat4
-                  (vec4 (cos ((Time) * (0.3)),sin ((Time) * (0.3)),0.0,0.0)
-                  ,vec4
-                  ((0.0) - (sin ((Time) * (0.3))),cos ((Time) * (0.3)),0.0,0.0)
-                  ,vec4 (0.0,0.0,1.0,0.0)
-                  ,vec4 (0.0,0.0,0.0,1.0))) * ((MVP) * ((vec4
-                  ((0.15) + ((sin (Time)) * (0.1)),0.0,0.0,0.0)) + (((mat4
-                  (vec4 (1.0,0.0,0.0,0.0)
-                  ,vec4 (0.0
-                        ,cos (((Time) * (2.0)) * (0.3))
-                        ,sin (((Time) * (2.0)) * (0.3))
-                        ,0.0)
-                  ,vec4 (0.0
-                        ,(0.0) - (sin (((Time) * (2.0)) * (0.3)))
-                        ,cos (((Time) * (2.0)) * (0.3))
-                        ,0.0)
-                  ,vec4 (0.0,0.0,0.0,1.0))) * (vi1)) * (vec4
-                  (4.0e-2,4.0e-2,4.0e-2,1.0)))));
-              vo1 = vi1;
-              }
-              
+                  gl_Position = (mat4
+                      (vec4 (cos ((Time) * (0.3)),sin ((Time) * (0.3)),0.0,0.0)
+                      ,vec4
+                      ((0.0) - (sin ((Time) * (0.3))),cos ((Time) * (0.3)),0.0,0.0)
+                      ,vec4 (0.0,0.0,1.0,0.0)
+                      ,vec4 (0.0,0.0,0.0,1.0))) * ((MVP) * ((vec4
+                      ((0.15) + ((sin (Time)) * (0.1)),0.0,0.0,0.0)) + (((mat4
+                      (vec4 (1.0,0.0,0.0,0.0)
+                      ,vec4 (0.0
+                            ,cos (((Time) * (2.0)) * (0.3))
+                            ,sin (((Time) * (2.0)) * (0.3))
+                            ,0.0)
+                      ,vec4 (0.0
+                            ,(0.0) - (sin (((Time) * (2.0)) * (0.3)))
+                            ,cos (((Time) * (2.0)) * (0.3))
+                            ,0.0)
+                      ,vec4 (0.0,0.0,0.0,1.0))) * (vi1)) * (vec4
+                      (4.0e-2,4.0e-2,4.0e-2,1.0)))));
+                  vo1 = vi1;
+              }
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              f0 = vo1;
+                  f0 = vo1;
               }
-              
               """
           }
       , Program
@@ -337,45 +349,47 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 MVP ;
-              uniform float Time ;
-              in vec4 vi1 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 MVP;
+              uniform float Time;
+              in vec4 vi1;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = (mat4
-                  (vec4 (cos ((Time) * (0.5)),sin ((Time) * (0.5)),0.0,0.0)
-                  ,vec4
-                  ((0.0) - (sin ((Time) * (0.5))),cos ((Time) * (0.5)),0.0,0.0)
-                  ,vec4 (0.0,0.0,1.0,0.0)
-                  ,vec4 (0.0,0.0,0.0,1.0))) * ((MVP) * ((vec4
-                  ((0.25) + ((sin (Time)) * (0.1)),0.0,0.0,0.0)) + (((mat4
-                  (vec4 (1.0,0.0,0.0,0.0)
-                  ,vec4 (0.0
-                        ,cos (((Time) * (2.0)) * (0.5))
-                        ,sin (((Time) * (2.0)) * (0.5))
-                        ,0.0)
-                  ,vec4 (0.0
-                        ,(0.0) - (sin (((Time) * (2.0)) * (0.5)))
-                        ,cos (((Time) * (2.0)) * (0.5))
-                        ,0.0)
-                  ,vec4 (0.0,0.0,0.0,1.0))) * (vi1)) * (vec4
-                  (4.0e-2,4.0e-2,4.0e-2,1.0)))));
-              vo1 = vi1;
-              }
-              
+                  gl_Position = (mat4
+                      (vec4 (cos ((Time) * (0.5)),sin ((Time) * (0.5)),0.0,0.0)
+                      ,vec4
+                      ((0.0) - (sin ((Time) * (0.5))),cos ((Time) * (0.5)),0.0,0.0)
+                      ,vec4 (0.0,0.0,1.0,0.0)
+                      ,vec4 (0.0,0.0,0.0,1.0))) * ((MVP) * ((vec4
+                      ((0.25) + ((sin (Time)) * (0.1)),0.0,0.0,0.0)) + (((mat4
+                      (vec4 (1.0,0.0,0.0,0.0)
+                      ,vec4 (0.0
+                            ,cos (((Time) * (2.0)) * (0.5))
+                            ,sin (((Time) * (2.0)) * (0.5))
+                            ,0.0)
+                      ,vec4 (0.0
+                            ,(0.0) - (sin (((Time) * (2.0)) * (0.5)))
+                            ,cos (((Time) * (2.0)) * (0.5))
+                            ,0.0)
+                      ,vec4 (0.0,0.0,0.0,1.0))) * (vi1)) * (vec4
+                      (4.0e-2,4.0e-2,4.0e-2,1.0)))));
+                  vo1 = vi1;
+              }
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              f0 = vo1;
+                  f0 = vo1;
               }
-              
               """
           }
       , Program
@@ -389,45 +403,47 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 MVP ;
-              uniform float Time ;
-              in vec4 vi1 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 MVP;
+              uniform float Time;
+              in vec4 vi1;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = (mat4
-                  (vec4 (cos ((Time) * (0.0)),sin ((Time) * (0.0)),0.0,0.0)
-                  ,vec4
-                  ((0.0) - (sin ((Time) * (0.0))),cos ((Time) * (0.0)),0.0,0.0)
-                  ,vec4 (0.0,0.0,1.0,0.0)
-                  ,vec4 (0.0,0.0,0.0,1.0))) * ((MVP) * ((vec4
-                  ((0.0) + ((sin (Time)) * (0.1)),0.0,0.0,0.0)) + (((mat4
-                  (vec4 (1.0,0.0,0.0,0.0)
-                  ,vec4 (0.0
-                        ,cos (((Time) * (2.0)) * (0.0))
-                        ,sin (((Time) * (2.0)) * (0.0))
-                        ,0.0)
-                  ,vec4 (0.0
-                        ,(0.0) - (sin (((Time) * (2.0)) * (0.0)))
-                        ,cos (((Time) * (2.0)) * (0.0))
-                        ,0.0)
-                  ,vec4 (0.0,0.0,0.0,1.0))) * (vi1)) * (vec4
-                  (4.0e-2,4.0e-2,4.0e-2,1.0)))));
-              vo1 = vi1;
-              }
-              
+                  gl_Position = (mat4
+                      (vec4 (cos ((Time) * (0.0)),sin ((Time) * (0.0)),0.0,0.0)
+                      ,vec4
+                      ((0.0) - (sin ((Time) * (0.0))),cos ((Time) * (0.0)),0.0,0.0)
+                      ,vec4 (0.0,0.0,1.0,0.0)
+                      ,vec4 (0.0,0.0,0.0,1.0))) * ((MVP) * ((vec4
+                      ((0.0) + ((sin (Time)) * (0.1)),0.0,0.0,0.0)) + (((mat4
+                      (vec4 (1.0,0.0,0.0,0.0)
+                      ,vec4 (0.0
+                            ,cos (((Time) * (2.0)) * (0.0))
+                            ,sin (((Time) * (2.0)) * (0.0))
+                            ,0.0)
+                      ,vec4 (0.0
+                            ,(0.0) - (sin (((Time) * (2.0)) * (0.0)))
+                            ,cos (((Time) * (2.0)) * (0.0))
+                            ,0.0)
+                      ,vec4 (0.0,0.0,0.0,1.0))) * (vi1)) * (vec4
+                      (4.0e-2,4.0e-2,4.0e-2,1.0)))));
+                  vo1 = vi1;
+              }
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              f0 = vo1;
+                  f0 = vo1;
               }
-              
               """
           }
       , Program
@@ -441,45 +457,47 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 MVP ;
-              uniform float Time ;
-              in vec4 vi1 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 MVP;
+              uniform float Time;
+              in vec4 vi1;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = (mat4
-                  (vec4 (cos ((Time) * (-0.5)),sin ((Time) * (-0.5)),0.0,0.0)
-                  ,vec4
-                  ((0.0) - (sin ((Time) * (-0.5))),cos ((Time) * (-0.5)),0.0,0.0)
-                  ,vec4 (0.0,0.0,1.0,0.0)
-                  ,vec4 (0.0,0.0,0.0,1.0))) * ((MVP) * ((vec4
-                  ((-0.25) + ((sin (Time)) * (0.1)),0.0,0.0,0.0)) + (((mat4
-                  (vec4 (1.0,0.0,0.0,0.0)
-                  ,vec4 (0.0
-                        ,cos (((Time) * (2.0)) * (-0.5))
-                        ,sin (((Time) * (2.0)) * (-0.5))
-                        ,0.0)
-                  ,vec4 (0.0
-                        ,(0.0) - (sin (((Time) * (2.0)) * (-0.5)))
-                        ,cos (((Time) * (2.0)) * (-0.5))
-                        ,0.0)
-                  ,vec4 (0.0,0.0,0.0,1.0))) * (vi1)) * (vec4
-                  (4.0e-2,4.0e-2,4.0e-2,1.0)))));
-              vo1 = vi1;
-              }
-              
+                  gl_Position = (mat4
+                      (vec4 (cos ((Time) * (-0.5)),sin ((Time) * (-0.5)),0.0,0.0)
+                      ,vec4
+                      ((0.0) - (sin ((Time) * (-0.5))),cos ((Time) * (-0.5)),0.0,0.0)
+                      ,vec4 (0.0,0.0,1.0,0.0)
+                      ,vec4 (0.0,0.0,0.0,1.0))) * ((MVP) * ((vec4
+                      ((-0.25) + ((sin (Time)) * (0.1)),0.0,0.0,0.0)) + (((mat4
+                      (vec4 (1.0,0.0,0.0,0.0)
+                      ,vec4 (0.0
+                            ,cos (((Time) * (2.0)) * (-0.5))
+                            ,sin (((Time) * (2.0)) * (-0.5))
+                            ,0.0)
+                      ,vec4 (0.0
+                            ,(0.0) - (sin (((Time) * (2.0)) * (-0.5)))
+                            ,cos (((Time) * (2.0)) * (-0.5))
+                            ,0.0)
+                      ,vec4 (0.0,0.0,0.0,1.0))) * (vi1)) * (vec4
+                      (4.0e-2,4.0e-2,4.0e-2,1.0)))));
+                  vo1 = vi1;
+              }
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              f0 = vo1;
+                  f0 = vo1;
               }
-              
               """
           }
       ]
diff --git a/testdata/fetcharrays01.out b/testdata/fetcharrays01.out
index 5ab293d2..e3fcfa14 100644
--- a/testdata/fetcharrays01.out
+++ b/testdata/fetcharrays01.out
@@ -26,29 +26,31 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 MVP ;
-              in vec3 vi1 ;
-              in vec3 vi2 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 MVP;
+              in vec3 vi1;
+              in vec3 vi2;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = ((MVP) * (vec4
-                  ((vi1).x,(vi1).y,(vi1).z,1.0))) * (vec4 (0.5,0.5,0.5,1.0));
-              vo1 = vec4 ((vi1).x,(vi1).y,(vi1).z,1.0);
+                  gl_Position = ((MVP) * (vec4
+                      ((vi1).x,(vi1).y,(vi1).z,1.0))) * (vec4 (0.5,0.5,0.5,1.0));
+                  vo1 = vec4 ((vi1).x,(vi1).y,(vi1).z,1.0);
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              f0 = vo1;
+                  f0 = vo1;
               }
-              
               """
           }
       ]
diff --git a/testdata/fragment01.out b/testdata/fragment01.out
index c0500173..06fc0e6e 100644
--- a/testdata/fragment01.out
+++ b/testdata/fragment01.out
@@ -21,23 +21,25 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              in vec4 vi1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              in vec4 vi1;
               void main() {
-              gl_Position = vi1;
+                  gl_Position = vi1;
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              out vec4 f0;
               void main() {
-              f0 = vec4 (0.0,0.0,1.0,1.0);
+                  f0 = vec4 (0.0,0.0,1.0,1.0);
               }
-              
               """
           }
       ]
diff --git a/testdata/fragment03swizzling.out b/testdata/fragment03swizzling.out
index 39e6ea74..8e68922f 100644
--- a/testdata/fragment03swizzling.out
+++ b/testdata/fragment03swizzling.out
@@ -21,26 +21,28 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              in vec4 vi1 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              in vec4 vi1;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = vi1;
-              vo1 = vi1;
+                  gl_Position = vi1;
+                  vo1 = vi1;
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              f0 = ((vo1).xxxw) + ((vo1).yyyw);
+                  f0 = ((vo1).xxxw) + ((vo1).yyyw);
               }
-              
               """
           }
       ]
diff --git a/testdata/fragment04ifthenelse.out b/testdata/fragment04ifthenelse.out
index 1588f9fa..3bc71b70 100644
--- a/testdata/fragment04ifthenelse.out
+++ b/testdata/fragment04ifthenelse.out
@@ -21,27 +21,29 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              in vec4 vi1 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              in vec4 vi1;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = vi1;
-              vo1 = vi1;
+                  gl_Position = vi1;
+                  vo1 = vi1;
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform float Time ;
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform float Time;
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              f0 = (Time) < (0.5) ? vo1 : vec4 (0.0,0.0,1.0,1.0);
+                  f0 = (Time) < (0.5) ? vo1 : vec4 (0.0,0.0,1.0,1.0);
               }
-              
               """
           }
       ]
diff --git a/testdata/fragment07let.out b/testdata/fragment07let.out
index dfc9efb0..3d59a3da 100644
--- a/testdata/fragment07let.out
+++ b/testdata/fragment07let.out
@@ -21,26 +21,28 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              in vec4 vi1 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              in vec4 vi1;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = vi1;
-              vo1 = vi1;
+                  gl_Position = vi1;
+                  vo1 = vi1;
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              f0 = sin (sin (vo1));
+                  f0 = sin (sin (vo1));
               }
-              
               """
           }
       ]
diff --git a/testdata/gfx02.out b/testdata/gfx02.out
index 104994a2..e4a79e42 100644
--- a/testdata/gfx02.out
+++ b/testdata/gfx02.out
@@ -22,26 +22,28 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              in vec4 vi1 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              in vec4 vi1;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = vi1;
-              vo1 = vi1;
+                  gl_Position = vi1;
+                  vo1 = vi1;
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              f0 = vo1;
+                  f0 = vo1;
               }
-              
               """
           }
       ]
diff --git a/testdata/gfx03.out b/testdata/gfx03.out
index 1a963b9a..3ea828c2 100644
--- a/testdata/gfx03.out
+++ b/testdata/gfx03.out
@@ -23,24 +23,26 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 MVP2 ;
-              in vec3 vi1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 MVP2;
+              in vec3 vi1;
               void main() {
-              gl_Position = (MVP2) * (vec4 ((vi1).x,(vi1).y,(vi1).z,1.0));
+                  gl_Position = (MVP2) * (vec4 ((vi1).x,(vi1).y,(vi1).z,1.0));
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              out vec4 f0;
               void main() {
-              f0 = vec4 (0.0,0.4,0.0,1.0);
+                  f0 = vec4 (0.0,0.4,0.0,1.0);
               }
-              
               """
           }
       , Program
@@ -52,27 +54,29 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 MVP2 ;
-              in vec3 vi1 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 MVP2;
+              in vec3 vi1;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = (MVP2) * (vec4 ((vi1).x,(vi1).y,(vi1).z,1.0));
-              vo1 = vec4 ((vi1).x,(vi1).y,(vi1).z,1.0);
+                  gl_Position = (MVP2) * (vec4 ((vi1).x,(vi1).y,(vi1).z,1.0));
+                  vo1 = vec4 ((vi1).x,(vi1).y,(vi1).z,1.0);
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              f0 = (vo1) + (vec4 (1.0,1.4,1.0,0.6));
+                  f0 = (vo1) + (vec4 (1.0,1.4,1.0,0.6));
               }
-              
               """
           }
       , Program
@@ -85,27 +89,29 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 MVP ;
-              in vec4 vi1 ;
-              flat out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 MVP;
+              in vec4 vi1;
+              flat out vec4 vo1;
               void main() {
-              gl_Position = (MVP) * (vi1);
-              vo1 = vi1;
+                  gl_Position = (MVP) * (vi1);
+                  vo1 = vi1;
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              flat in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              flat in vec4 vo1;
+              out vec4 f0;
               void main() {
-              f0 = (vo1) * (vec4 (1.0,1.4,1.0,0.6));
+                  f0 = (vo1) * (vec4 (1.0,1.4,1.0,0.6));
               }
-              
               """
           }
       ]
diff --git a/testdata/gfx04.out b/testdata/gfx04.out
index b67504c5..68bb0e52 100644
--- a/testdata/gfx04.out
+++ b/testdata/gfx04.out
@@ -26,28 +26,30 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 MVP ;
-              in vec3 vi1 ;
-              in vec3 vi2 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 MVP;
+              in vec3 vi1;
+              in vec3 vi2;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = (MVP) * (vec4 ((vi1).x,(vi1).y,(vi1).z,1.0));
-              vo1 = vec4 ((vi2).x,(vi2).y,(vi2).z,1.0);
+                  gl_Position = (MVP) * (vec4 ((vi1).x,(vi1).y,(vi1).z,1.0));
+                  vo1 = vec4 ((vi2).x,(vi2).y,(vi2).z,1.0);
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              f0 = (vo1) * (vec4 (1.0,1.4,1.0,0.6));
+                  f0 = (vo1) * (vec4 (1.0,1.4,1.0,0.6));
               }
-              
               """
           }
       ]
diff --git a/testdata/gfx05.out b/testdata/gfx05.out
index f477997f..b7ce4002 100644
--- a/testdata/gfx05.out
+++ b/testdata/gfx05.out
@@ -76,24 +76,26 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 MVP2 ;
-              in vec3 vi1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 MVP2;
+              in vec3 vi1;
               void main() {
-              gl_Position = (MVP2) * (vec4 ((vi1).x,(vi1).y,(vi1).z,1.0));
+                  gl_Position = (MVP2) * (vec4 ((vi1).x,(vi1).y,(vi1).z,1.0));
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              out vec4 f0;
               void main() {
-              f0 = vec4 (0.0,0.4,0.0,1.0);
+                  f0 = vec4 (0.0,0.4,0.0,1.0);
               }
-              
               """
           }
       , Program
@@ -105,27 +107,29 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 MVP2 ;
-              in vec3 vi1 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 MVP2;
+              in vec3 vi1;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = (MVP2) * (vec4 ((vi1).x,(vi1).y,(vi1).z,1.0));
-              vo1 = vec4 ((vi1).x,(vi1).y,(vi1).z,1.0);
+                  gl_Position = (MVP2) * (vec4 ((vi1).x,(vi1).y,(vi1).z,1.0));
+                  vo1 = vec4 ((vi1).x,(vi1).y,(vi1).z,1.0);
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              f0 = (vo1) + (vec4 (1.0,1.4,1.0,0.6));
+                  f0 = (vo1) + (vec4 (1.0,1.4,1.0,0.6));
               }
-              
               """
           }
       , Program
@@ -137,24 +141,26 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 MVP2 ;
-              in vec3 vi1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 MVP2;
+              in vec3 vi1;
               void main() {
-              gl_Position = (MVP2) * (vec4 ((vi1).x,(vi1).y,(vi1).z,1.0));
+                  gl_Position = (MVP2) * (vec4 ((vi1).x,(vi1).y,(vi1).z,1.0));
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              out vec4 f0;
               void main() {
-              f0 = vec4 (0.0,0.4,0.0,1.0);
+                  f0 = vec4 (0.0,0.4,0.0,1.0);
               }
-              
               """
           }
       , Program
@@ -169,29 +175,31 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 MVP ;
-              in vec4 vi1 ;
-              in vec2 vi2 ;
-              smooth out vec2 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 MVP;
+              in vec4 vi1;
+              in vec2 vi2;
+              smooth out vec2 vo1;
               void main() {
-              gl_Position = (MVP) * (vi1);
-              vo1 = vi2;
+                  gl_Position = (MVP) * (vi1);
+                  vo1 = vi2;
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform sampler2D s0 ;
-              smooth in vec2 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform sampler2D s0;
+              smooth in vec2 vo1;
+              out vec4 f0;
               void main() {
-              f0 = (texture2D (s0,(vo1).xy)) * (0.7);
+                  f0 = (texture2D (s0,(vo1).xy)) * (0.7);
               }
-              
               """
           }
       ]
diff --git a/testdata/heartbeat01.out b/testdata/heartbeat01.out
index d40dc6d6..64a3d97b 100644
--- a/testdata/heartbeat01.out
+++ b/testdata/heartbeat01.out
@@ -79,49 +79,52 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              in vec4 vi1 ;
-              in vec2 vi2 ;
-              smooth out vec2 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              in vec4 vi1;
+              in vec2 vi2;
+              smooth out vec2 vo1;
               void main() {
-              gl_Position = (vi1) * (vec4 (1.0,1.0,1.0,1.0));
-              vo1 = vi2;
+                  gl_Position = (vi1) * (vec4 (1.0,1.0,1.0,1.0));
+                  vo1 = vi2;
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform float Time ;
-              smooth in vec2 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform float Time;
+              smooth in vec2 vo1;
+              out vec4 f0;
               void main() {
-              f0 = ((((((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)))) ? vec4
-                  (0.0
-                  ,0.0
-                  ,0.5
-                  ,1.0) : ((((((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)))) ? vec4
-                  (0.0
-                  ,0.0
-                  ,1.0
-                  ,1.0) : ((((((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)))) ? vec4
-                  (1.0,1.0,1.0,1.0) : vec4 (1.0,1.0,0.0,1.0);
+                  f0 =
+                      ((((((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)))) ? vec4
+                      (0.0
+                      ,0.0
+                      ,0.5
+                      ,1.0) : ((((((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)))) ? vec4
+                      (0.0
+                      ,0.0
+                      ,1.0
+                      ,1.0) : ((((((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)))) ? vec4
+                      (1.0,1.0,1.0,1.0) : vec4 (1.0,1.0,0.0,1.0);
               }
-              
               """
           }
       , Program
@@ -136,29 +139,31 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 MVP ;
-              in vec4 vi1 ;
-              in vec2 vi2 ;
-              smooth out vec2 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 MVP;
+              in vec4 vi1;
+              in vec2 vi2;
+              smooth out vec2 vo1;
               void main() {
-              gl_Position = ((MVP) * (vi1)) * (vec4 (0.5,0.5,0.5,1.0));
-              vo1 = vi2;
+                  gl_Position = ((MVP) * (vi1)) * (vec4 (0.5,0.5,0.5,1.0));
+                  vo1 = vi2;
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform sampler2D s0 ;
-              smooth in vec2 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform sampler2D s0;
+              smooth in vec2 vo1;
+              out vec4 f0;
               void main() {
-              f0 = texture2D (s0,vo1);
+                  f0 = texture2D (s0,vo1);
               }
-              
               """
           }
       ]
diff --git a/testdata/helloWorld.out b/testdata/helloWorld.out
index 9da473c4..13e7377a 100644
--- a/testdata/helloWorld.out
+++ b/testdata/helloWorld.out
@@ -24,28 +24,30 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 MVP ;
-              in vec4 vi1 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 MVP;
+              in vec4 vi1;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = ((MVP) * (vi1)) * (vec4 (0.5,0.5,0.5,1.0));
-              vo1 = vi1;
+                  gl_Position = ((MVP) * (vi1)) * (vec4 (0.5,0.5,0.5,1.0));
+                  vo1 = vi1;
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              if (!(true)) discard;
-              f0 = vo1;
+                  if (!(true)) discard;
+                  f0 = vo1;
               }
-              
               """
           }
       ]
diff --git a/testdata/line01.out b/testdata/line01.out
index 66c0aebb..6ea03c7f 100644
--- a/testdata/line01.out
+++ b/testdata/line01.out
@@ -24,28 +24,30 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 MVP ;
-              in vec3 vi1 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 MVP;
+              in vec3 vi1;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = ((MVP) * (vec4
-                  ((vi1).x,(vi1).y,(vi1).z,1.0))) * (vec4 (0.5,0.5,0.5,1.0));
-              vo1 = vec4 ((vi1).x,(vi1).y,(vi1).z,1.0);
+                  gl_Position = ((MVP) * (vec4
+                      ((vi1).x,(vi1).y,(vi1).z,1.0))) * (vec4 (0.5,0.5,0.5,1.0));
+                  vo1 = vec4 ((vi1).x,(vi1).y,(vi1).z,1.0);
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              f0 = vo1;
+                  f0 = vo1;
               }
-              
               """
           }
       ]
diff --git a/testdata/point01.out b/testdata/point01.out
index 269277a7..7eddbc45 100644
--- a/testdata/point01.out
+++ b/testdata/point01.out
@@ -26,30 +26,32 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 MVP ;
-              in vec3 vi1 ;
-              in vec4 vi2 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 MVP;
+              in vec3 vi1;
+              in vec4 vi2;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = ((MVP) * (vec4
-                  ((vi1).x,(vi1).y,(vi1).z,1.0))) * (vec4 (0.5,0.5,0.5,1.0));
-              vo1 = vi2;
-              gl_PointSize = 30.0;
+                  gl_Position = ((MVP) * (vec4
+                      ((vi1).x,(vi1).y,(vi1).z,1.0))) * (vec4 (0.5,0.5,0.5,1.0));
+                  vo1 = vi2;
+                  gl_PointSize = 30.0;
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              f0 = vo1;
+                  f0 = vo1;
               }
-              
               """
           }
       ]
diff --git a/testdata/recursivetexture02.out b/testdata/recursivetexture02.out
index 4e9e1953..0dc86bbb 100644
--- a/testdata/recursivetexture02.out
+++ b/testdata/recursivetexture02.out
@@ -287,28 +287,30 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 MVP ;
-              in vec4 vi1 ;
-              in vec2 vi2 ;
-              smooth out vec2 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 MVP;
+              in vec4 vi1;
+              in vec2 vi2;
+              smooth out vec2 vo1;
               void main() {
-              gl_Position = ((MVP) * (vi1)) * (vec4 (0.5,0.5,0.5,1.0));
-              vo1 = vi2;
+                  gl_Position = ((MVP) * (vi1)) * (vec4 (0.5,0.5,0.5,1.0));
+                  vo1 = vi2;
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              smooth in vec2 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              smooth in vec2 vo1;
+              out vec4 f0;
               void main() {
-              f0 = (vo1).xyxy;
+                  f0 = (vo1).xyxy;
               }
-              
               """
           }
       , Program
@@ -323,29 +325,31 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 MVP ;
-              in vec4 vi1 ;
-              in vec2 vi2 ;
-              smooth out vec2 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 MVP;
+              in vec4 vi1;
+              in vec2 vi2;
+              smooth out vec2 vo1;
               void main() {
-              gl_Position = ((MVP) * (vi1)) * (vec4 (1.0,1.0,1.0,1.0));
-              vo1 = vi2;
+                  gl_Position = ((MVP) * (vi1)) * (vec4 (1.0,1.0,1.0,1.0));
+                  vo1 = vi2;
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform sampler2D s0 ;
-              smooth in vec2 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform sampler2D s0;
+              smooth in vec2 vo1;
+              out vec4 f0;
               void main() {
-              f0 = (texture2D (s0,vo1)) * (vec4 (0.7,0.7,0.7,1.0));
+                  f0 = (texture2D (s0,vo1)) * (vec4 (0.7,0.7,0.7,1.0));
               }
-              
               """
           }
       , Program
@@ -360,29 +364,31 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 MVP ;
-              in vec4 vi1 ;
-              in vec2 vi2 ;
-              smooth out vec2 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 MVP;
+              in vec4 vi1;
+              in vec2 vi2;
+              smooth out vec2 vo1;
               void main() {
-              gl_Position = ((MVP) * (vi1)) * (vec4 (1.0,1.0,1.0,1.0));
-              vo1 = vi2;
+                  gl_Position = ((MVP) * (vi1)) * (vec4 (1.0,1.0,1.0,1.0));
+                  vo1 = vi2;
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform sampler2D s0 ;
-              smooth in vec2 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform sampler2D s0;
+              smooth in vec2 vo1;
+              out vec4 f0;
               void main() {
-              f0 = (texture2D (s0,vo1)) * (vec4 (0.7,0.7,0.7,1.0));
+                  f0 = (texture2D (s0,vo1)) * (vec4 (0.7,0.7,0.7,1.0));
               }
-              
               """
           }
       , Program
@@ -397,29 +403,31 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 MVP ;
-              in vec4 vi1 ;
-              in vec2 vi2 ;
-              smooth out vec2 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 MVP;
+              in vec4 vi1;
+              in vec2 vi2;
+              smooth out vec2 vo1;
               void main() {
-              gl_Position = ((MVP) * (vi1)) * (vec4 (1.0,1.0,1.0,1.0));
-              vo1 = vi2;
+                  gl_Position = ((MVP) * (vi1)) * (vec4 (1.0,1.0,1.0,1.0));
+                  vo1 = vi2;
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform sampler2D s0 ;
-              smooth in vec2 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform sampler2D s0;
+              smooth in vec2 vo1;
+              out vec4 f0;
               void main() {
-              f0 = (texture2D (s0,vo1)) * (vec4 (0.7,0.7,0.7,1.0));
+                  f0 = (texture2D (s0,vo1)) * (vec4 (0.7,0.7,0.7,1.0));
               }
-              
               """
           }
       , Program
@@ -434,29 +442,31 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 MVP ;
-              in vec4 vi1 ;
-              in vec2 vi2 ;
-              smooth out vec2 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 MVP;
+              in vec4 vi1;
+              in vec2 vi2;
+              smooth out vec2 vo1;
               void main() {
-              gl_Position = ((MVP) * (vi1)) * (vec4 (1.0,1.0,1.0,1.0));
-              vo1 = vi2;
+                  gl_Position = ((MVP) * (vi1)) * (vec4 (1.0,1.0,1.0,1.0));
+                  vo1 = vi2;
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform sampler2D s0 ;
-              smooth in vec2 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform sampler2D s0;
+              smooth in vec2 vo1;
+              out vec4 f0;
               void main() {
-              f0 = (texture2D (s0,vo1)) * (vec4 (0.7,0.7,0.7,1.0));
+                  f0 = (texture2D (s0,vo1)) * (vec4 (0.7,0.7,0.7,1.0));
               }
-              
               """
           }
       , Program
@@ -471,29 +481,31 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 MVP ;
-              in vec4 vi1 ;
-              in vec2 vi2 ;
-              smooth out vec2 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 MVP;
+              in vec4 vi1;
+              in vec2 vi2;
+              smooth out vec2 vo1;
               void main() {
-              gl_Position = ((MVP) * (vi1)) * (vec4 (1.0,1.0,1.0,1.0));
-              vo1 = vi2;
+                  gl_Position = ((MVP) * (vi1)) * (vec4 (1.0,1.0,1.0,1.0));
+                  vo1 = vi2;
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform sampler2D s0 ;
-              smooth in vec2 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform sampler2D s0;
+              smooth in vec2 vo1;
+              out vec4 f0;
               void main() {
-              f0 = (texture2D (s0,vo1)) * (vec4 (0.7,0.7,0.7,1.0));
+                  f0 = (texture2D (s0,vo1)) * (vec4 (0.7,0.7,0.7,1.0));
               }
-              
               """
           }
       ]
diff --git a/testdata/reduce01.out b/testdata/reduce01.out
index 104994a2..e4a79e42 100644
--- a/testdata/reduce01.out
+++ b/testdata/reduce01.out
@@ -22,26 +22,28 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              in vec4 vi1 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              in vec4 vi1;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = vi1;
-              vo1 = vi1;
+                  gl_Position = vi1;
+                  vo1 = vi1;
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              f0 = vo1;
+                  f0 = vo1;
               }
-              
               """
           }
       ]
diff --git a/testdata/reduce05.out b/testdata/reduce05.out
index b3cd59c2..98edf765 100644
--- a/testdata/reduce05.out
+++ b/testdata/reduce05.out
@@ -22,26 +22,28 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              in vec4 vi1 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              in vec4 vi1;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = vi1;
-              vo1 = vi1;
+                  gl_Position = vi1;
+                  vo1 = vi1;
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              f0 = vec4 (1.0,0.0,0.0,1.0);
+                  f0 = vec4 (1.0,0.0,0.0,1.0);
               }
-              
               """
           }
       , Program
@@ -54,26 +56,28 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              in vec4 vi1 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              in vec4 vi1;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = vi1;
-              vo1 = vi1;
+                  gl_Position = vi1;
+                  vo1 = vi1;
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              f0 = vec4 (0.0,1.0,0.0,1.0);
+                  f0 = vec4 (0.0,1.0,0.0,1.0);
               }
-              
               """
           }
       ]
diff --git a/testdata/simple02.out b/testdata/simple02.out
index 683bd02e..faf41dea 100644
--- a/testdata/simple02.out
+++ b/testdata/simple02.out
@@ -24,27 +24,29 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 MVP ;
-              in vec4 vi1 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 MVP;
+              in vec4 vi1;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = (MVP) * (vi1);
-              vo1 = vi1;
+                  gl_Position = (MVP) * (vi1);
+                  vo1 = vi1;
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              f0 = (vo1) * (vec4 (1.0,0.4,0.0,0.2));
+                  f0 = (vo1) * (vec4 (1.0,0.4,0.0,0.2));
               }
-              
               """
           }
       ]
diff --git a/testdata/simple03.out b/testdata/simple03.out
index e72073e3..08a43c01 100644
--- a/testdata/simple03.out
+++ b/testdata/simple03.out
@@ -26,28 +26,31 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 viewProj ;
-              in vec3 vi1 ;
-              in vec3 vi2 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 viewProj;
+              in vec3 vi1;
+              in vec3 vi2;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = (viewProj) * (vec4 ((vi1).x,(vi1).y,(vi1).z,1.0));
-              vo1 = vec4 ((vi2).x,(vi2).y,(vi2).z,1.0);
+                  gl_Position = (viewProj) * (vec4
+                      ((vi1).x,(vi1).y,(vi1).z,1.0));
+                  vo1 = vec4 ((vi2).x,(vi2).y,(vi2).z,1.0);
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              f0 = vec4 (1.0,1.0,1.0,1.0);
+                  f0 = vec4 (1.0,1.0,1.0,1.0);
               }
-              
               """
           }
       , Program
@@ -62,28 +65,31 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 viewProj ;
-              in vec3 vi1 ;
-              in vec3 vi2 ;
-              smooth out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 viewProj;
+              in vec3 vi1;
+              in vec3 vi2;
+              smooth out vec4 vo1;
               void main() {
-              gl_Position = (viewProj) * (vec4 ((vi1).x,(vi1).y,(vi1).z,1.0));
-              vo1 = vec4 ((vi2).x,(vi2).y,(vi2).z,1.0);
+                  gl_Position = (viewProj) * (vec4
+                      ((vi1).x,(vi1).y,(vi1).z,1.0));
+                  vo1 = vec4 ((vi2).x,(vi2).y,(vi2).z,1.0);
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              smooth in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              smooth in vec4 vo1;
+              out vec4 f0;
               void main() {
-              f0 = vo1;
+                  f0 = vo1;
               }
-              
               """
           }
       ]
diff --git a/testdata/texture01.out b/testdata/texture01.out
index ec89a6c0..eea2d8ff 100644
--- a/testdata/texture01.out
+++ b/testdata/texture01.out
@@ -27,29 +27,31 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 MVP ;
-              in vec4 vi1 ;
-              in vec2 vi2 ;
-              smooth out vec2 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 MVP;
+              in vec4 vi1;
+              in vec2 vi2;
+              smooth out vec2 vo1;
               void main() {
-              gl_Position = ((MVP) * (vi1)) * (vec4 (0.5,0.5,0.5,1.0));
-              vo1 = vi2;
+                  gl_Position = ((MVP) * (vi1)) * (vec4 (0.5,0.5,0.5,1.0));
+                  vo1 = vi2;
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform sampler2D diffuse ;
-              smooth in vec2 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform sampler2D diffuse;
+              smooth in vec2 vo1;
+              out vec4 f0;
               void main() {
-              f0 = texture2D (diffuse,vo1);
+                  f0 = texture2D (diffuse,vo1);
               }
-              
               """
           }
       ]
diff --git a/testdata/texture02.out b/testdata/texture02.out
index d57e830f..0f94c705 100644
--- a/testdata/texture02.out
+++ b/testdata/texture02.out
@@ -79,29 +79,31 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 MVP ;
-              in vec4 vi1 ;
-              in vec2 vi2 ;
-              smooth out vec2 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 MVP;
+              in vec4 vi1;
+              in vec2 vi2;
+              smooth out vec2 vo1;
               void main() {
-              gl_Position = ((MVP) * (vi1)) * (vec4 (0.5,0.5,0.5,1.0));
-              vo1 = vi2;
+                  gl_Position = ((MVP) * (vi1)) * (vec4 (0.5,0.5,0.5,1.0));
+                  vo1 = vi2;
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform sampler2D s0 ;
-              smooth in vec2 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform sampler2D s0;
+              smooth in vec2 vo1;
+              out vec4 f0;
               void main() {
-              f0 = texture2D (s0,vo1);
+                  f0 = texture2D (s0,vo1);
               }
-              
               """
           }
       ]
diff --git a/testdata/uniformparam01.out b/testdata/uniformparam01.out
index be9f3748..1b5bf8ef 100644
--- a/testdata/uniformparam01.out
+++ b/testdata/uniformparam01.out
@@ -22,27 +22,29 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 MVP ;
-              in vec4 vi1 ;
-              flat out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 MVP;
+              in vec4 vi1;
+              flat out vec4 vo1;
               void main() {
-              gl_Position = (MVP) * (vi1);
-              vo1 = vi1;
+                  gl_Position = (MVP) * (vi1);
+                  vo1 = vi1;
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              flat in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              flat in vec4 vo1;
+              out vec4 f0;
               void main() {
-              f0 = vo1;
+                  f0 = vo1;
               }
-              
               """
           }
       ]
diff --git a/testdata/uniformparam02.out b/testdata/uniformparam02.out
index d057c8c0..8fde7aec 100644
--- a/testdata/uniformparam02.out
+++ b/testdata/uniformparam02.out
@@ -22,24 +22,27 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              in vec4 vi1 ;
-              flat out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              in vec4 vi1;
+              flat out vec4 vo1;
               void main() {
-              gl_Position = vi1;
-              vo1 = vi1;
+                  gl_Position = vi1;
+                  vo1 = vi1;
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              flat in vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              flat in vec4 vo1;
               void main() {
+                  
               }
-              
               """
           }
       ]
diff --git a/testdata/uniformparam03.out b/testdata/uniformparam03.out
index be9f3748..1b5bf8ef 100644
--- a/testdata/uniformparam03.out
+++ b/testdata/uniformparam03.out
@@ -22,27 +22,29 @@ Pipeline
           , vertexShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              uniform mat4 MVP ;
-              in vec4 vi1 ;
-              flat out vec4 vo1 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              uniform mat4 MVP;
+              in vec4 vi1;
+              flat out vec4 vo1;
               void main() {
-              gl_Position = (MVP) * (vi1);
-              vo1 = vi1;
+                  gl_Position = (MVP) * (vi1);
+                  vo1 = vi1;
               }
-              
               """
           , geometryShader = Nothing
           , fragmentShader =
               """
               #version 330 core
-              vec4 texture2D(sampler2D s, vec2 uv){return texture(s,uv);}
-              flat in vec4 vo1 ;
-              out vec4 f0 ;
+              vec4 texture2D(sampler2D s,vec2 uv) {
+                  return texture(s,uv);
+              }
+              flat in vec4 vo1;
+              out vec4 f0;
               void main() {
-              f0 = vo1;
+                  f0 = vo1;
               }
-              
               """
           }
       ]