- SimCode.mo

- fix bug in derVarFromStateVar to avoid redefinition of macros in generated code git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@5825 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Jul 7, 2010 · ac71acc · ac71acc
1 parent a50e099
commit ac71acc
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/Compiler/SimCode.mo b/Compiler/SimCode.mo
@@ -4315,13 +4315,20 @@ algorithm
       Boolean isFixed;
       Exp.Type type_;
       Boolean isDiscrete;
-      Option<DAE.ComponentRef> arrayCref;
-    case (SIMVAR(name, kind, comment, index, isFixed, type_, isDiscrete, arrayCref))
+      DAE.ComponentRef arrayCref;
+    case (SIMVAR(name, kind, comment, index, isFixed, type_, isDiscrete, NONE()))
+      equation
+        name = DAELow.crefPrefixDer(name);
+      then
+        SIMVAR(name, DAELow.STATE_DER(), comment, index, isFixed, type_,
+               isDiscrete, NONE());      
+    case (SIMVAR(name, kind, comment, index, isFixed, type_, isDiscrete, SOME(arrayCref)))
       equation
         name = DAELow.crefPrefixDer(name);
+        arrayCref = DAELow.crefPrefixDer(arrayCref);
       then
         SIMVAR(name, DAELow.STATE_DER(), comment, index, isFixed, type_,
-               isDiscrete, arrayCref);
+               isDiscrete, SOME(arrayCref));
   end matchcontinue;
 end derVarFromStateVar;