Replace Value with Expression in the grammar

org.lflang.diagram/src/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java

@@ -1127,7 +1127,7 @@ private String createParameterLabel(ParameterInstance param, boolean bullet) {
         }
         if (!IterableExtensions.isNullOrEmpty(param.getInitialValue())) {
             b.append("(");
-            b.append(IterableExtensions.join(param.getInitialValue(), ", ", _utilityExtensions::toText));
+            b.append(IterableExtensions.join(param.getInitialValue(), ", ", ASTUtils::toText));
             b.append(")");
         }
         return b.toString();
@@ -1163,7 +1163,7 @@ private String createStateVariableLabel(StateVar variable, boolean bullet) {
         }
         if (!IterableExtensions.isNullOrEmpty(variable.getInit())) {
             b.append("(");
-            b.append(IterableExtensions.join(variable.getInit(), ", ", _utilityExtensions::toText));
+            b.append(IterableExtensions.join(variable.getInit(), ", ", ASTUtils::toText));
             b.append(")");
         }
         return b.toString();

org.lflang.diagram/src/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java

@@ -68,6 +68,7 @@
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
 import org.eclipse.xtext.xbase.lib.Pair;
 import org.eclipse.xtext.xbase.lib.StringExtensions;
+import org.lflang.ASTUtils;
 import org.lflang.diagram.synthesis.AbstractSynthesisExtensions;
 import org.lflang.diagram.synthesis.LinguaFrancaSynthesis;
 import org.lflang.diagram.synthesis.postprocessor.ReactionPortAdjustment;
