Skip to content

Commit

Permalink
- Fixes for bootstrapping
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@9799 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
sjoelund committed Sep 13, 2011
1 parent 80b1a83 commit 3b87114
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
12 changes: 6 additions & 6 deletions Compiler/BackEnd/BackendDAE.mo
Expand Up @@ -82,19 +82,19 @@ end VarKind;
public
uniontype Var "- Variables"
record VAR
DAE.ComponentRef varName "varName ; variable name" ;
.DAE.ComponentRef varName "varName ; variable name" ;
VarKind varKind "varKind ; Kind of variable" ;
DAE.VarDirection varDirection "varDirection ; input, output or bidirectional" ;
.DAE.VarDirection varDirection "varDirection ; input, output or bidirectional" ;
Type varType "varType ; builtin type or enumeration" ;
Option< .DAE.Exp> bindExp "bindExp ; Binding expression e.g. for parameters" ;
Option<Values.Value> bindValue "bindValue ; binding value for parameters" ;
DAE.InstDims arryDim "arryDim ; array dimensions on nonexpanded var" ;
.DAE.InstDims arryDim "arryDim ; array dimensions on nonexpanded var" ;
Integer index "index ; index in impl. vector" ;
DAE.ElementSource source "origin of variable" ;
.DAE.ElementSource source "origin of variable" ;
Option< .DAE.VariableAttributes> values "values ; values on builtin attributes" ;
Option<SCode.Comment> comment "comment ; this contains the comment and annotation from Absyn" ;
DAE.Flow flowPrefix "flow ; if the variable is a flow" ;
DAE.Stream streamPrefix "stream ; if the variable is a stream variable. Modelica 3.1 specs" ;
.DAE.Flow flowPrefix "flow ; if the variable is a flow" ;
.DAE.Stream streamPrefix "stream ; if the variable is a stream variable. Modelica 3.1 specs" ;
end VAR;
end Var;

Expand Down
6 changes: 3 additions & 3 deletions Compiler/BackEnd/SimCode.mo
Expand Up @@ -5460,15 +5460,15 @@ algorithm
case({}) then {};

case(BackendDAE.EQUATION(e1, e2, es)::eqns) equation
lambda = DAE.CREF(DAE.CREF_IDENT("$_lambda", DAE.ET_REAL, {}), DAE.ET_REAL);
lambda = DAE.CREF(DAE.CREF_IDENT("$_lambda", DAE.ET_REAL(), {}), DAE.ET_REAL());
e1 = DAE.BINARY(lambda, DAE.MUL(DAE.ET_REAL()), e1);
e2 = DAE.BINARY(lambda, DAE.MUL(DAE.ET_REAL()), e2);
eqn = BackendDAE.EQUATION(e1, e2, es);
eqns = addLambdaToEquationList(eqns);
then eqn::eqns;

case(BackendDAE.RESIDUAL_EQUATION(e1, es)::eqns) equation
lambda = DAE.CREF(DAE.CREF_IDENT("$_lambda", DAE.ET_REAL, {}), DAE.ET_REAL);
lambda = DAE.CREF(DAE.CREF_IDENT("$_lambda", DAE.ET_REAL(), {}), DAE.ET_REAL());
e1 = DAE.BINARY(lambda, DAE.MUL(DAE.ET_REAL()), e1);
eqn = BackendDAE.RESIDUAL_EQUATION(e1, es);
eqns = addLambdaToEquationList(eqns);
Expand Down Expand Up @@ -5499,7 +5499,7 @@ algorithm

case(var::vars) equation
SOME(startExp) = BackendVariable.varStartValueOption(var);
lambda = DAE.CREF(DAE.CREF_IDENT("$_lambda", DAE.ET_REAL, {}), DAE.ET_REAL);
lambda = DAE.CREF(DAE.CREF_IDENT("$_lambda", DAE.ET_REAL(), {}), DAE.ET_REAL());
cref = BackendVariable.varCref(var);
crefExp = DAE.CREF(cref, DAE.ET_REAL());

Expand Down

0 comments on commit 3b87114

Please sign in to comment.