[NF] Fix checkConnectorType for derived nodes.

Belonging to [master]: - #2933
OpenModelica · Feb 14, 2019 · 33c5dba · 33c5dba
1 parent 1afef5f
commit 33c5dba
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/3rdParty b/3rdParty
diff --git a/Compiler/NFFrontEnd/NFConnectEquations.mo b/Compiler/NFFrontEnd/NFConnectEquations.mo
@@ -95,6 +95,12 @@ algorithm
       case ConnectorType.POTENTIAL then potfunc(set);
       case ConnectorType.FLOW then generateFlowEquations(set);
       case ConnectorType.STREAM then generateStreamEquations(set, flowThreshold);
+      else
+        algorithm
+          Error.addInternalError("Invalid connector type on set "
+            + List.toString(set, Connector.toString, "", "{", ", ", "}", true), sourceInfo());
+        then
+          fail();
     end match;
 
     equations := listAppend(set_eql, equations);

diff --git a/Compiler/NFFrontEnd/NFTyping.mo b/Compiler/NFFrontEnd/NFTyping.mo
@@ -457,12 +457,14 @@ end checkComponentAttributes;
 function checkConnectorType
   input InstNode node;
   output Boolean isConnector;
+protected
+  InstNode dnode = InstNode.getDerivedNode(node);
 algorithm
-  if InstNode.isEmpty(node) or InstNode.isInnerOuterNode(node) then
+  if InstNode.isEmpty(dnode) or InstNode.isInnerOuterNode(dnode) then
     isConnector := false;
   else
-    isConnector := Class.isConnectorClass(InstNode.getClass(node)) or
-                   checkConnectorType(InstNode.parent(node));
+    isConnector := Class.isConnectorClass(InstNode.getClass(dnode)) or
+                   checkConnectorType(InstNode.parent(dnode));
   end if;
 end checkConnectorType;