better source range handling

1 files changed, 65 insertions, 31 deletions

diff --git a/testdata/SampleMaterial.out b/testdata/SampleMaterial.out
index ba48a298..937791f6 100644
--- a/testdata/SampleMaterial.out
+++ b/testdata/SampleMaterial.out
@@ -1,10 +1,9 @@
 main is not found
 tooltips:
 testdata/SampleMaterial.lc 4:5-46:6  V0
-testdata/SampleMaterial.lc 4:5-46:6  {a} -> {b} -> a -> b -> 'Tuple2 a b
 testdata/SampleMaterial.lc 4:7-4:49  V1
 testdata/SampleMaterial.lc 4:7-4:49  'String
-testdata/SampleMaterial.lc 5:7-44:26  V0
+testdata/SampleMaterial.lc 5:7-45:10  V0
 testdata/SampleMaterial.lc 5:7-5:18  'Tuple0 -> 'Tuple0 -> 'Bool -> 'Int -> 'Bool -> 'Bool -> 'CullType -> 'List 'Deform -> 'Bool -> 'Bool -> 'List 'StageAttrs -> 'Bool->'CommonAttrs
 testdata/SampleMaterial.lc 6:24-6:26  'Tuple0
 testdata/SampleMaterial.lc 7:24-7:26  'Tuple0
@@ -13,16 +12,20 @@ testdata/SampleMaterial.lc 9:20-9:21  'Int
 testdata/SampleMaterial.lc 10:30-10:35  'Bool
 testdata/SampleMaterial.lc 11:23-11:28  'Bool
 testdata/SampleMaterial.lc 12:20-12:33  'CullType
+testdata/SampleMaterial.lc 13:30-13:32  'List 'Deform
+testdata/SampleMaterial.lc 13:30-13:32  {a} -> 'List a
 testdata/SampleMaterial.lc 14:25-14:30  'Bool
 testdata/SampleMaterial.lc 15:29-15:34  'Bool
 testdata/SampleMaterial.lc 17:13-43:14  'List 'StageAttrs
-testdata/SampleMaterial.lc 17:15-28:53  V0
+testdata/SampleMaterial.lc 17:15-29:18  V0
 testdata/SampleMaterial.lc 17:15-17:25  'Maybe ('Tuple2 'Blending' 'Blending') -> 'RGBGen -> 'AlphaGen -> 'TCGen -> 'List 'TCMod -> 'StageTexture -> 'Bool -> 'DepthFunction -> 'Maybe 'AlphaFunction -> 'Bool -> 'String->'StageAttrs
 testdata/SampleMaterial.lc 18:29-18:36  'Maybe ('Tuple2 'Blending' 'Blending')
 testdata/SampleMaterial.lc 18:29-18:36  {a} -> 'Maybe a
 testdata/SampleMaterial.lc 19:30-19:50  'RGBGen
 testdata/SampleMaterial.lc 20:32-20:42  'AlphaGen
 testdata/SampleMaterial.lc 21:29-21:36  'TCGen
+testdata/SampleMaterial.lc 22:29-22:31  'List 'TCMod
+testdata/SampleMaterial.lc 22:29-22:31  {a} -> 'List a
 testdata/SampleMaterial.lc 23:31-23:80  'StageTexture
 testdata/SampleMaterial.lc 23:31-23:37  'String->'StageTexture
 testdata/SampleMaterial.lc 23:38-23:80  'String
@@ -32,12 +35,12 @@ testdata/SampleMaterial.lc 26:33-26:40  'Maybe 'AlphaFunction
 testdata/SampleMaterial.lc 26:33-26:40  {a} -> 'Maybe a
 testdata/SampleMaterial.lc 27:41-27:46  'Bool
 testdata/SampleMaterial.lc 28:38-28:53  'String
-testdata/SampleMaterial.lc 30:15-41:54  V0
+testdata/SampleMaterial.lc 30:15-42:18  'List 'StageAttrs
+testdata/SampleMaterial.lc 30:15-42:18  V0
 testdata/SampleMaterial.lc 30:15-30:25  'Maybe ('Tuple2 'Blending' 'Blending') -> 'RGBGen -> 'AlphaGen -> 'TCGen -> 'List 'TCMod -> 'StageTexture -> 'Bool -> 'DepthFunction -> 'Maybe 'AlphaFunction -> 'Bool -> 'String->'StageAttrs
 testdata/SampleMaterial.lc 31:29-31:57  'Maybe ('Tuple2 'Blending' 'Blending')
 testdata/SampleMaterial.lc 31:29-31:33  {a} -> a -> 'Maybe a
 testdata/SampleMaterial.lc 31:34-31:57  V0
