- Continued implementation of interfaces in the bytecode compiler.

- Added support to have a native method both as operator and named method

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

@@ -3984,6 +3984,8 @@ public class JavaExpressionVisitor implements ExpressionVisitor<Void>, JavaNativ
 
 		if (methodInfo.kind == JavaMethod.Kind.STATIC) {
 			getJavaWriter().invokeStatic(methodInfo);
+		} else if (methodInfo.kind == JavaMethod.Kind.INTERFACE) {
+			getJavaWriter().invokeInterface(methodInfo);
 		} else if (methodInfo.kind == JavaMethod.Kind.COMPILED) {
 			Objects.requireNonNull(methodInfo.translation).translate(expression, this);
 		} else {

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

@@ -17,6 +17,7 @@ import org.openzen.zenscript.javabytecode.JavaBytecodeContext;
 import org.openzen.zenscript.javashared.JavaClass;
 import org.openzen.zenscript.javashared.JavaCompiledModule;
 import org.openzen.zenscript.javashared.JavaField;
+import org.openzen.zenscript.javashared.JavaImplementation;
 import org.openzen.zenscript.javashared.JavaMethod;
 
 public class JavaMemberVisitor implements MemberVisitor<Void> {
@@ -116,7 +117,7 @@ public class JavaMemberVisitor implements MemberVisitor<Void> {
 		final Label constructorEnd = new Label();
 		final JavaWriter destructorWriter = new JavaWriter(member.position, writer, method, definition, null, null);
 		destructorWriter.label(constructorStart);
-
+		
         final JavaStatementVisitor statementVisitor = new JavaStatementVisitor(context, javaModule, destructorWriter);
         statementVisitor.start();
 		// TODO: destruction of members (to be done when memory tags are implemented)
@@ -132,14 +133,18 @@ public class JavaMemberVisitor implements MemberVisitor<Void> {
 
         final boolean isAbstract = member.body == null || Modifiers.isAbstract(member.getEffectiveModifiers());
         final JavaMethod method = context.getJavaMethod(member);
-
-		final Label methodStart = new Label();
-		final Label methodEnd = new Label();
-	    final JavaWriter methodWriter = new JavaWriter(member.position, writer, method, definition, context.getMethodSignature(member.header), null);
-
-        final JavaStatementVisitor statementVisitor = new JavaStatementVisitor(context, javaModule, methodWriter);
+		
+		final JavaWriter methodWriter = new JavaWriter(member.position, writer, method, definition, context.getMethodSignature(member.header), null);
 
 		if (!isAbstract) {
+			if (method.isAbstract() || method.cls.kind == JavaClass.Kind.INTERFACE)
+				throw new IllegalArgumentException();
+			
+			final Label methodStart = new Label();
+			final Label methodEnd = new Label();
+		
+			final JavaStatementVisitor statementVisitor = new JavaStatementVisitor(context, javaModule, methodWriter);
+
 			statementVisitor.start();
 			member.body.accept(statementVisitor);
 			methodWriter.label(methodEnd);
@@ -180,6 +185,13 @@ public class JavaMemberVisitor implements MemberVisitor<Void> {
 
 	@Override
 	public Void visitImplementation(ImplementationMember member) {
+		JavaImplementation implementation = context.getJavaImplementation(member);
+		if (implementation.inline) {
+			for (IDefinitionMember imember : member.members)
+				imember.accept(this);
+		} else {
+			throw new UnsupportedOperationException("Non-inline interface implementations not yet available");
+		}
 		return null;
 	}
 

JavaIntegration/src/main/java/org/openzen/zencode/java/JavaNativeModule.java

@@ -39,6 +39,7 @@ import org.openzen.zenscript.codemodel.member.CasterMember;
 import org.openzen.zenscript.codemodel.member.ConstructorMember;
 import org.openzen.zenscript.codemodel.member.FieldMember;
 import org.openzen.zenscript.codemodel.member.GetterMember;
+import org.openzen.zenscript.codemodel.member.ImplementationMember;
 import org.openzen.zenscript.codemodel.member.MethodMember;
 import org.openzen.zenscript.codemodel.member.OperatorMember;
 import org.openzen.zenscript.codemodel.member.SetterMember;
@@ -56,6 +57,7 @@ import org.openzen.zenscript.codemodel.type.storage.AutoStorageTag;
 import org.openzen.zenscript.javashared.JavaClass;
 import org.openzen.zenscript.javashared.JavaCompiledModule;
 import org.openzen.zenscript.javashared.JavaField;
+import org.openzen.zenscript.javashared.JavaImplementation;
 import org.openzen.zenscript.javashared.JavaMethod;
 import stdlib.Strings;
 
@@ -207,6 +209,10 @@ public class JavaNativeModule {
 		return methodMember.ref(registry.getForDefinition(definition).stored());
 	}
 	
+	private boolean isInBasePackage(String className) {
+		return className.startsWith(basePackage + ".");
+	}
+	
 	private ZSPackage getPackage(String className) {
 		if (!className.contains("."))
 			return pkg;
@@ -246,6 +252,7 @@ public class JavaNativeModule {
 				TypeID type = loadType(bound);
 				parameter.addBound(new ParameterTypeBound(CodePosition.NATIVE, type));
 			}
+			typeParameters[i] = parameter;
 		}
 		
 		HighLevelDefinition definition;
@@ -263,6 +270,19 @@ public class JavaNativeModule {
 		} else {
 			definition = new ClassDefinition(CodePosition.NATIVE, module, classPkg, className, Modifiers.PUBLIC);
 			javaClass = JavaClass.fromInternalName(internalName, JavaClass.Kind.CLASS);
+			
+			if (cls.getSuperclass() != null && shouldLoadClass(cls.getSuperclass())) {
+				definition.setSuperType(loadType(cls.getSuperclass(), false, false));
+			}
+		}
+		
+		for (Class<?> iface : cls.getInterfaces()) {
+			if (shouldLoadClass(iface)) {
+				TypeID type = loadType(iface, false, false);
+				ImplementationMember member = new ImplementationMember(CodePosition.NATIVE, definition, Modifiers.PUBLIC, type);
+				definition.members.add(member);
+				compiled.setImplementationInfo(member, new JavaImplementation(true, javaClass));
+			}
 		}
 		
 		definition.typeParameters = typeParameters;
@@ -318,7 +338,6 @@ public class JavaNativeModule {
 				GetterMember member = asGetter(definition, method, getter);
 				definition.addMember(member);
 				compiled.setMethodInfo(member, getMethod(javaClass, method, member.getType()));
-				continue;
 			}
 			
 			ZenCodeType.Setter setter = method.getAnnotation(ZenCodeType.Setter.class);
@@ -326,7 +345,6 @@ public class JavaNativeModule {
 				SetterMember member = asSetter(definition, method, setter);
 				definition.addMember(member);
 				compiled.setMethodInfo(member, getMethod(javaClass, method, BasicTypeID.VOID.stored));
-				continue;
 			}
 			
 			ZenCodeType.Operator operator = method.getAnnotation(ZenCodeType.Operator.class);
@@ -334,7 +352,6 @@ public class JavaNativeModule {
 				OperatorMember member = asOperator(definition, method, operator);
 				definition.addMember(member);
 				compiled.setMethodInfo(member, getMethod(javaClass, method, member.header.getReturnType()));
-				continue;
 			}
 			
 			ZenCodeType.Caster caster = method.getAnnotation(ZenCodeType.Caster.class);
@@ -342,7 +359,6 @@ public class JavaNativeModule {
 				CasterMember member = asCaster(definition, method, caster);
 				definition.addMember(member);
 				compiled.setMethodInfo(member, getMethod(javaClass, method, member.toType));
-				continue;
 			}
 			
 			/*if (!annotated) {
@@ -355,6 +371,10 @@ public class JavaNativeModule {
 		return definition;
 	}
 	
+	private boolean shouldLoadClass(Class<?> cls) {
+		return isInBasePackage(cls.getName());
+	}
+	
 	private boolean isGetterName(String name) {
 		return name.startsWith("get") || name.startsWith("is") || name.startsWith("has");
 	}

JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaContext.java

@@ -18,6 +18,7 @@ import org.openzen.zenscript.codemodel.definition.VariantDefinition;
 import org.openzen.zenscript.codemodel.definition.ZSPackage;
 import org.openzen.zenscript.codemodel.generic.TypeParameter;
 import org.openzen.zenscript.codemodel.member.IDefinitionMember;
+import org.openzen.zenscript.codemodel.member.ImplementationMember;
 import org.openzen.zenscript.codemodel.member.ref.DefinitionMemberRef;
 import org.openzen.zenscript.codemodel.member.ref.VariantOptionRef;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
@@ -184,6 +185,10 @@ public abstract class JavaContext {
 		return getJavaVariantOption(member.getOption());
 	}
 	
+	public JavaImplementation getJavaImplementation(ImplementationMember member) {
+		return getJavaModule(member.definition.module).getImplementationInfo(member);
+	}
+	
 	public void useShared() {
 		if (useShared)
 			return;

JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaMethod.java

@@ -5,6 +5,8 @@
  */
 package org.openzen.zenscript.javashared;
 
+import org.openzen.zenscript.codemodel.Modifiers;
+
 /**
  *
  * @author Hoofdgebruiker
@@ -60,6 +62,8 @@ public class JavaMethod {
 	public JavaMethod(JavaClass cls, Kind kind, String name, boolean compile, String descriptor, int modifiers, boolean genericResult, boolean[] typeParameterArguments) {
 		if (descriptor.contains("<")) // fix signature bug
 			throw new IllegalArgumentException("Invalid descriptor!");
+		if (cls.isInterface() && !JavaModifiers.isStatic(modifiers))
+			kind = Kind.INTERFACE;
 		
 		this.cls = cls;
 		this.kind = kind;
@@ -99,10 +103,15 @@ public class JavaMethod {
 		return result.toString();
 	}
 	
+	public boolean isAbstract() {
+		return (modifiers & Modifiers.ABSTRACT) > 0;
+	}
+	
 	public enum Kind {
 		STATIC,
 		STATICINIT,
 		INSTANCE,
+		INTERFACE,
 		EXPANSION,
 		CONSTRUCTOR,
 		COMPILED

JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaModifiers.java

@@ -53,5 +53,9 @@ public class JavaModifiers {
 		return out;
 	}
 	
+	public static boolean isStatic(int modifiers) {
+		return (modifiers & STATIC) > 0;
+	}
+	
 	private JavaModifiers() {}
 }

JavaShared/src/main/java/org/openzen/zenscript/javashared/prepare/JavaPrepareClassMethodVisitor.java

@@ -8,6 +8,7 @@ package org.openzen.zenscript.javashared.prepare;
 import org.openzen.zenscript.javashared.JavaNativeClass;
 import org.openzen.zencode.shared.StringExpansion;
 import org.openzen.zenscript.codemodel.FunctionHeader;
+import org.openzen.zenscript.codemodel.Modifiers;
 import org.openzen.zenscript.codemodel.OperatorType;
 import org.openzen.zenscript.codemodel.annotations.NativeTag;
 import org.openzen.zenscript.codemodel.member.CallerMember;
@@ -296,6 +297,7 @@ public class JavaPrepareClassMethodVisitor implements MemberVisitor<Void> {
 		if (nativeTag != null && nativeClass != null)
 			method = nativeClass.getMethod(nativeTag.value);
 		
+		int modifiers = cls.kind == JavaClass.Kind.INTERFACE ? JavaModifiers.ABSTRACT : 0;
 		if (member.getOverrides() != null) {
 			DefinitionMemberRef base = member.getOverrides();
 			
@@ -307,7 +309,7 @@ public class JavaPrepareClassMethodVisitor implements MemberVisitor<Void> {
 					baseMethod.name,
 					true,
 					context.getMethodDescriptor(header),
-					JavaModifiers.getJavaModifiers(member.getEffectiveModifiers()),
+					modifiers | JavaModifiers.getJavaModifiers(member.getEffectiveModifiers()),
 					header.getReturnType().type instanceof GenericTypeID,
 					header.useTypeParameters());
 		} else if (method == null) {
@@ -317,7 +319,7 @@ public class JavaPrepareClassMethodVisitor implements MemberVisitor<Void> {
 					name,
 					true,
 					context.getMethodDescriptor(header),
-					JavaModifiers.getJavaModifiers(member.getEffectiveModifiers()),
+					modifiers | JavaModifiers.getJavaModifiers(member.getEffectiveModifiers()),
 					header.getReturnType().type instanceof GenericTypeID,
 					header.useTypeParameters());
 		}

Parser/src/main/java/org/openzen/zenscript/parser/statements/ParsedEmptyFunctionBody.java

@@ -24,6 +24,6 @@ public class ParsedEmptyFunctionBody implements ParsedFunctionBody {
 	
 	@Override
 	public Statement compile(StatementScope scope, FunctionHeader header) {
-		return new EmptyStatement(position);
+		return null;
 	}
 }

ScriptingExample/scripts/integration.zs

@@ -13,6 +13,12 @@ class TestOperators {
 	//	=> "key " + key;
 }
 
+class TestImplementation {
+	public implements TestInterface {
+		interfaceMethod() => "TestImplementation";
+	}
+}
+
 val testInstance = new TestOperators();
 //testInstance("something");
 
@@ -24,6 +30,8 @@ printMany(objects);
 
 println(<test string>);
 println(<test string>.name);
+println(<test string>.interfaceMethod());
+println(new TestImplementation().interfaceMethod());
 
 var diamond = <item:minecraft:diamond>;
 var dirt = <item:minecraft:dirt>;

ScriptingExample/scripts/interfaces.zs

@@ -0,0 +1,17 @@
+public interface MyInterface {
+	interfaceMethod() as string;
+}
+
+public class MyClass {
+	val name as string;
+	
+	public this(name as string) {
+		this.name = name;
+	}
+
+	public implements MyInterface {
+		interfaceMethod() => "InterfaceMethod " + name;
+	}
+}
+
+println(new MyClass("hello").interfaceMethod());

ScriptingExample/src/main/java/org/openzen/zenscript/scriptingexample/Main.java

@@ -25,6 +25,7 @@ public class Main {
 		JavaNativeModule example = scriptingEngine.createNativeModule("example", "org.openzen.zenscript.scriptingexample");
 		example.addGlobals(Globals.class);
 		example.addClass(TestClass.class);
+		example.addClass(TestInterface.class);
 		scriptingEngine.registerNativeProvided(example);
 		
 		File inputDirectory = new File("scripts");

ScriptingExample/src/main/java/org/openzen/zenscript/scriptingexample/TestClass.java

@@ -5,13 +5,11 @@
  */
 package org.openzen.zenscript.scriptingexample;
 
-import org.openzen.zencode.java.ZenCodeType;
-
 /**
  *
  * @author Hoofdgebruiker
  */
-public class TestClass implements ZenCodeType {
+public class TestClass implements TestInterface {
 	private final String name;
 	
 	@Constructor
@@ -39,4 +37,9 @@ public class TestClass implements ZenCodeType {
 	public String toString() {
 		return name;
 	}
+
+	@Override
+	public String interfaceMethod() {
+		return "Interface method of " + name;
+	}
 }