Changeset 35a0fde5 in OpenModelica

Timestamp:

2023-03-28T15:58:19+02:00 (13 months ago)

Author:

Per Östlund <perost86@…>

Parents:

92b6780

git-author:

Per Östlund <perost86@…> (03/28/23 15:08:15)

git-committer:

Per Östlund <perost86@…> (03/28/23 15:58:19)

Message:

Fix derived modifiers in getModelInstance

• Dump the modifier of a short class definition on the extends element instead of on the class itself, so that short and long class definitions are dumped in the same way.

Fixes #9519

Files:

• OMCompiler/Compiler/NFFrontEnd/NFInstNode.mo (modified) (1 diff)
• OMCompiler/Compiler/Script/NFApi.mo (modified) (4 diffs)
• doc/instanceAPI/getModelInstance.schema.json (modified) (1 diff)
• testsuite/openmodelica/instance-API/GetModelInstanceAttributes1.mos (modified) (1 diff)
• testsuite/openmodelica/instance-API/GetModelInstanceDerived1.mos (modified) (1 diff)
• testsuite/openmodelica/instance-API/GetModelInstanceDerived2.mos (modified) (1 diff)
• testsuite/openmodelica/instance-API/GetModelInstanceDerived3.mos (added)
• testsuite/openmodelica/instance-API/GetModelInstanceExtends3.mos (modified) (3 diffs)
• testsuite/openmodelica/instance-API/Makefile (modified) (1 diff)

OMCompiler/Compiler/NFFrontEnd/NFInstNode.mo

@@ -836 +836 @@
   function getDerivedNode
     input InstNode node;
+    input Boolean recursive = true;
     output InstNode derived;
   algorithm
     derived := match node
-      case CLASS_NODE(nodeType = InstNodeType.BASE_CLASS(parent = derived))
-        then getDerivedNode(derived);
+      case CLASS_NODE() then getDerivedNode2(node, node.nodeType, recursive);
       else node;
     end match;
   end getDerivedNode;
+
+  function getDerivedNode2
+    input InstNode node;
+    input InstNodeType ty;
+    input Boolean recursive;
+    output InstNode derived;
+  algorithm
+    derived := match ty
+      case InstNodeType.BASE_CLASS() then if recursive then getDerivedNode(ty.parent) else ty.parent;
+      case InstNodeType.DERIVED_CLASS() then getDerivedNode2(node, ty.ty, recursive);
+      else node;
+    end match;
+  end getDerivedNode2;
 
   function updateClass

OMCompiler/Compiler/Script/NFApi.mo

@@ -1089 +1089 @@
   json := JSON.addPair("restriction",
     JSON.makeString(Restriction.toString(InstNode.restriction(node))), json);
-  json := dumpJSONSCodeMod(SCodeUtil.elementMod(def), scope, json);
 
   json := JSON.addPairNotNull("prefixes", dumpJSONClassPrefixes(def, node), json);
@@ -1225 +1224 @@
   InstNode node;
   SCode.Element cls_def, ext_def;
+  SCode.Mod mod;
 algorithm
   InstanceTree.CLASS(node = node) := ext;
@@ -1231 +1231 @@
 
   json := JSON.addPair("$kind", JSON.makeString("extends"), json);
-  json := dumpJSONSCodeMod(SCodeUtil.elementMod(ext_def), node, json);
+  json := dumpJSONSCodeMod(getExtendsModifier(ext_def, node), node, json);
   json := dumpJSONCommentOpt(SCodeUtil.getElementComment(ext_def), node, json);
 
@@ -1240 +1240 @@
   end if;
 end dumpJSONExtends;
+
+function getExtendsModifier
+  input SCode.Element definition;
+  input InstNode node;
+  output SCode.Mod mod;
+algorithm
+  mod := match definition
+    case SCode.EXTENDS() then definition.modifications;
+    case SCode.CLASS() then SCodeUtil.elementMod(InstNode.definition(InstNode.getDerivedNode(node, recursive = false)));
+    else SCode.NOMOD();
+  end match;
+end getExtendsModifier;
 
 function dumpJSONReplaceableClass

doc/instanceAPI/getModelInstance.schema.json

@@ -20 +20 @@
       "description": "The class prefixes",
       "$ref": "#/definitions/classPrefixes"
-    },
-    "modifiers": {
-      "description": "Modifier from the SCode",
-      "type": "#/definitions/scodeModifier"
     },
     "comment": {

testsuite/openmodelica/instance-API/GetModelInstanceAttributes1.mos

@@ -40 +40 @@
 //         \"name\": \"Angle\",
 //         \"restriction\": \"type\",
-//         \"modifiers\": {
-//           \"quantity\": {
-//             \"final\": true,
-//             \"$value\": \"\\\"Angle\\\"\"
-//           }
-//         },
 //         \"elements\": [
 //           {
 //             \"$kind\": \"extends\",
+//             \"modifiers\": {
+//               \"quantity\": {
+//                 \"final\": true,
+//                 \"$value\": \"\\\"Angle\\\"\"
+//               }
+//             },
 //             \"baseClass\": \"Real\"
 //           }

testsuite/openmodelica/instance-API/GetModelInstanceDerived1.mos

@@ -55 +55 @@
 //         \"name\": \"RealInput2\",
 //         \"restriction\": \"type\",
-//         \"modifiers\": {
-//           \"start\": \"1.0\"
-//         },
 //         \"elements\": [
 //           {
 //             \"$kind\": \"extends\",
+//             \"modifiers\": {
+//               \"start\": \"1.0\"
+//             },
 //             \"baseClass\": {
 //               \"name\": \"RealInput\",

testsuite/openmodelica/instance-API/GetModelInstanceDerived2.mos

@@ -40 +40 @@
 //   \"name\": \"RealInput2\",
 //   \"restriction\": \"type\",
-//   \"modifiers\": {
-//     \"start\": \"1.0\"
-//   },
 //   \"elements\": [
 //     {
 //       \"$kind\": \"extends\",
+//       \"modifiers\": {
+//         \"start\": \"1.0\"
+//       },
 //       \"baseClass\": {
 //         \"name\": \"RealInput\",

testsuite/openmodelica/instance-API/GetModelInstanceExtends3.mos

@@ -8 +8 @@
 loadString("
   type MyReal
-    extends Real;
+    extends Real(start = 1.0);
   end MyReal;
 
   model M
-    MyReal x;
+    MyReal x(unit = \"m\");
   end M;
 ");
@@ -35 +35 @@
 //           {
 //             \"$kind\": \"extends\",
+//             \"modifiers\": {
+//               \"start\": \"1.0\"
+//             },
 //             \"baseClass\": \"Real\"
 //           }
@@ -45 +48 @@
 //           \"columnEnd\": 13
 //         }
+//       },
+//       \"modifiers\": {
+//         \"unit\": \"\\\"m\\\"\"
 //       }
 //     }

testsuite/openmodelica/instance-API/Makefile

@@ -24 +24 @@
 GetModelInstanceDerived1.mos \
 GetModelInstanceDerived2.mos \
+GetModelInstanceDerived3.mos \
 GetModelInstanceDuplicate1.mos \
 GetModelInstanceEnum1.mos \