-testdata/SampleMaterial.lc 31:34-31:57  {a} -> {b} -> a -> b -> 'Tuple2 a b
 testdata/SampleMaterial.lc 31:36-31:46  V1
 testdata/SampleMaterial.lc 31:36-31:46  'Blending'
 testdata/SampleMaterial.lc 31:49-31:55  V0
@@ -45,6 +48,8 @@ testdata/SampleMaterial.lc 31:49-31:55  'Blending'
 testdata/SampleMaterial.lc 32:30-32:50  'RGBGen
 testdata/SampleMaterial.lc 33:32-33:42  'AlphaGen
 testdata/SampleMaterial.lc 34:29-34:40  'TCGen
+testdata/SampleMaterial.lc 35:29-35:31  'List 'TCMod
+testdata/SampleMaterial.lc 35:29-35:31  {a} -> 'List a
 testdata/SampleMaterial.lc 36:31-36:42  'StageTexture
 testdata/SampleMaterial.lc 37:34-37:38  'Bool
 testdata/SampleMaterial.lc 38:33-38:41  'DepthFunction
@@ -53,12 +58,11 @@ testdata/SampleMaterial.lc 39:33-39:40  {a} -> 'Maybe a
 testdata/SampleMaterial.lc 40:41-40:46  'Bool
 testdata/SampleMaterial.lc 41:38-41:54  'String
 testdata/SampleMaterial.lc 44:21-44:26  'Bool
-testdata/SampleMaterial.lc 4:3-262:4  'List ('Tuple2 'String 'CommonAttrs)
+testdata/SampleMaterial.lc 47:5-261:6  'List ('Tuple2 'String 'CommonAttrs)
 testdata/SampleMaterial.lc 47:5-89:6  V0
-testdata/SampleMaterial.lc 47:5-89:6  {a} -> {b} -> a -> b -> 'Tuple2 a b
 testdata/SampleMaterial.lc 47:7-47:53  V1
 testdata/SampleMaterial.lc 47:7-47:53  'String
-testdata/SampleMaterial.lc 48:7-87:26  V0
+testdata/SampleMaterial.lc 48:7-88:10  V0
 testdata/SampleMaterial.lc 48:7-48:18  'Tuple0 -> 'Tuple0 -> 'Bool -> 'Int -> 'Bool -> 'Bool -> 'CullType -> 'List 'Deform -> 'Bool -> 'Bool -> 'List 'StageAttrs -> 'Bool->'CommonAttrs
 testdata/SampleMaterial.lc 49:24-49:26  'Tuple0
 testdata/SampleMaterial.lc 50:24-50:26  'Tuple0
@@ -67,16 +71,20 @@ testdata/SampleMaterial.lc 52:20-52:21  'Int
 testdata/SampleMaterial.lc 53:30-53:35  'Bool
 testdata/SampleMaterial.lc 54:23-54:28  'Bool
 testdata/SampleMaterial.lc 55:20-55:33  'CullType
+testdata/SampleMaterial.lc 56:30-56:32  'List 'Deform
+testdata/SampleMaterial.lc 56:30-56:32  {a} -> 'List a
 testdata/SampleMaterial.lc 57:25-57:30  'Bool
 testdata/SampleMaterial.lc 58:29-58:34  'Bool
 testdata/SampleMaterial.lc 60:13-86:14  'List 'StageAttrs
-testdata/SampleMaterial.lc 60:15-71:54  V0
+testdata/SampleMaterial.lc 60:15-72:18  V0
 testdata/SampleMaterial.lc 60:15-60:25  'Maybe ('Tuple2 'Blending' 'Blending') -> 'RGBGen -> 'AlphaGen -> 'TCGen -> 'List 'TCMod -> 'StageTexture -> 'Bool -> 'DepthFunction -> 'Maybe 'AlphaFunction -> 'Bool -> 'String->'StageAttrs
 testdata/SampleMaterial.lc 61:29-61:36  'Maybe ('Tuple2 'Blending' 'Blending')
 testdata/SampleMaterial.lc 61:29-61:36  {a} -> 'Maybe a
 testdata/SampleMaterial.lc 62:30-62:50  'RGBGen
 testdata/SampleMaterial.lc 63:32-63:42  'AlphaGen
 testdata/SampleMaterial.lc 64:29-64:36  'TCGen
