Moved function from AbsynToSCode that belong to Inst

OpenModelica · Aug 16, 2019 · c59e7a8 · c59e7a8
1 parent 4d7ee8a
commit c59e7a8
Show file tree

Hide file tree

Showing 9 changed files with 522 additions and 814 deletions.
diff --git a/OMCompiler/Compiler/FFrontEnd/FGraphBuild.mo b/OMCompiler/Compiler/FFrontEnd/FGraphBuild.mo
@@ -70,6 +70,7 @@ import List;
 import AbsynToSCode;
 import SCodeDump;
 import SCodeUtil;
+import SCodeInstUtil;
 import Util;
 import FMod;
 
@@ -130,7 +131,7 @@ algorithm
 
     case (_, _, _, g)
       equation
-        cls = AbsynToSCode.expandEnumerationClass(inClass);
+        cls = SCodeInstUtil.expandEnumerationClass(inClass);
         SCode.CLASS(name = name, classDef = cdef) = cls;
         (g, n) = FGraph.node(g, name, {inParentRef}, FCore.CL(cls, Prefix.NOPRE(), DAE.NOMOD(), inKind, FCore.VAR_UNTYPED()));
         nr = FNode.toRef(n);

diff --git a/OMCompiler/Compiler/FFrontEnd/FGraphBuildEnv.mo b/OMCompiler/Compiler/FFrontEnd/FGraphBuildEnv.mo
@@ -72,6 +72,7 @@ protected
 import List;
 import AbsynToSCode;
 import SCodeDump;
+import SCodeInstUtil;
 import SCodeUtil;
 import Util;
 
@@ -139,7 +140,7 @@ algorithm
 
     case (_, _, _, _, _, g)
       equation
-        cls = AbsynToSCode.expandEnumerationClass(inClass);
+        cls = SCodeInstUtil.expandEnumerationClass(inClass);
         SCode.CLASS(name = name) = cls;
         (g, n) = FGraph.node(g, name, {inParentRef}, FCore.CL(cls, inPrefix, inMod, inKind, FCore.CLS_UNTYPED()));
         nr = FNode.toRef(n);