- Fix crash when performing access checks between script and class

- Fix default constructor not working properly
- Fix integration classes without exposed constructor being instantiable if they have a default (non-exposed) constructor
- Fix extern methods failing validation

CodeModel/src/main/java/org/openzen/zenscript/codemodel/AccessScope.java

@@ -23,6 +23,8 @@ public final class AccessScope {
 	public boolean hasAccessTo(AccessScope other, int access) {
 		if (Modifiers.isPublic(access))
 			return true;
+		if (definition == null)
+			return false;
 		if (definition == other.definition || definition.isOuterOf(other.definition) || other.definition.isOuterOf(definition))
 			return true;
 		if (Modifiers.isPrivate(access))

CodeModel/src/main/java/org/openzen/zenscript/codemodel/definition/ClassDefinition.java

@@ -6,8 +6,16 @@
 package org.openzen.zenscript.codemodel.definition;
 
 import org.openzen.zencode.shared.CodePosition;
+import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import org.openzen.zenscript.codemodel.Modifiers;
 import org.openzen.zenscript.codemodel.Module;
+import org.openzen.zenscript.codemodel.member.ConstructorMember;
+import org.openzen.zenscript.codemodel.member.IDefinitionMember;
+import org.openzen.zenscript.codemodel.scope.TypeScope;
+import org.openzen.zenscript.codemodel.statement.BlockStatement;
+import org.openzen.zenscript.codemodel.type.BasicTypeID;
+import org.openzen.zenscript.codemodel.type.member.BuiltinID;
 
 /**
  *
@@ -21,6 +29,24 @@ public class ClassDefinition extends HighLevelDefinition {
 	public ClassDefinition(CodePosition position, Module module, ZSPackage pkg, String name, int modifiers, HighLevelDefinition outerDefinition) {
 		super(position, module, pkg, name, modifiers, outerDefinition);
 	}
+	
+	@Override
+	public void normalize(TypeScope scope) {
+		super.normalize(scope);
+		
+		boolean hasConstructor = false;
+		for (IDefinitionMember member : members) {
+			if (member instanceof ConstructorMember) {
+				hasConstructor = true;
+				break;
+			}
+		}
+		
+		if (!hasConstructor) {
+			ConstructorMember constructor = new ConstructorMember(position, this, Modifiers.PUBLIC | Modifiers.EXTERN, new FunctionHeader(BasicTypeID.VOID), BuiltinID.CLASS_DEFAULT_CONSTRUCTOR);
+			addMember(constructor);
+		}
+	}
 
 	@Override
 	public <T> T accept(DefinitionVisitor<T> visitor) {

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

@@ -57,7 +57,7 @@ public class JavaMemberVisitor implements MemberVisitor<Void> {
 
     @Override
     public Void visitConstructor(ConstructorMember member) {
-        final boolean isEnum = definition instanceof EnumDefinition;
+		final boolean isEnum = definition instanceof EnumDefinition;
         final JavaMethod method = context.getJavaMethod(member);
 
         final Label constructorStart = new Label();
@@ -93,7 +93,10 @@ public class JavaMemberVisitor implements MemberVisitor<Void> {
 			}
         }
 
-		member.body.accept(statementVisitor);
+		if (member.body != null) {
+			member.body.accept(statementVisitor);
+		}
+		
 		constructorWriter.label(constructorEnd);
 		statementVisitor.end();
 		return null;

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

@@ -49,6 +49,7 @@ import org.openzen.zenscript.codemodel.type.ISymbol;
 import org.openzen.zenscript.codemodel.type.StoredType;
 import org.openzen.zenscript.codemodel.type.StringTypeID;
 import org.openzen.zenscript.codemodel.type.TypeID;
+import org.openzen.zenscript.codemodel.type.member.BuiltinID;
 import org.openzen.zenscript.codemodel.type.member.TypeMembers;
 import org.openzen.zenscript.codemodel.type.storage.AutoStorageTag;
 import org.openzen.zenscript.javashared.JavaClass;
@@ -76,12 +77,23 @@ public class JavaNativeModule {
 	
 	public final Map<String, ISymbol> globals = new HashMap<>();
 	
-	public JavaNativeModule(ZSPackage pkg, String name, String basePackage, GlobalTypeRegistry registry, boolean allowNonAnnotated) {
+	public JavaNativeModule(
+			ZSPackage pkg,
+			String name,
+			String basePackage,
+			GlobalTypeRegistry registry,
+			boolean allowNonAnnotated,
+			JavaNativeModule[] dependencies)
+	{
 		this.pkg = pkg;
 		this.basePackage = basePackage;
 		module = new Module(name);
 		this.registry = registry;
 		
+		for (JavaNativeModule dependency : dependencies) {
+			definitionByClass.putAll(dependency.definitionByClass);
+		}
+		
 		this.allowNonAnnonated = allowNonAnnotated;
 		compiled = new JavaCompiledModule(module);
 		
@@ -262,15 +274,23 @@ public class JavaNativeModule {
 			compiled.setFieldInfo(member, new JavaField(javaClass, field.getName(), getDescriptor(field.getType())));
 		}
 		
+		boolean hasConstructor = false;
 		for (java.lang.reflect.Constructor constructor : cls.getConstructors()) {
 			ZenCodeType.Constructor constructorAnnotation = (ZenCodeType.Constructor)constructor.getAnnotation(ZenCodeType.Constructor.class);
 			if (constructorAnnotation != null || !annotated) {
 				ConstructorMember member = asConstructor(definition, constructor);
 				definition.addMember(member);
 				compiled.setMethodInfo(member, getMethod(javaClass, constructor));
+				hasConstructor = true;
 			}
 		}
 		
+		if (!hasConstructor) {
+			// no constructor! make a private constructor so the compiler doesn't add one
+			ConstructorMember member = new ConstructorMember(CodePosition.BUILTIN, definition, Modifiers.PRIVATE, new FunctionHeader(BasicTypeID.VOID), BuiltinID.CLASS_DEFAULT_CONSTRUCTOR);
+			definition.addMember(member);
+		}
+		
 		for (Method method : cls.getDeclaredMethods()) {
 			ZenCodeType.Method methodAnnotation = method.getAnnotation(ZenCodeType.Method.class);
 			if (methodAnnotation != null) {

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

@@ -63,7 +63,7 @@ public class ScriptingEngine {
 	
 	public JavaNativeModule createNativeModule(String name, String basePackage, JavaNativeModule... dependencies) {
 		ZSPackage testPackage = new ZSPackage(space.rootPackage, name);
-		return new JavaNativeModule(testPackage, name, basePackage, registry, false);
+		return new JavaNativeModule(testPackage, name, basePackage, registry, false, dependencies);
 	}
 	
 	public void registerNativeProvided(JavaNativeModule module) throws CompileException {

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

@@ -9,11 +9,13 @@ import java.util.HashMap;
 import java.util.Map;
 import org.openzen.zenscript.codemodel.FunctionParameter;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import org.openzen.zenscript.codemodel.Modifiers;
 import org.openzen.zenscript.codemodel.Module;
 import org.openzen.zenscript.codemodel.definition.VariantDefinition;
 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.type.member.BuiltinID;
 
 /**
  *
@@ -125,6 +127,8 @@ public class JavaCompiledModule {
 	
 	public JavaMethod getMethodInfo(IDefinitionMember member) {
 		JavaMethod method = methods.get(member);
+		if (member.getBuiltin() == BuiltinID.CLASS_DEFAULT_CONSTRUCTOR) // TODO: handle this differently
+			return new JavaMethod(getClassInfo(member.getDefinition()), JavaMethod.Kind.CONSTRUCTOR, "<init>", true, "()V", Modifiers.PUBLIC, false);
 		if (method == null)
 			throw new IllegalStateException("Missing method info for method " + member.getDefinition().name + "." + member.describe());
 		

ScriptingExample/scripts/integration.zs

@@ -3,3 +3,15 @@ import example.TestClass;
 val instance = new TestClass("Instance");
 println("Name: " + instance.name);
 instance.dump();
+
+class TestOperators {
+	public (name as string) as void {
+		println("MyTestClass: " + name);
+	}
+	
+	//.(key as string) as string
+	//	=> "key " + key;
+}
+
+val testInstance = new TestOperators();
+//testInstance("something");

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

@@ -21,6 +21,7 @@ import org.openzen.zenscript.parser.expression.ParsedExpressionString;
 public class Main {
 	public static void main(String[] args) throws CompileException, ParseException, IOException {
 		ScriptingEngine scriptingEngine = new ScriptingEngine();
+		scriptingEngine.debug = true;
 		
 		JavaNativeModule example = scriptingEngine.createNativeModule("example", "org.openzen.zenscript.scriptingexample");
 		example.addGlobals(Globals.class);

Validator/src/main/java/org/openzen/zenscript/validator/visitors/DefinitionMemberValidator.java

@@ -119,9 +119,11 @@ public class DefinitionMemberValidator implements MemberVisitor<Void> {
 		constructors.add(member.header);
 		ValidationUtils.validateHeader(validator, member.position, member.header, member.getAccessScope());
 		
-		if (member.body == null && !member.isExtern()) {
-			validator.logError(ValidationLogEntry.Code.BODY_REQUIRED, member.position, "Constructors must have a body");
-			return null;
+		if (member.body == null) {
+			if (!member.isExtern()) {
+				validator.logError(ValidationLogEntry.Code.BODY_REQUIRED, member.position, "Constructors must have a body");
+				return null;
+			}
 		} else {
 			StatementValidator statementValidator = new StatementValidator(validator, new ConstructorStatementScope(member.header, member.getAccessScope()));
 			member.body.accept(statementValidator);