- replace list<Env.Frame> with Env.Env

- FFrontEnd: * add names for edges * resolve component types after constrainedby and class extends git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@20217 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Apr 22, 2014 · 3bb32eb · 3bb32eb
1 parent 6bcf8a5
commit 3bb32eb
Show file tree

Hide file tree

Showing 24 changed files with 396 additions and 394 deletions.
diff --git a/Compiler/BackEnd/SimCodeMain.mo b/Compiler/BackEnd/SimCodeMain.mo
@@ -213,7 +213,7 @@ algorithm
     local
       String FMUVersion,filenameprefix,file_dir,resstr;
       DAE.DAElist dae;
-      list<Env.Frame> env;
+      Env.Env env;
       BackendDAE.BackendDAE dlow,dlow_1,indexed_dlow_1;
       list<String> libs;
       GlobalScript.SymbolTable st;
@@ -288,7 +288,7 @@ algorithm
     local
       String filenameprefix,file_dir,resstr,description;
       DAE.DAElist dae;
-      list<Env.Frame> env;
+      Env.Env env;
       BackendDAE.BackendDAE dlow,dlow_1,indexed_dlow_1;
       list<String> libs;
       GlobalScript.SymbolTable st;
@@ -570,7 +570,7 @@ algorithm
     local
       String filenameprefix, file_dir, resstr, description;
       DAE.DAElist dae;
-      list<Env.Frame> env;
+      Env.Env env;
       BackendDAE.BackendDAE dlow, dlow_1, indexed_dlow_1;
       list<String> libs;
       GlobalScript.SymbolTable st;

diff --git a/Compiler/BackEnd/Uncertainties.mo b/Compiler/BackEnd/Uncertainties.mo
@@ -102,7 +102,7 @@ algorithm
 
       DAE.DAElist dae;
       Env.Cache cache;
-      list<Env.Frame> env;
+      Env.Env env;
       Absyn.Program p;
 
       BackendDAE.BackendDAE dlow,dlow_1;
@@ -638,14 +638,14 @@ protected function flattenModel
   input Env.Cache icache;
   output DAE.DAElist daeOut;
   output Env.Cache cacheOut;
-  output list<Env.Frame> envOut;
+  output Env.Env envOut;
 algorithm
 (daeOut,cacheOut,envOut):=matchcontinue(className,p,icache)
   local
     list<SCode.Element> p_1;
     Absyn.Program ptot;
     DAE.DAElist dae;
-    list<Env.Frame> env;
+    Env.Env env;
     Real timeFrontend;
     String resstr;
     Env.Cache cache;

diff --git a/Compiler/FFrontEnd/FExpand.mo b/Compiler/FFrontEnd/FExpand.mo
@@ -126,13 +126,6 @@ algorithm
         lst = List.consr(lst, System.getTimerIntervalTime());
         print("Derived:        " +& realString(List.first(lst)) +& "\n");
 
-        System.startTimer();
-        // resolve type paths
-        g = FResolve.ty(FGraph.top(g), g);
-        System.stopTimer();
-        lst = List.consr(lst, System.getTimerIntervalTime());
-        print("ComponentTypes: " +& realString(List.first(lst)) +& "\n");
-
         System.startTimer();
         // resolve type paths for constrain classes
         g = FResolve.cc(FGraph.top(g), g);
@@ -147,6 +140,13 @@ algorithm
         lst = List.consr(lst, System.getTimerIntervalTime());
         print("ClassExtends:   " +& realString(List.first(lst)) +& "\n");
 
+        System.startTimer();
+        // resolve type paths
+        g = FResolve.ty(FGraph.top(g), g);
+        System.stopTimer();
+        lst = List.consr(lst, System.getTimerIntervalTime());
+        print("ComponentTypes: " +& realString(List.first(lst)) +& "\n");
+
         System.startTimer();
         // resolve all component references
         g = FResolve.cr(FGraph.top(g), g);

diff --git a/Compiler/FFrontEnd/FGraphBuild.mo b/Compiler/FFrontEnd/FGraphBuild.mo
@@ -1283,12 +1283,11 @@ algorithm
         // ignore basic types and builtins
         true = not FNode.isRefBasicType(inTargetRef) and
                not FNode.isRefBuiltin(inTargetRef);
-
+
+        /*
         // if target is a reference found on the way
         // to the top from parent ref do not clone!
         true = listMember(inTargetRef, FNode.originalScope(inParentRef));
-
-        /*
         // if the first non implicit scope of target
         // and parent are the same do not clone
         true = referenceEq(

diff --git a/Compiler/FFrontEnd/FGraphStream.mo b/Compiler/FFrontEnd/FGraphStream.mo
@@ -139,12 +139,13 @@ algorithm
 end node;
 
 public function edge
+  input Name name;
   input Node source;
   input Node target;
 algorithm
-  _ := matchcontinue(source, target)
+  _ := matchcontinue(name, source, target)
 
-    case (_, _)
+    case (_, _, _)
       equation
         true = Flags.isSet(Flags.GRAPH_INST_SHOW_GRAPH);
 
@@ -165,7 +166,9 @@ algorithm
         false = FNode.isIn(target, FNode.isRefSection);
         false = FNode.isIn(target, FNode.isRefMod);
         false = FNode.isIn(target, FNode.isRefDims);
+        
         GraphStream.addEdge("default", "omc", -1, intString(FNode.id(source)), intString(FNode.id(target)), false);
+        GraphStream.addEdgeAttribute("default", "omc", -1, intString(FNode.id(source)), intString(FNode.id(target)), "ui.label", Values.STRING(name));
       then
         ();
 

diff --git a/Compiler/FFrontEnd/FNode.mo b/Compiler/FFrontEnd/FNode.mo
@@ -288,7 +288,7 @@ algorithm
   FCore.N(n, i, p, c, d) := fromRef(inParentRef);
   c := avlTreeAdd(c, inName, inChildRef);
   parent := updateRef(inParentRef, FCore.N(n, i, p, c, d));
-  FGraphStream.edge(fromRef(parent), fromRef(inChildRef));
+  FGraphStream.edge(inName, fromRef(parent), fromRef(inChildRef));
 end addChildRef;
 
 public function addImportToRef

diff --git a/Compiler/FrontEnd/Builtin.mo b/Compiler/FrontEnd/Builtin.mo
@@ -565,7 +565,7 @@ public function initialEnv
     others."
   input Env.Cache inCache;
   output Env.Cache outCache;
-  output list<Env.Frame> env;
+  output Env.Env env;
 protected
   Env.Cache cache;
 algorithm
@@ -678,12 +678,12 @@ algorithm
 end initialEnv;
 
 protected function initialEnvMetaModelica
-  input list<Env.Frame> inEnv;
-  output list<Env.Frame> outEnv;
+  input Env.Env inEnv;
+  output Env.Env outEnv;
 algorithm
   outEnv := matchcontinue(inEnv)
     local
-      list<Env.Frame> env;
+      Env.Env env;
     case (env)
       equation
         true = Config.acceptMetaModelicaGrammar();