Changeset f6e7c77 in OpenModelica

Timestamp:

2012-11-20T10:34:17+01:00 (11 years ago)

Author:

Per Östlund <per.ostlund@…>

Branches:

Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

69de9ca

Parents:

2c58d767

Message:

• Fixed connect with multiple inheritance, in both old and new instantiation.
• Added test case MultipleInheritanceConnect and updated Modelica.Fluid.Examples.HeatingSystem test which is now balanced.

git-svn-id: ​https://openmodelica.org/svn/OpenModelica/trunk@13982 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Location:

Compiler/FrontEnd

Files:

• ConnectUtil.mo (modified) (2 diffs)
• ConnectUtil2.mo (modified) (3 diffs)
• Typing.mo (modified) (7 diffs)

Compiler/FrontEnd/ConnectUtil.mo

@@ -150 +150 @@
       then inChildSets;
 
+    // Check if the node already exists. In that case it's probably due to
+    // multiple inheritance and we should ignore it.
+    case (Connect.SETS(sets = Connect.SET_TRIE_NODE(nodes = nodes)),
+        Connect.SETS(sets = node))
+      equation
+        name = setTrieNodeName(node);
+        _ = setTrieGetNode(name, nodes);
+      then
+        inParentSets;
+
     // In the normal case we add the trie on the child sets to the parent, and
     // also merge their lists of connection crefs and outer connects.
@@ -1253 +1263 @@
   end match;
 end setTrieNewNode;
+
+protected function setTrieNodeName
+  input SetTrieNode inNode;
+  output String outName;
+algorithm
+  outName := match(inNode)
+    local
+      String name;
+
+    case Connect.SET_TRIE_NODE(name = name) then name;
+    case Connect.SET_TRIE_LEAF(name = name) then name;
+    case Connect.SET_TRIE_DELETED(name = name) then name;
+
+  end match;
+end setTrieNodeName;
 
 protected function mergeSets

Compiler/FrontEnd/ConnectUtil2.mo

@@ -683 +683 @@
   "Determines the face of a connector element, i.e. inside or outside. A
    connector element is outside if the first identifier in the cref is a
-   connector, otherwise inside. This function takes the optional component
-   returned from lookupConnectorCref instead of a cref though."
-  input Option<Component> inPrefixComponent;
+   connector, otherwise inside."
+  input DAE.ComponentRef inCref;
+  input Component inComponent;
   output Face outFace;
 algorithm
-  outFace := match(inPrefixComponent)
+  outFace := match(inCref, inComponent)
     local
       Component comp;
@@ -694 +694 @@
       Face face;
 
-    // No prefix component means a simple identifier, i.e. the connector element
-    // itself is the first identifier.
-    case NONE() then Connect2.OUTSIDE();
-
-    // A prefix component, face depends on if it's a connector or not.
-    case SOME(comp)
-      equation
+    // Non-qualified connector crefs are always outside.
+    case (DAE.CREF_IDENT(ident = _), _) then Connect2.OUTSIDE();
+
+    // Qualified connector crefs are allowed to be on two forms: m.c or
+    // c1.c2.c3..., where m is a non-connector component and cN a connector.
+    // To determine the face of a connector we only need to look at the parent
+    // of the given connector element.
+    case (DAE.CREF_QUAL(ident = _), _)
+      equation
+        SOME(comp) = InstUtil.getComponentParent(inComponent);
         is_conn = InstUtil.isConnectorComponent(comp);
         // Connector => outside, not connector => inside.
@@ -709 +712 @@
   end match;
 end getConnectorFace;
-
+        
 public function isConstOrComplexConnector
   input Connector inConnector;

Compiler/FrontEnd/Typing.mo

@@ -1536 +1536 @@
         (cref, comp, pre_comp) =
           lookupConnectorCref(inCref, inPrefix, inSymbolTable, inInfo);
-        (cref, face, is_deleted) = typeConnectorCref2(cref, comp, pre_comp, inInfo);
+        (cref, face, is_deleted) = typeConnectorCref2(cref, inCref, comp, pre_comp, inInfo);
       then
         (cref, face, comp, is_deleted);
@@ -1545 +1545 @@
 protected function typeConnectorCref2
   input DAE.ComponentRef inCref;
+  input DAE.ComponentRef inUnprefixedCref;
   input Option<Component> inComponent;
   input Option<Component> inPrefixComponent;
@@ -1553 +1554 @@
 algorithm
   (outCref, outFace, outIsDeleted) :=
-  match(inCref, inComponent, inPrefixComponent, inInfo)
+  match(inCref, inUnprefixedCref, inComponent, inPrefixComponent, inInfo)
     local
       Face face;
@@ -1563 +1564 @@
 
     // A connector that is part of a deleted conditional component.
-    case (_, NONE(), NONE(), _)
+    case (_, _, NONE(), NONE(), _)
       then (inCref, Connect2.NO_FACE(), true);
 
     // A connector which is itself deleted.
-    case (_, SOME(InstTypes.DELETED_COMPONENT(_)), _, _)
+    case (_, _, SOME(InstTypes.DELETED_COMPONENT(_)), _, _)
       then (inCref, Connect2.NO_FACE(), true);
 
     // A component that should be added to an expandable connector. It can only
     // be outside, since only connectors on the form m.c are inside.
-    case (_, NONE(), SOME(comp), _)
+    case (_, _, NONE(), SOME(comp), _)
       equation
         /* ------------------------------------------------------------------*/
@@ -1585 +1586 @@
 
     // A normal connector.
-    case (cref, SOME(comp), _, _)
+    case (cref, _, SOME(comp), _, _)
       equation
         /* ------------------------------------------------------------------*/
@@ -1591 +1592 @@
         /* ------------------------------------------------------------------*/
         ConnectCheck.checkComponentIsConnector(comp, inPrefixComponent, inCref, inInfo);
-        face = ConnectUtil2.getConnectorFace(inPrefixComponent);
+        face = ConnectUtil2.getConnectorFace(inUnprefixedCref, comp);
         cref = InstUtil.typeCrefWithComponent(cref, comp);
       then
@@ -1653 +1654 @@
       equation
         comp = InstSymbolTable.lookupCref(inCref, inSymbolTable);
-        opt_pre_comp = InstUtil.getComponentParent(comp);
-      then
-        (SOME(comp), opt_pre_comp);
+      then
+        (SOME(comp), NONE());
 
     // If the cref is qualified but we couldn't find it, it might be part of a