[NF] Update tests.

Belonging to [master]:
  - OpenModelica/OMCompiler#2984
  - OpenModelica/OpenModelica-testsuite#1142

Author: perost

flattening/modelica/scodeinst/FuncViaComp2.mo

@@ -0,0 +1,41 @@
+// name: FuncViaComp2
+// keywords:
+// status: correct
+// cflags: -d=newInst
+//
+//
+
+function f
+  input Real x;
+  output Real y = x;
+end f;
+
+model M
+  Real mx;
+  function mf = f(x = mx);
+  Real my = mf();
+end M;
+
+model FuncViaComp2
+  M m;
+  M m2;
+end FuncViaComp2;
+
+// Result:
+// function FuncViaComp2.m.mf
+//   input Real x = m.mx;
+//   output Real y = x;
+// end FuncViaComp2.m.mf;
+//
+// function FuncViaComp2.m2.mf
+//   input Real x = m2.mx;
+//   output Real y = x;
+// end FuncViaComp2.m2.mf;
+//
+// class FuncViaComp2
+//   Real m.mx;
+//   Real m.my = FuncViaComp2.m.mf(m.mx);
+//   Real m2.mx;
+//   Real m2.my = FuncViaComp2.m2.mf(m2.mx);
+// end FuncViaComp2;
+// endResult

flattening/modelica/scodeinst/Makefile

@@ -485,6 +485,7 @@ FuncUnknownDim1.mo \
 FuncUnknownDim2.mo \
 FuncVariability.mo \
 FuncViaComp.mo \
+FuncViaComp2.mo \
 FuncVectorization1.mo \
 FuncVectorization2.mo \
 FuncVectorization3.mo \
@@ -722,6 +723,8 @@ redeclare13.mo \
 redeclare2.mo \
 redeclare3.mo \
 redeclare4.mo \
+redeclare5.mo \
+redeclare6.mo \
 redeclare7.mo \
 redeclare9.mo \
 ReductionInvalidTypeSum.mo \
@@ -883,8 +886,6 @@ loop4.mo \
 PartialInst.mo \
 PropagateRedeclareMod1.mo \
 RecursiveExtends2.mo \
-redeclare5.mo \
-redeclare6.mo \
 redeclare8.mo \
 type4.mo \
 type5.mo \

flattening/modelica/scodeinst/TestSampleNoClock.mos

@@ -12,7 +12,7 @@ instantiateModel(Modelica.Blocks.Examples.BooleanNetwork1); getErrorString();
 // Result:
 // true
 // ""
-// "function Modelica.Blocks.Sources.BooleanTable.getFirstIndex \"Get first index of table and check table\"
+// "function Modelica.Blocks.Examples.BooleanNetwork1.booleanTable.getFirstIndex \"Get first index of table and check table\"
 //   input Real[:] table \"Vector of time instants\";
 //   input Real simulationStartTime(quantity = \"Time\", unit = \"s\") \"Simulation start time\";
 //   input Boolean startValue \"Value of y for time < table[1]\";
@@ -52,7 +52,7 @@ instantiateModel(Modelica.Blocks.Examples.BooleanNetwork1); getErrorString();
 //     end if;
 //     index := j;
 //   end if;
-// end Modelica.Blocks.Sources.BooleanTable.getFirstIndex;
+// end Modelica.Blocks.Examples.BooleanNetwork1.booleanTable.getFirstIndex;
 //
 // function Modelica.Math.BooleanVectors.allTrue \"Returns true, if all elements of the Boolean input vector are true ('and')\"
 //   input Boolean[:] b \"Boolean vector\";
@@ -246,7 +246,7 @@ instantiateModel(Modelica.Blocks.Examples.BooleanNetwork1); getErrorString();
 //   pre(triggeredAdd.y) = triggeredAdd.y_start;
 //   pre(rSFlipFlop.pre.u) = rSFlipFlop.pre.pre_u_start;
 // initial algorithm
-//   (booleanTable.index, booleanTable.nextTime, booleanTable.y) := Modelica.Blocks.Sources.BooleanTable.getFirstIndex(booleanTable.table, time, booleanTable.startValue);
+//   (booleanTable.index, booleanTable.nextTime, booleanTable.y) := Modelica.Blocks.Examples.BooleanNetwork1.booleanTable.getFirstIndex(booleanTable.table, time, booleanTable.startValue);
 // equation
 //   showValue.activePort = showValue.showActive;
 //   showValue2.activePort = showValue2.showActive;

flattening/modelica/scodeinst/func2.mo

@@ -20,7 +20,7 @@ end B;
 
 // Result:
 // Error processing file: func2.mo
-// [flattening/modelica/scodeinst/func2.mo:12:3-12:15:writable] Error: Type mismatch in binding x = A.f(), expected subtype of Real, got type ().
+// [flattening/modelica/scodeinst/func2.mo:12:3-12:15:writable] Error: Type mismatch in binding x = B.a.f(), expected subtype of Real, got type ().
 //
 // # Error encountered! Exiting...
 // # Please check the error message and the flags.