Merge pull request #16 from bxparks/develop

0.7.2 - support fixed offset RULES with '/' in FORMAT

Author: bxparks

CHANGELOG.md

@@ -1,9 +1,16 @@
 # Changelog
 
 * Unreleased
+* 0.7.2
+    * Support timezones whose FORMAT contains a '/' with a fixed RULES column.
+      Seems to make BasicZoneProcessor slightly smaller (20-80 bytes) and
+      ExtendedZoneProcessor slightly bigger (50-100 bytes).
+    * Split `--granularity` into `--until_at_granularity` and
+      `offset_granularity`. Current zonedb files use values of 60 and 900
+      respectively.
 * 0.7.1
-    * Replace `TimeZone::printAbbrevTo()` with more
-      flexible and useful `TimeZone::getAbbrev()`.
+    * Replace `TimeZone::printAbbrevTo()` with more flexible and useful
+      `TimeZone::getAbbrev()`.
 * 0.7
     * Change TimeZoneData to store mStdOffset and mDstOffset in units of
       one minute (instead of 15-minute increments, "code") in the off chance

README.md

@@ -204,7 +204,7 @@ Conversion from an epochSeconds to date-time components including timezone
 * 2.8 microseconds on an ESP32,
 * 6 microseconds on a Teensy 3.2.
 
-**Version**: 0.7.1 (2019-08-13, TZ DB version 2019b, beta)
+**Version**: 0.7.2 (2019-08-14, TZ DB version 2019b, beta)
 
 **Status**: Upgraded to latest TZ DB version 2019b. Validated against 3
 other timezone libraries (Python, Java, C++). See [CHANGELOG.md](CHANGELOG.md)

USER_GUIDE.md

@@ -2,7 +2,7 @@
 
 See the [README.md](README.md) for introductory background.
 
-Version: 0.7.1 (2019-08-13, TZ DB version 2019b, beta)
+Version: 0.7.2 (2019-08-14, TZ DB version 2019b, beta)
 
 ## Installation
 

docs/html/AceTime_8h_source.html

@@ -184,13 +184,13 @@
 </table><table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="func-members"></a>
 Functions</h2></td></tr>
-<tr class="memitem:a5893c5995c2a8e752b750e1587506e8e"><td class="memItemLeft" align="right" valign="top">uint16_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="Brokers_8h.html#a5893c5995c2a8e752b750e1587506e8e">ace_time::internal::timeCodeToMinutes</a> (uint8_t rawCode, uint8_t rawModifier)</td></tr>
-<tr class="memdesc:a5893c5995c2a8e752b750e1587506e8e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Convert (timeCode, timeModifier) fields in zoneinfo to minutes.  <a href="Brokers_8h.html#a5893c5995c2a8e752b750e1587506e8e">More...</a><br /></td></tr>
-<tr class="separator:a5893c5995c2a8e752b750e1587506e8e"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:af7217437baaa848328172f733fc86be8"><td class="memItemLeft" align="right" valign="top"><a id="af7217437baaa848328172f733fc86be8"></a>
-uint8_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="Brokers_8h.html#af7217437baaa848328172f733fc86be8">ace_time::internal::toModifier</a> (uint8_t rawModifier)</td></tr>
-<tr class="memdesc:af7217437baaa848328172f733fc86be8"><td class="mdescLeft">&#160;</td><td class="mdescRight">Extract the 'w', 's' 'u' suffix from the 'modifier' field, so that they can be compared against TIME_MODIFIER_W, TIME_MODIFIER_S and TIME_MODIFIER_U. <br /></td></tr>
-<tr class="separator:af7217437baaa848328172f733fc86be8"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a5f7fe934c97e99cd812171e90c7945cd"><td class="memItemLeft" align="right" valign="top">uint16_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="Brokers_8h.html#a5f7fe934c97e99cd812171e90c7945cd">ace_time::internal::timeCodeToMinutes</a> (uint8_t code, uint8_t modifier)</td></tr>
+<tr class="memdesc:a5f7fe934c97e99cd812171e90c7945cd"><td class="mdescLeft">&#160;</td><td class="mdescRight">Convert (timeCode, timeModifier) fields in zoneinfo to minutes.  <a href="Brokers_8h.html#a5f7fe934c97e99cd812171e90c7945cd">More...</a><br /></td></tr>
+<tr class="separator:a5f7fe934c97e99cd812171e90c7945cd"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ae980919d070889e10164c643f1411c5f"><td class="memItemLeft" align="right" valign="top"><a id="ae980919d070889e10164c643f1411c5f"></a>
+uint8_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="Brokers_8h.html#ae980919d070889e10164c643f1411c5f">ace_time::internal::toSuffix</a> (uint8_t modifier)</td></tr>
+<tr class="memdesc:ae980919d070889e10164c643f1411c5f"><td class="mdescLeft">&#160;</td><td class="mdescRight">Extract the 'w', 's' 'u' suffix from the 'modifier' field, so that they can be compared against TIME_SUFFIX_W, TIME_SUFFIX_S and TIME_SUFFIX_U. <br /></td></tr>
+<tr class="separator:ae980919d070889e10164c643f1411c5f"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock"><p>The classes provide a thin layer of indirection for accessing the zoneinfo files stored in the zonedb/ and zonedbx/ directories. </p>
@@ -201,8 +201,8 @@
 
 <p class="definition">Definition in file <a class="el" href="Brokers_8h_source.html">Brokers.h</a>.</p>
 </div><h2 class="groupheader">Function Documentation</h2>
