experimental support for merging alg sections, ticket:4365

Author: adrpo

Compiler/FrontEnd/DAEUtil.mo

@@ -6445,6 +6445,64 @@ algorithm
   end match;
 end toSCodeConnectorType;
 
+public function mergeAlgorithmSections
+"@author: adrpo
+ experimental merging of all algorithm sections into:
+ - one for initial algorithms
+ - one for normal algorithms
+ - only happens on a flag (-d=mergeAlgSections)"
+  input DAE.DAElist inDae;
+  output DAE.DAElist outDae;
+protected
+  list<DAE.Element> els, newEls = {}, dAElist;
+  list<DAE.Statement> istmts = {}, stmts = {}, s;
+  DAE.ElementSource source, src;
+  DAE.Ident ident;
+  Option<SCode.Comment> comment;
+algorithm
+  // do nothing if the flag is not activated
+  if not Flags.isSet(Flags.MERGE_ALGORITHM_SECTIONS) then
+    outDae := inDae;
+    return;
+  end if;
+
+  DAE.DAE(els) := inDae;
+  for e in els loop
+    _ :=
+    match e
+      case DAE.COMP(ident, dAElist, src, comment)
+        equation
+          DAE.DAE(dAElist) = mergeAlgorithmSections(DAE.DAE(dAElist));
+          newEls = DAE.COMP(ident, dAElist, src, comment)::newEls;
+        then
+          ();
+
+      case DAE.ALGORITHM(algorithm_ = DAE.ALGORITHM_STMTS(s), source = source)
+        equation
+          stmts = listAppend(stmts, s);
+        then ();
+      case DAE.INITIALALGORITHM(algorithm_ = DAE.ALGORITHM_STMTS(s), source = source)
+        equation
+          istmts = listAppend(istmts, s);
+        then ();
+      else
+        equation
+          newEls = e::newEls;
+        then ();
+    end match;
+  end for;
+  newEls := listReverse(newEls);
+  if not listEmpty(istmts) then
+    newEls := listAppend(newEls, {DAE.INITIALALGORITHM(DAE.ALGORITHM_STMTS(istmts), source)});
+  end if;
+  if not listEmpty(stmts) then
+    newEls := listAppend(newEls, {DAE.ALGORITHM(DAE.ALGORITHM_STMTS(stmts), source)});
+  end if;
+
+  outDae := DAE.DAE(newEls);
+
+end mergeAlgorithmSections;
+
 annotation(__OpenModelica_Interface="frontend");
 end DAEUtil;
 

Compiler/Script/CevalScriptBackend.mo

@@ -2883,6 +2883,8 @@ algorithm
         //print("\nInst.instantiateClass");
         (cache,env,_,dae) = Inst.instantiateClass(cache,InnerOuter.emptyInstHierarchy,scodeP,className);
 
+        dae = DAEUtil.mergeAlgorithmSections(dae);
+
         //FGraphDump.dumpGraph(env, "F:\\dev\\" + Absyn.pathString(className) + ".graph.graphml");
 
         //System.stopTimer();

Compiler/Util/Flags.mo

@@ -511,6 +511,8 @@ constant DebugFlag NF_UNITCHECK = DEBUG_FLAG(168, "frontEndUnitCheck", false,
   Util.gettext("Checks the consistency of units in equation."));
 constant DebugFlag DISABLE_COLORING = DEBUG_FLAG(169, "disableColoring", false,
   Util.gettext("Disables coloring algorithm while spasity detection."));
+constant DebugFlag MERGE_ALGORITHM_SECTIONS = DEBUG_FLAG(170, "mergeAlgSections", false,
+  Util.gettext("Disables coloring algorithm while spasity detection."));
 
 
 // This is a list of all debug flags, to keep track of which flags are used. A
@@ -687,7 +689,8 @@ constant list<DebugFlag> allDebugFlags = {
   PARTITION_INITIALIZATION,
   EVAL_PARAM_DUMP,
   NF_UNITCHECK,
-  DISABLE_COLORING
+  DISABLE_COLORING,
+  MERGE_ALGORITHM_SECTIONS
 };
 
 public