@@ -175,7 +176,7 @@ public KRoundedRectangle addMainReactorFigure(KNode node, ReactorInstance reacto
             if (reactorInstance.reactorDefinition.getHost() != null && 
                     getBooleanValue(LinguaFrancaSynthesis.SHOW_REACTOR_HOST)) {
                 KText hostNameText = _kContainerRenderingExtensions.addText(childContainer, 
-                        _utilityExtensions.toText(reactorInstance.reactorDefinition.getHost()));
+                        ASTUtils.toText(reactorInstance.reactorDefinition.getHost()));
                 DiagramSyntheses.suppressSelectability(hostNameText);
                 _linguaFrancaStyleExtensions.underlineSelectionStyle(hostNameText);
                 setGridPlacementDataFromPointToPoint(hostNameText,
@@ -245,7 +246,7 @@ public ReactorFigureComponents addReactorFigure(KNode node, ReactorInstance reac
 
             if (getBooleanValue(LinguaFrancaSynthesis.SHOW_REACTOR_HOST)) {
                 KText reactorHostText = _kContainerRenderingExtensions.addText(childContainer, 
-                        _utilityExtensions.toText(reactorInstance.getDefinition().getHost()));
+                        ASTUtils.toText(reactorInstance.getDefinition().getHost()));
                 DiagramSyntheses.suppressSelectability(reactorHostText);
                 _linguaFrancaStyleExtensions.underlineSelectionStyle(reactorHostText);
                 setGridPlacementDataFromPointToPoint(reactorHostText,

org.lflang.diagram/src/org/lflang/diagram/synthesis/util/UtilityExtensions.java

@@ -39,9 +39,12 @@
 import org.lflang.diagram.synthesis.AbstractSynthesisExtensions;
 import org.lflang.generator.ReactorInstance;
 import org.lflang.lf.Code;
+import org.lflang.lf.Expression;
 import org.lflang.lf.Host;
+import org.lflang.lf.Literal;
+import org.lflang.lf.ParameterReference;
 import org.lflang.lf.Reactor;
-import org.lflang.lf.Value;
+import org.lflang.lf.Time;
 import org.lflang.util.StringUtil;
 
 import de.cau.cs.kieler.klighd.internal.util.KlighdInternalProperties;
@@ -61,44 +64,7 @@ public class UtilityExtensions extends AbstractSynthesisExtensions {
 
     @Extension
     private KGraphFactory _kGraphFactory = KGraphFactory.eINSTANCE;
-
-    /**
-     * Converts a timing value into readable text
-     */
-    public String toText(Value value) {
-        if (value != null) {
-            if (value.getParameter() != null) {
-                return value.getParameter().getName();
-            } else if (value.getTime() != null) {
-                return value.getTime().getInterval() +
-                        value.getTime().getUnit().toString();
-            } else if (value.getLiteral() != null) {
-                return value.getLiteral();
-            } else if (value.getCode() != null) {
-                return StringUtil.trimCodeBlock(value.getCode().getBody());
-            }
-        }
-        return "";
-    }
-
-    /**
-     * Converts a host value into readable text
-     */
-    public String toText(Host host) {
-        StringBuilder sb = new StringBuilder();
-        if (host != null) {
-            if (!StringExtensions.isNullOrEmpty(host.getUser())) {
-                sb.append(host.getUser()).append("@");
-            }
-            if (!StringExtensions.isNullOrEmpty(host.getAddr())) {
-                sb.append(host.getAddr());
-            }
-            if (host.getPort() != 0) {
-                sb.append(":").append(host.getPort());
-            }
-        }
-        return sb.toString();
-    }
+
 
     /**
      * Returns true if the reactor is the primary reactor

org.lflang.tests/src/org/lflang/tests/compiler/LinguaFrancaASTUtilsTest.java

@@ -33,7 +33,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-
 import javax.inject.Inject;
 
 import org.eclipse.xtext.testing.InjectWith;
@@ -42,8 +41,10 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+
 import org.lflang.ASTUtils;
 import org.lflang.lf.Instantiation;
+import org.lflang.lf.Literal;
 import org.lflang.lf.Model;
 import org.lflang.lf.Parameter;
 import org.lflang.lf.StateVar;
@@ -222,50 +223,47 @@ public void initialValue() throws Exception {
                 Parameter parameter = (Parameter)obj;
                 if (parameter.getName() == "x") {
                     var values = ASTUtils.initialValue(parameter, null);
-                    Assertions.assertEquals(values.get(0).getLiteral(), "1");
+                    Assertions.assertInstanceOf(Literal.class, values.get(0));
+                    Assertions.assertEquals(((Literal)values.get(0)).getLiteral(), "1");
 
-                    values = ASTUtils.initialValue(parameter,
-                            List.of(map.get("a1")));
-                    Assertions.assertEquals(values.get(0).getLiteral(), "2");
+                    values = ASTUtils.initialValue(parameter, List.of(map.get("a1")));
+                    Assertions.assertInstanceOf(Literal.class, values.get(0));
+                    Assertions.assertEquals(((Literal)values.get(0)).getLiteral(), "2");
 
-                    values = ASTUtils.initialValue(parameter,
-                            List.of(map.get("a2")));
-                    Assertions.assertEquals(values.get(0).getLiteral(), "-1");
+                    values = ASTUtils.initialValue(parameter, List.of(map.get("a2")));
+                    Assertions.assertInstanceOf(Literal.class, values.get(0));
+                    Assertions.assertEquals(((Literal)values.get(0)).getLiteral(), "-1");
 
-                    values = ASTUtils.initialValue(parameter,
-                            List.of(map.get("a1"), map.get("b1")));
-                    Assertions.assertEquals(values.get(0).getLiteral(), "3");
+                    values = ASTUtils.initialValue(parameter, List.of(map.get("a1"), map.get("b1")));
+                    Assertions.assertInstanceOf(Literal.class, values.get(0));
+                    Assertions.assertEquals(((Literal)values.get(0)).getLiteral(), "3");
 
-                    values = ASTUtils.initialValue(parameter,
-                            List.of(map.get("a2"), map.get("b1")));
-                    Assertions.assertEquals(values.get(0).getLiteral(), "-1");
+                    values = ASTUtils.initialValue(parameter, List.of(map.get("a2"), map.get("b1")));
+                    Assertions.assertInstanceOf(Literal.class, values.get(0));
+                    Assertions.assertEquals(((Literal)values.get(0)).getLiteral(), "-1");
 
-                    values = ASTUtils.initialValue(parameter,
-                            List.of(map.get("a1"), map.get("b2")));
-                    Assertions.assertEquals(values.get(0).getLiteral(), "-2");
+                    values = ASTUtils.initialValue(parameter, List.of(map.get("a1"), map.get("b2")));
+                    Assertions.assertInstanceOf(Literal.class, values.get(0));
+                    Assertions.assertEquals(((Literal)values.get(0)).getLiteral(), "-2");
 
-                    values = ASTUtils.initialValue(parameter,
-                            List.of(map.get("a2"), map.get("b2")));
-                    Assertions.assertEquals(values.get(0).getLiteral(), "-1");
+                    values = ASTUtils.initialValue(parameter, List.of(map.get("a2"), map.get("b2")));
+                    Assertions.assertInstanceOf(Literal.class, values.get(0));
+                    Assertions.assertEquals(((Literal)values.get(0)).getLiteral(), "-1");
                 } else if (parameter.getName() == "y") {
                     var values = ASTUtils.initialValue(parameter, null);
-                    Assertions.assertEquals(values.get(0).getLiteral(), "2");
+                    Assertions.assertInstanceOf(Literal.class, values.get(0));
+                    Assertions.assertEquals(((Literal)values.get(0)).getLiteral(), "2");
 
-                    try {
-                        values = ASTUtils.initialValue(parameter,
-                                List.of(map.get("a1")));
-                    } catch (IllegalArgumentException ex) {
-                        Assertions.assertTrue(ex.getMessage()
-                                .startsWith("Parameter y is not"));
-                    }
+                    Assertions.assertThrows(IllegalArgumentException.class,
+                                            () -> ASTUtils.initialValue(parameter, List.of(map.get("a1"))));
 
-                    values = ASTUtils.initialValue(parameter,
-                            List.of(map.get("b1")));
-                    Assertions.assertEquals(values.get(0).getLiteral(), "3");
+                    values = ASTUtils.initialValue(parameter, List.of(map.get("b1")));
+                    Assertions.assertInstanceOf(Literal.class, values.get(0));
+                    Assertions.assertEquals(((Literal)values.get(0)).getLiteral(), "3");
 
-                    values = ASTUtils.initialValue(parameter,
-                            List.of(map.get("b2")));
-                    Assertions.assertEquals(values.get(0).getLiteral(), "-2");
+                    values = ASTUtils.initialValue(parameter, List.of(map.get("b2")));
+                    Assertions.assertInstanceOf(Literal.class, values.get(0));
+                    Assertions.assertEquals(((Literal)values.get(0)).getLiteral(), "-2");
                 }
             }
         });

org.lflang.tests/src/org/lflang/tests/compiler/LinguaFrancaValidationTest.java

@@ -26,8 +26,6 @@
 ***************/
 package org.lflang.tests.compiler;
 
-import static org.lflang.ASTUtils.withoutQuotes;
-
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -40,6 +38,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+
 import org.lflang.Target;
 import org.lflang.TargetProperty;
 import org.lflang.TargetProperty.ArrayType;
@@ -53,6 +52,7 @@
 import org.lflang.lf.Model;
 import org.lflang.lf.Visibility;
 import org.lflang.tests.LFInjectorProvider;
+import org.lflang.util.StringUtil;
 
 import com.google.inject.Inject;
 
@@ -906,8 +906,8 @@ public void nonzeroAfterMustHaveUnits() throws Exception {
             "    b = new X()",
             "    a.y -> b.x after 1",
             "}");
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getTime(),
-            null, "Missing or invalid time unit.");
+        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getConnection(),
+            null, "Missing time unit.");
     }
 
 
@@ -936,7 +936,7 @@ public void nonZeroTimeValueWithoutUnits() throws Exception {
             "        printf(\"Hello World.\\n\");",
             "    =}",
             "}");
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getValue(), null, "Missing time unit.");
+        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getTimer(), null, "Missing time unit.");
     }    
 
     /**
@@ -963,8 +963,8 @@ public void parameterTypeMismatch() throws Exception {
             "        printf(\"Hello World.\\n\");",
             "    =}",
             "}");
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getValue(),
-            null, "Parameter is not of time type");
+        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getTimer(),
+            null, "Parameter is not of time type.");
     }
 
     /**
@@ -991,8 +991,8 @@ public void targetCodeInTimeArgument() throws Exception {
             "        printf(\"Hello World.\\n\");",
             "    =}",
             "}");
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getValue(),
-            null, "Invalid time literal");
+        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getTimer(),
+            null, "Invalid time literal.");
     }  
 
 
@@ -1250,12 +1250,14 @@ public void stateAndParameterDeclarationsInC() throws Exception {
         validator.assertError(model, LfPackage.eINSTANCE.getParameter(), null,
             "Parameter cannot be initialized using parameter.");
         validator.assertError(model, LfPackage.eINSTANCE.getStateVar(), null,
-            "Referenced parameter does not denote a time.");
+                              "Missing time unit.");
         validator.assertError(model, LfPackage.eINSTANCE.getStateVar(), null,
-            "Invalid time literal.");
+            "Parameter is not of time type.");
+        validator.assertError(model, LfPackage.eINSTANCE.getStateVar(), null,
+                              "Invalid time literal.");
         validator.assertError(model, LfPackage.eINSTANCE.getParameter(), null,
             "Uninitialized parameter.");
-       	validator.assertError(model, LfPackage.eINSTANCE.getValue(), null,
+       	validator.assertError(model, LfPackage.eINSTANCE.getTimer(), null,
             "Missing time unit.");
     }  
 
@@ -1696,7 +1698,7 @@ public void checkTargetProperties() throws Exception {
                 // Also make sure warnings are produced when files are not present.
                 if (prop.type == PrimitiveType.FILE) {
                     validator.assertWarning(model, LfPackage.eINSTANCE.getKeyValuePair(),
-                    null, String.format("Could not find file: '%s'.", withoutQuotes(it)));
+                                            null, String.format("Could not find file: '%s'.", StringUtil.removeQuotes(it)));
                 }
             }
 

org.lflang.tests/src/org/lflang/tests/lsp/ErrorInserter.java

@@ -12,6 +12,7 @@
 import java.util.ListIterator;
 import java.util.Random;
 import java.util.function.BiFunction;
+import java.util.function.BiPredicate;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
@@ -28,7 +29,8 @@ class ErrorInserter {
 
     /** A basic error inserter builder on which more specific error inserters can be built. */
     private static final Builder BASE_ERROR_INSERTER = new Builder()
