Update nfinst tests.

Belonging to [master]:
  - OpenModelica/OMCompiler#2069
  - OpenModelica/OpenModelica-testsuite#801

flattening/modelica/scodeinst/DimCyclic4.mo

@@ -12,7 +12,7 @@ end DimCyclic4;
 
 // Result:
 // Error processing file: DimCyclic4.mo
-// [flattening/modelica/scodeinst/DimCyclic4.mo:10:3-10:44:writable] Error: Dimension 2 of x, '(i + 2)', could not be evaluated due to a cyclic dependency.
+// [flattening/modelica/scodeinst/DimCyclic4.mo:10:3-10:44:writable] Error: Dimension 2 of x, 'i + 2', could not be evaluated due to a cyclic dependency.
 //
 // # Error encountered! Exiting...
 // # Please check the error message and the flags.

flattening/modelica/scodeinst/End1.mo

@@ -6,17 +6,29 @@
 //
 
 model End1
+  type E = enumeration(one, two, three);
   Real x[3];
+  Real y[E];
+  Real z[Boolean];
 equation
   x[end] = 1;
+  y[end] = 1;
+  z[end] = 1;
 end End1;
 
 // Result:
 // class End1
 //   Real x[1];
 //   Real x[2];
 //   Real x[3];
+//   Real y[E.one];
+//   Real y[E.two];
+//   Real y[E.three];
+//   Real z[false];
+//   Real z[true];
 // equation
-//   x[3] = 1;
+//   x[3] = 1.0;
+//   y[E.three] = 1.0;
+//   z[true] = 1.0;
 // end End1;
 // endResult

flattening/modelica/scodeinst/End2.mo

@@ -0,0 +1,32 @@
+
+// name: End2
+// keywords:
+// status: correct
+// cflags: -d=newInst
+//
+//
+
+model End2
+  Real x[3, 4, 1];
+equation
+  x[end, end, end] = 1;
+end End2;
+
+// Result:
+// class End2
+//   Real x[1,1,1];
+//   Real x[1,2,1];
+//   Real x[1,3,1];
+//   Real x[1,4,1];
+//   Real x[2,1,1];
+//   Real x[2,2,1];
+//   Real x[2,3,1];
+//   Real x[2,4,1];
+//   Real x[3,1,1];
+//   Real x[3,2,1];
+//   Real x[3,3,1];
+//   Real x[3,4,1];
+// equation
+//   x[3,4,1] = 1.0;
+// end End2;
+// endResult

flattening/modelica/scodeinst/End3.mo

@@ -0,0 +1,37 @@
+// name: End3
+// keywords:
+// status: correct
+// cflags: -d=newInst
+//
+//
+
+function last
+  input Real x[:];
+  output Real y;
+algorithm
+  y := x[end];
+end last;
+
+model End3
+  Real x[3] = {1, 2, 3};
+  Real y = last(x);
+end End3;
+
+// Result:
+// function last
+//   input Real[:] x;
+//   output Real y;
+// algorithm
+//   y := x[size(x, 1)];
+// end last;
+//
+// class End3
+//   Real x[1];
+//   Real x[2];
+//   Real x[3];
+//   Real y = last(x);
+// equation
+//   x = {1.0, 2.0, 3.0};
+// end End3;
+// endResult
+

flattening/modelica/scodeinst/FuncBuiltinEdge.mo

@@ -7,13 +7,13 @@
 //
 
 model FuncBuiltinEdge
-  discrete Boolean b1;
+  Boolean b1;
   Boolean b2 = edge(b1);
 end FuncBuiltinEdge;
 
 // Result:
 // class FuncBuiltinEdge
-//   discrete Boolean b1;
+//   Boolean b1;
 //   Boolean b2 = edge(b1);
 // end FuncBuiltinEdge;
 // endResult

flattening/modelica/scodeinst/FuncBuiltinInitial1.mo

@@ -0,0 +1,17 @@
+// name: FuncBuiltinInitial1
+// keywords: initial
+// status: correct
+// cflags: -d=newInst
+//
+// Tests the builtin initial operator.
+//
+
+model FuncBuiltinInitial1
+  Boolean b = initial();
+end FuncBuiltinInitial1;
+
+// Result:
+// class FuncBuiltinInitial1
+//   Boolean b = initial();
+// end FuncBuiltinInitial1;
+// endResult

flattening/modelica/scodeinst/FuncBuiltinInitial2.mo

@@ -0,0 +1,21 @@
+// name: FuncBuiltinInitial2
+// keywords: initial
+// status: incorrect
+// cflags: -d=newInst
+//
+// Tests the builtin initial operator.
+//
+
+model FuncBuiltinInitial2
+  parameter Boolean b = initial();
+end FuncBuiltinInitial2;
+
+// Result:
+// Error processing file: FuncBuiltinInitial2.mo
+// [flattening/modelica/scodeinst/FuncBuiltinInitial2.mo:10:3-10:34:writable] Error: Component b of variability parameter has binding 'initial()' of higher variability discrete.
+//
+// # Error encountered! Exiting...
+// # Please check the error message and the flags.
+//
+// Execution failed!
+// endResult

flattening/modelica/scodeinst/FuncBuiltinTerminal1.mo

@@ -0,0 +1,17 @@
+// name: FuncBuiltinTerminal1
+// keywords: terminal
+// status: correct
+// cflags: -d=newInst
+//
+// Tests the builtin terminal operator.
+//
+
+model FuncBuiltinTerminal1
+  Boolean b = terminal();
+end FuncBuiltinTerminal1;
+
+// Result:
+// class FuncBuiltinTerminal1
+//   Boolean b = terminal();
+// end FuncBuiltinTerminal1;
+// endResult

