Ignore implicit bindings in getModelInstance (#10098)

- Ignore record bindings created by the frontend when dumping component bindings in getModelInstance, they are meant to be removed during flattening and should not be dumped.
OpenModelica · Jan 24, 2023 · cd8969a · cd8969a
1 parent c26b021
commit cd8969a
Show file tree

Hide file tree

Showing 3 changed files with 210 additions and 1 deletion.
diff --git a/OMCompiler/Compiler/Script/NFApi.mo b/OMCompiler/Compiler/Script/NFApi.mo
@@ -1185,7 +1185,7 @@ algorithm
 
         is_constant := comp.attributes.variability <= Variability.PARAMETER;
 
-        if Binding.isBound(comp.binding) then
+        if Binding.isExplicitlyBound(comp.binding) then
           json := JSON.addPair("value", dumpJSONBinding(comp.binding, evaluate = is_constant), json);
         end if;
 

diff --git a/testsuite/openmodelica/instance-API/GetModelInstanceBinding1.mos b/testsuite/openmodelica/instance-API/GetModelInstanceBinding1.mos
@@ -0,0 +1,208 @@
+// name: GetModelInstanceBinding1
+// keywords:
+// status: correct
+// cflags: -d=newInst
+//
+//
+
+loadString("
+  model World
+    parameter Configuration conf1;
+    parameter Configuration conf2 = conf1;
+  end World;
+
+  record Configuration
+  end Configuration;
+
+  model A
+    outer World world;
+  end A;
+
+  model M
+    inner World world;
+    A a;
+  end M;
+");
+
+getModelInstance(M, prettyPrint = true);
+
+// Result:
+// true
+// "{
+//   \"name\": \"M\",
+//   \"restriction\": \"model\",
+//   \"components\": [
+//     {
+//       \"name\": \"world\",
+//       \"type\": {
+//         \"name\": \"World\",
+//         \"restriction\": \"model\",
+//         \"components\": [
+//           {
+//             \"name\": \"conf1\",
+//             \"type\": {
+//               \"name\": \"Configuration\",
+//               \"restriction\": \"record\",
+//               \"source\": {
+//                 \"filename\": \"<interactive>\",
+//                 \"lineStart\": 7,
+//                 \"columnStart\": 3,
+//                 \"lineEnd\": 8,
+//                 \"columnEnd\": 20
+//               }
+//             },
+//             \"prefixes\": {
+//               \"variability\": \"parameter\"
+//             }
+//           },
+//           {
+//             \"name\": \"conf2\",
+//             \"type\": {
+//               \"name\": \"Configuration\",
+//               \"restriction\": \"record\",
+//               \"source\": {
+//                 \"filename\": \"<interactive>\",
+//                 \"lineStart\": 7,
+//                 \"columnStart\": 3,
+//                 \"lineEnd\": 8,
+//                 \"columnEnd\": 20
+//               }
+//             },
+//             \"modifiers\": \"conf1\",
+//             \"value\": {
+//               \"binding\": {
+//                 \"$kind\": \"cref\",
+//                 \"parts\": [
+//                   {
+//                     \"name\": \"world\"
+//                   },
+//                   {
+//                     \"name\": \"conf1\"
+//                   }
+//                 ]
+//               },
+//               \"value\": {
+//                 \"$kind\": \"record\",
+//                 \"name\": \"Configuration\",
+//                 \"elements\": [
+//
+//                 ]
+//               }
+//             },
+//             \"prefixes\": {
+//               \"variability\": \"parameter\"
+//             }
+//           }
+//         ],
+//         \"source\": {
+//           \"filename\": \"<interactive>\",
+//           \"lineStart\": 2,
+//           \"columnStart\": 3,
+//           \"lineEnd\": 5,
+//           \"columnEnd\": 12
+//         }
+//       },
+//       \"prefixes\": {
+//         \"inner\": true
+//       }
+//     },
+//     {
+//       \"name\": \"a\",
+//       \"type\": {
+//         \"name\": \"A\",
+//         \"restriction\": \"model\",
+//         \"components\": [
+//           {
+//             \"name\": \"world\",
+//             \"type\": {
+//               \"name\": \"world\",
+//               \"restriction\": \"model\",
+//               \"components\": [
+//                 {
+//                   \"name\": \"conf1\",
+//                   \"type\": {
+//                     \"name\": \"Configuration\",
+//                     \"restriction\": \"record\",
+//                     \"source\": {
+//                       \"filename\": \"<interactive>\",
+//                       \"lineStart\": 7,
+//                       \"columnStart\": 3,
+//                       \"lineEnd\": 8,
+//                       \"columnEnd\": 20
+//                     }
+//                   },
+//                   \"prefixes\": {
+//                     \"variability\": \"parameter\"
+//                   }
+//                 },
+//                 {
+//                   \"name\": \"conf2\",
+//                   \"type\": {
+//                     \"name\": \"Configuration\",
+//                     \"restriction\": \"record\",
+//                     \"source\": {
+//                       \"filename\": \"<interactive>\",
+//                       \"lineStart\": 7,
+//                       \"columnStart\": 3,
+//                       \"lineEnd\": 8,
+//                       \"columnEnd\": 20
+//                     }
+//                   },
+//                   \"modifiers\": \"conf1\",
+//                   \"value\": {
+//                     \"binding\": {
+//                       \"$kind\": \"cref\",
+//                       \"parts\": [
+//                         {
+//                           \"name\": \"world\"
+//                         },
+//                         {
+//                           \"name\": \"conf1\"
+//                         }
+//                       ]
+//                     },
+//                     \"value\": {
+//                       \"$kind\": \"record\",
+//                       \"name\": \"Configuration\",
+//                       \"elements\": [
+//
+//                       ]
+//                     }
+//                   },
+//                   \"prefixes\": {
+//                     \"variability\": \"parameter\"
+//                   }
+//                 }
+//               ],
+//               \"source\": {
+//                 \"filename\": \"<interactive>\",
+//                 \"lineStart\": 15,
+//                 \"columnStart\": 5,
+//                 \"lineEnd\": 15,
+//                 \"columnEnd\": 22
+//               }
+//             },
+//             \"prefixes\": {
+//               \"inner\": true
+//             }
+//           }
+//         ],
+//         \"source\": {
+//           \"filename\": \"<interactive>\",
+//           \"lineStart\": 10,
+//           \"columnStart\": 3,
+//           \"lineEnd\": 12,
+//           \"columnEnd\": 8
+//         }
+//       }
+//     }
+//   ],
+//   \"source\": {
+//     \"filename\": \"<interactive>\",
+//     \"lineStart\": 14,
+//     \"columnStart\": 3,
+//     \"lineEnd\": 17,
+//     \"columnEnd\": 8
+//   }
+// }"
+// endResult
diff --git a/testsuite/openmodelica/instance-API/Makefile b/testsuite/openmodelica/instance-API/Makefile
@@ -8,6 +8,7 @@ GetModelInstanceAnnotation4.mos \
 GetModelInstanceAnnotation5.mos \
 GetModelInstanceAttributes1.mos \
 GetModelInstanceAttributes2.mos \
+GetModelInstanceBinding1.mos \
 GetModelInstanceChoices1.mos \
 GetModelInstanceChoices2.mos \
 GetModelInstanceComment1.mos \