Updated nfinst tests.

Belonging to [master]:
  - OpenModelica/OMCompiler#1996
  - OpenModelica/OpenModelica-testsuite#772

flattening/modelica/scodeinst/Makefile

@@ -141,7 +141,6 @@ eq1.mo \
 eq2.mo \
 eq3.mo \
 eq4.mo \
-eq6.mo \
 eq7.mo \
 eq8.mo \
 eq10.mo \
@@ -420,6 +419,7 @@ conngraph1.mo \
 conngraph2.mo \
 enum6.mo \
 eq5.mo \
+eq6.mo \
 expconn1.mo \
 expconn2.mo \
 expconn3.mo \

flattening/modelica/scodeinst/PackageConstant1.mo

@@ -14,6 +14,7 @@ end PackageConstant1;
 
 // Result:
 // class PackageConstant1
+//   constant Real P.x = 1.0;
 //   Real y = P.x;
 // end PackageConstant1;
 // endResult

flattening/modelica/scodeinst/const10.mo

@@ -19,6 +19,7 @@ end C;
 
 // Result:
 // class C
+//   constant Integer A.i = 3;
 //   constant Integer b.j = A.i;
 //   Real b.x = /*Real*/(b.j);
 // end C;

flattening/modelica/scodeinst/const11.mo

@@ -35,6 +35,9 @@ end M;
 
 // Result:
 // class M
+//   constant Integer P.A.j = 2;
+//   constant Integer P.A.B.i = P.A.j;
+//   constant Integer B.i = P.A.j;
 //   Integer x = P.A.B.i;
 //   constant Integer a.j = 3;
 //   Integer y = a.j;

flattening/modelica/scodeinst/const12.mo

@@ -20,6 +20,7 @@ end B;
 
 // Result:
 // class B
+//   constant Integer A.m.i = {1, 2, 3};
 //   constant Integer j = A.m[1].i[2];
 //   Real x = /*Real*/(j);
 // end B;

flattening/modelica/scodeinst/const14.mo

@@ -28,6 +28,8 @@ end M;
 
 // Result:
 // class M
+//   constant Integer B.A.B.j = 2;
+//   constant Integer A.B.A.B.i = B.A.B.j;
 //   Integer x = A.B.A.B.i;
 // end M;
 // endResult

flattening/modelica/scodeinst/const15.mo

@@ -18,6 +18,7 @@ end C;
 
 // Result:
 // class C
+//   constant Integer B.i = 4;
 //   Real x = /*Real*/(B.i);
 // end C;
 // endResult

flattening/modelica/scodeinst/const16.mo

@@ -24,6 +24,8 @@ end M;
 
 // Result:
 // class M
+//   constant Integer P.P.j = 2;
+//   constant Integer P.P.P.i = P.P.j;
 //   Real x = /*Real*/(P.P.P.i);
 // end M;
 // endResult

flattening/modelica/scodeinst/const17.mo

@@ -23,6 +23,8 @@ end M;
 
 // Result:
 // class M
+//   constant Integer A.B.i = A.B.A.B.c;
+//   constant Integer A.B.A.B.c = 2;
 //   Real x = /*Real*/(A.B.i);
 // end M;
 // endResult

flattening/modelica/scodeinst/eq4.mo

@@ -25,6 +25,7 @@ end B;
 
 // Result:
 // class B
+//   constant Integer P.n = 3;
 //   Real a1[1].x;
 //   parameter Real a1[1].y = 1.0;
 //   Real a1[2].x;

flattening/modelica/scodeinst/eq6.mo

@@ -20,12 +20,13 @@ end B;
 
 // Result:
 // class B
+//   constant Integer P.i = 2;
 //   Real a[1].x;
 //   Real a[2].x;
 //   Real a[3].x;
 // equation
-//   a[1].x = /*Real*/(P[1].i);
-//   a[2].x = /*Real*/(P[2].i);
-//   a[3].x = /*Real*/(P[3].i);
+//   a[1].x = /*Real*/(P.i);
+//   a[2].x = /*Real*/(P.i);
+//   a[3].x = /*Real*/(P.i);
 // end B;
 // endResult

flattening/modelica/scodeinst/ih2.mo

@@ -25,6 +25,8 @@ end A;
 
 // Result:
 // class A
+//   constant Integer P2.i = 3;
+//   constant Integer P1.i = 2;
 //   Integer i1 = P1.i;
 //   Integer i2 = P2.i;
 // end A;

flattening/modelica/scodeinst/ih3.mo

@@ -25,6 +25,8 @@ end A;
 
 // Result:
 // class A
+//   constant Integer P.P2.i = 3;
+//   constant Integer P.P1.i = 2;
 //   Integer i1 = P.P1.i;
 //   Integer i2 = P.P2.i;
 // end A;

flattening/modelica/scodeinst/redeclare7.mo

@@ -26,6 +26,7 @@ end D;
 
 // Result:
 // class D
+//   constant Real b.P.x = 2;
 //   Real b.z = b.P.x;
 // end D;
 // endResult