Fixed bug with unconnected flow variables. Fixed MC bug #572.

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@2361 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · May 11, 2006 · 6be39ae · 6be39ae
1 parent aa933ea
commit 6be39ae
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 0 deletions.
diff --git a/Compiler/Connect.mo b/Compiler/Connect.mo
@@ -670,6 +670,8 @@ algorithm
         v2 = Env.localInsideConnectorFlowvars(env);
         vars = listAppend(v1, v2);
         vars2 = getOuterFlowVariables(csets);
+        // last array subscripts are not present in vars, therefor removed from vars2 too.
+        vars2 = Util.listMap(vars2,Exp.crefStripLastSubs); 
         unconnectedvars = removeVariables(vars, vars2);
         dae_1 = generateZeroflowEquations(unconnectedvars);
       then

diff --git a/Compiler/Interactive.mo b/Compiler/Interactive.mo
@@ -10564,11 +10564,40 @@ algorithm
       list<Absyn.ComponentRef> res;
       list<Absyn.ClassPart> parts;
       list<Env.Frame> env;
+      Absyn.Path tp;
     case (Absyn.CLASS(body = Absyn.PARTS(classParts = parts)),env)
       equation 
         res = getBaseClassesFromParts(parts, env);
       then
         res;
+    case (Absyn.CLASS(body = Absyn.DERIVED(path=tp)),env)
+      local 
+        Env.Env cenv;
+        Absyn.Path envpath,p1;
+        String tpname,str;
+        Absyn.ComponentRef cref;
+        SCode.Class c;
+      equation
+        (c,cenv) = Lookup.lookupClass(env, tp, true);
+        SOME(envpath) = Env.getEnvPath(cenv);
+        tpname = Absyn.pathLastIdent(tp);
+        p1 = Absyn.joinPaths(envpath, Absyn.IDENT(tpname));
+        cref = Absyn.pathToCref(p1);
+        str = Absyn.pathString(p1);
+      then {cref};
+    case (Absyn.CLASS(body = Absyn.DERIVED(path=tp)),env)
+      local 
+        Env.Env cenv;
+        Absyn.Path envpath,p1;
+        String tpname,str;
+        Absyn.ComponentRef cref;
+
+        SCode.Class c;
+      equation
+        (c,cenv) = Lookup.lookupClass(env, tp, true);
+        NONE = Env.getEnvPath(cenv);
+        cref = Absyn.pathToCref(tp);
+        then {cref};
     case (_,_) then {}; 
   end matchcontinue;
 end getBaseClasses;
@@ -10661,11 +10690,13 @@ algorithm
     local
       Integer res;
       list<Absyn.ClassPart> parts;
+      Absyn.Path tp;
     case (Absyn.CLASS(body = Absyn.PARTS(classParts = parts)))
       equation 
         res = countBaseClassesFromParts(parts);
       then
         res;
+    case (Absyn.CLASS(body = Absyn.DERIVED(path=tp))) then 1;
     case (_) then 0; 
   end matchcontinue;
 end countBaseClasses;