[NF] Improved handling of function parameter dims.

- Allow function parameter dimensions to be unknown or continuous. - Improved typing of size when size can't be evaluated. - Fixed type of min/max of array. Belonging to [master]: - OpenModelica/OMCompiler#2028 - OpenModelica/OpenModelica-testsuite#784
OpenModelica · Nov 16, 2017 · 2fe6fb8 · 2fe6fb8
1 parent 6136400
commit 2fe6fb8
Show file tree

Hide file tree

Showing 5 changed files with 92 additions and 64 deletions.
diff --git a/Compiler/NFFrontEnd/NFCall.mo b/Compiler/NFFrontEnd/NFCall.mo
@@ -570,6 +570,7 @@ uniontype Call
           if nArgs == 1 then
             {(e,ty,variability)} := tyArgs;
             es := {e};
+            ty := Type.arrayElementType(ty);
           else
             {(e1,ty1,variability1),(e2,ty2,variability2)} := tyArgs;
             es := {e1,e2};

diff --git a/Compiler/NFFrontEnd/NFCeval.mo b/Compiler/NFFrontEnd/NFCeval.mo
@@ -138,7 +138,7 @@ algorithm
       algorithm
         dim := listGet(Type.arrayDims(Expression.typeOf(exp.exp)), Expression.toInteger(evalExp(exp1, target)));
       then
-        Expression.INTEGER(Dimension.size(dim));
+        if Dimension.isKnown(dim) then Expression.INTEGER(Dimension.size(dim)) else exp;
 
     case Expression.SIZE()
       algorithm

diff --git a/Compiler/NFFrontEnd/NFSimplifyExp.mo b/Compiler/NFFrontEnd/NFSimplifyExp.mo
@@ -99,11 +99,6 @@ algorithm
       then
         Expression.CALL(call);
 
-    case Expression.SIZE()
-      algorithm
-        assert(false, "Unimplemented case for " + Expression.toString(exp) + " in " + getInstanceName());
-      then fail();
-
     case Expression.BINARY()
       algorithm
         exp1 := simplifyExp(exp.exp1);
@@ -181,11 +176,6 @@ algorithm
         assert(false, "Unimplemented case for " + Expression.toString(exp) + " in " + getInstanceName());
       then fail();
 
-    case Expression.SIZE()
-      algorithm
-        assert(false, "Unimplemented case for " + Expression.toString(exp) + " in " + getInstanceName());
-      then fail();
-
     case Expression.BINARY(exp1=Expression.INTEGER(value=i1), exp2=Expression.INTEGER(value=i2))
       then match exp.operator
         case Operator.ADD() then Expression.INTEGER(i1 + i2);

diff --git a/Compiler/NFFrontEnd/NFTypeCheck.mo b/Compiler/NFFrontEnd/NFTypeCheck.mo
@@ -2435,7 +2435,7 @@ algorithm
           end for;
         end if;
 