-        .insertCondition(s -> Stream.of(";", "}", "{").anyMatch(s::endsWith))
+        .insertCondition((s0, s1) -> Stream.of(s0, s1).allMatch(it -> Stream.of(";", "}", "{").anyMatch(it::endsWith)))
+        .insertCondition((s0, s1) -> !s1.trim().startsWith("else"))
         .insertable("    0 = 1;").insertable("some_undeclared_var1524263 = 9;").insertable("        ++;");
     public static final Builder C = BASE_ERROR_INSERTER
         .replacer("lf_set(", "UNDEFINED_NAME2828376(")
@@ -79,7 +81,7 @@ private boolean get() {
          * @param insertCondition Whether the error inserter is permitted to insert a line after a given line.
          * @throws IOException if the content of {@code originalTest} cannot be read.
          */
-        private AlteredTest(Path originalTest, Predicate<String> insertCondition) throws IOException {
+        private AlteredTest(Path originalTest, BiPredicate<String, String> insertCondition) throws IOException {
             this.badLines = new ArrayList<>();
             this.path = originalTest;
             this.lines = new LinkedList<>();  // Constant-time insertion during iteration is desired.
@@ -88,10 +90,9 @@ private AlteredTest(Path originalTest, Predicate<String> insertCondition) throws
                 boolean ret = true;
                 it.previous();
                 if (it.hasPrevious()) {
-                    ret = insertCondition.test(it.previous());
+                    ret = insertCondition.test(it.previous(), it.next());
                 }
                 it.next();
-                it.next();
                 return ret;
             };
         }
@@ -246,18 +247,18 @@ public T next() {
         }
         private final Node<Function<String, String>> replacers;
         private final Node<String> insertables;
-        private final Predicate<String> insertCondition;
+        private final BiPredicate<String, String> insertCondition;
 
         /** Initializes a builder for error inserters. */
         public Builder() {
-            this(null, null, s -> true);
+            this(null, null, (s0, s1) -> true);
         }
 
         /** Construct a builder with the given replacers and insertables. */
         private Builder(
             Node<Function<String, String>> replacers,
             Node<String> insertables,
-            Predicate<String> insertCondition
+            BiPredicate<String, String> insertCondition
         ) {
             this.replacers = replacers;
             this.insertables = insertables;
@@ -295,9 +296,10 @@ public Builder insertable(String line) {
         }
 
         /**
-         * Record that for any line X, insertCondition(X) is a necessary condition that a line may be inserted after X.
+         * Record that for any lines X, Y, insertCondition(X, Y) is a necessary condition that a line may be inserted
+         * between X and Y.
          */
-        public Builder insertCondition(Predicate<String> insertCondition) {
+        public Builder insertCondition(BiPredicate<String, String> insertCondition) {
             return new Builder(replacers, insertables, insertCondition.and(insertCondition));
         }
 
@@ -317,13 +319,13 @@ public ErrorInserter get(Random random) {
     private final Random random;
     private final ImmutableList<Function<String, String>> replacers;
     private final ImmutableList<String> insertables;
-    private final Predicate<String> insertCondition;
+    private final BiPredicate<String, String> insertCondition;
 
     private ErrorInserter(
         Random random,
         ImmutableList<Function<String, String>> replacers,
         ImmutableList<String> insertables,
-        Predicate<String> insertCondition
+        BiPredicate<String, String> insertCondition
     ) {
         this.random = random;
         this.replacers = replacers;