Add modifierToJSON API call (#10438)

OpenModelica · Mar 23, 2023 · d06ba1f · d06ba1f
1 parent d33f6a4
commit d06ba1f
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 0 deletions.
diff --git a/OMCompiler/Compiler/FrontEnd/ModelicaBuiltin.mo b/OMCompiler/Compiler/FrontEnd/ModelicaBuiltin.mo
@@ -4420,6 +4420,14 @@ function getModelInstanceIcon
 external "builtin";
 end getModelInstanceIcon;
 
+function modifierToJSON
+  "Parses a modifier given as a string and dumps it as JSON."
+  input String modifier;
+  input Boolean prettyPrint = false;
+  output String json;
+external "builtin";
+end modifierToJSON;
+
 function storeAST
   output Integer id;
 external "builtin";

diff --git a/OMCompiler/Compiler/NFFrontEnd/NFModelicaBuiltin.mo b/OMCompiler/Compiler/NFFrontEnd/NFModelicaBuiltin.mo
@@ -4673,6 +4673,14 @@ function getModelInstanceIcon
 external "builtin";
 end getModelInstanceIcon;
 
+function modifierToJSON
+  "Parses a modifier given as a string and dumps it as JSON."
+  input String modifier;
+  input Boolean prettyPrint = false;
+  output String json;
+external "builtin";
+end modifierToJSON;
+
 function storeAST
   output Integer id;
 external "builtin";

diff --git a/OMCompiler/Compiler/Script/CevalScriptBackend.mo b/OMCompiler/Compiler/Script/CevalScriptBackend.mo
@@ -3091,6 +3091,9 @@ algorithm
     case ("getModelInstanceIcon", {Values.CODE(Absyn.C_TYPENAME(classpath)), Values.BOOL(b)})
       then NFApi.getModelInstanceIcon(classpath, b);
 
+    case ("modifierToJSON", {Values.STRING(str), Values.BOOL(b)})
+      then NFApi.modifierToJSON(str, b);
+
     case ("storeAST", {})
       then Values.INTEGER(SymbolTable.storeAST());
 

diff --git a/OMCompiler/Compiler/Script/NFApi.mo b/OMCompiler/Compiler/Script/NFApi.mo
@@ -2151,5 +2151,22 @@ algorithm
   end for;
 end dumpJSONChoicesAnnotation;
 
+function modifierToJSON
+  input String modifier;
+  input Boolean prettyPrint;
+  output Values.Value jsonString;
+protected
+  Absyn.Modification amod;
+  SCode.Mod smod;
+  JSON json;
+algorithm
+  Absyn.ElementArg.MODIFICATION(modification = SOME(amod)) :=
+    Parser.stringMod("dummy" + modifier);
+  smod := AbsynToSCode.translateMod(SOME(amod),
+    SCode.Final.NOT_FINAL(), SCode.Each.NOT_EACH(), AbsynUtil.dummyInfo);
+  json := dumpJSONSCodeMod_impl(smod, InstNode.EMPTY_NODE());
+  jsonString := Values.STRING(JSON.toString(json, prettyPrint));
+end modifierToJSON;
+
   annotation(__OpenModelica_Interface="backend");
 end NFApi;
diff --git a/testsuite/openmodelica/instance-API/Makefile b/testsuite/openmodelica/instance-API/Makefile
@@ -49,6 +49,7 @@ GetModelInstanceReplaceable2.mos \
 GetModelInstanceReplaceable3.mos \
 GetModelInstanceReplaceable4.mos \
 GetModelInstanceStateMachine1.mos \
+ModifierToJSON1.mos \
 
 
 # test that currently fail. Move up when fixed.

diff --git a/testsuite/openmodelica/instance-API/ModifierToJSON1.mos b/testsuite/openmodelica/instance-API/ModifierToJSON1.mos
@@ -0,0 +1,22 @@
+// name: ModifierToJSON1
+// keywords:
+// status: correct
+// cflags: -d=newInst
+//
+//
+
+modifierToJSON("(a(redeclare MyReal y = 4, x = 3), z = 5)", prettyPrint = true);
+getErrorString();
+
+// Result:
+// "{
+//   \"a\": {
+//     \"y\": {
+//       \"$value\": \"redeclare MyReal y = 4\"
+//     },
+//     \"x\": \"3\"
+//   },
+//   \"z\": \"5\"
+// }"
+// ""
+// endResult