Skip to content

Commit

Permalink
- fix copy past error from last commit
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@14348 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
Jens Frenkel committed Dec 12, 2012
1 parent 09fd39d commit 15306e2
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions Compiler/FrontEnd/Inline.mo
Original file line number Diff line number Diff line change
Expand Up @@ -1426,14 +1426,14 @@ algorithm
equation
true = DAEUtil.convertInlineTypeToBool(inlineType);
true = checkInlineType(inlineType,fns);
(fn,comment) = getFunctionBody(p,fns);
(fn,comment) = getFunctionBody(p,fns);
// get inputs, body and output
(crefs,{cr},stmts,repl) = getFunctionInputsOutputBody(fn,{},{},{},VarTransform.emptyReplacements());
// merge statements to one line
// merge statements to one line
repl = mergeFunctionBody(stmts,repl);
newExp = VarTransform.getReplacement(repl,cr);
argmap = List.threadTuple(crefs,args);
(argmap,checkcr) = extendCrefRecords(argmap,HashTableCG.emptyHashTable());
(argmap,checkcr) = extendCrefRecords(argmap,HashTableCG.emptyHashTable());
// compare types
true = checkExpsTypeEquiv(e1, newExp);
// add noEvent to avoid events as usually for functions
Expand Down Expand Up @@ -1503,7 +1503,7 @@ algorithm
equation
false = Config.acceptMetaModelicaGrammar();
true = checkInlineType(inlineType,fns);
(fn,comment) = getFunctionBody(p,fns);
(fn,comment) = getFunctionBody(p,fns);
// get inputs, body and output
(crefs,{cr},stmts,repl) = getFunctionInputsOutputBody(fn,{},{},{},VarTransform.emptyReplacements());
// merge statements to one line
Expand All @@ -1519,9 +1519,9 @@ algorithm
newExp = Debug.bcallret1(not generateEvents,Expression.addNoEventToRelationsAndConds,newExp,newExp);
((newExp,(_,_,true))) = Expression.traverseExp(newExp,replaceArgs,(argmap,checkcr,true));
// for inlinecalls in functions
((newExp1,(fns1,_))) = Expression.traverseExp(newExp,inlineCall,(fns,true));
((newExp1,(fns1,_))) = Expression.traverseExp(newExp,forceInlineCall,(fns,true));
then
((newExp1,(fns,true)));
((newExp1,(fns,true)));
else inTuple;
end matchcontinue;
end forceInlineCall;
Expand Down

0 comments on commit 15306e2

Please sign in to comment.