Switch order of stuff

ZenCodeLang · Apr 19, 2024 · 956246d · 956246d
1 parent 8db81eb
commit 956246d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/...a/org/openzen/zenscript/javabytecode/compiler/definitions/JavaExpansionMemberVisitor.java b/...a/org/openzen/zenscript/javabytecode/compiler/definitions/JavaExpansionMemberVisitor.java
@@ -92,13 +92,14 @@ public Void visitMethod(MethodMember member) {
 		methodWriter.label(methodStart);
 
 		if (!isStatic) {
-			methodWriter.nameVariable(0, "expandedObj", methodStart, methodEnd, context.getType(expandedClass));
-			methodWriter.nameParameter(0, "expandedObj");
 
 			for (TypeParameter typeParameter : typeParameters) {
 				methodWriter.nameParameter(0, "typeOf" + typeParameter.name);
-				methodWriter.nameVariable(javaModule.getTypeParameterInfo(typeParameter).parameterIndex, "typeOf" + typeParameter.name, methodStart, methodEnd, Type.getType(Class.class));
+				methodWriter.nameVariable(javaModule.getTypeParameterInfo(typeParameter).parameterIndex - 1, "typeOf" + typeParameter.name, methodStart, methodEnd, Type.getType(Class.class));
 			}
+
+			methodWriter.nameVariable(typeParameters.size(), "expandedObj", methodStart, methodEnd, context.getType(expandedClass));
+			methodWriter.nameParameter(0, "expandedObj");
 		}
 
 		for (TypeParameter typeParameter : member.header.typeParameters) {

diff --git a/JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaContext.java b/JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaContext.java
@@ -393,12 +393,13 @@ public boolean isGenericReturn(TypeID type) {
 	}
 
 	public String getMethodDescriptorExpansion(FunctionHeader header, TypeID expandedType) {
-		StringBuilder startBuilder = new StringBuilder(getDescriptor(expandedType));
+		StringBuilder startBuilder = new StringBuilder();
 		final List<TypeParameter> typeParameters = new ArrayList<>();
 		expandedType.extractTypeParameters(typeParameters);
-		for (TypeParameter typeParameter : typeParameters) {
+		for (TypeParameter ignored : typeParameters) {
 			startBuilder.append("Ljava/lang/Class;");
 		}
+		startBuilder.append(getDescriptor(expandedType));
 
 		return getMethodDescriptor(header, false, startBuilder.toString());
 	}