diff options
| author | Ned Batchelder <ned@nedbatchelder.com> | 2016-05-21 08:56:09 -0400 |
|---|---|---|
| committer | Ned Batchelder <ned@nedbatchelder.com> | 2016-05-21 08:56:09 -0400 |
| commit | 539f26594e0c821a233361051fda901015e01784 (patch) | |
| tree | 7914b0ef018efafaf89b14535ed5de03dfeb71ad /doc | |
| parent | af6ee8eb297995b33fab89a130f1f3e5acc1e856 (diff) | |
| download | python-coveragepy-539f26594e0c821a233361051fda901015e01784.tar.gz | |
Latest sample html report
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/sample_html/cogapp___init___py.html | 26 | ||||
| -rw-r--r-- | doc/sample_html/cogapp___main___py.html | 20 | ||||
| -rw-r--r-- | doc/sample_html/cogapp_backward_py.html | 50 | ||||
| -rw-r--r-- | doc/sample_html/cogapp_cogapp_py.html | 2508 | ||||
| -rw-r--r-- | doc/sample_html/cogapp_makefiles_py.html | 174 | ||||
| -rw-r--r-- | doc/sample_html/cogapp_test_cogapp_py.html | 4764 | ||||
| -rw-r--r-- | doc/sample_html/cogapp_test_makefiles_py.html | 284 | ||||
| -rw-r--r-- | doc/sample_html/cogapp_test_whiteutils_py.html | 328 | ||||
| -rw-r--r-- | doc/sample_html/cogapp_whiteutils_py.html | 154 | ||||
| -rw-r--r-- | doc/sample_html/coverage_html.js | 74 | ||||
| -rw-r--r-- | doc/sample_html/index.html | 52 | ||||
| -rw-r--r-- | doc/sample_html/status.json | 2 | ||||
| -rw-r--r-- | doc/sample_html/style.css | 54 |
13 files changed, 4307 insertions, 4183 deletions
diff --git a/doc/sample_html/cogapp___init___py.html b/doc/sample_html/cogapp___init___py.html index 4003d77..1e2712e 100644 --- a/doc/sample_html/cogapp___init___py.html +++ b/doc/sample_html/cogapp___init___py.html @@ -44,22 +44,22 @@ <div class="help_panel"> <img id="panel_icon" src="keybd_open.png" alt="Hide keyboard shortcuts" /> -<p class="legend">Hot-keys on this page</p> + <p class="legend">Hot-keys on this page</p> <div> -<p class="keyhelp"> + <p class="keyhelp"> <span class="key">r</span> <span class="key">m</span> <span class="key">x</span> <span class="key">p</span> toggle line displays </p> -<p class="keyhelp"> + <p class="keyhelp"> <span class="key">j</span> <span class="key">k</span> next/prev highlighted chunk </p> -<p class="keyhelp"> + <p class="keyhelp"> <span class="key">0</span> (zero) top of page </p> -<p class="keyhelp"> + <p class="keyhelp"> <span class="key">1</span> (one) first highlighted chunk </p> </div> @@ -78,19 +78,19 @@ <p id="n7" class="stm run hide_run"><a href="#n7">7</a></p> <p id="n8" class="pln"><a href="#n8">8</a></p> <p id="n9" class="stm run hide_run"><a href="#n9">9</a></p> - + </td> <td class="text"> -<p id="t1" class="pln"><span class="str">""" Cog code generation tool.</span><span class="strut"> </span></p> -<p id="t2" class="pln"><span class="str"> http://nedbatchelder.com/code/cog</span><span class="strut"> </span></p> +<p id="t1" class="pln"><span class="str">""" Cog code generation tool.</span><span class="strut"> </span></p> +<p id="t2" class="pln"><span class="str"> http://nedbatchelder.com/code/cog</span><span class="strut"> </span></p> <p id="t3" class="pln"><span class="strut"> </span></p> -<p id="t4" class="pln"><span class="str"> Copyright 2004-2015, Ned Batchelder.</span><span class="strut"> </span></p> -<p id="t5" class="pln"><span class="str">"""</span><span class="strut"> </span></p> +<p id="t4" class="pln"><span class="str"> Copyright 2004-2015, Ned Batchelder.</span><span class="strut"> </span></p> +<p id="t5" class="pln"><span class="str">"""</span><span class="strut"> </span></p> <p id="t6" class="pln"><span class="strut"> </span></p> <p id="t7" class="stm run hide_run"><span class="key">from</span> <span class="nam">__future__</span> <span class="key">import</span> <span class="nam">absolute_import</span><span class="strut"> </span></p> <p id="t8" class="pln"><span class="strut"> </span></p> <p id="t9" class="stm run hide_run"><span class="key">from</span> <span class="op">.</span><span class="nam">cogapp</span> <span class="key">import</span> <span class="op">*</span><span class="strut"> </span></p> - + </td> </tr> </table> @@ -99,8 +99,8 @@ <div id="footer"> <div class="content"> <p> - <a class="nav" href="index.html">« index</a> <a class="nav" href="https://coverage.readthedocs.org">coverage.py v4.0.3</a>, - created at 2015-11-24 07:02 + <a class="nav" href="index.html">« index</a> <a class="nav" href="https://coverage.readthedocs.io">coverage.py v4.1</a>, + created at 2016-05-21 08:55 </p> </div> </div> diff --git a/doc/sample_html/cogapp___main___py.html b/doc/sample_html/cogapp___main___py.html index c805cbe..a7e9da1 100644 --- a/doc/sample_html/cogapp___main___py.html +++ b/doc/sample_html/cogapp___main___py.html @@ -44,22 +44,22 @@ <div class="help_panel"> <img id="panel_icon" src="keybd_open.png" alt="Hide keyboard shortcuts" /> -<p class="legend">Hot-keys on this page</p> + <p class="legend">Hot-keys on this page</p> <div> -<p class="keyhelp"> + <p class="keyhelp"> <span class="key">r</span> <span class="key">m</span> <span class="key">x</span> <span class="key">p</span> toggle line displays </p> -<p class="keyhelp"> + <p class="keyhelp"> <span class="key">j</span> <span class="key">k</span> next/prev highlighted chunk </p> -<p class="keyhelp"> + <p class="keyhelp"> <span class="key">0</span> (zero) top of page </p> -<p class="keyhelp"> + <p class="keyhelp"> <span class="key">1</span> (one) first highlighted chunk </p> </div> @@ -74,15 +74,15 @@ <p id="n3" class="stm mis"><a href="#n3">3</a></p> <p id="n4" class="pln"><a href="#n4">4</a></p> <p id="n5" class="stm mis"><a href="#n5">5</a></p> - + </td> <td class="text"> -<p id="t1" class="pln"><span class="str">"""Make Cog runnable directly from the module."""</span><span class="strut"> </span></p> +<p id="t1" class="pln"><span class="str">"""Make Cog runnable directly from the module."""</span><span class="strut"> </span></p> <p id="t2" class="stm mis"><span class="key">import</span> <span class="nam">sys</span><span class="strut"> </span></p> <p id="t3" class="stm mis"><span class="key">from</span> <span class="nam">cogapp</span> <span class="key">import</span> <span class="nam">Cog</span><span class="strut"> </span></p> <p id="t4" class="pln"><span class="strut"> </span></p> <p id="t5" class="stm mis"><span class="nam">sys</span><span class="op">.</span><span class="nam">exit</span><span class="op">(</span><span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">main</span><span class="op">(</span><span class="nam">sys</span><span class="op">.</span><span class="nam">argv</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> - + </td> </tr> </table> @@ -91,8 +91,8 @@ <div id="footer"> <div class="content"> <p> - <a class="nav" href="index.html">« index</a> <a class="nav" href="https://coverage.readthedocs.org">coverage.py v4.0.3</a>, - created at 2015-11-24 07:02 + <a class="nav" href="index.html">« index</a> <a class="nav" href="https://coverage.readthedocs.io">coverage.py v4.1</a>, + created at 2016-05-21 08:55 </p> </div> </div> diff --git a/doc/sample_html/cogapp_backward_py.html b/doc/sample_html/cogapp_backward_py.html index c0eb8cc..b11f9d7 100644 --- a/doc/sample_html/cogapp_backward_py.html +++ b/doc/sample_html/cogapp_backward_py.html @@ -44,22 +44,22 @@ <div class="help_panel"> <img id="panel_icon" src="keybd_open.png" alt="Hide keyboard shortcuts" /> -<p class="legend">Hot-keys on this page</p> + <p class="legend">Hot-keys on this page</p> <div> -<p class="keyhelp"> + <p class="keyhelp"> <span class="key">r</span> <span class="key">m</span> <span class="key">x</span> <span class="key">p</span> toggle line displays </p> -<p class="keyhelp"> + <p class="keyhelp"> <span class="key">j</span> <span class="key">k</span> next/prev highlighted chunk </p> -<p class="keyhelp"> + <p class="keyhelp"> <span class="key">0</span> (zero) top of page </p> -<p class="keyhelp"> + <p class="keyhelp"> <span class="key">1</span> (one) first highlighted chunk </p> </div> @@ -95,36 +95,36 @@ <p id="n24" class="stm run hide_run"><a href="#n24">24</a></p> <p id="n25" class="stm mis"><a href="#n25">25</a></p> <p id="n26" class="stm mis"><a href="#n26">26</a></p> - + </td> <td class="text"> -<p id="t1" class="pln"><span class="str">"""Compatibility between Py2 and Py3."""</span><span class="strut"> </span></p> +<p id="t1" class="pln"><span class="str">"""Compatibility between Py2 and Py3."""</span><span class="strut"> </span></p> <p id="t2" class="pln"><span class="strut"> </span></p> <p id="t3" class="stm run hide_run"><span class="key">import</span> <span class="nam">sys</span><span class="strut"> </span></p> <p id="t4" class="pln"><span class="strut"> </span></p> <p id="t5" class="stm run hide_run"><span class="nam">PY3</span> <span class="op">=</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">version_info</span><span class="op">[</span><span class="num">0</span><span class="op">]</span> <span class="op">==</span> <span class="num">3</span><span class="strut"> </span></p> <p id="t6" class="pln"><span class="strut"> </span></p> -<p id="t7" class="stm par run hide_run"><span class="annotate" title="Line 7 was executed, but never jumped to line 8">7 ↛ 8 [?]</span><span class="key">if</span> <span class="nam">PY3</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t8" class="stm mis"> <span class="nam">string_types</span> <span class="op">=</span> <span class="op">(</span><span class="nam">str</span><span class="op">,</span><span class="nam">bytes</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t9" class="stm mis"> <span class="nam">bytes_types</span> <span class="op">=</span> <span class="op">(</span><span class="nam">bytes</span><span class="op">,</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t10" class="stm mis"> <span class="key">def</span> <span class="nam">b</span><span class="op">(</span><span class="nam">s</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t11" class="stm mis"> <span class="key">return</span> <span class="nam">s</span><span class="op">.</span><span class="nam">encode</span><span class="op">(</span><span class="str">"latin-1"</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t12" class="stm mis"> <span class="key">def</span> <span class="nam">to_bytes</span><span class="op">(</span><span class="nam">s</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t13" class="stm mis"> <span class="key">return</span> <span class="nam">s</span><span class="op">.</span><span class="nam">encode</span><span class="op">(</span><span class="str">'utf8'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t7" class="stm par run hide_run"><span class="annotate short">7 ↛ 8</span><span class="annotate long">line 7 didn't jump to line 8, because the condition on line 7 was never true</span><span class="key">if</span> <span class="nam">PY3</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t8" class="stm mis"> <span class="nam">string_types</span> <span class="op">=</span> <span class="op">(</span><span class="nam">str</span><span class="op">,</span><span class="nam">bytes</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t9" class="stm mis"> <span class="nam">bytes_types</span> <span class="op">=</span> <span class="op">(</span><span class="nam">bytes</span><span class="op">,</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t10" class="stm mis"> <span class="key">def</span> <span class="nam">b</span><span class="op">(</span><span class="nam">s</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t11" class="stm mis"> <span class="key">return</span> <span class="nam">s</span><span class="op">.</span><span class="nam">encode</span><span class="op">(</span><span class="str">"latin-1"</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t12" class="stm mis"> <span class="key">def</span> <span class="nam">to_bytes</span><span class="op">(</span><span class="nam">s</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t13" class="stm mis"> <span class="key">return</span> <span class="nam">s</span><span class="op">.</span><span class="nam">encode</span><span class="op">(</span><span class="str">'utf8'</span><span class="op">)</span><span class="strut"> </span></p> <p id="t14" class="pln"><span class="key">else</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t15" class="stm run hide_run"> <span class="nam">string_types</span> <span class="op">=</span> <span class="op">(</span><span class="nam">basestring</span><span class="op">,</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t16" class="stm run hide_run"> <span class="nam">bytes_types</span> <span class="op">=</span> <span class="op">(</span><span class="nam">str</span><span class="op">,</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t17" class="stm run hide_run"> <span class="key">def</span> <span class="nam">b</span><span class="op">(</span><span class="nam">s</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t18" class="stm run hide_run"> <span class="key">return</span> <span class="nam">s</span><span class="strut"> </span></p> -<p id="t19" class="stm run hide_run"> <span class="key">def</span> <span class="nam">to_bytes</span><span class="op">(</span><span class="nam">s</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t20" class="stm run hide_run"> <span class="key">return</span> <span class="nam">s</span><span class="strut"> </span></p> +<p id="t15" class="stm run hide_run"> <span class="nam">string_types</span> <span class="op">=</span> <span class="op">(</span><span class="nam">basestring</span><span class="op">,</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t16" class="stm run hide_run"> <span class="nam">bytes_types</span> <span class="op">=</span> <span class="op">(</span><span class="nam">str</span><span class="op">,</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t17" class="stm run hide_run"> <span class="key">def</span> <span class="nam">b</span><span class="op">(</span><span class="nam">s</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t18" class="stm run hide_run"> <span class="key">return</span> <span class="nam">s</span><span class="strut"> </span></p> +<p id="t19" class="stm run hide_run"> <span class="key">def</span> <span class="nam">to_bytes</span><span class="op">(</span><span class="nam">s</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t20" class="stm run hide_run"> <span class="key">return</span> <span class="nam">s</span><span class="strut"> </span></p> <p id="t21" class="pln"><span class="strut"> </span></p> <p id="t22" class="pln"><span class="com"># Pythons 2 and 3 differ on where to get StringIO</span><span class="strut"> </span></p> <p id="t23" class="stm run hide_run"><span class="key">try</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t24" class="stm run hide_run"> <span class="key">from</span> <span class="nam">cStringIO</span> <span class="key">import</span> <span class="nam">StringIO</span><span class="strut"> </span></p> +<p id="t24" class="stm run hide_run"> <span class="key">from</span> <span class="nam">cStringIO</span> <span class="key">import</span> <span class="nam">StringIO</span><span class="strut"> </span></p> <p id="t25" class="stm mis"><span class="key">except</span> <span class="nam">ImportError</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t26" class="stm mis"> <span class="key">from</span> <span class="nam">io</span> <span class="key">import</span> <span class="nam">StringIO</span><span class="strut"> </span></p> - +<p id="t26" class="stm mis"> <span class="key">from</span> <span class="nam">io</span> <span class="key">import</span> <span class="nam">StringIO</span><span class="strut"> </span></p> + </td> </tr> </table> @@ -133,8 +133,8 @@ <div id="footer"> <div class="content"> <p> - <a class="nav" href="index.html">« index</a> <a class="nav" href="https://coverage.readthedocs.org">coverage.py v4.0.3</a>, - created at 2015-11-24 07:02 + <a class="nav" href="index.html">« index</a> <a class="nav" href="https://coverage.readthedocs.io">coverage.py v4.1</a>, + created at 2016-05-21 08:55 </p> </div> </div> diff --git a/doc/sample_html/cogapp_cogapp_py.html b/doc/sample_html/cogapp_cogapp_py.html index 26c6df7..d434af2 100644 --- a/doc/sample_html/cogapp_cogapp_py.html +++ b/doc/sample_html/cogapp_cogapp_py.html @@ -8,7 +8,7 @@ <meta http-equiv="X-UA-Compatible" content="IE=emulateIE7" /> - <title>Coverage for cogapp/cogapp.py: 47.88%</title> + <title>Coverage for cogapp/cogapp.py: 98.84%</title> <link rel="stylesheet" href="style.css" type="text/css"> <script type="text/javascript" src="jquery.min.js"></script> @@ -24,19 +24,19 @@ <div id="header"> <div class="content"> <h1>Coverage for <b>cogapp/cogapp.py</b> : - <span class="pc_cov">47.88%</span> + <span class="pc_cov">98.84%</span> </h1> <img id="keyboard_icon" src="keybd_closed.png" alt="Show keyboard shortcuts" /> <h2 class="stats"> - 423 statements - <span class="run hide_run shortkey_r button_toggle_run">229 run</span> - <span class="mis shortkey_m button_toggle_mis">194 missing</span> + 427 statements + <span class="run hide_run shortkey_r button_toggle_run">424 run</span> + <span class="mis shortkey_m button_toggle_mis">3 missing</span> <span class="exc shortkey_x button_toggle_exc">4 excluded</span> - <span class="par run hide_run shortkey_p button_toggle_par">26 partial</span> + <span class="par run hide_run shortkey_p button_toggle_par">4 partial</span> </h2> </div> @@ -44,22 +44,22 @@ <div class="help_panel"> <img id="panel_icon" src="keybd_open.png" alt="Hide keyboard shortcuts" /> -<p class="legend">Hot-keys on this page</p> + <p class="legend">Hot-keys on this page</p> <div> -<p class="keyhelp"> + <p class="keyhelp"> <span class="key">r</span> <span class="key">m</span> <span class="key">x</span> <span class="key">p</span> toggle line displays </p> -<p class="keyhelp"> + <p class="keyhelp"> <span class="key">j</span> <span class="key">k</span> next/prev highlighted chunk </p> -<p class="keyhelp"> + <p class="keyhelp"> <span class="key">0</span> (zero) top of page </p> -<p class="keyhelp"> + <p class="keyhelp"> <span class="key">1</span> (one) first highlighted chunk </p> </div> @@ -70,22 +70,22 @@ <tr> <td class="linenos"> <p id="n1" class="pln"><a href="#n1">1</a></p> -<p id="n2" class="pln"><a href="#n2">2</a></p> +<p id="n2" class="stm run hide_run"><a href="#n2">2</a></p> <p id="n3" class="pln"><a href="#n3">3</a></p> <p id="n4" class="pln"><a href="#n4">4</a></p> <p id="n5" class="pln"><a href="#n5">5</a></p> <p id="n6" class="pln"><a href="#n6">6</a></p> -<p id="n7" class="stm run hide_run"><a href="#n7">7</a></p> -<p id="n8" class="pln"><a href="#n8">8</a></p> -<p id="n9" class="stm run hide_run"><a href="#n9">9</a></p> +<p id="n7" class="pln"><a href="#n7">7</a></p> +<p id="n8" class="stm run hide_run"><a href="#n8">8</a></p> +<p id="n9" class="pln"><a href="#n9">9</a></p> <p id="n10" class="stm run hide_run"><a href="#n10">10</a></p> -<p id="n11" class="pln"><a href="#n11">11</a></p> -<p id="n12" class="stm run hide_run"><a href="#n12">12</a></p> -<p id="n13" class="pln"><a href="#n13">13</a></p> -<p id="n14" class="stm run hide_run"><a href="#n14">14</a></p> -<p id="n15" class="pln"><a href="#n15">15</a></p> -<p id="n16" class="stm run hide_run"><a href="#n16">16</a></p> -<p id="n17" class="pln"><a href="#n17">17</a></p> +<p id="n11" class="stm run hide_run"><a href="#n11">11</a></p> +<p id="n12" class="pln"><a href="#n12">12</a></p> +<p id="n13" class="stm run hide_run"><a href="#n13">13</a></p> +<p id="n14" class="pln"><a href="#n14">14</a></p> +<p id="n15" class="stm run hide_run"><a href="#n15">15</a></p> +<p id="n16" class="pln"><a href="#n16">16</a></p> +<p id="n17" class="stm run hide_run"><a href="#n17">17</a></p> <p id="n18" class="pln"><a href="#n18">18</a></p> <p id="n19" class="pln"><a href="#n19">19</a></p> <p id="n20" class="pln"><a href="#n20">20</a></p> @@ -120,165 +120,165 @@ <p id="n49" class="pln"><a href="#n49">49</a></p> <p id="n50" class="pln"><a href="#n50">50</a></p> <p id="n51" class="pln"><a href="#n51">51</a></p> -<p id="n52" class="stm run hide_run"><a href="#n52">52</a></p> -<p id="n53" class="pln"><a href="#n53">53</a></p> -<p id="n54" class="stm run hide_run"><a href="#n54">54</a></p> -<p id="n55" class="pln"><a href="#n55">55</a></p> +<p id="n52" class="pln"><a href="#n52">52</a></p> +<p id="n53" class="stm run hide_run"><a href="#n53">53</a></p> +<p id="n54" class="pln"><a href="#n54">54</a></p> +<p id="n55" class="stm run hide_run"><a href="#n55">55</a></p> <p id="n56" class="pln"><a href="#n56">56</a></p> -<p id="n57" class="stm run hide_run"><a href="#n57">57</a></p> -<p id="n58" class="stm par run hide_run"><a href="#n58">58</a></p> +<p id="n57" class="pln"><a href="#n57">57</a></p> +<p id="n58" class="stm run hide_run"><a href="#n58">58</a></p> <p id="n59" class="stm run hide_run"><a href="#n59">59</a></p> -<p id="n60" class="pln"><a href="#n60">60</a></p> -<p id="n61" class="stm mis"><a href="#n61">61</a></p> -<p id="n62" class="pln"><a href="#n62">62</a></p> -<p id="n63" class="stm run hide_run"><a href="#n63">63</a></p> -<p id="n64" class="pln"><a href="#n64">64</a></p> +<p id="n60" class="stm run hide_run"><a href="#n60">60</a></p> +<p id="n61" class="pln"><a href="#n61">61</a></p> +<p id="n62" class="stm run hide_run"><a href="#n62">62</a></p> +<p id="n63" class="pln"><a href="#n63">63</a></p> +<p id="n64" class="stm run hide_run"><a href="#n64">64</a></p> <p id="n65" class="pln"><a href="#n65">65</a></p> -<p id="n66" class="exc"><a href="#n66">66</a></p> -<p id="n67" class="pln"><a href="#n67">67</a></p> -<p id="n68" class="stm run hide_run"><a href="#n68">68</a></p> -<p id="n69" class="pln"><a href="#n69">69</a></p> +<p id="n66" class="pln"><a href="#n66">66</a></p> +<p id="n67" class="exc"><a href="#n67">67</a></p> +<p id="n68" class="pln"><a href="#n68">68</a></p> +<p id="n69" class="stm run hide_run"><a href="#n69">69</a></p> <p id="n70" class="pln"><a href="#n70">70</a></p> -<p id="n71" class="exc"><a href="#n71">71</a></p> -<p id="n72" class="pln"><a href="#n72">72</a></p> -<p id="n73" class="stm run hide_run"><a href="#n73">73</a></p> -<p id="n74" class="pln"><a href="#n74">74</a></p> +<p id="n71" class="pln"><a href="#n71">71</a></p> +<p id="n72" class="exc"><a href="#n72">72</a></p> +<p id="n73" class="pln"><a href="#n73">73</a></p> +<p id="n74" class="stm run hide_run"><a href="#n74">74</a></p> <p id="n75" class="pln"><a href="#n75">75</a></p> -<p id="n76" class="exc"><a href="#n76">76</a></p> -<p id="n77" class="pln"><a href="#n77">77</a></p> -<p id="n78" class="stm run hide_run"><a href="#n78">78</a></p> -<p id="n79" class="pln"><a href="#n79">79</a></p> +<p id="n76" class="pln"><a href="#n76">76</a></p> +<p id="n77" class="exc"><a href="#n77">77</a></p> +<p id="n78" class="pln"><a href="#n78">78</a></p> +<p id="n79" class="stm run hide_run"><a href="#n79">79</a></p> <p id="n80" class="pln"><a href="#n80">80</a></p> -<p id="n81" class="stm run hide_run"><a href="#n81">81</a></p> +<p id="n81" class="pln"><a href="#n81">81</a></p> <p id="n82" class="stm run hide_run"><a href="#n82">82</a></p> <p id="n83" class="stm run hide_run"><a href="#n83">83</a></p> -<p id="n84" class="pln"><a href="#n84">84</a></p> -<p id="n85" class="stm run hide_run"><a href="#n85">85</a></p> -<p id="n86" class="pln"><a href="#n86">86</a></p> +<p id="n84" class="stm run hide_run"><a href="#n84">84</a></p> +<p id="n85" class="pln"><a href="#n85">85</a></p> +<p id="n86" class="stm run hide_run"><a href="#n86">86</a></p> <p id="n87" class="pln"><a href="#n87">87</a></p> -<p id="n88" class="stm par run hide_run"><a href="#n88">88</a></p> +<p id="n88" class="pln"><a href="#n88">88</a></p> <p id="n89" class="stm run hide_run"><a href="#n89">89</a></p> -<p id="n90" class="stm par run hide_run"><a href="#n90">90</a></p> -<p id="n91" class="stm mis"><a href="#n91">91</a></p> -<p id="n92" class="pln"><a href="#n92">92</a></p> -<p id="n93" class="stm run hide_run"><a href="#n93">93</a></p> -<p id="n94" class="stm mis"><a href="#n94">94</a></p> -<p id="n95" class="pln"><a href="#n95">95</a></p> -<p id="n96" class="stm run hide_run"><a href="#n96">96</a></p> -<p id="n97" class="stm mis"><a href="#n97">97</a></p> -<p id="n98" class="pln"><a href="#n98">98</a></p> +<p id="n90" class="stm run hide_run"><a href="#n90">90</a></p> +<p id="n91" class="stm run hide_run"><a href="#n91">91</a></p> +<p id="n92" class="stm run hide_run"><a href="#n92">92</a></p> +<p id="n93" class="pln"><a href="#n93">93</a></p> +<p id="n94" class="stm run hide_run"><a href="#n94">94</a></p> +<p id="n95" class="stm run hide_run"><a href="#n95">95</a></p> +<p id="n96" class="pln"><a href="#n96">96</a></p> +<p id="n97" class="stm run hide_run"><a href="#n97">97</a></p> +<p id="n98" class="stm run hide_run"><a href="#n98">98</a></p> <p id="n99" class="pln"><a href="#n99">99</a></p> -<p id="n100" class="stm run hide_run"><a href="#n100">100</a></p> -<p id="n101" class="pln"><a href="#n101">101</a></p> +<p id="n100" class="pln"><a href="#n100">100</a></p> +<p id="n101" class="stm run hide_run"><a href="#n101">101</a></p> <p id="n102" class="pln"><a href="#n102">102</a></p> -<p id="n103" class="stm run hide_run"><a href="#n103">103</a></p> +<p id="n103" class="pln"><a href="#n103">103</a></p> <p id="n104" class="stm run hide_run"><a href="#n104">104</a></p> <p id="n105" class="stm run hide_run"><a href="#n105">105</a></p> <p id="n106" class="stm run hide_run"><a href="#n106">106</a></p> -<p id="n107" class="pln"><a href="#n107">107</a></p> -<p id="n108" class="stm run hide_run"><a href="#n108">108</a></p> +<p id="n107" class="stm run hide_run"><a href="#n107">107</a></p> +<p id="n108" class="pln"><a href="#n108">108</a></p> <p id="n109" class="stm run hide_run"><a href="#n109">109</a></p> -<p id="n110" class="pln"><a href="#n110">110</a></p> -<p id="n111" class="stm run hide_run"><a href="#n111">111</a></p> +<p id="n110" class="stm run hide_run"><a href="#n110">110</a></p> +<p id="n111" class="pln"><a href="#n111">111</a></p> <p id="n112" class="stm run hide_run"><a href="#n112">112</a></p> -<p id="n113" class="pln"><a href="#n113">113</a></p> -<p id="n114" class="stm run hide_run"><a href="#n114">114</a></p> -<p id="n115" class="pln"><a href="#n115">115</a></p> +<p id="n113" class="stm run hide_run"><a href="#n113">113</a></p> +<p id="n114" class="pln"><a href="#n114">114</a></p> +<p id="n115" class="stm run hide_run"><a href="#n115">115</a></p> <p id="n116" class="pln"><a href="#n116">116</a></p> <p id="n117" class="pln"><a href="#n117">117</a></p> <p id="n118" class="pln"><a href="#n118">118</a></p> <p id="n119" class="pln"><a href="#n119">119</a></p> -<p id="n120" class="stm run hide_run"><a href="#n120">120</a></p> +<p id="n120" class="pln"><a href="#n120">120</a></p> <p id="n121" class="stm run hide_run"><a href="#n121">121</a></p> <p id="n122" class="stm run hide_run"><a href="#n122">122</a></p> <p id="n123" class="stm run hide_run"><a href="#n123">123</a></p> -<p id="n124" class="pln"><a href="#n124">124</a></p> -<p id="n125" class="stm run hide_run"><a href="#n125">125</a></p> -<p id="n126" class="pln"><a href="#n126">126</a></p> -<p id="n127" class="stm run hide_run"><a href="#n127">127</a></p> -<p id="n128" class="pln"><a href="#n128">128</a></p> -<p id="n129" class="stm run hide_run"><a href="#n129">129</a></p> -<p id="n130" class="pln"><a href="#n130">130</a></p> -<p id="n131" class="stm run hide_run"><a href="#n131">131</a></p> +<p id="n124" class="stm run hide_run"><a href="#n124">124</a></p> +<p id="n125" class="pln"><a href="#n125">125</a></p> +<p id="n126" class="stm run hide_run"><a href="#n126">126</a></p> +<p id="n127" class="pln"><a href="#n127">127</a></p> +<p id="n128" class="stm run hide_run"><a href="#n128">128</a></p> +<p id="n129" class="pln"><a href="#n129">129</a></p> +<p id="n130" class="stm run hide_run"><a href="#n130">130</a></p> +<p id="n131" class="pln"><a href="#n131">131</a></p> <p id="n132" class="stm run hide_run"><a href="#n132">132</a></p> <p id="n133" class="stm run hide_run"><a href="#n133">133</a></p> -<p id="n134" class="pln"><a href="#n134">134</a></p> +<p id="n134" class="stm run hide_run"><a href="#n134">134</a></p> <p id="n135" class="pln"><a href="#n135">135</a></p> -<p id="n136" class="stm run hide_run"><a href="#n136">136</a></p> +<p id="n136" class="pln"><a href="#n136">136</a></p> <p id="n137" class="stm run hide_run"><a href="#n137">137</a></p> -<p id="n138" class="pln"><a href="#n138">138</a></p> +<p id="n138" class="stm run hide_run"><a href="#n138">138</a></p> <p id="n139" class="pln"><a href="#n139">139</a></p> -<p id="n140" class="stm run hide_run"><a href="#n140">140</a></p> +<p id="n140" class="pln"><a href="#n140">140</a></p> <p id="n141" class="stm run hide_run"><a href="#n141">141</a></p> <p id="n142" class="stm run hide_run"><a href="#n142">142</a></p> <p id="n143" class="stm run hide_run"><a href="#n143">143</a></p> -<p id="n144" class="pln"><a href="#n144">144</a></p> -<p id="n145" class="stm run hide_run"><a href="#n145">145</a></p> +<p id="n144" class="stm run hide_run"><a href="#n144">144</a></p> +<p id="n145" class="pln"><a href="#n145">145</a></p> <p id="n146" class="stm run hide_run"><a href="#n146">146</a></p> -<p id="n147" class="pln"><a href="#n147">147</a></p> +<p id="n147" class="stm run hide_run"><a href="#n147">147</a></p> <p id="n148" class="pln"><a href="#n148">148</a></p> <p id="n149" class="pln"><a href="#n149">149</a></p> <p id="n150" class="pln"><a href="#n150">150</a></p> -<p id="n151" class="stm run hide_run"><a href="#n151">151</a></p> +<p id="n151" class="pln"><a href="#n151">151</a></p> <p id="n152" class="stm run hide_run"><a href="#n152">152</a></p> -<p id="n153" class="pln"><a href="#n153">153</a></p> -<p id="n154" class="stm run hide_run"><a href="#n154">154</a></p> -<p id="n155" class="pln"><a href="#n155">155</a></p> -<p id="n156" class="stm run hide_run"><a href="#n156">156</a></p> -<p id="n157" class="stm mis"><a href="#n157">157</a></p> -<p id="n158" class="pln"><a href="#n158">158</a></p> -<p id="n159" class="stm run hide_run"><a href="#n159">159</a></p> -<p id="n160" class="pln"><a href="#n160">160</a></p> +<p id="n153" class="stm run hide_run"><a href="#n153">153</a></p> +<p id="n154" class="pln"><a href="#n154">154</a></p> +<p id="n155" class="stm run hide_run"><a href="#n155">155</a></p> +<p id="n156" class="pln"><a href="#n156">156</a></p> +<p id="n157" class="stm run hide_run"><a href="#n157">157</a></p> +<p id="n158" class="stm run hide_run"><a href="#n158">158</a></p> +<p id="n159" class="pln"><a href="#n159">159</a></p> +<p id="n160" class="stm run hide_run"><a href="#n160">160</a></p> <p id="n161" class="pln"><a href="#n161">161</a></p> -<p id="n162" class="stm run hide_run"><a href="#n162">162</a></p> +<p id="n162" class="pln"><a href="#n162">162</a></p> <p id="n163" class="stm run hide_run"><a href="#n163">163</a></p> <p id="n164" class="stm run hide_run"><a href="#n164">164</a></p> <p id="n165" class="stm run hide_run"><a href="#n165">165</a></p> -<p id="n166" class="stm par run hide_run"><a href="#n166">166</a></p> -<p id="n167" class="stm run hide_run"><a href="#n167">167</a></p> +<p id="n166" class="stm run hide_run"><a href="#n166">166</a></p> +<p id="n167" class="stm par run hide_run"><a href="#n167">167</a></p> <p id="n168" class="stm run hide_run"><a href="#n168">168</a></p> <p id="n169" class="stm run hide_run"><a href="#n169">169</a></p> <p id="n170" class="stm run hide_run"><a href="#n170">170</a></p> <p id="n171" class="stm run hide_run"><a href="#n171">171</a></p> -<p id="n172" class="pln"><a href="#n172">172</a></p> -<p id="n173" class="stm run hide_run"><a href="#n173">173</a></p> -<p id="n174" class="pln"><a href="#n174">174</a></p> +<p id="n172" class="stm run hide_run"><a href="#n172">172</a></p> +<p id="n173" class="pln"><a href="#n173">173</a></p> +<p id="n174" class="stm run hide_run"><a href="#n174">174</a></p> <p id="n175" class="pln"><a href="#n175">175</a></p> -<p id="n176" class="stm run hide_run"><a href="#n176">176</a></p> +<p id="n176" class="pln"><a href="#n176">176</a></p> <p id="n177" class="stm run hide_run"><a href="#n177">177</a></p> -<p id="n178" class="pln"><a href="#n178">178</a></p> -<p id="n179" class="stm run hide_run"><a href="#n179">179</a></p> -<p id="n180" class="pln"><a href="#n180">180</a></p> +<p id="n178" class="stm run hide_run"><a href="#n178">178</a></p> +<p id="n179" class="pln"><a href="#n179">179</a></p> +<p id="n180" class="stm run hide_run"><a href="#n180">180</a></p> <p id="n181" class="pln"><a href="#n181">181</a></p> <p id="n182" class="pln"><a href="#n182">182</a></p> <p id="n183" class="pln"><a href="#n183">183</a></p> <p id="n184" class="pln"><a href="#n184">184</a></p> -<p id="n185" class="stm mis"><a href="#n185">185</a></p> -<p id="n186" class="pln"><a href="#n186">186</a></p> +<p id="n185" class="pln"><a href="#n185">185</a></p> +<p id="n186" class="stm run hide_run"><a href="#n186">186</a></p> <p id="n187" class="pln"><a href="#n187">187</a></p> -<p id="n188" class="stm run hide_run"><a href="#n188">188</a></p> -<p id="n189" class="pln"><a href="#n189">189</a></p> +<p id="n188" class="pln"><a href="#n188">188</a></p> +<p id="n189" class="stm run hide_run"><a href="#n189">189</a></p> <p id="n190" class="pln"><a href="#n190">190</a></p> -<p id="n191" class="stm run hide_run"><a href="#n191">191</a></p> +<p id="n191" class="pln"><a href="#n191">191</a></p> <p id="n192" class="stm run hide_run"><a href="#n192">192</a></p> <p id="n193" class="stm run hide_run"><a href="#n193">193</a></p> -<p id="n194" class="pln"><a href="#n194">194</a></p> -<p id="n195" class="stm run hide_run"><a href="#n195">195</a></p> +<p id="n194" class="stm run hide_run"><a href="#n194">194</a></p> +<p id="n195" class="pln"><a href="#n195">195</a></p> <p id="n196" class="stm run hide_run"><a href="#n196">196</a></p> <p id="n197" class="stm run hide_run"><a href="#n197">197</a></p> <p id="n198" class="stm run hide_run"><a href="#n198">198</a></p> <p id="n199" class="stm run hide_run"><a href="#n199">199</a></p> -<p id="n200" class="pln"><a href="#n200">200</a></p> -<p id="n201" class="stm run hide_run"><a href="#n201">201</a></p> +<p id="n200" class="stm run hide_run"><a href="#n200">200</a></p> +<p id="n201" class="pln"><a href="#n201">201</a></p> <p id="n202" class="stm run hide_run"><a href="#n202">202</a></p> -<p id="n203" class="pln"><a href="#n203">203</a></p> +<p id="n203" class="stm run hide_run"><a href="#n203">203</a></p> <p id="n204" class="pln"><a href="#n204">204</a></p> -<p id="n205" class="stm run hide_run"><a href="#n205">205</a></p> -<p id="n206" class="pln"><a href="#n206">206</a></p> +<p id="n205" class="pln"><a href="#n205">205</a></p> +<p id="n206" class="stm run hide_run"><a href="#n206">206</a></p> <p id="n207" class="pln"><a href="#n207">207</a></p> -<p id="n208" class="stm run hide_run"><a href="#n208">208</a></p> -<p id="n209" class="pln"><a href="#n209">209</a></p> -<p id="n210" class="stm run hide_run"><a href="#n210">210</a></p> +<p id="n208" class="pln"><a href="#n208">208</a></p> +<p id="n209" class="stm run hide_run"><a href="#n209">209</a></p> +<p id="n210" class="pln"><a href="#n210">210</a></p> <p id="n211" class="stm run hide_run"><a href="#n211">211</a></p> <p id="n212" class="stm run hide_run"><a href="#n212">212</a></p> <p id="n213" class="stm run hide_run"><a href="#n213">213</a></p> @@ -297,506 +297,506 @@ <p id="n226" class="stm run hide_run"><a href="#n226">226</a></p> <p id="n227" class="stm run hide_run"><a href="#n227">227</a></p> <p id="n228" class="stm run hide_run"><a href="#n228">228</a></p> -<p id="n229" class="pln"><a href="#n229">229</a></p> -<p id="n230" class="stm run hide_run"><a href="#n230">230</a></p> -<p id="n231" class="pln"><a href="#n231">231</a></p> +<p id="n229" class="stm run hide_run"><a href="#n229">229</a></p> +<p id="n230" class="pln"><a href="#n230">230</a></p> +<p id="n231" class="stm run hide_run"><a href="#n231">231</a></p> <p id="n232" class="pln"><a href="#n232">232</a></p> -<p id="n233" class="stm mis"><a href="#n233">233</a></p> -<p id="n234" class="pln"><a href="#n234">234</a></p> -<p id="n235" class="stm run hide_run"><a href="#n235">235</a></p> -<p id="n236" class="pln"><a href="#n236">236</a></p> +<p id="n233" class="pln"><a href="#n233">233</a></p> +<p id="n234" class="stm run hide_run"><a href="#n234">234</a></p> +<p id="n235" class="pln"><a href="#n235">235</a></p> +<p id="n236" class="stm run hide_run"><a href="#n236">236</a></p> <p id="n237" class="pln"><a href="#n237">237</a></p> -<p id="n238" class="stm mis"><a href="#n238">238</a></p> -<p id="n239" class="pln"><a href="#n239">239</a></p> -<p id="n240" class="stm run hide_run"><a href="#n240">240</a></p> -<p id="n241" class="pln"><a href="#n241">241</a></p> +<p id="n238" class="pln"><a href="#n238">238</a></p> +<p id="n239" class="stm run hide_run"><a href="#n239">239</a></p> +<p id="n240" class="pln"><a href="#n240">240</a></p> +<p id="n241" class="stm run hide_run"><a href="#n241">241</a></p> <p id="n242" class="pln"><a href="#n242">242</a></p> -<p id="n243" class="stm mis"><a href="#n243">243</a></p> -<p id="n244" class="stm mis"><a href="#n244">244</a></p> -<p id="n245" class="pln"><a href="#n245">245</a></p> -<p id="n246" class="stm run hide_run"><a href="#n246">246</a></p> -<p id="n247" class="pln"><a href="#n247">247</a></p> -<p id="n248" class="stm mis"><a href="#n248">248</a></p> -<p id="n249" class="stm mis"><a href="#n249">249</a></p> -<p id="n250" class="pln"><a href="#n250">250</a></p> +<p id="n243" class="pln"><a href="#n243">243</a></p> +<p id="n244" class="stm run hide_run"><a href="#n244">244</a></p> +<p id="n245" class="stm run hide_run"><a href="#n245">245</a></p> +<p id="n246" class="pln"><a href="#n246">246</a></p> +<p id="n247" class="stm run hide_run"><a href="#n247">247</a></p> +<p id="n248" class="pln"><a href="#n248">248</a></p> +<p id="n249" class="stm run hide_run"><a href="#n249">249</a></p> +<p id="n250" class="stm run hide_run"><a href="#n250">250</a></p> <p id="n251" class="pln"><a href="#n251">251</a></p> <p id="n252" class="pln"><a href="#n252">252</a></p> <p id="n253" class="pln"><a href="#n253">253</a></p> <p id="n254" class="pln"><a href="#n254">254</a></p> <p id="n255" class="pln"><a href="#n255">255</a></p> <p id="n256" class="pln"><a href="#n256">256</a></p> -<p id="n257" class="stm mis"><a href="#n257">257</a></p> -<p id="n258" class="stm mis"><a href="#n258">258</a></p> -<p id="n259" class="pln"><a href="#n259">259</a></p> +<p id="n257" class="pln"><a href="#n257">257</a></p> +<p id="n258" class="stm run hide_run"><a href="#n258">258</a></p> +<p id="n259" class="stm run hide_run"><a href="#n259">259</a></p> <p id="n260" class="pln"><a href="#n260">260</a></p> -<p id="n261" class="stm mis"><a href="#n261">261</a></p> -<p id="n262" class="stm mis"><a href="#n262">262</a></p> -<p id="n263" class="stm mis"><a href="#n263">263</a></p> -<p id="n264" class="stm mis"><a href="#n264">264</a></p> -<p id="n265" class="stm mis"><a href="#n265">265</a></p> -<p id="n266" class="stm mis"><a href="#n266">266</a></p> -<p id="n267" class="stm mis"><a href="#n267">267</a></p> -<p id="n268" class="stm mis"><a href="#n268">268</a></p> -<p id="n269" class="stm mis"><a href="#n269">269</a></p> -<p id="n270" class="stm mis"><a href="#n270">270</a></p> -<p id="n271" class="stm mis"><a href="#n271">271</a></p> -<p id="n272" class="stm mis"><a href="#n272">272</a></p> -<p id="n273" class="stm mis"><a href="#n273">273</a></p> -<p id="n274" class="stm mis"><a href="#n274">274</a></p> -<p id="n275" class="stm mis"><a href="#n275">275</a></p> -<p id="n276" class="stm mis"><a href="#n276">276</a></p> -<p id="n277" class="stm mis"><a href="#n277">277</a></p> -<p id="n278" class="stm mis"><a href="#n278">278</a></p> -<p id="n279" class="stm mis"><a href="#n279">279</a></p> -<p id="n280" class="stm mis"><a href="#n280">280</a></p> -<p id="n281" class="stm mis"><a href="#n281">281</a></p> -<p id="n282" class="stm mis"><a href="#n282">282</a></p> -<p id="n283" class="stm mis"><a href="#n283">283</a></p> -<p id="n284" class="stm mis"><a href="#n284">284</a></p> -<p id="n285" class="stm mis"><a href="#n285">285</a></p> -<p id="n286" class="stm mis"><a href="#n286">286</a></p> -<p id="n287" class="stm mis"><a href="#n287">287</a></p> -<p id="n288" class="stm mis"><a href="#n288">288</a></p> -<p id="n289" class="stm mis"><a href="#n289">289</a></p> -<p id="n290" class="stm mis"><a href="#n290">290</a></p> -<p id="n291" class="stm mis"><a href="#n291">291</a></p> -<p id="n292" class="stm mis"><a href="#n292">292</a></p> -<p id="n293" class="stm mis"><a href="#n293">293</a></p> -<p id="n294" class="stm mis"><a href="#n294">294</a></p> -<p id="n295" class="stm mis"><a href="#n295">295</a></p> -<p id="n296" class="stm mis"><a href="#n296">296</a></p> -<p id="n297" class="pln"><a href="#n297">297</a></p> +<p id="n261" class="pln"><a href="#n261">261</a></p> +<p id="n262" class="stm run hide_run"><a href="#n262">262</a></p> +<p id="n263" class="stm run hide_run"><a href="#n263">263</a></p> +<p id="n264" class="stm run hide_run"><a href="#n264">264</a></p> +<p id="n265" class="stm run hide_run"><a href="#n265">265</a></p> +<p id="n266" class="stm run hide_run"><a href="#n266">266</a></p> +<p id="n267" class="stm run hide_run"><a href="#n267">267</a></p> +<p id="n268" class="stm run hide_run"><a href="#n268">268</a></p> +<p id="n269" class="stm run hide_run"><a href="#n269">269</a></p> +<p id="n270" class="stm run hide_run"><a href="#n270">270</a></p> +<p id="n271" class="stm run hide_run"><a href="#n271">271</a></p> +<p id="n272" class="stm run hide_run"><a href="#n272">272</a></p> +<p id="n273" class="stm run hide_run"><a href="#n273">273</a></p> +<p id="n274" class="stm run hide_run"><a href="#n274">274</a></p> +<p id="n275" class="stm run hide_run"><a href="#n275">275</a></p> +<p id="n276" class="stm run hide_run"><a href="#n276">276</a></p> +<p id="n277" class="stm run hide_run"><a href="#n277">277</a></p> +<p id="n278" class="stm run hide_run"><a href="#n278">278</a></p> +<p id="n279" class="stm run hide_run"><a href="#n279">279</a></p> +<p id="n280" class="stm run hide_run"><a href="#n280">280</a></p> +<p id="n281" class="stm run hide_run"><a href="#n281">281</a></p> +<p id="n282" class="stm run hide_run"><a href="#n282">282</a></p> +<p id="n283" class="stm run hide_run"><a href="#n283">283</a></p> +<p id="n284" class="stm run hide_run"><a href="#n284">284</a></p> +<p id="n285" class="stm run hide_run"><a href="#n285">285</a></p> +<p id="n286" class="stm run hide_run"><a href="#n286">286</a></p> +<p id="n287" class="stm run hide_run"><a href="#n287">287</a></p> +<p id="n288" class="stm run hide_run"><a href="#n288">288</a></p> +<p id="n289" class="stm run hide_run"><a href="#n289">289</a></p> +<p id="n290" class="stm run hide_run"><a href="#n290">290</a></p> +<p id="n291" class="stm run hide_run"><a href="#n291">291</a></p> +<p id="n292" class="stm run hide_run"><a href="#n292">292</a></p> +<p id="n293" class="stm run hide_run"><a href="#n293">293</a></p> +<p id="n294" class="stm run hide_run"><a href="#n294">294</a></p> +<p id="n295" class="stm run hide_run"><a href="#n295">295</a></p> +<p id="n296" class="stm run hide_run"><a href="#n296">296</a></p> +<p id="n297" class="stm run hide_run"><a href="#n297">297</a></p> <p id="n298" class="pln"><a href="#n298">298</a></p> <p id="n299" class="pln"><a href="#n299">299</a></p> -<p id="n300" class="exc"><a href="#n300">300</a></p> -<p id="n301" class="pln"><a href="#n301">301</a></p> -<p id="n302" class="stm run hide_run"><a href="#n302">302</a></p> -<p id="n303" class="stm mis"><a href="#n303">303</a></p> -<p id="n304" class="stm mis"><a href="#n304">304</a></p> -<p id="n305" class="stm mis"><a href="#n305">305</a></p> -<p id="n306" class="stm mis"><a href="#n306">306</a></p> -<p id="n307" class="pln"><a href="#n307">307</a></p> +<p id="n300" class="pln"><a href="#n300">300</a></p> +<p id="n301" class="exc"><a href="#n301">301</a></p> +<p id="n302" class="pln"><a href="#n302">302</a></p> +<p id="n303" class="stm run hide_run"><a href="#n303">303</a></p> +<p id="n304" class="stm run hide_run"><a href="#n304">304</a></p> +<p id="n305" class="stm run hide_run"><a href="#n305">305</a></p> +<p id="n306" class="stm run hide_run"><a href="#n306">306</a></p> +<p id="n307" class="stm run hide_run"><a href="#n307">307</a></p> <p id="n308" class="pln"><a href="#n308">308</a></p> <p id="n309" class="pln"><a href="#n309">309</a></p> -<p id="n310" class="stm run hide_run"><a href="#n310">310</a></p> -<p id="n311" class="pln"><a href="#n311">311</a></p> +<p id="n310" class="pln"><a href="#n310">310</a></p> +<p id="n311" class="stm run hide_run"><a href="#n311">311</a></p> <p id="n312" class="pln"><a href="#n312">312</a></p> -<p id="n313" class="stm mis"><a href="#n313">313</a></p> -<p id="n314" class="stm mis"><a href="#n314">314</a></p> -<p id="n315" class="pln"><a href="#n315">315</a></p> -<p id="n316" class="stm mis"><a href="#n316">316</a></p> -<p id="n317" class="stm mis"><a href="#n317">317</a></p> -<p id="n318" class="pln"><a href="#n318">318</a></p> +<p id="n313" class="pln"><a href="#n313">313</a></p> +<p id="n314" class="stm run hide_run"><a href="#n314">314</a></p> +<p id="n315" class="stm run hide_run"><a href="#n315">315</a></p> +<p id="n316" class="pln"><a href="#n316">316</a></p> +<p id="n317" class="stm run hide_run"><a href="#n317">317</a></p> +<p id="n318" class="stm run hide_run"><a href="#n318">318</a></p> <p id="n319" class="pln"><a href="#n319">319</a></p> -<p id="n320" class="stm run hide_run"><a href="#n320">320</a></p> -<p id="n321" class="pln"><a href="#n321">321</a></p> +<p id="n320" class="pln"><a href="#n320">320</a></p> +<p id="n321" class="stm run hide_run"><a href="#n321">321</a></p> <p id="n322" class="pln"><a href="#n322">322</a></p> -<p id="n323" class="stm run hide_run"><a href="#n323">323</a></p> +<p id="n323" class="pln"><a href="#n323">323</a></p> <p id="n324" class="stm run hide_run"><a href="#n324">324</a></p> <p id="n325" class="stm run hide_run"><a href="#n325">325</a></p> <p id="n326" class="stm run hide_run"><a href="#n326">326</a></p> <p id="n327" class="stm run hide_run"><a href="#n327">327</a></p> -<p id="n328" class="pln"><a href="#n328">328</a></p> -<p id="n329" class="stm run hide_run"><a href="#n329">329</a></p> +<p id="n328" class="stm run hide_run"><a href="#n328">328</a></p> +<p id="n329" class="pln"><a href="#n329">329</a></p> <p id="n330" class="stm run hide_run"><a href="#n330">330</a></p> <p id="n331" class="stm run hide_run"><a href="#n331">331</a></p> <p id="n332" class="stm run hide_run"><a href="#n332">332</a></p> -<p id="n333" class="pln"><a href="#n333">333</a></p> -<p id="n334" class="stm run hide_run"><a href="#n334">334</a></p> -<p id="n335" class="stm mis"><a href="#n335">335</a></p> -<p id="n336" class="pln"><a href="#n336">336</a></p> -<p id="n337" class="stm run hide_run"><a href="#n337">337</a></p> +<p id="n333" class="stm run hide_run"><a href="#n333">333</a></p> +<p id="n334" class="pln"><a href="#n334">334</a></p> +<p id="n335" class="stm run hide_run"><a href="#n335">335</a></p> +<p id="n336" class="stm run hide_run"><a href="#n336">336</a></p> +<p id="n337" class="pln"><a href="#n337">337</a></p> <p id="n338" class="stm run hide_run"><a href="#n338">338</a></p> -<p id="n339" class="pln"><a href="#n339">339</a></p> -<p id="n340" class="stm run hide_run"><a href="#n340">340</a></p> +<p id="n339" class="stm run hide_run"><a href="#n339">339</a></p> +<p id="n340" class="pln"><a href="#n340">340</a></p> <p id="n341" class="stm run hide_run"><a href="#n341">341</a></p> -<p id="n342" class="pln"><a href="#n342">342</a></p> -<p id="n343" class="stm run hide_run"><a href="#n343">343</a></p> +<p id="n342" class="stm run hide_run"><a href="#n342">342</a></p> +<p id="n343" class="pln"><a href="#n343">343</a></p> <p id="n344" class="stm run hide_run"><a href="#n344">344</a></p> -<p id="n345" class="pln"><a href="#n345">345</a></p> -<p id="n346" class="stm run hide_run"><a href="#n346">346</a></p> -<p id="n347" class="pln"><a href="#n347">347</a></p> +<p id="n345" class="stm run hide_run"><a href="#n345">345</a></p> +<p id="n346" class="pln"><a href="#n346">346</a></p> +<p id="n347" class="stm run hide_run"><a href="#n347">347</a></p> <p id="n348" class="pln"><a href="#n348">348</a></p> <p id="n349" class="pln"><a href="#n349">349</a></p> -<p id="n350" class="stm run hide_run"><a href="#n350">350</a></p> +<p id="n350" class="pln"><a href="#n350">350</a></p> <p id="n351" class="stm run hide_run"><a href="#n351">351</a></p> <p id="n352" class="stm run hide_run"><a href="#n352">352</a></p> -<p id="n353" class="pln"><a href="#n353">353</a></p> -<p id="n354" class="stm run hide_run"><a href="#n354">354</a></p> -<p id="n355" class="pln"><a href="#n355">355</a></p> +<p id="n353" class="stm run hide_run"><a href="#n353">353</a></p> +<p id="n354" class="pln"><a href="#n354">354</a></p> +<p id="n355" class="stm run hide_run"><a href="#n355">355</a></p> <p id="n356" class="pln"><a href="#n356">356</a></p> -<p id="n357" class="stm mis"><a href="#n357">357</a></p> -<p id="n358" class="stm mis"><a href="#n358">358</a></p> -<p id="n359" class="stm mis"><a href="#n359">359</a></p> -<p id="n360" class="stm mis"><a href="#n360">360</a></p> +<p id="n357" class="pln"><a href="#n357">357</a></p> +<p id="n358" class="stm run hide_run"><a href="#n358">358</a></p> +<p id="n359" class="stm run hide_run"><a href="#n359">359</a></p> +<p id="n360" class="stm par run hide_run"><a href="#n360">360</a></p> <p id="n361" class="stm mis"><a href="#n361">361</a></p> -<p id="n362" class="stm mis"><a href="#n362">362</a></p> -<p id="n363" class="stm mis"><a href="#n363">363</a></p> -<p id="n364" class="pln"><a href="#n364">364</a></p> -<p id="n365" class="stm mis"><a href="#n365">365</a></p> -<p id="n366" class="stm mis"><a href="#n366">366</a></p> -<p id="n367" class="pln"><a href="#n367">367</a></p> +<p id="n362" class="stm run hide_run"><a href="#n362">362</a></p> +<p id="n363" class="stm par run hide_run"><a href="#n363">363</a></p> +<p id="n364" class="stm mis"><a href="#n364">364</a></p> +<p id="n365" class="pln"><a href="#n365">365</a></p> +<p id="n366" class="stm run hide_run"><a href="#n366">366</a></p> +<p id="n367" class="stm run hide_run"><a href="#n367">367</a></p> <p id="n368" class="stm run hide_run"><a href="#n368">368</a></p> -<p id="n369" class="pln"><a href="#n369">369</a></p> -<p id="n370" class="stm mis"><a href="#n370">370</a></p> -<p id="n371" class="stm mis"><a href="#n371">371</a></p> -<p id="n372" class="pln"><a href="#n372">372</a></p> -<p id="n373" class="stm mis"><a href="#n373">373</a></p> -<p id="n374" class="stm mis"><a href="#n374">374</a></p> -<p id="n375" class="stm mis"><a href="#n375">375</a></p> -<p id="n376" class="stm mis"><a href="#n376">376</a></p> -<p id="n377" class="pln"><a href="#n377">377</a></p> -<p id="n378" class="stm run hide_run"><a href="#n378">378</a></p> -<p id="n379" class="pln"><a href="#n379">379</a></p> -<p id="n380" class="pln"><a href="#n380">380</a></p> +<p id="n369" class="stm run hide_run"><a href="#n369">369</a></p> +<p id="n370" class="stm run hide_run"><a href="#n370">370</a></p> +<p id="n371" class="pln"><a href="#n371">371</a></p> +<p id="n372" class="stm run hide_run"><a href="#n372">372</a></p> +<p id="n373" class="pln"><a href="#n373">373</a></p> +<p id="n374" class="stm run hide_run"><a href="#n374">374</a></p> +<p id="n375" class="stm run hide_run"><a href="#n375">375</a></p> +<p id="n376" class="pln"><a href="#n376">376</a></p> +<p id="n377" class="stm run hide_run"><a href="#n377">377</a></p> +<p id="n378" class="stm par run hide_run"><a href="#n378">378</a></p> +<p id="n379" class="stm mis"><a href="#n379">379</a></p> +<p id="n380" class="stm run hide_run"><a href="#n380">380</a></p> <p id="n381" class="pln"><a href="#n381">381</a></p> -<p id="n382" class="pln"><a href="#n382">382</a></p> -<p id="n383" class="stm run hide_run"><a href="#n383">383</a></p> -<p id="n384" class="stm run hide_run"><a href="#n384">384</a></p> -<p id="n385" class="stm run hide_run"><a href="#n385">385</a></p> +<p id="n382" class="stm run hide_run"><a href="#n382">382</a></p> +<p id="n383" class="pln"><a href="#n383">383</a></p> +<p id="n384" class="pln"><a href="#n384">384</a></p> +<p id="n385" class="pln"><a href="#n385">385</a></p> <p id="n386" class="pln"><a href="#n386">386</a></p> -<p id="n387" class="stm par run hide_run"><a href="#n387">387</a></p> -<p id="n388" class="pln"><a href="#n388">388</a></p> -<p id="n389" class="stm mis"><a href="#n389">389</a></p> -<p id="n390" class="stm mis"><a href="#n390">390</a></p> -<p id="n391" class="stm par run hide_run"><a href="#n391">391</a></p> +<p id="n387" class="stm run hide_run"><a href="#n387">387</a></p> +<p id="n388" class="stm run hide_run"><a href="#n388">388</a></p> +<p id="n389" class="stm run hide_run"><a href="#n389">389</a></p> +<p id="n390" class="pln"><a href="#n390">390</a></p> +<p id="n391" class="stm run hide_run"><a href="#n391">391</a></p> <p id="n392" class="pln"><a href="#n392">392</a></p> -<p id="n393" class="stm mis"><a href="#n393">393</a></p> -<p id="n394" class="stm mis"><a href="#n394">394</a></p> -<p id="n395" class="pln"><a href="#n395">395</a></p> -<p id="n396" class="stm run hide_run"><a href="#n396">396</a></p> +<p id="n393" class="stm run hide_run"><a href="#n393">393</a></p> +<p id="n394" class="stm run hide_run"><a href="#n394">394</a></p> +<p id="n395" class="stm run hide_run"><a href="#n395">395</a></p> +<p id="n396" class="pln"><a href="#n396">396</a></p> <p id="n397" class="stm run hide_run"><a href="#n397">397</a></p> -<p id="n398" class="pln"><a href="#n398">398</a></p> -<p id="n399" class="stm run hide_run"><a href="#n399">399</a></p> -<p id="n400" class="pln"><a href="#n400">400</a></p> +<p id="n398" class="stm run hide_run"><a href="#n398">398</a></p> +<p id="n399" class="pln"><a href="#n399">399</a></p> +<p id="n400" class="stm run hide_run"><a href="#n400">400</a></p> <p id="n401" class="stm run hide_run"><a href="#n401">401</a></p> -<p id="n402" class="stm run hide_run"><a href="#n402">402</a></p> -<p id="n403" class="pln"><a href="#n403">403</a></p> +<p id="n402" class="pln"><a href="#n402">402</a></p> +<p id="n403" class="stm run hide_run"><a href="#n403">403</a></p> <p id="n404" class="pln"><a href="#n404">404</a></p> -<p id="n405" class="stm par run hide_run"><a href="#n405">405</a></p> +<p id="n405" class="stm run hide_run"><a href="#n405">405</a></p> <p id="n406" class="stm run hide_run"><a href="#n406">406</a></p> <p id="n407" class="pln"><a href="#n407">407</a></p> <p id="n408" class="pln"><a href="#n408">408</a></p> <p id="n409" class="stm run hide_run"><a href="#n409">409</a></p> -<p id="n410" class="pln"><a href="#n410">410</a></p> +<p id="n410" class="stm run hide_run"><a href="#n410">410</a></p> <p id="n411" class="pln"><a href="#n411">411</a></p> -<p id="n412" class="stm run hide_run"><a href="#n412">412</a></p> +<p id="n412" class="pln"><a href="#n412">412</a></p> <p id="n413" class="stm run hide_run"><a href="#n413">413</a></p> <p id="n414" class="pln"><a href="#n414">414</a></p> -<p id="n415" class="stm run hide_run"><a href="#n415">415</a></p> -<p id="n416" class="stm par run hide_run"><a href="#n416">416</a></p> -<p id="n417" class="stm mis"><a href="#n417">417</a></p> +<p id="n415" class="pln"><a href="#n415">415</a></p> +<p id="n416" class="stm run hide_run"><a href="#n416">416</a></p> +<p id="n417" class="stm run hide_run"><a href="#n417">417</a></p> <p id="n418" class="pln"><a href="#n418">418</a></p> -<p id="n419" class="stm par run hide_run"><a href="#n419">419</a></p> -<p id="n420" class="stm mis"><a href="#n420">420</a></p> -<p id="n421" class="pln"><a href="#n421">421</a></p> -<p id="n422" class="stm run hide_run"><a href="#n422">422</a></p> +<p id="n419" class="stm run hide_run"><a href="#n419">419</a></p> +<p id="n420" class="stm run hide_run"><a href="#n420">420</a></p> +<p id="n421" class="stm run hide_run"><a href="#n421">421</a></p> +<p id="n422" class="pln"><a href="#n422">422</a></p> <p id="n423" class="stm run hide_run"><a href="#n423">423</a></p> <p id="n424" class="stm run hide_run"><a href="#n424">424</a></p> -<p id="n425" class="stm run hide_run"><a href="#n425">425</a></p> -<p id="n426" class="stm par run hide_run"><a href="#n426">426</a></p> +<p id="n425" class="pln"><a href="#n425">425</a></p> +<p id="n426" class="stm run hide_run"><a href="#n426">426</a></p> <p id="n427" class="stm run hide_run"><a href="#n427">427</a></p> -<p id="n428" class="pln"><a href="#n428">428</a></p> -<p id="n429" class="pln"><a href="#n429">429</a></p> +<p id="n428" class="stm run hide_run"><a href="#n428">428</a></p> +<p id="n429" class="stm run hide_run"><a href="#n429">429</a></p> <p id="n430" class="stm run hide_run"><a href="#n430">430</a></p> <p id="n431" class="stm run hide_run"><a href="#n431">431</a></p> -<p id="n432" class="stm run hide_run"><a href="#n432">432</a></p> -<p id="n433" class="stm run hide_run"><a href="#n433">433</a></p> +<p id="n432" class="pln"><a href="#n432">432</a></p> +<p id="n433" class="pln"><a href="#n433">433</a></p> <p id="n434" class="stm run hide_run"><a href="#n434">434</a></p> -<p id="n435" class="pln"><a href="#n435">435</a></p> -<p id="n436" class="pln"><a href="#n436">436</a></p> -<p id="n437" class="pln"><a href="#n437">437</a></p> +<p id="n435" class="stm run hide_run"><a href="#n435">435</a></p> +<p id="n436" class="stm run hide_run"><a href="#n436">436</a></p> +<p id="n437" class="stm run hide_run"><a href="#n437">437</a></p> <p id="n438" class="stm run hide_run"><a href="#n438">438</a></p> -<p id="n439" class="stm run hide_run"><a href="#n439">439</a></p> -<p id="n440" class="stm run hide_run"><a href="#n440">440</a></p> -<p id="n441" class="stm run hide_run"><a href="#n441">441</a></p> +<p id="n439" class="pln"><a href="#n439">439</a></p> +<p id="n440" class="pln"><a href="#n440">440</a></p> +<p id="n441" class="pln"><a href="#n441">441</a></p> <p id="n442" class="stm run hide_run"><a href="#n442">442</a></p> -<p id="n443" class="pln"><a href="#n443">443</a></p> -<p id="n444" class="pln"><a href="#n444">444</a></p> +<p id="n443" class="stm run hide_run"><a href="#n443">443</a></p> +<p id="n444" class="stm run hide_run"><a href="#n444">444</a></p> <p id="n445" class="stm run hide_run"><a href="#n445">445</a></p> <p id="n446" class="stm run hide_run"><a href="#n446">446</a></p> <p id="n447" class="pln"><a href="#n447">447</a></p> <p id="n448" class="pln"><a href="#n448">448</a></p> <p id="n449" class="stm run hide_run"><a href="#n449">449</a></p> -<p id="n450" class="pln"><a href="#n450">450</a></p> +<p id="n450" class="stm run hide_run"><a href="#n450">450</a></p> <p id="n451" class="pln"><a href="#n451">451</a></p> -<p id="n452" class="stm run hide_run"><a href="#n452">452</a></p> -<p id="n453" class="stm par run hide_run"><a href="#n453">453</a></p> -<p id="n454" class="stm mis"><a href="#n454">454</a></p> +<p id="n452" class="pln"><a href="#n452">452</a></p> +<p id="n453" class="stm run hide_run"><a href="#n453">453</a></p> +<p id="n454" class="pln"><a href="#n454">454</a></p> <p id="n455" class="pln"><a href="#n455">455</a></p> -<p id="n456" class="stm par run hide_run"><a href="#n456">456</a></p> -<p id="n457" class="stm mis"><a href="#n457">457</a></p> -<p id="n458" class="pln"><a href="#n458">458</a></p> -<p id="n459" class="stm par run hide_run"><a href="#n459">459</a></p> +<p id="n456" class="stm run hide_run"><a href="#n456">456</a></p> +<p id="n457" class="stm run hide_run"><a href="#n457">457</a></p> +<p id="n458" class="stm run hide_run"><a href="#n458">458</a></p> +<p id="n459" class="pln"><a href="#n459">459</a></p> <p id="n460" class="stm run hide_run"><a href="#n460">460</a></p> <p id="n461" class="stm run hide_run"><a href="#n461">461</a></p> -<p id="n462" class="stm run hide_run"><a href="#n462">462</a></p> -<p id="n463" class="stm par run hide_run"><a href="#n463">463</a></p> -<p id="n464" class="stm mis"><a href="#n464">464</a></p> -<p id="n465" class="pln"><a href="#n465">465</a></p> -<p id="n466" class="pln"><a href="#n466">466</a></p> -<p id="n467" class="pln"><a href="#n467">467</a></p> -<p id="n468" class="stm par run hide_run"><a href="#n468">468</a></p> -<p id="n469" class="stm run hide_run"><a href="#n469">469</a></p> -<p id="n470" class="stm run hide_run"><a href="#n470">470</a></p> +<p id="n462" class="pln"><a href="#n462">462</a></p> +<p id="n463" class="stm run hide_run"><a href="#n463">463</a></p> +<p id="n464" class="stm run hide_run"><a href="#n464">464</a></p> +<p id="n465" class="stm run hide_run"><a href="#n465">465</a></p> +<p id="n466" class="stm run hide_run"><a href="#n466">466</a></p> +<p id="n467" class="stm run hide_run"><a href="#n467">467</a></p> +<p id="n468" class="stm run hide_run"><a href="#n468">468</a></p> +<p id="n469" class="pln"><a href="#n469">469</a></p> +<p id="n470" class="pln"><a href="#n470">470</a></p> <p id="n471" class="pln"><a href="#n471">471</a></p> <p id="n472" class="stm run hide_run"><a href="#n472">472</a></p> -<p id="n473" class="pln"><a href="#n473">473</a></p> -<p id="n474" class="pln"><a href="#n474">474</a></p> +<p id="n473" class="stm run hide_run"><a href="#n473">473</a></p> +<p id="n474" class="stm run hide_run"><a href="#n474">474</a></p> <p id="n475" class="pln"><a href="#n475">475</a></p> <p id="n476" class="stm run hide_run"><a href="#n476">476</a></p> -<p id="n477" class="stm run hide_run"><a href="#n477">477</a></p> -<p id="n478" class="stm run hide_run"><a href="#n478">478</a></p> -<p id="n479" class="stm par run hide_run"><a href="#n479">479</a></p> -<p id="n480" class="stm mis"><a href="#n480">480</a></p> -<p id="n481" class="pln"><a href="#n481">481</a></p> -<p id="n482" class="stm par run hide_run"><a href="#n482">482</a></p> -<p id="n483" class="stm mis"><a href="#n483">483</a></p> -<p id="n484" class="pln"><a href="#n484">484</a></p> -<p id="n485" class="stm run hide_run"><a href="#n485">485</a></p> +<p id="n477" class="pln"><a href="#n477">477</a></p> +<p id="n478" class="pln"><a href="#n478">478</a></p> +<p id="n479" class="pln"><a href="#n479">479</a></p> +<p id="n480" class="stm run hide_run"><a href="#n480">480</a></p> +<p id="n481" class="stm run hide_run"><a href="#n481">481</a></p> +<p id="n482" class="stm run hide_run"><a href="#n482">482</a></p> +<p id="n483" class="stm run hide_run"><a href="#n483">483</a></p> +<p id="n484" class="stm run hide_run"><a href="#n484">484</a></p> +<p id="n485" class="pln"><a href="#n485">485</a></p> <p id="n486" class="stm run hide_run"><a href="#n486">486</a></p> <p id="n487" class="stm run hide_run"><a href="#n487">487</a></p> -<p id="n488" class="stm run hide_run"><a href="#n488">488</a></p> -<p id="n489" class="pln"><a href="#n489">489</a></p> -<p id="n490" class="stm par run hide_run"><a href="#n490">490</a></p> -<p id="n491" class="pln"><a href="#n491">491</a></p> -<p id="n492" class="stm mis"><a href="#n492">492</a></p> +<p id="n488" class="pln"><a href="#n488">488</a></p> +<p id="n489" class="stm run hide_run"><a href="#n489">489</a></p> +<p id="n490" class="stm run hide_run"><a href="#n490">490</a></p> +<p id="n491" class="stm run hide_run"><a href="#n491">491</a></p> +<p id="n492" class="stm run hide_run"><a href="#n492">492</a></p> <p id="n493" class="pln"><a href="#n493">493</a></p> -<p id="n494" class="pln"><a href="#n494">494</a></p> +<p id="n494" class="stm run hide_run"><a href="#n494">494</a></p> <p id="n495" class="pln"><a href="#n495">495</a></p> <p id="n496" class="stm run hide_run"><a href="#n496">496</a></p> <p id="n497" class="pln"><a href="#n497">497</a></p> <p id="n498" class="pln"><a href="#n498">498</a></p> <p id="n499" class="pln"><a href="#n499">499</a></p> <p id="n500" class="stm run hide_run"><a href="#n500">500</a></p> -<p id="n501" class="stm par run hide_run"><a href="#n501">501</a></p> -<p id="n502" class="stm run hide_run"><a href="#n502">502</a></p> -<p id="n503" class="stm run hide_run"><a href="#n503">503</a></p> +<p id="n501" class="pln"><a href="#n501">501</a></p> +<p id="n502" class="pln"><a href="#n502">502</a></p> +<p id="n503" class="pln"><a href="#n503">503</a></p> <p id="n504" class="stm run hide_run"><a href="#n504">504</a></p> <p id="n505" class="stm run hide_run"><a href="#n505">505</a></p> <p id="n506" class="stm run hide_run"><a href="#n506">506</a></p> <p id="n507" class="stm run hide_run"><a href="#n507">507</a></p> -<p id="n508" class="pln"><a href="#n508">508</a></p> +<p id="n508" class="stm run hide_run"><a href="#n508">508</a></p> <p id="n509" class="stm run hide_run"><a href="#n509">509</a></p> -<p id="n510" class="pln"><a href="#n510">510</a></p> -<p id="n511" class="pln"><a href="#n511">511</a></p> -<p id="n512" class="stm run hide_run"><a href="#n512">512</a></p> -<p id="n513" class="stm par run hide_run"><a href="#n513">513</a></p> -<p id="n514" class="stm mis"><a href="#n514">514</a></p> -<p id="n515" class="stm mis"><a href="#n515">515</a></p> -<p id="n516" class="stm mis"><a href="#n516">516</a></p> -<p id="n517" class="stm mis"><a href="#n517">517</a></p> -<p id="n518" class="pln"><a href="#n518">518</a></p> -<p id="n519" class="pln"><a href="#n519">519</a></p> -<p id="n520" class="stm mis"><a href="#n520">520</a></p> -<p id="n521" class="pln"><a href="#n521">521</a></p> +<p id="n510" class="stm run hide_run"><a href="#n510">510</a></p> +<p id="n511" class="stm run hide_run"><a href="#n511">511</a></p> +<p id="n512" class="pln"><a href="#n512">512</a></p> +<p id="n513" class="stm run hide_run"><a href="#n513">513</a></p> +<p id="n514" class="pln"><a href="#n514">514</a></p> +<p id="n515" class="pln"><a href="#n515">515</a></p> +<p id="n516" class="stm run hide_run"><a href="#n516">516</a></p> +<p id="n517" class="stm run hide_run"><a href="#n517">517</a></p> +<p id="n518" class="stm run hide_run"><a href="#n518">518</a></p> +<p id="n519" class="stm run hide_run"><a href="#n519">519</a></p> +<p id="n520" class="stm run hide_run"><a href="#n520">520</a></p> +<p id="n521" class="stm run hide_run"><a href="#n521">521</a></p> <p id="n522" class="pln"><a href="#n522">522</a></p> -<p id="n523" class="stm mis"><a href="#n523">523</a></p> -<p id="n524" class="stm mis"><a href="#n524">524</a></p> +<p id="n523" class="pln"><a href="#n523">523</a></p> +<p id="n524" class="stm run hide_run"><a href="#n524">524</a></p> <p id="n525" class="pln"><a href="#n525">525</a></p> <p id="n526" class="pln"><a href="#n526">526</a></p> -<p id="n527" class="pln"><a href="#n527">527</a></p> -<p id="n528" class="stm par run hide_run"><a href="#n528">528</a></p> -<p id="n529" class="stm mis"><a href="#n529">529</a></p> +<p id="n527" class="stm run hide_run"><a href="#n527">527</a></p> +<p id="n528" class="stm run hide_run"><a href="#n528">528</a></p> +<p id="n529" class="pln"><a href="#n529">529</a></p> <p id="n530" class="pln"><a href="#n530">530</a></p> -<p id="n531" class="stm par run hide_run"><a href="#n531">531</a></p> +<p id="n531" class="pln"><a href="#n531">531</a></p> <p id="n532" class="stm run hide_run"><a href="#n532">532</a></p> <p id="n533" class="stm run hide_run"><a href="#n533">533</a></p> <p id="n534" class="pln"><a href="#n534">534</a></p> -<p id="n535" class="stm par run hide_run"><a href="#n535">535</a></p> -<p id="n536" class="stm mis"><a href="#n536">536</a></p> -<p id="n537" class="pln"><a href="#n537">537</a></p> -<p id="n538" class="stm par run hide_run"><a href="#n538">538</a></p> -<p id="n539" class="stm mis"><a href="#n539">539</a></p> -<p id="n540" class="stm par run hide_run"><a href="#n540">540</a></p> -<p id="n541" class="stm mis"><a href="#n541">541</a></p> -<p id="n542" class="pln"><a href="#n542">542</a></p> -<p id="n543" class="pln"><a href="#n543">543</a></p> -<p id="n544" class="pln"><a href="#n544">544</a></p> +<p id="n535" class="stm run hide_run"><a href="#n535">535</a></p> +<p id="n536" class="stm run hide_run"><a href="#n536">536</a></p> +<p id="n537" class="stm run hide_run"><a href="#n537">537</a></p> +<p id="n538" class="pln"><a href="#n538">538</a></p> +<p id="n539" class="stm run hide_run"><a href="#n539">539</a></p> +<p id="n540" class="stm run hide_run"><a href="#n540">540</a></p> +<p id="n541" class="pln"><a href="#n541">541</a></p> +<p id="n542" class="stm run hide_run"><a href="#n542">542</a></p> +<p id="n543" class="stm run hide_run"><a href="#n543">543</a></p> +<p id="n544" class="stm run hide_run"><a href="#n544">544</a></p> <p id="n545" class="stm run hide_run"><a href="#n545">545</a></p> <p id="n546" class="pln"><a href="#n546">546</a></p> -<p id="n547" class="stm run hide_run"><a href="#n547">547</a></p> +<p id="n547" class="pln"><a href="#n547">547</a></p> <p id="n548" class="pln"><a href="#n548">548</a></p> -<p id="n549" class="pln"><a href="#n549">549</a></p> +<p id="n549" class="stm run hide_run"><a href="#n549">549</a></p> <p id="n550" class="pln"><a href="#n550">550</a></p> -<p id="n551" class="stm par run hide_run"><a href="#n551">551</a></p> +<p id="n551" class="stm run hide_run"><a href="#n551">551</a></p> <p id="n552" class="pln"><a href="#n552">552</a></p> -<p id="n553" class="stm mis"><a href="#n553">553</a></p> -<p id="n554" class="stm mis"><a href="#n554">554</a></p> +<p id="n553" class="pln"><a href="#n553">553</a></p> +<p id="n554" class="pln"><a href="#n554">554</a></p> <p id="n555" class="stm run hide_run"><a href="#n555">555</a></p> <p id="n556" class="pln"><a href="#n556">556</a></p> <p id="n557" class="stm run hide_run"><a href="#n557">557</a></p> -<p id="n558" class="pln"><a href="#n558">558</a></p> -<p id="n559" class="pln"><a href="#n559">559</a></p> +<p id="n558" class="stm run hide_run"><a href="#n558">558</a></p> +<p id="n559" class="stm run hide_run"><a href="#n559">559</a></p> <p id="n560" class="pln"><a href="#n560">560</a></p> <p id="n561" class="stm run hide_run"><a href="#n561">561</a></p> -<p id="n562" class="stm run hide_run"><a href="#n562">562</a></p> -<p id="n563" class="stm run hide_run"><a href="#n563">563</a></p> -<p id="n564" class="stm run hide_run"><a href="#n564">564</a></p> -<p id="n565" class="pln"><a href="#n565">565</a></p> +<p id="n562" class="pln"><a href="#n562">562</a></p> +<p id="n563" class="pln"><a href="#n563">563</a></p> +<p id="n564" class="pln"><a href="#n564">564</a></p> +<p id="n565" class="stm run hide_run"><a href="#n565">565</a></p> <p id="n566" class="stm run hide_run"><a href="#n566">566</a></p> -<p id="n567" class="pln"><a href="#n567">567</a></p> -<p id="n568" class="pln"><a href="#n568">568</a></p> -<p id="n569" class="stm mis"><a href="#n569">569</a></p> -<p id="n570" class="pln"><a href="#n570">570</a></p> -<p id="n571" class="stm mis"><a href="#n571">571</a></p> +<p id="n567" class="stm run hide_run"><a href="#n567">567</a></p> +<p id="n568" class="stm run hide_run"><a href="#n568">568</a></p> +<p id="n569" class="pln"><a href="#n569">569</a></p> +<p id="n570" class="stm run hide_run"><a href="#n570">570</a></p> +<p id="n571" class="pln"><a href="#n571">571</a></p> <p id="n572" class="pln"><a href="#n572">572</a></p> -<p id="n573" class="stm mis"><a href="#n573">573</a></p> -<p id="n574" class="stm mis"><a href="#n574">574</a></p> -<p id="n575" class="stm mis"><a href="#n575">575</a></p> -<p id="n576" class="stm mis"><a href="#n576">576</a></p> -<p id="n577" class="pln"><a href="#n577">577</a></p> -<p id="n578" class="pln"><a href="#n578">578</a></p> -<p id="n579" class="stm mis"><a href="#n579">579</a></p> -<p id="n580" class="stm mis"><a href="#n580">580</a></p> -<p id="n581" class="stm mis"><a href="#n581">581</a></p> -<p id="n582" class="stm mis"><a href="#n582">582</a></p> -<p id="n583" class="pln"><a href="#n583">583</a></p> +<p id="n573" class="stm run hide_run"><a href="#n573">573</a></p> +<p id="n574" class="pln"><a href="#n574">574</a></p> +<p id="n575" class="stm run hide_run"><a href="#n575">575</a></p> +<p id="n576" class="pln"><a href="#n576">576</a></p> +<p id="n577" class="stm run hide_run"><a href="#n577">577</a></p> +<p id="n578" class="stm run hide_run"><a href="#n578">578</a></p> +<p id="n579" class="stm run hide_run"><a href="#n579">579</a></p> +<p id="n580" class="stm run hide_run"><a href="#n580">580</a></p> +<p id="n581" class="pln"><a href="#n581">581</a></p> +<p id="n582" class="pln"><a href="#n582">582</a></p> +<p id="n583" class="stm run hide_run"><a href="#n583">583</a></p> <p id="n584" class="stm run hide_run"><a href="#n584">584</a></p> -<p id="n585" class="stm mis"><a href="#n585">585</a></p> -<p id="n586" class="stm mis"><a href="#n586">586</a></p> +<p id="n585" class="stm run hide_run"><a href="#n585">585</a></p> +<p id="n586" class="stm run hide_run"><a href="#n586">586</a></p> <p id="n587" class="pln"><a href="#n587">587</a></p> <p id="n588" class="stm run hide_run"><a href="#n588">588</a></p> -<p id="n589" class="stm mis"><a href="#n589">589</a></p> -<p id="n590" class="stm mis"><a href="#n590">590</a></p> -<p id="n591" class="stm mis"><a href="#n591">591</a></p> -<p id="n592" class="pln"><a href="#n592">592</a></p> +<p id="n589" class="stm run hide_run"><a href="#n589">589</a></p> +<p id="n590" class="stm run hide_run"><a href="#n590">590</a></p> +<p id="n591" class="pln"><a href="#n591">591</a></p> +<p id="n592" class="stm run hide_run"><a href="#n592">592</a></p> <p id="n593" class="stm run hide_run"><a href="#n593">593</a></p> -<p id="n594" class="stm mis"><a href="#n594">594</a></p> -<p id="n595" class="stm mis"><a href="#n595">595</a></p> +<p id="n594" class="stm run hide_run"><a href="#n594">594</a></p> +<p id="n595" class="stm run hide_run"><a href="#n595">595</a></p> <p id="n596" class="pln"><a href="#n596">596</a></p> <p id="n597" class="stm run hide_run"><a href="#n597">597</a></p> -<p id="n598" class="pln"><a href="#n598">598</a></p> -<p id="n599" class="pln"><a href="#n599">599</a></p> +<p id="n598" class="stm run hide_run"><a href="#n598">598</a></p> +<p id="n599" class="stm run hide_run"><a href="#n599">599</a></p> <p id="n600" class="pln"><a href="#n600">600</a></p> -<p id="n601" class="stm mis"><a href="#n601">601</a></p> -<p id="n602" class="stm mis"><a href="#n602">602</a></p> +<p id="n601" class="stm run hide_run"><a href="#n601">601</a></p> +<p id="n602" class="pln"><a href="#n602">602</a></p> <p id="n603" class="pln"><a href="#n603">603</a></p> -<p id="n604" class="stm mis"><a href="#n604">604</a></p> -<p id="n605" class="stm mis"><a href="#n605">605</a></p> -<p id="n606" class="pln"><a href="#n606">606</a></p> +<p id="n604" class="pln"><a href="#n604">604</a></p> +<p id="n605" class="stm run hide_run"><a href="#n605">605</a></p> +<p id="n606" class="stm run hide_run"><a href="#n606">606</a></p> <p id="n607" class="pln"><a href="#n607">607</a></p> -<p id="n608" class="stm mis"><a href="#n608">608</a></p> -<p id="n609" class="pln"><a href="#n609">609</a></p> +<p id="n608" class="stm run hide_run"><a href="#n608">608</a></p> +<p id="n609" class="stm run hide_run"><a href="#n609">609</a></p> <p id="n610" class="pln"><a href="#n610">610</a></p> -<p id="n611" class="stm mis"><a href="#n611">611</a></p> -<p id="n612" class="stm mis"><a href="#n612">612</a></p> -<p id="n613" class="stm mis"><a href="#n613">613</a></p> +<p id="n611" class="pln"><a href="#n611">611</a></p> +<p id="n612" class="stm run hide_run"><a href="#n612">612</a></p> +<p id="n613" class="pln"><a href="#n613">613</a></p> <p id="n614" class="pln"><a href="#n614">614</a></p> -<p id="n615" class="pln"><a href="#n615">615</a></p> -<p id="n616" class="stm mis"><a href="#n616">616</a></p> -<p id="n617" class="stm mis"><a href="#n617">617</a></p> -<p id="n618" class="stm mis"><a href="#n618">618</a></p> +<p id="n615" class="stm run hide_run"><a href="#n615">615</a></p> +<p id="n616" class="stm run hide_run"><a href="#n616">616</a></p> +<p id="n617" class="stm run hide_run"><a href="#n617">617</a></p> +<p id="n618" class="pln"><a href="#n618">618</a></p> <p id="n619" class="pln"><a href="#n619">619</a></p> -<p id="n620" class="stm mis"><a href="#n620">620</a></p> -<p id="n621" class="stm mis"><a href="#n621">621</a></p> -<p id="n622" class="stm mis"><a href="#n622">622</a></p> -<p id="n623" class="stm mis"><a href="#n623">623</a></p> -<p id="n624" class="stm mis"><a href="#n624">624</a></p> -<p id="n625" class="stm mis"><a href="#n625">625</a></p> -<p id="n626" class="stm mis"><a href="#n626">626</a></p> -<p id="n627" class="stm mis"><a href="#n627">627</a></p> -<p id="n628" class="stm mis"><a href="#n628">628</a></p> -<p id="n629" class="stm mis"><a href="#n629">629</a></p> -<p id="n630" class="stm mis"><a href="#n630">630</a></p> -<p id="n631" class="stm mis"><a href="#n631">631</a></p> -<p id="n632" class="pln"><a href="#n632">632</a></p> -<p id="n633" class="pln"><a href="#n633">633</a></p> -<p id="n634" class="pln"><a href="#n634">634</a></p> -<p id="n635" class="pln"><a href="#n635">635</a></p> +<p id="n620" class="stm run hide_run"><a href="#n620">620</a></p> +<p id="n621" class="stm run hide_run"><a href="#n621">621</a></p> +<p id="n622" class="stm run hide_run"><a href="#n622">622</a></p> +<p id="n623" class="pln"><a href="#n623">623</a></p> +<p id="n624" class="stm run hide_run"><a href="#n624">624</a></p> +<p id="n625" class="stm run hide_run"><a href="#n625">625</a></p> +<p id="n626" class="stm run hide_run"><a href="#n626">626</a></p> +<p id="n627" class="stm run hide_run"><a href="#n627">627</a></p> +<p id="n628" class="stm run hide_run"><a href="#n628">628</a></p> +<p id="n629" class="stm run hide_run"><a href="#n629">629</a></p> +<p id="n630" class="stm run hide_run"><a href="#n630">630</a></p> +<p id="n631" class="stm run hide_run"><a href="#n631">631</a></p> +<p id="n632" class="stm run hide_run"><a href="#n632">632</a></p> +<p id="n633" class="stm run hide_run"><a href="#n633">633</a></p> +<p id="n634" class="stm run hide_run"><a href="#n634">634</a></p> +<p id="n635" class="stm run hide_run"><a href="#n635">635</a></p> <p id="n636" class="pln"><a href="#n636">636</a></p> -<p id="n637" class="stm mis"><a href="#n637">637</a></p> -<p id="n638" class="stm mis"><a href="#n638">638</a></p> +<p id="n637" class="pln"><a href="#n637">637</a></p> +<p id="n638" class="pln"><a href="#n638">638</a></p> <p id="n639" class="pln"><a href="#n639">639</a></p> -<p id="n640" class="stm mis"><a href="#n640">640</a></p> -<p id="n641" class="pln"><a href="#n641">641</a></p> -<p id="n642" class="stm mis"><a href="#n642">642</a></p> +<p id="n640" class="pln"><a href="#n640">640</a></p> +<p id="n641" class="stm run hide_run"><a href="#n641">641</a></p> +<p id="n642" class="stm run hide_run"><a href="#n642">642</a></p> <p id="n643" class="pln"><a href="#n643">643</a></p> <p id="n644" class="stm run hide_run"><a href="#n644">644</a></p> <p id="n645" class="pln"><a href="#n645">645</a></p> -<p id="n646" class="pln"><a href="#n646">646</a></p> -<p id="n647" class="stm mis"><a href="#n647">647</a></p> -<p id="n648" class="stm mis"><a href="#n648">648</a></p> -<p id="n649" class="stm mis"><a href="#n649">649</a></p> -<p id="n650" class="stm mis"><a href="#n650">650</a></p> -<p id="n651" class="pln"><a href="#n651">651</a></p> -<p id="n652" class="stm mis"><a href="#n652">652</a></p> -<p id="n653" class="stm mis"><a href="#n653">653</a></p> -<p id="n654" class="stm mis"><a href="#n654">654</a></p> +<p id="n646" class="stm run hide_run"><a href="#n646">646</a></p> +<p id="n647" class="pln"><a href="#n647">647</a></p> +<p id="n648" class="stm run hide_run"><a href="#n648">648</a></p> +<p id="n649" class="pln"><a href="#n649">649</a></p> +<p id="n650" class="pln"><a href="#n650">650</a></p> +<p id="n651" class="stm run hide_run"><a href="#n651">651</a></p> +<p id="n652" class="stm run hide_run"><a href="#n652">652</a></p> +<p id="n653" class="stm run hide_run"><a href="#n653">653</a></p> +<p id="n654" class="stm run hide_run"><a href="#n654">654</a></p> <p id="n655" class="pln"><a href="#n655">655</a></p> -<p id="n656" class="stm mis"><a href="#n656">656</a></p> -<p id="n657" class="stm mis"><a href="#n657">657</a></p> -<p id="n658" class="stm mis"><a href="#n658">658</a></p> -<p id="n659" class="stm mis"><a href="#n659">659</a></p> -<p id="n660" class="pln"><a href="#n660">660</a></p> +<p id="n656" class="stm run hide_run"><a href="#n656">656</a></p> +<p id="n657" class="stm run hide_run"><a href="#n657">657</a></p> +<p id="n658" class="stm run hide_run"><a href="#n658">658</a></p> +<p id="n659" class="pln"><a href="#n659">659</a></p> +<p id="n660" class="stm run hide_run"><a href="#n660">660</a></p> <p id="n661" class="stm run hide_run"><a href="#n661">661</a></p> -<p id="n662" class="pln"><a href="#n662">662</a></p> -<p id="n663" class="pln"><a href="#n663">663</a></p> -<p id="n664" class="stm mis"><a href="#n664">664</a></p> -<p id="n665" class="stm mis"><a href="#n665">665</a></p> +<p id="n662" class="stm run hide_run"><a href="#n662">662</a></p> +<p id="n663" class="stm run hide_run"><a href="#n663">663</a></p> +<p id="n664" class="pln"><a href="#n664">664</a></p> +<p id="n665" class="stm run hide_run"><a href="#n665">665</a></p> <p id="n666" class="pln"><a href="#n666">666</a></p> -<p id="n667" class="stm mis"><a href="#n667">667</a></p> -<p id="n668" class="stm mis"><a href="#n668">668</a></p> -<p id="n669" class="pln"><a href="#n669">669</a></p> -<p id="n670" class="stm mis"><a href="#n670">670</a></p> -<p id="n671" class="stm mis"><a href="#n671">671</a></p> -<p id="n672" class="stm mis"><a href="#n672">672</a></p> -<p id="n673" class="stm mis"><a href="#n673">673</a></p> -<p id="n674" class="pln"><a href="#n674">674</a></p> -<p id="n675" class="stm mis"><a href="#n675">675</a></p> -<p id="n676" class="pln"><a href="#n676">676</a></p> -<p id="n677" class="stm mis"><a href="#n677">677</a></p> +<p id="n667" class="pln"><a href="#n667">667</a></p> +<p id="n668" class="stm run hide_run"><a href="#n668">668</a></p> +<p id="n669" class="stm run hide_run"><a href="#n669">669</a></p> +<p id="n670" class="pln"><a href="#n670">670</a></p> +<p id="n671" class="stm run hide_run"><a href="#n671">671</a></p> +<p id="n672" class="stm run hide_run"><a href="#n672">672</a></p> +<p id="n673" class="pln"><a href="#n673">673</a></p> +<p id="n674" class="stm run hide_run"><a href="#n674">674</a></p> +<p id="n675" class="stm run hide_run"><a href="#n675">675</a></p> +<p id="n676" class="stm run hide_run"><a href="#n676">676</a></p> +<p id="n677" class="stm run hide_run"><a href="#n677">677</a></p> <p id="n678" class="pln"><a href="#n678">678</a></p> <p id="n679" class="stm run hide_run"><a href="#n679">679</a></p> <p id="n680" class="pln"><a href="#n680">680</a></p> -<p id="n681" class="pln"><a href="#n681">681</a></p> +<p id="n681" class="stm run hide_run"><a href="#n681">681</a></p> <p id="n682" class="pln"><a href="#n682">682</a></p> -<p id="n683" class="pln"><a href="#n683">683</a></p> -<p id="n684" class="stm mis"><a href="#n684">684</a></p> +<p id="n683" class="stm run hide_run"><a href="#n683">683</a></p> +<p id="n684" class="pln"><a href="#n684">684</a></p> <p id="n685" class="pln"><a href="#n685">685</a></p> <p id="n686" class="pln"><a href="#n686">686</a></p> -<p id="n687" class="stm mis"><a href="#n687">687</a></p> -<p id="n688" class="stm mis"><a href="#n688">688</a></p> -<p id="n689" class="stm mis"><a href="#n689">689</a></p> +<p id="n687" class="pln"><a href="#n687">687</a></p> +<p id="n688" class="stm run hide_run"><a href="#n688">688</a></p> +<p id="n689" class="pln"><a href="#n689">689</a></p> <p id="n690" class="pln"><a href="#n690">690</a></p> -<p id="n691" class="stm mis"><a href="#n691">691</a></p> -<p id="n692" class="stm mis"><a href="#n692">692</a></p> -<p id="n693" class="stm mis"><a href="#n693">693</a></p> +<p id="n691" class="stm run hide_run"><a href="#n691">691</a></p> +<p id="n692" class="stm run hide_run"><a href="#n692">692</a></p> +<p id="n693" class="stm run hide_run"><a href="#n693">693</a></p> <p id="n694" class="pln"><a href="#n694">694</a></p> -<p id="n695" class="stm mis"><a href="#n695">695</a></p> -<p id="n696" class="stm mis"><a href="#n696">696</a></p> -<p id="n697" class="stm mis"><a href="#n697">697</a></p> +<p id="n695" class="stm run hide_run"><a href="#n695">695</a></p> +<p id="n696" class="stm run hide_run"><a href="#n696">696</a></p> +<p id="n697" class="stm run hide_run"><a href="#n697">697</a></p> <p id="n698" class="pln"><a href="#n698">698</a></p> -<p id="n699" class="stm mis"><a href="#n699">699</a></p> -<p id="n700" class="stm mis"><a href="#n700">700</a></p> -<p id="n701" class="stm mis"><a href="#n701">701</a></p> +<p id="n699" class="stm run hide_run"><a href="#n699">699</a></p> +<p id="n700" class="stm run hide_run"><a href="#n700">700</a></p> +<p id="n701" class="stm run hide_run"><a href="#n701">701</a></p> <p id="n702" class="pln"><a href="#n702">702</a></p> -<p id="n703" class="stm mis"><a href="#n703">703</a></p> -<p id="n704" class="pln"><a href="#n704">704</a></p> +<p id="n703" class="stm run hide_run"><a href="#n703">703</a></p> +<p id="n704" class="stm run hide_run"><a href="#n704">704</a></p> <p id="n705" class="stm run hide_run"><a href="#n705">705</a></p> <p id="n706" class="pln"><a href="#n706">706</a></p> -<p id="n707" class="pln"><a href="#n707">707</a></p> +<p id="n707" class="stm run hide_run"><a href="#n707">707</a></p> <p id="n708" class="pln"><a href="#n708">708</a></p> -<p id="n709" class="stm mis"><a href="#n709">709</a></p> -<p id="n710" class="stm mis"><a href="#n710">710</a></p> -<p id="n711" class="stm mis"><a href="#n711">711</a></p> -<p id="n712" class="stm mis"><a href="#n712">712</a></p> -<p id="n713" class="stm mis"><a href="#n713">713</a></p> -<p id="n714" class="stm mis"><a href="#n714">714</a></p> -<p id="n715" class="stm mis"><a href="#n715">715</a></p> -<p id="n716" class="stm mis"><a href="#n716">716</a></p> -<p id="n717" class="stm mis"><a href="#n717">717</a></p> -<p id="n718" class="stm mis"><a href="#n718">718</a></p> -<p id="n719" class="stm mis"><a href="#n719">719</a></p> -<p id="n720" class="stm mis"><a href="#n720">720</a></p> -<p id="n721" class="stm mis"><a href="#n721">721</a></p> -<p id="n722" class="stm mis"><a href="#n722">722</a></p> -<p id="n723" class="stm mis"><a href="#n723">723</a></p> -<p id="n724" class="stm mis"><a href="#n724">724</a></p> -<p id="n725" class="pln"><a href="#n725">725</a></p> -<p id="n726" class="pln"><a href="#n726">726</a></p> -<p id="n727" class="pln"><a href="#n727">727</a></p> -<p id="n728" class="pln"><a href="#n728">728</a></p> +<p id="n709" class="stm run hide_run"><a href="#n709">709</a></p> +<p id="n710" class="pln"><a href="#n710">710</a></p> +<p id="n711" class="pln"><a href="#n711">711</a></p> +<p id="n712" class="pln"><a href="#n712">712</a></p> +<p id="n713" class="stm run hide_run"><a href="#n713">713</a></p> +<p id="n714" class="stm run hide_run"><a href="#n714">714</a></p> +<p id="n715" class="stm run hide_run"><a href="#n715">715</a></p> +<p id="n716" class="stm run hide_run"><a href="#n716">716</a></p> +<p id="n717" class="stm run hide_run"><a href="#n717">717</a></p> +<p id="n718" class="stm run hide_run"><a href="#n718">718</a></p> +<p id="n719" class="stm run hide_run"><a href="#n719">719</a></p> +<p id="n720" class="stm run hide_run"><a href="#n720">720</a></p> +<p id="n721" class="stm run hide_run"><a href="#n721">721</a></p> +<p id="n722" class="stm run hide_run"><a href="#n722">722</a></p> +<p id="n723" class="stm run hide_run"><a href="#n723">723</a></p> +<p id="n724" class="stm run hide_run"><a href="#n724">724</a></p> +<p id="n725" class="stm run hide_run"><a href="#n725">725</a></p> +<p id="n726" class="stm run hide_run"><a href="#n726">726</a></p> +<p id="n727" class="stm run hide_run"><a href="#n727">727</a></p> +<p id="n728" class="stm run hide_run"><a href="#n728">728</a></p> <p id="n729" class="pln"><a href="#n729">729</a></p> <p id="n730" class="pln"><a href="#n730">730</a></p> <p id="n731" class="pln"><a href="#n731">731</a></p> @@ -844,785 +844,795 @@ <p id="n773" class="pln"><a href="#n773">773</a></p> <p id="n774" class="pln"><a href="#n774">774</a></p> <p id="n775" class="pln"><a href="#n775">775</a></p> - +<p id="n776" class="pln"><a href="#n776">776</a></p> +<p id="n777" class="pln"><a href="#n777">777</a></p> +<p id="n778" class="pln"><a href="#n778">778</a></p> +<p id="n779" class="pln"><a href="#n779">779</a></p> +<p id="n780" class="pln"><a href="#n780">780</a></p> + </td> <td class="text"> -<p id="t1" class="pln"><span class="str">""" Cog code generation tool.</span><span class="strut"> </span></p> -<p id="t2" class="pln"><span class="str"> http://nedbatchelder.com/code/cog</span><span class="strut"> </span></p> -<p id="t3" class="pln"><span class="strut"> </span></p> -<p id="t4" class="pln"><span class="str"> Copyright 2004-2015, Ned Batchelder.</span><span class="strut"> </span></p> -<p id="t5" class="pln"><span class="str">"""</span><span class="strut"> </span></p> -<p id="t6" class="pln"><span class="strut"> </span></p> -<p id="t7" class="stm run hide_run"><span class="key">from</span> <span class="nam">__future__</span> <span class="key">import</span> <span class="nam">absolute_import</span><span class="op">,</span> <span class="nam">print_function</span><span class="strut"> </span></p> -<p id="t8" class="pln"><span class="strut"> </span></p> -<p id="t9" class="stm run hide_run"><span class="key">import</span> <span class="nam">copy</span><span class="op">,</span> <span class="nam">getopt</span><span class="op">,</span> <span class="nam">hashlib</span><span class="op">,</span> <span class="nam">imp</span><span class="op">,</span> <span class="nam">os</span><span class="op">,</span> <span class="nam">re</span><span class="op">,</span> <span class="nam">shlex</span><span class="op">,</span> <span class="nam">sys</span><span class="op">,</span> <span class="nam">traceback</span><span class="strut"> </span></p> -<p id="t10" class="stm run hide_run"><span class="key">from</span> <span class="op">.</span><span class="nam">backward</span> <span class="key">import</span> <span class="nam">PY3</span><span class="op">,</span> <span class="nam">StringIO</span><span class="op">,</span> <span class="nam">string_types</span><span class="op">,</span> <span class="nam">to_bytes</span><span class="strut"> </span></p> -<p id="t11" class="pln"><span class="strut"> </span></p> -<p id="t12" class="stm run hide_run"><span class="nam">__all__</span> <span class="op">=</span> <span class="op">[</span><span class="str">'Cog'</span><span class="op">,</span> <span class="str">'CogUsageError'</span><span class="op">]</span><span class="strut"> </span></p> -<p id="t13" class="pln"><span class="strut"> </span></p> -<p id="t14" class="stm run hide_run"><span class="nam">__version__</span> <span class="op">=</span> <span class="str">'2.4'</span> <span class="com"># History at the end of the file.</span><span class="strut"> </span></p> -<p id="t15" class="pln"><span class="strut"> </span></p> -<p id="t16" class="stm run hide_run"><span class="nam">usage</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t17" class="pln"><span class="str">cog - generate code with inlined Python code.</span><span class="strut"> </span></p> -<p id="t18" class="pln"><span class="strut"> </span></p> -<p id="t19" class="pln"><span class="str">cog [OPTIONS] [INFILE | @FILELIST] ...</span><span class="strut"> </span></p> -<p id="t20" class="pln"><span class="strut"> </span></p> -<p id="t21" class="pln"><span class="str">INFILE is the name of an input file, '-' will read from stdin.</span><span class="strut"> </span></p> -<p id="t22" class="pln"><span class="str">FILELIST is the name of a text file containing file names or</span><span class="strut"> </span></p> -<p id="t23" class="pln"><span class="str"> other @FILELISTs.</span><span class="strut"> </span></p> -<p id="t24" class="pln"><span class="strut"> </span></p> -<p id="t25" class="pln"><span class="str">OPTIONS:</span><span class="strut"> </span></p> -<p id="t26" class="pln"><span class="str"> -c Checksum the output to protect it against accidental change.</span><span class="strut"> </span></p> -<p id="t27" class="pln"><span class="str"> -d Delete the generator code from the output file.</span><span class="strut"> </span></p> -<p id="t28" class="pln"><span class="str"> -D name=val Define a global string available to your generator code.</span><span class="strut"> </span></p> -<p id="t29" class="pln"><span class="str"> -e Warn if a file has no cog code in it.</span><span class="strut"> </span></p> -<p id="t30" class="pln"><span class="str"> -I PATH Add PATH to the list of directories for data files and modules.</span><span class="strut"> </span></p> -<p id="t31" class="pln"><span class="str"> -n ENCODING Use ENCODING when reading and writing files.</span><span class="strut"> </span></p> -<p id="t32" class="pln"><span class="str"> -o OUTNAME Write the output to OUTNAME.</span><span class="strut"> </span></p> -<p id="t33" class="pln"><span class="str"> -r Replace the input file with the output.</span><span class="strut"> </span></p> -<p id="t34" class="pln"><span class="str"> -s STRING Suffix all generated output lines with STRING.</span><span class="strut"> </span></p> -<p id="t35" class="pln"><span class="str"> -U Write the output with Unix newlines (only LF line-endings).</span><span class="strut"> </span></p> -<p id="t36" class="pln"><span class="str"> -w CMD Use CMD if the output file needs to be made writable.</span><span class="strut"> </span></p> -<p id="t37" class="pln"><span class="str"> A %s in the CMD will be filled with the filename.</span><span class="strut"> </span></p> -<p id="t38" class="pln"><span class="str"> -x Excise all the generated output without running the generators.</span><span class="strut"> </span></p> -<p id="t39" class="pln"><span class="str"> -z The end-output marker can be omitted, and is assumed at eof.</span><span class="strut"> </span></p> -<p id="t40" class="pln"><span class="str"> -v Print the version of cog and exit.</span><span class="strut"> </span></p> -<p id="t41" class="pln"><span class="str"> --verbosity=VERBOSITY</span><span class="strut"> </span></p> -<p id="t42" class="pln"><span class="str"> Control the amount of output. 2 (the default) lists all files,</span><span class="strut"> </span></p> -<p id="t43" class="pln"><span class="str"> 1 lists only changed files, 0 lists no files.</span><span class="strut"> </span></p> -<p id="t44" class="pln"><span class="str"> --markers='START END END-OUTPUT'</span><span class="strut"> </span></p> -<p id="t45" class="pln"><span class="str"> The patterns surrounding cog inline instructions. Should</span><span class="strut"> </span></p> -<p id="t46" class="pln"><span class="str"> include three values separated by spaces, the start, end,</span><span class="strut"> </span></p> -<p id="t47" class="pln"><span class="str"> and end-output markers. Defaults to '[[[cog ]]] [[[end]]]'.</span><span class="strut"> </span></p> -<p id="t48" class="pln"><span class="str"> -h Print this help.</span><span class="strut"> </span></p> -<p id="t49" class="pln"><span class="str">"""</span><span class="strut"> </span></p> -<p id="t50" class="pln"><span class="strut"> </span></p> -<p id="t51" class="pln"><span class="com"># Other package modules</span><span class="strut"> </span></p> -<p id="t52" class="stm run hide_run"><span class="key">from</span> <span class="op">.</span><span class="nam">whiteutils</span> <span class="key">import</span> <span class="op">*</span><span class="strut"> </span></p> -<p id="t53" class="pln"><span class="strut"> </span></p> -<p id="t54" class="stm run hide_run"><span class="key">class</span> <span class="nam">CogError</span><span class="op">(</span><span class="nam">Exception</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t55" class="pln"> <span class="str">""" Any exception raised by Cog.</span><span class="strut"> </span></p> -<p id="t56" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t57" class="stm run hide_run"> <span class="key">def</span> <span class="nam">__init__</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">msg</span><span class="op">,</span> <span class="nam">file</span><span class="op">=</span><span class="str">''</span><span class="op">,</span> <span class="nam">line</span><span class="op">=</span><span class="num">0</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t58" class="stm par run hide_run"><span class="annotate" title="Line 58 was executed, but never jumped to line 61">58 ↛ 61 [?]</span> <span class="key">if</span> <span class="nam">file</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t59" class="stm run hide_run"> <span class="nam">Exception</span><span class="op">.</span><span class="nam">__init__</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="str">"%s(%d): %s"</span> <span class="op">%</span> <span class="op">(</span><span class="nam">file</span><span class="op">,</span> <span class="nam">line</span><span class="op">,</span> <span class="nam">msg</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t60" class="pln"> <span class="key">else</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t61" class="stm mis"> <span class="nam">Exception</span><span class="op">.</span><span class="nam">__init__</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">msg</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t62" class="pln"><span class="strut"> </span></p> -<p id="t63" class="stm run hide_run"><span class="key">class</span> <span class="nam">CogUsageError</span><span class="op">(</span><span class="nam">CogError</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t64" class="pln"> <span class="str">""" An error in usage of command-line arguments in cog.</span><span class="strut"> </span></p> -<p id="t65" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t66" class="exc"> <span class="key">pass</span> <span class="com">#pragma: no cover</span><span class="strut"> </span></p> -<p id="t67" class="pln"><span class="strut"> </span></p> -<p id="t68" class="stm run hide_run"><span class="key">class</span> <span class="nam">CogInternalError</span><span class="op">(</span><span class="nam">CogError</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t69" class="pln"> <span class="str">""" An error in the coding of Cog. Should never happen.</span><span class="strut"> </span></p> -<p id="t70" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t71" class="exc"> <span class="key">pass</span> <span class="com">#pragma: no cover</span><span class="strut"> </span></p> -<p id="t72" class="pln"><span class="strut"> </span></p> -<p id="t73" class="stm run hide_run"><span class="key">class</span> <span class="nam">CogGeneratedError</span><span class="op">(</span><span class="nam">CogError</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t74" class="pln"> <span class="str">""" An error raised by a user's cog generator.</span><span class="strut"> </span></p> -<p id="t75" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t76" class="exc"> <span class="key">pass</span> <span class="com">#pragma: no cover</span><span class="strut"> </span></p> -<p id="t77" class="pln"><span class="strut"> </span></p> -<p id="t78" class="stm run hide_run"><span class="key">class</span> <span class="nam">Redirectable</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t79" class="pln"> <span class="str">""" An object with its own stdout and stderr files.</span><span class="strut"> </span></p> -<p id="t80" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t81" class="stm run hide_run"> <span class="key">def</span> <span class="nam">__init__</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t82" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">stdout</span> <span class="op">=</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">stdout</span><span class="strut"> </span></p> -<p id="t83" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">stderr</span> <span class="op">=</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">stderr</span><span class="strut"> </span></p> -<p id="t84" class="pln"><span class="strut"> </span></p> -<p id="t85" class="stm run hide_run"> <span class="key">def</span> <span class="nam">setOutput</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">stdout</span><span class="op">=</span><span class="nam">None</span><span class="op">,</span> <span class="nam">stderr</span><span class="op">=</span><span class="nam">None</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t86" class="pln"> <span class="str">""" Assign new files for standard out and/or standard error.</span><span class="strut"> </span></p> -<p id="t87" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t88" class="stm par run hide_run"><span class="annotate" title="Line 88 was executed, but never jumped to line 90">88 ↛ 90 [?]</span> <span class="key">if</span> <span class="nam">stdout</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t89" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">stdout</span> <span class="op">=</span> <span class="nam">stdout</span><span class="strut"> </span></p> -<p id="t90" class="stm par run hide_run"><span class="annotate" title="Line 90 was executed, but never jumped to line 91">90 ↛ 91 [?]</span> <span class="key">if</span> <span class="nam">stderr</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t91" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">stderr</span> <span class="op">=</span> <span class="nam">stderr</span><span class="strut"> </span></p> -<p id="t92" class="pln"><span class="strut"> </span></p> -<p id="t93" class="stm run hide_run"> <span class="key">def</span> <span class="nam">prout</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">s</span><span class="op">,</span> <span class="nam">end</span><span class="op">=</span><span class="str">"\n"</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t94" class="stm mis"> <span class="key">print</span><span class="op">(</span><span class="nam">s</span><span class="op">,</span> <span class="nam">file</span><span class="op">=</span><span class="nam">self</span><span class="op">.</span><span class="nam">stdout</span><span class="op">,</span> <span class="nam">end</span><span class="op">=</span><span class="nam">end</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t95" class="pln"><span class="strut"> </span></p> -<p id="t96" class="stm run hide_run"> <span class="key">def</span> <span class="nam">prerr</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">s</span><span class="op">,</span> <span class="nam">end</span><span class="op">=</span><span class="str">"\n"</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t97" class="stm mis"> <span class="key">print</span><span class="op">(</span><span class="nam">s</span><span class="op">,</span> <span class="nam">file</span><span class="op">=</span><span class="nam">self</span><span class="op">.</span><span class="nam">stderr</span><span class="op">,</span> <span class="nam">end</span><span class="op">=</span><span class="nam">end</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t98" class="pln"><span class="strut"> </span></p> +<p id="t1" class="pln"><span class="com"># coding: utf8</span><span class="strut"> </span></p> +<p id="t2" class="stm run hide_run"><span class="str">""" Cog code generation tool.</span><span class="strut"> </span></p> +<p id="t3" class="pln"><span class="str"> http://nedbatchelder.com/code/cog</span><span class="strut"> </span></p> +<p id="t4" class="pln"><span class="strut"> </span></p> +<p id="t5" class="pln"><span class="str"> Copyright 2004-2016, Ned Batchelder.</span><span class="strut"> </span></p> +<p id="t6" class="pln"><span class="str">"""</span><span class="strut"> </span></p> +<p id="t7" class="pln"><span class="strut"> </span></p> +<p id="t8" class="stm run hide_run"><span class="key">from</span> <span class="nam">__future__</span> <span class="key">import</span> <span class="nam">absolute_import</span><span class="op">,</span> <span class="nam">print_function</span><span class="strut"> </span></p> +<p id="t9" class="pln"><span class="strut"> </span></p> +<p id="t10" class="stm run hide_run"><span class="key">import</span> <span class="nam">copy</span><span class="op">,</span> <span class="nam">getopt</span><span class="op">,</span> <span class="nam">hashlib</span><span class="op">,</span> <span class="nam">imp</span><span class="op">,</span> <span class="nam">os</span><span class="op">,</span> <span class="nam">re</span><span class="op">,</span> <span class="nam">shlex</span><span class="op">,</span> <span class="nam">sys</span><span class="op">,</span> <span class="nam">traceback</span><span class="strut"> </span></p> +<p id="t11" class="stm run hide_run"><span class="key">from</span> <span class="op">.</span><span class="nam">backward</span> <span class="key">import</span> <span class="nam">PY3</span><span class="op">,</span> <span class="nam">StringIO</span><span class="op">,</span> <span class="nam">string_types</span><span class="op">,</span> <span class="nam">to_bytes</span><span class="strut"> </span></p> +<p id="t12" class="pln"><span class="strut"> </span></p> +<p id="t13" class="stm run hide_run"><span class="nam">__all__</span> <span class="op">=</span> <span class="op">[</span><span class="str">'Cog'</span><span class="op">,</span> <span class="str">'CogUsageError'</span><span class="op">]</span><span class="strut"> </span></p> +<p id="t14" class="pln"><span class="strut"> </span></p> +<p id="t15" class="stm run hide_run"><span class="nam">__version__</span> <span class="op">=</span> <span class="str">'2.5'</span> <span class="com"># History at the end of the file.</span><span class="strut"> </span></p> +<p id="t16" class="pln"><span class="strut"> </span></p> +<p id="t17" class="stm run hide_run"><span class="nam">usage</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t18" class="pln"><span class="str">cog - generate code with inlined Python code.</span><span class="strut"> </span></p> +<p id="t19" class="pln"><span class="strut"> </span></p> +<p id="t20" class="pln"><span class="str">cog [OPTIONS] [INFILE | @FILELIST] ...</span><span class="strut"> </span></p> +<p id="t21" class="pln"><span class="strut"> </span></p> +<p id="t22" class="pln"><span class="str">INFILE is the name of an input file, '-' will read from stdin.</span><span class="strut"> </span></p> +<p id="t23" class="pln"><span class="str">FILELIST is the name of a text file containing file names or</span><span class="strut"> </span></p> +<p id="t24" class="pln"><span class="str"> other @FILELISTs.</span><span class="strut"> </span></p> +<p id="t25" class="pln"><span class="strut"> </span></p> +<p id="t26" class="pln"><span class="str">OPTIONS:</span><span class="strut"> </span></p> +<p id="t27" class="pln"><span class="str"> -c Checksum the output to protect it against accidental change.</span><span class="strut"> </span></p> +<p id="t28" class="pln"><span class="str"> -d Delete the generator code from the output file.</span><span class="strut"> </span></p> +<p id="t29" class="pln"><span class="str"> -D name=val Define a global string available to your generator code.</span><span class="strut"> </span></p> +<p id="t30" class="pln"><span class="str"> -e Warn if a file has no cog code in it.</span><span class="strut"> </span></p> +<p id="t31" class="pln"><span class="str"> -I PATH Add PATH to the list of directories for data files and modules.</span><span class="strut"> </span></p> +<p id="t32" class="pln"><span class="str"> -n ENCODING Use ENCODING when reading and writing files.</span><span class="strut"> </span></p> +<p id="t33" class="pln"><span class="str"> -o OUTNAME Write the output to OUTNAME.</span><span class="strut"> </span></p> +<p id="t34" class="pln"><span class="str"> -r Replace the input file with the output.</span><span class="strut"> </span></p> +<p id="t35" class="pln"><span class="str"> -s STRING Suffix all generated output lines with STRING.</span><span class="strut"> </span></p> +<p id="t36" class="pln"><span class="str"> -U Write the output with Unix newlines (only LF line-endings).</span><span class="strut"> </span></p> +<p id="t37" class="pln"><span class="str"> -w CMD Use CMD if the output file needs to be made writable.</span><span class="strut"> </span></p> +<p id="t38" class="pln"><span class="str"> A %s in the CMD will be filled with the filename.</span><span class="strut"> </span></p> +<p id="t39" class="pln"><span class="str"> -x Excise all the generated output without running the generators.</span><span class="strut"> </span></p> +<p id="t40" class="pln"><span class="str"> -z The end-output marker can be omitted, and is assumed at eof.</span><span class="strut"> </span></p> +<p id="t41" class="pln"><span class="str"> -v Print the version of cog and exit.</span><span class="strut"> </span></p> +<p id="t42" class="pln"><span class="str"> --verbosity=VERBOSITY</span><span class="strut"> </span></p> +<p id="t43" class="pln"><span class="str"> Control the amount of output. 2 (the default) lists all files,</span><span class="strut"> </span></p> +<p id="t44" class="pln"><span class="str"> 1 lists only changed files, 0 lists no files.</span><span class="strut"> </span></p> +<p id="t45" class="pln"><span class="str"> --markers='START END END-OUTPUT'</span><span class="strut"> </span></p> +<p id="t46" class="pln"><span class="str"> The patterns surrounding cog inline instructions. Should</span><span class="strut"> </span></p> +<p id="t47" class="pln"><span class="str"> include three values separated by spaces, the start, end,</span><span class="strut"> </span></p> +<p id="t48" class="pln"><span class="str"> and end-output markers. Defaults to '[[[cog ]]] [[[end]]]'.</span><span class="strut"> </span></p> +<p id="t49" class="pln"><span class="str"> -h Print this help.</span><span class="strut"> </span></p> +<p id="t50" class="pln"><span class="str">"""</span><span class="strut"> </span></p> +<p id="t51" class="pln"><span class="strut"> </span></p> +<p id="t52" class="pln"><span class="com"># Other package modules</span><span class="strut"> </span></p> +<p id="t53" class="stm run hide_run"><span class="key">from</span> <span class="op">.</span><span class="nam">whiteutils</span> <span class="key">import</span> <span class="op">*</span><span class="strut"> </span></p> +<p id="t54" class="pln"><span class="strut"> </span></p> +<p id="t55" class="stm run hide_run"><span class="key">class</span> <span class="nam">CogError</span><span class="op">(</span><span class="nam">Exception</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t56" class="pln"> <span class="str">""" Any exception raised by Cog.</span><span class="strut"> </span></p> +<p id="t57" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t58" class="stm run hide_run"> <span class="key">def</span> <span class="nam">__init__</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">msg</span><span class="op">,</span> <span class="nam">file</span><span class="op">=</span><span class="str">''</span><span class="op">,</span> <span class="nam">line</span><span class="op">=</span><span class="num">0</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t59" class="stm run hide_run"> <span class="key">if</span> <span class="nam">file</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t60" class="stm run hide_run"> <span class="nam">Exception</span><span class="op">.</span><span class="nam">__init__</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="str">"%s(%d): %s"</span> <span class="op">%</span> <span class="op">(</span><span class="nam">file</span><span class="op">,</span> <span class="nam">line</span><span class="op">,</span> <span class="nam">msg</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t61" class="pln"> <span class="key">else</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t62" class="stm run hide_run"> <span class="nam">Exception</span><span class="op">.</span><span class="nam">__init__</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">msg</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t63" class="pln"><span class="strut"> </span></p> +<p id="t64" class="stm run hide_run"><span class="key">class</span> <span class="nam">CogUsageError</span><span class="op">(</span><span class="nam">CogError</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t65" class="pln"> <span class="str">""" An error in usage of command-line arguments in cog.</span><span class="strut"> </span></p> +<p id="t66" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t67" class="exc"> <span class="key">pass</span> <span class="com">#pragma: no cover</span><span class="strut"> </span></p> +<p id="t68" class="pln"><span class="strut"> </span></p> +<p id="t69" class="stm run hide_run"><span class="key">class</span> <span class="nam">CogInternalError</span><span class="op">(</span><span class="nam">CogError</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t70" class="pln"> <span class="str">""" An error in the coding of Cog. Should never happen.</span><span class="strut"> </span></p> +<p id="t71" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t72" class="exc"> <span class="key">pass</span> <span class="com">#pragma: no cover</span><span class="strut"> </span></p> +<p id="t73" class="pln"><span class="strut"> </span></p> +<p id="t74" class="stm run hide_run"><span class="key">class</span> <span class="nam">CogGeneratedError</span><span class="op">(</span><span class="nam">CogError</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t75" class="pln"> <span class="str">""" An error raised by a user's cog generator.</span><span class="strut"> </span></p> +<p id="t76" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t77" class="exc"> <span class="key">pass</span> <span class="com">#pragma: no cover</span><span class="strut"> </span></p> +<p id="t78" class="pln"><span class="strut"> </span></p> +<p id="t79" class="stm run hide_run"><span class="key">class</span> <span class="nam">Redirectable</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t80" class="pln"> <span class="str">""" An object with its own stdout and stderr files.</span><span class="strut"> </span></p> +<p id="t81" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t82" class="stm run hide_run"> <span class="key">def</span> <span class="nam">__init__</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t83" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">stdout</span> <span class="op">=</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">stdout</span><span class="strut"> </span></p> +<p id="t84" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">stderr</span> <span class="op">=</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">stderr</span><span class="strut"> </span></p> +<p id="t85" class="pln"><span class="strut"> </span></p> +<p id="t86" class="stm run hide_run"> <span class="key">def</span> <span class="nam">setOutput</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">stdout</span><span class="op">=</span><span class="nam">None</span><span class="op">,</span> <span class="nam">stderr</span><span class="op">=</span><span class="nam">None</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t87" class="pln"> <span class="str">""" Assign new files for standard out and/or standard error.</span><span class="strut"> </span></p> +<p id="t88" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t89" class="stm run hide_run"> <span class="key">if</span> <span class="nam">stdout</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t90" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">stdout</span> <span class="op">=</span> <span class="nam">stdout</span><span class="strut"> </span></p> +<p id="t91" class="stm run hide_run"> <span class="key">if</span> <span class="nam">stderr</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t92" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">stderr</span> <span class="op">=</span> <span class="nam">stderr</span><span class="strut"> </span></p> +<p id="t93" class="pln"><span class="strut"> </span></p> +<p id="t94" class="stm run hide_run"> <span class="key">def</span> <span class="nam">prout</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">s</span><span class="op">,</span> <span class="nam">end</span><span class="op">=</span><span class="str">"\n"</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t95" class="stm run hide_run"> <span class="key">print</span><span class="op">(</span><span class="nam">s</span><span class="op">,</span> <span class="nam">file</span><span class="op">=</span><span class="nam">self</span><span class="op">.</span><span class="nam">stdout</span><span class="op">,</span> <span class="nam">end</span><span class="op">=</span><span class="nam">end</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t96" class="pln"><span class="strut"> </span></p> +<p id="t97" class="stm run hide_run"> <span class="key">def</span> <span class="nam">prerr</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">s</span><span class="op">,</span> <span class="nam">end</span><span class="op">=</span><span class="str">"\n"</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t98" class="stm run hide_run"> <span class="key">print</span><span class="op">(</span><span class="nam">s</span><span class="op">,</span> <span class="nam">file</span><span class="op">=</span><span class="nam">self</span><span class="op">.</span><span class="nam">stderr</span><span class="op">,</span> <span class="nam">end</span><span class="op">=</span><span class="nam">end</span><span class="op">)</span><span class="strut"> </span></p> <p id="t99" class="pln"><span class="strut"> </span></p> -<p id="t100" class="stm run hide_run"><span class="key">class</span> <span class="nam">CogGenerator</span><span class="op">(</span><span class="nam">Redirectable</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t101" class="pln"> <span class="str">""" A generator pulled from a source file.</span><span class="strut"> </span></p> -<p id="t102" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t103" class="stm run hide_run"> <span class="key">def</span> <span class="nam">__init__</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t104" class="stm run hide_run"> <span class="nam">Redirectable</span><span class="op">.</span><span class="nam">__init__</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t105" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">markers</span> <span class="op">=</span> <span class="op">[</span><span class="op">]</span><span class="strut"> </span></p> -<p id="t106" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">lines</span> <span class="op">=</span> <span class="op">[</span><span class="op">]</span><span class="strut"> </span></p> -<p id="t107" class="pln"><span class="strut"> </span></p> -<p id="t108" class="stm run hide_run"> <span class="key">def</span> <span class="nam">parseMarker</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">l</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t109" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">markers</span><span class="op">.</span><span class="nam">append</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t110" class="pln"><span class="strut"> </span></p> -<p id="t111" class="stm run hide_run"> <span class="key">def</span> <span class="nam">parseLine</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">l</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t112" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">lines</span><span class="op">.</span><span class="nam">append</span><span class="op">(</span><span class="nam">l</span><span class="op">.</span><span class="nam">strip</span><span class="op">(</span><span class="str">'\n'</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t113" class="pln"><span class="strut"> </span></p> -<p id="t114" class="stm run hide_run"> <span class="key">def</span> <span class="nam">getCode</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t115" class="pln"> <span class="str">""" Extract the executable Python code from the generator.</span><span class="strut"> </span></p> -<p id="t116" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t117" class="pln"> <span class="com"># If the markers and lines all have the same prefix</span><span class="strut"> </span></p> -<p id="t118" class="pln"> <span class="com"># (end-of-line comment chars, for example),</span><span class="strut"> </span></p> -<p id="t119" class="pln"> <span class="com"># then remove it from all the lines.</span><span class="strut"> </span></p> -<p id="t120" class="stm run hide_run"> <span class="nam">prefIn</span> <span class="op">=</span> <span class="nam">commonPrefix</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">markers</span> <span class="op">+</span> <span class="nam">self</span><span class="op">.</span><span class="nam">lines</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t121" class="stm run hide_run"> <span class="key">if</span> <span class="nam">prefIn</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t122" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">markers</span> <span class="op">=</span> <span class="op">[</span> <span class="nam">l</span><span class="op">.</span><span class="nam">replace</span><span class="op">(</span><span class="nam">prefIn</span><span class="op">,</span> <span class="str">''</span><span class="op">,</span> <span class="num">1</span><span class="op">)</span> <span class="key">for</span> <span class="nam">l</span> <span class="key">in</span> <span class="nam">self</span><span class="op">.</span><span class="nam">markers</span> <span class="op">]</span><span class="strut"> </span></p> -<p id="t123" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">lines</span> <span class="op">=</span> <span class="op">[</span> <span class="nam">l</span><span class="op">.</span><span class="nam">replace</span><span class="op">(</span><span class="nam">prefIn</span><span class="op">,</span> <span class="str">''</span><span class="op">,</span> <span class="num">1</span><span class="op">)</span> <span class="key">for</span> <span class="nam">l</span> <span class="key">in</span> <span class="nam">self</span><span class="op">.</span><span class="nam">lines</span> <span class="op">]</span><span class="strut"> </span></p> -<p id="t124" class="pln"><span class="strut"> </span></p> -<p id="t125" class="stm run hide_run"> <span class="key">return</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">lines</span><span class="op">,</span> <span class="str">''</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t126" class="pln"><span class="strut"> </span></p> -<p id="t127" class="stm run hide_run"> <span class="key">def</span> <span class="nam">evaluate</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">cog</span><span class="op">,</span> <span class="nam">globals</span><span class="op">,</span> <span class="nam">fname</span><span class="op">=</span><span class="str">'cog generator'</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t128" class="pln"> <span class="com"># figure out the right whitespace prefix for the output</span><span class="strut"> </span></p> -<p id="t129" class="stm run hide_run"> <span class="nam">prefOut</span> <span class="op">=</span> <span class="nam">whitePrefix</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">markers</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t130" class="pln"><span class="strut"> </span></p> -<p id="t131" class="stm run hide_run"> <span class="nam">intext</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">getCode</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t132" class="stm run hide_run"> <span class="key">if</span> <span class="key">not</span> <span class="nam">intext</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t133" class="stm run hide_run"> <span class="key">return</span> <span class="str">''</span><span class="strut"> </span></p> -<p id="t134" class="pln"><span class="strut"> </span></p> -<p id="t135" class="pln"> <span class="com"># In Python 2.2, the last line has to end in a newline.</span><span class="strut"> </span></p> -<p id="t136" class="stm run hide_run"> <span class="nam">intext</span> <span class="op">=</span> <span class="str">"import cog\n"</span> <span class="op">+</span> <span class="nam">intext</span> <span class="op">+</span> <span class="str">"\n"</span><span class="strut"> </span></p> -<p id="t137" class="stm run hide_run"> <span class="nam">code</span> <span class="op">=</span> <span class="nam">compile</span><span class="op">(</span><span class="nam">intext</span><span class="op">,</span> <span class="nam">str</span><span class="op">(</span><span class="nam">fname</span><span class="op">)</span><span class="op">,</span> <span class="str">'exec'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t138" class="pln"><span class="strut"> </span></p> -<p id="t139" class="pln"> <span class="com"># Make sure the "cog" module has our state.</span><span class="strut"> </span></p> -<p id="t140" class="stm run hide_run"> <span class="nam">cog</span><span class="op">.</span><span class="nam">cogmodule</span><span class="op">.</span><span class="nam">msg</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">msg</span><span class="strut"> </span></p> -<p id="t141" class="stm run hide_run"> <span class="nam">cog</span><span class="op">.</span><span class="nam">cogmodule</span><span class="op">.</span><span class="nam">out</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">out</span><span class="strut"> </span></p> -<p id="t142" class="stm run hide_run"> <span class="nam">cog</span><span class="op">.</span><span class="nam">cogmodule</span><span class="op">.</span><span class="nam">outl</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">outl</span><span class="strut"> </span></p> -<p id="t143" class="stm run hide_run"> <span class="nam">cog</span><span class="op">.</span><span class="nam">cogmodule</span><span class="op">.</span><span class="nam">error</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">error</span><span class="strut"> </span></p> -<p id="t144" class="pln"><span class="strut"> </span></p> -<p id="t145" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">outstring</span> <span class="op">=</span> <span class="str">''</span><span class="strut"> </span></p> -<p id="t146" class="stm run hide_run"> <span class="nam">eval</span><span class="op">(</span><span class="nam">code</span><span class="op">,</span> <span class="nam">globals</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t147" class="pln"><span class="strut"> </span></p> -<p id="t148" class="pln"> <span class="com"># We need to make sure that the last line in the output</span><span class="strut"> </span></p> -<p id="t149" class="pln"> <span class="com"># ends with a newline, or it will be joined to the</span><span class="strut"> </span></p> -<p id="t150" class="pln"> <span class="com"># end-output line, ruining cog's idempotency.</span><span class="strut"> </span></p> -<p id="t151" class="stm run hide_run"> <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">outstring</span> <span class="key">and</span> <span class="nam">self</span><span class="op">.</span><span class="nam">outstring</span><span class="op">[</span><span class="op">-</span><span class="num">1</span><span class="op">]</span> <span class="op">!=</span> <span class="str">'\n'</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t152" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">outstring</span> <span class="op">+=</span> <span class="str">'\n'</span><span class="strut"> </span></p> -<p id="t153" class="pln"><span class="strut"> </span></p> -<p id="t154" class="stm run hide_run"> <span class="key">return</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">outstring</span><span class="op">,</span> <span class="nam">prefOut</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t155" class="pln"><span class="strut"> </span></p> -<p id="t156" class="stm run hide_run"> <span class="key">def</span> <span class="nam">msg</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">s</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t157" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">prout</span><span class="op">(</span><span class="str">"Message: "</span><span class="op">+</span><span class="nam">s</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t158" class="pln"><span class="strut"> </span></p> -<p id="t159" class="stm run hide_run"> <span class="key">def</span> <span class="nam">out</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">sOut</span><span class="op">=</span><span class="str">''</span><span class="op">,</span> <span class="nam">dedent</span><span class="op">=</span><span class="nam">False</span><span class="op">,</span> <span class="nam">trimblanklines</span><span class="op">=</span><span class="nam">False</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t160" class="pln"> <span class="str">""" The cog.out function.</span><span class="strut"> </span></p> -<p id="t161" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t162" class="stm run hide_run"> <span class="key">if</span> <span class="nam">trimblanklines</span> <span class="key">and</span> <span class="op">(</span><span class="str">'\n'</span> <span class="key">in</span> <span class="nam">sOut</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t163" class="stm run hide_run"> <span class="nam">lines</span> <span class="op">=</span> <span class="nam">sOut</span><span class="op">.</span><span class="nam">split</span><span class="op">(</span><span class="str">'\n'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t164" class="stm run hide_run"> <span class="key">if</span> <span class="nam">lines</span><span class="op">[</span><span class="num">0</span><span class="op">]</span><span class="op">.</span><span class="nam">strip</span><span class="op">(</span><span class="op">)</span> <span class="op">==</span> <span class="str">''</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t165" class="stm run hide_run"> <span class="key">del</span> <span class="nam">lines</span><span class="op">[</span><span class="num">0</span><span class="op">]</span><span class="strut"> </span></p> -<p id="t166" class="stm par run hide_run"><span class="annotate" title="Line 166 was executed, but never jumped to line 168">166 ↛ 168 [?]</span> <span class="key">if</span> <span class="nam">lines</span> <span class="key">and</span> <span class="nam">lines</span><span class="op">[</span><span class="op">-</span><span class="num">1</span><span class="op">]</span><span class="op">.</span><span class="nam">strip</span><span class="op">(</span><span class="op">)</span> <span class="op">==</span> <span class="str">''</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t167" class="stm run hide_run"> <span class="key">del</span> <span class="nam">lines</span><span class="op">[</span><span class="op">-</span><span class="num">1</span><span class="op">]</span><span class="strut"> </span></p> -<p id="t168" class="stm run hide_run"> <span class="nam">sOut</span> <span class="op">=</span> <span class="str">'\n'</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">lines</span><span class="op">)</span><span class="op">+</span><span class="str">'\n'</span><span class="strut"> </span></p> -<p id="t169" class="stm run hide_run"> <span class="key">if</span> <span class="nam">dedent</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t170" class="stm run hide_run"> <span class="nam">sOut</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">sOut</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t171" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">outstring</span> <span class="op">+=</span> <span class="nam">sOut</span><span class="strut"> </span></p> -<p id="t172" class="pln"><span class="strut"> </span></p> -<p id="t173" class="stm run hide_run"> <span class="key">def</span> <span class="nam">outl</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">sOut</span><span class="op">=</span><span class="str">''</span><span class="op">,</span> <span class="op">**</span><span class="nam">kw</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t174" class="pln"> <span class="str">""" The cog.outl function.</span><span class="strut"> </span></p> -<p id="t175" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t176" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">out</span><span class="op">(</span><span class="nam">sOut</span><span class="op">,</span> <span class="op">**</span><span class="nam">kw</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t177" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">out</span><span class="op">(</span><span class="str">'\n'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t178" class="pln"><span class="strut"> </span></p> -<p id="t179" class="stm run hide_run"> <span class="key">def</span> <span class="nam">error</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">msg</span><span class="op">=</span><span class="str">'Error raised by cog generator.'</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t180" class="pln"> <span class="str">""" The cog.error function.</span><span class="strut"> </span></p> -<p id="t181" class="pln"><span class="str"> Instead of raising standard python errors, cog generators can use</span><span class="strut"> </span></p> -<p id="t182" class="pln"><span class="str"> this function. It will display the error without a scary Python</span><span class="strut"> </span></p> -<p id="t183" class="pln"><span class="str"> traceback.</span><span class="strut"> </span></p> -<p id="t184" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t185" class="stm mis"> <span class="key">raise</span> <span class="nam">CogGeneratedError</span><span class="op">(</span><span class="nam">msg</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t186" class="pln"><span class="strut"> </span></p> +<p id="t100" class="pln"><span class="strut"> </span></p> +<p id="t101" class="stm run hide_run"><span class="key">class</span> <span class="nam">CogGenerator</span><span class="op">(</span><span class="nam">Redirectable</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t102" class="pln"> <span class="str">""" A generator pulled from a source file.</span><span class="strut"> </span></p> +<p id="t103" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t104" class="stm run hide_run"> <span class="key">def</span> <span class="nam">__init__</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t105" class="stm run hide_run"> <span class="nam">Redirectable</span><span class="op">.</span><span class="nam">__init__</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t106" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">markers</span> <span class="op">=</span> <span class="op">[</span><span class="op">]</span><span class="strut"> </span></p> +<p id="t107" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">lines</span> <span class="op">=</span> <span class="op">[</span><span class="op">]</span><span class="strut"> </span></p> +<p id="t108" class="pln"><span class="strut"> </span></p> +<p id="t109" class="stm run hide_run"> <span class="key">def</span> <span class="nam">parseMarker</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">l</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t110" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">markers</span><span class="op">.</span><span class="nam">append</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t111" class="pln"><span class="strut"> </span></p> +<p id="t112" class="stm run hide_run"> <span class="key">def</span> <span class="nam">parseLine</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">l</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t113" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">lines</span><span class="op">.</span><span class="nam">append</span><span class="op">(</span><span class="nam">l</span><span class="op">.</span><span class="nam">strip</span><span class="op">(</span><span class="str">'\n'</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t114" class="pln"><span class="strut"> </span></p> +<p id="t115" class="stm run hide_run"> <span class="key">def</span> <span class="nam">getCode</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t116" class="pln"> <span class="str">""" Extract the executable Python code from the generator.</span><span class="strut"> </span></p> +<p id="t117" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t118" class="pln"> <span class="com"># If the markers and lines all have the same prefix</span><span class="strut"> </span></p> +<p id="t119" class="pln"> <span class="com"># (end-of-line comment chars, for example),</span><span class="strut"> </span></p> +<p id="t120" class="pln"> <span class="com"># then remove it from all the lines.</span><span class="strut"> </span></p> +<p id="t121" class="stm run hide_run"> <span class="nam">prefIn</span> <span class="op">=</span> <span class="nam">commonPrefix</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">markers</span> <span class="op">+</span> <span class="nam">self</span><span class="op">.</span><span class="nam">lines</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t122" class="stm run hide_run"> <span class="key">if</span> <span class="nam">prefIn</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t123" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">markers</span> <span class="op">=</span> <span class="op">[</span> <span class="nam">l</span><span class="op">.</span><span class="nam">replace</span><span class="op">(</span><span class="nam">prefIn</span><span class="op">,</span> <span class="str">''</span><span class="op">,</span> <span class="num">1</span><span class="op">)</span> <span class="key">for</span> <span class="nam">l</span> <span class="key">in</span> <span class="nam">self</span><span class="op">.</span><span class="nam">markers</span> <span class="op">]</span><span class="strut"> </span></p> +<p id="t124" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">lines</span> <span class="op">=</span> <span class="op">[</span> <span class="nam">l</span><span class="op">.</span><span class="nam">replace</span><span class="op">(</span><span class="nam">prefIn</span><span class="op">,</span> <span class="str">''</span><span class="op">,</span> <span class="num">1</span><span class="op">)</span> <span class="key">for</span> <span class="nam">l</span> <span class="key">in</span> <span class="nam">self</span><span class="op">.</span><span class="nam">lines</span> <span class="op">]</span><span class="strut"> </span></p> +<p id="t125" class="pln"><span class="strut"> </span></p> +<p id="t126" class="stm run hide_run"> <span class="key">return</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">lines</span><span class="op">,</span> <span class="str">''</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t127" class="pln"><span class="strut"> </span></p> +<p id="t128" class="stm run hide_run"> <span class="key">def</span> <span class="nam">evaluate</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">cog</span><span class="op">,</span> <span class="nam">globals</span><span class="op">,</span> <span class="nam">fname</span><span class="op">=</span><span class="str">'cog generator'</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t129" class="pln"> <span class="com"># figure out the right whitespace prefix for the output</span><span class="strut"> </span></p> +<p id="t130" class="stm run hide_run"> <span class="nam">prefOut</span> <span class="op">=</span> <span class="nam">whitePrefix</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">markers</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t131" class="pln"><span class="strut"> </span></p> +<p id="t132" class="stm run hide_run"> <span class="nam">intext</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">getCode</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t133" class="stm run hide_run"> <span class="key">if</span> <span class="key">not</span> <span class="nam">intext</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t134" class="stm run hide_run"> <span class="key">return</span> <span class="str">''</span><span class="strut"> </span></p> +<p id="t135" class="pln"><span class="strut"> </span></p> +<p id="t136" class="pln"> <span class="com"># In Python 2.2, the last line has to end in a newline.</span><span class="strut"> </span></p> +<p id="t137" class="stm run hide_run"> <span class="nam">intext</span> <span class="op">=</span> <span class="str">"import cog\n"</span> <span class="op">+</span> <span class="nam">intext</span> <span class="op">+</span> <span class="str">"\n"</span><span class="strut"> </span></p> +<p id="t138" class="stm run hide_run"> <span class="nam">code</span> <span class="op">=</span> <span class="nam">compile</span><span class="op">(</span><span class="nam">intext</span><span class="op">,</span> <span class="nam">str</span><span class="op">(</span><span class="nam">fname</span><span class="op">)</span><span class="op">,</span> <span class="str">'exec'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t139" class="pln"><span class="strut"> </span></p> +<p id="t140" class="pln"> <span class="com"># Make sure the "cog" module has our state.</span><span class="strut"> </span></p> +<p id="t141" class="stm run hide_run"> <span class="nam">cog</span><span class="op">.</span><span class="nam">cogmodule</span><span class="op">.</span><span class="nam">msg</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">msg</span><span class="strut"> </span></p> +<p id="t142" class="stm run hide_run"> <span class="nam">cog</span><span class="op">.</span><span class="nam">cogmodule</span><span class="op">.</span><span class="nam">out</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">out</span><span class="strut"> </span></p> +<p id="t143" class="stm run hide_run"> <span class="nam">cog</span><span class="op">.</span><span class="nam">cogmodule</span><span class="op">.</span><span class="nam">outl</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">outl</span><span class="strut"> </span></p> +<p id="t144" class="stm run hide_run"> <span class="nam">cog</span><span class="op">.</span><span class="nam">cogmodule</span><span class="op">.</span><span class="nam">error</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">error</span><span class="strut"> </span></p> +<p id="t145" class="pln"><span class="strut"> </span></p> +<p id="t146" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">outstring</span> <span class="op">=</span> <span class="str">''</span><span class="strut"> </span></p> +<p id="t147" class="stm run hide_run"> <span class="nam">eval</span><span class="op">(</span><span class="nam">code</span><span class="op">,</span> <span class="nam">globals</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t148" class="pln"><span class="strut"> </span></p> +<p id="t149" class="pln"> <span class="com"># We need to make sure that the last line in the output</span><span class="strut"> </span></p> +<p id="t150" class="pln"> <span class="com"># ends with a newline, or it will be joined to the</span><span class="strut"> </span></p> +<p id="t151" class="pln"> <span class="com"># end-output line, ruining cog's idempotency.</span><span class="strut"> </span></p> +<p id="t152" class="stm run hide_run"> <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">outstring</span> <span class="key">and</span> <span class="nam">self</span><span class="op">.</span><span class="nam">outstring</span><span class="op">[</span><span class="op">-</span><span class="num">1</span><span class="op">]</span> <span class="op">!=</span> <span class="str">'\n'</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t153" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">outstring</span> <span class="op">+=</span> <span class="str">'\n'</span><span class="strut"> </span></p> +<p id="t154" class="pln"><span class="strut"> </span></p> +<p id="t155" class="stm run hide_run"> <span class="key">return</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">outstring</span><span class="op">,</span> <span class="nam">prefOut</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t156" class="pln"><span class="strut"> </span></p> +<p id="t157" class="stm run hide_run"> <span class="key">def</span> <span class="nam">msg</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">s</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t158" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">prout</span><span class="op">(</span><span class="str">"Message: "</span><span class="op">+</span><span class="nam">s</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t159" class="pln"><span class="strut"> </span></p> +<p id="t160" class="stm run hide_run"> <span class="key">def</span> <span class="nam">out</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">sOut</span><span class="op">=</span><span class="str">''</span><span class="op">,</span> <span class="nam">dedent</span><span class="op">=</span><span class="nam">False</span><span class="op">,</span> <span class="nam">trimblanklines</span><span class="op">=</span><span class="nam">False</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t161" class="pln"> <span class="str">""" The cog.out function.</span><span class="strut"> </span></p> +<p id="t162" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t163" class="stm run hide_run"> <span class="key">if</span> <span class="nam">trimblanklines</span> <span class="key">and</span> <span class="op">(</span><span class="str">'\n'</span> <span class="key">in</span> <span class="nam">sOut</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t164" class="stm run hide_run"> <span class="nam">lines</span> <span class="op">=</span> <span class="nam">sOut</span><span class="op">.</span><span class="nam">split</span><span class="op">(</span><span class="str">'\n'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t165" class="stm run hide_run"> <span class="key">if</span> <span class="nam">lines</span><span class="op">[</span><span class="num">0</span><span class="op">]</span><span class="op">.</span><span class="nam">strip</span><span class="op">(</span><span class="op">)</span> <span class="op">==</span> <span class="str">''</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t166" class="stm run hide_run"> <span class="key">del</span> <span class="nam">lines</span><span class="op">[</span><span class="num">0</span><span class="op">]</span><span class="strut"> </span></p> +<p id="t167" class="stm par run hide_run"><span class="annotate short">167 ↛ 169</span><span class="annotate long">line 167 didn't jump to line 169, because the condition on line 167 was never false</span> <span class="key">if</span> <span class="nam">lines</span> <span class="key">and</span> <span class="nam">lines</span><span class="op">[</span><span class="op">-</span><span class="num">1</span><span class="op">]</span><span class="op">.</span><span class="nam">strip</span><span class="op">(</span><span class="op">)</span> <span class="op">==</span> <span class="str">''</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t168" class="stm run hide_run"> <span class="key">del</span> <span class="nam">lines</span><span class="op">[</span><span class="op">-</span><span class="num">1</span><span class="op">]</span><span class="strut"> </span></p> +<p id="t169" class="stm run hide_run"> <span class="nam">sOut</span> <span class="op">=</span> <span class="str">'\n'</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">lines</span><span class="op">)</span><span class="op">+</span><span class="str">'\n'</span><span class="strut"> </span></p> +<p id="t170" class="stm run hide_run"> <span class="key">if</span> <span class="nam">dedent</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t171" class="stm run hide_run"> <span class="nam">sOut</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">sOut</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t172" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">outstring</span> <span class="op">+=</span> <span class="nam">sOut</span><span class="strut"> </span></p> +<p id="t173" class="pln"><span class="strut"> </span></p> +<p id="t174" class="stm run hide_run"> <span class="key">def</span> <span class="nam">outl</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">sOut</span><span class="op">=</span><span class="str">''</span><span class="op">,</span> <span class="op">**</span><span class="nam">kw</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t175" class="pln"> <span class="str">""" The cog.outl function.</span><span class="strut"> </span></p> +<p id="t176" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t177" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">out</span><span class="op">(</span><span class="nam">sOut</span><span class="op">,</span> <span class="op">**</span><span class="nam">kw</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t178" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">out</span><span class="op">(</span><span class="str">'\n'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t179" class="pln"><span class="strut"> </span></p> +<p id="t180" class="stm run hide_run"> <span class="key">def</span> <span class="nam">error</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">msg</span><span class="op">=</span><span class="str">'Error raised by cog generator.'</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t181" class="pln"> <span class="str">""" The cog.error function.</span><span class="strut"> </span></p> +<p id="t182" class="pln"><span class="str"> Instead of raising standard python errors, cog generators can use</span><span class="strut"> </span></p> +<p id="t183" class="pln"><span class="str"> this function. It will display the error without a scary Python</span><span class="strut"> </span></p> +<p id="t184" class="pln"><span class="str"> traceback.</span><span class="strut"> </span></p> +<p id="t185" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t186" class="stm run hide_run"> <span class="key">raise</span> <span class="nam">CogGeneratedError</span><span class="op">(</span><span class="nam">msg</span><span class="op">)</span><span class="strut"> </span></p> <p id="t187" class="pln"><span class="strut"> </span></p> -<p id="t188" class="stm run hide_run"><span class="key">class</span> <span class="nam">NumberedFileReader</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t189" class="pln"> <span class="str">""" A decorator for files that counts the readline()'s called.</span><span class="strut"> </span></p> -<p id="t190" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t191" class="stm run hide_run"> <span class="key">def</span> <span class="nam">__init__</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">f</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t192" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">f</span> <span class="op">=</span> <span class="nam">f</span><span class="strut"> </span></p> -<p id="t193" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">n</span> <span class="op">=</span> <span class="num">0</span><span class="strut"> </span></p> -<p id="t194" class="pln"><span class="strut"> </span></p> -<p id="t195" class="stm run hide_run"> <span class="key">def</span> <span class="nam">readline</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t196" class="stm run hide_run"> <span class="nam">l</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">f</span><span class="op">.</span><span class="nam">readline</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t197" class="stm run hide_run"> <span class="key">if</span> <span class="nam">l</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t198" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">n</span> <span class="op">+=</span> <span class="num">1</span><span class="strut"> </span></p> -<p id="t199" class="stm run hide_run"> <span class="key">return</span> <span class="nam">l</span><span class="strut"> </span></p> -<p id="t200" class="pln"><span class="strut"> </span></p> -<p id="t201" class="stm run hide_run"> <span class="key">def</span> <span class="nam">linenumber</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t202" class="stm run hide_run"> <span class="key">return</span> <span class="nam">self</span><span class="op">.</span><span class="nam">n</span><span class="strut"> </span></p> -<p id="t203" class="pln"><span class="strut"> </span></p> +<p id="t188" class="pln"><span class="strut"> </span></p> +<p id="t189" class="stm run hide_run"><span class="key">class</span> <span class="nam">NumberedFileReader</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t190" class="pln"> <span class="str">""" A decorator for files that counts the readline()'s called.</span><span class="strut"> </span></p> +<p id="t191" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t192" class="stm run hide_run"> <span class="key">def</span> <span class="nam">__init__</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">f</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t193" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">f</span> <span class="op">=</span> <span class="nam">f</span><span class="strut"> </span></p> +<p id="t194" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">n</span> <span class="op">=</span> <span class="num">0</span><span class="strut"> </span></p> +<p id="t195" class="pln"><span class="strut"> </span></p> +<p id="t196" class="stm run hide_run"> <span class="key">def</span> <span class="nam">readline</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t197" class="stm run hide_run"> <span class="nam">l</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">f</span><span class="op">.</span><span class="nam">readline</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t198" class="stm run hide_run"> <span class="key">if</span> <span class="nam">l</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t199" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">n</span> <span class="op">+=</span> <span class="num">1</span><span class="strut"> </span></p> +<p id="t200" class="stm run hide_run"> <span class="key">return</span> <span class="nam">l</span><span class="strut"> </span></p> +<p id="t201" class="pln"><span class="strut"> </span></p> +<p id="t202" class="stm run hide_run"> <span class="key">def</span> <span class="nam">linenumber</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t203" class="stm run hide_run"> <span class="key">return</span> <span class="nam">self</span><span class="op">.</span><span class="nam">n</span><span class="strut"> </span></p> <p id="t204" class="pln"><span class="strut"> </span></p> -<p id="t205" class="stm run hide_run"><span class="key">class</span> <span class="nam">CogOptions</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t206" class="pln"> <span class="str">""" Options for a run of cog.</span><span class="strut"> </span></p> -<p id="t207" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t208" class="stm run hide_run"> <span class="key">def</span> <span class="nam">__init__</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t209" class="pln"> <span class="com"># Defaults for argument values.</span><span class="strut"> </span></p> -<p id="t210" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">args</span> <span class="op">=</span> <span class="op">[</span><span class="op">]</span><span class="strut"> </span></p> -<p id="t211" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">includePath</span> <span class="op">=</span> <span class="op">[</span><span class="op">]</span><span class="strut"> </span></p> -<p id="t212" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">defines</span> <span class="op">=</span> <span class="op">{</span><span class="op">}</span><span class="strut"> </span></p> -<p id="t213" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">bShowVersion</span> <span class="op">=</span> <span class="nam">False</span><span class="strut"> </span></p> -<p id="t214" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">sMakeWritableCmd</span> <span class="op">=</span> <span class="nam">None</span><span class="strut"> </span></p> -<p id="t215" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">bReplace</span> <span class="op">=</span> <span class="nam">False</span><span class="strut"> </span></p> -<p id="t216" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">bNoGenerate</span> <span class="op">=</span> <span class="nam">False</span><span class="strut"> </span></p> -<p id="t217" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">sOutputName</span> <span class="op">=</span> <span class="nam">None</span><span class="strut"> </span></p> -<p id="t218" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">bWarnEmpty</span> <span class="op">=</span> <span class="nam">False</span><span class="strut"> </span></p> -<p id="t219" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">bHashOutput</span> <span class="op">=</span> <span class="nam">False</span><span class="strut"> </span></p> -<p id="t220" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">bDeleteCode</span> <span class="op">=</span> <span class="nam">False</span><span class="strut"> </span></p> -<p id="t221" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">bEofCanBeEnd</span> <span class="op">=</span> <span class="nam">False</span><span class="strut"> </span></p> -<p id="t222" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">sSuffix</span> <span class="op">=</span> <span class="nam">None</span><span class="strut"> </span></p> -<p id="t223" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">bNewlines</span> <span class="op">=</span> <span class="nam">False</span><span class="strut"> </span></p> -<p id="t224" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">sBeginSpec</span> <span class="op">=</span> <span class="str">'[[[cog'</span><span class="strut"> </span></p> -<p id="t225" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">sEndSpec</span> <span class="op">=</span> <span class="str">']]]'</span><span class="strut"> </span></p> -<p id="t226" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">sEndOutput</span> <span class="op">=</span> <span class="str">'[[[end]]]'</span><span class="strut"> </span></p> -<p id="t227" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">sEncoding</span> <span class="op">=</span> <span class="str">"utf-8"</span><span class="strut"> </span></p> -<p id="t228" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">verbosity</span> <span class="op">=</span> <span class="num">2</span><span class="strut"> </span></p> -<p id="t229" class="pln"><span class="strut"> </span></p> -<p id="t230" class="stm run hide_run"> <span class="key">def</span> <span class="nam">__eq__</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">other</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t231" class="pln"> <span class="str">""" Comparison operator for tests to use.</span><span class="strut"> </span></p> -<p id="t232" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t233" class="stm mis"> <span class="key">return</span> <span class="nam">self</span><span class="op">.</span><span class="nam">__dict__</span> <span class="op">==</span> <span class="nam">other</span><span class="op">.</span><span class="nam">__dict__</span><span class="strut"> </span></p> -<p id="t234" class="pln"><span class="strut"> </span></p> -<p id="t235" class="stm run hide_run"> <span class="key">def</span> <span class="nam">clone</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t236" class="pln"> <span class="str">""" Make a clone of these options, for further refinement.</span><span class="strut"> </span></p> -<p id="t237" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t238" class="stm mis"> <span class="key">return</span> <span class="nam">copy</span><span class="op">.</span><span class="nam">deepcopy</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t239" class="pln"><span class="strut"> </span></p> -<p id="t240" class="stm run hide_run"> <span class="key">def</span> <span class="nam">addToIncludePath</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">dirs</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t241" class="pln"> <span class="str">""" Add directories to the include path.</span><span class="strut"> </span></p> -<p id="t242" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t243" class="stm mis"> <span class="nam">dirs</span> <span class="op">=</span> <span class="nam">dirs</span><span class="op">.</span><span class="nam">split</span><span class="op">(</span><span class="nam">os</span><span class="op">.</span><span class="nam">pathsep</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t244" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">includePath</span><span class="op">.</span><span class="nam">extend</span><span class="op">(</span><span class="nam">dirs</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t245" class="pln"><span class="strut"> </span></p> -<p id="t246" class="stm run hide_run"> <span class="key">def</span> <span class="nam">parseArgs</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">argv</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t247" class="pln"> <span class="com"># Parse the command line arguments.</span><span class="strut"> </span></p> -<p id="t248" class="stm mis"> <span class="key">try</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t249" class="stm mis"> <span class="nam">opts</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">args</span> <span class="op">=</span> <span class="nam">getopt</span><span class="op">.</span><span class="nam">getopt</span><span class="op">(</span><span class="strut"> </span></p> -<p id="t250" class="pln"> <span class="nam">argv</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t251" class="pln"> <span class="str">'cdD:eI:n:o:rs:Uvw:xz'</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t252" class="pln"> <span class="op">[</span><span class="strut"> </span></p> -<p id="t253" class="pln"> <span class="str">'markers='</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t254" class="pln"> <span class="str">'verbosity='</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t255" class="pln"> <span class="op">]</span><span class="strut"> </span></p> -<p id="t256" class="pln"> <span class="op">)</span><span class="strut"> </span></p> -<p id="t257" class="stm mis"> <span class="key">except</span> <span class="nam">getopt</span><span class="op">.</span><span class="nam">error</span> <span class="key">as</span> <span class="nam">msg</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t258" class="stm mis"> <span class="key">raise</span> <span class="nam">CogUsageError</span><span class="op">(</span><span class="nam">msg</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t259" class="pln"><span class="strut"> </span></p> -<p id="t260" class="pln"> <span class="com"># Handle the command line arguments.</span><span class="strut"> </span></p> -<p id="t261" class="stm mis"> <span class="key">for</span> <span class="nam">o</span><span class="op">,</span> <span class="nam">a</span> <span class="key">in</span> <span class="nam">opts</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t262" class="stm mis"> <span class="key">if</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">'-c'</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t263" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">bHashOutput</span> <span class="op">=</span> <span class="nam">True</span><span class="strut"> </span></p> -<p id="t264" class="stm mis"> <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">'-d'</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t265" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">bDeleteCode</span> <span class="op">=</span> <span class="nam">True</span><span class="strut"> </span></p> -<p id="t266" class="stm mis"> <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">'-D'</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t267" class="stm mis"> <span class="key">if</span> <span class="nam">a</span><span class="op">.</span><span class="nam">count</span><span class="op">(</span><span class="str">'='</span><span class="op">)</span> <span class="op"><</span> <span class="num">1</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t268" class="stm mis"> <span class="key">raise</span> <span class="nam">CogUsageError</span><span class="op">(</span><span class="str">"-D takes a name=value argument"</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t269" class="stm mis"> <span class="nam">name</span><span class="op">,</span> <span class="nam">value</span> <span class="op">=</span> <span class="nam">a</span><span class="op">.</span><span class="nam">split</span><span class="op">(</span><span class="str">'='</span><span class="op">,</span> <span class="num">1</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t270" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">defines</span><span class="op">[</span><span class="nam">name</span><span class="op">]</span> <span class="op">=</span> <span class="nam">value</span><span class="strut"> </span></p> -<p id="t271" class="stm mis"> <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">'-e'</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t272" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">bWarnEmpty</span> <span class="op">=</span> <span class="nam">True</span><span class="strut"> </span></p> -<p id="t273" class="stm mis"> <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">'-I'</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t274" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">addToIncludePath</span><span class="op">(</span><span class="nam">a</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t275" class="stm mis"> <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">'-n'</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t276" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">sEncoding</span> <span class="op">=</span> <span class="nam">a</span><span class="strut"> </span></p> -<p id="t277" class="stm mis"> <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">'-o'</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t278" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">sOutputName</span> <span class="op">=</span> <span class="nam">a</span><span class="strut"> </span></p> -<p id="t279" class="stm mis"> <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">'-r'</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t280" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">bReplace</span> <span class="op">=</span> <span class="nam">True</span><span class="strut"> </span></p> -<p id="t281" class="stm mis"> <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">'-s'</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t282" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">sSuffix</span> <span class="op">=</span> <span class="nam">a</span><span class="strut"> </span></p> -<p id="t283" class="stm mis"> <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">'-U'</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t284" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">bNewlines</span> <span class="op">=</span> <span class="nam">True</span><span class="strut"> </span></p> -<p id="t285" class="stm mis"> <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">'-v'</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t286" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">bShowVersion</span> <span class="op">=</span> <span class="nam">True</span><span class="strut"> </span></p> -<p id="t287" class="stm mis"> <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">'-w'</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t288" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">sMakeWritableCmd</span> <span class="op">=</span> <span class="nam">a</span><span class="strut"> </span></p> -<p id="t289" class="stm mis"> <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">'-x'</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t290" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">bNoGenerate</span> <span class="op">=</span> <span class="nam">True</span><span class="strut"> </span></p> -<p id="t291" class="stm mis"> <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">'-z'</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t292" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">bEofCanBeEnd</span> <span class="op">=</span> <span class="nam">True</span><span class="strut"> </span></p> -<p id="t293" class="stm mis"> <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">'--markers'</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t294" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">_parse_markers</span><span class="op">(</span><span class="nam">a</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t295" class="stm mis"> <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">'--verbosity'</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t296" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">verbosity</span> <span class="op">=</span> <span class="nam">int</span><span class="op">(</span><span class="nam">a</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t297" class="pln"> <span class="key">else</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t298" class="pln"> <span class="com"># Since getopt.getopt is given a list of possible flags,</span><span class="strut"> </span></p> -<p id="t299" class="pln"> <span class="com"># this is an internal error.</span><span class="strut"> </span></p> -<p id="t300" class="exc"> <span class="key">raise</span> <span class="nam">CogInternalError</span><span class="op">(</span><span class="str">"Don't understand argument %s"</span> <span class="op">%</span> <span class="nam">o</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t301" class="pln"><span class="strut"> </span></p> -<p id="t302" class="stm run hide_run"> <span class="key">def</span> <span class="nam">_parse_markers</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">val</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t303" class="stm mis"> <span class="key">try</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t304" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">sBeginSpec</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">sEndSpec</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">sEndOutput</span> <span class="op">=</span> <span class="nam">val</span><span class="op">.</span><span class="nam">split</span><span class="op">(</span><span class="str">' '</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t305" class="stm mis"> <span class="key">except</span> <span class="nam">ValueError</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t306" class="stm mis"> <span class="key">raise</span> <span class="nam">CogUsageError</span><span class="op">(</span><span class="strut"> </span></p> -<p id="t307" class="pln"> <span class="str">'--markers requires 3 values separated by spaces, could not parse %r'</span> <span class="op">%</span> <span class="nam">val</span><span class="strut"> </span></p> -<p id="t308" class="pln"> <span class="op">)</span><span class="strut"> </span></p> -<p id="t309" class="pln"><span class="strut"> </span></p> -<p id="t310" class="stm run hide_run"> <span class="key">def</span> <span class="nam">validate</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t311" class="pln"> <span class="str">""" Does nothing if everything is OK, raises CogError's if it's not.</span><span class="strut"> </span></p> -<p id="t312" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t313" class="stm mis"> <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">bReplace</span> <span class="key">and</span> <span class="nam">self</span><span class="op">.</span><span class="nam">bDeleteCode</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t314" class="stm mis"> <span class="key">raise</span> <span class="nam">CogUsageError</span><span class="op">(</span><span class="str">"Can't use -d with -r (or you would delete all your source!)"</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t315" class="pln"><span class="strut"> </span></p> -<p id="t316" class="stm mis"> <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">bReplace</span> <span class="key">and</span> <span class="nam">self</span><span class="op">.</span><span class="nam">sOutputName</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t317" class="stm mis"> <span class="key">raise</span> <span class="nam">CogUsageError</span><span class="op">(</span><span class="str">"Can't use -o with -r (they are opposites)"</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t318" class="pln"><span class="strut"> </span></p> +<p id="t205" class="pln"><span class="strut"> </span></p> +<p id="t206" class="stm run hide_run"><span class="key">class</span> <span class="nam">CogOptions</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t207" class="pln"> <span class="str">""" Options for a run of cog.</span><span class="strut"> </span></p> +<p id="t208" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t209" class="stm run hide_run"> <span class="key">def</span> <span class="nam">__init__</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t210" class="pln"> <span class="com"># Defaults for argument values.</span><span class="strut"> </span></p> +<p id="t211" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">args</span> <span class="op">=</span> <span class="op">[</span><span class="op">]</span><span class="strut"> </span></p> +<p id="t212" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">includePath</span> <span class="op">=</span> <span class="op">[</span><span class="op">]</span><span class="strut"> </span></p> +<p id="t213" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">defines</span> <span class="op">=</span> <span class="op">{</span><span class="op">}</span><span class="strut"> </span></p> +<p id="t214" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">bShowVersion</span> <span class="op">=</span> <span class="nam">False</span><span class="strut"> </span></p> +<p id="t215" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">sMakeWritableCmd</span> <span class="op">=</span> <span class="nam">None</span><span class="strut"> </span></p> +<p id="t216" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">bReplace</span> <span class="op">=</span> <span class="nam">False</span><span class="strut"> </span></p> +<p id="t217" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">bNoGenerate</span> <span class="op">=</span> <span class="nam">False</span><span class="strut"> </span></p> +<p id="t218" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">sOutputName</span> <span class="op">=</span> <span class="nam">None</span><span class="strut"> </span></p> +<p id="t219" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">bWarnEmpty</span> <span class="op">=</span> <span class="nam">False</span><span class="strut"> </span></p> +<p id="t220" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">bHashOutput</span> <span class="op">=</span> <span class="nam">False</span><span class="strut"> </span></p> +<p id="t221" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">bDeleteCode</span> <span class="op">=</span> <span class="nam">False</span><span class="strut"> </span></p> +<p id="t222" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">bEofCanBeEnd</span> <span class="op">=</span> <span class="nam">False</span><span class="strut"> </span></p> +<p id="t223" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">sSuffix</span> <span class="op">=</span> <span class="nam">None</span><span class="strut"> </span></p> +<p id="t224" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">bNewlines</span> <span class="op">=</span> <span class="nam">False</span><span class="strut"> </span></p> +<p id="t225" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">sBeginSpec</span> <span class="op">=</span> <span class="str">'[[[cog'</span><span class="strut"> </span></p> +<p id="t226" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">sEndSpec</span> <span class="op">=</span> <span class="str">']]]'</span><span class="strut"> </span></p> +<p id="t227" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">sEndOutput</span> <span class="op">=</span> <span class="str">'[[[end]]]'</span><span class="strut"> </span></p> +<p id="t228" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">sEncoding</span> <span class="op">=</span> <span class="str">"utf-8"</span><span class="strut"> </span></p> +<p id="t229" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">verbosity</span> <span class="op">=</span> <span class="num">2</span><span class="strut"> </span></p> +<p id="t230" class="pln"><span class="strut"> </span></p> +<p id="t231" class="stm run hide_run"> <span class="key">def</span> <span class="nam">__eq__</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">other</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t232" class="pln"> <span class="str">""" Comparison operator for tests to use.</span><span class="strut"> </span></p> +<p id="t233" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t234" class="stm run hide_run"> <span class="key">return</span> <span class="nam">self</span><span class="op">.</span><span class="nam">__dict__</span> <span class="op">==</span> <span class="nam">other</span><span class="op">.</span><span class="nam">__dict__</span><span class="strut"> </span></p> +<p id="t235" class="pln"><span class="strut"> </span></p> +<p id="t236" class="stm run hide_run"> <span class="key">def</span> <span class="nam">clone</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t237" class="pln"> <span class="str">""" Make a clone of these options, for further refinement.</span><span class="strut"> </span></p> +<p id="t238" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t239" class="stm run hide_run"> <span class="key">return</span> <span class="nam">copy</span><span class="op">.</span><span class="nam">deepcopy</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t240" class="pln"><span class="strut"> </span></p> +<p id="t241" class="stm run hide_run"> <span class="key">def</span> <span class="nam">addToIncludePath</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">dirs</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t242" class="pln"> <span class="str">""" Add directories to the include path.</span><span class="strut"> </span></p> +<p id="t243" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t244" class="stm run hide_run"> <span class="nam">dirs</span> <span class="op">=</span> <span class="nam">dirs</span><span class="op">.</span><span class="nam">split</span><span class="op">(</span><span class="nam">os</span><span class="op">.</span><span class="nam">pathsep</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t245" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">includePath</span><span class="op">.</span><span class="nam">extend</span><span class="op">(</span><span class="nam">dirs</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t246" class="pln"><span class="strut"> </span></p> +<p id="t247" class="stm run hide_run"> <span class="key">def</span> <span class="nam">parseArgs</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">argv</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t248" class="pln"> <span class="com"># Parse the command line arguments.</span><span class="strut"> </span></p> +<p id="t249" class="stm run hide_run"> <span class="key">try</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t250" class="stm run hide_run"> <span class="nam">opts</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">args</span> <span class="op">=</span> <span class="nam">getopt</span><span class="op">.</span><span class="nam">getopt</span><span class="op">(</span><span class="strut"> </span></p> +<p id="t251" class="pln"> <span class="nam">argv</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t252" class="pln"> <span class="str">'cdD:eI:n:o:rs:Uvw:xz'</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t253" class="pln"> <span class="op">[</span><span class="strut"> </span></p> +<p id="t254" class="pln"> <span class="str">'markers='</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t255" class="pln"> <span class="str">'verbosity='</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t256" class="pln"> <span class="op">]</span><span class="strut"> </span></p> +<p id="t257" class="pln"> <span class="op">)</span><span class="strut"> </span></p> +<p id="t258" class="stm run hide_run"> <span class="key">except</span> <span class="nam">getopt</span><span class="op">.</span><span class="nam">error</span> <span class="key">as</span> <span class="nam">msg</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t259" class="stm run hide_run"> <span class="key">raise</span> <span class="nam">CogUsageError</span><span class="op">(</span><span class="nam">msg</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t260" class="pln"><span class="strut"> </span></p> +<p id="t261" class="pln"> <span class="com"># Handle the command line arguments.</span><span class="strut"> </span></p> +<p id="t262" class="stm run hide_run"> <span class="key">for</span> <span class="nam">o</span><span class="op">,</span> <span class="nam">a</span> <span class="key">in</span> <span class="nam">opts</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t263" class="stm run hide_run"> <span class="key">if</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">'-c'</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t264" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">bHashOutput</span> <span class="op">=</span> <span class="nam">True</span><span class="strut"> </span></p> +<p id="t265" class="stm run hide_run"> <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">'-d'</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t266" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">bDeleteCode</span> <span class="op">=</span> <span class="nam">True</span><span class="strut"> </span></p> +<p id="t267" class="stm run hide_run"> <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">'-D'</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t268" class="stm run hide_run"> <span class="key">if</span> <span class="nam">a</span><span class="op">.</span><span class="nam">count</span><span class="op">(</span><span class="str">'='</span><span class="op">)</span> <span class="op"><</span> <span class="num">1</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t269" class="stm run hide_run"> <span class="key">raise</span> <span class="nam">CogUsageError</span><span class="op">(</span><span class="str">"-D takes a name=value argument"</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t270" class="stm run hide_run"> <span class="nam">name</span><span class="op">,</span> <span class="nam">value</span> <span class="op">=</span> <span class="nam">a</span><span class="op">.</span><span class="nam">split</span><span class="op">(</span><span class="str">'='</span><span class="op">,</span> <span class="num">1</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t271" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">defines</span><span class="op">[</span><span class="nam">name</span><span class="op">]</span> <span class="op">=</span> <span class="nam">value</span><span class="strut"> </span></p> +<p id="t272" class="stm run hide_run"> <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">'-e'</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t273" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">bWarnEmpty</span> <span class="op">=</span> <span class="nam">True</span><span class="strut"> </span></p> +<p id="t274" class="stm run hide_run"> <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">'-I'</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t275" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">addToIncludePath</span><span class="op">(</span><span class="nam">a</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t276" class="stm run hide_run"> <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">'-n'</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t277" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">sEncoding</span> <span class="op">=</span> <span class="nam">a</span><span class="strut"> </span></p> +<p id="t278" class="stm run hide_run"> <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">'-o'</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t279" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">sOutputName</span> <span class="op">=</span> <span class="nam">a</span><span class="strut"> </span></p> +<p id="t280" class="stm run hide_run"> <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">'-r'</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t281" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">bReplace</span> <span class="op">=</span> <span class="nam">True</span><span class="strut"> </span></p> +<p id="t282" class="stm run hide_run"> <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">'-s'</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t283" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">sSuffix</span> <span class="op">=</span> <span class="nam">a</span><span class="strut"> </span></p> +<p id="t284" class="stm run hide_run"> <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">'-U'</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t285" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">bNewlines</span> <span class="op">=</span> <span class="nam">True</span><span class="strut"> </span></p> +<p id="t286" class="stm run hide_run"> <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">'-v'</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t287" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">bShowVersion</span> <span class="op">=</span> <span class="nam">True</span><span class="strut"> </span></p> +<p id="t288" class="stm run hide_run"> <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">'-w'</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t289" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">sMakeWritableCmd</span> <span class="op">=</span> <span class="nam">a</span><span class="strut"> </span></p> +<p id="t290" class="stm run hide_run"> <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">'-x'</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t291" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">bNoGenerate</span> <span class="op">=</span> <span class="nam">True</span><span class="strut"> </span></p> +<p id="t292" class="stm run hide_run"> <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">'-z'</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t293" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">bEofCanBeEnd</span> <span class="op">=</span> <span class="nam">True</span><span class="strut"> </span></p> +<p id="t294" class="stm run hide_run"> <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">'--markers'</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t295" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">_parse_markers</span><span class="op">(</span><span class="nam">a</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t296" class="stm run hide_run"> <span class="key">elif</span> <span class="nam">o</span> <span class="op">==</span> <span class="str">'--verbosity'</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t297" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">verbosity</span> <span class="op">=</span> <span class="nam">int</span><span class="op">(</span><span class="nam">a</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t298" class="pln"> <span class="key">else</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t299" class="pln"> <span class="com"># Since getopt.getopt is given a list of possible flags,</span><span class="strut"> </span></p> +<p id="t300" class="pln"> <span class="com"># this is an internal error.</span><span class="strut"> </span></p> +<p id="t301" class="exc"> <span class="key">raise</span> <span class="nam">CogInternalError</span><span class="op">(</span><span class="str">"Don't understand argument %s"</span> <span class="op">%</span> <span class="nam">o</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t302" class="pln"><span class="strut"> </span></p> +<p id="t303" class="stm run hide_run"> <span class="key">def</span> <span class="nam">_parse_markers</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">val</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t304" class="stm run hide_run"> <span class="key">try</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t305" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">sBeginSpec</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">sEndSpec</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">sEndOutput</span> <span class="op">=</span> <span class="nam">val</span><span class="op">.</span><span class="nam">split</span><span class="op">(</span><span class="str">' '</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t306" class="stm run hide_run"> <span class="key">except</span> <span class="nam">ValueError</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t307" class="stm run hide_run"> <span class="key">raise</span> <span class="nam">CogUsageError</span><span class="op">(</span><span class="strut"> </span></p> +<p id="t308" class="pln"> <span class="str">'--markers requires 3 values separated by spaces, could not parse %r'</span> <span class="op">%</span> <span class="nam">val</span><span class="strut"> </span></p> +<p id="t309" class="pln"> <span class="op">)</span><span class="strut"> </span></p> +<p id="t310" class="pln"><span class="strut"> </span></p> +<p id="t311" class="stm run hide_run"> <span class="key">def</span> <span class="nam">validate</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t312" class="pln"> <span class="str">""" Does nothing if everything is OK, raises CogError's if it's not.</span><span class="strut"> </span></p> +<p id="t313" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t314" class="stm run hide_run"> <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">bReplace</span> <span class="key">and</span> <span class="nam">self</span><span class="op">.</span><span class="nam">bDeleteCode</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t315" class="stm run hide_run"> <span class="key">raise</span> <span class="nam">CogUsageError</span><span class="op">(</span><span class="str">"Can't use -d with -r (or you would delete all your source!)"</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t316" class="pln"><span class="strut"> </span></p> +<p id="t317" class="stm run hide_run"> <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">bReplace</span> <span class="key">and</span> <span class="nam">self</span><span class="op">.</span><span class="nam">sOutputName</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t318" class="stm run hide_run"> <span class="key">raise</span> <span class="nam">CogUsageError</span><span class="op">(</span><span class="str">"Can't use -o with -r (they are opposites)"</span><span class="op">)</span><span class="strut"> </span></p> <p id="t319" class="pln"><span class="strut"> </span></p> -<p id="t320" class="stm run hide_run"><span class="key">class</span> <span class="nam">Cog</span><span class="op">(</span><span class="nam">Redirectable</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t321" class="pln"> <span class="str">""" The Cog engine.</span><span class="strut"> </span></p> -<p id="t322" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t323" class="stm run hide_run"> <span class="key">def</span> <span class="nam">__init__</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t324" class="stm run hide_run"> <span class="nam">Redirectable</span><span class="op">.</span><span class="nam">__init__</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t325" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span> <span class="op">=</span> <span class="nam">CogOptions</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t326" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">_fixEndOutputPatterns</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t327" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">installCogModule</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t328" class="pln"><span class="strut"> </span></p> -<p id="t329" class="stm run hide_run"> <span class="key">def</span> <span class="nam">_fixEndOutputPatterns</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t330" class="stm run hide_run"> <span class="nam">end_output</span> <span class="op">=</span> <span class="nam">re</span><span class="op">.</span><span class="nam">escape</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sEndOutput</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t331" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">reEndOutput</span> <span class="op">=</span> <span class="nam">re</span><span class="op">.</span><span class="nam">compile</span><span class="op">(</span><span class="nam">end_output</span> <span class="op">+</span> <span class="str">r'(?P<hashsect> *\(checksum: (?P<hash>[a-f0-9]+)\))'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t332" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">sEndFormat</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sEndOutput</span> <span class="op">+</span> <span class="str">' (checksum: %s)'</span><span class="strut"> </span></p> -<p id="t333" class="pln"><span class="strut"> </span></p> -<p id="t334" class="stm run hide_run"> <span class="key">def</span> <span class="nam">showWarning</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">msg</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t335" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">prout</span><span class="op">(</span><span class="str">"Warning: "</span><span class="op">+</span><span class="nam">msg</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t336" class="pln"><span class="strut"> </span></p> -<p id="t337" class="stm run hide_run"> <span class="key">def</span> <span class="nam">isBeginSpecLine</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">s</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t338" class="stm run hide_run"> <span class="key">return</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sBeginSpec</span> <span class="key">in</span> <span class="nam">s</span><span class="strut"> </span></p> -<p id="t339" class="pln"><span class="strut"> </span></p> -<p id="t340" class="stm run hide_run"> <span class="key">def</span> <span class="nam">isEndSpecLine</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">s</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t341" class="stm run hide_run"> <span class="key">return</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sEndSpec</span> <span class="key">in</span> <span class="nam">s</span> <span class="key">and</span> <span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">isEndOutputLine</span><span class="op">(</span><span class="nam">s</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t342" class="pln"><span class="strut"> </span></p> -<p id="t343" class="stm run hide_run"> <span class="key">def</span> <span class="nam">isEndOutputLine</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">s</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t344" class="stm run hide_run"> <span class="key">return</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sEndOutput</span> <span class="key">in</span> <span class="nam">s</span><span class="strut"> </span></p> -<p id="t345" class="pln"><span class="strut"> </span></p> -<p id="t346" class="stm run hide_run"> <span class="key">def</span> <span class="nam">installCogModule</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t347" class="pln"> <span class="str">""" Magic mumbo-jumbo so that imported Python modules</span><span class="strut"> </span></p> -<p id="t348" class="pln"><span class="str"> can say "import cog" and get our state.</span><span class="strut"> </span></p> -<p id="t349" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t350" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cogmodule</span> <span class="op">=</span> <span class="nam">imp</span><span class="op">.</span><span class="nam">new_module</span><span class="op">(</span><span class="str">'cog'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t351" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cogmodule</span><span class="op">.</span><span class="nam">path</span> <span class="op">=</span> <span class="op">[</span><span class="op">]</span><span class="strut"> </span></p> -<p id="t352" class="stm run hide_run"> <span class="nam">sys</span><span class="op">.</span><span class="nam">modules</span><span class="op">[</span><span class="str">'cog'</span><span class="op">]</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">cogmodule</span><span class="strut"> </span></p> -<p id="t353" class="pln"><span class="strut"> </span></p> -<p id="t354" class="stm run hide_run"> <span class="key">def</span> <span class="nam">openOutputFile</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">fname</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t355" class="pln"> <span class="str">""" Open an output file, taking all the details into account.</span><span class="strut"> </span></p> -<p id="t356" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t357" class="stm mis"> <span class="nam">opts</span> <span class="op">=</span> <span class="op">{</span><span class="op">}</span><span class="strut"> </span></p> -<p id="t358" class="stm mis"> <span class="nam">mode</span> <span class="op">=</span> <span class="str">"w"</span><span class="strut"> </span></p> -<p id="t359" class="stm mis"> <span class="key">if</span> <span class="nam">PY3</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t360" class="stm mis"> <span class="nam">opts</span><span class="op">[</span><span class="str">'encoding'</span><span class="op">]</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sEncoding</span><span class="strut"> </span></p> -<p id="t361" class="stm mis"> <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bNewlines</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t362" class="stm mis"> <span class="key">if</span> <span class="nam">PY3</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t363" class="stm mis"> <span class="nam">opts</span><span class="op">[</span><span class="str">'newline'</span><span class="op">]</span> <span class="op">=</span> <span class="str">"\n"</span><span class="strut"> </span></p> -<p id="t364" class="pln"> <span class="key">else</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t365" class="stm mis"> <span class="nam">mode</span> <span class="op">=</span> <span class="str">"wb"</span><span class="strut"> </span></p> -<p id="t366" class="stm mis"> <span class="key">return</span> <span class="nam">open</span><span class="op">(</span><span class="nam">fname</span><span class="op">,</span> <span class="nam">mode</span><span class="op">,</span> <span class="op">**</span><span class="nam">opts</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t367" class="pln"><span class="strut"> </span></p> -<p id="t368" class="stm run hide_run"> <span class="key">def</span> <span class="nam">openInputFile</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">fname</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t369" class="pln"> <span class="str">""" Open an input file. """</span><span class="strut"> </span></p> -<p id="t370" class="stm mis"> <span class="key">if</span> <span class="nam">fname</span> <span class="op">==</span> <span class="str">"-"</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t371" class="stm mis"> <span class="key">return</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">stdin</span><span class="strut"> </span></p> -<p id="t372" class="pln"> <span class="key">else</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t373" class="stm mis"> <span class="nam">opts</span> <span class="op">=</span> <span class="op">{</span><span class="op">}</span><span class="strut"> </span></p> -<p id="t374" class="stm mis"> <span class="key">if</span> <span class="nam">PY3</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t375" class="stm mis"> <span class="nam">opts</span><span class="op">[</span><span class="str">'encoding'</span><span class="op">]</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sEncoding</span><span class="strut"> </span></p> -<p id="t376" class="stm mis"> <span class="key">return</span> <span class="nam">open</span><span class="op">(</span><span class="nam">fname</span><span class="op">,</span> <span class="str">"r"</span><span class="op">,</span> <span class="op">**</span><span class="nam">opts</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t377" class="pln"><span class="strut"> </span></p> -<p id="t378" class="stm run hide_run"> <span class="key">def</span> <span class="nam">processFile</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">fIn</span><span class="op">,</span> <span class="nam">fOut</span><span class="op">,</span> <span class="nam">fname</span><span class="op">=</span><span class="nam">None</span><span class="op">,</span> <span class="nam">globals</span><span class="op">=</span><span class="nam">None</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t379" class="pln"> <span class="str">""" Process an input file object to an output file object.</span><span class="strut"> </span></p> -<p id="t380" class="pln"><span class="str"> fIn and fOut can be file objects, or file names.</span><span class="strut"> </span></p> -<p id="t381" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t382" class="pln"><span class="strut"> </span></p> -<p id="t383" class="stm run hide_run"> <span class="nam">sFileIn</span> <span class="op">=</span> <span class="nam">fname</span> <span class="key">or</span> <span class="str">''</span><span class="strut"> </span></p> -<p id="t384" class="stm run hide_run"> <span class="nam">sFileOut</span> <span class="op">=</span> <span class="nam">fname</span> <span class="key">or</span> <span class="str">''</span><span class="strut"> </span></p> -<p id="t385" class="stm run hide_run"> <span class="nam">fInToClose</span> <span class="op">=</span> <span class="nam">fOutToClose</span> <span class="op">=</span> <span class="nam">None</span><span class="strut"> </span></p> -<p id="t386" class="pln"> <span class="com"># Convert filenames to files.</span><span class="strut"> </span></p> -<p id="t387" class="stm par run hide_run"><span class="annotate" title="Line 387 was executed, but never jumped to line 389">387 ↛ 389 [?]</span> <span class="key">if</span> <span class="nam">isinstance</span><span class="op">(</span><span class="nam">fIn</span><span class="op">,</span> <span class="nam">string_types</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t388" class="pln"> <span class="com"># Open the input file.</span><span class="strut"> </span></p> -<p id="t389" class="stm mis"> <span class="nam">sFileIn</span> <span class="op">=</span> <span class="nam">fIn</span><span class="strut"> </span></p> -<p id="t390" class="stm mis"> <span class="nam">fIn</span> <span class="op">=</span> <span class="nam">fInToClose</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">openInputFile</span><span class="op">(</span><span class="nam">fIn</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t391" class="stm par run hide_run"><span class="annotate" title="Line 391 was executed, but never jumped to line 393">391 ↛ 393 [?]</span> <span class="key">if</span> <span class="nam">isinstance</span><span class="op">(</span><span class="nam">fOut</span><span class="op">,</span> <span class="nam">string_types</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t392" class="pln"> <span class="com"># Open the output file.</span><span class="strut"> </span></p> -<p id="t393" class="stm mis"> <span class="nam">sFileOut</span> <span class="op">=</span> <span class="nam">fOut</span><span class="strut"> </span></p> -<p id="t394" class="stm mis"> <span class="nam">fOut</span> <span class="op">=</span> <span class="nam">fOutToClose</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">openOutputFile</span><span class="op">(</span><span class="nam">fOut</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t395" class="pln"><span class="strut"> </span></p> -<p id="t396" class="stm run hide_run"> <span class="key">try</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t397" class="stm run hide_run"> <span class="nam">fIn</span> <span class="op">=</span> <span class="nam">NumberedFileReader</span><span class="op">(</span><span class="nam">fIn</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t398" class="pln"><span class="strut"> </span></p> -<p id="t399" class="stm run hide_run"> <span class="nam">bSawCog</span> <span class="op">=</span> <span class="nam">False</span><span class="strut"> </span></p> -<p id="t400" class="pln"><span class="strut"> </span></p> -<p id="t401" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cogmodule</span><span class="op">.</span><span class="nam">inFile</span> <span class="op">=</span> <span class="nam">sFileIn</span><span class="strut"> </span></p> -<p id="t402" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cogmodule</span><span class="op">.</span><span class="nam">outFile</span> <span class="op">=</span> <span class="nam">sFileOut</span><span class="strut"> </span></p> -<p id="t403" class="pln"><span class="strut"> </span></p> -<p id="t404" class="pln"> <span class="com"># The globals dict we'll use for this file.</span><span class="strut"> </span></p> -<p id="t405" class="stm par run hide_run"><span class="annotate" title="Line 405 was executed, but never jumped to line 409">405 ↛ 409 [?]</span> <span class="key">if</span> <span class="nam">globals</span> <span class="key">is</span> <span class="nam">None</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t406" class="stm run hide_run"> <span class="nam">globals</span> <span class="op">=</span> <span class="op">{</span><span class="op">}</span><span class="strut"> </span></p> +<p id="t320" class="pln"><span class="strut"> </span></p> +<p id="t321" class="stm run hide_run"><span class="key">class</span> <span class="nam">Cog</span><span class="op">(</span><span class="nam">Redirectable</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t322" class="pln"> <span class="str">""" The Cog engine.</span><span class="strut"> </span></p> +<p id="t323" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t324" class="stm run hide_run"> <span class="key">def</span> <span class="nam">__init__</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t325" class="stm run hide_run"> <span class="nam">Redirectable</span><span class="op">.</span><span class="nam">__init__</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t326" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span> <span class="op">=</span> <span class="nam">CogOptions</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t327" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">_fixEndOutputPatterns</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t328" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">installCogModule</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t329" class="pln"><span class="strut"> </span></p> +<p id="t330" class="stm run hide_run"> <span class="key">def</span> <span class="nam">_fixEndOutputPatterns</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t331" class="stm run hide_run"> <span class="nam">end_output</span> <span class="op">=</span> <span class="nam">re</span><span class="op">.</span><span class="nam">escape</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sEndOutput</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t332" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">reEndOutput</span> <span class="op">=</span> <span class="nam">re</span><span class="op">.</span><span class="nam">compile</span><span class="op">(</span><span class="nam">end_output</span> <span class="op">+</span> <span class="str">r'(?P<hashsect> *\(checksum: (?P<hash>[a-f0-9]+)\))'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t333" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">sEndFormat</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sEndOutput</span> <span class="op">+</span> <span class="str">' (checksum: %s)'</span><span class="strut"> </span></p> +<p id="t334" class="pln"><span class="strut"> </span></p> +<p id="t335" class="stm run hide_run"> <span class="key">def</span> <span class="nam">showWarning</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">msg</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t336" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">prout</span><span class="op">(</span><span class="str">"Warning: "</span><span class="op">+</span><span class="nam">msg</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t337" class="pln"><span class="strut"> </span></p> +<p id="t338" class="stm run hide_run"> <span class="key">def</span> <span class="nam">isBeginSpecLine</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">s</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t339" class="stm run hide_run"> <span class="key">return</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sBeginSpec</span> <span class="key">in</span> <span class="nam">s</span><span class="strut"> </span></p> +<p id="t340" class="pln"><span class="strut"> </span></p> +<p id="t341" class="stm run hide_run"> <span class="key">def</span> <span class="nam">isEndSpecLine</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">s</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t342" class="stm run hide_run"> <span class="key">return</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sEndSpec</span> <span class="key">in</span> <span class="nam">s</span> <span class="key">and</span> <span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">isEndOutputLine</span><span class="op">(</span><span class="nam">s</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t343" class="pln"><span class="strut"> </span></p> +<p id="t344" class="stm run hide_run"> <span class="key">def</span> <span class="nam">isEndOutputLine</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">s</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t345" class="stm run hide_run"> <span class="key">return</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sEndOutput</span> <span class="key">in</span> <span class="nam">s</span><span class="strut"> </span></p> +<p id="t346" class="pln"><span class="strut"> </span></p> +<p id="t347" class="stm run hide_run"> <span class="key">def</span> <span class="nam">installCogModule</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t348" class="pln"> <span class="str">""" Magic mumbo-jumbo so that imported Python modules</span><span class="strut"> </span></p> +<p id="t349" class="pln"><span class="str"> can say "import cog" and get our state.</span><span class="strut"> </span></p> +<p id="t350" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t351" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cogmodule</span> <span class="op">=</span> <span class="nam">imp</span><span class="op">.</span><span class="nam">new_module</span><span class="op">(</span><span class="str">'cog'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t352" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cogmodule</span><span class="op">.</span><span class="nam">path</span> <span class="op">=</span> <span class="op">[</span><span class="op">]</span><span class="strut"> </span></p> +<p id="t353" class="stm run hide_run"> <span class="nam">sys</span><span class="op">.</span><span class="nam">modules</span><span class="op">[</span><span class="str">'cog'</span><span class="op">]</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">cogmodule</span><span class="strut"> </span></p> +<p id="t354" class="pln"><span class="strut"> </span></p> +<p id="t355" class="stm run hide_run"> <span class="key">def</span> <span class="nam">openOutputFile</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">fname</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t356" class="pln"> <span class="str">""" Open an output file, taking all the details into account.</span><span class="strut"> </span></p> +<p id="t357" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t358" class="stm run hide_run"> <span class="nam">opts</span> <span class="op">=</span> <span class="op">{</span><span class="op">}</span><span class="strut"> </span></p> +<p id="t359" class="stm run hide_run"> <span class="nam">mode</span> <span class="op">=</span> <span class="str">"w"</span><span class="strut"> </span></p> +<p id="t360" class="stm par run hide_run"><span class="annotate short">360 ↛ 361</span><span class="annotate long">line 360 didn't jump to line 361, because the condition on line 360 was never true</span> <span class="key">if</span> <span class="nam">PY3</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t361" class="stm mis"> <span class="nam">opts</span><span class="op">[</span><span class="str">'encoding'</span><span class="op">]</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sEncoding</span><span class="strut"> </span></p> +<p id="t362" class="stm run hide_run"> <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bNewlines</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t363" class="stm par run hide_run"><span class="annotate short">363 ↛ 364</span><span class="annotate long">line 363 didn't jump to line 364, because the condition on line 363 was never true</span> <span class="key">if</span> <span class="nam">PY3</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t364" class="stm mis"> <span class="nam">opts</span><span class="op">[</span><span class="str">'newline'</span><span class="op">]</span> <span class="op">=</span> <span class="str">"\n"</span><span class="strut"> </span></p> +<p id="t365" class="pln"> <span class="key">else</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t366" class="stm run hide_run"> <span class="nam">mode</span> <span class="op">=</span> <span class="str">"wb"</span><span class="strut"> </span></p> +<p id="t367" class="stm run hide_run"> <span class="nam">fdir</span> <span class="op">=</span> <span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">dirname</span><span class="op">(</span><span class="nam">fname</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t368" class="stm run hide_run"> <span class="key">if</span> <span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">dirname</span><span class="op">(</span><span class="nam">fdir</span><span class="op">)</span> <span class="key">and</span> <span class="key">not</span> <span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">exists</span><span class="op">(</span><span class="nam">fdir</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t369" class="stm run hide_run"> <span class="nam">os</span><span class="op">.</span><span class="nam">makedirs</span><span class="op">(</span><span class="nam">fdir</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t370" class="stm run hide_run"> <span class="key">return</span> <span class="nam">open</span><span class="op">(</span><span class="nam">fname</span><span class="op">,</span> <span class="nam">mode</span><span class="op">,</span> <span class="op">**</span><span class="nam">opts</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t371" class="pln"><span class="strut"> </span></p> +<p id="t372" class="stm run hide_run"> <span class="key">def</span> <span class="nam">openInputFile</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">fname</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t373" class="pln"> <span class="str">""" Open an input file. """</span><span class="strut"> </span></p> +<p id="t374" class="stm run hide_run"> <span class="key">if</span> <span class="nam">fname</span> <span class="op">==</span> <span class="str">"-"</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t375" class="stm run hide_run"> <span class="key">return</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">stdin</span><span class="strut"> </span></p> +<p id="t376" class="pln"> <span class="key">else</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t377" class="stm run hide_run"> <span class="nam">opts</span> <span class="op">=</span> <span class="op">{</span><span class="op">}</span><span class="strut"> </span></p> +<p id="t378" class="stm par run hide_run"><span class="annotate short">378 ↛ 379</span><span class="annotate long">line 378 didn't jump to line 379, because the condition on line 378 was never true</span> <span class="key">if</span> <span class="nam">PY3</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t379" class="stm mis"> <span class="nam">opts</span><span class="op">[</span><span class="str">'encoding'</span><span class="op">]</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sEncoding</span><span class="strut"> </span></p> +<p id="t380" class="stm run hide_run"> <span class="key">return</span> <span class="nam">open</span><span class="op">(</span><span class="nam">fname</span><span class="op">,</span> <span class="str">"r"</span><span class="op">,</span> <span class="op">**</span><span class="nam">opts</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t381" class="pln"><span class="strut"> </span></p> +<p id="t382" class="stm run hide_run"> <span class="key">def</span> <span class="nam">processFile</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">fIn</span><span class="op">,</span> <span class="nam">fOut</span><span class="op">,</span> <span class="nam">fname</span><span class="op">=</span><span class="nam">None</span><span class="op">,</span> <span class="nam">globals</span><span class="op">=</span><span class="nam">None</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t383" class="pln"> <span class="str">""" Process an input file object to an output file object.</span><span class="strut"> </span></p> +<p id="t384" class="pln"><span class="str"> fIn and fOut can be file objects, or file names.</span><span class="strut"> </span></p> +<p id="t385" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t386" class="pln"><span class="strut"> </span></p> +<p id="t387" class="stm run hide_run"> <span class="nam">sFileIn</span> <span class="op">=</span> <span class="nam">fname</span> <span class="key">or</span> <span class="str">''</span><span class="strut"> </span></p> +<p id="t388" class="stm run hide_run"> <span class="nam">sFileOut</span> <span class="op">=</span> <span class="nam">fname</span> <span class="key">or</span> <span class="str">''</span><span class="strut"> </span></p> +<p id="t389" class="stm run hide_run"> <span class="nam">fInToClose</span> <span class="op">=</span> <span class="nam">fOutToClose</span> <span class="op">=</span> <span class="nam">None</span><span class="strut"> </span></p> +<p id="t390" class="pln"> <span class="com"># Convert filenames to files.</span><span class="strut"> </span></p> +<p id="t391" class="stm run hide_run"> <span class="key">if</span> <span class="nam">isinstance</span><span class="op">(</span><span class="nam">fIn</span><span class="op">,</span> <span class="nam">string_types</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t392" class="pln"> <span class="com"># Open the input file.</span><span class="strut"> </span></p> +<p id="t393" class="stm run hide_run"> <span class="nam">sFileIn</span> <span class="op">=</span> <span class="nam">fIn</span><span class="strut"> </span></p> +<p id="t394" class="stm run hide_run"> <span class="nam">fIn</span> <span class="op">=</span> <span class="nam">fInToClose</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">openInputFile</span><span class="op">(</span><span class="nam">fIn</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t395" class="stm run hide_run"> <span class="key">if</span> <span class="nam">isinstance</span><span class="op">(</span><span class="nam">fOut</span><span class="op">,</span> <span class="nam">string_types</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t396" class="pln"> <span class="com"># Open the output file.</span><span class="strut"> </span></p> +<p id="t397" class="stm run hide_run"> <span class="nam">sFileOut</span> <span class="op">=</span> <span class="nam">fOut</span><span class="strut"> </span></p> +<p id="t398" class="stm run hide_run"> <span class="nam">fOut</span> <span class="op">=</span> <span class="nam">fOutToClose</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">openOutputFile</span><span class="op">(</span><span class="nam">fOut</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t399" class="pln"><span class="strut"> </span></p> +<p id="t400" class="stm run hide_run"> <span class="key">try</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t401" class="stm run hide_run"> <span class="nam">fIn</span> <span class="op">=</span> <span class="nam">NumberedFileReader</span><span class="op">(</span><span class="nam">fIn</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t402" class="pln"><span class="strut"> </span></p> +<p id="t403" class="stm run hide_run"> <span class="nam">bSawCog</span> <span class="op">=</span> <span class="nam">False</span><span class="strut"> </span></p> +<p id="t404" class="pln"><span class="strut"> </span></p> +<p id="t405" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cogmodule</span><span class="op">.</span><span class="nam">inFile</span> <span class="op">=</span> <span class="nam">sFileIn</span><span class="strut"> </span></p> +<p id="t406" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cogmodule</span><span class="op">.</span><span class="nam">outFile</span> <span class="op">=</span> <span class="nam">sFileOut</span><span class="strut"> </span></p> <p id="t407" class="pln"><span class="strut"> </span></p> -<p id="t408" class="pln"> <span class="com"># If there are any global defines, put them in the globals.</span><span class="strut"> </span></p> -<p id="t409" class="stm run hide_run"> <span class="nam">globals</span><span class="op">.</span><span class="nam">update</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">defines</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t410" class="pln"><span class="strut"> </span></p> -<p id="t411" class="pln"> <span class="com"># loop over generator chunks</span><span class="strut"> </span></p> -<p id="t412" class="stm run hide_run"> <span class="nam">l</span> <span class="op">=</span> <span class="nam">fIn</span><span class="op">.</span><span class="nam">readline</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t413" class="stm run hide_run"> <span class="key">while</span> <span class="nam">l</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t414" class="pln"> <span class="com"># Find the next spec begin</span><span class="strut"> </span></p> -<p id="t415" class="stm run hide_run"> <span class="key">while</span> <span class="nam">l</span> <span class="key">and</span> <span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">isBeginSpecLine</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t416" class="stm par run hide_run"><span class="annotate" title="Line 416 was executed, but never jumped to line 417">416 ↛ 417 [?]</span> <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">isEndSpecLine</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t417" class="stm mis"> <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="str">"Unexpected '%s'"</span> <span class="op">%</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sEndSpec</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t418" class="pln"> <span class="nam">file</span><span class="op">=</span><span class="nam">sFileIn</span><span class="op">,</span> <span class="nam">line</span><span class="op">=</span><span class="nam">fIn</span><span class="op">.</span><span class="nam">linenumber</span><span class="op">(</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t419" class="stm par run hide_run"><span class="annotate" title="Line 419 was executed, but never jumped to line 420">419 ↛ 420 [?]</span> <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">isEndOutputLine</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t420" class="stm mis"> <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="str">"Unexpected '%s'"</span> <span class="op">%</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sEndOutput</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t421" class="pln"> <span class="nam">file</span><span class="op">=</span><span class="nam">sFileIn</span><span class="op">,</span> <span class="nam">line</span><span class="op">=</span><span class="nam">fIn</span><span class="op">.</span><span class="nam">linenumber</span><span class="op">(</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t422" class="stm run hide_run"> <span class="nam">fOut</span><span class="op">.</span><span class="nam">write</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t423" class="stm run hide_run"> <span class="nam">l</span> <span class="op">=</span> <span class="nam">fIn</span><span class="op">.</span><span class="nam">readline</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t424" class="stm run hide_run"> <span class="key">if</span> <span class="key">not</span> <span class="nam">l</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t425" class="stm run hide_run"> <span class="key">break</span><span class="strut"> </span></p> -<p id="t426" class="stm par run hide_run"><span class="annotate" title="Line 426 was executed, but never jumped to line 430">426 ↛ 430 [?]</span> <span class="key">if</span> <span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bDeleteCode</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t427" class="stm run hide_run"> <span class="nam">fOut</span><span class="op">.</span><span class="nam">write</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t428" class="pln"><span class="strut"> </span></p> -<p id="t429" class="pln"> <span class="com"># l is the begin spec</span><span class="strut"> </span></p> -<p id="t430" class="stm run hide_run"> <span class="nam">gen</span> <span class="op">=</span> <span class="nam">CogGenerator</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t431" class="stm run hide_run"> <span class="nam">gen</span><span class="op">.</span><span class="nam">setOutput</span><span class="op">(</span><span class="nam">stdout</span><span class="op">=</span><span class="nam">self</span><span class="op">.</span><span class="nam">stdout</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t432" class="stm run hide_run"> <span class="nam">gen</span><span class="op">.</span><span class="nam">parseMarker</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t433" class="stm run hide_run"> <span class="nam">firstLineNum</span> <span class="op">=</span> <span class="nam">fIn</span><span class="op">.</span><span class="nam">linenumber</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t434" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cogmodule</span><span class="op">.</span><span class="nam">firstLineNum</span> <span class="op">=</span> <span class="nam">firstLineNum</span><span class="strut"> </span></p> -<p id="t435" class="pln"><span class="strut"> </span></p> -<p id="t436" class="pln"> <span class="com"># If the spec begin is also a spec end, then process the single</span><span class="strut"> </span></p> -<p id="t437" class="pln"> <span class="com"># line of code inside.</span><span class="strut"> </span></p> -<p id="t438" class="stm run hide_run"> <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">isEndSpecLine</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t439" class="stm run hide_run"> <span class="nam">beg</span> <span class="op">=</span> <span class="nam">l</span><span class="op">.</span><span class="nam">find</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sBeginSpec</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t440" class="stm run hide_run"> <span class="nam">end</span> <span class="op">=</span> <span class="nam">l</span><span class="op">.</span><span class="nam">find</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sEndSpec</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t441" class="stm run hide_run"> <span class="key">if</span> <span class="nam">beg</span> <span class="op">></span> <span class="nam">end</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t442" class="stm run hide_run"> <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="str">"Cog code markers inverted"</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t443" class="pln"> <span class="nam">file</span><span class="op">=</span><span class="nam">sFileIn</span><span class="op">,</span> <span class="nam">line</span><span class="op">=</span><span class="nam">firstLineNum</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t444" class="pln"> <span class="key">else</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t445" class="stm run hide_run"> <span class="nam">sCode</span> <span class="op">=</span> <span class="nam">l</span><span class="op">[</span><span class="nam">beg</span><span class="op">+</span><span class="nam">len</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sBeginSpec</span><span class="op">)</span><span class="op">:</span><span class="nam">end</span><span class="op">]</span><span class="op">.</span><span class="nam">strip</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t446" class="stm run hide_run"> <span class="nam">gen</span><span class="op">.</span><span class="nam">parseLine</span><span class="op">(</span><span class="nam">sCode</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t447" class="pln"> <span class="key">else</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t448" class="pln"> <span class="com"># Deal with an ordinary code block.</span><span class="strut"> </span></p> -<p id="t449" class="stm run hide_run"> <span class="nam">l</span> <span class="op">=</span> <span class="nam">fIn</span><span class="op">.</span><span class="nam">readline</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t450" class="pln"><span class="strut"> </span></p> -<p id="t451" class="pln"> <span class="com"># Get all the lines in the spec</span><span class="strut"> </span></p> -<p id="t452" class="stm run hide_run"> <span class="key">while</span> <span class="nam">l</span> <span class="key">and</span> <span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">isEndSpecLine</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t453" class="stm par run hide_run"><span class="annotate" title="Line 453 was executed, but never jumped to line 454">453 ↛ 454 [?]</span> <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">isBeginSpecLine</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t454" class="stm mis"> <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="str">"Unexpected '%s'"</span> <span class="op">%</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sBeginSpec</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t455" class="pln"> <span class="nam">file</span><span class="op">=</span><span class="nam">sFileIn</span><span class="op">,</span> <span class="nam">line</span><span class="op">=</span><span class="nam">fIn</span><span class="op">.</span><span class="nam">linenumber</span><span class="op">(</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t456" class="stm par run hide_run"><span class="annotate" title="Line 456 was executed, but never jumped to line 457">456 ↛ 457 [?]</span> <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">isEndOutputLine</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t457" class="stm mis"> <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="str">"Unexpected '%s'"</span> <span class="op">%</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sEndOutput</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t458" class="pln"> <span class="nam">file</span><span class="op">=</span><span class="nam">sFileIn</span><span class="op">,</span> <span class="nam">line</span><span class="op">=</span><span class="nam">fIn</span><span class="op">.</span><span class="nam">linenumber</span><span class="op">(</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t459" class="stm par run hide_run"><span class="annotate" title="Line 459 was executed, but never jumped to line 461">459 ↛ 461 [?]</span> <span class="key">if</span> <span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bDeleteCode</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t460" class="stm run hide_run"> <span class="nam">fOut</span><span class="op">.</span><span class="nam">write</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t461" class="stm run hide_run"> <span class="nam">gen</span><span class="op">.</span><span class="nam">parseLine</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t462" class="stm run hide_run"> <span class="nam">l</span> <span class="op">=</span> <span class="nam">fIn</span><span class="op">.</span><span class="nam">readline</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t463" class="stm par run hide_run"><span class="annotate" title="Line 463 was executed, but never jumped to line 464">463 ↛ 464 [?]</span> <span class="key">if</span> <span class="key">not</span> <span class="nam">l</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t464" class="stm mis"> <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="strut"> </span></p> -<p id="t465" class="pln"> <span class="str">"Cog block begun but never ended."</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t466" class="pln"> <span class="nam">file</span><span class="op">=</span><span class="nam">sFileIn</span><span class="op">,</span> <span class="nam">line</span><span class="op">=</span><span class="nam">firstLineNum</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t467" class="pln"><span class="strut"> </span></p> -<p id="t468" class="stm par run hide_run"><span class="annotate" title="Line 468 was executed, but never jumped to line 470">468 ↛ 470 [?]</span> <span class="key">if</span> <span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bDeleteCode</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t469" class="stm run hide_run"> <span class="nam">fOut</span><span class="op">.</span><span class="nam">write</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t470" class="stm run hide_run"> <span class="nam">gen</span><span class="op">.</span><span class="nam">parseMarker</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t408" class="pln"> <span class="com"># The globals dict we'll use for this file.</span><span class="strut"> </span></p> +<p id="t409" class="stm run hide_run"> <span class="key">if</span> <span class="nam">globals</span> <span class="key">is</span> <span class="nam">None</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t410" class="stm run hide_run"> <span class="nam">globals</span> <span class="op">=</span> <span class="op">{</span><span class="op">}</span><span class="strut"> </span></p> +<p id="t411" class="pln"><span class="strut"> </span></p> +<p id="t412" class="pln"> <span class="com"># If there are any global defines, put them in the globals.</span><span class="strut"> </span></p> +<p id="t413" class="stm run hide_run"> <span class="nam">globals</span><span class="op">.</span><span class="nam">update</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">defines</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t414" class="pln"><span class="strut"> </span></p> +<p id="t415" class="pln"> <span class="com"># loop over generator chunks</span><span class="strut"> </span></p> +<p id="t416" class="stm run hide_run"> <span class="nam">l</span> <span class="op">=</span> <span class="nam">fIn</span><span class="op">.</span><span class="nam">readline</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t417" class="stm run hide_run"> <span class="key">while</span> <span class="nam">l</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t418" class="pln"> <span class="com"># Find the next spec begin</span><span class="strut"> </span></p> +<p id="t419" class="stm run hide_run"> <span class="key">while</span> <span class="nam">l</span> <span class="key">and</span> <span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">isBeginSpecLine</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t420" class="stm run hide_run"> <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">isEndSpecLine</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t421" class="stm run hide_run"> <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="str">"Unexpected '%s'"</span> <span class="op">%</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sEndSpec</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t422" class="pln"> <span class="nam">file</span><span class="op">=</span><span class="nam">sFileIn</span><span class="op">,</span> <span class="nam">line</span><span class="op">=</span><span class="nam">fIn</span><span class="op">.</span><span class="nam">linenumber</span><span class="op">(</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t423" class="stm run hide_run"> <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">isEndOutputLine</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t424" class="stm run hide_run"> <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="str">"Unexpected '%s'"</span> <span class="op">%</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sEndOutput</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t425" class="pln"> <span class="nam">file</span><span class="op">=</span><span class="nam">sFileIn</span><span class="op">,</span> <span class="nam">line</span><span class="op">=</span><span class="nam">fIn</span><span class="op">.</span><span class="nam">linenumber</span><span class="op">(</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t426" class="stm run hide_run"> <span class="nam">fOut</span><span class="op">.</span><span class="nam">write</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t427" class="stm run hide_run"> <span class="nam">l</span> <span class="op">=</span> <span class="nam">fIn</span><span class="op">.</span><span class="nam">readline</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t428" class="stm run hide_run"> <span class="key">if</span> <span class="key">not</span> <span class="nam">l</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t429" class="stm run hide_run"> <span class="key">break</span><span class="strut"> </span></p> +<p id="t430" class="stm run hide_run"> <span class="key">if</span> <span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bDeleteCode</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t431" class="stm run hide_run"> <span class="nam">fOut</span><span class="op">.</span><span class="nam">write</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t432" class="pln"><span class="strut"> </span></p> +<p id="t433" class="pln"> <span class="com"># l is the begin spec</span><span class="strut"> </span></p> +<p id="t434" class="stm run hide_run"> <span class="nam">gen</span> <span class="op">=</span> <span class="nam">CogGenerator</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t435" class="stm run hide_run"> <span class="nam">gen</span><span class="op">.</span><span class="nam">setOutput</span><span class="op">(</span><span class="nam">stdout</span><span class="op">=</span><span class="nam">self</span><span class="op">.</span><span class="nam">stdout</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t436" class="stm run hide_run"> <span class="nam">gen</span><span class="op">.</span><span class="nam">parseMarker</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t437" class="stm run hide_run"> <span class="nam">firstLineNum</span> <span class="op">=</span> <span class="nam">fIn</span><span class="op">.</span><span class="nam">linenumber</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t438" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cogmodule</span><span class="op">.</span><span class="nam">firstLineNum</span> <span class="op">=</span> <span class="nam">firstLineNum</span><span class="strut"> </span></p> +<p id="t439" class="pln"><span class="strut"> </span></p> +<p id="t440" class="pln"> <span class="com"># If the spec begin is also a spec end, then process the single</span><span class="strut"> </span></p> +<p id="t441" class="pln"> <span class="com"># line of code inside.</span><span class="strut"> </span></p> +<p id="t442" class="stm run hide_run"> <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">isEndSpecLine</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t443" class="stm run hide_run"> <span class="nam">beg</span> <span class="op">=</span> <span class="nam">l</span><span class="op">.</span><span class="nam">find</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sBeginSpec</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t444" class="stm run hide_run"> <span class="nam">end</span> <span class="op">=</span> <span class="nam">l</span><span class="op">.</span><span class="nam">find</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sEndSpec</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t445" class="stm run hide_run"> <span class="key">if</span> <span class="nam">beg</span> <span class="op">></span> <span class="nam">end</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t446" class="stm run hide_run"> <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="str">"Cog code markers inverted"</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t447" class="pln"> <span class="nam">file</span><span class="op">=</span><span class="nam">sFileIn</span><span class="op">,</span> <span class="nam">line</span><span class="op">=</span><span class="nam">firstLineNum</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t448" class="pln"> <span class="key">else</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t449" class="stm run hide_run"> <span class="nam">sCode</span> <span class="op">=</span> <span class="nam">l</span><span class="op">[</span><span class="nam">beg</span><span class="op">+</span><span class="nam">len</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sBeginSpec</span><span class="op">)</span><span class="op">:</span><span class="nam">end</span><span class="op">]</span><span class="op">.</span><span class="nam">strip</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t450" class="stm run hide_run"> <span class="nam">gen</span><span class="op">.</span><span class="nam">parseLine</span><span class="op">(</span><span class="nam">sCode</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t451" class="pln"> <span class="key">else</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t452" class="pln"> <span class="com"># Deal with an ordinary code block.</span><span class="strut"> </span></p> +<p id="t453" class="stm run hide_run"> <span class="nam">l</span> <span class="op">=</span> <span class="nam">fIn</span><span class="op">.</span><span class="nam">readline</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t454" class="pln"><span class="strut"> </span></p> +<p id="t455" class="pln"> <span class="com"># Get all the lines in the spec</span><span class="strut"> </span></p> +<p id="t456" class="stm run hide_run"> <span class="key">while</span> <span class="nam">l</span> <span class="key">and</span> <span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">isEndSpecLine</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t457" class="stm run hide_run"> <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">isBeginSpecLine</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t458" class="stm run hide_run"> <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="str">"Unexpected '%s'"</span> <span class="op">%</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sBeginSpec</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t459" class="pln"> <span class="nam">file</span><span class="op">=</span><span class="nam">sFileIn</span><span class="op">,</span> <span class="nam">line</span><span class="op">=</span><span class="nam">fIn</span><span class="op">.</span><span class="nam">linenumber</span><span class="op">(</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t460" class="stm run hide_run"> <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">isEndOutputLine</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t461" class="stm run hide_run"> <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="str">"Unexpected '%s'"</span> <span class="op">%</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sEndOutput</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t462" class="pln"> <span class="nam">file</span><span class="op">=</span><span class="nam">sFileIn</span><span class="op">,</span> <span class="nam">line</span><span class="op">=</span><span class="nam">fIn</span><span class="op">.</span><span class="nam">linenumber</span><span class="op">(</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t463" class="stm run hide_run"> <span class="key">if</span> <span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bDeleteCode</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t464" class="stm run hide_run"> <span class="nam">fOut</span><span class="op">.</span><span class="nam">write</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t465" class="stm run hide_run"> <span class="nam">gen</span><span class="op">.</span><span class="nam">parseLine</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t466" class="stm run hide_run"> <span class="nam">l</span> <span class="op">=</span> <span class="nam">fIn</span><span class="op">.</span><span class="nam">readline</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t467" class="stm run hide_run"> <span class="key">if</span> <span class="key">not</span> <span class="nam">l</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t468" class="stm run hide_run"> <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="strut"> </span></p> +<p id="t469" class="pln"> <span class="str">"Cog block begun but never ended."</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t470" class="pln"> <span class="nam">file</span><span class="op">=</span><span class="nam">sFileIn</span><span class="op">,</span> <span class="nam">line</span><span class="op">=</span><span class="nam">firstLineNum</span><span class="op">)</span><span class="strut"> </span></p> <p id="t471" class="pln"><span class="strut"> </span></p> -<p id="t472" class="stm run hide_run"> <span class="nam">l</span> <span class="op">=</span> <span class="nam">fIn</span><span class="op">.</span><span class="nam">readline</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t473" class="pln"><span class="strut"> </span></p> -<p id="t474" class="pln"> <span class="com"># Eat all the lines in the output section. While reading past</span><span class="strut"> </span></p> -<p id="t475" class="pln"> <span class="com"># them, compute the md5 hash of the old output.</span><span class="strut"> </span></p> -<p id="t476" class="stm run hide_run"> <span class="nam">previous</span> <span class="op">=</span> <span class="str">""</span><span class="strut"> </span></p> -<p id="t477" class="stm run hide_run"> <span class="nam">hasher</span> <span class="op">=</span> <span class="nam">hashlib</span><span class="op">.</span><span class="nam">md5</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t478" class="stm run hide_run"> <span class="key">while</span> <span class="nam">l</span> <span class="key">and</span> <span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">isEndOutputLine</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t479" class="stm par run hide_run"><span class="annotate" title="Line 479 was executed, but never jumped to line 480">479 ↛ 480 [?]</span> <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">isBeginSpecLine</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t480" class="stm mis"> <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="str">"Unexpected '%s'"</span> <span class="op">%</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sBeginSpec</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t481" class="pln"> <span class="nam">file</span><span class="op">=</span><span class="nam">sFileIn</span><span class="op">,</span> <span class="nam">line</span><span class="op">=</span><span class="nam">fIn</span><span class="op">.</span><span class="nam">linenumber</span><span class="op">(</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t482" class="stm par run hide_run"><span class="annotate" title="Line 482 was executed, but never jumped to line 483">482 ↛ 483 [?]</span> <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">isEndSpecLine</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t483" class="stm mis"> <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="str">"Unexpected '%s'"</span> <span class="op">%</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sEndSpec</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t484" class="pln"> <span class="nam">file</span><span class="op">=</span><span class="nam">sFileIn</span><span class="op">,</span> <span class="nam">line</span><span class="op">=</span><span class="nam">fIn</span><span class="op">.</span><span class="nam">linenumber</span><span class="op">(</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t485" class="stm run hide_run"> <span class="nam">previous</span> <span class="op">+=</span> <span class="nam">l</span><span class="strut"> </span></p> -<p id="t486" class="stm run hide_run"> <span class="nam">hasher</span><span class="op">.</span><span class="nam">update</span><span class="op">(</span><span class="nam">to_bytes</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t487" class="stm run hide_run"> <span class="nam">l</span> <span class="op">=</span> <span class="nam">fIn</span><span class="op">.</span><span class="nam">readline</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t488" class="stm run hide_run"> <span class="nam">curHash</span> <span class="op">=</span> <span class="nam">hasher</span><span class="op">.</span><span class="nam">hexdigest</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t489" class="pln"><span class="strut"> </span></p> -<p id="t490" class="stm par run hide_run"><span class="annotate" title="Line 490 was executed, but never jumped to line 492">490 ↛ 492 [?]</span> <span class="key">if</span> <span class="key">not</span> <span class="nam">l</span> <span class="key">and</span> <span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bEofCanBeEnd</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t491" class="pln"> <span class="com"># We reached end of file before we found the end output line.</span><span class="strut"> </span></p> -<p id="t492" class="stm mis"> <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="str">"Missing '%s' before end of file."</span> <span class="op">%</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sEndOutput</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t493" class="pln"> <span class="nam">file</span><span class="op">=</span><span class="nam">sFileIn</span><span class="op">,</span> <span class="nam">line</span><span class="op">=</span><span class="nam">fIn</span><span class="op">.</span><span class="nam">linenumber</span><span class="op">(</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t494" class="pln"><span class="strut"> </span></p> -<p id="t495" class="pln"> <span class="com"># Make the previous output available to the current code</span><span class="strut"> </span></p> -<p id="t496" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cogmodule</span><span class="op">.</span><span class="nam">previous</span> <span class="op">=</span> <span class="nam">previous</span><span class="strut"> </span></p> -<p id="t497" class="pln"><span class="strut"> </span></p> -<p id="t498" class="pln"> <span class="com"># Write the output of the spec to be the new output if we're</span><span class="strut"> </span></p> -<p id="t499" class="pln"> <span class="com"># supposed to generate code.</span><span class="strut"> </span></p> -<p id="t500" class="stm run hide_run"> <span class="nam">hasher</span> <span class="op">=</span> <span class="nam">hashlib</span><span class="op">.</span><span class="nam">md5</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t501" class="stm par run hide_run"><span class="annotate" title="Line 501 was executed, but never jumped to line 507">501 ↛ 507 [?]</span> <span class="key">if</span> <span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bNoGenerate</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t502" class="stm run hide_run"> <span class="nam">sFile</span> <span class="op">=</span> <span class="str">"%s+%d"</span> <span class="op">%</span> <span class="op">(</span><span class="nam">sFileIn</span><span class="op">,</span> <span class="nam">firstLineNum</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t503" class="stm run hide_run"> <span class="nam">sGen</span> <span class="op">=</span> <span class="nam">gen</span><span class="op">.</span><span class="nam">evaluate</span><span class="op">(</span><span class="nam">cog</span><span class="op">=</span><span class="nam">self</span><span class="op">,</span> <span class="nam">globals</span><span class="op">=</span><span class="nam">globals</span><span class="op">,</span> <span class="nam">fname</span><span class="op">=</span><span class="nam">sFile</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t504" class="stm run hide_run"> <span class="nam">sGen</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">suffixLines</span><span class="op">(</span><span class="nam">sGen</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t505" class="stm run hide_run"> <span class="nam">hasher</span><span class="op">.</span><span class="nam">update</span><span class="op">(</span><span class="nam">to_bytes</span><span class="op">(</span><span class="nam">sGen</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t506" class="stm run hide_run"> <span class="nam">fOut</span><span class="op">.</span><span class="nam">write</span><span class="op">(</span><span class="nam">sGen</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t507" class="stm run hide_run"> <span class="nam">newHash</span> <span class="op">=</span> <span class="nam">hasher</span><span class="op">.</span><span class="nam">hexdigest</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t508" class="pln"><span class="strut"> </span></p> -<p id="t509" class="stm run hide_run"> <span class="nam">bSawCog</span> <span class="op">=</span> <span class="nam">True</span><span class="strut"> </span></p> -<p id="t510" class="pln"><span class="strut"> </span></p> -<p id="t511" class="pln"> <span class="com"># Write the ending output line</span><span class="strut"> </span></p> -<p id="t512" class="stm run hide_run"> <span class="nam">hashMatch</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">reEndOutput</span><span class="op">.</span><span class="nam">search</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t513" class="stm par run hide_run"><span class="annotate" title="Line 513 was executed, but never jumped to line 514">513 ↛ 514 [?]</span> <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bHashOutput</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t514" class="stm mis"> <span class="key">if</span> <span class="nam">hashMatch</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t515" class="stm mis"> <span class="nam">oldHash</span> <span class="op">=</span> <span class="nam">hashMatch</span><span class="op">.</span><span class="nam">groupdict</span><span class="op">(</span><span class="op">)</span><span class="op">[</span><span class="str">'hash'</span><span class="op">]</span><span class="strut"> </span></p> -<p id="t516" class="stm mis"> <span class="key">if</span> <span class="nam">oldHash</span> <span class="op">!=</span> <span class="nam">curHash</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t517" class="stm mis"> <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="str">"Output has been edited! Delete old checksum to unprotect."</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t518" class="pln"> <span class="nam">file</span><span class="op">=</span><span class="nam">sFileIn</span><span class="op">,</span> <span class="nam">line</span><span class="op">=</span><span class="nam">fIn</span><span class="op">.</span><span class="nam">linenumber</span><span class="op">(</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t519" class="pln"> <span class="com"># Create a new end line with the correct hash.</span><span class="strut"> </span></p> -<p id="t520" class="stm mis"> <span class="nam">endpieces</span> <span class="op">=</span> <span class="nam">l</span><span class="op">.</span><span class="nam">split</span><span class="op">(</span><span class="nam">hashMatch</span><span class="op">.</span><span class="nam">group</span><span class="op">(</span><span class="num">0</span><span class="op">)</span><span class="op">,</span> <span class="num">1</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t521" class="pln"> <span class="key">else</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t522" class="pln"> <span class="com"># There was no old hash, but we want a new hash.</span><span class="strut"> </span></p> -<p id="t523" class="stm mis"> <span class="nam">endpieces</span> <span class="op">=</span> <span class="nam">l</span><span class="op">.</span><span class="nam">split</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sEndOutput</span><span class="op">,</span> <span class="num">1</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t524" class="stm mis"> <span class="nam">l</span> <span class="op">=</span> <span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">sEndFormat</span> <span class="op">%</span> <span class="nam">newHash</span><span class="op">)</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">endpieces</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t525" class="pln"> <span class="key">else</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t526" class="pln"> <span class="com"># We don't want hashes output, so if there was one, get rid of</span><span class="strut"> </span></p> -<p id="t527" class="pln"> <span class="com"># it.</span><span class="strut"> </span></p> -<p id="t528" class="stm par run hide_run"><span class="annotate" title="Line 528 was executed, but never jumped to line 529">528 ↛ 529 [?]</span> <span class="key">if</span> <span class="nam">hashMatch</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t529" class="stm mis"> <span class="nam">l</span> <span class="op">=</span> <span class="nam">l</span><span class="op">.</span><span class="nam">replace</span><span class="op">(</span><span class="nam">hashMatch</span><span class="op">.</span><span class="nam">groupdict</span><span class="op">(</span><span class="op">)</span><span class="op">[</span><span class="str">'hashsect'</span><span class="op">]</span><span class="op">,</span> <span class="str">''</span><span class="op">,</span> <span class="num">1</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t530" class="pln"><span class="strut"> </span></p> -<p id="t531" class="stm par run hide_run"><span class="annotate" title="Line 531 was executed, but never jumped to line 533">531 ↛ 533 [?]</span> <span class="key">if</span> <span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bDeleteCode</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t532" class="stm run hide_run"> <span class="nam">fOut</span><span class="op">.</span><span class="nam">write</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t533" class="stm run hide_run"> <span class="nam">l</span> <span class="op">=</span> <span class="nam">fIn</span><span class="op">.</span><span class="nam">readline</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t472" class="stm run hide_run"> <span class="key">if</span> <span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bDeleteCode</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t473" class="stm run hide_run"> <span class="nam">fOut</span><span class="op">.</span><span class="nam">write</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t474" class="stm run hide_run"> <span class="nam">gen</span><span class="op">.</span><span class="nam">parseMarker</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t475" class="pln"><span class="strut"> </span></p> +<p id="t476" class="stm run hide_run"> <span class="nam">l</span> <span class="op">=</span> <span class="nam">fIn</span><span class="op">.</span><span class="nam">readline</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t477" class="pln"><span class="strut"> </span></p> +<p id="t478" class="pln"> <span class="com"># Eat all the lines in the output section. While reading past</span><span class="strut"> </span></p> +<p id="t479" class="pln"> <span class="com"># them, compute the md5 hash of the old output.</span><span class="strut"> </span></p> +<p id="t480" class="stm run hide_run"> <span class="nam">previous</span> <span class="op">=</span> <span class="str">""</span><span class="strut"> </span></p> +<p id="t481" class="stm run hide_run"> <span class="nam">hasher</span> <span class="op">=</span> <span class="nam">hashlib</span><span class="op">.</span><span class="nam">md5</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t482" class="stm run hide_run"> <span class="key">while</span> <span class="nam">l</span> <span class="key">and</span> <span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">isEndOutputLine</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t483" class="stm run hide_run"> <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">isBeginSpecLine</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t484" class="stm run hide_run"> <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="str">"Unexpected '%s'"</span> <span class="op">%</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sBeginSpec</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t485" class="pln"> <span class="nam">file</span><span class="op">=</span><span class="nam">sFileIn</span><span class="op">,</span> <span class="nam">line</span><span class="op">=</span><span class="nam">fIn</span><span class="op">.</span><span class="nam">linenumber</span><span class="op">(</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t486" class="stm run hide_run"> <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">isEndSpecLine</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t487" class="stm run hide_run"> <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="str">"Unexpected '%s'"</span> <span class="op">%</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sEndSpec</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t488" class="pln"> <span class="nam">file</span><span class="op">=</span><span class="nam">sFileIn</span><span class="op">,</span> <span class="nam">line</span><span class="op">=</span><span class="nam">fIn</span><span class="op">.</span><span class="nam">linenumber</span><span class="op">(</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t489" class="stm run hide_run"> <span class="nam">previous</span> <span class="op">+=</span> <span class="nam">l</span><span class="strut"> </span></p> +<p id="t490" class="stm run hide_run"> <span class="nam">hasher</span><span class="op">.</span><span class="nam">update</span><span class="op">(</span><span class="nam">to_bytes</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t491" class="stm run hide_run"> <span class="nam">l</span> <span class="op">=</span> <span class="nam">fIn</span><span class="op">.</span><span class="nam">readline</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t492" class="stm run hide_run"> <span class="nam">curHash</span> <span class="op">=</span> <span class="nam">hasher</span><span class="op">.</span><span class="nam">hexdigest</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t493" class="pln"><span class="strut"> </span></p> +<p id="t494" class="stm run hide_run"> <span class="key">if</span> <span class="key">not</span> <span class="nam">l</span> <span class="key">and</span> <span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bEofCanBeEnd</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t495" class="pln"> <span class="com"># We reached end of file before we found the end output line.</span><span class="strut"> </span></p> +<p id="t496" class="stm run hide_run"> <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="str">"Missing '%s' before end of file."</span> <span class="op">%</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sEndOutput</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t497" class="pln"> <span class="nam">file</span><span class="op">=</span><span class="nam">sFileIn</span><span class="op">,</span> <span class="nam">line</span><span class="op">=</span><span class="nam">fIn</span><span class="op">.</span><span class="nam">linenumber</span><span class="op">(</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t498" class="pln"><span class="strut"> </span></p> +<p id="t499" class="pln"> <span class="com"># Make the previous output available to the current code</span><span class="strut"> </span></p> +<p id="t500" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cogmodule</span><span class="op">.</span><span class="nam">previous</span> <span class="op">=</span> <span class="nam">previous</span><span class="strut"> </span></p> +<p id="t501" class="pln"><span class="strut"> </span></p> +<p id="t502" class="pln"> <span class="com"># Write the output of the spec to be the new output if we're</span><span class="strut"> </span></p> +<p id="t503" class="pln"> <span class="com"># supposed to generate code.</span><span class="strut"> </span></p> +<p id="t504" class="stm run hide_run"> <span class="nam">hasher</span> <span class="op">=</span> <span class="nam">hashlib</span><span class="op">.</span><span class="nam">md5</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t505" class="stm run hide_run"> <span class="key">if</span> <span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bNoGenerate</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t506" class="stm run hide_run"> <span class="nam">sFile</span> <span class="op">=</span> <span class="str">"%s+%d"</span> <span class="op">%</span> <span class="op">(</span><span class="nam">sFileIn</span><span class="op">,</span> <span class="nam">firstLineNum</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t507" class="stm run hide_run"> <span class="nam">sGen</span> <span class="op">=</span> <span class="nam">gen</span><span class="op">.</span><span class="nam">evaluate</span><span class="op">(</span><span class="nam">cog</span><span class="op">=</span><span class="nam">self</span><span class="op">,</span> <span class="nam">globals</span><span class="op">=</span><span class="nam">globals</span><span class="op">,</span> <span class="nam">fname</span><span class="op">=</span><span class="nam">sFile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t508" class="stm run hide_run"> <span class="nam">sGen</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">suffixLines</span><span class="op">(</span><span class="nam">sGen</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t509" class="stm run hide_run"> <span class="nam">hasher</span><span class="op">.</span><span class="nam">update</span><span class="op">(</span><span class="nam">to_bytes</span><span class="op">(</span><span class="nam">sGen</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t510" class="stm run hide_run"> <span class="nam">fOut</span><span class="op">.</span><span class="nam">write</span><span class="op">(</span><span class="nam">sGen</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t511" class="stm run hide_run"> <span class="nam">newHash</span> <span class="op">=</span> <span class="nam">hasher</span><span class="op">.</span><span class="nam">hexdigest</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t512" class="pln"><span class="strut"> </span></p> +<p id="t513" class="stm run hide_run"> <span class="nam">bSawCog</span> <span class="op">=</span> <span class="nam">True</span><span class="strut"> </span></p> +<p id="t514" class="pln"><span class="strut"> </span></p> +<p id="t515" class="pln"> <span class="com"># Write the ending output line</span><span class="strut"> </span></p> +<p id="t516" class="stm run hide_run"> <span class="nam">hashMatch</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">reEndOutput</span><span class="op">.</span><span class="nam">search</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t517" class="stm run hide_run"> <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bHashOutput</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t518" class="stm run hide_run"> <span class="key">if</span> <span class="nam">hashMatch</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t519" class="stm run hide_run"> <span class="nam">oldHash</span> <span class="op">=</span> <span class="nam">hashMatch</span><span class="op">.</span><span class="nam">groupdict</span><span class="op">(</span><span class="op">)</span><span class="op">[</span><span class="str">'hash'</span><span class="op">]</span><span class="strut"> </span></p> +<p id="t520" class="stm run hide_run"> <span class="key">if</span> <span class="nam">oldHash</span> <span class="op">!=</span> <span class="nam">curHash</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t521" class="stm run hide_run"> <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="str">"Output has been edited! Delete old checksum to unprotect."</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t522" class="pln"> <span class="nam">file</span><span class="op">=</span><span class="nam">sFileIn</span><span class="op">,</span> <span class="nam">line</span><span class="op">=</span><span class="nam">fIn</span><span class="op">.</span><span class="nam">linenumber</span><span class="op">(</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t523" class="pln"> <span class="com"># Create a new end line with the correct hash.</span><span class="strut"> </span></p> +<p id="t524" class="stm run hide_run"> <span class="nam">endpieces</span> <span class="op">=</span> <span class="nam">l</span><span class="op">.</span><span class="nam">split</span><span class="op">(</span><span class="nam">hashMatch</span><span class="op">.</span><span class="nam">group</span><span class="op">(</span><span class="num">0</span><span class="op">)</span><span class="op">,</span> <span class="num">1</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t525" class="pln"> <span class="key">else</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t526" class="pln"> <span class="com"># There was no old hash, but we want a new hash.</span><span class="strut"> </span></p> +<p id="t527" class="stm run hide_run"> <span class="nam">endpieces</span> <span class="op">=</span> <span class="nam">l</span><span class="op">.</span><span class="nam">split</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sEndOutput</span><span class="op">,</span> <span class="num">1</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t528" class="stm run hide_run"> <span class="nam">l</span> <span class="op">=</span> <span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">sEndFormat</span> <span class="op">%</span> <span class="nam">newHash</span><span class="op">)</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">endpieces</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t529" class="pln"> <span class="key">else</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t530" class="pln"> <span class="com"># We don't want hashes output, so if there was one, get rid of</span><span class="strut"> </span></p> +<p id="t531" class="pln"> <span class="com"># it.</span><span class="strut"> </span></p> +<p id="t532" class="stm run hide_run"> <span class="key">if</span> <span class="nam">hashMatch</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t533" class="stm run hide_run"> <span class="nam">l</span> <span class="op">=</span> <span class="nam">l</span><span class="op">.</span><span class="nam">replace</span><span class="op">(</span><span class="nam">hashMatch</span><span class="op">.</span><span class="nam">groupdict</span><span class="op">(</span><span class="op">)</span><span class="op">[</span><span class="str">'hashsect'</span><span class="op">]</span><span class="op">,</span> <span class="str">''</span><span class="op">,</span> <span class="num">1</span><span class="op">)</span><span class="strut"> </span></p> <p id="t534" class="pln"><span class="strut"> </span></p> -<p id="t535" class="stm par run hide_run"><span class="annotate" title="Line 535 was executed, but never jumped to line 536">535 ↛ 536 [?]</span> <span class="key">if</span> <span class="key">not</span> <span class="nam">bSawCog</span> <span class="key">and</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bWarnEmpty</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t536" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">showWarning</span><span class="op">(</span><span class="str">"no cog code found in %s"</span> <span class="op">%</span> <span class="nam">sFileIn</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t537" class="pln"> <span class="key">finally</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t538" class="stm par run hide_run"><span class="annotate" title="Line 538 was executed, but never jumped to line 539">538 ↛ 539 [?]</span> <span class="key">if</span> <span class="nam">fInToClose</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t539" class="stm mis"> <span class="nam">fInToClose</span><span class="op">.</span><span class="nam">close</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t540" class="stm par run hide_run"><span class="annotate" title="Line 540 was executed, but never jumped to line 541">540 ↛ 541 [?]</span> <span class="key">if</span> <span class="nam">fOutToClose</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t541" class="stm mis"> <span class="nam">fOutToClose</span><span class="op">.</span><span class="nam">close</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t542" class="pln"><span class="strut"> </span></p> -<p id="t543" class="pln"><span class="strut"> </span></p> -<p id="t544" class="pln"> <span class="com"># A regex for non-empty lines, used by suffixLines.</span><span class="strut"> </span></p> -<p id="t545" class="stm run hide_run"> <span class="nam">reNonEmptyLines</span> <span class="op">=</span> <span class="nam">re</span><span class="op">.</span><span class="nam">compile</span><span class="op">(</span><span class="str">"^\s*\S+.*$"</span><span class="op">,</span> <span class="nam">re</span><span class="op">.</span><span class="nam">MULTILINE</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t535" class="stm run hide_run"> <span class="key">if</span> <span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bDeleteCode</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t536" class="stm run hide_run"> <span class="nam">fOut</span><span class="op">.</span><span class="nam">write</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t537" class="stm run hide_run"> <span class="nam">l</span> <span class="op">=</span> <span class="nam">fIn</span><span class="op">.</span><span class="nam">readline</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t538" class="pln"><span class="strut"> </span></p> +<p id="t539" class="stm run hide_run"> <span class="key">if</span> <span class="key">not</span> <span class="nam">bSawCog</span> <span class="key">and</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bWarnEmpty</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t540" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">showWarning</span><span class="op">(</span><span class="str">"no cog code found in %s"</span> <span class="op">%</span> <span class="nam">sFileIn</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t541" class="pln"> <span class="key">finally</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t542" class="stm run hide_run"> <span class="key">if</span> <span class="nam">fInToClose</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t543" class="stm run hide_run"> <span class="nam">fInToClose</span><span class="op">.</span><span class="nam">close</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t544" class="stm run hide_run"> <span class="key">if</span> <span class="nam">fOutToClose</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t545" class="stm run hide_run"> <span class="nam">fOutToClose</span><span class="op">.</span><span class="nam">close</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> <p id="t546" class="pln"><span class="strut"> </span></p> -<p id="t547" class="stm run hide_run"> <span class="key">def</span> <span class="nam">suffixLines</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">text</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t548" class="pln"> <span class="str">""" Add suffixes to the lines in text, if our options desire it.</span><span class="strut"> </span></p> -<p id="t549" class="pln"><span class="str"> text is many lines, as a single string.</span><span class="strut"> </span></p> -<p id="t550" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t551" class="stm par run hide_run"><span class="annotate" title="Line 551 was executed, but never jumped to line 553">551 ↛ 553 [?]</span> <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sSuffix</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t552" class="pln"> <span class="com"># Find all non-blank lines, and add the suffix to the end.</span><span class="strut"> </span></p> -<p id="t553" class="stm mis"> <span class="nam">repl</span> <span class="op">=</span> <span class="str">r"\g<0>"</span> <span class="op">+</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sSuffix</span><span class="op">.</span><span class="nam">replace</span><span class="op">(</span><span class="str">'\\'</span><span class="op">,</span> <span class="str">'\\\\'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t554" class="stm mis"> <span class="nam">text</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">reNonEmptyLines</span><span class="op">.</span><span class="nam">sub</span><span class="op">(</span><span class="nam">repl</span><span class="op">,</span> <span class="nam">text</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t555" class="stm run hide_run"> <span class="key">return</span> <span class="nam">text</span><span class="strut"> </span></p> -<p id="t556" class="pln"><span class="strut"> </span></p> -<p id="t557" class="stm run hide_run"> <span class="key">def</span> <span class="nam">processString</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">sInput</span><span class="op">,</span> <span class="nam">fname</span><span class="op">=</span><span class="nam">None</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t558" class="pln"> <span class="str">""" Process sInput as the text to cog.</span><span class="strut"> </span></p> -<p id="t559" class="pln"><span class="str"> Return the cogged output as a string.</span><span class="strut"> </span></p> -<p id="t560" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t561" class="stm run hide_run"> <span class="nam">fOld</span> <span class="op">=</span> <span class="nam">StringIO</span><span class="op">(</span><span class="nam">sInput</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t562" class="stm run hide_run"> <span class="nam">fNew</span> <span class="op">=</span> <span class="nam">StringIO</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t563" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">processFile</span><span class="op">(</span><span class="nam">fOld</span><span class="op">,</span> <span class="nam">fNew</span><span class="op">,</span> <span class="nam">fname</span><span class="op">=</span><span class="nam">fname</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t564" class="stm run hide_run"> <span class="key">return</span> <span class="nam">fNew</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t565" class="pln"><span class="strut"> </span></p> -<p id="t566" class="stm run hide_run"> <span class="key">def</span> <span class="nam">replaceFile</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">sOldPath</span><span class="op">,</span> <span class="nam">sNewText</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t567" class="pln"> <span class="str">""" Replace file sOldPath with the contents sNewText</span><span class="strut"> </span></p> -<p id="t568" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t569" class="stm mis"> <span class="key">if</span> <span class="key">not</span> <span class="nam">os</span><span class="op">.</span><span class="nam">access</span><span class="op">(</span><span class="nam">sOldPath</span><span class="op">,</span> <span class="nam">os</span><span class="op">.</span><span class="nam">W_OK</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t570" class="pln"> <span class="com"># Need to ensure we can write.</span><span class="strut"> </span></p> -<p id="t571" class="stm mis"> <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sMakeWritableCmd</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t572" class="pln"> <span class="com"># Use an external command to make the file writable.</span><span class="strut"> </span></p> -<p id="t573" class="stm mis"> <span class="nam">cmd</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sMakeWritableCmd</span><span class="op">.</span><span class="nam">replace</span><span class="op">(</span><span class="str">'%s'</span><span class="op">,</span> <span class="nam">sOldPath</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t574" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">stdout</span><span class="op">.</span><span class="nam">write</span><span class="op">(</span><span class="nam">os</span><span class="op">.</span><span class="nam">popen</span><span class="op">(</span><span class="nam">cmd</span><span class="op">)</span><span class="op">.</span><span class="nam">read</span><span class="op">(</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t575" class="stm mis"> <span class="key">if</span> <span class="key">not</span> <span class="nam">os</span><span class="op">.</span><span class="nam">access</span><span class="op">(</span><span class="nam">sOldPath</span><span class="op">,</span> <span class="nam">os</span><span class="op">.</span><span class="nam">W_OK</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t576" class="stm mis"> <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="str">"Couldn't make %s writable"</span> <span class="op">%</span> <span class="nam">sOldPath</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t577" class="pln"> <span class="key">else</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t578" class="pln"> <span class="com"># Can't write!</span><span class="strut"> </span></p> -<p id="t579" class="stm mis"> <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="str">"Can't overwrite %s"</span> <span class="op">%</span> <span class="nam">sOldPath</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t580" class="stm mis"> <span class="nam">f</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">openOutputFile</span><span class="op">(</span><span class="nam">sOldPath</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t581" class="stm mis"> <span class="nam">f</span><span class="op">.</span><span class="nam">write</span><span class="op">(</span><span class="nam">sNewText</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t582" class="stm mis"> <span class="nam">f</span><span class="op">.</span><span class="nam">close</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t583" class="pln"><span class="strut"> </span></p> -<p id="t584" class="stm run hide_run"> <span class="key">def</span> <span class="nam">saveIncludePath</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t585" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">savedInclude</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">includePath</span><span class="op">[</span><span class="op">:</span><span class="op">]</span><span class="strut"> </span></p> -<p id="t586" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">savedSysPath</span> <span class="op">=</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">path</span><span class="op">[</span><span class="op">:</span><span class="op">]</span><span class="strut"> </span></p> +<p id="t547" class="pln"><span class="strut"> </span></p> +<p id="t548" class="pln"> <span class="com"># A regex for non-empty lines, used by suffixLines.</span><span class="strut"> </span></p> +<p id="t549" class="stm run hide_run"> <span class="nam">reNonEmptyLines</span> <span class="op">=</span> <span class="nam">re</span><span class="op">.</span><span class="nam">compile</span><span class="op">(</span><span class="str">"^\s*\S+.*$"</span><span class="op">,</span> <span class="nam">re</span><span class="op">.</span><span class="nam">MULTILINE</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t550" class="pln"><span class="strut"> </span></p> +<p id="t551" class="stm run hide_run"> <span class="key">def</span> <span class="nam">suffixLines</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">text</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t552" class="pln"> <span class="str">""" Add suffixes to the lines in text, if our options desire it.</span><span class="strut"> </span></p> +<p id="t553" class="pln"><span class="str"> text is many lines, as a single string.</span><span class="strut"> </span></p> +<p id="t554" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t555" class="stm run hide_run"> <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sSuffix</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t556" class="pln"> <span class="com"># Find all non-blank lines, and add the suffix to the end.</span><span class="strut"> </span></p> +<p id="t557" class="stm run hide_run"> <span class="nam">repl</span> <span class="op">=</span> <span class="str">r"\g<0>"</span> <span class="op">+</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sSuffix</span><span class="op">.</span><span class="nam">replace</span><span class="op">(</span><span class="str">'\\'</span><span class="op">,</span> <span class="str">'\\\\'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t558" class="stm run hide_run"> <span class="nam">text</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">reNonEmptyLines</span><span class="op">.</span><span class="nam">sub</span><span class="op">(</span><span class="nam">repl</span><span class="op">,</span> <span class="nam">text</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t559" class="stm run hide_run"> <span class="key">return</span> <span class="nam">text</span><span class="strut"> </span></p> +<p id="t560" class="pln"><span class="strut"> </span></p> +<p id="t561" class="stm run hide_run"> <span class="key">def</span> <span class="nam">processString</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">sInput</span><span class="op">,</span> <span class="nam">fname</span><span class="op">=</span><span class="nam">None</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t562" class="pln"> <span class="str">""" Process sInput as the text to cog.</span><span class="strut"> </span></p> +<p id="t563" class="pln"><span class="str"> Return the cogged output as a string.</span><span class="strut"> </span></p> +<p id="t564" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t565" class="stm run hide_run"> <span class="nam">fOld</span> <span class="op">=</span> <span class="nam">StringIO</span><span class="op">(</span><span class="nam">sInput</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t566" class="stm run hide_run"> <span class="nam">fNew</span> <span class="op">=</span> <span class="nam">StringIO</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t567" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">processFile</span><span class="op">(</span><span class="nam">fOld</span><span class="op">,</span> <span class="nam">fNew</span><span class="op">,</span> <span class="nam">fname</span><span class="op">=</span><span class="nam">fname</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t568" class="stm run hide_run"> <span class="key">return</span> <span class="nam">fNew</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t569" class="pln"><span class="strut"> </span></p> +<p id="t570" class="stm run hide_run"> <span class="key">def</span> <span class="nam">replaceFile</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">sOldPath</span><span class="op">,</span> <span class="nam">sNewText</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t571" class="pln"> <span class="str">""" Replace file sOldPath with the contents sNewText</span><span class="strut"> </span></p> +<p id="t572" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t573" class="stm run hide_run"> <span class="key">if</span> <span class="key">not</span> <span class="nam">os</span><span class="op">.</span><span class="nam">access</span><span class="op">(</span><span class="nam">sOldPath</span><span class="op">,</span> <span class="nam">os</span><span class="op">.</span><span class="nam">W_OK</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t574" class="pln"> <span class="com"># Need to ensure we can write.</span><span class="strut"> </span></p> +<p id="t575" class="stm run hide_run"> <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sMakeWritableCmd</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t576" class="pln"> <span class="com"># Use an external command to make the file writable.</span><span class="strut"> </span></p> +<p id="t577" class="stm run hide_run"> <span class="nam">cmd</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sMakeWritableCmd</span><span class="op">.</span><span class="nam">replace</span><span class="op">(</span><span class="str">'%s'</span><span class="op">,</span> <span class="nam">sOldPath</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t578" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">stdout</span><span class="op">.</span><span class="nam">write</span><span class="op">(</span><span class="nam">os</span><span class="op">.</span><span class="nam">popen</span><span class="op">(</span><span class="nam">cmd</span><span class="op">)</span><span class="op">.</span><span class="nam">read</span><span class="op">(</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t579" class="stm run hide_run"> <span class="key">if</span> <span class="key">not</span> <span class="nam">os</span><span class="op">.</span><span class="nam">access</span><span class="op">(</span><span class="nam">sOldPath</span><span class="op">,</span> <span class="nam">os</span><span class="op">.</span><span class="nam">W_OK</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t580" class="stm run hide_run"> <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="str">"Couldn't make %s writable"</span> <span class="op">%</span> <span class="nam">sOldPath</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t581" class="pln"> <span class="key">else</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t582" class="pln"> <span class="com"># Can't write!</span><span class="strut"> </span></p> +<p id="t583" class="stm run hide_run"> <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="str">"Can't overwrite %s"</span> <span class="op">%</span> <span class="nam">sOldPath</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t584" class="stm run hide_run"> <span class="nam">f</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">openOutputFile</span><span class="op">(</span><span class="nam">sOldPath</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t585" class="stm run hide_run"> <span class="nam">f</span><span class="op">.</span><span class="nam">write</span><span class="op">(</span><span class="nam">sNewText</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t586" class="stm run hide_run"> <span class="nam">f</span><span class="op">.</span><span class="nam">close</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> <p id="t587" class="pln"><span class="strut"> </span></p> -<p id="t588" class="stm run hide_run"> <span class="key">def</span> <span class="nam">restoreIncludePath</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t589" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">includePath</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">savedInclude</span><span class="strut"> </span></p> -<p id="t590" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cogmodule</span><span class="op">.</span><span class="nam">path</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">includePath</span><span class="strut"> </span></p> -<p id="t591" class="stm mis"> <span class="nam">sys</span><span class="op">.</span><span class="nam">path</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">savedSysPath</span><span class="strut"> </span></p> -<p id="t592" class="pln"><span class="strut"> </span></p> -<p id="t593" class="stm run hide_run"> <span class="key">def</span> <span class="nam">addToIncludePath</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">includePath</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t594" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cogmodule</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">extend</span><span class="op">(</span><span class="nam">includePath</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t595" class="stm mis"> <span class="nam">sys</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">extend</span><span class="op">(</span><span class="nam">includePath</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t588" class="stm run hide_run"> <span class="key">def</span> <span class="nam">saveIncludePath</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t589" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">savedInclude</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">includePath</span><span class="op">[</span><span class="op">:</span><span class="op">]</span><span class="strut"> </span></p> +<p id="t590" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">savedSysPath</span> <span class="op">=</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">path</span><span class="op">[</span><span class="op">:</span><span class="op">]</span><span class="strut"> </span></p> +<p id="t591" class="pln"><span class="strut"> </span></p> +<p id="t592" class="stm run hide_run"> <span class="key">def</span> <span class="nam">restoreIncludePath</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t593" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">includePath</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">savedInclude</span><span class="strut"> </span></p> +<p id="t594" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cogmodule</span><span class="op">.</span><span class="nam">path</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">includePath</span><span class="strut"> </span></p> +<p id="t595" class="stm run hide_run"> <span class="nam">sys</span><span class="op">.</span><span class="nam">path</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">savedSysPath</span><span class="strut"> </span></p> <p id="t596" class="pln"><span class="strut"> </span></p> -<p id="t597" class="stm run hide_run"> <span class="key">def</span> <span class="nam">processOneFile</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">sFile</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t598" class="pln"> <span class="str">""" Process one filename through cog.</span><span class="strut"> </span></p> -<p id="t599" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t597" class="stm run hide_run"> <span class="key">def</span> <span class="nam">addToIncludePath</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">includePath</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t598" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cogmodule</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">extend</span><span class="op">(</span><span class="nam">includePath</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t599" class="stm run hide_run"> <span class="nam">sys</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">extend</span><span class="op">(</span><span class="nam">includePath</span><span class="op">)</span><span class="strut"> </span></p> <p id="t600" class="pln"><span class="strut"> </span></p> -<p id="t601" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">saveIncludePath</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t602" class="stm mis"> <span class="nam">bNeedNewline</span> <span class="op">=</span> <span class="nam">False</span><span class="strut"> </span></p> -<p id="t603" class="pln"><span class="strut"> </span></p> -<p id="t604" class="stm mis"> <span class="key">try</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t605" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">addToIncludePath</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">includePath</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t606" class="pln"> <span class="com"># Since we know where the input file came from,</span><span class="strut"> </span></p> -<p id="t607" class="pln"> <span class="com"># push its directory onto the include path.</span><span class="strut"> </span></p> -<p id="t608" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">addToIncludePath</span><span class="op">(</span><span class="op">[</span><span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">dirname</span><span class="op">(</span><span class="nam">sFile</span><span class="op">)</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t609" class="pln"><span class="strut"> </span></p> -<p id="t610" class="pln"> <span class="com"># How we process the file depends on where the output is going.</span><span class="strut"> </span></p> -<p id="t611" class="stm mis"> <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sOutputName</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t612" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">processFile</span><span class="op">(</span><span class="nam">sFile</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sOutputName</span><span class="op">,</span> <span class="nam">sFile</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t613" class="stm mis"> <span class="key">elif</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bReplace</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t614" class="pln"> <span class="com"># We want to replace the cog file with the output,</span><span class="strut"> </span></p> -<p id="t615" class="pln"> <span class="com"># but only if they differ.</span><span class="strut"> </span></p> -<p id="t616" class="stm mis"> <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">verbosity</span> <span class="op">>=</span> <span class="num">2</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t617" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">prout</span><span class="op">(</span><span class="str">"Cogging %s"</span> <span class="op">%</span> <span class="nam">sFile</span><span class="op">,</span> <span class="nam">end</span><span class="op">=</span><span class="str">""</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t618" class="stm mis"> <span class="nam">bNeedNewline</span> <span class="op">=</span> <span class="nam">True</span><span class="strut"> </span></p> -<p id="t619" class="pln"><span class="strut"> </span></p> -<p id="t620" class="stm mis"> <span class="key">try</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t621" class="stm mis"> <span class="nam">fOldFile</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">openInputFile</span><span class="op">(</span><span class="nam">sFile</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t622" class="stm mis"> <span class="nam">sOldText</span> <span class="op">=</span> <span class="nam">fOldFile</span><span class="op">.</span><span class="nam">read</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t623" class="stm mis"> <span class="nam">fOldFile</span><span class="op">.</span><span class="nam">close</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t624" class="stm mis"> <span class="nam">sNewText</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">sOldText</span><span class="op">,</span> <span class="nam">fname</span><span class="op">=</span><span class="nam">sFile</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t625" class="stm mis"> <span class="key">if</span> <span class="nam">sOldText</span> <span class="op">!=</span> <span class="nam">sNewText</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t626" class="stm mis"> <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">verbosity</span> <span class="op">>=</span> <span class="num">1</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t627" class="stm mis"> <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">verbosity</span> <span class="op"><</span> <span class="num">2</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t628" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">prout</span><span class="op">(</span><span class="str">"Cogging %s"</span> <span class="op">%</span> <span class="nam">sFile</span><span class="op">,</span> <span class="nam">end</span><span class="op">=</span><span class="str">""</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t629" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">prout</span><span class="op">(</span><span class="str">" (changed)"</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t630" class="stm mis"> <span class="nam">bNeedNewline</span> <span class="op">=</span> <span class="nam">False</span><span class="strut"> </span></p> -<p id="t631" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">replaceFile</span><span class="op">(</span><span class="nam">sFile</span><span class="op">,</span> <span class="nam">sNewText</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t632" class="pln"> <span class="key">finally</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t633" class="pln"> <span class="com"># The try-finally block is so we can print a partial line</span><span class="strut"> </span></p> -<p id="t634" class="pln"> <span class="com"># with the name of the file, and print (changed) on the</span><span class="strut"> </span></p> -<p id="t635" class="pln"> <span class="com"># same line, but also make sure to break the line before</span><span class="strut"> </span></p> -<p id="t636" class="pln"> <span class="com"># any traceback.</span><span class="strut"> </span></p> -<p id="t637" class="stm mis"> <span class="key">if</span> <span class="nam">bNeedNewline</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t638" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">prout</span><span class="op">(</span><span class="str">""</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t639" class="pln"> <span class="key">else</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t640" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">processFile</span><span class="op">(</span><span class="nam">sFile</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">stdout</span><span class="op">,</span> <span class="nam">sFile</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t641" class="pln"> <span class="key">finally</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t642" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">restoreIncludePath</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t643" class="pln"><span class="strut"> </span></p> -<p id="t644" class="stm run hide_run"> <span class="key">def</span> <span class="nam">processFileList</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">sFileList</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t645" class="pln"> <span class="str">""" Process the files in a file list.</span><span class="strut"> </span></p> -<p id="t646" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t647" class="stm mis"> <span class="nam">flist</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">openInputFile</span><span class="op">(</span><span class="nam">sFileList</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t648" class="stm mis"> <span class="nam">lines</span> <span class="op">=</span> <span class="nam">flist</span><span class="op">.</span><span class="nam">readlines</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t649" class="stm mis"> <span class="nam">flist</span><span class="op">.</span><span class="nam">close</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t650" class="stm mis"> <span class="key">for</span> <span class="nam">l</span> <span class="key">in</span> <span class="nam">lines</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t651" class="pln"> <span class="com"># Use shlex to parse the line like a shell.</span><span class="strut"> </span></p> -<p id="t652" class="stm mis"> <span class="nam">lex</span> <span class="op">=</span> <span class="nam">shlex</span><span class="op">.</span><span class="nam">shlex</span><span class="op">(</span><span class="nam">l</span><span class="op">,</span> <span class="nam">posix</span><span class="op">=</span><span class="nam">True</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t653" class="stm mis"> <span class="nam">lex</span><span class="op">.</span><span class="nam">whitespace_split</span> <span class="op">=</span> <span class="nam">True</span><span class="strut"> </span></p> -<p id="t654" class="stm mis"> <span class="nam">lex</span><span class="op">.</span><span class="nam">commenters</span> <span class="op">=</span> <span class="str">'#'</span><span class="strut"> </span></p> -<p id="t655" class="pln"> <span class="com"># No escapes, so that backslash can be part of the path</span><span class="strut"> </span></p> -<p id="t656" class="stm mis"> <span class="nam">lex</span><span class="op">.</span><span class="nam">escape</span> <span class="op">=</span> <span class="str">''</span><span class="strut"> </span></p> -<p id="t657" class="stm mis"> <span class="nam">args</span> <span class="op">=</span> <span class="nam">list</span><span class="op">(</span><span class="nam">lex</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t658" class="stm mis"> <span class="key">if</span> <span class="nam">args</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t659" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">processArguments</span><span class="op">(</span><span class="nam">args</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t660" class="pln"><span class="strut"> </span></p> -<p id="t661" class="stm run hide_run"> <span class="key">def</span> <span class="nam">processArguments</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">args</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t662" class="pln"> <span class="str">""" Process one command-line.</span><span class="strut"> </span></p> -<p id="t663" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t664" class="stm mis"> <span class="nam">saved_options</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="strut"> </span></p> -<p id="t665" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">clone</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t666" class="pln"><span class="strut"> </span></p> -<p id="t667" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">parseArgs</span><span class="op">(</span><span class="nam">args</span><span class="op">[</span><span class="num">1</span><span class="op">:</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t668" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">validate</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t669" class="pln"><span class="strut"> </span></p> -<p id="t670" class="stm mis"> <span class="key">if</span> <span class="nam">args</span><span class="op">[</span><span class="num">0</span><span class="op">]</span><span class="op">[</span><span class="num">0</span><span class="op">]</span> <span class="op">==</span> <span class="str">'@'</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t671" class="stm mis"> <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sOutputName</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t672" class="stm mis"> <span class="key">raise</span> <span class="nam">CogUsageError</span><span class="op">(</span><span class="str">"Can't use -o with @file"</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t673" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">processFileList</span><span class="op">(</span><span class="nam">args</span><span class="op">[</span><span class="num">0</span><span class="op">]</span><span class="op">[</span><span class="num">1</span><span class="op">:</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t674" class="pln"> <span class="key">else</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t675" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">processOneFile</span><span class="op">(</span><span class="nam">args</span><span class="op">[</span><span class="num">0</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t676" class="pln"><span class="strut"> </span></p> -<p id="t677" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span> <span class="op">=</span> <span class="nam">saved_options</span><span class="strut"> </span></p> -<p id="t678" class="pln"><span class="strut"> </span></p> -<p id="t679" class="stm run hide_run"> <span class="key">def</span> <span class="nam">callableMain</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">argv</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t680" class="pln"> <span class="str">""" All of command-line cog, but in a callable form.</span><span class="strut"> </span></p> -<p id="t681" class="pln"><span class="str"> This is used by main.</span><span class="strut"> </span></p> -<p id="t682" class="pln"><span class="str"> argv is the equivalent of sys.argv.</span><span class="strut"> </span></p> -<p id="t683" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t684" class="stm mis"> <span class="nam">argv</span> <span class="op">=</span> <span class="nam">argv</span><span class="op">[</span><span class="num">1</span><span class="op">:</span><span class="op">]</span><span class="strut"> </span></p> -<p id="t685" class="pln"><span class="strut"> </span></p> -<p id="t686" class="pln"> <span class="com"># Provide help if asked for anywhere in the command line.</span><span class="strut"> </span></p> -<p id="t687" class="stm mis"> <span class="key">if</span> <span class="str">'-?'</span> <span class="key">in</span> <span class="nam">argv</span> <span class="key">or</span> <span class="str">'-h'</span> <span class="key">in</span> <span class="nam">argv</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t688" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">prerr</span><span class="op">(</span><span class="nam">usage</span><span class="op">,</span> <span class="nam">end</span><span class="op">=</span><span class="str">""</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t689" class="stm mis"> <span class="key">return</span><span class="strut"> </span></p> -<p id="t690" class="pln"><span class="strut"> </span></p> -<p id="t691" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">parseArgs</span><span class="op">(</span><span class="nam">argv</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t692" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">validate</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t693" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">_fixEndOutputPatterns</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t601" class="stm run hide_run"> <span class="key">def</span> <span class="nam">processOneFile</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">sFile</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t602" class="pln"> <span class="str">""" Process one filename through cog.</span><span class="strut"> </span></p> +<p id="t603" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t604" class="pln"><span class="strut"> </span></p> +<p id="t605" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">saveIncludePath</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t606" class="stm run hide_run"> <span class="nam">bNeedNewline</span> <span class="op">=</span> <span class="nam">False</span><span class="strut"> </span></p> +<p id="t607" class="pln"><span class="strut"> </span></p> +<p id="t608" class="stm run hide_run"> <span class="key">try</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t609" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">addToIncludePath</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">includePath</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t610" class="pln"> <span class="com"># Since we know where the input file came from,</span><span class="strut"> </span></p> +<p id="t611" class="pln"> <span class="com"># push its directory onto the include path.</span><span class="strut"> </span></p> +<p id="t612" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">addToIncludePath</span><span class="op">(</span><span class="op">[</span><span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">dirname</span><span class="op">(</span><span class="nam">sFile</span><span class="op">)</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t613" class="pln"><span class="strut"> </span></p> +<p id="t614" class="pln"> <span class="com"># How we process the file depends on where the output is going.</span><span class="strut"> </span></p> +<p id="t615" class="stm run hide_run"> <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sOutputName</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t616" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">processFile</span><span class="op">(</span><span class="nam">sFile</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sOutputName</span><span class="op">,</span> <span class="nam">sFile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t617" class="stm run hide_run"> <span class="key">elif</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bReplace</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t618" class="pln"> <span class="com"># We want to replace the cog file with the output,</span><span class="strut"> </span></p> +<p id="t619" class="pln"> <span class="com"># but only if they differ.</span><span class="strut"> </span></p> +<p id="t620" class="stm run hide_run"> <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">verbosity</span> <span class="op">>=</span> <span class="num">2</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t621" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">prout</span><span class="op">(</span><span class="str">"Cogging %s"</span> <span class="op">%</span> <span class="nam">sFile</span><span class="op">,</span> <span class="nam">end</span><span class="op">=</span><span class="str">""</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t622" class="stm run hide_run"> <span class="nam">bNeedNewline</span> <span class="op">=</span> <span class="nam">True</span><span class="strut"> </span></p> +<p id="t623" class="pln"><span class="strut"> </span></p> +<p id="t624" class="stm run hide_run"> <span class="key">try</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t625" class="stm run hide_run"> <span class="nam">fOldFile</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">openInputFile</span><span class="op">(</span><span class="nam">sFile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t626" class="stm run hide_run"> <span class="nam">sOldText</span> <span class="op">=</span> <span class="nam">fOldFile</span><span class="op">.</span><span class="nam">read</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t627" class="stm run hide_run"> <span class="nam">fOldFile</span><span class="op">.</span><span class="nam">close</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t628" class="stm run hide_run"> <span class="nam">sNewText</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">sOldText</span><span class="op">,</span> <span class="nam">fname</span><span class="op">=</span><span class="nam">sFile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t629" class="stm run hide_run"> <span class="key">if</span> <span class="nam">sOldText</span> <span class="op">!=</span> <span class="nam">sNewText</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t630" class="stm run hide_run"> <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">verbosity</span> <span class="op">>=</span> <span class="num">1</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t631" class="stm run hide_run"> <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">verbosity</span> <span class="op"><</span> <span class="num">2</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t632" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">prout</span><span class="op">(</span><span class="str">"Cogging %s"</span> <span class="op">%</span> <span class="nam">sFile</span><span class="op">,</span> <span class="nam">end</span><span class="op">=</span><span class="str">""</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t633" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">prout</span><span class="op">(</span><span class="str">" (changed)"</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t634" class="stm run hide_run"> <span class="nam">bNeedNewline</span> <span class="op">=</span> <span class="nam">False</span><span class="strut"> </span></p> +<p id="t635" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">replaceFile</span><span class="op">(</span><span class="nam">sFile</span><span class="op">,</span> <span class="nam">sNewText</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t636" class="pln"> <span class="key">finally</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t637" class="pln"> <span class="com"># The try-finally block is so we can print a partial line</span><span class="strut"> </span></p> +<p id="t638" class="pln"> <span class="com"># with the name of the file, and print (changed) on the</span><span class="strut"> </span></p> +<p id="t639" class="pln"> <span class="com"># same line, but also make sure to break the line before</span><span class="strut"> </span></p> +<p id="t640" class="pln"> <span class="com"># any traceback.</span><span class="strut"> </span></p> +<p id="t641" class="stm run hide_run"> <span class="key">if</span> <span class="nam">bNeedNewline</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t642" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">prout</span><span class="op">(</span><span class="str">""</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t643" class="pln"> <span class="key">else</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t644" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">processFile</span><span class="op">(</span><span class="nam">sFile</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">stdout</span><span class="op">,</span> <span class="nam">sFile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t645" class="pln"> <span class="key">finally</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t646" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">restoreIncludePath</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t647" class="pln"><span class="strut"> </span></p> +<p id="t648" class="stm run hide_run"> <span class="key">def</span> <span class="nam">processFileList</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">sFileList</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t649" class="pln"> <span class="str">""" Process the files in a file list.</span><span class="strut"> </span></p> +<p id="t650" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t651" class="stm run hide_run"> <span class="nam">flist</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">openInputFile</span><span class="op">(</span><span class="nam">sFileList</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t652" class="stm run hide_run"> <span class="nam">lines</span> <span class="op">=</span> <span class="nam">flist</span><span class="op">.</span><span class="nam">readlines</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t653" class="stm run hide_run"> <span class="nam">flist</span><span class="op">.</span><span class="nam">close</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t654" class="stm run hide_run"> <span class="key">for</span> <span class="nam">l</span> <span class="key">in</span> <span class="nam">lines</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t655" class="pln"> <span class="com"># Use shlex to parse the line like a shell.</span><span class="strut"> </span></p> +<p id="t656" class="stm run hide_run"> <span class="nam">lex</span> <span class="op">=</span> <span class="nam">shlex</span><span class="op">.</span><span class="nam">shlex</span><span class="op">(</span><span class="nam">l</span><span class="op">,</span> <span class="nam">posix</span><span class="op">=</span><span class="nam">True</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t657" class="stm run hide_run"> <span class="nam">lex</span><span class="op">.</span><span class="nam">whitespace_split</span> <span class="op">=</span> <span class="nam">True</span><span class="strut"> </span></p> +<p id="t658" class="stm run hide_run"> <span class="nam">lex</span><span class="op">.</span><span class="nam">commenters</span> <span class="op">=</span> <span class="str">'#'</span><span class="strut"> </span></p> +<p id="t659" class="pln"> <span class="com"># No escapes, so that backslash can be part of the path</span><span class="strut"> </span></p> +<p id="t660" class="stm run hide_run"> <span class="nam">lex</span><span class="op">.</span><span class="nam">escape</span> <span class="op">=</span> <span class="str">''</span><span class="strut"> </span></p> +<p id="t661" class="stm run hide_run"> <span class="nam">args</span> <span class="op">=</span> <span class="nam">list</span><span class="op">(</span><span class="nam">lex</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t662" class="stm run hide_run"> <span class="key">if</span> <span class="nam">args</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t663" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">processArguments</span><span class="op">(</span><span class="nam">args</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t664" class="pln"><span class="strut"> </span></p> +<p id="t665" class="stm run hide_run"> <span class="key">def</span> <span class="nam">processArguments</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">args</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t666" class="pln"> <span class="str">""" Process one command-line.</span><span class="strut"> </span></p> +<p id="t667" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t668" class="stm run hide_run"> <span class="nam">saved_options</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="strut"> </span></p> +<p id="t669" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">clone</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t670" class="pln"><span class="strut"> </span></p> +<p id="t671" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">parseArgs</span><span class="op">(</span><span class="nam">args</span><span class="op">[</span><span class="num">1</span><span class="op">:</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t672" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">validate</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t673" class="pln"><span class="strut"> </span></p> +<p id="t674" class="stm run hide_run"> <span class="key">if</span> <span class="nam">args</span><span class="op">[</span><span class="num">0</span><span class="op">]</span><span class="op">[</span><span class="num">0</span><span class="op">]</span> <span class="op">==</span> <span class="str">'@'</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t675" class="stm run hide_run"> <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">sOutputName</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t676" class="stm run hide_run"> <span class="key">raise</span> <span class="nam">CogUsageError</span><span class="op">(</span><span class="str">"Can't use -o with @file"</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t677" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">processFileList</span><span class="op">(</span><span class="nam">args</span><span class="op">[</span><span class="num">0</span><span class="op">]</span><span class="op">[</span><span class="num">1</span><span class="op">:</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t678" class="pln"> <span class="key">else</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t679" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">processOneFile</span><span class="op">(</span><span class="nam">args</span><span class="op">[</span><span class="num">0</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t680" class="pln"><span class="strut"> </span></p> +<p id="t681" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span> <span class="op">=</span> <span class="nam">saved_options</span><span class="strut"> </span></p> +<p id="t682" class="pln"><span class="strut"> </span></p> +<p id="t683" class="stm run hide_run"> <span class="key">def</span> <span class="nam">callableMain</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">argv</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t684" class="pln"> <span class="str">""" All of command-line cog, but in a callable form.</span><span class="strut"> </span></p> +<p id="t685" class="pln"><span class="str"> This is used by main.</span><span class="strut"> </span></p> +<p id="t686" class="pln"><span class="str"> argv is the equivalent of sys.argv.</span><span class="strut"> </span></p> +<p id="t687" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t688" class="stm run hide_run"> <span class="nam">argv</span> <span class="op">=</span> <span class="nam">argv</span><span class="op">[</span><span class="num">1</span><span class="op">:</span><span class="op">]</span><span class="strut"> </span></p> +<p id="t689" class="pln"><span class="strut"> </span></p> +<p id="t690" class="pln"> <span class="com"># Provide help if asked for anywhere in the command line.</span><span class="strut"> </span></p> +<p id="t691" class="stm run hide_run"> <span class="key">if</span> <span class="str">'-?'</span> <span class="key">in</span> <span class="nam">argv</span> <span class="key">or</span> <span class="str">'-h'</span> <span class="key">in</span> <span class="nam">argv</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t692" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">prerr</span><span class="op">(</span><span class="nam">usage</span><span class="op">,</span> <span class="nam">end</span><span class="op">=</span><span class="str">""</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t693" class="stm run hide_run"> <span class="key">return</span><span class="strut"> </span></p> <p id="t694" class="pln"><span class="strut"> </span></p> -<p id="t695" class="stm mis"> <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bShowVersion</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t696" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">prout</span><span class="op">(</span><span class="str">"Cog version %s"</span> <span class="op">%</span> <span class="nam">__version__</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t697" class="stm mis"> <span class="key">return</span><span class="strut"> </span></p> +<p id="t695" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">parseArgs</span><span class="op">(</span><span class="nam">argv</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t696" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">validate</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t697" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">_fixEndOutputPatterns</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> <p id="t698" class="pln"><span class="strut"> </span></p> -<p id="t699" class="stm mis"> <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">args</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t700" class="stm mis"> <span class="key">for</span> <span class="nam">a</span> <span class="key">in</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">args</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t701" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">processArguments</span><span class="op">(</span><span class="op">[</span><span class="nam">a</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t702" class="pln"> <span class="key">else</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t703" class="stm mis"> <span class="key">raise</span> <span class="nam">CogUsageError</span><span class="op">(</span><span class="str">"No files to process"</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t704" class="pln"><span class="strut"> </span></p> -<p id="t705" class="stm run hide_run"> <span class="key">def</span> <span class="nam">main</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">argv</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t706" class="pln"> <span class="str">""" Handle the command-line execution for cog.</span><span class="strut"> </span></p> -<p id="t707" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t699" class="stm run hide_run"> <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bShowVersion</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t700" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">prout</span><span class="op">(</span><span class="str">"Cog version %s"</span> <span class="op">%</span> <span class="nam">__version__</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t701" class="stm run hide_run"> <span class="key">return</span><span class="strut"> </span></p> +<p id="t702" class="pln"><span class="strut"> </span></p> +<p id="t703" class="stm run hide_run"> <span class="key">if</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">args</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t704" class="stm run hide_run"> <span class="key">for</span> <span class="nam">a</span> <span class="key">in</span> <span class="nam">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">args</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t705" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">processArguments</span><span class="op">(</span><span class="op">[</span><span class="nam">a</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t706" class="pln"> <span class="key">else</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t707" class="stm run hide_run"> <span class="key">raise</span> <span class="nam">CogUsageError</span><span class="op">(</span><span class="str">"No files to process"</span><span class="op">)</span><span class="strut"> </span></p> <p id="t708" class="pln"><span class="strut"> </span></p> -<p id="t709" class="stm mis"> <span class="key">try</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t710" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="nam">argv</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t711" class="stm mis"> <span class="key">return</span> <span class="num">0</span><span class="strut"> </span></p> -<p id="t712" class="stm mis"> <span class="key">except</span> <span class="nam">CogUsageError</span> <span class="key">as</span> <span class="nam">err</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t713" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">prerr</span><span class="op">(</span><span class="nam">err</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t714" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">prerr</span><span class="op">(</span><span class="str">"(for help use -?)"</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t715" class="stm mis"> <span class="key">return</span> <span class="num">2</span><span class="strut"> </span></p> -<p id="t716" class="stm mis"> <span class="key">except</span> <span class="nam">CogGeneratedError</span> <span class="key">as</span> <span class="nam">err</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t717" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">prerr</span><span class="op">(</span><span class="str">"Error: %s"</span> <span class="op">%</span> <span class="nam">err</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t718" class="stm mis"> <span class="key">return</span> <span class="num">3</span><span class="strut"> </span></p> -<p id="t719" class="stm mis"> <span class="key">except</span> <span class="nam">CogError</span> <span class="key">as</span> <span class="nam">err</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t720" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">prerr</span><span class="op">(</span><span class="nam">err</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t721" class="stm mis"> <span class="key">return</span> <span class="num">1</span><span class="strut"> </span></p> -<p id="t722" class="stm mis"> <span class="key">except</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t723" class="stm mis"> <span class="nam">traceback</span><span class="op">.</span><span class="nam">print_exc</span><span class="op">(</span><span class="nam">None</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">stderr</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t724" class="stm mis"> <span class="key">return</span> <span class="num">1</span><span class="strut"> </span></p> -<p id="t725" class="pln"><span class="strut"> </span></p> -<p id="t726" class="pln"><span class="com"># History:</span><span class="strut"> </span></p> -<p id="t727" class="pln"><span class="com"># 20040210: First public version.</span><span class="strut"> </span></p> -<p id="t728" class="pln"><span class="com"># 20040220: Text preceding the start and end marker are removed from Python lines.</span><span class="strut"> </span></p> -<p id="t729" class="pln"><span class="com"># -v option on the command line shows the version.</span><span class="strut"> </span></p> -<p id="t730" class="pln"><span class="com"># 20040311: Make sure the last line of output is properly ended with a newline.</span><span class="strut"> </span></p> -<p id="t731" class="pln"><span class="com"># 20040605: Fixed some blank line handling in cog.</span><span class="strut"> </span></p> -<p id="t732" class="pln"><span class="com"># Fixed problems with assigning to xml elements in handyxml.</span><span class="strut"> </span></p> -<p id="t733" class="pln"><span class="com"># 20040621: Changed all line-ends to LF from CRLF.</span><span class="strut"> </span></p> -<p id="t734" class="pln"><span class="com"># 20041002: Refactor some option handling to simplify unittesting the options.</span><span class="strut"> </span></p> -<p id="t735" class="pln"><span class="com"># 20041118: cog.out and cog.outl have optional string arguments.</span><span class="strut"> </span></p> -<p id="t736" class="pln"><span class="com"># 20041119: File names weren't being properly passed around for warnings, etc.</span><span class="strut"> </span></p> -<p id="t737" class="pln"><span class="com"># 20041122: Added cog.firstLineNum: a property with the line number of the [[[cog line.</span><span class="strut"> </span></p> -<p id="t738" class="pln"><span class="com"># Added cog.inFile and cog.outFile: the names of the input and output file.</span><span class="strut"> </span></p> -<p id="t739" class="pln"><span class="com"># 20041218: Single-line cog generators, with start marker and end marker on</span><span class="strut"> </span></p> -<p id="t740" class="pln"><span class="com"># the same line.</span><span class="strut"> </span></p> -<p id="t741" class="pln"><span class="com"># 20041230: Keep a single globals dict for all the code fragments in a single</span><span class="strut"> </span></p> -<p id="t742" class="pln"><span class="com"># file so they can share state.</span><span class="strut"> </span></p> -<p id="t743" class="pln"><span class="com"># 20050206: Added the -x switch to remove all generated output.</span><span class="strut"> </span></p> -<p id="t744" class="pln"><span class="com"># 20050218: Now code can be on the marker lines as well.</span><span class="strut"> </span></p> -<p id="t745" class="pln"><span class="com"># 20050219: Added -c switch to checksum the output so that edits can be</span><span class="strut"> </span></p> -<p id="t746" class="pln"><span class="com"># detected before they are obliterated.</span><span class="strut"> </span></p> -<p id="t747" class="pln"><span class="com"># 20050521: Added cog.error, contributed by Alexander Belchenko.</span><span class="strut"> </span></p> -<p id="t748" class="pln"><span class="com"># 20050720: Added code deletion and settable globals contributed by Blake Winton.</span><span class="strut"> </span></p> -<p id="t749" class="pln"><span class="com"># 20050724: Many tweaks to improve code coverage.</span><span class="strut"> </span></p> -<p id="t750" class="pln"><span class="com"># 20050726: Error messages are now printed with no traceback.</span><span class="strut"> </span></p> -<p id="t751" class="pln"><span class="com"># Code can no longer appear on the marker lines,</span><span class="strut"> </span></p> -<p id="t752" class="pln"><span class="com"># except for single-line style.</span><span class="strut"> </span></p> -<p id="t753" class="pln"><span class="com"># -z allows omission of the [[[end]]] marker, and it will be assumed</span><span class="strut"> </span></p> -<p id="t754" class="pln"><span class="com"># at the end of the file.</span><span class="strut"> </span></p> -<p id="t755" class="pln"><span class="com"># 20050729: Refactor option parsing into a separate class, in preparation for</span><span class="strut"> </span></p> -<p id="t756" class="pln"><span class="com"># future features.</span><span class="strut"> </span></p> -<p id="t757" class="pln"><span class="com"># 20050805: The cogmodule.path wasn't being properly maintained.</span><span class="strut"> </span></p> -<p id="t758" class="pln"><span class="com"># 20050808: Added the -D option to define a global value.</span><span class="strut"> </span></p> -<p id="t759" class="pln"><span class="com"># 20050810: The %s in the -w command is dealt with more robustly.</span><span class="strut"> </span></p> -<p id="t760" class="pln"><span class="com"># Added the -s option to suffix output lines with a marker.</span><span class="strut"> </span></p> -<p id="t761" class="pln"><span class="com"># 20050817: Now @files can have arguments on each line to change the cog's</span><span class="strut"> </span></p> -<p id="t762" class="pln"><span class="com"># behavior for that line.</span><span class="strut"> </span></p> -<p id="t763" class="pln"><span class="com"># 20051006: Version 2.0</span><span class="strut"> </span></p> -<p id="t764" class="pln"><span class="com"># 20080521: -U options lets you create Unix newlines on Windows. Thanks,</span><span class="strut"> </span></p> -<p id="t765" class="pln"><span class="com"># Alexander Belchenko.</span><span class="strut"> </span></p> -<p id="t766" class="pln"><span class="com"># 20080522: It's now ok to have -d with output to stdout, and now we validate</span><span class="strut"> </span></p> -<p id="t767" class="pln"><span class="com"># the args after each line of an @file.</span><span class="strut"> </span></p> -<p id="t768" class="pln"><span class="com"># 20090520: Use hashlib where it's available, to avoid a warning.</span><span class="strut"> </span></p> -<p id="t769" class="pln"><span class="com"># Use the builtin compile() instead of compiler, for Jython.</span><span class="strut"> </span></p> -<p id="t770" class="pln"><span class="com"># Explicitly close files we opened, Jython likes this.</span><span class="strut"> </span></p> -<p id="t771" class="pln"><span class="com"># 20120205: Port to Python 3. Lowest supported version is 2.6.</span><span class="strut"> </span></p> -<p id="t772" class="pln"><span class="com"># 20150104: --markers option added by Doug Hellmann.</span><span class="strut"> </span></p> -<p id="t773" class="pln"><span class="com"># 20150104: -n ENCODING option added by Petr Gladkiy.</span><span class="strut"> </span></p> -<p id="t774" class="pln"><span class="com"># 20150107: Added --verbose to control what files get listed.</span><span class="strut"> </span></p> -<p id="t775" class="pln"><span class="com"># 20150111: Version 2.4</span><span class="strut"> </span></p> - +<p id="t709" class="stm run hide_run"> <span class="key">def</span> <span class="nam">main</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">argv</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t710" class="pln"> <span class="str">""" Handle the command-line execution for cog.</span><span class="strut"> </span></p> +<p id="t711" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t712" class="pln"><span class="strut"> </span></p> +<p id="t713" class="stm run hide_run"> <span class="key">try</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t714" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="nam">argv</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t715" class="stm run hide_run"> <span class="key">return</span> <span class="num">0</span><span class="strut"> </span></p> +<p id="t716" class="stm run hide_run"> <span class="key">except</span> <span class="nam">CogUsageError</span> <span class="key">as</span> <span class="nam">err</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t717" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">prerr</span><span class="op">(</span><span class="nam">err</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t718" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">prerr</span><span class="op">(</span><span class="str">"(for help use -?)"</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t719" class="stm run hide_run"> <span class="key">return</span> <span class="num">2</span><span class="strut"> </span></p> +<p id="t720" class="stm run hide_run"> <span class="key">except</span> <span class="nam">CogGeneratedError</span> <span class="key">as</span> <span class="nam">err</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t721" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">prerr</span><span class="op">(</span><span class="str">"Error: %s"</span> <span class="op">%</span> <span class="nam">err</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t722" class="stm run hide_run"> <span class="key">return</span> <span class="num">3</span><span class="strut"> </span></p> +<p id="t723" class="stm run hide_run"> <span class="key">except</span> <span class="nam">CogError</span> <span class="key">as</span> <span class="nam">err</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t724" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">prerr</span><span class="op">(</span><span class="nam">err</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t725" class="stm run hide_run"> <span class="key">return</span> <span class="num">1</span><span class="strut"> </span></p> +<p id="t726" class="stm run hide_run"> <span class="key">except</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t727" class="stm run hide_run"> <span class="nam">traceback</span><span class="op">.</span><span class="nam">print_exc</span><span class="op">(</span><span class="nam">None</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">stderr</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t728" class="stm run hide_run"> <span class="key">return</span> <span class="num">1</span><span class="strut"> </span></p> +<p id="t729" class="pln"><span class="strut"> </span></p> +<p id="t730" class="pln"><span class="com"># History:</span><span class="strut"> </span></p> +<p id="t731" class="pln"><span class="com"># 20040210: First public version.</span><span class="strut"> </span></p> +<p id="t732" class="pln"><span class="com"># 20040220: Text preceding the start and end marker are removed from Python lines.</span><span class="strut"> </span></p> +<p id="t733" class="pln"><span class="com"># -v option on the command line shows the version.</span><span class="strut"> </span></p> +<p id="t734" class="pln"><span class="com"># 20040311: Make sure the last line of output is properly ended with a newline.</span><span class="strut"> </span></p> +<p id="t735" class="pln"><span class="com"># 20040605: Fixed some blank line handling in cog.</span><span class="strut"> </span></p> +<p id="t736" class="pln"><span class="com"># Fixed problems with assigning to xml elements in handyxml.</span><span class="strut"> </span></p> +<p id="t737" class="pln"><span class="com"># 20040621: Changed all line-ends to LF from CRLF.</span><span class="strut"> </span></p> +<p id="t738" class="pln"><span class="com"># 20041002: Refactor some option handling to simplify unittesting the options.</span><span class="strut"> </span></p> +<p id="t739" class="pln"><span class="com"># 20041118: cog.out and cog.outl have optional string arguments.</span><span class="strut"> </span></p> +<p id="t740" class="pln"><span class="com"># 20041119: File names weren't being properly passed around for warnings, etc.</span><span class="strut"> </span></p> +<p id="t741" class="pln"><span class="com"># 20041122: Added cog.firstLineNum: a property with the line number of the [[[cog line.</span><span class="strut"> </span></p> +<p id="t742" class="pln"><span class="com"># Added cog.inFile and cog.outFile: the names of the input and output file.</span><span class="strut"> </span></p> +<p id="t743" class="pln"><span class="com"># 20041218: Single-line cog generators, with start marker and end marker on</span><span class="strut"> </span></p> +<p id="t744" class="pln"><span class="com"># the same line.</span><span class="strut"> </span></p> +<p id="t745" class="pln"><span class="com"># 20041230: Keep a single globals dict for all the code fragments in a single</span><span class="strut"> </span></p> +<p id="t746" class="pln"><span class="com"># file so they can share state.</span><span class="strut"> </span></p> +<p id="t747" class="pln"><span class="com"># 20050206: Added the -x switch to remove all generated output.</span><span class="strut"> </span></p> +<p id="t748" class="pln"><span class="com"># 20050218: Now code can be on the marker lines as well.</span><span class="strut"> </span></p> +<p id="t749" class="pln"><span class="com"># 20050219: Added -c switch to checksum the output so that edits can be</span><span class="strut"> </span></p> +<p id="t750" class="pln"><span class="com"># detected before they are obliterated.</span><span class="strut"> </span></p> +<p id="t751" class="pln"><span class="com"># 20050521: Added cog.error, contributed by Alexander Belchenko.</span><span class="strut"> </span></p> +<p id="t752" class="pln"><span class="com"># 20050720: Added code deletion and settable globals contributed by Blake Winton.</span><span class="strut"> </span></p> +<p id="t753" class="pln"><span class="com"># 20050724: Many tweaks to improve code coverage.</span><span class="strut"> </span></p> +<p id="t754" class="pln"><span class="com"># 20050726: Error messages are now printed with no traceback.</span><span class="strut"> </span></p> +<p id="t755" class="pln"><span class="com"># Code can no longer appear on the marker lines,</span><span class="strut"> </span></p> +<p id="t756" class="pln"><span class="com"># except for single-line style.</span><span class="strut"> </span></p> +<p id="t757" class="pln"><span class="com"># -z allows omission of the [[[end]]] marker, and it will be assumed</span><span class="strut"> </span></p> +<p id="t758" class="pln"><span class="com"># at the end of the file.</span><span class="strut"> </span></p> +<p id="t759" class="pln"><span class="com"># 20050729: Refactor option parsing into a separate class, in preparation for</span><span class="strut"> </span></p> +<p id="t760" class="pln"><span class="com"># future features.</span><span class="strut"> </span></p> +<p id="t761" class="pln"><span class="com"># 20050805: The cogmodule.path wasn't being properly maintained.</span><span class="strut"> </span></p> +<p id="t762" class="pln"><span class="com"># 20050808: Added the -D option to define a global value.</span><span class="strut"> </span></p> +<p id="t763" class="pln"><span class="com"># 20050810: The %s in the -w command is dealt with more robustly.</span><span class="strut"> </span></p> +<p id="t764" class="pln"><span class="com"># Added the -s option to suffix output lines with a marker.</span><span class="strut"> </span></p> +<p id="t765" class="pln"><span class="com"># 20050817: Now @files can have arguments on each line to change the cog's</span><span class="strut"> </span></p> +<p id="t766" class="pln"><span class="com"># behavior for that line.</span><span class="strut"> </span></p> +<p id="t767" class="pln"><span class="com"># 20051006: Version 2.0</span><span class="strut"> </span></p> +<p id="t768" class="pln"><span class="com"># 20080521: -U options lets you create Unix newlines on Windows. Thanks,</span><span class="strut"> </span></p> +<p id="t769" class="pln"><span class="com"># Alexander Belchenko.</span><span class="strut"> </span></p> +<p id="t770" class="pln"><span class="com"># 20080522: It's now ok to have -d with output to stdout, and now we validate</span><span class="strut"> </span></p> +<p id="t771" class="pln"><span class="com"># the args after each line of an @file.</span><span class="strut"> </span></p> +<p id="t772" class="pln"><span class="com"># 20090520: Use hashlib where it's available, to avoid a warning.</span><span class="strut"> </span></p> +<p id="t773" class="pln"><span class="com"># Use the builtin compile() instead of compiler, for Jython.</span><span class="strut"> </span></p> +<p id="t774" class="pln"><span class="com"># Explicitly close files we opened, Jython likes this.</span><span class="strut"> </span></p> +<p id="t775" class="pln"><span class="com"># 20120205: Port to Python 3. Lowest supported version is 2.6.</span><span class="strut"> </span></p> +<p id="t776" class="pln"><span class="com"># 20150104: --markers option added by Doug Hellmann.</span><span class="strut"> </span></p> +<p id="t777" class="pln"><span class="com"># 20150104: -n ENCODING option added by Petr Gladkiy.</span><span class="strut"> </span></p> +<p id="t778" class="pln"><span class="com"># 20150107: Added --verbose to control what files get listed.</span><span class="strut"> </span></p> +<p id="t779" class="pln"><span class="com"># 20150111: Version 2.4</span><span class="strut"> </span></p> +<p id="t780" class="pln"><span class="com"># 20160213: v2.5: -o makes needed directories, thanks Jean-François Giraud.</span><span class="strut"> </span></p> + </td> </tr> </table> @@ -1631,8 +1641,8 @@ <div id="footer"> <div class="content"> <p> - <a class="nav" href="index.html">« index</a> <a class="nav" href="https://coverage.readthedocs.org">coverage.py v4.0.3</a>, - created at 2015-11-24 07:02 + <a class="nav" href="index.html">« index</a> <a class="nav" href="https://coverage.readthedocs.io">coverage.py v4.1</a>, + created at 2016-05-21 08:55 </p> </div> </div> diff --git a/doc/sample_html/cogapp_makefiles_py.html b/doc/sample_html/cogapp_makefiles_py.html index a2514c8..7e0efe4 100644 --- a/doc/sample_html/cogapp_makefiles_py.html +++ b/doc/sample_html/cogapp_makefiles_py.html @@ -8,7 +8,7 @@ <meta http-equiv="X-UA-Compatible" content="IE=emulateIE7" /> - <title>Coverage for cogapp/makefiles.py: 19.05%</title> + <title>Coverage for cogapp/makefiles.py: 92.86%</title> <link rel="stylesheet" href="style.css" type="text/css"> <script type="text/javascript" src="jquery.min.js"></script> @@ -24,19 +24,19 @@ <div id="header"> <div class="content"> <h1>Coverage for <b>cogapp/makefiles.py</b> : - <span class="pc_cov">19.05%</span> + <span class="pc_cov">92.86%</span> </h1> <img id="keyboard_icon" src="keybd_closed.png" alt="Show keyboard shortcuts" /> <h2 class="stats"> 28 statements - <span class="run hide_run shortkey_r button_toggle_run">8 run</span> - <span class="mis shortkey_m button_toggle_mis">20 missing</span> + <span class="run hide_run shortkey_r button_toggle_run">28 run</span> + <span class="mis shortkey_m button_toggle_mis">0 missing</span> <span class="exc shortkey_x button_toggle_exc">3 excluded</span> - <span class="par run hide_run shortkey_p button_toggle_par">0 partial</span> + <span class="par run hide_run shortkey_p button_toggle_par">3 partial</span> </h2> </div> @@ -44,22 +44,22 @@ <div class="help_panel"> <img id="panel_icon" src="keybd_open.png" alt="Hide keyboard shortcuts" /> -<p class="legend">Hot-keys on this page</p> + <p class="legend">Hot-keys on this page</p> <div> -<p class="keyhelp"> + <p class="keyhelp"> <span class="key">r</span> <span class="key">m</span> <span class="key">x</span> <span class="key">p</span> toggle line displays </p> -<p class="keyhelp"> + <p class="keyhelp"> <span class="key">j</span> <span class="key">k</span> next/prev highlighted chunk </p> -<p class="keyhelp"> + <p class="keyhelp"> <span class="key">0</span> (zero) top of page </p> -<p class="keyhelp"> + <p class="keyhelp"> <span class="key">1</span> (one) first highlighted chunk </p> </div> @@ -86,33 +86,33 @@ <p id="n15" class="stm run hide_run"><a href="#n15">15</a></p> <p id="n16" class="pln"><a href="#n16">16</a></p> <p id="n17" class="pln"><a href="#n17">17</a></p> -<p id="n18" class="stm mis"><a href="#n18">18</a></p> -<p id="n19" class="stm mis"><a href="#n19">19</a></p> -<p id="n20" class="stm mis"><a href="#n20">20</a></p> -<p id="n21" class="stm mis"><a href="#n21">21</a></p> -<p id="n22" class="stm mis"><a href="#n22">22</a></p> -<p id="n23" class="stm mis"><a href="#n23">23</a></p> -<p id="n24" class="stm mis"><a href="#n24">24</a></p> -<p id="n25" class="stm mis"><a href="#n25">25</a></p> -<p id="n26" class="stm mis"><a href="#n26">26</a></p> -<p id="n27" class="stm mis"><a href="#n27">27</a></p> +<p id="n18" class="stm run hide_run"><a href="#n18">18</a></p> +<p id="n19" class="stm run hide_run"><a href="#n19">19</a></p> +<p id="n20" class="stm run hide_run"><a href="#n20">20</a></p> +<p id="n21" class="stm run hide_run"><a href="#n21">21</a></p> +<p id="n22" class="stm par run hide_run"><a href="#n22">22</a></p> +<p id="n23" class="stm run hide_run"><a href="#n23">23</a></p> +<p id="n24" class="stm run hide_run"><a href="#n24">24</a></p> +<p id="n25" class="stm run hide_run"><a href="#n25">25</a></p> +<p id="n26" class="stm run hide_run"><a href="#n26">26</a></p> +<p id="n27" class="stm run hide_run"><a href="#n27">27</a></p> <p id="n28" class="pln"><a href="#n28">28</a></p> -<p id="n29" class="stm mis"><a href="#n29">29</a></p> -<p id="n30" class="stm mis"><a href="#n30">30</a></p> -<p id="n31" class="stm mis"><a href="#n31">31</a></p> +<p id="n29" class="stm par run hide_run"><a href="#n29">29</a></p> +<p id="n30" class="stm run hide_run"><a href="#n30">30</a></p> +<p id="n31" class="stm run hide_run"><a href="#n31">31</a></p> <p id="n32" class="pln"><a href="#n32">32</a></p> <p id="n33" class="stm run hide_run"><a href="#n33">33</a></p> <p id="n34" class="pln"><a href="#n34">34</a></p> <p id="n35" class="pln"><a href="#n35">35</a></p> <p id="n36" class="pln"><a href="#n36">36</a></p> -<p id="n37" class="stm mis"><a href="#n37">37</a></p> -<p id="n38" class="stm mis"><a href="#n38">38</a></p> -<p id="n39" class="stm mis"><a href="#n39">39</a></p> -<p id="n40" class="stm mis"><a href="#n40">40</a></p> +<p id="n37" class="stm run hide_run"><a href="#n37">37</a></p> +<p id="n38" class="stm run hide_run"><a href="#n38">38</a></p> +<p id="n39" class="stm run hide_run"><a href="#n39">39</a></p> +<p id="n40" class="stm run hide_run"><a href="#n40">40</a></p> <p id="n41" class="pln"><a href="#n41">41</a></p> -<p id="n42" class="stm mis"><a href="#n42">42</a></p> -<p id="n43" class="stm mis"><a href="#n43">43</a></p> -<p id="n44" class="stm mis"><a href="#n44">44</a></p> +<p id="n42" class="stm run hide_run"><a href="#n42">42</a></p> +<p id="n43" class="stm par run hide_run"><a href="#n43">43</a></p> +<p id="n44" class="stm run hide_run"><a href="#n44">44</a></p> <p id="n45" class="pln"><a href="#n45">45</a></p> <p id="n46" class="exc"><a href="#n46">46</a></p> <p id="n47" class="pln"><a href="#n47">47</a></p> @@ -132,73 +132,73 @@ <p id="n61" class="pln"><a href="#n61">61</a></p> <p id="n62" class="pln"><a href="#n62">62</a></p> <p id="n63" class="exc"><a href="#n63">63</a></p> - + </td> <td class="text"> -<p id="t1" class="pln"><span class="str">""" Dictionary-to-filetree functions, to create test files for testing.</span><span class="strut"> </span></p> -<p id="t2" class="pln"><span class="str"> http://nedbatchelder.com/code/cog</span><span class="strut"> </span></p> +<p id="t1" class="pln"><span class="str">""" Dictionary-to-filetree functions, to create test files for testing.</span><span class="strut"> </span></p> +<p id="t2" class="pln"><span class="str"> http://nedbatchelder.com/code/cog</span><span class="strut"> </span></p> <p id="t3" class="pln"><span class="strut"> </span></p> -<p id="t4" class="pln"><span class="str"> Copyright 2004-2015, Ned Batchelder.</span><span class="strut"> </span></p> -<p id="t5" class="pln"><span class="str">"""</span><span class="strut"> </span></p> +<p id="t4" class="pln"><span class="str"> Copyright 2004-2015, Ned Batchelder.</span><span class="strut"> </span></p> +<p id="t5" class="pln"><span class="str">"""</span><span class="strut"> </span></p> <p id="t6" class="pln"><span class="strut"> </span></p> <p id="t7" class="stm run hide_run"><span class="key">from</span> <span class="nam">__future__</span> <span class="key">import</span> <span class="nam">absolute_import</span><span class="strut"> </span></p> <p id="t8" class="stm run hide_run"><span class="key">import</span> <span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="strut"> </span></p> <p id="t9" class="stm run hide_run"><span class="key">from</span> <span class="op">.</span><span class="nam">whiteutils</span> <span class="key">import</span> <span class="nam">reindentBlock</span><span class="strut"> </span></p> <p id="t10" class="stm run hide_run"><span class="key">from</span> <span class="op">.</span><span class="nam">backward</span> <span class="key">import</span> <span class="nam">string_types</span><span class="op">,</span> <span class="nam">bytes_types</span><span class="strut"> </span></p> <p id="t11" class="pln"><span class="strut"> </span></p> -<p id="t12" class="stm run hide_run"><span class="nam">__version__</span> <span class="op">=</span> <span class="str">'1.0.20040126'</span><span class="strut"> </span></p> -<p id="t13" class="stm run hide_run"><span class="nam">__all__</span> <span class="op">=</span> <span class="op">[</span><span class="str">'makeFiles'</span><span class="op">,</span> <span class="str">'removeFiles'</span><span class="op">]</span><span class="strut"> </span></p> +<p id="t12" class="stm run hide_run"><span class="nam">__version__</span> <span class="op">=</span> <span class="str">'1.0.20040126'</span><span class="strut"> </span></p> +<p id="t13" class="stm run hide_run"><span class="nam">__all__</span> <span class="op">=</span> <span class="op">[</span><span class="str">'makeFiles'</span><span class="op">,</span> <span class="str">'removeFiles'</span><span class="op">]</span><span class="strut"> </span></p> <p id="t14" class="pln"><span class="strut"> </span></p> -<p id="t15" class="stm run hide_run"><span class="key">def</span> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">,</span> <span class="nam">basedir</span><span class="op">=</span><span class="str">'.'</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t16" class="pln"> <span class="str">""" Create files from the dictionary `d`, in the directory named by `basedir`.</span><span class="strut"> </span></p> -<p id="t17" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t18" class="stm mis"> <span class="key">for</span> <span class="nam">name</span><span class="op">,</span> <span class="nam">contents</span> <span class="key">in</span> <span class="nam">d</span><span class="op">.</span><span class="nam">items</span><span class="op">(</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t19" class="stm mis"> <span class="nam">child</span> <span class="op">=</span> <span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">basedir</span><span class="op">,</span> <span class="nam">name</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t20" class="stm mis"> <span class="key">if</span> <span class="nam">isinstance</span><span class="op">(</span><span class="nam">contents</span><span class="op">,</span> <span class="nam">string_types</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t21" class="stm mis"> <span class="nam">mode</span> <span class="op">=</span> <span class="str">'w'</span><span class="strut"> </span></p> -<p id="t22" class="stm mis"> <span class="key">if</span> <span class="nam">isinstance</span><span class="op">(</span><span class="nam">contents</span><span class="op">,</span> <span class="nam">bytes_types</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t23" class="stm mis"> <span class="nam">mode</span> <span class="op">+=</span> <span class="str">"b"</span><span class="strut"> </span></p> -<p id="t24" class="stm mis"> <span class="nam">f</span> <span class="op">=</span> <span class="nam">open</span><span class="op">(</span><span class="nam">child</span><span class="op">,</span> <span class="nam">mode</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t25" class="stm mis"> <span class="nam">contents</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">contents</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t26" class="stm mis"> <span class="nam">f</span><span class="op">.</span><span class="nam">write</span><span class="op">(</span><span class="nam">contents</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t27" class="stm mis"> <span class="nam">f</span><span class="op">.</span><span class="nam">close</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t28" class="pln"> <span class="key">else</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t29" class="stm mis"> <span class="key">if</span> <span class="key">not</span> <span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">exists</span><span class="op">(</span><span class="nam">child</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t30" class="stm mis"> <span class="nam">os</span><span class="op">.</span><span class="nam">mkdir</span><span class="op">(</span><span class="nam">child</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t31" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">contents</span><span class="op">,</span> <span class="nam">child</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t15" class="stm run hide_run"><span class="key">def</span> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">,</span> <span class="nam">basedir</span><span class="op">=</span><span class="str">'.'</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t16" class="pln"> <span class="str">""" Create files from the dictionary `d`, in the directory named by `basedir`.</span><span class="strut"> </span></p> +<p id="t17" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t18" class="stm run hide_run"> <span class="key">for</span> <span class="nam">name</span><span class="op">,</span> <span class="nam">contents</span> <span class="key">in</span> <span class="nam">d</span><span class="op">.</span><span class="nam">items</span><span class="op">(</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t19" class="stm run hide_run"> <span class="nam">child</span> <span class="op">=</span> <span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">basedir</span><span class="op">,</span> <span class="nam">name</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t20" class="stm run hide_run"> <span class="key">if</span> <span class="nam">isinstance</span><span class="op">(</span><span class="nam">contents</span><span class="op">,</span> <span class="nam">string_types</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t21" class="stm run hide_run"> <span class="nam">mode</span> <span class="op">=</span> <span class="str">'w'</span><span class="strut"> </span></p> +<p id="t22" class="stm par run hide_run"><span class="annotate short">22 ↛ 24</span><span class="annotate long">line 22 didn't jump to line 24, because the condition on line 22 was never false</span> <span class="key">if</span> <span class="nam">isinstance</span><span class="op">(</span><span class="nam">contents</span><span class="op">,</span> <span class="nam">bytes_types</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t23" class="stm run hide_run"> <span class="nam">mode</span> <span class="op">+=</span> <span class="str">"b"</span><span class="strut"> </span></p> +<p id="t24" class="stm run hide_run"> <span class="nam">f</span> <span class="op">=</span> <span class="nam">open</span><span class="op">(</span><span class="nam">child</span><span class="op">,</span> <span class="nam">mode</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t25" class="stm run hide_run"> <span class="nam">contents</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">contents</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t26" class="stm run hide_run"> <span class="nam">f</span><span class="op">.</span><span class="nam">write</span><span class="op">(</span><span class="nam">contents</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t27" class="stm run hide_run"> <span class="nam">f</span><span class="op">.</span><span class="nam">close</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t28" class="pln"> <span class="key">else</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t29" class="stm par run hide_run"><span class="annotate short">29 ↛ 31</span><span class="annotate long">line 29 didn't jump to line 31, because the condition on line 29 was never false</span> <span class="key">if</span> <span class="key">not</span> <span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">exists</span><span class="op">(</span><span class="nam">child</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t30" class="stm run hide_run"> <span class="nam">os</span><span class="op">.</span><span class="nam">mkdir</span><span class="op">(</span><span class="nam">child</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t31" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">contents</span><span class="op">,</span> <span class="nam">child</span><span class="op">)</span><span class="strut"> </span></p> <p id="t32" class="pln"><span class="strut"> </span></p> -<p id="t33" class="stm run hide_run"><span class="key">def</span> <span class="nam">removeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">,</span> <span class="nam">basedir</span><span class="op">=</span><span class="str">'.'</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t34" class="pln"> <span class="str">""" Remove the files created by makeFiles.</span><span class="strut"> </span></p> -<p id="t35" class="pln"><span class="str"> Directories are removed if they are empty.</span><span class="strut"> </span></p> -<p id="t36" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t37" class="stm mis"> <span class="key">for</span> <span class="nam">name</span><span class="op">,</span> <span class="nam">contents</span> <span class="key">in</span> <span class="nam">d</span><span class="op">.</span><span class="nam">items</span><span class="op">(</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t38" class="stm mis"> <span class="nam">child</span> <span class="op">=</span> <span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">basedir</span><span class="op">,</span> <span class="nam">name</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t39" class="stm mis"> <span class="key">if</span> <span class="nam">isinstance</span><span class="op">(</span><span class="nam">contents</span><span class="op">,</span> <span class="nam">string_types</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t40" class="stm mis"> <span class="nam">os</span><span class="op">.</span><span class="nam">remove</span><span class="op">(</span><span class="nam">child</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t41" class="pln"> <span class="key">else</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t42" class="stm mis"> <span class="nam">removeFiles</span><span class="op">(</span><span class="nam">contents</span><span class="op">,</span> <span class="nam">child</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t43" class="stm mis"> <span class="key">if</span> <span class="key">not</span> <span class="nam">os</span><span class="op">.</span><span class="nam">listdir</span><span class="op">(</span><span class="nam">child</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t44" class="stm mis"> <span class="nam">os</span><span class="op">.</span><span class="nam">rmdir</span><span class="op">(</span><span class="nam">child</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t33" class="stm run hide_run"><span class="key">def</span> <span class="nam">removeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">,</span> <span class="nam">basedir</span><span class="op">=</span><span class="str">'.'</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t34" class="pln"> <span class="str">""" Remove the files created by makeFiles.</span><span class="strut"> </span></p> +<p id="t35" class="pln"><span class="str"> Directories are removed if they are empty.</span><span class="strut"> </span></p> +<p id="t36" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t37" class="stm run hide_run"> <span class="key">for</span> <span class="nam">name</span><span class="op">,</span> <span class="nam">contents</span> <span class="key">in</span> <span class="nam">d</span><span class="op">.</span><span class="nam">items</span><span class="op">(</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t38" class="stm run hide_run"> <span class="nam">child</span> <span class="op">=</span> <span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">basedir</span><span class="op">,</span> <span class="nam">name</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t39" class="stm run hide_run"> <span class="key">if</span> <span class="nam">isinstance</span><span class="op">(</span><span class="nam">contents</span><span class="op">,</span> <span class="nam">string_types</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t40" class="stm run hide_run"> <span class="nam">os</span><span class="op">.</span><span class="nam">remove</span><span class="op">(</span><span class="nam">child</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t41" class="pln"> <span class="key">else</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t42" class="stm run hide_run"> <span class="nam">removeFiles</span><span class="op">(</span><span class="nam">contents</span><span class="op">,</span> <span class="nam">child</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t43" class="stm par run hide_run"><span class="annotate short">43 ↛ 37</span><span class="annotate long">line 43 didn't jump to line 37, because the condition on line 43 was never false</span> <span class="key">if</span> <span class="key">not</span> <span class="nam">os</span><span class="op">.</span><span class="nam">listdir</span><span class="op">(</span><span class="nam">child</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t44" class="stm run hide_run"> <span class="nam">os</span><span class="op">.</span><span class="nam">rmdir</span><span class="op">(</span><span class="nam">child</span><span class="op">)</span><span class="strut"> </span></p> <p id="t45" class="pln"><span class="strut"> </span></p> -<p id="t46" class="exc"><span class="key">if</span> <span class="nam">__name__</span> <span class="op">==</span> <span class="str">'__main__'</span><span class="op">:</span> <span class="com">#pragma: no cover</span><span class="strut"> </span></p> -<p id="t47" class="pln"> <span class="com"># Try it a little.</span><span class="strut"> </span></p> -<p id="t48" class="exc"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t49" class="pln"> <span class="str">'test_makefiles'</span><span class="op">:</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t50" class="pln"> <span class="str">'hey.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t51" class="pln"><span class="str"> This is hey.txt.</span><span class="strut"> </span></p> -<p id="t52" class="pln"><span class="str"> It's very simple.</span><span class="strut"> </span></p> -<p id="t53" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t54" class="pln"> <span class="str">'subdir'</span><span class="op">:</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t55" class="pln"> <span class="str">'fooey'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t56" class="pln"><span class="str"> # Fooey</span><span class="strut"> </span></p> -<p id="t57" class="pln"><span class="str"> Kablooey</span><span class="strut"> </span></p> -<p id="t58" class="pln"><span class="str"> Ew.</span><span class="strut"> </span></p> -<p id="t59" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t60" class="pln"> <span class="op">}</span><span class="strut"> </span></p> -<p id="t61" class="pln"> <span class="op">}</span><span class="strut"> </span></p> -<p id="t62" class="pln"> <span class="op">}</span><span class="strut"> </span></p> -<p id="t63" class="exc"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> - +<p id="t46" class="exc"><span class="key">if</span> <span class="nam">__name__</span> <span class="op">==</span> <span class="str">'__main__'</span><span class="op">:</span> <span class="com">#pragma: no cover</span><span class="strut"> </span></p> +<p id="t47" class="pln"> <span class="com"># Try it a little.</span><span class="strut"> </span></p> +<p id="t48" class="exc"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t49" class="pln"> <span class="str">'test_makefiles'</span><span class="op">:</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t50" class="pln"> <span class="str">'hey.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t51" class="pln"><span class="str"> This is hey.txt.</span><span class="strut"> </span></p> +<p id="t52" class="pln"><span class="str"> It's very simple.</span><span class="strut"> </span></p> +<p id="t53" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t54" class="pln"> <span class="str">'subdir'</span><span class="op">:</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t55" class="pln"> <span class="str">'fooey'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t56" class="pln"><span class="str"> # Fooey</span><span class="strut"> </span></p> +<p id="t57" class="pln"><span class="str"> Kablooey</span><span class="strut"> </span></p> +<p id="t58" class="pln"><span class="str"> Ew.</span><span class="strut"> </span></p> +<p id="t59" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t60" class="pln"> <span class="op">}</span><span class="strut"> </span></p> +<p id="t61" class="pln"> <span class="op">}</span><span class="strut"> </span></p> +<p id="t62" class="pln"> <span class="op">}</span><span class="strut"> </span></p> +<p id="t63" class="exc"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> + </td> </tr> </table> @@ -207,8 +207,8 @@ <div id="footer"> <div class="content"> <p> - <a class="nav" href="index.html">« index</a> <a class="nav" href="https://coverage.readthedocs.org">coverage.py v4.0.3</a>, - created at 2015-11-24 07:02 + <a class="nav" href="index.html">« index</a> <a class="nav" href="https://coverage.readthedocs.io">coverage.py v4.1</a>, + created at 2016-05-21 08:55 </p> </div> </div> diff --git a/doc/sample_html/cogapp_test_cogapp_py.html b/doc/sample_html/cogapp_test_cogapp_py.html index d6ee371..6a7826d 100644 --- a/doc/sample_html/cogapp_test_cogapp_py.html +++ b/doc/sample_html/cogapp_test_cogapp_py.html @@ -8,7 +8,7 @@ <meta http-equiv="X-UA-Compatible" content="IE=emulateIE7" /> - <title>Coverage for cogapp/test_cogapp.py: 30.99%</title> + <title>Coverage for cogapp/test_cogapp.py: 99.86%</title> <link rel="stylesheet" href="style.css" type="text/css"> <script type="text/javascript" src="jquery.min.js"></script> @@ -24,19 +24,19 @@ <div id="header"> <div class="content"> <h1>Coverage for <b>cogapp/test_cogapp.py</b> : - <span class="pc_cov">30.99%</span> + <span class="pc_cov">99.86%</span> </h1> <img id="keyboard_icon" src="keybd_closed.png" alt="Show keyboard shortcuts" /> <h2 class="stats"> 704 statements - <span class="run hide_run shortkey_r button_toggle_run">218 run</span> - <span class="mis shortkey_m button_toggle_mis">486 missing</span> + <span class="run hide_run shortkey_r button_toggle_run">704 run</span> + <span class="mis shortkey_m button_toggle_mis">0 missing</span> <span class="exc shortkey_x button_toggle_exc">6 excluded</span> - <span class="par run hide_run shortkey_p button_toggle_par">0 partial</span> + <span class="par run hide_run shortkey_p button_toggle_par">1 partial</span> </h2> </div> @@ -44,22 +44,22 @@ <div class="help_panel"> <img id="panel_icon" src="keybd_open.png" alt="Hide keyboard shortcuts" /> -<p class="legend">Hot-keys on this page</p> + <p class="legend">Hot-keys on this page</p> <div> -<p class="keyhelp"> + <p class="keyhelp"> <span class="key">r</span> <span class="key">m</span> <span class="key">x</span> <span class="key">p</span> toggle line displays </p> -<p class="keyhelp"> + <p class="keyhelp"> <span class="key">j</span> <span class="key">k</span> next/prev highlighted chunk </p> -<p class="keyhelp"> + <p class="keyhelp"> <span class="key">0</span> (zero) top of page </p> -<p class="keyhelp"> + <p class="keyhelp"> <span class="key">1</span> (one) first highlighted chunk </p> </div> @@ -500,46 +500,46 @@ <p id="n429" class="pln"><a href="#n429">429</a></p> <p id="n430" class="pln"><a href="#n430">430</a></p> <p id="n431" class="stm run hide_run"><a href="#n431">431</a></p> -<p id="n432" class="stm mis"><a href="#n432">432</a></p> -<p id="n433" class="stm mis"><a href="#n433">433</a></p> -<p id="n434" class="stm mis"><a href="#n434">434</a></p> -<p id="n435" class="stm mis"><a href="#n435">435</a></p> -<p id="n436" class="stm mis"><a href="#n436">436</a></p> -<p id="n437" class="stm mis"><a href="#n437">437</a></p> -<p id="n438" class="stm mis"><a href="#n438">438</a></p> +<p id="n432" class="stm run hide_run"><a href="#n432">432</a></p> +<p id="n433" class="stm run hide_run"><a href="#n433">433</a></p> +<p id="n434" class="stm run hide_run"><a href="#n434">434</a></p> +<p id="n435" class="stm run hide_run"><a href="#n435">435</a></p> +<p id="n436" class="stm run hide_run"><a href="#n436">436</a></p> +<p id="n437" class="stm run hide_run"><a href="#n437">437</a></p> +<p id="n438" class="stm run hide_run"><a href="#n438">438</a></p> <p id="n439" class="pln"><a href="#n439">439</a></p> <p id="n440" class="stm run hide_run"><a href="#n440">440</a></p> -<p id="n441" class="stm mis"><a href="#n441">441</a></p> -<p id="n442" class="stm mis"><a href="#n442">442</a></p> -<p id="n443" class="stm mis"><a href="#n443">443</a></p> -<p id="n444" class="stm mis"><a href="#n444">444</a></p> -<p id="n445" class="stm mis"><a href="#n445">445</a></p> -<p id="n446" class="stm mis"><a href="#n446">446</a></p> -<p id="n447" class="stm mis"><a href="#n447">447</a></p> -<p id="n448" class="stm mis"><a href="#n448">448</a></p> -<p id="n449" class="stm mis"><a href="#n449">449</a></p> +<p id="n441" class="stm run hide_run"><a href="#n441">441</a></p> +<p id="n442" class="stm run hide_run"><a href="#n442">442</a></p> +<p id="n443" class="stm run hide_run"><a href="#n443">443</a></p> +<p id="n444" class="stm run hide_run"><a href="#n444">444</a></p> +<p id="n445" class="stm run hide_run"><a href="#n445">445</a></p> +<p id="n446" class="stm run hide_run"><a href="#n446">446</a></p> +<p id="n447" class="stm run hide_run"><a href="#n447">447</a></p> +<p id="n448" class="stm run hide_run"><a href="#n448">448</a></p> +<p id="n449" class="stm run hide_run"><a href="#n449">449</a></p> <p id="n450" class="pln"><a href="#n450">450</a></p> <p id="n451" class="stm run hide_run"><a href="#n451">451</a></p> <p id="n452" class="pln"><a href="#n452">452</a></p> -<p id="n453" class="stm mis"><a href="#n453">453</a></p> -<p id="n454" class="stm mis"><a href="#n454">454</a></p> -<p id="n455" class="stm mis"><a href="#n455">455</a></p> -<p id="n456" class="stm mis"><a href="#n456">456</a></p> -<p id="n457" class="stm mis"><a href="#n457">457</a></p> +<p id="n453" class="stm run hide_run"><a href="#n453">453</a></p> +<p id="n454" class="stm run hide_run"><a href="#n454">454</a></p> +<p id="n455" class="stm run hide_run"><a href="#n455">455</a></p> +<p id="n456" class="stm run hide_run"><a href="#n456">456</a></p> +<p id="n457" class="stm run hide_run"><a href="#n457">457</a></p> <p id="n458" class="pln"><a href="#n458">458</a></p> <p id="n459" class="stm run hide_run"><a href="#n459">459</a></p> -<p id="n460" class="stm mis"><a href="#n460">460</a></p> -<p id="n461" class="stm mis"><a href="#n461">461</a></p> -<p id="n462" class="stm mis"><a href="#n462">462</a></p> -<p id="n463" class="stm mis"><a href="#n463">463</a></p> -<p id="n464" class="stm mis"><a href="#n464">464</a></p> +<p id="n460" class="stm run hide_run"><a href="#n460">460</a></p> +<p id="n461" class="stm run hide_run"><a href="#n461">461</a></p> +<p id="n462" class="stm run hide_run"><a href="#n462">462</a></p> +<p id="n463" class="stm run hide_run"><a href="#n463">463</a></p> +<p id="n464" class="stm run hide_run"><a href="#n464">464</a></p> <p id="n465" class="pln"><a href="#n465">465</a></p> <p id="n466" class="stm run hide_run"><a href="#n466">466</a></p> -<p id="n467" class="stm mis"><a href="#n467">467</a></p> -<p id="n468" class="stm mis"><a href="#n468">468</a></p> -<p id="n469" class="stm mis"><a href="#n469">469</a></p> -<p id="n470" class="stm mis"><a href="#n470">470</a></p> -<p id="n471" class="stm mis"><a href="#n471">471</a></p> +<p id="n467" class="stm run hide_run"><a href="#n467">467</a></p> +<p id="n468" class="stm run hide_run"><a href="#n468">468</a></p> +<p id="n469" class="stm run hide_run"><a href="#n469">469</a></p> +<p id="n470" class="stm run hide_run"><a href="#n470">470</a></p> +<p id="n471" class="stm run hide_run"><a href="#n471">471</a></p> <p id="n472" class="pln"><a href="#n472">472</a></p> <p id="n473" class="pln"><a href="#n473">473</a></p> <p id="n474" class="stm run hide_run"><a href="#n474">474</a></p> @@ -548,28 +548,28 @@ <p id="n477" class="pln"><a href="#n477">477</a></p> <p id="n478" class="pln"><a href="#n478">478</a></p> <p id="n479" class="stm run hide_run"><a href="#n479">479</a></p> -<p id="n480" class="stm mis"><a href="#n480">480</a></p> -<p id="n481" class="stm mis"><a href="#n481">481</a></p> -<p id="n482" class="stm mis"><a href="#n482">482</a></p> +<p id="n480" class="stm run hide_run"><a href="#n480">480</a></p> +<p id="n481" class="stm run hide_run"><a href="#n481">481</a></p> +<p id="n482" class="stm run hide_run"><a href="#n482">482</a></p> <p id="n483" class="pln"><a href="#n483">483</a></p> <p id="n484" class="stm run hide_run"><a href="#n484">484</a></p> -<p id="n485" class="stm mis"><a href="#n485">485</a></p> +<p id="n485" class="stm run hide_run"><a href="#n485">485</a></p> <p id="n486" class="pln"><a href="#n486">486</a></p> <p id="n487" class="pln"><a href="#n487">487</a></p> <p id="n488" class="pln"><a href="#n488">488</a></p> <p id="n489" class="pln"><a href="#n489">489</a></p> -<p id="n490" class="stm mis"><a href="#n490">490</a></p> +<p id="n490" class="stm run hide_run"><a href="#n490">490</a></p> <p id="n491" class="pln"><a href="#n491">491</a></p> <p id="n492" class="stm run hide_run"><a href="#n492">492</a></p> -<p id="n493" class="stm mis"><a href="#n493">493</a></p> +<p id="n493" class="stm run hide_run"><a href="#n493">493</a></p> <p id="n494" class="pln"><a href="#n494">494</a></p> <p id="n495" class="pln"><a href="#n495">495</a></p> <p id="n496" class="pln"><a href="#n496">496</a></p> <p id="n497" class="pln"><a href="#n497">497</a></p> <p id="n498" class="pln"><a href="#n498">498</a></p> -<p id="n499" class="stm mis"><a href="#n499">499</a></p> +<p id="n499" class="stm run hide_run"><a href="#n499">499</a></p> <p id="n500" class="pln"><a href="#n500">500</a></p> -<p id="n501" class="stm mis"><a href="#n501">501</a></p> +<p id="n501" class="stm run hide_run"><a href="#n501">501</a></p> <p id="n502" class="pln"><a href="#n502">502</a></p> <p id="n503" class="pln"><a href="#n503">503</a></p> <p id="n504" class="pln"><a href="#n504">504</a></p> @@ -578,47 +578,47 @@ <p id="n507" class="pln"><a href="#n507">507</a></p> <p id="n508" class="pln"><a href="#n508">508</a></p> <p id="n509" class="pln"><a href="#n509">509</a></p> -<p id="n510" class="stm mis"><a href="#n510">510</a></p> +<p id="n510" class="stm run hide_run"><a href="#n510">510</a></p> <p id="n511" class="pln"><a href="#n511">511</a></p> <p id="n512" class="stm run hide_run"><a href="#n512">512</a></p> -<p id="n513" class="stm mis"><a href="#n513">513</a></p> +<p id="n513" class="stm run hide_run"><a href="#n513">513</a></p> <p id="n514" class="pln"><a href="#n514">514</a></p> <p id="n515" class="pln"><a href="#n515">515</a></p> -<p id="n516" class="stm mis"><a href="#n516">516</a></p> +<p id="n516" class="stm run hide_run"><a href="#n516">516</a></p> <p id="n517" class="pln"><a href="#n517">517</a></p> -<p id="n518" class="stm mis"><a href="#n518">518</a></p> +<p id="n518" class="stm run hide_run"><a href="#n518">518</a></p> <p id="n519" class="pln"><a href="#n519">519</a></p> <p id="n520" class="pln"><a href="#n520">520</a></p> <p id="n521" class="pln"><a href="#n521">521</a></p> <p id="n522" class="pln"><a href="#n522">522</a></p> <p id="n523" class="pln"><a href="#n523">523</a></p> <p id="n524" class="pln"><a href="#n524">524</a></p> -<p id="n525" class="stm mis"><a href="#n525">525</a></p> +<p id="n525" class="stm run hide_run"><a href="#n525">525</a></p> <p id="n526" class="pln"><a href="#n526">526</a></p> <p id="n527" class="stm run hide_run"><a href="#n527">527</a></p> -<p id="n528" class="stm mis"><a href="#n528">528</a></p> +<p id="n528" class="stm run hide_run"><a href="#n528">528</a></p> <p id="n529" class="pln"><a href="#n529">529</a></p> <p id="n530" class="pln"><a href="#n530">530</a></p> -<p id="n531" class="stm mis"><a href="#n531">531</a></p> +<p id="n531" class="stm run hide_run"><a href="#n531">531</a></p> <p id="n532" class="pln"><a href="#n532">532</a></p> -<p id="n533" class="stm mis"><a href="#n533">533</a></p> +<p id="n533" class="stm run hide_run"><a href="#n533">533</a></p> <p id="n534" class="pln"><a href="#n534">534</a></p> <p id="n535" class="pln"><a href="#n535">535</a></p> <p id="n536" class="pln"><a href="#n536">536</a></p> <p id="n537" class="pln"><a href="#n537">537</a></p> <p id="n538" class="pln"><a href="#n538">538</a></p> <p id="n539" class="pln"><a href="#n539">539</a></p> -<p id="n540" class="stm mis"><a href="#n540">540</a></p> +<p id="n540" class="stm run hide_run"><a href="#n540">540</a></p> <p id="n541" class="pln"><a href="#n541">541</a></p> <p id="n542" class="stm run hide_run"><a href="#n542">542</a></p> -<p id="n543" class="stm mis"><a href="#n543">543</a></p> +<p id="n543" class="stm run hide_run"><a href="#n543">543</a></p> <p id="n544" class="pln"><a href="#n544">544</a></p> <p id="n545" class="pln"><a href="#n545">545</a></p> <p id="n546" class="pln"><a href="#n546">546</a></p> <p id="n547" class="pln"><a href="#n547">547</a></p> -<p id="n548" class="stm mis"><a href="#n548">548</a></p> +<p id="n548" class="stm run hide_run"><a href="#n548">548</a></p> <p id="n549" class="pln"><a href="#n549">549</a></p> -<p id="n550" class="stm mis"><a href="#n550">550</a></p> +<p id="n550" class="stm run hide_run"><a href="#n550">550</a></p> <p id="n551" class="pln"><a href="#n551">551</a></p> <p id="n552" class="pln"><a href="#n552">552</a></p> <p id="n553" class="pln"><a href="#n553">553</a></p> @@ -627,19 +627,19 @@ <p id="n556" class="pln"><a href="#n556">556</a></p> <p id="n557" class="pln"><a href="#n557">557</a></p> <p id="n558" class="pln"><a href="#n558">558</a></p> -<p id="n559" class="stm mis"><a href="#n559">559</a></p> +<p id="n559" class="stm run hide_run"><a href="#n559">559</a></p> <p id="n560" class="pln"><a href="#n560">560</a></p> <p id="n561" class="stm run hide_run"><a href="#n561">561</a></p> -<p id="n562" class="stm mis"><a href="#n562">562</a></p> +<p id="n562" class="stm run hide_run"><a href="#n562">562</a></p> <p id="n563" class="pln"><a href="#n563">563</a></p> <p id="n564" class="pln"><a href="#n564">564</a></p> <p id="n565" class="pln"><a href="#n565">565</a></p> <p id="n566" class="pln"><a href="#n566">566</a></p> <p id="n567" class="pln"><a href="#n567">567</a></p> <p id="n568" class="pln"><a href="#n568">568</a></p> -<p id="n569" class="stm mis"><a href="#n569">569</a></p> +<p id="n569" class="stm run hide_run"><a href="#n569">569</a></p> <p id="n570" class="pln"><a href="#n570">570</a></p> -<p id="n571" class="stm mis"><a href="#n571">571</a></p> +<p id="n571" class="stm run hide_run"><a href="#n571">571</a></p> <p id="n572" class="pln"><a href="#n572">572</a></p> <p id="n573" class="pln"><a href="#n573">573</a></p> <p id="n574" class="pln"><a href="#n574">574</a></p> @@ -650,19 +650,19 @@ <p id="n579" class="pln"><a href="#n579">579</a></p> <p id="n580" class="pln"><a href="#n580">580</a></p> <p id="n581" class="pln"><a href="#n581">581</a></p> -<p id="n582" class="stm mis"><a href="#n582">582</a></p> +<p id="n582" class="stm run hide_run"><a href="#n582">582</a></p> <p id="n583" class="pln"><a href="#n583">583</a></p> <p id="n584" class="stm run hide_run"><a href="#n584">584</a></p> -<p id="n585" class="stm mis"><a href="#n585">585</a></p> +<p id="n585" class="stm run hide_run"><a href="#n585">585</a></p> <p id="n586" class="pln"><a href="#n586">586</a></p> <p id="n587" class="pln"><a href="#n587">587</a></p> <p id="n588" class="pln"><a href="#n588">588</a></p> <p id="n589" class="pln"><a href="#n589">589</a></p> <p id="n590" class="pln"><a href="#n590">590</a></p> <p id="n591" class="pln"><a href="#n591">591</a></p> -<p id="n592" class="stm mis"><a href="#n592">592</a></p> +<p id="n592" class="stm run hide_run"><a href="#n592">592</a></p> <p id="n593" class="pln"><a href="#n593">593</a></p> -<p id="n594" class="stm mis"><a href="#n594">594</a></p> +<p id="n594" class="stm run hide_run"><a href="#n594">594</a></p> <p id="n595" class="pln"><a href="#n595">595</a></p> <p id="n596" class="pln"><a href="#n596">596</a></p> <p id="n597" class="pln"><a href="#n597">597</a></p> @@ -673,7 +673,7 @@ <p id="n602" class="pln"><a href="#n602">602</a></p> <p id="n603" class="pln"><a href="#n603">603</a></p> <p id="n604" class="pln"><a href="#n604">604</a></p> -<p id="n605" class="stm mis"><a href="#n605">605</a></p> +<p id="n605" class="stm run hide_run"><a href="#n605">605</a></p> <p id="n606" class="pln"><a href="#n606">606</a></p> <p id="n607" class="pln"><a href="#n607">607</a></p> <p id="n608" class="stm run hide_run"><a href="#n608">608</a></p> @@ -681,27 +681,27 @@ <p id="n610" class="pln"><a href="#n610">610</a></p> <p id="n611" class="pln"><a href="#n611">611</a></p> <p id="n612" class="stm run hide_run"><a href="#n612">612</a></p> -<p id="n613" class="stm mis"><a href="#n613">613</a></p> +<p id="n613" class="stm run hide_run"><a href="#n613">613</a></p> <p id="n614" class="pln"><a href="#n614">614</a></p> <p id="n615" class="pln"><a href="#n615">615</a></p> <p id="n616" class="pln"><a href="#n616">616</a></p> <p id="n617" class="pln"><a href="#n617">617</a></p> -<p id="n618" class="stm mis"><a href="#n618">618</a></p> -<p id="n619" class="stm mis"><a href="#n619">619</a></p> -<p id="n620" class="stm mis"><a href="#n620">620</a></p> +<p id="n618" class="stm run hide_run"><a href="#n618">618</a></p> +<p id="n619" class="stm run hide_run"><a href="#n619">619</a></p> +<p id="n620" class="stm run hide_run"><a href="#n620">620</a></p> <p id="n621" class="pln"><a href="#n621">621</a></p> <p id="n622" class="stm run hide_run"><a href="#n622">622</a></p> -<p id="n623" class="stm mis"><a href="#n623">623</a></p> +<p id="n623" class="stm run hide_run"><a href="#n623">623</a></p> <p id="n624" class="pln"><a href="#n624">624</a></p> <p id="n625" class="pln"><a href="#n625">625</a></p> <p id="n626" class="pln"><a href="#n626">626</a></p> <p id="n627" class="pln"><a href="#n627">627</a></p> -<p id="n628" class="stm mis"><a href="#n628">628</a></p> -<p id="n629" class="stm mis"><a href="#n629">629</a></p> -<p id="n630" class="stm mis"><a href="#n630">630</a></p> +<p id="n628" class="stm run hide_run"><a href="#n628">628</a></p> +<p id="n629" class="stm run hide_run"><a href="#n629">629</a></p> +<p id="n630" class="stm run hide_run"><a href="#n630">630</a></p> <p id="n631" class="pln"><a href="#n631">631</a></p> <p id="n632" class="stm run hide_run"><a href="#n632">632</a></p> -<p id="n633" class="stm mis"><a href="#n633">633</a></p> +<p id="n633" class="stm run hide_run"><a href="#n633">633</a></p> <p id="n634" class="pln"><a href="#n634">634</a></p> <p id="n635" class="pln"><a href="#n635">635</a></p> <p id="n636" class="pln"><a href="#n636">636</a></p> @@ -715,8 +715,8 @@ <p id="n644" class="pln"><a href="#n644">644</a></p> <p id="n645" class="pln"><a href="#n645">645</a></p> <p id="n646" class="pln"><a href="#n646">646</a></p> -<p id="n647" class="stm mis"><a href="#n647">647</a></p> -<p id="n648" class="stm mis"><a href="#n648">648</a></p> +<p id="n647" class="stm run hide_run"><a href="#n647">647</a></p> +<p id="n648" class="stm run hide_run"><a href="#n648">648</a></p> <p id="n649" class="pln"><a href="#n649">649</a></p> <p id="n650" class="pln"><a href="#n650">650</a></p> <p id="n651" class="stm run hide_run"><a href="#n651">651</a></p> @@ -728,63 +728,63 @@ <p id="n657" class="pln"><a href="#n657">657</a></p> <p id="n658" class="pln"><a href="#n658">658</a></p> <p id="n659" class="pln"><a href="#n659">659</a></p> -<p id="n660" class="stm mis"><a href="#n660">660</a></p> -<p id="n661" class="stm mis"><a href="#n661">661</a></p> -<p id="n662" class="stm mis"><a href="#n662">662</a></p> +<p id="n660" class="stm run hide_run"><a href="#n660">660</a></p> +<p id="n661" class="stm run hide_run"><a href="#n661">661</a></p> +<p id="n662" class="stm run hide_run"><a href="#n662">662</a></p> <p id="n663" class="pln"><a href="#n663">663</a></p> <p id="n664" class="stm run hide_run"><a href="#n664">664</a></p> -<p id="n665" class="stm mis"><a href="#n665">665</a></p> -<p id="n666" class="stm mis"><a href="#n666">666</a></p> -<p id="n667" class="stm mis"><a href="#n667">667</a></p> +<p id="n665" class="stm run hide_run"><a href="#n665">665</a></p> +<p id="n666" class="stm run hide_run"><a href="#n666">666</a></p> +<p id="n667" class="stm run hide_run"><a href="#n667">667</a></p> <p id="n668" class="pln"><a href="#n668">668</a></p> <p id="n669" class="stm run hide_run"><a href="#n669">669</a></p> -<p id="n670" class="stm mis"><a href="#n670">670</a></p> -<p id="n671" class="stm mis"><a href="#n671">671</a></p> -<p id="n672" class="stm mis"><a href="#n672">672</a></p> -<p id="n673" class="stm mis"><a href="#n673">673</a></p> -<p id="n674" class="stm mis"><a href="#n674">674</a></p> +<p id="n670" class="stm run hide_run"><a href="#n670">670</a></p> +<p id="n671" class="stm run hide_run"><a href="#n671">671</a></p> +<p id="n672" class="stm run hide_run"><a href="#n672">672</a></p> +<p id="n673" class="stm run hide_run"><a href="#n673">673</a></p> +<p id="n674" class="stm run hide_run"><a href="#n674">674</a></p> <p id="n675" class="pln"><a href="#n675">675</a></p> <p id="n676" class="stm run hide_run"><a href="#n676">676</a></p> <p id="n677" class="pln"><a href="#n677">677</a></p> -<p id="n678" class="stm mis"><a href="#n678">678</a></p> -<p id="n679" class="stm mis"><a href="#n679">679</a></p> -<p id="n680" class="stm mis"><a href="#n680">680</a></p> -<p id="n681" class="stm mis"><a href="#n681">681</a></p> -<p id="n682" class="stm mis"><a href="#n682">682</a></p> +<p id="n678" class="stm run hide_run"><a href="#n678">678</a></p> +<p id="n679" class="stm run hide_run"><a href="#n679">679</a></p> +<p id="n680" class="stm run hide_run"><a href="#n680">680</a></p> +<p id="n681" class="stm run hide_run"><a href="#n681">681</a></p> +<p id="n682" class="stm run hide_run"><a href="#n682">682</a></p> <p id="n683" class="pln"><a href="#n683">683</a></p> <p id="n684" class="stm run hide_run"><a href="#n684">684</a></p> <p id="n685" class="pln"><a href="#n685">685</a></p> -<p id="n686" class="stm mis"><a href="#n686">686</a></p> -<p id="n687" class="stm mis"><a href="#n687">687</a></p> -<p id="n688" class="stm mis"><a href="#n688">688</a></p> -<p id="n689" class="stm mis"><a href="#n689">689</a></p> -<p id="n690" class="stm mis"><a href="#n690">690</a></p> +<p id="n686" class="stm run hide_run"><a href="#n686">686</a></p> +<p id="n687" class="stm run hide_run"><a href="#n687">687</a></p> +<p id="n688" class="stm run hide_run"><a href="#n688">688</a></p> +<p id="n689" class="stm run hide_run"><a href="#n689">689</a></p> +<p id="n690" class="stm run hide_run"><a href="#n690">690</a></p> <p id="n691" class="pln"><a href="#n691">691</a></p> <p id="n692" class="stm run hide_run"><a href="#n692">692</a></p> <p id="n693" class="pln"><a href="#n693">693</a></p> -<p id="n694" class="stm mis"><a href="#n694">694</a></p> -<p id="n695" class="stm mis"><a href="#n695">695</a></p> -<p id="n696" class="stm mis"><a href="#n696">696</a></p> -<p id="n697" class="stm mis"><a href="#n697">697</a></p> -<p id="n698" class="stm mis"><a href="#n698">698</a></p> +<p id="n694" class="stm run hide_run"><a href="#n694">694</a></p> +<p id="n695" class="stm run hide_run"><a href="#n695">695</a></p> +<p id="n696" class="stm run hide_run"><a href="#n696">696</a></p> +<p id="n697" class="stm run hide_run"><a href="#n697">697</a></p> +<p id="n698" class="stm run hide_run"><a href="#n698">698</a></p> <p id="n699" class="pln"><a href="#n699">699</a></p> <p id="n700" class="stm run hide_run"><a href="#n700">700</a></p> <p id="n701" class="pln"><a href="#n701">701</a></p> -<p id="n702" class="stm mis"><a href="#n702">702</a></p> -<p id="n703" class="stm mis"><a href="#n703">703</a></p> -<p id="n704" class="stm mis"><a href="#n704">704</a></p> -<p id="n705" class="stm mis"><a href="#n705">705</a></p> -<p id="n706" class="stm mis"><a href="#n706">706</a></p> +<p id="n702" class="stm run hide_run"><a href="#n702">702</a></p> +<p id="n703" class="stm run hide_run"><a href="#n703">703</a></p> +<p id="n704" class="stm run hide_run"><a href="#n704">704</a></p> +<p id="n705" class="stm run hide_run"><a href="#n705">705</a></p> +<p id="n706" class="stm run hide_run"><a href="#n706">706</a></p> <p id="n707" class="pln"><a href="#n707">707</a></p> <p id="n708" class="stm run hide_run"><a href="#n708">708</a></p> <p id="n709" class="pln"><a href="#n709">709</a></p> <p id="n710" class="pln"><a href="#n710">710</a></p> -<p id="n711" class="stm mis"><a href="#n711">711</a></p> -<p id="n712" class="stm mis"><a href="#n712">712</a></p> -<p id="n713" class="stm mis"><a href="#n713">713</a></p> -<p id="n714" class="stm mis"><a href="#n714">714</a></p> -<p id="n715" class="stm mis"><a href="#n715">715</a></p> -<p id="n716" class="stm mis"><a href="#n716">716</a></p> +<p id="n711" class="stm run hide_run"><a href="#n711">711</a></p> +<p id="n712" class="stm run hide_run"><a href="#n712">712</a></p> +<p id="n713" class="stm run hide_run"><a href="#n713">713</a></p> +<p id="n714" class="stm run hide_run"><a href="#n714">714</a></p> +<p id="n715" class="stm run hide_run"><a href="#n715">715</a></p> +<p id="n716" class="stm run hide_run"><a href="#n716">716</a></p> <p id="n717" class="pln"><a href="#n717">717</a></p> <p id="n718" class="pln"><a href="#n718">718</a></p> <p id="n719" class="stm run hide_run"><a href="#n719">719</a></p> @@ -793,92 +793,92 @@ <p id="n722" class="pln"><a href="#n722">722</a></p> <p id="n723" class="pln"><a href="#n723">723</a></p> <p id="n724" class="pln"><a href="#n724">724</a></p> -<p id="n725" class="stm mis"><a href="#n725">725</a></p> -<p id="n726" class="stm mis"><a href="#n726">726</a></p> -<p id="n727" class="stm mis"><a href="#n727">727</a></p> +<p id="n725" class="stm run hide_run"><a href="#n725">725</a></p> +<p id="n726" class="stm run hide_run"><a href="#n726">726</a></p> +<p id="n727" class="stm run hide_run"><a href="#n727">727</a></p> <p id="n728" class="pln"><a href="#n728">728</a></p> <p id="n729" class="stm run hide_run"><a href="#n729">729</a></p> <p id="n730" class="pln"><a href="#n730">730</a></p> -<p id="n731" class="stm mis"><a href="#n731">731</a></p> -<p id="n732" class="stm mis"><a href="#n732">732</a></p> -<p id="n733" class="stm mis"><a href="#n733">733</a></p> -<p id="n734" class="stm mis"><a href="#n734">734</a></p> -<p id="n735" class="stm mis"><a href="#n735">735</a></p> +<p id="n731" class="stm run hide_run"><a href="#n731">731</a></p> +<p id="n732" class="stm run hide_run"><a href="#n732">732</a></p> +<p id="n733" class="stm run hide_run"><a href="#n733">733</a></p> +<p id="n734" class="stm run hide_run"><a href="#n734">734</a></p> +<p id="n735" class="stm run hide_run"><a href="#n735">735</a></p> <p id="n736" class="pln"><a href="#n736">736</a></p> <p id="n737" class="stm run hide_run"><a href="#n737">737</a></p> -<p id="n738" class="stm mis"><a href="#n738">738</a></p> +<p id="n738" class="stm run hide_run"><a href="#n738">738</a></p> <p id="n739" class="pln"><a href="#n739">739</a></p> -<p id="n740" class="stm mis"><a href="#n740">740</a></p> +<p id="n740" class="stm run hide_run"><a href="#n740">740</a></p> <p id="n741" class="pln"><a href="#n741">741</a></p> <p id="n742" class="stm run hide_run"><a href="#n742">742</a></p> -<p id="n743" class="stm mis"><a href="#n743">743</a></p> -<p id="n744" class="stm mis"><a href="#n744">744</a></p> -<p id="n745" class="stm mis"><a href="#n745">745</a></p> +<p id="n743" class="stm run hide_run"><a href="#n743">743</a></p> +<p id="n744" class="stm run hide_run"><a href="#n744">744</a></p> +<p id="n745" class="stm run hide_run"><a href="#n745">745</a></p> <p id="n746" class="pln"><a href="#n746">746</a></p> <p id="n747" class="stm run hide_run"><a href="#n747">747</a></p> -<p id="n748" class="stm mis"><a href="#n748">748</a></p> -<p id="n749" class="stm mis"><a href="#n749">749</a></p> -<p id="n750" class="stm mis"><a href="#n750">750</a></p> -<p id="n751" class="stm mis"><a href="#n751">751</a></p> +<p id="n748" class="stm run hide_run"><a href="#n748">748</a></p> +<p id="n749" class="stm run hide_run"><a href="#n749">749</a></p> +<p id="n750" class="stm run hide_run"><a href="#n750">750</a></p> +<p id="n751" class="stm run hide_run"><a href="#n751">751</a></p> <p id="n752" class="pln"><a href="#n752">752</a></p> -<p id="n753" class="stm mis"><a href="#n753">753</a></p> -<p id="n754" class="stm mis"><a href="#n754">754</a></p> +<p id="n753" class="stm run hide_run"><a href="#n753">753</a></p> +<p id="n754" class="stm run hide_run"><a href="#n754">754</a></p> <p id="n755" class="pln"><a href="#n755">755</a></p> <p id="n756" class="pln"><a href="#n756">756</a></p> <p id="n757" class="stm run hide_run"><a href="#n757">757</a></p> <p id="n758" class="pln"><a href="#n758">758</a></p> <p id="n759" class="stm run hide_run"><a href="#n759">759</a></p> <p id="n760" class="pln"><a href="#n760">760</a></p> -<p id="n761" class="stm mis"><a href="#n761">761</a></p> -<p id="n762" class="stm mis"><a href="#n762">762</a></p> -<p id="n763" class="stm mis"><a href="#n763">763</a></p> -<p id="n764" class="stm mis"><a href="#n764">764</a></p> -<p id="n765" class="stm mis"><a href="#n765">765</a></p> -<p id="n766" class="stm mis"><a href="#n766">766</a></p> -<p id="n767" class="stm mis"><a href="#n767">767</a></p> +<p id="n761" class="stm run hide_run"><a href="#n761">761</a></p> +<p id="n762" class="stm run hide_run"><a href="#n762">762</a></p> +<p id="n763" class="stm run hide_run"><a href="#n763">763</a></p> +<p id="n764" class="stm run hide_run"><a href="#n764">764</a></p> +<p id="n765" class="stm run hide_run"><a href="#n765">765</a></p> +<p id="n766" class="stm run hide_run"><a href="#n766">766</a></p> +<p id="n767" class="stm run hide_run"><a href="#n767">767</a></p> <p id="n768" class="pln"><a href="#n768">768</a></p> <p id="n769" class="stm run hide_run"><a href="#n769">769</a></p> -<p id="n770" class="stm mis"><a href="#n770">770</a></p> +<p id="n770" class="stm run hide_run"><a href="#n770">770</a></p> <p id="n771" class="pln"><a href="#n771">771</a></p> <p id="n772" class="pln"><a href="#n772">772</a></p> <p id="n773" class="pln"><a href="#n773">773</a></p> <p id="n774" class="pln"><a href="#n774">774</a></p> <p id="n775" class="pln"><a href="#n775">775</a></p> -<p id="n776" class="stm mis"><a href="#n776">776</a></p> -<p id="n777" class="stm mis"><a href="#n777">777</a></p> -<p id="n778" class="stm mis"><a href="#n778">778</a></p> +<p id="n776" class="stm run hide_run"><a href="#n776">776</a></p> +<p id="n777" class="stm run hide_run"><a href="#n777">777</a></p> +<p id="n778" class="stm run hide_run"><a href="#n778">778</a></p> <p id="n779" class="pln"><a href="#n779">779</a></p> <p id="n780" class="stm run hide_run"><a href="#n780">780</a></p> -<p id="n781" class="stm mis"><a href="#n781">781</a></p> -<p id="n782" class="stm mis"><a href="#n782">782</a></p> -<p id="n783" class="stm mis"><a href="#n783">783</a></p> +<p id="n781" class="stm run hide_run"><a href="#n781">781</a></p> +<p id="n782" class="stm run hide_run"><a href="#n782">782</a></p> +<p id="n783" class="stm run hide_run"><a href="#n783">783</a></p> <p id="n784" class="pln"><a href="#n784">784</a></p> <p id="n785" class="stm run hide_run"><a href="#n785">785</a></p> -<p id="n786" class="stm mis"><a href="#n786">786</a></p> -<p id="n787" class="stm mis"><a href="#n787">787</a></p> -<p id="n788" class="stm mis"><a href="#n788">788</a></p> -<p id="n789" class="stm mis"><a href="#n789">789</a></p> +<p id="n786" class="stm run hide_run"><a href="#n786">786</a></p> +<p id="n787" class="stm run hide_run"><a href="#n787">787</a></p> +<p id="n788" class="stm run hide_run"><a href="#n788">788</a></p> +<p id="n789" class="stm run hide_run"><a href="#n789">789</a></p> <p id="n790" class="pln"><a href="#n790">790</a></p> <p id="n791" class="stm run hide_run"><a href="#n791">791</a></p> <p id="n792" class="pln"><a href="#n792">792</a></p> -<p id="n793" class="stm mis"><a href="#n793">793</a></p> -<p id="n794" class="stm mis"><a href="#n794">794</a></p> -<p id="n795" class="stm mis"><a href="#n795">795</a></p> -<p id="n796" class="stm mis"><a href="#n796">796</a></p> +<p id="n793" class="stm run hide_run"><a href="#n793">793</a></p> +<p id="n794" class="stm run hide_run"><a href="#n794">794</a></p> +<p id="n795" class="stm run hide_run"><a href="#n795">795</a></p> +<p id="n796" class="stm run hide_run"><a href="#n796">796</a></p> <p id="n797" class="pln"><a href="#n797">797</a></p> <p id="n798" class="stm run hide_run"><a href="#n798">798</a></p> -<p id="n799" class="stm mis"><a href="#n799">799</a></p> +<p id="n799" class="stm run hide_run"><a href="#n799">799</a></p> <p id="n800" class="pln"><a href="#n800">800</a></p> <p id="n801" class="pln"><a href="#n801">801</a></p> <p id="n802" class="pln"><a href="#n802">802</a></p> <p id="n803" class="pln"><a href="#n803">803</a></p> <p id="n804" class="pln"><a href="#n804">804</a></p> -<p id="n805" class="stm mis"><a href="#n805">805</a></p> -<p id="n806" class="stm mis"><a href="#n806">806</a></p> -<p id="n807" class="stm mis"><a href="#n807">807</a></p> +<p id="n805" class="stm run hide_run"><a href="#n805">805</a></p> +<p id="n806" class="stm run hide_run"><a href="#n806">806</a></p> +<p id="n807" class="stm run hide_run"><a href="#n807">807</a></p> <p id="n808" class="pln"><a href="#n808">808</a></p> <p id="n809" class="stm run hide_run"><a href="#n809">809</a></p> -<p id="n810" class="stm mis"><a href="#n810">810</a></p> +<p id="n810" class="stm run hide_run"><a href="#n810">810</a></p> <p id="n811" class="pln"><a href="#n811">811</a></p> <p id="n812" class="pln"><a href="#n812">812</a></p> <p id="n813" class="pln"><a href="#n813">813</a></p> @@ -901,30 +901,30 @@ <p id="n830" class="pln"><a href="#n830">830</a></p> <p id="n831" class="pln"><a href="#n831">831</a></p> <p id="n832" class="pln"><a href="#n832">832</a></p> -<p id="n833" class="stm mis"><a href="#n833">833</a></p> -<p id="n834" class="stm mis"><a href="#n834">834</a></p> -<p id="n835" class="stm mis"><a href="#n835">835</a></p> -<p id="n836" class="stm mis"><a href="#n836">836</a></p> -<p id="n837" class="stm mis"><a href="#n837">837</a></p> -<p id="n838" class="stm mis"><a href="#n838">838</a></p> +<p id="n833" class="stm run hide_run"><a href="#n833">833</a></p> +<p id="n834" class="stm run hide_run"><a href="#n834">834</a></p> +<p id="n835" class="stm run hide_run"><a href="#n835">835</a></p> +<p id="n836" class="stm run hide_run"><a href="#n836">836</a></p> +<p id="n837" class="stm run hide_run"><a href="#n837">837</a></p> +<p id="n838" class="stm run hide_run"><a href="#n838">838</a></p> <p id="n839" class="pln"><a href="#n839">839</a></p> <p id="n840" class="stm run hide_run"><a href="#n840">840</a></p> -<p id="n841" class="stm mis"><a href="#n841">841</a></p> -<p id="n842" class="stm mis"><a href="#n842">842</a></p> -<p id="n843" class="stm mis"><a href="#n843">843</a></p> -<p id="n844" class="stm mis"><a href="#n844">844</a></p> +<p id="n841" class="stm run hide_run"><a href="#n841">841</a></p> +<p id="n842" class="stm run hide_run"><a href="#n842">842</a></p> +<p id="n843" class="stm run hide_run"><a href="#n843">843</a></p> +<p id="n844" class="stm run hide_run"><a href="#n844">844</a></p> <p id="n845" class="pln"><a href="#n845">845</a></p> <p id="n846" class="stm run hide_run"><a href="#n846">846</a></p> -<p id="n847" class="stm mis"><a href="#n847">847</a></p> -<p id="n848" class="stm mis"><a href="#n848">848</a></p> -<p id="n849" class="stm mis"><a href="#n849">849</a></p> -<p id="n850" class="stm mis"><a href="#n850">850</a></p> +<p id="n847" class="stm run hide_run"><a href="#n847">847</a></p> +<p id="n848" class="stm run hide_run"><a href="#n848">848</a></p> +<p id="n849" class="stm run hide_run"><a href="#n849">849</a></p> +<p id="n850" class="stm run hide_run"><a href="#n850">850</a></p> <p id="n851" class="pln"><a href="#n851">851</a></p> <p id="n852" class="pln"><a href="#n852">852</a></p> <p id="n853" class="stm run hide_run"><a href="#n853">853</a></p> <p id="n854" class="pln"><a href="#n854">854</a></p> <p id="n855" class="stm run hide_run"><a href="#n855">855</a></p> -<p id="n856" class="stm mis"><a href="#n856">856</a></p> +<p id="n856" class="stm run hide_run"><a href="#n856">856</a></p> <p id="n857" class="pln"><a href="#n857">857</a></p> <p id="n858" class="pln"><a href="#n858">858</a></p> <p id="n859" class="pln"><a href="#n859">859</a></p> @@ -949,15 +949,15 @@ <p id="n878" class="pln"><a href="#n878">878</a></p> <p id="n879" class="pln"><a href="#n879">879</a></p> <p id="n880" class="pln"><a href="#n880">880</a></p> -<p id="n881" class="stm mis"><a href="#n881">881</a></p> -<p id="n882" class="stm mis"><a href="#n882">882</a></p> -<p id="n883" class="stm mis"><a href="#n883">883</a></p> -<p id="n884" class="stm mis"><a href="#n884">884</a></p> -<p id="n885" class="stm mis"><a href="#n885">885</a></p> +<p id="n881" class="stm run hide_run"><a href="#n881">881</a></p> +<p id="n882" class="stm run hide_run"><a href="#n882">882</a></p> +<p id="n883" class="stm run hide_run"><a href="#n883">883</a></p> +<p id="n884" class="stm run hide_run"><a href="#n884">884</a></p> +<p id="n885" class="stm run hide_run"><a href="#n885">885</a></p> <p id="n886" class="pln"><a href="#n886">886</a></p> <p id="n887" class="stm run hide_run"><a href="#n887">887</a></p> <p id="n888" class="pln"><a href="#n888">888</a></p> -<p id="n889" class="stm mis"><a href="#n889">889</a></p> +<p id="n889" class="stm run hide_run"><a href="#n889">889</a></p> <p id="n890" class="pln"><a href="#n890">890</a></p> <p id="n891" class="pln"><a href="#n891">891</a></p> <p id="n892" class="pln"><a href="#n892">892</a></p> @@ -982,12 +982,12 @@ <p id="n911" class="pln"><a href="#n911">911</a></p> <p id="n912" class="pln"><a href="#n912">912</a></p> <p id="n913" class="pln"><a href="#n913">913</a></p> -<p id="n914" class="stm mis"><a href="#n914">914</a></p> -<p id="n915" class="stm mis"><a href="#n915">915</a></p> -<p id="n916" class="stm mis"><a href="#n916">916</a></p> +<p id="n914" class="stm run hide_run"><a href="#n914">914</a></p> +<p id="n915" class="stm run hide_run"><a href="#n915">915</a></p> +<p id="n916" class="stm run hide_run"><a href="#n916">916</a></p> <p id="n917" class="pln"><a href="#n917">917</a></p> <p id="n918" class="stm run hide_run"><a href="#n918">918</a></p> -<p id="n919" class="stm mis"><a href="#n919">919</a></p> +<p id="n919" class="stm run hide_run"><a href="#n919">919</a></p> <p id="n920" class="pln"><a href="#n920">920</a></p> <p id="n921" class="pln"><a href="#n921">921</a></p> <p id="n922" class="pln"><a href="#n922">922</a></p> @@ -1026,15 +1026,15 @@ <p id="n955" class="pln"><a href="#n955">955</a></p> <p id="n956" class="pln"><a href="#n956">956</a></p> <p id="n957" class="pln"><a href="#n957">957</a></p> -<p id="n958" class="stm mis"><a href="#n958">958</a></p> -<p id="n959" class="stm mis"><a href="#n959">959</a></p> -<p id="n960" class="stm mis"><a href="#n960">960</a></p> -<p id="n961" class="stm mis"><a href="#n961">961</a></p> -<p id="n962" class="stm mis"><a href="#n962">962</a></p> -<p id="n963" class="stm mis"><a href="#n963">963</a></p> +<p id="n958" class="stm run hide_run"><a href="#n958">958</a></p> +<p id="n959" class="stm run hide_run"><a href="#n959">959</a></p> +<p id="n960" class="stm run hide_run"><a href="#n960">960</a></p> +<p id="n961" class="stm run hide_run"><a href="#n961">961</a></p> +<p id="n962" class="stm run hide_run"><a href="#n962">962</a></p> +<p id="n963" class="stm run hide_run"><a href="#n963">963</a></p> <p id="n964" class="pln"><a href="#n964">964</a></p> <p id="n965" class="stm run hide_run"><a href="#n965">965</a></p> -<p id="n966" class="stm mis"><a href="#n966">966</a></p> +<p id="n966" class="stm run hide_run"><a href="#n966">966</a></p> <p id="n967" class="pln"><a href="#n967">967</a></p> <p id="n968" class="pln"><a href="#n968">968</a></p> <p id="n969" class="pln"><a href="#n969">969</a></p> @@ -1077,15 +1077,15 @@ <p id="n1006" class="pln"><a href="#n1006">1006</a></p> <p id="n1007" class="pln"><a href="#n1007">1007</a></p> <p id="n1008" class="pln"><a href="#n1008">1008</a></p> -<p id="n1009" class="stm mis"><a href="#n1009">1009</a></p> -<p id="n1010" class="stm mis"><a href="#n1010">1010</a></p> -<p id="n1011" class="stm mis"><a href="#n1011">1011</a></p> -<p id="n1012" class="stm mis"><a href="#n1012">1012</a></p> -<p id="n1013" class="stm mis"><a href="#n1013">1013</a></p> -<p id="n1014" class="stm mis"><a href="#n1014">1014</a></p> +<p id="n1009" class="stm run hide_run"><a href="#n1009">1009</a></p> +<p id="n1010" class="stm run hide_run"><a href="#n1010">1010</a></p> +<p id="n1011" class="stm run hide_run"><a href="#n1011">1011</a></p> +<p id="n1012" class="stm run hide_run"><a href="#n1012">1012</a></p> +<p id="n1013" class="stm run hide_run"><a href="#n1013">1013</a></p> +<p id="n1014" class="stm run hide_run"><a href="#n1014">1014</a></p> <p id="n1015" class="pln"><a href="#n1015">1015</a></p> <p id="n1016" class="stm run hide_run"><a href="#n1016">1016</a></p> -<p id="n1017" class="stm mis"><a href="#n1017">1017</a></p> +<p id="n1017" class="stm run hide_run"><a href="#n1017">1017</a></p> <p id="n1018" class="pln"><a href="#n1018">1018</a></p> <p id="n1019" class="pln"><a href="#n1019">1019</a></p> <p id="n1020" class="pln"><a href="#n1020">1020</a></p> @@ -1121,13 +1121,13 @@ <p id="n1050" class="pln"><a href="#n1050">1050</a></p> <p id="n1051" class="pln"><a href="#n1051">1051</a></p> <p id="n1052" class="pln"><a href="#n1052">1052</a></p> -<p id="n1053" class="stm mis"><a href="#n1053">1053</a></p> -<p id="n1054" class="stm mis"><a href="#n1054">1054</a></p> -<p id="n1055" class="stm mis"><a href="#n1055">1055</a></p> -<p id="n1056" class="stm mis"><a href="#n1056">1056</a></p> +<p id="n1053" class="stm run hide_run"><a href="#n1053">1053</a></p> +<p id="n1054" class="stm run hide_run"><a href="#n1054">1054</a></p> +<p id="n1055" class="stm run hide_run"><a href="#n1055">1055</a></p> +<p id="n1056" class="stm run hide_run"><a href="#n1056">1056</a></p> <p id="n1057" class="pln"><a href="#n1057">1057</a></p> <p id="n1058" class="stm run hide_run"><a href="#n1058">1058</a></p> -<p id="n1059" class="stm mis"><a href="#n1059">1059</a></p> +<p id="n1059" class="stm run hide_run"><a href="#n1059">1059</a></p> <p id="n1060" class="pln"><a href="#n1060">1060</a></p> <p id="n1061" class="pln"><a href="#n1061">1061</a></p> <p id="n1062" class="pln"><a href="#n1062">1062</a></p> @@ -1143,18 +1143,18 @@ <p id="n1072" class="pln"><a href="#n1072">1072</a></p> <p id="n1073" class="pln"><a href="#n1073">1073</a></p> <p id="n1074" class="pln"><a href="#n1074">1074</a></p> -<p id="n1075" class="stm mis"><a href="#n1075">1075</a></p> -<p id="n1076" class="stm mis"><a href="#n1076">1076</a></p> -<p id="n1077" class="stm mis"><a href="#n1077">1077</a></p> +<p id="n1075" class="stm run hide_run"><a href="#n1075">1075</a></p> +<p id="n1076" class="stm run hide_run"><a href="#n1076">1076</a></p> +<p id="n1077" class="stm run hide_run"><a href="#n1077">1077</a></p> <p id="n1078" class="pln"><a href="#n1078">1078</a></p> <p id="n1079" class="stm run hide_run"><a href="#n1079">1079</a></p> -<p id="n1080" class="stm mis"><a href="#n1080">1080</a></p> +<p id="n1080" class="stm run hide_run"><a href="#n1080">1080</a></p> <p id="n1081" class="pln"><a href="#n1081">1081</a></p> -<p id="n1082" class="stm mis"><a href="#n1082">1082</a></p> -<p id="n1083" class="stm mis"><a href="#n1083">1083</a></p> -<p id="n1084" class="stm mis"><a href="#n1084">1084</a></p> +<p id="n1082" class="stm par run hide_run"><a href="#n1082">1082</a></p> +<p id="n1083" class="stm run hide_run"><a href="#n1083">1083</a></p> +<p id="n1084" class="stm run hide_run"><a href="#n1084">1084</a></p> <p id="n1085" class="pln"><a href="#n1085">1085</a></p> -<p id="n1086" class="stm mis"><a href="#n1086">1086</a></p> +<p id="n1086" class="stm run hide_run"><a href="#n1086">1086</a></p> <p id="n1087" class="pln"><a href="#n1087">1087</a></p> <p id="n1088" class="pln"><a href="#n1088">1088</a></p> <p id="n1089" class="pln"><a href="#n1089">1089</a></p> @@ -1192,14 +1192,14 @@ <p id="n1121" class="pln"><a href="#n1121">1121</a></p> <p id="n1122" class="pln"><a href="#n1122">1122</a></p> <p id="n1123" class="pln"><a href="#n1123">1123</a></p> -<p id="n1124" class="stm mis"><a href="#n1124">1124</a></p> -<p id="n1125" class="stm mis"><a href="#n1125">1125</a></p> -<p id="n1126" class="stm mis"><a href="#n1126">1126</a></p> -<p id="n1127" class="stm mis"><a href="#n1127">1127</a></p> -<p id="n1128" class="stm mis"><a href="#n1128">1128</a></p> +<p id="n1124" class="stm run hide_run"><a href="#n1124">1124</a></p> +<p id="n1125" class="stm run hide_run"><a href="#n1125">1125</a></p> +<p id="n1126" class="stm run hide_run"><a href="#n1126">1126</a></p> +<p id="n1127" class="stm run hide_run"><a href="#n1127">1127</a></p> +<p id="n1128" class="stm run hide_run"><a href="#n1128">1128</a></p> <p id="n1129" class="pln"><a href="#n1129">1129</a></p> <p id="n1130" class="stm run hide_run"><a href="#n1130">1130</a></p> -<p id="n1131" class="stm mis"><a href="#n1131">1131</a></p> +<p id="n1131" class="stm run hide_run"><a href="#n1131">1131</a></p> <p id="n1132" class="pln"><a href="#n1132">1132</a></p> <p id="n1133" class="pln"><a href="#n1133">1133</a></p> <p id="n1134" class="pln"><a href="#n1134">1134</a></p> @@ -1221,22 +1221,22 @@ <p id="n1150" class="pln"><a href="#n1150">1150</a></p> <p id="n1151" class="pln"><a href="#n1151">1151</a></p> <p id="n1152" class="pln"><a href="#n1152">1152</a></p> -<p id="n1153" class="stm mis"><a href="#n1153">1153</a></p> -<p id="n1154" class="stm mis"><a href="#n1154">1154</a></p> -<p id="n1155" class="stm mis"><a href="#n1155">1155</a></p> -<p id="n1156" class="stm mis"><a href="#n1156">1156</a></p> +<p id="n1153" class="stm run hide_run"><a href="#n1153">1153</a></p> +<p id="n1154" class="stm run hide_run"><a href="#n1154">1154</a></p> +<p id="n1155" class="stm run hide_run"><a href="#n1155">1155</a></p> +<p id="n1156" class="stm run hide_run"><a href="#n1156">1156</a></p> <p id="n1157" class="pln"><a href="#n1157">1157</a></p> <p id="n1158" class="stm run hide_run"><a href="#n1158">1158</a></p> -<p id="n1159" class="stm mis"><a href="#n1159">1159</a></p> -<p id="n1160" class="stm mis"><a href="#n1160">1160</a></p> +<p id="n1159" class="stm run hide_run"><a href="#n1159">1159</a></p> +<p id="n1160" class="stm run hide_run"><a href="#n1160">1160</a></p> <p id="n1161" class="pln"><a href="#n1161">1161</a></p> <p id="n1162" class="stm run hide_run"><a href="#n1162">1162</a></p> -<p id="n1163" class="stm mis"><a href="#n1163">1163</a></p> -<p id="n1164" class="stm mis"><a href="#n1164">1164</a></p> +<p id="n1163" class="stm run hide_run"><a href="#n1163">1163</a></p> +<p id="n1164" class="stm run hide_run"><a href="#n1164">1164</a></p> <p id="n1165" class="pln"><a href="#n1165">1165</a></p> <p id="n1166" class="stm run hide_run"><a href="#n1166">1166</a></p> -<p id="n1167" class="stm mis"><a href="#n1167">1167</a></p> -<p id="n1168" class="stm mis"><a href="#n1168">1168</a></p> +<p id="n1167" class="stm run hide_run"><a href="#n1167">1167</a></p> +<p id="n1168" class="stm run hide_run"><a href="#n1168">1168</a></p> <p id="n1169" class="pln"><a href="#n1169">1169</a></p> <p id="n1170" class="pln"><a href="#n1170">1170</a></p> <p id="n1171" class="stm run hide_run"><a href="#n1171">1171</a></p> @@ -1261,30 +1261,30 @@ <p id="n1190" class="pln"><a href="#n1190">1190</a></p> <p id="n1191" class="pln"><a href="#n1191">1191</a></p> <p id="n1192" class="stm run hide_run"><a href="#n1192">1192</a></p> -<p id="n1193" class="stm mis"><a href="#n1193">1193</a></p> -<p id="n1194" class="stm mis"><a href="#n1194">1194</a></p> -<p id="n1195" class="stm mis"><a href="#n1195">1195</a></p> +<p id="n1193" class="stm run hide_run"><a href="#n1193">1193</a></p> +<p id="n1194" class="stm run hide_run"><a href="#n1194">1194</a></p> +<p id="n1195" class="stm run hide_run"><a href="#n1195">1195</a></p> <p id="n1196" class="pln"><a href="#n1196">1196</a></p> <p id="n1197" class="stm run hide_run"><a href="#n1197">1197</a></p> -<p id="n1198" class="stm mis"><a href="#n1198">1198</a></p> -<p id="n1199" class="stm mis"><a href="#n1199">1199</a></p> -<p id="n1200" class="stm mis"><a href="#n1200">1200</a></p> +<p id="n1198" class="stm run hide_run"><a href="#n1198">1198</a></p> +<p id="n1199" class="stm run hide_run"><a href="#n1199">1199</a></p> +<p id="n1200" class="stm run hide_run"><a href="#n1200">1200</a></p> <p id="n1201" class="pln"><a href="#n1201">1201</a></p> <p id="n1202" class="stm run hide_run"><a href="#n1202">1202</a></p> -<p id="n1203" class="stm mis"><a href="#n1203">1203</a></p> -<p id="n1204" class="stm mis"><a href="#n1204">1204</a></p> -<p id="n1205" class="stm mis"><a href="#n1205">1205</a></p> +<p id="n1203" class="stm run hide_run"><a href="#n1203">1203</a></p> +<p id="n1204" class="stm run hide_run"><a href="#n1204">1204</a></p> +<p id="n1205" class="stm run hide_run"><a href="#n1205">1205</a></p> <p id="n1206" class="pln"><a href="#n1206">1206</a></p> <p id="n1207" class="stm run hide_run"><a href="#n1207">1207</a></p> -<p id="n1208" class="stm mis"><a href="#n1208">1208</a></p> -<p id="n1209" class="stm mis"><a href="#n1209">1209</a></p> -<p id="n1210" class="stm mis"><a href="#n1210">1210</a></p> +<p id="n1208" class="stm run hide_run"><a href="#n1208">1208</a></p> +<p id="n1209" class="stm run hide_run"><a href="#n1209">1209</a></p> +<p id="n1210" class="stm run hide_run"><a href="#n1210">1210</a></p> <p id="n1211" class="pln"><a href="#n1211">1211</a></p> <p id="n1212" class="pln"><a href="#n1212">1212</a></p> <p id="n1213" class="stm run hide_run"><a href="#n1213">1213</a></p> <p id="n1214" class="pln"><a href="#n1214">1214</a></p> <p id="n1215" class="stm run hide_run"><a href="#n1215">1215</a></p> -<p id="n1216" class="stm mis"><a href="#n1216">1216</a></p> +<p id="n1216" class="stm run hide_run"><a href="#n1216">1216</a></p> <p id="n1217" class="pln"><a href="#n1217">1217</a></p> <p id="n1218" class="pln"><a href="#n1218">1218</a></p> <p id="n1219" class="pln"><a href="#n1219">1219</a></p> @@ -1303,14 +1303,14 @@ <p id="n1232" class="pln"><a href="#n1232">1232</a></p> <p id="n1233" class="pln"><a href="#n1233">1233</a></p> <p id="n1234" class="pln"><a href="#n1234">1234</a></p> -<p id="n1235" class="stm mis"><a href="#n1235">1235</a></p> -<p id="n1236" class="stm mis"><a href="#n1236">1236</a></p> -<p id="n1237" class="stm mis"><a href="#n1237">1237</a></p> -<p id="n1238" class="stm mis"><a href="#n1238">1238</a></p> -<p id="n1239" class="stm mis"><a href="#n1239">1239</a></p> +<p id="n1235" class="stm run hide_run"><a href="#n1235">1235</a></p> +<p id="n1236" class="stm run hide_run"><a href="#n1236">1236</a></p> +<p id="n1237" class="stm run hide_run"><a href="#n1237">1237</a></p> +<p id="n1238" class="stm run hide_run"><a href="#n1238">1238</a></p> +<p id="n1239" class="stm run hide_run"><a href="#n1239">1239</a></p> <p id="n1240" class="pln"><a href="#n1240">1240</a></p> <p id="n1241" class="stm run hide_run"><a href="#n1241">1241</a></p> -<p id="n1242" class="stm mis"><a href="#n1242">1242</a></p> +<p id="n1242" class="stm run hide_run"><a href="#n1242">1242</a></p> <p id="n1243" class="pln"><a href="#n1243">1243</a></p> <p id="n1244" class="pln"><a href="#n1244">1244</a></p> <p id="n1245" class="pln"><a href="#n1245">1245</a></p> @@ -1329,11 +1329,11 @@ <p id="n1258" class="pln"><a href="#n1258">1258</a></p> <p id="n1259" class="pln"><a href="#n1259">1259</a></p> <p id="n1260" class="pln"><a href="#n1260">1260</a></p> -<p id="n1261" class="stm mis"><a href="#n1261">1261</a></p> -<p id="n1262" class="stm mis"><a href="#n1262">1262</a></p> -<p id="n1263" class="stm mis"><a href="#n1263">1263</a></p> -<p id="n1264" class="stm mis"><a href="#n1264">1264</a></p> -<p id="n1265" class="stm mis"><a href="#n1265">1265</a></p> +<p id="n1261" class="stm run hide_run"><a href="#n1261">1261</a></p> +<p id="n1262" class="stm run hide_run"><a href="#n1262">1262</a></p> +<p id="n1263" class="stm run hide_run"><a href="#n1263">1263</a></p> +<p id="n1264" class="stm run hide_run"><a href="#n1264">1264</a></p> +<p id="n1265" class="stm run hide_run"><a href="#n1265">1265</a></p> <p id="n1266" class="pln"><a href="#n1266">1266</a></p> <p id="n1267" class="pln"><a href="#n1267">1267</a></p> <p id="n1268" class="stm run hide_run"><a href="#n1268">1268</a></p> @@ -1343,18 +1343,18 @@ <p id="n1272" class="pln"><a href="#n1272">1272</a></p> <p id="n1273" class="pln"><a href="#n1273">1273</a></p> <p id="n1274" class="stm run hide_run"><a href="#n1274">1274</a></p> -<p id="n1275" class="stm mis"><a href="#n1275">1275</a></p> -<p id="n1276" class="stm mis"><a href="#n1276">1276</a></p> +<p id="n1275" class="stm run hide_run"><a href="#n1275">1275</a></p> +<p id="n1276" class="stm run hide_run"><a href="#n1276">1276</a></p> <p id="n1277" class="pln"><a href="#n1277">1277</a></p> <p id="n1278" class="stm run hide_run"><a href="#n1278">1278</a></p> -<p id="n1279" class="stm mis"><a href="#n1279">1279</a></p> +<p id="n1279" class="stm run hide_run"><a href="#n1279">1279</a></p> <p id="n1280" class="pln"><a href="#n1280">1280</a></p> <p id="n1281" class="pln"><a href="#n1281">1281</a></p> <p id="n1282" class="pln"><a href="#n1282">1282</a></p> <p id="n1283" class="pln"><a href="#n1283">1283</a></p> -<p id="n1284" class="stm mis"><a href="#n1284">1284</a></p> -<p id="n1285" class="stm mis"><a href="#n1285">1285</a></p> -<p id="n1286" class="stm mis"><a href="#n1286">1286</a></p> +<p id="n1284" class="stm run hide_run"><a href="#n1284">1284</a></p> +<p id="n1285" class="stm run hide_run"><a href="#n1285">1285</a></p> +<p id="n1286" class="stm run hide_run"><a href="#n1286">1286</a></p> <p id="n1287" class="pln"><a href="#n1287">1287</a></p> <p id="n1288" class="pln"><a href="#n1288">1288</a></p> <p id="n1289" class="stm run hide_run"><a href="#n1289">1289</a></p> @@ -1406,36 +1406,36 @@ <p id="n1335" class="pln"><a href="#n1335">1335</a></p> <p id="n1336" class="stm run hide_run"><a href="#n1336">1336</a></p> <p id="n1337" class="pln"><a href="#n1337">1337</a></p> -<p id="n1338" class="stm mis"><a href="#n1338">1338</a></p> -<p id="n1339" class="stm mis"><a href="#n1339">1339</a></p> -<p id="n1340" class="stm mis"><a href="#n1340">1340</a></p> +<p id="n1338" class="stm run hide_run"><a href="#n1338">1338</a></p> +<p id="n1339" class="stm run hide_run"><a href="#n1339">1339</a></p> +<p id="n1340" class="stm run hide_run"><a href="#n1340">1340</a></p> <p id="n1341" class="pln"><a href="#n1341">1341</a></p> <p id="n1342" class="stm run hide_run"><a href="#n1342">1342</a></p> <p id="n1343" class="pln"><a href="#n1343">1343</a></p> -<p id="n1344" class="stm mis"><a href="#n1344">1344</a></p> -<p id="n1345" class="stm mis"><a href="#n1345">1345</a></p> -<p id="n1346" class="stm mis"><a href="#n1346">1346</a></p> +<p id="n1344" class="stm run hide_run"><a href="#n1344">1344</a></p> +<p id="n1345" class="stm run hide_run"><a href="#n1345">1345</a></p> +<p id="n1346" class="stm run hide_run"><a href="#n1346">1346</a></p> <p id="n1347" class="pln"><a href="#n1347">1347</a></p> <p id="n1348" class="stm run hide_run"><a href="#n1348">1348</a></p> <p id="n1349" class="pln"><a href="#n1349">1349</a></p> -<p id="n1350" class="stm mis"><a href="#n1350">1350</a></p> -<p id="n1351" class="stm mis"><a href="#n1351">1351</a></p> -<p id="n1352" class="stm mis"><a href="#n1352">1352</a></p> +<p id="n1350" class="stm run hide_run"><a href="#n1350">1350</a></p> +<p id="n1351" class="stm run hide_run"><a href="#n1351">1351</a></p> +<p id="n1352" class="stm run hide_run"><a href="#n1352">1352</a></p> <p id="n1353" class="pln"><a href="#n1353">1353</a></p> <p id="n1354" class="stm run hide_run"><a href="#n1354">1354</a></p> <p id="n1355" class="pln"><a href="#n1355">1355</a></p> -<p id="n1356" class="stm mis"><a href="#n1356">1356</a></p> -<p id="n1357" class="stm mis"><a href="#n1357">1357</a></p> -<p id="n1358" class="stm mis"><a href="#n1358">1358</a></p> +<p id="n1356" class="stm run hide_run"><a href="#n1356">1356</a></p> +<p id="n1357" class="stm run hide_run"><a href="#n1357">1357</a></p> +<p id="n1358" class="stm run hide_run"><a href="#n1358">1358</a></p> <p id="n1359" class="pln"><a href="#n1359">1359</a></p> <p id="n1360" class="stm run hide_run"><a href="#n1360">1360</a></p> <p id="n1361" class="pln"><a href="#n1361">1361</a></p> -<p id="n1362" class="stm mis"><a href="#n1362">1362</a></p> -<p id="n1363" class="stm mis"><a href="#n1363">1363</a></p> -<p id="n1364" class="stm mis"><a href="#n1364">1364</a></p> +<p id="n1362" class="stm run hide_run"><a href="#n1362">1362</a></p> +<p id="n1363" class="stm run hide_run"><a href="#n1363">1363</a></p> +<p id="n1364" class="stm run hide_run"><a href="#n1364">1364</a></p> <p id="n1365" class="pln"><a href="#n1365">1365</a></p> <p id="n1366" class="stm run hide_run"><a href="#n1366">1366</a></p> -<p id="n1367" class="stm mis"><a href="#n1367">1367</a></p> +<p id="n1367" class="stm run hide_run"><a href="#n1367">1367</a></p> <p id="n1368" class="pln"><a href="#n1368">1368</a></p> <p id="n1369" class="pln"><a href="#n1369">1369</a></p> <p id="n1370" class="pln"><a href="#n1370">1370</a></p> @@ -1446,43 +1446,43 @@ <p id="n1375" class="pln"><a href="#n1375">1375</a></p> <p id="n1376" class="pln"><a href="#n1376">1376</a></p> <p id="n1377" class="pln"><a href="#n1377">1377</a></p> -<p id="n1378" class="stm mis"><a href="#n1378">1378</a></p> +<p id="n1378" class="stm run hide_run"><a href="#n1378">1378</a></p> <p id="n1379" class="pln"><a href="#n1379">1379</a></p> -<p id="n1380" class="stm mis"><a href="#n1380">1380</a></p> -<p id="n1381" class="stm mis"><a href="#n1381">1381</a></p> -<p id="n1382" class="stm mis"><a href="#n1382">1382</a></p> +<p id="n1380" class="stm run hide_run"><a href="#n1380">1380</a></p> +<p id="n1381" class="stm run hide_run"><a href="#n1381">1381</a></p> +<p id="n1382" class="stm run hide_run"><a href="#n1382">1382</a></p> <p id="n1383" class="pln"><a href="#n1383">1383</a></p> -<p id="n1384" class="stm mis"><a href="#n1384">1384</a></p> -<p id="n1385" class="stm mis"><a href="#n1385">1385</a></p> -<p id="n1386" class="stm mis"><a href="#n1386">1386</a></p> +<p id="n1384" class="stm run hide_run"><a href="#n1384">1384</a></p> +<p id="n1385" class="stm run hide_run"><a href="#n1385">1385</a></p> +<p id="n1386" class="stm run hide_run"><a href="#n1386">1386</a></p> <p id="n1387" class="pln"><a href="#n1387">1387</a></p> -<p id="n1388" class="stm mis"><a href="#n1388">1388</a></p> -<p id="n1389" class="stm mis"><a href="#n1389">1389</a></p> -<p id="n1390" class="stm mis"><a href="#n1390">1390</a></p> +<p id="n1388" class="stm run hide_run"><a href="#n1388">1388</a></p> +<p id="n1389" class="stm run hide_run"><a href="#n1389">1389</a></p> +<p id="n1390" class="stm run hide_run"><a href="#n1390">1390</a></p> <p id="n1391" class="pln"><a href="#n1391">1391</a></p> -<p id="n1392" class="stm mis"><a href="#n1392">1392</a></p> -<p id="n1393" class="stm mis"><a href="#n1393">1393</a></p> -<p id="n1394" class="stm mis"><a href="#n1394">1394</a></p> +<p id="n1392" class="stm run hide_run"><a href="#n1392">1392</a></p> +<p id="n1393" class="stm run hide_run"><a href="#n1393">1393</a></p> +<p id="n1394" class="stm run hide_run"><a href="#n1394">1394</a></p> <p id="n1395" class="pln"><a href="#n1395">1395</a></p> -<p id="n1396" class="stm mis"><a href="#n1396">1396</a></p> -<p id="n1397" class="stm mis"><a href="#n1397">1397</a></p> -<p id="n1398" class="stm mis"><a href="#n1398">1398</a></p> -<p id="n1399" class="stm mis"><a href="#n1399">1399</a></p> +<p id="n1396" class="stm run hide_run"><a href="#n1396">1396</a></p> +<p id="n1397" class="stm run hide_run"><a href="#n1397">1397</a></p> +<p id="n1398" class="stm run hide_run"><a href="#n1398">1398</a></p> +<p id="n1399" class="stm run hide_run"><a href="#n1399">1399</a></p> <p id="n1400" class="pln"><a href="#n1400">1400</a></p> -<p id="n1401" class="stm mis"><a href="#n1401">1401</a></p> -<p id="n1402" class="stm mis"><a href="#n1402">1402</a></p> -<p id="n1403" class="stm mis"><a href="#n1403">1403</a></p> -<p id="n1404" class="stm mis"><a href="#n1404">1404</a></p> +<p id="n1401" class="stm run hide_run"><a href="#n1401">1401</a></p> +<p id="n1402" class="stm run hide_run"><a href="#n1402">1402</a></p> +<p id="n1403" class="stm run hide_run"><a href="#n1403">1403</a></p> +<p id="n1404" class="stm run hide_run"><a href="#n1404">1404</a></p> <p id="n1405" class="pln"><a href="#n1405">1405</a></p> -<p id="n1406" class="stm mis"><a href="#n1406">1406</a></p> -<p id="n1407" class="stm mis"><a href="#n1407">1407</a></p> -<p id="n1408" class="stm mis"><a href="#n1408">1408</a></p> -<p id="n1409" class="stm mis"><a href="#n1409">1409</a></p> +<p id="n1406" class="stm run hide_run"><a href="#n1406">1406</a></p> +<p id="n1407" class="stm run hide_run"><a href="#n1407">1407</a></p> +<p id="n1408" class="stm run hide_run"><a href="#n1408">1408</a></p> +<p id="n1409" class="stm run hide_run"><a href="#n1409">1409</a></p> <p id="n1410" class="pln"><a href="#n1410">1410</a></p> <p id="n1411" class="stm run hide_run"><a href="#n1411">1411</a></p> <p id="n1412" class="pln"><a href="#n1412">1412</a></p> <p id="n1413" class="pln"><a href="#n1413">1413</a></p> -<p id="n1414" class="stm mis"><a href="#n1414">1414</a></p> +<p id="n1414" class="stm run hide_run"><a href="#n1414">1414</a></p> <p id="n1415" class="pln"><a href="#n1415">1415</a></p> <p id="n1416" class="pln"><a href="#n1416">1416</a></p> <p id="n1417" class="pln"><a href="#n1417">1417</a></p> @@ -1506,18 +1506,18 @@ <p id="n1435" class="pln"><a href="#n1435">1435</a></p> <p id="n1436" class="pln"><a href="#n1436">1436</a></p> <p id="n1437" class="pln"><a href="#n1437">1437</a></p> -<p id="n1438" class="stm mis"><a href="#n1438">1438</a></p> +<p id="n1438" class="stm run hide_run"><a href="#n1438">1438</a></p> <p id="n1439" class="pln"><a href="#n1439">1439</a></p> <p id="n1440" class="pln"><a href="#n1440">1440</a></p> -<p id="n1441" class="stm mis"><a href="#n1441">1441</a></p> -<p id="n1442" class="stm mis"><a href="#n1442">1442</a></p> +<p id="n1441" class="stm run hide_run"><a href="#n1441">1441</a></p> +<p id="n1442" class="stm run hide_run"><a href="#n1442">1442</a></p> <p id="n1443" class="pln"><a href="#n1443">1443</a></p> <p id="n1444" class="pln"><a href="#n1444">1444</a></p> <p id="n1445" class="stm run hide_run"><a href="#n1445">1445</a></p> <p id="n1446" class="pln"><a href="#n1446">1446</a></p> <p id="n1447" class="stm run hide_run"><a href="#n1447">1447</a></p> <p id="n1448" class="pln"><a href="#n1448">1448</a></p> -<p id="n1449" class="stm mis"><a href="#n1449">1449</a></p> +<p id="n1449" class="stm run hide_run"><a href="#n1449">1449</a></p> <p id="n1450" class="pln"><a href="#n1450">1450</a></p> <p id="n1451" class="pln"><a href="#n1451">1451</a></p> <p id="n1452" class="pln"><a href="#n1452">1452</a></p> @@ -1532,21 +1532,21 @@ <p id="n1461" class="pln"><a href="#n1461">1461</a></p> <p id="n1462" class="pln"><a href="#n1462">1462</a></p> <p id="n1463" class="pln"><a href="#n1463">1463</a></p> -<p id="n1464" class="stm mis"><a href="#n1464">1464</a></p> -<p id="n1465" class="stm mis"><a href="#n1465">1465</a></p> -<p id="n1466" class="stm mis"><a href="#n1466">1466</a></p> -<p id="n1467" class="stm mis"><a href="#n1467">1467</a></p> -<p id="n1468" class="stm mis"><a href="#n1468">1468</a></p> -<p id="n1469" class="stm mis"><a href="#n1469">1469</a></p> -<p id="n1470" class="stm mis"><a href="#n1470">1470</a></p> -<p id="n1471" class="stm mis"><a href="#n1471">1471</a></p> -<p id="n1472" class="stm mis"><a href="#n1472">1472</a></p> -<p id="n1473" class="stm mis"><a href="#n1473">1473</a></p> -<p id="n1474" class="stm mis"><a href="#n1474">1474</a></p> -<p id="n1475" class="stm mis"><a href="#n1475">1475</a></p> +<p id="n1464" class="stm run hide_run"><a href="#n1464">1464</a></p> +<p id="n1465" class="stm run hide_run"><a href="#n1465">1465</a></p> +<p id="n1466" class="stm run hide_run"><a href="#n1466">1466</a></p> +<p id="n1467" class="stm run hide_run"><a href="#n1467">1467</a></p> +<p id="n1468" class="stm run hide_run"><a href="#n1468">1468</a></p> +<p id="n1469" class="stm run hide_run"><a href="#n1469">1469</a></p> +<p id="n1470" class="stm run hide_run"><a href="#n1470">1470</a></p> +<p id="n1471" class="stm run hide_run"><a href="#n1471">1471</a></p> +<p id="n1472" class="stm run hide_run"><a href="#n1472">1472</a></p> +<p id="n1473" class="stm run hide_run"><a href="#n1473">1473</a></p> +<p id="n1474" class="stm run hide_run"><a href="#n1474">1474</a></p> +<p id="n1475" class="stm run hide_run"><a href="#n1475">1475</a></p> <p id="n1476" class="pln"><a href="#n1476">1476</a></p> <p id="n1477" class="stm run hide_run"><a href="#n1477">1477</a></p> -<p id="n1478" class="stm mis"><a href="#n1478">1478</a></p> +<p id="n1478" class="stm run hide_run"><a href="#n1478">1478</a></p> <p id="n1479" class="pln"><a href="#n1479">1479</a></p> <p id="n1480" class="pln"><a href="#n1480">1480</a></p> <p id="n1481" class="pln"><a href="#n1481">1481</a></p> @@ -1572,16 +1572,16 @@ <p id="n1501" class="pln"><a href="#n1501">1501</a></p> <p id="n1502" class="pln"><a href="#n1502">1502</a></p> <p id="n1503" class="pln"><a href="#n1503">1503</a></p> -<p id="n1504" class="stm mis"><a href="#n1504">1504</a></p> -<p id="n1505" class="stm mis"><a href="#n1505">1505</a></p> -<p id="n1506" class="stm mis"><a href="#n1506">1506</a></p> -<p id="n1507" class="stm mis"><a href="#n1507">1507</a></p> -<p id="n1508" class="stm mis"><a href="#n1508">1508</a></p> -<p id="n1509" class="stm mis"><a href="#n1509">1509</a></p> +<p id="n1504" class="stm run hide_run"><a href="#n1504">1504</a></p> +<p id="n1505" class="stm run hide_run"><a href="#n1505">1505</a></p> +<p id="n1506" class="stm run hide_run"><a href="#n1506">1506</a></p> +<p id="n1507" class="stm run hide_run"><a href="#n1507">1507</a></p> +<p id="n1508" class="stm run hide_run"><a href="#n1508">1508</a></p> +<p id="n1509" class="stm run hide_run"><a href="#n1509">1509</a></p> <p id="n1510" class="pln"><a href="#n1510">1510</a></p> <p id="n1511" class="stm run hide_run"><a href="#n1511">1511</a></p> <p id="n1512" class="pln"><a href="#n1512">1512</a></p> -<p id="n1513" class="stm mis"><a href="#n1513">1513</a></p> +<p id="n1513" class="stm run hide_run"><a href="#n1513">1513</a></p> <p id="n1514" class="pln"><a href="#n1514">1514</a></p> <p id="n1515" class="pln"><a href="#n1515">1515</a></p> <p id="n1516" class="pln"><a href="#n1516">1516</a></p> @@ -1626,15 +1626,15 @@ <p id="n1555" class="pln"><a href="#n1555">1555</a></p> <p id="n1556" class="pln"><a href="#n1556">1556</a></p> <p id="n1557" class="pln"><a href="#n1557">1557</a></p> -<p id="n1558" class="stm mis"><a href="#n1558">1558</a></p> -<p id="n1559" class="stm mis"><a href="#n1559">1559</a></p> -<p id="n1560" class="stm mis"><a href="#n1560">1560</a></p> -<p id="n1561" class="stm mis"><a href="#n1561">1561</a></p> -<p id="n1562" class="stm mis"><a href="#n1562">1562</a></p> -<p id="n1563" class="stm mis"><a href="#n1563">1563</a></p> +<p id="n1558" class="stm run hide_run"><a href="#n1558">1558</a></p> +<p id="n1559" class="stm run hide_run"><a href="#n1559">1559</a></p> +<p id="n1560" class="stm run hide_run"><a href="#n1560">1560</a></p> +<p id="n1561" class="stm run hide_run"><a href="#n1561">1561</a></p> +<p id="n1562" class="stm run hide_run"><a href="#n1562">1562</a></p> +<p id="n1563" class="stm run hide_run"><a href="#n1563">1563</a></p> <p id="n1564" class="pln"><a href="#n1564">1564</a></p> <p id="n1565" class="stm run hide_run"><a href="#n1565">1565</a></p> -<p id="n1566" class="stm mis"><a href="#n1566">1566</a></p> +<p id="n1566" class="stm run hide_run"><a href="#n1566">1566</a></p> <p id="n1567" class="pln"><a href="#n1567">1567</a></p> <p id="n1568" class="pln"><a href="#n1568">1568</a></p> <p id="n1569" class="pln"><a href="#n1569">1569</a></p> @@ -1662,35 +1662,35 @@ <p id="n1591" class="pln"><a href="#n1591">1591</a></p> <p id="n1592" class="pln"><a href="#n1592">1592</a></p> <p id="n1593" class="pln"><a href="#n1593">1593</a></p> -<p id="n1594" class="stm mis"><a href="#n1594">1594</a></p> +<p id="n1594" class="stm run hide_run"><a href="#n1594">1594</a></p> <p id="n1595" class="pln"><a href="#n1595">1595</a></p> -<p id="n1596" class="stm mis"><a href="#n1596">1596</a></p> -<p id="n1597" class="stm mis"><a href="#n1597">1597</a></p> -<p id="n1598" class="stm mis"><a href="#n1598">1598</a></p> +<p id="n1596" class="stm run hide_run"><a href="#n1596">1596</a></p> +<p id="n1597" class="stm run hide_run"><a href="#n1597">1597</a></p> +<p id="n1598" class="stm run hide_run"><a href="#n1598">1598</a></p> <p id="n1599" class="pln"><a href="#n1599">1599</a></p> -<p id="n1600" class="stm mis"><a href="#n1600">1600</a></p> -<p id="n1601" class="stm mis"><a href="#n1601">1601</a></p> -<p id="n1602" class="stm mis"><a href="#n1602">1602</a></p> +<p id="n1600" class="stm run hide_run"><a href="#n1600">1600</a></p> +<p id="n1601" class="stm run hide_run"><a href="#n1601">1601</a></p> +<p id="n1602" class="stm run hide_run"><a href="#n1602">1602</a></p> <p id="n1603" class="pln"><a href="#n1603">1603</a></p> -<p id="n1604" class="stm mis"><a href="#n1604">1604</a></p> -<p id="n1605" class="stm mis"><a href="#n1605">1605</a></p> +<p id="n1604" class="stm run hide_run"><a href="#n1604">1604</a></p> +<p id="n1605" class="stm run hide_run"><a href="#n1605">1605</a></p> <p id="n1606" class="pln"><a href="#n1606">1606</a></p> <p id="n1607" class="stm run hide_run"><a href="#n1607">1607</a></p> -<p id="n1608" class="stm mis"><a href="#n1608">1608</a></p> +<p id="n1608" class="stm run hide_run"><a href="#n1608">1608</a></p> <p id="n1609" class="pln"><a href="#n1609">1609</a></p> <p id="n1610" class="pln"><a href="#n1610">1610</a></p> <p id="n1611" class="pln"><a href="#n1611">1611</a></p> <p id="n1612" class="pln"><a href="#n1612">1612</a></p> <p id="n1613" class="pln"><a href="#n1613">1613</a></p> -<p id="n1614" class="stm mis"><a href="#n1614">1614</a></p> -<p id="n1615" class="stm mis"><a href="#n1615">1615</a></p> -<p id="n1616" class="stm mis"><a href="#n1616">1616</a></p> -<p id="n1617" class="stm mis"><a href="#n1617">1617</a></p> +<p id="n1614" class="stm run hide_run"><a href="#n1614">1614</a></p> +<p id="n1615" class="stm run hide_run"><a href="#n1615">1615</a></p> +<p id="n1616" class="stm run hide_run"><a href="#n1616">1616</a></p> +<p id="n1617" class="stm run hide_run"><a href="#n1617">1617</a></p> <p id="n1618" class="pln"><a href="#n1618">1618</a></p> <p id="n1619" class="stm run hide_run"><a href="#n1619">1619</a></p> <p id="n1620" class="pln"><a href="#n1620">1620</a></p> <p id="n1621" class="pln"><a href="#n1621">1621</a></p> -<p id="n1622" class="stm mis"><a href="#n1622">1622</a></p> +<p id="n1622" class="stm run hide_run"><a href="#n1622">1622</a></p> <p id="n1623" class="pln"><a href="#n1623">1623</a></p> <p id="n1624" class="pln"><a href="#n1624">1624</a></p> <p id="n1625" class="pln"><a href="#n1625">1625</a></p> @@ -1704,15 +1704,15 @@ <p id="n1633" class="pln"><a href="#n1633">1633</a></p> <p id="n1634" class="pln"><a href="#n1634">1634</a></p> <p id="n1635" class="pln"><a href="#n1635">1635</a></p> -<p id="n1636" class="stm mis"><a href="#n1636">1636</a></p> -<p id="n1637" class="stm mis"><a href="#n1637">1637</a></p> -<p id="n1638" class="stm mis"><a href="#n1638">1638</a></p> -<p id="n1639" class="stm mis"><a href="#n1639">1639</a></p> -<p id="n1640" class="stm mis"><a href="#n1640">1640</a></p> -<p id="n1641" class="stm mis"><a href="#n1641">1641</a></p> +<p id="n1636" class="stm run hide_run"><a href="#n1636">1636</a></p> +<p id="n1637" class="stm run hide_run"><a href="#n1637">1637</a></p> +<p id="n1638" class="stm run hide_run"><a href="#n1638">1638</a></p> +<p id="n1639" class="stm run hide_run"><a href="#n1639">1639</a></p> +<p id="n1640" class="stm run hide_run"><a href="#n1640">1640</a></p> +<p id="n1641" class="stm run hide_run"><a href="#n1641">1641</a></p> <p id="n1642" class="pln"><a href="#n1642">1642</a></p> <p id="n1643" class="stm run hide_run"><a href="#n1643">1643</a></p> -<p id="n1644" class="stm mis"><a href="#n1644">1644</a></p> +<p id="n1644" class="stm run hide_run"><a href="#n1644">1644</a></p> <p id="n1645" class="pln"><a href="#n1645">1645</a></p> <p id="n1646" class="pln"><a href="#n1646">1646</a></p> <p id="n1647" class="pln"><a href="#n1647">1647</a></p> @@ -1731,60 +1731,60 @@ <p id="n1660" class="pln"><a href="#n1660">1660</a></p> <p id="n1661" class="pln"><a href="#n1661">1661</a></p> <p id="n1662" class="pln"><a href="#n1662">1662</a></p> -<p id="n1663" class="stm mis"><a href="#n1663">1663</a></p> -<p id="n1664" class="stm mis"><a href="#n1664">1664</a></p> -<p id="n1665" class="stm mis"><a href="#n1665">1665</a></p> -<p id="n1666" class="stm mis"><a href="#n1666">1666</a></p> -<p id="n1667" class="stm mis"><a href="#n1667">1667</a></p> -<p id="n1668" class="stm mis"><a href="#n1668">1668</a></p> -<p id="n1669" class="stm mis"><a href="#n1669">1669</a></p> -<p id="n1670" class="stm mis"><a href="#n1670">1670</a></p> -<p id="n1671" class="stm mis"><a href="#n1671">1671</a></p> -<p id="n1672" class="stm mis"><a href="#n1672">1672</a></p> -<p id="n1673" class="stm mis"><a href="#n1673">1673</a></p> -<p id="n1674" class="stm mis"><a href="#n1674">1674</a></p> -<p id="n1675" class="stm mis"><a href="#n1675">1675</a></p> -<p id="n1676" class="stm mis"><a href="#n1676">1676</a></p> -<p id="n1677" class="stm mis"><a href="#n1677">1677</a></p> -<p id="n1678" class="stm mis"><a href="#n1678">1678</a></p> -<p id="n1679" class="stm mis"><a href="#n1679">1679</a></p> -<p id="n1680" class="stm mis"><a href="#n1680">1680</a></p> +<p id="n1663" class="stm run hide_run"><a href="#n1663">1663</a></p> +<p id="n1664" class="stm run hide_run"><a href="#n1664">1664</a></p> +<p id="n1665" class="stm run hide_run"><a href="#n1665">1665</a></p> +<p id="n1666" class="stm run hide_run"><a href="#n1666">1666</a></p> +<p id="n1667" class="stm run hide_run"><a href="#n1667">1667</a></p> +<p id="n1668" class="stm run hide_run"><a href="#n1668">1668</a></p> +<p id="n1669" class="stm run hide_run"><a href="#n1669">1669</a></p> +<p id="n1670" class="stm run hide_run"><a href="#n1670">1670</a></p> +<p id="n1671" class="stm run hide_run"><a href="#n1671">1671</a></p> +<p id="n1672" class="stm run hide_run"><a href="#n1672">1672</a></p> +<p id="n1673" class="stm run hide_run"><a href="#n1673">1673</a></p> +<p id="n1674" class="stm run hide_run"><a href="#n1674">1674</a></p> +<p id="n1675" class="stm run hide_run"><a href="#n1675">1675</a></p> +<p id="n1676" class="stm run hide_run"><a href="#n1676">1676</a></p> +<p id="n1677" class="stm run hide_run"><a href="#n1677">1677</a></p> +<p id="n1678" class="stm run hide_run"><a href="#n1678">1678</a></p> +<p id="n1679" class="stm run hide_run"><a href="#n1679">1679</a></p> +<p id="n1680" class="stm run hide_run"><a href="#n1680">1680</a></p> <p id="n1681" class="pln"><a href="#n1681">1681</a></p> <p id="n1682" class="stm run hide_run"><a href="#n1682">1682</a></p> -<p id="n1683" class="stm mis"><a href="#n1683">1683</a></p> +<p id="n1683" class="stm run hide_run"><a href="#n1683">1683</a></p> <p id="n1684" class="pln"><a href="#n1684">1684</a></p> <p id="n1685" class="pln"><a href="#n1685">1685</a></p> <p id="n1686" class="pln"><a href="#n1686">1686</a></p> <p id="n1687" class="pln"><a href="#n1687">1687</a></p> <p id="n1688" class="pln"><a href="#n1688">1688</a></p> <p id="n1689" class="pln"><a href="#n1689">1689</a></p> -<p id="n1690" class="stm mis"><a href="#n1690">1690</a></p> -<p id="n1691" class="stm mis"><a href="#n1691">1691</a></p> -<p id="n1692" class="stm mis"><a href="#n1692">1692</a></p> -<p id="n1693" class="stm mis"><a href="#n1693">1693</a></p> -<p id="n1694" class="stm mis"><a href="#n1694">1694</a></p> -<p id="n1695" class="stm mis"><a href="#n1695">1695</a></p> -<p id="n1696" class="stm mis"><a href="#n1696">1696</a></p> -<p id="n1697" class="stm mis"><a href="#n1697">1697</a></p> +<p id="n1690" class="stm run hide_run"><a href="#n1690">1690</a></p> +<p id="n1691" class="stm run hide_run"><a href="#n1691">1691</a></p> +<p id="n1692" class="stm run hide_run"><a href="#n1692">1692</a></p> +<p id="n1693" class="stm run hide_run"><a href="#n1693">1693</a></p> +<p id="n1694" class="stm run hide_run"><a href="#n1694">1694</a></p> +<p id="n1695" class="stm run hide_run"><a href="#n1695">1695</a></p> +<p id="n1696" class="stm run hide_run"><a href="#n1696">1696</a></p> +<p id="n1697" class="stm run hide_run"><a href="#n1697">1697</a></p> <p id="n1698" class="pln"><a href="#n1698">1698</a></p> <p id="n1699" class="stm run hide_run"><a href="#n1699">1699</a></p> -<p id="n1700" class="stm mis"><a href="#n1700">1700</a></p> -<p id="n1701" class="stm mis"><a href="#n1701">1701</a></p> -<p id="n1702" class="stm mis"><a href="#n1702">1702</a></p> -<p id="n1703" class="stm mis"><a href="#n1703">1703</a></p> -<p id="n1704" class="stm mis"><a href="#n1704">1704</a></p> +<p id="n1700" class="stm run hide_run"><a href="#n1700">1700</a></p> +<p id="n1701" class="stm run hide_run"><a href="#n1701">1701</a></p> +<p id="n1702" class="stm run hide_run"><a href="#n1702">1702</a></p> +<p id="n1703" class="stm run hide_run"><a href="#n1703">1703</a></p> +<p id="n1704" class="stm run hide_run"><a href="#n1704">1704</a></p> <p id="n1705" class="pln"><a href="#n1705">1705</a></p> -<p id="n1706" class="stm mis"><a href="#n1706">1706</a></p> -<p id="n1707" class="stm mis"><a href="#n1707">1707</a></p> -<p id="n1708" class="stm mis"><a href="#n1708">1708</a></p> -<p id="n1709" class="stm mis"><a href="#n1709">1709</a></p> -<p id="n1710" class="stm mis"><a href="#n1710">1710</a></p> -<p id="n1711" class="stm mis"><a href="#n1711">1711</a></p> -<p id="n1712" class="stm mis"><a href="#n1712">1712</a></p> +<p id="n1706" class="stm run hide_run"><a href="#n1706">1706</a></p> +<p id="n1707" class="stm run hide_run"><a href="#n1707">1707</a></p> +<p id="n1708" class="stm run hide_run"><a href="#n1708">1708</a></p> +<p id="n1709" class="stm run hide_run"><a href="#n1709">1709</a></p> +<p id="n1710" class="stm run hide_run"><a href="#n1710">1710</a></p> +<p id="n1711" class="stm run hide_run"><a href="#n1711">1711</a></p> +<p id="n1712" class="stm run hide_run"><a href="#n1712">1712</a></p> <p id="n1713" class="pln"><a href="#n1713">1713</a></p> <p id="n1714" class="pln"><a href="#n1714">1714</a></p> <p id="n1715" class="stm run hide_run"><a href="#n1715">1715</a></p> -<p id="n1716" class="stm mis"><a href="#n1716">1716</a></p> +<p id="n1716" class="stm run hide_run"><a href="#n1716">1716</a></p> <p id="n1717" class="pln"><a href="#n1717">1717</a></p> <p id="n1718" class="pln"><a href="#n1718">1718</a></p> <p id="n1719" class="pln"><a href="#n1719">1719</a></p> @@ -1806,12 +1806,12 @@ <p id="n1735" class="pln"><a href="#n1735">1735</a></p> <p id="n1736" class="pln"><a href="#n1736">1736</a></p> <p id="n1737" class="pln"><a href="#n1737">1737</a></p> -<p id="n1738" class="stm mis"><a href="#n1738">1738</a></p> -<p id="n1739" class="stm mis"><a href="#n1739">1739</a></p> -<p id="n1740" class="stm mis"><a href="#n1740">1740</a></p> +<p id="n1738" class="stm run hide_run"><a href="#n1738">1738</a></p> +<p id="n1739" class="stm run hide_run"><a href="#n1739">1739</a></p> +<p id="n1740" class="stm run hide_run"><a href="#n1740">1740</a></p> <p id="n1741" class="pln"><a href="#n1741">1741</a></p> <p id="n1742" class="stm run hide_run"><a href="#n1742">1742</a></p> -<p id="n1743" class="stm mis"><a href="#n1743">1743</a></p> +<p id="n1743" class="stm run hide_run"><a href="#n1743">1743</a></p> <p id="n1744" class="pln"><a href="#n1744">1744</a></p> <p id="n1745" class="pln"><a href="#n1745">1745</a></p> <p id="n1746" class="pln"><a href="#n1746">1746</a></p> @@ -1826,12 +1826,12 @@ <p id="n1755" class="pln"><a href="#n1755">1755</a></p> <p id="n1756" class="pln"><a href="#n1756">1756</a></p> <p id="n1757" class="pln"><a href="#n1757">1757</a></p> -<p id="n1758" class="stm mis"><a href="#n1758">1758</a></p> -<p id="n1759" class="stm mis"><a href="#n1759">1759</a></p> -<p id="n1760" class="stm mis"><a href="#n1760">1760</a></p> +<p id="n1758" class="stm run hide_run"><a href="#n1758">1758</a></p> +<p id="n1759" class="stm run hide_run"><a href="#n1759">1759</a></p> +<p id="n1760" class="stm run hide_run"><a href="#n1760">1760</a></p> <p id="n1761" class="pln"><a href="#n1761">1761</a></p> <p id="n1762" class="stm run hide_run"><a href="#n1762">1762</a></p> -<p id="n1763" class="stm mis"><a href="#n1763">1763</a></p> +<p id="n1763" class="stm run hide_run"><a href="#n1763">1763</a></p> <p id="n1764" class="pln"><a href="#n1764">1764</a></p> <p id="n1765" class="pln"><a href="#n1765">1765</a></p> <p id="n1766" class="pln"><a href="#n1766">1766</a></p> @@ -1844,9 +1844,9 @@ <p id="n1773" class="pln"><a href="#n1773">1773</a></p> <p id="n1774" class="pln"><a href="#n1774">1774</a></p> <p id="n1775" class="pln"><a href="#n1775">1775</a></p> -<p id="n1776" class="stm mis"><a href="#n1776">1776</a></p> -<p id="n1777" class="stm mis"><a href="#n1777">1777</a></p> -<p id="n1778" class="stm mis"><a href="#n1778">1778</a></p> +<p id="n1776" class="stm run hide_run"><a href="#n1776">1776</a></p> +<p id="n1777" class="stm run hide_run"><a href="#n1777">1777</a></p> +<p id="n1778" class="stm run hide_run"><a href="#n1778">1778</a></p> <p id="n1779" class="pln"><a href="#n1779">1779</a></p> <p id="n1780" class="pln"><a href="#n1780">1780</a></p> <p id="n1781" class="stm run hide_run"><a href="#n1781">1781</a></p> @@ -1882,41 +1882,41 @@ <p id="n1811" class="exc"><a href="#n1811">1811</a></p> <p id="n1812" class="pln"><a href="#n1812">1812</a></p> <p id="n1813" class="stm run hide_run"><a href="#n1813">1813</a></p> -<p id="n1814" class="stm mis"><a href="#n1814">1814</a></p> -<p id="n1815" class="stm mis"><a href="#n1815">1815</a></p> -<p id="n1816" class="stm mis"><a href="#n1816">1816</a></p> -<p id="n1817" class="stm mis"><a href="#n1817">1817</a></p> -<p id="n1818" class="stm mis"><a href="#n1818">1818</a></p> +<p id="n1814" class="stm run hide_run"><a href="#n1814">1814</a></p> +<p id="n1815" class="stm run hide_run"><a href="#n1815">1815</a></p> +<p id="n1816" class="stm run hide_run"><a href="#n1816">1816</a></p> +<p id="n1817" class="stm run hide_run"><a href="#n1817">1817</a></p> +<p id="n1818" class="stm run hide_run"><a href="#n1818">1818</a></p> <p id="n1819" class="pln"><a href="#n1819">1819</a></p> <p id="n1820" class="stm run hide_run"><a href="#n1820">1820</a></p> -<p id="n1821" class="stm mis"><a href="#n1821">1821</a></p> -<p id="n1822" class="stm mis"><a href="#n1822">1822</a></p> +<p id="n1821" class="stm run hide_run"><a href="#n1821">1821</a></p> +<p id="n1822" class="stm run hide_run"><a href="#n1822">1822</a></p> <p id="n1823" class="pln"><a href="#n1823">1823</a></p> <p id="n1824" class="stm run hide_run"><a href="#n1824">1824</a></p> -<p id="n1825" class="stm mis"><a href="#n1825">1825</a></p> -<p id="n1826" class="stm mis"><a href="#n1826">1826</a></p> -<p id="n1827" class="stm mis"><a href="#n1827">1827</a></p> +<p id="n1825" class="stm run hide_run"><a href="#n1825">1825</a></p> +<p id="n1826" class="stm run hide_run"><a href="#n1826">1826</a></p> +<p id="n1827" class="stm run hide_run"><a href="#n1827">1827</a></p> <p id="n1828" class="pln"><a href="#n1828">1828</a></p> <p id="n1829" class="stm run hide_run"><a href="#n1829">1829</a></p> -<p id="n1830" class="stm mis"><a href="#n1830">1830</a></p> -<p id="n1831" class="stm mis"><a href="#n1831">1831</a></p> -<p id="n1832" class="stm mis"><a href="#n1832">1832</a></p> +<p id="n1830" class="stm run hide_run"><a href="#n1830">1830</a></p> +<p id="n1831" class="stm run hide_run"><a href="#n1831">1831</a></p> +<p id="n1832" class="stm run hide_run"><a href="#n1832">1832</a></p> <p id="n1833" class="pln"><a href="#n1833">1833</a></p> <p id="n1834" class="stm run hide_run"><a href="#n1834">1834</a></p> -<p id="n1835" class="stm mis"><a href="#n1835">1835</a></p> -<p id="n1836" class="stm mis"><a href="#n1836">1836</a></p> -<p id="n1837" class="stm mis"><a href="#n1837">1837</a></p> +<p id="n1835" class="stm run hide_run"><a href="#n1835">1835</a></p> +<p id="n1836" class="stm run hide_run"><a href="#n1836">1836</a></p> +<p id="n1837" class="stm run hide_run"><a href="#n1837">1837</a></p> <p id="n1838" class="pln"><a href="#n1838">1838</a></p> <p id="n1839" class="stm run hide_run"><a href="#n1839">1839</a></p> -<p id="n1840" class="stm mis"><a href="#n1840">1840</a></p> -<p id="n1841" class="stm mis"><a href="#n1841">1841</a></p> -<p id="n1842" class="stm mis"><a href="#n1842">1842</a></p> +<p id="n1840" class="stm run hide_run"><a href="#n1840">1840</a></p> +<p id="n1841" class="stm run hide_run"><a href="#n1841">1841</a></p> +<p id="n1842" class="stm run hide_run"><a href="#n1842">1842</a></p> <p id="n1843" class="pln"><a href="#n1843">1843</a></p> <p id="n1844" class="pln"><a href="#n1844">1844</a></p> <p id="n1845" class="stm run hide_run"><a href="#n1845">1845</a></p> <p id="n1846" class="pln"><a href="#n1846">1846</a></p> <p id="n1847" class="stm run hide_run"><a href="#n1847">1847</a></p> -<p id="n1848" class="stm mis"><a href="#n1848">1848</a></p> +<p id="n1848" class="stm run hide_run"><a href="#n1848">1848</a></p> <p id="n1849" class="pln"><a href="#n1849">1849</a></p> <p id="n1850" class="pln"><a href="#n1850">1850</a></p> <p id="n1851" class="pln"><a href="#n1851">1851</a></p> @@ -1936,12 +1936,12 @@ <p id="n1865" class="pln"><a href="#n1865">1865</a></p> <p id="n1866" class="pln"><a href="#n1866">1866</a></p> <p id="n1867" class="pln"><a href="#n1867">1867</a></p> -<p id="n1868" class="stm mis"><a href="#n1868">1868</a></p> -<p id="n1869" class="stm mis"><a href="#n1869">1869</a></p> -<p id="n1870" class="stm mis"><a href="#n1870">1870</a></p> +<p id="n1868" class="stm run hide_run"><a href="#n1868">1868</a></p> +<p id="n1869" class="stm run hide_run"><a href="#n1869">1869</a></p> +<p id="n1870" class="stm run hide_run"><a href="#n1870">1870</a></p> <p id="n1871" class="pln"><a href="#n1871">1871</a></p> <p id="n1872" class="stm run hide_run"><a href="#n1872">1872</a></p> -<p id="n1873" class="stm mis"><a href="#n1873">1873</a></p> +<p id="n1873" class="stm run hide_run"><a href="#n1873">1873</a></p> <p id="n1874" class="pln"><a href="#n1874">1874</a></p> <p id="n1875" class="pln"><a href="#n1875">1875</a></p> <p id="n1876" class="pln"><a href="#n1876">1876</a></p> @@ -1965,12 +1965,12 @@ <p id="n1894" class="pln"><a href="#n1894">1894</a></p> <p id="n1895" class="pln"><a href="#n1895">1895</a></p> <p id="n1896" class="pln"><a href="#n1896">1896</a></p> -<p id="n1897" class="stm mis"><a href="#n1897">1897</a></p> -<p id="n1898" class="stm mis"><a href="#n1898">1898</a></p> -<p id="n1899" class="stm mis"><a href="#n1899">1899</a></p> +<p id="n1897" class="stm run hide_run"><a href="#n1897">1897</a></p> +<p id="n1898" class="stm run hide_run"><a href="#n1898">1898</a></p> +<p id="n1899" class="stm run hide_run"><a href="#n1899">1899</a></p> <p id="n1900" class="pln"><a href="#n1900">1900</a></p> <p id="n1901" class="stm run hide_run"><a href="#n1901">1901</a></p> -<p id="n1902" class="stm mis"><a href="#n1902">1902</a></p> +<p id="n1902" class="stm run hide_run"><a href="#n1902">1902</a></p> <p id="n1903" class="pln"><a href="#n1903">1903</a></p> <p id="n1904" class="pln"><a href="#n1904">1904</a></p> <p id="n1905" class="pln"><a href="#n1905">1905</a></p> @@ -1994,12 +1994,12 @@ <p id="n1923" class="pln"><a href="#n1923">1923</a></p> <p id="n1924" class="pln"><a href="#n1924">1924</a></p> <p id="n1925" class="pln"><a href="#n1925">1925</a></p> -<p id="n1926" class="stm mis"><a href="#n1926">1926</a></p> -<p id="n1927" class="stm mis"><a href="#n1927">1927</a></p> -<p id="n1928" class="stm mis"><a href="#n1928">1928</a></p> +<p id="n1926" class="stm run hide_run"><a href="#n1926">1926</a></p> +<p id="n1927" class="stm run hide_run"><a href="#n1927">1927</a></p> +<p id="n1928" class="stm run hide_run"><a href="#n1928">1928</a></p> <p id="n1929" class="pln"><a href="#n1929">1929</a></p> <p id="n1930" class="stm run hide_run"><a href="#n1930">1930</a></p> -<p id="n1931" class="stm mis"><a href="#n1931">1931</a></p> +<p id="n1931" class="stm run hide_run"><a href="#n1931">1931</a></p> <p id="n1932" class="pln"><a href="#n1932">1932</a></p> <p id="n1933" class="pln"><a href="#n1933">1933</a></p> <p id="n1934" class="pln"><a href="#n1934">1934</a></p> @@ -2072,37 +2072,37 @@ <p id="n2001" class="pln"><a href="#n2001">2001</a></p> <p id="n2002" class="pln"><a href="#n2002">2002</a></p> <p id="n2003" class="pln"><a href="#n2003">2003</a></p> -<p id="n2004" class="stm mis"><a href="#n2004">2004</a></p> -<p id="n2005" class="stm mis"><a href="#n2005">2005</a></p> +<p id="n2004" class="stm run hide_run"><a href="#n2004">2004</a></p> +<p id="n2005" class="stm run hide_run"><a href="#n2005">2005</a></p> <p id="n2006" class="pln"><a href="#n2006">2006</a></p> -<p id="n2007" class="stm mis"><a href="#n2007">2007</a></p> -<p id="n2008" class="stm mis"><a href="#n2008">2008</a></p> +<p id="n2007" class="stm run hide_run"><a href="#n2007">2007</a></p> +<p id="n2008" class="stm run hide_run"><a href="#n2008">2008</a></p> <p id="n2009" class="pln"><a href="#n2009">2009</a></p> -<p id="n2010" class="stm mis"><a href="#n2010">2010</a></p> -<p id="n2011" class="stm mis"><a href="#n2011">2011</a></p> +<p id="n2010" class="stm run hide_run"><a href="#n2010">2010</a></p> +<p id="n2011" class="stm run hide_run"><a href="#n2011">2011</a></p> <p id="n2012" class="pln"><a href="#n2012">2012</a></p> -<p id="n2013" class="stm mis"><a href="#n2013">2013</a></p> -<p id="n2014" class="stm mis"><a href="#n2014">2014</a></p> +<p id="n2013" class="stm run hide_run"><a href="#n2013">2013</a></p> +<p id="n2014" class="stm run hide_run"><a href="#n2014">2014</a></p> <p id="n2015" class="pln"><a href="#n2015">2015</a></p> -<p id="n2016" class="stm mis"><a href="#n2016">2016</a></p> -<p id="n2017" class="stm mis"><a href="#n2017">2017</a></p> +<p id="n2016" class="stm run hide_run"><a href="#n2016">2016</a></p> +<p id="n2017" class="stm run hide_run"><a href="#n2017">2017</a></p> <p id="n2018" class="pln"><a href="#n2018">2018</a></p> -<p id="n2019" class="stm mis"><a href="#n2019">2019</a></p> -<p id="n2020" class="stm mis"><a href="#n2020">2020</a></p> +<p id="n2019" class="stm run hide_run"><a href="#n2019">2019</a></p> +<p id="n2020" class="stm run hide_run"><a href="#n2020">2020</a></p> <p id="n2021" class="pln"><a href="#n2021">2021</a></p> -<p id="n2022" class="stm mis"><a href="#n2022">2022</a></p> +<p id="n2022" class="stm run hide_run"><a href="#n2022">2022</a></p> <p id="n2023" class="pln"><a href="#n2023">2023</a></p> <p id="n2024" class="stm run hide_run"><a href="#n2024">2024</a></p> -<p id="n2025" class="stm mis"><a href="#n2025">2025</a></p> -<p id="n2026" class="stm mis"><a href="#n2026">2026</a></p> -<p id="n2027" class="stm mis"><a href="#n2027">2027</a></p> -<p id="n2028" class="stm mis"><a href="#n2028">2028</a></p> +<p id="n2025" class="stm run hide_run"><a href="#n2025">2025</a></p> +<p id="n2026" class="stm run hide_run"><a href="#n2026">2026</a></p> +<p id="n2027" class="stm run hide_run"><a href="#n2027">2027</a></p> +<p id="n2028" class="stm run hide_run"><a href="#n2028">2028</a></p> <p id="n2029" class="pln"><a href="#n2029">2029</a></p> <p id="n2030" class="pln"><a href="#n2030">2030</a></p> <p id="n2031" class="stm run hide_run"><a href="#n2031">2031</a></p> <p id="n2032" class="pln"><a href="#n2032">2032</a></p> <p id="n2033" class="stm run hide_run"><a href="#n2033">2033</a></p> -<p id="n2034" class="stm mis"><a href="#n2034">2034</a></p> +<p id="n2034" class="stm run hide_run"><a href="#n2034">2034</a></p> <p id="n2035" class="pln"><a href="#n2035">2035</a></p> <p id="n2036" class="pln"><a href="#n2036">2036</a></p> <p id="n2037" class="pln"><a href="#n2037">2037</a></p> @@ -2119,17 +2119,17 @@ <p id="n2048" class="pln"><a href="#n2048">2048</a></p> <p id="n2049" class="pln"><a href="#n2049">2049</a></p> <p id="n2050" class="pln"><a href="#n2050">2050</a></p> -<p id="n2051" class="stm mis"><a href="#n2051">2051</a></p> -<p id="n2052" class="stm mis"><a href="#n2052">2052</a></p> +<p id="n2051" class="stm run hide_run"><a href="#n2051">2051</a></p> +<p id="n2052" class="stm run hide_run"><a href="#n2052">2052</a></p> <p id="n2053" class="pln"><a href="#n2053">2053</a></p> <p id="n2054" class="pln"><a href="#n2054">2054</a></p> <p id="n2055" class="pln"><a href="#n2055">2055</a></p> <p id="n2056" class="pln"><a href="#n2056">2056</a></p> -<p id="n2057" class="stm mis"><a href="#n2057">2057</a></p> +<p id="n2057" class="stm run hide_run"><a href="#n2057">2057</a></p> <p id="n2058" class="pln"><a href="#n2058">2058</a></p> <p id="n2059" class="stm run hide_run"><a href="#n2059">2059</a></p> <p id="n2060" class="pln"><a href="#n2060">2060</a></p> -<p id="n2061" class="stm mis"><a href="#n2061">2061</a></p> +<p id="n2061" class="stm run hide_run"><a href="#n2061">2061</a></p> <p id="n2062" class="pln"><a href="#n2062">2062</a></p> <p id="n2063" class="pln"><a href="#n2063">2063</a></p> <p id="n2064" class="pln"><a href="#n2064">2064</a></p> @@ -2146,16 +2146,16 @@ <p id="n2075" class="pln"><a href="#n2075">2075</a></p> <p id="n2076" class="pln"><a href="#n2076">2076</a></p> <p id="n2077" class="pln"><a href="#n2077">2077</a></p> -<p id="n2078" class="stm mis"><a href="#n2078">2078</a></p> -<p id="n2079" class="stm mis"><a href="#n2079">2079</a></p> +<p id="n2078" class="stm run hide_run"><a href="#n2078">2078</a></p> +<p id="n2079" class="stm run hide_run"><a href="#n2079">2079</a></p> <p id="n2080" class="pln"><a href="#n2080">2080</a></p> <p id="n2081" class="pln"><a href="#n2081">2081</a></p> <p id="n2082" class="pln"><a href="#n2082">2082</a></p> <p id="n2083" class="pln"><a href="#n2083">2083</a></p> -<p id="n2084" class="stm mis"><a href="#n2084">2084</a></p> +<p id="n2084" class="stm run hide_run"><a href="#n2084">2084</a></p> <p id="n2085" class="pln"><a href="#n2085">2085</a></p> <p id="n2086" class="stm run hide_run"><a href="#n2086">2086</a></p> -<p id="n2087" class="stm mis"><a href="#n2087">2087</a></p> +<p id="n2087" class="stm run hide_run"><a href="#n2087">2087</a></p> <p id="n2088" class="pln"><a href="#n2088">2088</a></p> <p id="n2089" class="pln"><a href="#n2089">2089</a></p> <p id="n2090" class="pln"><a href="#n2090">2090</a></p> @@ -2172,13 +2172,13 @@ <p id="n2101" class="pln"><a href="#n2101">2101</a></p> <p id="n2102" class="pln"><a href="#n2102">2102</a></p> <p id="n2103" class="pln"><a href="#n2103">2103</a></p> -<p id="n2104" class="stm mis"><a href="#n2104">2104</a></p> -<p id="n2105" class="stm mis"><a href="#n2105">2105</a></p> +<p id="n2104" class="stm run hide_run"><a href="#n2104">2104</a></p> +<p id="n2105" class="stm run hide_run"><a href="#n2105">2105</a></p> <p id="n2106" class="pln"><a href="#n2106">2106</a></p> <p id="n2107" class="pln"><a href="#n2107">2107</a></p> <p id="n2108" class="pln"><a href="#n2108">2108</a></p> <p id="n2109" class="pln"><a href="#n2109">2109</a></p> -<p id="n2110" class="stm mis"><a href="#n2110">2110</a></p> +<p id="n2110" class="stm run hide_run"><a href="#n2110">2110</a></p> <p id="n2111" class="pln"><a href="#n2111">2111</a></p> <p id="n2112" class="pln"><a href="#n2112">2112</a></p> <p id="n2113" class="stm run hide_run"><a href="#n2113">2113</a></p> @@ -2186,7 +2186,7 @@ <p id="n2115" class="pln"><a href="#n2115">2115</a></p> <p id="n2116" class="stm run hide_run"><a href="#n2116">2116</a></p> <p id="n2117" class="pln"><a href="#n2117">2117</a></p> -<p id="n2118" class="stm mis"><a href="#n2118">2118</a></p> +<p id="n2118" class="stm run hide_run"><a href="#n2118">2118</a></p> <p id="n2119" class="pln"><a href="#n2119">2119</a></p> <p id="n2120" class="pln"><a href="#n2120">2120</a></p> <p id="n2121" class="pln"><a href="#n2121">2121</a></p> @@ -2208,25 +2208,25 @@ <p id="n2137" class="pln"><a href="#n2137">2137</a></p> <p id="n2138" class="pln"><a href="#n2138">2138</a></p> <p id="n2139" class="pln"><a href="#n2139">2139</a></p> -<p id="n2140" class="stm mis"><a href="#n2140">2140</a></p> -<p id="n2141" class="stm mis"><a href="#n2141">2141</a></p> -<p id="n2142" class="stm mis"><a href="#n2142">2142</a></p> +<p id="n2140" class="stm run hide_run"><a href="#n2140">2140</a></p> +<p id="n2141" class="stm run hide_run"><a href="#n2141">2141</a></p> +<p id="n2142" class="stm run hide_run"><a href="#n2142">2142</a></p> <p id="n2143" class="pln"><a href="#n2143">2143</a></p> <p id="n2144" class="stm run hide_run"><a href="#n2144">2144</a></p> -<p id="n2145" class="stm mis"><a href="#n2145">2145</a></p> +<p id="n2145" class="stm run hide_run"><a href="#n2145">2145</a></p> <p id="n2146" class="pln"><a href="#n2146">2146</a></p> <p id="n2147" class="pln"><a href="#n2147">2147</a></p> <p id="n2148" class="pln"><a href="#n2148">2148</a></p> <p id="n2149" class="pln"><a href="#n2149">2149</a></p> <p id="n2150" class="pln"><a href="#n2150">2150</a></p> -<p id="n2151" class="stm mis"><a href="#n2151">2151</a></p> -<p id="n2152" class="stm mis"><a href="#n2152">2152</a></p> -<p id="n2153" class="stm mis"><a href="#n2153">2153</a></p> +<p id="n2151" class="stm run hide_run"><a href="#n2151">2151</a></p> +<p id="n2152" class="stm run hide_run"><a href="#n2152">2152</a></p> +<p id="n2153" class="stm run hide_run"><a href="#n2153">2153</a></p> <p id="n2154" class="pln"><a href="#n2154">2154</a></p> <p id="n2155" class="stm run hide_run"><a href="#n2155">2155</a></p> <p id="n2156" class="pln"><a href="#n2156">2156</a></p> <p id="n2157" class="pln"><a href="#n2157">2157</a></p> -<p id="n2158" class="stm mis"><a href="#n2158">2158</a></p> +<p id="n2158" class="stm run hide_run"><a href="#n2158">2158</a></p> <p id="n2159" class="pln"><a href="#n2159">2159</a></p> <p id="n2160" class="pln"><a href="#n2160">2160</a></p> <p id="n2161" class="pln"><a href="#n2161">2161</a></p> @@ -2244,19 +2244,19 @@ <p id="n2173" class="pln"><a href="#n2173">2173</a></p> <p id="n2174" class="pln"><a href="#n2174">2174</a></p> <p id="n2175" class="pln"><a href="#n2175">2175</a></p> -<p id="n2176" class="stm mis"><a href="#n2176">2176</a></p> -<p id="n2177" class="stm mis"><a href="#n2177">2177</a></p> -<p id="n2178" class="stm mis"><a href="#n2178">2178</a></p> -<p id="n2179" class="stm mis"><a href="#n2179">2179</a></p> -<p id="n2180" class="stm mis"><a href="#n2180">2180</a></p> -<p id="n2181" class="stm mis"><a href="#n2181">2181</a></p> +<p id="n2176" class="stm run hide_run"><a href="#n2176">2176</a></p> +<p id="n2177" class="stm run hide_run"><a href="#n2177">2177</a></p> +<p id="n2178" class="stm run hide_run"><a href="#n2178">2178</a></p> +<p id="n2179" class="stm run hide_run"><a href="#n2179">2179</a></p> +<p id="n2180" class="stm run hide_run"><a href="#n2180">2180</a></p> +<p id="n2181" class="stm run hide_run"><a href="#n2181">2181</a></p> <p id="n2182" class="pln"><a href="#n2182">2182</a></p> <p id="n2183" class="pln"><a href="#n2183">2183</a></p> <p id="n2184" class="stm run hide_run"><a href="#n2184">2184</a></p> <p id="n2185" class="pln"><a href="#n2185">2185</a></p> <p id="n2186" class="stm run hide_run"><a href="#n2186">2186</a></p> <p id="n2187" class="pln"><a href="#n2187">2187</a></p> -<p id="n2188" class="stm mis"><a href="#n2188">2188</a></p> +<p id="n2188" class="stm run hide_run"><a href="#n2188">2188</a></p> <p id="n2189" class="pln"><a href="#n2189">2189</a></p> <p id="n2190" class="pln"><a href="#n2190">2190</a></p> <p id="n2191" class="pln"><a href="#n2191">2191</a></p> @@ -2265,14 +2265,14 @@ <p id="n2194" class="pln"><a href="#n2194">2194</a></p> <p id="n2195" class="pln"><a href="#n2195">2195</a></p> <p id="n2196" class="pln"><a href="#n2196">2196</a></p> -<p id="n2197" class="stm mis"><a href="#n2197">2197</a></p> -<p id="n2198" class="stm mis"><a href="#n2198">2198</a></p> -<p id="n2199" class="stm mis"><a href="#n2199">2199</a></p> -<p id="n2200" class="stm mis"><a href="#n2200">2200</a></p> +<p id="n2197" class="stm run hide_run"><a href="#n2197">2197</a></p> +<p id="n2198" class="stm run hide_run"><a href="#n2198">2198</a></p> +<p id="n2199" class="stm run hide_run"><a href="#n2199">2199</a></p> +<p id="n2200" class="stm run hide_run"><a href="#n2200">2200</a></p> <p id="n2201" class="pln"><a href="#n2201">2201</a></p> <p id="n2202" class="stm run hide_run"><a href="#n2202">2202</a></p> <p id="n2203" class="pln"><a href="#n2203">2203</a></p> -<p id="n2204" class="stm mis"><a href="#n2204">2204</a></p> +<p id="n2204" class="stm run hide_run"><a href="#n2204">2204</a></p> <p id="n2205" class="pln"><a href="#n2205">2205</a></p> <p id="n2206" class="pln"><a href="#n2206">2206</a></p> <p id="n2207" class="pln"><a href="#n2207">2207</a></p> @@ -2281,35 +2281,35 @@ <p id="n2210" class="pln"><a href="#n2210">2210</a></p> <p id="n2211" class="pln"><a href="#n2211">2211</a></p> <p id="n2212" class="pln"><a href="#n2212">2212</a></p> -<p id="n2213" class="stm mis"><a href="#n2213">2213</a></p> -<p id="n2214" class="stm mis"><a href="#n2214">2214</a></p> -<p id="n2215" class="stm mis"><a href="#n2215">2215</a></p> -<p id="n2216" class="stm mis"><a href="#n2216">2216</a></p> -<p id="n2217" class="stm mis"><a href="#n2217">2217</a></p> -<p id="n2218" class="stm mis"><a href="#n2218">2218</a></p> +<p id="n2213" class="stm run hide_run"><a href="#n2213">2213</a></p> +<p id="n2214" class="stm run hide_run"><a href="#n2214">2214</a></p> +<p id="n2215" class="stm run hide_run"><a href="#n2215">2215</a></p> +<p id="n2216" class="stm run hide_run"><a href="#n2216">2216</a></p> +<p id="n2217" class="stm run hide_run"><a href="#n2217">2217</a></p> +<p id="n2218" class="stm run hide_run"><a href="#n2218">2218</a></p> <p id="n2219" class="pln"><a href="#n2219">2219</a></p> <p id="n2220" class="pln"><a href="#n2220">2220</a></p> <p id="n2221" class="pln"><a href="#n2221">2221</a></p> <p id="n2222" class="pln"><a href="#n2222">2222</a></p> - + </td> <td class="text"> -<p id="t1" class="pln"><span class="str">""" Test cogapp.</span><span class="strut"> </span></p> -<p id="t2" class="pln"><span class="str"> http://nedbatchelder.com/code/cog</span><span class="strut"> </span></p> +<p id="t1" class="pln"><span class="str">""" Test cogapp.</span><span class="strut"> </span></p> +<p id="t2" class="pln"><span class="str"> http://nedbatchelder.com/code/cog</span><span class="strut"> </span></p> <p id="t3" class="pln"><span class="strut"> </span></p> -<p id="t4" class="pln"><span class="str"> Copyright 2004-2015, Ned Batchelder.</span><span class="strut"> </span></p> -<p id="t5" class="pln"><span class="str">"""</span><span class="strut"> </span></p> +<p id="t4" class="pln"><span class="str"> Copyright 2004-2015, Ned Batchelder.</span><span class="strut"> </span></p> +<p id="t5" class="pln"><span class="str">"""</span><span class="strut"> </span></p> <p id="t6" class="pln"><span class="strut"> </span></p> <p id="t7" class="stm run hide_run"><span class="key">from</span> <span class="nam">__future__</span> <span class="key">import</span> <span class="nam">absolute_import</span><span class="strut"> </span></p> <p id="t8" class="pln"><span class="strut"> </span></p> <p id="t9" class="stm run hide_run"><span class="key">import</span> <span class="nam">os</span><span class="op">,</span> <span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">,</span> <span class="nam">random</span><span class="op">,</span> <span class="nam">re</span><span class="op">,</span> <span class="nam">shutil</span><span class="op">,</span> <span class="nam">stat</span><span class="op">,</span> <span class="nam">sys</span><span class="op">,</span> <span class="nam">tempfile</span><span class="strut"> </span></p> <p id="t10" class="pln"><span class="strut"> </span></p> -<p id="t11" class="pln"><span class="com"># Use unittest2 if it's available, otherwise unittest. This gives us</span><span class="strut"> </span></p> +<p id="t11" class="pln"><span class="com"># Use unittest2 if it's available, otherwise unittest. This gives us</span><span class="strut"> </span></p> <p id="t12" class="pln"><span class="com"># back-ported features for 2.6.</span><span class="strut"> </span></p> <p id="t13" class="stm run hide_run"><span class="key">try</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t14" class="stm run hide_run"> <span class="key">import</span> <span class="nam">unittest2</span> <span class="key">as</span> <span class="nam">unittest</span><span class="strut"> </span></p> +<p id="t14" class="stm run hide_run"> <span class="key">import</span> <span class="nam">unittest2</span> <span class="key">as</span> <span class="nam">unittest</span><span class="strut"> </span></p> <p id="t15" class="stm run hide_run"><span class="key">except</span> <span class="nam">ImportError</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t16" class="stm run hide_run"> <span class="key">import</span> <span class="nam">unittest</span><span class="strut"> </span></p> +<p id="t16" class="stm run hide_run"> <span class="key">import</span> <span class="nam">unittest</span><span class="strut"> </span></p> <p id="t17" class="pln"><span class="strut"> </span></p> <p id="t18" class="stm run hide_run"><span class="key">from</span> <span class="op">.</span><span class="nam">backward</span> <span class="key">import</span> <span class="nam">StringIO</span><span class="op">,</span> <span class="nam">to_bytes</span><span class="op">,</span> <span class="nam">b</span><span class="strut"> </span></p> <p id="t19" class="stm run hide_run"><span class="key">from</span> <span class="op">.</span><span class="nam">cogapp</span> <span class="key">import</span> <span class="nam">Cog</span><span class="op">,</span> <span class="nam">CogOptions</span><span class="op">,</span> <span class="nam">CogGenerator</span><span class="strut"> </span></p> @@ -2323,2200 +2323,2200 @@ <p id="t27" class="pln"><span class="strut"> </span></p> <p id="t28" class="pln"><span class="strut"> </span></p> <p id="t29" class="stm run hide_run"><span class="key">class</span> <span class="nam">CogTestsInMemory</span><span class="op">(</span><span class="nam">TestCase</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t30" class="pln"> <span class="str">""" Test cases for cogapp.Cog()</span><span class="strut"> </span></p> -<p id="t31" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t30" class="pln"> <span class="str">""" Test cases for cogapp.Cog()</span><span class="strut"> </span></p> +<p id="t31" class="pln"><span class="str"> """</span><span class="strut"> </span></p> <p id="t32" class="pln"><span class="strut"> </span></p> -<p id="t33" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testNoCog</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t34" class="stm run hide_run"> <span class="nam">strings</span> <span class="op">=</span> <span class="op">[</span><span class="strut"> </span></p> -<p id="t35" class="pln"> <span class="str">''</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t36" class="pln"> <span class="str">' '</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t37" class="pln"> <span class="str">' \t \t \tx'</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t38" class="pln"> <span class="str">'hello'</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t39" class="pln"> <span class="str">'the cat\nin the\nhat.'</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t40" class="pln"> <span class="str">'Horton\n\tHears A\n\t\tWho'</span><span class="strut"> </span></p> -<p id="t41" class="pln"> <span class="op">]</span><span class="strut"> </span></p> -<p id="t42" class="stm run hide_run"> <span class="key">for</span> <span class="nam">s</span> <span class="key">in</span> <span class="nam">strings</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t43" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">s</span><span class="op">)</span><span class="op">,</span> <span class="nam">s</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t33" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testNoCog</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t34" class="stm run hide_run"> <span class="nam">strings</span> <span class="op">=</span> <span class="op">[</span><span class="strut"> </span></p> +<p id="t35" class="pln"> <span class="str">''</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t36" class="pln"> <span class="str">' '</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t37" class="pln"> <span class="str">' \t \t \tx'</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t38" class="pln"> <span class="str">'hello'</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t39" class="pln"> <span class="str">'the cat\nin the\nhat.'</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t40" class="pln"> <span class="str">'Horton\n\tHears A\n\t\tWho'</span><span class="strut"> </span></p> +<p id="t41" class="pln"> <span class="op">]</span><span class="strut"> </span></p> +<p id="t42" class="stm run hide_run"> <span class="key">for</span> <span class="nam">s</span> <span class="key">in</span> <span class="nam">strings</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t43" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">s</span><span class="op">)</span><span class="op">,</span> <span class="nam">s</span><span class="op">)</span><span class="strut"> </span></p> <p id="t44" class="pln"><span class="strut"> </span></p> -<p id="t45" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testSimple</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t46" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t47" class="pln"><span class="str"> Some text.</span><span class="strut"> </span></p> -<p id="t48" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t49" class="pln"><span class="str"> import cog</span><span class="strut"> </span></p> -<p id="t50" class="pln"><span class="str"> cog.outl("This is line one\\n")</span><span class="strut"> </span></p> -<p id="t51" class="pln"><span class="str"> cog.outl("This is line two")</span><span class="strut"> </span></p> -<p id="t52" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t53" class="pln"><span class="str"> gobbledegook.</span><span class="strut"> </span></p> -<p id="t54" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t55" class="pln"><span class="str"> epilogue.</span><span class="strut"> </span></p> -<p id="t56" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t45" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testSimple</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t46" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t47" class="pln"><span class="str"> Some text.</span><span class="strut"> </span></p> +<p id="t48" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t49" class="pln"><span class="str"> import cog</span><span class="strut"> </span></p> +<p id="t50" class="pln"><span class="str"> cog.outl("This is line one\\n")</span><span class="strut"> </span></p> +<p id="t51" class="pln"><span class="str"> cog.outl("This is line two")</span><span class="strut"> </span></p> +<p id="t52" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t53" class="pln"><span class="str"> gobbledegook.</span><span class="strut"> </span></p> +<p id="t54" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t55" class="pln"><span class="str"> epilogue.</span><span class="strut"> </span></p> +<p id="t56" class="pln"><span class="str"> """</span><span class="strut"> </span></p> <p id="t57" class="pln"><span class="strut"> </span></p> -<p id="t58" class="stm run hide_run"> <span class="nam">outfile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t59" class="pln"><span class="str"> Some text.</span><span class="strut"> </span></p> -<p id="t60" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t61" class="pln"><span class="str"> import cog</span><span class="strut"> </span></p> -<p id="t62" class="pln"><span class="str"> cog.outl("This is line one\\n")</span><span class="strut"> </span></p> -<p id="t63" class="pln"><span class="str"> cog.outl("This is line two")</span><span class="strut"> </span></p> -<p id="t64" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t65" class="pln"><span class="str"> This is line one</span><span class="strut"> </span></p> +<p id="t58" class="stm run hide_run"> <span class="nam">outfile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t59" class="pln"><span class="str"> Some text.</span><span class="strut"> </span></p> +<p id="t60" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t61" class="pln"><span class="str"> import cog</span><span class="strut"> </span></p> +<p id="t62" class="pln"><span class="str"> cog.outl("This is line one\\n")</span><span class="strut"> </span></p> +<p id="t63" class="pln"><span class="str"> cog.outl("This is line two")</span><span class="strut"> </span></p> +<p id="t64" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t65" class="pln"><span class="str"> This is line one</span><span class="strut"> </span></p> <p id="t66" class="pln"><span class="strut"> </span></p> -<p id="t67" class="pln"><span class="str"> This is line two</span><span class="strut"> </span></p> -<p id="t68" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t69" class="pln"><span class="str"> epilogue.</span><span class="strut"> </span></p> -<p id="t70" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t67" class="pln"><span class="str"> This is line two</span><span class="strut"> </span></p> +<p id="t68" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t69" class="pln"><span class="str"> epilogue.</span><span class="strut"> </span></p> +<p id="t70" class="pln"><span class="str"> """</span><span class="strut"> </span></p> <p id="t71" class="pln"><span class="strut"> </span></p> -<p id="t72" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="nam">outfile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t72" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="nam">outfile</span><span class="op">)</span><span class="strut"> </span></p> <p id="t73" class="pln"><span class="strut"> </span></p> -<p id="t74" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testEmptyCog</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t75" class="pln"> <span class="com"># The cog clause can be totally empty. Not sure why you'd want it,</span><span class="strut"> </span></p> -<p id="t76" class="pln"> <span class="com"># but it works.</span><span class="strut"> </span></p> -<p id="t77" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t78" class="pln"><span class="str"> hello</span><span class="strut"> </span></p> -<p id="t79" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t80" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t81" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t82" class="pln"><span class="str"> goodbye</span><span class="strut"> </span></p> -<p id="t83" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t74" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testEmptyCog</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t75" class="pln"> <span class="com"># The cog clause can be totally empty. Not sure why you'd want it,</span><span class="strut"> </span></p> +<p id="t76" class="pln"> <span class="com"># but it works.</span><span class="strut"> </span></p> +<p id="t77" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t78" class="pln"><span class="str"> hello</span><span class="strut"> </span></p> +<p id="t79" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t80" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t81" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t82" class="pln"><span class="str"> goodbye</span><span class="strut"> </span></p> +<p id="t83" class="pln"><span class="str"> """</span><span class="strut"> </span></p> <p id="t84" class="pln"><span class="strut"> </span></p> -<p id="t85" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t86" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t85" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t86" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> <p id="t87" class="pln"><span class="strut"> </span></p> -<p id="t88" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testMultipleCogs</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t89" class="pln"> <span class="com"># One file can have many cog chunks, even abutting each other.</span><span class="strut"> </span></p> -<p id="t90" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t91" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t92" class="pln"><span class="str"> cog.out("chunk1")</span><span class="strut"> </span></p> -<p id="t93" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t94" class="pln"><span class="str"> chunk1</span><span class="strut"> </span></p> -<p id="t95" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t96" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t97" class="pln"><span class="str"> cog.out("chunk2")</span><span class="strut"> </span></p> -<p id="t98" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t99" class="pln"><span class="str"> chunk2</span><span class="strut"> </span></p> -<p id="t100" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t101" class="pln"><span class="str"> between chunks</span><span class="strut"> </span></p> -<p id="t102" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t103" class="pln"><span class="str"> cog.out("chunk3")</span><span class="strut"> </span></p> -<p id="t104" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t105" class="pln"><span class="str"> chunk3</span><span class="strut"> </span></p> -<p id="t106" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t107" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t88" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testMultipleCogs</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t89" class="pln"> <span class="com"># One file can have many cog chunks, even abutting each other.</span><span class="strut"> </span></p> +<p id="t90" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t91" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t92" class="pln"><span class="str"> cog.out("chunk1")</span><span class="strut"> </span></p> +<p id="t93" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t94" class="pln"><span class="str"> chunk1</span><span class="strut"> </span></p> +<p id="t95" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t96" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t97" class="pln"><span class="str"> cog.out("chunk2")</span><span class="strut"> </span></p> +<p id="t98" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t99" class="pln"><span class="str"> chunk2</span><span class="strut"> </span></p> +<p id="t100" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t101" class="pln"><span class="str"> between chunks</span><span class="strut"> </span></p> +<p id="t102" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t103" class="pln"><span class="str"> cog.out("chunk3")</span><span class="strut"> </span></p> +<p id="t104" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t105" class="pln"><span class="str"> chunk3</span><span class="strut"> </span></p> +<p id="t106" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t107" class="pln"><span class="str"> """</span><span class="strut"> </span></p> <p id="t108" class="pln"><span class="strut"> </span></p> -<p id="t109" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t110" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t109" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t110" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> <p id="t111" class="pln"><span class="strut"> </span></p> -<p id="t112" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testTrimBlankLines</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t113" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t114" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t115" class="pln"><span class="str"> cog.out("This is line one\\n", trimblanklines=True)</span><span class="strut"> </span></p> -<p id="t116" class="pln"><span class="str"> cog.out('''</span><span class="strut"> </span></p> -<p id="t117" class="pln"><span class="str"> This is line two</span><span class="strut"> </span></p> -<p id="t118" class="pln"><span class="str"> ''', dedent=True, trimblanklines=True)</span><span class="strut"> </span></p> -<p id="t119" class="pln"><span class="str"> cog.outl("This is line three", trimblanklines=True)</span><span class="strut"> </span></p> -<p id="t120" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t121" class="pln"><span class="str"> This is line one</span><span class="strut"> </span></p> -<p id="t122" class="pln"><span class="str"> This is line two</span><span class="strut"> </span></p> -<p id="t123" class="pln"><span class="str"> This is line three</span><span class="strut"> </span></p> -<p id="t124" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t125" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t112" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testTrimBlankLines</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t113" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t114" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t115" class="pln"><span class="str"> cog.out("This is line one\\n", trimblanklines=True)</span><span class="strut"> </span></p> +<p id="t116" class="pln"><span class="str"> cog.out('''</span><span class="strut"> </span></p> +<p id="t117" class="pln"><span class="str"> This is line two</span><span class="strut"> </span></p> +<p id="t118" class="pln"><span class="str"> ''', dedent=True, trimblanklines=True)</span><span class="strut"> </span></p> +<p id="t119" class="pln"><span class="str"> cog.outl("This is line three", trimblanklines=True)</span><span class="strut"> </span></p> +<p id="t120" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t121" class="pln"><span class="str"> This is line one</span><span class="strut"> </span></p> +<p id="t122" class="pln"><span class="str"> This is line two</span><span class="strut"> </span></p> +<p id="t123" class="pln"><span class="str"> This is line three</span><span class="strut"> </span></p> +<p id="t124" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t125" class="pln"><span class="str"> """</span><span class="strut"> </span></p> <p id="t126" class="pln"><span class="strut"> </span></p> -<p id="t127" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t128" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t127" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t128" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> <p id="t129" class="pln"><span class="strut"> </span></p> -<p id="t130" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testTrimEmptyBlankLines</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t131" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t132" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t133" class="pln"><span class="str"> cog.out("This is line one\\n", trimblanklines=True)</span><span class="strut"> </span></p> -<p id="t134" class="pln"><span class="str"> cog.out('''</span><span class="strut"> </span></p> -<p id="t135" class="pln"><span class="str"> This is line two</span><span class="strut"> </span></p> -<p id="t136" class="pln"><span class="str"> ''', dedent=True, trimblanklines=True)</span><span class="strut"> </span></p> -<p id="t137" class="pln"><span class="str"> cog.out('', dedent=True, trimblanklines=True)</span><span class="strut"> </span></p> -<p id="t138" class="pln"><span class="str"> cog.outl("This is line three", trimblanklines=True)</span><span class="strut"> </span></p> -<p id="t139" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t140" class="pln"><span class="str"> This is line one</span><span class="strut"> </span></p> -<p id="t141" class="pln"><span class="str"> This is line two</span><span class="strut"> </span></p> -<p id="t142" class="pln"><span class="str"> This is line three</span><span class="strut"> </span></p> -<p id="t143" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t144" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t130" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testTrimEmptyBlankLines</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t131" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t132" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t133" class="pln"><span class="str"> cog.out("This is line one\\n", trimblanklines=True)</span><span class="strut"> </span></p> +<p id="t134" class="pln"><span class="str"> cog.out('''</span><span class="strut"> </span></p> +<p id="t135" class="pln"><span class="str"> This is line two</span><span class="strut"> </span></p> +<p id="t136" class="pln"><span class="str"> ''', dedent=True, trimblanklines=True)</span><span class="strut"> </span></p> +<p id="t137" class="pln"><span class="str"> cog.out('', dedent=True, trimblanklines=True)</span><span class="strut"> </span></p> +<p id="t138" class="pln"><span class="str"> cog.outl("This is line three", trimblanklines=True)</span><span class="strut"> </span></p> +<p id="t139" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t140" class="pln"><span class="str"> This is line one</span><span class="strut"> </span></p> +<p id="t141" class="pln"><span class="str"> This is line two</span><span class="strut"> </span></p> +<p id="t142" class="pln"><span class="str"> This is line three</span><span class="strut"> </span></p> +<p id="t143" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t144" class="pln"><span class="str"> """</span><span class="strut"> </span></p> <p id="t145" class="pln"><span class="strut"> </span></p> -<p id="t146" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t147" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t146" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t147" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> <p id="t148" class="pln"><span class="strut"> </span></p> -<p id="t149" class="stm run hide_run"> <span class="key">def</span> <span class="nam">test22EndOfLine</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t150" class="pln"> <span class="com"># In Python 2.2, this cog file was not parsing because the</span><span class="strut"> </span></p> -<p id="t151" class="pln"> <span class="com"># last line is indented but didn't end with a newline.</span><span class="strut"> </span></p> -<p id="t152" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t153" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t154" class="pln"><span class="str"> import cog</span><span class="strut"> </span></p> -<p id="t155" class="pln"><span class="str"> for i in range(3):</span><span class="strut"> </span></p> -<p id="t156" class="pln"><span class="str"> cog.out("%d\\n" % i)</span><span class="strut"> </span></p> -<p id="t157" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t158" class="pln"><span class="str"> 0</span><span class="strut"> </span></p> -<p id="t159" class="pln"><span class="str"> 1</span><span class="strut"> </span></p> -<p id="t160" class="pln"><span class="str"> 2</span><span class="strut"> </span></p> -<p id="t161" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t162" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t149" class="stm run hide_run"> <span class="key">def</span> <span class="nam">test22EndOfLine</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t150" class="pln"> <span class="com"># In Python 2.2, this cog file was not parsing because the</span><span class="strut"> </span></p> +<p id="t151" class="pln"> <span class="com"># last line is indented but didn't end with a newline.</span><span class="strut"> </span></p> +<p id="t152" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t153" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t154" class="pln"><span class="str"> import cog</span><span class="strut"> </span></p> +<p id="t155" class="pln"><span class="str"> for i in range(3):</span><span class="strut"> </span></p> +<p id="t156" class="pln"><span class="str"> cog.out("%d\\n" % i)</span><span class="strut"> </span></p> +<p id="t157" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t158" class="pln"><span class="str"> 0</span><span class="strut"> </span></p> +<p id="t159" class="pln"><span class="str"> 1</span><span class="strut"> </span></p> +<p id="t160" class="pln"><span class="str"> 2</span><span class="strut"> </span></p> +<p id="t161" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t162" class="pln"><span class="str"> """</span><span class="strut"> </span></p> <p id="t163" class="pln"><span class="strut"> </span></p> -<p id="t164" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t165" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t164" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t165" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> <p id="t166" class="pln"><span class="strut"> </span></p> -<p id="t167" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testIndentedCode</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t168" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t169" class="pln"><span class="str"> first line</span><span class="strut"> </span></p> -<p id="t170" class="pln"><span class="str"> [[[cog</span><span class="strut"> </span></p> -<p id="t171" class="pln"><span class="str"> import cog</span><span class="strut"> </span></p> -<p id="t172" class="pln"><span class="str"> for i in range(3):</span><span class="strut"> </span></p> -<p id="t173" class="pln"><span class="str"> cog.out("xx%d\\n" % i)</span><span class="strut"> </span></p> -<p id="t174" class="pln"><span class="str"> ]]]</span><span class="strut"> </span></p> -<p id="t175" class="pln"><span class="str"> xx0</span><span class="strut"> </span></p> -<p id="t176" class="pln"><span class="str"> xx1</span><span class="strut"> </span></p> -<p id="t177" class="pln"><span class="str"> xx2</span><span class="strut"> </span></p> -<p id="t178" class="pln"><span class="str"> [[[end]]]</span><span class="strut"> </span></p> -<p id="t179" class="pln"><span class="str"> last line</span><span class="strut"> </span></p> -<p id="t180" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t167" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testIndentedCode</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t168" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t169" class="pln"><span class="str"> first line</span><span class="strut"> </span></p> +<p id="t170" class="pln"><span class="str"> [[[cog</span><span class="strut"> </span></p> +<p id="t171" class="pln"><span class="str"> import cog</span><span class="strut"> </span></p> +<p id="t172" class="pln"><span class="str"> for i in range(3):</span><span class="strut"> </span></p> +<p id="t173" class="pln"><span class="str"> cog.out("xx%d\\n" % i)</span><span class="strut"> </span></p> +<p id="t174" class="pln"><span class="str"> ]]]</span><span class="strut"> </span></p> +<p id="t175" class="pln"><span class="str"> xx0</span><span class="strut"> </span></p> +<p id="t176" class="pln"><span class="str"> xx1</span><span class="strut"> </span></p> +<p id="t177" class="pln"><span class="str"> xx2</span><span class="strut"> </span></p> +<p id="t178" class="pln"><span class="str"> [[[end]]]</span><span class="strut"> </span></p> +<p id="t179" class="pln"><span class="str"> last line</span><span class="strut"> </span></p> +<p id="t180" class="pln"><span class="str"> """</span><span class="strut"> </span></p> <p id="t181" class="pln"><span class="strut"> </span></p> -<p id="t182" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t183" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t182" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t183" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> <p id="t184" class="pln"><span class="strut"> </span></p> -<p id="t185" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testPrefixedCode</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t186" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t187" class="pln"><span class="str"> --[[[cog</span><span class="strut"> </span></p> -<p id="t188" class="pln"><span class="str"> --import cog</span><span class="strut"> </span></p> -<p id="t189" class="pln"><span class="str"> --for i in range(3):</span><span class="strut"> </span></p> -<p id="t190" class="pln"><span class="str"> -- cog.out("xx%d\\n" % i)</span><span class="strut"> </span></p> -<p id="t191" class="pln"><span class="str"> --]]]</span><span class="strut"> </span></p> -<p id="t192" class="pln"><span class="str"> xx0</span><span class="strut"> </span></p> -<p id="t193" class="pln"><span class="str"> xx1</span><span class="strut"> </span></p> -<p id="t194" class="pln"><span class="str"> xx2</span><span class="strut"> </span></p> -<p id="t195" class="pln"><span class="str"> --[[[end]]]</span><span class="strut"> </span></p> -<p id="t196" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t185" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testPrefixedCode</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t186" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t187" class="pln"><span class="str"> --[[[cog</span><span class="strut"> </span></p> +<p id="t188" class="pln"><span class="str"> --import cog</span><span class="strut"> </span></p> +<p id="t189" class="pln"><span class="str"> --for i in range(3):</span><span class="strut"> </span></p> +<p id="t190" class="pln"><span class="str"> -- cog.out("xx%d\\n" % i)</span><span class="strut"> </span></p> +<p id="t191" class="pln"><span class="str"> --]]]</span><span class="strut"> </span></p> +<p id="t192" class="pln"><span class="str"> xx0</span><span class="strut"> </span></p> +<p id="t193" class="pln"><span class="str"> xx1</span><span class="strut"> </span></p> +<p id="t194" class="pln"><span class="str"> xx2</span><span class="strut"> </span></p> +<p id="t195" class="pln"><span class="str"> --[[[end]]]</span><span class="strut"> </span></p> +<p id="t196" class="pln"><span class="str"> """</span><span class="strut"> </span></p> <p id="t197" class="pln"><span class="strut"> </span></p> -<p id="t198" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t199" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t198" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t199" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> <p id="t200" class="pln"><span class="strut"> </span></p> -<p id="t201" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testPrefixedIndentedCode</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t202" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t203" class="pln"><span class="str"> prologue</span><span class="strut"> </span></p> -<p id="t204" class="pln"><span class="str"> --[[[cog</span><span class="strut"> </span></p> -<p id="t205" class="pln"><span class="str"> -- import cog</span><span class="strut"> </span></p> -<p id="t206" class="pln"><span class="str"> -- for i in range(3):</span><span class="strut"> </span></p> -<p id="t207" class="pln"><span class="str"> -- cog.out("xy%d\\n" % i)</span><span class="strut"> </span></p> -<p id="t208" class="pln"><span class="str"> --]]]</span><span class="strut"> </span></p> -<p id="t209" class="pln"><span class="str"> xy0</span><span class="strut"> </span></p> -<p id="t210" class="pln"><span class="str"> xy1</span><span class="strut"> </span></p> -<p id="t211" class="pln"><span class="str"> xy2</span><span class="strut"> </span></p> -<p id="t212" class="pln"><span class="str"> --[[[end]]]</span><span class="strut"> </span></p> -<p id="t213" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t201" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testPrefixedIndentedCode</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t202" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t203" class="pln"><span class="str"> prologue</span><span class="strut"> </span></p> +<p id="t204" class="pln"><span class="str"> --[[[cog</span><span class="strut"> </span></p> +<p id="t205" class="pln"><span class="str"> -- import cog</span><span class="strut"> </span></p> +<p id="t206" class="pln"><span class="str"> -- for i in range(3):</span><span class="strut"> </span></p> +<p id="t207" class="pln"><span class="str"> -- cog.out("xy%d\\n" % i)</span><span class="strut"> </span></p> +<p id="t208" class="pln"><span class="str"> --]]]</span><span class="strut"> </span></p> +<p id="t209" class="pln"><span class="str"> xy0</span><span class="strut"> </span></p> +<p id="t210" class="pln"><span class="str"> xy1</span><span class="strut"> </span></p> +<p id="t211" class="pln"><span class="str"> xy2</span><span class="strut"> </span></p> +<p id="t212" class="pln"><span class="str"> --[[[end]]]</span><span class="strut"> </span></p> +<p id="t213" class="pln"><span class="str"> """</span><span class="strut"> </span></p> <p id="t214" class="pln"><span class="strut"> </span></p> -<p id="t215" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t216" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t215" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t216" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> <p id="t217" class="pln"><span class="strut"> </span></p> -<p id="t218" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testBogusPrefixMatch</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t219" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t220" class="pln"><span class="str"> prologue</span><span class="strut"> </span></p> -<p id="t221" class="pln"><span class="str"> #[[[cog</span><span class="strut"> </span></p> -<p id="t222" class="pln"><span class="str"> import cog</span><span class="strut"> </span></p> -<p id="t223" class="pln"><span class="str"> # This comment should not be clobbered by removing the pound sign.</span><span class="strut"> </span></p> -<p id="t224" class="pln"><span class="str"> for i in range(3):</span><span class="strut"> </span></p> -<p id="t225" class="pln"><span class="str"> cog.out("xy%d\\n" % i)</span><span class="strut"> </span></p> -<p id="t226" class="pln"><span class="str"> #]]]</span><span class="strut"> </span></p> -<p id="t227" class="pln"><span class="str"> xy0</span><span class="strut"> </span></p> -<p id="t228" class="pln"><span class="str"> xy1</span><span class="strut"> </span></p> -<p id="t229" class="pln"><span class="str"> xy2</span><span class="strut"> </span></p> -<p id="t230" class="pln"><span class="str"> #[[[end]]]</span><span class="strut"> </span></p> -<p id="t231" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t218" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testBogusPrefixMatch</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t219" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t220" class="pln"><span class="str"> prologue</span><span class="strut"> </span></p> +<p id="t221" class="pln"><span class="str"> #[[[cog</span><span class="strut"> </span></p> +<p id="t222" class="pln"><span class="str"> import cog</span><span class="strut"> </span></p> +<p id="t223" class="pln"><span class="str"> # This comment should not be clobbered by removing the pound sign.</span><span class="strut"> </span></p> +<p id="t224" class="pln"><span class="str"> for i in range(3):</span><span class="strut"> </span></p> +<p id="t225" class="pln"><span class="str"> cog.out("xy%d\\n" % i)</span><span class="strut"> </span></p> +<p id="t226" class="pln"><span class="str"> #]]]</span><span class="strut"> </span></p> +<p id="t227" class="pln"><span class="str"> xy0</span><span class="strut"> </span></p> +<p id="t228" class="pln"><span class="str"> xy1</span><span class="strut"> </span></p> +<p id="t229" class="pln"><span class="str"> xy2</span><span class="strut"> </span></p> +<p id="t230" class="pln"><span class="str"> #[[[end]]]</span><span class="strut"> </span></p> +<p id="t231" class="pln"><span class="str"> """</span><span class="strut"> </span></p> <p id="t232" class="pln"><span class="strut"> </span></p> -<p id="t233" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t234" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t233" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t234" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> <p id="t235" class="pln"><span class="strut"> </span></p> -<p id="t236" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testNoFinalNewline</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t237" class="pln"> <span class="com"># If the cog'ed output has no final newline,</span><span class="strut"> </span></p> -<p id="t238" class="pln"> <span class="com"># it shouldn't eat up the cog terminator.</span><span class="strut"> </span></p> -<p id="t239" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t240" class="pln"><span class="str"> prologue</span><span class="strut"> </span></p> -<p id="t241" class="pln"><span class="str"> [[[cog</span><span class="strut"> </span></p> -<p id="t242" class="pln"><span class="str"> import cog</span><span class="strut"> </span></p> -<p id="t243" class="pln"><span class="str"> for i in range(3):</span><span class="strut"> </span></p> -<p id="t244" class="pln"><span class="str"> cog.out("%d" % i)</span><span class="strut"> </span></p> -<p id="t245" class="pln"><span class="str"> ]]]</span><span class="strut"> </span></p> -<p id="t246" class="pln"><span class="str"> 012</span><span class="strut"> </span></p> -<p id="t247" class="pln"><span class="str"> [[[end]]]</span><span class="strut"> </span></p> -<p id="t248" class="pln"><span class="str"> epilogue</span><span class="strut"> </span></p> -<p id="t249" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t236" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testNoFinalNewline</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t237" class="pln"> <span class="com"># If the cog'ed output has no final newline,</span><span class="strut"> </span></p> +<p id="t238" class="pln"> <span class="com"># it shouldn't eat up the cog terminator.</span><span class="strut"> </span></p> +<p id="t239" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t240" class="pln"><span class="str"> prologue</span><span class="strut"> </span></p> +<p id="t241" class="pln"><span class="str"> [[[cog</span><span class="strut"> </span></p> +<p id="t242" class="pln"><span class="str"> import cog</span><span class="strut"> </span></p> +<p id="t243" class="pln"><span class="str"> for i in range(3):</span><span class="strut"> </span></p> +<p id="t244" class="pln"><span class="str"> cog.out("%d" % i)</span><span class="strut"> </span></p> +<p id="t245" class="pln"><span class="str"> ]]]</span><span class="strut"> </span></p> +<p id="t246" class="pln"><span class="str"> 012</span><span class="strut"> </span></p> +<p id="t247" class="pln"><span class="str"> [[[end]]]</span><span class="strut"> </span></p> +<p id="t248" class="pln"><span class="str"> epilogue</span><span class="strut"> </span></p> +<p id="t249" class="pln"><span class="str"> """</span><span class="strut"> </span></p> <p id="t250" class="pln"><span class="strut"> </span></p> -<p id="t251" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t252" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t251" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t252" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> <p id="t253" class="pln"><span class="strut"> </span></p> -<p id="t254" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testNoOutputAtAll</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t255" class="pln"> <span class="com"># If there is absolutely no cog output, that's ok.</span><span class="strut"> </span></p> -<p id="t256" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t257" class="pln"><span class="str"> prologue</span><span class="strut"> </span></p> -<p id="t258" class="pln"><span class="str"> [[[cog</span><span class="strut"> </span></p> -<p id="t259" class="pln"><span class="str"> i = 1</span><span class="strut"> </span></p> -<p id="t260" class="pln"><span class="str"> ]]]</span><span class="strut"> </span></p> -<p id="t261" class="pln"><span class="str"> [[[end]]]</span><span class="strut"> </span></p> -<p id="t262" class="pln"><span class="str"> epilogue</span><span class="strut"> </span></p> -<p id="t263" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t254" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testNoOutputAtAll</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t255" class="pln"> <span class="com"># If there is absolutely no cog output, that's ok.</span><span class="strut"> </span></p> +<p id="t256" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t257" class="pln"><span class="str"> prologue</span><span class="strut"> </span></p> +<p id="t258" class="pln"><span class="str"> [[[cog</span><span class="strut"> </span></p> +<p id="t259" class="pln"><span class="str"> i = 1</span><span class="strut"> </span></p> +<p id="t260" class="pln"><span class="str"> ]]]</span><span class="strut"> </span></p> +<p id="t261" class="pln"><span class="str"> [[[end]]]</span><span class="strut"> </span></p> +<p id="t262" class="pln"><span class="str"> epilogue</span><span class="strut"> </span></p> +<p id="t263" class="pln"><span class="str"> """</span><span class="strut"> </span></p> <p id="t264" class="pln"><span class="strut"> </span></p> -<p id="t265" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t266" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t265" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t266" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> <p id="t267" class="pln"><span class="strut"> </span></p> -<p id="t268" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testPurelyBlankLine</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t269" class="pln"> <span class="com"># If there is a blank line in the cog code with no whitespace</span><span class="strut"> </span></p> -<p id="t270" class="pln"> <span class="com"># prefix, that should be OK.</span><span class="strut"> </span></p> +<p id="t268" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testPurelyBlankLine</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t269" class="pln"> <span class="com"># If there is a blank line in the cog code with no whitespace</span><span class="strut"> </span></p> +<p id="t270" class="pln"> <span class="com"># prefix, that should be OK.</span><span class="strut"> </span></p> <p id="t271" class="pln"><span class="strut"> </span></p> -<p id="t272" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t273" class="pln"><span class="str"> prologue</span><span class="strut"> </span></p> -<p id="t274" class="pln"><span class="str"> [[[cog</span><span class="strut"> </span></p> -<p id="t275" class="pln"><span class="str"> import sys</span><span class="strut"> </span></p> -<p id="t276" class="pln"><span class="str"> cog.out("Hello")</span><span class="strut"> </span></p> -<p id="t277" class="pln"><span class="str"> $</span><span class="strut"> </span></p> -<p id="t278" class="pln"><span class="str"> cog.out("There")</span><span class="strut"> </span></p> -<p id="t279" class="pln"><span class="str"> ]]]</span><span class="strut"> </span></p> -<p id="t280" class="pln"><span class="str"> HelloThere</span><span class="strut"> </span></p> -<p id="t281" class="pln"><span class="str"> [[[end]]]</span><span class="strut"> </span></p> -<p id="t282" class="pln"><span class="str"> epilogue</span><span class="strut"> </span></p> -<p id="t283" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t272" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t273" class="pln"><span class="str"> prologue</span><span class="strut"> </span></p> +<p id="t274" class="pln"><span class="str"> [[[cog</span><span class="strut"> </span></p> +<p id="t275" class="pln"><span class="str"> import sys</span><span class="strut"> </span></p> +<p id="t276" class="pln"><span class="str"> cog.out("Hello")</span><span class="strut"> </span></p> +<p id="t277" class="pln"><span class="str"> $</span><span class="strut"> </span></p> +<p id="t278" class="pln"><span class="str"> cog.out("There")</span><span class="strut"> </span></p> +<p id="t279" class="pln"><span class="str"> ]]]</span><span class="strut"> </span></p> +<p id="t280" class="pln"><span class="str"> HelloThere</span><span class="strut"> </span></p> +<p id="t281" class="pln"><span class="str"> [[[end]]]</span><span class="strut"> </span></p> +<p id="t282" class="pln"><span class="str"> epilogue</span><span class="strut"> </span></p> +<p id="t283" class="pln"><span class="str"> """</span><span class="strut"> </span></p> <p id="t284" class="pln"><span class="strut"> </span></p> -<p id="t285" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">.</span><span class="nam">replace</span><span class="op">(</span><span class="str">'$'</span><span class="op">,</span> <span class="str">''</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t286" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t285" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">.</span><span class="nam">replace</span><span class="op">(</span><span class="str">'$'</span><span class="op">,</span> <span class="str">''</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t286" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> <p id="t287" class="pln"><span class="strut"> </span></p> -<p id="t288" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testEmptyOutl</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t289" class="pln"> <span class="com"># Alexander Belchenko suggested the string argument to outl should</span><span class="strut"> </span></p> -<p id="t290" class="pln"> <span class="com"># be optional. Does it work?</span><span class="strut"> </span></p> +<p id="t288" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testEmptyOutl</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t289" class="pln"> <span class="com"># Alexander Belchenko suggested the string argument to outl should</span><span class="strut"> </span></p> +<p id="t290" class="pln"> <span class="com"># be optional. Does it work?</span><span class="strut"> </span></p> <p id="t291" class="pln"><span class="strut"> </span></p> -<p id="t292" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t293" class="pln"><span class="str"> prologue</span><span class="strut"> </span></p> -<p id="t294" class="pln"><span class="str"> [[[cog</span><span class="strut"> </span></p> -<p id="t295" class="pln"><span class="str"> cog.outl("x")</span><span class="strut"> </span></p> -<p id="t296" class="pln"><span class="str"> cog.outl()</span><span class="strut"> </span></p> -<p id="t297" class="pln"><span class="str"> cog.outl("y")</span><span class="strut"> </span></p> -<p id="t298" class="pln"><span class="str"> cog.outl(trimblanklines=True)</span><span class="strut"> </span></p> -<p id="t299" class="pln"><span class="str"> cog.outl("z")</span><span class="strut"> </span></p> -<p id="t300" class="pln"><span class="str"> ]]]</span><span class="strut"> </span></p> -<p id="t301" class="pln"><span class="str"> x</span><span class="strut"> </span></p> +<p id="t292" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t293" class="pln"><span class="str"> prologue</span><span class="strut"> </span></p> +<p id="t294" class="pln"><span class="str"> [[[cog</span><span class="strut"> </span></p> +<p id="t295" class="pln"><span class="str"> cog.outl("x")</span><span class="strut"> </span></p> +<p id="t296" class="pln"><span class="str"> cog.outl()</span><span class="strut"> </span></p> +<p id="t297" class="pln"><span class="str"> cog.outl("y")</span><span class="strut"> </span></p> +<p id="t298" class="pln"><span class="str"> cog.outl(trimblanklines=True)</span><span class="strut"> </span></p> +<p id="t299" class="pln"><span class="str"> cog.outl("z")</span><span class="strut"> </span></p> +<p id="t300" class="pln"><span class="str"> ]]]</span><span class="strut"> </span></p> +<p id="t301" class="pln"><span class="str"> x</span><span class="strut"> </span></p> <p id="t302" class="pln"><span class="strut"> </span></p> -<p id="t303" class="pln"><span class="str"> y</span><span class="strut"> </span></p> +<p id="t303" class="pln"><span class="str"> y</span><span class="strut"> </span></p> <p id="t304" class="pln"><span class="strut"> </span></p> -<p id="t305" class="pln"><span class="str"> z</span><span class="strut"> </span></p> -<p id="t306" class="pln"><span class="str"> [[[end]]]</span><span class="strut"> </span></p> -<p id="t307" class="pln"><span class="str"> epilogue</span><span class="strut"> </span></p> -<p id="t308" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t305" class="pln"><span class="str"> z</span><span class="strut"> </span></p> +<p id="t306" class="pln"><span class="str"> [[[end]]]</span><span class="strut"> </span></p> +<p id="t307" class="pln"><span class="str"> epilogue</span><span class="strut"> </span></p> +<p id="t308" class="pln"><span class="str"> """</span><span class="strut"> </span></p> <p id="t309" class="pln"><span class="strut"> </span></p> -<p id="t310" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t311" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t310" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t311" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> <p id="t312" class="pln"><span class="strut"> </span></p> -<p id="t313" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testFirstLineNum</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t314" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t315" class="pln"><span class="str"> fooey</span><span class="strut"> </span></p> -<p id="t316" class="pln"><span class="str"> [[[cog</span><span class="strut"> </span></p> -<p id="t317" class="pln"><span class="str"> cog.outl("started at line number %d" % cog.firstLineNum)</span><span class="strut"> </span></p> -<p id="t318" class="pln"><span class="str"> ]]]</span><span class="strut"> </span></p> -<p id="t319" class="pln"><span class="str"> started at line number 2</span><span class="strut"> </span></p> -<p id="t320" class="pln"><span class="str"> [[[end]]]</span><span class="strut"> </span></p> -<p id="t321" class="pln"><span class="str"> blah blah</span><span class="strut"> </span></p> -<p id="t322" class="pln"><span class="str"> [[[cog</span><span class="strut"> </span></p> -<p id="t323" class="pln"><span class="str"> cog.outl("and again at line %d" % cog.firstLineNum)</span><span class="strut"> </span></p> -<p id="t324" class="pln"><span class="str"> ]]]</span><span class="strut"> </span></p> -<p id="t325" class="pln"><span class="str"> and again at line 8</span><span class="strut"> </span></p> -<p id="t326" class="pln"><span class="str"> [[[end]]]</span><span class="strut"> </span></p> -<p id="t327" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t313" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testFirstLineNum</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t314" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t315" class="pln"><span class="str"> fooey</span><span class="strut"> </span></p> +<p id="t316" class="pln"><span class="str"> [[[cog</span><span class="strut"> </span></p> +<p id="t317" class="pln"><span class="str"> cog.outl("started at line number %d" % cog.firstLineNum)</span><span class="strut"> </span></p> +<p id="t318" class="pln"><span class="str"> ]]]</span><span class="strut"> </span></p> +<p id="t319" class="pln"><span class="str"> started at line number 2</span><span class="strut"> </span></p> +<p id="t320" class="pln"><span class="str"> [[[end]]]</span><span class="strut"> </span></p> +<p id="t321" class="pln"><span class="str"> blah blah</span><span class="strut"> </span></p> +<p id="t322" class="pln"><span class="str"> [[[cog</span><span class="strut"> </span></p> +<p id="t323" class="pln"><span class="str"> cog.outl("and again at line %d" % cog.firstLineNum)</span><span class="strut"> </span></p> +<p id="t324" class="pln"><span class="str"> ]]]</span><span class="strut"> </span></p> +<p id="t325" class="pln"><span class="str"> and again at line 8</span><span class="strut"> </span></p> +<p id="t326" class="pln"><span class="str"> [[[end]]]</span><span class="strut"> </span></p> +<p id="t327" class="pln"><span class="str"> """</span><span class="strut"> </span></p> <p id="t328" class="pln"><span class="strut"> </span></p> -<p id="t329" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t330" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t329" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t330" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> <p id="t331" class="pln"><span class="strut"> </span></p> -<p id="t332" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testCompactOneLineCode</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t333" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t334" class="pln"><span class="str"> first line</span><span class="strut"> </span></p> -<p id="t335" class="pln"><span class="str"> hey: [[[cog cog.outl("hello %d" % (3*3*3*3)) ]]] looky!</span><span class="strut"> </span></p> -<p id="t336" class="pln"><span class="str"> get rid of this!</span><span class="strut"> </span></p> -<p id="t337" class="pln"><span class="str"> [[[end]]]</span><span class="strut"> </span></p> -<p id="t338" class="pln"><span class="str"> last line</span><span class="strut"> </span></p> -<p id="t339" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t332" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testCompactOneLineCode</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t333" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t334" class="pln"><span class="str"> first line</span><span class="strut"> </span></p> +<p id="t335" class="pln"><span class="str"> hey: [[[cog cog.outl("hello %d" % (3*3*3*3)) ]]] looky!</span><span class="strut"> </span></p> +<p id="t336" class="pln"><span class="str"> get rid of this!</span><span class="strut"> </span></p> +<p id="t337" class="pln"><span class="str"> [[[end]]]</span><span class="strut"> </span></p> +<p id="t338" class="pln"><span class="str"> last line</span><span class="strut"> </span></p> +<p id="t339" class="pln"><span class="str"> """</span><span class="strut"> </span></p> <p id="t340" class="pln"><span class="strut"> </span></p> -<p id="t341" class="stm run hide_run"> <span class="nam">outfile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t342" class="pln"><span class="str"> first line</span><span class="strut"> </span></p> -<p id="t343" class="pln"><span class="str"> hey: [[[cog cog.outl("hello %d" % (3*3*3*3)) ]]] looky!</span><span class="strut"> </span></p> -<p id="t344" class="pln"><span class="str"> hello 81</span><span class="strut"> </span></p> -<p id="t345" class="pln"><span class="str"> [[[end]]]</span><span class="strut"> </span></p> -<p id="t346" class="pln"><span class="str"> last line</span><span class="strut"> </span></p> -<p id="t347" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t341" class="stm run hide_run"> <span class="nam">outfile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t342" class="pln"><span class="str"> first line</span><span class="strut"> </span></p> +<p id="t343" class="pln"><span class="str"> hey: [[[cog cog.outl("hello %d" % (3*3*3*3)) ]]] looky!</span><span class="strut"> </span></p> +<p id="t344" class="pln"><span class="str"> hello 81</span><span class="strut"> </span></p> +<p id="t345" class="pln"><span class="str"> [[[end]]]</span><span class="strut"> </span></p> +<p id="t346" class="pln"><span class="str"> last line</span><span class="strut"> </span></p> +<p id="t347" class="pln"><span class="str"> """</span><span class="strut"> </span></p> <p id="t348" class="pln"><span class="strut"> </span></p> -<p id="t349" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t350" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">outfile</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t349" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t350" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">outfile</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> <p id="t351" class="pln"><span class="strut"> </span></p> -<p id="t352" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testInsideOutCompact</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t353" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t354" class="pln"><span class="str"> first line</span><span class="strut"> </span></p> -<p id="t355" class="pln"><span class="str"> hey?: ]]] what is this? [[[cog strange!</span><span class="strut"> </span></p> -<p id="t356" class="pln"><span class="str"> get rid of this!</span><span class="strut"> </span></p> -<p id="t357" class="pln"><span class="str"> [[[end]]]</span><span class="strut"> </span></p> -<p id="t358" class="pln"><span class="str"> last line</span><span class="strut"> </span></p> -<p id="t359" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t360" class="stm run hide_run"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogError</span><span class="op">,</span> <span class="str">r"infile.txt\(2\): Cog code markers inverted"</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t361" class="stm run hide_run"> <span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="str">"infile.txt"</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t352" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testInsideOutCompact</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t353" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t354" class="pln"><span class="str"> first line</span><span class="strut"> </span></p> +<p id="t355" class="pln"><span class="str"> hey?: ]]] what is this? [[[cog strange!</span><span class="strut"> </span></p> +<p id="t356" class="pln"><span class="str"> get rid of this!</span><span class="strut"> </span></p> +<p id="t357" class="pln"><span class="str"> [[[end]]]</span><span class="strut"> </span></p> +<p id="t358" class="pln"><span class="str"> last line</span><span class="strut"> </span></p> +<p id="t359" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t360" class="stm run hide_run"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogError</span><span class="op">,</span> <span class="str">r"infile.txt\(2\): Cog code markers inverted"</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t361" class="stm run hide_run"> <span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="str">"infile.txt"</span><span class="op">)</span><span class="strut"> </span></p> <p id="t362" class="pln"><span class="strut"> </span></p> -<p id="t363" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testSharingGlobals</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t364" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t365" class="pln"><span class="str"> first line</span><span class="strut"> </span></p> -<p id="t366" class="pln"><span class="str"> hey: [[[cog s="hey there" ]]] looky!</span><span class="strut"> </span></p> -<p id="t367" class="pln"><span class="str"> [[[end]]]</span><span class="strut"> </span></p> -<p id="t368" class="pln"><span class="str"> more literal junk.</span><span class="strut"> </span></p> -<p id="t369" class="pln"><span class="str"> [[[cog cog.outl(s) ]]]</span><span class="strut"> </span></p> -<p id="t370" class="pln"><span class="str"> [[[end]]]</span><span class="strut"> </span></p> -<p id="t371" class="pln"><span class="str"> last line</span><span class="strut"> </span></p> -<p id="t372" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t363" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testSharingGlobals</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t364" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t365" class="pln"><span class="str"> first line</span><span class="strut"> </span></p> +<p id="t366" class="pln"><span class="str"> hey: [[[cog s="hey there" ]]] looky!</span><span class="strut"> </span></p> +<p id="t367" class="pln"><span class="str"> [[[end]]]</span><span class="strut"> </span></p> +<p id="t368" class="pln"><span class="str"> more literal junk.</span><span class="strut"> </span></p> +<p id="t369" class="pln"><span class="str"> [[[cog cog.outl(s) ]]]</span><span class="strut"> </span></p> +<p id="t370" class="pln"><span class="str"> [[[end]]]</span><span class="strut"> </span></p> +<p id="t371" class="pln"><span class="str"> last line</span><span class="strut"> </span></p> +<p id="t372" class="pln"><span class="str"> """</span><span class="strut"> </span></p> <p id="t373" class="pln"><span class="strut"> </span></p> -<p id="t374" class="stm run hide_run"> <span class="nam">outfile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t375" class="pln"><span class="str"> first line</span><span class="strut"> </span></p> -<p id="t376" class="pln"><span class="str"> hey: [[[cog s="hey there" ]]] looky!</span><span class="strut"> </span></p> -<p id="t377" class="pln"><span class="str"> [[[end]]]</span><span class="strut"> </span></p> -<p id="t378" class="pln"><span class="str"> more literal junk.</span><span class="strut"> </span></p> -<p id="t379" class="pln"><span class="str"> [[[cog cog.outl(s) ]]]</span><span class="strut"> </span></p> -<p id="t380" class="pln"><span class="str"> hey there</span><span class="strut"> </span></p> -<p id="t381" class="pln"><span class="str"> [[[end]]]</span><span class="strut"> </span></p> -<p id="t382" class="pln"><span class="str"> last line</span><span class="strut"> </span></p> -<p id="t383" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t374" class="stm run hide_run"> <span class="nam">outfile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t375" class="pln"><span class="str"> first line</span><span class="strut"> </span></p> +<p id="t376" class="pln"><span class="str"> hey: [[[cog s="hey there" ]]] looky!</span><span class="strut"> </span></p> +<p id="t377" class="pln"><span class="str"> [[[end]]]</span><span class="strut"> </span></p> +<p id="t378" class="pln"><span class="str"> more literal junk.</span><span class="strut"> </span></p> +<p id="t379" class="pln"><span class="str"> [[[cog cog.outl(s) ]]]</span><span class="strut"> </span></p> +<p id="t380" class="pln"><span class="str"> hey there</span><span class="strut"> </span></p> +<p id="t381" class="pln"><span class="str"> [[[end]]]</span><span class="strut"> </span></p> +<p id="t382" class="pln"><span class="str"> last line</span><span class="strut"> </span></p> +<p id="t383" class="pln"><span class="str"> """</span><span class="strut"> </span></p> <p id="t384" class="pln"><span class="strut"> </span></p> -<p id="t385" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t386" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">outfile</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t385" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t386" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">outfile</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> <p id="t387" class="pln"><span class="strut"> </span></p> -<p id="t388" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testAssertInCogCode</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t389" class="pln"> <span class="com"># Check that we can test assertions in cog code in the test framework.</span><span class="strut"> </span></p> -<p id="t390" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t391" class="pln"><span class="str"> [[[cog</span><span class="strut"> </span></p> -<p id="t392" class="pln"><span class="str"> assert 1 == 2, "Oops"</span><span class="strut"> </span></p> -<p id="t393" class="pln"><span class="str"> ]]]</span><span class="strut"> </span></p> -<p id="t394" class="pln"><span class="str"> [[[end]]]</span><span class="strut"> </span></p> -<p id="t395" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t396" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t397" class="stm run hide_run"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">AssertionError</span><span class="op">,</span> <span class="str">"Oops"</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t398" class="stm run hide_run"> <span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t388" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testAssertInCogCode</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t389" class="pln"> <span class="com"># Check that we can test assertions in cog code in the test framework.</span><span class="strut"> </span></p> +<p id="t390" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t391" class="pln"><span class="str"> [[[cog</span><span class="strut"> </span></p> +<p id="t392" class="pln"><span class="str"> assert 1 == 2, "Oops"</span><span class="strut"> </span></p> +<p id="t393" class="pln"><span class="str"> ]]]</span><span class="strut"> </span></p> +<p id="t394" class="pln"><span class="str"> [[[end]]]</span><span class="strut"> </span></p> +<p id="t395" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t396" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t397" class="stm run hide_run"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">AssertionError</span><span class="op">,</span> <span class="str">"Oops"</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t398" class="stm run hide_run"> <span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> <p id="t399" class="pln"><span class="strut"> </span></p> -<p id="t400" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testCogPrevious</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t401" class="pln"> <span class="com"># Check that we can access the previous run's output.</span><span class="strut"> </span></p> -<p id="t402" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t403" class="pln"><span class="str"> [[[cog</span><span class="strut"> </span></p> -<p id="t404" class="pln"><span class="str"> assert cog.previous == "Hello there!\\n", "WTF??"</span><span class="strut"> </span></p> -<p id="t405" class="pln"><span class="str"> cog.out(cog.previous)</span><span class="strut"> </span></p> -<p id="t406" class="pln"><span class="str"> cog.outl("Ran again!")</span><span class="strut"> </span></p> -<p id="t407" class="pln"><span class="str"> ]]]</span><span class="strut"> </span></p> -<p id="t408" class="pln"><span class="str"> Hello there!</span><span class="strut"> </span></p> -<p id="t409" class="pln"><span class="str"> [[[end]]]</span><span class="strut"> </span></p> -<p id="t410" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t400" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testCogPrevious</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t401" class="pln"> <span class="com"># Check that we can access the previous run's output.</span><span class="strut"> </span></p> +<p id="t402" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t403" class="pln"><span class="str"> [[[cog</span><span class="strut"> </span></p> +<p id="t404" class="pln"><span class="str"> assert cog.previous == "Hello there!\\n", "WTF??"</span><span class="strut"> </span></p> +<p id="t405" class="pln"><span class="str"> cog.out(cog.previous)</span><span class="strut"> </span></p> +<p id="t406" class="pln"><span class="str"> cog.outl("Ran again!")</span><span class="strut"> </span></p> +<p id="t407" class="pln"><span class="str"> ]]]</span><span class="strut"> </span></p> +<p id="t408" class="pln"><span class="str"> Hello there!</span><span class="strut"> </span></p> +<p id="t409" class="pln"><span class="str"> [[[end]]]</span><span class="strut"> </span></p> +<p id="t410" class="pln"><span class="str"> """</span><span class="strut"> </span></p> <p id="t411" class="pln"><span class="strut"> </span></p> -<p id="t412" class="stm run hide_run"> <span class="nam">outfile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t413" class="pln"><span class="str"> [[[cog</span><span class="strut"> </span></p> -<p id="t414" class="pln"><span class="str"> assert cog.previous == "Hello there!\\n", "WTF??"</span><span class="strut"> </span></p> -<p id="t415" class="pln"><span class="str"> cog.out(cog.previous)</span><span class="strut"> </span></p> -<p id="t416" class="pln"><span class="str"> cog.outl("Ran again!")</span><span class="strut"> </span></p> -<p id="t417" class="pln"><span class="str"> ]]]</span><span class="strut"> </span></p> -<p id="t418" class="pln"><span class="str"> Hello there!</span><span class="strut"> </span></p> -<p id="t419" class="pln"><span class="str"> Ran again!</span><span class="strut"> </span></p> -<p id="t420" class="pln"><span class="str"> [[[end]]]</span><span class="strut"> </span></p> -<p id="t421" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t412" class="stm run hide_run"> <span class="nam">outfile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t413" class="pln"><span class="str"> [[[cog</span><span class="strut"> </span></p> +<p id="t414" class="pln"><span class="str"> assert cog.previous == "Hello there!\\n", "WTF??"</span><span class="strut"> </span></p> +<p id="t415" class="pln"><span class="str"> cog.out(cog.previous)</span><span class="strut"> </span></p> +<p id="t416" class="pln"><span class="str"> cog.outl("Ran again!")</span><span class="strut"> </span></p> +<p id="t417" class="pln"><span class="str"> ]]]</span><span class="strut"> </span></p> +<p id="t418" class="pln"><span class="str"> Hello there!</span><span class="strut"> </span></p> +<p id="t419" class="pln"><span class="str"> Ran again!</span><span class="strut"> </span></p> +<p id="t420" class="pln"><span class="str"> [[[end]]]</span><span class="strut"> </span></p> +<p id="t421" class="pln"><span class="str"> """</span><span class="strut"> </span></p> <p id="t422" class="pln"><span class="strut"> </span></p> -<p id="t423" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t424" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">outfile</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t423" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t424" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">outfile</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> <p id="t425" class="pln"><span class="strut"> </span></p> <p id="t426" class="pln"><span class="strut"> </span></p> <p id="t427" class="stm run hide_run"><span class="key">class</span> <span class="nam">CogOptionsTests</span><span class="op">(</span><span class="nam">TestCase</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t428" class="pln"> <span class="str">""" Test the CogOptions class.</span><span class="strut"> </span></p> -<p id="t429" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t428" class="pln"> <span class="str">""" Test the CogOptions class.</span><span class="strut"> </span></p> +<p id="t429" class="pln"><span class="str"> """</span><span class="strut"> </span></p> <p id="t430" class="pln"><span class="strut"> </span></p> -<p id="t431" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testEquality</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t432" class="stm mis"> <span class="nam">o</span> <span class="op">=</span> <span class="nam">CogOptions</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t433" class="stm mis"> <span class="nam">p</span> <span class="op">=</span> <span class="nam">CogOptions</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t434" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">o</span><span class="op">,</span> <span class="nam">p</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t435" class="stm mis"> <span class="nam">o</span><span class="op">.</span><span class="nam">parseArgs</span><span class="op">(</span><span class="op">[</span><span class="str">'-r'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t436" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertNotEqual</span><span class="op">(</span><span class="nam">o</span><span class="op">,</span> <span class="nam">p</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t437" class="stm mis"> <span class="nam">p</span><span class="op">.</span><span class="nam">parseArgs</span><span class="op">(</span><span class="op">[</span><span class="str">'-r'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t438" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">o</span><span class="op">,</span> <span class="nam">p</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t431" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testEquality</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t432" class="stm run hide_run"> <span class="nam">o</span> <span class="op">=</span> <span class="nam">CogOptions</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t433" class="stm run hide_run"> <span class="nam">p</span> <span class="op">=</span> <span class="nam">CogOptions</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t434" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">o</span><span class="op">,</span> <span class="nam">p</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t435" class="stm run hide_run"> <span class="nam">o</span><span class="op">.</span><span class="nam">parseArgs</span><span class="op">(</span><span class="op">[</span><span class="str">'-r'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t436" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertNotEqual</span><span class="op">(</span><span class="nam">o</span><span class="op">,</span> <span class="nam">p</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t437" class="stm run hide_run"> <span class="nam">p</span><span class="op">.</span><span class="nam">parseArgs</span><span class="op">(</span><span class="op">[</span><span class="str">'-r'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t438" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">o</span><span class="op">,</span> <span class="nam">p</span><span class="op">)</span><span class="strut"> </span></p> <p id="t439" class="pln"><span class="strut"> </span></p> -<p id="t440" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testCloning</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t441" class="stm mis"> <span class="nam">o</span> <span class="op">=</span> <span class="nam">CogOptions</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t442" class="stm mis"> <span class="nam">o</span><span class="op">.</span><span class="nam">parseArgs</span><span class="op">(</span><span class="op">[</span><span class="str">'-I'</span><span class="op">,</span> <span class="str">'fooey'</span><span class="op">,</span> <span class="str">'-I'</span><span class="op">,</span> <span class="str">'booey'</span><span class="op">,</span> <span class="str">'-s'</span><span class="op">,</span> <span class="str">' /*x*/'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t443" class="stm mis"> <span class="nam">p</span> <span class="op">=</span> <span class="nam">o</span><span class="op">.</span><span class="nam">clone</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t444" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">o</span><span class="op">,</span> <span class="nam">p</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t445" class="stm mis"> <span class="nam">p</span><span class="op">.</span><span class="nam">parseArgs</span><span class="op">(</span><span class="op">[</span><span class="str">'-I'</span><span class="op">,</span> <span class="str">'huey'</span><span class="op">,</span> <span class="str">'-D'</span><span class="op">,</span> <span class="str">'foo=quux'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t446" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertNotEqual</span><span class="op">(</span><span class="nam">o</span><span class="op">,</span> <span class="nam">p</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t447" class="stm mis"> <span class="nam">q</span> <span class="op">=</span> <span class="nam">CogOptions</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t448" class="stm mis"> <span class="nam">q</span><span class="op">.</span><span class="nam">parseArgs</span><span class="op">(</span><span class="op">[</span><span class="str">'-I'</span><span class="op">,</span> <span class="str">'fooey'</span><span class="op">,</span> <span class="str">'-I'</span><span class="op">,</span> <span class="str">'booey'</span><span class="op">,</span> <span class="str">'-s'</span><span class="op">,</span> <span class="str">' /*x*/'</span><span class="op">,</span> <span class="str">'-I'</span><span class="op">,</span> <span class="str">'huey'</span><span class="op">,</span> <span class="str">'-D'</span><span class="op">,</span> <span class="str">'foo=quux'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t449" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">p</span><span class="op">,</span> <span class="nam">q</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t440" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testCloning</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t441" class="stm run hide_run"> <span class="nam">o</span> <span class="op">=</span> <span class="nam">CogOptions</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t442" class="stm run hide_run"> <span class="nam">o</span><span class="op">.</span><span class="nam">parseArgs</span><span class="op">(</span><span class="op">[</span><span class="str">'-I'</span><span class="op">,</span> <span class="str">'fooey'</span><span class="op">,</span> <span class="str">'-I'</span><span class="op">,</span> <span class="str">'booey'</span><span class="op">,</span> <span class="str">'-s'</span><span class="op">,</span> <span class="str">' /*x*/'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t443" class="stm run hide_run"> <span class="nam">p</span> <span class="op">=</span> <span class="nam">o</span><span class="op">.</span><span class="nam">clone</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t444" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">o</span><span class="op">,</span> <span class="nam">p</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t445" class="stm run hide_run"> <span class="nam">p</span><span class="op">.</span><span class="nam">parseArgs</span><span class="op">(</span><span class="op">[</span><span class="str">'-I'</span><span class="op">,</span> <span class="str">'huey'</span><span class="op">,</span> <span class="str">'-D'</span><span class="op">,</span> <span class="str">'foo=quux'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t446" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertNotEqual</span><span class="op">(</span><span class="nam">o</span><span class="op">,</span> <span class="nam">p</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t447" class="stm run hide_run"> <span class="nam">q</span> <span class="op">=</span> <span class="nam">CogOptions</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t448" class="stm run hide_run"> <span class="nam">q</span><span class="op">.</span><span class="nam">parseArgs</span><span class="op">(</span><span class="op">[</span><span class="str">'-I'</span><span class="op">,</span> <span class="str">'fooey'</span><span class="op">,</span> <span class="str">'-I'</span><span class="op">,</span> <span class="str">'booey'</span><span class="op">,</span> <span class="str">'-s'</span><span class="op">,</span> <span class="str">' /*x*/'</span><span class="op">,</span> <span class="str">'-I'</span><span class="op">,</span> <span class="str">'huey'</span><span class="op">,</span> <span class="str">'-D'</span><span class="op">,</span> <span class="str">'foo=quux'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t449" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">p</span><span class="op">,</span> <span class="nam">q</span><span class="op">)</span><span class="strut"> </span></p> <p id="t450" class="pln"><span class="strut"> </span></p> -<p id="t451" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testCombiningFlags</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t452" class="pln"> <span class="com"># Single-character flags can be combined.</span><span class="strut"> </span></p> -<p id="t453" class="stm mis"> <span class="nam">o</span> <span class="op">=</span> <span class="nam">CogOptions</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t454" class="stm mis"> <span class="nam">o</span><span class="op">.</span><span class="nam">parseArgs</span><span class="op">(</span><span class="op">[</span><span class="str">'-e'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-z'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t455" class="stm mis"> <span class="nam">p</span> <span class="op">=</span> <span class="nam">CogOptions</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t456" class="stm mis"> <span class="nam">p</span><span class="op">.</span><span class="nam">parseArgs</span><span class="op">(</span><span class="op">[</span><span class="str">'-erz'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t457" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">o</span><span class="op">,</span> <span class="nam">p</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t451" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testCombiningFlags</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t452" class="pln"> <span class="com"># Single-character flags can be combined.</span><span class="strut"> </span></p> +<p id="t453" class="stm run hide_run"> <span class="nam">o</span> <span class="op">=</span> <span class="nam">CogOptions</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t454" class="stm run hide_run"> <span class="nam">o</span><span class="op">.</span><span class="nam">parseArgs</span><span class="op">(</span><span class="op">[</span><span class="str">'-e'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-z'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t455" class="stm run hide_run"> <span class="nam">p</span> <span class="op">=</span> <span class="nam">CogOptions</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t456" class="stm run hide_run"> <span class="nam">p</span><span class="op">.</span><span class="nam">parseArgs</span><span class="op">(</span><span class="op">[</span><span class="str">'-erz'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t457" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">o</span><span class="op">,</span> <span class="nam">p</span><span class="op">)</span><span class="strut"> </span></p> <p id="t458" class="pln"><span class="strut"> </span></p> -<p id="t459" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testMarkers</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t460" class="stm mis"> <span class="nam">o</span> <span class="op">=</span> <span class="nam">CogOptions</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t461" class="stm mis"> <span class="nam">o</span><span class="op">.</span><span class="nam">_parse_markers</span><span class="op">(</span><span class="str">'a b c'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t462" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="str">'a'</span><span class="op">,</span> <span class="nam">o</span><span class="op">.</span><span class="nam">sBeginSpec</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t463" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="str">'b'</span><span class="op">,</span> <span class="nam">o</span><span class="op">.</span><span class="nam">sEndSpec</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t464" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="str">'c'</span><span class="op">,</span> <span class="nam">o</span><span class="op">.</span><span class="nam">sEndOutput</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t459" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testMarkers</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t460" class="stm run hide_run"> <span class="nam">o</span> <span class="op">=</span> <span class="nam">CogOptions</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t461" class="stm run hide_run"> <span class="nam">o</span><span class="op">.</span><span class="nam">_parse_markers</span><span class="op">(</span><span class="str">'a b c'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t462" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="str">'a'</span><span class="op">,</span> <span class="nam">o</span><span class="op">.</span><span class="nam">sBeginSpec</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t463" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="str">'b'</span><span class="op">,</span> <span class="nam">o</span><span class="op">.</span><span class="nam">sEndSpec</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t464" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="str">'c'</span><span class="op">,</span> <span class="nam">o</span><span class="op">.</span><span class="nam">sEndOutput</span><span class="op">)</span><span class="strut"> </span></p> <p id="t465" class="pln"><span class="strut"> </span></p> -<p id="t466" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testMarkersSwitch</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t467" class="stm mis"> <span class="nam">o</span> <span class="op">=</span> <span class="nam">CogOptions</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t468" class="stm mis"> <span class="nam">o</span><span class="op">.</span><span class="nam">parseArgs</span><span class="op">(</span><span class="op">[</span><span class="str">'--markers'</span><span class="op">,</span> <span class="str">'a b c'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t469" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="str">'a'</span><span class="op">,</span> <span class="nam">o</span><span class="op">.</span><span class="nam">sBeginSpec</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t470" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="str">'b'</span><span class="op">,</span> <span class="nam">o</span><span class="op">.</span><span class="nam">sEndSpec</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t471" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="str">'c'</span><span class="op">,</span> <span class="nam">o</span><span class="op">.</span><span class="nam">sEndOutput</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t466" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testMarkersSwitch</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t467" class="stm run hide_run"> <span class="nam">o</span> <span class="op">=</span> <span class="nam">CogOptions</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t468" class="stm run hide_run"> <span class="nam">o</span><span class="op">.</span><span class="nam">parseArgs</span><span class="op">(</span><span class="op">[</span><span class="str">'--markers'</span><span class="op">,</span> <span class="str">'a b c'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t469" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="str">'a'</span><span class="op">,</span> <span class="nam">o</span><span class="op">.</span><span class="nam">sBeginSpec</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t470" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="str">'b'</span><span class="op">,</span> <span class="nam">o</span><span class="op">.</span><span class="nam">sEndSpec</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t471" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="str">'c'</span><span class="op">,</span> <span class="nam">o</span><span class="op">.</span><span class="nam">sEndOutput</span><span class="op">)</span><span class="strut"> </span></p> <p id="t472" class="pln"><span class="strut"> </span></p> <p id="t473" class="pln"><span class="strut"> </span></p> <p id="t474" class="stm run hide_run"><span class="key">class</span> <span class="nam">FileStructureTests</span><span class="op">(</span><span class="nam">TestCase</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t475" class="pln"> <span class="str">""" Test cases to check that we're properly strict about the structure</span><span class="strut"> </span></p> -<p id="t476" class="pln"><span class="str"> of files.</span><span class="strut"> </span></p> -<p id="t477" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t475" class="pln"> <span class="str">""" Test cases to check that we're properly strict about the structure</span><span class="strut"> </span></p> +<p id="t476" class="pln"><span class="str"> of files.</span><span class="strut"> </span></p> +<p id="t477" class="pln"><span class="str"> """</span><span class="strut"> </span></p> <p id="t478" class="pln"><span class="strut"> </span></p> -<p id="t479" class="stm run hide_run"> <span class="key">def</span> <span class="nam">isBad</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">infile</span><span class="op">,</span> <span class="nam">msg</span><span class="op">=</span><span class="nam">None</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t480" class="stm mis"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t481" class="stm mis"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogError</span><span class="op">,</span> <span class="nam">re</span><span class="op">.</span><span class="nam">escape</span><span class="op">(</span><span class="nam">msg</span><span class="op">)</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t482" class="stm mis"> <span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">,</span> <span class="str">'infile.txt'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t479" class="stm run hide_run"> <span class="key">def</span> <span class="nam">isBad</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">infile</span><span class="op">,</span> <span class="nam">msg</span><span class="op">=</span><span class="nam">None</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t480" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t481" class="stm run hide_run"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogError</span><span class="op">,</span> <span class="nam">re</span><span class="op">.</span><span class="nam">escape</span><span class="op">(</span><span class="nam">msg</span><span class="op">)</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t482" class="stm run hide_run"> <span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">,</span> <span class="str">'infile.txt'</span><span class="op">)</span><span class="strut"> </span></p> <p id="t483" class="pln"><span class="strut"> </span></p> -<p id="t484" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testBeginNoEnd</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t485" class="stm mis"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t486" class="pln"><span class="str"> Fooey</span><span class="strut"> </span></p> -<p id="t487" class="pln"><span class="str"> #[[[cog</span><span class="strut"> </span></p> -<p id="t488" class="pln"><span class="str"> cog.outl('hello')</span><span class="strut"> </span></p> -<p id="t489" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t490" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile</span><span class="op">,</span> <span class="str">"infile.txt(2): Cog block begun but never ended."</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t484" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testBeginNoEnd</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t485" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t486" class="pln"><span class="str"> Fooey</span><span class="strut"> </span></p> +<p id="t487" class="pln"><span class="str"> #[[[cog</span><span class="strut"> </span></p> +<p id="t488" class="pln"><span class="str"> cog.outl('hello')</span><span class="strut"> </span></p> +<p id="t489" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t490" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile</span><span class="op">,</span> <span class="str">"infile.txt(2): Cog block begun but never ended."</span><span class="op">)</span><span class="strut"> </span></p> <p id="t491" class="pln"><span class="strut"> </span></p> -<p id="t492" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testNoEoo</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t493" class="stm mis"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t494" class="pln"><span class="str"> Fooey</span><span class="strut"> </span></p> -<p id="t495" class="pln"><span class="str"> #[[[cog</span><span class="strut"> </span></p> -<p id="t496" class="pln"><span class="str"> cog.outl('hello')</span><span class="strut"> </span></p> -<p id="t497" class="pln"><span class="str"> #]]]</span><span class="strut"> </span></p> -<p id="t498" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t499" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile</span><span class="op">,</span> <span class="str">"infile.txt(4): Missing '[[[end]]]' before end of file."</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t492" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testNoEoo</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t493" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t494" class="pln"><span class="str"> Fooey</span><span class="strut"> </span></p> +<p id="t495" class="pln"><span class="str"> #[[[cog</span><span class="strut"> </span></p> +<p id="t496" class="pln"><span class="str"> cog.outl('hello')</span><span class="strut"> </span></p> +<p id="t497" class="pln"><span class="str"> #]]]</span><span class="strut"> </span></p> +<p id="t498" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t499" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile</span><span class="op">,</span> <span class="str">"infile.txt(4): Missing '[[[end]]]' before end of file."</span><span class="op">)</span><span class="strut"> </span></p> <p id="t500" class="pln"><span class="strut"> </span></p> -<p id="t501" class="stm mis"> <span class="nam">infile2</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t502" class="pln"><span class="str"> Fooey</span><span class="strut"> </span></p> -<p id="t503" class="pln"><span class="str"> #[[[cog</span><span class="strut"> </span></p> -<p id="t504" class="pln"><span class="str"> cog.outl('hello')</span><span class="strut"> </span></p> -<p id="t505" class="pln"><span class="str"> #]]]</span><span class="strut"> </span></p> -<p id="t506" class="pln"><span class="str"> #[[[cog</span><span class="strut"> </span></p> -<p id="t507" class="pln"><span class="str"> cog.outl('goodbye')</span><span class="strut"> </span></p> -<p id="t508" class="pln"><span class="str"> #]]]</span><span class="strut"> </span></p> -<p id="t509" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t510" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile2</span><span class="op">,</span> <span class="str">"infile.txt(5): Unexpected '[[[cog'"</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t501" class="stm run hide_run"> <span class="nam">infile2</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t502" class="pln"><span class="str"> Fooey</span><span class="strut"> </span></p> +<p id="t503" class="pln"><span class="str"> #[[[cog</span><span class="strut"> </span></p> +<p id="t504" class="pln"><span class="str"> cog.outl('hello')</span><span class="strut"> </span></p> +<p id="t505" class="pln"><span class="str"> #]]]</span><span class="strut"> </span></p> +<p id="t506" class="pln"><span class="str"> #[[[cog</span><span class="strut"> </span></p> +<p id="t507" class="pln"><span class="str"> cog.outl('goodbye')</span><span class="strut"> </span></p> +<p id="t508" class="pln"><span class="str"> #]]]</span><span class="strut"> </span></p> +<p id="t509" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t510" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile2</span><span class="op">,</span> <span class="str">"infile.txt(5): Unexpected '[[[cog'"</span><span class="op">)</span><span class="strut"> </span></p> <p id="t511" class="pln"><span class="strut"> </span></p> -<p id="t512" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testStartWithEnd</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t513" class="stm mis"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t514" class="pln"><span class="str"> #]]]</span><span class="strut"> </span></p> -<p id="t515" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t516" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile</span><span class="op">,</span> <span class="str">"infile.txt(1): Unexpected ']]]'"</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t512" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testStartWithEnd</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t513" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t514" class="pln"><span class="str"> #]]]</span><span class="strut"> </span></p> +<p id="t515" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t516" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile</span><span class="op">,</span> <span class="str">"infile.txt(1): Unexpected ']]]'"</span><span class="op">)</span><span class="strut"> </span></p> <p id="t517" class="pln"><span class="strut"> </span></p> -<p id="t518" class="stm mis"> <span class="nam">infile2</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t519" class="pln"><span class="str"> #[[[cog</span><span class="strut"> </span></p> -<p id="t520" class="pln"><span class="str"> cog.outl('hello')</span><span class="strut"> </span></p> -<p id="t521" class="pln"><span class="str"> #]]]</span><span class="strut"> </span></p> -<p id="t522" class="pln"><span class="str"> #[[[end]]]</span><span class="strut"> </span></p> -<p id="t523" class="pln"><span class="str"> #]]]</span><span class="strut"> </span></p> -<p id="t524" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t525" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile2</span><span class="op">,</span> <span class="str">"infile.txt(5): Unexpected ']]]'"</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t518" class="stm run hide_run"> <span class="nam">infile2</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t519" class="pln"><span class="str"> #[[[cog</span><span class="strut"> </span></p> +<p id="t520" class="pln"><span class="str"> cog.outl('hello')</span><span class="strut"> </span></p> +<p id="t521" class="pln"><span class="str"> #]]]</span><span class="strut"> </span></p> +<p id="t522" class="pln"><span class="str"> #[[[end]]]</span><span class="strut"> </span></p> +<p id="t523" class="pln"><span class="str"> #]]]</span><span class="strut"> </span></p> +<p id="t524" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t525" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile2</span><span class="op">,</span> <span class="str">"infile.txt(5): Unexpected ']]]'"</span><span class="op">)</span><span class="strut"> </span></p> <p id="t526" class="pln"><span class="strut"> </span></p> -<p id="t527" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testStartWithEoo</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t528" class="stm mis"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t529" class="pln"><span class="str"> #[[[end]]]</span><span class="strut"> </span></p> -<p id="t530" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t531" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile</span><span class="op">,</span> <span class="str">"infile.txt(1): Unexpected '[[[end]]]'"</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t527" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testStartWithEoo</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t528" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t529" class="pln"><span class="str"> #[[[end]]]</span><span class="strut"> </span></p> +<p id="t530" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t531" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile</span><span class="op">,</span> <span class="str">"infile.txt(1): Unexpected '[[[end]]]'"</span><span class="op">)</span><span class="strut"> </span></p> <p id="t532" class="pln"><span class="strut"> </span></p> -<p id="t533" class="stm mis"> <span class="nam">infile2</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t534" class="pln"><span class="str"> #[[[cog</span><span class="strut"> </span></p> -<p id="t535" class="pln"><span class="str"> cog.outl('hello')</span><span class="strut"> </span></p> -<p id="t536" class="pln"><span class="str"> #]]]</span><span class="strut"> </span></p> -<p id="t537" class="pln"><span class="str"> #[[[end]]]</span><span class="strut"> </span></p> -<p id="t538" class="pln"><span class="str"> #[[[end]]]</span><span class="strut"> </span></p> -<p id="t539" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t540" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile2</span><span class="op">,</span> <span class="str">"infile.txt(5): Unexpected '[[[end]]]'"</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t533" class="stm run hide_run"> <span class="nam">infile2</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t534" class="pln"><span class="str"> #[[[cog</span><span class="strut"> </span></p> +<p id="t535" class="pln"><span class="str"> cog.outl('hello')</span><span class="strut"> </span></p> +<p id="t536" class="pln"><span class="str"> #]]]</span><span class="strut"> </span></p> +<p id="t537" class="pln"><span class="str"> #[[[end]]]</span><span class="strut"> </span></p> +<p id="t538" class="pln"><span class="str"> #[[[end]]]</span><span class="strut"> </span></p> +<p id="t539" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t540" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile2</span><span class="op">,</span> <span class="str">"infile.txt(5): Unexpected '[[[end]]]'"</span><span class="op">)</span><span class="strut"> </span></p> <p id="t541" class="pln"><span class="strut"> </span></p> -<p id="t542" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testNoEnd</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t543" class="stm mis"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t544" class="pln"><span class="str"> #[[[cog</span><span class="strut"> </span></p> -<p id="t545" class="pln"><span class="str"> cog.outl("hello")</span><span class="strut"> </span></p> -<p id="t546" class="pln"><span class="str"> #[[[end]]]</span><span class="strut"> </span></p> -<p id="t547" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t548" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile</span><span class="op">,</span> <span class="str">"infile.txt(3): Unexpected '[[[end]]]'"</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t542" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testNoEnd</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t543" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t544" class="pln"><span class="str"> #[[[cog</span><span class="strut"> </span></p> +<p id="t545" class="pln"><span class="str"> cog.outl("hello")</span><span class="strut"> </span></p> +<p id="t546" class="pln"><span class="str"> #[[[end]]]</span><span class="strut"> </span></p> +<p id="t547" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t548" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile</span><span class="op">,</span> <span class="str">"infile.txt(3): Unexpected '[[[end]]]'"</span><span class="op">)</span><span class="strut"> </span></p> <p id="t549" class="pln"><span class="strut"> </span></p> -<p id="t550" class="stm mis"> <span class="nam">infile2</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t551" class="pln"><span class="str"> #[[[cog</span><span class="strut"> </span></p> -<p id="t552" class="pln"><span class="str"> cog.outl('hello')</span><span class="strut"> </span></p> -<p id="t553" class="pln"><span class="str"> #]]]</span><span class="strut"> </span></p> -<p id="t554" class="pln"><span class="str"> #[[[end]]]</span><span class="strut"> </span></p> -<p id="t555" class="pln"><span class="str"> #[[[cog</span><span class="strut"> </span></p> -<p id="t556" class="pln"><span class="str"> cog.outl("hello")</span><span class="strut"> </span></p> -<p id="t557" class="pln"><span class="str"> #[[[end]]]</span><span class="strut"> </span></p> -<p id="t558" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t559" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile2</span><span class="op">,</span> <span class="str">"infile.txt(7): Unexpected '[[[end]]]'"</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t550" class="stm run hide_run"> <span class="nam">infile2</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t551" class="pln"><span class="str"> #[[[cog</span><span class="strut"> </span></p> +<p id="t552" class="pln"><span class="str"> cog.outl('hello')</span><span class="strut"> </span></p> +<p id="t553" class="pln"><span class="str"> #]]]</span><span class="strut"> </span></p> +<p id="t554" class="pln"><span class="str"> #[[[end]]]</span><span class="strut"> </span></p> +<p id="t555" class="pln"><span class="str"> #[[[cog</span><span class="strut"> </span></p> +<p id="t556" class="pln"><span class="str"> cog.outl("hello")</span><span class="strut"> </span></p> +<p id="t557" class="pln"><span class="str"> #[[[end]]]</span><span class="strut"> </span></p> +<p id="t558" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t559" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile2</span><span class="op">,</span> <span class="str">"infile.txt(7): Unexpected '[[[end]]]'"</span><span class="op">)</span><span class="strut"> </span></p> <p id="t560" class="pln"><span class="strut"> </span></p> -<p id="t561" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testTwoBegins</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t562" class="stm mis"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t563" class="pln"><span class="str"> #[[[cog</span><span class="strut"> </span></p> -<p id="t564" class="pln"><span class="str"> #[[[cog</span><span class="strut"> </span></p> -<p id="t565" class="pln"><span class="str"> cog.outl("hello")</span><span class="strut"> </span></p> -<p id="t566" class="pln"><span class="str"> #]]]</span><span class="strut"> </span></p> -<p id="t567" class="pln"><span class="str"> #[[[end]]]</span><span class="strut"> </span></p> -<p id="t568" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t569" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile</span><span class="op">,</span> <span class="str">"infile.txt(2): Unexpected '[[[cog'"</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t561" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testTwoBegins</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t562" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t563" class="pln"><span class="str"> #[[[cog</span><span class="strut"> </span></p> +<p id="t564" class="pln"><span class="str"> #[[[cog</span><span class="strut"> </span></p> +<p id="t565" class="pln"><span class="str"> cog.outl("hello")</span><span class="strut"> </span></p> +<p id="t566" class="pln"><span class="str"> #]]]</span><span class="strut"> </span></p> +<p id="t567" class="pln"><span class="str"> #[[[end]]]</span><span class="strut"> </span></p> +<p id="t568" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t569" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile</span><span class="op">,</span> <span class="str">"infile.txt(2): Unexpected '[[[cog'"</span><span class="op">)</span><span class="strut"> </span></p> <p id="t570" class="pln"><span class="strut"> </span></p> -<p id="t571" class="stm mis"> <span class="nam">infile2</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t572" class="pln"><span class="str"> #[[[cog</span><span class="strut"> </span></p> -<p id="t573" class="pln"><span class="str"> cog.outl("hello")</span><span class="strut"> </span></p> -<p id="t574" class="pln"><span class="str"> #]]]</span><span class="strut"> </span></p> -<p id="t575" class="pln"><span class="str"> #[[[end]]]</span><span class="strut"> </span></p> -<p id="t576" class="pln"><span class="str"> #[[[cog</span><span class="strut"> </span></p> -<p id="t577" class="pln"><span class="str"> #[[[cog</span><span class="strut"> </span></p> -<p id="t578" class="pln"><span class="str"> cog.outl("hello")</span><span class="strut"> </span></p> -<p id="t579" class="pln"><span class="str"> #]]]</span><span class="strut"> </span></p> -<p id="t580" class="pln"><span class="str"> #[[[end]]]</span><span class="strut"> </span></p> -<p id="t581" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t582" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile2</span><span class="op">,</span> <span class="str">"infile.txt(6): Unexpected '[[[cog'"</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t571" class="stm run hide_run"> <span class="nam">infile2</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t572" class="pln"><span class="str"> #[[[cog</span><span class="strut"> </span></p> +<p id="t573" class="pln"><span class="str"> cog.outl("hello")</span><span class="strut"> </span></p> +<p id="t574" class="pln"><span class="str"> #]]]</span><span class="strut"> </span></p> +<p id="t575" class="pln"><span class="str"> #[[[end]]]</span><span class="strut"> </span></p> +<p id="t576" class="pln"><span class="str"> #[[[cog</span><span class="strut"> </span></p> +<p id="t577" class="pln"><span class="str"> #[[[cog</span><span class="strut"> </span></p> +<p id="t578" class="pln"><span class="str"> cog.outl("hello")</span><span class="strut"> </span></p> +<p id="t579" class="pln"><span class="str"> #]]]</span><span class="strut"> </span></p> +<p id="t580" class="pln"><span class="str"> #[[[end]]]</span><span class="strut"> </span></p> +<p id="t581" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t582" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile2</span><span class="op">,</span> <span class="str">"infile.txt(6): Unexpected '[[[cog'"</span><span class="op">)</span><span class="strut"> </span></p> <p id="t583" class="pln"><span class="strut"> </span></p> -<p id="t584" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testTwoEnds</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t585" class="stm mis"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t586" class="pln"><span class="str"> #[[[cog</span><span class="strut"> </span></p> -<p id="t587" class="pln"><span class="str"> cog.outl("hello")</span><span class="strut"> </span></p> -<p id="t588" class="pln"><span class="str"> #]]]</span><span class="strut"> </span></p> -<p id="t589" class="pln"><span class="str"> #]]]</span><span class="strut"> </span></p> -<p id="t590" class="pln"><span class="str"> #[[[end]]]</span><span class="strut"> </span></p> -<p id="t591" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t592" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile</span><span class="op">,</span> <span class="str">"infile.txt(4): Unexpected ']]]'"</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t584" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testTwoEnds</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t585" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t586" class="pln"><span class="str"> #[[[cog</span><span class="strut"> </span></p> +<p id="t587" class="pln"><span class="str"> cog.outl("hello")</span><span class="strut"> </span></p> +<p id="t588" class="pln"><span class="str"> #]]]</span><span class="strut"> </span></p> +<p id="t589" class="pln"><span class="str"> #]]]</span><span class="strut"> </span></p> +<p id="t590" class="pln"><span class="str"> #[[[end]]]</span><span class="strut"> </span></p> +<p id="t591" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t592" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile</span><span class="op">,</span> <span class="str">"infile.txt(4): Unexpected ']]]'"</span><span class="op">)</span><span class="strut"> </span></p> <p id="t593" class="pln"><span class="strut"> </span></p> -<p id="t594" class="stm mis"> <span class="nam">infile2</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t595" class="pln"><span class="str"> #[[[cog</span><span class="strut"> </span></p> -<p id="t596" class="pln"><span class="str"> cog.outl("hello")</span><span class="strut"> </span></p> -<p id="t597" class="pln"><span class="str"> #]]]</span><span class="strut"> </span></p> -<p id="t598" class="pln"><span class="str"> #[[[end]]]</span><span class="strut"> </span></p> -<p id="t599" class="pln"><span class="str"> #[[[cog</span><span class="strut"> </span></p> -<p id="t600" class="pln"><span class="str"> cog.outl("hello")</span><span class="strut"> </span></p> -<p id="t601" class="pln"><span class="str"> #]]]</span><span class="strut"> </span></p> -<p id="t602" class="pln"><span class="str"> #]]]</span><span class="strut"> </span></p> -<p id="t603" class="pln"><span class="str"> #[[[end]]]</span><span class="strut"> </span></p> -<p id="t604" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t605" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile2</span><span class="op">,</span> <span class="str">"infile.txt(8): Unexpected ']]]'"</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t594" class="stm run hide_run"> <span class="nam">infile2</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t595" class="pln"><span class="str"> #[[[cog</span><span class="strut"> </span></p> +<p id="t596" class="pln"><span class="str"> cog.outl("hello")</span><span class="strut"> </span></p> +<p id="t597" class="pln"><span class="str"> #]]]</span><span class="strut"> </span></p> +<p id="t598" class="pln"><span class="str"> #[[[end]]]</span><span class="strut"> </span></p> +<p id="t599" class="pln"><span class="str"> #[[[cog</span><span class="strut"> </span></p> +<p id="t600" class="pln"><span class="str"> cog.outl("hello")</span><span class="strut"> </span></p> +<p id="t601" class="pln"><span class="str"> #]]]</span><span class="strut"> </span></p> +<p id="t602" class="pln"><span class="str"> #]]]</span><span class="strut"> </span></p> +<p id="t603" class="pln"><span class="str"> #[[[end]]]</span><span class="strut"> </span></p> +<p id="t604" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t605" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">isBad</span><span class="op">(</span><span class="nam">infile2</span><span class="op">,</span> <span class="str">"infile.txt(8): Unexpected ']]]'"</span><span class="op">)</span><span class="strut"> </span></p> <p id="t606" class="pln"><span class="strut"> </span></p> <p id="t607" class="pln"><span class="strut"> </span></p> <p id="t608" class="stm run hide_run"><span class="key">class</span> <span class="nam">CogErrorTests</span><span class="op">(</span><span class="nam">TestCase</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t609" class="pln"> <span class="str">""" Test cases for cog.error().</span><span class="strut"> </span></p> -<p id="t610" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t609" class="pln"> <span class="str">""" Test cases for cog.error().</span><span class="strut"> </span></p> +<p id="t610" class="pln"><span class="str"> """</span><span class="strut"> </span></p> <p id="t611" class="pln"><span class="strut"> </span></p> -<p id="t612" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testErrorMsg</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t613" class="stm mis"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t614" class="pln"><span class="str"> [[[cog cog.error("This ain't right!")]]]</span><span class="strut"> </span></p> -<p id="t615" class="pln"><span class="str"> [[[end]]]</span><span class="strut"> </span></p> -<p id="t616" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t612" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testErrorMsg</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t613" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t614" class="pln"><span class="str"> [[[cog cog.error("This ain't right!")]]]</span><span class="strut"> </span></p> +<p id="t615" class="pln"><span class="str"> [[[end]]]</span><span class="strut"> </span></p> +<p id="t616" class="pln"><span class="str"> """</span><span class="strut"> </span></p> <p id="t617" class="pln"><span class="strut"> </span></p> -<p id="t618" class="stm mis"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t619" class="stm mis"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogGeneratedError</span><span class="op">,</span> <span class="str">"This ain't right!"</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t620" class="stm mis"> <span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t618" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t619" class="stm run hide_run"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogGeneratedError</span><span class="op">,</span> <span class="str">"This ain't right!"</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t620" class="stm run hide_run"> <span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> <p id="t621" class="pln"><span class="strut"> </span></p> -<p id="t622" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testErrorNoMsg</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t623" class="stm mis"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t624" class="pln"><span class="str"> [[[cog cog.error()]]]</span><span class="strut"> </span></p> -<p id="t625" class="pln"><span class="str"> [[[end]]]</span><span class="strut"> </span></p> -<p id="t626" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t622" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testErrorNoMsg</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t623" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t624" class="pln"><span class="str"> [[[cog cog.error()]]]</span><span class="strut"> </span></p> +<p id="t625" class="pln"><span class="str"> [[[end]]]</span><span class="strut"> </span></p> +<p id="t626" class="pln"><span class="str"> """</span><span class="strut"> </span></p> <p id="t627" class="pln"><span class="strut"> </span></p> -<p id="t628" class="stm mis"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t629" class="stm mis"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogGeneratedError</span><span class="op">,</span> <span class="str">"Error raised by cog generator."</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t630" class="stm mis"> <span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t628" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t629" class="stm run hide_run"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogGeneratedError</span><span class="op">,</span> <span class="str">"Error raised by cog generator."</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t630" class="stm run hide_run"> <span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> <p id="t631" class="pln"><span class="strut"> </span></p> -<p id="t632" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testNoErrorIfErrorNotCalled</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t633" class="stm mis"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t634" class="pln"><span class="str"> --[[[cog</span><span class="strut"> </span></p> -<p id="t635" class="pln"><span class="str"> --import cog</span><span class="strut"> </span></p> -<p id="t636" class="pln"><span class="str"> --for i in range(3):</span><span class="strut"> </span></p> -<p id="t637" class="pln"><span class="str"> -- if i > 10:</span><span class="strut"> </span></p> -<p id="t638" class="pln"><span class="str"> -- cog.error("Something is amiss!")</span><span class="strut"> </span></p> -<p id="t639" class="pln"><span class="str"> -- cog.out("xx%d\\n" % i)</span><span class="strut"> </span></p> -<p id="t640" class="pln"><span class="str"> --]]]</span><span class="strut"> </span></p> -<p id="t641" class="pln"><span class="str"> xx0</span><span class="strut"> </span></p> -<p id="t642" class="pln"><span class="str"> xx1</span><span class="strut"> </span></p> -<p id="t643" class="pln"><span class="str"> xx2</span><span class="strut"> </span></p> -<p id="t644" class="pln"><span class="str"> --[[[end]]]</span><span class="strut"> </span></p> -<p id="t645" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t632" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testNoErrorIfErrorNotCalled</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t633" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t634" class="pln"><span class="str"> --[[[cog</span><span class="strut"> </span></p> +<p id="t635" class="pln"><span class="str"> --import cog</span><span class="strut"> </span></p> +<p id="t636" class="pln"><span class="str"> --for i in range(3):</span><span class="strut"> </span></p> +<p id="t637" class="pln"><span class="str"> -- if i > 10:</span><span class="strut"> </span></p> +<p id="t638" class="pln"><span class="str"> -- cog.error("Something is amiss!")</span><span class="strut"> </span></p> +<p id="t639" class="pln"><span class="str"> -- cog.out("xx%d\\n" % i)</span><span class="strut"> </span></p> +<p id="t640" class="pln"><span class="str"> --]]]</span><span class="strut"> </span></p> +<p id="t641" class="pln"><span class="str"> xx0</span><span class="strut"> </span></p> +<p id="t642" class="pln"><span class="str"> xx1</span><span class="strut"> </span></p> +<p id="t643" class="pln"><span class="str"> xx2</span><span class="strut"> </span></p> +<p id="t644" class="pln"><span class="str"> --[[[end]]]</span><span class="strut"> </span></p> +<p id="t645" class="pln"><span class="str"> """</span><span class="strut"> </span></p> <p id="t646" class="pln"><span class="strut"> </span></p> -<p id="t647" class="stm mis"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t648" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t647" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t648" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> <p id="t649" class="pln"><span class="strut"> </span></p> <p id="t650" class="pln"><span class="strut"> </span></p> <p id="t651" class="stm run hide_run"><span class="key">class</span> <span class="nam">CogGeneratorGetCodeTests</span><span class="op">(</span><span class="nam">TestCase</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t652" class="pln"> <span class="str">""" Unit tests against CogGenerator to see if its getCode() method works</span><span class="strut"> </span></p> -<p id="t653" class="pln"><span class="str"> properly.</span><span class="strut"> </span></p> -<p id="t654" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t652" class="pln"> <span class="str">""" Unit tests against CogGenerator to see if its getCode() method works</span><span class="strut"> </span></p> +<p id="t653" class="pln"><span class="str"> properly.</span><span class="strut"> </span></p> +<p id="t654" class="pln"><span class="str"> """</span><span class="strut"> </span></p> <p id="t655" class="pln"><span class="strut"> </span></p> -<p id="t656" class="stm run hide_run"> <span class="key">def</span> <span class="nam">setUp</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t657" class="pln"> <span class="str">""" All tests get a generator to use, and short same-length names for</span><span class="strut"> </span></p> -<p id="t658" class="pln"><span class="str"> the functions we're going to use.</span><span class="strut"> </span></p> -<p id="t659" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t660" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">gen</span> <span class="op">=</span> <span class="nam">CogGenerator</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t661" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">m</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">gen</span><span class="op">.</span><span class="nam">parseMarker</span><span class="strut"> </span></p> -<p id="t662" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">l</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">gen</span><span class="op">.</span><span class="nam">parseLine</span><span class="strut"> </span></p> +<p id="t656" class="stm run hide_run"> <span class="key">def</span> <span class="nam">setUp</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t657" class="pln"> <span class="str">""" All tests get a generator to use, and short same-length names for</span><span class="strut"> </span></p> +<p id="t658" class="pln"><span class="str"> the functions we're going to use.</span><span class="strut"> </span></p> +<p id="t659" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t660" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">gen</span> <span class="op">=</span> <span class="nam">CogGenerator</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t661" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">m</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">gen</span><span class="op">.</span><span class="nam">parseMarker</span><span class="strut"> </span></p> +<p id="t662" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">l</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">gen</span><span class="op">.</span><span class="nam">parseLine</span><span class="strut"> </span></p> <p id="t663" class="pln"><span class="strut"> </span></p> -<p id="t664" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testEmpty</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t665" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">'// [[[cog'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t666" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">'// ]]]'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t667" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">gen</span><span class="op">.</span><span class="nam">getCode</span><span class="op">(</span><span class="op">)</span><span class="op">,</span> <span class="str">''</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t664" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testEmpty</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t665" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">'// [[[cog'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t666" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">'// ]]]'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t667" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">gen</span><span class="op">.</span><span class="nam">getCode</span><span class="op">(</span><span class="op">)</span><span class="op">,</span> <span class="str">''</span><span class="op">)</span><span class="strut"> </span></p> <p id="t668" class="pln"><span class="strut"> </span></p> -<p id="t669" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testSimple</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t670" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">'// [[[cog'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t671" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">' print "hello"'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t672" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">' print "bye"'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t673" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">'// ]]]'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t674" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">gen</span><span class="op">.</span><span class="nam">getCode</span><span class="op">(</span><span class="op">)</span><span class="op">,</span> <span class="str">'print "hello"\nprint "bye"'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t669" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testSimple</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t670" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">'// [[[cog'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t671" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">' print "hello"'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t672" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">' print "bye"'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t673" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">'// ]]]'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t674" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">gen</span><span class="op">.</span><span class="nam">getCode</span><span class="op">(</span><span class="op">)</span><span class="op">,</span> <span class="str">'print "hello"\nprint "bye"'</span><span class="op">)</span><span class="strut"> </span></p> <p id="t675" class="pln"><span class="strut"> </span></p> -<p id="t676" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testCompressed1</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t677" class="pln"> <span class="com"># For a while, I supported compressed code blocks, but no longer.</span><span class="strut"> </span></p> -<p id="t678" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">'// [[[cog: print """'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t679" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">'// hello'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t680" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">'// bye'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t681" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">'// """)]]]'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t682" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">gen</span><span class="op">.</span><span class="nam">getCode</span><span class="op">(</span><span class="op">)</span><span class="op">,</span> <span class="str">'hello\nbye'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t676" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testCompressed1</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t677" class="pln"> <span class="com"># For a while, I supported compressed code blocks, but no longer.</span><span class="strut"> </span></p> +<p id="t678" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">'// [[[cog: print """'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t679" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">'// hello'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t680" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">'// bye'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t681" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">'// """)]]]'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t682" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">gen</span><span class="op">.</span><span class="nam">getCode</span><span class="op">(</span><span class="op">)</span><span class="op">,</span> <span class="str">'hello\nbye'</span><span class="op">)</span><span class="strut"> </span></p> <p id="t683" class="pln"><span class="strut"> </span></p> -<p id="t684" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testCompressed2</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t685" class="pln"> <span class="com"># For a while, I supported compressed code blocks, but no longer.</span><span class="strut"> </span></p> -<p id="t686" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">'// [[[cog: print """'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t687" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">'hello'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t688" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">'bye'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t689" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">'// """)]]]'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t690" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">gen</span><span class="op">.</span><span class="nam">getCode</span><span class="op">(</span><span class="op">)</span><span class="op">,</span> <span class="str">'hello\nbye'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t684" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testCompressed2</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t685" class="pln"> <span class="com"># For a while, I supported compressed code blocks, but no longer.</span><span class="strut"> </span></p> +<p id="t686" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">'// [[[cog: print """'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t687" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">'hello'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t688" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">'bye'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t689" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">'// """)]]]'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t690" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">gen</span><span class="op">.</span><span class="nam">getCode</span><span class="op">(</span><span class="op">)</span><span class="op">,</span> <span class="str">'hello\nbye'</span><span class="op">)</span><span class="strut"> </span></p> <p id="t691" class="pln"><span class="strut"> </span></p> -<p id="t692" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testCompressed3</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t693" class="pln"> <span class="com"># For a while, I supported compressed code blocks, but no longer.</span><span class="strut"> </span></p> -<p id="t694" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">'// [[[cog'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t695" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">'print """hello'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t696" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">'bye'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t697" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">'// """)]]]'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t698" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">gen</span><span class="op">.</span><span class="nam">getCode</span><span class="op">(</span><span class="op">)</span><span class="op">,</span> <span class="str">'print """hello\nbye'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t692" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testCompressed3</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t693" class="pln"> <span class="com"># For a while, I supported compressed code blocks, but no longer.</span><span class="strut"> </span></p> +<p id="t694" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">'// [[[cog'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t695" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">'print """hello'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t696" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">'bye'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t697" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">'// """)]]]'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t698" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">gen</span><span class="op">.</span><span class="nam">getCode</span><span class="op">(</span><span class="op">)</span><span class="op">,</span> <span class="str">'print """hello\nbye'</span><span class="op">)</span><span class="strut"> </span></p> <p id="t699" class="pln"><span class="strut"> </span></p> -<p id="t700" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testCompressed4</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t701" class="pln"> <span class="com"># For a while, I supported compressed code blocks, but no longer.</span><span class="strut"> </span></p> -<p id="t702" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">'// [[[cog: print """'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t703" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">'hello'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t704" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">'bye""")'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t705" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">'// ]]]'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t706" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">gen</span><span class="op">.</span><span class="nam">getCode</span><span class="op">(</span><span class="op">)</span><span class="op">,</span> <span class="str">'hello\nbye""")'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t700" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testCompressed4</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t701" class="pln"> <span class="com"># For a while, I supported compressed code blocks, but no longer.</span><span class="strut"> </span></p> +<p id="t702" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">'// [[[cog: print """'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t703" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">'hello'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t704" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">'bye""")'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t705" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">'// ]]]'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t706" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">gen</span><span class="op">.</span><span class="nam">getCode</span><span class="op">(</span><span class="op">)</span><span class="op">,</span> <span class="str">'hello\nbye""")'</span><span class="op">)</span><span class="strut"> </span></p> <p id="t707" class="pln"><span class="strut"> </span></p> -<p id="t708" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testNoCommonPrefixForMarkers</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t709" class="pln"> <span class="com"># It's important to be able to use #if 0 to hide lines from a</span><span class="strut"> </span></p> -<p id="t710" class="pln"> <span class="com"># C++ compiler.</span><span class="strut"> </span></p> -<p id="t711" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">'#if 0 //[[[cog'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t712" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">'\timport cog, sys'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t713" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">''</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t714" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">'\tprint sys.argv'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t715" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">'#endif //]]]'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t716" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">gen</span><span class="op">.</span><span class="nam">getCode</span><span class="op">(</span><span class="op">)</span><span class="op">,</span> <span class="str">'import cog, sys\n\nprint sys.argv'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t708" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testNoCommonPrefixForMarkers</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t709" class="pln"> <span class="com"># It's important to be able to use #if 0 to hide lines from a</span><span class="strut"> </span></p> +<p id="t710" class="pln"> <span class="com"># C++ compiler.</span><span class="strut"> </span></p> +<p id="t711" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">'#if 0 //[[[cog'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t712" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">'\timport cog, sys'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t713" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">''</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t714" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">l</span><span class="op">(</span><span class="str">'\tprint sys.argv'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t715" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">m</span><span class="op">(</span><span class="str">'#endif //]]]'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t716" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">gen</span><span class="op">.</span><span class="nam">getCode</span><span class="op">(</span><span class="op">)</span><span class="op">,</span> <span class="str">'import cog, sys\n\nprint sys.argv'</span><span class="op">)</span><span class="strut"> </span></p> <p id="t717" class="pln"><span class="strut"> </span></p> <p id="t718" class="pln"><span class="strut"> </span></p> <p id="t719" class="stm run hide_run"><span class="key">class</span> <span class="nam">TestCaseWithTempDir</span><span class="op">(</span><span class="nam">TestCase</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> <p id="t720" class="pln"><span class="strut"> </span></p> -<p id="t721" class="stm run hide_run"> <span class="key">def</span> <span class="nam">newCog</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t722" class="pln"> <span class="str">""" Initialize the cog members for another run.</span><span class="strut"> </span></p> -<p id="t723" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t724" class="pln"> <span class="com"># Create a cog engine, and catch its output.</span><span class="strut"> </span></p> -<p id="t725" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span> <span class="op">=</span> <span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t726" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span> <span class="op">=</span> <span class="nam">StringIO</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t727" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">setOutput</span><span class="op">(</span><span class="nam">stdout</span><span class="op">=</span><span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">,</span> <span class="nam">stderr</span><span class="op">=</span><span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t721" class="stm run hide_run"> <span class="key">def</span> <span class="nam">newCog</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t722" class="pln"> <span class="str">""" Initialize the cog members for another run.</span><span class="strut"> </span></p> +<p id="t723" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t724" class="pln"> <span class="com"># Create a cog engine, and catch its output.</span><span class="strut"> </span></p> +<p id="t725" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span> <span class="op">=</span> <span class="nam">Cog</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t726" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span> <span class="op">=</span> <span class="nam">StringIO</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t727" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">setOutput</span><span class="op">(</span><span class="nam">stdout</span><span class="op">=</span><span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">,</span> <span class="nam">stderr</span><span class="op">=</span><span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">)</span><span class="strut"> </span></p> <p id="t728" class="pln"><span class="strut"> </span></p> -<p id="t729" class="stm run hide_run"> <span class="key">def</span> <span class="nam">setUp</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t730" class="pln"> <span class="com"># Create a temporary directory.</span><span class="strut"> </span></p> -<p id="t731" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span> <span class="op">=</span> <span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">tempfile</span><span class="op">.</span><span class="nam">gettempdir</span><span class="op">(</span><span class="op">)</span><span class="op">,</span> <span class="str">'testcog_tempdir_'</span> <span class="op">+</span> <span class="nam">str</span><span class="op">(</span><span class="nam">random</span><span class="op">.</span><span class="nam">random</span><span class="op">(</span><span class="op">)</span><span class="op">)</span><span class="op">[</span><span class="num">2</span><span class="op">:</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t732" class="stm mis"> <span class="nam">os</span><span class="op">.</span><span class="nam">mkdir</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t733" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">olddir</span> <span class="op">=</span> <span class="nam">os</span><span class="op">.</span><span class="nam">getcwd</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t734" class="stm mis"> <span class="nam">os</span><span class="op">.</span><span class="nam">chdir</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t735" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t729" class="stm run hide_run"> <span class="key">def</span> <span class="nam">setUp</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t730" class="pln"> <span class="com"># Create a temporary directory.</span><span class="strut"> </span></p> +<p id="t731" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span> <span class="op">=</span> <span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">tempfile</span><span class="op">.</span><span class="nam">gettempdir</span><span class="op">(</span><span class="op">)</span><span class="op">,</span> <span class="str">'testcog_tempdir_'</span> <span class="op">+</span> <span class="nam">str</span><span class="op">(</span><span class="nam">random</span><span class="op">.</span><span class="nam">random</span><span class="op">(</span><span class="op">)</span><span class="op">)</span><span class="op">[</span><span class="num">2</span><span class="op">:</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t732" class="stm run hide_run"> <span class="nam">os</span><span class="op">.</span><span class="nam">mkdir</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t733" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">olddir</span> <span class="op">=</span> <span class="nam">os</span><span class="op">.</span><span class="nam">getcwd</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t734" class="stm run hide_run"> <span class="nam">os</span><span class="op">.</span><span class="nam">chdir</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t735" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> <p id="t736" class="pln"><span class="strut"> </span></p> -<p id="t737" class="stm run hide_run"> <span class="key">def</span> <span class="nam">tearDown</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t738" class="stm mis"> <span class="nam">os</span><span class="op">.</span><span class="nam">chdir</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">olddir</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t739" class="pln"> <span class="com"># Get rid of the temporary directory.</span><span class="strut"> </span></p> -<p id="t740" class="stm mis"> <span class="nam">shutil</span><span class="op">.</span><span class="nam">rmtree</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t737" class="stm run hide_run"> <span class="key">def</span> <span class="nam">tearDown</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t738" class="stm run hide_run"> <span class="nam">os</span><span class="op">.</span><span class="nam">chdir</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">olddir</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t739" class="pln"> <span class="com"># Get rid of the temporary directory.</span><span class="strut"> </span></p> +<p id="t740" class="stm run hide_run"> <span class="nam">shutil</span><span class="op">.</span><span class="nam">rmtree</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">)</span><span class="strut"> </span></p> <p id="t741" class="pln"><span class="strut"> </span></p> -<p id="t742" class="stm run hide_run"> <span class="key">def</span> <span class="nam">assertFilesSame</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">sFName1</span><span class="op">,</span> <span class="nam">sFName2</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t743" class="stm mis"> <span class="nam">text1</span> <span class="op">=</span> <span class="nam">open</span><span class="op">(</span><span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">,</span> <span class="nam">sFName1</span><span class="op">)</span><span class="op">,</span> <span class="str">'rb'</span><span class="op">)</span><span class="op">.</span><span class="nam">read</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t744" class="stm mis"> <span class="nam">text2</span> <span class="op">=</span> <span class="nam">open</span><span class="op">(</span><span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">,</span> <span class="nam">sFName2</span><span class="op">)</span><span class="op">,</span> <span class="str">'rb'</span><span class="op">)</span><span class="op">.</span><span class="nam">read</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t745" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">text1</span><span class="op">,</span> <span class="nam">text2</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t742" class="stm run hide_run"> <span class="key">def</span> <span class="nam">assertFilesSame</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">sFName1</span><span class="op">,</span> <span class="nam">sFName2</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t743" class="stm run hide_run"> <span class="nam">text1</span> <span class="op">=</span> <span class="nam">open</span><span class="op">(</span><span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">,</span> <span class="nam">sFName1</span><span class="op">)</span><span class="op">,</span> <span class="str">'rb'</span><span class="op">)</span><span class="op">.</span><span class="nam">read</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t744" class="stm run hide_run"> <span class="nam">text2</span> <span class="op">=</span> <span class="nam">open</span><span class="op">(</span><span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">,</span> <span class="nam">sFName2</span><span class="op">)</span><span class="op">,</span> <span class="str">'rb'</span><span class="op">)</span><span class="op">.</span><span class="nam">read</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t745" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">text1</span><span class="op">,</span> <span class="nam">text2</span><span class="op">)</span><span class="strut"> </span></p> <p id="t746" class="pln"><span class="strut"> </span></p> -<p id="t747" class="stm run hide_run"> <span class="key">def</span> <span class="nam">assertFileContent</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">sFName</span><span class="op">,</span> <span class="nam">sContent</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t748" class="stm mis"> <span class="nam">sAbsName</span> <span class="op">=</span> <span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">,</span> <span class="nam">sFName</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t749" class="stm mis"> <span class="nam">f</span> <span class="op">=</span> <span class="nam">open</span><span class="op">(</span><span class="nam">sAbsName</span><span class="op">,</span> <span class="str">'rb'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t750" class="stm mis"> <span class="key">try</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t751" class="stm mis"> <span class="nam">sFileContent</span> <span class="op">=</span> <span class="nam">f</span><span class="op">.</span><span class="nam">read</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t752" class="pln"> <span class="key">finally</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t753" class="stm mis"> <span class="nam">f</span><span class="op">.</span><span class="nam">close</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t754" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">sFileContent</span><span class="op">,</span> <span class="nam">to_bytes</span><span class="op">(</span><span class="nam">sContent</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t747" class="stm run hide_run"> <span class="key">def</span> <span class="nam">assertFileContent</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">sFName</span><span class="op">,</span> <span class="nam">sContent</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t748" class="stm run hide_run"> <span class="nam">sAbsName</span> <span class="op">=</span> <span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">,</span> <span class="nam">sFName</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t749" class="stm run hide_run"> <span class="nam">f</span> <span class="op">=</span> <span class="nam">open</span><span class="op">(</span><span class="nam">sAbsName</span><span class="op">,</span> <span class="str">'rb'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t750" class="stm run hide_run"> <span class="key">try</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t751" class="stm run hide_run"> <span class="nam">sFileContent</span> <span class="op">=</span> <span class="nam">f</span><span class="op">.</span><span class="nam">read</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t752" class="pln"> <span class="key">finally</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t753" class="stm run hide_run"> <span class="nam">f</span><span class="op">.</span><span class="nam">close</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t754" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">sFileContent</span><span class="op">,</span> <span class="nam">to_bytes</span><span class="op">(</span><span class="nam">sContent</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> <p id="t755" class="pln"><span class="strut"> </span></p> <p id="t756" class="pln"><span class="strut"> </span></p> <p id="t757" class="stm run hide_run"><span class="key">class</span> <span class="nam">ArgumentHandlingTests</span><span class="op">(</span><span class="nam">TestCaseWithTempDir</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> <p id="t758" class="pln"><span class="strut"> </span></p> -<p id="t759" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testArgumentFailure</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t760" class="pln"> <span class="com"># Return value 2 means usage problem.</span><span class="strut"> </span></p> -<p id="t761" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">main</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-j'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="num">2</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t762" class="stm mis"> <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t763" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertIn</span><span class="op">(</span><span class="str">"option -j not recognized"</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t764" class="stm mis"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogUsageError</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t765" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t766" class="stm mis"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogUsageError</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t767" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-j'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t759" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testArgumentFailure</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t760" class="pln"> <span class="com"># Return value 2 means usage problem.</span><span class="strut"> </span></p> +<p id="t761" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">main</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-j'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="num">2</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t762" class="stm run hide_run"> <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t763" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertIn</span><span class="op">(</span><span class="str">"option -j not recognized"</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t764" class="stm run hide_run"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogUsageError</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t765" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t766" class="stm run hide_run"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogUsageError</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t767" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-j'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> <p id="t768" class="pln"><span class="strut"> </span></p> -<p id="t769" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testNoDashOAndAtFile</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t770" class="stm mis"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t771" class="pln"> <span class="str">'cogfiles.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t772" class="pln"><span class="str"> # Please run cog</span><span class="strut"> </span></p> -<p id="t773" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t774" class="pln"> <span class="op">}</span><span class="strut"> </span></p> +<p id="t769" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testNoDashOAndAtFile</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t770" class="stm run hide_run"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t771" class="pln"> <span class="str">'cogfiles.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t772" class="pln"><span class="str"> # Please run cog</span><span class="strut"> </span></p> +<p id="t773" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t774" class="pln"> <span class="op">}</span><span class="strut"> </span></p> <p id="t775" class="pln"><span class="strut"> </span></p> -<p id="t776" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t777" class="stm mis"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogUsageError</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t778" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-o'</span><span class="op">,</span> <span class="str">'foo'</span><span class="op">,</span> <span class="str">'@cogfiles.txt'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t776" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t777" class="stm run hide_run"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogUsageError</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t778" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-o'</span><span class="op">,</span> <span class="str">'foo'</span><span class="op">,</span> <span class="str">'@cogfiles.txt'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> <p id="t779" class="pln"><span class="strut"> </span></p> -<p id="t780" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testDashV</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t781" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">main</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-v'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="num">0</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t782" class="stm mis"> <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t783" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="str">'Cog version %s\n'</span> <span class="op">%</span> <span class="nam">__version__</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t780" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testDashV</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t781" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">main</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-v'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="num">0</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t782" class="stm run hide_run"> <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t783" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="str">'Cog version %s\n'</span> <span class="op">%</span> <span class="nam">__version__</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut"> </span></p> <p id="t784" class="pln"><span class="strut"> </span></p> -<p id="t785" class="stm run hide_run"> <span class="key">def</span> <span class="nam">producesHelp</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">args</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t786" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t787" class="stm mis"> <span class="nam">argv</span> <span class="op">=</span> <span class="op">[</span><span class="str">'argv0'</span><span class="op">]</span> <span class="op">+</span> <span class="nam">args</span><span class="op">.</span><span class="nam">split</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t788" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">main</span><span class="op">(</span><span class="nam">argv</span><span class="op">)</span><span class="op">,</span> <span class="num">0</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t789" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">usage</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t785" class="stm run hide_run"> <span class="key">def</span> <span class="nam">producesHelp</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">args</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t786" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t787" class="stm run hide_run"> <span class="nam">argv</span> <span class="op">=</span> <span class="op">[</span><span class="str">'argv0'</span><span class="op">]</span> <span class="op">+</span> <span class="nam">args</span><span class="op">.</span><span class="nam">split</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t788" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">main</span><span class="op">(</span><span class="nam">argv</span><span class="op">)</span><span class="op">,</span> <span class="num">0</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t789" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">usage</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> <p id="t790" class="pln"><span class="strut"> </span></p> -<p id="t791" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testDashH</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t792" class="pln"> <span class="com"># -h or -? anywhere on the command line should just print help.</span><span class="strut"> </span></p> -<p id="t793" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">producesHelp</span><span class="op">(</span><span class="str">"-h"</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t794" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">producesHelp</span><span class="op">(</span><span class="str">"-?"</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t795" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">producesHelp</span><span class="op">(</span><span class="str">"fooey.txt -h"</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t796" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">producesHelp</span><span class="op">(</span><span class="str">"-o -r @fooey.txt -? @booey.txt"</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t791" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testDashH</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t792" class="pln"> <span class="com"># -h or -? anywhere on the command line should just print help.</span><span class="strut"> </span></p> +<p id="t793" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">producesHelp</span><span class="op">(</span><span class="str">"-h"</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t794" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">producesHelp</span><span class="op">(</span><span class="str">"-?"</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t795" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">producesHelp</span><span class="op">(</span><span class="str">"fooey.txt -h"</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t796" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">producesHelp</span><span class="op">(</span><span class="str">"-o -r @fooey.txt -? @booey.txt"</span><span class="op">)</span><span class="strut"> </span></p> <p id="t797" class="pln"><span class="strut"> </span></p> -<p id="t798" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testDashOAndDashR</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t799" class="stm mis"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t800" class="pln"> <span class="str">'cogfile.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t801" class="pln"><span class="str"> # Please run cog</span><span class="strut"> </span></p> -<p id="t802" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t803" class="pln"> <span class="op">}</span><span class="strut"> </span></p> +<p id="t798" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testDashOAndDashR</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t799" class="stm run hide_run"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t800" class="pln"> <span class="str">'cogfile.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t801" class="pln"><span class="str"> # Please run cog</span><span class="strut"> </span></p> +<p id="t802" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t803" class="pln"> <span class="op">}</span><span class="strut"> </span></p> <p id="t804" class="pln"><span class="strut"> </span></p> -<p id="t805" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t806" class="stm mis"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogUsageError</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t807" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-o'</span><span class="op">,</span> <span class="str">'foo'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'cogfile.txt'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t805" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t806" class="stm run hide_run"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogUsageError</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t807" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-o'</span><span class="op">,</span> <span class="str">'foo'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'cogfile.txt'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> <p id="t808" class="pln"><span class="strut"> </span></p> -<p id="t809" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testDashZ</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t810" class="stm mis"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t811" class="pln"> <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t812" class="pln"><span class="str"> // This is my C++ file.</span><span class="strut"> </span></p> -<p id="t813" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t814" class="pln"><span class="str"> fnames = ['DoSomething', 'DoAnotherThing', 'DoLastThing']</span><span class="strut"> </span></p> -<p id="t815" class="pln"><span class="str"> for fn in fnames:</span><span class="strut"> </span></p> -<p id="t816" class="pln"><span class="str"> cog.outl("void %s();" % fn)</span><span class="strut"> </span></p> -<p id="t817" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t818" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t809" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testDashZ</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t810" class="stm run hide_run"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t811" class="pln"> <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t812" class="pln"><span class="str"> // This is my C++ file.</span><span class="strut"> </span></p> +<p id="t813" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t814" class="pln"><span class="str"> fnames = ['DoSomething', 'DoAnotherThing', 'DoLastThing']</span><span class="strut"> </span></p> +<p id="t815" class="pln"><span class="str"> for fn in fnames:</span><span class="strut"> </span></p> +<p id="t816" class="pln"><span class="str"> cog.outl("void %s();" % fn)</span><span class="strut"> </span></p> +<p id="t817" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t818" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t819" class="pln"><span class="strut"> </span></p> -<p id="t820" class="pln"> <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t821" class="pln"><span class="str"> // This is my C++ file.</span><span class="strut"> </span></p> -<p id="t822" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t823" class="pln"><span class="str"> fnames = ['DoSomething', 'DoAnotherThing', 'DoLastThing']</span><span class="strut"> </span></p> -<p id="t824" class="pln"><span class="str"> for fn in fnames:</span><span class="strut"> </span></p> -<p id="t825" class="pln"><span class="str"> cog.outl("void %s();" % fn)</span><span class="strut"> </span></p> -<p id="t826" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t827" class="pln"><span class="str"> void DoSomething();</span><span class="strut"> </span></p> -<p id="t828" class="pln"><span class="str"> void DoAnotherThing();</span><span class="strut"> </span></p> -<p id="t829" class="pln"><span class="str"> void DoLastThing();</span><span class="strut"> </span></p> -<p id="t830" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t831" class="pln"> <span class="op">}</span><span class="strut"> </span></p> +<p id="t820" class="pln"> <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t821" class="pln"><span class="str"> // This is my C++ file.</span><span class="strut"> </span></p> +<p id="t822" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t823" class="pln"><span class="str"> fnames = ['DoSomething', 'DoAnotherThing', 'DoLastThing']</span><span class="strut"> </span></p> +<p id="t824" class="pln"><span class="str"> for fn in fnames:</span><span class="strut"> </span></p> +<p id="t825" class="pln"><span class="str"> cog.outl("void %s();" % fn)</span><span class="strut"> </span></p> +<p id="t826" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t827" class="pln"><span class="str"> void DoSomething();</span><span class="strut"> </span></p> +<p id="t828" class="pln"><span class="str"> void DoAnotherThing();</span><span class="strut"> </span></p> +<p id="t829" class="pln"><span class="str"> void DoLastThing();</span><span class="strut"> </span></p> +<p id="t830" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t831" class="pln"> <span class="op">}</span><span class="strut"> </span></p> <p id="t832" class="pln"><span class="strut"> </span></p> -<p id="t833" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t834" class="stm mis"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogError</span><span class="op">,</span> <span class="nam">re</span><span class="op">.</span><span class="nam">escape</span><span class="op">(</span><span class="str">"test.cog(6): Missing '[[[end]]]' before end of file."</span><span class="op">)</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t835" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t836" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t837" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-z'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t838" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test.out'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t833" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t834" class="stm run hide_run"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogError</span><span class="op">,</span> <span class="nam">re</span><span class="op">.</span><span class="nam">escape</span><span class="op">(</span><span class="str">"test.cog(6): Missing '[[[end]]]' before end of file."</span><span class="op">)</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t835" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t836" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t837" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-z'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t838" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test.out'</span><span class="op">)</span><span class="strut"> </span></p> <p id="t839" class="pln"><span class="strut"> </span></p> -<p id="t840" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testBadDashD</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t841" class="stm mis"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogUsageError</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t842" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-Dfooey'</span><span class="op">,</span> <span class="str">'cog.txt'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t843" class="stm mis"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogUsageError</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t844" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-D'</span><span class="op">,</span> <span class="str">'fooey'</span><span class="op">,</span> <span class="str">'cog.txt'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t840" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testBadDashD</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t841" class="stm run hide_run"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogUsageError</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t842" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-Dfooey'</span><span class="op">,</span> <span class="str">'cog.txt'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t843" class="stm run hide_run"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogUsageError</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t844" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-D'</span><span class="op">,</span> <span class="str">'fooey'</span><span class="op">,</span> <span class="str">'cog.txt'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> <p id="t845" class="pln"><span class="strut"> </span></p> -<p id="t846" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testBadMarkers</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t847" class="stm mis"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogUsageError</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t848" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'--markers=X'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t849" class="stm mis"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogUsageError</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t850" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'--markers=A B C D'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t846" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testBadMarkers</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t847" class="stm run hide_run"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogUsageError</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t848" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'--markers=X'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t849" class="stm run hide_run"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogUsageError</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t850" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'--markers=A B C D'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> <p id="t851" class="pln"><span class="strut"> </span></p> <p id="t852" class="pln"><span class="strut"> </span></p> <p id="t853" class="stm run hide_run"><span class="key">class</span> <span class="nam">TestFileHandling</span><span class="op">(</span><span class="nam">TestCaseWithTempDir</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> <p id="t854" class="pln"><span class="strut"> </span></p> -<p id="t855" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testSimple</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t856" class="stm mis"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t857" class="pln"> <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t858" class="pln"><span class="str"> // This is my C++ file.</span><span class="strut"> </span></p> -<p id="t859" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t860" class="pln"><span class="str"> fnames = ['DoSomething', 'DoAnotherThing', 'DoLastThing']</span><span class="strut"> </span></p> -<p id="t861" class="pln"><span class="str"> for fn in fnames:</span><span class="strut"> </span></p> -<p id="t862" class="pln"><span class="str"> cog.outl("void %s();" % fn)</span><span class="strut"> </span></p> -<p id="t863" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t864" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t865" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t855" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testSimple</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t856" class="stm run hide_run"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t857" class="pln"> <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t858" class="pln"><span class="str"> // This is my C++ file.</span><span class="strut"> </span></p> +<p id="t859" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t860" class="pln"><span class="str"> fnames = ['DoSomething', 'DoAnotherThing', 'DoLastThing']</span><span class="strut"> </span></p> +<p id="t861" class="pln"><span class="str"> for fn in fnames:</span><span class="strut"> </span></p> +<p id="t862" class="pln"><span class="str"> cog.outl("void %s();" % fn)</span><span class="strut"> </span></p> +<p id="t863" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t864" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t865" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t866" class="pln"><span class="strut"> </span></p> -<p id="t867" class="pln"> <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t868" class="pln"><span class="str"> // This is my C++ file.</span><span class="strut"> </span></p> -<p id="t869" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t870" class="pln"><span class="str"> fnames = ['DoSomething', 'DoAnotherThing', 'DoLastThing']</span><span class="strut"> </span></p> -<p id="t871" class="pln"><span class="str"> for fn in fnames:</span><span class="strut"> </span></p> -<p id="t872" class="pln"><span class="str"> cog.outl("void %s();" % fn)</span><span class="strut"> </span></p> -<p id="t873" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t874" class="pln"><span class="str"> void DoSomething();</span><span class="strut"> </span></p> -<p id="t875" class="pln"><span class="str"> void DoAnotherThing();</span><span class="strut"> </span></p> -<p id="t876" class="pln"><span class="str"> void DoLastThing();</span><span class="strut"> </span></p> -<p id="t877" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t878" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t879" class="pln"> <span class="op">}</span><span class="strut"> </span></p> +<p id="t867" class="pln"> <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t868" class="pln"><span class="str"> // This is my C++ file.</span><span class="strut"> </span></p> +<p id="t869" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t870" class="pln"><span class="str"> fnames = ['DoSomething', 'DoAnotherThing', 'DoLastThing']</span><span class="strut"> </span></p> +<p id="t871" class="pln"><span class="str"> for fn in fnames:</span><span class="strut"> </span></p> +<p id="t872" class="pln"><span class="str"> cog.outl("void %s();" % fn)</span><span class="strut"> </span></p> +<p id="t873" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t874" class="pln"><span class="str"> void DoSomething();</span><span class="strut"> </span></p> +<p id="t875" class="pln"><span class="str"> void DoAnotherThing();</span><span class="strut"> </span></p> +<p id="t876" class="pln"><span class="str"> void DoLastThing();</span><span class="strut"> </span></p> +<p id="t877" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t878" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t879" class="pln"> <span class="op">}</span><span class="strut"> </span></p> <p id="t880" class="pln"><span class="strut"> </span></p> -<p id="t881" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t882" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t883" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test.out'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t884" class="stm mis"> <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t885" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertIn</span><span class="op">(</span><span class="str">"(changed)"</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t881" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t882" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t883" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test.out'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t884" class="stm run hide_run"> <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t885" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertIn</span><span class="op">(</span><span class="str">"(changed)"</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut"> </span></p> <p id="t886" class="pln"><span class="strut"> </span></p> -<p id="t887" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testOutputFile</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t888" class="pln"> <span class="com"># -o sets the output file.</span><span class="strut"> </span></p> -<p id="t889" class="stm mis"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t890" class="pln"> <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t891" class="pln"><span class="str"> // This is my C++ file.</span><span class="strut"> </span></p> -<p id="t892" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t893" class="pln"><span class="str"> fnames = ['DoSomething', 'DoAnotherThing', 'DoLastThing']</span><span class="strut"> </span></p> -<p id="t894" class="pln"><span class="str"> for fn in fnames:</span><span class="strut"> </span></p> -<p id="t895" class="pln"><span class="str"> cog.outl("void %s();" % fn)</span><span class="strut"> </span></p> -<p id="t896" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t897" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t898" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t887" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testOutputFile</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t888" class="pln"> <span class="com"># -o sets the output file.</span><span class="strut"> </span></p> +<p id="t889" class="stm run hide_run"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t890" class="pln"> <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t891" class="pln"><span class="str"> // This is my C++ file.</span><span class="strut"> </span></p> +<p id="t892" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t893" class="pln"><span class="str"> fnames = ['DoSomething', 'DoAnotherThing', 'DoLastThing']</span><span class="strut"> </span></p> +<p id="t894" class="pln"><span class="str"> for fn in fnames:</span><span class="strut"> </span></p> +<p id="t895" class="pln"><span class="str"> cog.outl("void %s();" % fn)</span><span class="strut"> </span></p> +<p id="t896" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t897" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t898" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t899" class="pln"><span class="strut"> </span></p> -<p id="t900" class="pln"> <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t901" class="pln"><span class="str"> // This is my C++ file.</span><span class="strut"> </span></p> -<p id="t902" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t903" class="pln"><span class="str"> fnames = ['DoSomething', 'DoAnotherThing', 'DoLastThing']</span><span class="strut"> </span></p> -<p id="t904" class="pln"><span class="str"> for fn in fnames:</span><span class="strut"> </span></p> -<p id="t905" class="pln"><span class="str"> cog.outl("void %s();" % fn)</span><span class="strut"> </span></p> -<p id="t906" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t907" class="pln"><span class="str"> void DoSomething();</span><span class="strut"> </span></p> -<p id="t908" class="pln"><span class="str"> void DoAnotherThing();</span><span class="strut"> </span></p> -<p id="t909" class="pln"><span class="str"> void DoLastThing();</span><span class="strut"> </span></p> -<p id="t910" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t911" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t912" class="pln"> <span class="op">}</span><span class="strut"> </span></p> +<p id="t900" class="pln"> <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t901" class="pln"><span class="str"> // This is my C++ file.</span><span class="strut"> </span></p> +<p id="t902" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t903" class="pln"><span class="str"> fnames = ['DoSomething', 'DoAnotherThing', 'DoLastThing']</span><span class="strut"> </span></p> +<p id="t904" class="pln"><span class="str"> for fn in fnames:</span><span class="strut"> </span></p> +<p id="t905" class="pln"><span class="str"> cog.outl("void %s();" % fn)</span><span class="strut"> </span></p> +<p id="t906" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t907" class="pln"><span class="str"> void DoSomething();</span><span class="strut"> </span></p> +<p id="t908" class="pln"><span class="str"> void DoAnotherThing();</span><span class="strut"> </span></p> +<p id="t909" class="pln"><span class="str"> void DoLastThing();</span><span class="strut"> </span></p> +<p id="t910" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t911" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t912" class="pln"> <span class="op">}</span><span class="strut"> </span></p> <p id="t913" class="pln"><span class="strut"> </span></p> -<p id="t914" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t915" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-o'</span><span class="op">,</span> <span class="str">'test.cogged'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t916" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cogged'</span><span class="op">,</span> <span class="str">'test.out'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t914" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t915" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-o'</span><span class="op">,</span> <span class="str">'in/a/dir/test.cogged'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t916" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'in/a/dir/test.cogged'</span><span class="op">,</span> <span class="str">'test.out'</span><span class="op">)</span><span class="strut"> </span></p> <p id="t917" class="pln"><span class="strut"> </span></p> -<p id="t918" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testAtFile</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t919" class="stm mis"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t920" class="pln"> <span class="str">'one.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t921" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t922" class="pln"><span class="str"> cog.outl("hello world")</span><span class="strut"> </span></p> -<p id="t923" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t924" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t925" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t918" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testAtFile</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t919" class="stm run hide_run"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t920" class="pln"> <span class="str">'one.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t921" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t922" class="pln"><span class="str"> cog.outl("hello world")</span><span class="strut"> </span></p> +<p id="t923" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t924" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t925" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t926" class="pln"><span class="strut"> </span></p> -<p id="t927" class="pln"> <span class="str">'one.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t928" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t929" class="pln"><span class="str"> cog.outl("hello world")</span><span class="strut"> </span></p> -<p id="t930" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t931" class="pln"><span class="str"> hello world</span><span class="strut"> </span></p> -<p id="t932" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t933" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t927" class="pln"> <span class="str">'one.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t928" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t929" class="pln"><span class="str"> cog.outl("hello world")</span><span class="strut"> </span></p> +<p id="t930" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t931" class="pln"><span class="str"> hello world</span><span class="strut"> </span></p> +<p id="t932" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t933" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t934" class="pln"><span class="strut"> </span></p> -<p id="t935" class="pln"> <span class="str">'two.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t936" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t937" class="pln"><span class="str"> cog.outl("goodbye cruel world")</span><span class="strut"> </span></p> -<p id="t938" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t939" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t940" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t935" class="pln"> <span class="str">'two.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t936" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t937" class="pln"><span class="str"> cog.outl("goodbye cruel world")</span><span class="strut"> </span></p> +<p id="t938" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t939" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t940" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t941" class="pln"><span class="strut"> </span></p> -<p id="t942" class="pln"> <span class="str">'two.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t943" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t944" class="pln"><span class="str"> cog.outl("goodbye cruel world")</span><span class="strut"> </span></p> -<p id="t945" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t946" class="pln"><span class="str"> goodbye cruel world</span><span class="strut"> </span></p> -<p id="t947" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t948" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t942" class="pln"> <span class="str">'two.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t943" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t944" class="pln"><span class="str"> cog.outl("goodbye cruel world")</span><span class="strut"> </span></p> +<p id="t945" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t946" class="pln"><span class="str"> goodbye cruel world</span><span class="strut"> </span></p> +<p id="t947" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t948" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t949" class="pln"><span class="strut"> </span></p> -<p id="t950" class="pln"> <span class="str">'cogfiles.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t951" class="pln"><span class="str"> # Please run cog</span><span class="strut"> </span></p> -<p id="t952" class="pln"><span class="str"> one.cog</span><span class="strut"> </span></p> +<p id="t950" class="pln"> <span class="str">'cogfiles.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t951" class="pln"><span class="str"> # Please run cog</span><span class="strut"> </span></p> +<p id="t952" class="pln"><span class="str"> one.cog</span><span class="strut"> </span></p> <p id="t953" class="pln"><span class="strut"> </span></p> -<p id="t954" class="pln"><span class="str"> two.cog</span><span class="strut"> </span></p> -<p id="t955" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t956" class="pln"> <span class="op">}</span><span class="strut"> </span></p> +<p id="t954" class="pln"><span class="str"> two.cog</span><span class="strut"> </span></p> +<p id="t955" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t956" class="pln"> <span class="op">}</span><span class="strut"> </span></p> <p id="t957" class="pln"><span class="strut"> </span></p> -<p id="t958" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t959" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'@cogfiles.txt'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t960" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'one.cog'</span><span class="op">,</span> <span class="str">'one.out'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t961" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'two.cog'</span><span class="op">,</span> <span class="str">'two.out'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t962" class="stm mis"> <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t963" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertIn</span><span class="op">(</span><span class="str">"(changed)"</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t958" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t959" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'@cogfiles.txt'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t960" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'one.cog'</span><span class="op">,</span> <span class="str">'one.out'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t961" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'two.cog'</span><span class="op">,</span> <span class="str">'two.out'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t962" class="stm run hide_run"> <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t963" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertIn</span><span class="op">(</span><span class="str">"(changed)"</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut"> </span></p> <p id="t964" class="pln"><span class="strut"> </span></p> -<p id="t965" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testNestedAtFile</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t966" class="stm mis"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t967" class="pln"> <span class="str">'one.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t968" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t969" class="pln"><span class="str"> cog.outl("hello world")</span><span class="strut"> </span></p> -<p id="t970" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t971" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t972" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t965" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testNestedAtFile</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t966" class="stm run hide_run"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t967" class="pln"> <span class="str">'one.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t968" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t969" class="pln"><span class="str"> cog.outl("hello world")</span><span class="strut"> </span></p> +<p id="t970" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t971" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t972" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t973" class="pln"><span class="strut"> </span></p> -<p id="t974" class="pln"> <span class="str">'one.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t975" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t976" class="pln"><span class="str"> cog.outl("hello world")</span><span class="strut"> </span></p> -<p id="t977" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t978" class="pln"><span class="str"> hello world</span><span class="strut"> </span></p> -<p id="t979" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t980" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t974" class="pln"> <span class="str">'one.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t975" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t976" class="pln"><span class="str"> cog.outl("hello world")</span><span class="strut"> </span></p> +<p id="t977" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t978" class="pln"><span class="str"> hello world</span><span class="strut"> </span></p> +<p id="t979" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t980" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t981" class="pln"><span class="strut"> </span></p> -<p id="t982" class="pln"> <span class="str">'two.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t983" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t984" class="pln"><span class="str"> cog.outl("goodbye cruel world")</span><span class="strut"> </span></p> -<p id="t985" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t986" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t987" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t982" class="pln"> <span class="str">'two.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t983" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t984" class="pln"><span class="str"> cog.outl("goodbye cruel world")</span><span class="strut"> </span></p> +<p id="t985" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t986" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t987" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t988" class="pln"><span class="strut"> </span></p> -<p id="t989" class="pln"> <span class="str">'two.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t990" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t991" class="pln"><span class="str"> cog.outl("goodbye cruel world")</span><span class="strut"> </span></p> -<p id="t992" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t993" class="pln"><span class="str"> goodbye cruel world</span><span class="strut"> </span></p> -<p id="t994" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t995" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t989" class="pln"> <span class="str">'two.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t990" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t991" class="pln"><span class="str"> cog.outl("goodbye cruel world")</span><span class="strut"> </span></p> +<p id="t992" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t993" class="pln"><span class="str"> goodbye cruel world</span><span class="strut"> </span></p> +<p id="t994" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t995" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t996" class="pln"><span class="strut"> </span></p> -<p id="t997" class="pln"> <span class="str">'cogfiles.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t998" class="pln"><span class="str"> # Please run cog</span><span class="strut"> </span></p> -<p id="t999" class="pln"><span class="str"> one.cog</span><span class="strut"> </span></p> -<p id="t1000" class="pln"><span class="str"> @cogfiles2.txt</span><span class="strut"> </span></p> -<p id="t1001" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t997" class="pln"> <span class="str">'cogfiles.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t998" class="pln"><span class="str"> # Please run cog</span><span class="strut"> </span></p> +<p id="t999" class="pln"><span class="str"> one.cog</span><span class="strut"> </span></p> +<p id="t1000" class="pln"><span class="str"> @cogfiles2.txt</span><span class="strut"> </span></p> +<p id="t1001" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t1002" class="pln"><span class="strut"> </span></p> -<p id="t1003" class="pln"> <span class="str">'cogfiles2.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1004" class="pln"><span class="str"> # This one too, please.</span><span class="strut"> </span></p> -<p id="t1005" class="pln"><span class="str"> two.cog</span><span class="strut"> </span></p> -<p id="t1006" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t1007" class="pln"> <span class="op">}</span><span class="strut"> </span></p> +<p id="t1003" class="pln"> <span class="str">'cogfiles2.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1004" class="pln"><span class="str"> # This one too, please.</span><span class="strut"> </span></p> +<p id="t1005" class="pln"><span class="str"> two.cog</span><span class="strut"> </span></p> +<p id="t1006" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1007" class="pln"> <span class="op">}</span><span class="strut"> </span></p> <p id="t1008" class="pln"><span class="strut"> </span></p> -<p id="t1009" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1010" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'@cogfiles.txt'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1011" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'one.cog'</span><span class="op">,</span> <span class="str">'one.out'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1012" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'two.cog'</span><span class="op">,</span> <span class="str">'two.out'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1013" class="stm mis"> <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1014" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertIn</span><span class="op">(</span><span class="str">"(changed)"</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1009" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1010" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'@cogfiles.txt'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1011" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'one.cog'</span><span class="op">,</span> <span class="str">'one.out'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1012" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'two.cog'</span><span class="op">,</span> <span class="str">'two.out'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1013" class="stm run hide_run"> <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1014" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertIn</span><span class="op">(</span><span class="str">"(changed)"</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut"> </span></p> <p id="t1015" class="pln"><span class="strut"> </span></p> -<p id="t1016" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testAtFileWithArgs</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1017" class="stm mis"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t1018" class="pln"> <span class="str">'both.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1019" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t1020" class="pln"><span class="str"> cog.outl("one: %s" % ('one' in globals()))</span><span class="strut"> </span></p> -<p id="t1021" class="pln"><span class="str"> cog.outl("two: %s" % ('two' in globals()))</span><span class="strut"> </span></p> -<p id="t1022" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t1023" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t1024" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1016" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testAtFileWithArgs</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1017" class="stm run hide_run"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t1018" class="pln"> <span class="str">'both.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1019" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t1020" class="pln"><span class="str"> cog.outl("one: %s" % ('one' in globals()))</span><span class="strut"> </span></p> +<p id="t1021" class="pln"><span class="str"> cog.outl("two: %s" % ('two' in globals()))</span><span class="strut"> </span></p> +<p id="t1022" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t1023" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t1024" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t1025" class="pln"><span class="strut"> </span></p> -<p id="t1026" class="pln"> <span class="str">'one.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1027" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t1028" class="pln"><span class="str"> cog.outl("one: %s" % ('one' in globals()))</span><span class="strut"> </span></p> -<p id="t1029" class="pln"><span class="str"> cog.outl("two: %s" % ('two' in globals()))</span><span class="strut"> </span></p> -<p id="t1030" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t1031" class="pln"><span class="str"> one: True // ONE</span><span class="strut"> </span></p> -<p id="t1032" class="pln"><span class="str"> two: False // ONE</span><span class="strut"> </span></p> -<p id="t1033" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t1034" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1026" class="pln"> <span class="str">'one.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1027" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t1028" class="pln"><span class="str"> cog.outl("one: %s" % ('one' in globals()))</span><span class="strut"> </span></p> +<p id="t1029" class="pln"><span class="str"> cog.outl("two: %s" % ('two' in globals()))</span><span class="strut"> </span></p> +<p id="t1030" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t1031" class="pln"><span class="str"> one: True // ONE</span><span class="strut"> </span></p> +<p id="t1032" class="pln"><span class="str"> two: False // ONE</span><span class="strut"> </span></p> +<p id="t1033" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t1034" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t1035" class="pln"><span class="strut"> </span></p> -<p id="t1036" class="pln"> <span class="str">'two.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1037" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t1038" class="pln"><span class="str"> cog.outl("one: %s" % ('one' in globals()))</span><span class="strut"> </span></p> -<p id="t1039" class="pln"><span class="str"> cog.outl("two: %s" % ('two' in globals()))</span><span class="strut"> </span></p> -<p id="t1040" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t1041" class="pln"><span class="str"> one: False // TWO</span><span class="strut"> </span></p> -<p id="t1042" class="pln"><span class="str"> two: True // TWO</span><span class="strut"> </span></p> -<p id="t1043" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t1044" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1036" class="pln"> <span class="str">'two.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1037" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t1038" class="pln"><span class="str"> cog.outl("one: %s" % ('one' in globals()))</span><span class="strut"> </span></p> +<p id="t1039" class="pln"><span class="str"> cog.outl("two: %s" % ('two' in globals()))</span><span class="strut"> </span></p> +<p id="t1040" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t1041" class="pln"><span class="str"> one: False // TWO</span><span class="strut"> </span></p> +<p id="t1042" class="pln"><span class="str"> two: True // TWO</span><span class="strut"> </span></p> +<p id="t1043" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t1044" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t1045" class="pln"><span class="strut"> </span></p> -<p id="t1046" class="pln"> <span class="str">'cogfiles.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1047" class="pln"><span class="str"> # Please run cog</span><span class="strut"> </span></p> -<p id="t1048" class="pln"><span class="str"> both.cog -o both.one -s ' // ONE' -D one=x</span><span class="strut"> </span></p> -<p id="t1049" class="pln"><span class="str"> both.cog -o both.two -s ' // TWO' -D two=x</span><span class="strut"> </span></p> -<p id="t1050" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t1051" class="pln"> <span class="op">}</span><span class="strut"> </span></p> +<p id="t1046" class="pln"> <span class="str">'cogfiles.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1047" class="pln"><span class="str"> # Please run cog</span><span class="strut"> </span></p> +<p id="t1048" class="pln"><span class="str"> both.cog -o in/a/dir/both.one -s ' // ONE' -D one=x</span><span class="strut"> </span></p> +<p id="t1049" class="pln"><span class="str"> both.cog -o in/a/dir/both.two -s ' // TWO' -D two=x</span><span class="strut"> </span></p> +<p id="t1050" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t1051" class="pln"> <span class="op">}</span><span class="strut"> </span></p> <p id="t1052" class="pln"><span class="strut"> </span></p> -<p id="t1053" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1054" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'@cogfiles.txt'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1055" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'both.one'</span><span class="op">,</span> <span class="str">'one.out'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1056" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'both.two'</span><span class="op">,</span> <span class="str">'two.out'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1053" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1054" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'@cogfiles.txt'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1055" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'in/a/dir/both.one'</span><span class="op">,</span> <span class="str">'one.out'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1056" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'in/a/dir/both.two'</span><span class="op">,</span> <span class="str">'two.out'</span><span class="op">)</span><span class="strut"> </span></p> <p id="t1057" class="pln"><span class="strut"> </span></p> -<p id="t1058" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testAtFileWithBadArgCombo</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1059" class="stm mis"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t1060" class="pln"> <span class="str">'both.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1061" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t1062" class="pln"><span class="str"> cog.outl("one: %s" % ('one' in globals()))</span><span class="strut"> </span></p> -<p id="t1063" class="pln"><span class="str"> cog.outl("two: %s" % ('two' in globals()))</span><span class="strut"> </span></p> -<p id="t1064" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t1065" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t1066" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1058" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testAtFileWithBadArgCombo</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1059" class="stm run hide_run"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t1060" class="pln"> <span class="str">'both.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1061" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t1062" class="pln"><span class="str"> cog.outl("one: %s" % ('one' in globals()))</span><span class="strut"> </span></p> +<p id="t1063" class="pln"><span class="str"> cog.outl("two: %s" % ('two' in globals()))</span><span class="strut"> </span></p> +<p id="t1064" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t1065" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t1066" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t1067" class="pln"><span class="strut"> </span></p> -<p id="t1068" class="pln"> <span class="str">'cogfiles.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1069" class="pln"><span class="str"> # Please run cog</span><span class="strut"> </span></p> -<p id="t1070" class="pln"><span class="str"> both.cog</span><span class="strut"> </span></p> -<p id="t1071" class="pln"><span class="str"> both.cog -d # This is bad: -r and -d</span><span class="strut"> </span></p> -<p id="t1072" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t1073" class="pln"> <span class="op">}</span><span class="strut"> </span></p> +<p id="t1068" class="pln"> <span class="str">'cogfiles.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1069" class="pln"><span class="str"> # Please run cog</span><span class="strut"> </span></p> +<p id="t1070" class="pln"><span class="str"> both.cog</span><span class="strut"> </span></p> +<p id="t1071" class="pln"><span class="str"> both.cog -d # This is bad: -r and -d</span><span class="strut"> </span></p> +<p id="t1072" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t1073" class="pln"> <span class="op">}</span><span class="strut"> </span></p> <p id="t1074" class="pln"><span class="strut"> </span></p> -<p id="t1075" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1076" class="stm mis"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogUsageError</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1077" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'@cogfiles.txt'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1075" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1076" class="stm run hide_run"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogUsageError</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1077" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'@cogfiles.txt'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> <p id="t1078" class="pln"><span class="strut"> </span></p> -<p id="t1079" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testAtFileWithTrickyFilenames</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1080" class="stm mis"> <span class="key">def</span> <span class="nam">fix_backslashes</span><span class="op">(</span><span class="nam">files_txt</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1081" class="pln"> <span class="str">"""Make the contents of a files.txt sensitive to the platform."""</span><span class="strut"> </span></p> -<p id="t1082" class="stm mis"> <span class="key">if</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">platform</span> <span class="op">!=</span> <span class="str">"win32"</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1083" class="stm mis"> <span class="nam">files_txt</span> <span class="op">=</span> <span class="nam">files_txt</span><span class="op">.</span><span class="nam">replace</span><span class="op">(</span><span class="str">"\\"</span><span class="op">,</span> <span class="str">"/"</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1084" class="stm mis"> <span class="key">return</span> <span class="nam">files_txt</span><span class="strut"> </span></p> +<p id="t1079" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testAtFileWithTrickyFilenames</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1080" class="stm run hide_run"> <span class="key">def</span> <span class="nam">fix_backslashes</span><span class="op">(</span><span class="nam">files_txt</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1081" class="pln"> <span class="str">"""Make the contents of a files.txt sensitive to the platform."""</span><span class="strut"> </span></p> +<p id="t1082" class="stm par run hide_run"><span class="annotate short">1082 ↛ 1084</span><span class="annotate long">line 1082 didn't jump to line 1084, because the condition on line 1082 was never false</span> <span class="key">if</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">platform</span> <span class="op">!=</span> <span class="str">"win32"</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1083" class="stm run hide_run"> <span class="nam">files_txt</span> <span class="op">=</span> <span class="nam">files_txt</span><span class="op">.</span><span class="nam">replace</span><span class="op">(</span><span class="str">"\\"</span><span class="op">,</span> <span class="str">"/"</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1084" class="stm run hide_run"> <span class="key">return</span> <span class="nam">files_txt</span><span class="strut"> </span></p> <p id="t1085" class="pln"><span class="strut"> </span></p> -<p id="t1086" class="stm mis"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t1087" class="pln"> <span class="str">'one 1.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1088" class="pln"><span class="str"> //[[[cog cog.outl("hello world") ]]]</span><span class="strut"> </span></p> -<p id="t1089" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1086" class="stm run hide_run"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t1087" class="pln"> <span class="str">'one 1.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1088" class="pln"><span class="str"> //[[[cog cog.outl("hello world") ]]]</span><span class="strut"> </span></p> +<p id="t1089" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t1090" class="pln"><span class="strut"> </span></p> -<p id="t1091" class="pln"> <span class="str">'one.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1092" class="pln"><span class="str"> //[[[cog cog.outl("hello world") ]]]</span><span class="strut"> </span></p> -<p id="t1093" class="pln"><span class="str"> hello world //xxx</span><span class="strut"> </span></p> -<p id="t1094" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1091" class="pln"> <span class="str">'one.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1092" class="pln"><span class="str"> //[[[cog cog.outl("hello world") ]]]</span><span class="strut"> </span></p> +<p id="t1093" class="pln"><span class="str"> hello world //xxx</span><span class="strut"> </span></p> +<p id="t1094" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t1095" class="pln"><span class="strut"> </span></p> -<p id="t1096" class="pln"> <span class="str">'subdir'</span><span class="op">:</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t1097" class="pln"> <span class="str">'subback.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1098" class="pln"><span class="str"> //[[[cog cog.outl("down deep with backslashes") ]]]</span><span class="strut"> </span></p> -<p id="t1099" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1096" class="pln"> <span class="str">'subdir'</span><span class="op">:</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t1097" class="pln"> <span class="str">'subback.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1098" class="pln"><span class="str"> //[[[cog cog.outl("down deep with backslashes") ]]]</span><span class="strut"> </span></p> +<p id="t1099" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t1100" class="pln"><span class="strut"> </span></p> -<p id="t1101" class="pln"> <span class="str">'subfwd.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1102" class="pln"><span class="str"> //[[[cog cog.outl("down deep with slashes") ]]]</span><span class="strut"> </span></p> -<p id="t1103" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t1104" class="pln"> <span class="op">}</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1101" class="pln"> <span class="str">'subfwd.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1102" class="pln"><span class="str"> //[[[cog cog.outl("down deep with slashes") ]]]</span><span class="strut"> </span></p> +<p id="t1103" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1104" class="pln"> <span class="op">}</span><span class="op">,</span><span class="strut"> </span></p> <p id="t1105" class="pln"><span class="strut"> </span></p> -<p id="t1106" class="pln"> <span class="str">'subback.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1107" class="pln"><span class="str"> //[[[cog cog.outl("down deep with backslashes") ]]]</span><span class="strut"> </span></p> -<p id="t1108" class="pln"><span class="str"> down deep with backslashes //yyy</span><span class="strut"> </span></p> -<p id="t1109" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1106" class="pln"> <span class="str">'subback.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1107" class="pln"><span class="str"> //[[[cog cog.outl("down deep with backslashes") ]]]</span><span class="strut"> </span></p> +<p id="t1108" class="pln"><span class="str"> down deep with backslashes //yyy</span><span class="strut"> </span></p> +<p id="t1109" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t1110" class="pln"><span class="strut"> </span></p> -<p id="t1111" class="pln"> <span class="str">'subfwd.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1112" class="pln"><span class="str"> //[[[cog cog.outl("down deep with slashes") ]]]</span><span class="strut"> </span></p> -<p id="t1113" class="pln"><span class="str"> down deep with slashes //zzz</span><span class="strut"> </span></p> -<p id="t1114" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1111" class="pln"> <span class="str">'subfwd.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1112" class="pln"><span class="str"> //[[[cog cog.outl("down deep with slashes") ]]]</span><span class="strut"> </span></p> +<p id="t1113" class="pln"><span class="str"> down deep with slashes //zzz</span><span class="strut"> </span></p> +<p id="t1114" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t1115" class="pln"><span class="strut"> </span></p> -<p id="t1116" class="pln"> <span class="str">'cogfiles.txt'</span><span class="op">:</span> <span class="nam">fix_backslashes</span><span class="op">(</span><span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1117" class="pln"><span class="str"> # Please run cog</span><span class="strut"> </span></p> -<p id="t1118" class="pln"><span class="str"> 'one 1.cog' -s ' //xxx'</span><span class="strut"> </span></p> -<p id="t1119" class="pln"><span class="str"> subdir\\subback.cog -s ' //yyy'</span><span class="strut"> </span></p> -<p id="t1120" class="pln"><span class="str"> subdir/subfwd.cog -s ' //zzz'</span><span class="strut"> </span></p> -<p id="t1121" class="pln"><span class="str"> """</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1122" class="pln"> <span class="op">}</span><span class="strut"> </span></p> +<p id="t1116" class="pln"> <span class="str">'cogfiles.txt'</span><span class="op">:</span> <span class="nam">fix_backslashes</span><span class="op">(</span><span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1117" class="pln"><span class="str"> # Please run cog</span><span class="strut"> </span></p> +<p id="t1118" class="pln"><span class="str"> 'one 1.cog' -s ' //xxx'</span><span class="strut"> </span></p> +<p id="t1119" class="pln"><span class="str"> subdir\\subback.cog -s ' //yyy'</span><span class="strut"> </span></p> +<p id="t1120" class="pln"><span class="str"> subdir/subfwd.cog -s ' //zzz'</span><span class="strut"> </span></p> +<p id="t1121" class="pln"><span class="str"> """</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1122" class="pln"> <span class="op">}</span><span class="strut"> </span></p> <p id="t1123" class="pln"><span class="strut"> </span></p> -<p id="t1124" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1125" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-z'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'@cogfiles.txt'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1126" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'one 1.cog'</span><span class="op">,</span> <span class="str">'one.out'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1127" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'subdir/subback.cog'</span><span class="op">,</span> <span class="str">'subback.out'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1128" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'subdir/subfwd.cog'</span><span class="op">,</span> <span class="str">'subfwd.out'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1124" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1125" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-z'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'@cogfiles.txt'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1126" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'one 1.cog'</span><span class="op">,</span> <span class="str">'one.out'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1127" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'subdir/subback.cog'</span><span class="op">,</span> <span class="str">'subback.out'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1128" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'subdir/subfwd.cog'</span><span class="op">,</span> <span class="str">'subfwd.out'</span><span class="op">)</span><span class="strut"> </span></p> <p id="t1129" class="pln"><span class="strut"> </span></p> -<p id="t1130" class="stm run hide_run"> <span class="key">def</span> <span class="nam">run_with_verbosity</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">verbosity</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1131" class="stm mis"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t1132" class="pln"> <span class="str">'unchanged.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1133" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t1134" class="pln"><span class="str"> cog.outl("hello world")</span><span class="strut"> </span></p> -<p id="t1135" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t1136" class="pln"><span class="str"> hello world</span><span class="strut"> </span></p> -<p id="t1137" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t1138" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1130" class="stm run hide_run"> <span class="key">def</span> <span class="nam">run_with_verbosity</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">verbosity</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1131" class="stm run hide_run"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t1132" class="pln"> <span class="str">'unchanged.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1133" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t1134" class="pln"><span class="str"> cog.outl("hello world")</span><span class="strut"> </span></p> +<p id="t1135" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t1136" class="pln"><span class="str"> hello world</span><span class="strut"> </span></p> +<p id="t1137" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t1138" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t1139" class="pln"><span class="strut"> </span></p> -<p id="t1140" class="pln"> <span class="str">'changed.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1141" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t1142" class="pln"><span class="str"> cog.outl("goodbye cruel world")</span><span class="strut"> </span></p> -<p id="t1143" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t1144" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t1145" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1140" class="pln"> <span class="str">'changed.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1141" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t1142" class="pln"><span class="str"> cog.outl("goodbye cruel world")</span><span class="strut"> </span></p> +<p id="t1143" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t1144" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t1145" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t1146" class="pln"><span class="strut"> </span></p> -<p id="t1147" class="pln"> <span class="str">'cogfiles.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1148" class="pln"><span class="str"> unchanged.cog</span><span class="strut"> </span></p> -<p id="t1149" class="pln"><span class="str"> changed.cog</span><span class="strut"> </span></p> -<p id="t1150" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t1151" class="pln"> <span class="op">}</span><span class="strut"> </span></p> +<p id="t1147" class="pln"> <span class="str">'cogfiles.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1148" class="pln"><span class="str"> unchanged.cog</span><span class="strut"> </span></p> +<p id="t1149" class="pln"><span class="str"> changed.cog</span><span class="strut"> </span></p> +<p id="t1150" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t1151" class="pln"> <span class="op">}</span><span class="strut"> </span></p> <p id="t1152" class="pln"><span class="strut"> </span></p> -<p id="t1153" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1154" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'--verbosity='</span><span class="op">+</span><span class="nam">verbosity</span><span class="op">,</span> <span class="str">'@cogfiles.txt'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1155" class="stm mis"> <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1156" class="stm mis"> <span class="key">return</span> <span class="nam">output</span><span class="strut"> </span></p> +<p id="t1153" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1154" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'--verbosity='</span><span class="op">+</span><span class="nam">verbosity</span><span class="op">,</span> <span class="str">'@cogfiles.txt'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1155" class="stm run hide_run"> <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1156" class="stm run hide_run"> <span class="key">return</span> <span class="nam">output</span><span class="strut"> </span></p> <p id="t1157" class="pln"><span class="strut"> </span></p> -<p id="t1158" class="stm run hide_run"> <span class="key">def</span> <span class="nam">test_verbosity0</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1159" class="stm mis"> <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">run_with_verbosity</span><span class="op">(</span><span class="str">"0"</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1160" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">output</span><span class="op">,</span> <span class="str">""</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1158" class="stm run hide_run"> <span class="key">def</span> <span class="nam">test_verbosity0</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1159" class="stm run hide_run"> <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">run_with_verbosity</span><span class="op">(</span><span class="str">"0"</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1160" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">output</span><span class="op">,</span> <span class="str">""</span><span class="op">)</span><span class="strut"> </span></p> <p id="t1161" class="pln"><span class="strut"> </span></p> -<p id="t1162" class="stm run hide_run"> <span class="key">def</span> <span class="nam">test_verbosity1</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1163" class="stm mis"> <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">run_with_verbosity</span><span class="op">(</span><span class="str">"1"</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1164" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">output</span><span class="op">,</span> <span class="str">"Cogging changed.cog (changed)\n"</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1162" class="stm run hide_run"> <span class="key">def</span> <span class="nam">test_verbosity1</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1163" class="stm run hide_run"> <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">run_with_verbosity</span><span class="op">(</span><span class="str">"1"</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1164" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">output</span><span class="op">,</span> <span class="str">"Cogging changed.cog (changed)\n"</span><span class="op">)</span><span class="strut"> </span></p> <p id="t1165" class="pln"><span class="strut"> </span></p> -<p id="t1166" class="stm run hide_run"> <span class="key">def</span> <span class="nam">test_verbosity2</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1167" class="stm mis"> <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">run_with_verbosity</span><span class="op">(</span><span class="str">"2"</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1168" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">output</span><span class="op">,</span> <span class="str">"Cogging unchanged.cog\nCogging changed.cog (changed)\n"</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1166" class="stm run hide_run"> <span class="key">def</span> <span class="nam">test_verbosity2</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1167" class="stm run hide_run"> <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">run_with_verbosity</span><span class="op">(</span><span class="str">"2"</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1168" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">output</span><span class="op">,</span> <span class="str">"Cogging unchanged.cog\nCogging changed.cog (changed)\n"</span><span class="op">)</span><span class="strut"> </span></p> <p id="t1169" class="pln"><span class="strut"> </span></p> <p id="t1170" class="pln"><span class="strut"> </span></p> <p id="t1171" class="stm run hide_run"><span class="key">class</span> <span class="nam">CogTestLineEndings</span><span class="op">(</span><span class="nam">TestCaseWithTempDir</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1172" class="pln"> <span class="str">"""Tests for -U option (force LF line-endings in output)."""</span><span class="strut"> </span></p> +<p id="t1172" class="pln"> <span class="str">"""Tests for -U option (force LF line-endings in output)."""</span><span class="strut"> </span></p> <p id="t1173" class="pln"><span class="strut"> </span></p> -<p id="t1174" class="stm run hide_run"> <span class="nam">lines_in</span> <span class="op">=</span> <span class="op">[</span><span class="str">'Some text.'</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t1175" class="pln"> <span class="str">'//[[[cog'</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t1176" class="pln"> <span class="str">'cog.outl("Cog text")'</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t1177" class="pln"> <span class="str">'//]]]'</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t1178" class="pln"> <span class="str">'gobbledegook.'</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t1179" class="pln"> <span class="str">'//[[[end]]]'</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t1180" class="pln"> <span class="str">'epilogue.'</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t1181" class="pln"> <span class="str">''</span><span class="op">]</span><span class="strut"> </span></p> +<p id="t1174" class="stm run hide_run"> <span class="nam">lines_in</span> <span class="op">=</span> <span class="op">[</span><span class="str">'Some text.'</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1175" class="pln"> <span class="str">'//[[[cog'</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1176" class="pln"> <span class="str">'cog.outl("Cog text")'</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1177" class="pln"> <span class="str">'//]]]'</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1178" class="pln"> <span class="str">'gobbledegook.'</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1179" class="pln"> <span class="str">'//[[[end]]]'</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1180" class="pln"> <span class="str">'epilogue.'</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1181" class="pln"> <span class="str">''</span><span class="op">]</span><span class="strut"> </span></p> <p id="t1182" class="pln"><span class="strut"> </span></p> -<p id="t1183" class="stm run hide_run"> <span class="nam">lines_out</span> <span class="op">=</span> <span class="op">[</span><span class="str">'Some text.'</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t1184" class="pln"> <span class="str">'//[[[cog'</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t1185" class="pln"> <span class="str">'cog.outl("Cog text")'</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t1186" class="pln"> <span class="str">'//]]]'</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t1187" class="pln"> <span class="str">'Cog text'</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t1188" class="pln"> <span class="str">'//[[[end]]]'</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t1189" class="pln"> <span class="str">'epilogue.'</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t1190" class="pln"> <span class="str">''</span><span class="op">]</span><span class="strut"> </span></p> +<p id="t1183" class="stm run hide_run"> <span class="nam">lines_out</span> <span class="op">=</span> <span class="op">[</span><span class="str">'Some text.'</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1184" class="pln"> <span class="str">'//[[[cog'</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1185" class="pln"> <span class="str">'cog.outl("Cog text")'</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1186" class="pln"> <span class="str">'//]]]'</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1187" class="pln"> <span class="str">'Cog text'</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1188" class="pln"> <span class="str">'//[[[end]]]'</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1189" class="pln"> <span class="str">'epilogue.'</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1190" class="pln"> <span class="str">''</span><span class="op">]</span><span class="strut"> </span></p> <p id="t1191" class="pln"><span class="strut"> </span></p> -<p id="t1192" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testOutputNativeEol</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1193" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="op">{</span><span class="str">'infile'</span><span class="op">:</span> <span class="str">'\n'</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">lines_in</span><span class="op">)</span><span class="op">}</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1194" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-o'</span><span class="op">,</span> <span class="str">'outfile'</span><span class="op">,</span> <span class="str">'infile'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1195" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFileContent</span><span class="op">(</span><span class="str">'outfile'</span><span class="op">,</span> <span class="nam">os</span><span class="op">.</span><span class="nam">linesep</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">lines_out</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1192" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testOutputNativeEol</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1193" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="op">{</span><span class="str">'infile'</span><span class="op">:</span> <span class="str">'\n'</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">lines_in</span><span class="op">)</span><span class="op">}</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1194" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-o'</span><span class="op">,</span> <span class="str">'outfile'</span><span class="op">,</span> <span class="str">'infile'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1195" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFileContent</span><span class="op">(</span><span class="str">'outfile'</span><span class="op">,</span> <span class="nam">os</span><span class="op">.</span><span class="nam">linesep</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">lines_out</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> <p id="t1196" class="pln"><span class="strut"> </span></p> -<p id="t1197" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testOutputLfEol</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1198" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="op">{</span><span class="str">'infile'</span><span class="op">:</span> <span class="str">'\n'</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">lines_in</span><span class="op">)</span><span class="op">}</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1199" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-U'</span><span class="op">,</span> <span class="str">'-o'</span><span class="op">,</span> <span class="str">'outfile'</span><span class="op">,</span> <span class="str">'infile'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1200" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFileContent</span><span class="op">(</span><span class="str">'outfile'</span><span class="op">,</span> <span class="str">'\n'</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">lines_out</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1197" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testOutputLfEol</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1198" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="op">{</span><span class="str">'infile'</span><span class="op">:</span> <span class="str">'\n'</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">lines_in</span><span class="op">)</span><span class="op">}</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1199" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-U'</span><span class="op">,</span> <span class="str">'-o'</span><span class="op">,</span> <span class="str">'outfile'</span><span class="op">,</span> <span class="str">'infile'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1200" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFileContent</span><span class="op">(</span><span class="str">'outfile'</span><span class="op">,</span> <span class="str">'\n'</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">lines_out</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> <p id="t1201" class="pln"><span class="strut"> </span></p> -<p id="t1202" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testReplaceNativeEol</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1203" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="op">{</span><span class="str">'test.cog'</span><span class="op">:</span> <span class="str">'\n'</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">lines_in</span><span class="op">)</span><span class="op">}</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1204" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1205" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFileContent</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="nam">os</span><span class="op">.</span><span class="nam">linesep</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">lines_out</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1202" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testReplaceNativeEol</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1203" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="op">{</span><span class="str">'test.cog'</span><span class="op">:</span> <span class="str">'\n'</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">lines_in</span><span class="op">)</span><span class="op">}</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1204" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1205" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFileContent</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="nam">os</span><span class="op">.</span><span class="nam">linesep</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">lines_out</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> <p id="t1206" class="pln"><span class="strut"> </span></p> -<p id="t1207" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testReplaceLfEol</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1208" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="op">{</span><span class="str">'test.cog'</span><span class="op">:</span> <span class="str">'\n'</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">lines_in</span><span class="op">)</span><span class="op">}</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1209" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-U'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1210" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFileContent</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'\n'</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">lines_out</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1207" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testReplaceLfEol</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1208" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="op">{</span><span class="str">'test.cog'</span><span class="op">:</span> <span class="str">'\n'</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">lines_in</span><span class="op">)</span><span class="op">}</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1209" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-U'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1210" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFileContent</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'\n'</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">lines_out</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> <p id="t1211" class="pln"><span class="strut"> </span></p> <p id="t1212" class="pln"><span class="strut"> </span></p> <p id="t1213" class="stm run hide_run"><span class="key">class</span> <span class="nam">CogTestCharacterEncoding</span><span class="op">(</span><span class="nam">TestCaseWithTempDir</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> <p id="t1214" class="pln"><span class="strut"> </span></p> -<p id="t1215" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testSimple</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1216" class="stm mis"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t1217" class="pln"> <span class="str">'test.cog'</span><span class="op">:</span> <span class="nam">b</span><span class="op">(</span><span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1218" class="pln"><span class="str"> // This is my C++ file.</span><span class="strut"> </span></p> -<p id="t1219" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t1220" class="pln"><span class="str"> cog.outl("// Unicode: \xe1\x88\xb4 (U+1234)")</span><span class="strut"> </span></p> -<p id="t1221" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t1222" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t1223" class="pln"><span class="str"> """</span><span class="op">)</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1215" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testSimple</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1216" class="stm run hide_run"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t1217" class="pln"> <span class="str">'test.cog'</span><span class="op">:</span> <span class="nam">b</span><span class="op">(</span><span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1218" class="pln"><span class="str"> // This is my C++ file.</span><span class="strut"> </span></p> +<p id="t1219" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t1220" class="pln"><span class="str"> cog.outl("// Unicode: \xe1\x88\xb4 (U+1234)")</span><span class="strut"> </span></p> +<p id="t1221" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t1222" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t1223" class="pln"><span class="str"> """</span><span class="op">)</span><span class="op">,</span><span class="strut"> </span></p> <p id="t1224" class="pln"><span class="strut"> </span></p> -<p id="t1225" class="pln"> <span class="str">'test.out'</span><span class="op">:</span> <span class="nam">b</span><span class="op">(</span><span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1226" class="pln"><span class="str"> // This is my C++ file.</span><span class="strut"> </span></p> -<p id="t1227" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t1228" class="pln"><span class="str"> cog.outl("// Unicode: \xe1\x88\xb4 (U+1234)")</span><span class="strut"> </span></p> -<p id="t1229" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t1230" class="pln"><span class="str"> // Unicode: \xe1\x88\xb4 (U+1234)</span><span class="strut"> </span></p> -<p id="t1231" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t1232" class="pln"><span class="str"> """</span><span class="op">)</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t1233" class="pln"> <span class="op">}</span><span class="strut"> </span></p> +<p id="t1225" class="pln"> <span class="str">'test.out'</span><span class="op">:</span> <span class="nam">b</span><span class="op">(</span><span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1226" class="pln"><span class="str"> // This is my C++ file.</span><span class="strut"> </span></p> +<p id="t1227" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t1228" class="pln"><span class="str"> cog.outl("// Unicode: \xe1\x88\xb4 (U+1234)")</span><span class="strut"> </span></p> +<p id="t1229" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t1230" class="pln"><span class="str"> // Unicode: \xe1\x88\xb4 (U+1234)</span><span class="strut"> </span></p> +<p id="t1231" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t1232" class="pln"><span class="str"> """</span><span class="op">)</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1233" class="pln"> <span class="op">}</span><span class="strut"> </span></p> <p id="t1234" class="pln"><span class="strut"> </span></p> -<p id="t1235" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1236" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1237" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test.out'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1238" class="stm mis"> <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1239" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertIn</span><span class="op">(</span><span class="str">"(changed)"</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1235" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1236" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1237" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test.out'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1238" class="stm run hide_run"> <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1239" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertIn</span><span class="op">(</span><span class="str">"(changed)"</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut"> </span></p> <p id="t1240" class="pln"><span class="strut"> </span></p> -<p id="t1241" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testFileEncodingOption</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1242" class="stm mis"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t1243" class="pln"> <span class="str">'test.cog'</span><span class="op">:</span> <span class="nam">b</span><span class="op">(</span><span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1244" class="pln"><span class="str"> // \xca\xee\xe4\xe8\xf0\xe2\xea\xe0 Windows</span><span class="strut"> </span></p> -<p id="t1245" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t1246" class="pln"><span class="str"> cog.outl("\xd1\xfa\xe5\xf8\xfc \xe5\xf9\xb8 \xfd\xf2\xe8\xf5 \xec\xff\xe3\xea\xe8\xf5 \xf4\xf0\xe0\xed\xf6\xf3\xe7\xf1\xea\xe8\xf5 \xe1\xf3\xeb\xee\xea \xe4\xe0 \xe2\xfb\xef\xe5\xe9 \xf7\xe0\xfe")</span><span class="strut"> </span></p> -<p id="t1247" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t1248" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t1249" class="pln"><span class="str"> """</span><span class="op">)</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1241" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testFileEncodingOption</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1242" class="stm run hide_run"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t1243" class="pln"> <span class="str">'test.cog'</span><span class="op">:</span> <span class="nam">b</span><span class="op">(</span><span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1244" class="pln"><span class="str"> // \xca\xee\xe4\xe8\xf0\xe2\xea\xe0 Windows</span><span class="strut"> </span></p> +<p id="t1245" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t1246" class="pln"><span class="str"> cog.outl("\xd1\xfa\xe5\xf8\xfc \xe5\xf9\xb8 \xfd\xf2\xe8\xf5 \xec\xff\xe3\xea\xe8\xf5 \xf4\xf0\xe0\xed\xf6\xf3\xe7\xf1\xea\xe8\xf5 \xe1\xf3\xeb\xee\xea \xe4\xe0 \xe2\xfb\xef\xe5\xe9 \xf7\xe0\xfe")</span><span class="strut"> </span></p> +<p id="t1247" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t1248" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t1249" class="pln"><span class="str"> """</span><span class="op">)</span><span class="op">,</span><span class="strut"> </span></p> <p id="t1250" class="pln"><span class="strut"> </span></p> -<p id="t1251" class="pln"> <span class="str">'test.out'</span><span class="op">:</span> <span class="nam">b</span><span class="op">(</span><span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1252" class="pln"><span class="str"> // \xca\xee\xe4\xe8\xf0\xe2\xea\xe0 Windows</span><span class="strut"> </span></p> -<p id="t1253" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t1254" class="pln"><span class="str"> cog.outl("\xd1\xfa\xe5\xf8\xfc \xe5\xf9\xb8 \xfd\xf2\xe8\xf5 \xec\xff\xe3\xea\xe8\xf5 \xf4\xf0\xe0\xed\xf6\xf3\xe7\xf1\xea\xe8\xf5 \xe1\xf3\xeb\xee\xea \xe4\xe0 \xe2\xfb\xef\xe5\xe9 \xf7\xe0\xfe")</span><span class="strut"> </span></p> -<p id="t1255" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t1256" class="pln"><span class="str"> \xd1\xfa\xe5\xf8\xfc \xe5\xf9\xb8 \xfd\xf2\xe8\xf5 \xec\xff\xe3\xea\xe8\xf5 \xf4\xf0\xe0\xed\xf6\xf3\xe7\xf1\xea\xe8\xf5 \xe1\xf3\xeb\xee\xea \xe4\xe0 \xe2\xfb\xef\xe5\xe9 \xf7\xe0\xfe</span><span class="strut"> </span></p> -<p id="t1257" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t1258" class="pln"><span class="str"> """</span><span class="op">)</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t1259" class="pln"> <span class="op">}</span><span class="strut"> </span></p> +<p id="t1251" class="pln"> <span class="str">'test.out'</span><span class="op">:</span> <span class="nam">b</span><span class="op">(</span><span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1252" class="pln"><span class="str"> // \xca\xee\xe4\xe8\xf0\xe2\xea\xe0 Windows</span><span class="strut"> </span></p> +<p id="t1253" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t1254" class="pln"><span class="str"> cog.outl("\xd1\xfa\xe5\xf8\xfc \xe5\xf9\xb8 \xfd\xf2\xe8\xf5 \xec\xff\xe3\xea\xe8\xf5 \xf4\xf0\xe0\xed\xf6\xf3\xe7\xf1\xea\xe8\xf5 \xe1\xf3\xeb\xee\xea \xe4\xe0 \xe2\xfb\xef\xe5\xe9 \xf7\xe0\xfe")</span><span class="strut"> </span></p> +<p id="t1255" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t1256" class="pln"><span class="str"> \xd1\xfa\xe5\xf8\xfc \xe5\xf9\xb8 \xfd\xf2\xe8\xf5 \xec\xff\xe3\xea\xe8\xf5 \xf4\xf0\xe0\xed\xf6\xf3\xe7\xf1\xea\xe8\xf5 \xe1\xf3\xeb\xee\xea \xe4\xe0 \xe2\xfb\xef\xe5\xe9 \xf7\xe0\xfe</span><span class="strut"> </span></p> +<p id="t1257" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t1258" class="pln"><span class="str"> """</span><span class="op">)</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1259" class="pln"> <span class="op">}</span><span class="strut"> </span></p> <p id="t1260" class="pln"><span class="strut"> </span></p> -<p id="t1261" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1262" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-n'</span><span class="op">,</span> <span class="str">'cp1251'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1263" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test.out'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1264" class="stm mis"> <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1265" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertIn</span><span class="op">(</span><span class="str">"(changed)"</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1261" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1262" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-n'</span><span class="op">,</span> <span class="str">'cp1251'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1263" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test.out'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1264" class="stm run hide_run"> <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1265" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertIn</span><span class="op">(</span><span class="str">"(changed)"</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut"> </span></p> <p id="t1266" class="pln"><span class="strut"> </span></p> <p id="t1267" class="pln"><span class="strut"> </span></p> <p id="t1268" class="stm run hide_run"><span class="key">class</span> <span class="nam">TestCaseWithImports</span><span class="op">(</span><span class="nam">TestCaseWithTempDir</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1269" class="pln"> <span class="str">""" When running tests which import modules, the sys.modules list</span><span class="strut"> </span></p> -<p id="t1270" class="pln"><span class="str"> leaks from one test to the next. This test case class scrubs</span><span class="strut"> </span></p> -<p id="t1271" class="pln"><span class="str"> the list after each run to keep the tests isolated from each other.</span><span class="strut"> </span></p> -<p id="t1272" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t1269" class="pln"> <span class="str">""" When running tests which import modules, the sys.modules list</span><span class="strut"> </span></p> +<p id="t1270" class="pln"><span class="str"> leaks from one test to the next. This test case class scrubs</span><span class="strut"> </span></p> +<p id="t1271" class="pln"><span class="str"> the list after each run to keep the tests isolated from each other.</span><span class="strut"> </span></p> +<p id="t1272" class="pln"><span class="str"> """</span><span class="strut"> </span></p> <p id="t1273" class="pln"><span class="strut"> </span></p> -<p id="t1274" class="stm run hide_run"> <span class="key">def</span> <span class="nam">setUp</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1275" class="stm mis"> <span class="nam">TestCaseWithTempDir</span><span class="op">.</span><span class="nam">setUp</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1276" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">sysmodulekeys</span> <span class="op">=</span> <span class="nam">list</span><span class="op">(</span><span class="nam">sys</span><span class="op">.</span><span class="nam">modules</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1274" class="stm run hide_run"> <span class="key">def</span> <span class="nam">setUp</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1275" class="stm run hide_run"> <span class="nam">TestCaseWithTempDir</span><span class="op">.</span><span class="nam">setUp</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1276" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">sysmodulekeys</span> <span class="op">=</span> <span class="nam">list</span><span class="op">(</span><span class="nam">sys</span><span class="op">.</span><span class="nam">modules</span><span class="op">)</span><span class="strut"> </span></p> <p id="t1277" class="pln"><span class="strut"> </span></p> -<p id="t1278" class="stm run hide_run"> <span class="key">def</span> <span class="nam">tearDown</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1279" class="stm mis"> <span class="nam">modstoscrub</span> <span class="op">=</span> <span class="op">[</span><span class="strut"> </span></p> -<p id="t1280" class="pln"> <span class="nam">modname</span><span class="strut"> </span></p> -<p id="t1281" class="pln"> <span class="key">for</span> <span class="nam">modname</span> <span class="key">in</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">modules</span><span class="strut"> </span></p> -<p id="t1282" class="pln"> <span class="key">if</span> <span class="nam">modname</span> <span class="key">not</span> <span class="key">in</span> <span class="nam">self</span><span class="op">.</span><span class="nam">sysmodulekeys</span><span class="strut"> </span></p> -<p id="t1283" class="pln"> <span class="op">]</span><span class="strut"> </span></p> -<p id="t1284" class="stm mis"> <span class="key">for</span> <span class="nam">modname</span> <span class="key">in</span> <span class="nam">modstoscrub</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1285" class="stm mis"> <span class="key">del</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">modules</span><span class="op">[</span><span class="nam">modname</span><span class="op">]</span><span class="strut"> </span></p> -<p id="t1286" class="stm mis"> <span class="nam">TestCaseWithTempDir</span><span class="op">.</span><span class="nam">tearDown</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1278" class="stm run hide_run"> <span class="key">def</span> <span class="nam">tearDown</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1279" class="stm run hide_run"> <span class="nam">modstoscrub</span> <span class="op">=</span> <span class="op">[</span><span class="strut"> </span></p> +<p id="t1280" class="pln"> <span class="nam">modname</span><span class="strut"> </span></p> +<p id="t1281" class="pln"> <span class="key">for</span> <span class="nam">modname</span> <span class="key">in</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">modules</span><span class="strut"> </span></p> +<p id="t1282" class="pln"> <span class="key">if</span> <span class="nam">modname</span> <span class="key">not</span> <span class="key">in</span> <span class="nam">self</span><span class="op">.</span><span class="nam">sysmodulekeys</span><span class="strut"> </span></p> +<p id="t1283" class="pln"> <span class="op">]</span><span class="strut"> </span></p> +<p id="t1284" class="stm run hide_run"> <span class="key">for</span> <span class="nam">modname</span> <span class="key">in</span> <span class="nam">modstoscrub</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1285" class="stm run hide_run"> <span class="key">del</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">modules</span><span class="op">[</span><span class="nam">modname</span><span class="op">]</span><span class="strut"> </span></p> +<p id="t1286" class="stm run hide_run"> <span class="nam">TestCaseWithTempDir</span><span class="op">.</span><span class="nam">tearDown</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="strut"> </span></p> <p id="t1287" class="pln"><span class="strut"> </span></p> <p id="t1288" class="pln"><span class="strut"> </span></p> <p id="t1289" class="stm run hide_run"><span class="key">class</span> <span class="nam">CogIncludeTests</span><span class="op">(</span><span class="nam">TestCaseWithImports</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1290" class="stm run hide_run"> <span class="nam">dincludes</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t1291" class="pln"> <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1292" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t1293" class="pln"><span class="str"> import mymodule</span><span class="strut"> </span></p> -<p id="t1294" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t1295" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t1296" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1290" class="stm run hide_run"> <span class="nam">dincludes</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t1291" class="pln"> <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1292" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t1293" class="pln"><span class="str"> import mymodule</span><span class="strut"> </span></p> +<p id="t1294" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t1295" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t1296" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t1297" class="pln"><span class="strut"> </span></p> -<p id="t1298" class="pln"> <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1299" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t1300" class="pln"><span class="str"> import mymodule</span><span class="strut"> </span></p> -<p id="t1301" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t1302" class="pln"><span class="str"> Hello from mymodule</span><span class="strut"> </span></p> -<p id="t1303" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t1304" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1298" class="pln"> <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1299" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t1300" class="pln"><span class="str"> import mymodule</span><span class="strut"> </span></p> +<p id="t1301" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t1302" class="pln"><span class="str"> Hello from mymodule</span><span class="strut"> </span></p> +<p id="t1303" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t1304" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t1305" class="pln"><span class="strut"> </span></p> -<p id="t1306" class="pln"> <span class="str">'test2.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1307" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t1308" class="pln"><span class="str"> import mymodule</span><span class="strut"> </span></p> -<p id="t1309" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t1310" class="pln"><span class="str"> Hello from mymodule in inc2</span><span class="strut"> </span></p> -<p id="t1311" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t1312" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1306" class="pln"> <span class="str">'test2.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1307" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t1308" class="pln"><span class="str"> import mymodule</span><span class="strut"> </span></p> +<p id="t1309" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t1310" class="pln"><span class="str"> Hello from mymodule in inc2</span><span class="strut"> </span></p> +<p id="t1311" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t1312" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t1313" class="pln"><span class="strut"> </span></p> -<p id="t1314" class="pln"> <span class="str">'include'</span><span class="op">:</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t1315" class="pln"> <span class="str">'mymodule.py'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1316" class="pln"><span class="str"> import cog</span><span class="strut"> </span></p> -<p id="t1317" class="pln"><span class="str"> cog.outl("Hello from mymodule")</span><span class="strut"> </span></p> -<p id="t1318" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t1319" class="pln"> <span class="op">}</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1314" class="pln"> <span class="str">'include'</span><span class="op">:</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t1315" class="pln"> <span class="str">'mymodule.py'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1316" class="pln"><span class="str"> import cog</span><span class="strut"> </span></p> +<p id="t1317" class="pln"><span class="str"> cog.outl("Hello from mymodule")</span><span class="strut"> </span></p> +<p id="t1318" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t1319" class="pln"> <span class="op">}</span><span class="op">,</span><span class="strut"> </span></p> <p id="t1320" class="pln"><span class="strut"> </span></p> -<p id="t1321" class="pln"> <span class="str">'inc2'</span><span class="op">:</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t1322" class="pln"> <span class="str">'mymodule.py'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1323" class="pln"><span class="str"> import cog</span><span class="strut"> </span></p> -<p id="t1324" class="pln"><span class="str"> cog.outl("Hello from mymodule in inc2")</span><span class="strut"> </span></p> -<p id="t1325" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t1326" class="pln"> <span class="op">}</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1321" class="pln"> <span class="str">'inc2'</span><span class="op">:</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t1322" class="pln"> <span class="str">'mymodule.py'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1323" class="pln"><span class="str"> import cog</span><span class="strut"> </span></p> +<p id="t1324" class="pln"><span class="str"> cog.outl("Hello from mymodule in inc2")</span><span class="strut"> </span></p> +<p id="t1325" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t1326" class="pln"> <span class="op">}</span><span class="op">,</span><span class="strut"> </span></p> <p id="t1327" class="pln"><span class="strut"> </span></p> -<p id="t1328" class="pln"> <span class="str">'inc3'</span><span class="op">:</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t1329" class="pln"> <span class="str">'someothermodule.py'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1330" class="pln"><span class="str"> import cog</span><span class="strut"> </span></p> -<p id="t1331" class="pln"><span class="str"> cog.outl("This is some other module.")</span><span class="strut"> </span></p> -<p id="t1332" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t1333" class="pln"> <span class="op">}</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t1334" class="pln"> <span class="op">}</span><span class="strut"> </span></p> +<p id="t1328" class="pln"> <span class="str">'inc3'</span><span class="op">:</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t1329" class="pln"> <span class="str">'someothermodule.py'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1330" class="pln"><span class="str"> import cog</span><span class="strut"> </span></p> +<p id="t1331" class="pln"><span class="str"> cog.outl("This is some other module.")</span><span class="strut"> </span></p> +<p id="t1332" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t1333" class="pln"> <span class="op">}</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1334" class="pln"> <span class="op">}</span><span class="strut"> </span></p> <p id="t1335" class="pln"><span class="strut"> </span></p> -<p id="t1336" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testNeedIncludePath</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1337" class="pln"> <span class="com"># Try it without the -I, to see that an ImportError happens.</span><span class="strut"> </span></p> -<p id="t1338" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">dincludes</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1339" class="stm mis"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">ImportError</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1340" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1336" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testNeedIncludePath</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1337" class="pln"> <span class="com"># Try it without the -I, to see that an ImportError happens.</span><span class="strut"> </span></p> +<p id="t1338" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">dincludes</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1339" class="stm run hide_run"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">ImportError</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1340" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> <p id="t1341" class="pln"><span class="strut"> </span></p> -<p id="t1342" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testIncludePath</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1343" class="pln"> <span class="com"># Test that -I adds include directories properly.</span><span class="strut"> </span></p> -<p id="t1344" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">dincludes</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1345" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-I'</span><span class="op">,</span> <span class="str">'include'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1346" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test.out'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1342" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testIncludePath</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1343" class="pln"> <span class="com"># Test that -I adds include directories properly.</span><span class="strut"> </span></p> +<p id="t1344" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">dincludes</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1345" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-I'</span><span class="op">,</span> <span class="str">'include'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1346" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test.out'</span><span class="op">)</span><span class="strut"> </span></p> <p id="t1347" class="pln"><span class="strut"> </span></p> -<p id="t1348" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testTwoIncludePaths</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1349" class="pln"> <span class="com"># Test that two -I's add include directories properly.</span><span class="strut"> </span></p> -<p id="t1350" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">dincludes</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1351" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-I'</span><span class="op">,</span> <span class="str">'include'</span><span class="op">,</span> <span class="str">'-I'</span><span class="op">,</span> <span class="str">'inc2'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1352" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test.out'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1348" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testTwoIncludePaths</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1349" class="pln"> <span class="com"># Test that two -I's add include directories properly.</span><span class="strut"> </span></p> +<p id="t1350" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">dincludes</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1351" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-I'</span><span class="op">,</span> <span class="str">'include'</span><span class="op">,</span> <span class="str">'-I'</span><span class="op">,</span> <span class="str">'inc2'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1352" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test.out'</span><span class="op">)</span><span class="strut"> </span></p> <p id="t1353" class="pln"><span class="strut"> </span></p> -<p id="t1354" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testTwoIncludePaths2</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1355" class="pln"> <span class="com"># Test that two -I's add include directories properly.</span><span class="strut"> </span></p> -<p id="t1356" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">dincludes</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1357" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-I'</span><span class="op">,</span> <span class="str">'inc2'</span><span class="op">,</span> <span class="str">'-I'</span><span class="op">,</span> <span class="str">'include'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1358" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test2.out'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1354" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testTwoIncludePaths2</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1355" class="pln"> <span class="com"># Test that two -I's add include directories properly.</span><span class="strut"> </span></p> +<p id="t1356" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">dincludes</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1357" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-I'</span><span class="op">,</span> <span class="str">'inc2'</span><span class="op">,</span> <span class="str">'-I'</span><span class="op">,</span> <span class="str">'include'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1358" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test2.out'</span><span class="op">)</span><span class="strut"> </span></p> <p id="t1359" class="pln"><span class="strut"> </span></p> -<p id="t1360" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testUselessIncludePath</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1361" class="pln"> <span class="com"># Test that the search will continue past the first directory.</span><span class="strut"> </span></p> -<p id="t1362" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">dincludes</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1363" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-I'</span><span class="op">,</span> <span class="str">'inc3'</span><span class="op">,</span> <span class="str">'-I'</span><span class="op">,</span> <span class="str">'include'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1364" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test.out'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1360" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testUselessIncludePath</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1361" class="pln"> <span class="com"># Test that the search will continue past the first directory.</span><span class="strut"> </span></p> +<p id="t1362" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">dincludes</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1363" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-I'</span><span class="op">,</span> <span class="str">'inc3'</span><span class="op">,</span> <span class="str">'-I'</span><span class="op">,</span> <span class="str">'include'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1364" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test.out'</span><span class="op">)</span><span class="strut"> </span></p> <p id="t1365" class="pln"><span class="strut"> </span></p> -<p id="t1366" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testSysPathIsUnchanged</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1367" class="stm mis"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t1368" class="pln"> <span class="str">'bad.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1369" class="pln"><span class="str"> //[[[cog cog.error("Oh no!") ]]]</span><span class="strut"> </span></p> -<p id="t1370" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t1371" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t1372" class="pln"> <span class="str">'good.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1373" class="pln"><span class="str"> //[[[cog cog.outl("Oh yes!") ]]]</span><span class="strut"> </span></p> -<p id="t1374" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t1375" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t1376" class="pln"> <span class="op">}</span><span class="strut"> </span></p> +<p id="t1366" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testSysPathIsUnchanged</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1367" class="stm run hide_run"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t1368" class="pln"> <span class="str">'bad.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1369" class="pln"><span class="str"> //[[[cog cog.error("Oh no!") ]]]</span><span class="strut"> </span></p> +<p id="t1370" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t1371" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1372" class="pln"> <span class="str">'good.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1373" class="pln"><span class="str"> //[[[cog cog.outl("Oh yes!") ]]]</span><span class="strut"> </span></p> +<p id="t1374" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t1375" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1376" class="pln"> <span class="op">}</span><span class="strut"> </span></p> <p id="t1377" class="pln"><span class="strut"> </span></p> -<p id="t1378" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1379" class="pln"> <span class="com"># Is it unchanged just by creating a cog engine?</span><span class="strut"> </span></p> -<p id="t1380" class="stm mis"> <span class="nam">oldsyspath</span> <span class="op">=</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">path</span><span class="op">[</span><span class="op">:</span><span class="op">]</span><span class="strut"> </span></p> -<p id="t1381" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1382" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">oldsyspath</span><span class="op">,</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">path</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1383" class="pln"> <span class="com"># Is it unchanged for a successful run?</span><span class="strut"> </span></p> -<p id="t1384" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1385" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'good.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1386" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">oldsyspath</span><span class="op">,</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">path</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1387" class="pln"> <span class="com"># Is it unchanged for a successful run with includes?</span><span class="strut"> </span></p> -<p id="t1388" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1389" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-I'</span><span class="op">,</span> <span class="str">'xyzzy'</span><span class="op">,</span> <span class="str">'good.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1390" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">oldsyspath</span><span class="op">,</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">path</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1391" class="pln"> <span class="com"># Is it unchanged for a successful run with two includes?</span><span class="strut"> </span></p> -<p id="t1392" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1393" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-I'</span><span class="op">,</span> <span class="str">'xyzzy'</span><span class="op">,</span> <span class="str">'-I'</span><span class="op">,</span> <span class="str">'quux'</span><span class="op">,</span> <span class="str">'good.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1394" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">oldsyspath</span><span class="op">,</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">path</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1395" class="pln"> <span class="com"># Is it unchanged for a failed run?</span><span class="strut"> </span></p> -<p id="t1396" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1397" class="stm mis"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogError</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1398" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'bad.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1399" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">oldsyspath</span><span class="op">,</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">path</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1400" class="pln"> <span class="com"># Is it unchanged for a failed run with includes?</span><span class="strut"> </span></p> -<p id="t1401" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1402" class="stm mis"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogError</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1403" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-I'</span><span class="op">,</span> <span class="str">'xyzzy'</span><span class="op">,</span> <span class="str">'bad.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1404" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">oldsyspath</span><span class="op">,</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">path</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1405" class="pln"> <span class="com"># Is it unchanged for a failed run with two includes?</span><span class="strut"> </span></p> -<p id="t1406" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1407" class="stm mis"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogError</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1408" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-I'</span><span class="op">,</span> <span class="str">'xyzzy'</span><span class="op">,</span> <span class="str">'-I'</span><span class="op">,</span> <span class="str">'quux'</span><span class="op">,</span> <span class="str">'bad.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1409" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">oldsyspath</span><span class="op">,</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">path</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1378" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1379" class="pln"> <span class="com"># Is it unchanged just by creating a cog engine?</span><span class="strut"> </span></p> +<p id="t1380" class="stm run hide_run"> <span class="nam">oldsyspath</span> <span class="op">=</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">path</span><span class="op">[</span><span class="op">:</span><span class="op">]</span><span class="strut"> </span></p> +<p id="t1381" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1382" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">oldsyspath</span><span class="op">,</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">path</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1383" class="pln"> <span class="com"># Is it unchanged for a successful run?</span><span class="strut"> </span></p> +<p id="t1384" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1385" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'good.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1386" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">oldsyspath</span><span class="op">,</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">path</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1387" class="pln"> <span class="com"># Is it unchanged for a successful run with includes?</span><span class="strut"> </span></p> +<p id="t1388" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1389" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-I'</span><span class="op">,</span> <span class="str">'xyzzy'</span><span class="op">,</span> <span class="str">'good.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1390" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">oldsyspath</span><span class="op">,</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">path</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1391" class="pln"> <span class="com"># Is it unchanged for a successful run with two includes?</span><span class="strut"> </span></p> +<p id="t1392" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1393" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-I'</span><span class="op">,</span> <span class="str">'xyzzy'</span><span class="op">,</span> <span class="str">'-I'</span><span class="op">,</span> <span class="str">'quux'</span><span class="op">,</span> <span class="str">'good.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1394" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">oldsyspath</span><span class="op">,</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">path</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1395" class="pln"> <span class="com"># Is it unchanged for a failed run?</span><span class="strut"> </span></p> +<p id="t1396" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1397" class="stm run hide_run"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogError</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1398" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'bad.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1399" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">oldsyspath</span><span class="op">,</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">path</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1400" class="pln"> <span class="com"># Is it unchanged for a failed run with includes?</span><span class="strut"> </span></p> +<p id="t1401" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1402" class="stm run hide_run"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogError</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1403" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-I'</span><span class="op">,</span> <span class="str">'xyzzy'</span><span class="op">,</span> <span class="str">'bad.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1404" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">oldsyspath</span><span class="op">,</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">path</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1405" class="pln"> <span class="com"># Is it unchanged for a failed run with two includes?</span><span class="strut"> </span></p> +<p id="t1406" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1407" class="stm run hide_run"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogError</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1408" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-I'</span><span class="op">,</span> <span class="str">'xyzzy'</span><span class="op">,</span> <span class="str">'-I'</span><span class="op">,</span> <span class="str">'quux'</span><span class="op">,</span> <span class="str">'bad.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1409" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">oldsyspath</span><span class="op">,</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">path</span><span class="op">)</span><span class="strut"> </span></p> <p id="t1410" class="pln"><span class="strut"> </span></p> -<p id="t1411" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testSubDirectories</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1412" class="pln"> <span class="com"># Test that relative paths on the command line work, with includes.</span><span class="strut"> </span></p> +<p id="t1411" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testSubDirectories</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1412" class="pln"> <span class="com"># Test that relative paths on the command line work, with includes.</span><span class="strut"> </span></p> <p id="t1413" class="pln"><span class="strut"> </span></p> -<p id="t1414" class="stm mis"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t1415" class="pln"> <span class="str">'code'</span><span class="op">:</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t1416" class="pln"> <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1417" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t1418" class="pln"><span class="str"> import mysubmodule</span><span class="strut"> </span></p> -<p id="t1419" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t1420" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t1421" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1414" class="stm run hide_run"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t1415" class="pln"> <span class="str">'code'</span><span class="op">:</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t1416" class="pln"> <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1417" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t1418" class="pln"><span class="str"> import mysubmodule</span><span class="strut"> </span></p> +<p id="t1419" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t1420" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t1421" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t1422" class="pln"><span class="strut"> </span></p> -<p id="t1423" class="pln"> <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1424" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t1425" class="pln"><span class="str"> import mysubmodule</span><span class="strut"> </span></p> -<p id="t1426" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t1427" class="pln"><span class="str"> Hello from mysubmodule</span><span class="strut"> </span></p> -<p id="t1428" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t1429" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1423" class="pln"> <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1424" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t1425" class="pln"><span class="str"> import mysubmodule</span><span class="strut"> </span></p> +<p id="t1426" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t1427" class="pln"><span class="str"> Hello from mysubmodule</span><span class="strut"> </span></p> +<p id="t1428" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t1429" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t1430" class="pln"><span class="strut"> </span></p> -<p id="t1431" class="pln"> <span class="str">'mysubmodule.py'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1432" class="pln"><span class="str"> import cog</span><span class="strut"> </span></p> -<p id="t1433" class="pln"><span class="str"> cog.outl("Hello from mysubmodule")</span><span class="strut"> </span></p> -<p id="t1434" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t1435" class="pln"> <span class="op">}</span><span class="strut"> </span></p> -<p id="t1436" class="pln"> <span class="op">}</span><span class="strut"> </span></p> +<p id="t1431" class="pln"> <span class="str">'mysubmodule.py'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1432" class="pln"><span class="str"> import cog</span><span class="strut"> </span></p> +<p id="t1433" class="pln"><span class="str"> cog.outl("Hello from mysubmodule")</span><span class="strut"> </span></p> +<p id="t1434" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t1435" class="pln"> <span class="op">}</span><span class="strut"> </span></p> +<p id="t1436" class="pln"> <span class="op">}</span><span class="strut"> </span></p> <p id="t1437" class="pln"><span class="strut"> </span></p> -<p id="t1438" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1439" class="pln"> <span class="com"># We should be able to invoke cog without the -I switch, and it will</span><span class="strut"> </span></p> -<p id="t1440" class="pln"> <span class="com"># auto-include the current directory</span><span class="strut"> </span></p> -<p id="t1441" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'code/test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1442" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'code/test.cog'</span><span class="op">,</span> <span class="str">'code/test.out'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1438" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1439" class="pln"> <span class="com"># We should be able to invoke cog without the -I switch, and it will</span><span class="strut"> </span></p> +<p id="t1440" class="pln"> <span class="com"># auto-include the current directory</span><span class="strut"> </span></p> +<p id="t1441" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'code/test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1442" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'code/test.cog'</span><span class="op">,</span> <span class="str">'code/test.out'</span><span class="op">)</span><span class="strut"> </span></p> <p id="t1443" class="pln"><span class="strut"> </span></p> <p id="t1444" class="pln"><span class="strut"> </span></p> <p id="t1445" class="stm run hide_run"><span class="key">class</span> <span class="nam">CogTestsInFiles</span><span class="op">(</span><span class="nam">TestCaseWithTempDir</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> <p id="t1446" class="pln"><span class="strut"> </span></p> -<p id="t1447" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testWarnIfNoCogCode</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1448" class="pln"> <span class="com"># Test that the -e switch warns if there is no Cog code.</span><span class="strut"> </span></p> -<p id="t1449" class="stm mis"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t1450" class="pln"> <span class="str">'with.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1451" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t1452" class="pln"><span class="str"> cog.outl("hello world")</span><span class="strut"> </span></p> -<p id="t1453" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t1454" class="pln"><span class="str"> hello world</span><span class="strut"> </span></p> -<p id="t1455" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t1456" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1447" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testWarnIfNoCogCode</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1448" class="pln"> <span class="com"># Test that the -e switch warns if there is no Cog code.</span><span class="strut"> </span></p> +<p id="t1449" class="stm run hide_run"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t1450" class="pln"> <span class="str">'with.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1451" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t1452" class="pln"><span class="str"> cog.outl("hello world")</span><span class="strut"> </span></p> +<p id="t1453" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t1454" class="pln"><span class="str"> hello world</span><span class="strut"> </span></p> +<p id="t1455" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t1456" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t1457" class="pln"><span class="strut"> </span></p> -<p id="t1458" class="pln"> <span class="str">'without.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1459" class="pln"><span class="str"> There's no cog</span><span class="strut"> </span></p> -<p id="t1460" class="pln"><span class="str"> code in this file.</span><span class="strut"> </span></p> -<p id="t1461" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t1462" class="pln"> <span class="op">}</span><span class="strut"> </span></p> +<p id="t1458" class="pln"> <span class="str">'without.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1459" class="pln"><span class="str"> There's no cog</span><span class="strut"> </span></p> +<p id="t1460" class="pln"><span class="str"> code in this file.</span><span class="strut"> </span></p> +<p id="t1461" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1462" class="pln"> <span class="op">}</span><span class="strut"> </span></p> <p id="t1463" class="pln"><span class="strut"> </span></p> -<p id="t1464" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1465" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-e'</span><span class="op">,</span> <span class="str">'with.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1466" class="stm mis"> <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1467" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertNotIn</span><span class="op">(</span><span class="str">"Warning"</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1468" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1469" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-e'</span><span class="op">,</span> <span class="str">'without.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1470" class="stm mis"> <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1471" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertIn</span><span class="op">(</span><span class="str">"Warning: no cog code found in without.cog"</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1472" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1473" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'without.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1474" class="stm mis"> <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1475" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertNotIn</span><span class="op">(</span><span class="str">"Warning"</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1464" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1465" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-e'</span><span class="op">,</span> <span class="str">'with.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1466" class="stm run hide_run"> <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1467" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertNotIn</span><span class="op">(</span><span class="str">"Warning"</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1468" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1469" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-e'</span><span class="op">,</span> <span class="str">'without.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1470" class="stm run hide_run"> <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1471" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertIn</span><span class="op">(</span><span class="str">"Warning: no cog code found in without.cog"</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1472" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1473" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'without.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1474" class="stm run hide_run"> <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1475" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertNotIn</span><span class="op">(</span><span class="str">"Warning"</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut"> </span></p> <p id="t1476" class="pln"><span class="strut"> </span></p> -<p id="t1477" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testFileNameProps</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1478" class="stm mis"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t1479" class="pln"> <span class="str">'cog1.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1480" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t1481" class="pln"><span class="str"> cog.outl("This is %s in, %s out" % (cog.inFile, cog.outFile))</span><span class="strut"> </span></p> -<p id="t1482" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t1483" class="pln"><span class="str"> this is cog1.txt in, cog1.txt out</span><span class="strut"> </span></p> -<p id="t1484" class="pln"><span class="str"> [[[end]]]</span><span class="strut"> </span></p> -<p id="t1485" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1477" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testFileNameProps</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1478" class="stm run hide_run"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t1479" class="pln"> <span class="str">'cog1.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1480" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t1481" class="pln"><span class="str"> cog.outl("This is %s in, %s out" % (cog.inFile, cog.outFile))</span><span class="strut"> </span></p> +<p id="t1482" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t1483" class="pln"><span class="str"> this is cog1.txt in, cog1.txt out</span><span class="strut"> </span></p> +<p id="t1484" class="pln"><span class="str"> [[[end]]]</span><span class="strut"> </span></p> +<p id="t1485" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t1486" class="pln"><span class="strut"> </span></p> -<p id="t1487" class="pln"> <span class="str">'cog1.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1488" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t1489" class="pln"><span class="str"> cog.outl("This is %s in, %s out" % (cog.inFile, cog.outFile))</span><span class="strut"> </span></p> -<p id="t1490" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t1491" class="pln"><span class="str"> This is cog1.txt in, cog1.txt out</span><span class="strut"> </span></p> -<p id="t1492" class="pln"><span class="str"> [[[end]]]</span><span class="strut"> </span></p> -<p id="t1493" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1487" class="pln"> <span class="str">'cog1.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1488" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t1489" class="pln"><span class="str"> cog.outl("This is %s in, %s out" % (cog.inFile, cog.outFile))</span><span class="strut"> </span></p> +<p id="t1490" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t1491" class="pln"><span class="str"> This is cog1.txt in, cog1.txt out</span><span class="strut"> </span></p> +<p id="t1492" class="pln"><span class="str"> [[[end]]]</span><span class="strut"> </span></p> +<p id="t1493" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t1494" class="pln"><span class="strut"> </span></p> -<p id="t1495" class="pln"> <span class="str">'cog1out.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1496" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t1497" class="pln"><span class="str"> cog.outl("This is %s in, %s out" % (cog.inFile, cog.outFile))</span><span class="strut"> </span></p> -<p id="t1498" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t1499" class="pln"><span class="str"> This is cog1.txt in, cog1out.txt out</span><span class="strut"> </span></p> -<p id="t1500" class="pln"><span class="str"> [[[end]]]</span><span class="strut"> </span></p> -<p id="t1501" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t1502" class="pln"> <span class="op">}</span><span class="strut"> </span></p> +<p id="t1495" class="pln"> <span class="str">'cog1out.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1496" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t1497" class="pln"><span class="str"> cog.outl("This is %s in, %s out" % (cog.inFile, cog.outFile))</span><span class="strut"> </span></p> +<p id="t1498" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t1499" class="pln"><span class="str"> This is cog1.txt in, cog1out.txt out</span><span class="strut"> </span></p> +<p id="t1500" class="pln"><span class="str"> [[[end]]]</span><span class="strut"> </span></p> +<p id="t1501" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1502" class="pln"> <span class="op">}</span><span class="strut"> </span></p> <p id="t1503" class="pln"><span class="strut"> </span></p> -<p id="t1504" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1505" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'cog1.txt'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1506" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'cog1.txt'</span><span class="op">,</span> <span class="str">'cog1.out'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1507" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1508" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-o'</span><span class="op">,</span> <span class="str">'cog1out.txt'</span><span class="op">,</span> <span class="str">'cog1.txt'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1509" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'cog1out.txt'</span><span class="op">,</span> <span class="str">'cog1out.out'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1504" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1505" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'cog1.txt'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1506" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'cog1.txt'</span><span class="op">,</span> <span class="str">'cog1.out'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1507" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1508" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-o'</span><span class="op">,</span> <span class="str">'cog1out.txt'</span><span class="op">,</span> <span class="str">'cog1.txt'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1509" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'cog1out.txt'</span><span class="op">,</span> <span class="str">'cog1out.out'</span><span class="op">)</span><span class="strut"> </span></p> <p id="t1510" class="pln"><span class="strut"> </span></p> -<p id="t1511" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testGlobalsDontCrossFiles</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1512" class="pln"> <span class="com"># Make sure that global values don't get shared between files.</span><span class="strut"> </span></p> -<p id="t1513" class="stm mis"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t1514" class="pln"> <span class="str">'one.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1515" class="pln"><span class="str"> //[[[cog s = "This was set in one.cog" ]]]</span><span class="strut"> </span></p> -<p id="t1516" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t1517" class="pln"><span class="str"> //[[[cog cog.outl(s) ]]]</span><span class="strut"> </span></p> -<p id="t1518" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t1519" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1511" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testGlobalsDontCrossFiles</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1512" class="pln"> <span class="com"># Make sure that global values don't get shared between files.</span><span class="strut"> </span></p> +<p id="t1513" class="stm run hide_run"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t1514" class="pln"> <span class="str">'one.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1515" class="pln"><span class="str"> //[[[cog s = "This was set in one.cog" ]]]</span><span class="strut"> </span></p> +<p id="t1516" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t1517" class="pln"><span class="str"> //[[[cog cog.outl(s) ]]]</span><span class="strut"> </span></p> +<p id="t1518" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t1519" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t1520" class="pln"><span class="strut"> </span></p> -<p id="t1521" class="pln"> <span class="str">'one.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1522" class="pln"><span class="str"> //[[[cog s = "This was set in one.cog" ]]]</span><span class="strut"> </span></p> -<p id="t1523" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t1524" class="pln"><span class="str"> //[[[cog cog.outl(s) ]]]</span><span class="strut"> </span></p> -<p id="t1525" class="pln"><span class="str"> This was set in one.cog</span><span class="strut"> </span></p> -<p id="t1526" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t1527" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1521" class="pln"> <span class="str">'one.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1522" class="pln"><span class="str"> //[[[cog s = "This was set in one.cog" ]]]</span><span class="strut"> </span></p> +<p id="t1523" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t1524" class="pln"><span class="str"> //[[[cog cog.outl(s) ]]]</span><span class="strut"> </span></p> +<p id="t1525" class="pln"><span class="str"> This was set in one.cog</span><span class="strut"> </span></p> +<p id="t1526" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t1527" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t1528" class="pln"><span class="strut"> </span></p> -<p id="t1529" class="pln"> <span class="str">'two.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1530" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t1531" class="pln"><span class="str"> try:</span><span class="strut"> </span></p> -<p id="t1532" class="pln"><span class="str"> cog.outl(s)</span><span class="strut"> </span></p> -<p id="t1533" class="pln"><span class="str"> except NameError:</span><span class="strut"> </span></p> -<p id="t1534" class="pln"><span class="str"> cog.outl("s isn't set!")</span><span class="strut"> </span></p> -<p id="t1535" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t1536" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t1537" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1529" class="pln"> <span class="str">'two.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1530" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t1531" class="pln"><span class="str"> try:</span><span class="strut"> </span></p> +<p id="t1532" class="pln"><span class="str"> cog.outl(s)</span><span class="strut"> </span></p> +<p id="t1533" class="pln"><span class="str"> except NameError:</span><span class="strut"> </span></p> +<p id="t1534" class="pln"><span class="str"> cog.outl("s isn't set!")</span><span class="strut"> </span></p> +<p id="t1535" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t1536" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t1537" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t1538" class="pln"><span class="strut"> </span></p> -<p id="t1539" class="pln"> <span class="str">'two.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1540" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t1541" class="pln"><span class="str"> try:</span><span class="strut"> </span></p> -<p id="t1542" class="pln"><span class="str"> cog.outl(s)</span><span class="strut"> </span></p> -<p id="t1543" class="pln"><span class="str"> except NameError:</span><span class="strut"> </span></p> -<p id="t1544" class="pln"><span class="str"> cog.outl("s isn't set!")</span><span class="strut"> </span></p> -<p id="t1545" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t1546" class="pln"><span class="str"> s isn't set!</span><span class="strut"> </span></p> -<p id="t1547" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t1548" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1539" class="pln"> <span class="str">'two.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1540" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t1541" class="pln"><span class="str"> try:</span><span class="strut"> </span></p> +<p id="t1542" class="pln"><span class="str"> cog.outl(s)</span><span class="strut"> </span></p> +<p id="t1543" class="pln"><span class="str"> except NameError:</span><span class="strut"> </span></p> +<p id="t1544" class="pln"><span class="str"> cog.outl("s isn't set!")</span><span class="strut"> </span></p> +<p id="t1545" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t1546" class="pln"><span class="str"> s isn't set!</span><span class="strut"> </span></p> +<p id="t1547" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t1548" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t1549" class="pln"><span class="strut"> </span></p> -<p id="t1550" class="pln"> <span class="str">'cogfiles.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1551" class="pln"><span class="str"> # Please run cog</span><span class="strut"> </span></p> -<p id="t1552" class="pln"><span class="str"> one.cog</span><span class="strut"> </span></p> +<p id="t1550" class="pln"> <span class="str">'cogfiles.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1551" class="pln"><span class="str"> # Please run cog</span><span class="strut"> </span></p> +<p id="t1552" class="pln"><span class="str"> one.cog</span><span class="strut"> </span></p> <p id="t1553" class="pln"><span class="strut"> </span></p> -<p id="t1554" class="pln"><span class="str"> two.cog</span><span class="strut"> </span></p> -<p id="t1555" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t1556" class="pln"> <span class="op">}</span><span class="strut"> </span></p> +<p id="t1554" class="pln"><span class="str"> two.cog</span><span class="strut"> </span></p> +<p id="t1555" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t1556" class="pln"> <span class="op">}</span><span class="strut"> </span></p> <p id="t1557" class="pln"><span class="strut"> </span></p> -<p id="t1558" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1559" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'@cogfiles.txt'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1560" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'one.cog'</span><span class="op">,</span> <span class="str">'one.out'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1561" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'two.cog'</span><span class="op">,</span> <span class="str">'two.out'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1562" class="stm mis"> <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1563" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertIn</span><span class="op">(</span><span class="str">"(changed)"</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1558" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1559" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'@cogfiles.txt'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1560" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'one.cog'</span><span class="op">,</span> <span class="str">'one.out'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1561" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'two.cog'</span><span class="op">,</span> <span class="str">'two.out'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1562" class="stm run hide_run"> <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1563" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertIn</span><span class="op">(</span><span class="str">"(changed)"</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut"> </span></p> <p id="t1564" class="pln"><span class="strut"> </span></p> -<p id="t1565" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testRemoveGeneratedOutput</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1566" class="stm mis"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t1567" class="pln"> <span class="str">'cog1.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1568" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t1569" class="pln"><span class="str"> cog.outl("This line was generated.")</span><span class="strut"> </span></p> -<p id="t1570" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t1571" class="pln"><span class="str"> This line was generated.</span><span class="strut"> </span></p> -<p id="t1572" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t1573" class="pln"><span class="str"> This line was not.</span><span class="strut"> </span></p> -<p id="t1574" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1565" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testRemoveGeneratedOutput</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1566" class="stm run hide_run"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t1567" class="pln"> <span class="str">'cog1.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1568" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t1569" class="pln"><span class="str"> cog.outl("This line was generated.")</span><span class="strut"> </span></p> +<p id="t1570" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t1571" class="pln"><span class="str"> This line was generated.</span><span class="strut"> </span></p> +<p id="t1572" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t1573" class="pln"><span class="str"> This line was not.</span><span class="strut"> </span></p> +<p id="t1574" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t1575" class="pln"><span class="strut"> </span></p> -<p id="t1576" class="pln"> <span class="str">'cog1.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1577" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t1578" class="pln"><span class="str"> cog.outl("This line was generated.")</span><span class="strut"> </span></p> -<p id="t1579" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t1580" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t1581" class="pln"><span class="str"> This line was not.</span><span class="strut"> </span></p> -<p id="t1582" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1576" class="pln"> <span class="str">'cog1.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1577" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t1578" class="pln"><span class="str"> cog.outl("This line was generated.")</span><span class="strut"> </span></p> +<p id="t1579" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t1580" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t1581" class="pln"><span class="str"> This line was not.</span><span class="strut"> </span></p> +<p id="t1582" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t1583" class="pln"><span class="strut"> </span></p> -<p id="t1584" class="pln"> <span class="str">'cog1.out2'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1585" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t1586" class="pln"><span class="str"> cog.outl("This line was generated.")</span><span class="strut"> </span></p> -<p id="t1587" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t1588" class="pln"><span class="str"> This line was generated.</span><span class="strut"> </span></p> -<p id="t1589" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t1590" class="pln"><span class="str"> This line was not.</span><span class="strut"> </span></p> -<p id="t1591" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t1592" class="pln"> <span class="op">}</span><span class="strut"> </span></p> +<p id="t1584" class="pln"> <span class="str">'cog1.out2'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1585" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t1586" class="pln"><span class="str"> cog.outl("This line was generated.")</span><span class="strut"> </span></p> +<p id="t1587" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t1588" class="pln"><span class="str"> This line was generated.</span><span class="strut"> </span></p> +<p id="t1589" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t1590" class="pln"><span class="str"> This line was not.</span><span class="strut"> </span></p> +<p id="t1591" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1592" class="pln"> <span class="op">}</span><span class="strut"> </span></p> <p id="t1593" class="pln"><span class="strut"> </span></p> -<p id="t1594" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1595" class="pln"> <span class="com"># Remove generated output.</span><span class="strut"> </span></p> -<p id="t1596" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-x'</span><span class="op">,</span> <span class="str">'cog1.txt'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1597" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'cog1.txt'</span><span class="op">,</span> <span class="str">'cog1.out'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1598" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1599" class="pln"> <span class="com"># Regenerate the generated output.</span><span class="strut"> </span></p> -<p id="t1600" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'cog1.txt'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1601" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'cog1.txt'</span><span class="op">,</span> <span class="str">'cog1.out2'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1602" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1603" class="pln"> <span class="com"># Remove the generated output again.</span><span class="strut"> </span></p> -<p id="t1604" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-x'</span><span class="op">,</span> <span class="str">'cog1.txt'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1605" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'cog1.txt'</span><span class="op">,</span> <span class="str">'cog1.out'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1594" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1595" class="pln"> <span class="com"># Remove generated output.</span><span class="strut"> </span></p> +<p id="t1596" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-x'</span><span class="op">,</span> <span class="str">'cog1.txt'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1597" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'cog1.txt'</span><span class="op">,</span> <span class="str">'cog1.out'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1598" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1599" class="pln"> <span class="com"># Regenerate the generated output.</span><span class="strut"> </span></p> +<p id="t1600" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'cog1.txt'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1601" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'cog1.txt'</span><span class="op">,</span> <span class="str">'cog1.out2'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1602" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">newCog</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1603" class="pln"> <span class="com"># Remove the generated output again.</span><span class="strut"> </span></p> +<p id="t1604" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-x'</span><span class="op">,</span> <span class="str">'cog1.txt'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1605" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'cog1.txt'</span><span class="op">,</span> <span class="str">'cog1.out'</span><span class="op">)</span><span class="strut"> </span></p> <p id="t1606" class="pln"><span class="strut"> </span></p> -<p id="t1607" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testMsgCall</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1608" class="stm mis"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1609" class="pln"><span class="str"> #[[[cog</span><span class="strut"> </span></p> -<p id="t1610" class="pln"><span class="str"> cog.msg("Hello there!")</span><span class="strut"> </span></p> -<p id="t1611" class="pln"><span class="str"> #]]]</span><span class="strut"> </span></p> -<p id="t1612" class="pln"><span class="str"> #[[[end]]]</span><span class="strut"> </span></p> -<p id="t1613" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t1614" class="stm mis"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1615" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1616" class="stm mis"> <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1617" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">output</span><span class="op">,</span> <span class="str">"Message: Hello there!\n"</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1607" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testMsgCall</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1608" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1609" class="pln"><span class="str"> #[[[cog</span><span class="strut"> </span></p> +<p id="t1610" class="pln"><span class="str"> cog.msg("Hello there!")</span><span class="strut"> </span></p> +<p id="t1611" class="pln"><span class="str"> #]]]</span><span class="strut"> </span></p> +<p id="t1612" class="pln"><span class="str"> #[[[end]]]</span><span class="strut"> </span></p> +<p id="t1613" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t1614" class="stm run hide_run"> <span class="nam">infile</span> <span class="op">=</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1615" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">processString</span><span class="op">(</span><span class="nam">infile</span><span class="op">)</span><span class="op">,</span> <span class="nam">infile</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1616" class="stm run hide_run"> <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1617" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">output</span><span class="op">,</span> <span class="str">"Message: Hello there!\n"</span><span class="op">)</span><span class="strut"> </span></p> <p id="t1618" class="pln"><span class="strut"> </span></p> -<p id="t1619" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testErrorMessageHasNoTraceback</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1620" class="pln"> <span class="com"># Test that a Cog error is printed to stderr with no traceback.</span><span class="strut"> </span></p> +<p id="t1619" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testErrorMessageHasNoTraceback</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1620" class="pln"> <span class="com"># Test that a Cog error is printed to stderr with no traceback.</span><span class="strut"> </span></p> <p id="t1621" class="pln"><span class="strut"> </span></p> -<p id="t1622" class="stm mis"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t1623" class="pln"> <span class="str">'cog1.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1624" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t1625" class="pln"><span class="str"> cog.outl("This line was newly")</span><span class="strut"> </span></p> -<p id="t1626" class="pln"><span class="str"> cog.outl("generated by cog")</span><span class="strut"> </span></p> -<p id="t1627" class="pln"><span class="str"> cog.outl("blah blah.")</span><span class="strut"> </span></p> -<p id="t1628" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t1629" class="pln"><span class="str"> Xhis line was newly</span><span class="strut"> </span></p> -<p id="t1630" class="pln"><span class="str"> generated by cog</span><span class="strut"> </span></p> -<p id="t1631" class="pln"><span class="str"> blah blah.</span><span class="strut"> </span></p> -<p id="t1632" class="pln"><span class="str"> //[[[end]]] (checksum: a8540982e5ad6b95c9e9a184b26f4346)</span><span class="strut"> </span></p> -<p id="t1633" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t1634" class="pln"> <span class="op">}</span><span class="strut"> </span></p> +<p id="t1622" class="stm run hide_run"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t1623" class="pln"> <span class="str">'cog1.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1624" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t1625" class="pln"><span class="str"> cog.outl("This line was newly")</span><span class="strut"> </span></p> +<p id="t1626" class="pln"><span class="str"> cog.outl("generated by cog")</span><span class="strut"> </span></p> +<p id="t1627" class="pln"><span class="str"> cog.outl("blah blah.")</span><span class="strut"> </span></p> +<p id="t1628" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t1629" class="pln"><span class="str"> Xhis line was newly</span><span class="strut"> </span></p> +<p id="t1630" class="pln"><span class="str"> generated by cog</span><span class="strut"> </span></p> +<p id="t1631" class="pln"><span class="str"> blah blah.</span><span class="strut"> </span></p> +<p id="t1632" class="pln"><span class="str"> //[[[end]]] (checksum: a8540982e5ad6b95c9e9a184b26f4346)</span><span class="strut"> </span></p> +<p id="t1633" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1634" class="pln"> <span class="op">}</span><span class="strut"> </span></p> <p id="t1635" class="pln"><span class="strut"> </span></p> -<p id="t1636" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1637" class="stm mis"> <span class="nam">stderr</span> <span class="op">=</span> <span class="nam">StringIO</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1638" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">setOutput</span><span class="op">(</span><span class="nam">stderr</span><span class="op">=</span><span class="nam">stderr</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1639" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">main</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-c'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">"cog1.txt"</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1640" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="op">,</span> <span class="str">"Cogging cog1.txt\n"</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1641" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">stderr</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="op">,</span> <span class="str">"cog1.txt(9): Output has been edited! Delete old checksum to unprotect.\n"</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1636" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1637" class="stm run hide_run"> <span class="nam">stderr</span> <span class="op">=</span> <span class="nam">StringIO</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1638" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">setOutput</span><span class="op">(</span><span class="nam">stderr</span><span class="op">=</span><span class="nam">stderr</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1639" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">main</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-c'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">"cog1.txt"</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1640" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="op">,</span> <span class="str">"Cogging cog1.txt\n"</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1641" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">stderr</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="op">,</span> <span class="str">"cog1.txt(9): Output has been edited! Delete old checksum to unprotect.\n"</span><span class="op">)</span><span class="strut"> </span></p> <p id="t1642" class="pln"><span class="strut"> </span></p> -<p id="t1643" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testDashD</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1644" class="stm mis"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t1645" class="pln"> <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1646" class="pln"><span class="str"> --[[[cog cog.outl("Defined fooey as " + fooey) ]]]</span><span class="strut"> </span></p> -<p id="t1647" class="pln"><span class="str"> --[[[end]]]</span><span class="strut"> </span></p> -<p id="t1648" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1643" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testDashD</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1644" class="stm run hide_run"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t1645" class="pln"> <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1646" class="pln"><span class="str"> --[[[cog cog.outl("Defined fooey as " + fooey) ]]]</span><span class="strut"> </span></p> +<p id="t1647" class="pln"><span class="str"> --[[[end]]]</span><span class="strut"> </span></p> +<p id="t1648" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t1649" class="pln"><span class="strut"> </span></p> -<p id="t1650" class="pln"> <span class="str">'test.kablooey'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1651" class="pln"><span class="str"> --[[[cog cog.outl("Defined fooey as " + fooey) ]]]</span><span class="strut"> </span></p> -<p id="t1652" class="pln"><span class="str"> Defined fooey as kablooey</span><span class="strut"> </span></p> -<p id="t1653" class="pln"><span class="str"> --[[[end]]]</span><span class="strut"> </span></p> -<p id="t1654" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1650" class="pln"> <span class="str">'test.kablooey'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1651" class="pln"><span class="str"> --[[[cog cog.outl("Defined fooey as " + fooey) ]]]</span><span class="strut"> </span></p> +<p id="t1652" class="pln"><span class="str"> Defined fooey as kablooey</span><span class="strut"> </span></p> +<p id="t1653" class="pln"><span class="str"> --[[[end]]]</span><span class="strut"> </span></p> +<p id="t1654" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t1655" class="pln"><span class="strut"> </span></p> -<p id="t1656" class="pln"> <span class="str">'test.einstein'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1657" class="pln"><span class="str"> --[[[cog cog.outl("Defined fooey as " + fooey) ]]]</span><span class="strut"> </span></p> -<p id="t1658" class="pln"><span class="str"> Defined fooey as e=mc2</span><span class="strut"> </span></p> -<p id="t1659" class="pln"><span class="str"> --[[[end]]]</span><span class="strut"> </span></p> -<p id="t1660" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t1661" class="pln"> <span class="op">}</span><span class="strut"> </span></p> +<p id="t1656" class="pln"> <span class="str">'test.einstein'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1657" class="pln"><span class="str"> --[[[cog cog.outl("Defined fooey as " + fooey) ]]]</span><span class="strut"> </span></p> +<p id="t1658" class="pln"><span class="str"> Defined fooey as e=mc2</span><span class="strut"> </span></p> +<p id="t1659" class="pln"><span class="str"> --[[[end]]]</span><span class="strut"> </span></p> +<p id="t1660" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1661" class="pln"> <span class="op">}</span><span class="strut"> </span></p> <p id="t1662" class="pln"><span class="strut"> </span></p> -<p id="t1663" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1664" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-D'</span><span class="op">,</span> <span class="str">'fooey=kablooey'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1665" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test.kablooey'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1666" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1667" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-Dfooey=kablooey'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1668" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test.kablooey'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1669" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1670" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-Dfooey=e=mc2'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1671" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test.einstein'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1672" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1673" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-Dbar=quux'</span><span class="op">,</span> <span class="str">'-Dfooey=kablooey'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1674" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test.kablooey'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1675" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1676" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-Dfooey=kablooey'</span><span class="op">,</span> <span class="str">'-Dbar=quux'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1677" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test.kablooey'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1678" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1679" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-Dfooey=gooey'</span><span class="op">,</span> <span class="str">'-Dfooey=kablooey'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1680" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test.kablooey'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1663" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1664" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-D'</span><span class="op">,</span> <span class="str">'fooey=kablooey'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1665" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test.kablooey'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1666" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1667" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-Dfooey=kablooey'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1668" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test.kablooey'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1669" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1670" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-Dfooey=e=mc2'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1671" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test.einstein'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1672" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1673" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-Dbar=quux'</span><span class="op">,</span> <span class="str">'-Dfooey=kablooey'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1674" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test.kablooey'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1675" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1676" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-Dfooey=kablooey'</span><span class="op">,</span> <span class="str">'-Dbar=quux'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1677" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test.kablooey'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1678" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1679" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-Dfooey=gooey'</span><span class="op">,</span> <span class="str">'-Dfooey=kablooey'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1680" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test.kablooey'</span><span class="op">)</span><span class="strut"> </span></p> <p id="t1681" class="pln"><span class="strut"> </span></p> -<p id="t1682" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testOutputToStdout</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1683" class="stm mis"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t1684" class="pln"> <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1685" class="pln"><span class="str"> --[[[cog cog.outl('Hey there!') ]]]</span><span class="strut"> </span></p> -<p id="t1686" class="pln"><span class="str"> --[[[end]]]</span><span class="strut"> </span></p> -<p id="t1687" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t1688" class="pln"> <span class="op">}</span><span class="strut"> </span></p> +<p id="t1682" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testOutputToStdout</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1683" class="stm run hide_run"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t1684" class="pln"> <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1685" class="pln"><span class="str"> --[[[cog cog.outl('Hey there!') ]]]</span><span class="strut"> </span></p> +<p id="t1686" class="pln"><span class="str"> --[[[end]]]</span><span class="strut"> </span></p> +<p id="t1687" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t1688" class="pln"> <span class="op">}</span><span class="strut"> </span></p> <p id="t1689" class="pln"><span class="strut"> </span></p> -<p id="t1690" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1691" class="stm mis"> <span class="nam">stderr</span> <span class="op">=</span> <span class="nam">StringIO</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1692" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">setOutput</span><span class="op">(</span><span class="nam">stderr</span><span class="op">=</span><span class="nam">stderr</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1693" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1694" class="stm mis"> <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1695" class="stm mis"> <span class="nam">outerr</span> <span class="op">=</span> <span class="nam">stderr</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1696" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">output</span><span class="op">,</span> <span class="str">"--[[[cog cog.outl('Hey there!') ]]]\nHey there!\n--[[[end]]]\n"</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1697" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">outerr</span><span class="op">,</span> <span class="str">""</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1690" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1691" class="stm run hide_run"> <span class="nam">stderr</span> <span class="op">=</span> <span class="nam">StringIO</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1692" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">setOutput</span><span class="op">(</span><span class="nam">stderr</span><span class="op">=</span><span class="nam">stderr</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1693" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1694" class="stm run hide_run"> <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1695" class="stm run hide_run"> <span class="nam">outerr</span> <span class="op">=</span> <span class="nam">stderr</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1696" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">output</span><span class="op">,</span> <span class="str">"--[[[cog cog.outl('Hey there!') ]]]\nHey there!\n--[[[end]]]\n"</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1697" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">outerr</span><span class="op">,</span> <span class="str">""</span><span class="op">)</span><span class="strut"> </span></p> <p id="t1698" class="pln"><span class="strut"> </span></p> -<p id="t1699" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testReadFromStdin</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1700" class="stm mis"> <span class="nam">stdin</span> <span class="op">=</span> <span class="nam">StringIO</span><span class="op">(</span><span class="str">"--[[[cog cog.outl('Wow') ]]]\n--[[[end]]]\n"</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1701" class="stm mis"> <span class="key">def</span> <span class="nam">restore_stdin</span><span class="op">(</span><span class="nam">old_stdin</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1702" class="stm mis"> <span class="nam">sys</span><span class="op">.</span><span class="nam">stdin</span> <span class="op">=</span> <span class="nam">old_stdin</span><span class="strut"> </span></p> -<p id="t1703" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">addCleanup</span><span class="op">(</span><span class="nam">restore_stdin</span><span class="op">,</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">stdin</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1704" class="stm mis"> <span class="nam">sys</span><span class="op">.</span><span class="nam">stdin</span> <span class="op">=</span> <span class="nam">stdin</span><span class="strut"> </span></p> +<p id="t1699" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testReadFromStdin</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1700" class="stm run hide_run"> <span class="nam">stdin</span> <span class="op">=</span> <span class="nam">StringIO</span><span class="op">(</span><span class="str">"--[[[cog cog.outl('Wow') ]]]\n--[[[end]]]\n"</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1701" class="stm run hide_run"> <span class="key">def</span> <span class="nam">restore_stdin</span><span class="op">(</span><span class="nam">old_stdin</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1702" class="stm run hide_run"> <span class="nam">sys</span><span class="op">.</span><span class="nam">stdin</span> <span class="op">=</span> <span class="nam">old_stdin</span><span class="strut"> </span></p> +<p id="t1703" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">addCleanup</span><span class="op">(</span><span class="nam">restore_stdin</span><span class="op">,</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">stdin</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1704" class="stm run hide_run"> <span class="nam">sys</span><span class="op">.</span><span class="nam">stdin</span> <span class="op">=</span> <span class="nam">stdin</span><span class="strut"> </span></p> <p id="t1705" class="pln"><span class="strut"> </span></p> -<p id="t1706" class="stm mis"> <span class="nam">stderr</span> <span class="op">=</span> <span class="nam">StringIO</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1707" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">setOutput</span><span class="op">(</span><span class="nam">stderr</span><span class="op">=</span><span class="nam">stderr</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1708" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1709" class="stm mis"> <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1710" class="stm mis"> <span class="nam">outerr</span> <span class="op">=</span> <span class="nam">stderr</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1711" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">output</span><span class="op">,</span> <span class="str">"--[[[cog cog.outl('Wow') ]]]\nWow\n--[[[end]]]\n"</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1712" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">outerr</span><span class="op">,</span> <span class="str">""</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1706" class="stm run hide_run"> <span class="nam">stderr</span> <span class="op">=</span> <span class="nam">StringIO</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1707" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">setOutput</span><span class="op">(</span><span class="nam">stderr</span><span class="op">=</span><span class="nam">stderr</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1708" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1709" class="stm run hide_run"> <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1710" class="stm run hide_run"> <span class="nam">outerr</span> <span class="op">=</span> <span class="nam">stderr</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1711" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">output</span><span class="op">,</span> <span class="str">"--[[[cog cog.outl('Wow') ]]]\nWow\n--[[[end]]]\n"</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1712" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">outerr</span><span class="op">,</span> <span class="str">""</span><span class="op">)</span><span class="strut"> </span></p> <p id="t1713" class="pln"><span class="strut"> </span></p> <p id="t1714" class="pln"><span class="strut"> </span></p> -<p id="t1715" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testSuffixOutputLines</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1716" class="stm mis"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t1717" class="pln"> <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1718" class="pln"><span class="str"> Hey there.</span><span class="strut"> </span></p> -<p id="t1719" class="pln"><span class="str"> ;[[[cog cog.outl('a\\nb\\n \\nc') ]]]</span><span class="strut"> </span></p> -<p id="t1720" class="pln"><span class="str"> ;[[[end]]]</span><span class="strut"> </span></p> -<p id="t1721" class="pln"><span class="str"> Good bye.</span><span class="strut"> </span></p> -<p id="t1722" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1715" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testSuffixOutputLines</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1716" class="stm run hide_run"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t1717" class="pln"> <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1718" class="pln"><span class="str"> Hey there.</span><span class="strut"> </span></p> +<p id="t1719" class="pln"><span class="str"> ;[[[cog cog.outl('a\\nb\\n \\nc') ]]]</span><span class="strut"> </span></p> +<p id="t1720" class="pln"><span class="str"> ;[[[end]]]</span><span class="strut"> </span></p> +<p id="t1721" class="pln"><span class="str"> Good bye.</span><span class="strut"> </span></p> +<p id="t1722" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t1723" class="pln"><span class="strut"> </span></p> -<p id="t1724" class="pln"> <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1725" class="pln"><span class="str"> Hey there.</span><span class="strut"> </span></p> -<p id="t1726" class="pln"><span class="str"> ;[[[cog cog.outl('a\\nb\\n \\nc') ]]]</span><span class="strut"> </span></p> -<p id="t1727" class="pln"><span class="str"> a (foo)</span><span class="strut"> </span></p> -<p id="t1728" class="pln"><span class="str"> b (foo)</span><span class="strut"> </span></p> -<p id="t1729" class="pln"><span class="str"> """</span> <span class="com"># These three trailing spaces are important.</span><span class="strut"> </span></p> -<p id="t1730" class="pln"> <span class="com"># The suffix is not applied to completely blank lines.</span><span class="strut"> </span></p> -<p id="t1731" class="pln"> <span class="str">"""</span><span class="strut"> </span></p> -<p id="t1732" class="pln"><span class="str"> c (foo)</span><span class="strut"> </span></p> -<p id="t1733" class="pln"><span class="str"> ;[[[end]]]</span><span class="strut"> </span></p> -<p id="t1734" class="pln"><span class="str"> Good bye.</span><span class="strut"> </span></p> -<p id="t1735" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t1736" class="pln"> <span class="op">}</span><span class="strut"> </span></p> +<p id="t1724" class="pln"> <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1725" class="pln"><span class="str"> Hey there.</span><span class="strut"> </span></p> +<p id="t1726" class="pln"><span class="str"> ;[[[cog cog.outl('a\\nb\\n \\nc') ]]]</span><span class="strut"> </span></p> +<p id="t1727" class="pln"><span class="str"> a (foo)</span><span class="strut"> </span></p> +<p id="t1728" class="pln"><span class="str"> b (foo)</span><span class="strut"> </span></p> +<p id="t1729" class="pln"><span class="str"> """</span> <span class="com"># These three trailing spaces are important.</span><span class="strut"> </span></p> +<p id="t1730" class="pln"> <span class="com"># The suffix is not applied to completely blank lines.</span><span class="strut"> </span></p> +<p id="t1731" class="pln"> <span class="str">"""</span><span class="strut"> </span></p> +<p id="t1732" class="pln"><span class="str"> c (foo)</span><span class="strut"> </span></p> +<p id="t1733" class="pln"><span class="str"> ;[[[end]]]</span><span class="strut"> </span></p> +<p id="t1734" class="pln"><span class="str"> Good bye.</span><span class="strut"> </span></p> +<p id="t1735" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1736" class="pln"> <span class="op">}</span><span class="strut"> </span></p> <p id="t1737" class="pln"><span class="strut"> </span></p> -<p id="t1738" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1739" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-s'</span><span class="op">,</span> <span class="str">' (foo)'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1740" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test.out'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1738" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1739" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-s'</span><span class="op">,</span> <span class="str">' (foo)'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1740" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test.out'</span><span class="op">)</span><span class="strut"> </span></p> <p id="t1741" class="pln"><span class="strut"> </span></p> -<p id="t1742" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testEmptySuffix</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1743" class="stm mis"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t1744" class="pln"> <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1745" class="pln"><span class="str"> ;[[[cog cog.outl('a\\nb\\nc') ]]]</span><span class="strut"> </span></p> -<p id="t1746" class="pln"><span class="str"> ;[[[end]]]</span><span class="strut"> </span></p> -<p id="t1747" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1742" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testEmptySuffix</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1743" class="stm run hide_run"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t1744" class="pln"> <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1745" class="pln"><span class="str"> ;[[[cog cog.outl('a\\nb\\nc') ]]]</span><span class="strut"> </span></p> +<p id="t1746" class="pln"><span class="str"> ;[[[end]]]</span><span class="strut"> </span></p> +<p id="t1747" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t1748" class="pln"><span class="strut"> </span></p> -<p id="t1749" class="pln"> <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1750" class="pln"><span class="str"> ;[[[cog cog.outl('a\\nb\\nc') ]]]</span><span class="strut"> </span></p> -<p id="t1751" class="pln"><span class="str"> a</span><span class="strut"> </span></p> -<p id="t1752" class="pln"><span class="str"> b</span><span class="strut"> </span></p> -<p id="t1753" class="pln"><span class="str"> c</span><span class="strut"> </span></p> -<p id="t1754" class="pln"><span class="str"> ;[[[end]]]</span><span class="strut"> </span></p> -<p id="t1755" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t1756" class="pln"> <span class="op">}</span><span class="strut"> </span></p> +<p id="t1749" class="pln"> <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1750" class="pln"><span class="str"> ;[[[cog cog.outl('a\\nb\\nc') ]]]</span><span class="strut"> </span></p> +<p id="t1751" class="pln"><span class="str"> a</span><span class="strut"> </span></p> +<p id="t1752" class="pln"><span class="str"> b</span><span class="strut"> </span></p> +<p id="t1753" class="pln"><span class="str"> c</span><span class="strut"> </span></p> +<p id="t1754" class="pln"><span class="str"> ;[[[end]]]</span><span class="strut"> </span></p> +<p id="t1755" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1756" class="pln"> <span class="op">}</span><span class="strut"> </span></p> <p id="t1757" class="pln"><span class="strut"> </span></p> -<p id="t1758" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1759" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-s'</span><span class="op">,</span> <span class="str">''</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1760" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test.out'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1758" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1759" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-s'</span><span class="op">,</span> <span class="str">''</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1760" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test.out'</span><span class="op">)</span><span class="strut"> </span></p> <p id="t1761" class="pln"><span class="strut"> </span></p> -<p id="t1762" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testHellishSuffix</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1763" class="stm mis"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t1764" class="pln"> <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1765" class="pln"><span class="str"> ;[[[cog cog.outl('a\\n\\nb') ]]]</span><span class="strut"> </span></p> -<p id="t1766" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1762" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testHellishSuffix</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1763" class="stm run hide_run"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t1764" class="pln"> <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1765" class="pln"><span class="str"> ;[[[cog cog.outl('a\\n\\nb') ]]]</span><span class="strut"> </span></p> +<p id="t1766" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t1767" class="pln"><span class="strut"> </span></p> -<p id="t1768" class="pln"> <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1769" class="pln"><span class="str"> ;[[[cog cog.outl('a\\n\\nb') ]]]</span><span class="strut"> </span></p> -<p id="t1770" class="pln"><span class="str"> a /\\n*+([)]><</span><span class="strut"> </span></p> +<p id="t1768" class="pln"> <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1769" class="pln"><span class="str"> ;[[[cog cog.outl('a\\n\\nb') ]]]</span><span class="strut"> </span></p> +<p id="t1770" class="pln"><span class="str"> a /\\n*+([)]><</span><span class="strut"> </span></p> <p id="t1771" class="pln"><span class="strut"> </span></p> -<p id="t1772" class="pln"><span class="str"> b /\\n*+([)]><</span><span class="strut"> </span></p> -<p id="t1773" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t1774" class="pln"> <span class="op">}</span><span class="strut"> </span></p> +<p id="t1772" class="pln"><span class="str"> b /\\n*+([)]><</span><span class="strut"> </span></p> +<p id="t1773" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1774" class="pln"> <span class="op">}</span><span class="strut"> </span></p> <p id="t1775" class="pln"><span class="strut"> </span></p> -<p id="t1776" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1777" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-z'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-s'</span><span class="op">,</span> <span class="str">r' /\n*+([)]><'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1778" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test.out'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1776" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1777" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-z'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-s'</span><span class="op">,</span> <span class="str">r' /\n*+([)]><'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1778" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test.out'</span><span class="op">)</span><span class="strut"> </span></p> <p id="t1779" class="pln"><span class="strut"> </span></p> <p id="t1780" class="pln"><span class="strut"> </span></p> <p id="t1781" class="stm run hide_run"><span class="key">class</span> <span class="nam">WritabilityTests</span><span class="op">(</span><span class="nam">TestCaseWithTempDir</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> <p id="t1782" class="pln"><span class="strut"> </span></p> -<p id="t1783" class="stm run hide_run"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t1784" class="pln"> <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1785" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t1786" class="pln"><span class="str"> for fn in ['DoSomething', 'DoAnotherThing', 'DoLastThing']:</span><span class="strut"> </span></p> -<p id="t1787" class="pln"><span class="str"> cog.outl("void %s();" % fn)</span><span class="strut"> </span></p> -<p id="t1788" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t1789" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t1790" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1783" class="stm run hide_run"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t1784" class="pln"> <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1785" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t1786" class="pln"><span class="str"> for fn in ['DoSomething', 'DoAnotherThing', 'DoLastThing']:</span><span class="strut"> </span></p> +<p id="t1787" class="pln"><span class="str"> cog.outl("void %s();" % fn)</span><span class="strut"> </span></p> +<p id="t1788" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t1789" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t1790" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t1791" class="pln"><span class="strut"> </span></p> -<p id="t1792" class="pln"> <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1793" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t1794" class="pln"><span class="str"> for fn in ['DoSomething', 'DoAnotherThing', 'DoLastThing']:</span><span class="strut"> </span></p> -<p id="t1795" class="pln"><span class="str"> cog.outl("void %s();" % fn)</span><span class="strut"> </span></p> -<p id="t1796" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t1797" class="pln"><span class="str"> void DoSomething();</span><span class="strut"> </span></p> -<p id="t1798" class="pln"><span class="str"> void DoAnotherThing();</span><span class="strut"> </span></p> -<p id="t1799" class="pln"><span class="str"> void DoLastThing();</span><span class="strut"> </span></p> -<p id="t1800" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t1801" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t1802" class="pln"> <span class="op">}</span><span class="strut"> </span></p> +<p id="t1792" class="pln"> <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1793" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t1794" class="pln"><span class="str"> for fn in ['DoSomething', 'DoAnotherThing', 'DoLastThing']:</span><span class="strut"> </span></p> +<p id="t1795" class="pln"><span class="str"> cog.outl("void %s();" % fn)</span><span class="strut"> </span></p> +<p id="t1796" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t1797" class="pln"><span class="str"> void DoSomething();</span><span class="strut"> </span></p> +<p id="t1798" class="pln"><span class="str"> void DoAnotherThing();</span><span class="strut"> </span></p> +<p id="t1799" class="pln"><span class="str"> void DoLastThing();</span><span class="strut"> </span></p> +<p id="t1800" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t1801" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1802" class="pln"> <span class="op">}</span><span class="strut"> </span></p> <p id="t1803" class="pln"><span class="strut"> </span></p> -<p id="t1804" class="exc"> <span class="key">if</span> <span class="nam">os</span><span class="op">.</span><span class="nam">name</span> <span class="op">==</span> <span class="str">'nt'</span><span class="op">:</span> <span class="com">#pragma: no cover</span><span class="strut"> </span></p> -<p id="t1805" class="pln"> <span class="com"># for Windows</span><span class="strut"> </span></p> -<p id="t1806" class="exc"> <span class="nam">cmd_w_args</span> <span class="op">=</span> <span class="str">'attrib -R %s'</span><span class="strut"> </span></p> -<p id="t1807" class="exc"> <span class="nam">cmd_w_asterisk</span> <span class="op">=</span> <span class="str">'attrib -R *'</span><span class="strut"> </span></p> -<p id="t1808" class="exc"> <span class="key">else</span><span class="op">:</span> <span class="com">#pragma: no cover</span><span class="strut"> </span></p> -<p id="t1809" class="pln"> <span class="com"># for unix-like</span><span class="strut"> </span></p> -<p id="t1810" class="exc"> <span class="nam">cmd_w_args</span> <span class="op">=</span> <span class="str">'chmod +w %s'</span><span class="strut"> </span></p> -<p id="t1811" class="exc"> <span class="nam">cmd_w_asterisk</span> <span class="op">=</span> <span class="str">'chmod +w *'</span><span class="strut"> </span></p> +<p id="t1804" class="exc"> <span class="key">if</span> <span class="nam">os</span><span class="op">.</span><span class="nam">name</span> <span class="op">==</span> <span class="str">'nt'</span><span class="op">:</span> <span class="com">#pragma: no cover</span><span class="strut"> </span></p> +<p id="t1805" class="pln"> <span class="com"># for Windows</span><span class="strut"> </span></p> +<p id="t1806" class="exc"> <span class="nam">cmd_w_args</span> <span class="op">=</span> <span class="str">'attrib -R %s'</span><span class="strut"> </span></p> +<p id="t1807" class="exc"> <span class="nam">cmd_w_asterisk</span> <span class="op">=</span> <span class="str">'attrib -R *'</span><span class="strut"> </span></p> +<p id="t1808" class="exc"> <span class="key">else</span><span class="op">:</span> <span class="com">#pragma: no cover</span><span class="strut"> </span></p> +<p id="t1809" class="pln"> <span class="com"># for unix-like</span><span class="strut"> </span></p> +<p id="t1810" class="exc"> <span class="nam">cmd_w_args</span> <span class="op">=</span> <span class="str">'chmod +w %s'</span><span class="strut"> </span></p> +<p id="t1811" class="exc"> <span class="nam">cmd_w_asterisk</span> <span class="op">=</span> <span class="str">'chmod +w *'</span><span class="strut"> </span></p> <p id="t1812" class="pln"><span class="strut"> </span></p> -<p id="t1813" class="stm run hide_run"> <span class="key">def</span> <span class="nam">setUp</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1814" class="stm mis"> <span class="nam">TestCaseWithTempDir</span><span class="op">.</span><span class="nam">setUp</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1815" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1816" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">testcog</span> <span class="op">=</span> <span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1817" class="stm mis"> <span class="nam">os</span><span class="op">.</span><span class="nam">chmod</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">testcog</span><span class="op">,</span> <span class="nam">stat</span><span class="op">.</span><span class="nam">S_IREAD</span><span class="op">)</span> <span class="com"># Make the file readonly.</span><span class="strut"> </span></p> -<p id="t1818" class="stm mis"> <span class="key">assert</span> <span class="key">not</span> <span class="nam">os</span><span class="op">.</span><span class="nam">access</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">testcog</span><span class="op">,</span> <span class="nam">os</span><span class="op">.</span><span class="nam">W_OK</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1813" class="stm run hide_run"> <span class="key">def</span> <span class="nam">setUp</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1814" class="stm run hide_run"> <span class="nam">TestCaseWithTempDir</span><span class="op">.</span><span class="nam">setUp</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1815" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1816" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">testcog</span> <span class="op">=</span> <span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1817" class="stm run hide_run"> <span class="nam">os</span><span class="op">.</span><span class="nam">chmod</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">testcog</span><span class="op">,</span> <span class="nam">stat</span><span class="op">.</span><span class="nam">S_IREAD</span><span class="op">)</span> <span class="com"># Make the file readonly.</span><span class="strut"> </span></p> +<p id="t1818" class="stm run hide_run"> <span class="key">assert</span> <span class="key">not</span> <span class="nam">os</span><span class="op">.</span><span class="nam">access</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">testcog</span><span class="op">,</span> <span class="nam">os</span><span class="op">.</span><span class="nam">W_OK</span><span class="op">)</span><span class="strut"> </span></p> <p id="t1819" class="pln"><span class="strut"> </span></p> -<p id="t1820" class="stm run hide_run"> <span class="key">def</span> <span class="nam">tearDown</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1821" class="stm mis"> <span class="nam">os</span><span class="op">.</span><span class="nam">chmod</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">testcog</span><span class="op">,</span> <span class="nam">stat</span><span class="op">.</span><span class="nam">S_IWRITE</span><span class="op">)</span> <span class="com"># Make the file writable again.</span><span class="strut"> </span></p> -<p id="t1822" class="stm mis"> <span class="nam">TestCaseWithTempDir</span><span class="op">.</span><span class="nam">tearDown</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1820" class="stm run hide_run"> <span class="key">def</span> <span class="nam">tearDown</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1821" class="stm run hide_run"> <span class="nam">os</span><span class="op">.</span><span class="nam">chmod</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">testcog</span><span class="op">,</span> <span class="nam">stat</span><span class="op">.</span><span class="nam">S_IWRITE</span><span class="op">)</span> <span class="com"># Make the file writable again.</span><span class="strut"> </span></p> +<p id="t1822" class="stm run hide_run"> <span class="nam">TestCaseWithTempDir</span><span class="op">.</span><span class="nam">tearDown</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="strut"> </span></p> <p id="t1823" class="pln"><span class="strut"> </span></p> -<p id="t1824" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testReadonlyNoCommand</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1825" class="stm mis"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogError</span><span class="op">,</span> <span class="str">"Can't overwrite test.cog"</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1826" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1827" class="stm mis"> <span class="key">assert</span> <span class="key">not</span> <span class="nam">os</span><span class="op">.</span><span class="nam">access</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">testcog</span><span class="op">,</span> <span class="nam">os</span><span class="op">.</span><span class="nam">W_OK</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1824" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testReadonlyNoCommand</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1825" class="stm run hide_run"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogError</span><span class="op">,</span> <span class="str">"Can't overwrite test.cog"</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1826" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1827" class="stm run hide_run"> <span class="key">assert</span> <span class="key">not</span> <span class="nam">os</span><span class="op">.</span><span class="nam">access</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">testcog</span><span class="op">,</span> <span class="nam">os</span><span class="op">.</span><span class="nam">W_OK</span><span class="op">)</span><span class="strut"> </span></p> <p id="t1828" class="pln"><span class="strut"> </span></p> -<p id="t1829" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testReadonlyWithCommand</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1830" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-w'</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">cmd_w_args</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1831" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test.out'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1832" class="stm mis"> <span class="key">assert</span> <span class="nam">os</span><span class="op">.</span><span class="nam">access</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">testcog</span><span class="op">,</span> <span class="nam">os</span><span class="op">.</span><span class="nam">W_OK</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1829" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testReadonlyWithCommand</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1830" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-w'</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">cmd_w_args</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1831" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test.out'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1832" class="stm run hide_run"> <span class="key">assert</span> <span class="nam">os</span><span class="op">.</span><span class="nam">access</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">testcog</span><span class="op">,</span> <span class="nam">os</span><span class="op">.</span><span class="nam">W_OK</span><span class="op">)</span><span class="strut"> </span></p> <p id="t1833" class="pln"><span class="strut"> </span></p> -<p id="t1834" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testReadonlyWithCommandWithNoSlot</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1835" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-w'</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">cmd_w_asterisk</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1836" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test.out'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1837" class="stm mis"> <span class="key">assert</span> <span class="nam">os</span><span class="op">.</span><span class="nam">access</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">testcog</span><span class="op">,</span> <span class="nam">os</span><span class="op">.</span><span class="nam">W_OK</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1834" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testReadonlyWithCommandWithNoSlot</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1835" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-w'</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">cmd_w_asterisk</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1836" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test.out'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1837" class="stm run hide_run"> <span class="key">assert</span> <span class="nam">os</span><span class="op">.</span><span class="nam">access</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">testcog</span><span class="op">,</span> <span class="nam">os</span><span class="op">.</span><span class="nam">W_OK</span><span class="op">)</span><span class="strut"> </span></p> <p id="t1838" class="pln"><span class="strut"> </span></p> -<p id="t1839" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testReadonlyWithIneffectualCommand</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1840" class="stm mis"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogError</span><span class="op">,</span> <span class="str">"Couldn't make test.cog writable"</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1841" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-w'</span><span class="op">,</span> <span class="str">'echo %s'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1842" class="stm mis"> <span class="key">assert</span> <span class="key">not</span> <span class="nam">os</span><span class="op">.</span><span class="nam">access</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">testcog</span><span class="op">,</span> <span class="nam">os</span><span class="op">.</span><span class="nam">W_OK</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1839" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testReadonlyWithIneffectualCommand</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1840" class="stm run hide_run"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogError</span><span class="op">,</span> <span class="str">"Couldn't make test.cog writable"</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1841" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-w'</span><span class="op">,</span> <span class="str">'echo %s'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1842" class="stm run hide_run"> <span class="key">assert</span> <span class="key">not</span> <span class="nam">os</span><span class="op">.</span><span class="nam">access</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">testcog</span><span class="op">,</span> <span class="nam">os</span><span class="op">.</span><span class="nam">W_OK</span><span class="op">)</span><span class="strut"> </span></p> <p id="t1843" class="pln"><span class="strut"> </span></p> <p id="t1844" class="pln"><span class="strut"> </span></p> <p id="t1845" class="stm run hide_run"><span class="key">class</span> <span class="nam">ChecksumTests</span><span class="op">(</span><span class="nam">TestCaseWithTempDir</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> <p id="t1846" class="pln"><span class="strut"> </span></p> -<p id="t1847" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testCreateChecksumOutput</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1848" class="stm mis"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t1849" class="pln"> <span class="str">'cog1.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1850" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t1851" class="pln"><span class="str"> cog.outl("This line was generated.")</span><span class="strut"> </span></p> -<p id="t1852" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t1853" class="pln"><span class="str"> This line was generated.</span><span class="strut"> </span></p> -<p id="t1854" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t1855" class="pln"><span class="str"> This line was not.</span><span class="strut"> </span></p> -<p id="t1856" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1847" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testCreateChecksumOutput</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1848" class="stm run hide_run"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t1849" class="pln"> <span class="str">'cog1.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1850" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t1851" class="pln"><span class="str"> cog.outl("This line was generated.")</span><span class="strut"> </span></p> +<p id="t1852" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t1853" class="pln"><span class="str"> This line was generated.</span><span class="strut"> </span></p> +<p id="t1854" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t1855" class="pln"><span class="str"> This line was not.</span><span class="strut"> </span></p> +<p id="t1856" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t1857" class="pln"><span class="strut"> </span></p> -<p id="t1858" class="pln"> <span class="str">'cog1.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1859" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t1860" class="pln"><span class="str"> cog.outl("This line was generated.")</span><span class="strut"> </span></p> -<p id="t1861" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t1862" class="pln"><span class="str"> This line was generated.</span><span class="strut"> </span></p> -<p id="t1863" class="pln"><span class="str"> //[[[end]]] (checksum: 8adb13fb59b996a1c7f0065ea9f3d893)</span><span class="strut"> </span></p> -<p id="t1864" class="pln"><span class="str"> This line was not.</span><span class="strut"> </span></p> -<p id="t1865" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t1866" class="pln"> <span class="op">}</span><span class="strut"> </span></p> +<p id="t1858" class="pln"> <span class="str">'cog1.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1859" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t1860" class="pln"><span class="str"> cog.outl("This line was generated.")</span><span class="strut"> </span></p> +<p id="t1861" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t1862" class="pln"><span class="str"> This line was generated.</span><span class="strut"> </span></p> +<p id="t1863" class="pln"><span class="str"> //[[[end]]] (checksum: 8adb13fb59b996a1c7f0065ea9f3d893)</span><span class="strut"> </span></p> +<p id="t1864" class="pln"><span class="str"> This line was not.</span><span class="strut"> </span></p> +<p id="t1865" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1866" class="pln"> <span class="op">}</span><span class="strut"> </span></p> <p id="t1867" class="pln"><span class="strut"> </span></p> -<p id="t1868" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1869" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-c'</span><span class="op">,</span> <span class="str">'cog1.txt'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1870" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'cog1.txt'</span><span class="op">,</span> <span class="str">'cog1.out'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1868" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1869" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-c'</span><span class="op">,</span> <span class="str">'cog1.txt'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1870" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'cog1.txt'</span><span class="op">,</span> <span class="str">'cog1.out'</span><span class="op">)</span><span class="strut"> </span></p> <p id="t1871" class="pln"><span class="strut"> </span></p> -<p id="t1872" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testCheckChecksumOutput</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1873" class="stm mis"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t1874" class="pln"> <span class="str">'cog1.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1875" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t1876" class="pln"><span class="str"> cog.outl("This line was newly")</span><span class="strut"> </span></p> -<p id="t1877" class="pln"><span class="str"> cog.outl("generated by cog")</span><span class="strut"> </span></p> -<p id="t1878" class="pln"><span class="str"> cog.outl("blah blah.")</span><span class="strut"> </span></p> -<p id="t1879" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t1880" class="pln"><span class="str"> This line was generated.</span><span class="strut"> </span></p> -<p id="t1881" class="pln"><span class="str"> //[[[end]]] (checksum: 8adb13fb59b996a1c7f0065ea9f3d893)</span><span class="strut"> </span></p> -<p id="t1882" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1872" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testCheckChecksumOutput</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1873" class="stm run hide_run"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t1874" class="pln"> <span class="str">'cog1.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1875" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t1876" class="pln"><span class="str"> cog.outl("This line was newly")</span><span class="strut"> </span></p> +<p id="t1877" class="pln"><span class="str"> cog.outl("generated by cog")</span><span class="strut"> </span></p> +<p id="t1878" class="pln"><span class="str"> cog.outl("blah blah.")</span><span class="strut"> </span></p> +<p id="t1879" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t1880" class="pln"><span class="str"> This line was generated.</span><span class="strut"> </span></p> +<p id="t1881" class="pln"><span class="str"> //[[[end]]] (checksum: 8adb13fb59b996a1c7f0065ea9f3d893)</span><span class="strut"> </span></p> +<p id="t1882" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t1883" class="pln"><span class="strut"> </span></p> -<p id="t1884" class="pln"> <span class="str">'cog1.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1885" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t1886" class="pln"><span class="str"> cog.outl("This line was newly")</span><span class="strut"> </span></p> -<p id="t1887" class="pln"><span class="str"> cog.outl("generated by cog")</span><span class="strut"> </span></p> -<p id="t1888" class="pln"><span class="str"> cog.outl("blah blah.")</span><span class="strut"> </span></p> -<p id="t1889" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t1890" class="pln"><span class="str"> This line was newly</span><span class="strut"> </span></p> -<p id="t1891" class="pln"><span class="str"> generated by cog</span><span class="strut"> </span></p> -<p id="t1892" class="pln"><span class="str"> blah blah.</span><span class="strut"> </span></p> -<p id="t1893" class="pln"><span class="str"> //[[[end]]] (checksum: a8540982e5ad6b95c9e9a184b26f4346)</span><span class="strut"> </span></p> -<p id="t1894" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t1895" class="pln"> <span class="op">}</span><span class="strut"> </span></p> +<p id="t1884" class="pln"> <span class="str">'cog1.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1885" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t1886" class="pln"><span class="str"> cog.outl("This line was newly")</span><span class="strut"> </span></p> +<p id="t1887" class="pln"><span class="str"> cog.outl("generated by cog")</span><span class="strut"> </span></p> +<p id="t1888" class="pln"><span class="str"> cog.outl("blah blah.")</span><span class="strut"> </span></p> +<p id="t1889" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t1890" class="pln"><span class="str"> This line was newly</span><span class="strut"> </span></p> +<p id="t1891" class="pln"><span class="str"> generated by cog</span><span class="strut"> </span></p> +<p id="t1892" class="pln"><span class="str"> blah blah.</span><span class="strut"> </span></p> +<p id="t1893" class="pln"><span class="str"> //[[[end]]] (checksum: a8540982e5ad6b95c9e9a184b26f4346)</span><span class="strut"> </span></p> +<p id="t1894" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1895" class="pln"> <span class="op">}</span><span class="strut"> </span></p> <p id="t1896" class="pln"><span class="strut"> </span></p> -<p id="t1897" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1898" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-c'</span><span class="op">,</span> <span class="str">'cog1.txt'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1899" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'cog1.txt'</span><span class="op">,</span> <span class="str">'cog1.out'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1897" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1898" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-c'</span><span class="op">,</span> <span class="str">'cog1.txt'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1899" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'cog1.txt'</span><span class="op">,</span> <span class="str">'cog1.out'</span><span class="op">)</span><span class="strut"> </span></p> <p id="t1900" class="pln"><span class="strut"> </span></p> -<p id="t1901" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testRemoveChecksumOutput</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1902" class="stm mis"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t1903" class="pln"> <span class="str">'cog1.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1904" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t1905" class="pln"><span class="str"> cog.outl("This line was newly")</span><span class="strut"> </span></p> -<p id="t1906" class="pln"><span class="str"> cog.outl("generated by cog")</span><span class="strut"> </span></p> -<p id="t1907" class="pln"><span class="str"> cog.outl("blah blah.")</span><span class="strut"> </span></p> -<p id="t1908" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t1909" class="pln"><span class="str"> This line was generated.</span><span class="strut"> </span></p> -<p id="t1910" class="pln"><span class="str"> //[[[end]]] (checksum: 8adb13fb59b996a1c7f0065ea9f3d893) fooey</span><span class="strut"> </span></p> -<p id="t1911" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1901" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testRemoveChecksumOutput</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1902" class="stm run hide_run"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t1903" class="pln"> <span class="str">'cog1.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1904" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t1905" class="pln"><span class="str"> cog.outl("This line was newly")</span><span class="strut"> </span></p> +<p id="t1906" class="pln"><span class="str"> cog.outl("generated by cog")</span><span class="strut"> </span></p> +<p id="t1907" class="pln"><span class="str"> cog.outl("blah blah.")</span><span class="strut"> </span></p> +<p id="t1908" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t1909" class="pln"><span class="str"> This line was generated.</span><span class="strut"> </span></p> +<p id="t1910" class="pln"><span class="str"> //[[[end]]] (checksum: 8adb13fb59b996a1c7f0065ea9f3d893) fooey</span><span class="strut"> </span></p> +<p id="t1911" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t1912" class="pln"><span class="strut"> </span></p> -<p id="t1913" class="pln"> <span class="str">'cog1.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1914" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t1915" class="pln"><span class="str"> cog.outl("This line was newly")</span><span class="strut"> </span></p> -<p id="t1916" class="pln"><span class="str"> cog.outl("generated by cog")</span><span class="strut"> </span></p> -<p id="t1917" class="pln"><span class="str"> cog.outl("blah blah.")</span><span class="strut"> </span></p> -<p id="t1918" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t1919" class="pln"><span class="str"> This line was newly</span><span class="strut"> </span></p> -<p id="t1920" class="pln"><span class="str"> generated by cog</span><span class="strut"> </span></p> -<p id="t1921" class="pln"><span class="str"> blah blah.</span><span class="strut"> </span></p> -<p id="t1922" class="pln"><span class="str"> //[[[end]]] fooey</span><span class="strut"> </span></p> -<p id="t1923" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t1924" class="pln"> <span class="op">}</span><span class="strut"> </span></p> +<p id="t1913" class="pln"> <span class="str">'cog1.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1914" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t1915" class="pln"><span class="str"> cog.outl("This line was newly")</span><span class="strut"> </span></p> +<p id="t1916" class="pln"><span class="str"> cog.outl("generated by cog")</span><span class="strut"> </span></p> +<p id="t1917" class="pln"><span class="str"> cog.outl("blah blah.")</span><span class="strut"> </span></p> +<p id="t1918" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t1919" class="pln"><span class="str"> This line was newly</span><span class="strut"> </span></p> +<p id="t1920" class="pln"><span class="str"> generated by cog</span><span class="strut"> </span></p> +<p id="t1921" class="pln"><span class="str"> blah blah.</span><span class="strut"> </span></p> +<p id="t1922" class="pln"><span class="str"> //[[[end]]] fooey</span><span class="strut"> </span></p> +<p id="t1923" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1924" class="pln"> <span class="op">}</span><span class="strut"> </span></p> <p id="t1925" class="pln"><span class="strut"> </span></p> -<p id="t1926" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1927" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'cog1.txt'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t1928" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'cog1.txt'</span><span class="op">,</span> <span class="str">'cog1.out'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1926" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1927" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'cog1.txt'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t1928" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'cog1.txt'</span><span class="op">,</span> <span class="str">'cog1.out'</span><span class="op">)</span><span class="strut"> </span></p> <p id="t1929" class="pln"><span class="strut"> </span></p> -<p id="t1930" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testTamperedChecksumOutput</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t1931" class="stm mis"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t1932" class="pln"> <span class="str">'cog1.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1933" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t1934" class="pln"><span class="str"> cog.outl("This line was newly")</span><span class="strut"> </span></p> -<p id="t1935" class="pln"><span class="str"> cog.outl("generated by cog")</span><span class="strut"> </span></p> -<p id="t1936" class="pln"><span class="str"> cog.outl("blah blah.")</span><span class="strut"> </span></p> -<p id="t1937" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t1938" class="pln"><span class="str"> Xhis line was newly</span><span class="strut"> </span></p> -<p id="t1939" class="pln"><span class="str"> generated by cog</span><span class="strut"> </span></p> -<p id="t1940" class="pln"><span class="str"> blah blah.</span><span class="strut"> </span></p> -<p id="t1941" class="pln"><span class="str"> //[[[end]]] (checksum: a8540982e5ad6b95c9e9a184b26f4346)</span><span class="strut"> </span></p> -<p id="t1942" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1930" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testTamperedChecksumOutput</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t1931" class="stm run hide_run"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t1932" class="pln"> <span class="str">'cog1.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1933" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t1934" class="pln"><span class="str"> cog.outl("This line was newly")</span><span class="strut"> </span></p> +<p id="t1935" class="pln"><span class="str"> cog.outl("generated by cog")</span><span class="strut"> </span></p> +<p id="t1936" class="pln"><span class="str"> cog.outl("blah blah.")</span><span class="strut"> </span></p> +<p id="t1937" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t1938" class="pln"><span class="str"> Xhis line was newly</span><span class="strut"> </span></p> +<p id="t1939" class="pln"><span class="str"> generated by cog</span><span class="strut"> </span></p> +<p id="t1940" class="pln"><span class="str"> blah blah.</span><span class="strut"> </span></p> +<p id="t1941" class="pln"><span class="str"> //[[[end]]] (checksum: a8540982e5ad6b95c9e9a184b26f4346)</span><span class="strut"> </span></p> +<p id="t1942" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t1943" class="pln"><span class="strut"> </span></p> -<p id="t1944" class="pln"> <span class="str">'cog2.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1945" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t1946" class="pln"><span class="str"> cog.outl("This line was newly")</span><span class="strut"> </span></p> -<p id="t1947" class="pln"><span class="str"> cog.outl("generated by cog")</span><span class="strut"> </span></p> -<p id="t1948" class="pln"><span class="str"> cog.outl("blah blah.")</span><span class="strut"> </span></p> -<p id="t1949" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t1950" class="pln"><span class="str"> This line was newly</span><span class="strut"> </span></p> -<p id="t1951" class="pln"><span class="str"> generated by cog</span><span class="strut"> </span></p> -<p id="t1952" class="pln"><span class="str"> blah blah!</span><span class="strut"> </span></p> -<p id="t1953" class="pln"><span class="str"> //[[[end]]] (checksum: a8540982e5ad6b95c9e9a184b26f4346)</span><span class="strut"> </span></p> -<p id="t1954" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1944" class="pln"> <span class="str">'cog2.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1945" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t1946" class="pln"><span class="str"> cog.outl("This line was newly")</span><span class="strut"> </span></p> +<p id="t1947" class="pln"><span class="str"> cog.outl("generated by cog")</span><span class="strut"> </span></p> +<p id="t1948" class="pln"><span class="str"> cog.outl("blah blah.")</span><span class="strut"> </span></p> +<p id="t1949" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t1950" class="pln"><span class="str"> This line was newly</span><span class="strut"> </span></p> +<p id="t1951" class="pln"><span class="str"> generated by cog</span><span class="strut"> </span></p> +<p id="t1952" class="pln"><span class="str"> blah blah!</span><span class="strut"> </span></p> +<p id="t1953" class="pln"><span class="str"> //[[[end]]] (checksum: a8540982e5ad6b95c9e9a184b26f4346)</span><span class="strut"> </span></p> +<p id="t1954" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t1955" class="pln"><span class="strut"> </span></p> -<p id="t1956" class="pln"> <span class="str">'cog3.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1957" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t1958" class="pln"><span class="str"> cog.outl("This line was newly")</span><span class="strut"> </span></p> -<p id="t1959" class="pln"><span class="str"> cog.outl("generated by cog")</span><span class="strut"> </span></p> -<p id="t1960" class="pln"><span class="str"> cog.outl("blah blah.")</span><span class="strut"> </span></p> -<p id="t1961" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t1956" class="pln"> <span class="str">'cog3.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1957" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t1958" class="pln"><span class="str"> cog.outl("This line was newly")</span><span class="strut"> </span></p> +<p id="t1959" class="pln"><span class="str"> cog.outl("generated by cog")</span><span class="strut"> </span></p> +<p id="t1960" class="pln"><span class="str"> cog.outl("blah blah.")</span><span class="strut"> </span></p> +<p id="t1961" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> <p id="t1962" class="pln"><span class="strut"> </span></p> -<p id="t1963" class="pln"><span class="str"> This line was newly</span><span class="strut"> </span></p> -<p id="t1964" class="pln"><span class="str"> generated by cog</span><span class="strut"> </span></p> -<p id="t1965" class="pln"><span class="str"> blah blah.</span><span class="strut"> </span></p> -<p id="t1966" class="pln"><span class="str"> //[[[end]]] (checksum: a8540982e5ad6b95c9e9a184b26f4346)</span><span class="strut"> </span></p> -<p id="t1967" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1963" class="pln"><span class="str"> This line was newly</span><span class="strut"> </span></p> +<p id="t1964" class="pln"><span class="str"> generated by cog</span><span class="strut"> </span></p> +<p id="t1965" class="pln"><span class="str"> blah blah.</span><span class="strut"> </span></p> +<p id="t1966" class="pln"><span class="str"> //[[[end]]] (checksum: a8540982e5ad6b95c9e9a184b26f4346)</span><span class="strut"> </span></p> +<p id="t1967" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t1968" class="pln"><span class="strut"> </span></p> -<p id="t1969" class="pln"> <span class="str">'cog4.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1970" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t1971" class="pln"><span class="str"> cog.outl("This line was newly")</span><span class="strut"> </span></p> -<p id="t1972" class="pln"><span class="str"> cog.outl("generated by cog")</span><span class="strut"> </span></p> -<p id="t1973" class="pln"><span class="str"> cog.outl("blah blah.")</span><span class="strut"> </span></p> -<p id="t1974" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t1975" class="pln"><span class="str"> This line was newly</span><span class="strut"> </span></p> -<p id="t1976" class="pln"><span class="str"> generated by cog</span><span class="strut"> </span></p> -<p id="t1977" class="pln"><span class="str"> blah blah..</span><span class="strut"> </span></p> -<p id="t1978" class="pln"><span class="str"> //[[[end]]] (checksum: a8540982e5ad6b95c9e9a184b26f4346)</span><span class="strut"> </span></p> -<p id="t1979" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1969" class="pln"> <span class="str">'cog4.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1970" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t1971" class="pln"><span class="str"> cog.outl("This line was newly")</span><span class="strut"> </span></p> +<p id="t1972" class="pln"><span class="str"> cog.outl("generated by cog")</span><span class="strut"> </span></p> +<p id="t1973" class="pln"><span class="str"> cog.outl("blah blah.")</span><span class="strut"> </span></p> +<p id="t1974" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t1975" class="pln"><span class="str"> This line was newly</span><span class="strut"> </span></p> +<p id="t1976" class="pln"><span class="str"> generated by cog</span><span class="strut"> </span></p> +<p id="t1977" class="pln"><span class="str"> blah blah..</span><span class="strut"> </span></p> +<p id="t1978" class="pln"><span class="str"> //[[[end]]] (checksum: a8540982e5ad6b95c9e9a184b26f4346)</span><span class="strut"> </span></p> +<p id="t1979" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t1980" class="pln"><span class="strut"> </span></p> -<p id="t1981" class="pln"> <span class="str">'cog5.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1982" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t1983" class="pln"><span class="str"> cog.outl("This line was newly")</span><span class="strut"> </span></p> -<p id="t1984" class="pln"><span class="str"> cog.outl("generated by cog")</span><span class="strut"> </span></p> -<p id="t1985" class="pln"><span class="str"> cog.outl("blah blah.")</span><span class="strut"> </span></p> -<p id="t1986" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t1987" class="pln"><span class="str"> This line was newly</span><span class="strut"> </span></p> -<p id="t1988" class="pln"><span class="str"> generated by cog</span><span class="strut"> </span></p> -<p id="t1989" class="pln"><span class="str"> blah blah.</span><span class="strut"> </span></p> -<p id="t1990" class="pln"><span class="str"> extra</span><span class="strut"> </span></p> -<p id="t1991" class="pln"><span class="str"> //[[[end]]] (checksum: a8540982e5ad6b95c9e9a184b26f4346)</span><span class="strut"> </span></p> -<p id="t1992" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t1981" class="pln"> <span class="str">'cog5.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1982" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t1983" class="pln"><span class="str"> cog.outl("This line was newly")</span><span class="strut"> </span></p> +<p id="t1984" class="pln"><span class="str"> cog.outl("generated by cog")</span><span class="strut"> </span></p> +<p id="t1985" class="pln"><span class="str"> cog.outl("blah blah.")</span><span class="strut"> </span></p> +<p id="t1986" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t1987" class="pln"><span class="str"> This line was newly</span><span class="strut"> </span></p> +<p id="t1988" class="pln"><span class="str"> generated by cog</span><span class="strut"> </span></p> +<p id="t1989" class="pln"><span class="str"> blah blah.</span><span class="strut"> </span></p> +<p id="t1990" class="pln"><span class="str"> extra</span><span class="strut"> </span></p> +<p id="t1991" class="pln"><span class="str"> //[[[end]]] (checksum: a8540982e5ad6b95c9e9a184b26f4346)</span><span class="strut"> </span></p> +<p id="t1992" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t1993" class="pln"><span class="strut"> </span></p> -<p id="t1994" class="pln"> <span class="str">'cog6.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t1995" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t1996" class="pln"><span class="str"> cog.outl("This line was newly")</span><span class="strut"> </span></p> -<p id="t1997" class="pln"><span class="str"> cog.outl("generated by cog")</span><span class="strut"> </span></p> -<p id="t1998" class="pln"><span class="str"> cog.outl("blah blah.")</span><span class="strut"> </span></p> -<p id="t1999" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t2000" class="pln"><span class="str"> //[[[end]]] (checksum: a8540982e5ad6b95c9e9a184b26f4346)</span><span class="strut"> </span></p> -<p id="t2001" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t2002" class="pln"> <span class="op">}</span><span class="strut"> </span></p> +<p id="t1994" class="pln"> <span class="str">'cog6.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t1995" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t1996" class="pln"><span class="str"> cog.outl("This line was newly")</span><span class="strut"> </span></p> +<p id="t1997" class="pln"><span class="str"> cog.outl("generated by cog")</span><span class="strut"> </span></p> +<p id="t1998" class="pln"><span class="str"> cog.outl("blah blah.")</span><span class="strut"> </span></p> +<p id="t1999" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t2000" class="pln"><span class="str"> //[[[end]]] (checksum: a8540982e5ad6b95c9e9a184b26f4346)</span><span class="strut"> </span></p> +<p id="t2001" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t2002" class="pln"> <span class="op">}</span><span class="strut"> </span></p> <p id="t2003" class="pln"><span class="strut"> </span></p> -<p id="t2004" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t2005" class="stm mis"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogError</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t2006" class="pln"> <span class="str">r"cog1.txt\(9\): Output has been edited! Delete old checksum to unprotect."</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t2007" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-c'</span><span class="op">,</span> <span class="str">"cog1.txt"</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t2008" class="stm mis"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogError</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t2009" class="pln"> <span class="str">r"cog2.txt\(9\): Output has been edited! Delete old checksum to unprotect."</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t2010" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-c'</span><span class="op">,</span> <span class="str">"cog2.txt"</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t2011" class="stm mis"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogError</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t2012" class="pln"> <span class="str">r"cog3.txt\(10\): Output has been edited! Delete old checksum to unprotect."</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t2013" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-c'</span><span class="op">,</span> <span class="str">"cog3.txt"</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t2014" class="stm mis"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogError</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t2015" class="pln"> <span class="str">r"cog4.txt\(9\): Output has been edited! Delete old checksum to unprotect."</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t2016" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-c'</span><span class="op">,</span> <span class="str">"cog4.txt"</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t2017" class="stm mis"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogError</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t2018" class="pln"> <span class="str">r"cog5.txt\(10\): Output has been edited! Delete old checksum to unprotect."</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t2019" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-c'</span><span class="op">,</span> <span class="str">"cog5.txt"</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t2020" class="stm mis"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogError</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t2021" class="pln"> <span class="str">r"cog6.txt\(6\): Output has been edited! Delete old checksum to unprotect."</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t2022" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-c'</span><span class="op">,</span> <span class="str">"cog6.txt"</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t2004" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t2005" class="stm run hide_run"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogError</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t2006" class="pln"> <span class="str">r"cog1.txt\(9\): Output has been edited! Delete old checksum to unprotect."</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t2007" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-c'</span><span class="op">,</span> <span class="str">"cog1.txt"</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t2008" class="stm run hide_run"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogError</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t2009" class="pln"> <span class="str">r"cog2.txt\(9\): Output has been edited! Delete old checksum to unprotect."</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t2010" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-c'</span><span class="op">,</span> <span class="str">"cog2.txt"</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t2011" class="stm run hide_run"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogError</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t2012" class="pln"> <span class="str">r"cog3.txt\(10\): Output has been edited! Delete old checksum to unprotect."</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t2013" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-c'</span><span class="op">,</span> <span class="str">"cog3.txt"</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t2014" class="stm run hide_run"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogError</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t2015" class="pln"> <span class="str">r"cog4.txt\(9\): Output has been edited! Delete old checksum to unprotect."</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t2016" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-c'</span><span class="op">,</span> <span class="str">"cog4.txt"</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t2017" class="stm run hide_run"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogError</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t2018" class="pln"> <span class="str">r"cog5.txt\(10\): Output has been edited! Delete old checksum to unprotect."</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t2019" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-c'</span><span class="op">,</span> <span class="str">"cog5.txt"</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t2020" class="stm run hide_run"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaisesRegexp</span><span class="op">(</span><span class="nam">CogError</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t2021" class="pln"> <span class="str">r"cog6.txt\(6\): Output has been edited! Delete old checksum to unprotect."</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t2022" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-c'</span><span class="op">,</span> <span class="str">"cog6.txt"</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> <p id="t2023" class="pln"><span class="strut"> </span></p> -<p id="t2024" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testArgvIsntModified</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t2025" class="stm mis"> <span class="nam">argv</span> <span class="op">=</span> <span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-v'</span><span class="op">]</span><span class="strut"> </span></p> -<p id="t2026" class="stm mis"> <span class="nam">orig_argv</span> <span class="op">=</span> <span class="nam">argv</span><span class="op">[</span><span class="op">:</span><span class="op">]</span><span class="strut"> </span></p> -<p id="t2027" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="nam">argv</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t2028" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">argv</span><span class="op">,</span> <span class="nam">orig_argv</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t2024" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testArgvIsntModified</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t2025" class="stm run hide_run"> <span class="nam">argv</span> <span class="op">=</span> <span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-v'</span><span class="op">]</span><span class="strut"> </span></p> +<p id="t2026" class="stm run hide_run"> <span class="nam">orig_argv</span> <span class="op">=</span> <span class="nam">argv</span><span class="op">[</span><span class="op">:</span><span class="op">]</span><span class="strut"> </span></p> +<p id="t2027" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="nam">argv</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t2028" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">argv</span><span class="op">,</span> <span class="nam">orig_argv</span><span class="op">)</span><span class="strut"> </span></p> <p id="t2029" class="pln"><span class="strut"> </span></p> <p id="t2030" class="pln"><span class="strut"> </span></p> <p id="t2031" class="stm run hide_run"><span class="key">class</span> <span class="nam">CustomMarkerTests</span><span class="op">(</span><span class="nam">TestCaseWithTempDir</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> <p id="t2032" class="pln"><span class="strut"> </span></p> -<p id="t2033" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testCustomerMarkers</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t2034" class="stm mis"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t2035" class="pln"> <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t2036" class="pln"><span class="str"> //{{</span><span class="strut"> </span></p> -<p id="t2037" class="pln"><span class="str"> cog.outl("void %s();" % "MyFunction")</span><span class="strut"> </span></p> -<p id="t2038" class="pln"><span class="str"> //}}</span><span class="strut"> </span></p> -<p id="t2039" class="pln"><span class="str"> //{{end}}</span><span class="strut"> </span></p> -<p id="t2040" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t2033" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testCustomerMarkers</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t2034" class="stm run hide_run"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t2035" class="pln"> <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t2036" class="pln"><span class="str"> //{{</span><span class="strut"> </span></p> +<p id="t2037" class="pln"><span class="str"> cog.outl("void %s();" % "MyFunction")</span><span class="strut"> </span></p> +<p id="t2038" class="pln"><span class="str"> //}}</span><span class="strut"> </span></p> +<p id="t2039" class="pln"><span class="str"> //{{end}}</span><span class="strut"> </span></p> +<p id="t2040" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t2041" class="pln"><span class="strut"> </span></p> -<p id="t2042" class="pln"> <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t2043" class="pln"><span class="str"> //{{</span><span class="strut"> </span></p> -<p id="t2044" class="pln"><span class="str"> cog.outl("void %s();" % "MyFunction")</span><span class="strut"> </span></p> -<p id="t2045" class="pln"><span class="str"> //}}</span><span class="strut"> </span></p> -<p id="t2046" class="pln"><span class="str"> void MyFunction();</span><span class="strut"> </span></p> -<p id="t2047" class="pln"><span class="str"> //{{end}}</span><span class="strut"> </span></p> -<p id="t2048" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t2049" class="pln"> <span class="op">}</span><span class="strut"> </span></p> +<p id="t2042" class="pln"> <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t2043" class="pln"><span class="str"> //{{</span><span class="strut"> </span></p> +<p id="t2044" class="pln"><span class="str"> cog.outl("void %s();" % "MyFunction")</span><span class="strut"> </span></p> +<p id="t2045" class="pln"><span class="str"> //}}</span><span class="strut"> </span></p> +<p id="t2046" class="pln"><span class="str"> void MyFunction();</span><span class="strut"> </span></p> +<p id="t2047" class="pln"><span class="str"> //{{end}}</span><span class="strut"> </span></p> +<p id="t2048" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t2049" class="pln"> <span class="op">}</span><span class="strut"> </span></p> <p id="t2050" class="pln"><span class="strut"> </span></p> -<p id="t2051" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t2052" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="strut"> </span></p> -<p id="t2053" class="pln"> <span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t2054" class="pln"> <span class="str">'--markers={{ }} {{end}}'</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t2055" class="pln"> <span class="str">'test.cog'</span><span class="strut"> </span></p> -<p id="t2056" class="pln"> <span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t2057" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test.out'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t2051" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t2052" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="strut"> </span></p> +<p id="t2053" class="pln"> <span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t2054" class="pln"> <span class="str">'--markers={{ }} {{end}}'</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t2055" class="pln"> <span class="str">'test.cog'</span><span class="strut"> </span></p> +<p id="t2056" class="pln"> <span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t2057" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test.out'</span><span class="op">)</span><span class="strut"> </span></p> <p id="t2058" class="pln"><span class="strut"> </span></p> -<p id="t2059" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testTrulyWackyMarkers</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t2060" class="pln"> <span class="com"># Make sure the markers are properly re-escaped.</span><span class="strut"> </span></p> -<p id="t2061" class="stm mis"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t2062" class="pln"> <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t2063" class="pln"><span class="str"> //**(</span><span class="strut"> </span></p> -<p id="t2064" class="pln"><span class="str"> cog.outl("void %s();" % "MyFunction")</span><span class="strut"> </span></p> -<p id="t2065" class="pln"><span class="str"> //**)</span><span class="strut"> </span></p> -<p id="t2066" class="pln"><span class="str"> //**(end)**</span><span class="strut"> </span></p> -<p id="t2067" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t2059" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testTrulyWackyMarkers</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t2060" class="pln"> <span class="com"># Make sure the markers are properly re-escaped.</span><span class="strut"> </span></p> +<p id="t2061" class="stm run hide_run"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t2062" class="pln"> <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t2063" class="pln"><span class="str"> //**(</span><span class="strut"> </span></p> +<p id="t2064" class="pln"><span class="str"> cog.outl("void %s();" % "MyFunction")</span><span class="strut"> </span></p> +<p id="t2065" class="pln"><span class="str"> //**)</span><span class="strut"> </span></p> +<p id="t2066" class="pln"><span class="str"> //**(end)**</span><span class="strut"> </span></p> +<p id="t2067" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t2068" class="pln"><span class="strut"> </span></p> -<p id="t2069" class="pln"> <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t2070" class="pln"><span class="str"> //**(</span><span class="strut"> </span></p> -<p id="t2071" class="pln"><span class="str"> cog.outl("void %s();" % "MyFunction")</span><span class="strut"> </span></p> -<p id="t2072" class="pln"><span class="str"> //**)</span><span class="strut"> </span></p> -<p id="t2073" class="pln"><span class="str"> void MyFunction();</span><span class="strut"> </span></p> -<p id="t2074" class="pln"><span class="str"> //**(end)**</span><span class="strut"> </span></p> -<p id="t2075" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t2076" class="pln"> <span class="op">}</span><span class="strut"> </span></p> +<p id="t2069" class="pln"> <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t2070" class="pln"><span class="str"> //**(</span><span class="strut"> </span></p> +<p id="t2071" class="pln"><span class="str"> cog.outl("void %s();" % "MyFunction")</span><span class="strut"> </span></p> +<p id="t2072" class="pln"><span class="str"> //**)</span><span class="strut"> </span></p> +<p id="t2073" class="pln"><span class="str"> void MyFunction();</span><span class="strut"> </span></p> +<p id="t2074" class="pln"><span class="str"> //**(end)**</span><span class="strut"> </span></p> +<p id="t2075" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t2076" class="pln"> <span class="op">}</span><span class="strut"> </span></p> <p id="t2077" class="pln"><span class="strut"> </span></p> -<p id="t2078" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t2079" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="strut"> </span></p> -<p id="t2080" class="pln"> <span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t2081" class="pln"> <span class="str">'--markers=**( **) **(end)**'</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t2082" class="pln"> <span class="str">'test.cog'</span><span class="strut"> </span></p> -<p id="t2083" class="pln"> <span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t2084" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test.out'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t2078" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t2079" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="strut"> </span></p> +<p id="t2080" class="pln"> <span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t2081" class="pln"> <span class="str">'--markers=**( **) **(end)**'</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t2082" class="pln"> <span class="str">'test.cog'</span><span class="strut"> </span></p> +<p id="t2083" class="pln"> <span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t2084" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test.out'</span><span class="op">)</span><span class="strut"> </span></p> <p id="t2085" class="pln"><span class="strut"> </span></p> -<p id="t2086" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testChangeJustOneMarker</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t2087" class="stm mis"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t2088" class="pln"> <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t2089" class="pln"><span class="str"> //**(</span><span class="strut"> </span></p> -<p id="t2090" class="pln"><span class="str"> cog.outl("void %s();" % "MyFunction")</span><span class="strut"> </span></p> -<p id="t2091" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t2092" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t2093" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t2086" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testChangeJustOneMarker</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t2087" class="stm run hide_run"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t2088" class="pln"> <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t2089" class="pln"><span class="str"> //**(</span><span class="strut"> </span></p> +<p id="t2090" class="pln"><span class="str"> cog.outl("void %s();" % "MyFunction")</span><span class="strut"> </span></p> +<p id="t2091" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t2092" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t2093" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t2094" class="pln"><span class="strut"> </span></p> -<p id="t2095" class="pln"> <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t2096" class="pln"><span class="str"> //**(</span><span class="strut"> </span></p> -<p id="t2097" class="pln"><span class="str"> cog.outl("void %s();" % "MyFunction")</span><span class="strut"> </span></p> -<p id="t2098" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t2099" class="pln"><span class="str"> void MyFunction();</span><span class="strut"> </span></p> -<p id="t2100" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t2101" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t2102" class="pln"> <span class="op">}</span><span class="strut"> </span></p> +<p id="t2095" class="pln"> <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t2096" class="pln"><span class="str"> //**(</span><span class="strut"> </span></p> +<p id="t2097" class="pln"><span class="str"> cog.outl("void %s();" % "MyFunction")</span><span class="strut"> </span></p> +<p id="t2098" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t2099" class="pln"><span class="str"> void MyFunction();</span><span class="strut"> </span></p> +<p id="t2100" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t2101" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t2102" class="pln"> <span class="op">}</span><span class="strut"> </span></p> <p id="t2103" class="pln"><span class="strut"> </span></p> -<p id="t2104" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t2105" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="strut"> </span></p> -<p id="t2106" class="pln"> <span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t2107" class="pln"> <span class="str">'--markers=**( ]]] [[[end]]]'</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t2108" class="pln"> <span class="str">'test.cog'</span><span class="strut"> </span></p> -<p id="t2109" class="pln"> <span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t2110" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test.out'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t2104" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t2105" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="strut"> </span></p> +<p id="t2106" class="pln"> <span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t2107" class="pln"> <span class="str">'--markers=**( ]]] [[[end]]]'</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t2108" class="pln"> <span class="str">'test.cog'</span><span class="strut"> </span></p> +<p id="t2109" class="pln"> <span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t2110" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test.out'</span><span class="op">)</span><span class="strut"> </span></p> <p id="t2111" class="pln"><span class="strut"> </span></p> <p id="t2112" class="pln"><span class="strut"> </span></p> <p id="t2113" class="stm run hide_run"><span class="key">class</span> <span class="nam">BlakeTests</span><span class="op">(</span><span class="nam">TestCaseWithTempDir</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> <p id="t2114" class="pln"><span class="strut"> </span></p> -<p id="t2115" class="pln"> <span class="com"># Blake Winton's contributions.</span><span class="strut"> </span></p> -<p id="t2116" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testDeleteCode</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t2117" class="pln"> <span class="com"># -o sets the output file.</span><span class="strut"> </span></p> -<p id="t2118" class="stm mis"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t2119" class="pln"> <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t2120" class="pln"><span class="str"> // This is my C++ file.</span><span class="strut"> </span></p> -<p id="t2121" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t2122" class="pln"><span class="str"> fnames = ['DoSomething', 'DoAnotherThing', 'DoLastThing']</span><span class="strut"> </span></p> -<p id="t2123" class="pln"><span class="str"> for fn in fnames:</span><span class="strut"> </span></p> -<p id="t2124" class="pln"><span class="str"> cog.outl("void %s();" % fn)</span><span class="strut"> </span></p> -<p id="t2125" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t2126" class="pln"><span class="str"> Some Sample Code Here</span><span class="strut"> </span></p> -<p id="t2127" class="pln"><span class="str"> //[[[end]]]Data Data</span><span class="strut"> </span></p> -<p id="t2128" class="pln"><span class="str"> And Some More</span><span class="strut"> </span></p> -<p id="t2129" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t2115" class="pln"> <span class="com"># Blake Winton's contributions.</span><span class="strut"> </span></p> +<p id="t2116" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testDeleteCode</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t2117" class="pln"> <span class="com"># -o sets the output file.</span><span class="strut"> </span></p> +<p id="t2118" class="stm run hide_run"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t2119" class="pln"> <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t2120" class="pln"><span class="str"> // This is my C++ file.</span><span class="strut"> </span></p> +<p id="t2121" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t2122" class="pln"><span class="str"> fnames = ['DoSomething', 'DoAnotherThing', 'DoLastThing']</span><span class="strut"> </span></p> +<p id="t2123" class="pln"><span class="str"> for fn in fnames:</span><span class="strut"> </span></p> +<p id="t2124" class="pln"><span class="str"> cog.outl("void %s();" % fn)</span><span class="strut"> </span></p> +<p id="t2125" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t2126" class="pln"><span class="str"> Some Sample Code Here</span><span class="strut"> </span></p> +<p id="t2127" class="pln"><span class="str"> //[[[end]]]Data Data</span><span class="strut"> </span></p> +<p id="t2128" class="pln"><span class="str"> And Some More</span><span class="strut"> </span></p> +<p id="t2129" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> <p id="t2130" class="pln"><span class="strut"> </span></p> -<p id="t2131" class="pln"> <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t2132" class="pln"><span class="str"> // This is my C++ file.</span><span class="strut"> </span></p> -<p id="t2133" class="pln"><span class="str"> void DoSomething();</span><span class="strut"> </span></p> -<p id="t2134" class="pln"><span class="str"> void DoAnotherThing();</span><span class="strut"> </span></p> -<p id="t2135" class="pln"><span class="str"> void DoLastThing();</span><span class="strut"> </span></p> -<p id="t2136" class="pln"><span class="str"> And Some More</span><span class="strut"> </span></p> -<p id="t2137" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t2138" class="pln"> <span class="op">}</span><span class="strut"> </span></p> +<p id="t2131" class="pln"> <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t2132" class="pln"><span class="str"> // This is my C++ file.</span><span class="strut"> </span></p> +<p id="t2133" class="pln"><span class="str"> void DoSomething();</span><span class="strut"> </span></p> +<p id="t2134" class="pln"><span class="str"> void DoAnotherThing();</span><span class="strut"> </span></p> +<p id="t2135" class="pln"><span class="str"> void DoLastThing();</span><span class="strut"> </span></p> +<p id="t2136" class="pln"><span class="str"> And Some More</span><span class="strut"> </span></p> +<p id="t2137" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t2138" class="pln"> <span class="op">}</span><span class="strut"> </span></p> <p id="t2139" class="pln"><span class="strut"> </span></p> -<p id="t2140" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t2141" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-d'</span><span class="op">,</span> <span class="str">'-o'</span><span class="op">,</span> <span class="str">'test.cogged'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t2142" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cogged'</span><span class="op">,</span> <span class="str">'test.out'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t2140" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t2141" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-d'</span><span class="op">,</span> <span class="str">'-o'</span><span class="op">,</span> <span class="str">'test.cogged'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t2142" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cogged'</span><span class="op">,</span> <span class="str">'test.out'</span><span class="op">)</span><span class="strut"> </span></p> <p id="t2143" class="pln"><span class="strut"> </span></p> -<p id="t2144" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testDeleteCodeWithDashRFails</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t2145" class="stm mis"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t2146" class="pln"> <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t2147" class="pln"><span class="str"> // This is my C++ file.</span><span class="strut"> </span></p> -<p id="t2148" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t2149" class="pln"> <span class="op">}</span><span class="strut"> </span></p> +<p id="t2144" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testDeleteCodeWithDashRFails</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t2145" class="stm run hide_run"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t2146" class="pln"> <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t2147" class="pln"><span class="str"> // This is my C++ file.</span><span class="strut"> </span></p> +<p id="t2148" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t2149" class="pln"> <span class="op">}</span><span class="strut"> </span></p> <p id="t2150" class="pln"><span class="strut"> </span></p> -<p id="t2151" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t2152" class="stm mis"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogUsageError</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t2153" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-d'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t2151" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t2152" class="stm run hide_run"> <span class="key">with</span> <span class="nam">self</span><span class="op">.</span><span class="nam">assertRaises</span><span class="op">(</span><span class="nam">CogUsageError</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t2153" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">callableMain</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'-d'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> <p id="t2154" class="pln"><span class="strut"> </span></p> -<p id="t2155" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testSettingGlobals</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t2156" class="pln"> <span class="com"># Blake Winton contributed a way to set the globals that will be used in</span><span class="strut"> </span></p> -<p id="t2157" class="pln"> <span class="com"># processFile().</span><span class="strut"> </span></p> -<p id="t2158" class="stm mis"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t2159" class="pln"> <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t2160" class="pln"><span class="str"> // This is my C++ file.</span><span class="strut"> </span></p> -<p id="t2161" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t2162" class="pln"><span class="str"> for fn in fnames:</span><span class="strut"> </span></p> -<p id="t2163" class="pln"><span class="str"> cog.outl("void %s();" % fn)</span><span class="strut"> </span></p> -<p id="t2164" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t2165" class="pln"><span class="str"> Some Sample Code Here</span><span class="strut"> </span></p> -<p id="t2166" class="pln"><span class="str"> //[[[end]]]"""</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t2155" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testSettingGlobals</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t2156" class="pln"> <span class="com"># Blake Winton contributed a way to set the globals that will be used in</span><span class="strut"> </span></p> +<p id="t2157" class="pln"> <span class="com"># processFile().</span><span class="strut"> </span></p> +<p id="t2158" class="stm run hide_run"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t2159" class="pln"> <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t2160" class="pln"><span class="str"> // This is my C++ file.</span><span class="strut"> </span></p> +<p id="t2161" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t2162" class="pln"><span class="str"> for fn in fnames:</span><span class="strut"> </span></p> +<p id="t2163" class="pln"><span class="str"> cog.outl("void %s();" % fn)</span><span class="strut"> </span></p> +<p id="t2164" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t2165" class="pln"><span class="str"> Some Sample Code Here</span><span class="strut"> </span></p> +<p id="t2166" class="pln"><span class="str"> //[[[end]]]"""</span><span class="op">,</span><span class="strut"> </span></p> <p id="t2167" class="pln"><span class="strut"> </span></p> -<p id="t2168" class="pln"> <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t2169" class="pln"><span class="str"> // This is my C++ file.</span><span class="strut"> </span></p> -<p id="t2170" class="pln"><span class="str"> void DoBlake();</span><span class="strut"> </span></p> -<p id="t2171" class="pln"><span class="str"> void DoWinton();</span><span class="strut"> </span></p> -<p id="t2172" class="pln"><span class="str"> void DoContribution();</span><span class="strut"> </span></p> -<p id="t2173" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t2174" class="pln"> <span class="op">}</span><span class="strut"> </span></p> +<p id="t2168" class="pln"> <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t2169" class="pln"><span class="str"> // This is my C++ file.</span><span class="strut"> </span></p> +<p id="t2170" class="pln"><span class="str"> void DoBlake();</span><span class="strut"> </span></p> +<p id="t2171" class="pln"><span class="str"> void DoWinton();</span><span class="strut"> </span></p> +<p id="t2172" class="pln"><span class="str"> void DoContribution();</span><span class="strut"> </span></p> +<p id="t2173" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t2174" class="pln"> <span class="op">}</span><span class="strut"> </span></p> <p id="t2175" class="pln"><span class="strut"> </span></p> -<p id="t2176" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t2177" class="stm mis"> <span class="nam">globals</span> <span class="op">=</span> <span class="op">{</span><span class="op">}</span><span class="strut"> </span></p> -<p id="t2178" class="stm mis"> <span class="nam">globals</span><span class="op">[</span><span class="str">'fnames'</span><span class="op">]</span> <span class="op">=</span> <span class="op">[</span><span class="str">'DoBlake'</span><span class="op">,</span> <span class="str">'DoWinton'</span><span class="op">,</span> <span class="str">'DoContribution'</span><span class="op">]</span><span class="strut"> </span></p> -<p id="t2179" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bDeleteCode</span> <span class="op">=</span> <span class="nam">True</span><span class="strut"> </span></p> -<p id="t2180" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">processFile</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test.cogged'</span><span class="op">,</span> <span class="nam">globals</span><span class="op">=</span><span class="nam">globals</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t2181" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cogged'</span><span class="op">,</span> <span class="str">'test.out'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t2176" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t2177" class="stm run hide_run"> <span class="nam">globals</span> <span class="op">=</span> <span class="op">{</span><span class="op">}</span><span class="strut"> </span></p> +<p id="t2178" class="stm run hide_run"> <span class="nam">globals</span><span class="op">[</span><span class="str">'fnames'</span><span class="op">]</span> <span class="op">=</span> <span class="op">[</span><span class="str">'DoBlake'</span><span class="op">,</span> <span class="str">'DoWinton'</span><span class="op">,</span> <span class="str">'DoContribution'</span><span class="op">]</span><span class="strut"> </span></p> +<p id="t2179" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">bDeleteCode</span> <span class="op">=</span> <span class="nam">True</span><span class="strut"> </span></p> +<p id="t2180" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">processFile</span><span class="op">(</span><span class="str">'test.cog'</span><span class="op">,</span> <span class="str">'test.cogged'</span><span class="op">,</span> <span class="nam">globals</span><span class="op">=</span><span class="nam">globals</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t2181" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertFilesSame</span><span class="op">(</span><span class="str">'test.cogged'</span><span class="op">,</span> <span class="str">'test.out'</span><span class="op">)</span><span class="strut"> </span></p> <p id="t2182" class="pln"><span class="strut"> </span></p> <p id="t2183" class="pln"><span class="strut"> </span></p> <p id="t2184" class="stm run hide_run"><span class="key">class</span> <span class="nam">ErrorCallTests</span><span class="op">(</span><span class="nam">TestCaseWithTempDir</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> <p id="t2185" class="pln"><span class="strut"> </span></p> -<p id="t2186" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testErrorCallHasNoTraceback</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t2187" class="pln"> <span class="com"># Test that cog.error() doesn't show a traceback.</span><span class="strut"> </span></p> -<p id="t2188" class="stm mis"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t2189" class="pln"> <span class="str">'error.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t2190" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t2191" class="pln"><span class="str"> cog.error("Something Bad!")</span><span class="strut"> </span></p> -<p id="t2192" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t2193" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t2194" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t2195" class="pln"> <span class="op">}</span><span class="strut"> </span></p> +<p id="t2186" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testErrorCallHasNoTraceback</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t2187" class="pln"> <span class="com"># Test that cog.error() doesn't show a traceback.</span><span class="strut"> </span></p> +<p id="t2188" class="stm run hide_run"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t2189" class="pln"> <span class="str">'error.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t2190" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t2191" class="pln"><span class="str"> cog.error("Something Bad!")</span><span class="strut"> </span></p> +<p id="t2192" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t2193" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t2194" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t2195" class="pln"> <span class="op">}</span><span class="strut"> </span></p> <p id="t2196" class="pln"><span class="strut"> </span></p> -<p id="t2197" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t2198" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">main</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'error.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t2199" class="stm mis"> <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t2200" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">output</span><span class="op">,</span> <span class="str">"Cogging error.cog\nError: Something Bad!\n"</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t2197" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t2198" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">main</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'error.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t2199" class="stm run hide_run"> <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t2200" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">output</span><span class="op">,</span> <span class="str">"Cogging error.cog\nError: Something Bad!\n"</span><span class="op">)</span><span class="strut"> </span></p> <p id="t2201" class="pln"><span class="strut"> </span></p> -<p id="t2202" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testRealErrorHasTraceback</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t2203" class="pln"> <span class="com"># Test that a genuine error does show a traceback.</span><span class="strut"> </span></p> -<p id="t2204" class="stm mis"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t2205" class="pln"> <span class="str">'error.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t2206" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> -<p id="t2207" class="pln"><span class="str"> raise RuntimeError("Hey!")</span><span class="strut"> </span></p> -<p id="t2208" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> -<p id="t2209" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> -<p id="t2210" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t2211" class="pln"> <span class="op">}</span><span class="strut"> </span></p> +<p id="t2202" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testRealErrorHasTraceback</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t2203" class="pln"> <span class="com"># Test that a genuine error does show a traceback.</span><span class="strut"> </span></p> +<p id="t2204" class="stm run hide_run"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t2205" class="pln"> <span class="str">'error.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t2206" class="pln"><span class="str"> //[[[cog</span><span class="strut"> </span></p> +<p id="t2207" class="pln"><span class="str"> raise RuntimeError("Hey!")</span><span class="strut"> </span></p> +<p id="t2208" class="pln"><span class="str"> //]]]</span><span class="strut"> </span></p> +<p id="t2209" class="pln"><span class="str"> //[[[end]]]</span><span class="strut"> </span></p> +<p id="t2210" class="pln"><span class="str"> """</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t2211" class="pln"> <span class="op">}</span><span class="strut"> </span></p> <p id="t2212" class="pln"><span class="strut"> </span></p> -<p id="t2213" class="stm mis"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t2214" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">main</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'error.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t2215" class="stm mis"> <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t2216" class="stm mis"> <span class="nam">msg</span> <span class="op">=</span> <span class="str">'Actual output:\n'</span> <span class="op">+</span> <span class="nam">output</span><span class="strut"> </span></p> -<p id="t2217" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assert_</span><span class="op">(</span><span class="nam">output</span><span class="op">.</span><span class="nam">startswith</span><span class="op">(</span><span class="str">"Cogging error.cog\nTraceback (most recent"</span><span class="op">)</span><span class="op">,</span> <span class="nam">msg</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t2218" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertIn</span><span class="op">(</span><span class="str">"RuntimeError: Hey!"</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t2213" class="stm run hide_run"> <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t2214" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">cog</span><span class="op">.</span><span class="nam">main</span><span class="op">(</span><span class="op">[</span><span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span> <span class="str">'error.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t2215" class="stm run hide_run"> <span class="nam">output</span> <span class="op">=</span> <span class="nam">self</span><span class="op">.</span><span class="nam">output</span><span class="op">.</span><span class="nam">getvalue</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t2216" class="stm run hide_run"> <span class="nam">msg</span> <span class="op">=</span> <span class="str">'Actual output:\n'</span> <span class="op">+</span> <span class="nam">output</span><span class="strut"> </span></p> +<p id="t2217" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assert_</span><span class="op">(</span><span class="nam">output</span><span class="op">.</span><span class="nam">startswith</span><span class="op">(</span><span class="str">"Cogging error.cog\nTraceback (most recent"</span><span class="op">)</span><span class="op">,</span> <span class="nam">msg</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t2218" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertIn</span><span class="op">(</span><span class="str">"RuntimeError: Hey!"</span><span class="op">,</span> <span class="nam">output</span><span class="op">)</span><span class="strut"> </span></p> <p id="t2219" class="pln"><span class="strut"> </span></p> <p id="t2220" class="pln"><span class="strut"> </span></p> <p id="t2221" class="pln"><span class="com"># Things not yet tested:</span><span class="strut"> </span></p> <p id="t2222" class="pln"><span class="com"># - A bad -w command (currently fails silently).</span><span class="strut"> </span></p> - + </td> </tr> </table> @@ -4525,8 +4525,8 @@ <div id="footer"> <div class="content"> <p> - <a class="nav" href="index.html">« index</a> <a class="nav" href="https://coverage.readthedocs.org">coverage.py v4.0.3</a>, - created at 2015-11-24 07:02 + <a class="nav" href="index.html">« index</a> <a class="nav" href="https://coverage.readthedocs.io">coverage.py v4.1</a>, + created at 2016-05-21 08:55 </p> </div> </div> diff --git a/doc/sample_html/cogapp_test_makefiles_py.html b/doc/sample_html/cogapp_test_makefiles_py.html index 1fba8b0..08b433d 100644 --- a/doc/sample_html/cogapp_test_makefiles_py.html +++ b/doc/sample_html/cogapp_test_makefiles_py.html @@ -8,7 +8,7 @@ <meta http-equiv="X-UA-Compatible" content="IE=emulateIE7" /> - <title>Coverage for cogapp/test_makefiles.py: 0.00%</title> + <title>Coverage for cogapp/test_makefiles.py: 100.00%</title> <link rel="stylesheet" href="style.css" type="text/css"> <script type="text/javascript" src="jquery.min.js"></script> @@ -24,15 +24,15 @@ <div id="header"> <div class="content"> <h1>Coverage for <b>cogapp/test_makefiles.py</b> : - <span class="pc_cov">0.00%</span> + <span class="pc_cov">100.00%</span> </h1> <img id="keyboard_icon" src="keybd_closed.png" alt="Show keyboard shortcuts" /> <h2 class="stats"> 55 statements - <span class="run hide_run shortkey_r button_toggle_run">0 run</span> - <span class="mis shortkey_m button_toggle_mis">55 missing</span> + <span class="run hide_run shortkey_r button_toggle_run">55 run</span> + <span class="mis shortkey_m button_toggle_mis">0 missing</span> <span class="exc shortkey_x button_toggle_exc">0 excluded</span> @@ -44,22 +44,22 @@ <div class="help_panel"> <img id="panel_icon" src="keybd_open.png" alt="Hide keyboard shortcuts" /> -<p class="legend">Hot-keys on this page</p> + <p class="legend">Hot-keys on this page</p> <div> -<p class="keyhelp"> + <p class="keyhelp"> <span class="key">r</span> <span class="key">m</span> <span class="key">x</span> <span class="key">p</span> toggle line displays </p> -<p class="keyhelp"> + <p class="keyhelp"> <span class="key">j</span> <span class="key">k</span> next/prev highlighted chunk </p> -<p class="keyhelp"> + <p class="keyhelp"> <span class="key">0</span> (zero) top of page </p> -<p class="keyhelp"> + <p class="keyhelp"> <span class="key">1</span> (one) first highlighted chunk </p> </div> @@ -75,56 +75,56 @@ <p id="n4" class="pln"><a href="#n4">4</a></p> <p id="n5" class="pln"><a href="#n5">5</a></p> <p id="n6" class="pln"><a href="#n6">6</a></p> -<p id="n7" class="stm mis"><a href="#n7">7</a></p> +<p id="n7" class="stm run hide_run"><a href="#n7">7</a></p> <p id="n8" class="pln"><a href="#n8">8</a></p> -<p id="n9" class="stm mis"><a href="#n9">9</a></p> -<p id="n10" class="stm mis"><a href="#n10">10</a></p> +<p id="n9" class="stm run hide_run"><a href="#n9">9</a></p> +<p id="n10" class="stm run hide_run"><a href="#n10">10</a></p> <p id="n11" class="pln"><a href="#n11">11</a></p> -<p id="n12" class="stm mis"><a href="#n12">12</a></p> +<p id="n12" class="stm run hide_run"><a href="#n12">12</a></p> <p id="n13" class="pln"><a href="#n13">13</a></p> <p id="n14" class="pln"><a href="#n14">14</a></p> -<p id="n15" class="stm mis"><a href="#n15">15</a></p> +<p id="n15" class="stm run hide_run"><a href="#n15">15</a></p> <p id="n16" class="pln"><a href="#n16">16</a></p> -<p id="n17" class="stm mis"><a href="#n17">17</a></p> +<p id="n17" class="stm run hide_run"><a href="#n17">17</a></p> <p id="n18" class="pln"><a href="#n18">18</a></p> -<p id="n19" class="stm mis"><a href="#n19">19</a></p> -<p id="n20" class="stm mis"><a href="#n20">20</a></p> -<p id="n21" class="stm mis"><a href="#n21">21</a></p> +<p id="n19" class="stm run hide_run"><a href="#n19">19</a></p> +<p id="n20" class="stm run hide_run"><a href="#n20">20</a></p> +<p id="n21" class="stm run hide_run"><a href="#n21">21</a></p> <p id="n22" class="pln"><a href="#n22">22</a></p> -<p id="n23" class="stm mis"><a href="#n23">23</a></p> +<p id="n23" class="stm run hide_run"><a href="#n23">23</a></p> <p id="n24" class="pln"><a href="#n24">24</a></p> -<p id="n25" class="stm mis"><a href="#n25">25</a></p> +<p id="n25" class="stm run hide_run"><a href="#n25">25</a></p> <p id="n26" class="pln"><a href="#n26">26</a></p> -<p id="n27" class="stm mis"><a href="#n27">27</a></p> -<p id="n28" class="stm mis"><a href="#n28">28</a></p> +<p id="n27" class="stm run hide_run"><a href="#n27">27</a></p> +<p id="n28" class="stm run hide_run"><a href="#n28">28</a></p> <p id="n29" class="pln"><a href="#n29">29</a></p> -<p id="n30" class="stm mis"><a href="#n30">30</a></p> -<p id="n31" class="stm mis"><a href="#n31">31</a></p> -<p id="n32" class="stm mis"><a href="#n32">32</a></p> -<p id="n33" class="stm mis"><a href="#n33">33</a></p> -<p id="n34" class="stm mis"><a href="#n34">34</a></p> +<p id="n30" class="stm run hide_run"><a href="#n30">30</a></p> +<p id="n31" class="stm run hide_run"><a href="#n31">31</a></p> +<p id="n32" class="stm run hide_run"><a href="#n32">32</a></p> +<p id="n33" class="stm run hide_run"><a href="#n33">33</a></p> +<p id="n34" class="stm run hide_run"><a href="#n34">34</a></p> <p id="n35" class="pln"><a href="#n35">35</a></p> -<p id="n36" class="stm mis"><a href="#n36">36</a></p> -<p id="n37" class="stm mis"><a href="#n37">37</a></p> -<p id="n38" class="stm mis"><a href="#n38">38</a></p> +<p id="n36" class="stm run hide_run"><a href="#n36">36</a></p> +<p id="n37" class="stm run hide_run"><a href="#n37">37</a></p> +<p id="n38" class="stm run hide_run"><a href="#n38">38</a></p> <p id="n39" class="pln"><a href="#n39">39</a></p> -<p id="n40" class="stm mis"><a href="#n40">40</a></p> -<p id="n41" class="stm mis"><a href="#n41">41</a></p> -<p id="n42" class="stm mis"><a href="#n42">42</a></p> -<p id="n43" class="stm mis"><a href="#n43">43</a></p> -<p id="n44" class="stm mis"><a href="#n44">44</a></p> -<p id="n45" class="stm mis"><a href="#n45">45</a></p> +<p id="n40" class="stm run hide_run"><a href="#n40">40</a></p> +<p id="n41" class="stm run hide_run"><a href="#n41">41</a></p> +<p id="n42" class="stm run hide_run"><a href="#n42">42</a></p> +<p id="n43" class="stm run hide_run"><a href="#n43">43</a></p> +<p id="n44" class="stm run hide_run"><a href="#n44">44</a></p> +<p id="n45" class="stm run hide_run"><a href="#n45">45</a></p> <p id="n46" class="pln"><a href="#n46">46</a></p> -<p id="n47" class="stm mis"><a href="#n47">47</a></p> -<p id="n48" class="stm mis"><a href="#n48">48</a></p> -<p id="n49" class="stm mis"><a href="#n49">49</a></p> +<p id="n47" class="stm run hide_run"><a href="#n47">47</a></p> +<p id="n48" class="stm run hide_run"><a href="#n48">48</a></p> +<p id="n49" class="stm run hide_run"><a href="#n49">49</a></p> <p id="n50" class="pln"><a href="#n50">50</a></p> -<p id="n51" class="stm mis"><a href="#n51">51</a></p> -<p id="n52" class="stm mis"><a href="#n52">52</a></p> -<p id="n53" class="stm mis"><a href="#n53">53</a></p> +<p id="n51" class="stm run hide_run"><a href="#n51">51</a></p> +<p id="n52" class="stm run hide_run"><a href="#n52">52</a></p> +<p id="n53" class="stm run hide_run"><a href="#n53">53</a></p> <p id="n54" class="pln"><a href="#n54">54</a></p> -<p id="n55" class="stm mis"><a href="#n55">55</a></p> -<p id="n56" class="stm mis"><a href="#n56">56</a></p> +<p id="n55" class="stm run hide_run"><a href="#n55">55</a></p> +<p id="n56" class="stm run hide_run"><a href="#n56">56</a></p> <p id="n57" class="pln"><a href="#n57">57</a></p> <p id="n58" class="pln"><a href="#n58">58</a></p> <p id="n59" class="pln"><a href="#n59">59</a></p> @@ -133,130 +133,130 @@ <p id="n62" class="pln"><a href="#n62">62</a></p> <p id="n63" class="pln"><a href="#n63">63</a></p> <p id="n64" class="pln"><a href="#n64">64</a></p> -<p id="n65" class="stm mis"><a href="#n65">65</a></p> -<p id="n66" class="stm mis"><a href="#n66">66</a></p> -<p id="n67" class="stm mis"><a href="#n67">67</a></p> -<p id="n68" class="stm mis"><a href="#n68">68</a></p> -<p id="n69" class="stm mis"><a href="#n69">69</a></p> +<p id="n65" class="stm run hide_run"><a href="#n65">65</a></p> +<p id="n66" class="stm run hide_run"><a href="#n66">66</a></p> +<p id="n67" class="stm run hide_run"><a href="#n67">67</a></p> +<p id="n68" class="stm run hide_run"><a href="#n68">68</a></p> +<p id="n69" class="stm run hide_run"><a href="#n69">69</a></p> <p id="n70" class="pln"><a href="#n70">70</a></p> -<p id="n71" class="stm mis"><a href="#n71">71</a></p> -<p id="n72" class="stm mis"><a href="#n72">72</a></p> -<p id="n73" class="stm mis"><a href="#n73">73</a></p> -<p id="n74" class="stm mis"><a href="#n74">74</a></p> -<p id="n75" class="stm mis"><a href="#n75">75</a></p> -<p id="n76" class="stm mis"><a href="#n76">76</a></p> -<p id="n77" class="stm mis"><a href="#n77">77</a></p> -<p id="n78" class="stm mis"><a href="#n78">78</a></p> +<p id="n71" class="stm run hide_run"><a href="#n71">71</a></p> +<p id="n72" class="stm run hide_run"><a href="#n72">72</a></p> +<p id="n73" class="stm run hide_run"><a href="#n73">73</a></p> +<p id="n74" class="stm run hide_run"><a href="#n74">74</a></p> +<p id="n75" class="stm run hide_run"><a href="#n75">75</a></p> +<p id="n76" class="stm run hide_run"><a href="#n76">76</a></p> +<p id="n77" class="stm run hide_run"><a href="#n77">77</a></p> +<p id="n78" class="stm run hide_run"><a href="#n78">78</a></p> <p id="n79" class="pln"><a href="#n79">79</a></p> -<p id="n80" class="stm mis"><a href="#n80">80</a></p> -<p id="n81" class="stm mis"><a href="#n81">81</a></p> -<p id="n82" class="stm mis"><a href="#n82">82</a></p> +<p id="n80" class="stm run hide_run"><a href="#n80">80</a></p> +<p id="n81" class="stm run hide_run"><a href="#n81">81</a></p> +<p id="n82" class="stm run hide_run"><a href="#n82">82</a></p> <p id="n83" class="pln"><a href="#n83">83</a></p> <p id="n84" class="pln"><a href="#n84">84</a></p> <p id="n85" class="pln"><a href="#n85">85</a></p> <p id="n86" class="pln"><a href="#n86">86</a></p> <p id="n87" class="pln"><a href="#n87">87</a></p> <p id="n88" class="pln"><a href="#n88">88</a></p> -<p id="n89" class="stm mis"><a href="#n89">89</a></p> -<p id="n90" class="stm mis"><a href="#n90">90</a></p> -<p id="n91" class="stm mis"><a href="#n91">91</a></p> -<p id="n92" class="stm mis"><a href="#n92">92</a></p> - +<p id="n89" class="stm run hide_run"><a href="#n89">89</a></p> +<p id="n90" class="stm run hide_run"><a href="#n90">90</a></p> +<p id="n91" class="stm run hide_run"><a href="#n91">91</a></p> +<p id="n92" class="stm run hide_run"><a href="#n92">92</a></p> + </td> <td class="text"> -<p id="t1" class="pln"><span class="str">""" Test the cogapp.makefiles modules</span><span class="strut"> </span></p> -<p id="t2" class="pln"><span class="str"> http://nedbatchelder.com/code/cog</span><span class="strut"> </span></p> +<p id="t1" class="pln"><span class="str">""" Test the cogapp.makefiles modules</span><span class="strut"> </span></p> +<p id="t2" class="pln"><span class="str"> http://nedbatchelder.com/code/cog</span><span class="strut"> </span></p> <p id="t3" class="pln"><span class="strut"> </span></p> -<p id="t4" class="pln"><span class="str"> Copyright 2004-2015, Ned Batchelder.</span><span class="strut"> </span></p> -<p id="t5" class="pln"><span class="str">"""</span><span class="strut"> </span></p> +<p id="t4" class="pln"><span class="str"> Copyright 2004-2015, Ned Batchelder.</span><span class="strut"> </span></p> +<p id="t5" class="pln"><span class="str">"""</span><span class="strut"> </span></p> <p id="t6" class="pln"><span class="strut"> </span></p> -<p id="t7" class="stm mis"><span class="key">from</span> <span class="nam">__future__</span> <span class="key">import</span> <span class="nam">absolute_import</span><span class="strut"> </span></p> +<p id="t7" class="stm run hide_run"><span class="key">from</span> <span class="nam">__future__</span> <span class="key">import</span> <span class="nam">absolute_import</span><span class="strut"> </span></p> <p id="t8" class="pln"><span class="strut"> </span></p> -<p id="t9" class="stm mis"><span class="key">import</span> <span class="nam">unittest</span><span class="strut"> </span></p> -<p id="t10" class="stm mis"><span class="key">import</span> <span class="nam">shutil</span><span class="op">,</span> <span class="nam">os</span><span class="op">,</span> <span class="nam">random</span><span class="op">,</span> <span class="nam">tempfile</span><span class="strut"> </span></p> +<p id="t9" class="stm run hide_run"><span class="key">import</span> <span class="nam">unittest</span><span class="strut"> </span></p> +<p id="t10" class="stm run hide_run"><span class="key">import</span> <span class="nam">shutil</span><span class="op">,</span> <span class="nam">os</span><span class="op">,</span> <span class="nam">random</span><span class="op">,</span> <span class="nam">tempfile</span><span class="strut"> </span></p> <p id="t11" class="pln"><span class="strut"> </span></p> -<p id="t12" class="stm mis"><span class="key">from</span> <span class="op">.</span> <span class="key">import</span> <span class="nam">makefiles</span><span class="strut"> </span></p> +<p id="t12" class="stm run hide_run"><span class="key">from</span> <span class="op">.</span> <span class="key">import</span> <span class="nam">makefiles</span><span class="strut"> </span></p> <p id="t13" class="pln"><span class="strut"> </span></p> <p id="t14" class="pln"><span class="strut"> </span></p> -<p id="t15" class="stm mis"><span class="key">class</span> <span class="nam">SimpleTests</span><span class="op">(</span><span class="nam">unittest</span><span class="op">.</span><span class="nam">TestCase</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t15" class="stm run hide_run"><span class="key">class</span> <span class="nam">SimpleTests</span><span class="op">(</span><span class="nam">unittest</span><span class="op">.</span><span class="nam">TestCase</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> <p id="t16" class="pln"><span class="strut"> </span></p> -<p id="t17" class="stm mis"> <span class="key">def</span> <span class="nam">setUp</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t18" class="pln"> <span class="com"># Create a temporary directory.</span><span class="strut"> </span></p> -<p id="t19" class="stm mis"> <span class="nam">my_dir</span> <span class="op">=</span> <span class="str">'testmakefiles_tempdir_'</span> <span class="op">+</span> <span class="nam">str</span><span class="op">(</span><span class="nam">random</span><span class="op">.</span><span class="nam">random</span><span class="op">(</span><span class="op">)</span><span class="op">)</span><span class="op">[</span><span class="num">2</span><span class="op">:</span><span class="op">]</span><span class="strut"> </span></p> -<p id="t20" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span> <span class="op">=</span> <span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">tempfile</span><span class="op">.</span><span class="nam">gettempdir</span><span class="op">(</span><span class="op">)</span><span class="op">,</span> <span class="nam">my_dir</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t21" class="stm mis"> <span class="nam">os</span><span class="op">.</span><span class="nam">mkdir</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t17" class="stm run hide_run"> <span class="key">def</span> <span class="nam">setUp</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t18" class="pln"> <span class="com"># Create a temporary directory.</span><span class="strut"> </span></p> +<p id="t19" class="stm run hide_run"> <span class="nam">my_dir</span> <span class="op">=</span> <span class="str">'testmakefiles_tempdir_'</span> <span class="op">+</span> <span class="nam">str</span><span class="op">(</span><span class="nam">random</span><span class="op">.</span><span class="nam">random</span><span class="op">(</span><span class="op">)</span><span class="op">)</span><span class="op">[</span><span class="num">2</span><span class="op">:</span><span class="op">]</span><span class="strut"> </span></p> +<p id="t20" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span> <span class="op">=</span> <span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">tempfile</span><span class="op">.</span><span class="nam">gettempdir</span><span class="op">(</span><span class="op">)</span><span class="op">,</span> <span class="nam">my_dir</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t21" class="stm run hide_run"> <span class="nam">os</span><span class="op">.</span><span class="nam">mkdir</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">)</span><span class="strut"> </span></p> <p id="t22" class="pln"><span class="strut"> </span></p> -<p id="t23" class="stm mis"> <span class="key">def</span> <span class="nam">tearDown</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t24" class="pln"> <span class="com"># Get rid of the temporary directory.</span><span class="strut"> </span></p> -<p id="t25" class="stm mis"> <span class="nam">shutil</span><span class="op">.</span><span class="nam">rmtree</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t23" class="stm run hide_run"> <span class="key">def</span> <span class="nam">tearDown</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t24" class="pln"> <span class="com"># Get rid of the temporary directory.</span><span class="strut"> </span></p> +<p id="t25" class="stm run hide_run"> <span class="nam">shutil</span><span class="op">.</span><span class="nam">rmtree</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">)</span><span class="strut"> </span></p> <p id="t26" class="pln"><span class="strut"> </span></p> -<p id="t27" class="stm mis"> <span class="key">def</span> <span class="nam">exists</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">dname</span><span class="op">,</span> <span class="nam">fname</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t28" class="stm mis"> <span class="key">return</span> <span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">exists</span><span class="op">(</span><span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">dname</span><span class="op">,</span> <span class="nam">fname</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t27" class="stm run hide_run"> <span class="key">def</span> <span class="nam">exists</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">dname</span><span class="op">,</span> <span class="nam">fname</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t28" class="stm run hide_run"> <span class="key">return</span> <span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">exists</span><span class="op">(</span><span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">dname</span><span class="op">,</span> <span class="nam">fname</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> <p id="t29" class="pln"><span class="strut"> </span></p> -<p id="t30" class="stm mis"> <span class="key">def</span> <span class="nam">checkFilesExist</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">d</span><span class="op">,</span> <span class="nam">dname</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t31" class="stm mis"> <span class="key">for</span> <span class="nam">fname</span> <span class="key">in</span> <span class="nam">d</span><span class="op">.</span><span class="nam">keys</span><span class="op">(</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t32" class="stm mis"> <span class="key">assert</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">exists</span><span class="op">(</span><span class="nam">dname</span><span class="op">,</span> <span class="nam">fname</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t33" class="stm mis"> <span class="key">if</span> <span class="nam">type</span><span class="op">(</span><span class="nam">d</span><span class="op">[</span><span class="nam">fname</span><span class="op">]</span><span class="op">)</span> <span class="op">==</span> <span class="nam">type</span><span class="op">(</span><span class="op">{</span><span class="op">}</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t34" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">checkFilesExist</span><span class="op">(</span><span class="nam">d</span><span class="op">[</span><span class="nam">fname</span><span class="op">]</span><span class="op">,</span> <span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">dname</span><span class="op">,</span> <span class="nam">fname</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t30" class="stm run hide_run"> <span class="key">def</span> <span class="nam">checkFilesExist</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">d</span><span class="op">,</span> <span class="nam">dname</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t31" class="stm run hide_run"> <span class="key">for</span> <span class="nam">fname</span> <span class="key">in</span> <span class="nam">d</span><span class="op">.</span><span class="nam">keys</span><span class="op">(</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t32" class="stm run hide_run"> <span class="key">assert</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">exists</span><span class="op">(</span><span class="nam">dname</span><span class="op">,</span> <span class="nam">fname</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t33" class="stm run hide_run"> <span class="key">if</span> <span class="nam">type</span><span class="op">(</span><span class="nam">d</span><span class="op">[</span><span class="nam">fname</span><span class="op">]</span><span class="op">)</span> <span class="op">==</span> <span class="nam">type</span><span class="op">(</span><span class="op">{</span><span class="op">}</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t34" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">checkFilesExist</span><span class="op">(</span><span class="nam">d</span><span class="op">[</span><span class="nam">fname</span><span class="op">]</span><span class="op">,</span> <span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">dname</span><span class="op">,</span> <span class="nam">fname</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> <p id="t35" class="pln"><span class="strut"> </span></p> -<p id="t36" class="stm mis"> <span class="key">def</span> <span class="nam">checkFilesDontExist</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">d</span><span class="op">,</span> <span class="nam">dname</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t37" class="stm mis"> <span class="key">for</span> <span class="nam">fname</span> <span class="key">in</span> <span class="nam">d</span><span class="op">.</span><span class="nam">keys</span><span class="op">(</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t38" class="stm mis"> <span class="key">assert</span><span class="op">(</span><span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">exists</span><span class="op">(</span><span class="nam">dname</span><span class="op">,</span> <span class="nam">fname</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t36" class="stm run hide_run"> <span class="key">def</span> <span class="nam">checkFilesDontExist</span><span class="op">(</span><span class="nam">self</span><span class="op">,</span> <span class="nam">d</span><span class="op">,</span> <span class="nam">dname</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t37" class="stm run hide_run"> <span class="key">for</span> <span class="nam">fname</span> <span class="key">in</span> <span class="nam">d</span><span class="op">.</span><span class="nam">keys</span><span class="op">(</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t38" class="stm run hide_run"> <span class="key">assert</span><span class="op">(</span><span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">exists</span><span class="op">(</span><span class="nam">dname</span><span class="op">,</span> <span class="nam">fname</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> <p id="t39" class="pln"><span class="strut"> </span></p> -<p id="t40" class="stm mis"> <span class="key">def</span> <span class="nam">testOneFile</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t41" class="stm mis"> <span class="nam">fname</span> <span class="op">=</span> <span class="str">'foo.txt'</span><span class="strut"> </span></p> -<p id="t42" class="stm mis"> <span class="nam">notfname</span> <span class="op">=</span> <span class="str">'not_here.txt'</span><span class="strut"> </span></p> -<p id="t43" class="stm mis"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span> <span class="nam">fname</span><span class="op">:</span> <span class="str">"howdy"</span> <span class="op">}</span><span class="strut"> </span></p> -<p id="t44" class="stm mis"> <span class="key">assert</span><span class="op">(</span><span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">exists</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">,</span> <span class="nam">fname</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t45" class="stm mis"> <span class="key">assert</span><span class="op">(</span><span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">exists</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">,</span> <span class="nam">notfname</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t40" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testOneFile</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t41" class="stm run hide_run"> <span class="nam">fname</span> <span class="op">=</span> <span class="str">'foo.txt'</span><span class="strut"> </span></p> +<p id="t42" class="stm run hide_run"> <span class="nam">notfname</span> <span class="op">=</span> <span class="str">'not_here.txt'</span><span class="strut"> </span></p> +<p id="t43" class="stm run hide_run"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span> <span class="nam">fname</span><span class="op">:</span> <span class="str">"howdy"</span> <span class="op">}</span><span class="strut"> </span></p> +<p id="t44" class="stm run hide_run"> <span class="key">assert</span><span class="op">(</span><span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">exists</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">,</span> <span class="nam">fname</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t45" class="stm run hide_run"> <span class="key">assert</span><span class="op">(</span><span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">exists</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">,</span> <span class="nam">notfname</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> <p id="t46" class="pln"><span class="strut"> </span></p> -<p id="t47" class="stm mis"> <span class="nam">makefiles</span><span class="op">.</span><span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t48" class="stm mis"> <span class="key">assert</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">exists</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">,</span> <span class="nam">fname</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t49" class="stm mis"> <span class="key">assert</span><span class="op">(</span><span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">exists</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">,</span> <span class="nam">notfname</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t47" class="stm run hide_run"> <span class="nam">makefiles</span><span class="op">.</span><span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t48" class="stm run hide_run"> <span class="key">assert</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">exists</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">,</span> <span class="nam">fname</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t49" class="stm run hide_run"> <span class="key">assert</span><span class="op">(</span><span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">exists</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">,</span> <span class="nam">notfname</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> <p id="t50" class="pln"><span class="strut"> </span></p> -<p id="t51" class="stm mis"> <span class="nam">makefiles</span><span class="op">.</span><span class="nam">removeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t52" class="stm mis"> <span class="key">assert</span><span class="op">(</span><span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">exists</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">,</span> <span class="nam">fname</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t53" class="stm mis"> <span class="key">assert</span><span class="op">(</span><span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">exists</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">,</span> <span class="nam">notfname</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t51" class="stm run hide_run"> <span class="nam">makefiles</span><span class="op">.</span><span class="nam">removeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t52" class="stm run hide_run"> <span class="key">assert</span><span class="op">(</span><span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">exists</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">,</span> <span class="nam">fname</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t53" class="stm run hide_run"> <span class="key">assert</span><span class="op">(</span><span class="key">not</span> <span class="nam">self</span><span class="op">.</span><span class="nam">exists</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">,</span> <span class="nam">notfname</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> <p id="t54" class="pln"><span class="strut"> </span></p> -<p id="t55" class="stm mis"> <span class="key">def</span> <span class="nam">testManyFiles</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t56" class="stm mis"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t57" class="pln"> <span class="str">'top1.txt'</span><span class="op">:</span> <span class="str">"howdy"</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t58" class="pln"> <span class="str">'top2.txt'</span><span class="op">:</span> <span class="str">"hello"</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t59" class="pln"> <span class="str">'sub'</span><span class="op">:</span> <span class="op">{</span><span class="strut"> </span></p> -<p id="t60" class="pln"> <span class="str">'sub1.txt'</span><span class="op">:</span> <span class="str">"inside"</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t61" class="pln"> <span class="str">'sub2.txt'</span><span class="op">:</span> <span class="str">"inside2"</span><span class="strut"> </span></p> -<p id="t62" class="pln"> <span class="op">}</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t63" class="pln"> <span class="op">}</span><span class="strut"> </span></p> +<p id="t55" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testManyFiles</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t56" class="stm run hide_run"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t57" class="pln"> <span class="str">'top1.txt'</span><span class="op">:</span> <span class="str">"howdy"</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t58" class="pln"> <span class="str">'top2.txt'</span><span class="op">:</span> <span class="str">"hello"</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t59" class="pln"> <span class="str">'sub'</span><span class="op">:</span> <span class="op">{</span><span class="strut"> </span></p> +<p id="t60" class="pln"> <span class="str">'sub1.txt'</span><span class="op">:</span> <span class="str">"inside"</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t61" class="pln"> <span class="str">'sub2.txt'</span><span class="op">:</span> <span class="str">"inside2"</span><span class="strut"> </span></p> +<p id="t62" class="pln"> <span class="op">}</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t63" class="pln"> <span class="op">}</span><span class="strut"> </span></p> <p id="t64" class="pln"><span class="strut"> </span></p> -<p id="t65" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">checkFilesDontExist</span><span class="op">(</span><span class="nam">d</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t66" class="stm mis"> <span class="nam">makefiles</span><span class="op">.</span><span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t67" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">checkFilesExist</span><span class="op">(</span><span class="nam">d</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t68" class="stm mis"> <span class="nam">makefiles</span><span class="op">.</span><span class="nam">removeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t69" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">checkFilesDontExist</span><span class="op">(</span><span class="nam">d</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t65" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">checkFilesDontExist</span><span class="op">(</span><span class="nam">d</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t66" class="stm run hide_run"> <span class="nam">makefiles</span><span class="op">.</span><span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t67" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">checkFilesExist</span><span class="op">(</span><span class="nam">d</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t68" class="stm run hide_run"> <span class="nam">makefiles</span><span class="op">.</span><span class="nam">removeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t69" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">checkFilesDontExist</span><span class="op">(</span><span class="nam">d</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">)</span><span class="strut"> </span></p> <p id="t70" class="pln"><span class="strut"> </span></p> -<p id="t71" class="stm mis"> <span class="key">def</span> <span class="nam">testContents</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t72" class="stm mis"> <span class="nam">fname</span> <span class="op">=</span> <span class="str">'bar.txt'</span><span class="strut"> </span></p> -<p id="t73" class="stm mis"> <span class="nam">cont0</span> <span class="op">=</span> <span class="str">"I am bar.txt"</span><span class="strut"> </span></p> -<p id="t74" class="stm mis"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span> <span class="nam">fname</span><span class="op">:</span> <span class="nam">cont0</span> <span class="op">}</span><span class="strut"> </span></p> -<p id="t75" class="stm mis"> <span class="nam">makefiles</span><span class="op">.</span><span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t76" class="stm mis"> <span class="nam">fcont1</span> <span class="op">=</span> <span class="nam">open</span><span class="op">(</span><span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">,</span> <span class="nam">fname</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t77" class="stm mis"> <span class="key">assert</span><span class="op">(</span><span class="nam">fcont1</span><span class="op">.</span><span class="nam">read</span><span class="op">(</span><span class="op">)</span> <span class="op">==</span> <span class="nam">cont0</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t78" class="stm mis"> <span class="nam">fcont1</span><span class="op">.</span><span class="nam">close</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t71" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testContents</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t72" class="stm run hide_run"> <span class="nam">fname</span> <span class="op">=</span> <span class="str">'bar.txt'</span><span class="strut"> </span></p> +<p id="t73" class="stm run hide_run"> <span class="nam">cont0</span> <span class="op">=</span> <span class="str">"I am bar.txt"</span><span class="strut"> </span></p> +<p id="t74" class="stm run hide_run"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span> <span class="nam">fname</span><span class="op">:</span> <span class="nam">cont0</span> <span class="op">}</span><span class="strut"> </span></p> +<p id="t75" class="stm run hide_run"> <span class="nam">makefiles</span><span class="op">.</span><span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t76" class="stm run hide_run"> <span class="nam">fcont1</span> <span class="op">=</span> <span class="nam">open</span><span class="op">(</span><span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">,</span> <span class="nam">fname</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t77" class="stm run hide_run"> <span class="key">assert</span><span class="op">(</span><span class="nam">fcont1</span><span class="op">.</span><span class="nam">read</span><span class="op">(</span><span class="op">)</span> <span class="op">==</span> <span class="nam">cont0</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t78" class="stm run hide_run"> <span class="nam">fcont1</span><span class="op">.</span><span class="nam">close</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> <p id="t79" class="pln"><span class="strut"> </span></p> -<p id="t80" class="stm mis"> <span class="key">def</span> <span class="nam">testDedent</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t81" class="stm mis"> <span class="nam">fname</span> <span class="op">=</span> <span class="str">'dedent.txt'</span><span class="strut"> </span></p> -<p id="t82" class="stm mis"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span> <span class="nam">fname</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> -<p id="t83" class="pln"><span class="str"> This is dedent.txt</span><span class="strut"> </span></p> -<p id="t84" class="pln"><span class="str"> \tTabbed in.</span><span class="strut"> </span></p> -<p id="t85" class="pln"><span class="str"> spaced in.</span><span class="strut"> </span></p> -<p id="t86" class="pln"><span class="str"> OK.</span><span class="strut"> </span></p> -<p id="t87" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t88" class="pln"> <span class="op">}</span><span class="strut"> </span></p> -<p id="t89" class="stm mis"> <span class="nam">makefiles</span><span class="op">.</span><span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t90" class="stm mis"> <span class="nam">fcont</span> <span class="op">=</span> <span class="nam">open</span><span class="op">(</span><span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">,</span> <span class="nam">fname</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t91" class="stm mis"> <span class="key">assert</span><span class="op">(</span><span class="nam">fcont</span><span class="op">.</span><span class="nam">read</span><span class="op">(</span><span class="op">)</span> <span class="op">==</span> <span class="str">"This is dedent.txt\n\tTabbed in.\n spaced in.\nOK.\n"</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t92" class="stm mis"> <span class="nam">fcont</span><span class="op">.</span><span class="nam">close</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> - +<p id="t80" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testDedent</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t81" class="stm run hide_run"> <span class="nam">fname</span> <span class="op">=</span> <span class="str">'dedent.txt'</span><span class="strut"> </span></p> +<p id="t82" class="stm run hide_run"> <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span> <span class="nam">fname</span><span class="op">:</span> <span class="str">"""\</span><span class="strut"> </span></p> +<p id="t83" class="pln"><span class="str"> This is dedent.txt</span><span class="strut"> </span></p> +<p id="t84" class="pln"><span class="str"> \tTabbed in.</span><span class="strut"> </span></p> +<p id="t85" class="pln"><span class="str"> spaced in.</span><span class="strut"> </span></p> +<p id="t86" class="pln"><span class="str"> OK.</span><span class="strut"> </span></p> +<p id="t87" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t88" class="pln"> <span class="op">}</span><span class="strut"> </span></p> +<p id="t89" class="stm run hide_run"> <span class="nam">makefiles</span><span class="op">.</span><span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">,</span> <span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t90" class="stm run hide_run"> <span class="nam">fcont</span> <span class="op">=</span> <span class="nam">open</span><span class="op">(</span><span class="nam">os</span><span class="op">.</span><span class="nam">path</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">tempdir</span><span class="op">,</span> <span class="nam">fname</span><span class="op">)</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t91" class="stm run hide_run"> <span class="key">assert</span><span class="op">(</span><span class="nam">fcont</span><span class="op">.</span><span class="nam">read</span><span class="op">(</span><span class="op">)</span> <span class="op">==</span> <span class="str">"This is dedent.txt\n\tTabbed in.\n spaced in.\nOK.\n"</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t92" class="stm run hide_run"> <span class="nam">fcont</span><span class="op">.</span><span class="nam">close</span><span class="op">(</span><span class="op">)</span><span class="strut"> </span></p> + </td> </tr> </table> @@ -265,8 +265,8 @@ <div id="footer"> <div class="content"> <p> - <a class="nav" href="index.html">« index</a> <a class="nav" href="https://coverage.readthedocs.org">coverage.py v4.0.3</a>, - created at 2015-11-24 07:02 + <a class="nav" href="index.html">« index</a> <a class="nav" href="https://coverage.readthedocs.io">coverage.py v4.1</a>, + created at 2016-05-21 08:55 </p> </div> </div> diff --git a/doc/sample_html/cogapp_test_whiteutils_py.html b/doc/sample_html/cogapp_test_whiteutils_py.html index 0a0eb77..d9a39a5 100644 --- a/doc/sample_html/cogapp_test_whiteutils_py.html +++ b/doc/sample_html/cogapp_test_whiteutils_py.html @@ -8,7 +8,7 @@ <meta http-equiv="X-UA-Compatible" content="IE=emulateIE7" /> - <title>Coverage for cogapp/test_whiteutils.py: 0.00%</title> + <title>Coverage for cogapp/test_whiteutils.py: 100.00%</title> <link rel="stylesheet" href="style.css" type="text/css"> <script type="text/javascript" src="jquery.min.js"></script> @@ -24,15 +24,15 @@ <div id="header"> <div class="content"> <h1>Coverage for <b>cogapp/test_whiteutils.py</b> : - <span class="pc_cov">0.00%</span> + <span class="pc_cov">100.00%</span> </h1> <img id="keyboard_icon" src="keybd_closed.png" alt="Show keyboard shortcuts" /> <h2 class="stats"> 69 statements - <span class="run hide_run shortkey_r button_toggle_run">0 run</span> - <span class="mis shortkey_m button_toggle_mis">69 missing</span> + <span class="run hide_run shortkey_r button_toggle_run">69 run</span> + <span class="mis shortkey_m button_toggle_mis">0 missing</span> <span class="exc shortkey_x button_toggle_exc">0 excluded</span> @@ -44,22 +44,22 @@ <div class="help_panel"> <img id="panel_icon" src="keybd_open.png" alt="Hide keyboard shortcuts" /> -<p class="legend">Hot-keys on this page</p> + <p class="legend">Hot-keys on this page</p> <div> -<p class="keyhelp"> + <p class="keyhelp"> <span class="key">r</span> <span class="key">m</span> <span class="key">x</span> <span class="key">p</span> toggle line displays </p> -<p class="keyhelp"> + <p class="keyhelp"> <span class="key">j</span> <span class="key">k</span> next/prev highlighted chunk </p> -<p class="keyhelp"> + <p class="keyhelp"> <span class="key">0</span> (zero) top of page </p> -<p class="keyhelp"> + <p class="keyhelp"> <span class="key">1</span> (one) first highlighted chunk </p> </div> @@ -75,208 +75,208 @@ <p id="n4" class="pln"><a href="#n4">4</a></p> <p id="n5" class="pln"><a href="#n5">5</a></p> <p id="n6" class="pln"><a href="#n6">6</a></p> -<p id="n7" class="stm mis"><a href="#n7">7</a></p> +<p id="n7" class="stm run hide_run"><a href="#n7">7</a></p> <p id="n8" class="pln"><a href="#n8">8</a></p> -<p id="n9" class="stm mis"><a href="#n9">9</a></p> +<p id="n9" class="stm run hide_run"><a href="#n9">9</a></p> <p id="n10" class="pln"><a href="#n10">10</a></p> -<p id="n11" class="stm mis"><a href="#n11">11</a></p> +<p id="n11" class="stm run hide_run"><a href="#n11">11</a></p> <p id="n12" class="pln"><a href="#n12">12</a></p> <p id="n13" class="pln"><a href="#n13">13</a></p> -<p id="n14" class="stm mis"><a href="#n14">14</a></p> +<p id="n14" class="stm run hide_run"><a href="#n14">14</a></p> <p id="n15" class="pln"><a href="#n15">15</a></p> <p id="n16" class="pln"><a href="#n16">16</a></p> -<p id="n17" class="stm mis"><a href="#n17">17</a></p> -<p id="n18" class="stm mis"><a href="#n18">18</a></p> -<p id="n19" class="stm mis"><a href="#n19">19</a></p> -<p id="n20" class="stm mis"><a href="#n20">20</a></p> -<p id="n21" class="stm mis"><a href="#n21">21</a></p> -<p id="n22" class="stm mis"><a href="#n22">22</a></p> -<p id="n23" class="stm mis"><a href="#n23">23</a></p> -<p id="n24" class="stm mis"><a href="#n24">24</a></p> +<p id="n17" class="stm run hide_run"><a href="#n17">17</a></p> +<p id="n18" class="stm run hide_run"><a href="#n18">18</a></p> +<p id="n19" class="stm run hide_run"><a href="#n19">19</a></p> +<p id="n20" class="stm run hide_run"><a href="#n20">20</a></p> +<p id="n21" class="stm run hide_run"><a href="#n21">21</a></p> +<p id="n22" class="stm run hide_run"><a href="#n22">22</a></p> +<p id="n23" class="stm run hide_run"><a href="#n23">23</a></p> +<p id="n24" class="stm run hide_run"><a href="#n24">24</a></p> <p id="n25" class="pln"><a href="#n25">25</a></p> -<p id="n26" class="stm mis"><a href="#n26">26</a></p> -<p id="n27" class="stm mis"><a href="#n27">27</a></p> -<p id="n28" class="stm mis"><a href="#n28">28</a></p> -<p id="n29" class="stm mis"><a href="#n29">29</a></p> +<p id="n26" class="stm run hide_run"><a href="#n26">26</a></p> +<p id="n27" class="stm run hide_run"><a href="#n27">27</a></p> +<p id="n28" class="stm run hide_run"><a href="#n28">28</a></p> +<p id="n29" class="stm run hide_run"><a href="#n29">29</a></p> <p id="n30" class="pln"><a href="#n30">30</a></p> -<p id="n31" class="stm mis"><a href="#n31">31</a></p> -<p id="n32" class="stm mis"><a href="#n32">32</a></p> -<p id="n33" class="stm mis"><a href="#n33">33</a></p> -<p id="n34" class="stm mis"><a href="#n34">34</a></p> -<p id="n35" class="stm mis"><a href="#n35">35</a></p> +<p id="n31" class="stm run hide_run"><a href="#n31">31</a></p> +<p id="n32" class="stm run hide_run"><a href="#n32">32</a></p> +<p id="n33" class="stm run hide_run"><a href="#n33">33</a></p> +<p id="n34" class="stm run hide_run"><a href="#n34">34</a></p> +<p id="n35" class="stm run hide_run"><a href="#n35">35</a></p> <p id="n36" class="pln"><a href="#n36">36</a></p> -<p id="n37" class="stm mis"><a href="#n37">37</a></p> -<p id="n38" class="stm mis"><a href="#n38">38</a></p> +<p id="n37" class="stm run hide_run"><a href="#n37">37</a></p> +<p id="n38" class="stm run hide_run"><a href="#n38">38</a></p> <p id="n39" class="pln"><a href="#n39">39</a></p> -<p id="n40" class="stm mis"><a href="#n40">40</a></p> -<p id="n41" class="stm mis"><a href="#n41">41</a></p> -<p id="n42" class="stm mis"><a href="#n42">42</a></p> +<p id="n40" class="stm run hide_run"><a href="#n40">40</a></p> +<p id="n41" class="stm run hide_run"><a href="#n41">41</a></p> +<p id="n42" class="stm run hide_run"><a href="#n42">42</a></p> <p id="n43" class="pln"><a href="#n43">43</a></p> <p id="n44" class="pln"><a href="#n44">44</a></p> -<p id="n45" class="stm mis"><a href="#n45">45</a></p> +<p id="n45" class="stm run hide_run"><a href="#n45">45</a></p> <p id="n46" class="pln"><a href="#n46">46</a></p> <p id="n47" class="pln"><a href="#n47">47</a></p> -<p id="n48" class="stm mis"><a href="#n48">48</a></p> -<p id="n49" class="stm mis"><a href="#n49">49</a></p> -<p id="n50" class="stm mis"><a href="#n50">50</a></p> -<p id="n51" class="stm mis"><a href="#n51">51</a></p> -<p id="n52" class="stm mis"><a href="#n52">52</a></p> -<p id="n53" class="stm mis"><a href="#n53">53</a></p> -<p id="n54" class="stm mis"><a href="#n54">54</a></p> -<p id="n55" class="stm mis"><a href="#n55">55</a></p> -<p id="n56" class="stm mis"><a href="#n56">56</a></p> -<p id="n57" class="stm mis"><a href="#n57">57</a></p> -<p id="n58" class="stm mis"><a href="#n58">58</a></p> +<p id="n48" class="stm run hide_run"><a href="#n48">48</a></p> +<p id="n49" class="stm run hide_run"><a href="#n49">49</a></p> +<p id="n50" class="stm run hide_run"><a href="#n50">50</a></p> +<p id="n51" class="stm run hide_run"><a href="#n51">51</a></p> +<p id="n52" class="stm run hide_run"><a href="#n52">52</a></p> +<p id="n53" class="stm run hide_run"><a href="#n53">53</a></p> +<p id="n54" class="stm run hide_run"><a href="#n54">54</a></p> +<p id="n55" class="stm run hide_run"><a href="#n55">55</a></p> +<p id="n56" class="stm run hide_run"><a href="#n56">56</a></p> +<p id="n57" class="stm run hide_run"><a href="#n57">57</a></p> +<p id="n58" class="stm run hide_run"><a href="#n58">58</a></p> <p id="n59" class="pln"><a href="#n59">59</a></p> -<p id="n60" class="stm mis"><a href="#n60">60</a></p> -<p id="n61" class="stm mis"><a href="#n61">61</a></p> -<p id="n62" class="stm mis"><a href="#n62">62</a></p> -<p id="n63" class="stm mis"><a href="#n63">63</a></p> -<p id="n64" class="stm mis"><a href="#n64">64</a></p> -<p id="n65" class="stm mis"><a href="#n65">65</a></p> -<p id="n66" class="stm mis"><a href="#n66">66</a></p> -<p id="n67" class="stm mis"><a href="#n67">67</a></p> -<p id="n68" class="stm mis"><a href="#n68">68</a></p> -<p id="n69" class="stm mis"><a href="#n69">69</a></p> -<p id="n70" class="stm mis"><a href="#n70">70</a></p> +<p id="n60" class="stm run hide_run"><a href="#n60">60</a></p> +<p id="n61" class="stm run hide_run"><a href="#n61">61</a></p> +<p id="n62" class="stm run hide_run"><a href="#n62">62</a></p> +<p id="n63" class="stm run hide_run"><a href="#n63">63</a></p> +<p id="n64" class="stm run hide_run"><a href="#n64">64</a></p> +<p id="n65" class="stm run hide_run"><a href="#n65">65</a></p> +<p id="n66" class="stm run hide_run"><a href="#n66">66</a></p> +<p id="n67" class="stm run hide_run"><a href="#n67">67</a></p> +<p id="n68" class="stm run hide_run"><a href="#n68">68</a></p> +<p id="n69" class="stm run hide_run"><a href="#n69">69</a></p> +<p id="n70" class="stm run hide_run"><a href="#n70">70</a></p> <p id="n71" class="pln"><a href="#n71">71</a></p> -<p id="n72" class="stm mis"><a href="#n72">72</a></p> -<p id="n73" class="stm mis"><a href="#n73">73</a></p> +<p id="n72" class="stm run hide_run"><a href="#n72">72</a></p> +<p id="n73" class="stm run hide_run"><a href="#n73">73</a></p> <p id="n74" class="pln"><a href="#n74">74</a></p> <p id="n75" class="pln"><a href="#n75">75</a></p> <p id="n76" class="pln"><a href="#n76">76</a></p> <p id="n77" class="pln"><a href="#n77">77</a></p> <p id="n78" class="pln"><a href="#n78">78</a></p> -<p id="n79" class="stm mis"><a href="#n79">79</a></p> +<p id="n79" class="stm run hide_run"><a href="#n79">79</a></p> <p id="n80" class="pln"><a href="#n80">80</a></p> <p id="n81" class="pln"><a href="#n81">81</a></p> -<p id="n82" class="stm mis"><a href="#n82">82</a></p> -<p id="n83" class="stm mis"><a href="#n83">83</a></p> -<p id="n84" class="stm mis"><a href="#n84">84</a></p> -<p id="n85" class="stm mis"><a href="#n85">85</a></p> -<p id="n86" class="stm mis"><a href="#n86">86</a></p> +<p id="n82" class="stm run hide_run"><a href="#n82">82</a></p> +<p id="n83" class="stm run hide_run"><a href="#n83">83</a></p> +<p id="n84" class="stm run hide_run"><a href="#n84">84</a></p> +<p id="n85" class="stm run hide_run"><a href="#n85">85</a></p> +<p id="n86" class="stm run hide_run"><a href="#n86">86</a></p> <p id="n87" class="pln"><a href="#n87">87</a></p> -<p id="n88" class="stm mis"><a href="#n88">88</a></p> -<p id="n89" class="stm mis"><a href="#n89">89</a></p> -<p id="n90" class="stm mis"><a href="#n90">90</a></p> -<p id="n91" class="stm mis"><a href="#n91">91</a></p> +<p id="n88" class="stm run hide_run"><a href="#n88">88</a></p> +<p id="n89" class="stm run hide_run"><a href="#n89">89</a></p> +<p id="n90" class="stm run hide_run"><a href="#n90">90</a></p> +<p id="n91" class="stm run hide_run"><a href="#n91">91</a></p> <p id="n92" class="pln"><a href="#n92">92</a></p> -<p id="n93" class="stm mis"><a href="#n93">93</a></p> -<p id="n94" class="stm mis"><a href="#n94">94</a></p> -<p id="n95" class="stm mis"><a href="#n95">95</a></p> -<p id="n96" class="stm mis"><a href="#n96">96</a></p> +<p id="n93" class="stm run hide_run"><a href="#n93">93</a></p> +<p id="n94" class="stm run hide_run"><a href="#n94">94</a></p> +<p id="n95" class="stm run hide_run"><a href="#n95">95</a></p> +<p id="n96" class="stm run hide_run"><a href="#n96">96</a></p> <p id="n97" class="pln"><a href="#n97">97</a></p> -<p id="n98" class="stm mis"><a href="#n98">98</a></p> -<p id="n99" class="stm mis"><a href="#n99">99</a></p> +<p id="n98" class="stm run hide_run"><a href="#n98">98</a></p> +<p id="n99" class="stm run hide_run"><a href="#n99">99</a></p> <p id="n100" class="pln"><a href="#n100">100</a></p> -<p id="n101" class="stm mis"><a href="#n101">101</a></p> -<p id="n102" class="stm mis"><a href="#n102">102</a></p> - +<p id="n101" class="stm run hide_run"><a href="#n101">101</a></p> +<p id="n102" class="stm run hide_run"><a href="#n102">102</a></p> + </td> <td class="text"> -<p id="t1" class="pln"><span class="str">""" Test the cogapp.whiteutils module.</span><span class="strut"> </span></p> -<p id="t2" class="pln"><span class="str"> http://nedbatchelder.com/code/cog</span><span class="strut"> </span></p> +<p id="t1" class="pln"><span class="str">""" Test the cogapp.whiteutils module.</span><span class="strut"> </span></p> +<p id="t2" class="pln"><span class="str"> http://nedbatchelder.com/code/cog</span><span class="strut"> </span></p> <p id="t3" class="pln"><span class="strut"> </span></p> -<p id="t4" class="pln"><span class="str"> Copyright 2004-2015, Ned Batchelder.</span><span class="strut"> </span></p> -<p id="t5" class="pln"><span class="str">"""</span><span class="strut"> </span></p> +<p id="t4" class="pln"><span class="str"> Copyright 2004-2015, Ned Batchelder.</span><span class="strut"> </span></p> +<p id="t5" class="pln"><span class="str">"""</span><span class="strut"> </span></p> <p id="t6" class="pln"><span class="strut"> </span></p> -<p id="t7" class="stm mis"><span class="key">from</span> <span class="nam">__future__</span> <span class="key">import</span> <span class="nam">absolute_import</span><span class="strut"> </span></p> +<p id="t7" class="stm run hide_run"><span class="key">from</span> <span class="nam">__future__</span> <span class="key">import</span> <span class="nam">absolute_import</span><span class="strut"> </span></p> <p id="t8" class="pln"><span class="strut"> </span></p> -<p id="t9" class="stm mis"><span class="key">import</span> <span class="nam">unittest</span><span class="strut"> </span></p> +<p id="t9" class="stm run hide_run"><span class="key">import</span> <span class="nam">unittest</span><span class="strut"> </span></p> <p id="t10" class="pln"><span class="strut"> </span></p> -<p id="t11" class="stm mis"><span class="key">from</span> <span class="op">.</span><span class="nam">whiteutils</span> <span class="key">import</span> <span class="op">*</span><span class="strut"> </span></p> +<p id="t11" class="stm run hide_run"><span class="key">from</span> <span class="op">.</span><span class="nam">whiteutils</span> <span class="key">import</span> <span class="op">*</span><span class="strut"> </span></p> <p id="t12" class="pln"><span class="strut"> </span></p> <p id="t13" class="pln"><span class="strut"> </span></p> -<p id="t14" class="stm mis"><span class="key">class</span> <span class="nam">WhitePrefixTests</span><span class="op">(</span><span class="nam">unittest</span><span class="op">.</span><span class="nam">TestCase</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t15" class="pln"> <span class="str">""" Test cases for cogapp.whiteutils.</span><span class="strut"> </span></p> -<p id="t16" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t17" class="stm mis"> <span class="key">def</span> <span class="nam">testSingleLine</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t18" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">whitePrefix</span><span class="op">(</span><span class="op">[</span><span class="str">''</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">''</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t19" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">whitePrefix</span><span class="op">(</span><span class="op">[</span><span class="str">' '</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">''</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t20" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">whitePrefix</span><span class="op">(</span><span class="op">[</span><span class="str">'x'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">''</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t21" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">whitePrefix</span><span class="op">(</span><span class="op">[</span><span class="str">' x'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">' '</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t22" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">whitePrefix</span><span class="op">(</span><span class="op">[</span><span class="str">'\tx'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">'\t'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t23" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">whitePrefix</span><span class="op">(</span><span class="op">[</span><span class="str">' x'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">' '</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t24" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">whitePrefix</span><span class="op">(</span><span class="op">[</span><span class="str">' \t \tx '</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">' \t \t'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t14" class="stm run hide_run"><span class="key">class</span> <span class="nam">WhitePrefixTests</span><span class="op">(</span><span class="nam">unittest</span><span class="op">.</span><span class="nam">TestCase</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t15" class="pln"> <span class="str">""" Test cases for cogapp.whiteutils.</span><span class="strut"> </span></p> +<p id="t16" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t17" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testSingleLine</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t18" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">whitePrefix</span><span class="op">(</span><span class="op">[</span><span class="str">''</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">''</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t19" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">whitePrefix</span><span class="op">(</span><span class="op">[</span><span class="str">' '</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">''</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t20" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">whitePrefix</span><span class="op">(</span><span class="op">[</span><span class="str">'x'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">''</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t21" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">whitePrefix</span><span class="op">(</span><span class="op">[</span><span class="str">' x'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">' '</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t22" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">whitePrefix</span><span class="op">(</span><span class="op">[</span><span class="str">'\tx'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">'\t'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t23" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">whitePrefix</span><span class="op">(</span><span class="op">[</span><span class="str">' x'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">' '</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t24" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">whitePrefix</span><span class="op">(</span><span class="op">[</span><span class="str">' \t \tx '</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">' \t \t'</span><span class="op">)</span><span class="strut"> </span></p> <p id="t25" class="pln"><span class="strut"> </span></p> -<p id="t26" class="stm mis"> <span class="key">def</span> <span class="nam">testMultiLine</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t27" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">whitePrefix</span><span class="op">(</span><span class="op">[</span><span class="str">' x'</span><span class="op">,</span><span class="str">' x'</span><span class="op">,</span><span class="str">' x'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">' '</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t28" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">whitePrefix</span><span class="op">(</span><span class="op">[</span><span class="str">' y'</span><span class="op">,</span><span class="str">' y'</span><span class="op">,</span><span class="str">' y'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">' '</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t29" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">whitePrefix</span><span class="op">(</span><span class="op">[</span><span class="str">' y'</span><span class="op">,</span><span class="str">' y'</span><span class="op">,</span><span class="str">' y'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">' '</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t26" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testMultiLine</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t27" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">whitePrefix</span><span class="op">(</span><span class="op">[</span><span class="str">' x'</span><span class="op">,</span><span class="str">' x'</span><span class="op">,</span><span class="str">' x'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">' '</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t28" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">whitePrefix</span><span class="op">(</span><span class="op">[</span><span class="str">' y'</span><span class="op">,</span><span class="str">' y'</span><span class="op">,</span><span class="str">' y'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">' '</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t29" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">whitePrefix</span><span class="op">(</span><span class="op">[</span><span class="str">' y'</span><span class="op">,</span><span class="str">' y'</span><span class="op">,</span><span class="str">' y'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">' '</span><span class="op">)</span><span class="strut"> </span></p> <p id="t30" class="pln"><span class="strut"> </span></p> -<p id="t31" class="stm mis"> <span class="key">def</span> <span class="nam">testBlankLinesAreIgnored</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t32" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">whitePrefix</span><span class="op">(</span><span class="op">[</span><span class="str">' x'</span><span class="op">,</span><span class="str">' x'</span><span class="op">,</span><span class="str">''</span><span class="op">,</span><span class="str">' x'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">' '</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t33" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">whitePrefix</span><span class="op">(</span><span class="op">[</span><span class="str">''</span><span class="op">,</span><span class="str">' x'</span><span class="op">,</span><span class="str">' x'</span><span class="op">,</span><span class="str">' x'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">' '</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t34" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">whitePrefix</span><span class="op">(</span><span class="op">[</span><span class="str">' x'</span><span class="op">,</span><span class="str">' x'</span><span class="op">,</span><span class="str">' x'</span><span class="op">,</span><span class="str">''</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">' '</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t35" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">whitePrefix</span><span class="op">(</span><span class="op">[</span><span class="str">' x'</span><span class="op">,</span><span class="str">' x'</span><span class="op">,</span><span class="str">' '</span><span class="op">,</span><span class="str">' x'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">' '</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t31" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testBlankLinesAreIgnored</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t32" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">whitePrefix</span><span class="op">(</span><span class="op">[</span><span class="str">' x'</span><span class="op">,</span><span class="str">' x'</span><span class="op">,</span><span class="str">''</span><span class="op">,</span><span class="str">' x'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">' '</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t33" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">whitePrefix</span><span class="op">(</span><span class="op">[</span><span class="str">''</span><span class="op">,</span><span class="str">' x'</span><span class="op">,</span><span class="str">' x'</span><span class="op">,</span><span class="str">' x'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">' '</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t34" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">whitePrefix</span><span class="op">(</span><span class="op">[</span><span class="str">' x'</span><span class="op">,</span><span class="str">' x'</span><span class="op">,</span><span class="str">' x'</span><span class="op">,</span><span class="str">''</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">' '</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t35" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">whitePrefix</span><span class="op">(</span><span class="op">[</span><span class="str">' x'</span><span class="op">,</span><span class="str">' x'</span><span class="op">,</span><span class="str">' '</span><span class="op">,</span><span class="str">' x'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">' '</span><span class="op">)</span><span class="strut"> </span></p> <p id="t36" class="pln"><span class="strut"> </span></p> -<p id="t37" class="stm mis"> <span class="key">def</span> <span class="nam">testTabCharacters</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t38" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">whitePrefix</span><span class="op">(</span><span class="op">[</span><span class="str">'\timport sys'</span><span class="op">,</span> <span class="str">''</span><span class="op">,</span> <span class="str">'\tprint sys.argv'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">'\t'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t37" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testTabCharacters</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t38" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">whitePrefix</span><span class="op">(</span><span class="op">[</span><span class="str">'\timport sys'</span><span class="op">,</span> <span class="str">''</span><span class="op">,</span> <span class="str">'\tprint sys.argv'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">'\t'</span><span class="op">)</span><span class="strut"> </span></p> <p id="t39" class="pln"><span class="strut"> </span></p> -<p id="t40" class="stm mis"> <span class="key">def</span> <span class="nam">testDecreasingLengths</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t41" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">whitePrefix</span><span class="op">(</span><span class="op">[</span><span class="str">' x'</span><span class="op">,</span><span class="str">' x'</span><span class="op">,</span><span class="str">' x'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">' '</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t42" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">whitePrefix</span><span class="op">(</span><span class="op">[</span><span class="str">' x'</span><span class="op">,</span><span class="str">' x'</span><span class="op">,</span><span class="str">' x'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">' '</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t40" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testDecreasingLengths</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t41" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">whitePrefix</span><span class="op">(</span><span class="op">[</span><span class="str">' x'</span><span class="op">,</span><span class="str">' x'</span><span class="op">,</span><span class="str">' x'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">' '</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t42" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">whitePrefix</span><span class="op">(</span><span class="op">[</span><span class="str">' x'</span><span class="op">,</span><span class="str">' x'</span><span class="op">,</span><span class="str">' x'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">' '</span><span class="op">)</span><span class="strut"> </span></p> <p id="t43" class="pln"><span class="strut"> </span></p> <p id="t44" class="pln"><span class="strut"> </span></p> -<p id="t45" class="stm mis"><span class="key">class</span> <span class="nam">ReindentBlockTests</span><span class="op">(</span><span class="nam">unittest</span><span class="op">.</span><span class="nam">TestCase</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t46" class="pln"> <span class="str">""" Test cases for cogapp.reindentBlock.</span><span class="strut"> </span></p> -<p id="t47" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t48" class="stm mis"> <span class="key">def</span> <span class="nam">testNonTermLine</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t49" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">reindentBlock</span><span class="op">(</span><span class="str">''</span><span class="op">)</span><span class="op">,</span> <span class="str">''</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t50" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">reindentBlock</span><span class="op">(</span><span class="str">'x'</span><span class="op">)</span><span class="op">,</span> <span class="str">'x'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t51" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">reindentBlock</span><span class="op">(</span><span class="str">' x'</span><span class="op">)</span><span class="op">,</span> <span class="str">'x'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t52" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">reindentBlock</span><span class="op">(</span><span class="str">' x'</span><span class="op">)</span><span class="op">,</span> <span class="str">'x'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t53" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">reindentBlock</span><span class="op">(</span><span class="str">'\tx'</span><span class="op">)</span><span class="op">,</span> <span class="str">'x'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t54" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">reindentBlock</span><span class="op">(</span><span class="str">'x'</span><span class="op">,</span> <span class="str">' '</span><span class="op">)</span><span class="op">,</span> <span class="str">' x'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t55" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">reindentBlock</span><span class="op">(</span><span class="str">'x'</span><span class="op">,</span> <span class="str">'\t'</span><span class="op">)</span><span class="op">,</span> <span class="str">'\tx'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t56" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">reindentBlock</span><span class="op">(</span><span class="str">' x'</span><span class="op">,</span> <span class="str">' '</span><span class="op">)</span><span class="op">,</span> <span class="str">' x'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t57" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">reindentBlock</span><span class="op">(</span><span class="str">' x'</span><span class="op">,</span> <span class="str">'\t'</span><span class="op">)</span><span class="op">,</span> <span class="str">'\tx'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t58" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">reindentBlock</span><span class="op">(</span><span class="str">' x'</span><span class="op">,</span> <span class="str">' '</span><span class="op">)</span><span class="op">,</span> <span class="str">' x'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t45" class="stm run hide_run"><span class="key">class</span> <span class="nam">ReindentBlockTests</span><span class="op">(</span><span class="nam">unittest</span><span class="op">.</span><span class="nam">TestCase</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t46" class="pln"> <span class="str">""" Test cases for cogapp.reindentBlock.</span><span class="strut"> </span></p> +<p id="t47" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t48" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testNonTermLine</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t49" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">reindentBlock</span><span class="op">(</span><span class="str">''</span><span class="op">)</span><span class="op">,</span> <span class="str">''</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t50" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">reindentBlock</span><span class="op">(</span><span class="str">'x'</span><span class="op">)</span><span class="op">,</span> <span class="str">'x'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t51" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">reindentBlock</span><span class="op">(</span><span class="str">' x'</span><span class="op">)</span><span class="op">,</span> <span class="str">'x'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t52" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">reindentBlock</span><span class="op">(</span><span class="str">' x'</span><span class="op">)</span><span class="op">,</span> <span class="str">'x'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t53" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">reindentBlock</span><span class="op">(</span><span class="str">'\tx'</span><span class="op">)</span><span class="op">,</span> <span class="str">'x'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t54" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">reindentBlock</span><span class="op">(</span><span class="str">'x'</span><span class="op">,</span> <span class="str">' '</span><span class="op">)</span><span class="op">,</span> <span class="str">' x'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t55" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">reindentBlock</span><span class="op">(</span><span class="str">'x'</span><span class="op">,</span> <span class="str">'\t'</span><span class="op">)</span><span class="op">,</span> <span class="str">'\tx'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t56" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">reindentBlock</span><span class="op">(</span><span class="str">' x'</span><span class="op">,</span> <span class="str">' '</span><span class="op">)</span><span class="op">,</span> <span class="str">' x'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t57" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">reindentBlock</span><span class="op">(</span><span class="str">' x'</span><span class="op">,</span> <span class="str">'\t'</span><span class="op">)</span><span class="op">,</span> <span class="str">'\tx'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t58" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">reindentBlock</span><span class="op">(</span><span class="str">' x'</span><span class="op">,</span> <span class="str">' '</span><span class="op">)</span><span class="op">,</span> <span class="str">' x'</span><span class="op">)</span><span class="strut"> </span></p> <p id="t59" class="pln"><span class="strut"> </span></p> -<p id="t60" class="stm mis"> <span class="key">def</span> <span class="nam">testSingleLine</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t61" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">reindentBlock</span><span class="op">(</span><span class="str">'\n'</span><span class="op">)</span><span class="op">,</span> <span class="str">'\n'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t62" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">reindentBlock</span><span class="op">(</span><span class="str">'x\n'</span><span class="op">)</span><span class="op">,</span> <span class="str">'x\n'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t63" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">reindentBlock</span><span class="op">(</span><span class="str">' x\n'</span><span class="op">)</span><span class="op">,</span> <span class="str">'x\n'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t64" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">reindentBlock</span><span class="op">(</span><span class="str">' x\n'</span><span class="op">)</span><span class="op">,</span> <span class="str">'x\n'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t65" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">reindentBlock</span><span class="op">(</span><span class="str">'\tx\n'</span><span class="op">)</span><span class="op">,</span> <span class="str">'x\n'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t66" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">reindentBlock</span><span class="op">(</span><span class="str">'x\n'</span><span class="op">,</span> <span class="str">' '</span><span class="op">)</span><span class="op">,</span> <span class="str">' x\n'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t67" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">reindentBlock</span><span class="op">(</span><span class="str">'x\n'</span><span class="op">,</span> <span class="str">'\t'</span><span class="op">)</span><span class="op">,</span> <span class="str">'\tx\n'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t68" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">reindentBlock</span><span class="op">(</span><span class="str">' x\n'</span><span class="op">,</span> <span class="str">' '</span><span class="op">)</span><span class="op">,</span> <span class="str">' x\n'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t69" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">reindentBlock</span><span class="op">(</span><span class="str">' x\n'</span><span class="op">,</span> <span class="str">'\t'</span><span class="op">)</span><span class="op">,</span> <span class="str">'\tx\n'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t70" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">reindentBlock</span><span class="op">(</span><span class="str">' x\n'</span><span class="op">,</span> <span class="str">' '</span><span class="op">)</span><span class="op">,</span> <span class="str">' x\n'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t60" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testSingleLine</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t61" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">reindentBlock</span><span class="op">(</span><span class="str">'\n'</span><span class="op">)</span><span class="op">,</span> <span class="str">'\n'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t62" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">reindentBlock</span><span class="op">(</span><span class="str">'x\n'</span><span class="op">)</span><span class="op">,</span> <span class="str">'x\n'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t63" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">reindentBlock</span><span class="op">(</span><span class="str">' x\n'</span><span class="op">)</span><span class="op">,</span> <span class="str">'x\n'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t64" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">reindentBlock</span><span class="op">(</span><span class="str">' x\n'</span><span class="op">)</span><span class="op">,</span> <span class="str">'x\n'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t65" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">reindentBlock</span><span class="op">(</span><span class="str">'\tx\n'</span><span class="op">)</span><span class="op">,</span> <span class="str">'x\n'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t66" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">reindentBlock</span><span class="op">(</span><span class="str">'x\n'</span><span class="op">,</span> <span class="str">' '</span><span class="op">)</span><span class="op">,</span> <span class="str">' x\n'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t67" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">reindentBlock</span><span class="op">(</span><span class="str">'x\n'</span><span class="op">,</span> <span class="str">'\t'</span><span class="op">)</span><span class="op">,</span> <span class="str">'\tx\n'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t68" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">reindentBlock</span><span class="op">(</span><span class="str">' x\n'</span><span class="op">,</span> <span class="str">' '</span><span class="op">)</span><span class="op">,</span> <span class="str">' x\n'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t69" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">reindentBlock</span><span class="op">(</span><span class="str">' x\n'</span><span class="op">,</span> <span class="str">'\t'</span><span class="op">)</span><span class="op">,</span> <span class="str">'\tx\n'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t70" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">reindentBlock</span><span class="op">(</span><span class="str">' x\n'</span><span class="op">,</span> <span class="str">' '</span><span class="op">)</span><span class="op">,</span> <span class="str">' x\n'</span><span class="op">)</span><span class="strut"> </span></p> <p id="t71" class="pln"><span class="strut"> </span></p> -<p id="t72" class="stm mis"> <span class="key">def</span> <span class="nam">testRealBlock</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t73" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="strut"> </span></p> -<p id="t74" class="pln"> <span class="nam">reindentBlock</span><span class="op">(</span><span class="str">'\timport sys\n\n\tprint sys.argv\n'</span><span class="op">)</span><span class="op">,</span><span class="strut"> </span></p> -<p id="t75" class="pln"> <span class="str">'import sys\n\nprint sys.argv\n'</span><span class="strut"> </span></p> -<p id="t76" class="pln"> <span class="op">)</span><span class="strut"> </span></p> +<p id="t72" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testRealBlock</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t73" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="strut"> </span></p> +<p id="t74" class="pln"> <span class="nam">reindentBlock</span><span class="op">(</span><span class="str">'\timport sys\n\n\tprint sys.argv\n'</span><span class="op">)</span><span class="op">,</span><span class="strut"> </span></p> +<p id="t75" class="pln"> <span class="str">'import sys\n\nprint sys.argv\n'</span><span class="strut"> </span></p> +<p id="t76" class="pln"> <span class="op">)</span><span class="strut"> </span></p> <p id="t77" class="pln"><span class="strut"> </span></p> <p id="t78" class="pln"><span class="strut"> </span></p> -<p id="t79" class="stm mis"><span class="key">class</span> <span class="nam">CommonPrefixTests</span><span class="op">(</span><span class="nam">unittest</span><span class="op">.</span><span class="nam">TestCase</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t80" class="pln"> <span class="str">""" Test cases for cogapp.commonPrefix.</span><span class="strut"> </span></p> -<p id="t81" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t82" class="stm mis"> <span class="key">def</span> <span class="nam">testDegenerateCases</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t83" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">commonPrefix</span><span class="op">(</span><span class="op">[</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">''</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t84" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">commonPrefix</span><span class="op">(</span><span class="op">[</span><span class="str">''</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">''</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t85" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">commonPrefix</span><span class="op">(</span><span class="op">[</span><span class="str">''</span><span class="op">,</span><span class="str">''</span><span class="op">,</span><span class="str">''</span><span class="op">,</span><span class="str">''</span><span class="op">,</span><span class="str">''</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">''</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t86" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">commonPrefix</span><span class="op">(</span><span class="op">[</span><span class="str">'cat in the hat'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">'cat in the hat'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t79" class="stm run hide_run"><span class="key">class</span> <span class="nam">CommonPrefixTests</span><span class="op">(</span><span class="nam">unittest</span><span class="op">.</span><span class="nam">TestCase</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t80" class="pln"> <span class="str">""" Test cases for cogapp.commonPrefix.</span><span class="strut"> </span></p> +<p id="t81" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t82" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testDegenerateCases</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t83" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">commonPrefix</span><span class="op">(</span><span class="op">[</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">''</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t84" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">commonPrefix</span><span class="op">(</span><span class="op">[</span><span class="str">''</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">''</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t85" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">commonPrefix</span><span class="op">(</span><span class="op">[</span><span class="str">''</span><span class="op">,</span><span class="str">''</span><span class="op">,</span><span class="str">''</span><span class="op">,</span><span class="str">''</span><span class="op">,</span><span class="str">''</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">''</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t86" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">commonPrefix</span><span class="op">(</span><span class="op">[</span><span class="str">'cat in the hat'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">'cat in the hat'</span><span class="op">)</span><span class="strut"> </span></p> <p id="t87" class="pln"><span class="strut"> </span></p> -<p id="t88" class="stm mis"> <span class="key">def</span> <span class="nam">testNoCommonPrefix</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t89" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">commonPrefix</span><span class="op">(</span><span class="op">[</span><span class="str">'a'</span><span class="op">,</span><span class="str">'b'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">''</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t90" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">commonPrefix</span><span class="op">(</span><span class="op">[</span><span class="str">'a'</span><span class="op">,</span><span class="str">'b'</span><span class="op">,</span><span class="str">'c'</span><span class="op">,</span><span class="str">'d'</span><span class="op">,</span><span class="str">'e'</span><span class="op">,</span><span class="str">'f'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">''</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t91" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">commonPrefix</span><span class="op">(</span><span class="op">[</span><span class="str">'a'</span><span class="op">,</span><span class="str">'a'</span><span class="op">,</span><span class="str">'a'</span><span class="op">,</span><span class="str">'a'</span><span class="op">,</span><span class="str">'a'</span><span class="op">,</span><span class="str">'x'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">''</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t88" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testNoCommonPrefix</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t89" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">commonPrefix</span><span class="op">(</span><span class="op">[</span><span class="str">'a'</span><span class="op">,</span><span class="str">'b'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">''</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t90" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">commonPrefix</span><span class="op">(</span><span class="op">[</span><span class="str">'a'</span><span class="op">,</span><span class="str">'b'</span><span class="op">,</span><span class="str">'c'</span><span class="op">,</span><span class="str">'d'</span><span class="op">,</span><span class="str">'e'</span><span class="op">,</span><span class="str">'f'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">''</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t91" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">commonPrefix</span><span class="op">(</span><span class="op">[</span><span class="str">'a'</span><span class="op">,</span><span class="str">'a'</span><span class="op">,</span><span class="str">'a'</span><span class="op">,</span><span class="str">'a'</span><span class="op">,</span><span class="str">'a'</span><span class="op">,</span><span class="str">'x'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">''</span><span class="op">)</span><span class="strut"> </span></p> <p id="t92" class="pln"><span class="strut"> </span></p> -<p id="t93" class="stm mis"> <span class="key">def</span> <span class="nam">testUsualCases</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t94" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">commonPrefix</span><span class="op">(</span><span class="op">[</span><span class="str">'ab'</span><span class="op">,</span> <span class="str">'ac'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">'a'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t95" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">commonPrefix</span><span class="op">(</span><span class="op">[</span><span class="str">'aab'</span><span class="op">,</span> <span class="str">'aac'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">'aa'</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t96" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">commonPrefix</span><span class="op">(</span><span class="op">[</span><span class="str">'aab'</span><span class="op">,</span> <span class="str">'aab'</span><span class="op">,</span> <span class="str">'aab'</span><span class="op">,</span> <span class="str">'aac'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">'aa'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t93" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testUsualCases</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t94" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">commonPrefix</span><span class="op">(</span><span class="op">[</span><span class="str">'ab'</span><span class="op">,</span> <span class="str">'ac'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">'a'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t95" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">commonPrefix</span><span class="op">(</span><span class="op">[</span><span class="str">'aab'</span><span class="op">,</span> <span class="str">'aac'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">'aa'</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t96" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">commonPrefix</span><span class="op">(</span><span class="op">[</span><span class="str">'aab'</span><span class="op">,</span> <span class="str">'aab'</span><span class="op">,</span> <span class="str">'aab'</span><span class="op">,</span> <span class="str">'aac'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">'aa'</span><span class="op">)</span><span class="strut"> </span></p> <p id="t97" class="pln"><span class="strut"> </span></p> -<p id="t98" class="stm mis"> <span class="key">def</span> <span class="nam">testBlankLine</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t99" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">commonPrefix</span><span class="op">(</span><span class="op">[</span><span class="str">'abc'</span><span class="op">,</span> <span class="str">'abx'</span><span class="op">,</span> <span class="str">''</span><span class="op">,</span> <span class="str">'aby'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">''</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t98" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testBlankLine</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t99" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">commonPrefix</span><span class="op">(</span><span class="op">[</span><span class="str">'abc'</span><span class="op">,</span> <span class="str">'abx'</span><span class="op">,</span> <span class="str">''</span><span class="op">,</span> <span class="str">'aby'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">''</span><span class="op">)</span><span class="strut"> </span></p> <p id="t100" class="pln"><span class="strut"> </span></p> -<p id="t101" class="stm mis"> <span class="key">def</span> <span class="nam">testDecreasingLengths</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t102" class="stm mis"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">commonPrefix</span><span class="op">(</span><span class="op">[</span><span class="str">'abcd'</span><span class="op">,</span> <span class="str">'abc'</span><span class="op">,</span> <span class="str">'ab'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">'ab'</span><span class="op">)</span><span class="strut"> </span></p> - +<p id="t101" class="stm run hide_run"> <span class="key">def</span> <span class="nam">testDecreasingLengths</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t102" class="stm run hide_run"> <span class="nam">self</span><span class="op">.</span><span class="nam">assertEqual</span><span class="op">(</span><span class="nam">commonPrefix</span><span class="op">(</span><span class="op">[</span><span class="str">'abcd'</span><span class="op">,</span> <span class="str">'abc'</span><span class="op">,</span> <span class="str">'ab'</span><span class="op">]</span><span class="op">)</span><span class="op">,</span> <span class="str">'ab'</span><span class="op">)</span><span class="strut"> </span></p> + </td> </tr> </table> @@ -285,8 +285,8 @@ <div id="footer"> <div class="content"> <p> - <a class="nav" href="index.html">« index</a> <a class="nav" href="https://coverage.readthedocs.org">coverage.py v4.0.3</a>, - created at 2015-11-24 07:02 + <a class="nav" href="index.html">« index</a> <a class="nav" href="https://coverage.readthedocs.io">coverage.py v4.1</a>, + created at 2016-05-21 08:55 </p> </div> </div> diff --git a/doc/sample_html/cogapp_whiteutils_py.html b/doc/sample_html/cogapp_whiteutils_py.html index eee9d62..679dcb7 100644 --- a/doc/sample_html/cogapp_whiteutils_py.html +++ b/doc/sample_html/cogapp_whiteutils_py.html @@ -8,7 +8,7 @@ <meta http-equiv="X-UA-Compatible" content="IE=emulateIE7" /> - <title>Coverage for cogapp/whiteutils.py: 92.21%</title> + <title>Coverage for cogapp/whiteutils.py: 98.70%</title> <link rel="stylesheet" href="style.css" type="text/css"> <script type="text/javascript" src="jquery.min.js"></script> @@ -24,19 +24,19 @@ <div id="header"> <div class="content"> <h1>Coverage for <b>cogapp/whiteutils.py</b> : - <span class="pc_cov">92.21%</span> + <span class="pc_cov">98.70%</span> </h1> <img id="keyboard_icon" src="keybd_closed.png" alt="Show keyboard shortcuts" /> <h2 class="stats"> 45 statements - <span class="run hide_run shortkey_r button_toggle_run">42 run</span> - <span class="mis shortkey_m button_toggle_mis">3 missing</span> + <span class="run hide_run shortkey_r button_toggle_run">45 run</span> + <span class="mis shortkey_m button_toggle_mis">0 missing</span> <span class="exc shortkey_x button_toggle_exc">0 excluded</span> - <span class="par run hide_run shortkey_p button_toggle_par">3 partial</span> + <span class="par run hide_run shortkey_p button_toggle_par">1 partial</span> </h2> </div> @@ -44,22 +44,22 @@ <div class="help_panel"> <img id="panel_icon" src="keybd_open.png" alt="Hide keyboard shortcuts" /> -<p class="legend">Hot-keys on this page</p> + <p class="legend">Hot-keys on this page</p> <div> -<p class="keyhelp"> + <p class="keyhelp"> <span class="key">r</span> <span class="key">m</span> <span class="key">x</span> <span class="key">p</span> toggle line displays </p> -<p class="keyhelp"> + <p class="keyhelp"> <span class="key">j</span> <span class="key">k</span> next/prev highlighted chunk </p> -<p class="keyhelp"> + <p class="keyhelp"> <span class="key">0</span> (zero) top of page </p> -<p class="keyhelp"> + <p class="keyhelp"> <span class="key">1</span> (one) first highlighted chunk </p> </div> @@ -99,9 +99,9 @@ <p id="n28" class="pln"><a href="#n28">28</a></p> <p id="n29" class="stm run hide_run"><a href="#n29">29</a></p> <p id="n30" class="stm run hide_run"><a href="#n30">30</a></p> -<p id="n31" class="stm par run hide_run"><a href="#n31">31</a></p> -<p id="n32" class="stm mis"><a href="#n32">32</a></p> -<p id="n33" class="stm mis"><a href="#n33">33</a></p> +<p id="n31" class="stm run hide_run"><a href="#n31">31</a></p> +<p id="n32" class="stm run hide_run"><a href="#n32">32</a></p> +<p id="n33" class="stm run hide_run"><a href="#n33">33</a></p> <p id="n34" class="stm run hide_run"><a href="#n34">34</a></p> <p id="n35" class="pln"><a href="#n35">35</a></p> <p id="n36" class="stm run hide_run"><a href="#n36">36</a></p> @@ -127,8 +127,8 @@ <p id="n56" class="stm run hide_run"><a href="#n56">56</a></p> <p id="n57" class="pln"><a href="#n57">57</a></p> <p id="n58" class="pln"><a href="#n58">58</a></p> -<p id="n59" class="stm par run hide_run"><a href="#n59">59</a></p> -<p id="n60" class="stm mis"><a href="#n60">60</a></p> +<p id="n59" class="stm run hide_run"><a href="#n59">59</a></p> +<p id="n60" class="stm run hide_run"><a href="#n60">60</a></p> <p id="n61" class="stm run hide_run"><a href="#n61">61</a></p> <p id="n62" class="stm run hide_run"><a href="#n62">62</a></p> <p id="n63" class="stm run hide_run"><a href="#n63">63</a></p> @@ -140,81 +140,81 @@ <p id="n69" class="stm run hide_run"><a href="#n69">69</a></p> <p id="n70" class="stm run hide_run"><a href="#n70">70</a></p> <p id="n71" class="stm run hide_run"><a href="#n71">71</a></p> - + </td> <td class="text"> -<p id="t1" class="pln"><span class="str">""" Indentation utilities for Cog.</span><span class="strut"> </span></p> -<p id="t2" class="pln"><span class="str"> http://nedbatchelder.com/code/cog</span><span class="strut"> </span></p> +<p id="t1" class="pln"><span class="str">""" Indentation utilities for Cog.</span><span class="strut"> </span></p> +<p id="t2" class="pln"><span class="str"> http://nedbatchelder.com/code/cog</span><span class="strut"> </span></p> <p id="t3" class="pln"><span class="strut"> </span></p> -<p id="t4" class="pln"><span class="str"> Copyright 2004-2015, Ned Batchelder.</span><span class="strut"> </span></p> -<p id="t5" class="pln"><span class="str">"""</span><span class="strut"> </span></p> +<p id="t4" class="pln"><span class="str"> Copyright 2004-2015, Ned Batchelder.</span><span class="strut"> </span></p> +<p id="t5" class="pln"><span class="str">"""</span><span class="strut"> </span></p> <p id="t6" class="pln"><span class="strut"> </span></p> <p id="t7" class="stm run hide_run"><span class="key">from</span> <span class="nam">__future__</span> <span class="key">import</span> <span class="nam">absolute_import</span><span class="strut"> </span></p> <p id="t8" class="stm run hide_run"><span class="key">import</span> <span class="nam">re</span><span class="strut"> </span></p> <p id="t9" class="stm run hide_run"><span class="key">from</span> <span class="op">.</span><span class="nam">backward</span> <span class="key">import</span> <span class="nam">string_types</span><span class="op">,</span> <span class="nam">bytes_types</span><span class="op">,</span> <span class="nam">to_bytes</span><span class="op">,</span> <span class="nam">b</span><span class="strut"> </span></p> <p id="t10" class="pln"><span class="strut"> </span></p> <p id="t11" class="stm run hide_run"><span class="key">def</span> <span class="nam">whitePrefix</span><span class="op">(</span><span class="nam">strings</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t12" class="pln"> <span class="str">""" Determine the whitespace prefix common to all non-blank lines</span><span class="strut"> </span></p> -<p id="t13" class="pln"><span class="str"> in the argument list.</span><span class="strut"> </span></p> -<p id="t14" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t15" class="pln"> <span class="com"># Remove all blank lines from the list</span><span class="strut"> </span></p> -<p id="t16" class="stm run hide_run"> <span class="nam">strings</span> <span class="op">=</span> <span class="op">[</span><span class="nam">s</span> <span class="key">for</span> <span class="nam">s</span> <span class="key">in</span> <span class="nam">strings</span> <span class="key">if</span> <span class="nam">s</span><span class="op">.</span><span class="nam">strip</span><span class="op">(</span><span class="op">)</span> <span class="op">!=</span> <span class="str">''</span><span class="op">]</span><span class="strut"> </span></p> +<p id="t12" class="pln"> <span class="str">""" Determine the whitespace prefix common to all non-blank lines</span><span class="strut"> </span></p> +<p id="t13" class="pln"><span class="str"> in the argument list.</span><span class="strut"> </span></p> +<p id="t14" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t15" class="pln"> <span class="com"># Remove all blank lines from the list</span><span class="strut"> </span></p> +<p id="t16" class="stm run hide_run"> <span class="nam">strings</span> <span class="op">=</span> <span class="op">[</span><span class="nam">s</span> <span class="key">for</span> <span class="nam">s</span> <span class="key">in</span> <span class="nam">strings</span> <span class="key">if</span> <span class="nam">s</span><span class="op">.</span><span class="nam">strip</span><span class="op">(</span><span class="op">)</span> <span class="op">!=</span> <span class="str">''</span><span class="op">]</span><span class="strut"> </span></p> <p id="t17" class="pln"><span class="strut"> </span></p> -<p id="t18" class="stm run hide_run"> <span class="key">if</span> <span class="key">not</span> <span class="nam">strings</span><span class="op">:</span> <span class="key">return</span> <span class="str">''</span><span class="strut"> </span></p> +<p id="t18" class="stm run hide_run"> <span class="key">if</span> <span class="key">not</span> <span class="nam">strings</span><span class="op">:</span> <span class="key">return</span> <span class="str">''</span><span class="strut"> </span></p> <p id="t19" class="pln"><span class="strut"> </span></p> -<p id="t20" class="pln"> <span class="com"># Find initial whitespace chunk in the first line.</span><span class="strut"> </span></p> -<p id="t21" class="pln"> <span class="com"># This is the best prefix we can hope for.</span><span class="strut"> </span></p> -<p id="t22" class="stm run hide_run"> <span class="nam">pat</span> <span class="op">=</span> <span class="str">r'\s*'</span><span class="strut"> </span></p> -<p id="t23" class="stm par run hide_run"><span class="annotate" title="Line 23 was executed, but never jumped to line 25">23 ↛ 25 [?]</span> <span class="key">if</span> <span class="nam">isinstance</span><span class="op">(</span><span class="nam">strings</span><span class="op">[</span><span class="num">0</span><span class="op">]</span><span class="op">,</span> <span class="nam">bytes_types</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t24" class="stm run hide_run"> <span class="nam">pat</span> <span class="op">=</span> <span class="nam">to_bytes</span><span class="op">(</span><span class="nam">pat</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t25" class="stm run hide_run"> <span class="nam">prefix</span> <span class="op">=</span> <span class="nam">re</span><span class="op">.</span><span class="nam">match</span><span class="op">(</span><span class="nam">pat</span><span class="op">,</span> <span class="nam">strings</span><span class="op">[</span><span class="num">0</span><span class="op">]</span><span class="op">)</span><span class="op">.</span><span class="nam">group</span><span class="op">(</span><span class="num">0</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t20" class="pln"> <span class="com"># Find initial whitespace chunk in the first line.</span><span class="strut"> </span></p> +<p id="t21" class="pln"> <span class="com"># This is the best prefix we can hope for.</span><span class="strut"> </span></p> +<p id="t22" class="stm run hide_run"> <span class="nam">pat</span> <span class="op">=</span> <span class="str">r'\s*'</span><span class="strut"> </span></p> +<p id="t23" class="stm par run hide_run"><span class="annotate short">23 ↛ 25</span><span class="annotate long">line 23 didn't jump to line 25, because the condition on line 23 was never false</span> <span class="key">if</span> <span class="nam">isinstance</span><span class="op">(</span><span class="nam">strings</span><span class="op">[</span><span class="num">0</span><span class="op">]</span><span class="op">,</span> <span class="nam">bytes_types</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t24" class="stm run hide_run"> <span class="nam">pat</span> <span class="op">=</span> <span class="nam">to_bytes</span><span class="op">(</span><span class="nam">pat</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t25" class="stm run hide_run"> <span class="nam">prefix</span> <span class="op">=</span> <span class="nam">re</span><span class="op">.</span><span class="nam">match</span><span class="op">(</span><span class="nam">pat</span><span class="op">,</span> <span class="nam">strings</span><span class="op">[</span><span class="num">0</span><span class="op">]</span><span class="op">)</span><span class="op">.</span><span class="nam">group</span><span class="op">(</span><span class="num">0</span><span class="op">)</span><span class="strut"> </span></p> <p id="t26" class="pln"><span class="strut"> </span></p> -<p id="t27" class="pln"> <span class="com"># Loop over the other strings, keeping only as much of</span><span class="strut"> </span></p> -<p id="t28" class="pln"> <span class="com"># the prefix as matches each string.</span><span class="strut"> </span></p> -<p id="t29" class="stm run hide_run"> <span class="key">for</span> <span class="nam">s</span> <span class="key">in</span> <span class="nam">strings</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t30" class="stm run hide_run"> <span class="key">for</span> <span class="nam">i</span> <span class="key">in</span> <span class="nam">range</span><span class="op">(</span><span class="nam">len</span><span class="op">(</span><span class="nam">prefix</span><span class="op">)</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t31" class="stm par run hide_run"><span class="annotate" title="Line 31 was executed, but never jumped to line 32">31 ↛ 32 [?]</span> <span class="key">if</span> <span class="nam">prefix</span><span class="op">[</span><span class="nam">i</span><span class="op">]</span> <span class="op">!=</span> <span class="nam">s</span><span class="op">[</span><span class="nam">i</span><span class="op">]</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t32" class="stm mis"> <span class="nam">prefix</span> <span class="op">=</span> <span class="nam">prefix</span><span class="op">[</span><span class="op">:</span><span class="nam">i</span><span class="op">]</span><span class="strut"> </span></p> -<p id="t33" class="stm mis"> <span class="key">break</span><span class="strut"> </span></p> -<p id="t34" class="stm run hide_run"> <span class="key">return</span> <span class="nam">prefix</span><span class="strut"> </span></p> +<p id="t27" class="pln"> <span class="com"># Loop over the other strings, keeping only as much of</span><span class="strut"> </span></p> +<p id="t28" class="pln"> <span class="com"># the prefix as matches each string.</span><span class="strut"> </span></p> +<p id="t29" class="stm run hide_run"> <span class="key">for</span> <span class="nam">s</span> <span class="key">in</span> <span class="nam">strings</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t30" class="stm run hide_run"> <span class="key">for</span> <span class="nam">i</span> <span class="key">in</span> <span class="nam">range</span><span class="op">(</span><span class="nam">len</span><span class="op">(</span><span class="nam">prefix</span><span class="op">)</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t31" class="stm run hide_run"> <span class="key">if</span> <span class="nam">prefix</span><span class="op">[</span><span class="nam">i</span><span class="op">]</span> <span class="op">!=</span> <span class="nam">s</span><span class="op">[</span><span class="nam">i</span><span class="op">]</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t32" class="stm run hide_run"> <span class="nam">prefix</span> <span class="op">=</span> <span class="nam">prefix</span><span class="op">[</span><span class="op">:</span><span class="nam">i</span><span class="op">]</span><span class="strut"> </span></p> +<p id="t33" class="stm run hide_run"> <span class="key">break</span><span class="strut"> </span></p> +<p id="t34" class="stm run hide_run"> <span class="key">return</span> <span class="nam">prefix</span><span class="strut"> </span></p> <p id="t35" class="pln"><span class="strut"> </span></p> -<p id="t36" class="stm run hide_run"><span class="key">def</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">lines</span><span class="op">,</span> <span class="nam">newIndent</span><span class="op">=</span><span class="str">''</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t37" class="pln"> <span class="str">""" Take a block of text as a string or list of lines.</span><span class="strut"> </span></p> -<p id="t38" class="pln"><span class="str"> Remove any common whitespace indentation.</span><span class="strut"> </span></p> -<p id="t39" class="pln"><span class="str"> Re-indent using newIndent, and return it as a single string.</span><span class="strut"> </span></p> -<p id="t40" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t41" class="stm run hide_run"> <span class="nam">sep</span><span class="op">,</span> <span class="nam">nothing</span> <span class="op">=</span> <span class="str">'\n'</span><span class="op">,</span> <span class="str">''</span><span class="strut"> </span></p> -<p id="t42" class="stm run hide_run"> <span class="key">if</span> <span class="nam">isinstance</span><span class="op">(</span><span class="nam">lines</span><span class="op">,</span> <span class="nam">bytes_types</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t43" class="stm run hide_run"> <span class="nam">sep</span><span class="op">,</span> <span class="nam">nothing</span> <span class="op">=</span> <span class="nam">b</span><span class="op">(</span><span class="str">'\n'</span><span class="op">)</span><span class="op">,</span> <span class="nam">b</span><span class="op">(</span><span class="str">''</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t44" class="stm run hide_run"> <span class="key">if</span> <span class="nam">isinstance</span><span class="op">(</span><span class="nam">lines</span><span class="op">,</span> <span class="nam">string_types</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t45" class="stm run hide_run"> <span class="nam">lines</span> <span class="op">=</span> <span class="nam">lines</span><span class="op">.</span><span class="nam">split</span><span class="op">(</span><span class="nam">sep</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t46" class="stm run hide_run"> <span class="nam">oldIndent</span> <span class="op">=</span> <span class="nam">whitePrefix</span><span class="op">(</span><span class="nam">lines</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t47" class="stm run hide_run"> <span class="nam">outLines</span> <span class="op">=</span> <span class="op">[</span><span class="op">]</span><span class="strut"> </span></p> -<p id="t48" class="stm run hide_run"> <span class="key">for</span> <span class="nam">l</span> <span class="key">in</span> <span class="nam">lines</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t49" class="stm run hide_run"> <span class="key">if</span> <span class="nam">oldIndent</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t50" class="stm run hide_run"> <span class="nam">l</span> <span class="op">=</span> <span class="nam">l</span><span class="op">.</span><span class="nam">replace</span><span class="op">(</span><span class="nam">oldIndent</span><span class="op">,</span> <span class="nam">nothing</span><span class="op">,</span> <span class="num">1</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t51" class="stm run hide_run"> <span class="key">if</span> <span class="nam">l</span> <span class="key">and</span> <span class="nam">newIndent</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t52" class="stm run hide_run"> <span class="nam">l</span> <span class="op">=</span> <span class="nam">newIndent</span> <span class="op">+</span> <span class="nam">l</span><span class="strut"> </span></p> -<p id="t53" class="stm run hide_run"> <span class="nam">outLines</span><span class="op">.</span><span class="nam">append</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="strut"> </span></p> -<p id="t54" class="stm run hide_run"> <span class="key">return</span> <span class="nam">sep</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">outLines</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t36" class="stm run hide_run"><span class="key">def</span> <span class="nam">reindentBlock</span><span class="op">(</span><span class="nam">lines</span><span class="op">,</span> <span class="nam">newIndent</span><span class="op">=</span><span class="str">''</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t37" class="pln"> <span class="str">""" Take a block of text as a string or list of lines.</span><span class="strut"> </span></p> +<p id="t38" class="pln"><span class="str"> Remove any common whitespace indentation.</span><span class="strut"> </span></p> +<p id="t39" class="pln"><span class="str"> Re-indent using newIndent, and return it as a single string.</span><span class="strut"> </span></p> +<p id="t40" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t41" class="stm run hide_run"> <span class="nam">sep</span><span class="op">,</span> <span class="nam">nothing</span> <span class="op">=</span> <span class="str">'\n'</span><span class="op">,</span> <span class="str">''</span><span class="strut"> </span></p> +<p id="t42" class="stm run hide_run"> <span class="key">if</span> <span class="nam">isinstance</span><span class="op">(</span><span class="nam">lines</span><span class="op">,</span> <span class="nam">bytes_types</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t43" class="stm run hide_run"> <span class="nam">sep</span><span class="op">,</span> <span class="nam">nothing</span> <span class="op">=</span> <span class="nam">b</span><span class="op">(</span><span class="str">'\n'</span><span class="op">)</span><span class="op">,</span> <span class="nam">b</span><span class="op">(</span><span class="str">''</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t44" class="stm run hide_run"> <span class="key">if</span> <span class="nam">isinstance</span><span class="op">(</span><span class="nam">lines</span><span class="op">,</span> <span class="nam">string_types</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t45" class="stm run hide_run"> <span class="nam">lines</span> <span class="op">=</span> <span class="nam">lines</span><span class="op">.</span><span class="nam">split</span><span class="op">(</span><span class="nam">sep</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t46" class="stm run hide_run"> <span class="nam">oldIndent</span> <span class="op">=</span> <span class="nam">whitePrefix</span><span class="op">(</span><span class="nam">lines</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t47" class="stm run hide_run"> <span class="nam">outLines</span> <span class="op">=</span> <span class="op">[</span><span class="op">]</span><span class="strut"> </span></p> +<p id="t48" class="stm run hide_run"> <span class="key">for</span> <span class="nam">l</span> <span class="key">in</span> <span class="nam">lines</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t49" class="stm run hide_run"> <span class="key">if</span> <span class="nam">oldIndent</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t50" class="stm run hide_run"> <span class="nam">l</span> <span class="op">=</span> <span class="nam">l</span><span class="op">.</span><span class="nam">replace</span><span class="op">(</span><span class="nam">oldIndent</span><span class="op">,</span> <span class="nam">nothing</span><span class="op">,</span> <span class="num">1</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t51" class="stm run hide_run"> <span class="key">if</span> <span class="nam">l</span> <span class="key">and</span> <span class="nam">newIndent</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t52" class="stm run hide_run"> <span class="nam">l</span> <span class="op">=</span> <span class="nam">newIndent</span> <span class="op">+</span> <span class="nam">l</span><span class="strut"> </span></p> +<p id="t53" class="stm run hide_run"> <span class="nam">outLines</span><span class="op">.</span><span class="nam">append</span><span class="op">(</span><span class="nam">l</span><span class="op">)</span><span class="strut"> </span></p> +<p id="t54" class="stm run hide_run"> <span class="key">return</span> <span class="nam">sep</span><span class="op">.</span><span class="nam">join</span><span class="op">(</span><span class="nam">outLines</span><span class="op">)</span><span class="strut"> </span></p> <p id="t55" class="pln"><span class="strut"> </span></p> <p id="t56" class="stm run hide_run"><span class="key">def</span> <span class="nam">commonPrefix</span><span class="op">(</span><span class="nam">strings</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t57" class="pln"> <span class="str">""" Find the longest string that is a prefix of all the strings.</span><span class="strut"> </span></p> -<p id="t58" class="pln"><span class="str"> """</span><span class="strut"> </span></p> -<p id="t59" class="stm par run hide_run"><span class="annotate" title="Line 59 was executed, but never jumped to line 60">59 ↛ 60 [?]</span> <span class="key">if</span> <span class="key">not</span> <span class="nam">strings</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t60" class="stm mis"> <span class="key">return</span> <span class="str">''</span><span class="strut"> </span></p> -<p id="t61" class="stm run hide_run"> <span class="nam">prefix</span> <span class="op">=</span> <span class="nam">strings</span><span class="op">[</span><span class="num">0</span><span class="op">]</span><span class="strut"> </span></p> -<p id="t62" class="stm run hide_run"> <span class="key">for</span> <span class="nam">s</span> <span class="key">in</span> <span class="nam">strings</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t63" class="stm run hide_run"> <span class="key">if</span> <span class="nam">len</span><span class="op">(</span><span class="nam">s</span><span class="op">)</span> <span class="op"><</span> <span class="nam">len</span><span class="op">(</span><span class="nam">prefix</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t64" class="stm run hide_run"> <span class="nam">prefix</span> <span class="op">=</span> <span class="nam">prefix</span><span class="op">[</span><span class="op">:</span><span class="nam">len</span><span class="op">(</span><span class="nam">s</span><span class="op">)</span><span class="op">]</span><span class="strut"> </span></p> -<p id="t65" class="stm run hide_run"> <span class="key">if</span> <span class="key">not</span> <span class="nam">prefix</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t66" class="stm run hide_run"> <span class="key">return</span> <span class="str">''</span><span class="strut"> </span></p> -<p id="t67" class="stm run hide_run"> <span class="key">for</span> <span class="nam">i</span> <span class="key">in</span> <span class="nam">range</span><span class="op">(</span><span class="nam">len</span><span class="op">(</span><span class="nam">prefix</span><span class="op">)</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t68" class="stm run hide_run"> <span class="key">if</span> <span class="nam">prefix</span><span class="op">[</span><span class="nam">i</span><span class="op">]</span> <span class="op">!=</span> <span class="nam">s</span><span class="op">[</span><span class="nam">i</span><span class="op">]</span><span class="op">:</span><span class="strut"> </span></p> -<p id="t69" class="stm run hide_run"> <span class="nam">prefix</span> <span class="op">=</span> <span class="nam">prefix</span><span class="op">[</span><span class="op">:</span><span class="nam">i</span><span class="op">]</span><span class="strut"> </span></p> -<p id="t70" class="stm run hide_run"> <span class="key">break</span><span class="strut"> </span></p> -<p id="t71" class="stm run hide_run"> <span class="key">return</span> <span class="nam">prefix</span><span class="strut"> </span></p> - +<p id="t57" class="pln"> <span class="str">""" Find the longest string that is a prefix of all the strings.</span><span class="strut"> </span></p> +<p id="t58" class="pln"><span class="str"> """</span><span class="strut"> </span></p> +<p id="t59" class="stm run hide_run"> <span class="key">if</span> <span class="key">not</span> <span class="nam">strings</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t60" class="stm run hide_run"> <span class="key">return</span> <span class="str">''</span><span class="strut"> </span></p> +<p id="t61" class="stm run hide_run"> <span class="nam">prefix</span> <span class="op">=</span> <span class="nam">strings</span><span class="op">[</span><span class="num">0</span><span class="op">]</span><span class="strut"> </span></p> +<p id="t62" class="stm run hide_run"> <span class="key">for</span> <span class="nam">s</span> <span class="key">in</span> <span class="nam">strings</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t63" class="stm run hide_run"> <span class="key">if</span> <span class="nam">len</span><span class="op">(</span><span class="nam">s</span><span class="op">)</span> <span class="op"><</span> <span class="nam">len</span><span class="op">(</span><span class="nam">prefix</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t64" class="stm run hide_run"> <span class="nam">prefix</span> <span class="op">=</span> <span class="nam">prefix</span><span class="op">[</span><span class="op">:</span><span class="nam">len</span><span class="op">(</span><span class="nam">s</span><span class="op">)</span><span class="op">]</span><span class="strut"> </span></p> +<p id="t65" class="stm run hide_run"> <span class="key">if</span> <span class="key">not</span> <span class="nam">prefix</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t66" class="stm run hide_run"> <span class="key">return</span> <span class="str">''</span><span class="strut"> </span></p> +<p id="t67" class="stm run hide_run"> <span class="key">for</span> <span class="nam">i</span> <span class="key">in</span> <span class="nam">range</span><span class="op">(</span><span class="nam">len</span><span class="op">(</span><span class="nam">prefix</span><span class="op">)</span><span class="op">)</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t68" class="stm run hide_run"> <span class="key">if</span> <span class="nam">prefix</span><span class="op">[</span><span class="nam">i</span><span class="op">]</span> <span class="op">!=</span> <span class="nam">s</span><span class="op">[</span><span class="nam">i</span><span class="op">]</span><span class="op">:</span><span class="strut"> </span></p> +<p id="t69" class="stm run hide_run"> <span class="nam">prefix</span> <span class="op">=</span> <span class="nam">prefix</span><span class="op">[</span><span class="op">:</span><span class="nam">i</span><span class="op">]</span><span class="strut"> </span></p> +<p id="t70" class="stm run hide_run"> <span class="key">break</span><span class="strut"> </span></p> +<p id="t71" class="stm run hide_run"> <span class="key">return</span> <span class="nam">prefix</span><span class="strut"> </span></p> + </td> </tr> </table> @@ -223,8 +223,8 @@ <div id="footer"> <div class="content"> <p> - <a class="nav" href="index.html">« index</a> <a class="nav" href="https://coverage.readthedocs.org">coverage.py v4.0.3</a>, - created at 2015-11-24 07:02 + <a class="nav" href="index.html">« index</a> <a class="nav" href="https://coverage.readthedocs.io">coverage.py v4.1</a>, + created at 2016-05-21 08:55 </p> </div> </div> diff --git a/doc/sample_html/coverage_html.js b/doc/sample_html/coverage_html.js index bd6a875..51904dd 100644 --- a/doc/sample_html/coverage_html.js +++ b/doc/sample_html/coverage_html.js @@ -264,6 +264,11 @@ coverage.pyfile_ready = function ($) { coverage.assign_shortkeys(); coverage.wire_up_help_panel(); + + coverage.init_scroll_markers(); + + // Rebuild scroll markers after window high changing + $(window).resize(coverage.resize_scroll_markers); }; coverage.toggle_lines = function (btn, cls) { @@ -510,3 +515,72 @@ coverage.scroll_window = function (to_pos) { coverage.finish_scrolling = function () { $("html,body").stop(true, true); }; + +coverage.init_scroll_markers = function () { + var c = coverage; + // Init some variables + c.lines_len = $('td.text p').length; + c.body_h = $('body').height(); + c.header_h = $('div#header').height(); + c.missed_lines = $('td.text p.mis, td.text p.par'); + + // Build html + c.resize_scroll_markers(); +}; + +coverage.resize_scroll_markers = function () { + var c = coverage, + min_line_height = 3, + max_line_height = 10, + visible_window_h = $(window).height(); + + $('#scroll_marker').remove(); + // Don't build markers if the window has no scroll bar. + if (c.body_h <= visible_window_h) { + return; + } + + $("body").append("<div id='scroll_marker'> </div>"); + var scroll_marker = $('#scroll_marker'), + marker_scale = scroll_marker.height() / c.body_h, + line_height = scroll_marker.height() / c.lines_len; + + // Line height must be between the extremes. + if (line_height > min_line_height) { + if (line_height > max_line_height) { + line_height = max_line_height; + } + } + else { + line_height = min_line_height; + } + + var previous_line = -99, + last_mark, + last_top; + + c.missed_lines.each(function () { + var line_top = Math.round($(this).offset().top * marker_scale), + id_name = $(this).attr('id'), + line_number = parseInt(id_name.substring(1, id_name.length)); + + if (line_number === previous_line + 1) { + // If this solid missed block just make previous mark higher. + last_mark.css({ + 'height': line_top + line_height - last_top + }); + } + else { + // Add colored line in scroll_marker block. + scroll_marker.append('<div id="m' + line_number + '" class="marker"></div>'); + last_mark = $('#m' + line_number); + last_mark.css({ + 'height': line_height, + 'top': line_top + }); + last_top = line_top; + } + + previous_line = line_number; + }); +}; diff --git a/doc/sample_html/index.html b/doc/sample_html/index.html index f2dd3a5..5b23518 100644 --- a/doc/sample_html/index.html +++ b/doc/sample_html/index.html @@ -22,7 +22,7 @@ <div id="header"> <div class="content"> <h1>Coverage report: - <span class="pc_cov">37.82%</span> + <span class="pc_cov">98.49%</span> </h1> <img id="keyboard_icon" src="keybd_closed.png" alt="Show keyboard shortcuts" /> @@ -71,14 +71,14 @@ <tfoot> <tr class="total"> <td class="name left">Total</td> - <td>1348</td> - <td>838</td> + <td>1352</td> + <td>14</td> <td>13</td> - <td>228</td> - <td>30</td> + <td>236</td> + <td>10</td> - <td class="right" data-ratio="596 1576">37.82%</td> + <td class="right" data-ratio="1564 1588">98.49%</td> </tr> </tfoot> <tbody> @@ -121,74 +121,74 @@ <tr class="file"> <td class="name left"><a href="cogapp_cogapp_py.html">cogapp/cogapp.py</a></td> - <td>423</td> - <td>194</td> + <td>427</td> + <td>3</td> <td>4</td> - <td>168</td> - <td>26</td> + <td>176</td> + <td>4</td> - <td class="right" data-ratio="283 591">47.88%</td> + <td class="right" data-ratio="596 603">98.84%</td> </tr> <tr class="file"> <td class="name left"><a href="cogapp_makefiles_py.html">cogapp/makefiles.py</a></td> <td>28</td> - <td>20</td> + <td>0</td> <td>3</td> <td>14</td> - <td>0</td> + <td>3</td> - <td class="right" data-ratio="8 42">19.05%</td> + <td class="right" data-ratio="39 42">92.86%</td> </tr> <tr class="file"> <td class="name left"><a href="cogapp_test_cogapp_py.html">cogapp/test_cogapp.py</a></td> <td>704</td> - <td>486</td> + <td>0</td> <td>6</td> <td>6</td> - <td>0</td> + <td>1</td> - <td class="right" data-ratio="220 710">30.99%</td> + <td class="right" data-ratio="709 710">99.86%</td> </tr> <tr class="file"> <td class="name left"><a href="cogapp_test_makefiles_py.html">cogapp/test_makefiles.py</a></td> <td>55</td> - <td>55</td> + <td>0</td> <td>0</td> <td>6</td> <td>0</td> - <td class="right" data-ratio="0 61">0.00%</td> + <td class="right" data-ratio="61 61">100.00%</td> </tr> <tr class="file"> <td class="name left"><a href="cogapp_test_whiteutils_py.html">cogapp/test_whiteutils.py</a></td> <td>69</td> - <td>69</td> + <td>0</td> <td>0</td> <td>0</td> <td>0</td> - <td class="right" data-ratio="0 69">0.00%</td> + <td class="right" data-ratio="69 69">100.00%</td> </tr> <tr class="file"> <td class="name left"><a href="cogapp_whiteutils_py.html">cogapp/whiteutils.py</a></td> <td>45</td> - <td>3</td> + <td>0</td> <td>0</td> <td>32</td> - <td>3</td> + <td>1</td> - <td class="right" data-ratio="71 77">92.21%</td> + <td class="right" data-ratio="76 77">98.70%</td> </tr> </tbody> @@ -202,8 +202,8 @@ <div id="footer"> <div class="content"> <p> - <a class="nav" href="https://coverage.readthedocs.org">coverage.py v4.0.3</a>, - created at 2015-11-24 07:02 + <a class="nav" href="https://coverage.readthedocs.io">coverage.py v4.1</a>, + created at 2016-05-21 08:55 </p> </div> </div> diff --git a/doc/sample_html/status.json b/doc/sample_html/status.json index 3419a95..67997b4 100644 --- a/doc/sample_html/status.json +++ b/doc/sample_html/status.json @@ -1 +1 @@ -{"files": {"cogapp_test_whiteutils_py": {"index": {"relative_filename": "cogapp/test_whiteutils.py", "html_filename": "cogapp_test_whiteutils_py.html", "nums": [1, 69, 0, 69, 0, 0, 0]}, "hash": "f7a3c04788858b652fcfb29825e1e8d4"}, "cogapp_test_makefiles_py": {"index": {"relative_filename": "cogapp/test_makefiles.py", "html_filename": "cogapp_test_makefiles_py.html", "nums": [1, 55, 0, 55, 6, 0, 6]}, "hash": "ff1f44c04d08ae202f5164e1ba75818e"}, "cogapp_cogapp_py": {"index": {"relative_filename": "cogapp/cogapp.py", "html_filename": "cogapp_cogapp_py.html", "nums": [1, 423, 4, 194, 168, 26, 114]}, "hash": "0cddc268270941a93a88a5a06a86629e"}, "cogapp___init___py": {"index": {"relative_filename": "cogapp/__init__.py", "html_filename": "cogapp___init___py.html", "nums": [1, 2, 0, 0, 0, 0, 0]}, "hash": "e8e5f4601febeb4f8cfaedc27cda7ff2"}, "cogapp_backward_py": {"index": {"relative_filename": "cogapp/backward.py", "html_filename": "cogapp_backward_py.html", "nums": [1, 19, 0, 8, 2, 1, 1]}, "hash": "02fc7e84b678eb8cd2df594ecd21792d"}, "cogapp_test_cogapp_py": {"index": {"relative_filename": "cogapp/test_cogapp.py", "html_filename": "cogapp_test_cogapp_py.html", "nums": [1, 704, 6, 486, 6, 0, 4]}, "hash": "8693bbecf0b8fc5ef9ad177e4d156edb"}, "cogapp_makefiles_py": {"index": {"relative_filename": "cogapp/makefiles.py", "html_filename": "cogapp_makefiles_py.html", "nums": [1, 28, 3, 20, 14, 0, 14]}, "hash": "a744227abe2381eefae57f20e5f3d79e"}, "cogapp_whiteutils_py": {"index": {"relative_filename": "cogapp/whiteutils.py", "html_filename": "cogapp_whiteutils_py.html", "nums": [1, 45, 0, 3, 32, 3, 3]}, "hash": "b898c54cd626b6265d68d6e536ad78cf"}, "cogapp___main___py": {"index": {"relative_filename": "cogapp/__main__.py", "html_filename": "cogapp___main___py.html", "nums": [1, 3, 0, 3, 0, 0, 0]}, "hash": "c846304fff9f9b5f7510a86b60c3c3c6"}}, "version": "4.0.3", "settings": "7d07facd0b8027d5d394bf363d405670", "format": 1}
\ No newline at end of file +{"files": {"cogapp_test_whiteutils_py": {"index": {"relative_filename": "cogapp/test_whiteutils.py", "html_filename": "cogapp_test_whiteutils_py.html", "nums": [1, 69, 0, 0, 0, 0, 0]}, "hash": "e00fa13d9d6f419ca35e732ea83c17fb"}, "cogapp_test_makefiles_py": {"index": {"relative_filename": "cogapp/test_makefiles.py", "html_filename": "cogapp_test_makefiles_py.html", "nums": [1, 55, 0, 0, 6, 0, 0]}, "hash": "db9f8cbf81e744216a3602f494704e64"}, "cogapp_cogapp_py": {"index": {"relative_filename": "cogapp/cogapp.py", "html_filename": "cogapp_cogapp_py.html", "nums": [1, 427, 4, 3, 176, 4, 4]}, "hash": "305b92258a63818d3ef2a2d824cb1d63"}, "cogapp___init___py": {"index": {"relative_filename": "cogapp/__init__.py", "html_filename": "cogapp___init___py.html", "nums": [1, 2, 0, 0, 0, 0, 0]}, "hash": "589b4cc38603d62593ba92f20950eb8a"}, "cogapp_backward_py": {"index": {"relative_filename": "cogapp/backward.py", "html_filename": "cogapp_backward_py.html", "nums": [1, 19, 0, 8, 2, 1, 1]}, "hash": "5b76f23e07605fde0795af44bf5eeedf"}, "cogapp_test_cogapp_py": {"index": {"relative_filename": "cogapp/test_cogapp.py", "html_filename": "cogapp_test_cogapp_py.html", "nums": [1, 704, 6, 0, 6, 1, 1]}, "hash": "76eef3ae095c6723c07d7c4f5e3a8cd1"}, "cogapp_makefiles_py": {"index": {"relative_filename": "cogapp/makefiles.py", "html_filename": "cogapp_makefiles_py.html", "nums": [1, 28, 3, 0, 14, 3, 3]}, "hash": "1703ddbb839a9738578dc9bc8deab9b5"}, "cogapp_whiteutils_py": {"index": {"relative_filename": "cogapp/whiteutils.py", "html_filename": "cogapp_whiteutils_py.html", "nums": [1, 45, 0, 0, 32, 1, 1]}, "hash": "f0acf5699b528da74f67913134e4e21d"}, "cogapp___main___py": {"index": {"relative_filename": "cogapp/__main__.py", "html_filename": "cogapp___main___py.html", "nums": [1, 3, 0, 3, 0, 0, 0]}, "hash": "c846304fff9f9b5f7510a86b60c3c3c6"}}, "version": "4.1", "settings": "7d07facd0b8027d5d394bf363d405670", "format": 1}
\ No newline at end of file diff --git a/doc/sample_html/style.css b/doc/sample_html/style.css index 15b0890..136cbb8 100644 --- a/doc/sample_html/style.css +++ b/doc/sample_html/style.css @@ -64,7 +64,7 @@ a.nav:hover { #source { padding: 1em; - font-family: "courier new", monospace; + font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace; } .indexfile #footer { @@ -160,7 +160,7 @@ h2.stats { .help_panel { position: absolute; - background: #ffc; + background: #ffffcc; padding: .5em; border: 1px solid #883; display: none; @@ -226,7 +226,8 @@ td.text { margin: 0; padding: 0 0 0 .5em; border-left: 2px solid #ffffff; - white-space: nowrap; + white-space: pre; + position: relative; } .text p.mis { @@ -259,6 +260,27 @@ td.text { .text p.hide_par span.annotate { display: none; } +.text span.annotate.long { + display: none; + } +.text p:hover span.annotate.long { + display: block; + max-width: 50%; + white-space: normal; + float: right; + position: absolute; + top: 1.75em; + right: 1em; + width: 30em; + height: auto; + color: #333; + background: #ffffcc; + border: 1px solid #888; + padding: .25em .5em; + z-index: 999; + border-radius: .2em; + box-shadow: #cccccc .2em .2em .2em; + } /* Syntax coloring */ .text .com { @@ -308,10 +330,6 @@ td.text { text-decoration: none; color: #000; } -#index td.name a:hover { - text-decoration: underline; - color: #000; - } #index tr.total, #index tr.total_dynamic { } @@ -324,3 +342,25 @@ td.text { #index tr.file:hover { background: #eeeeee; } +#index tr.file:hover td.name { + text-decoration: underline; + color: #000; + } + +/* scroll marker styles */ +#scroll_marker { + position: fixed; + right: 0; + top: 0; + width: 16px; + height: 100%; + background: white; + border-left: 1px solid #eee; + } + +#scroll_marker .marker { + background: #eedddd; + position: absolute; + min-height: 3px; + width: 100%; + } |