[NF] Update tests.

Belonging to [master]:
  - OpenModelica/OMCompiler#2636
  - OpenModelica/OpenModelica-testsuite#1027

flattening/modelica/scodeinst/CevalRecordArray2.mo

@@ -35,6 +35,6 @@ end CevalRecordArray2;
 // end P.f;
 //
 // class CevalRecordArray2
-//   Real x = P.f(1.0);
+//   Real x = 2.0;
 // end CevalRecordArray2;
 // endResult

flattening/modelica/scodeinst/DimSize3.mo

@@ -1,7 +1,7 @@
 // name: DimSize3
 // keywords:
 // status: correct
-// cflags: -d=newInst
+// cflags: -d=newInst,-nfEvalConstArgFuncs
 //
 
 function f

flattening/modelica/scodeinst/ExtendsShort2.mo

@@ -38,6 +38,6 @@ end ExtendsShort2;
 // end P.f2;
 //
 // class ExtendsShort2
-//   Real x = ExtendsShort2.f(2.0);
+//   Real x = 4.0;
 // end ExtendsShort2;
 // endResult

flattening/modelica/scodeinst/ExtendsVisibility5.mo

@@ -31,6 +31,6 @@ end ExtendsVisibility5;
 // end ExtendsVisibility5.c.f;
 //
 // class ExtendsVisibility5
-//   Real x = ExtendsVisibility5.c.f();
+//   Real x = 1.0;
 // end ExtendsVisibility5;
 // endResult

flattening/modelica/scodeinst/FuncDefaultArg1.mo

@@ -16,7 +16,7 @@ end f;
 
 model FuncDefaultArg1
   Real x = f(1.0, 2.0, 3.0);
-  Real y = f(1.0, z = 2.0);
+  Real y = f(4.0, z = 2.0);
 end FuncDefaultArg1;
 
 // Result:
@@ -28,7 +28,7 @@ end FuncDefaultArg1;
 // end f;
 //
 // class FuncDefaultArg1
-//   Real x = f(1.0, 2.0, 3.0);
-//   Real y = f(1.0, 1.0, 2.0);
+//   Real x = 6.0;
+//   Real y = 7.0;
 // end FuncDefaultArg1;
 // endResult

flattening/modelica/scodeinst/FuncExtends.mo

@@ -24,6 +24,6 @@ end M;
 // end f2;
 //
 // class M
-//   Real x = f2(1.0);
+//   Real x = 1.0;
 // end M;
 // endResult

flattening/modelica/scodeinst/FuncLocals.mo

@@ -29,6 +29,6 @@ end FuncLocals;
 // end f;
 //
 // class FuncLocals
-//   Real x = f(4.0);
+//   Real x = 8.0;
 // end FuncLocals;
 // endResult

flattening/modelica/scodeinst/FuncOverloadMulti.mo

@@ -48,8 +48,8 @@ end FuncOverloadMulti;
 // end FuncOverloadMulti.real_string;
 //
 // class FuncOverloadMulti
-//   String x = FuncOverloadMulti.bool_string(true);
-//   String y = FuncOverloadMulti.int_string(1);
-//   String z = FuncOverloadMulti.real_string(1.0);
+//   String x = "Boolean";
+//   String y = "Integer";
+//   String z = "Real";
 // end FuncOverloadMulti;
 // endResult

flattening/modelica/scodeinst/FuncSimple.mo

@@ -22,6 +22,6 @@ end FuncSimple;
 // end f;
 //
 // class FuncSimple
-//   Real x = f(1.0);
+//   Real x = 1.0;
 // end FuncSimple;
 // endResult

flattening/modelica/scodeinst/FuncUnknownDim2.mo

@@ -28,6 +28,6 @@ end FuncUnknownDim2;
 //   Real x[2];
 //   Real x[3];
 // equation
-//   x = f(3);
+//   x = {1.0, 1.0, 1.0};
 // end FuncUnknownDim2;
 // endResult

flattening/modelica/scodeinst/FuncViaComp.mo

@@ -22,10 +22,10 @@ end FuncViaComp;
 // Result:
 // function FuncViaComp.a.f
 //   input Integer n;
-//   output Real x = 2;
+//   output Real x = 2.0;
 // end FuncViaComp.a.f;
 //
 // class FuncViaComp
-//   Real x = FuncViaComp.a.f(1);
+//   Real x = 2.0;
 // end FuncViaComp;
 // endResult

flattening/modelica/scodeinst/FuncWildcard.mo

@@ -27,6 +27,6 @@ end FuncWildcard;
 // end _;
 //
 // class FuncWildcard
-//   Real x = _(3.0);
+//   Real x = 3.0;
 // end FuncWildcard;
 // endResult

flattening/modelica/scodeinst/FunctionExtends1.mo

@@ -28,6 +28,6 @@ end M;
 // end f2;
 //
 // class M
-//   Real x = f2(1.0);
+//   Real x = 1.0;
 // end M;
 // endResult

flattening/modelica/scodeinst/FunctionMultiOutput1.mo

@@ -30,6 +30,6 @@ end FunctionMultiOutput1;
 //   Real y;
 //   Real z;
 // algorithm
