- expected output

- remove the merging of modifiers in SCodeAnalyseRedeclare.mo for now as it seems to have some issues with the AVM models. git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@14069 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Nov 26, 2012 · 6d6ddeb · 6d6ddeb
1 parent 221881a
commit 6d6ddeb
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/Compiler/FrontEnd/SCodeAnalyseRedeclare.mo b/Compiler/FrontEnd/SCodeAnalyseRedeclare.mo
@@ -1201,7 +1201,7 @@ algorithm
         (ilist as _::_) = getDerivedIScopes(rest, {});
         // start with original and fold derived prefixes on to it.
         e = List.applyAndFold(ilist, SCodeFlattenRedeclare.propagateAttributesClass, getElementFromIScope, e);
-        e = List.applyAndFold(ilist, propagateModifiersAndArrayDims, getElementFromIScope, e);
+        // e = List.applyAndFold(ilist, propagateModifiersAndArrayDims, getElementFromIScope, e);
         last = List.last(ilist);
         EI(eLast,envLast) = getEIFromIScope(last);
         // a = a, a = c, c = d, d = e -> a = e 

diff --git a/Compiler/Template/CodegenC.tpl b/Compiler/Template/CodegenC.tpl
@@ -6639,7 +6639,6 @@ case IFEXP(__) then
       <%condVar%> = (modelica_boolean)<%condExp%>;
       if (<%condVar%>) {
         <%preExpThen%>
-        // exp <%printExpStr(expThen)%> has type <%unparseType(typeof(expThen))%>
         <%if eThen then resultVarAssignment(typeof(exp),resVar,eThen)%>
       } else {
         <%preExpElse%>