[NF] stream connector improvements.

- Reenable special handling for inStream/actualStream.
- Handle arrays in BuiltinCall.typeActualInStreamCall.
- Check that components with flow or stream prefix has Real type.

Belonging to [master]:
  - OpenModelica/OpenModelica#152
  - #3062

Author: perost

Compiler/NFFrontEnd/NFBuiltinCall.mo

@@ -1789,35 +1789,60 @@ protected
     end if;
 
     (arg, ty, var) := Typing.typeExp(listHead(args), origin, info);
+    arg := ExpandExp.expand(arg);
 
-    // The argument of actualStream/inStream must be a component reference.
-    if not Expression.isCref(arg) then
-      Error.addSourceMessage(Error.ARGUMENT_MUST_BE_VARIABLE,
-            {"First", ComponentRef.toString(fn_ref), "<REMOVE ME>"}, info);
-      fail();
-    end if;
+    {fn} := Function.typeRefCache(fn_ref);
+    callExp := typeActualInStreamCall2(name, fn, arg, var, info);
+  end typeActualInStreamCall;
 
-    arg_ref := Expression.toCref(arg);
-    arg_node := ComponentRef.node(arg_ref);
+  function typeActualInStreamCall2
+    input String name;
+    input Function fn;
+    input Expression arg;
+    input Variability var;
+    input SourceInfo info;
+    output Expression callExp;
+  algorithm
+    callExp := match arg
+      local
+        InstNode arg_node;
 
-    // The argument of actualStream/inStream must be a stream variable.
-    if not InstNode.isComponent(arg_node) or
-       not ConnectorType.isStream(Component.connectorType(InstNode.component(arg_node))) then
-      Error.addSourceMessageAndFail(Error.NON_STREAM_OPERAND_IN_STREAM_OPERATOR,
-        {ComponentRef.toString(arg_ref), name}, info);
-    end if;
+      case Expression.CREF()
+        algorithm
+          arg_node := ComponentRef.node(arg.cref);
 
-    // The argument of actualStream/inStream must have subscripts that can be evaluated.
-    for sub in ComponentRef.subscriptsAllFlat(arg_ref) loop
-      if Subscript.variability(sub) > Variability.PARAMETER then
-        Error.addSourceMessageAndFail(Error.CONNECTOR_NON_PARAMETER_SUBSCRIPT,
-          {ComponentRef.toString(arg_ref), Subscript.toString(sub)}, info);
-      end if;
-    end for;
+          // The argument of actualStream/inStream must be a stream variable.
+          if not InstNode.isComponent(arg_node) or
+             not ConnectorType.isStream(Component.connectorType(InstNode.component(arg_node))) then
+            Error.addSourceMessageAndFail(Error.NON_STREAM_OPERAND_IN_STREAM_OPERATOR,
+              {ComponentRef.toString(arg.cref), name}, info);
+          end if;
 
-    {fn} := Function.typeRefCache(fn_ref);
-    callExp := Expression.CALL(Call.makeTypedCall(fn, {arg}, var, ty));
-  end typeActualInStreamCall;
+          // The argument of actualStream/inStream must have subscripts that can be evaluated.
+          for sub in ComponentRef.subscriptsAllFlat(arg.cref) loop
+            if Subscript.variability(sub) > Variability.PARAMETER then
+              Error.addSourceMessageAndFail(Error.CONNECTOR_NON_PARAMETER_SUBSCRIPT,
+                {ComponentRef.toString(arg.cref), Subscript.toString(sub)}, info);
+            end if;
+          end for;
+        then
+          Expression.CALL(Call.makeTypedCall(fn, {arg}, var, arg.ty));
+
+      case Expression.ARRAY()
+        algorithm
+          arg.elements := list(typeActualInStreamCall2(name, fn, e, var, info) for e in arg.elements);
+        then
+          arg;
+
+      else
+        algorithm
+          Error.addSourceMessage(Error.NON_STREAM_OPERAND_IN_STREAM_OPERATOR,
+            {Expression.toString(arg), name}, info);
+        then
+          fail();
+
+    end match;
+  end typeActualInStreamCall2;
 
 annotation(__OpenModelica_Interface="frontend");
 end NFBuiltinCall;

