support local pattern matching functions and local recursive functions

18 files changed, 188 insertions, 74 deletions

diff --git a/testdata/Graphics.out b/testdata/Graphics.out
index fc891b27..cea97671 100644
--- a/testdata/Graphics.out
+++ b/testdata/Graphics.out
@@ -38,6 +38,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi2;
@@ -82,6 +84,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vec4 ((vi2).x,(vi2).y,(vi2).z,0.5);
@@ -136,6 +140,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi4;
@@ -194,6 +200,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -253,6 +261,9 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              float time = time;
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = (((vi3) + ((vec2 (0.0,1.0)) * (time))) + ((sin (vec2
@@ -314,6 +325,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -372,6 +385,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -432,6 +447,9 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              float time = time;
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = (((vi3) + ((vec2 (0.0,1.0)) * (time))) + ((sin (vec2
@@ -494,6 +512,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi4;
@@ -554,6 +574,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -614,6 +636,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -674,6 +698,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -733,6 +759,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -793,6 +821,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -853,6 +883,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -913,6 +945,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -973,6 +1007,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -1033,6 +1069,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -1093,6 +1131,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -1153,6 +1193,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -1213,6 +1255,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -1273,6 +1317,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -1333,6 +1379,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -1393,6 +1441,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -1453,6 +1503,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -1513,6 +1565,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -1573,6 +1627,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -1632,6 +1688,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -1692,6 +1750,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -1752,6 +1812,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -1812,6 +1874,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -1872,6 +1936,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -1932,6 +1998,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -1992,6 +2060,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -2052,6 +2122,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -2112,6 +2184,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -2172,6 +2246,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -2232,6 +2308,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -2292,6 +2370,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -2352,6 +2432,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -2412,6 +2494,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -2472,6 +2556,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -2532,6 +2618,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -2591,6 +2679,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -2651,6 +2741,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -2711,6 +2803,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -2771,6 +2865,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -2831,6 +2927,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -2891,6 +2989,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -2951,6 +3051,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -3011,6 +3113,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -3071,6 +3175,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -3131,6 +3237,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -3191,6 +3299,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -3251,6 +3361,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
@@ -3311,6 +3423,8 @@ Pipeline
               vec4 snoc(vec3 z0,float z1) {
                   return vec4 ((z0).x,(z0).y,(z0).z,z1);
               }
+              mat4 viewProj = viewProj;
+              mat4 worldMat = worldMat;
               void main() {
                   gl_Position = (viewProj) * ((worldMat) * (snoc (vi1,1.0)));
                   vo1 = vi3;
diff --git a/testdata/HyperbolicParaboloic.out b/testdata/HyperbolicParaboloic.out
index 28548feb..7b9b420d 100644
--- a/testdata/HyperbolicParaboloic.out
+++ b/testdata/HyperbolicParaboloic.out
@@ -36,17 +36,15 @@ Pipeline
               vec4 scale(float z0,vec4 z1) {
                   return (z1) * (vec4 (z0,z0,z0,1.0));
               }
-              vec4 v3FToV4F(vec3 z0) {
-                  return vec4 ((z0).x,(z0).y,(z0).z,1.0);
-              }
+              float t = (m).y;
               void main() {
                   gl_Position = scale
                       (0.1
-                      ,(MVP) * (vec4 (((m).y) * ((vi1).x)
+                      ,(MVP) * (vec4 ((t) * ((vi1).x)
                                      ,(((0.5) * ((m).x)) * ((vi1).x)) * ((vi1).y)
-                                     ,((m).y) * ((vi1).y)
+                                     ,(t) * ((vi1).y)
                                      ,1.0)));
-                  vo1 = v3FToV4F (vi1);
+                  vo1 = vec4 ((vi1).x,(vi1).y,(vi1).z,1.0);
               }
               """
           , geometryShader = Nothing
diff --git a/testdata/Hyperboloid.lc b/testdata/Hyperboloid.lc
index d3f8dc7e..e6ae104a 100644
--- a/testdata/Hyperboloid.lc
+++ b/testdata/Hyperboloid.lc
@@ -14,9 +14,9 @@ mapFragments22 s fs = accumulate colorFragmentCtx (\a -> fs a) s clear
 transform s f = mapPrimitives (\(p) -> let v = v3FToV4F p in (f v, v)) s
 
 trans :: Vec 4 Float -> Vec 4 Float
-trans (V4 x y _ _) = V4 (k *! sin (s *! x +! r *! y)) y (k *! cos (s *! x +! r *! y)) 1.0
+trans (V4 x y _ _) = V4 (k * sin (s * x + r * y)) y (k * cos (s * x + r * y)) 1.0
     where 
-          k = 2 *! m%y
+          k = 2 * m%y
           s = 0.7
           r = m%x
 
diff --git a/testdata/Hyperboloid.out b/testdata/Hyperboloid.out
index 3eea868f..bf3367bb 100644
--- a/testdata/Hyperboloid.out
+++ b/testdata/Hyperboloid.out
@@ -33,22 +33,19 @@ Pipeline
               in vec3 vi1;
               smooth out vec4 vo1;
               vec2 m = Mouse;
+              float k = (2.0) * ((m).y);
+              float r = (m).x;
               vec4 scale(float z0,vec4 z1) {
                   return (z1) * (vec4 (z0,z0,z0,1.0));
               }
-              vec4 v3FToV4F(vec3 z0) {
-                  return vec4 ((z0).x,(z0).y,(z0).z,1.0);
-              }
               void main() {
-                  gl_Position = scale
-                      (0.1
-                      ,(MVP) * (vec4 (((2.0) * ((m).y)) * (sin
-                                     (((0.7) * ((vi1).x)) + (((m).x) * ((vi1).y))))
-                                     ,(vi1).y
-                                     ,((2.0) * ((m).y)) * (cos
-                                     (((0.7) * ((vi1).x)) + (((m).x) * ((vi1).y))))
-                                     ,1.0)));
-                  vo1 = v3FToV4F (vi1);
+                  gl_Position = scale (0.1
+                                      ,(MVP) * (vec4
+                                      ((k) * (sin (((0.7) * ((vi1).x)) + ((r) * ((vi1).y))))
+                                      ,(vi1).y
+                                      ,(k) * (cos (((0.7) * ((vi1).x)) + ((r) * ((vi1).y))))
+                                      ,1.0)));
+                  vo1 = vec4 ((vi1).x,(vi1).y,(vi1).z,1.0);
               }
               """
           , geometryShader = Nothing
diff --git a/testdata/Spiral.out b/testdata/Spiral.out
index 0364685f..d4922494 100644
--- a/testdata/Spiral.out
+++ b/testdata/Spiral.out
@@ -36,9 +36,6 @@ Pipeline
               vec4 scale(float z0,vec4 z1) {
                   return (z1) * (vec4 (z0,z0,z0,1.0));
               }
-              vec4 v3FToV4F(vec3 z0) {
-                  return vec4 ((z0).x,(z0).y,(z0).z,1.0);
-              }
               void main() {
                   gl_Position = scale
                       (0.5
@@ -48,7 +45,7 @@ Pipeline
                                      ((0.9) * ((vi1).x)))
                                      ,((m).y) * ((0.9) * ((vi1).x))
                                      ,1.0)));
-                  vo1 = v3FToV4F (vi1);
+                  vo1 = vec4 ((vi1).x,(vi1).y,(vi1).z,1.0);
               }
               """
           , geometryShader = Nothing
diff --git a/testdata/editor-examples/Heartbeat.out b/testdata/editor-examples/Heartbeat.out
index 81eec655..435db6b7 100644
--- a/testdata/editor-examples/Heartbeat.out
+++ b/testdata/editor-examples/Heartbeat.out
@@ -108,6 +108,7 @@ Pipeline
               }
               vec4 blue = rgb (0.0,0.0,1.0);
               vec4 navy = rgb (0.0,0.0,0.5);
+              float ti = abs ((sin ((time) * (4.0))) - (0.37));
               float time = Time;
               vec4 white = rgb (1.0,1.0,1.0);
               vec4 yellow = rgb (1.0,1.0,0.0);
@@ -116,18 +117,13 @@ Pipeline
                       ((((((vo1).x) - (0.85)) * (((vo1).x) - (0.85))) + ((((vo1).y) - (0.85)) * (((vo1).y) - (0.85)))) + ((5.0e-4) * (sin
                       (((3.0) * (atan
                       (((vo1).x) - (0.85)
-                      ,((vo1).y) - (0.85)))) + ((15.0) * (time)))))) < ((5.0e-3) * (abs
-                      ((sin
-                      ((time) * (4.0))) - (0.37)))) ? navy : ((((((vo1).x) - (0.85)) * (((vo1).x) - (0.85))) + ((((vo1).y) - (0.85)) * (((vo1).y) - (0.85)))) + ((2.0e-3) * (sin
+                      ,((vo1).y) - (0.85)))) + ((15.0) * (time)))))) < ((5.0e-3) * (ti)) ? navy : ((((((vo1).x) - (0.85)) * (((vo1).x) - (0.85))) + ((((vo1).y) - (0.85)) * (((vo1).y) - (0.85)))) + ((2.0e-3) * (sin
                       (((5.0) * (atan
                       (((vo1).x) - (0.85)
-                      ,((vo1).y) - (0.85)))) - ((5.0) * (time)))))) < ((2.0e-2) * (abs
-                      ((sin
-                      ((time) * (4.0))) - (0.37)))) ? blue : ((((((vo1).x) - (0.85)) * (((vo1).x) - (0.85))) + ((((vo1).y) - (0.85)) * (((vo1).y) - (0.85)))) + ((2.0e-3) * (sin
+                      ,((vo1).y) - (0.85)))) - ((5.0) * (time)))))) < ((2.0e-2) * (ti)) ? blue : ((((((vo1).x) - (0.85)) * (((vo1).x) - (0.85))) + ((((vo1).y) - (0.85)) * (((vo1).y) - (0.85)))) + ((2.0e-3) * (sin
                       (((7.0) * (atan
                       (((vo1).x) - (0.85)
-                      ,((vo1).y) - (0.85)))) + ((3.0) * (time)))))) < ((5.0e-2) * (abs
-                      ((sin ((time) * (4.0))) - (0.37)))) ? white : yellow;
+                      ,((vo1).y) - (0.85)))) + ((3.0) * (time)))))) < ((5.0e-2) * (ti)) ? white : yellow;
               }
               """
           }
diff --git a/testdata/fetcharrays01.out b/testdata/fetcharrays01.out
index aa49e5fd..06db8806 100644
--- a/testdata/fetcharrays01.out
+++ b/testdata/fetcharrays01.out
@@ -36,12 +36,10 @@ Pipeline
               vec4 scale(float z0,vec4 z1) {
                   return (z1) * (vec4 (z0,z0,z0,1.0));
               }
-              vec4 v3FToV4F(vec3 z0) {
-                  return vec4 ((z0).x,(z0).y,(z0).z,1.0);
-              }
               void main() {
-                  gl_Position = scale (0.5,(MVP) * (v3FToV4F (vi1)));
-                  vo1 = v3FToV4F (vi1);
+                  gl_Position = scale
+                      (0.5,(MVP) * (vec4 ((vi1).x,(vi1).y,(vi1).z,1.0)));
+                  vo1 = vec4 ((vi1).x,(vi1).y,(vi1).z,1.0);
               }
               """
           , geometryShader = Nothing
diff --git a/testdata/gfx03.out b/testdata/gfx03.out
index b3c238b4..1462c801 100644
--- a/testdata/gfx03.out
+++ b/testdata/gfx03.out
@@ -28,11 +28,10 @@ Pipeline
               }
               uniform mat4 MVP2;
               in vec3 vi1;
-              vec4 v3FToV4F(vec3 z0) {
-                  return vec4 ((z0).x,(z0).y,(z0).z,1.0);
-              }
+              mat4 modelViewProj = MVP2;
               void main() {
-                  gl_Position = (MVP2) * (v3FToV4F (vi1));
+                  gl_Position = (modelViewProj) * (vec4
+                      ((vi1).x,(vi1).y,(vi1).z,1.0));
               }
               """
           , geometryShader = Nothing
@@ -63,12 +62,11 @@ Pipeline
               uniform mat4 MVP2;
               in vec3 vi1;
               smooth out vec4 vo1;
-              vec4 v3FToV4F(vec3 z0) {
-                  return vec4 ((z0).x,(z0).y,(z0).z,1.0);
-              }
+              mat4 modelViewProj = MVP2;
               void main() {
-                  gl_Position = (MVP2) * (v3FToV4F (vi1));
-                  vo1 = v3FToV4F (vi1);
+                  gl_Position = (modelViewProj) * (vec4
+                      ((vi1).x,(vi1).y,(vi1).z,1.0));
+                  vo1 = vec4 ((vi1).x,(vi1).y,(vi1).z,1.0);
               }
               """
           , geometryShader = Nothing
@@ -101,8 +99,9 @@ Pipeline
               uniform mat4 MVP;
               in vec4 vi1;
               flat out vec4 vo1;
+              mat4 modelViewProj = MVP;
               void main() {
-                  gl_Position = (MVP) * (vi1);
+                  gl_Position = (modelViewProj) * (vi1);
                   vo1 = vi1;
               }
               """
diff --git a/testdata/gfx04.out b/testdata/gfx04.out
index b39f1a1c..e17394f1 100644
--- a/testdata/gfx04.out
+++ b/testdata/gfx04.out
@@ -33,11 +33,12 @@ Pipeline
               in vec3 vi1;
               in vec3 vi2;
               smooth out vec4 vo1;
+              mat4 modelViewProj = MVP;
               vec4 v3FToV4F(vec3 z0) {
                   return vec4 ((z0).x,(z0).y,(z0).z,1.0);
               }
               void main() {
-                  gl_Position = (MVP) * (v3FToV4F (vi1));
+                  gl_Position = (modelViewProj) * (v3FToV4F (vi1));
                   vo1 = v3FToV4F (vi2);
               }
               """
diff --git a/testdata/gfx05.out b/testdata/gfx05.out
index aaa1ce3d..a06d0612 100644
--- a/testdata/gfx05.out
+++ b/testdata/gfx05.out
@@ -81,11 +81,10 @@ Pipeline
               }
               uniform mat4 MVP2;
               in vec3 vi1;
-              vec4 v3FToV4F(vec3 z0) {
-                  return vec4 ((z0).x,(z0).y,(z0).z,1.0);
-              }
+              mat4 modelViewProj = MVP2;
               void main() {
-                  gl_Position = (MVP2) * (v3FToV4F (vi1));
+                  gl_Position = (modelViewProj) * (vec4
+                      ((vi1).x,(vi1).y,(vi1).z,1.0));
               }
               """
           , geometryShader = Nothing
@@ -116,12 +115,11 @@ Pipeline
               uniform mat4 MVP2;
               in vec3 vi1;
               smooth out vec4 vo1;
-              vec4 v3FToV4F(vec3 z0) {
-                  return vec4 ((z0).x,(z0).y,(z0).z,1.0);
-              }
+              mat4 modelViewProj = MVP2;
               void main() {
-                  gl_Position = (MVP2) * (v3FToV4F (vi1));
-                  vo1 = v3FToV4F (vi1);
+                  gl_Position = (modelViewProj) * (vec4
+                      ((vi1).x,(vi1).y,(vi1).z,1.0));
+                  vo1 = vec4 ((vi1).x,(vi1).y,(vi1).z,1.0);
               }
               """
           , geometryShader = Nothing
@@ -157,8 +155,9 @@ Pipeline
               in vec4 vi1;
               in vec2 vi2;
               smooth out vec2 vo1;
+              mat4 modelViewProj = MVP;
               void main() {
-                  gl_Position = (MVP) * (vi1);
+                  gl_Position = (modelViewProj) * (vi1);
                   vo1 = vi2;
               }
               """
diff --git a/testdata/heartbeat01.out b/testdata/heartbeat01.out
index 70857c9b..35528cae 100644
--- a/testdata/heartbeat01.out
+++ b/testdata/heartbeat01.out
@@ -108,6 +108,7 @@ Pipeline
               }
               vec4 blue = rgb (0.0,0.0,1.0);
               vec4 navy = rgb (0.0,0.0,0.5);
+              float ti = abs ((sin ((time) * (4.0))) - (0.37));
               float time = Time;
               vec4 white = rgb (1.0,1.0,1.0);
               vec4 yellow = rgb (1.0,1.0,0.0);
@@ -116,18 +117,13 @@ Pipeline
                       ((((((vo1).x) - (0.85)) * (((vo1).x) - (0.85))) + ((((vo1).y) - (0.85)) * (((vo1).y) - (0.85)))) + ((5.0e-4) * (sin
                       (((3.0) * (atan
                       (((vo1).x) - (0.85)
-                      ,((vo1).y) - (0.85)))) + ((15.0) * (time)))))) < ((5.0e-3) * (abs
-                      ((sin
-                      ((time) * (4.0))) - (0.37)))) ? navy : ((((((vo1).x) - (0.85)) * (((vo1).x) - (0.85))) + ((((vo1).y) - (0.85)) * (((vo1).y) - (0.85)))) + ((2.0e-3) * (sin
+                      ,((vo1).y) - (0.85)))) + ((15.0) * (time)))))) < ((5.0e-3) * (ti)) ? navy : ((((((vo1).x) - (0.85)) * (((vo1).x) - (0.85))) + ((((vo1).y) - (0.85)) * (((vo1).y) - (0.85)))) + ((2.0e-3) * (sin
                       (((5.0) * (atan
                       (((vo1).x) - (0.85)
-                      ,((vo1).y) - (0.85)))) - ((5.0) * (time)))))) < ((2.0e-2) * (abs
-                      ((sin
-                      ((time) * (4.0))) - (0.37)))) ? blue : ((((((vo1).x) - (0.85)) * (((vo1).x) - (0.85))) + ((((vo1).y) - (0.85)) * (((vo1).y) - (0.85)))) + ((2.0e-3) * (sin
+                      ,((vo1).y) - (0.85)))) - ((5.0) * (time)))))) < ((2.0e-2) * (ti)) ? blue : ((((((vo1).x) - (0.85)) * (((vo1).x) - (0.85))) + ((((vo1).y) - (0.85)) * (((vo1).y) - (0.85)))) + ((2.0e-3) * (sin
                       (((7.0) * (atan
                       (((vo1).x) - (0.85)
-                      ,((vo1).y) - (0.85)))) + ((3.0) * (time)))))) < ((5.0e-2) * (abs
-                      ((sin ((time) * (4.0))) - (0.37)))) ? white : yellow;
+                      ,((vo1).y) - (0.85)))) + ((3.0) * (time)))))) < ((5.0e-2) * (ti)) ? white : yellow;
               }
               """
           }
diff --git a/testdata/language-features/recursion/simplerec02.wip.lc b/testdata/language-features/recursion/simplerec02.lc
index 71f046fd..71f046fd 100644
--- a/testdata/language-features/recursion/simplerec02.wip.lc
+++ b/testdata/language-features/recursion/simplerec02.lc
diff --git a/testdata/language-features/recursion/simplerec02.out b/testdata/language-features/recursion/simplerec02.out
new file mode 100644
index 00000000..5f8d48b2
--- /dev/null
+++ b/testdata/language-features/recursion/simplerec02.out
@@ -0,0 +1,9 @@
+main is not found
+------------ trace
+value :: 'Tuple0
+------------ tooltips
+testdata/language-features/recursion/simplerec02.lc 1:1-1:6  Tuple0
+testdata/language-features/recursion/simplerec02.lc 1:21-1:24  Char
+testdata/language-features/recursion/simplerec02.lc 1:21-2:26  Bool->Char | V0->V1
+testdata/language-features/recursion/simplerec02.lc 2:21-2:24  V4
+testdata/language-features/recursion/simplerec02.lc 3:12-3:14  Tuple0
diff --git a/testdata/language-features/recursion/simplerec03.wip.lc b/testdata/language-features/recursion/simplerec03.lc
index 5f602a04..5f602a04 100644
--- a/testdata/language-features/recursion/simplerec03.wip.lc
+++ b/testdata/language-features/recursion/simplerec03.lc
diff --git a/testdata/language-features/recursion/simplerec03.out b/testdata/language-features/recursion/simplerec03.out
new file mode 100644
index 00000000..16802cb7
--- /dev/null
+++ b/testdata/language-features/recursion/simplerec03.out
@@ -0,0 +1,9 @@
+main is not found
+------------ trace
+value :: 'Tuple0
+------------ tooltips
+testdata/language-features/recursion/simplerec03.lc 1:1-1:6  Tuple0
+testdata/language-features/recursion/simplerec03.lc 1:9-1:11  Tuple0
+testdata/language-features/recursion/simplerec03.lc 3:13-3:16  Char
+testdata/language-features/recursion/simplerec03.lc 3:13-4:18  Bool->Char | V0->V1
+testdata/language-features/recursion/simplerec03.lc 4:13-4:16  V4
diff --git a/testdata/line01.out b/testdata/line01.out
index 67124a52..a19722c6 100644
--- a/testdata/line01.out
+++ b/testdata/line01.out
@@ -33,12 +33,10 @@ Pipeline
               vec4 scale(float z0,vec4 z1) {
                   return (z1) * (vec4 (z0,z0,z0,1.0));
               }
-              vec4 v3FToV4F(vec3 z0) {
-                  return vec4 ((z0).x,(z0).y,(z0).z,1.0);
-              }
               void main() {
-                  gl_Position = scale (0.5,(MVP) * (v3FToV4F (vi1)));
-                  vo1 = v3FToV4F (vi1);
+                  gl_Position = scale
+                      (0.5,(MVP) * (vec4 ((vi1).x,(vi1).y,(vi1).z,1.0)));
+                  vo1 = vec4 ((vi1).x,(vi1).y,(vi1).z,1.0);
               }
               """
           , geometryShader = Nothing
