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@21540 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
@OpenModelica-Hudson
OpenModelica-Hudson committed Jul 16, 2014
1 parent 950f878 commit f209f27
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 31 deletions.
4 changes: 2 additions & 2 deletions Compiler/FrontEnd/ClassInf.mo
View file
Expand Up @@ -432,9 +432,9 @@ algorithm
case (SCode.R_PREDEFINED_STRING(),p) then TYPE_STRING(p);
case (SCode.R_PREDEFINED_BOOLEAN(),p) then TYPE_BOOL(p);
// BTH
case (SCode.R_PREDEFINED_CLOCK(),p)
case (SCode.R_PREDEFINED_CLOCK(),p)
equation
true = intGe(Flags.getConfigEnum(Flags.LANGUAGE_STANDARD), 33);
true = intGe(Flags.getConfigEnum(Flags.LANGUAGE_STANDARD), 33);
then TYPE_CLOCK(p);
case (SCode.R_PREDEFINED_ENUMERATION(),p) then TYPE_ENUM(p);
/* Meta Modelica extensions */
Expand Down
8 changes: 4 additions & 4 deletions Compiler/FrontEnd/Inst.mo
View file
Expand Up @@ -1297,9 +1297,9 @@ algorithm
case "String" then DAE.T_STRING_DEFAULT;
case "Boolean" then DAE.T_BOOL_DEFAULT;
// BTH
case "Clock"
case "Clock"
equation
true = intGe(Flags.getConfigEnum(Flags.LANGUAGE_STANDARD), 33);
true = intGe(Flags.getConfigEnum(Flags.LANGUAGE_STANDARD), 33);
then DAE.T_CLOCK_DEFAULT;
end match;
end getBasicTypeType;
Expand All @@ -1314,7 +1314,7 @@ algorithm
case "String" then getStringAttributeType;
case "Boolean" then getBoolAttributeType;
// BTH
case "Clock"
case "Clock"
equation
true = intGe(Flags.getConfigEnum(Flags.LANGUAGE_STANDARD), 33);
then getClockAttributeType;
Expand Down Expand Up @@ -1883,7 +1883,7 @@ algorithm
System.setPartialInstantiation(partialInst);
then (cache,env,ih,ci_state,{});

// BTH
// BTH
case (cache,env,ih,_,_,ci_state,(SCode.CLASS(name = "Clock")),_,_,_,_)
equation
true = intGe(Flags.getConfigEnum(Flags.LANGUAGE_STANDARD), 33);
Expand Down
18 changes: 9 additions & 9 deletions Compiler/FrontEnd/InstUtil.mo
View file
Expand Up @@ -609,7 +609,7 @@ public function prefixEqualUnlessBasicType
input SCode.Element cls;
algorithm
_ := matchcontinue (pre1, pre2, cls)
local
local
// adrpo: TODO! FIXME!, I think here we should have pre1 = Prefix.CLASSPRE(variability1) == pre2 = Prefix.CLASSPRE(variability2)

// don't care about prefix for:
Expand All @@ -634,7 +634,7 @@ algorithm
// BTH
case (_, _, SCode.CLASS(name = "Clock"))
equation
true = intGe(Flags.getConfigEnum(Flags.LANGUAGE_STANDARD), 33);
true = intGe(Flags.getConfigEnum(Flags.LANGUAGE_STANDARD), 33);
then ();

// anything else, check for equality!
Expand Down Expand Up @@ -859,7 +859,7 @@ algorithm
true = listMember(r, {SCode.R_TYPE(), SCode.R_CONNECTOR(false), SCode.R_CONNECTOR(true)});
true = listMember(id, {"Real", "Integer", "Boolean", "String"});
then ();

//BTH same as above but extended with Clock type if Flags.SYNCHRONOUS_FEATURES == true
case (_, _, _, r, {SCode.EXTENDS(baseClassPath=Absyn.IDENT(id))})
equation
Expand Down Expand Up @@ -906,12 +906,12 @@ algorithm
{"Real", "Integer", "String", "Boolean", "Clock"},
{"Real", "Integer", "String", "Boolean"});
b1 := listMember(childName, strLst);

