Merge remote-tracking branch 'origin/master' into icon-attribute

lf-lang · Aug 18, 2022 · aa99002 · aa99002
2 parents bac0c0c + 0d2f64e
commit aa99002
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/org.lflang.diagram/src/log4j.xml b/org.lflang.diagram/src/log4j.xml
@@ -1,9 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd" >
 <log4j:configuration>
-
     <category name="org.eclipse.xtext.linking.impl">
         <priority value="off"/>
     </category>
-
+    <category name="org.eclipse.xtext.validation">
+        <priority value="off"/>
+    </category>
+    <category name="org.eclipse.xtext.parser.antlr">
+        <priority value="off"/>
+    </category>
+    <category name="org.eclipse.xtext.util">
+        <priority value="off"/>
+    </category>
 </log4j:configuration>
diff --git a/org.lflang.diagram/src/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java b/org.lflang.diagram/src/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
@@ -259,6 +259,9 @@ public List<DisplayedActionData> getDisplayedActions() {
     @Override
     public KNode transform(final Model model) {
         KNode rootNode = _kNodeExtensions.createNode();
+        setLayoutOption(rootNode, CoreOptions.ALGORITHM, LayeredOptions.ALGORITHM_ID);
+        setLayoutOption(rootNode, CoreOptions.DIRECTION, Direction.RIGHT);
+        setLayoutOption(rootNode, CoreOptions.PADDING, new ElkPadding(0));
 
         try {
             // Find main
@@ -301,6 +304,7 @@ public KNode transform(final Model model) {
                         }
                         _kRenderingExtensions.addInvisibleContainerRendering(child);
                         setLayoutOption(child, CoreOptions.ALGORITHM, LayeredOptions.ALGORITHM_ID);
+                        setLayoutOption(child, CoreOptions.DIRECTION, Direction.RIGHT);
                         setLayoutOption(child, CoreOptions.PADDING, new ElkPadding(0));
                         // Legacy ordering option.
                         setLayoutOption(child, CoreOptions.PRIORITY, reactorNodes.size() - index); // Order!

diff --git a/org.lflang/META-INF/MANIFEST.MF b/org.lflang/META-INF/MANIFEST.MF
@@ -25,6 +25,7 @@ Require-Bundle: org.eclipse.xtext,
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Export-Package: org.lflang,
  org.lflang.generator,
+ org.lflang.generator.c,
  org.lflang.graph,
  org.lflang.lf,
  org.lflang.lf.impl,

diff --git a/org.lflang/src/org/lflang/generator/TargetTypes.java b/org.lflang/src/org/lflang/generator/TargetTypes.java
@@ -163,7 +163,7 @@ default String getTargetType(InferredType type) {
         } else if (type.isVariableSizeList) {
             return getTargetVariableSizeListType(type.baseType());
         }
-        return type.toText();
+        return type.toOriginalText();
     }
 
     /**