+testdata/SampleMaterial.lc 65:29-65:31  'List 'TCMod
+testdata/SampleMaterial.lc 65:29-65:31  {a} -> 'List a
 testdata/SampleMaterial.lc 66:31-66:84  'StageTexture
 testdata/SampleMaterial.lc 66:31-66:37  'String->'StageTexture
 testdata/SampleMaterial.lc 66:38-66:84  'String
@@ -86,12 +94,12 @@ testdata/SampleMaterial.lc 69:33-69:40  'Maybe 'AlphaFunction
 testdata/SampleMaterial.lc 69:33-69:40  {a} -> 'Maybe a
 testdata/SampleMaterial.lc 70:41-70:46  'Bool
 testdata/SampleMaterial.lc 71:38-71:54  'String
-testdata/SampleMaterial.lc 73:15-84:54  V0
+testdata/SampleMaterial.lc 73:15-85:18  'List 'StageAttrs
+testdata/SampleMaterial.lc 73:15-85:18  V0
 testdata/SampleMaterial.lc 73:15-73:25  'Maybe ('Tuple2 'Blending' 'Blending') -> 'RGBGen -> 'AlphaGen -> 'TCGen -> 'List 'TCMod -> 'StageTexture -> 'Bool -> 'DepthFunction -> 'Maybe 'AlphaFunction -> 'Bool -> 'String->'StageAttrs
 testdata/SampleMaterial.lc 74:29-74:57  'Maybe ('Tuple2 'Blending' 'Blending')
 testdata/SampleMaterial.lc 74:29-74:33  {a} -> a -> 'Maybe a
 testdata/SampleMaterial.lc 74:34-74:57  V0
-testdata/SampleMaterial.lc 74:34-74:57  {a} -> {b} -> a -> b -> 'Tuple2 a b
 testdata/SampleMaterial.lc 74:36-74:46  V1
 testdata/SampleMaterial.lc 74:36-74:46  'Blending'
 testdata/SampleMaterial.lc 74:49-74:55  V0
@@ -99,6 +107,8 @@ testdata/SampleMaterial.lc 74:49-74:55  'Blending'
 testdata/SampleMaterial.lc 75:30-75:50  'RGBGen
 testdata/SampleMaterial.lc 76:32-76:42  'AlphaGen
 testdata/SampleMaterial.lc 77:29-77:40  'TCGen
+testdata/SampleMaterial.lc 78:29-78:31  'List 'TCMod
+testdata/SampleMaterial.lc 78:29-78:31  {a} -> 'List a
 testdata/SampleMaterial.lc 79:31-79:42  'StageTexture
 testdata/SampleMaterial.lc 80:34-80:38  'Bool
 testdata/SampleMaterial.lc 81:33-81:41  'DepthFunction
@@ -107,11 +117,11 @@ testdata/SampleMaterial.lc 82:33-82:40  {a} -> 'Maybe a
 testdata/SampleMaterial.lc 83:41-83:46  'Bool
 testdata/SampleMaterial.lc 84:38-84:54  'String
 testdata/SampleMaterial.lc 87:21-87:26  'Bool
+testdata/SampleMaterial.lc 90:5-261:6  'List ('Tuple2 'String 'CommonAttrs)
 testdata/SampleMaterial.lc 90:5-132:6  V0
-testdata/SampleMaterial.lc 90:5-132:6  {a} -> {b} -> a -> b -> 'Tuple2 a b
 testdata/SampleMaterial.lc 90:7-90:53  V1
 testdata/SampleMaterial.lc 90:7-90:53  'String
-testdata/SampleMaterial.lc 91:7-130:26  V0
+testdata/SampleMaterial.lc 91:7-131:10  V0
 testdata/SampleMaterial.lc 91:7-91:18  'Tuple0 -> 'Tuple0 -> 'Bool -> 'Int -> 'Bool -> 'Bool -> 'CullType -> 'List 'Deform -> 'Bool -> 'Bool -> 'List 'StageAttrs -> 'Bool->'CommonAttrs
 testdata/SampleMaterial.lc 92:24-92:26  'Tuple0
 testdata/SampleMaterial.lc 93:24-93:26  'Tuple0