rstLst := Util.if_(intGe(Flags.getConfigEnum(Flags.LANGUAGE_STANDARD), 33),
{SCode.R_TYPE(), SCode.R_PREDEFINED_INTEGER(), SCode.R_PREDEFINED_REAL(), SCode.R_PREDEFINED_STRING(), SCode.R_PREDEFINED_BOOLEAN(), SCode.R_PREDEFINED_CLOCK()},
{SCode.R_TYPE(), SCode.R_PREDEFINED_INTEGER(), SCode.R_PREDEFINED_REAL(), SCode.R_PREDEFINED_STRING(), SCode.R_PREDEFINED_BOOLEAN()});
b2 := listMember(childRestriction, rstLst);

b3 := valueEq(parentRestriction, SCode.R_TYPE());

//b2 := listMember(childRestriction, {SCode.R_TYPE(), SCode.R_ENUMERATION(), SCode.R_PREDEFINED_INTEGER(), SCode.R_PREDEFINED_REAL(), SCode.R_PREDEFINED_STRING(), SCode.R_PREDEFINED_BOOLEAN(), SCode.R_PREDEFINED_ENUMERATION()});
Expand Down Expand Up @@ -3776,7 +3776,7 @@ algorithm
case (cache, _, _, _, cl as SCode.CLASS(name = "String"), _, _) then (cache,{},cl,DAE.NOMOD());
case (cache, _, _, _, cl as SCode.CLASS(name = "Boolean"), _, _) then (cache,{},cl,DAE.NOMOD());
// BTH
case (cache, _, _, _, cl as SCode.CLASS(name = "Clock"), _, _)
case (cache, _, _, _, cl as SCode.CLASS(name = "Clock"), _, _)
equation
true = intGe(Flags.getConfigEnum(Flags.LANGUAGE_STANDARD), 33);
then (cache,{},cl,DAE.NOMOD());
Expand Down Expand Up @@ -8322,15 +8322,15 @@ algorithm
// redeclare constant Boolean standardOrderComponents = true
case (DAE.REDECL(_, _, {(SCode.COMPONENT(typeSpec=Absyn.TPATH(path=path)), _)})) equation
true = intGe(Flags.getConfigEnum(Flags.LANGUAGE_STANDARD), 33);

name = Absyn.pathFirstIdent(path);
// BTH
true = listMember(name, {"Real", "Integer", "Boolean", "String", "Clock"});
then true;

case (DAE.REDECL(_, _, {(SCode.COMPONENT(typeSpec=Absyn.TPATH(path=path)), _)})) equation
false = intGe(Flags.getConfigEnum(Flags.LANGUAGE_STANDARD), 33);

name = Absyn.pathFirstIdent(path);
// BTH
true = listMember(name, {"Real", "Integer", "Boolean", "String"});
Expand Down
4 changes: 2 additions & 2 deletions Compiler/FrontEnd/MetaUtil.mo
View file
Expand Up @@ -370,9 +370,9 @@ algorithm
case(Absyn.IDENT("String")) then DAE.T_STRING_DEFAULT;
case(Absyn.IDENT("Boolean")) then DAE.T_BOOL_DEFAULT;
// BTH
case(Absyn.IDENT("Clock"))
case(Absyn.IDENT("Clock"))
equation
true = intGe(Flags.getConfigEnum(Flags.LANGUAGE_STANDARD), 33);
true = intGe(Flags.getConfigEnum(Flags.LANGUAGE_STANDARD), 33);
then DAE.T_CLOCK_DEFAULT;
end match;
end reparseType;
Expand Down
4 changes: 2 additions & 2 deletions Compiler/FrontEnd/NFInst.mo
View file
Expand Up @@ -557,9 +557,9 @@ algorithm
case ("String", _) then DAE.T_STRING(inAttributes, DAE.emptyTypeSource);
case ("Boolean", _) then DAE.T_BOOL(inAttributes, DAE.emptyTypeSource);
// BTH
case ("Clock", _)
case ("Clock", _)
equation
true = intGe(Flags.getConfigEnum(Flags.LANGUAGE_STANDARD), 33);
true = intGe(Flags.getConfigEnum(Flags.LANGUAGE_STANDARD), 33);
then DAE.T_CLOCK(inAttributes, DAE.emptyTypeSource);
case ("StateSelect", _) then DAE.T_ENUMERATION_DEFAULT;
end match;
Expand Down
20 changes: 10 additions & 10 deletions Compiler/FrontEnd/Static.mo
View file
Expand Up @@ -598,7 +598,7 @@ algorithm
// BTH
case (cache,_,Absyn.CLOCK(value = ck),_,st,_,_,_,_)
equation
true = intGe(Flags.getConfigEnum(Flags.LANGUAGE_STANDARD), 33);
true = intGe(Flags.getConfigEnum(Flags.LANGUAGE_STANDARD), 33);
then
(cache,DAE.CLKCONST(ck),DAE.PROP(DAE.T_CLOCK_DEFAULT,DAE.C_CONST()),st);

