make clockIndex optional instead of 0

OpenModelica · Oct 16, 2015 · f1a8433 · f1a8433
1 parent 4002cbd
commit f1a8433
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Compiler/SimCode/SimCodeUtil.mo b/Compiler/SimCode/SimCodeUtil.mo
@@ -661,7 +661,7 @@ public function getClockIndex "author: rfranke
   Returns the index of the clock of a variable or zero non-clocked variables"
   input SimCodeVar.SimVar simVar;
   input SimCode.SimCode simCode;
-  output Integer clockIndex;
+  output Option<Integer> clockIndex;
 protected
   DAE.ComponentRef cref;
   HashTable.HashTable clkHT;
@@ -670,8 +670,8 @@ algorithm
   clockIndex := match simCode
     case SimCode.SIMCODE(crefToClockIndexHT=clkHT) then
       if BaseHashTable.hasKey(cref, clkHT)
-      then BaseHashTable.get(cref, clkHT)
-      else 0;
+      then SOME(BaseHashTable.get(cref, clkHT))
+      else NONE();
   end match;
 end getClockIndex;
 

diff --git a/Compiler/Template/CodegenFMUCommon.tpl b/Compiler/Template/CodegenFMUCommon.tpl
@@ -448,7 +448,7 @@ match simVar
   <<
   name="<%System.stringReplace(crefStrNoUnderscore(name),"$", "_D_")%>"
   valueReference="<%valueReference%>"
-  <%if boolNot(stringEq(clockIndex, "0")) then 'clockIndex="'+clockIndex+'"' %>
+  <%if boolNot(stringEq(clockIndex, "")) then 'clockIndex="'+clockIndex+'"' %>
   <%if boolNot(stringEq(previous, "")) then 'previous="'+previous+'"' %>
   <%description%>
   variability="<%variability%>"

diff --git a/Compiler/Template/SimCodeTV.mo b/Compiler/Template/SimCodeTV.mo
@@ -842,7 +842,7 @@ package SimCodeUtil
   function getClockIndex
     input SimCodeVar.SimVar simVar;
     input SimCode.SimCode simCode;
-    output Integer clockIndex;
+    output Option<Integer> clockIndex;
   end getClockIndex;
 
   function computeDependencies