Merge remote-tracking branch 'remotes/kindlich/development' into development

JavaBytecodeCompiler/src/main/java/org/openzen/zenscript/javabytecode/compiler/JavaExpressionVisitor.java

@@ -1660,6 +1660,7 @@ public class JavaExpressionVisitor implements ExpressionVisitor<Void> {
 		
 		final String descriptor = context.getMethodDescriptor(expression.header);
         final String signature = context.getMethodSignature(expression.header);
+		final String signature2 = context.getMethodDescriptor(expression.header);
 		final String name = context.getLambdaCounter();
 
 		final JavaMethod methodInfo = JavaMethod.getNativeVirtual(javaWriter.method.cls, "accept", descriptor);

JavaBytecodeCompiler/src/main/java/org/openzen/zenscript/javabytecode/compiler/definitions/JavaDefinitionVisitor.java

@@ -1,6 +1,7 @@
 package org.openzen.zenscript.javabytecode.compiler.definitions;
 
-import org.openzen.zenscript.javashared.JavaTypeGenericVisitor;
+import org.openzen.zenscript.codemodel.member.MethodMember;
+import org.openzen.zenscript.javashared.*;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.Opcodes;
 import org.openzen.zenscript.codemodel.definition.*;
@@ -10,7 +11,6 @@ import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.GenericTypeID;
 import org.openzen.zenscript.javabytecode.JavaBytecodeContext;
 import org.openzen.zenscript.javabytecode.compiler.*;
-import org.openzen.zenscript.javashared.JavaClass;
 
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -18,9 +18,6 @@ import java.util.ArrayList;
 import java.util.List;
 import org.openzen.zenscript.codemodel.member.ImplementationMember;
 import org.openzen.zenscript.codemodel.type.StoredType;
-import org.openzen.zenscript.javashared.JavaMethod;
-import org.openzen.zenscript.javashared.JavaModifiers;
-import org.openzen.zenscript.javashared.JavaVariantOption;
 
 
 public class JavaDefinitionVisitor implements DefinitionVisitor<byte[]> {
@@ -56,7 +53,7 @@ public class JavaDefinitionVisitor implements DefinitionVisitor<byte[]> {
 		}
         String signature = null;
 
-        writer.visit(Opcodes.V1_8, definition.modifiers, toClass.internalName, signature, superTypeInternalName, interfaces.toArray(new String[interfaces.size()]));
+        writer.visit(Opcodes.V1_8, definition.modifiers, toClass.internalName, signature, superTypeInternalName, interfaces.toArray(new String[0]));
 		JavaMemberVisitor memberVisitor = new JavaMemberVisitor(context, writer, toClass, definition);
         for (IDefinitionMember member : definition.members) {
             member.accept(memberVisitor);
@@ -160,7 +157,21 @@ public class JavaDefinitionVisitor implements DefinitionVisitor<byte[]> {
 
 	@Override
 	public byte[] visitExpansion(ExpansionDefinition definition) {
-		return null;
+
+		JavaClassWriter writer = new JavaClassWriter(ClassWriter.COMPUTE_FRAMES);
+		final JavaClass expansionClassInfo = context.getJavaModule(definition.module).getExpansionClassInfo(definition);
+		final String internalName = expansionClassInfo.internalName;
+
+		writer.visit(Opcodes.V1_8, Opcodes.ACC_PUBLIC |Opcodes.ACC_STATIC, internalName, null, "java/lang/Object", null);
+		JavaExpansionMemberVisitor memberVisitor = new JavaExpansionMemberVisitor(context, writer, expansionClassInfo, definition);
+
+		for (IDefinitionMember member : definition.members) {
+			member.accept(memberVisitor);
+		}
+		memberVisitor.end();
+		writer.visitEnd();
+
+		return writer.toByteArray();
 	}
 
 	@Override

JavaBytecodeCompiler/src/main/java/org/openzen/zenscript/javabytecode/compiler/definitions/JavaExpansionMemberVisitor.java

@@ -0,0 +1,119 @@
+package org.openzen.zenscript.javabytecode.compiler.definitions;
+
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.Label;
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import org.openzen.zenscript.codemodel.member.*;
+import org.openzen.zenscript.javabytecode.JavaBytecodeContext;
+import org.openzen.zenscript.javabytecode.compiler.CompilerUtils;
+import org.openzen.zenscript.javabytecode.compiler.JavaStatementVisitor;
+import org.openzen.zenscript.javabytecode.compiler.JavaWriter;
+import org.openzen.zenscript.javashared.JavaClass;
+import org.openzen.zenscript.javashared.JavaCompiledModule;
+import org.openzen.zenscript.javashared.JavaField;
+import org.openzen.zenscript.javashared.JavaMethod;
+
+public class JavaExpansionMemberVisitor implements MemberVisitor<Void> {
+
+	private final ClassWriter writer;
+	private final JavaBytecodeContext context;
+	private final JavaClass toClass;
+	private final HighLevelDefinition definition;
+	private final JavaCompiledModule javaModule;
+
+	public JavaExpansionMemberVisitor(JavaBytecodeContext context, ClassWriter writer, JavaClass toClass, HighLevelDefinition definition) {
+		this.writer = writer;
+		this.toClass = toClass;
+		this.definition = definition;
+		this.context = context;
+		javaModule = context.getJavaModule(definition.module);
+	}
+
+	public void end() {
+	}
+
+	@Override
+	public Void visitConst(ConstMember member) {
+		JavaField field = context.getJavaField(member);
+		writer.visitField(CompilerUtils.calcAccess(member.getEffectiveModifiers()), field.name, field.descriptor, field.signature, null).visitEnd();
+		return null;
+	}
+
+	@Override
+	public Void visitField(FieldMember member) {
+		throw new IllegalStateException("Cannot add fields via expansions");
+	}
+
+	@Override
+	public Void visitConstructor(ConstructorMember member) {
+		throw new IllegalStateException("Cannot add constructors via expansions");
+	}
+
+	@Override
+	public Void visitDestructor(DestructorMember member) {
+		throw new IllegalStateException("Cannot add constructors via expansions");
+	}
+
+	@Override
+	public Void visitMethod(MethodMember member) {
+		final boolean isStatic = member.isStatic();
+		final JavaMethod method = context.getJavaMethod(member);
+		if(!method.compile)
+			return null;
+
+
+		CompilerUtils.tagMethodParameters(context, javaModule, member.header, member.isStatic());
+
+
+		final Label methodStart = new Label();
+		final Label methodEnd = new Label();
+		final JavaWriter methodWriter = new JavaWriter(writer, method, definition, context.getMethodSignature(member.header), null);
+
+		return null;
+	}
+
+	@Override
+	public Void visitGetter(GetterMember member) {
+		throw new IllegalStateException("Cannot add getters via expansions");
+	}
+
+	@Override
+	public Void visitSetter(SetterMember member) {
+		throw new IllegalStateException("Cannot add setters via expansions");
+	}
+
+	@Override
+	public Void visitOperator(OperatorMember member) {
+		return null;
+	}
+
+	@Override
+	public Void visitCaster(CasterMember member) {
+		return null;
+	}
+
+	@Override
+	public Void visitCustomIterator(IteratorMember member) {
+		return null;
+	}
+
+	@Override
+	public Void visitCaller(CallerMember member) {
+		return null;
+	}
+
+	@Override
+	public Void visitImplementation(ImplementationMember member) {
+		return null;
+	}
+
+	@Override
+	public Void visitInnerDefinition(InnerDefinitionMember member) {
+		return null;
+	}
+
+	@Override
+	public Void visitStaticInitializer(StaticInitializerMember member) {
+		throw new IllegalStateException("Cannot add Static initializers via expansions");
+	}
+}