From 19e2ef851a55398aee9bdafedf8c5a434013a154 Mon Sep 17 00:00:00 2001
From: dgelessus <dgelessus@users.noreply.github.com>
Date: Mon, 8 Nov 2021 11:59:29 +0100
Subject: [PATCH] Use PredicateBuilder to build let variable assignments
---
src/main/java/de/prob2/jupyter/CommandUtils.java | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/main/java/de/prob2/jupyter/CommandUtils.java b/src/main/java/de/prob2/jupyter/CommandUtils.java
index 4f199cf..65a6c09 100644
--- a/src/main/java/de/prob2/jupyter/CommandUtils.java
+++ b/src/main/java/de/prob2/jupyter/CommandUtils.java
@@ -8,7 +8,6 @@ import java.util.List;
import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Set;
-import java.util.StringJoiner;
import java.util.function.Supplier;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -30,6 +29,7 @@ import de.prob.animator.domainobjects.ProBPreference;
import de.prob.animator.domainobjects.TypeCheckResult;
import de.prob.animator.domainobjects.WDError;
import de.prob.exception.ProBError;
+import de.prob.formula.PredicateBuilder;
import de.prob.statespace.Trace;
import de.prob.unicode.UnicodeTranslator;
@@ -215,12 +215,9 @@ public final class CommandUtils {
if (variables.isEmpty()) {
return code;
} else {
- final StringJoiner varNames = new StringJoiner(",");
- final StringJoiner varAssignments = new StringJoiner("&");
- variables.forEach((name, value) -> {
- varNames.add(name);
- varAssignments.add(name + "=(" + value + ')');
- });
+ final String varNames = String.join(",", variables.keySet());
+ final PredicateBuilder varAssignments = new PredicateBuilder();
+ varAssignments.addMap(variables);
return String.format("LET %s BE %s IN(\n%s\n)END", varNames, varAssignments, code);
}
}
--
GitLab