Expand Down Expand Up @@ -4619,7 +4619,7 @@ algorithm

call = Expression.makePureBuiltinCall("Clock", {}, ty);
then (cache, call, DAE.PROP(DAE.T_CLOCK_DEFAULT, DAE.C_CONST()));

// clock with Integer interval "Clock(intervalCounter)"
case (cache,env,{aintervalCounter},{},impl,pre,_)
equation
Expand Down Expand Up @@ -6889,35 +6889,35 @@ algorithm
case "getInstanceName" then elabBuiltinGetInstanceName;
case "classDirectory" then elabBuiltinClassDirectory;
case "sample" then elabBuiltinSample;
case "Clock"
case "Clock"
equation
true = intGe(Flags.getConfigEnum(Flags.LANGUAGE_STANDARD), 33);
then elabBuiltinClock;
case "previous"
case "previous"
equation
true = intGe(Flags.getConfigEnum(Flags.LANGUAGE_STANDARD), 33);
then elabBuiltinPrevious;
case "hold"
case "hold"
equation
true = intGe(Flags.getConfigEnum(Flags.LANGUAGE_STANDARD), 33);
then elabBuiltinHold;
case "subSample"
case "subSample"
equation
true = intGe(Flags.getConfigEnum(Flags.LANGUAGE_STANDARD), 33);
then elabBuiltinSubSample;
case "superSample"
case "superSample"
equation
true = intGe(Flags.getConfigEnum(Flags.LANGUAGE_STANDARD), 33);
then elabBuiltinSuperSample;
case "shiftSample"
case "shiftSample"
equation
true = intGe(Flags.getConfigEnum(Flags.LANGUAGE_STANDARD), 33);
then elabBuiltinShiftSample;
case "backSample"
case "backSample"
equation
true = intGe(Flags.getConfigEnum(Flags.LANGUAGE_STANDARD), 33);
then elabBuiltinBackSample;
case "noClock"
case "noClock"
equation
true = intGe(Flags.getConfigEnum(Flags.LANGUAGE_STANDARD), 33);
then elabBuiltinNoClock;
Expand Down
4 changes: 2 additions & 2 deletions Compiler/Script/Interactive.mo
View file
Expand Up @@ -9602,9 +9602,9 @@ algorithm
case (Absyn.IDENT(name = "Boolean"),_,_) then (Absyn.CLASS("Boolean",false,false,false,Absyn.R_PREDEFINED_BOOLEAN(),
Absyn.dummyParts,Absyn.dummyInfo),Absyn.IDENT("Boolean"));
// BTH
case (Absyn.IDENT(name = "Clock"),_,_)
case (Absyn.IDENT(name = "Clock"),_,_)
equation
true = intGe(Flags.getConfigEnum(Flags.LANGUAGE_STANDARD), 33);
true = intGe(Flags.getConfigEnum(Flags.LANGUAGE_STANDARD), 33);
then (Absyn.CLASS("Clock",false,false,false,Absyn.R_PREDEFINED_CLOCK(),
Absyn.dummyParts,Absyn.dummyInfo),Absyn.IDENT("Clock"));

Expand Down

0 comments on commit f209f27

Please sign in to comment.