- Merging

git-svn-id: https://openmodelica.org/svn/OpenModelica/branches/sjoelund-functiontree@6296 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Oct 6, 2010 · 44e8d01 · 44e8d01
2 parents 526b6ad + e22cd43
commit 44e8d01
Show file tree

Hide file tree

Showing 3 changed files with 606 additions and 539 deletions.
diff --git a/Compiler/DAEUtil.mo b/Compiler/DAEUtil.mo
@@ -676,6 +676,7 @@ algorithm
     case (SOME(DAE.VAR_ATTR_INT(initial_ = SOME(r))),_) then r;
     case (SOME(DAE.VAR_ATTR_BOOL(initial_ = SOME(r))),_) then r;
     case (SOME(DAE.VAR_ATTR_STRING(initial_ = SOME(r))),_) then r;
+    case (SOME(DAE.VAR_ATTR_ENUMERATION(start = SOME(r))),_) then r;
     case(_,optExp) then optExp;
   end matchcontinue;
 end getStartAttrEmpty;
@@ -715,7 +716,7 @@ algorithm
     case (SOME(DAE.VAR_ATTR_INT(initial_ = SOME(r)))) then r;
     case (SOME(DAE.VAR_ATTR_BOOL(initial_ = SOME(r)))) then r;
     case (SOME(DAE.VAR_ATTR_STRING(initial_ = SOME(r)))) then r;
-    //ppriv- ??? should be here: case (SOME(DAE.VAR_ATTR_ENUMERATION(start = SOME(r)))) then r;
+    case (SOME(DAE.VAR_ATTR_ENUMERATION(start = SOME(r)))) then r;
     case (_) then DAE.RCONST(0.0);
   end matchcontinue;
 end getStartAttr;
@@ -731,7 +732,7 @@ algorithm start:= matchcontinue (inVariableAttributesOption)
     case (SOME(DAE.VAR_ATTR_INT(initial_ = SOME(r)))) then r;
     case (SOME(DAE.VAR_ATTR_BOOL(initial_ = SOME(r)))) then r;
     case (SOME(DAE.VAR_ATTR_STRING(initial_ = SOME(r)))) then r;
-    //ppriv- ??? should be here: case (SOME(DAE.VAR_ATTR_ENUMERATION(start = SOME(r)))) then r;
+    case (SOME(DAE.VAR_ATTR_ENUMERATION(start = SOME(r)))) then r;
   end matchcontinue;
 end getStartAttrFail;