Changeset 13946

Timestamp:

2012-11-18T05:39:44+01:00 (11 years ago)

Author:

adrpo

Message:

• make models dumped with +d=scodeInstShortcut able to instantiate when loaded again in OMC. Check differently the last ident if OMC is present otherwise you get: first element is: .Modelica.Fluid.Interfaces.FluidPort_aOMC70 port_a; second element is: .Modelica.Fluid.Interfaces.FluidPort_aOMC88 port_a;

File:

• trunk/Compiler/FrontEnd/Absyn.mo (modified) (1 diff)

trunk/Compiler/FrontEnd/Absyn.mo

@@ -2641 +2641 @@
       Option<ArrayDim> oad1,oad2;
       list<TypeSpec> lst1,lst2;
+      Ident i1, i2;
+      Integer pos1, pos2;
+
+    // first try full equality
     case(TPATH(p1,oad1), TPATH(p2,oad2))
       equation
-        true = Flags.isSet(Flags.SCODE_INST_SHORTCUT);
+        true = pathEqual(p1,p2);
+        true = optArrayDimEqual(oad1,oad2);
+      then true;
+
+    // if that didn't work try for different last ident due to +d=scodeInstShortcut
+    // first element is:  .Modelica.Fluid.Interfaces.FluidPort_a__OMC__70 port_a;
+    // second element is: .Modelica.Fluid.Interfaces.FluidPort_a__OMC__88 port_a;
+    case(TPATH(p1,oad1), TPATH(p2,oad2))
+      equation
+        i1 = pathLastIdent(p1);
+        i2 = pathLastIdent(p2);
+        pos1 = System.stringFind(i1, "__OMC__");
+        true = intNe(pos1, -1);
+        pos2 = System.stringFind(i2, "__OMC__");
+        true = intNe(pos2, -1);
+        true = intEq(pos1, pos2);
+        0 = System.strncmp(i1, i2, pos1);
         p1 = stripLast(p1);
         p2 = stripLast(p2);
         true = pathEqual(p1,p2);
         true = optArrayDimEqual(oad1,oad2);
-      then
-        true;
-    case(TPATH(p1,oad1), TPATH(p2,oad2))
-      equation
-        true = pathEqual(p1,p2);
-        true = optArrayDimEqual(oad1,oad2);
       then true;
+
     case(TCOMPLEX(p1,lst1,oad1),TCOMPLEX(p2,lst2,oad2))
       equation