remove hacks

25 files changed, 27 insertions, 27 deletions

diff --git a/testdata/NewStyle.lc b/testdata/NewStyle.lc
index 5f7c7f6f..2a074b53 100644
--- a/testdata/NewStyle.lc
+++ b/testdata/NewStyle.lc
@@ -8,7 +8,7 @@ colorFragmentCtx = (DepthOp Less True, ColorOp NoBlending (V4 True True True Tru
 rasterizeWith = rasterizePrimitives
 triangles = triangleRasterCtx
 
-cubeVertexStream = fetch "stream4" (Attribute "position4" :: ((Vec 4 Float)))
+cubeVertexStream = fetch "stream4" ((Attribute "position4" :: Vec 4 Float))
 mapFragments2 s fs = accumulate colorFragmentCtx (\((a)) -> ((fs a))) s clear
 
 rotate' v = (Uniform "MVP" :: Mat 4 4 Float) `PrimMulMatVec` v
diff --git a/testdata/PrimReduce.lc b/testdata/PrimReduce.lc
index e311e9ac..6325c79f 100644
--- a/testdata/PrimReduce.lc
+++ b/testdata/PrimReduce.lc
@@ -6,7 +6,7 @@ colorFragmentCtx = accumulationContext ((ColorOp NoBlending (V4 True True True T
 rasterizeWith = rasterizePrimitives
 triangles = triangleRasterCtx
 
-cubeVertexStream = fetch "stream4" (Attribute "position4" :: ((Vec 4 Float)))
+cubeVertexStream = fetch "stream4" ((Attribute "position4" :: Vec 4 Float))
 mapFragments2 s fs = accumulate colorFragmentCtx  (\() -> ((fs))) s clear
 transform s f =  mapPrimitives (\((v)) -> ((f v))) s
 
diff --git a/testdata/editor-examples/Cube.lc b/testdata/editor-examples/Cube.lc
index 7efaf32b..61bf2ae5 100644
--- a/testdata/editor-examples/Cube.lc
+++ b/testdata/editor-examples/Cube.lc
@@ -16,5 +16,5 @@ makeFrame (time :: Float)
 
 main = renderFrame $
    makeFrame (Uniform "Time")
-             (fetch "stream4" (Attribute "position4"))
+             (fetch "stream4" ((Attribute "position4")))
 
diff --git a/testdata/editor-examples/LambdaCube.lc b/testdata/editor-examples/LambdaCube.lc
index 3ac877bc..810159d8 100644
--- a/testdata/editor-examples/LambdaCube.lc
+++ b/testdata/editor-examples/LambdaCube.lc
@@ -43,5 +43,5 @@ makeFrame (vertexstream :: PrimitiveStream Triangle ((Vec 4 Float)))
     & accumulateWith (DepthOp Less True, ColorOp NoBlending (V4 True True True True))
 
 main = renderFrame $
-   makeFrame (fetch "stream4" (Attribute "position4"))
+   makeFrame (fetch "stream4" ((Attribute "position4")))
 
diff --git a/testdata/editor-examples/LambdaCube2.lc b/testdata/editor-examples/LambdaCube2.lc
index 8529db31..7a9bdeec 100644
--- a/testdata/editor-examples/LambdaCube2.lc
+++ b/testdata/editor-examples/LambdaCube2.lc
@@ -29,5 +29,5 @@ makeFrame (time :: Float)
 
 main = renderFrame $
    makeFrame (Uniform "Time")
-             (fetch "stream4" (Attribute "position4"))
+             (fetch "stream4" ((Attribute "position4")))
 
diff --git a/testdata/editor-examples/MagicCube.lc b/testdata/editor-examples/MagicCube.lc
index f41a9ec9..43ecf311 100644
--- a/testdata/editor-examples/MagicCube.lc
+++ b/testdata/editor-examples/MagicCube.lc
@@ -23,4 +23,4 @@ makeFrame (time :: Float)
 
 main = renderFrame $
    makeFrame (Uniform "Time")
-             (fetch "stream4" (Attribute "position4"))
+             (fetch "stream4" ((Attribute "position4")))
diff --git a/testdata/editor-examples/RecLC.lc b/testdata/editor-examples/RecLC.lc
index b8cfac19..cebd551c 100644
--- a/testdata/editor-examples/RecLC.lc
+++ b/testdata/editor-examples/RecLC.lc
@@ -5,7 +5,7 @@ import RecursiveTexture hiding (main)
 
 inner2 =
    makeFrame (Uniform "Time")
-             (fetch "stream4" (Attribute "position4"))
+             (fetch "stream4" ((Attribute "position4")))
 
 main :: Output
 main = ScreenOut $ snd $ iterate (\(n, f) -> (n+1, cube' 512 n f)) (0, inner2) !! 2
diff --git a/testdata/editor-examples/Stripes.lc b/testdata/editor-examples/Stripes.lc
index 549e2e4d..d97fa7da 100644
--- a/testdata/editor-examples/Stripes.lc
+++ b/testdata/editor-examples/Stripes.lc
@@ -19,6 +19,6 @@ makeFrame (time :: Float)
 
 main = renderFrame $
    makeFrame (Uniform "Time")
-             (fetch "stream4" (Attribute "position4"))
+             (fetch "stream4" ((Attribute "position4")))
 
 
diff --git a/testdata/example06.lc b/testdata/example06.lc
index f29f8904..51181553 100644
--- a/testdata/example06.lc
+++ b/testdata/example06.lc
@@ -6,7 +6,7 @@ colorFragmentCtx = (DepthOp Less True, ColorOp NoBlending (V4 True True True Tru
 rasterizeWith = rasterizePrimitives
 triangles = triangleRasterCtx
 
-cubeVertexStream = fetch "stream4" (Attribute "position4" :: ((Vec 4 Float)))
+cubeVertexStream = fetch "stream4" ((Attribute "position4" :: Vec 4 Float))
 mapFragments2 s fs = accumulate colorFragmentCtx (\((a)) -> ((fs a))) s clear
 transform s f = mapPrimitives (\((v)) -> (f v, v)) s
 
diff --git a/testdata/example07.lc b/testdata/example07.lc
index 4882f206..8f28413b 100644
--- a/testdata/example07.lc
+++ b/testdata/example07.lc
@@ -8,7 +8,7 @@ colorFragmentCtx = (DepthOp Less True, ColorOp NoBlending (V4 True True True Tru
 rasterizeWith = rasterizePrimitives
 triangles = triangleRasterCtx
 
-cubeVertexStream = fetch "stream4" (Attribute "position4" :: ((Vec 4 Float)))
+cubeVertexStream = fetch "stream4" ((Attribute "position4" :: Vec 4 Float))
 mapFragments2 s fs = accumulate colorFragmentCtx (\((a)) -> ((fs a))) s clear
 transform s f = mapPrimitives (\((v)) -> (f v, v)) s
 
diff --git a/testdata/example08.lc b/testdata/example08.lc
index 59b2c1d5..02f94059 100644
--- a/testdata/example08.lc
+++ b/testdata/example08.lc
@@ -8,7 +8,7 @@ colorFragmentCtx = (DepthOp Less True, ColorOp NoBlending (V4 True True True Tru
 rasterizeWith = rasterizePrimitives
 triangles = triangleRasterCtx
 
-cubeVertexStream = fetch "stream4" (Attribute "position4" :: ((Vec 4 Float)))
+cubeVertexStream = fetch "stream4" ((Attribute "position4" :: Vec 4 Float))
 mapFragments2 s fs bg = accumulate colorFragmentCtx (\((a)) -> ((fs a))) s bg
 
 cube fv f bg = (cubeVertexStream         -- cube vertices
diff --git a/testdata/fragment01.lc b/testdata/fragment01.lc
index c285242e..3ebdca52 100644
--- a/testdata/fragment01.lc
+++ b/testdata/fragment01.lc
@@ -6,7 +6,7 @@ colorFragmentCtx = accumulationContext ((ColorOp NoBlending (V4 True True True T
 rasterizeWith = rasterizePrimitives
 triangles = triangleRasterCtx
 
-quadVertexStream = fetch "quad" (Attribute "position" :: ((Vec 4 Float)))
+quadVertexStream = fetch "quad" ((Attribute "position" :: Vec 4 Float))
 
 transform s f =  mapPrimitives (\((v)) -> ((f v))) s
 
diff --git a/testdata/fragment03swizzling.lc b/testdata/fragment03swizzling.lc
index c4c89e2c..8dc816a1 100644
--- a/testdata/fragment03swizzling.lc
+++ b/testdata/fragment03swizzling.lc
@@ -6,7 +6,7 @@ colorFragmentCtx = accumulationContext ((ColorOp NoBlending (V4 True True True T
 rasterizeWith = rasterizePrimitives
 triangles = triangleRasterCtx
 
-quadVertexStream = fetch "quad" (Attribute "position" :: ((Vec 4 Float)))
+quadVertexStream = fetch "quad" ((Attribute "position" :: Vec 4 Float))
 
 transform s f =  mapPrimitives (\((v)) ->  (f v, v)) s
 
diff --git a/testdata/fragment04ifthenelse.lc b/testdata/fragment04ifthenelse.lc
index 55d47c98..69cd9ee3 100644
--- a/testdata/fragment04ifthenelse.lc
+++ b/testdata/fragment04ifthenelse.lc
@@ -7,7 +7,7 @@ colorFragmentCtx = accumulationContext ((ColorOp NoBlending (V4 True True True T
 rasterizeWith = rasterizePrimitives
 triangles = triangleRasterCtx
 
-quadVertexStream = fetch "quad" (Attribute "position" :: ((Vec 4 Float)))
+quadVertexStream = fetch "quad" ((Attribute "position" :: Vec 4 Float))
 
 transform s f =  mapPrimitives (\((v)) ->  (f v, v)) s
 
diff --git a/testdata/fragment07let.lc b/testdata/fragment07let.lc
index ad5d719b..44655d09 100644
--- a/testdata/fragment07let.lc
+++ b/testdata/fragment07let.lc
@@ -6,7 +6,7 @@ colorFragmentCtx = ((ColorOp NoBlending (V4 True True True True)))
 rasterizeWith = rasterizePrimitives
 triangles = triangleRasterCtx
 
-quadVertexStream = fetch "quad" (Attribute "position" :: ((Vec 4 Float)))
+quadVertexStream = fetch "quad" ((Attribute "position" :: Vec 4 Float))
 
 transform s f =  mapPrimitives (\((v)) -> (f v, v)) s
 
diff --git a/testdata/gfx02.lc b/testdata/gfx02.lc
index 96753443..489c6dfa 100644
--- a/testdata/gfx02.lc
+++ b/testdata/gfx02.lc
@@ -3,7 +3,7 @@ main = let
   rasterCtx         = TriangleCtx CullNone PolygonFill NoOffset LastVertex
   fragmentCtx       = accumulationContext ((ColorOp NoBlending (V4 True True True True)))
   vertexShader      = \((v)) -> (v, v)
-  vertexStream      = fetch "stream4" (Attribute "position4" :: ((Vec 4 Float)))
+  vertexStream      = fetch "stream4" ((Attribute "position4" :: Vec 4 Float))
   primitiveStream   = mapPrimitives vertexShader vertexStream
   fragmentStream    = rasterizePrimitives rasterCtx ((Smooth)) primitiveStream
   fragmentShader    = \((v)) -> ((v)) --(V4F 1.0 0.0 0.0 1.0)
diff --git a/testdata/gfx03.lc b/testdata/gfx03.lc
index 97bdddef..2b16ddd5 100644
--- a/testdata/gfx03.lc
+++ b/testdata/gfx03.lc
@@ -12,7 +12,7 @@ renderWire fb = let
   rasterCtx         = TriangleCtx cull polyMode NoOffset FirstVertex
   fragmentCtx       = (DepthOp Always False, ColorOp blend' (V4 True True False False))
   vertexShader ((v))    = let v2 = v3FToV4F v in ((PrimMulMatVec modelViewProj v2))
-  vertexStream      = fetch "stream" (Attribute "position" :: ((Vec 3 Float)))
+  vertexStream      = fetch "stream" ((Attribute "position" :: Vec 3 Float))
   primitiveStream   = mapPrimitives vertexShader vertexStream
   fragmentStream    = rasterizePrimitives rasterCtx () primitiveStream
   fragmentShader' = \_ -> ((V4 1.0 0.4 0.0 0.2))
@@ -34,7 +34,7 @@ render fb = let
   rasterCtx         = TriangleCtx cull polyMode' NoOffset FirstVertex
   fragmentCtx       = accumulationContext (DepthOp Less False, ColorOp blend' (V4 True True False False))
   vertexShader ((v))    = let v2 = v3FToV4F v in (PrimMulMatVec modelViewProj v2, v2)
-  vertexStream      = fetch "stream" (Attribute "position" :: ((Vec 3 Float)))
+  vertexStream      = fetch "stream" ((Attribute "position" :: Vec 3 Float))
   primitiveStream   = mapPrimitives vertexShader vertexStream
   fragmentStream    = rasterizePrimitives rasterCtx ((Smooth)) primitiveStream
   fragmentShader'   = \((v)) -> ((V4 1.0 0.4 0.0 0.2))
@@ -57,7 +57,7 @@ render' fb = let
   fragmentCtx       = (DepthOp Less False, ColorOp blend (V4 True True True True))
   vertexShader' v    = let v2 = v3FToV4F v in (PrimMulMatVec modelViewProj v2, v2)
   vertexShader ((v))    = (PrimMulMatVec modelViewProj v, v)
-  vertexStream      = fetch "stream4" (Attribute "position4" :: ((Vec 4 Float)))
+  vertexStream      = fetch "stream4" ((Attribute "position4" :: Vec 4 Float))
   primitiveStream   = mapPrimitives vertexShader vertexStream
   fragmentStream    = rasterizePrimitives rasterCtx ((Flat)) primitiveStream
   fragmentShader' = \((v)) -> ((V4 1.0 0.4 0.0 0.2))
diff --git a/testdata/graphics-features/codegen/shadergen01.lc b/testdata/graphics-features/codegen/shadergen01.lc
index 89942cbb..b4dc7b46 100644
--- a/testdata/graphics-features/codegen/shadergen01.lc
+++ b/testdata/graphics-features/codegen/shadergen01.lc
@@ -15,5 +15,5 @@ makeFrame (projmat :: Mat 4 4 Float)
 
 main = renderFrame $
    makeFrame (Uniform "MVP")
-             (fetch "stream4" (Attribute "position4"))
+             (fetch "stream4" ((Attribute "position4")))
 
diff --git a/testdata/helloWorld.lc b/testdata/helloWorld.lc
index 5c5225a3..e52d9fa1 100644
--- a/testdata/helloWorld.lc
+++ b/testdata/helloWorld.lc
@@ -13,5 +13,5 @@ makeFrame (projmat :: Mat 4 4 Float)
 
 main = renderFrame $
    makeFrame (Uniform "MVP")
-             (fetch "stream4" (Attribute "position4"))
+             (fetch "stream4" ((Attribute "position4")))
 
diff --git a/testdata/reduce01.lc b/testdata/reduce01.lc
index 2482ea47..b5c2636c 100644
--- a/testdata/reduce01.lc
+++ b/testdata/reduce01.lc
@@ -5,7 +5,7 @@ render choice = let
   rasterCtx         = TriangleCtx CullNone PolygonFill NoOffset LastVertex
   fragmentCtx       = ((ColorOp NoBlending (V4 True True True True)))
   vertexShader ((v))    = (v, v)
-  vertexStream      = fetch "stream4" (Attribute "position4" :: ((Vec 4 Float)))
+  vertexStream      = fetch "stream4" ((Attribute "position4" :: Vec 4 Float))
   primitiveStream   = mapPrimitives vertexShader vertexStream
   fragmentStream    = rasterizePrimitives rasterCtx ((Smooth)) primitiveStream
   fragmentShader    = \((v)) -> ((case choice of
diff --git a/testdata/reduce05.lc b/testdata/reduce05.lc
index 1a6a710c..d4ea9268 100644
--- a/testdata/reduce05.lc
+++ b/testdata/reduce05.lc
@@ -7,7 +7,7 @@ render fb choice = let
                         B -> V4 True False False False
   fragmentCtx       = ((ColorOp NoBlending mask))
   vertexShader      = \((v)) -> (v, v)
-  vertexStream      = fetch "stream4" (Attribute "position4" :: ((Vec 4 Float)))
+  vertexStream      = fetch "stream4" ((Attribute "position4" :: Vec 4 Float))
   primitiveStream   = mapPrimitives vertexShader vertexStream
   fragmentStream    = rasterizePrimitives rasterCtx ((Smooth)) primitiveStream
   fragmentShader    =  \((v)) -> ((case choice of
diff --git a/testdata/simple02.lc b/testdata/simple02.lc
index 6a90ef03..09c00a6e 100644
--- a/testdata/simple02.lc
+++ b/testdata/simple02.lc
@@ -15,7 +15,7 @@ main = let
   fragmentCtx       = (DepthOp Less True, ColorOp blend (V4 True True True True))
   modelViewProj     = Uniform "MVP" :: Mat 4 4 Float
   vertexShader ((v))    = (PrimMulMatVec modelViewProj v, v)
-  vertexStream      = fetch "stream4" (Attribute "position4" :: ((Vec 4 Float)))
+  vertexStream      = fetch "stream4" ((Attribute "position4" :: Vec 4 Float))
   primitiveStream   = mapPrimitives vertexShader vertexStream
   fragmentStream    = rasterizePrimitives rasterCtx ((Smooth)) primitiveStream
   fragmentShader' = \((v)) -> ((V4 1.0 0.4 0.0 0.2))
diff --git a/testdata/uniformparam01.lc b/testdata/uniformparam01.lc
index 3530f941..afd4474f 100644
--- a/testdata/uniformparam01.lc
+++ b/testdata/uniformparam01.lc
@@ -3,7 +3,7 @@ render modelViewProj = let
   rasterCtx         = LineCtx 1.0 LastVertex
   fragmentCtx       = accumulationContext (((ColorOp NoBlending (V4 True True True True))))
   vertexShader ((v)) = (PrimMulMatVec (modelViewProj :: Mat 4 4 Float) v, v)
-  vertexStream      = fetch "stream4" (Attribute "position4" :: ((Vec 4 Float)))
+  vertexStream      = fetch "stream4" ((Attribute "position4" :: Vec 4 Float))
   primitiveStream   = mapPrimitives vertexShader vertexStream
   fragmentStream    = rasterizePrimitives rasterCtx ((Flat)) primitiveStream
   fragmentShader    = \((v)) -> ((v))
diff --git a/testdata/uniformparam02.lc b/testdata/uniformparam02.lc
index 18da61d2..6bdca7ca 100644
--- a/testdata/uniformparam02.lc
+++ b/testdata/uniformparam02.lc
@@ -3,7 +3,7 @@ render modelViewProj = let
   rasterCtx         = LineCtx 1.0 LastVertex
   fragmentCtx       = accumulationContext ((DepthOp Less False))
   vertexShader ((v)) = (v, v)
-  vertexStream      = fetch "stream4" (Attribute "position4" :: ((Vec 4 Float)))
+  vertexStream      = fetch "stream4" ((Attribute "position4" :: Vec 4 Float))
   primitiveStream   = mapPrimitives vertexShader vertexStream
   fragmentStream    = rasterizePrimitives rasterCtx ((Flat)) primitiveStream
   fragmentShader    = \((v)) -> ()
diff --git a/testdata/uniformparam03.lc b/testdata/uniformparam03.lc
index 99653b7e..67b0f335 100644
--- a/testdata/uniformparam03.lc
+++ b/testdata/uniformparam03.lc
@@ -3,7 +3,7 @@ render modelViewProj = let
   rasterCtx         = LineCtx 1.0 LastVertex
   fragmentCtx       = accumulationContext (((ColorOp NoBlending (V4 True True True True))))
   vertexShader ((v)) = (PrimMulMatVec modelViewProj v, v)
-  vertexStream      = fetch "stream4" (Attribute "position4" :: ((Vec 4 Float)))
+  vertexStream      = fetch "stream4" ((Attribute "position4" :: Vec 4 Float))
   primitiveStream   = mapPrimitives vertexShader vertexStream
   fragmentStream    = rasterizePrimitives rasterCtx ((Flat)) primitiveStream
   fragmentShader =  \((f)) -> ((f))