@@ -120,16 +130,20 @@ testdata/SampleMaterial.lc 95:20-95:21  'Int
 testdata/SampleMaterial.lc 96:30-96:35  'Bool
 testdata/SampleMaterial.lc 97:23-97:28  'Bool
 testdata/SampleMaterial.lc 98:20-98:33  'CullType
+testdata/SampleMaterial.lc 99:30-99:32  'List 'Deform
+testdata/SampleMaterial.lc 99:30-99:32  {a} -> 'List a
 testdata/SampleMaterial.lc 100:25-100:30  'Bool
 testdata/SampleMaterial.lc 101:29-101:34  'Bool
 testdata/SampleMaterial.lc 103:13-129:14  'List 'StageAttrs
-testdata/SampleMaterial.lc 103:15-114:54  V0
+testdata/SampleMaterial.lc 103:15-115:18  V0
 testdata/SampleMaterial.lc 103:15-103:25  'Maybe ('Tuple2 'Blending' 'Blending') -> 'RGBGen -> 'AlphaGen -> 'TCGen -> 'List 'TCMod -> 'StageTexture -> 'Bool -> 'DepthFunction -> 'Maybe 'AlphaFunction -> 'Bool -> 'String->'StageAttrs
 testdata/SampleMaterial.lc 104:29-104:36  'Maybe ('Tuple2 'Blending' 'Blending')
 testdata/SampleMaterial.lc 104:29-104:36  {a} -> 'Maybe a
 testdata/SampleMaterial.lc 105:30-105:50  'RGBGen
 testdata/SampleMaterial.lc 106:32-106:42  'AlphaGen
 testdata/SampleMaterial.lc 107:29-107:36  'TCGen
+testdata/SampleMaterial.lc 108:29-108:31  'List 'TCMod
+testdata/SampleMaterial.lc 108:29-108:31  {a} -> 'List a
 testdata/SampleMaterial.lc 109:31-109:84  'StageTexture
 testdata/SampleMaterial.lc 109:31-109:37  'String->'StageTexture
 testdata/SampleMaterial.lc 109:38-109:84  'String
@@ -139,12 +153,12 @@ testdata/SampleMaterial.lc 112:33-112:40  'Maybe 'AlphaFunction
 testdata/SampleMaterial.lc 112:33-112:40  {a} -> 'Maybe a
 testdata/SampleMaterial.lc 113:41-113:46  'Bool
 testdata/SampleMaterial.lc 114:38-114:54  'String
-testdata/SampleMaterial.lc 116:15-127:54  V0
+testdata/SampleMaterial.lc 116:15-128:18  'List 'StageAttrs
+testdata/SampleMaterial.lc 116:15-128:18  V0
 testdata/SampleMaterial.lc 116:15-116:25  'Maybe ('Tuple2 'Blending' 'Blending') -> 'RGBGen -> 'AlphaGen -> 'TCGen -> 'List 'TCMod -> 'StageTexture -> 'Bool -> 'DepthFunction -> 'Maybe 'AlphaFunction -> 'Bool -> 'String->'StageAttrs
 testdata/SampleMaterial.lc 117:29-117:57  'Maybe ('Tuple2 'Blending' 'Blending')
 testdata/SampleMaterial.lc 117:29-117:33  {a} -> a -> 'Maybe a
 testdata/SampleMaterial.lc 117:34-117:57  V0
-testdata/SampleMaterial.lc 117:34-117:57  {a} -> {b} -> a -> b -> 'Tuple2 a b
 testdata/SampleMaterial.lc 117:36-117:46  V1
 testdata/SampleMaterial.lc 117:36-117:46  'Blending'
 testdata/SampleMaterial.lc 117:49-117:55  V0
@@ -152,6 +166,8 @@ testdata/SampleMaterial.lc 117:49-117:55  'Blending'
 testdata/SampleMaterial.lc 118:30-118:50  'RGBGen
 testdata/SampleMaterial.lc 119:32-119:42  'AlphaGen
 testdata/SampleMaterial.lc 120:29-120:40  'TCGen
+testdata/SampleMaterial.lc 121:29-121:31  'List 'TCMod
+testdata/SampleMaterial.lc 121:29-121:31  {a} -> 'List a
 testdata/SampleMaterial.lc 122:31-122:42  'StageTexture
 testdata/SampleMaterial.lc 123:34-123:38  'Bool
 testdata/SampleMaterial.lc 124:33-124:41  'DepthFunction
