- Lots of connection handling in the new instantiation.

- Cleaned up BaseHashTable a bit. git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@13240 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Oct 8, 2012 · 807c294 · 807c294
1 parent 39baea0
commit 807c294
Show file tree

Hide file tree

Showing 14 changed files with 1,843 additions and 1,293 deletions.
diff --git a/Compiler/FrontEnd/ComponentReference.mo b/Compiler/FrontEnd/ComponentReference.mo
diff --git a/Compiler/FrontEnd/Connect2.mo b/Compiler/FrontEnd/Connect2.mo
@@ -81,6 +81,9 @@ public uniontype ConnectorAttr
   end CONN_ATTR;
 end ConnectorAttr;
 
+public constant ConnectorAttr DEFAULT_ATTR =
+  CONN_ATTR(DAE.VARIABLE(), DAE.PUBLIC(), DAE.BIDIR());
+
 public uniontype Connection
   record CONNECTION
     Connector lhs;
@@ -114,11 +117,12 @@ end Root;
 public uniontype Connections
   record CONNECTIONS
     list<Connection> connections;
+    list<Connection> expandableConnections;
     list<Connection> branches;
     list<Root> roots;
   end CONNECTIONS;
 end Connections;
 
-public constant Connections emptyConnections := CONNECTIONS({}, {}, {});
+public constant Connections emptyConnections := CONNECTIONS({}, {}, {}, {});
 
 end Connect2;
diff --git a/Compiler/FrontEnd/ConnectCheck.mo b/Compiler/FrontEnd/ConnectCheck.mo
@@ -264,11 +264,25 @@ algorithm
       then
         ();
 
+    // Both connectors are undeclared, show error.
+    case (_, POTENTIALLY_PRESENT(), _, POTENTIALLY_PRESENT(),
+        (lhs_cref, rhs_cref, info))
+      equation
+        cref_str1 = ComponentReference.printComponentRefStr(lhs_cref);
+        cref_str2 = ComponentReference.printComponentRefStr(rhs_cref);
+        Error.addSourceMessage(Error.UNDECLARED_CONNECTION,
+          {cref_str1, cref_str2}, info);
+      then
+        fail();
+
     // One of the connectors is only potentially present
     case (_, POTENTIALLY_PRESENT(), _, _, _) then ();
     case (_, _, _, POTENTIALLY_PRESENT(), _) then ();
 
     // Both connectors are expandable, check them later.
+    /*-----------------------------------------------------------------------*/
+    // TODO: Check that none of them contains flow components.
+    /*-----------------------------------------------------------------------*/
     case (_, EXPANDABLE_CONNECTOR(), _, EXPANDABLE_CONNECTOR(), _) then ();
 
     // One is expandable and one is non-expandable, show error.