tweak hnf handling

10 files changed, 16 insertions, 36 deletions

diff --git a/testdata/PrimReduce.out b/testdata/PrimReduce.out
index 0fc353f0..d8eb17d7 100644
--- a/testdata/PrimReduce.out
+++ b/testdata/PrimReduce.out
@@ -47,12 +47,9 @@ Pipeline
                   return texture(s,uv);
               }
               out vec4 f0;
-              vec4 rgb(float z0,float z1,float z2) {
-                  return vec4 (z0,z1,z2,1.0);
-              }
               vec4 blue;
               void main() {
-                  blue = rgb (0.0,0.0,1.0);
+                  blue = vec4 (0.0,0.0,1.0,1.0);
                   f0 = blue;
               }
               """
diff --git a/testdata/editor-examples/Heartbeat.lc b/testdata/editor-examples/Heartbeat.lc
index 920c9097..29a0464e 100644
--- a/testdata/editor-examples/Heartbeat.lc
+++ b/testdata/editor-examples/Heartbeat.lc
@@ -7,8 +7,6 @@ triangleRasterCtx = TriangleCtx CullNone PolygonFill NoOffset LastVertex
 triangles = triangleRasterCtx
 colorFragmentCtx = (DepthOp Less True, ColorOp NoBlending (V4 True True True True))
 
-rasterizeWith s = rasterizePrimitives triangles ((Smooth)) s
-
 cubeVertexStream = fetch "stream4" (Attribute "position4" :: Vec 4 Float, Attribute "vertexUV" :: Vec 2 Float)
 mapFragments2 s fs = accumulate colorFragmentCtx (\((a)) -> ((fs a))) s clear
 
@@ -22,7 +20,7 @@ rotate' v = projmat *. v
 texImage = PrjImageColor $
             cubeVertexStream         -- cube vertices
      &      mapPrimitives (\(x, y) -> (scale 1.0 x, V2 y%x (1-y%y)))
-     &      rasterizeWith  -- rasterize
+     &      rasterizePrimitives triangles ((Smooth))  -- rasterize
     `mapFragments2`
     (\xy -> let
                 x = ((xy :: Vec 2 Float)%x :: Float) -! 0.85
@@ -39,7 +37,7 @@ texImage = PrjImageColor $
 sampler = Sampler LinearFilter MirroredRepeat $ Texture2D (V2 128 128) texImage
 
 main =             cubeVertexStream         -- cube vertices
-     &      mapPrimitives (\(x, y) -> (scale 0.5 . rotate' $ x, y))
-     &             rasterizeWith -- rasterize
+     &             mapPrimitives (\(x, y) -> (scale 0.5 . rotate' $ x, y))
+     &             rasterizePrimitives triangles ((Smooth)) -- rasterize
     `mapFragments2` (texture2D sampler)
      &             ScreenOut                --  draw into screen
diff --git a/testdata/editor-examples/Heartbeat.out b/testdata/editor-examples/Heartbeat.out
index 6c435c7e..56f659dc 100644
--- a/testdata/editor-examples/Heartbeat.out
+++ b/testdata/editor-examples/Heartbeat.out
@@ -103,20 +103,17 @@ Pipeline
               uniform float Time;
               smooth in vec2 vo1;
               out vec4 f0;
-              vec4 rgb(float z0,float z1,float z2) {
-                  return vec4 (z0,z1,z2,1.0);
-              }
               vec4 blue;
               vec4 navy;
               float ti;
               vec4 white;
               vec4 yellow;
               void main() {
-                  blue = rgb (0.0,0.0,1.0);
-                  navy = rgb (0.0,0.0,0.5);
+                  blue = vec4 (0.0,0.0,1.0,1.0);
+                  navy = vec4 (0.0,0.0,0.5,1.0);
                   ti = abs ((sin ((Time) * (4.0))) - (0.37));
-                  white = rgb (1.0,1.0,1.0);
-                  yellow = rgb (1.0,1.0,0.0);
+                  white = vec4 (1.0,1.0,1.0,1.0);
+                  yellow = 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)
diff --git a/testdata/editor-examples/LambdaCube.out b/testdata/editor-examples/LambdaCube.out
index 68796786..fa7afdb9 100644
--- a/testdata/editor-examples/LambdaCube.out
+++ b/testdata/editor-examples/LambdaCube.out
@@ -65,9 +65,6 @@ Pipeline
               }
               smooth in vec4 vo1;
               out vec4 f0;
-              vec4 rgb(float z0,float z1,float z2) {
-                  return vec4 (z0,z1,z2,1.0);
-              }
               vec4 black;
               vec4 leftSide(vec2 z0) {
                   return vec4 (0.0
@@ -89,7 +86,7 @@ Pipeline
                                                                                ,vec2 (1.0,-1.0))) < (0.0)) ? 0.0 : 1.0);
               }
               void main() {
-                  black = rgb (0.0,0.0,0.0);
+                  black = vec4 (0.0,0.0,0.0,1.0);
                   f0 = (abs ((vo1).x)) > (0.99999) ? rightSide_2 (((((vo1).yz) * (sign
                       ((vo1).x))) * (0.5)) + (0.5)) : (abs ((vo1).y)) > (0.99999) ? topSide
                       (((((vo1).zx) * (sign ((vo1).y))) * (0.5)) + (0.5)) : (abs
diff --git a/testdata/example07.out b/testdata/example07.out
index 29991b12..cac517a9 100644
--- a/testdata/example07.out
+++ b/testdata/example07.out
@@ -47,14 +47,11 @@ Pipeline
               }
               smooth in vec4 vo1;
               out vec4 f0;
-              vec4 rgb(float z0,float z1,float z2) {
-                  return vec4 (z0,z1,z2,1.0);
-              }
               vec4 blue;
               vec4 red;
               void main() {
-                  blue = rgb (0.0,0.0,1.0);
-                  red = rgb (1.0,0.0,0.0);
+                  blue = vec4 (0.0,0.0,1.0,1.0);
+                  red = vec4 (1.0,0.0,0.0,1.0);
                   f0 = ((vo1).x) < (0.5) ? blue : red;
               }
               """
