Updated nfinst test cases.

Author: perost

flattening/modelica/scodeinst/ClassExtends1.mo

@@ -0,0 +1,34 @@
+// name: ClassExtends1.mo
+// keywords:
+// status: correct
+// cflags: -d=newInst
+//
+// Tests that basic class extends works.
+//
+
+model A
+  replaceable model B
+    Real x = 1.0;
+  end B;
+
+  B b;
+end A;
+
+model ClassExtends1
+  extends A;
+
+  redeclare model extends B
+    Real y = 2.0;
+  end B;
+
+  B b2;
+end ClassExtends1;
+
+// Result:
+// class ClassExtends1
+//   Real b.x = 1.0;
+//   Real b.y = 2.0;
+//   Real b2.x = 1.0;
+//   Real b2.y = 2.0;
+// end ClassExtends1;
+// endResult

flattening/modelica/scodeinst/classextends1.mo renamed to flattening/modelica/scodeinst/ClassExtends2.mo

@@ -1,7 +1,10 @@
-// name: classextends1.mo
+// name: ClassExtends2.mo
 // keywords:
 // status: correct
-// cflags:   -d=newInst
+// cflags: -d=newInst
+//
+// Checks that class extends without redeclare works, although with a warning
+// since it was deprecated in Modelica 3.4.
 //
 
 model A
@@ -17,7 +20,7 @@ model A
   M2 m2_a;
 end A;
 
-model B
+model ClassExtends2
   extends A;
 
   model extends M1
@@ -30,10 +33,10 @@ model B
 
   M1 m1_b;
   M2 m2_b;
-end B;
+end ClassExtends2;
 
 // Result:
-// class B
+// class ClassExtends2
 //   Real m1_a.x;
 //   Real m1_a.y;
 //   Real m2_a.x;
@@ -42,5 +45,7 @@ end B;
 //   Real m1_b.y;
 //   Real m2_b.x;
 //   Real m2_b.y;
-// end B;
+// end ClassExtends2;
+// [flattening/modelica/scodeinst/ClassExtends2.mo:26:3-28:9:writable] Warning: Missing redeclare prefix on class extends M1, treating like redeclare anyway.
+//
 // endResult

flattening/modelica/scodeinst/classextends2.mo renamed to flattening/modelica/scodeinst/ClassExtends3.mo

@@ -1,7 +1,9 @@
-// name: classextends2.mo
+// name: ClassExtends3
 // keywords:
 // status: correct
-// cflags:   -d=newInst
+// cflags: -d=newInst
+//
+// Checks that modifiers on class extends are applied.
 //
 
 model A
@@ -17,7 +19,7 @@ model A
   M2 m2_a;
 end A;
 
-model B
+model ClassExtends3
   extends A;
 
   model extends M1(x = 2.0)
@@ -30,10 +32,10 @@ model B
 
   M1 m1_b;
   M2 m2_b;
-end B;
+end ClassExtends3;
 
 // Result:
-// class B
+// class ClassExtends3
 //   Real m1_a.x = 2.0;
 //   Real m1_a.y;
 //   Real m2_a.x = 3.0;
@@ -42,5 +44,7 @@ end B;
 //   Real m1_b.y;
 //   Real m2_b.x = 3.0;
 //   Real m2_b.y;
-// end B;
+// end ClassExtends3;
+// [flattening/modelica/scodeinst/ClassExtends3.mo:25:3-27:9:writable] Warning: Missing redeclare prefix on class extends M1, treating like redeclare anyway.
+//
 // endResult

flattening/modelica/scodeinst/ClassExtendsBuiltin1.mo

@@ -0,0 +1,32 @@
+// name: ClassExtendsBuiltin1.mo
+// keywords:
+// status: incorrect
+// cflags: -d=newInst
+//
+
+model A
+  model B
+    Real x;
+  end B;
+end A;
+
+model ClassExtendsBuiltin1
+  extends A;
+
+  redeclare model extends B
+    extends Real;
+    Real y = 2.0;
+  end B;
+
+  B x;
+end ClassExtendsBuiltin1;
+
+// Result:
+// Error processing file: ClassExtendsBuiltin1.mo
+// [flattening/modelica/scodeinst/ClassExtendsBuiltin1.mo:17:5-17:17:writable] Error: A class extending from builtin type Real may not have other elements.
+//
+// # Error encountered! Exiting...
+// # Please check the error message and the flags.
+//
+// Execution failed!
+// endResult

flattening/modelica/scodeinst/ClassExtendsBuiltin2.mo

@@ -0,0 +1,29 @@
+// name: ClassExtendsBuiltin2.mo
+// keywords:
+// status: incorrect
+// cflags: -d=newInst
+//
+
+model A
+  type MyReal = Real;
+end A;
+
+model ClassExtendsBuiltin2
+  extends A;
+
+  redeclare model extends MyReal
+    Real y = 2.0;
+  end MyReal;
+
+  MyReal x;
+end ClassExtendsBuiltin2;
+
+// Result:
+// Error processing file: ClassExtendsBuiltin2.mo
+// [flattening/modelica/scodeinst/ClassExtendsBuiltin2.mo:14:13-16:13:writable] Error: A class extending from builtin type MyReal may not have other elements.
+//
+// # Error encountered! Exiting...
+// # Please check the error message and the flags.
+//
+// Execution failed!
+// endResult

flattening/modelica/scodeinst/ClassExtendsMissing1.mo

@@ -0,0 +1,25 @@
+// name: ClassExtends1.mo
+// keywords:
+// status: incorrect
+// cflags: -d=newInst
+//
+// Checks that a proper error message is given when no inherited element is found for a class extends.
+//
+
+model ClassExtendsMissing1
+  redeclare model extends B
+    Real y = 2.0;
+  end B;
+
+  B b;
+end ClassExtendsMissing1;
+
+// Result:
+// Error processing file: ClassExtendsMissing1.mo
+// [flattening/modelica/scodeinst/ClassExtendsMissing1.mo:10:13-12:8:writable] Error: Base class targeted by class extends B not found in the inherited classes.
+//
+// # Error encountered! Exiting...
+// # Please check the error message and the flags.
+//
+// Execution failed!
+// endResult

flattening/modelica/scodeinst/Makefile

@@ -17,6 +17,12 @@ ceval3.mo \
 ceval5.mo \
 ceval6.mo \
 ClassAsComponentError.mo \
+ClassExtends1.mo \
+ClassExtends2.mo \
+ClassExtends3.mo \
+ClassExtendsBuiltin1.mo \
+ClassExtendsBuiltin2.mo \
+ClassExtendsMissing1.mo \
 ClassMod1.mo \
 ClassMod2.mo \
 CompAsFunc.mo \
@@ -203,8 +209,6 @@ DuplicateElements6.mo \
 DuplicateElements7.mo \
 DuplicateElements8.mo \
 DuplicateElementsValid2.mo \
-classextends1.mo \
-classextends2.mo \
 classextends3.mo \
 ModClass2.mo \
 ModClass4.mo \