- Fix compilation of ASUB in non-function context, too

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@12509 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Aug 14, 2012 · f57b222 · f57b222
1 parent b4926da
commit f57b222
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/Compiler/Template/CodegenC.tpl b/Compiler/Template/CodegenC.tpl
@@ -6519,7 +6519,7 @@ template daeExpAsub(Exp inExp, Context context, Text &preExp /*BUFP*/,
         arrName
     case PARALLEL_FUNCTION_CONTEXT(__)  then
         arrName
-      else
+    else
         arrayScalarRhs(ecr.ty, subs, arrName, context, &preExp, &varDecls)
 
   case ASUB(exp=e, sub=indexes) then
@@ -6892,14 +6892,13 @@ template arrayScalarRhs(Type ty, list<Exp> subs, String arrName, Context context
       'arrayGet(<%arrName%>,<%dimsValuesStr%>) /*arrayScalarRhs*/'
     else
     match context
-        case FUNCTION_CONTEXT(__) then
-          <<
-          (*<%arrayType%>_element_addr(&<%arrName%>, <%dimsLenStr%>, <%dimsValuesStr%>))
-          >>
         case PARALLEL_FUNCTION_CONTEXT(__) then
           <<
           (*<%arrayType%>_element_addr_c99_<%dimsLenStr%>(&<%arrName%>, <%dimsLenStr%>, <%dimsValuesStr%>))
           >>
+        else
+          '(*<%arrayType%>_element_addr(&<%arrName%>, <%dimsLenStr%>, <%dimsValuesStr%>))'
+
 end arrayScalarRhs;
 
 template daeExpList(Exp exp, Context context, Text &preExp /*BUFP*/,