@@ -160,11 +176,11 @@ testdata/SampleMaterial.lc 125:33-125:40  {a} -> 'Maybe a
 testdata/SampleMaterial.lc 126:41-126:46  'Bool
 testdata/SampleMaterial.lc 127:38-127:54  'String
 testdata/SampleMaterial.lc 130:21-130:26  'Bool
+testdata/SampleMaterial.lc 133:5-261:6  'List ('Tuple2 'String 'CommonAttrs)
 testdata/SampleMaterial.lc 133:5-175:6  V0
-testdata/SampleMaterial.lc 133:5-175:6  {a} -> {b} -> a -> b -> 'Tuple2 a b
 testdata/SampleMaterial.lc 133:7-133:53  V1
 testdata/SampleMaterial.lc 133:7-133:53  'String
-testdata/SampleMaterial.lc 134:7-173:26  V0
+testdata/SampleMaterial.lc 134:7-174:10  V0
 testdata/SampleMaterial.lc 134:7-134:18  'Tuple0 -> 'Tuple0 -> 'Bool -> 'Int -> 'Bool -> 'Bool -> 'CullType -> 'List 'Deform -> 'Bool -> 'Bool -> 'List 'StageAttrs -> 'Bool->'CommonAttrs
 testdata/SampleMaterial.lc 135:24-135:26  'Tuple0
 testdata/SampleMaterial.lc 136:24-136:26  'Tuple0
@@ -173,16 +189,20 @@ testdata/SampleMaterial.lc 138:20-138:21  'Int
 testdata/SampleMaterial.lc 139:30-139:35  'Bool
 testdata/SampleMaterial.lc 140:23-140:28  'Bool
 testdata/SampleMaterial.lc 141:20-141:33  'CullType
+testdata/SampleMaterial.lc 142:30-142:32  'List 'Deform
+testdata/SampleMaterial.lc 142:30-142:32  {a} -> 'List a
 testdata/SampleMaterial.lc 143:25-143:30  'Bool
 testdata/SampleMaterial.lc 144:29-144:34  'Bool
 testdata/SampleMaterial.lc 146:13-172:14  'List 'StageAttrs
-testdata/SampleMaterial.lc 146:15-157:54  V0
+testdata/SampleMaterial.lc 146:15-158:18  V0
 testdata/SampleMaterial.lc 146:15-146:25  'Maybe ('Tuple2 'Blending' 'Blending') -> 'RGBGen -> 'AlphaGen -> 'TCGen -> 'List 'TCMod -> 'StageTexture -> 'Bool -> 'DepthFunction -> 'Maybe 'AlphaFunction -> 'Bool -> 'String->'StageAttrs
 testdata/SampleMaterial.lc 147:29-147:36  'Maybe ('Tuple2 'Blending' 'Blending')
 testdata/SampleMaterial.lc 147:29-147:36  {a} -> 'Maybe a
 testdata/SampleMaterial.lc 148:30-148:50  'RGBGen
 testdata/SampleMaterial.lc 149:32-149:42  'AlphaGen
 testdata/SampleMaterial.lc 150:29-150:36  'TCGen
+testdata/SampleMaterial.lc 151:29-151:31  'List 'TCMod
+testdata/SampleMaterial.lc 151:29-151:31  {a} -> 'List a
 testdata/SampleMaterial.lc 152:31-152:84  'StageTexture
 testdata/SampleMaterial.lc 152:31-152:37  'String->'StageTexture
 testdata/SampleMaterial.lc 152:38-152:84  'String
@@ -192,12 +212,12 @@ testdata/SampleMaterial.lc 155:33-155:40  'Maybe 'AlphaFunction
 testdata/SampleMaterial.lc 155:33-155:40  {a} -> 'Maybe a
 testdata/SampleMaterial.lc 156:41-156:46  'Bool
 testdata/SampleMaterial.lc 157:38-157:54  'String
-testdata/SampleMaterial.lc 159:15-170:54  V0
+testdata/SampleMaterial.lc 159:15-171:18  'List 'StageAttrs
+testdata/SampleMaterial.lc 159:15-171:18  V0
 testdata/SampleMaterial.lc 159:15-159:25  'Maybe ('Tuple2 'Blending' 'Blending') -> 'RGBGen -> 'AlphaGen -> 'TCGen -> 'List 'TCMod -> 'StageTexture -> 'Bool -> 'DepthFunction -> 'Maybe 'AlphaFunction -> 'Bool -> 'String->'StageAttrs
 testdata/SampleMaterial.lc 160:29-160:57  'Maybe ('Tuple2 'Blending' 'Blending')
 testdata/SampleMaterial.lc 160:29-160:33  {a} -> a -> 'Maybe a
 testdata/SampleMaterial.lc 160:34-160:57  V0
