- Rename redeclared class declarations in

  InstExtends.updateComponentsAndClassdefs2 so that their names are correct.
- Stop iterating in Inst.matchModificationToComponents when we get an empty
  modifier.
- Added another Siemens test (not working yet).


git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@10667 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Compiler/FrontEnd/Inst.mo

@@ -4043,8 +4043,8 @@ algorithm
       SCode.Element elem;
       String cn,s1,s2;
 
-    case({},DAE.NOMOD(),_) then ();
-    case({},DAE.MOD(subModLst={}),_) then ();
+    case(_,DAE.NOMOD(),_) then ();
+    case(_,DAE.MOD(subModLst={}),_) then ();
 
     case({},inmod,callingScope)
       equation

Compiler/FrontEnd/InstExtends.mo

@@ -654,6 +654,7 @@ algorithm
       equation
         DAE.REDECL(_, _, (comp, cmod)::_) = Mod.lookupCompModification(inMod, id);
         mod_rest = Mod.removeMod(inMod, id);
+        comp = SCode.renameElement(comp, id);
       then
         ((comp, cmod, b), mod_rest);
 

Compiler/FrontEnd/SCode.mo

@@ -825,6 +825,34 @@ algorithm
   end match;
 end elementName;
 
+public function renameElement
+  input Element inElement;
+  input String inName;
+  output Element outElement;
+algorithm
+  outElement := match(inElement, inName)
+    local
+      Prefixes pf;
+      Encapsulated ep;
+      Partial pp;
+      Restriction res;
+      ClassDef cdef;
+      Absyn.Info i;
+      Attributes attr;
+      Absyn.TypeSpec ty;
+      Mod mod;
+      Option<Comment> cmt;
+      Option<Absyn.Exp> cond;
+
+    case (CLASS(_, pf, ep, pp, res, cdef, i), _)
+      then CLASS(inName, pf, ep, pp, res, cdef, i);
+
+    case (COMPONENT(_, pf, attr, ty, mod, cmt, cond, i), _)
+      then COMPONENT(inName, pf, attr, ty, mod, cmt, cond, i);
+
+  end match;
+end renameElement;
+
 public function enumName ""
 input Enum e;
 output String s;