Actually fix the thing

ZenCodeLang · Apr 19, 2024 · 6d768e6 · 6d768e6
1 parent 956246d
commit 6d768e6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/...codeCompiler/src/main/java/org/openzen/zenscript/javabytecode/compiler/CompilerUtils.java b/...codeCompiler/src/main/java/org/openzen/zenscript/javabytecode/compiler/CompilerUtils.java
@@ -58,13 +58,15 @@ public static int calcAccess(Modifiers modifiers) {
 	}
 
 	public static void tagMethodParameters(JavaBytecodeContext context, JavaCompiledModule module, FunctionHeader header, boolean isStatic, List<TypeParameter> baseTypeTypeParameters) {
-		int index = isStatic ? 0 : 1;
+		int index = 0;
 
 		for (TypeParameter baseTypeTypeParameter : baseTypeTypeParameters) {
 			module.setTypeParameterInfo(baseTypeTypeParameter, new JavaTypeParameterInfo(index));
 			index++;
 		}
 
+		if (!isStatic) index++;
+
 		for (int i = 0; i < header.typeParameters.length; i++) {
 			TypeParameter parameter = header.typeParameters[i];
 			module.setTypeParameterInfo(parameter, new JavaTypeParameterInfo(index));

diff --git a/...a/org/openzen/zenscript/javabytecode/compiler/definitions/JavaExpansionMemberVisitor.java b/...a/org/openzen/zenscript/javabytecode/compiler/definitions/JavaExpansionMemberVisitor.java
@@ -95,7 +95,7 @@ public Void visitMethod(MethodMember member) {
 
 			for (TypeParameter typeParameter : typeParameters) {
 				methodWriter.nameParameter(0, "typeOf" + typeParameter.name);
-				methodWriter.nameVariable(javaModule.getTypeParameterInfo(typeParameter).parameterIndex - 1, "typeOf" + typeParameter.name, methodStart, methodEnd, Type.getType(Class.class));
+				methodWriter.nameVariable(javaModule.getTypeParameterInfo(typeParameter).parameterIndex, "typeOf" + typeParameter.name, methodStart, methodEnd, Type.getType(Class.class));
 			}
 
 			methodWriter.nameVariable(typeParameters.size(), "expandedObj", methodStart, methodEnd, context.getType(expandedClass));