fix ticket:4292, handle DAE.REDUCTION also

OpenModelica · Mar 1, 2017 · b1a493a · b1a493a
1 parent 64ce9d9
commit b1a493a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/Compiler/FrontEnd/NFSCodeFlattenImports.mo b/Compiler/FrontEnd/NFSCodeFlattenImports.mo
@@ -633,18 +633,21 @@ algorithm
       Absyn.ForIterators iters;
       SourceInfo info;
       tuple<Env, SourceInfo> tup;
+      Absyn.ReductionIterType iterType;
 
     case (Absyn.CREF(componentRef = cref), tup as (env, info))
       equation
         cref = NFSCodeLookup.lookupComponentRef(cref, env, info);
       then
         (Absyn.CREF(cref), tup);
 
-    case (Absyn.CALL(functionArgs = Absyn.FOR_ITER_FARG(iterators = iters)), (env, info))
+    case (Absyn.CALL(function_ = cref, functionArgs = args as Absyn.FOR_ITER_FARG(exp = exp, iterType = iterType, iterators = iters)), (env, info))
       equation
+        cref = NFSCodeLookup.lookupComponentRef(cref, env, info);
         env = NFSCodeEnv.extendEnvWithIterators(iters, System.tmpTickIndex(NFSCodeEnv.tmpTickIndex), env);
+        exp = flattenExp(exp, env, info);
       then
-        (inExp, (env, info));
+        (Absyn.CALL(cref, Absyn.FOR_ITER_FARG(exp, iterType, iters)), (env, info));
 
     case (Absyn.CALL(function_ = Absyn.CREF_IDENT(name = "SOME")), _)
       then (inExp,inTuple);

diff --git a/Compiler/Script/CevalScript.mo b/Compiler/Script/CevalScript.mo
@@ -1952,6 +1952,9 @@ algorithm
     local
       String name;
 
+    case DAE.REDUCTION(reductionInfo = DAE.REDUCTIONINFO(path = Absyn.FULLYQUALIFIED(Absyn.QUALIFIED(name = name))))
+      then List.consOnTrue(not listMember(name, inAcc), name, inAcc);
+
     case DAE.CALL(path = Absyn.FULLYQUALIFIED(Absyn.QUALIFIED(name = name)),
                   attr = DAE.CALL_ATTR(builtin = false))
       then List.consOnTrue(not listMember(name, inAcc), name, inAcc);

diff --git a/Compiler/SimCode/SimCodeFunction.mo b/Compiler/SimCode/SimCodeFunction.mo
@@ -274,9 +274,9 @@ algorithm
       equation
         // Create FunctionCode
         (daeElements,literals) = SimCodeFunctionUtil.findLiterals(daeMainFunction::daeElements);
-        (mainFunction::fns, extraRecordDecls, includes, includeDirs, libs,libPaths) = SimCodeFunctionUtil.elaborateFunctions(program, daeElements, metarecordTypes, literals, includes);
+        (mainFunction::fns, extraRecordDecls, includes, includeDirs, libs, libPaths) = SimCodeFunctionUtil.elaborateFunctions(program, daeElements, metarecordTypes, literals, includes);
         SimCodeFunctionUtil.checkValidMainFunction(name, mainFunction);
-        makefileParams = SimCodeFunctionUtil.createMakefileParams(includeDirs, libs,libPaths, true);
+        makefileParams = SimCodeFunctionUtil.createMakefileParams(includeDirs, libs, libPaths, true);
         fnCode = FUNCTIONCODE(name, SOME(mainFunction), fns, literals, includes, makefileParams, extraRecordDecls);
         // Generate code
         _ = Tpl.tplString(CodegenCFunctions.translateFunctions, fnCode);
@@ -286,8 +286,8 @@ algorithm
       equation
         // Create FunctionCode
         (daeElements,literals) = SimCodeFunctionUtil.findLiterals(daeElements);
-        (fns, extraRecordDecls, includes, includeDirs, libs,libPaths) = SimCodeFunctionUtil.elaborateFunctions(program, daeElements, metarecordTypes, literals, includes);
-        makefileParams = SimCodeFunctionUtil.createMakefileParams(includeDirs, libs,libPaths, true);
+        (fns, extraRecordDecls, includes, includeDirs, libs, libPaths) = SimCodeFunctionUtil.elaborateFunctions(program, daeElements, metarecordTypes, literals, includes);
+        makefileParams = SimCodeFunctionUtil.createMakefileParams(includeDirs, libs, libPaths, true);
         // remove OpenModelica.threadData.ThreadData
         fns = removeThreadDataFunction(fns, {});
         extraRecordDecls = removeThreadDataRecord(extraRecordDecls, {});