Make lambda method names a bit shorter

TheSilkMiner · TheSilkMiner · commit 154590a03bc5 · 2025-02-28T20:17:03.000+01:00
Signed-off-by: TheSilkMiner &lt;thesilkminer@outlook.com&gt;
diff --git a/JavaBytecodeCompiler/src/main/java/org/openzen/zenscript/javabytecode/JavaMangler.java b/JavaBytecodeCompiler/src/main/java/org/openzen/zenscript/javabytecode/JavaMangler.java
@@ -145,10 +145,12 @@ public int hashCode() {
 		} else {
 			sanitizedMethodName = parentMethodName;
 		}
-		final String interfaceTarget = interfaceName.replace('/', '_').replace('.', '_');
-		final LambdaId id = new LambdaId(interfaceName, sanitizedMethodName);
+		final String interfaceTarget = interfaceName.replace('/', '.');
+		final int lastDot = interfaceTarget.lastIndexOf('.');
+		final String canonicalInterfaceTarget = lastDot == -1 ? interfaceTarget : interfaceTarget.substring(lastDot + 1);
+		final LambdaId id = new LambdaId(canonicalInterfaceTarget, sanitizedMethodName);
 
-		return "$lambda$" + sanitizedMethodName + '$' + interfaceTarget  + '$' + this.mangleCounters.get(id);
+		return "$lambda$" + sanitizedMethodName + '$' + canonicalInterfaceTarget + '$' + this.mangleCounters.get(id);
 	}
 
 	public String mangleGeneratedLambdaName(final String interfaceName) {

Original file line number	Diff line number	Diff line change
`@@ -145,10 +145,12 @@ public int hashCode() {`
`145`	`145`	`} else {`
`146`	`146`	`sanitizedMethodName = parentMethodName;`
`147`	`147`	`}`
`148`		`- final String interfaceTarget = interfaceName.replace('/', '_').replace('.', '_');`
`149`		`- final LambdaId id = new LambdaId(interfaceName, sanitizedMethodName);`
	`148`	`+ final String interfaceTarget = interfaceName.replace('/', '.');`
	`149`	`+ final int lastDot = interfaceTarget.lastIndexOf('.');`
	`150`	`+ final String canonicalInterfaceTarget = lastDot == -1 ? interfaceTarget : interfaceTarget.substring(lastDot + 1);`
	`151`	`+ final LambdaId id = new LambdaId(canonicalInterfaceTarget, sanitizedMethodName);`
`150`	`152`
`151`		`- return "$lambda$" + sanitizedMethodName + '$' + interfaceTarget + '$' + this.mangleCounters.get(id);`
	`153`	`+ return "$lambda$" + sanitizedMethodName + '$' + canonicalInterfaceTarget + '$' + this.mangleCounters.get(id);`
`152`	`154`	`}`
`153`	`155`
`154`	`156`	`public String mangleGeneratedLambdaName(final String interfaceName) {`