fix ticket:5336, set non connector instead of potential

OpenModelica · Feb 13, 2019 · 9ae5692 · 9ae5692
1 parent 19e82ea
commit 9ae5692
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 14 deletions.
diff --git a/Compiler/NFFrontEnd/NFComponent.mo b/Compiler/NFFrontEnd/NFComponent.mo
@@ -62,7 +62,7 @@ constant Component.Attributes DEFAULT_ATTR =
   );
 constant Component.Attributes INPUT_ATTR =
   Component.Attributes.ATTRIBUTES(
-    ConnectorType.POTENTIAL,
+    ConnectorType.NON_CONNECTOR,
     Parallelism.NON_PARALLEL,
     Variability.CONTINUOUS,
     Direction.INPUT,
@@ -74,7 +74,7 @@ constant Component.Attributes INPUT_ATTR =
 
 constant Component.Attributes OUTPUT_ATTR =
   Component.Attributes.ATTRIBUTES(
-    ConnectorType.POTENTIAL,
+    ConnectorType.NON_CONNECTOR,
     Parallelism.NON_PARALLEL,
     Variability.CONTINUOUS,
     Direction.OUTPUT,
@@ -86,7 +86,7 @@ constant Component.Attributes OUTPUT_ATTR =
 
 constant Component.Attributes CONSTANT_ATTR =
   Component.Attributes.ATTRIBUTES(
-    ConnectorType.POTENTIAL,
+    ConnectorType.NON_CONNECTOR,
     Parallelism.NON_PARALLEL,
     Variability.CONSTANT,
     Direction.NONE,
@@ -98,7 +98,7 @@ constant Component.Attributes CONSTANT_ATTR =
 
 constant Component.Attributes IMPL_DISCRETE_ATTR =
   Component.Attributes.ATTRIBUTES(
-    ConnectorType.POTENTIAL,
+    ConnectorType.NON_CONNECTOR,
     Parallelism.NON_PARALLEL,
     Variability.IMPLICITLY_DISCRETE,
     Direction.NONE,
@@ -653,7 +653,7 @@ uniontype Component
       case UNTYPED_COMPONENT(attributes = Attributes.ATTRIBUTES(connectorType = cty)) then cty;
       case TYPED_COMPONENT(attributes = Attributes.ATTRIBUTES(connectorType = cty)) then cty;
       case DELETED_COMPONENT() then connectorType(component.component);
-      else ConnectorType.POTENTIAL;
+      else ConnectorType.NON_CONNECTOR;
     end match;
   end connectorType;
 

diff --git a/Compiler/NFFrontEnd/NFFunction.mo b/Compiler/NFFrontEnd/NFFunction.mo
@@ -1778,7 +1778,7 @@ protected
     var := Component.variability(InstNode.component(component));
 
     // Function components may not be connectors.
-    if cty <> ConnectorType.POTENTIAL then
+    if cty == ConnectorType.FLOW or cty == ConnectorType.STREAM then
       Error.addSourceMessage(Error.INNER_OUTER_FORMAL_PARAMETER,
         {Prefixes.connectorTypeString(cty), InstNode.name(component)},
         InstNode.info(component));

diff --git a/Compiler/NFFrontEnd/NFPrefixes.mo b/Compiler/NFFrontEnd/NFPrefixes.mo
@@ -38,7 +38,8 @@ import Type = NFType;
 type ConnectorType = enumeration(
   POTENTIAL,
   FLOW,
-  STREAM
+  STREAM,
+  NON_CONNECTOR
 );
 
 type Parallelism = enumeration(
@@ -101,6 +102,7 @@ algorithm
     case ConnectorType.POTENTIAL then DAE.ConnectorType.POTENTIAL();
     case ConnectorType.FLOW then DAE.ConnectorType.FLOW();
     case ConnectorType.STREAM then DAE.ConnectorType.STREAM(NONE());
+    case ConnectorType.NON_CONNECTOR then DAE.ConnectorType.NON_CONNECTOR();
   end match;
 end connectorTypeToDAE;
 

diff --git a/Compiler/NFFrontEnd/NFTyping.mo b/Compiler/NFFrontEnd/NFTyping.mo
@@ -366,7 +366,7 @@ algorithm
       flows := c :: flows;
     elseif cty == ConnectorType.STREAM then
       streams := c :: streams;
-    else
+    elseif cty == ConnectorType.POTENTIAL then
       pots := c :: pots;
     end if;
   end for;
@@ -432,13 +432,17 @@ algorithm
         // The Modelica specification forbids using stream outside connector
         // declarations, but has no such restriction for flow. To compromise we
         // print a warning for both flow and stream.
-        if cty <> ConnectorType.POTENTIAL and not checkConnectorType(component) then
-          Error.addSourceMessage(Error.CONNECTOR_PREFIX_OUTSIDE_CONNECTOR,
-            {Prefixes.connectorTypeString(cty)}, InstNode.info(component));
+        if not checkConnectorType(component) then
+          if (cty == ConnectorType.STREAM or cty == ConnectorType.FLOW) then
+            Error.addSourceMessage(Error.CONNECTOR_PREFIX_OUTSIDE_CONNECTOR,
+              {Prefixes.connectorTypeString(cty)}, InstNode.info(component));
+          end if;
           // Remove the prefix from the component, to avoid issues like a flow
           // equation being generated for it.
-          attr.connectorType := ConnectorType.POTENTIAL;
-          InstNode.componentApply(component, Component.setAttributes, attr);
+          if not (InstNode.isEmpty(component) or InstNode.isInnerOuterNode(component)) then
+            attr.connectorType := ConnectorType.NON_CONNECTOR;
+            InstNode.componentApply(component, Component.setAttributes, attr);
+          end if;
         end if;
       then
         ();
@@ -451,7 +455,7 @@ function checkConnectorType
   input InstNode node;
   output Boolean isConnector;
 algorithm
-  if InstNode.isEmpty(node) then
+  if InstNode.isEmpty(node) or InstNode.isInnerOuterNode(node) then
     isConnector := false;
   else
     isConnector := Class.isConnectorClass(InstNode.getClass(node)) or