Changeset 3eae525 in OpenModelica

Timestamp:

2021-11-26T17:34:24+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:

6ec8257, b3681ace

Parents:

da94d68a

git-author:

perost <perost86@…> (11/26/21 17:34:24)

git-committer:

GitHub <noreply@…> (11/26/21 17:34:24)

Message:

Improve Flat Modelica output (#8231)

• Only print visibility for blocks of variables, not for every variable.
• Remove unnecessary public section at end of variable list.

Fixes #8227.

Files:

• OMCompiler/Compiler/NFFrontEnd/NFFlatModel.mo (modified) (3 diffs)
• OMCompiler/Compiler/NFFrontEnd/NFVariable.mo (modified) (2 diffs)
• testsuite/flattening/modelica/scodeinst/CombineSubscripts3.mo (modified) (1 diff)
• testsuite/openmodelica/flatmodelica/SD.mo (modified) (1 diff)

OMCompiler/Compiler/NFFrontEnd/NFFlatModel.mo

@@ -53 +53 @@
   import MetaModelica.Dangerous.listReverseInPlace;
   import Util;
+  import Prefixes = NFPrefixes;
+  import NFPrefixes.Visibility;
 
   import FlatModel = NFFlatModel;
@@ -214 +216 @@
   protected
     FlatModel flat_model = flatModel;
+    Visibility visibility = Visibility.PUBLIC;
   algorithm
     s := IOStream.append(s, "class '" + flat_model.name + "'\n");
@@ -232 +235 @@
 
     for v in flat_model.variables loop
+      if visibility <> Variable.visibility(v) then
+        visibility := Variable.visibility(v);
+        s := IOStream.append(s, Prefixes.visibilityString(visibility));
+        s := IOStream.append(s, "\n");
+      end if;
+
       s := Variable.toFlatStream(v, "  ", printBindingTypes, s);
       s := IOStream.append(s, ";\n");
     end for;
-
-    s := IOStream.append(s, "public\n");
 
     if not listEmpty(flat_model.initialEquations) then

OMCompiler/Compiler/NFFrontEnd/NFVariable.mo

@@ -163 +163 @@
   end variability;
 
+  function visibility
+    input Variable variable;
+    output Visibility visibility = variable.visibility;
+  end visibility;
+
   function isEmptyArray
     input Variable variable;
@@ -317 +322 @@
     s := IOStream.append(s, indent);
 
-    if var.visibility == Visibility.PROTECTED then
-      s := IOStream.append(s, "protected ");
-    else
-      s := IOStream.append(s, "public ");
-    end if;
-
     s := Component.Attributes.toFlatStream(var.attributes, var.ty, s, ComponentRef.isSimple(var.name));
     s := IOStream.append(s, Type.toFlatString(var.ty));

testsuite/flattening/modelica/scodeinst/CombineSubscripts3.mo

@@ -22 +22 @@
 // Result:
 // class 'CombineSubscripts3'
-//   public Real[3] 'b.p';
-//   public Real[3, 4] 'b.x';
-// public
+//   Real[3] 'b.p';
+//   Real[3, 4] 'b.x';
 // equation
 //   for 'i' in 1:3 loop

testsuite/openmodelica/flatmodelica/SD.mo

@@ -44 +44 @@
 // Result:
 // class 'SD'
-//   public parameter Integer 'N' = 3;
-//   public parameter Real[3] 'p' = {1.0, 1.5, 2.0};
-//   public Real[3] 'c.c.f';
-//   public Real[3] 'c.c.e';
-//   public Real[3, {3, 4, 5}] 'c.x';
-//   public parameter Real[3] 'c.p' = 'p'[:];
-//   public parameter Integer[3] 'c.N' = {3, 4, 5};
-//   public parameter Real 's.p' = 3.0;
-//   public Real 's.c.e';
-//   public Real 's.c.f';
-// public
+//   parameter Integer 'N' = 3;
+//   parameter Real[3] 'p' = {1.0, 1.5, 2.0};
+//   Real[3] 'c.c.f';
+//   Real[3] 'c.c.e';
+//   Real[3, {3, 4, 5}] 'c.x';
+//   parameter Real[3] 'c.p' = 'p'[:];
+//   parameter Integer[3] 'c.N' = {3, 4, 5};
+//   parameter Real 's.p' = 3.0;
+//   Real 's.c.e';
+//   Real 's.c.f';
 // equation
 //   'c.x'[:,1] = 'c.c.e'[:];