-//   (x, y, z) := f(2.0);
+//   (x, y, z) := (4.0, 6.0, 8.0);
 // end FunctionMultiOutput1;
 // endResult

flattening/modelica/scodeinst/FunctionNoOutput1.mo

@@ -21,9 +21,5 @@ end FunctionNoOutput1;
 // end f;
 //
 // class FunctionNoOutput1
-// equation
-//   f(2.0);
-// algorithm
-//   f(1.0);
 // end FunctionNoOutput1;
 // endResult

flattening/modelica/scodeinst/FunctionNonInputOutputParameter.mo

@@ -1,4 +1,4 @@
-// name: FunctionNoOutput1
+// name: FunctionNonInputOutputParameter
 // keywords:
 // status: correct
 // cflags: -d=newInst
@@ -13,9 +13,9 @@ algorithm
   y := a + b + z;
 end f;
 
-model M
+model FunctionNonInputOutputParameter
   parameter Real p = f(1, 2);
-end M;
+end FunctionNonInputOutputParameter;
 
 
 // Result:
@@ -28,9 +28,9 @@ end M;
 //   y := a + b + z;
 // end f;
 //
-// class M
-//   parameter Real p = f(1.0, 2.0);
-// end M;
+// class FunctionNonInputOutputParameter
+//   parameter Real p = 4.0;
+// end FunctionNonInputOutputParameter;
 // [flattening/modelica/scodeinst/FunctionNonInputOutputParameter.mo:11:3-11:23:writable] Warning: Invalid public variable z, function variables that are not input/output must be protected.
 //
 // endResult

flattening/modelica/scodeinst/FunctionRecordArg2.mo

@@ -36,6 +36,6 @@ end M;
 // end f;
 //
 // class M
-//   Real x = f();
+//   Real x = 1.0;
 // end M;
 // endResult

flattening/modelica/scodeinst/FunctionRecursive1.mo

@@ -32,6 +32,6 @@ end FunctionRecursive1;
 // end fac;
 //
 // class FunctionRecursive1
-//   Integer x = fac(5);
+//   Integer x = 120;
 // end FunctionRecursive1;
 // endResult

flattening/modelica/scodeinst/FunctionRecursive2.mo

@@ -6,7 +6,7 @@
 
 function fac
   input Integer n;
-  output Integer o = if n <= 1 then 1 else fac(n - 1);
+  output Integer o = if n <= 1 then 1 else n * fac(n - 1);
 end fac;
 
 model FunctionRecursive2
@@ -16,10 +16,10 @@ end FunctionRecursive2;
 // Result:
 // function fac
 //   input Integer n;
-//   output Integer o = if n <= 1 then 1 else fac(n - 1);
+//   output Integer o = if n <= 1 then 1 else n * fac(n - 1);
 // end fac;
 //
 // class FunctionRecursive2
-//   Integer x = fac(5);
+//   Integer x = 120;
 // end FunctionRecursive2;
 // endResult

flattening/modelica/scodeinst/ImportUnqualified3.mo

@@ -29,6 +29,6 @@ end ImportUnqualified3;
 // end A.B.f;
 //
 // class ImportUnqualified3
-//   parameter Real x = A.B.f(100.0);
+//   parameter Real x = 100.0;
 // end ImportUnqualified3;
 // endResult

flattening/modelica/scodeinst/OperatorOverloadConstructor1.mo

@@ -1,7 +1,7 @@
 // name: OperatorOverloadConstructor1
 // keywords: operator overload constructor
 // status: correct
-// cflags: -d=newInst
+// cflags: -d=newInst,-nfEvalConstArgFuncs
 //
 //
 

flattening/modelica/scodeinst/OperatorOverloadConstructorHideDefault.mo

@@ -1,7 +1,7 @@
 // name: OperatorOverloadConstructorHideDefault
 // keywords: operator overload constructor
 // status: correct
-// cflags: -d=newInst
+// cflags: -d=newInst,-nfEvalConstArgFuncs
 //
 // Checks that overloaded constructor has precedence over deafault constructor 
 // which would otherwise cause ambiguity. 

flattening/modelica/scodeinst/OperatorOverloadConstructorSimple.mo

@@ -1,7 +1,7 @@
 // name: OperatorOverloadConstructorSimple
 // keywords: operator constructor overload
 // status: correct
-// cflags: -d=newInst
+// cflags: -d=newInst,-nfEvalConstArgFuncs
 //
 // Tests simple overloaded construction.
 //

flattening/modelica/scodeinst/PackageConstant1.mo

@@ -1,7 +1,7 @@
 // name: PackageConstant1
 // keywords:
 // status: correct
-// cflags: -d=newInst
+// cflags: -d=newInst,-nfEvalConstArgFuncs
 //
 
 package P

flattening/modelica/scodeinst/Wild1.mo

@@ -24,6 +24,6 @@ end Wild1;
 // class Wild1
 //   Real x;
 // algorithm
-//   (_, x) := f();
+//   (_, x) := (1.0, 2.0);
 // end Wild1;
 // endResult