fix #2429

use original expression in case of parameter or time alias and negate for global negate git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@17836 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Oct 23, 2013 · 64eae7c · 64eae7c
1 parent 413f313
commit 64eae7c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Compiler/BackEnd/RemoveSimpleEquations.mo b/Compiler/BackEnd/RemoveSimpleEquations.mo
@@ -75,7 +75,7 @@ protected import List;
 protected import Types;
 protected import Util;
 
-protected type EquationAttributes = tuple<DAE.ElementSource, Boolean> "eqnAttributes";
+protected type EquationAttributes = tuple<DAE.ElementSource, Boolean> "eqnAttributes(source,differentiated)";
 
 protected
 uniontype SimpleContainer
@@ -2001,7 +2001,7 @@ algorithm
        vsattr = Debug.bcallret5(replacable and replaceble1, addVarSetAttributes, v, negate, mark, simpleeqnsarr, vsattr, vsattr);
        rows = List.removeOnTrue(r, intEq, iMT[i]);
        _ = arrayUpdate(iMT, i, {});
-       (vars, eqnslst, shared, repl, vsattr) = traverseAliasTree(rows, i, exp1, SOME(expcr), negate, SOME(DAE.RCONST(0.0)), mark, simpleeqnsarr, iMT, unreplacable, vars, eqnslst, shared, repl, vsattr);
+       (vars, eqnslst, shared, repl, vsattr) = traverseAliasTree(rows, i, exp, SOME(expcr), negate, SOME(DAE.RCONST(0.0)), mark, simpleeqnsarr, iMT, unreplacable, vars, eqnslst, shared, repl, vsattr);
      then
        (vars, eqnslst, shared, repl);
    // time set
@@ -2021,7 +2021,7 @@ algorithm
        vsattr = addVarSetAttributes(v, negate, mark, simpleeqnsarr, EMPTYVARSETATTRIBUTES);
        rows = List.removeOnTrue(r, intEq, iMT[i]);
        _ = arrayUpdate(iMT, i, {});
-       (vars, eqnslst, shared, repl, vsattr) = traverseAliasTree(rows, i, exp1, SOME(expcr), negate, SOME(dexp), mark, simpleeqnsarr, iMT, unreplacable, vars, eqnslst, shared, repl, vsattr);
+       (vars, eqnslst, shared, repl, vsattr) = traverseAliasTree(rows, i, exp, SOME(expcr), negate, SOME(dexp), mark, simpleeqnsarr, iMT, unreplacable, vars, eqnslst, shared, repl, vsattr);
      then
        (vars, eqnslst, shared, repl);
    // constant set