Skip to content

Commit

Permalink
[Janitor mode] Fix whitespace
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@23435 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
OpenModelica-Hudson committed Nov 18, 2014
1 parent 0eb2422 commit f32c3d3
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 35 deletions.
2 changes: 1 addition & 1 deletion Compiler/BackEnd/BackendDAE.mo
Expand Up @@ -199,7 +199,7 @@ uniontype Var "variables"
.DAE.InstDims arryDim "array dimensions of non-expanded var";
.DAE.ElementSource source "origin of variable";
Option< .DAE.VariableAttributes> values "values on built-in attributes";
Option<TearingSelect> tearingSelectOption "value for TearingSelect";
Option<TearingSelect> tearingSelectOption "value for TearingSelect";
Option<SCode.Comment> comment "this contains the comment and annotation from Absyn";
.DAE.ConnectorType connectorType "flow, stream, unspecified or not connector.";
end VAR;
Expand Down
12 changes: 6 additions & 6 deletions Compiler/BackEnd/BackendDAECreate.mo
Expand Up @@ -582,7 +582,7 @@ algorithm
DAE.ConnectorType ct;
DAE.ElementSource source;
Option<DAE.VariableAttributes> dae_var_attr;
Option<BackendDAE.TearingSelect> ts;
Option<BackendDAE.TearingSelect> ts;
Option<SCode.Comment> comment;
DAE.Type t;
DAE.VarVisibility protection;
Expand All @@ -608,7 +608,7 @@ algorithm
_ = BackendVariable.getMinMaxAsserts(dae_var_attr, name, source, kind_1, tp, {});
_ = BackendVariable.getNominalAssert(dae_var_attr, name, source, kind_1, tp, {});
(dae_var_attr, source, _) = Inline.inlineStartAttribute(dae_var_attr, source, (SOME(functionTree), {DAE.NORM_INLINE()}));
ts = BackendDAEUtil.setTearingSelectAttribute(comment);
ts = BackendDAEUtil.setTearingSelectAttribute(comment);
then
(BackendDAE.VAR(name, kind_1, dir, prl, tp, NONE(), NONE(), dims, source, dae_var_attr, ts, comment, ct));
end match;
Expand Down Expand Up @@ -637,7 +637,7 @@ algorithm
DAE.ConnectorType ct;
DAE.ElementSource source;
Option<DAE.VariableAttributes> dae_var_attr;
Option<BackendDAE.TearingSelect> ts;
Option<BackendDAE.TearingSelect> ts;
Option<SCode.Comment> comment;
DAE.Type t;
DAE.VarVisibility protection;
Expand Down Expand Up @@ -674,7 +674,7 @@ algorithm
eqLst = buildAssertAlgorithms(assrtLst,source,assrtEqIn);
// building an algorithm of the assert
(dae_var_attr, source, _) = Inline.inlineStartAttribute(dae_var_attr, source, fnstpl);
ts = NONE();
ts = NONE();
then
(BackendDAE.VAR(name, kind_1, dir, prl, tp, bind1, NONE(), dims, source, dae_var_attr, ts, comment, ct), inlineHT,eqLst);

Expand Down Expand Up @@ -972,7 +972,7 @@ algorithm
DAE.ConnectorType ct;
DAE.ElementSource source;
Option<DAE.VariableAttributes> dae_var_attr;
Option<BackendDAE.TearingSelect> ts;
Option<BackendDAE.TearingSelect> ts;
Option<SCode.Comment> comment;
DAE.Type t;