Compiler/NFFrontEnd/NFFunction.mo

@@ -1380,7 +1380,7 @@ uniontype Function
         special := match Absyn.pathFirstIdent(path)
           // Can have variable number of arguments.
           case "array" then true;
-          //case "actualStream" then true;
+          case "actualStream" then true;
           case "branch" then true;
           case "cardinality" then true;
           case "cat" then true;
@@ -1396,7 +1396,7 @@ uniontype Function
           case "getInstanceName" then true;
           // Always discrete.
           case "initial" then true;
-          //case "inStream" then true;
+          case "inStream" then true;
           case "isRoot" then true;
           // Arguments can be scalar, vector, matrix, 3d array .... basically anything
           // We need to make sure size(Arg,i) = 1 for 2 < i <= ndims(Arg).

Compiler/NFFrontEnd/NFTyping.mo

@@ -415,6 +415,9 @@ algorithm
         ty := Type.liftArrayLeftList(ty, arrayList(c.dimensions));
         InstNode.updateComponent(Component.setType(ty, c), node);
 
+        // Check that flow/stream variables are Real.
+        checkComponentStreamAttribute(c.attributes.connectorType, ty, component);
+
         // Type the component's children.
         typeComponents(c.classInst, origin);
       then
@@ -435,6 +438,23 @@ algorithm
   end match;
 end typeComponent;
 
+function checkComponentStreamAttribute
+  input ConnectorType.Type cty;
+  input Type ty;
+  input InstNode component;
+protected
+  Type ety;
+algorithm
+  if ConnectorType.isFlowOrStream(cty) then
+    ety := Type.arrayElementType(ty);
+
+    if not (Type.isReal(ety) or Type.isComplex(ety)) then
+      Error.addSourceMessageAndFail(Error.NON_REAL_FLOW_OR_STREAM,
+        {ConnectorType.toString(cty), InstNode.name(component)}, InstNode.info(component));
+    end if;
+  end if;
+end checkComponentStreamAttribute;
+
 function checkConnectorType
   input InstNode node;
   output Boolean isConnector;

Compiler/Util/Error.mo

@@ -425,7 +425,7 @@ public constant Message TUPLE_ASSIGN_CREFS_ONLY = MESSAGE(147, TRANSLATION(), ER
 public constant Message LOOKUP_FUNCTION_GOT_CLASS = MESSAGE(148, TRANSLATION(), ERROR(),
   Util.gettext("Looking for a function %s but found a %s."));
 public constant Message NON_STREAM_OPERAND_IN_STREAM_OPERATOR = MESSAGE(149, TRANSLATION(), ERROR(),
-  Util.gettext("Operand %s to operator %s is not a stream variable."));
+  Util.gettext("Operand ‘%s‘ to operator ‘%s‘ is not a stream variable."));
 public constant Message UNBALANCED_CONNECTOR = MESSAGE(150, TRANSLATION(), WARNING(),
   Util.gettext("Connector %s is not balanced: %s"));
 public constant Message RESTRICTION_VIOLATION = MESSAGE(151, TRANSLATION(), ERROR(),
@@ -829,6 +829,8 @@ public constant Message WHEN_IF_VARIABLE_MISMATCH = MESSAGE(350, TRANSLATION(),
   Util.gettext("The branches of an if-equation inside a when-equation must have the same set of component references on the left-hand side."));
 public constant Message DIMENSION_DEDUCTION_FROM_BINDING_FAILURE = MESSAGE(351, TRANSLATION(), ERROR(),
   Util.gettext("Dimension %s of ‘%s‘ could not be deduced from the component's binding equation ‘%s‘."));
+public constant Message NON_REAL_FLOW_OR_STREAM = MESSAGE(351, TRANSLATION(), ERROR(),
+  Util.gettext("Invalid prefix ‘%s‘ on non-Real component ‘%s‘."));
 public constant Message INITIALIZATION_NOT_FULLY_SPECIFIED = MESSAGE(496, TRANSLATION(), WARNING(),
   Util.gettext("The initial conditions are not fully specified. %s."));
 public constant Message INITIALIZATION_OVER_SPECIFIED = MESSAGE(497, TRANSLATION(), WARNING(),