Allow checkModel of external object structors (#11164)

Fixes #11008

Author: perost

OMCompiler/Compiler/NFFrontEnd/NFInst.mo

@@ -325,9 +325,38 @@ function lookupRootClass
   input InstNode topScope;
   input InstContext.Type context;
   output InstNode clsNode;
+protected
+  InstContext.Type next_context;
+  String last;
+  ComplexType cty;
 algorithm
-  clsNode := Lookup.lookupClassName(path, topScope, InstContext.set(context, NFInstContext.RELAXED),
-    AbsynUtil.dummyInfo, checkAccessViolations = false);
+  next_context := InstContext.set(context, NFInstContext.RELAXED);
+
+  ErrorExt.setCheckpoint(getInstanceName());
+  try
+    clsNode := Lookup.lookupClassName(path, topScope, next_context, AbsynUtil.dummyInfo, checkAccessViolations = false);
+    ErrorExt.delCheckpoint(getInstanceName());
+  else
+    // Allow lookup of structor functions in ExternalObject:s (to allow e.g.
+    // checkModel on them). These are stored in the ComplexType of the node
+    // instead of in the class tree like normal elements.
+    try
+      last := AbsynUtil.pathLastIdent(path);
+      true := last == "constructor" or last == "destructor";
+      clsNode := Lookup.lookupName(AbsynUtil.stripLast(path), topScope, next_context, checkAccessViolations = false);
+      Type.COMPLEX(complexTy = cty) := InstNode.getType(clsNode);
+
+      if last == "constructor" then
+        ComplexType.EXTERNAL_OBJECT(constructor = clsNode) := cty;
+      else
+        ComplexType.EXTERNAL_OBJECT(destructor = clsNode) := cty;
+      end if;
+      ErrorExt.rollBack(getInstanceName());
+    else
+      ErrorExt.delCheckpoint(getInstanceName());
+    end try;
+  end try;
+
   clsNode := InstUtil.mergeScalars(clsNode, path);
   checkInstanceRestriction(clsNode, path, context);
   clsNode := InstNode.setNodeType(InstNodeType.ROOT_CLASS(InstNode.EMPTY_NODE()), clsNode);

testsuite/openmodelica/interactive-API/CheckModelExtObj1.mos

@@ -0,0 +1,40 @@
+// name: CheckModelExtObj1
+// keywords:
+// status: correct
+// cflags: -d=newInst
+//
+
+loadString("
+class ExternalObject1
+  extends ExternalObject;
+
+  function constructor
+    output ExternalObject1 obj;
+    external \"C\" obj = initObject();
+  end constructor;
+
+  function destructor
+    input ExternalObject1 obj;
+    external \"C\" destroyObject(obj);
+  end destructor;
+end ExternalObject1;
+");
+
+checkModel(ExternalObject1.constructor);
+checkModel(ExternalObject1.destructor);
+checkModel(ExternalObject1);
+getErrorString();
+
+// Result:
+// true
+// "Check of ExternalObject1.constructor completed successfully.
+// Class ExternalObject1.constructor has 0 equation(s) and 0 variable(s).
+// 0 of these are trivial equation(s)."
+// "Check of ExternalObject1.destructor completed successfully.
+// Class ExternalObject1.destructor has 0 equation(s) and 0 variable(s).
+// 0 of these are trivial equation(s)."
+// "Check of ExternalObject1 completed successfully.
+// Class ExternalObject1 has 0 equation(s) and 0 variable(s).
+// 0 of these are trivial equation(s)."
+// ""
+// endResult

testsuite/openmodelica/interactive-API/Makefile

@@ -17,6 +17,7 @@ Bug4209.mos \
 Bug4248.mos \
 Buildings.PartialFlowMachine.mos \
 checkAllModelsRecursive1.mos \
+CheckModelExtObj1.mos \
 choicesAllMatching.mos \
 ConnectionList.mos \
 ConversionVersions.mos \