Changeset 7c3ddb9c in OpenModelica

Timestamp:

2021-11-24T14:03:09+01:00 (2 years ago)

Author:

GitHub <noreply@…>

Branches:

maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

3b96b9d9, 4aff2018, 8213b2c

Parents:

4ff85b39

git-author:

perost <perost86@…> (11/24/21 14:03:09)

git-committer:

GitHub <noreply@…> (11/24/21 14:03:09)

Message:

Flat Modelica fixes (#8215)

• Use Flat Modelica for the dumpFlatModel output if the -f is used.
• Also check the for-range in FlatModel.collectEquationFlatTypes.

Location:

OMCompiler/Compiler/NFFrontEnd

Files:

• NFFlatModel.mo (modified) (1 diff)
• NFInstUtil.mo (modified) (1 diff)

OMCompiler/Compiler/NFFrontEnd/NFFlatModel.mo

@@ -357 +357 @@
       case Equation.FOR()
         algorithm
+          types := Util.applyOptionOrDefault(eq.range,
+            function collectExpFlatTypes(types = types), types);
           types := List.fold(eq.body, collectEquationFlatTypes, types);
         then

OMCompiler/Compiler/NFFrontEnd/NFInstUtil.mo

@@ -59 +59 @@
       print("\n########################################\n\n");
 
-      FlatModel.printString(flat_model);
+      if Flags.getConfigBool(Flags.FLAT_MODELICA) then
+        FlatModel.printFlatString(flat_model, FunctionTree.listValues(functions));
+      else
+        FlatModel.printString(flat_model);
+      end if;
+
       print("\n");
     end if;