diff --git a/testdata/fragment01.out b/testdata/fragment01.out
index f3e048fe..059ae787 100644
--- a/testdata/fragment01.out
+++ b/testdata/fragment01.out
@@ -37,12 +37,9 @@ Pipeline
                   return texture(s,uv);
               }
               out vec4 f0;
-              vec4 rgb(float z0,float z1,float z2) {
-                  return vec4 (z0,z1,z2,1.0);
-              }
               vec4 blue;
               void main() {
-                  blue = rgb (0.0,0.0,1.0);
+                  blue = vec4 (0.0,0.0,1.0,1.0);
                   f0 = blue;
               }
               """
diff --git a/testdata/fragment04ifthenelse.out b/testdata/fragment04ifthenelse.out
index 53374903..4e91a227 100644
--- a/testdata/fragment04ifthenelse.out
+++ b/testdata/fragment04ifthenelse.out
@@ -41,12 +41,9 @@ Pipeline
               uniform float Time;
               smooth in vec4 vo1;
               out vec4 f0;
-              vec4 rgb(float z0,float z1,float z2) {
-                  return vec4 (z0,z1,z2,1.0);
-              }
               vec4 blue;
               void main() {
-                  blue = rgb (0.0,0.0,1.0);
+                  blue = vec4 (0.0,0.0,1.0,1.0);
                   f0 = (Time) < (0.5) ? vo1 : blue;
               }
               """
diff --git a/testdata/language-features/basic-list/listcomp09.out b/testdata/language-features/basic-list/listcomp09.out
index 536f024a..b83e6611 100644
--- a/testdata/language-features/basic-list/listcomp09.out
+++ b/testdata/language-features/basic-list/listcomp09.out
@@ -4,7 +4,7 @@ value1
   = _rhs (concatMap (\(_ :: _) -> [\(a :: _) -> hlistNilCase _ "Hello" a]) [])
 ------------ core code
 value1 :: @Type -> [() -> String]
-value1 = \a -> _rhs []
+value1 = \_ -> _rhs []
 ------------ tooltips
 testdata/language-features/basic-list/listcomp09.lc 1:1-1:7
     @Type -> [() -> String]
diff --git a/testdata/language-features/basic-values/infix01.out b/testdata/language-features/basic-values/infix01.out
index cee5de49..1ba2bd04 100644
--- a/testdata/language-features/basic-values/infix01.out
+++ b/testdata/language-features/basic-values/infix01.out
@@ -8,7 +8,7 @@ fun :: forall a b . a -> b -> ()
 fun = \_ _ _ _ -> _rhs ()
 
 value :: forall a b . a -> b -> ()
-value = \a b c d -> _rhs ()
+value = \_ _ _ _ -> _rhs ()
 ------------ tooltips
 testdata/language-features/basic-values/infix01.lc 1:1-1:4
     forall a b . a -> b -> ()
diff --git a/testdata/let.out b/testdata/let.out
index 538f8977..36c6a54f 100644
--- a/testdata/let.out
+++ b/testdata/let.out
@@ -5,7 +5,7 @@ id = \(a :: _) -> _rhs a
 f = \(a :: _) -> _rhs let b = _rhs (id a) in b
 ------------ core code
 f :: forall a . a -> a
-f = \a b -> _rhs b
+f = \_ a -> _rhs a
 
 id :: forall a . a -> a
 id = \_ a -> _rhs a