-testdata/SampleMaterial.lc 160:34-160:57  {a} -> {b} -> a -> b -> 'Tuple2 a b
 testdata/SampleMaterial.lc 160:36-160:46  V1
 testdata/SampleMaterial.lc 160:36-160:46  'Blending'
 testdata/SampleMaterial.lc 160:49-160:55  V0
@@ -205,6 +225,8 @@ testdata/SampleMaterial.lc 160:49-160:55  'Blending'
 testdata/SampleMaterial.lc 161:30-161:50  'RGBGen
 testdata/SampleMaterial.lc 162:32-162:42  'AlphaGen
 testdata/SampleMaterial.lc 163:29-163:40  'TCGen
+testdata/SampleMaterial.lc 164:29-164:31  'List 'TCMod
+testdata/SampleMaterial.lc 164:29-164:31  {a} -> 'List a
 testdata/SampleMaterial.lc 165:31-165:42  'StageTexture
 testdata/SampleMaterial.lc 166:34-166:38  'Bool
 testdata/SampleMaterial.lc 167:33-167:41  'DepthFunction
@@ -213,11 +235,11 @@ testdata/SampleMaterial.lc 168:33-168:40  {a} -> 'Maybe a
 testdata/SampleMaterial.lc 169:41-169:46  'Bool
 testdata/SampleMaterial.lc 170:38-170:54  'String
 testdata/SampleMaterial.lc 173:21-173:26  'Bool
+testdata/SampleMaterial.lc 176:5-261:6  'List ('Tuple2 'String 'CommonAttrs)
 testdata/SampleMaterial.lc 176:5-218:6  V0
-testdata/SampleMaterial.lc 176:5-218:6  {a} -> {b} -> a -> b -> 'Tuple2 a b
 testdata/SampleMaterial.lc 176:7-176:53  V1
 testdata/SampleMaterial.lc 176:7-176:53  'String
-testdata/SampleMaterial.lc 177:7-216:26  V0
+testdata/SampleMaterial.lc 177:7-217:10  V0
 testdata/SampleMaterial.lc 177:7-177:18  'Tuple0 -> 'Tuple0 -> 'Bool -> 'Int -> 'Bool -> 'Bool -> 'CullType -> 'List 'Deform -> 'Bool -> 'Bool -> 'List 'StageAttrs -> 'Bool->'CommonAttrs
 testdata/SampleMaterial.lc 178:24-178:26  'Tuple0
 testdata/SampleMaterial.lc 179:24-179:26  'Tuple0
@@ -226,16 +248,20 @@ testdata/SampleMaterial.lc 181:20-181:21  'Int
 testdata/SampleMaterial.lc 182:30-182:35  'Bool
 testdata/SampleMaterial.lc 183:23-183:28  'Bool
 testdata/SampleMaterial.lc 184:20-184:33  'CullType
+testdata/SampleMaterial.lc 185:30-185:32  'List 'Deform
+testdata/SampleMaterial.lc 185:30-185:32  {a} -> 'List a
 testdata/SampleMaterial.lc 186:25-186:30  'Bool
 testdata/SampleMaterial.lc 187:29-187:34  'Bool
 testdata/SampleMaterial.lc 189:13-215:14  'List 'StageAttrs
-testdata/SampleMaterial.lc 189:15-200:54  V0
+testdata/SampleMaterial.lc 189:15-201:18  V0
 testdata/SampleMaterial.lc 189:15-189:25  'Maybe ('Tuple2 'Blending' 'Blending') -> 'RGBGen -> 'AlphaGen -> 'TCGen -> 'List 'TCMod -> 'StageTexture -> 'Bool -> 'DepthFunction -> 'Maybe 'AlphaFunction -> 'Bool -> 'String->'StageAttrs
 testdata/SampleMaterial.lc 190:29-190:36  'Maybe ('Tuple2 'Blending' 'Blending')
 testdata/SampleMaterial.lc 190:29-190:36  {a} -> 'Maybe a
 testdata/SampleMaterial.lc 191:30-191:50  'RGBGen
 testdata/SampleMaterial.lc 192:32-192:42  'AlphaGen
 testdata/SampleMaterial.lc 193:29-193:36  'TCGen
