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@23051 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
OpenModelica-Hudson committed Oct 29, 2014
1 parent d6355a4 commit e567c70
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
16 changes: 8 additions & 8 deletions Compiler/FrontEnd/Static.mo
Expand Up @@ -2621,7 +2621,7 @@ algorithm
for exp2 in rest_expl loop
DAE.PROP(ty2, c2) :: rest_props := rest_props;
ty2 := Types.getUniontypeIfMetarecordReplaceAllSubtypes(ty2);

// If the types are not equivalent, try type conversion.
if not Types.equivtypes(ty1, ty2) then
try
Expand Down Expand Up @@ -3003,8 +3003,8 @@ algorithm

// Check that all rows have the same size, otherwise print an error and fail.
if not Expression.dimensionsEqual(dim2, outDim2) then
dim1_str := ExpressionDump.dimensionString(dim1);
dim2_str := ExpressionDump.dimensionString(dim2);
dim1_str := ExpressionDump.dimensionString(dim1);
dim2_str := ExpressionDump.dimensionString(dim2);
pre_str := PrefixUtil.printPrefixStr3(inPrefix);
el_str := List.toString(expl, ExpressionDump.printExpStr, "", "{", ", ", "}", true);
Error.addSourceMessageAndFail(Error.MATRIX_EXP_ROW_SIZE,
Expand Down Expand Up @@ -6766,10 +6766,10 @@ protected
Absyn.Path name, envName;
algorithm
FCore.CACHE(modelName = name) := inCache;

if PrefixUtil.isNoPrefix(inPrefix) then
envName := FGraph.getGraphName(inEnv);
str := if Absyn.pathEqual(envName, name) then
str := if Absyn.pathEqual(envName, name) then
Absyn.pathLastIdent(name) else Absyn.pathString(envName);
else
str := Absyn.pathLastIdent(name) + "." + PrefixUtil.printPrefixStr(inPrefix);
Expand Down Expand Up @@ -11223,16 +11223,16 @@ protected
list<Slot> rest_slots := inSlotLst;
algorithm
DAE.FUNCARG(name = fa1, ty = ty1, const = c1) := inFuncArg;

while not listEmpty(rest_slots) loop
slot :: rest_slots := rest_slots;
SLOT(defaultArg = DAE.FUNCARG(name = fa2)) := slot;

// Check if this slot has the same name as the one we're looking for.
if stringEq(fa1, fa2) then
SLOT(defaultArg = DAE.FUNCARG(const = c2, par = prl, defaultBinding = binding),
slotFilled = filled, idx = idx) := slot;

// Fail if the slot is already filled.
if filled then
pre_str := PrefixUtil.printPrefixStr3(inPrefix);
Expand Down
10 changes: 5 additions & 5 deletions Compiler/Script/Interactive.mo
Expand Up @@ -14899,7 +14899,7 @@ algorithm
Absyn.CLASS(name = cls_name) := inClass;
outReplace := cls_name == inClassName;
end replaceClassInProgram2;

protected function replaceClassInProgram
" This function takes a Class and a Program and replaces the class
definition at the top level in the program by the class definition of
Expand Down Expand Up @@ -16216,7 +16216,7 @@ end addInstantiatedClass;

protected function isInstantiatedClassNamed
input Absyn.Path inName;
input GlobalScript.InstantiatedClass inClass;
input GlobalScript.InstantiatedClass inClass;
output Boolean outIsNamed;
protected
Absyn.Path path;
Expand Down Expand Up @@ -17052,8 +17052,8 @@ algorithm
GlobalScript.FILE(name, loadtime, classes) := file;

if stringEq(fileName, name) then
omodtime := System.getFileModificationTime(fileName);
omodtime := System.getFileModificationTime(fileName);

if isSome(omodtime) then
SOME(modtime) := omodtime;

Expand Down Expand Up @@ -18266,7 +18266,7 @@ algorithm
Lookup.lookupClass(FCore.emptyCache(), inEnv, inClassPath, false);
env := FGraph.openScope(env, encflag, SOME(id), FGraph.restrictionToScopeType(restr));
ci_state := ClassInf.start(restr, FGraph.getGraphName(env));

// First try partial instantiation
try
(_, outEnv) := Inst.partialInstClassIn(cache, env, InnerOuter.emptyInstHierarchy,
Expand Down

0 comments on commit e567c70

Please sign in to comment.