Update nfinst tests.

Belonging to [master]:
  - OpenModelica/OMCompiler#2077
  - #806

Author: perost

flattening/modelica/scodeinst/ExtendsVisibility4.mo

@@ -23,7 +23,7 @@ end ExtendsVisibility4;
 // Result:
 // Error processing file: ExtendsVisibility4.mo
 // [flattening/modelica/scodeinst/ExtendsVisibility4.mo:8:3-10:8:writable] Error: Illegal access of protected element f.
-// [flattening/modelica/scodeinst/ExtendsVisibility4.mo:19:3-19:17:writable] Error: Variable b.f not found in scope ExtendsVisibility4.
+// [flattening/modelica/scodeinst/ExtendsVisibility4.mo:19:3-19:17:writable] Error: Function b.f not found in scope ExtendsVisibility4.
 //
 // # Error encountered! Exiting...
 // # Please check the error message and the flags.

flattening/modelica/scodeinst/ExternalObject3.mo

@@ -0,0 +1,44 @@
+// name: ExternalObject3
+// keywords:
+// status: correct
+// cflags: -d=newInst
+//
+//
+
+class ExtObj
+  extends ExternalObject;
+
+  function constructor
+    input Integer i;
+    output ExtObj obj;
+    external "C" obj = initObject();
+  end constructor;
+
+  function destructor
+    input ExtObj obj;
+    external "C" destroyObject(obj);
+  end destructor;
+end ExtObj;
+
+model ExternalObject3
+  ExtObj eo1 = ExtObj(10);
+end ExternalObject3;
+
+// Result:
+// function ExtObj.constructor
+//   input Integer i;
+//   output ExtObj obj;
+//
+//   external "C" obj = initObject();
+// end ExtObj.constructor;
+//
+// function ExtObj.destructor
+//   input ExtObj obj;
+//
+//   external "C" destroyObject(obj);
+// end ExtObj.destructor;
+//
+// class ExternalObject3
+//   ExtObj eo1 = ExtObj.constructor(10);
+// end ExternalObject3;
+// endResult

flattening/modelica/scodeinst/ExternalObjectStructorCall1.mo

@@ -0,0 +1,37 @@
+// name: ExternalObjectStructorCall1
+// keywords:
+// status: incorrect
+// cflags: -d=newInst
+//
+// Tests that it's not possible to call an external object constructor
+// explicitly.
+//
+
+class ExtObj
+  extends ExternalObject;
+
+  function constructor
+    input Integer i;
+    output ExtObj obj;
+    external "C" obj = initObject();
+  end constructor;
+
+  function destructor
+    input ExtObj obj;
+    external "C" destroyObject(obj);
+  end destructor;
+end ExtObj;
+
+model ExternalObjectStructorCall1
+  ExtObj eo1 = ExtObj.constructor(10);
+end ExternalObjectStructorCall1;
+
+// Result:
+// Error processing file: ExternalObjectStructorCall1.mo
+// [flattening/modelica/scodeinst/ExternalObjectStructorCall1.mo:26:3-26:38:writable] Error: Function ExtObj.constructor not found in scope ExternalObjectStructorCall1.
+//
+// # Error encountered! Exiting...
+// # Please check the error message and the flags.
+//
+// Execution failed!
+// endResult

flattening/modelica/scodeinst/ExternalObjectStructorCall2.mo

@@ -0,0 +1,37 @@
+// name: ExternalObjectStructorCall2
+// keywords:
+// status: incorrect
+// cflags: -d=newInst
+//
+// Tests that it's not possible to call an external object constructor
+// explicitly.
+//
+
+class ExtObj
+  extends ExternalObject;
+
+  function constructor
+    input Integer i;
+    output ExtObj obj;
+    external "C" obj = initObject();
+  end constructor;
+
+  function destructor
+    input ExtObj obj;
+    external "C" destroyObject(obj);
+  end destructor;
+end ExtObj;
+
+model ExternalObjectStructorCall2
+  ExtObj eo1 = ExtObj.destructor();
+end ExternalObjectStructorCall2;
+
+// Result:
+// Error processing file: ExternalObjectStructorCall2.mo
+// [flattening/modelica/scodeinst/ExternalObjectStructorCall2.mo:26:3-26:35:writable] Error: Function ExtObj.destructor not found in scope ExternalObjectStructorCall2.
+//
+// # Error encountered! Exiting...
+// # Please check the error message and the flags.
+//
+// Execution failed!
+// endResult

flattening/modelica/scodeinst/Makefile

@@ -190,9 +190,12 @@ ExternalFunctionInvalidLang1.mo \
 ExternalFunctionInvalidSection1.mo \
 ExternalObject1.mo \
 ExternalObject2.mo \
+ExternalObject3.mo \
 ExternalObjectInvalidElement1.mo \
 ExternalObjectInvalidStructor1.mo \
 ExternalObjectMissingStructor1.mo \
+ExternalObjectStructorCall1.mo \
+ExternalObjectStructorCall2.mo \
 ForConnect1.mo \
 ForEquation1.mo \
 ForEquation2.mo \

flattening/modelica/scodeinst/Visibility4.mo

@@ -18,7 +18,7 @@ end Visibility4;
 // Result:
 // Error processing file: Visibility4.mo
 // [flattening/modelica/scodeinst/Visibility4.mo:8:13-10:8:writable] Error: Illegal access of protected element f.
-// [flattening/modelica/scodeinst/Visibility4.mo:15:3-15:17:writable] Error: Variable a.f not found in scope Visibility4.
+// [flattening/modelica/scodeinst/Visibility4.mo:15:3-15:17:writable] Error: Function a.f not found in scope Visibility4.
 //
 // # Error encountered! Exiting...
 // # Please check the error message and the flags.