A bug in the compile-time value of ternary expression is fixed.

rebeca-lang · Apr 25, 2024 · 966aa2e · 966aa2e
1 parent 3789e2d
commit 966aa2e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.rebecalang</groupId>
 	<artifactId>compiler</artifactId>
-	<version>2.19</version>
+	<version>2.20</version>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<springframework.version>6.1.2</springframework.version>

diff --git a/...er/corerebeca/statementsemanticchecker/expression/PrimaryTermExpressionSemanticCheck.java b/...er/corerebeca/statementsemanticchecker/expression/PrimaryTermExpressionSemanticCheck.java
@@ -66,7 +66,8 @@ public Pair<Type, Object> check(Expression expression, Type baseType) {
 					returnValue.setFirst(variableInScopeSpecifier.getType());
 					termPrimary.setType(variableInScopeSpecifier.getType());
 					Object value = variableInScopeSpecifier.getPrecompilationValue();
-					returnValue.setSecond(value);
+					if(value != null)
+						returnValue.setSecond(value);
 				} else {
 					Type curType = baseType;
 					Type symbolType = null;

diff --git a/...mpiler/corerebeca/statementsemanticchecker/expression/TernaryExpressionSemanticCheck.java b/...mpiler/corerebeca/statementsemanticchecker/expression/TernaryExpressionSemanticCheck.java
@@ -54,7 +54,7 @@ public Pair<Type, Object> check(Expression expression, Type baseType) {
 		}
 
 		returnValue.setFirst(tExpression.getType());
-		if (cType.getSecond() != null) {
+		if (cType.getSecond() != AbstractExpressionSemanticCheck.NO_VALUE) {
 			if (lType.getSecond() != null && rType.getSecond() != null)
 				if (((Boolean) cType.getSecond()).booleanValue()) {
 					returnValue.setSecond(lType.getSecond());