Expand All @@ -991,7 +991,7 @@ algorithm
tp = lowerType(t);
(bind, source, _) = Inline.inlineExpOpt(bind, (SOME(functionTree), {DAE.NORM_INLINE()}), source);
(dae_var_attr, source, _) = Inline.inlineStartAttribute(dae_var_attr, source, (SOME(functionTree), {DAE.NORM_INLINE()}));
ts = NONE();
ts = NONE();
then
BackendDAE.VAR(name, kind_1, dir, prl, tp, bind, NONE(), dims, source, dae_var_attr, ts, comment, ct);
end match;
Expand Down
4 changes: 2 additions & 2 deletions Compiler/BackEnd/BackendDAETransform.mo
Expand Up @@ -540,7 +540,7 @@ algorithm
Option<Values.Value> v;
list<DAE.Dimension> dim;
Option<DAE.VariableAttributes> attr;
Option<BackendDAE.TearingSelect> ts;
Option<BackendDAE.TearingSelect> ts;
Option<SCode.Comment> comment;
DAE.ConnectorType ct;
DAE.ElementSource source;
Expand All @@ -555,7 +555,7 @@ algorithm
arryDim = dim,
source = source,
values = attr,
tearingSelectOption = ts,
tearingSelectOption = ts,
comment = comment,
connectorType = ct))
equation
Expand Down
8 changes: 4 additions & 4 deletions Compiler/BackEnd/BackendDAEUtil.mo
Expand Up @@ -924,7 +924,7 @@ algorithm
DAE.InstDims dims;
DAE.ElementSource src;
Option<DAE.VariableAttributes> va;
Option<BackendDAE.TearingSelect> ts;
Option<BackendDAE.TearingSelect> ts;
Option<SCode.Comment> c;
DAE.ConnectorType ct;
Values.Value v;
Expand Down Expand Up @@ -1647,11 +1647,11 @@ algorithm
val := SCode.getNamedAnnotation(ann, "tearingSelect");
ts_str := Absyn.crefIdent(Absyn.expCref(val));
ts := match(ts_str)
case "always" then SOME(BackendDAE.ALWAYS());
case "always" then SOME(BackendDAE.ALWAYS());
case "prefer" then SOME(BackendDAE.PREFER());
case "avoid" then SOME(BackendDAE.AVOID());
case "never" then SOME(BackendDAE.NEVER());
case "default" then SOME(BackendDAE.DEFAULT());
case "default" then SOME(BackendDAE.DEFAULT());
else NONE();
end match;
else
Expand Down Expand Up @@ -6398,7 +6398,7 @@ algorithm
DAE.ComponentRef cref;
list<DAE.Dimension> instdims;
Option<DAE.VariableAttributes> attr;
Option<BackendDAE.TearingSelect> ts;
Option<BackendDAE.TearingSelect> ts;
Type_a ext_arg_1,ext_arg_2;
VarKind varKind;
DAE.VarDirection varDirection;
Expand Down
2 changes: 1 addition & 1 deletion Compiler/BackEnd/BackendInline.mo
Expand Up @@ -503,7 +503,7 @@ algorithm
Option<Values.Value> bindValue;
DAE.InstDims arrayDim;
Option<DAE.VariableAttributes> values,values1;
Option<BackendDAE.TearingSelect> ts;
Option<BackendDAE.TearingSelect> ts;
Option<SCode.Comment> comment;
DAE.ConnectorType ct;
BackendDAE.Var var;
Expand Down
24 changes: 12 additions & 12 deletions Compiler/BackEnd/BackendVariable.mo
Expand Up @@ -242,7 +242,7 @@ protected
list<DAE.Dimension> g;
DAE.ElementSource source;
Option<SCode.Comment> s;
Option<BackendDAE.TearingSelect> ts;
Option<BackendDAE.TearingSelect> ts;
DAE.ConnectorType ct;
algorithm
BackendDAE.VAR(a,b,c,prl,d,e,f,g,source,_,ts,s,ct) := v;
Expand Down Expand Up @@ -527,7 +527,7 @@ algorithm
arryDim=g,
source=source,
values=oattr,
tearingSelectOption = ts,
tearingSelectOption = ts,
comment=s,
connectorType=ct) := inVar;
outVar := BackendDAE.VAR(a,BackendDAE.STATE(indx,dcr),c,prl,d,e,f,g,source,oattr,ts,s,ct);
Expand Down Expand Up @@ -1595,7 +1595,7 @@ algorithm
arryDim = dim,
source = source,
values = attr,
tearingSelectOption = ts,
tearingSelectOption = ts,
comment = comment,
connectorType = ct) := inVar;
outVar := BackendDAE.VAR(cr, kind, dir, prl, tp, bind, v, dim, source, attr, ts, comment, ct);
Expand Down Expand Up @@ -1639,7 +1639,7 @@ algorithm
arryDim = dim,
source = source,
values = attr,
tearingSelectOption = ts,
tearingSelectOption = ts,
comment = comment,
connectorType = ct) := inVar;
outVar := BackendDAE.VAR(cr, inVarKind, dir, prl, tp, bind, v, dim, source, attr, ts, comment, ct);
Expand Down Expand Up @@ -1674,7 +1674,7 @@ algorithm
arryDim = dim,
source = source,
values = attr,
tearingSelectOption = ts,
tearingSelectOption = ts,
comment = comment,
connectorType = ct) := inVar;
outVar := BackendDAE.VAR(cr, varKind, dir, prl, tp, inBindExp, v, dim, source, attr, ts, comment, ct);
Expand Down Expand Up @@ -1707,7 +1707,7 @@ algorithm
arryDim = dim,
source = source,
values = attr,
tearingSelectOption = ts,
tearingSelectOption = ts,
comment = comment,
connectorType = ct) := inVar;
outVar := BackendDAE.VAR(cr, varKind, dir, prl, tp, bindExp, inBindValue, dim, source, attr, ts, comment, ct);
Expand Down Expand Up @@ -1740,7 +1740,7 @@ algorithm
list<DAE.Dimension> dim;
DAE.ElementSource source;
Option<DAE.VariableAttributes> attr;
Option<BackendDAE.TearingSelect> ts;
Option<BackendDAE.TearingSelect> ts;
Option<SCode.Comment> comment;
DAE.ConnectorType ct;
BackendDAE.Var oVar;
Expand All @@ -1754,7 +1754,7 @@ algorithm
arryDim = dim,
source = source,
values = attr,
tearingSelectOption = ts,
tearingSelectOption = ts,
comment = comment,
connectorType = ct),_)
equation
Expand Down Expand Up @@ -3578,7 +3578,7 @@ algorithm
list<DAE.Dimension> g;
DAE.ElementSource source;
Option<DAE.VariableAttributes> oattr;
Option<BackendDAE.TearingSelect> ts;
Option<BackendDAE.TearingSelect> ts;
Option<SCode.Comment> s;
DAE.ConnectorType ct;
list<DAE.SymbolicOperation> ops;
Expand All @@ -3593,7 +3593,7 @@ algorithm
arryDim = g,
source = source,
values = oattr,
tearingSelectOption = ts,
tearingSelectOption = ts,
comment = s,
connectorType = ct),_)
equation
Expand Down Expand Up @@ -4188,7 +4188,7 @@ algorithm
Option<Values.Value> v;
list<DAE.Dimension> dim;
Option<DAE.VariableAttributes> attr;
Option<BackendDAE.TearingSelect> ts;
Option<BackendDAE.TearingSelect> ts;
Option<SCode.Comment> comment;
DAE.ConnectorType ct;
DAE.ElementSource source;
Expand All @@ -4204,7 +4204,7 @@ algorithm
arryDim = dim,
source = source,
values = attr,
tearingSelectOption = ts,
tearingSelectOption = ts,
comment = comment,
connectorType = ct))
equation
Expand Down
14 changes: 7 additions & 7 deletions Compiler/BackEnd/IndexReduction.mo
Expand Up @@ -3821,7 +3821,7 @@ algorithm
DAE.InstDims dim;
DAE.ElementSource source;
Option<DAE.VariableAttributes> odattr;
Option<BackendDAE.TearingSelect> ts;
Option<BackendDAE.TearingSelect> ts;
DAE.VariableAttributes dattr;
Option<SCode.Comment> comment;
DAE.ConnectorType ct;
Expand Down Expand Up @@ -3968,7 +3968,7 @@ algorithm
DAE.ElementSource source;
BackendDAE.VarKind kind;
Option<DAE.VariableAttributes> odattr;
Option<BackendDAE.TearingSelect> ts;
Option<BackendDAE.TearingSelect> ts;
DAE.VariableAttributes dattr;
Option<SCode.Comment> comment;
DAE.ConnectorType ct;
Expand Down Expand Up @@ -4051,7 +4051,7 @@ algorithm
DAE.InstDims dim;
DAE.ElementSource source;
Option<DAE.VariableAttributes> attr;
Option<BackendDAE.TearingSelect> ts;
Option<BackendDAE.TearingSelect> ts;
Option<SCode.Comment> comment;
DAE.ConnectorType ct;
BackendDAE.Var var;
Expand Down Expand Up @@ -4124,7 +4124,7 @@ algorithm
DAE.InstDims dim;
.DAE.ElementSource source;
Option<DAE.VariableAttributes> odattr;
Option<BackendDAE.TearingSelect> ts;
Option<BackendDAE.TearingSelect> ts;
DAE.VariableAttributes dattr;
Option<SCode.Comment> comment;
DAE.ConnectorType ct;
Expand Down Expand Up @@ -4222,7 +4222,7 @@ algorithm
DAE.InstDims dim;
.DAE.ElementSource source,source1;
Option<DAE.VariableAttributes> odattr;
Option<BackendDAE.TearingSelect> ts;
Option<BackendDAE.TearingSelect> ts;
DAE.VariableAttributes dattr;
Option<SCode.Comment> comment;
DAE.ConnectorType ct;
Expand Down Expand Up @@ -4832,7 +4832,7 @@ algorithm
list<DAE.Dimension> dim;
DAE.ElementSource source;
Option<DAE.VariableAttributes> attr;
Option<BackendDAE.TearingSelect> ts;
Option<BackendDAE.TearingSelect> ts;
Option<SCode.Comment> comment;
DAE.ConnectorType ct;
BackendDAE.Var var;
Expand All @@ -4853,7 +4853,7 @@ algorithm
arryDim = dim,
source = source,
values = attr,
tearingSelectOption = ts,
tearingSelectOption = ts,
comment = comment,
connectorType = ct)::vlst,i::ilst,_,_,_)
equation
Expand Down
4 changes: 2 additions & 2 deletions Compiler/BackEnd/Tearing.mo
Expand Up @@ -1842,7 +1842,7 @@ protected
algorithm
for var in var_lstIn loop
// Get the value of the variable's tearingSelect attribute.
BackendDAE.VAR(tearingSelectOption = ts) := var;
BackendDAE.VAR(tearingSelectOption = ts) := var;

// Add the variable's index to the appropriate list.
_ := match(ts)
Expand Down Expand Up @@ -2090,7 +2090,7 @@ algorithm
else
equation
print("\nThe selection of a new tearing variable failed.");
Error.addCompilerWarning("Function Tearing.selectTearingVar failed at least once. Use +d=tearingdump or +d=tearingdumpV for more information.");
Error.addCompilerWarning("Function Tearing.selectTearingVar failed at least once. Use +d=tearingdump or +d=tearingdumpV for more information.");
then fail();
end matchcontinue;
end selectTearingVar;
Expand Down

0 comments on commit f32c3d3

Please sign in to comment.