+testdata/SampleMaterial.lc 194:29-194:31  'List 'TCMod
+testdata/SampleMaterial.lc 194:29-194:31  {a} -> 'List a
 testdata/SampleMaterial.lc 195:31-195:84  'StageTexture
 testdata/SampleMaterial.lc 195:31-195:37  'String->'StageTexture
 testdata/SampleMaterial.lc 195:38-195:84  'String
@@ -245,12 +271,12 @@ testdata/SampleMaterial.lc 198:33-198:40  'Maybe 'AlphaFunction
 testdata/SampleMaterial.lc 198:33-198:40  {a} -> 'Maybe a
 testdata/SampleMaterial.lc 199:41-199:46  'Bool
 testdata/SampleMaterial.lc 200:38-200:54  'String
-testdata/SampleMaterial.lc 202:15-213:54  V0
+testdata/SampleMaterial.lc 202:15-214:18  'List 'StageAttrs
+testdata/SampleMaterial.lc 202:15-214:18  V0
 testdata/SampleMaterial.lc 202:15-202:25  'Maybe ('Tuple2 'Blending' 'Blending') -> 'RGBGen -> 'AlphaGen -> 'TCGen -> 'List 'TCMod -> 'StageTexture -> 'Bool -> 'DepthFunction -> 'Maybe 'AlphaFunction -> 'Bool -> 'String->'StageAttrs
 testdata/SampleMaterial.lc 203:29-203:57  'Maybe ('Tuple2 'Blending' 'Blending')
 testdata/SampleMaterial.lc 203:29-203:33  {a} -> a -> 'Maybe a
 testdata/SampleMaterial.lc 203:34-203:57  V0
-testdata/SampleMaterial.lc 203:34-203:57  {a} -> {b} -> a -> b -> 'Tuple2 a b
 testdata/SampleMaterial.lc 203:36-203:46  V1
 testdata/SampleMaterial.lc 203:36-203:46  'Blending'
 testdata/SampleMaterial.lc 203:49-203:55  V0
@@ -258,6 +284,8 @@ testdata/SampleMaterial.lc 203:49-203:55  'Blending'
 testdata/SampleMaterial.lc 204:30-204:50  'RGBGen
 testdata/SampleMaterial.lc 205:32-205:42  'AlphaGen
 testdata/SampleMaterial.lc 206:29-206:40  'TCGen
+testdata/SampleMaterial.lc 207:29-207:31  'List 'TCMod
+testdata/SampleMaterial.lc 207:29-207:31  {a} -> 'List a
 testdata/SampleMaterial.lc 208:31-208:42  'StageTexture
 testdata/SampleMaterial.lc 209:34-209:38  'Bool
 testdata/SampleMaterial.lc 210:33-210:41  'DepthFunction
@@ -266,11 +294,11 @@ testdata/SampleMaterial.lc 211:33-211:40  {a} -> 'Maybe a
 testdata/SampleMaterial.lc 212:41-212:46  'Bool
 testdata/SampleMaterial.lc 213:38-213:54  'String
 testdata/SampleMaterial.lc 216:21-216:26  'Bool
+testdata/SampleMaterial.lc 219:5-261:6  'List ('Tuple2 'String 'CommonAttrs)
 testdata/SampleMaterial.lc 219:5-261:6  V0
-testdata/SampleMaterial.lc 219:5-261:6  {a} -> {b} -> a -> b -> 'Tuple2 a b
 testdata/SampleMaterial.lc 219:7-219:53  V1
 testdata/SampleMaterial.lc 219:7-219:53  'String
-testdata/SampleMaterial.lc 220:7-259:26  V0
+testdata/SampleMaterial.lc 220:7-260:10  V0
 testdata/SampleMaterial.lc 220:7-220:18  'Tuple0 -> 'Tuple0 -> 'Bool -> 'Int -> 'Bool -> 'Bool -> 'CullType -> 'List 'Deform -> 'Bool -> 'Bool -> 'List 'StageAttrs -> 'Bool->'CommonAttrs
 testdata/SampleMaterial.lc 221:24-221:26  'Tuple0
 testdata/SampleMaterial.lc 222:24-222:26  'Tuple0