diff --git a/testdata/simple02.out b/testdata/simple02.out
index faf41dea..63f86974 100644
--- a/testdata/simple02.out
+++ b/testdata/simple02.out
@@ -30,8 +30,9 @@ Pipeline
               uniform mat4 MVP;
               in vec4 vi1;
               smooth out vec4 vo1;
+              mat4 modelViewProj = MVP;
               void main() {
-                  gl_Position = (MVP) * (vi1);
+                  gl_Position = (modelViewProj) * (vi1);
                   vo1 = vi1;
               }
               """
diff --git a/testdata/simple03.out b/testdata/simple03.out
index dc2dcca3..79bc503a 100644
--- a/testdata/simple03.out
+++ b/testdata/simple03.out
@@ -33,11 +33,12 @@ Pipeline
               in vec3 vi1;
               in vec3 vi2;
               smooth out vec4 vo1;
+              mat4 modelViewProj = viewProj;
               vec4 v3FToV4F(vec3 z0) {
                   return vec4 ((z0).x,(z0).y,(z0).z,1.0);
               }
               void main() {
-                  gl_Position = (viewProj) * (v3FToV4F (vi1));
+                  gl_Position = (modelViewProj) * (v3FToV4F (vi1));
                   vo1 = v3FToV4F (vi2);
               }
               """
@@ -74,11 +75,12 @@ Pipeline
               in vec3 vi1;
               in vec3 vi2;
               smooth out vec4 vo1;
+              mat4 modelViewProj = viewProj;
               vec4 v3FToV4F(vec3 z0) {
                   return vec4 ((z0).x,(z0).y,(z0).z,1.0);
               }
               void main() {
-                  gl_Position = (viewProj) * (v3FToV4F (vi1));
+                  gl_Position = (modelViewProj) * (v3FToV4F (vi1));
                   vo1 = v3FToV4F (vi2);
               }
               """