Fixes on the PR

ZenCodeLang · Jun 7, 2024 · 9f602a5 · 9f602a5
1 parent 055207f
commit 9f602a5
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 9 deletions.
diff --git a/...a/org/openzen/zenscript/javabytecode/compiler/definitions/JavaExpansionMemberVisitor.java b/...a/org/openzen/zenscript/javabytecode/compiler/definitions/JavaExpansionMemberVisitor.java
@@ -70,7 +70,7 @@ public Void visitConstructor(ConstructorMember member) {
 	public Void visitMethod(MethodMember member) {
 		final boolean isStatic = member.isStatic();
 		final JavaCompilingMethod method = class_.getMethod(member);
-		if (method == null || !method.compile) {
+		if (!method.compile) {
 			return null;
 		}
 

diff --git a/JavaIntegration/src/main/java/org/openzen/zencode/java/module/JavaRuntimeMethod.java b/JavaIntegration/src/main/java/org/openzen/zencode/java/module/JavaRuntimeMethod.java
@@ -12,6 +12,7 @@
 import org.openzen.zenscript.codemodel.identifiers.instances.MethodInstance;
 import org.openzen.zenscript.codemodel.type.TypeID;
 import org.openzen.zenscript.javashared.*;
+import org.openzen.zenscript.javashared.compiling.JavaCompilingMethod;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Member;
@@ -134,6 +135,10 @@ public String getMapping(JavaClass class_) {
 		return method.getMapping(class_);
 	}
 
+	@Override
+	public JavaCompilingMethod asCompilingMethod(JavaClass compiled, String signature) {
+		return new JavaCompilingMethod(compiled, signature);
+	}
 
 	private Modifiers getMethodModifiers(Member method) {
 		Modifiers result = Modifiers.PUBLIC;

diff --git a/JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaBuiltinMethod.java b/JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaBuiltinMethod.java
@@ -4,6 +4,7 @@
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.type.TypeID;
 import org.openzen.zenscript.codemodel.type.builtin.BuiltinMethodSymbol;
+import org.openzen.zenscript.javashared.compiling.JavaCompilingMethod;
 
 public class JavaBuiltinMethod implements JavaMethod {
 	private final BuiltinMethodSymbol method;
@@ -36,4 +37,9 @@ public <T> T compileSpecial(JavaMethodCompiler<T> compiler, TypeID returnType, E
 	public String getMapping(JavaClass class_) {
 		return class_.internalName + "::builtin::" + method.getID().toString();
 	}
+
+	@Override
+	public JavaCompilingMethod asCompilingMethod(JavaClass compiled, String signature) {
+		return new JavaCompilingMethod(compiled, signature);
+	}
 }
diff --git a/JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaMethod.java b/JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaMethod.java
@@ -3,6 +3,7 @@
 import org.openzen.zenscript.codemodel.expression.CallArguments;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.type.TypeID;
+import org.openzen.zenscript.javashared.compiling.JavaCompilingMethod;
 
 public interface JavaMethod {
 	<T> T compileConstructor(JavaMethodCompiler<T> compiler, TypeID type, CallArguments arguments);
@@ -11,4 +12,6 @@ public interface JavaMethod {
 	<T> T compileSpecial(JavaMethodCompiler<T> compiler, TypeID returnType, Expression target, CallArguments arguments);
 
 	String getMapping(JavaClass class_);
+
+	JavaCompilingMethod asCompilingMethod(JavaClass compiled, String signature);
 }
diff --git a/JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaNativeMethod.java b/JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaNativeMethod.java
@@ -8,6 +8,7 @@
 import org.openzen.zenscript.codemodel.expression.CallArguments;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.type.TypeID;
+import org.openzen.zenscript.javashared.compiling.JavaCompilingMethod;
 
 import java.util.Arrays;
 
@@ -109,6 +110,11 @@ public String getMapping(JavaClass definition) {
 		return result.toString();
 	}
 
+	@Override
+	public JavaCompilingMethod asCompilingMethod(JavaClass compiled, String signature) {
+		return new JavaCompilingMethod(compiled, this, signature);
+	}
+
 	public boolean isAbstract() {
 		return (modifiers & JavaModifiers.ABSTRACT) > 0;
 	}

diff --git a/JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaSpecialMethod.java b/JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaSpecialMethod.java
@@ -3,6 +3,7 @@
 import org.openzen.zenscript.codemodel.expression.CallArguments;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.type.TypeID;
+import org.openzen.zenscript.javashared.compiling.JavaCompilingMethod;
 
 public enum JavaSpecialMethod implements JavaMethod {
 	STRINGBUILDER_ISEMPTY,
@@ -42,4 +43,9 @@ public <T> T compileSpecial(JavaMethodCompiler<T> compiler, TypeID returnType, E
 	public String getMapping(JavaClass class_) {
 		return class_.internalName + "::special::" + name();
 	}
+
+	@Override
+	public JavaCompilingMethod asCompilingMethod(JavaClass compiled, String signature) {
+		return new JavaCompilingMethod(compiled, signature);
+	}
 }
diff --git a/JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaTypeDescriptorVisitor.java b/JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaTypeDescriptorVisitor.java
@@ -69,11 +69,11 @@ public String visitBasic(BasicTypeID basic) {
 					return "Z";
 				case CHAR:
 					return "C";
-				case BYTE:
 				case SBYTE:
 					return "B";
 				case SHORT:
 					return "S";
+				case BYTE:
 				case USHORT:
 				case UINT:
 				case INT:

diff --git a/JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaTypeInternalNameVisitor.java b/JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaTypeInternalNameVisitor.java
@@ -62,11 +62,11 @@ public String visitBasic(BasicTypeID basic) {
 					return "Z";
 				case CHAR:
 					return "C";
-				case BYTE:
 				case SBYTE:
 					return "B";
 				case SHORT:
 					return "S";
+				case BYTE:
 				case USHORT:
 				case INT:
 				case UINT:

diff --git a/JavaShared/src/main/java/org/openzen/zenscript/javashared/compiling/JavaCompilingClass.java b/JavaShared/src/main/java/org/openzen/zenscript/javashared/compiling/JavaCompilingClass.java
@@ -121,12 +121,7 @@ public void addMethod(MethodSymbol method, NativeTag native_) {
 		if (native_ != null && nativeClass != null) {
 			final String signature = getContext().getMethodSignature(method.getHeader());
 			JavaMethod method1 = nativeClass.getMethod(native_.value);
-			if(method1 instanceof JavaSpecialMethod) {
-				module.module.setMethodInfo(method, method1);
-			} else {
-				JavaNativeMethod javaMethod = (JavaNativeMethod) method1;
-				addMethod(method, new JavaCompilingMethod(compiled, javaMethod, signature));
-			}
+			addMethod(method, method1.asCompilingMethod(compiled, signature));
 		} else {
 			final JavaNativeMethod.Kind kind = getKind(method);
 			final String descriptor;

diff --git a/JavaShared/src/main/java/org/openzen/zenscript/javashared/compiling/JavaCompilingMethod.java b/JavaShared/src/main/java/org/openzen/zenscript/javashared/compiling/JavaCompilingMethod.java
@@ -15,4 +15,11 @@ public JavaCompilingMethod(JavaClass class_, JavaNativeMethod compiled, String s
 		this.signature = signature;
 		this.compile = true;
 	}
+
+	public JavaCompilingMethod(JavaClass class_, String signature) {
+		this.class_ = class_;
+		this.compiled = null;
+		this.signature = signature;
+		this.compile = false;
+	}
 }