@@ -279,16 +307,20 @@ testdata/SampleMaterial.lc 224:20-224:21  'Int
 testdata/SampleMaterial.lc 225:30-225:35  'Bool
 testdata/SampleMaterial.lc 226:23-226:28  'Bool
 testdata/SampleMaterial.lc 227:20-227:33  'CullType
+testdata/SampleMaterial.lc 228:30-228:32  'List 'Deform
+testdata/SampleMaterial.lc 228:30-228:32  {a} -> 'List a
 testdata/SampleMaterial.lc 229:25-229:30  'Bool
 testdata/SampleMaterial.lc 230:29-230:34  'Bool
 testdata/SampleMaterial.lc 232:13-258:14  'List 'StageAttrs
-testdata/SampleMaterial.lc 232:15-243:54  V0
+testdata/SampleMaterial.lc 232:15-244:18  V0
 testdata/SampleMaterial.lc 232:15-232:25  'Maybe ('Tuple2 'Blending' 'Blending') -> 'RGBGen -> 'AlphaGen -> 'TCGen -> 'List 'TCMod -> 'StageTexture -> 'Bool -> 'DepthFunction -> 'Maybe 'AlphaFunction -> 'Bool -> 'String->'StageAttrs
 testdata/SampleMaterial.lc 233:29-233:36  'Maybe ('Tuple2 'Blending' 'Blending')
 testdata/SampleMaterial.lc 233:29-233:36  {a} -> 'Maybe a
 testdata/SampleMaterial.lc 234:30-234:50  'RGBGen
 testdata/SampleMaterial.lc 235:32-235:42  'AlphaGen
 testdata/SampleMaterial.lc 236:29-236:36  'TCGen
+testdata/SampleMaterial.lc 237:29-237:31  'List 'TCMod
+testdata/SampleMaterial.lc 237:29-237:31  {a} -> 'List a
 testdata/SampleMaterial.lc 238:31-238:84  'StageTexture
 testdata/SampleMaterial.lc 238:31-238:37  'String->'StageTexture
 testdata/SampleMaterial.lc 238:38-238:84  'String
@@ -298,12 +330,12 @@ testdata/SampleMaterial.lc 241:33-241:40  'Maybe 'AlphaFunction
 testdata/SampleMaterial.lc 241:33-241:40  {a} -> 'Maybe a
 testdata/SampleMaterial.lc 242:41-242:46  'Bool
 testdata/SampleMaterial.lc 243:38-243:54  'String
-testdata/SampleMaterial.lc 245:15-256:54  V0
+testdata/SampleMaterial.lc 245:15-257:18  'List 'StageAttrs
+testdata/SampleMaterial.lc 245:15-257:18  V0
 testdata/SampleMaterial.lc 245:15-245:25  'Maybe ('Tuple2 'Blending' 'Blending') -> 'RGBGen -> 'AlphaGen -> 'TCGen -> 'List 'TCMod -> 'StageTexture -> 'Bool -> 'DepthFunction -> 'Maybe 'AlphaFunction -> 'Bool -> 'String->'StageAttrs
 testdata/SampleMaterial.lc 246:29-246:57  'Maybe ('Tuple2 'Blending' 'Blending')
 testdata/SampleMaterial.lc 246:29-246:33  {a} -> a -> 'Maybe a
 testdata/SampleMaterial.lc 246:34-246:57  V0
-testdata/SampleMaterial.lc 246:34-246:57  {a} -> {b} -> a -> b -> 'Tuple2 a b
 testdata/SampleMaterial.lc 246:36-246:46  V1
 testdata/SampleMaterial.lc 246:36-246:46  'Blending'
 testdata/SampleMaterial.lc 246:49-246:55  V0
@@ -311,6 +343,8 @@ testdata/SampleMaterial.lc 246:49-246:55  'Blending'
 testdata/SampleMaterial.lc 247:30-247:50  'RGBGen
 testdata/SampleMaterial.lc 248:32-248:42  'AlphaGen
 testdata/SampleMaterial.lc 249:29-249:40  'TCGen
+testdata/SampleMaterial.lc 250:29-250:31  'List 'TCMod
+testdata/SampleMaterial.lc 250:29-250:31  {a} -> 'List a
 testdata/SampleMaterial.lc 251:31-251:42  'StageTexture
 testdata/SampleMaterial.lc 252:34-252:38  'Bool
 testdata/SampleMaterial.lc 253:33-253:41  'DepthFunction