-        (exp, ty, ty_match) := matchTypes(binding.bindingType, comp_ty, binding.bindingExp);
+        (exp, ty, ty_match) := matchTypes(binding.bindingType, comp_ty, binding.bindingExp, true);
 
         if not isCompatibleMatch(ty_match) then
           Error.addSourceMessage(Error.VARIABLE_BINDING_TYPE_MISMATCH,
@@ -2458,12 +2458,11 @@ algorithm
   end match;
 end matchBinding;
 
-function checkDimension
-  "Checks that an expression used as a dimension is a parameter expression and
-   has a valid type for a dimension, otherwise prints an error and fails."
+function checkDimensionType
+  "Checks that an expression used as a dimension has a valid type for a
+   dimension, otherwise prints an error and fails."
   input Expression exp;
   input Type ty;
-  input Variability var;
   input SourceInfo info;
 algorithm
   if not Type.isInteger(ty) then
@@ -2478,13 +2477,7 @@ algorithm
           fail();
     end match;
   end if;
-
-  if var > Variability.PARAMETER then
-    Error.addSourceMessage(Error.DIMENSION_NOT_KNOWN,
-      {Expression.toString(exp)}, info);
-    fail();
-  end if;
-end checkDimension;
+end checkDimensionType;
 
 annotation(__OpenModelica_Interface="frontend");
 end NFTypeCheck;
diff --git a/Compiler/NFFrontEnd/NFTyping.mo b/Compiler/NFFrontEnd/NFTyping.mo
@@ -100,13 +100,14 @@ uniontype TypingError
 end TypingError;
 
 type EquationScope = enumeration(NORMAL, INITIAL, IF, IF_PARAMETER);
+type ClassScope = enumeration(CLASS, FUNCTION);
 
 public
 function typeClass
   input InstNode cls;
   input String name;
 algorithm
-  typeComponents(cls);
+  typeComponents(cls, ClassScope.CLASS);
   execStat("NFTyping.typeComponents(" + name + ")");
   typeBindings(cls, cls);
   execStat("NFTyping.typeBindings(" + name + ")");
@@ -117,13 +118,14 @@ end typeClass;
 function typeFunction
   input InstNode cls;
 algorithm
-  typeComponents(cls);
+  typeComponents(cls, ClassScope.FUNCTION);
   typeBindings(cls, cls);
   typeSections(cls);
 end typeFunction;
 
 function typeComponents
   input InstNode cls;
+  input ClassScope clsScope;
 protected
   Class c = InstNode.getClass(cls), c2;
   ClassTree cls_tree;
@@ -133,7 +135,7 @@ algorithm
     case Class.INSTANCED_CLASS(elements = cls_tree as ClassTree.FLAT_TREE())
       algorithm
         for c in cls_tree.components loop
-          typeComponent(c);
+          typeComponent(c, clsScope);
         end for;
       then
         ();
@@ -147,7 +149,7 @@ algorithm
         // But keep the restriction.
         c2 := Class.setRestriction(c.restriction, c2);
         InstNode.updateClass(c2, cls);
-        typeComponents(cls);
+        typeComponents(cls, clsScope);
       then
         ();
 
@@ -204,6 +206,7 @@ end makeConnectorType;
 
 function typeComponent
   input InstNode component;
+  input ClassScope clsScope;
   output Type ty;
 protected
   InstNode node = InstNode.resolveOuter(component);
@@ -214,7 +217,7 @@ algorithm
     case Component.UNTYPED_COMPONENT()
       algorithm
         // Type the component's dimensions.
-        typeDimensions(c.dimensions, node, c.binding, c.info);
+        typeDimensions(c.dimensions, node, c.binding, clsScope, c.info);
 
         // Construct the type of the component and update the node with it.
         ty := Type.liftArrayLeftList(makeClassType(c.classInst), arrayList(c.dimensions));
@@ -224,7 +227,7 @@ algorithm
         checkComponentAttributes(c.attributes, component);
 
         // Type the component's children.
-        typeComponents(c.classInst);
+        typeComponents(c.classInst, clsScope);
       then
         ty;
 
@@ -349,10 +352,11 @@ function typeDimensions
   input output array<Dimension> dimensions;
   input InstNode component;
   input Binding binding;
+  input ClassScope clsScope;
   input SourceInfo info;
 algorithm
   for i in 1:arrayLength(dimensions) loop
-    typeDimension(dimensions[i], component, binding, i, dimensions, info);
+    typeDimension(dimensions[i], component, binding, i, clsScope, dimensions, info);
   end for;
 end typeDimensions;
 
@@ -361,6 +365,7 @@ function typeDimension
   input InstNode component;
   input Binding binding;
   input Integer index;
+  input ClassScope clsScope;
   input array<Dimension> dimensions;
   input SourceInfo info;
 algorithm
@@ -396,10 +401,20 @@ algorithm
         arrayUpdate(dimensions, index, Dimension.UNTYPED(dimension.dimension, true));
 
         (exp, ty, var) := typeExp(dimension.dimension, info, ExpOrigin.DIMENSION());
-        TypeCheck.checkDimension(exp, ty, var, info);
+        TypeCheck.checkDimensionType(exp, ty, info);
 
-        exp := Ceval.evalExp(exp, Ceval.EvalTarget.DIMENSION(component, index, exp, info));
-        exp := SimplifyExp.simplifyExp(exp);
+        if var <= Variability.PARAMETER then
+          // Evaluate the dimension if it's a parameter expression.
+          exp := Ceval.evalExp(exp, Ceval.EvalTarget.DIMENSION(component, index, exp, info));
+          exp := SimplifyExp.simplifyExp(exp);
+        else
+          // Dimensions must be parameter expressions, unless we're in a function.
+          if clsScope <> ClassScope.FUNCTION then
+            Error.addSourceMessage(Error.DIMENSION_NOT_KNOWN,
+              {Expression.toString(exp)}, info);
+            fail();
+          end if;
+        end if;
 
         // It's possible to get an array expression here, for example if the
         // dimension expression is a parameter whose binding comes from a
@@ -417,7 +432,11 @@ algorithm
       then
         dim;
 
-    // If the dimension is unknown, try to infer it from the components binding.
+    // If the dimension is unknown in a function, keep it unknown.
+    case Dimension.UNKNOWN() guard clsScope == ClassScope.FUNCTION
+      then dimension;
+
+    // If the dimension is unknown in a class, try to infer it from the components binding.
     case Dimension.UNKNOWN()
       algorithm
         dim := match binding
@@ -1123,7 +1142,7 @@ algorithm
         else
           error := TypingError.NO_ERROR();
           d := arrayGet(c.dimensions, dimIndex);
-          d := typeDimension(d, node, c.binding, dimIndex, c.dimensions, c.info);
+          d := typeDimension(d, node, c.binding, dimIndex, ClassScope.CLASS, c.dimensions, c.info);
         end if;
       then
         (d, error);
@@ -1172,7 +1191,7 @@ algorithm
 
     case ComponentRef.CREF(node = InstNode.COMPONENT_NODE())
       algorithm
-        node_ty := typeComponent(cref.node);
+        node_ty := typeComponent(cref.node, ClassScope.CLASS);
         variability := ComponentRef.getVariability(cref);
         subs := typeSubscripts(cref.subscripts, node_ty, cref.node, info);
         cref_ty := Type.subscript(node_ty, subs);
@@ -1422,38 +1441,63 @@ algorithm
           fail();
         end if;
 
-        // TODO: Only evaluate the index if it's a constant (parameter?),
-        //       otherwise just return a size expression.
-        index := Ceval.evalExp(index, Ceval.EvalTarget.IGNORE_ERRORS());
-        index := SimplifyExp.simplifyExp(index);
-
-        // TODO: Print an error if the index couldn't be evaluated to an int.
-        Expression.INTEGER(iindex) := index;
-
-        (dim, ty_err) := typeExpDim(sizeExp.exp, iindex, ExpOrigin.NO_ORIGIN(), info);
-
-        () := match ty_err
-          case NO_ERROR() then ();
+        if variability <= Variability.PARAMETER then
+          // Evaluate the index if it's a constant.
+          index := Ceval.evalExp(index, Ceval.EvalTarget.IGNORE_ERRORS());
+          index := SimplifyExp.simplifyExp(index);
+
+          // TODO: Print an error if the index couldn't be evaluated to an int.
+          Expression.INTEGER(iindex) := index;
+
+          // Get the iindex'd dimension of the expression.
+          (dim, ty_err) := typeExpDim(sizeExp.exp, iindex, ExpOrigin.NO_ORIGIN(), info);
+
+          () := match ty_err
+            case NO_ERROR() then ();
+
+            // The first argument wasn't an array.
+            case OUT_OF_BOUNDS(0)
+              algorithm
+                Error.addSourceMessage(Error.INVALID_ARGUMENT_TYPE_FIRST_ARRAY, {"size"}, info);
+              then
+                fail();
+
+            // The index referred to an invalid dimension.
+            case OUT_OF_BOUNDS()
+              algorithm
+                Error.addSourceMessage(Error.INVALID_SIZE_INDEX,
+                  {String(iindex), Expression.toString(sizeExp.exp), String(ty_err.upperBound)}, info);
+              then
+                fail();
+          end match;
+
+          if Dimension.isKnown(dim) then
+            // The dimension size is known, return its size.
+            exp := Expression.INTEGER(Dimension.size(dim));
+          else
+            // The dimension size is unknown, return a size expression. This can
+            // happen in functions where unknown dimensions are allowed.
+            exp := typeExp(sizeExp.exp, info);
+            exp := Expression.SIZE(exp, SOME(index));
+          end if;
 
-          // The first argument wasn't an array.
-          case OUT_OF_BOUNDS(0)
-            algorithm
-              Error.addSourceMessage(Error.INVALID_ARGUMENT_TYPE_FIRST_ARRAY, {"size"}, info);
-            then
-              fail();
+          variability := Variability.PARAMETER;
+        else
+          // If the index is not a constant, type the whole expression.
+          (exp, exp_ty) := typeExp(sizeExp.exp, info);
 
-          // The index referred to an invalid dimension.
-          case OUT_OF_BOUNDS()
-            algorithm
-              Error.addSourceMessage(Error.INVALID_SIZE_INDEX,
-                {String(iindex), Expression.toString(sizeExp.exp), String(ty_err.upperBound)}, info);
-            then
-              fail();
-        end match;
+          // Check that it's an array.
+          if not Type.isArray(exp_ty) then
+            Error.addSourceMessage(Error.INVALID_ARGUMENT_TYPE_FIRST_ARRAY, {"size"}, info);
+            fail();
+          end if;
 
-        dim_size := Dimension.size(dim);
+          // Since we don't know which dimension to take the size of, return a size expression.
+          exp := Expression.SIZE(exp, SOME(index));
+          variability := Variability.CONTINUOUS;
+        end if;
       then
-        (Expression.INTEGER(dim_size), Type.INTEGER(), Variability.CONSTANT);
+        (exp, Type.INTEGER(), variability);
 
     case Expression.SIZE()
       algorithm