-<a id="file_a5893c5995c2a8e752b750e1587506e8e"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#file_a5893c5995c2a8e752b750e1587506e8e">&#9670;&nbsp;</a></span>timeCodeToMinutes()</h2>
+<a id="file_a5f7fe934c97e99cd812171e90c7945cd"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#file_a5f7fe934c97e99cd812171e90c7945cd">&#9670;&nbsp;</a></span>timeCodeToMinutes()</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -214,13 +214,13 @@ <h2 class="memtitle"><span class="permalink"><a href="#file_a5893c5995c2a8e752b7
           <td class="memname">uint16_t ace_time::internal::timeCodeToMinutes </td>
           <td>(</td>
           <td class="paramtype">uint8_t&#160;</td>
-          <td class="paramname"><em>rawCode</em>, </td>
+          <td class="paramname"><em>code</em>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
           <td class="paramtype">uint8_t&#160;</td>
-          <td class="paramname"><em>rawModifier</em>&#160;</td>
+          <td class="paramname"><em>modifier</em>&#160;</td>
         </tr>
         <tr>
           <td></td>

docs/html/BasicZoneProcessor_8h_source.html

@@ -68,12 +68,12 @@
 <div class="title">ExtendedZoneProcessor.cpp</div>  </div>
 </div><!--header-->
 <div class="contents">
-<div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;<span class="comment">/*</span></div><div class="line"><a name="l00002"></a><span class="lineno">    2</span>&#160;<span class="comment"> * MIT License</span></div><div class="line"><a name="l00003"></a><span class="lineno">    3</span>&#160;<span class="comment"> * Copyright (c) 2019 Brian T. Park</span></div><div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;<span class="comment"> */</span></div><div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;</div><div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="preprocessor">#include &lt;Print.h&gt;</span></div><div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="preprocessor">#include &quot;LocalDate.h&quot;</span></div><div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor">#include &quot;ExtendedZone.h&quot;</span></div><div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="preprocessor">#include &quot;ExtendedZoneProcessor.h&quot;</span></div><div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;</div><div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="keyword">namespace </span><a class="code" href="namespaceace__time.html">ace_time</a> {</div><div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;</div><div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="keyword">const</span> extended::ZoneEra ExtendedZoneProcessor::kAnchorEra ACE_TIME_PROGMEM = {</div><div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;  <span class="keyword">nullptr</span> <span class="comment">/*zonePolicy*/</span>,</div><div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;  <span class="keyword">nullptr</span> <span class="comment">/*format*/</span>,</div><div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;  0 <span class="comment">/*offsetCode*/</span>,</div><div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;  0 <span class="comment">/*deltaCode*/</span>,</div><div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;  <a class="code" href="classace__time_1_1LocalDate.html#ab488f7039935fb19e1d53f63ec47a5f8">LocalDate::kInvalidYearTiny</a> <span class="comment">/*untilYearTiny*/</span>,</div><div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;  1 <span class="comment">/*untilMonth*/</span>,</div><div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;  1 <span class="comment">/*untilDay*/</span>,</div><div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;  0 <span class="comment">/*untilTimeCode*/</span>,</div><div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;  <a class="code" href="structace__time_1_1extended_1_1ZoneContext.html#ad2420b4c765947d4a220c1fd9b13b2b1">extended::ZoneContext::TIME_MODIFIER_W</a> <span class="comment">/*untilTimeModifier*/</span></div><div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;};</div><div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;</div><div class="line"><a name="l00025"></a><span class="lineno"><a class="line" href="classace__time_1_1ExtendedZoneProcessor.html#ac48a94acb7028a6f2a791fe268198756">   25</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="classace__time_1_1ExtendedZoneProcessor.html#ac48a94acb7028a6f2a791fe268198756">ExtendedZoneProcessor::printTo</a>(Print&amp; printer)<span class="keyword"> const </span>{</div><div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;  printer.print(<a class="code" href="classace__time_1_1ExtendedZone.html">ExtendedZone</a>(mZoneInfo.zoneInfo()).name());</div><div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;}</div><div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;</div><div class="line"><a name="l00029"></a><span class="lineno"><a class="line" href="classace__time_1_1ExtendedZoneProcessor.html#ab68cb446aeb2a8097f18697abecfc80f">   29</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="classace__time_1_1ExtendedZoneProcessor.html#ab68cb446aeb2a8097f18697abecfc80f">ExtendedZoneProcessor::printShortTo</a>(Print&amp; printer)<span class="keyword"> const </span>{</div><div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;  printer.print(<a class="code" href="classace__time_1_1ExtendedZone.html">ExtendedZone</a>(mZoneInfo.zoneInfo()).shortName());</div><div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;}</div><div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;</div><div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;}</div><div class="ttc" id="namespaceace__time_html"><div class="ttname"><a href="namespaceace__time.html">ace_time</a></div><div class="ttdef"><b>Definition:</b> <a href="BasicZone_8h_source.html#l00015">BasicZone.h:15</a></div></div>
+<div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;<span class="comment">/*</span></div><div class="line"><a name="l00002"></a><span class="lineno">    2</span>&#160;<span class="comment"> * MIT License</span></div><div class="line"><a name="l00003"></a><span class="lineno">    3</span>&#160;<span class="comment"> * Copyright (c) 2019 Brian T. Park</span></div><div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;<span class="comment"> */</span></div><div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;</div><div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="preprocessor">#include &lt;Print.h&gt;</span></div><div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="preprocessor">#include &quot;LocalDate.h&quot;</span></div><div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor">#include &quot;ExtendedZone.h&quot;</span></div><div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="preprocessor">#include &quot;ExtendedZoneProcessor.h&quot;</span></div><div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;</div><div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="keyword">namespace </span><a class="code" href="namespaceace__time.html">ace_time</a> {</div><div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;</div><div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="keyword">const</span> extended::ZoneEra ExtendedZoneProcessor::kAnchorEra ACE_TIME_PROGMEM = {</div><div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;  <span class="keyword">nullptr</span> <span class="comment">/*zonePolicy*/</span>,</div><div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;  <span class="keyword">nullptr</span> <span class="comment">/*format*/</span>,</div><div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;  0 <span class="comment">/*offsetCode*/</span>,</div><div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;  0 <span class="comment">/*deltaCode*/</span>,</div><div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;  <a class="code" href="classace__time_1_1LocalDate.html#ab488f7039935fb19e1d53f63ec47a5f8">LocalDate::kInvalidYearTiny</a> <span class="comment">/*untilYearTiny*/</span>,</div><div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;  1 <span class="comment">/*untilMonth*/</span>,</div><div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;  1 <span class="comment">/*untilDay*/</span>,</div><div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;  0 <span class="comment">/*untilTimeCode*/</span>,</div><div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;  <a class="code" href="structace__time_1_1extended_1_1ZoneContext.html#aa9dc6d2ad181a53cbd93853b5ee653ac">extended::ZoneContext::TIME_SUFFIX_W</a> <span class="comment">/*untilTimeModifier*/</span></div><div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;};</div><div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;</div><div class="line"><a name="l00025"></a><span class="lineno"><a class="line" href="classace__time_1_1ExtendedZoneProcessor.html#ac48a94acb7028a6f2a791fe268198756">   25</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="classace__time_1_1ExtendedZoneProcessor.html#ac48a94acb7028a6f2a791fe268198756">ExtendedZoneProcessor::printTo</a>(Print&amp; printer)<span class="keyword"> const </span>{</div><div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;  printer.print(<a class="code" href="classace__time_1_1ExtendedZone.html">ExtendedZone</a>(mZoneInfo.zoneInfo()).name());</div><div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;}</div><div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;</div><div class="line"><a name="l00029"></a><span class="lineno"><a class="line" href="classace__time_1_1ExtendedZoneProcessor.html#ab68cb446aeb2a8097f18697abecfc80f">   29</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="classace__time_1_1ExtendedZoneProcessor.html#ab68cb446aeb2a8097f18697abecfc80f">ExtendedZoneProcessor::printShortTo</a>(Print&amp; printer)<span class="keyword"> const </span>{</div><div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;  printer.print(<a class="code" href="classace__time_1_1ExtendedZone.html">ExtendedZone</a>(mZoneInfo.zoneInfo()).shortName());</div><div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;}</div><div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;</div><div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;}</div><div class="ttc" id="namespaceace__time_html"><div class="ttname"><a href="namespaceace__time.html">ace_time</a></div><div class="ttdef"><b>Definition:</b> <a href="BasicZone_8h_source.html#l00015">BasicZone.h:15</a></div></div>
 <div class="ttc" id="classace__time_1_1ExtendedZoneProcessor_html_ac48a94acb7028a6f2a791fe268198756"><div class="ttname"><a href="classace__time_1_1ExtendedZoneProcessor.html#ac48a94acb7028a6f2a791fe268198756">ace_time::ExtendedZoneProcessor::printTo</a></div><div class="ttdeci">void printTo(Print &amp;printer) const override</div><div class="ttdoc">Print a human-readable identifier (e.g. </div><div class="ttdef"><b>Definition:</b> <a href="ExtendedZoneProcessor_8cpp_source.html#l00025">ExtendedZoneProcessor.cpp:25</a></div></div>
-<div class="ttc" id="structace__time_1_1extended_1_1ZoneContext_html_ad2420b4c765947d4a220c1fd9b13b2b1"><div class="ttname"><a href="structace__time_1_1extended_1_1ZoneContext.html#ad2420b4c765947d4a220c1fd9b13b2b1">ace_time::extended::ZoneContext::TIME_MODIFIER_W</a></div><div class="ttdeci">static const uint8_t TIME_MODIFIER_W</div><div class="ttdoc">Represents &amp;#39;w&amp;#39; or wall time. </div><div class="ttdef"><b>Definition:</b> <a href="ZoneContext_8h_source.html#l00013">ZoneContext.h:13</a></div></div>
 <div class="ttc" id="classace__time_1_1ExtendedZoneProcessor_html_ab68cb446aeb2a8097f18697abecfc80f"><div class="ttname"><a href="classace__time_1_1ExtendedZoneProcessor.html#ab68cb446aeb2a8097f18697abecfc80f">ace_time::ExtendedZoneProcessor::printShortTo</a></div><div class="ttdeci">void printShortTo(Print &amp;printer) const override</div><div class="ttdoc">Print a short human-readable identifier (e.g. </div><div class="ttdef"><b>Definition:</b> <a href="ExtendedZoneProcessor_8cpp_source.html#l00029">ExtendedZoneProcessor.cpp:29</a></div></div>
 <div class="ttc" id="classace__time_1_1ExtendedZone_html"><div class="ttname"><a href="classace__time_1_1ExtendedZone.html">ace_time::ExtendedZone</a></div><div class="ttdoc">A thin wrapper around an extended::ZoneInfo data structure to provide a stable API access to some use...</div><div class="ttdef"><b>Definition:</b> <a href="ExtendedZone_8h_source.html#l00023">ExtendedZone.h:23</a></div></div>
 <div class="ttc" id="classace__time_1_1LocalDate_html_ab488f7039935fb19e1d53f63ec47a5f8"><div class="ttname"><a href="classace__time_1_1LocalDate.html#ab488f7039935fb19e1d53f63ec47a5f8">ace_time::LocalDate::kInvalidYearTiny</a></div><div class="ttdeci">static const int8_t kInvalidYearTiny</div><div class="ttdoc">Sentinel yearTiny which indicates an error condition or sometimes a year that &amp;#39;does not exist&amp;#39;...</div><div class="ttdef"><b>Definition:</b> <a href="LocalDate_8h_source.html#l00045">LocalDate.h:45</a></div></div>
+<div class="ttc" id="structace__time_1_1extended_1_1ZoneContext_html_aa9dc6d2ad181a53cbd93853b5ee653ac"><div class="ttname"><a href="structace__time_1_1extended_1_1ZoneContext.html#aa9dc6d2ad181a53cbd93853b5ee653ac">ace_time::extended::ZoneContext::TIME_SUFFIX_W</a></div><div class="ttdeci">static const uint8_t TIME_SUFFIX_W</div><div class="ttdoc">Represents &amp;#39;w&amp;#39; or wall time. </div><div class="ttdef"><b>Definition:</b> <a href="ZoneContext_8h_source.html#l00013">ZoneContext.h:13</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>