[ternary] Fix with void types

leek-wars · Jul 4, 2023 · ae56c8d · ae56c8d
1 parent e026fb7
commit ae56c8d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/main/java/leekscript/compiler/JavaCompiler.java b/src/main/java/leekscript/compiler/JavaCompiler.java
@@ -44,7 +44,6 @@ public AIClassEntry(Class<?> clazz, long timestamp) {
 	static {
 		classpath = new File(LeekScript.class.getProtectionDomain().getCodeSource().getLocation().getPath()).getPath();
 		classpath += ":/home/pierre/dev/leek-wars/generator/bin/main";
-		classpath += ":/home/pierre/dev/leek-wars/generator/leek-wars-env/bin/main";
 		arguments.addAll(Arrays.asList("-classpath", classpath, "-nowarn"));
 		try {
 			urlLoader = new URLClassLoader(new URL[] { new File(IA_PATH).toURI().toURL() }, new ClassLoader() {});

diff --git a/src/main/java/leekscript/compiler/expression/LeekTernaire.java b/src/main/java/leekscript/compiler/expression/LeekTernaire.java
@@ -272,7 +272,11 @@ public void analyze(WordCompiler compiler) throws LeekCompilerException {
 		}
 
 		if (mExpression1 != null && mExpression2 != null) {
-			type = Type.compound(mExpression1.getType(), mExpression2.getType());
+			var type1 = mExpression1.getType();
+			var type2 = mExpression2.getType();
+			if (type1 == Type.VOID) type1 = Type.NULL;
+			if (type2 == Type.VOID) type2 = Type.NULL;
+			type = Type.compound(type1, type2);
 		}
 	}