- Some fixes for evaluating bindings

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@13901 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Nov 15, 2012 · adaad1d · adaad1d
1 parent a60c178
commit adaad1d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/Compiler/FrontEnd/Inst.mo b/Compiler/FrontEnd/Inst.mo
@@ -8723,6 +8723,9 @@ algorithm
      list<DAE.Element> restDae2;
      DAE.Exp newBindExp;    
 
+    case (_,DAE.DAE({})) then inDae1;
+    case (DAE.DAE({}),_) then inDae2;     
+
     case (DAE.DAE(DAE.EQUATION(scalar = newBindExp)::{}),DAE.DAE(DAE.VAR(cref, kind, dir, prl, vis, ty, bind, dims, ct, src, varAttOpt, commOpt, inOut)::{}))
       then (DAE.DAE({DAE.VAR(cref, kind, dir, prl, vis, ty, SOME(newBindExp), dims, ct, src, varAttOpt, commOpt, inOut)}));
 

diff --git a/Compiler/Script/CevalScript.mo b/Compiler/Script/CevalScript.mo
@@ -6688,6 +6688,7 @@ algorithm
    case (cache, env, fpath)
      equation
        true = System.getPartialInstantiation();
+       (_, SCode.CLASS(prefixes = SCode.PREFIXES(replaceablePrefix=SCode.REPLACEABLE(cc=_))), _) = Lookup.lookupClass(cache, env, fpath, false); 
      then
        false;