Add redeclare attribute to modifiers in getModelInstance (#11318)

OpenModelica · Oct 4, 2023 · 6da8e5d · 6da8e5d
1 parent 7d537c5
commit 6da8e5d
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 0 deletions.
diff --git a/OMCompiler/Compiler/Script/NFApi.mo b/OMCompiler/Compiler/Script/NFApi.mo
@@ -2112,6 +2112,8 @@ algorithm
           json := JSON.addPair("each", JSON.makeBoolean(true), json);
         end if;
 
+        json := JSON.addPair("redeclare", JSON.makeBoolean(true), json);
+
         binding_json := JSON.makeString(SCodeDump.unparseElementStr(mod.element));
         json := JSON.addPair("$value", binding_json, json);
 

diff --git a/doc/instanceAPI/getModelInstance.schema.json b/doc/instanceAPI/getModelInstance.schema.json
@@ -450,6 +450,10 @@
             "each": {
               "type": "boolean",
               "description": "Whether the modifier is each or not"
+            },
+            "redeclare": {
+              "type": "boolean",
+              "description": "Whether the modifier is a redeclare or not"
             }
           },
           "additionalProperties": {

diff --git a/testsuite/openmodelica/instance-API/GetModelInstanceChoices2.mos b/testsuite/openmodelica/instance-API/GetModelInstanceChoices2.mos
@@ -42,18 +42,22 @@ getErrorString();
 //         \"choices\": {
 //           \"choice\": [
 //             {
+//               \"redeclare\": true,
 //               \"$value\": \"redeclare Real x = 1.0 \\\"A\\\"\",
 //               \"$type\": \"Real\"
 //             },
 //             {
+//               \"redeclare\": true,
 //               \"$value\": \"redeclare Real x = 2.0 \\\"B\\\"\",
 //               \"$type\": \"Real\"
 //             },
 //             {
+//               \"redeclare\": true,
 //               \"$value\": \"redeclare P2.OtherReal x = 3.0 \\\"C\\\"\",
 //               \"$type\": \"P.P2.OtherReal\"
 //             },
 //             {
+//               \"redeclare\": true,
 //               \"$value\": \"redeclare MissingReal x = 4.0 \\\"D\\\"\"
 //             }
 //           ]

diff --git a/testsuite/openmodelica/instance-API/GetModelInstanceReplaceable3.mos b/testsuite/openmodelica/instance-API/GetModelInstanceReplaceable3.mos
@@ -41,9 +41,11 @@ getModelInstance(M, prettyPrint = true);
 //       \"$kind\": \"extends\",
 //       \"modifiers\": {
 //         \"B\": {
+//           \"redeclare\": true,
 //           \"$value\": \"redeclare model B = MB\"
 //         },
 //         \"C\": {
+//           \"redeclare\": true,
 //           \"$value\": \"redeclare model C = C(y = 2.0)\"
 //         }
 //       },

diff --git a/testsuite/openmodelica/instance-API/ModifierToJSON1.mos b/testsuite/openmodelica/instance-API/ModifierToJSON1.mos
@@ -12,6 +12,7 @@ getErrorString();
 // "{
 //   \"a\": {
 //     \"y\": {
+//       \"redeclare\": true,
 //       \"$value\": \"redeclare MyReal y = 4\"
 //     },
 //     \"x\": \"3\"