flattening/modelica/scodeinst/FuncBuiltinTerminal2.mo

@@ -0,0 +1,21 @@
+// name: FuncBuiltinTerminal2
+// keywords: terminal
+// status: incorrect
+// cflags: -d=newInst
+//
+// Tests the builtin terminal operator.
+//
+
+model FuncBuiltinTerminal2
+  parameter Boolean b = terminal();
+end FuncBuiltinTerminal2;
+
+// Result:
+// Error processing file: FuncBuiltinTerminal2.mo
+// [flattening/modelica/scodeinst/FuncBuiltinTerminal2.mo:10:3-10:35:writable] Error: Component b of variability parameter has binding 'terminal()' of higher variability discrete.
+//
+// # Error encountered! Exiting...
+// # Please check the error message and the flags.
+//
+// Execution failed!
+// endResult

flattening/modelica/scodeinst/IfEquation1.mo

@@ -19,9 +19,9 @@ end IfEquation1;
 //   Real x;
 // equation
 //   if time > 1.0 then
-//     x = 2.0;
-//   else
 //     x = 1.0;
+//   else
+//     x = 2.0;
 //   end if;
 // end IfEquation1;
 // endResult

flattening/modelica/scodeinst/IfEquation2.mo

@@ -21,9 +21,9 @@ end IfEquation2;
 //   parameter Boolean b;
 // equation
 //   if b then
-//     x = 2.0;
-//   else
 //     x = 1.0;
+//   else
+//     x = 2.0;
 //   end if;
 // end IfEquation2;
 // endResult

flattening/modelica/scodeinst/Makefile

@@ -139,6 +139,8 @@ Each1.mo \
 Each2.mo \
 EncapsulatingInst1.mo \
 End1.mo \
+End2.mo \
+End3.mo \
 EndInvalid1.mo \
 EndInvalid2.mo \
 enum1.mo \
@@ -208,44 +210,45 @@ ForStatementPrefix.mo \
 func2.mo \
 FuncBuiltinAbs.mo \
 FuncBuiltinCeil.mo \
+FuncBuiltinChange.mo \
 FuncBuiltinCross.mo \
 FuncBuiltinDelay.mo \
 FuncBuiltinDer.mo \
 FuncBuiltinDiagonal.mo \
 FuncBuiltinDiv.mo \
 FuncBuiltinEdge.mo \
+FuncBuiltinFill.mo \
 FuncBuiltinFloor.mo \
 FuncBuiltinGetInstanceName.mo \
 FuncBuiltinHomotopy.mo \
 FuncBuiltinIdentity.mo \
-FuncBuiltinInitial.mo \
+FuncBuiltinInitial1.mo \
+FuncBuiltinInitial2.mo \
 FuncBuiltinInteger.mo \
 FuncBuiltinLinspace.mo \
 FuncBuiltinMath.mo \
+FuncBuiltinMatrix.mo \
 FuncBuiltinMax.mo \
 FuncBuiltinMin.mo \
 FuncBuiltinMod.mo \
+FuncBuiltinNdims.mo \
+FuncBuiltinOnes.mo \
 FuncBuiltinPre.mo \
+FuncBuiltinProduct.mo \
 FuncBuiltinRem.mo \
+FuncBuiltinSample.mo \
+FuncBuiltinScalar.mo \
 FuncBuiltinSemiLinear.mo \
 FuncBuiltinSign.mo \
 FuncBuiltinSize.mo \
 FuncBuiltinSkew.mo \
+FuncBuiltinSmooth.mo \
 FuncBuiltinSpatialDistribution.mo \
 FuncBuiltinSqrt.mo \
-FuncBuiltinTerminal.mo \
-FuncBuiltinChange.mo \
-FuncBuiltinFill.mo \
-FuncBuiltinMatrix.mo \
-FuncBuiltinNdims.mo \
-FuncBuiltinNoEvent.mo \
-FuncBuiltinOnes.mo \
-FuncBuiltinProduct.mo \
-FuncBuiltinSample.mo \
-FuncBuiltinScalar.mo \
-FuncBuiltinSmooth.mo \
 FuncBuiltinSum.mo \
 FuncBuiltinSymmetric.mo \
+FuncBuiltinTerminal1.mo \
+FuncBuiltinTerminal2.mo \
 FuncBuiltinTranspose.mo \
 FuncBuiltinVector.mo \
 FuncBuiltinZeros.mo \
@@ -363,6 +366,8 @@ ModClass6.mo \
 ModScope1.mo \
 MultiInheritanceRedeclare1.mo \
 MultiInheritanceRedeclare2.mo \
+NoEvent1.mo \
+NoEvent2.mo \
 NonConnectorFlow1.mo \
 NonexistentRedeclareModifier1.mo \
 NonexistentRedeclareModifier2.mo \
@@ -404,6 +409,7 @@ ReinitInvalid5.mo \
 ReinitInvalid6.mo \
 Size1.mo \
 Size2.mo \
+Size3.mo \
 SizeInvalidArgs1.mo \
 SizeInvalidArgs2.mo \
 SizeInvalidIndex1.mo \
@@ -412,6 +418,7 @@ SizeInvalidIndex3.mo \
 SizeInvalidIndex4.mo \
 SizeInvalidType1.mo \
 SizeInvalidType2.mo \
+SizeInvalidType3.mo \
 StatementInvalidType1.mo \
 StateSelectVariability1.mo \
 StateSelect1.mo \
@@ -427,6 +434,7 @@ Terminate1.mo \
 TerminateInvalid1.mo \
 Time1.mo \
 Time2.mo \
+Time3.mo \
 TupleInvalid1.mo \
 TupleInvalid2.mo \
 TupleInvalid3.mo \