Merge pull request #149 from ftsrg/arrayinit_fix

Fixed ArrayInitExpr withOps bug
ftsrg · Dec 1, 2021 · 92051f0 · 92051f0
2 parents 811e180 + 7410af6
commit 92051f0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -10,7 +10,7 @@ buildscript {
 
 allprojects {
     group = "hu.bme.mit.inf.theta"
-    version = "3.0.1"
+    version = "3.0.2"
 
     apply(from = rootDir.resolve("gradle/shared-with-buildSrc/mirrors.gradle.kts"))
 }

diff --git a/subprojects/common/core/src/main/java/hu/bme/mit/theta/core/type/MultiaryExpr.java b/subprojects/common/core/src/main/java/hu/bme/mit/theta/core/type/MultiaryExpr.java
@@ -47,7 +47,7 @@ public final List<Expr<OpType>> getOps() {
 	}
 
 	@Override
-	public final MultiaryExpr<OpType, ExprType> withOps(final List<? extends Expr<?>> ops) {
+	public MultiaryExpr<OpType, ExprType> withOps(final List<? extends Expr<?>> ops) {
 		checkNotNull(ops);
 		if (ops.isEmpty()) {
 			return with(ImmutableList.of());

diff --git a/...rojects/common/core/src/main/java/hu/bme/mit/theta/core/type/arraytype/ArrayInitExpr.java b/...rojects/common/core/src/main/java/hu/bme/mit/theta/core/type/arraytype/ArrayInitExpr.java
@@ -102,6 +102,11 @@ public MultiaryExpr<Type, ArrayType<IndexType, ElemType>> with(Iterable<? extend
 		return ArrayInitExpr.of(newOps, elseElem, type);
 	}
 
+	@Override
+	public MultiaryExpr<Type, ArrayType<IndexType, ElemType>> withOps(List<? extends Expr<?>> ops) {
+		return with(ops.stream().map(op -> (Expr<Type>) op).collect(Collectors.toList()));
+	}
+
 	@Override
 	protected int getHashSeed() {
 		return HASH_SEED;