Add qualifyPath() API call (#10617)

OpenModelica · Apr 26, 2023 · d238ab6 · d238ab6
1 parent f9dfd5f
commit d238ab6
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 0 deletions.
diff --git a/OMCompiler/Compiler/FrontEnd/ModelicaBuiltin.mo b/OMCompiler/Compiler/FrontEnd/ModelicaBuiltin.mo
@@ -4460,6 +4460,16 @@ annotation(preferredView="text",Documentation(info="<html>
 </html>"));
 end restoreAST;
 
+function qualifyPath
+  input TypeName classPath;
+  input TypeName path;
+  output TypeName qualifiedPath;
+external "builtin";
+annotation(preferredView="text",Documentation(info="<html>
+<p>Returns the fully qualified path for the given path in a class.</p>
+</html>"));
+end qualifyPath;
+
 // OMSimulator API calls
 type oms_system = enumeration(oms_system_none,oms_system_tlm, oms_system_wc,oms_system_sc);
 type oms_causality = enumeration(oms_causality_input, oms_causality_output, oms_causality_parameter, oms_causality_bidir, oms_causality_undefined);

diff --git a/OMCompiler/Compiler/NFFrontEnd/NFModelicaBuiltin.mo b/OMCompiler/Compiler/NFFrontEnd/NFModelicaBuiltin.mo
@@ -4713,6 +4713,16 @@ annotation(preferredView="text",Documentation(info="<html>
 </html>"));
 end restoreAST;
 
+function qualifyPath
+  input TypeName classPath;
+  input TypeName path;
+  output TypeName qualifiedPath;
+external "builtin";
+annotation(preferredView="text",Documentation(info="<html>
+<p>Returns the fully qualified path for the given path in a class.</p>
+</html>"));
+end qualifyPath;
+
 // OMSimulator API calls
 type oms_system = enumeration(oms_system_none,oms_system_tlm, oms_system_wc,oms_system_sc);
 type oms_causality = enumeration(oms_causality_input, oms_causality_output, oms_causality_parameter, oms_causality_bidir, oms_causality_undefined);

diff --git a/OMCompiler/Compiler/Script/CevalScriptBackend.mo b/OMCompiler/Compiler/Script/CevalScriptBackend.mo
@@ -3111,6 +3111,9 @@ algorithm
     case ("restoreAST", {Values.INTEGER(integer = n)})
       then Values.BOOL(SymbolTable.restoreAST(n));
 
+    case ("qualifyPath", {Values.CODE(Absyn.C_TYPENAME(classpath)), Values.CODE(Absyn.C_TYPENAME(path))})
+      then Values.STRING(AbsynUtil.pathString(NFApi.mkFullyQual(SymbolTable.getAbsyn(), classpath, path)));
+
  end matchcontinue;
 end cevalInteractiveFunctions4;
 

diff --git a/testsuite/openmodelica/instance-API/Makefile b/testsuite/openmodelica/instance-API/Makefile
@@ -54,6 +54,7 @@ GetModelInstanceReplaceable3.mos \
 GetModelInstanceReplaceable4.mos \
 GetModelInstanceStateMachine1.mos \
 ModifierToJSON1.mos \
+QualifyPath1.mos \
 
 
 # test that currently fail. Move up when fixed.

diff --git a/testsuite/openmodelica/instance-API/QualifyPath1.mos b/testsuite/openmodelica/instance-API/QualifyPath1.mos
@@ -0,0 +1,26 @@
+// name: QualifyPath1
+// keywords:
+// status: correct
+// cflags: -d=newInst
+//
+//
+
+loadString("
+  package P
+    model A
+    end A;
+
+    model B
+      A a;
+    end B;
+  end P;
+");
+
+qualifyPath(P.B, A);
+getErrorString();
+
+// Result:
+// true
+// "P.A"
+// ""
+// endResult