Changeset dfa5c6bb in OpenModelica

Timestamp:

2022-05-16T16:03:11+02:00 (2 years ago)

Author:

GitHub <noreply@…>

Branches:

maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master

Children:

82edd6c, e4b7953

Parents:

2ad1387

git-author:

perost <perost86@…> (05/16/22 16:03:11)

git-committer:

GitHub <noreply@…> (05/16/22 16:03:11)

Message:

Dumps annotations as JSON in instance API (#8963)

Files:

• OMCompiler/Compiler/Script/NFApi.mo (modified) (2 diffs)
• testsuite/openmodelica/instance-API/GetModelInstanceAnnotation1.mos (modified) (1 diff)
• testsuite/openmodelica/instance-API/GetModelInstanceConnection1.mos (modified) (1 diff)

OMCompiler/Compiler/Script/NFApi.mo

@@ -1158 +1158 @@
   if isSome(annOpt) then
     SOME(ann) := annOpt;
-    json := JSON.addPair("annotation",
-      JSON.makeString(SCodeDump.printModStr(ann.modification)), json);
+    json := JSON.addPair("annotation", dumpJSONMod(ann.modification), json);
   end if;
 end dumpJSONAnnotationOpt;
@@ -1220 +1219 @@
 end dumpJSONReplaceableElements;
 
+function dumpJSONMod
+  input SCode.Mod mod;
+  output JSON json = JSON.emptyObject();
+algorithm
+  () := match mod
+    case SCode.Mod.MOD()
+      algorithm
+        for sm in mod.subModLst loop
+          json := JSON.addPair(sm.ident, dumpJSONSubMod(sm), json);
+        end for;
+      then
+        ();
+
+    else ();
+  end match;
+end dumpJSONMod;
+
+function dumpJSONSubMod
+  input SCode.SubMod subMod;
+  output JSON json = JSON.emptyObject();
+protected
+  SCode.Mod mod = subMod.mod;
+algorithm
+  () := match mod
+    case SCode.Mod.MOD()
+      algorithm
+        if not listEmpty(mod.subModLst) then
+          json := JSON.addPair("modifiers", dumpJSONMod(mod), json);
+        end if;
+
+        if isSome(mod.binding) then
+          json := JSON.addPair("value",
+            JSON.makeString(Dump.printExpStr(Util.getOption(mod.binding))), json);
+        end if;
+      then
+        ();
+
+    else ();
+  end match;
+end dumpJSONSubMod;
+
   annotation(__OpenModelica_Interface="backend");
 end NFApi;

testsuite/openmodelica/instance-API/GetModelInstanceAnnotation1.mos

@@ -20 +20 @@
 // "{
 //   \"name\": \"M\",
-//   \"annotation\": \"(Icon(graphics = {Rectangle(extent = {{-66, 78}, {70, -56}}, lineColor = {28, 108, 200})}), Diagram(graphics = {Ellipse(extent = {{-62, 68}, {56, -60}}, lineColor = {28, 108, 200})}))\",
+//   \"annotation\": {
+//     \"Icon\": {
+//       \"modifiers\": {
+//         \"graphics\": {
+//           \"value\": \"{Rectangle(extent = {{-66, 78}, {70, -56}}, lineColor = {28, 108, 200})}\"
+//         }
+//       }
+//     },
+//     \"Diagram\": {
+//       \"modifiers\": {
+//         \"graphics\": {
+//           \"value\": \"{Ellipse(extent = {{-62, 68}, {56, -60}}, lineColor = {28, 108, 200})}\"
+//         }
+//       }
+//     }
+//   },
 //   \"connections\": [
 //

testsuite/openmodelica/instance-API/GetModelInstanceConnection1.mos

@@ -90 +90 @@
 //       \"lhs\": \"c1\",
 //       \"rhs\": \"c3\",
-//       \"annotation\": \"(Line(points = {{-25, 30}, {10, 30}, {10, -20}, {40, -20}}))\"
+//       \"annotation\": {
+//         \"Line\": {
+//           \"modifiers\": {
+//             \"points\": {
+//               \"value\": \"{{-25, 30}, {10, 30}, {10, -20}, {40, -20}}\"
+//             }
+//           }
+//         }
+//       }
 //     },
 //     {