Bug: Fix golfing name starting with underscore to single character.

E.g. "float _longName = 1.0;" => "float _ = 1.0;"

Author: DeanEdisGG

ShaderShrinker/Shrinker.Parser/Optimizations/GolfExtensions.cs

@@ -197,7 +197,7 @@ private static Dictionary<string, string> BuildGolfRenameMap(SyntaxNode rootNode
             foreach (var kvp in nameMap.Where(o => o.Value.Length > 1))
             {
                 // Try to abbreviate to one letter.
-                var candidate = $"{kvp.Value.First()}";
+                var candidate = $"{kvp.Value.Replace("_", null).First()}";
 
                 const string Letters = "abcdefghijlkmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
                 if (nameMap.ContainsValue(candidate))

ShaderShrinker/UnitTests/GolfTests.cs

@@ -61,6 +61,7 @@ public void CheckGolfingCodeNames(
                        "void foo1() { } void foo2() { }|void f() { } void a() { }",
                        "void foo() { } void main() { foo(); }|void f() { } void main() { f(); }",
                        "void foo() { int a = 1; }|void f() { int a = 1; }",
+                       "void foo() { int _a = 1; }|void f() { int a = 1; }",
                        "void main() { int number = 1; }|void main() { int n = 1; }",
                        "int foo() { int number = 1; number++; return number; }|int f() { int n = 1; n++; return n; }",
                        "int foo() { int number = 1; return ++number; }|int f() { int n = 1; return ++n; }",

ShaderShrinker/UnitTests/TestFiles/GolfedReference/PowerStone.glsl

@@ -1,4 +1,4 @@
-// Processed by 'GLSL Shader Shrinker' (Shrunk by 636 characters)
+// Processed by 'GLSL Shader Shrinker' (Shrunk by 634 characters)
 // (https://github.com/deanthecoder/GLSLShaderShrinker)
 
 #define v3	vec3
@@ -11,7 +11,7 @@
 #define _f	float
 #define iR	iResolution
 #define z0	min(iTime, 0.)
-#define X(x)	clamp(x, 0., 1.)
+#define Y(x)	clamp(x, 0., 1.)
 #define S(x)	SS(0., 1., x)
 
 _f T,
@@ -24,96 +24,96 @@ struct Hit {
 	int id;
 };
 
-#define L(a)	if (a.d < h.d) h = a
+#define M(a)	if (a.d < h.d) h = a
 
-mat2 W(_f a) {
-	v2 u = cos(v2(a, a - 1.5705));
-	RET mat2(u, -u.y, u.x);
+mat2 X(_f a) {
+	v2 w = cos(v2(a, a - 1.5705));
+	RET mat2(w, -w.y, w.x);
 }
 
-vec2 P(v2 p, _f n) {
+vec2 Q(v2 p, _f n) {
 	_f t = 3.141 / n,
 	   a = mod(atan(p.y, p.x) + t, 2. * t) - t;
 	RET LNG(p) * v2(cos(a), sin(a));
 }
 
-float l(v3 p) {
+float k(v3 p) {
 	v3 q = abs(p) - v3(.15, .08, .025);
 	RET LNG(MX(q, 0.)) + min(MX(q.x, MX(q.y, q.z)), 0.);
 }
 
-float k(v3 p, _f h, _f r) {
+float m(v3 p, _f h, _f r) {
 	p.x -= clamp(p.x, 0., h);
 	RET LNG(p) - r;
 }
 
-float Z(v3 p) {
+float sa(v3 p) {
 	p = abs(p);
 	RET (p.x + p.y + p.z - .3) * .577;
 }
 
-float m(v3 p) {
-	p.yz = P(p.yz, 3.);
+float o(v3 p) {
+	p.yz = Q(p.yz, 3.);
 	p.x = abs(p.x) - .9;
 	p.y--;
-	p.xy *= W(-.5);
-	_f d = MX(k(p, 1.2, .12 * S(p.x + .5)), abs(p.z) - .06);
-	p.xy *= W(-2.725);
+	p.xy *= X(-.5);
+	_f d = MX(m(p, 1.2, .12 * S(p.x + .5)), abs(p.z) - .06);
+	p.xy *= X(-2.725);
 	p.x += .1;
 	p.y -= .05;
-	RET min(d, MX(k(p, .9, .1 * (1.1 - S(p.x - .2))), abs(p.z) - .04));
+	RET min(d, MX(m(p, .9, .1 * (1.1 - S(p.x - .2))), abs(p.z) - .04));
 }
 
-vec3 R(v3 V, v2 UV) {
-	v3 f = NM(v3(0, 2, 0) - V),
+vec3 U(v3 W, v2 UV) {
+	v3 f = NM(v3(0, 2, 0) - W),
 	   r = NM(cross(v3(0, 1, 0), f));
 	RET NM(f + r * UV.x + cross(f, r) * UV.y);
 }
 
-Hit J(v3 p) {
+Hit K(v3 p) {
 	p.y -= 2.;
 	Hit h = Hit(abs(p.y + 2.), 1);
-	v3 O = p;
-	_f b, x, d, s, i, tp, w,
+	v3 P = p;
+	_f j, x, d, s, i, tp, y,
 	   t = (5. - clamp(T - 3., 0., 5.)) * 1.25664;
-	p.yz *= W((sin(t) + sin(2. * t)) * sign(p.x) * 1.4);
+	p.yz *= X((sin(t) + sin(2. * t)) * sign(p.x) * 1.4);
 	t = MX(0., T - 8.);
-	b = X((t - 1.) / 8.);
-	v2 sn = S(v2(b * 4., b * 4.5 - 3.)) * .7,
+	j = Y((t - 1.) / 8.);
+	v2 sn = S(v2(j * 4., j * 4.5 - 3.)) * .7,
 	   f = p.x - sn * sign(p.x),
-	   D = -abs(p.x) - .01 + sn;
+	   E = -abs(p.x) - .01 + sn;
 	p.x = p.x < 0. ? min(0., f.x) : MX(0., f.x);
 	x = abs(p.x) - .6;
 	d = MX(MX(dot(v2(1.5, .6), v2(LNG(p.yz), -x)), -x), MX(LNG(p.yz) - .5, 1.2 - abs(p.x)));
-	L(Hit(min(d, m(p)), 3));
+	M(Hit(min(d, o(p)), 3));
 	s = LNG(p) - 1.;
-	d = MX(min(LNG(v2(s, dot(sin(p * 26.), cos(p.zxy * 26.)) * .03)) - .02, abs(s + .08) - .05), D.x);
-	p.x = O.x < 0. ? min(0., f.y) : MX(0., f.y);
+	d = MX(min(LNG(v2(s, dot(sin(p * 26.), cos(p.zxy * 26.)) * .03)) - .02, abs(s + .08) - .05), E.x);
+	p.x = P.x < 0. ? min(0., f.y) : MX(0., f.y);
 	i = mod(floor(atan(-p.y, p.z) * 3.183 + 10.) + 2., 20.);
-	tp = X(b * 4. - 2.) * 20.;
-	w = MX(abs(LNG(p) - .65) - .05, D.y + .01 + .13 * step(i, tp) * min(tp - i, 1.));
-	p.yz = P(p.yz, 20.);
+	tp = Y(j * 4. - 2.) * 20.;
+	y = MX(abs(LNG(p) - .65) - .05, E.y + .01 + .13 * step(i, tp) * min(tp - i, 1.));
+	p.yz = Q(p.yz, 20.);
 	p.y -= .64;
-	d = min(d, MX(w, -l(p)));
-	p = O;
-	p.yz *= W(t * .1);
-	mat2 r = W(2.5);
-	w = 1e7;
+	d = min(d, MX(y, -k(p)));
+	p = P;
+	p.yz *= X(t * .1);
+	mat2 r = X(2.5);
+	y = 1e7;
 	for (i = z0; i < 4.; i++) {
 		p -= .02;
-		p.xy *= W(3.7 + i);
+		p.xy *= X(3.7 + i);
 		p.yz *= r;
-		w = min(w, Z(p) - .005);
+		y = min(y, sa(p) - .005);
 	}
 
-	g += 8e-5 / (.001 + w * w);
-	L(Hit(w, 4));
-	p = O;
+	g += 8e-5 / (.001 + y * y);
+	M(Hit(y, 4));
+	p = P;
 	p.x = abs(p.x);
 	p.y += cos(p.x + t) * .05;
-	w = LNG(p.yz) - .01;
-	g += 5e-4 / (.001 + w * w);
-	L(Hit(min(d, w), 2));
+	y = LNG(p.yz) - .01;
+	g += 5e-4 / (.001 + y * y);
+	M(Hit(min(d, y), 2));
 	RET h;
 }
 
@@ -122,42 +122,42 @@ vec3 N(v3 p, _f t) {
 	v3 n = v3(0);
 	for (int i = min(iFrame, 0); i < 4; i++) {
 		v3 e = .005773 * (2. * v3(((i + 3) >> 1) & 1, (i >> 1) & 1, i & 1) - 1.);
-		n += e * J(p + e * h).d;
+		n += e * K(p + e * h).d;
 	}
 
 	RET NM(n);
 }
 
-float sw(v3 p, v3 H) {
+float sw(v3 p, v3 I) {
 	_f i, h,
 	   s = 1.,
 	   t = .1;
 	for (i = z0; i < 15.; i++) {
-		h = J(t * H + p).d;
+		h = K(t * I + p).d;
 		s = min(s, 15. * h / t);
 		t += h;
 		if (s < .001 || t > 10.) break;
 	}
 
-	RET X(s);
+	RET Y(s);
 }
 
-float j(v3 p, v3 n, _f h) { RET J(h * n + p).d / h; }
+float l(v3 p, v3 n, _f h) { RET K(h * n + p).d / h; }
 
-vec3 vg(v3 c, v2 y) {
-	v2 q = y.xy / iR.xy;
+vec3 vg(v3 c, v2 z) {
+	v2 q = z.xy / iR.xy;
 	c *= .5 + .5 * pow(16. * q.x * q.y * (1. - q.x) * (1. - q.y), .4);
 	RET c;
 }
 
-float z(v3 v) { RET exp(dot(v, v) * -.002); }
+float B(v3 v) { RET exp(dot(v, v) * -.002); }
 
-vec3 I(v3 p, v3 U, _f d, Hit h) {
+vec3 J(v3 p, v3 V, _f d, Hit h) {
 	v3 c,
-	   H = NM(v3(6, 35, -10) - p),
+	   I = NM(v3(6, 35, -10) - p),
 	   n = N(p, d);
-	_f _, F, G, C,
-	   E = g,
+	_f b, G, H, D,
+	   F = g,
 	   SP = 1.;
 	if (h.id == 2) {
 		c = v3(.2);
@@ -167,60 +167,60 @@ vec3 I(v3 p, v3 U, _f d, Hit h) {
 	else if (h.id == 3) c = v3(.6);
 	else c = v3(.18, .02, .34);
 
-	_ = mix(j(p, n, .2), j(p, n, 2.), .7);
-	F = X(.1 + .9 * dot(H, n)) * (.3 + .7 * sw(p, H)) * (.3 + .7 * _);
-	G = X(.1 + .9 * dot(H * v3(-1, 1, -1), n)) + pow(X(dot(U, reflect(H, n))), 10.) * SP;
-	C = SS(.7, 1., 1. + dot(U, n)) * .5;
-	g = E;
-	RET mix((F * v3(.43, .29, .52) + G * _ * v3(2.11, 1.69, 1.48)) * c, v3(.05), C);
+	b = mix(l(p, n, .2), l(p, n, 2.), .7);
+	G = Y(.1 + .9 * dot(I, n)) * (.3 + .7 * sw(p, I)) * (.3 + .7 * b);
+	H = Y(.1 + .9 * dot(I * v3(-1, 1, -1), n)) + pow(Y(dot(V, reflect(I, n))), 10.) * SP;
+	D = SS(.7, 1., 1. + dot(V, n)) * .5;
+	g = F;
+	RET mix((G * v3(.43, .29, .52) + H * b * v3(2.11, 1.69, 1.48)) * c, v3(.05), D);
 }
 
-vec4 K(inout vec3 p, v3 U, _f s, _f M) {
+vec4 L(inout vec3 p, v3 V, _f s, _f O) {
 	_f i,
 	   d = .01;
 	g = 0.;
 	Hit h;
 	for (i = z0; i < s; i++) {
-		h = J(p);
+		h = K(p);
 		if (abs(h.d) < .0015) break;
 		d += h.d;
-		if (d > M) RET vec4(0);
-		p += h.d * U;
+		if (d > O) RET vec4(0);
+		p += h.d * V;
 	}
 
-	_f Q = mix(1., .3, (sin(T) * .5 + .5) * SS(13., 15., T));
-	RET vec4(pow(g, Q) * v3(.73, .5, .88) + I(p, U, d, h), h.id);
+	_f R = mix(1., .3, (sin(T) * .5 + .5) * SS(13., 15., T));
+	RET vec4(pow(g, R) * v3(.73, .5, .88) + J(p, V, d, h), h.id);
 }
 
-vec3 Y(v3 V, v3 U) {
-	v3 p = V;
-	vec4 o = K(p, U, 1e2, 50.);
-	o.rgb *= z(p - V);
-	if (o.w > 1.) {
-		U = reflect(U, N(p, LNG(p - V)));
-		p += U * .01;
-		o += mix(.2, .3, o.w - 2.) * K(p, U, 50., 10.) * z(V - p);
+vec3 Z(v3 W, v3 V) {
+	v3 p = W;
+	vec4 u = L(p, V, 1e2, 50.);
+	u.rgb *= B(p - W);
+	if (u.w > 1.) {
+		V = reflect(V, N(p, LNG(p - W)));
+		p += V * .01;
+		u += mix(.2, .3, u.w - 2.) * L(p, V, 50., 10.) * B(W - p);
 	}
 
-	RET MX(v3(0), o.rgb);
+	RET MX(v3(0), u.rgb);
 }
 
-void mainImage(out vec4 B, v2 y) {
+void mainImage(out vec4 C, v2 z) {
 	T = mod(iTime, 30.);
-	v3 o,
-	   V = mix(v3(1, 2, -4), v3(0, 3.5, -3), S(T / 4.));
-	v2 UV = (y - .5 * iR.xy) / iR.y;
-	o = Y(V, R(V, UV));
+	v3 u,
+	   W = mix(v3(1, 2, -4), v3(0, 3.5, -3), S(T / 4.));
+	v2 UV = (z - .5 * iR.xy) / iR.y;
+	u = Z(W, U(W, UV));
 #ifdef A
-	if (fwidth(o.r) > .03) {
+	if (fwidth(u.r) > .03) {
 		for (_f dx = z0; dx <= 1.; dx++) {
 			for (_f dy = z0; dy <= 1.; dy++)
-				o += Y(V, R(V, UV + (v2(dx, dy) - .5) / iR.xy));
+				u += Z(W, U(W, UV + (v2(dx, dy) - .5) / iR.xy));
 		}
 
-		o /= 5.;
+		u /= 5.;
 	}
 
 #endif
-	B = vec4(vg(pow(o, v3(.45)) * X(iTime), y), 1);
+	C = vec4(vg(pow(u, v3(.45)) * Y(iTime), z), 1);
 }