Fix implicit constructors not compiling properly

ZenCodeLang · Sep 6, 2024 · 5635594 · 5635594
1 parent 5eb14f6
commit 5635594
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/Parser/src/main/java/org/openzen/zenscript/parser/member/ParsedConstructor.java b/Parser/src/main/java/org/openzen/zenscript/parser/member/ParsedConstructor.java
@@ -2,6 +2,7 @@
 
 import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zencode.shared.CompileException;
+import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.Modifiers;
 import org.openzen.zenscript.codemodel.compilation.CompilingMember;
@@ -43,7 +44,11 @@ public void linkTypes() {
 		@Override
 		public void compile(List<CompileException> errors) {
 			compiled.annotations = ParsedAnnotation.compileForMember(annotations, compiled, compiler);
-			compiled.setBody(body.compile(compiler.forMethod(compiled.header.withReturnType(BasicTypeID.VOID))));
+
+			// Implicit .ctors return the created object, but "normal" ones don't, so for non-implict .ctors we change the header to return VOID
+			FunctionHeader compilingHeader = modifiers.isImplicit() ? compiled.header : compiled.header.withReturnType(BasicTypeID.VOID);
+			compiled.setBody(body.compile(compiler.forMethod(compilingHeader)));
+
 		}
 
 		@Override

diff --git a/...tingEngineTester/src/main/resources/zencode_tests/type_inference/implicit_constructors.zs b/...tingEngineTester/src/main/resources/zencode_tests/type_inference/implicit_constructors.zs
@@ -7,7 +7,10 @@ function enquote(input: string): string => '"' + input + '"';
 
 interface JsonData {
 
-	public implicit this(data: JsonData[]) => new JsonArray(data);
+	public implicit this(data: JsonData[]) {
+	    // this one uses the method body syntax to verify that both syntaxes work
+	    return new JsonArray(data);
+	}
 	public implicit this(data: JsonData[string]) => new JsonObject(data);
 	public implicit this(data: string)  => new JsonString(data);
 	public implicit this(data: int)  => new JsonNumber(data);